From ceb21144c4f15b3ae9534086906717eef70ef925 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sat, 7 May 2011 11:26:58 +0300
Subject: [PATCH 001/314] Bug 646412 - fix autodial pref initialization
 r=cbiesinger

---
 netwerk/base/src/nsIOService.cpp | 3 +++
 netwerk/base/src/nsIOService.h   | 1 +
 2 files changed, 4 insertions(+)

diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
index 7401cf9ec545..62d34d2dfae9 100644
--- a/netwerk/base/src/nsIOService.cpp
+++ b/netwerk/base/src/nsIOService.cpp
@@ -182,6 +182,7 @@ nsIOService::nsIOService()
     , mShutdown(PR_FALSE)
     , mChannelEventSinks(NS_CHANNEL_EVENT_SINK_CATEGORY)
     , mContentSniffers(NS_CONTENT_SNIFFER_CATEGORY)
+    , mAutoDialEnabled(PR_FALSE)
 {
 }
 
@@ -304,6 +305,7 @@ nsIOService::InitializeSocketTransportService()
     if (mSocketTransportService) {
         rv = mSocketTransportService->Init();
         NS_ASSERTION(NS_SUCCEEDED(rv), "socket transport service init failed");
+        mSocketTransportService->SetAutodialEnabled(mAutoDialEnabled);
     }
 
     return rv;
@@ -850,6 +852,7 @@ nsIOService::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         PRBool enableAutodial = PR_FALSE;
         nsresult rv = prefs->GetBoolPref(AUTODIAL_PREF, &enableAutodial);
         // If pref not found, default to disabled.
+        mAutoDialEnabled = enableAutodial;
         if (NS_SUCCEEDED(rv)) {
             if (mSocketTransportService)
                 mSocketTransportService->SetAutodialEnabled(enableAutodial);
diff --git a/netwerk/base/src/nsIOService.h b/netwerk/base/src/nsIOService.h
index 7a1b73b9bb68..6e083301e77a 100644
--- a/netwerk/base/src/nsIOService.h
+++ b/netwerk/base/src/nsIOService.h
@@ -161,6 +161,7 @@ private:
 
     nsTArray<PRInt32>                    mRestrictedPortList;
 
+    PRPackedBool                         mAutoDialEnabled;
 public:
     // Necko buffer cache. Used for all default buffer sizes that necko
     // allocates.

From 46e3ef201dd0076ca4cb26b21cc1d084586d76d8 Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Sat, 7 May 2011 11:27:13 +0300
Subject: [PATCH 002/314] Bug 646412 - After Connection is established on
 MeeGo. Browser shows Error Page. r=wolfiR

---
 netwerk/base/src/nsAutodialQt.cpp            |  4 ++--
 netwerk/system/qt/nsQtNetworkLinkService.cpp | 12 ++++------
 netwerk/system/qt/nsQtNetworkManager.cpp     | 25 ++++++++++++++++++--
 netwerk/system/qt/nsQtNetworkManager.h       | 11 ++++++---
 4 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/netwerk/base/src/nsAutodialQt.cpp b/netwerk/base/src/nsAutodialQt.cpp
index e29788f1eeca..cb2ef913ea94 100644
--- a/netwerk/base/src/nsAutodialQt.cpp
+++ b/netwerk/base/src/nsAutodialQt.cpp
@@ -61,7 +61,7 @@ nsAutodial::Init()
 nsresult
 nsAutodial::DialDefault(const PRUnichar* hostName)
 {
-  if (gQtNetworkManager->openConnection(QString::fromUtf16(hostName))) {
+  if (nsQtNetworkManager::get()->openConnection(QString::fromUtf16(hostName))) {
     return NS_OK;
   }
 
@@ -71,7 +71,7 @@ nsAutodial::DialDefault(const PRUnichar* hostName)
 PRBool
 nsAutodial::ShouldDialOnNetworkError()
 {
-  if (gQtNetworkManager->isOnline()) {
+  if (nsQtNetworkManager::get()->isOnline()) {
     return PR_FALSE;
   }
 
diff --git a/netwerk/system/qt/nsQtNetworkLinkService.cpp b/netwerk/system/qt/nsQtNetworkLinkService.cpp
index 11d7d2890396..15e6f617d6f7 100644
--- a/netwerk/system/qt/nsQtNetworkLinkService.cpp
+++ b/netwerk/system/qt/nsQtNetworkLinkService.cpp
@@ -58,14 +58,14 @@ nsQtNetworkLinkService::~nsQtNetworkLinkService()
 NS_IMETHODIMP
 nsQtNetworkLinkService::GetIsLinkUp(PRBool* aIsUp)
 {
-  *aIsUp = gQtNetworkManager->isOnline();
+  *aIsUp = nsQtNetworkManager::get()->isOnline();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsQtNetworkLinkService::GetLinkStatusKnown(PRBool* aIsKnown)
 {
-  *aIsKnown = gQtNetworkManager->isOnline();
+  *aIsKnown = nsQtNetworkManager::get()->isOnline();
   return NS_OK;
 }
 
@@ -76,8 +76,7 @@ nsQtNetworkLinkService::Observe(nsISupports* aSubject,
 {
   if (!strcmp(aTopic, "xpcom-shutdown")) {
     Shutdown();
-    delete gQtNetworkManager;
-    gQtNetworkManager = 0;
+    nsQtNetworkManager::get()->destroy();
   }
 
   if (!strcmp(aTopic, "browser-lastwindow-close-granted")) {
@@ -96,8 +95,7 @@ nsQtNetworkLinkService::Init(void)
     return NS_ERROR_FAILURE;
   }
 
-  delete gQtNetworkManager;
-  gQtNetworkManager = new nsQtNetworkManager();
+  nsQtNetworkManager::create();
   nsresult rv;
 
   rv = observerService->AddObserver(this, "xpcom-shutdown", PR_FALSE);
@@ -117,6 +115,6 @@ nsQtNetworkLinkService::Init(void)
 nsresult
 nsQtNetworkLinkService::Shutdown()
 {
-  gQtNetworkManager->closeSession();
+  nsQtNetworkManager::get()->closeSession();
   return NS_OK;
 }
diff --git a/netwerk/system/qt/nsQtNetworkManager.cpp b/netwerk/system/qt/nsQtNetworkManager.cpp
index 592dae238068..27cb5be8cc17 100644
--- a/netwerk/system/qt/nsQtNetworkManager.cpp
+++ b/netwerk/system/qt/nsQtNetworkManager.cpp
@@ -48,6 +48,27 @@
 #include <QHostAddress>
 #include <QTime>
 
+nsQtNetworkManager* nsQtNetworkManager::gQtNetworkManager = nsnull;
+
+void nsQtNetworkManager::create()
+{
+    if (!gQtNetworkManager) {
+        gQtNetworkManager = new nsQtNetworkManager();
+        connect(gQtNetworkManager, SIGNAL(openConnectionSignal()),
+                gQtNetworkManager, SLOT(openSession()),
+                Qt::BlockingQueuedConnection);
+        connect(&gQtNetworkManager->networkConfigurationManager,
+                SIGNAL(onlineStateChanged(bool)), gQtNetworkManager,
+                SLOT(onlineStateChanged(bool)));
+    }
+}
+
+void nsQtNetworkManager::destroy()
+{
+    delete gQtNetworkManager;
+    gQtNetworkManager = nsnull;
+}
+
 nsQtNetworkManager::nsQtNetworkManager(QObject* parent)
   : QObject(parent), networkSession(0)
 {
@@ -141,7 +162,7 @@ nsQtNetworkManager::openSession()
     // this only means we did not shutdown before...
     // renew Session every time
     // fix/workaround for prestart bug
-    if (!networkSession) {
+    if (networkSession) {
         networkSession->close();
         networkSession->deleteLater();
     }
@@ -168,7 +189,7 @@ nsQtNetworkManager::openSession()
 void
 nsQtNetworkManager::closeSession()
 {
-    if (!networkSession) {
+    if (networkSession) {
         networkSession->close();
     }
 }
diff --git a/netwerk/system/qt/nsQtNetworkManager.h b/netwerk/system/qt/nsQtNetworkManager.h
index 37e10e59f914..3e4acffdbb31 100644
--- a/netwerk/system/qt/nsQtNetworkManager.h
+++ b/netwerk/system/qt/nsQtNetworkManager.h
@@ -47,16 +47,18 @@
 
 class nsQtNetworkManager;
 
-static nsQtNetworkManager* gQtNetworkManager = nsnull;
+
 
 class nsQtNetworkManager : public QObject
 {
   Q_OBJECT
   public:
-    explicit nsQtNetworkManager(QObject* parent = 0);
-
+    static void create();
+    static void destroy();
     virtual ~nsQtNetworkManager();
 
+    static nsQtNetworkManager* get() { return gQtNetworkManager; }
+
     static PRBool IsConnected();
     static PRBool GetLinkStatusKnown();
     static void enableInstance();
@@ -73,6 +75,9 @@ class nsQtNetworkManager : public QObject
     void openSession();
 
   private:
+    explicit nsQtNetworkManager(QObject* parent = 0);
+
+    static nsQtNetworkManager* gQtNetworkManager;
     QNetworkSession* networkSession;
     QNetworkConfiguration networkConfiguration;
     QNetworkConfigurationManager networkConfigurationManager;

From 37941b9b4ffe847146475b7eba85544f81e9885c Mon Sep 17 00:00:00 2001
From: Tatiana Meshkova <tanya.meshkova@gmail.com>
Date: Tue, 3 May 2011 19:40:02 +0300
Subject: [PATCH 003/314] Bug 641460 - Fennec stays minimized when closing
 multiple tabs on Maemo / MeeGo

---
 mobile/chrome/content/browser.js | 3 +++
 widget/src/qt/nsWindow.cpp       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 9ef09984311f..c0add50e621a 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -409,6 +409,9 @@ var Browser = {
                       (prompt.BUTTON_TITLE_CANCEL * prompt.BUTTON_POS_1);
 
         this._waitingToClose = true;
+#ifdef MOZ_PLATFORM_MAEMO
+        window.QueryInterface(Ci.nsIDOMChromeWindow).restore();
+#endif
         let pressed = prompt.confirmEx(window, title, message, buttons, closeText, null, null, checkText, warnOnClose);
         this._waitingToClose = false;
 
diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
index fda5e831a897..332f23c74c3b 100644
--- a/widget/src/qt/nsWindow.cpp
+++ b/widget/src/qt/nsWindow.cpp
@@ -588,6 +588,9 @@ nsWindow::SetSizeMode(PRInt32 aMode)
     nsresult rv;
 
     LOG(("nsWindow::SetSizeMode [%p] %d\n", (void *)this, aMode));
+    if (aMode != nsSizeMode_Minimized) {
+        GetViewWidget()->activateWindow();
+    }
 
     // Save the requested state.
     rv = nsBaseWidget::SetSizeMode(aMode);

From bddf873447be1fa33182b731d87284baa407598b Mon Sep 17 00:00:00 2001
From: ffxbld <none@none>
Date: Sat, 7 May 2011 03:20:36 -0700
Subject: [PATCH 004/314] Automated blocklist update from host linux-ix-slave15

---
 browser/app/blocklist.xml | 45 ---------------------------------------
 1 file changed, 45 deletions(-)

diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
index 6b3f61b0dcff..57c60dfacaf2 100644
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -15,12 +15,6 @@
         </targetApplication>
       </versionRange>
     </emItem>
-    <emItem id="krupa.raj+545@gmail.com">
-      <versionRange severity="2"/>
-    </emItem>
-    <emItem id="krups@krup12s.com">
-      <versionRange severity="3"/>
-    </emItem>
     <emItem id="langpack-vi-VN@firefox.mozilla.org">
       <versionRange minVersion="2.0" maxVersion="2.0"/>
     </emItem>
@@ -42,9 +36,6 @@
     <emItem id="msntoolbar@msn.com">
       <versionRange minVersion=" " maxVersion="6.*"/>
     </emItem>
-    <emItem id="near799@wdios.com" os="Android">
-      <versionRange minVersion="0.8" maxVersion="1.0" severity="3"/>
-    </emItem>
     <emItem id="personas@christopher.beard">
       <versionRange minVersion="1.6" maxVersion="1.6">
         <targetApplication id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
@@ -55,9 +46,6 @@
     <emItem id="ShopperReports@ShopperReports.com">
       <versionRange minVersion="3.1.22.0" maxVersion="3.1.22.0"/>
     </emItem>
-    <emItem id="sidecar-test-addon20110103118@amazon.com" os="MACOSX, Windows, Linux">
-      <versionRange severity="3"/>
-    </emItem>
     <emItem id="support@daemon-tools.cc">
       <versionRange minVersion=" " maxVersion="1.0.0.5"/>
     </emItem>
@@ -196,38 +184,5 @@
     <driverVersion>7.0.0.0</driverVersion>
     <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator>
   </gfxBlacklistEntry>
-  <gfxBlacklistEntry>
-    <os>MAC OS X 10.5.8</os>
-    <vendor>0x10de</vendor>
-    <feature>DIRECT3D_9_LAYERS</feature>
-    <driverVersion>7.0.0.0</driverVersion>
-    <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator>
-  </gfxBlacklistEntry>
-  <gfxBlacklistEntry>
-    <os>MAC OS X 10.5.8</os>
-    <vendor>0x10de</vendor>
-    <feature>DIRECT3D_9_LAYERS</feature>
-    <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-    <driverVersion>7.0.0.0</driverVersion>
-    <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator>
-  </gfxBlacklistEntry>
-  <gfxBlacklistEntry>
-    <os>MAC OS X 10.6</os>
-    <vendor>0x10de</vendor>
-    <devices>
-      <device>0x0a6c</device>
-    </devices>
-    <feature>DIRECT3D_9_LAYERS</feature>
-    <featureStatus>BLOCKED_DRIVER_VERSION</featureStatus>
-    <driverVersion>8.17.12.5896</driverVersion>
-    <driverVersionComparator>LESS_THAN_OR_EQUAL</driverVersionComparator>
-  </gfxBlacklistEntry>
-  <gfxBlacklistEntry>
-    <os>MAC OS X 10.6</os>
-    <vendor>0x10de</vendor>
-    <feature>DIRECT3D_9_LAYERS</feature>
-    <driverVersion>7.0.0.0</driverVersion>
-    <driverVersionComparator>GREATER_THAN_OR_EQUAL</driverVersionComparator>
-  </gfxBlacklistEntry>
 </gfxItems>
 </blocklist>

From 3f57f9d8d45609c8054e5ee095faeea365e4a844 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Sat, 7 May 2011 12:42:45 +0300
Subject: [PATCH 005/314] Bug 652752 - Click event isn't fired if mousedown
 event and mouseup event are fired on different textnode of same element,
 r=masayuki

--HG--
extra : rebase_source : 90c84bb703c5e314dcdcf3b435b842e680d591ad
---
 content/events/src/nsEventStateManager.cpp      | 17 +++++++++--------
 content/events/test/test_bug534833.html         |  2 +-
 .../events/test/test_clickevent_on_input.html   |  6 ++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 2f95f42e5662..a80cbe35b800 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -3964,21 +3964,22 @@ nsEventStateManager::UpdateDragDataTransfer(nsDragEvent* dragEvent)
   }
 }
 
-nsIContent* GetParentContentForMouseTarget(nsIContent* aContent)
-{
-  return aContent && (aContent->IsInNativeAnonymousSubtree() ||
-                      aContent->IsNodeOfType(nsINode::eTEXT)) ?
-           aContent->GetParent() : nsnull;
-}
-
 nsresult
 nsEventStateManager::SetClickCount(nsPresContext* aPresContext,
                                    nsMouseEvent *aEvent,
                                    nsEventStatus* aStatus)
 {
   nsCOMPtr<nsIContent> mouseContent;
+  nsIContent* mouseContentParent = nsnull;
   mCurrentTarget->GetContentForEvent(aPresContext, aEvent, getter_AddRefs(mouseContent));
-  nsIContent* mouseContentParent = GetParentContentForMouseTarget(mouseContent);
+  if (mouseContent) {
+    if (mouseContent->IsNodeOfType(nsINode::eTEXT)) {
+      mouseContent = mouseContent->GetParent();
+    }
+    if (mouseContent && mouseContent->IsRootOfNativeAnonymousSubtree()) {
+      mouseContentParent = mouseContent->GetParent();
+    }
+  }
 
   switch (aEvent->button) {
   case nsMouseEvent::eLeftButton:
diff --git a/content/events/test/test_bug534833.html b/content/events/test/test_bug534833.html
index 0b5bbeec22bc..3a63b405a8ed 100644
--- a/content/events/test/test_bug534833.html
+++ b/content/events/test/test_bug534833.html
@@ -134,7 +134,7 @@ function finishTests() {
   is(input2GotClick, 1, "input element should have got a click! (2)");
   is(textarea1GotClick, 1, "textarea element should have got a click!");
   is(textarea2GotClick, 1, "textarea element should have got a click! (2)");
-  is(div1GotClick, 1, "div element's content text was replaced, it should have got 1 click!");
+  is(div1GotClick, 2, "div element's content text was replaced, it should have got 2 click!");
   is(div2GotClick, 2, "div element's content text was modified, it should have got 2 clicks!");
   SimpleTest.finish();
 }
diff --git a/content/events/test/test_clickevent_on_input.html b/content/events/test/test_clickevent_on_input.html
index 8299c422ac22..2cd3547aa932 100644
--- a/content/events/test/test_clickevent_on_input.html
+++ b/content/events/test/test_clickevent_on_input.html
@@ -31,6 +31,12 @@ function runTests()
   for (var i = 0; i < 3; i++) {
     doTest(i);
   }
+
+  // Re-test left clicking when the input element has some text. 
+  gClickCount = 0;
+  input.value = "Long text Long text Long text Long text Long text Long text";
+  doTest(0);
+
   input.style.display = "none";
   SimpleTest.finish();
 }

From 83cedda246d149f487974cdf99a4d01e9cb7a992 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Sat, 7 May 2011 16:01:01 +0100
Subject: [PATCH 006/314] bug 655198 - don't parse 'all' as a value for
 -moz-hyphens. r=dbaron

---
 layout/base/nsStyleConsts.h            | 1 -
 layout/style/nsCSSProps.cpp            | 1 -
 layout/style/test/property_database.js | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index 736fb2fde640..aa45b293e1d8 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -709,7 +709,6 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
 #define NS_STYLE_HYPHENS_NONE                   0
 #define NS_STYLE_HYPHENS_MANUAL                 1
 #define NS_STYLE_HYPHENS_AUTO                   2
-#define NS_STYLE_HYPHENS_ALL                    3
 
 // See nsStyleText
 #define NS_STYLE_LINE_HEIGHT_BLOCK_HEIGHT       0
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index e372be45482c..db1381058317 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1332,7 +1332,6 @@ const PRInt32 nsCSSProps::kHyphensKTable[] = {
   eCSSKeyword_none, NS_STYLE_HYPHENS_NONE,
   eCSSKeyword_manual, NS_STYLE_HYPHENS_MANUAL,
   eCSSKeyword_auto, NS_STYLE_HYPHENS_AUTO,
-  eCSSKeyword_all, NS_STYLE_HYPHENS_ALL,
   eCSSKeyword_UNKNOWN,-1
 };
 
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 45940342fd7f..a5c30c9e9b4e 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2722,7 +2722,7 @@ var gCSSProperties = {
 		inherited: true,
 		type: CSS_TYPE_LONGHAND,
 		initial_values: [ "manual" ],
-		other_values: [ "none", "auto", "all" ],
+		other_values: [ "none", "auto" ],
 		invalid_values: []
 	},
 	"z-index": {

From b8ad9e935d60bd65cc12e2f4a9b4b1914e591b98 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 8 May 2011 13:19:08 +1200
Subject: [PATCH 007/314] Bug 648604 - Re-enable plugin transform test on linux
 when GPU layers are enabled. r=joe

---
 modules/plugin/test/reftest/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugin/test/reftest/reftest.list b/modules/plugin/test/reftest/reftest.list
index c716f1c7f39b..dffb2e93590f 100644
--- a/modules/plugin/test/reftest/reftest.list
+++ b/modules/plugin/test/reftest/reftest.list
@@ -18,4 +18,4 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) =
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-5-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-10-step.html plugin-background-ref.html
 random-if(!haveTestPlugin) == plugin-transform-1.html plugin-transform-1-ref.html
-fails-if(!haveTestPlugin) fails-if(http.platform=="X11") == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496
+fails-if(!haveTestPlugin) fails-if(http.platform=="X11" && !layersGPUAccelerated) == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496

From cc174c5b895d7975b4110a92d9d558f9a4b98a11 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 8 May 2011 13:19:11 +1200
Subject: [PATCH 008/314] Bug 651469 - Add FastMovePixels to gfxASurface and
 use it where appropriate. r=roc

---
 gfx/thebes/gfxASurface.cpp     | 34 ++++++++++++++++++++++++++++------
 gfx/thebes/gfxASurface.h       |  8 ++++++++
 gfx/thebes/gfxD2DSurface.h     |  6 ++++++
 gfx/thebes/gfxQuartzSurface.h  |  6 ++++++
 gfx/thebes/gfxWindowsSurface.h |  6 ++++++
 5 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index a9ab802de835..fe169e64e35e 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -501,15 +501,13 @@ gfxASurface::BytePerPixelFromFormat(gfxImageFormat format)
 }
 
 void
-gfxASurface::MovePixels(const nsIntRect& aSourceRect,
-                        const nsIntPoint& aDestTopLeft)
+gfxASurface::FastMovePixels(const nsIntRect& aSourceRect,
+                            const nsIntPoint& aDestTopLeft)
 {
+    // Used when the backend can internally handle self copies.
     gfxIntSize size = GetSize();
     nsIntRect dest(aDestTopLeft, aSourceRect.Size());
-    // Assume that our cairo backend already knows how to properly
-    // self-copy.  gfxASurface subtypes whose backend can't self-copy
-    // need their own implementations, or their backends need to be
-    // fixed.
+    
     nsRefPtr<gfxContext> ctx = new gfxContext(this);
     ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
     nsIntPoint srcOrigin = dest.TopLeft() - aSourceRect.TopLeft();
@@ -518,6 +516,30 @@ gfxASurface::MovePixels(const nsIntRect& aSourceRect,
     ctx->Fill();
 }
 
+void
+gfxASurface::MovePixels(const nsIntRect& aSourceRect,
+                        const nsIntPoint& aDestTopLeft)
+{
+    // Assume the backend can't handle self copying well and allocate
+    // a temporary surface instead.
+    nsRefPtr<gfxASurface> tmp = 
+      CreateSimilarSurface(GetContentType(), 
+                           gfxIntSize(aSourceRect.width, aSourceRect.height));
+    nsRefPtr<gfxContext> ctx = new gfxContext(tmp);
+    ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+    ctx->SetSource(this, gfxPoint(-aSourceRect.x, -aSourceRect.y));
+    ctx->Paint();
+
+    ctx = new gfxContext(this);
+    ctx->SetOperator(gfxContext::OPERATOR_SOURCE);
+    ctx->SetSource(tmp, gfxPoint(aDestTopLeft.x, aDestTopLeft.y));
+    ctx->Rectangle(gfxRect(aDestTopLeft.x, 
+                           aDestTopLeft.y, 
+                           aSourceRect.width, 
+                           aSourceRect.height));
+    ctx->Fill();
+}
+
 /** Memory reporting **/
 
 static const char *sSurfaceNamesForSurfaceType[] = {
diff --git a/gfx/thebes/gfxASurface.h b/gfx/thebes/gfxASurface.h
index 56ab8e2fe070..e79a0e365386 100644
--- a/gfx/thebes/gfxASurface.h
+++ b/gfx/thebes/gfxASurface.h
@@ -256,6 +256,14 @@ protected:
     static gfxASurface* GetSurfaceWrapper(cairo_surface_t *csurf);
     static void SetSurfaceWrapper(cairo_surface_t *csurf, gfxASurface *asurf);
 
+    /**
+     * An implementation of MovePixels that assumes the backend can
+     * internally handle this operation and doesn't allocate any
+     * temporary surfaces.
+     */
+    void FastMovePixels(const nsIntRect& aSourceRect,
+                        const nsIntPoint& aDestTopLeft);
+
     // NB: Init() *must* be called from within subclass's
     // constructors.  It's unsafe to call it after the ctor finishes;
     // leaks and use-after-frees are possible.
diff --git a/gfx/thebes/gfxD2DSurface.h b/gfx/thebes/gfxD2DSurface.h
index f1b4d9e73a64..85aae2b32e72 100644
--- a/gfx/thebes/gfxD2DSurface.h
+++ b/gfx/thebes/gfxD2DSurface.h
@@ -59,6 +59,12 @@ public:
 
     gfxD2DSurface(cairo_surface_t *csurf);
 
+    void MovePixels(const nsIntRect& aSourceRect,
+                    const nsIntPoint& aDestTopLeft)
+    {
+        FastMovePixels(aSourceRect, aDestTopLeft);
+    }
+
     virtual ~gfxD2DSurface();
 
     void Present();
diff --git a/gfx/thebes/gfxQuartzSurface.h b/gfx/thebes/gfxQuartzSurface.h
index ed81c7a85698..d5075bf0e9cd 100644
--- a/gfx/thebes/gfxQuartzSurface.h
+++ b/gfx/thebes/gfxQuartzSurface.h
@@ -68,6 +68,12 @@ public:
 
     already_AddRefed<gfxImageSurface> GetAsImageSurface();
 
+    void MovePixels(const nsIntRect& aSourceRect,
+                    const nsIntPoint& aDestTopLeft)
+    {
+        FastMovePixels(aSourceRect, aDestTopLeft);
+    }
+
 protected:
     CGContextRef mCGContext;
     gfxSize      mSize;
diff --git a/gfx/thebes/gfxWindowsSurface.h b/gfx/thebes/gfxWindowsSurface.h
index 95fbfd3e16fe..59171daa4491 100644
--- a/gfx/thebes/gfxWindowsSurface.h
+++ b/gfx/thebes/gfxWindowsSurface.h
@@ -92,6 +92,12 @@ public:
 
     virtual PRInt32 GetDefaultContextFlags() const;
 
+    void MovePixels(const nsIntRect& aSourceRect,
+                    const nsIntPoint& aDestTopLeft)
+    {
+        FastMovePixels(aSourceRect, aDestTopLeft);
+    }
+
 private:
     PRPackedBool mOwnsDC;
     PRPackedBool mForPrinting;

From 2abdc868d1d38d1a7dcde021e133afb5499e1252 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 8 May 2011 13:19:17 +1200
Subject: [PATCH 009/314] Bug 651469 - Add backwards scrolling reftest to catch
 self-copy bugs. r=roc

---
 .../reftests/scrolling/fixed-opacity-2.html   | 42 +++++++++++++++++++
 layout/reftests/scrolling/reftest.list        |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 layout/reftests/scrolling/fixed-opacity-2.html

diff --git a/layout/reftests/scrolling/fixed-opacity-2.html b/layout/reftests/scrolling/fixed-opacity-2.html
new file mode 100644
index 000000000000..91a95cbc9944
--- /dev/null
+++ b/layout/reftests/scrolling/fixed-opacity-2.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<html>
+<body style="height:2000px; margin:0;">
+<div style="height:1000px; background:url(repeatable-diagonal-gradient.png) fixed repeat-x; opacity:0.5"></div>
+<script type="application/javascript">
+var topElements = document.getElementsByClassName("scrollTop");
+if (!topElements.length) {
+  topElements = [document.documentElement];
+}
+
+var failed = false;
+
+function doScroll(d)
+{
+  if (failed)
+    return;
+  for (var i = 0; i < topElements.length; ++i) {
+    var e = topElements[i];
+    e.scrollTop = d;
+    if (e.scrollTop != d) {
+      document.documentElement.textContent =
+          "Scrolling failed on " + e.tagName + " element, " +
+          "tried to scroll to " + d + ", got " + e.scrollTop +
+          " (Random number: " + Math.random() + ")";
+      failed = true;
+    }
+  }
+}
+
+if (document.location.search == '?ref') {
+  doScroll(700);
+} else {
+  doScroll(800);
+  document.documentElement.setAttribute("class", "reftest-wait");
+  window.addEventListener("MozReftestInvalidate", function() {
+    document.documentElement.removeAttribute("class");
+    doScroll(700);
+  }, false);
+}
+</script>
+</body>
+</html>
diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list
index 3c649ec9292c..720bfc151e5c 100644
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,5 +1,6 @@
 HTTP == fixed-1.html fixed-1.html?ref
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
+HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
 HTTP == fixed-text-1.html fixed-text-1.html?ref
 HTTP == fixed-text-2.html fixed-text-2.html?ref
 HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref

From a0703b2a12887a20d26592e955a46521ea77510a Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Sun, 8 May 2011 14:01:20 +1200
Subject: [PATCH 010/314] Remove spaces from reftest manifest file. r=orange

---
 modules/plugin/test/reftest/reftest.list | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/plugin/test/reftest/reftest.list b/modules/plugin/test/reftest/reftest.list
index dffb2e93590f..ea462f3245bc 100644
--- a/modules/plugin/test/reftest/reftest.list
+++ b/modules/plugin/test/reftest/reftest.list
@@ -18,4 +18,4 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) =
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-5-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-10-step.html plugin-background-ref.html
 random-if(!haveTestPlugin) == plugin-transform-1.html plugin-transform-1-ref.html
-fails-if(!haveTestPlugin) fails-if(http.platform=="X11" && !layersGPUAccelerated) == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496
+fails-if(!haveTestPlugin) fails-if(http.platform=="X11"&&!layersGPUAccelerated) == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496

From 0c662cc62d27edd963ef90c3fdf7b119fd9851da Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Sun, 8 May 2011 18:24:09 +1200
Subject: [PATCH 011/314] Bug 650994 - Decode ogg packets lazily, timestamp
 them at demux time. r=doublec

---
 .../base/test/file_mozfiledataurl_inner.html  |   2 +-
 content/base/test/test_mozfiledataurl.html    |   8 +-
 .../media/nsBuiltinDecoderStateMachine.cpp    |  21 +-
 content/media/ogg/nsOggCodecState.cpp         | 430 +++++++++++-
 content/media/ogg/nsOggCodecState.h           | 216 ++++--
 content/media/ogg/nsOggReader.cpp             | 633 +++++-------------
 content/media/ogg/nsOggReader.h               |  54 +-
 content/media/raw/nsRawReader.cpp             |   1 -
 8 files changed, 778 insertions(+), 587 deletions(-)

diff --git a/content/base/test/file_mozfiledataurl_inner.html b/content/base/test/file_mozfiledataurl_inner.html
index 83df19efb80e..1b8104a1496e 100644
--- a/content/base/test/file_mozfiledataurl_inner.html
+++ b/content/base/test/file_mozfiledataurl_inner.html
@@ -62,7 +62,7 @@ onload = function() {
   iframe = document.getElementById('iframe');
   iframe.onerror = iframe.onload = iframeNotifyParent;
   audio = document.getElementById('audio');
-  audio.onerror = audio.oncanplay = audioNotifyParent;
+  audio.onerror = audio.onloadeddata = audioNotifyParent;
 }
 
 </script>
diff --git a/content/base/test/test_mozfiledataurl.html b/content/base/test/test_mozfiledataurl.html
index c32cf3547157..b9383f9db9de 100644
--- a/content/base/test/test_mozfiledataurl.html
+++ b/content/base/test/test_mozfiledataurl.html
@@ -12,7 +12,7 @@
 <iframe id=inner></iframe>
 <iframe id=iframe></iframe>
 <img id=img onload="gen.send(event);">
-<audio id=audio oncanplay="gen.send(event);">
+<audio id=audio onloadeddata="gen.send(event);">
 <input type=file id=fileList>
 </p>
 <div id="content" style="display: none">
@@ -90,11 +90,11 @@ function runTest() {
   var fileurl = URL.createObjectURL(file);
   audio.src = fileurl;
   var e = (yield);
-  is(e.type, "canplay", "loaded successfully");
+  is(e.type, "loadeddata", "loaded successfully");
 
   // Revoke url and attempt to load a audio in this document
   audio.src = "file_mozfiledataurl_audio.ogg";
-  is((yield).type, "canplay", "successfully reset audio");
+  is((yield).type, "loadeddata", "successfully reset audio");
   URL.revokeObjectURL(fileurl);
   todo(false, "urls need to act like 404s, not fail to parse");
 /*  img.src = fileurl;
@@ -113,7 +113,7 @@ function runTest() {
   yield;
   inner.contentWindow.postMessage(JSON.stringify({audio:fileurl}), "*");
   var res = (yield);
-  is(res.type, "canplay", "loaded successfully");
+  is(res.type, "loadeddata", "loaded successfully");
   
   // Attempt to load an audio in a different cross-origin document
   inner.src = innerCrossSiteURI;
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index b7f280ecd13d..cdf4ff75bbfd 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -310,7 +310,7 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
 
     {
       skipToNextKeyframe = PR_TRUE;
-      LOG(PR_LOG_DEBUG, ("Skipping video decode to the next keyframe"));
+      LOG(PR_LOG_DEBUG, ("%p Skipping video decode to the next keyframe", mDecoder));
     }
 
     // Video decode.
@@ -390,7 +390,7 @@ void nsBuiltinDecoderStateMachine::DecodeLoop()
     mDecoder->GetReentrantMonitor().NotifyAll();
   }
 
-  LOG(PR_LOG_DEBUG, ("Shutting down DecodeLoop this=%p", this));
+  LOG(PR_LOG_DEBUG, ("%p Shutting down DecodeLoop this=%p", mDecoder, this));
 }
 
 PRBool nsBuiltinDecoderStateMachine::IsPlaying()
@@ -403,7 +403,7 @@ PRBool nsBuiltinDecoderStateMachine::IsPlaying()
 void nsBuiltinDecoderStateMachine::AudioLoop()
 {
   NS_ASSERTION(OnAudioThread(), "Should be on audio thread.");
-  LOG(PR_LOG_DEBUG, ("Begun audio thread/loop"));
+  LOG(PR_LOG_DEBUG, ("%p Begun audio thread/loop", mDecoder));
   PRInt64 audioDuration = 0;
   PRInt64 audioStartTime = -1;
   PRUint32 channels, rate;
@@ -586,7 +586,7 @@ void nsBuiltinDecoderStateMachine::AudioLoop()
     // for this to finish.
     mDecoder->GetReentrantMonitor().NotifyAll();
   }
-  LOG(PR_LOG_DEBUG, ("Audio stream finished playing, audio thread exit"));
+  LOG(PR_LOG_DEBUG, ("%p Audio stream finished playing, audio thread exit", mDecoder));
 }
 
 PRUint32 nsBuiltinDecoderStateMachine::PlaySilence(PRUint32 aSamples,
@@ -1212,7 +1212,7 @@ nsresult nsBuiltinDecoderStateMachine::Run()
           continue;
 
         // Try to decode another frame to detect if we're at the end...
-        LOG(PR_LOG_DEBUG, ("Seek completed, mCurrentFrameTime=%lld\n", mCurrentFrameTime));
+        LOG(PR_LOG_DEBUG, ("%p Seek completed, mCurrentFrameTime=%lld\n", mDecoder, mCurrentFrameTime));
 
         // Change state to DECODING or COMPLETED now. SeekingStopped will
         // call nsBuiltinDecoderStateMachine::Seek to reset our state to SEEKING
@@ -1321,7 +1321,7 @@ nsresult nsBuiltinDecoderStateMachine::Run()
         if (mState != DECODER_STATE_COMPLETED)
           continue;
 
-        LOG(PR_LOG_DEBUG, ("Shutting down the state machine thread"));
+        LOG(PR_LOG_DEBUG, ("%p Shutting down the state machine thread", mDecoder));
         StopDecodeThreads();
 
         if (mDecoder->GetState() == nsBuiltinDecoder::PLAY_STATE_PLAYING) {
@@ -1631,7 +1631,7 @@ void nsBuiltinDecoderStateMachine::LoadMetadata()
                "Should be on state machine thread.");
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
 
-  LOG(PR_LOG_DEBUG, ("Loading Media Headers"));
+  LOG(PR_LOG_DEBUG, ("%p Loading Media Headers", mDecoder));
   nsresult res;
   nsVideoInfo info;
   {
@@ -1682,10 +1682,11 @@ void nsBuiltinDecoderStateMachine::StartBuffering()
   // the element we're buffering or not.
   UpdateReadyState();
   mState = DECODER_STATE_BUFFERING;
-  LOG(PR_LOG_DEBUG, ("Changed state from DECODING to BUFFERING, decoded for %.3lfs",
-                     decodeDuration.ToSeconds()));
+  LOG(PR_LOG_DEBUG, ("%p Changed state from DECODING to BUFFERING, decoded for %.3lfs",
+                     mDecoder, decodeDuration.ToSeconds()));
   nsMediaDecoder::Statistics stats = mDecoder->GetStatistics();
-  LOG(PR_LOG_DEBUG, ("Playback rate: %.1lfKB/s%s download rate: %.1lfKB/s%s",
+  LOG(PR_LOG_DEBUG, ("%p Playback rate: %.1lfKB/s%s download rate: %.1lfKB/s%s",
+    mDecoder,
     stats.mPlaybackRate/1024, stats.mPlaybackRateReliable ? "" : " (unreliable)",
     stats.mDownloadRate/1024, stats.mDownloadRateReliable ? "" : " (unreliable)"));
 }
diff --git a/content/media/ogg/nsOggCodecState.cpp b/content/media/ogg/nsOggCodecState.cpp
index ef62b915ab0d..80d83a5964d2 100644
--- a/content/media/ogg/nsOggCodecState.cpp
+++ b/content/media/ogg/nsOggCodecState.cpp
@@ -54,6 +54,7 @@ extern PRLogModuleInfo* gBuiltinDecoderLog;
 nsOggCodecState*
 nsOggCodecState::Create(ogg_page* aPage)
 {
+  NS_ASSERTION(ogg_page_bos(aPage), "Only call on BOS page!");
   nsAutoPtr<nsOggCodecState> codecState;
   if (aPage->body_len > 6 && memcmp(aPage->body+1, "theora", 6) == 0) {
     codecState = new nsTheoraState(aPage);
@@ -62,16 +63,16 @@ nsOggCodecState::Create(ogg_page* aPage)
   } else if (aPage->body_len > 8 && memcmp(aPage->body, "fishead\0", 8) == 0) {
     codecState = new nsSkeletonState(aPage);
   } else {
-    codecState = new nsOggCodecState(aPage);
+    codecState = new nsOggCodecState(aPage, PR_FALSE);
   }
   return codecState->nsOggCodecState::Init() ? codecState.forget() : nsnull;
 }
 
-nsOggCodecState::nsOggCodecState(ogg_page* aBosPage) :
+nsOggCodecState::nsOggCodecState(ogg_page* aBosPage, PRBool aActive) :
   mPacketCount(0),
   mSerial(ogg_page_serialno(aBosPage)),
-  mActive(PR_FALSE),
-  mDoneReadingHeaders(PR_FALSE)
+  mActive(aActive),
+  mDoneReadingHeaders(!aActive)
 {
   MOZ_COUNT_CTOR(nsOggCodecState);
   memset(&mState, 0, sizeof(ogg_stream_state));
@@ -79,10 +80,11 @@ nsOggCodecState::nsOggCodecState(ogg_page* aBosPage) :
 
 nsOggCodecState::~nsOggCodecState() {
   MOZ_COUNT_DTOR(nsOggCodecState);
+  Reset();
 #ifdef DEBUG
   int ret =
 #endif
-    ogg_stream_clear(&mState);
+  ogg_stream_clear(&mState);
   NS_ASSERTION(ret == 0, "ogg_stream_clear failed");
 }
 
@@ -90,40 +92,129 @@ nsresult nsOggCodecState::Reset() {
   if (ogg_stream_reset(&mState) != 0) {
     return NS_ERROR_FAILURE;
   }
-  mBuffer.Erase();
+  mPackets.Erase();
+  ClearUnstamped();
   return NS_OK;
 }
 
+void nsOggCodecState::ClearUnstamped()
+{
+  for (PRUint32 i = 0; i < mUnstamped.Length(); ++i) {
+    nsOggCodecState::ReleasePacket(mUnstamped[i]);
+  }
+  mUnstamped.Clear();
+}
+
 PRBool nsOggCodecState::Init() {
   int ret = ogg_stream_init(&mState, mSerial);
   return ret == 0;
 }
 
-void nsPageQueue::Append(ogg_page* aPage) {
-  ogg_page* p = new ogg_page();
-  p->header_len = aPage->header_len;
-  p->body_len = aPage->body_len;
-  p->header = new unsigned char[p->header_len + p->body_len];
-  p->body = p->header + p->header_len;
-  memcpy(p->header, aPage->header, p->header_len);
-  memcpy(p->body, aPage->body, p->body_len);
-  nsDeque::Push(p);
+void nsVorbisState::RecordVorbisPacketSamples(ogg_packet* aPacket,
+                                              long aSamples)
+{
+#ifdef VALIDATE_VORBIS_SAMPLE_CALCULATION
+  mVorbisPacketSamples[aPacket] = aSamples;
+#endif
 }
 
-PRBool nsOggCodecState::PageInFromBuffer() {
-  if (mBuffer.IsEmpty())
-    return PR_FALSE;
-  ogg_page *p = mBuffer.PeekFront();
-  int ret = ogg_stream_pagein(&mState, p);
-  NS_ENSURE_TRUE(ret == 0, PR_FALSE);
-  mBuffer.PopFront();
-  delete [] p->header;
-  delete p;
-  return PR_TRUE;
+void nsVorbisState::ValidateVorbisPacketSamples(ogg_packet* aPacket,
+                                                long aSamples)
+{
+#ifdef VALIDATE_VORBIS_SAMPLE_CALCULATION
+  NS_ASSERTION(mVorbisPacketSamples[aPacket] == aSamples,
+    "Decoded samples for Vorbis packet don't match expected!");
+  mVorbisPacketSamples.erase(aPacket);
+#endif
+}
+
+void nsVorbisState::AssertHasRecordedPacketSamples(ogg_packet* aPacket)
+{
+#ifdef VALIDATE_VORBIS_SAMPLE_CALCULATION
+  NS_ASSERTION(mVorbisPacketSamples.count(aPacket) == 1,
+    "Must have recorded packet samples");
+#endif
+}
+
+static ogg_packet* Clone(ogg_packet* aPacket) {
+  ogg_packet* p = new ogg_packet();
+  memcpy(p, aPacket, sizeof(ogg_packet));
+  p->packet = new unsigned char[p->bytes];
+  memcpy(p->packet, aPacket->packet, p->bytes);
+  return p;
+}
+
+void nsOggCodecState::ReleasePacket(ogg_packet* aPacket) {
+  if (aPacket)
+    delete [] aPacket->packet;
+  delete aPacket;
+}
+
+void nsPacketQueue::Append(ogg_packet* aPacket) {
+  nsDeque::Push(aPacket);
+}
+
+ogg_packet* nsOggCodecState::PacketOut() {
+  if (mPackets.IsEmpty()) {
+    return nsnull;
+  }
+  return mPackets.PopFront();
+}
+
+nsresult nsOggCodecState::PageIn(ogg_page* aPage) {
+  if (!mActive)
+    return NS_OK;
+  NS_ASSERTION(ogg_page_serialno(aPage) == mSerial, "Page must be for this stream!");
+  if (ogg_stream_pagein(&mState, aPage) == -1)
+    return NS_ERROR_FAILURE;
+  int r;
+  do {
+    ogg_packet packet;
+    r = ogg_stream_packetout(&mState, &packet);
+    if (r == 1) {
+      mPackets.Append(Clone(&packet));
+    }
+  } while (r != 0);
+  if (ogg_stream_check(&mState)) {
+    NS_WARNING("Unrecoverable error in ogg_stream_packetout");
+    return NS_ERROR_FAILURE;
+  }
+  return NS_OK;
+}
+
+PRBool
+nsOggCodecState::PacketOutUntilGranulepos()
+{
+  int r;
+  PRBool foundGp = PR_FALSE;
+  // Extract packets from the sync state until either no more packets
+  // come out, or we get a data packet with non -1 granulepos.
+  do {
+    ogg_packet packet;
+    r = ogg_stream_packetout(&mState, &packet);
+    if (r == 1) {
+      ogg_packet* clone = Clone(&packet);
+      if (IsHeader(&packet)) {
+        // Header packets go straight into the packet queue.
+        mPackets.Append(clone);
+      } else {
+        // We buffer data packets until we encounter a granulepos. We'll
+        // then use the granulepos to figure out the granulepos of the
+        // preceeding packets.
+        mUnstamped.AppendElement(clone);
+        foundGp = packet.granulepos != -1;
+      }
+    }
+  } while (r != 0 && !foundGp);
+  if (ogg_stream_check(&mState)) {
+    NS_WARNING("Unrecoverable error in ogg_stream_packetout");
+    return NS_ERROR_FAILURE;
+  }
+  return foundGp;
 }
 
 nsTheoraState::nsTheoraState(ogg_page* aBosPage) :
-  nsOggCodecState(aBosPage),
+  nsOggCodecState(aBosPage, PR_TRUE),
   mSetup(0),
   mCtx(0),
   mPixelAspectRatio(0)
@@ -211,6 +302,11 @@ nsTheoraState::Time(PRInt64 granulepos) {
   return nsTheoraState::Time(&mInfo, granulepos);
 }
 
+PRBool
+nsTheoraState::IsHeader(ogg_packet* aPacket) {
+  return th_packet_isheader(aPacket);
+}
+
 # define TH_VERSION_CHECK(_info,_maj,_min,_sub) \
  ((_info)->version_major>(_maj)||(_info)->version_major==(_maj)&& \
  ((_info)->version_minor>(_min)||(_info)->version_minor==(_min)&& \
@@ -272,6 +368,127 @@ nsTheoraState::MaxKeyframeOffset()
   return frameDuration * keyframeDiff;
 }
 
+nsresult
+nsTheoraState::PageIn(ogg_page* aPage)
+{
+  if (!mActive)
+    return NS_OK;
+  NS_ASSERTION(static_cast<PRUint32>(ogg_page_serialno(aPage)) == mSerial,
+               "Page must be for this stream!");
+  if (ogg_stream_pagein(&mState, aPage) == -1)
+    return NS_ERROR_FAILURE;
+  PRBool foundGp = PacketOutUntilGranulepos();
+  if (foundGp && mDoneReadingHeaders) {
+    // We've found a packet with a granulepos, and we've loaded our metadata
+    // and initialized our decoder. Determine granulepos of buffered packets.
+    ReconstructTheoraGranulepos();
+    for (PRUint32 i = 0; i < mUnstamped.Length(); ++i) {
+      ogg_packet* packet = mUnstamped[i];
+#ifdef DEBUG
+      NS_ASSERTION(!IsHeader(packet), "Don't try to recover header packet gp");
+      NS_ASSERTION(packet->granulepos != -1, "Packet must have gp by now");
+#endif
+      mPackets.Append(packet);
+    }
+    mUnstamped.Clear();
+  }
+  return NS_OK;
+}
+
+// Returns 1 if the Theora info struct is decoding a media of Theora
+// verion (maj,min,sub) or later, otherwise returns 0.
+int
+TheoraVersion(th_info* info,
+              unsigned char maj,
+              unsigned char min,
+              unsigned char sub)
+{
+  ogg_uint32_t ver = (maj << 16) + (min << 8) + sub;
+  ogg_uint32_t th_ver = (info->version_major << 16) +
+                        (info->version_minor << 8) +
+                        info->version_subminor;
+  return (th_ver >= ver) ? 1 : 0;
+}
+
+void nsTheoraState::ReconstructTheoraGranulepos()
+{
+  if (mUnstamped.Length() == 0) {
+    return;
+  }
+  ogg_int64_t lastGranulepos = mUnstamped[mUnstamped.Length() - 1]->granulepos;
+  NS_ASSERTION(lastGranulepos != -1, "Must know last granulepos");
+
+  // Reconstruct the granulepos (and thus timestamps) of the decoded
+  // frames. Granulepos are stored as ((keyframe<<shift)+offset). We
+  // know the granulepos of the last frame in the list, so we can infer
+  // the granulepos of the intermediate frames using their frame numbers.
+  ogg_int64_t shift = mInfo.keyframe_granule_shift;
+  ogg_int64_t version_3_2_1 = TheoraVersion(&mInfo,3,2,1);
+  ogg_int64_t lastFrame = th_granule_frame(mCtx,
+                                           lastGranulepos) + version_3_2_1;
+  ogg_int64_t firstFrame = lastFrame - mUnstamped.Length() + 1;
+
+  // Until we encounter a keyframe, we'll assume that the "keyframe"
+  // segment of the granulepos is the first frame, or if that causes
+  // the "offset" segment to overflow, we assume the required
+  // keyframe is maximumally offset. Until we encounter a keyframe
+  // the granulepos will probably be wrong, but we can't decode the
+  // frame anyway (since we don't have its keyframe) so it doesn't really
+  // matter.
+  ogg_int64_t keyframe = lastGranulepos >> shift;
+
+  // The lastFrame, firstFrame, keyframe variables, as well as the frame
+  // variable in the loop below, store the frame number for Theora
+  // version >= 3.2.1 streams, and store the frame index for Theora
+  // version < 3.2.1 streams.
+  for (PRUint32 i = 0; i < mUnstamped.Length() - 1; ++i) {
+    ogg_int64_t frame = firstFrame + i;
+    ogg_int64_t granulepos;
+    ogg_packet* packet = mUnstamped[i];
+    PRBool isKeyframe = th_packet_iskeyframe(packet) == 1;
+
+    if (isKeyframe) {
+      granulepos = frame << shift;
+      keyframe = frame;
+    } else if (frame >= keyframe &&
+                frame - keyframe < ((ogg_int64_t)1 << shift))
+    {
+      // (frame - keyframe) won't overflow the "offset" segment of the
+      // granulepos, so it's safe to calculate the granulepos.
+      granulepos = (keyframe << shift) + (frame - keyframe);
+    } else {
+      // (frame - keyframeno) will overflow the "offset" segment of the
+      // granulepos, so we take "keyframe" to be the max possible offset
+      // frame instead.
+      ogg_int64_t k = NS_MAX(frame - (((ogg_int64_t)1 << shift) - 1), version_3_2_1);
+      granulepos = (k << shift) + (frame - k);
+    }
+    // Theora 3.2.1+ granulepos store frame number [1..N], so granulepos
+    // should be > 0.
+    // Theora 3.2.0 granulepos store the frame index [0..(N-1)], so
+    // granulepos should be >= 0. 
+    NS_ASSERTION(granulepos >= version_3_2_1,
+                  "Invalid granulepos for Theora version");
+
+    // Check that the frame's granule number is one more than the
+    // previous frame's.
+    NS_ASSERTION(i == 0 ||
+                 th_granule_frame(mCtx, granulepos) ==
+                 th_granule_frame(mCtx, mUnstamped[i-1]->granulepos) + 1,
+                 "Granulepos calculation is incorrect!");
+
+    packet->granulepos = granulepos;
+  }
+
+  // Check that the second to last frame's granule number is one less than
+  // the last frame's (the known granule number). If not our granulepos
+  // recovery missed a beat.
+  NS_ASSERTION(mUnstamped.Length() < 2 ||
+    th_granule_frame(mCtx, mUnstamped[mUnstamped.Length()-2]->granulepos) + 1 ==
+    th_granule_frame(mCtx, lastGranulepos),
+    "Granulepos recovery should catch up with packet->granulepos!");
+}
+
 nsresult nsVorbisState::Reset()
 {
   nsresult res = NS_OK;
@@ -281,11 +498,17 @@ nsresult nsVorbisState::Reset()
   if (NS_FAILED(nsOggCodecState::Reset())) {
     return NS_ERROR_FAILURE;
   }
+
+  mGranulepos = 0;
+  mPrevVorbisBlockSize = 0;
+
   return res;
 }
 
 nsVorbisState::nsVorbisState(ogg_page* aBosPage) :
-  nsOggCodecState(aBosPage)
+  nsOggCodecState(aBosPage, PR_TRUE),
+  mPrevVorbisBlockSize(0),
+  mGranulepos(0)
 {
   MOZ_COUNT_CTOR(nsVorbisState);
   vorbis_info_init(&mInfo);
@@ -296,6 +519,7 @@ nsVorbisState::nsVorbisState(ogg_page* aBosPage) :
 
 nsVorbisState::~nsVorbisState() {
   MOZ_COUNT_DTOR(nsVorbisState);
+  Reset();
   vorbis_block_clear(&mBlock);
   vorbis_dsp_clear(&mDsp);
   vorbis_info_clear(&mInfo);
@@ -327,12 +551,13 @@ PRBool nsVorbisState::DecodeHeader(ogg_packet* aPacket) {
 
   if (ret < 0 || mPacketCount > 3) {
     // We've received an error, or the first three packets weren't valid
-    // header packets, assume bad input, and don't activate the bitstream.
+    // header packets, assume bad input, and deactivate the bitstream.
     mDoneReadingHeaders = PR_TRUE;
+    mActive = PR_FALSE;
   } else if (ret == 0 && isSetupHeader && mPacketCount == 3) {
-    // Successfully read the three header packets, activate the bitstream.
+    // Successfully read the three header packets.
+    // The bitstream remains active.
     mDoneReadingHeaders = PR_TRUE;
-    mActive = PR_TRUE;
   }
   return mDoneReadingHeaders;
 }
@@ -377,8 +602,151 @@ PRInt64 nsVorbisState::Time(vorbis_info* aInfo, PRInt64 aGranulepos)
   return t / aInfo->rate;
 }
 
+PRBool
+nsVorbisState::IsHeader(ogg_packet* aPacket)
+{
+  // The first byte in each Vorbis header packet is either 0x01, 0x03, or 0x05,
+  // i.e. the first bit is odd. Audio data packets have their first bit as 0x0.
+  // Any packet with its first bit set cannot be a data packet, it's a
+  // (possibly invalid) header packet.
+  // See: http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-610004.2.1
+  return aPacket->bytes > 0 ? (aPacket->packet[0] & 0x1) : PR_FALSE;
+}
+
+nsresult
+nsVorbisState::PageIn(ogg_page* aPage)
+{
+  if (!mActive)
+    return NS_OK;
+  NS_ASSERTION(static_cast<PRUint32>(ogg_page_serialno(aPage)) == mSerial,
+               "Page must be for this stream!");
+  if (ogg_stream_pagein(&mState, aPage) == -1)
+    return NS_ERROR_FAILURE;
+  PRBool foundGp = PacketOutUntilGranulepos();
+  if (foundGp && mDoneReadingHeaders) {
+    // We've found a packet with a granulepos, and we've loaded our metadata
+    // and initialized our decoder. Determine granulepos of buffered packets.
+    ReconstructVorbisGranulepos();
+    for (PRUint32 i = 0; i < mUnstamped.Length(); ++i) {
+      ogg_packet* packet = mUnstamped[i];
+      AssertHasRecordedPacketSamples(packet);
+      NS_ASSERTION(!IsHeader(packet), "Don't try to recover header packet gp");
+      NS_ASSERTION(packet->granulepos != -1, "Packet must have gp by now");
+      mPackets.Append(packet);
+    }
+    mUnstamped.Clear();
+  }
+  return NS_OK;
+}
+
+nsresult nsVorbisState::ReconstructVorbisGranulepos()
+{
+  // The number of samples in a Vorbis packet is:
+  // window_blocksize(previous_packet)/4+window_blocksize(current_packet)/4
+  // See: http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-230001.3.2
+  // So we maintain mPrevVorbisBlockSize, the block size of the last packet
+  // encountered. We also maintain mGranulepos, which is the granulepos of
+  // the last encountered packet. This enables us to give granulepos to
+  // packets when the last packet in mUnstamped doesn't have a granulepos
+  // (for example if the stream was truncated).
+  //
+  // We validate our prediction of the number of samples decoded when
+  // VALIDATE_VORBIS_SAMPLE_CALCULATION is defined by recording the predicted
+  // number of samples, and verifing we extract that many when decoding
+  // each packet.
+
+  NS_ASSERTION(mUnstamped.Length() > 0, "Length must be > 0");
+  ogg_packet* last = mUnstamped[mUnstamped.Length()-1];
+  NS_ASSERTION(last->e_o_s || last->granulepos >= 0,
+    "Must know last granulepos!");
+  if (mUnstamped.Length() == 1) {
+    ogg_packet* packet = mUnstamped[0];
+    long blockSize = vorbis_packet_blocksize(&mInfo, packet);
+    if (blockSize < 0) {
+      // On failure vorbis_packet_blocksize returns < 0. If we've got
+      // a bad packet, we just assume that decode will have to skip this
+      // packet, i.e. assume 0 samples are decodable from this packet.
+      blockSize = 0;
+      mPrevVorbisBlockSize = 0;
+    }
+    long samples = mPrevVorbisBlockSize / 4 + blockSize / 4;
+    mPrevVorbisBlockSize = blockSize;
+    if (packet->granulepos == -1) {
+      packet->granulepos = mGranulepos + samples;
+    }
+    mGranulepos = packet->granulepos;
+    RecordVorbisPacketSamples(packet, samples);
+    return NS_OK;
+  }
+
+  PRBool unknownGranulepos = last->granulepos == -1;
+  int totalSamples = 0;
+  for (PRInt32 i = mUnstamped.Length() - 1; i > 0; i--) {
+    ogg_packet* packet = mUnstamped[i];
+    ogg_packet* prev = mUnstamped[i-1];
+    ogg_int64_t granulepos = packet->granulepos;
+    NS_ASSERTION(granulepos != -1, "Must know granulepos!");
+    long prevBlockSize = vorbis_packet_blocksize(&mInfo, prev);
+    long blockSize = vorbis_packet_blocksize(&mInfo, packet);
+
+    if (blockSize < 0 || prevBlockSize < 0) {
+      // On failure vorbis_packet_blocksize returns < 0. If we've got
+      // a bad packet, we just assume that decode will have to skip this
+      // packet, i.e. assume 0 samples are decodable from this packet.
+      blockSize = 0;
+      prevBlockSize = 0;
+    }
+
+    long samples = prevBlockSize / 4 + blockSize / 4;
+    totalSamples += samples;
+    prev->granulepos = granulepos - samples;
+    RecordVorbisPacketSamples(packet, samples);
+  }
+
+  if (unknownGranulepos) {
+    for (PRUint32 i = 0; i < mUnstamped.Length(); i++) {
+      ogg_packet* packet = mUnstamped[i];
+      packet->granulepos += mGranulepos + totalSamples + 1;
+    }
+  }
+
+  ogg_packet* first = mUnstamped[0];
+  long blockSize = vorbis_packet_blocksize(&mInfo, first);
+  if (blockSize < 0) {
+    mPrevVorbisBlockSize = 0;
+    blockSize = 0;
+  }
+
+  long samples = (mPrevVorbisBlockSize == 0) ? 0 :
+                  mPrevVorbisBlockSize / 4 + blockSize / 4;
+  PRInt64 start = first->granulepos - samples;
+  RecordVorbisPacketSamples(first, samples);
+
+  if (last->e_o_s && start < mGranulepos) {
+    // We've calculated that there are more samples in this page than its
+    // granulepos claims, and it's the last page in the stream. This is legal,
+    // and we will need to prune the trailing samples when we come to decode it.
+    // We must correct the timestamps so that they follow the last Vorbis page's
+    // samples.
+    PRInt64 pruned = mGranulepos - start;
+    for (PRUint32 i = 0; i < mUnstamped.Length() - 1; i++) {
+      mUnstamped[i]->granulepos += pruned;
+    }
+#ifdef VALIDATE_VORBIS_SAMPLE_CALCULATION
+    mVorbisPacketSamples[last] -= pruned;
+#endif
+  }
+
+  mPrevVorbisBlockSize = vorbis_packet_blocksize(&mInfo, last);
+  mPrevVorbisBlockSize = NS_MAX(static_cast<long>(0), mPrevVorbisBlockSize);
+  mGranulepos = last->granulepos;
+
+  return NS_OK;
+}
+
+
 nsSkeletonState::nsSkeletonState(ogg_page* aBosPage)
-  : nsOggCodecState(aBosPage),
+  : nsOggCodecState(aBosPage, PR_TRUE),
     mVersion(0),
     mPresentationTime(0),
     mLength(0)
diff --git a/content/media/ogg/nsOggCodecState.h b/content/media/ogg/nsOggCodecState.h
index 20121cec57da..a31bb3dda1ba 100644
--- a/content/media/ogg/nsOggCodecState.h
+++ b/content/media/ogg/nsOggCodecState.h
@@ -51,37 +51,50 @@
 #include <nsClassHashtable.h>
 #include "VideoUtils.h"
 
-class OggPageDeallocator : public nsDequeFunctor {
-  virtual void* operator() (void* aPage) {
-    ogg_page* p = static_cast<ogg_page*>(aPage);
-    delete [] p->header;
+// Uncomment the following to validate that we're predicting the number
+// of Vorbis samples in each packet correctly.
+#define VALIDATE_VORBIS_SAMPLE_CALCULATION
+#ifdef  VALIDATE_VORBIS_SAMPLE_CALCULATION
+#include <map>
+#endif
+
+// Deallocates a packet, used in nsPacketQueue below.
+class OggPacketDeallocator : public nsDequeFunctor {
+  virtual void* operator() (void* aPacket) {
+    ogg_packet* p = static_cast<ogg_packet*>(aPacket);
+    delete [] p->packet;
     delete p;
     return nsnull;
   }
 };
 
-// A queue of ogg_pages. When we read a page, and it's not from the bitstream
-// which we're looking for a page for, we buffer the page in the nsOggCodecState,
-// rather than pushing it immediately into the ogg_stream_state object. This
-// is because if we're skipping up to the next keyframe in very large frame
-// sized videos, there may be several megabytes of data between keyframes,
-// and the ogg_stream_state would end up resizing its buffer every time we
-// added a new 4K page to the bitstream, which kills performance on Windows.
-class nsPageQueue : private nsDeque {
+// A queue of ogg_packets. When we read a page, we extract the page's packets
+// and buffer them in the owning stream's nsOggCodecState. This is because
+// if we're skipping up to the next keyframe in very large frame sized videos,
+// there may be several megabytes of data between keyframes, and the
+// ogg_stream_state would end up resizing its buffer every time we added a
+// new 4KB page to the bitstream, which kills performance on Windows. This
+// also gives us the option to timestamp packets rather than decoded
+// frames/samples, reducing the amount of frames/samples we must decode to
+// determine start-time at a particular offset, and gives us finer control
+// over memory usage.
+class nsPacketQueue : private nsDeque {
 public:
-  nsPageQueue() : nsDeque(new OggPageDeallocator()) {}
-  ~nsPageQueue() { Erase(); }
+  nsPacketQueue() : nsDeque(new OggPacketDeallocator()) {}
+  ~nsPacketQueue() { Erase(); }
   PRBool IsEmpty() { return nsDeque::GetSize() == 0; }
-  void Append(ogg_page* aPage);
-  ogg_page* PopFront() { return static_cast<ogg_page*>(nsDeque::PopFront()); }
-  ogg_page* PeekFront() { return static_cast<ogg_page*>(nsDeque::PeekFront()); }
+  void Append(ogg_packet* aPacket);
+  ogg_packet* PopFront() { return static_cast<ogg_packet*>(nsDeque::PopFront()); }
+  ogg_packet* PeekFront() { return static_cast<ogg_packet*>(nsDeque::PeekFront()); }
+  void PushFront(ogg_packet* aPacket) { nsDeque::PushFront(aPacket); }
+  void PushBack(ogg_packet* aPacket) { nsDeque::PushFront(aPacket); }
   void Erase() { nsDeque::Erase(); }
 };
 
 // Encapsulates the data required for decoding an ogg bitstream and for
 // converting granulepos to timestamps.
 class nsOggCodecState {
- public:
+public:
   // Ogg types we know about
   enum CodecType {
     TYPE_VORBIS=0,
@@ -90,11 +103,10 @@ class nsOggCodecState {
     TYPE_UNKNOWN=3
   };
 
- public:
-  nsOggCodecState(ogg_page* aBosPage);
   virtual ~nsOggCodecState();
   
-  // Factory for creating nsCodecStates.
+  // Factory for creating nsCodecStates. Use instead of constructor.
+  // aPage should be a beginning-of-stream page.
   static nsOggCodecState* Create(ogg_page* aPage);
   
   virtual CodecType GetType() { return TYPE_UNKNOWN; }
@@ -119,19 +131,41 @@ class nsOggCodecState {
 
   // Deactivates the bitstream. Only the primary video and audio bitstreams
   // should be active.
-  void Deactivate() { mActive = PR_FALSE; }
+  void Deactivate() {
+    mActive = PR_FALSE;
+    mDoneReadingHeaders = PR_TRUE;
+    Reset();
+  }
 
   // Resets decoding state.
   virtual nsresult Reset();
 
-  // Clones a page and adds it to our buffer of pages which we'll insert to
-  // the bitstream at a later time (using PageInFromBuffer()). Memory stored in
-  // cloned pages is freed when Reset() or PageInFromBuffer() are called.
-  inline void AddToBuffer(ogg_page* aPage) { mBuffer.Append(aPage); }
+  // Returns PR_TRUE if the nsOggCodecState thinks this packet is a header
+  // packet. Note this does not verify the validity of the header packet,
+  // it just guarantees that the packet is marked as a header packet (i.e.
+  // it is definintely not a data packet). Do not use this to identify
+  // streams, use it to filter header packets from data packets while
+  // decoding.
+  virtual PRBool IsHeader(ogg_packet* aPacket) { return PR_FALSE; }
 
-  // Returns PR_TRUE if we had a buffered page and we successfully inserted it
-  // into the bitstream.
-  PRBool PageInFromBuffer();
+  // Returns the next packet in the stream, or nsnull if there are no more
+  // packets buffered in the packet queue. More packets can be buffered by
+  // inserting one or more pages into the stream by calling PageIn(). The
+  // caller is responsible for deleting returned packet's using
+  // nsOggCodecState::ReleasePacket(). The packet will have a valid granulepos.
+  ogg_packet* PacketOut();
+
+  // Releases the memory used by a cloned packet. Every packet returned by
+  // PacketOut() must be free'd using this function.
+  static void ReleasePacket(ogg_packet* aPacket);
+
+  // Extracts all packets from the page, and inserts them into the packet
+  // queue. They can be extracted by calling PacketOut(). Packets from an
+  // inactive stream are not buffered, i.e. this call has no effect for
+  // inactive streams. Multiple pages may need to be inserted before
+  // PacketOut() starts to return packets, as granulepos may need to be
+  // captured.
+  virtual nsresult PageIn(ogg_page* aPage);
 
   // Number of packets read.  
   PRUint64 mPacketCount;
@@ -142,14 +176,37 @@ class nsOggCodecState {
   // Ogg specific state.
   ogg_stream_state mState;
 
-  // Buffer of pages which we've not yet inserted into the ogg_stream_state.
-  nsPageQueue mBuffer;
+  // Queue of as yet undecoded packets. Packets are guaranteed to have
+  // a valid granulepos.
+  nsPacketQueue mPackets;
 
   // Is the bitstream active; whether we're decoding and playing this bitstream.
   PRPackedBool mActive;
   
   // PR_TRUE when all headers packets have been read.
   PRPackedBool mDoneReadingHeaders;
+
+protected:
+  // Constructs a new nsOggCodecState. aActive denotes whether the stream is
+  // active. For streams of unsupported or unknown types, aActive should be
+  // PR_FALSE.
+  nsOggCodecState(ogg_page* aBosPage, PRBool aActive);
+
+  // Deallocates all packets stored in mUnstamped, and clears the array.
+  void ClearUnstamped();
+
+  // Extracts packets out of mState until a data packet with a non -1
+  // granulepos is encountered, or no more packets are readable. Header
+  // packets are pushed into the packet queue immediately, and data packets
+  // are buffered in mUnstamped. Once a non -1 granulepos packet is read
+  // the granulepos of the packets in mUnstamped can be inferred, and they
+  // can be pushed over to mPackets. Used by PageIn() implementations in
+  // subclasses.
+  PRBool PacketOutUntilGranulepos();
+
+  // Temporary buffer in which to store packets while we're reading packets
+  // in order to capture granulepos.
+  nsTArray<ogg_packet*> mUnstamped;
 };
 
 class nsVorbisState : public nsOggCodecState {
@@ -157,31 +214,83 @@ public:
   nsVorbisState(ogg_page* aBosPage);
   virtual ~nsVorbisState();
 
-  virtual CodecType GetType() { return TYPE_VORBIS; }
-  virtual PRBool DecodeHeader(ogg_packet* aPacket);
-  virtual PRInt64 Time(PRInt64 granulepos);
-  virtual PRBool Init();
-  virtual nsresult Reset();
+  CodecType GetType() { return TYPE_VORBIS; }
+  PRBool DecodeHeader(ogg_packet* aPacket);
+  PRInt64 Time(PRInt64 granulepos);
+  PRBool Init();
+  nsresult Reset();
+  PRBool IsHeader(ogg_packet* aPacket);
+  nsresult PageIn(ogg_page* aPage); 
 
   // Returns the end time that a granulepos represents.
   static PRInt64 Time(vorbis_info* aInfo, PRInt64 aGranulePos); 
- 
+
   vorbis_info mInfo;
   vorbis_comment mComment;
   vorbis_dsp_state mDsp;
   vorbis_block mBlock;
+
+private:
+
+  // Reconstructs the granulepos of Vorbis packets stored in the mUnstamped
+  // array.
+  nsresult ReconstructVorbisGranulepos();
+
+  // The "block size" of the previously decoded Vorbis packet, or 0 if we've
+  // not yet decoded anything. This is used to calculate the number of samples
+  // in a Vorbis packet, since each Vorbis packet depends on the previous
+  // packet while being decoded.
+  long mPrevVorbisBlockSize;
+
+  // Granulepos (end sample) of the last decoded Vorbis packet. This is used
+  // to calculate the Vorbis granulepos when we don't find a granulepos to
+  // back-propagate from.
+  PRInt64 mGranulepos;
+
+#ifdef VALIDATE_VORBIS_SAMPLE_CALCULATION
+  // When validating that we've correctly predicted Vorbis packets' number
+  // of samples, we store each packet's predicted number of samples in this
+  // map, and verify we decode the predicted number of samples.
+  std::map<ogg_packet*, long> mVorbisPacketSamples;
+#endif
+
+  // Records that aPacket is predicted to have aSamples samples.
+  // This function has no effect if VALIDATE_VORBIS_SAMPLE_CALCULATION
+  // is not defined.
+  void RecordVorbisPacketSamples(ogg_packet* aPacket, long aSamples);
+
+  // Verifies that aPacket has had its number of samples predicted.
+  // This function has no effect if VALIDATE_VORBIS_SAMPLE_CALCULATION
+  // is not defined.
+  void AssertHasRecordedPacketSamples(ogg_packet* aPacket);
+
+public:
+  // Asserts that the number of samples predicted for aPacket is aSamples.
+  // This function has no effect if VALIDATE_VORBIS_SAMPLE_CALCULATION
+  // is not defined.
+  void ValidateVorbisPacketSamples(ogg_packet* aPacket, long aSamples);
+
 };
 
+// Returns 1 if the Theora info struct is decoding a media of Theora
+// verion (maj,min,sub) or later, otherwise returns 0.
+int TheoraVersion(th_info* info,
+                  unsigned char maj,
+                  unsigned char min,
+                  unsigned char sub);
+
 class nsTheoraState : public nsOggCodecState {
 public:
   nsTheoraState(ogg_page* aBosPage);
   virtual ~nsTheoraState();
 
-  virtual CodecType GetType() { return TYPE_THEORA; }
-  virtual PRBool DecodeHeader(ogg_packet* aPacket);
-  virtual PRInt64 Time(PRInt64 granulepos);
-  virtual PRInt64 StartTime(PRInt64 granulepos);
-  virtual PRBool Init();
+  CodecType GetType() { return TYPE_THEORA; }
+  PRBool DecodeHeader(ogg_packet* aPacket);
+  PRInt64 Time(PRInt64 granulepos);
+  PRInt64 StartTime(PRInt64 granulepos);
+  PRBool Init();
+  PRBool IsHeader(ogg_packet* aPacket);
+  nsresult PageIn(ogg_page* aPage); 
 
   // Returns the maximum number of microseconds which a keyframe can be offset
   // from any given interframe.
@@ -189,13 +298,23 @@ public:
 
   // Returns the end time that a granulepos represents.
   static PRInt64 Time(th_info* aInfo, PRInt64 aGranulePos); 
-  
+
   th_info mInfo;
   th_comment mComment;
   th_setup_info *mSetup;
   th_dec_ctx* mCtx;
 
   float mPixelAspectRatio;
+
+private:
+
+  // Reconstructs the granulepos of Theora packets stored in the
+  // mUnstamped array. mUnstamped must be filled with consecutive packets from
+  // the stream, with the last packet having a known granulepos. Using this
+  // known granulepos, and the known frame numbers, we recover the granulepos
+  // of all frames in the array. This enables us to determine their timestamps.
+  void ReconstructTheoraGranulepos();
+
 };
 
 // Constructs a 32bit version number out of two 16 bit major,minor
@@ -205,11 +324,12 @@ public:
 class nsSkeletonState : public nsOggCodecState {
 public:
   nsSkeletonState(ogg_page* aBosPage);
-  virtual ~nsSkeletonState();
-  virtual CodecType GetType() { return TYPE_SKELETON; }
-  virtual PRBool DecodeHeader(ogg_packet* aPacket);
-  virtual PRInt64 Time(PRInt64 granulepos) { return -1; }
-  virtual PRBool Init() { return PR_TRUE; }
+  ~nsSkeletonState();
+  CodecType GetType() { return TYPE_SKELETON; }
+  PRBool DecodeHeader(ogg_packet* aPacket);
+  PRInt64 Time(PRInt64 granulepos) { return -1; }
+  PRBool Init() { return PR_TRUE; }
+  PRBool IsHeader(ogg_packet* aPacket) { return PR_TRUE; }
 
   // Return PR_TRUE if the given time (in milliseconds) is within
   // the presentation time defined in the skeleton track.
diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index 31b1e0bd91a4..cb58230c7101 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -98,6 +98,16 @@ PageSync(nsMediaStream* aStream,
 // is about 4300 bytes, so we read the file in chunks larger than that.
 static const int PAGE_STEP = 8192;
 
+class nsAutoReleasePacket {
+public:
+  nsAutoReleasePacket(ogg_packet* aPacket) : mPacket(aPacket) { }
+  ~nsAutoReleasePacket() {
+    nsOggCodecState::ReleasePacket(mPacket);
+  }
+private:
+  ogg_packet* mPacket;
+};
+
 nsOggReader::nsOggReader(nsBuiltinDecoder* aDecoder)
   : nsBuiltinDecoderReader(aDecoder),
     mTheoraState(nsnull),
@@ -105,10 +115,7 @@ nsOggReader::nsOggReader(nsBuiltinDecoder* aDecoder)
     mSkeletonState(nsnull),
     mVorbisSerial(0),
     mTheoraSerial(0),
-    mPageOffset(0),
-    mTheoraGranulepos(-1),
-    mVorbisGranulepos(-1),
-    mDataOffset(0)
+    mPageOffset(0)
 {
   MOZ_COUNT_CTOR(nsOggReader);
 }
@@ -134,11 +141,6 @@ nsresult nsOggReader::ResetDecode()
 {
   nsresult res = NS_OK;
 
-  // Clear the Theora/Vorbis granulepos capture status, so that the next
-  // decode calls recaptures the granulepos.
-  mTheoraGranulepos = -1;
-  mVorbisGranulepos = -1;
-
   if (NS_FAILED(nsBuiltinDecoderReader::ResetDecode())) {
     res = NS_ERROR_FAILURE;
   }
@@ -159,15 +161,18 @@ nsresult nsOggReader::ResetDecode()
   return res;
 }
 
-// Returns PR_TRUE when all bitstreams in aBitstreams array have finished
-// reading their headers.
-static PRBool DoneReadingHeaders(nsTArray<nsOggCodecState*>& aBitstreams) {
-  for (PRUint32 i = 0; i < aBitstreams .Length(); i++) {
-    if (!aBitstreams [i]->DoneReadingHeaders()) {
-      return PR_FALSE;
+PRBool nsOggReader::ReadHeaders(nsOggCodecState* aState)
+{
+  while (!aState->DoneReadingHeaders()) {
+    ogg_packet* packet = NextOggPacket(aState);
+    nsAutoReleasePacket autoRelease(packet);
+    if (!packet || !aState->IsHeader(packet)) {
+      aState->Deactivate();
+    } else {
+      aState->DecodeHeader(packet);
     }
   }
-  return PR_TRUE;
+  return aState->Init();
 }
 
 nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
@@ -180,25 +185,15 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
   // what page to seek to when seeking to the media start.
 
   ogg_page page;
-  PRInt64 pageOffset;
   nsAutoTArray<nsOggCodecState*,4> bitstreams;
   PRBool readAllBOS = PR_FALSE;
-  mDataOffset = 0;
-  while (PR_TRUE) {
-    if (readAllBOS && DoneReadingHeaders(bitstreams)) {
-      if (mDataOffset == 0) {
-        // We've previously found the start of the first non-header packet.
-        mDataOffset = mPageOffset;
-      }
-      break;
-    }
-    pageOffset = ReadOggPage(&page);
+  while (!readAllBOS) {
+    PRInt64 pageOffset = ReadOggPage(&page);
     if (pageOffset == -1) {
       // Some kind of error...
       break;
     }
 
-    int ret = 0;
     int serial = ogg_page_serialno(&page);
     nsOggCodecState* codecState = 0;
 
@@ -209,7 +204,7 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
 #ifdef DEBUG
       PRBool r =
 #endif
-        mCodecStates.Put(serial, codecState);
+      mCodecStates.Put(serial, codecState);
       NS_ASSERTION(r, "Failed to insert into mCodecStates");
       bitstreams.AppendElement(codecState);
       mKnownStreams.AppendElement(serial);
@@ -245,42 +240,15 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     mCodecStates.Get(serial, &codecState);
     NS_ENSURE_TRUE(codecState, NS_ERROR_FAILURE);
 
-    // Add a complete page to the bitstream
-    ret = ogg_stream_pagein(&codecState->mState, &page);
-    NS_ENSURE_TRUE(ret == 0, NS_ERROR_FAILURE);
-
-    // Process all available header packets in the stream.
-    ogg_packet packet;
-    if (codecState->DoneReadingHeaders() && mDataOffset == 0)
-    {
-      // Stream has read all header packets, but now there's more data in
-      // (presumably) a non-header page, we must have finished header packets.
-      // This can happen in incorrectly chopped streams.
-      mDataOffset = pageOffset;
-      continue;
-    }
-    while (!codecState->DoneReadingHeaders() &&
-           (ret = ogg_stream_packetout(&codecState->mState, &packet)) != 0)
-    {
-      if (ret == -1) {
-        // Sync lost, we've probably encountered the continuation of a packet
-        // in a chopped video.
-        continue;
-      }
-      // A packet is available. If it is not a header packet we'll break.
-      // If it is a header packet, process it as normal.
-      codecState->DecodeHeader(&packet);
-    }
-    if (ogg_stream_packetpeek(&codecState->mState, &packet) != 0 &&
-        mDataOffset == 0)
-    {
-      // We're finished reading headers for this bitstream, but there's still
-      // packets in the bitstream to read. The bitstream is probably poorly
-      // muxed, and includes the last header packet on a page with non-header
-      // packets. We need to ensure that this is the media start page offset.
-      mDataOffset = pageOffset;
+    if (NS_FAILED(codecState->PageIn(&page))) {
+      return NS_ERROR_FAILURE;
     }
   }
+
+  // We've read all BOS pages, so we know the streams contained in the media.
+  // Now process all available header packets in the active Theora, Vorbis and
+  // Skeleton streams.
+
   // Deactivate any non-primary bitstreams.
   for (PRUint32 i = 0; i < bitstreams.Length(); i++) {
     nsOggCodecState* s = bitstreams[i];
@@ -289,85 +257,75 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     }
   }
 
-  // Initialize the first Theora and Vorbis bitstreams. According to the
-  // Theora spec these can be considered the 'primary' bitstreams for playback.
-  // Extract the metadata needed from these streams.
-  // Set a default callback period for if we have no video data
-  if (mTheoraState && mTheoraState->Init()) {
-    gfxIntSize sz(mTheoraState->mInfo.pic_width,
-                  mTheoraState->mInfo.pic_height);
-    mDecoder->SetVideoData(sz, mTheoraState->mPixelAspectRatio, nsnull, TimeStamp::Now());
-  }
-  if (mVorbisState) {
-    mVorbisState->Init();
-  }
-
-  if (!HasAudio() && !HasVideo() && mSkeletonState) {
-    // We have a skeleton track, but no audio or video, may as well disable
-    // the skeleton, we can't do anything useful with this media.
-    mSkeletonState->Deactivate();
-  }
-
-  mInfo.mHasAudio = HasAudio();
-  mInfo.mHasVideo = HasVideo();
-  if (HasAudio()) {
-    mInfo.mAudioRate = mVorbisState->mInfo.rate;
-    mInfo.mAudioChannels = mVorbisState->mInfo.channels;
-  }
-  if (HasVideo()) {
+  if (mTheoraState && ReadHeaders(mTheoraState)) {
+    mInfo.mHasVideo = PR_TRUE;
     mInfo.mPixelAspectRatio = mTheoraState->mPixelAspectRatio;
     mInfo.mPicture = nsIntRect(mTheoraState->mInfo.pic_x,
-                               mTheoraState->mInfo.pic_y,
-                               mTheoraState->mInfo.pic_width,
-                               mTheoraState->mInfo.pic_height);
+                                mTheoraState->mInfo.pic_y,
+                                mTheoraState->mInfo.pic_width,
+                                mTheoraState->mInfo.pic_height);
     mInfo.mFrame = nsIntSize(mTheoraState->mInfo.frame_width,
-                             mTheoraState->mInfo.frame_height);
+                              mTheoraState->mInfo.frame_height);
     mInfo.mDisplay = nsIntSize(mInfo.mPicture.width,
-                               mInfo.mPicture.height);
+                                mInfo.mPicture.height);
+    gfxIntSize sz(mTheoraState->mInfo.pic_width,
+                  mTheoraState->mInfo.pic_height);
+    mDecoder->SetVideoData(sz,
+                           mTheoraState->mPixelAspectRatio,
+                           nsnull,
+                           TimeStamp::Now());
+    // Copy Theora info data for time computations on other threads.
+    memcpy(&mTheoraInfo, &mTheoraState->mInfo, sizeof(mTheoraInfo));
+    mTheoraSerial = mTheoraState->mSerial;
+  } else {
+    memset(&mTheoraInfo, 0, sizeof(mTheoraInfo));
   }
 
-  if (mSkeletonState && mSkeletonState->HasIndex()) {
-    // Extract the duration info out of the index, so we don't need to seek to
-    // the end of stream to get it.
-    nsAutoTArray<PRUint32, 2> tracks;
-    if (HasVideo()) {
-      tracks.AppendElement(mTheoraState->mSerial);
-    }
-    if (HasAudio()) {
-      tracks.AppendElement(mVorbisState->mSerial);
-    }
-    PRInt64 duration = 0;
-    if (NS_SUCCEEDED(mSkeletonState->GetDuration(tracks, duration))) {
-      ReentrantMonitorAutoExit exitReaderMon(mReentrantMonitor);
-      ReentrantMonitorAutoEnter decoderMon(mDecoder->GetReentrantMonitor());
-      mDecoder->GetStateMachine()->SetDuration(duration);
-      LOG(PR_LOG_DEBUG, ("Got duration from Skeleton index %lld", duration));
-    }
-  }
-
-  // Copy Vorbis and Theora info data for time computations on other threads.
-  if (mVorbisState) {
+  if (mVorbisState && ReadHeaders(mVorbisState)) {
+    mInfo.mHasAudio = PR_TRUE;
+    mInfo.mAudioRate = mVorbisState->mInfo.rate;
+    mInfo.mAudioChannels = mVorbisState->mInfo.channels;
+    // Copy Vorbis info data for time computations on other threads.
     memcpy(&mVorbisInfo, &mVorbisState->mInfo, sizeof(mVorbisInfo));
     mVorbisInfo.codec_setup = NULL;
     mVorbisSerial = mVorbisState->mSerial;
+  } else {
+    memset(&mVorbisInfo, 0, sizeof(mVorbisInfo));
   }
 
-  if (mTheoraState) {
-    memcpy(&mTheoraInfo, &mTheoraState->mInfo, sizeof(mTheoraInfo));
-    mTheoraSerial = mTheoraState->mSerial;
+  if (mSkeletonState) {
+    if (!HasAudio() && !HasVideo()) {
+      // We have a skeleton track, but no audio or video, may as well disable
+      // the skeleton, we can't do anything useful with this media.
+      mSkeletonState->Deactivate();
+    } else if (ReadHeaders(mSkeletonState) && mSkeletonState->HasIndex()) {
+      // Extract the duration info out of the index, so we don't need to seek to
+      // the end of stream to get it.
+      nsAutoTArray<PRUint32, 2> tracks;
+      if (HasVideo()) {
+        tracks.AppendElement(mTheoraState->mSerial);
+      }
+      if (HasAudio()) {
+        tracks.AppendElement(mVorbisState->mSerial);
+      }
+      PRInt64 duration = 0;
+      if (NS_SUCCEEDED(mSkeletonState->GetDuration(tracks, duration))) {
+        ReentrantMonitorAutoExit exitReaderMon(mReentrantMonitor);
+        ReentrantMonitorAutoEnter decoderMon(mDecoder->GetReentrantMonitor());
+        mDecoder->GetStateMachine()->SetDuration(duration);
+        LOG(PR_LOG_DEBUG, ("Got duration from Skeleton index %lld", duration));
+      }
+    }
   }
 
   *aInfo = mInfo;
 
-  LOG(PR_LOG_DEBUG, ("Done loading headers, data offset %lld", mDataOffset));
-
   return NS_OK;
 }
 
-nsresult nsOggReader::DecodeVorbis(nsTArray<nsAutoPtr<SoundData> >& aChunks,
-                                   ogg_packet* aPacket)
-{
-  // Successfully read a packet.
+nsresult nsOggReader::DecodeVorbis(ogg_packet* aPacket) {
+  NS_ASSERTION(aPacket->granulepos != -1, "Must know vorbis granulepos!");
+
   if (vorbis_synthesis(&mVorbisState->mBlock, aPacket) != 0) {
     return NS_ERROR_FAILURE;
   }
@@ -380,7 +338,9 @@ nsresult nsOggReader::DecodeVorbis(nsTArray<nsAutoPtr<SoundData> >& aChunks,
   VorbisPCMValue** pcm = 0;
   PRInt32 samples = 0;
   PRUint32 channels = mVorbisState->mInfo.channels;
+  ogg_int64_t endSample = aPacket->granulepos;
   while ((samples = vorbis_synthesis_pcmout(&mVorbisState->mDsp, &pcm)) > 0) {
+    mVorbisState->ValidateVorbisPacketSamples(aPacket, samples);
     SoundDataValue* buffer = new SoundDataValue[samples * channels];
     for (PRUint32 j = 0; j < channels; ++j) {
       VorbisPCMValue* channel = pcm[j];
@@ -390,19 +350,15 @@ nsresult nsOggReader::DecodeVorbis(nsTArray<nsAutoPtr<SoundData> >& aChunks,
     }
 
     PRInt64 duration = mVorbisState->Time((PRInt64)samples);
-    PRInt64 startTime = mVorbisState->Time(mVorbisGranulepos);
+    PRInt64 startTime = mVorbisState->Time(endSample - samples);
     SoundData* s = new SoundData(mPageOffset,
                                  startTime,
                                  duration,
                                  samples,
                                  buffer,
                                  channels);
-    if (mVorbisGranulepos != -1) {
-      mVorbisGranulepos += samples;
-    }
-    if (!aChunks.AppendElement(s)) {
-      delete s;
-    }
+    mAudioQueue.Push(s);
+    endSample -= samples;
     if (vorbis_synthesis_read(&mVorbisState->mDsp, samples) != 0) {
       return NS_ERROR_FAILURE;
     }
@@ -416,80 +372,25 @@ PRBool nsOggReader::DecodeAudioData()
   NS_ASSERTION(mDecoder->OnStateMachineThread() || mDecoder->OnDecodeThread(),
                "Should be on playback or decode thread.");
   NS_ASSERTION(mVorbisState!=0, "Need Vorbis state to decode audio");
-  ogg_packet packet;
-  packet.granulepos = -1;
 
-  PRBool endOfStream = PR_FALSE;
-
-  nsAutoTArray<nsAutoPtr<SoundData>, 64> chunks;
-  if (mVorbisGranulepos == -1) {
-    // Not captured Vorbis granulepos, read up until we get a granulepos, and
-    // back propagate the granulepos.
-
-    // We buffer the packets' pcm samples until we reach a packet with a granulepos.
-    // This will be the last packet in a page. Then using that granulepos to 
-    // calculate the packet's end time, we calculate all the packets' start times by
-    // subtracting their durations.
-
-    // Ensure we've got Vorbis packets; read one more Vorbis page if necessary.
-    while (packet.granulepos <= 0 && !endOfStream) {
-      if (!ReadOggPacket(mVorbisState, &packet)) {
-        endOfStream = PR_TRUE;
-        break;
-      }
-      if (packet.e_o_s != 0) {
-        // This packet marks the logical end of the Vorbis bitstream. It may
-        // still contain sound samples, so we must still decode it.
-        endOfStream = PR_TRUE;
-      }
-
-      if (NS_FAILED(DecodeVorbis(chunks, &packet))) {
-        NS_WARNING("Failed to decode Vorbis packet");
-      }
-    }
-
-    if (packet.granulepos > 0) {
-      // Successfully read up to a non -1 granulepos.
-      // Calculate the timestamps of the sound samples.
-      PRInt64 granulepos = packet.granulepos; // Represents end time of last sample.
-      mVorbisGranulepos = packet.granulepos;
-      for (int i = chunks.Length() - 1; i >= 0; --i) {
-        SoundData* s = chunks[i];
-        PRInt64 startGranule = granulepos - s->mSamples;
-        s->mTime = mVorbisState->Time(startGranule);
-        granulepos = startGranule;
-      }
-    }
-  } else {
-    // We have already captured the granulepos. The next packet's granulepos
-    // is its number of samples, plus the previous granulepos.
-    if (!ReadOggPacket(mVorbisState, &packet)) {
-      endOfStream = PR_TRUE;
-    } else {
-      // Successfully read a packet from the file. Decode it.
-      endOfStream = packet.e_o_s != 0;
-
-      // Try to decode any packet we've read.
-      if (NS_FAILED(DecodeVorbis(chunks, &packet))) {
-        NS_WARNING("Failed to decode Vorbis packet");
-      }
-
-      if (packet.granulepos != -1 && packet.granulepos != mVorbisGranulepos) {
-        // If the packet's granulepos doesn't match our running sample total,
-        // it's likely the bitstream has been damaged somehow, or perhaps
-        // oggz-chopped. Just assume the packet's granulepos is correct...
-        mVorbisGranulepos = packet.granulepos;
-      }
+  // Read the next data packet. Skip any non-data packets we encounter.
+  ogg_packet* packet = 0;
+  do {
+    if (packet) {
+      nsOggCodecState::ReleasePacket(packet);
     }
+    packet = NextOggPacket(mVorbisState);
+  } while (packet && mVorbisState->IsHeader(packet));
+  if (!packet) {
+    mAudioQueue.Finish();
+    return PR_FALSE;
   }
 
-  // We've successfully decoded some sound chunks. Push them onto the audio
-  // queue.
-  for (PRUint32 i = 0; i < chunks.Length(); ++i) {
-    mAudioQueue.Push(chunks[i].forget());
-  }
-
-  if (endOfStream) {
+  NS_ASSERTION(packet && packet->granulepos != -1,
+    "Must have packet with known granulepos");
+  nsAutoReleasePacket autoRelease(packet);
+  DecodeVorbis(packet);
+  if (packet->e_o_s) {
     // We've encountered an end of bitstream packet, or we've hit the end of
     // file while trying to decode, so inform the audio queue that there'll
     // be no more samples.
@@ -500,21 +401,6 @@ PRBool nsOggReader::DecodeAudioData()
   return PR_TRUE;
 }
 
-// Returns 1 if the Theora info struct is decoding a media of Theora
-// verion (maj,min,sub) or later, otherwise returns 0.
-static int
-TheoraVersion(th_info* info,
-              unsigned char maj,
-              unsigned char min,
-              unsigned char sub)
-{
-  ogg_uint32_t ver = (maj << 16) + (min << 8) + sub;
-  ogg_uint32_t th_ver = (info->version_major << 16) +
-                        (info->version_minor << 8) +
-                        info->version_subminor;
-  return (th_ver >= ver) ? 1 : 0;
-}
-
 #ifdef DEBUG
 // Ensures that all the VideoData in aFrames array are stored in increasing
 // order by timestamp. Used in assertions in debug builds.
@@ -536,23 +422,32 @@ AllFrameTimesIncrease(nsTArray<nsAutoPtr<VideoData> >& aFrames)
 }
 #endif
 
-nsresult nsOggReader::DecodeTheora(nsTArray<nsAutoPtr<VideoData> >& aFrames,
-                                   ogg_packet* aPacket)
+nsresult nsOggReader::DecodeTheora(ogg_packet* aPacket)
 {
+  NS_ASSERTION(aPacket->granulepos >= TheoraVersion(&mTheoraState->mInfo,3,2,1),
+    "Packets must have valid granulepos and packetno");
+
   int ret = th_decode_packetin(mTheoraState->mCtx, aPacket, 0);
   if (ret != 0 && ret != TH_DUPFRAME) {
     return NS_ERROR_FAILURE;
   }
   PRInt64 time = mTheoraState->StartTime(aPacket->granulepos);
+
+  // Don't use the frame if it's outside the bounds of the presentation
+  // start time in the skeleton track. Note we still must submit the frame
+  // to the decoder (via th_decode_packetin), as the frames which are
+  // presentable may depend on this frame's data.
+  if (mSkeletonState && !mSkeletonState->IsPresentable(time)) {
+    return NS_OK;
+  }
+
   PRInt64 endTime = mTheoraState->Time(aPacket->granulepos);
   if (ret == TH_DUPFRAME) {
     VideoData* v = VideoData::CreateDuplicate(mPageOffset,
                                               time,
                                               endTime,
                                               aPacket->granulepos);
-    if (!aFrames.AppendElement(v)) {
-      delete v;
-    }
+    mVideoQueue.Push(v);
   } else if (ret == 0) {
     th_ycbcr_buffer buffer;
     ret = th_decode_ycbcr_out(mTheoraState->mCtx, buffer);
@@ -583,9 +478,7 @@ nsresult nsOggReader::DecodeTheora(nsTArray<nsAutoPtr<VideoData> >& aFrames,
       NS_WARNING("Failed to allocate memory for video frame");
       return NS_ERROR_OUT_OF_MEMORY;
     }
-    if (!aFrames.AppendElement(v)) {
-      delete v;
-    }
+    mVideoQueue.Push(v);
   }
   return NS_OK;
 }
@@ -602,199 +495,44 @@ PRBool nsOggReader::DecodeVideoFrame(PRBool &aKeyframeSkip,
   PRUint32 parsed = 0, decoded = 0;
   nsMediaDecoder::AutoNotifyDecoded autoNotify(mDecoder, parsed, decoded);
 
-  // We chose to keep track of the Theora granulepos ourselves, rather than
-  // rely on th_decode_packetin() to do it for us. This is because
-  // th_decode_packetin() simply works by incrementing a counter every time
-  // it's called, so if we drop frames and don't call it, subsequent granulepos
-  // will be wrong. Whenever we read a packet which has a granulepos, we use
-  // its granulepos, otherwise we increment the previous packet's granulepos.
-
-  nsAutoTArray<nsAutoPtr<VideoData>, 8> frames;
-  ogg_packet packet;
-  PRBool endOfStream = PR_FALSE;
-  if (mTheoraGranulepos == -1) {
-    // We've not read a Theora packet with a granulepos, so we don't know what
-    // timestamp to assign to Theora frames we decode. This will only happen
-    // the first time we read, or after a seek. We must read and buffer up to
-    // the first Theora packet with a granulepos, and back-propagate its 
-    // granulepos to calculate the buffered frames' granulepos.
-    do {
-      if (!ReadOggPacket(mTheoraState, &packet)) {
-        // Failed to read another page, must be the end of file. We can't have
-        // already encountered an end of bitstream packet, else we wouldn't be
-        // here, so this bitstream must be missing its end of stream packet, or
-        // is otherwise corrupt (oggz-chop can output files like this). Inform
-        // the queue that there will be no more frames.
-        mVideoQueue.Finish();
-        return PR_FALSE;
-      }
-      parsed++;
-
-      if (packet.granulepos > 0) {
-        // We've found a packet with a granulepos, we can now determine the
-        // buffered packet's timestamps, as well as the timestamps for any
-        // packets we read subsequently.
-        mTheoraGranulepos = packet.granulepos;
-      }
-
-      if (DecodeTheora(frames, &packet) == NS_ERROR_OUT_OF_MEMORY) {
-        NS_WARNING("Theora decode memory allocation failure!");
-        return PR_FALSE;
-      }
-
-    } while (packet.granulepos <= 0 && !endOfStream);
-
-    if (packet.granulepos > 0) {
-      // Reconstruct the granulepos (and thus timestamps) of the decoded
-      // frames. Granulepos are stored as ((keyframe<<shift)+offset). We
-      // know the granulepos of the last frame in the list, so we can infer
-      // the granulepos of the intermediate frames using their frame numbers.
-      ogg_int64_t shift = mTheoraState->mInfo.keyframe_granule_shift;
-      ogg_int64_t version_3_2_1 = TheoraVersion(&mTheoraState->mInfo,3,2,1);
-      ogg_int64_t lastFrame = th_granule_frame(mTheoraState->mCtx,
-                                               packet.granulepos) + version_3_2_1;
-      ogg_int64_t firstFrame = lastFrame - frames.Length() + 1;
-
-      // Until we encounter a keyframe, we'll assume that the "keyframe"
-      // segment of the granulepos is the first frame, or if that causes
-      // the "offset" segment to overflow, we assume the required
-      // keyframe is maximumally offset. Until we encounter a keyframe
-      // the granulepos will probably be wrong, but we can't decode the
-      // frame anyway (since we don't have its keyframe) so it doesn't really
-      // matter.
-      ogg_int64_t keyframe = packet.granulepos >> shift;
-
-      // The lastFrame, firstFrame, keyframe variables, as well as the frame
-      // variable in the loop below, store the frame number for Theora
-      // version >= 3.2.1 streams, and store the frame index for Theora
-      // version < 3.2.1 streams.
-      for (PRUint32 i = 0; i < frames.Length() - 1; ++i) {
-        ogg_int64_t frame = firstFrame + i;
-        ogg_int64_t granulepos;
-        if (frames[i]->mKeyframe) {
-          granulepos = frame << shift;
-          keyframe = frame;
-        } else if (frame >= keyframe &&
-                   frame - keyframe < ((ogg_int64_t)1 << shift))
-        {
-          // (frame - keyframe) won't overflow the "offset" segment of the
-          // granulepos, so it's safe to calculate the granulepos.
-          granulepos = (keyframe << shift) + (frame - keyframe);
-        } else {
-          // (frame - keyframeno) will overflow the "offset" segment of the
-          // granulepos, so we take "keyframe" to be the max possible offset
-          // frame instead.
-          ogg_int64_t k = NS_MAX(frame - (((ogg_int64_t)1 << shift) - 1), version_3_2_1);
-          granulepos = (k << shift) + (frame - k);
-        }
-        // Theora 3.2.1+ granulepos store frame number [1..N], so granulepos
-        // should be > 0.
-        // Theora 3.2.0 granulepos store the frame index [0..(N-1)], so
-        // granulepos should be >= 0. 
-        NS_ASSERTION(granulepos >= version_3_2_1,
-                     "Invalid granulepos for Theora version");
-
-        // Check that the frame's granule number is one more than the
-        // previous frame's.
-        NS_ASSERTION(i == 0 ||
-                     th_granule_frame(mTheoraState->mCtx, granulepos) ==
-                     th_granule_frame(mTheoraState->mCtx, frames[i-1]->mTimecode) + 1,
-                     "Granulepos calculation is incorrect!");
-
-        frames[i]->mTime = mTheoraState->StartTime(granulepos);
-        frames[i]->mEndTime = mTheoraState->Time(granulepos);
-        NS_ASSERTION(frames[i]->mEndTime >= frames[i]->mTime, "Frame must start before it ends.");
-        frames[i]->mTimecode = granulepos;
-      }
-      NS_ASSERTION(AllFrameTimesIncrease(frames), "All frames must have granulepos");
-
-      // Check that the second to last frame's granule number is one less than
-      // the last frame's (the known granule number). If not our granulepos
-      // recovery missed a beat.
-      NS_ASSERTION(frames.Length() < 2 ||
-        th_granule_frame(mTheoraState->mCtx, frames[frames.Length()-2]->mTimecode) + 1 ==
-        th_granule_frame(mTheoraState->mCtx, packet.granulepos),
-        "Granulepos recovery should catch up with packet.granulepos!");
+  // Read the next data packet. Skip any non-data packets we encounter.
+  ogg_packet* packet = 0;
+  do {
+    if (packet) {
+      nsOggCodecState::ReleasePacket(packet);
     }
-  } else {
-    
-    NS_ASSERTION(mTheoraGranulepos > 0, "We must Theora granulepos!");
-    
-    if (!ReadOggPacket(mTheoraState, &packet)) {
-      // Failed to read from file, so EOF or other premature failure.
-      // Inform the queue that there will be no more frames.
-      mVideoQueue.Finish();
+    packet = NextOggPacket(mTheoraState);
+  } while (packet && mTheoraState->IsHeader(packet));
+  if (!packet) {
+    mVideoQueue.Finish();
+    return PR_FALSE;
+  }
+  nsAutoReleasePacket autoRelease(packet);
+
+  parsed++;
+  NS_ASSERTION(packet && packet->granulepos != -1,
+                "Must know first packet's granulepos");
+  PRBool eos = packet->e_o_s;
+  PRInt64 frameEndTime = mTheoraState->Time(packet->granulepos);
+  if (!aKeyframeSkip ||
+     (th_packet_iskeyframe(packet) && frameEndTime >= aTimeThreshold))
+  {
+    aKeyframeSkip = PR_FALSE;
+    nsresult res = DecodeTheora(packet);
+    decoded++;
+    if (NS_FAILED(res)) {
       return PR_FALSE;
     }
-    parsed++;
-
-    endOfStream = packet.e_o_s != 0;
-
-    // Maintain the Theora granulepos. We must do this even if we drop frames,
-    // otherwise our clock will be wrong after we've skipped frames.
-    if (packet.granulepos != -1) {
-      // Incoming packet has a granulepos, use that as it's granulepos.
-      mTheoraGranulepos = packet.granulepos;
-    } else {
-      // Increment the previous Theora granulepos.
-      PRInt64 granulepos = 0;
-      int shift = mTheoraState->mInfo.keyframe_granule_shift;
-      // Theora 3.2.1+ bitstreams granulepos store frame number; [1..N]
-      // Theora 3.2.0 bitstreams store the frame index; [0..(N-1)]
-      if (!th_packet_iskeyframe(&packet)) {
-        granulepos = mTheoraGranulepos + 1;
-      } else {
-        ogg_int64_t frameindex = th_granule_frame(mTheoraState->mCtx,
-                                                  mTheoraGranulepos);
-        ogg_int64_t granule = frameindex +
-                              TheoraVersion(&mTheoraState->mInfo,3,2,1) + 1;
-        NS_ASSERTION(granule > 0, "Must have positive granulepos");
-        granulepos = granule << shift;
-      }
-
-      NS_ASSERTION(th_granule_frame(mTheoraState->mCtx, mTheoraGranulepos) + 1 == 
-                   th_granule_frame(mTheoraState->mCtx, granulepos),
-                   "Frame number must increment by 1");
-      packet.granulepos = mTheoraGranulepos = granulepos;
-    }
-
-    PRInt64 time = mTheoraState->StartTime(mTheoraGranulepos);
-    NS_ASSERTION(packet.granulepos != -1, "Must know packet granulepos");
-
-    if (!aKeyframeSkip ||
-        (th_packet_iskeyframe(&packet) == 1 && time >= aTimeThreshold))
-    {
-      if (DecodeTheora(frames, &packet) == NS_ERROR_OUT_OF_MEMORY) {
-        NS_WARNING("Theora decode memory allocation failure");
-        return PR_FALSE;
-      }
-    }
   }
 
-  // Push decoded data into the video frame queue.
-  for (PRUint32 i = 0; i < frames.Length(); i++) {
-    nsAutoPtr<VideoData> data(frames[i].forget());
-    // Don't use the frame if it's outside the bounds of the presentation
-    // start time in the skeleton track.
-    if (!mSkeletonState || mSkeletonState->IsPresentable(data->mTime)) {
-      if (aKeyframeSkip && data->mKeyframe) {
-        aKeyframeSkip = PR_FALSE;
-      }
- 
-      if (!aKeyframeSkip && data->mEndTime >= aTimeThreshold) {
-        mVideoQueue.Push(data.forget());
-        decoded++;
-      }
-    }
-  }
-
-  if (endOfStream) {
+  if (eos) {
     // We've encountered an end of bitstream packet. Inform the queue that
     // there will be no more frames.
     mVideoQueue.Finish();
+    return PR_FALSE;
   }
 
-  return !endOfStream;
+  return PR_TRUE;
 }
 
 PRInt64 nsOggReader::ReadOggPage(ogg_page* aPage)
@@ -837,51 +575,34 @@ PRInt64 nsOggReader::ReadOggPage(ogg_page* aPage)
   return offset;
 }
 
-PRBool nsOggReader::ReadOggPacket(nsOggCodecState* aCodecState,
-                                  ogg_packet* aPacket)
+ogg_packet* nsOggReader::NextOggPacket(nsOggCodecState* aCodecState)
 {
   NS_ASSERTION(mDecoder->OnStateMachineThread() || mDecoder->OnDecodeThread(),
                "Should be on play state machine or decode thread.");
   mReentrantMonitor.AssertCurrentThreadIn();
 
   if (!aCodecState || !aCodecState->mActive) {
-    return PR_FALSE;
+    return nsnull;
   }
 
-  int ret = 0;
-  while ((ret = ogg_stream_packetout(&aCodecState->mState, aPacket)) != 1) {
-    ogg_page page;
-
-    if (aCodecState->PageInFromBuffer()) {
-      // The codec state has inserted a previously buffered page into its
-      // ogg_stream_state, no need to read a page from the channel.
-      continue;
-    }
-
+  ogg_packet* packet;
+  while ((packet = aCodecState->PacketOut()) == nsnull) {
     // The codec state does not have any buffered pages, so try to read another
     // page from the channel.
+    ogg_page page;
     if (ReadOggPage(&page) == -1) {
-      return PR_FALSE;
+      return nsnull;
     }
 
     PRUint32 serial = ogg_page_serialno(&page);
     nsOggCodecState* codecState = nsnull;
     mCodecStates.Get(serial, &codecState);
-
-    if (serial == aCodecState->mSerial) {
-      // This page is from our target bitstream, insert it into the
-      // codec state's ogg_stream_state so we can read a packet.
-      ret = ogg_stream_pagein(&codecState->mState, &page);
-      NS_ENSURE_TRUE(ret == 0, PR_FALSE);
-    } else if (codecState && codecState->mActive) {
-      // Page is for another active bitstream, add the page to its codec
-      // state's buffer for later consumption when that stream next tries
-      // to read a packet.
-      codecState->AddToBuffer(&page);
+    if (codecState && NS_FAILED(codecState->PageIn(&page))) {
+      return nsnull;
     }
   }
 
-  return PR_TRUE;
+  return packet;
 }
 
 // Returns an ogg page's checksum.
@@ -906,13 +627,9 @@ VideoData* nsOggReader::FindStartTime(PRInt64 aOffset,
                "Should be on state machine thread.");
   nsMediaStream* stream = mDecoder->GetCurrentStream();
   NS_ENSURE_TRUE(stream != nsnull, nsnull);
-  // Ensure aOffset is after mDataOffset, the offset of the first non-header page.
-  // This prevents us from trying to parse header pages as content pages.
-  NS_ASSERTION(mDataOffset > 0, "Must know mDataOffset by now");
-  PRInt64 offset = NS_MAX(mDataOffset, aOffset);
-  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, offset);
+  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, aOffset);
   NS_ENSURE_SUCCESS(res, nsnull);
-  return nsBuiltinDecoderReader::FindStartTime(offset, aOutStartTime);
+  return nsBuiltinDecoderReader::FindStartTime(aOffset, aOutStartTime);
 }
 
 PRInt64 nsOggReader::FindEndTime(PRInt64 aEndOffset)
@@ -920,14 +637,11 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aEndOffset)
   ReentrantMonitorAutoEnter mon(mReentrantMonitor);
   NS_ASSERTION(mDecoder->OnStateMachineThread(),
                "Should be on state machine thread.");
-  NS_ASSERTION(mDataOffset > 0,
-               "Should have offset of first non-header page");
-  PRInt64 offset = NS_MAX(mDataOffset, aEndOffset);
-  PRInt64 endTime = FindEndTime(mDataOffset, offset, PR_FALSE, &mOggState);
+  PRInt64 endTime = FindEndTime(0, aEndOffset, PR_FALSE, &mOggState);
   // Reset read head to start of media data.
   nsMediaStream* stream = mDecoder->GetCurrentStream();
   NS_ENSURE_TRUE(stream != nsnull, -1);
-  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, mDataOffset);
+  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, 0);
   NS_ENSURE_SUCCESS(res, -1);
   return endTime;
 }
@@ -1068,10 +782,8 @@ nsresult nsOggReader::GetSeekRanges(nsTArray<SeekRange>& aRanges)
     if (NS_FAILED(ResetDecode())) {
       return NS_ERROR_FAILURE;
     }
-    // Ensure the offsets are after the header pages.
-    PRInt64 startOffset = NS_MAX(cached[index].mStart, mDataOffset);
-    PRInt64 endOffset = NS_MAX(cached[index].mEnd, mDataOffset);
-
+    PRInt64 startOffset = range.mStart;
+    PRInt64 endOffset = range.mEnd;
     FindStartTime(startOffset, startTime);
     if (startTime != -1 &&
         ((endTime = FindEndTime(endOffset)) != -1))
@@ -1099,7 +811,7 @@ nsOggReader::SelectSeekRange(const nsTArray<SeekRange>& ranges,
 {
   NS_ASSERTION(mDecoder->OnStateMachineThread(),
                "Should be on state machine thread.");
-  PRInt64 so = mDataOffset;
+  PRInt64 so = 0;
   PRInt64 eo = mDecoder->GetCurrentStream()->GetLength();
   PRInt64 st = aStartTime;
   PRInt64 et = aEndTime;
@@ -1261,8 +973,6 @@ nsresult nsOggReader::SeekInBufferedRange(PRInt64 aTarget,
                                   aEndTime,
                                   PR_FALSE);
     res = SeekBisection(keyframeTime, k, SEEK_FUZZ_USECS);
-    NS_ASSERTION(mTheoraGranulepos == -1, "SeekBisection must reset Theora decode");
-    NS_ASSERTION(mVorbisGranulepos == -1, "SeekBisection must reset Vorbis decode");
   }
   return res;
 }
@@ -1305,10 +1015,7 @@ nsresult nsOggReader::SeekInUnbuffered(PRInt64 aTarget,
   // Minimize the bisection search space using the known timestamps from the
   // buffered ranges.
   SeekRange k = SelectSeekRange(aRanges, seekTarget, aStartTime, aEndTime, PR_FALSE);
-  nsresult res = SeekBisection(seekTarget, k, SEEK_FUZZ_USECS);
-  NS_ASSERTION(mTheoraGranulepos == -1, "SeekBisection must reset Theora decode");
-  NS_ASSERTION(mVorbisGranulepos == -1, "SeekBisection must reset Vorbis decode");
-  return res;
+  return SeekBisection(seekTarget, k, SEEK_FUZZ_USECS);
 }
 
 nsresult nsOggReader::Seek(PRInt64 aTarget,
@@ -1327,10 +1034,10 @@ nsresult nsOggReader::Seek(PRInt64 aTarget,
   if (aTarget == aStartTime) {
     // We've seeked to the media start. Just seek to the offset of the first
     // content page.
-    res = stream->Seek(nsISeekableStream::NS_SEEK_SET, mDataOffset);
+    res = stream->Seek(nsISeekableStream::NS_SEEK_SET, 0);
     NS_ENSURE_SUCCESS(res,res);
 
-    mPageOffset = mDataOffset;
+    mPageOffset = 0;
     res = ResetDecode();
     NS_ENSURE_SUCCESS(res,res);
 
@@ -1456,9 +1163,9 @@ nsresult nsOggReader::SeekBisection(PRInt64 aTarget,
     if (NS_FAILED(ResetDecode())) {
       return NS_ERROR_FAILURE;
     }
-    res = stream->Seek(nsISeekableStream::NS_SEEK_SET, mDataOffset);
+    res = stream->Seek(nsISeekableStream::NS_SEEK_SET, 0);
     NS_ENSURE_SUCCESS(res,res);
-    mPageOffset = mDataOffset;
+    mPageOffset = 0;
     return NS_OK;
   }
 
@@ -1720,14 +1427,14 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
   ogg_sync_init(&state);
   for (PRUint32 index = 0; index < ranges.Length(); index++) {
     // Ensure the offsets are after the header pages.
-    PRInt64 startOffset = NS_MAX(ranges[index].mStart, mDataOffset);
-    PRInt64 endOffset = NS_MAX(ranges[index].mEnd, mDataOffset);
+    PRInt64 startOffset = ranges[index].mStart;
+    PRInt64 endOffset = ranges[index].mEnd;
 
     // Because the granulepos time is actually the end time of the page,
-    // we special-case (startOffset == mDataOffset) so that the first
+    // we special-case (startOffset == 0) so that the first
     // buffered range always appears to be buffered from the media start
     // time, rather than from the end-time of the first page.
-    PRInt64 startTime = (startOffset == mDataOffset) ? aStartTime : -1;
+    PRInt64 startTime = (startOffset == 0) ? aStartTime : -1;
 
     // Find the start time of the range. Read pages until we find one with a
     // granulepos which we can convert into a timestamp to use as the time of
diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h
index ca63660462f1..8077351f0d88 100644
--- a/content/media/ogg/nsOggReader.h
+++ b/content/media/ogg/nsOggReader.h
@@ -189,24 +189,6 @@ private:
                       PRBool aCachedDataOnly,
                       ogg_sync_state* aState);
 
-  // Decodes one packet of Vorbis data, storing the resulting chunks of
-  // PCM samples in aChunks.
-  nsresult DecodeVorbis(nsTArray<nsAutoPtr<SoundData> >& aChunks,
-                        ogg_packet* aPacket);
-
-  // May return NS_ERROR_OUT_OF_MEMORY. Caller must have obtained the
-  // reader's monitor.
-  nsresult DecodeTheora(nsTArray<nsAutoPtr<VideoData> >& aFrames,
-                        ogg_packet* aPacket);
-
-  // Read a page of data from the Ogg file. Returns the offset of the start
-  // of the page, or -1 if the page read failed.
-  PRInt64 ReadOggPage(ogg_page* aPage);
-
-  // Read a packet for an Ogg bitstream/codec state. Returns PR_TRUE on
-  // success, or PR_FALSE if the read failed.
-  PRBool ReadOggPacket(nsOggCodecState* aCodecState, ogg_packet* aPacket);
-
   // Performs a seek bisection to move the media stream's read cursor to the
   // last ogg page boundary which has end time before aTarget usecs on both the
   // Theora and Vorbis bitstreams. Limits its search to data inside aRange;
@@ -241,6 +223,31 @@ private:
                             PRInt64 aEndTime,
                             PRBool aExact);
 private:
+
+  // Decodes a packet of Vorbis data, and inserts its samples into the 
+  // audio queue.
+  nsresult DecodeVorbis(ogg_packet* aPacket);
+
+  // Decodes a packet of Theora data, and inserts its frame into the
+  // video queue. May return NS_ERROR_OUT_OF_MEMORY. Caller must have obtained
+  // the reader's monitor.
+  nsresult DecodeTheora(ogg_packet* aPacket);
+
+  // Read a page of data from the Ogg file. Returns the offset of the start
+  // of the page, or -1 if the page read failed.
+  PRInt64 ReadOggPage(ogg_page* aPage);
+
+  // Reads and decodes header packets for aState, until either header decode
+  // fails, or is complete. Initializes the codec state before returning.
+  // Returns PR_TRUE if reading headers and initializtion of the stream
+  // succeeds.
+  PRBool ReadHeaders(nsOggCodecState* aState);
+
+  // Returns the next Ogg packet for an bitstream/codec state. Returns a
+  // pointer to an ogg_packet on success, or nsnull if the read failed.
+  // The caller is responsible for deleting the packet and its |packet| field.
+  ogg_packet* NextOggPacket(nsOggCodecState* aCodecState);
+
   // Maps Ogg serialnos to nsOggStreams.
   nsClassHashtable<nsUint32HashKey, nsOggCodecState> mCodecStates;
 
@@ -276,17 +283,6 @@ private:
   // The offset of the end of the last page we've read, or the start of
   // the page we're about to read.
   PRInt64 mPageOffset;
-
-  // The granulepos of the last decoded Theora frame.
-  PRInt64 mTheoraGranulepos;
-
-  // The granulepos of the last decoded Vorbis sample.
-  PRInt64 mVorbisGranulepos;
-
-  // The offset of the first non-header page in the file, in bytes.
-  // Used to seek to the start of the media, and to prevent us trying to
-  // decode pages before this offset (the header pages) as content pages.
-  PRInt64 mDataOffset;
 };
 
 #endif
diff --git a/content/media/raw/nsRawReader.cpp b/content/media/raw/nsRawReader.cpp
index a662dad6bb94..110dd1949295 100644
--- a/content/media/raw/nsRawReader.cpp
+++ b/content/media/raw/nsRawReader.cpp
@@ -104,7 +104,6 @@ nsresult nsRawReader::ReadMetadata(nsVideoInfo* aInfo)
     return NS_ERROR_FAILURE; // Invalid data
   mInfo.mPixelAspectRatio = static_cast<float>(mMetadata.aspectNumerator) / 
                             mMetadata.aspectDenominator;
-  mInfo.mDataOffset = sizeof(nsRawVideoHeader) + 1;
   mInfo.mHasAudio = PR_FALSE;
 
   mFrameRate = static_cast<float>(mMetadata.framerateNumerator) /

From 5c54e37e9d7eaa38e455ccf6d1625da75c11b9f3 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Sat, 7 May 2011 18:08:41 +0100
Subject: [PATCH 012/314] Bug 655497 - Remove nsISVGGlyphFragmentLeaf.
 r=dholbert

---
 layout/svg/base/src/nsISVGGlyphFragmentLeaf.h | 97 ------------------
 layout/svg/base/src/nsISVGGlyphFragmentNode.h |  5 +-
 layout/svg/base/src/nsSVGGlyphFrame.cpp       | 53 +++++-----
 layout/svg/base/src/nsSVGGlyphFrame.h         | 98 +++++++++++--------
 layout/svg/base/src/nsSVGTSpanFrame.cpp       | 16 +--
 layout/svg/base/src/nsSVGTSpanFrame.h         |  4 +-
 .../svg/base/src/nsSVGTextContainerFrame.cpp  | 48 ++++-----
 layout/svg/base/src/nsSVGTextContainerFrame.h | 12 +--
 layout/svg/base/src/nsSVGTextFrame.cpp        | 63 ++++++------
 layout/svg/base/src/nsSVGTextFrame.h          |  2 +-
 layout/svg/base/src/nsSVGUtils.cpp            |  1 -
 11 files changed, 155 insertions(+), 244 deletions(-)
 delete mode 100644 layout/svg/base/src/nsISVGGlyphFragmentLeaf.h

diff --git a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
deleted file mode 100644
index ab12df8c6724..000000000000
--- a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
+++ /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 the Mozilla SVG project.
- *
- * The Initial Developer of the Original Code is
- * Crocodile Clips Ltd..
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Alex Fritze <alex.fritze@crocodile-clips.com> (original author)
- *
- * 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 ***** */
-
-#ifndef __NS_ISVGGLYPHFRAGMENTLEAF_H__
-#define __NS_ISVGGLYPHFRAGMENTLEAF_H__
-
-#include "nsISVGGlyphFragmentNode.h"
-
-class nsIDOMSVGPoint;
-class nsIDOMSVGRect;
-class nsSVGTextPathFrame;
-namespace mozilla {
-class SVGUserUnitList;
-}
-
-class nsISVGGlyphFragmentLeaf : public nsISVGGlyphFragmentNode
-{
-public:
-  NS_DECL_QUERYFRAME_TARGET(nsISVGGlyphFragmentLeaf)
-
-  NS_IMETHOD GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval)=0;
-  NS_IMETHOD GetEndPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval)=0;
-  NS_IMETHOD GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retval)=0;
-  NS_IMETHOD GetRotationOfChar(PRUint32 charnum, float *_retval)=0;
-
-  NS_IMETHOD_(float) GetAdvance(PRBool aForceGlobalTransform)=0;
-
-  NS_IMETHOD_(void) SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransform)=0;
-  NS_IMETHOD_(nsSVGTextPathFrame*) FindTextPathParent()=0;
-  NS_IMETHOD_(PRBool) IsStartOfChunk()=0; // == is new absolutely positioned chunk.
-
-  NS_IMETHOD_(void) GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY)=0;
-  NS_IMETHOD_(void) SetStartIndex(PRUint32 aStartIndex)=0;
-  /*
-   * Returns inherited x and y values instead of parent element's attribute
-   * values.
-   */
-  NS_IMETHOD_(void) GetEffectiveXY(PRInt32 strLength,
-                                   nsTArray<float> &aX, nsTArray<float> &aY)=0;
-  /*
-   * Returns inherited dx and dy values instead of parent element's attribute
-   * values.
-   */
-  NS_IMETHOD_(void) GetEffectiveDxDy(PRInt32 strLength, 
-                                     nsTArray<float> &aDx,
-                                     nsTArray<float> &aDy)=0;
-  /*
-   * Returns inherited rotate values instead of parent element's attribute
-   * values.
-   */
-  NS_IMETHOD_(void) GetEffectiveRotate(PRInt32 strLength,
-                                       nsTArray<float> &aRotate)=0;
-  NS_IMETHOD_(PRUint16) GetTextAnchor()=0;
-  NS_IMETHOD_(PRBool) IsAbsolutelyPositioned()=0;
-  NS_IMETHOD_(PRBool) IsTextEmpty() const=0;
-  NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace)=0;
-  NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace)=0;
-  NS_IMETHOD_(PRBool) EndsWithWhitespace() const=0;
-  NS_IMETHOD_(PRBool) IsAllWhitespace() const=0;
-};
-
-#endif // __NS_ISVGGLYPHFRAGMENTLEAF_H__
diff --git a/layout/svg/base/src/nsISVGGlyphFragmentNode.h b/layout/svg/base/src/nsISVGGlyphFragmentNode.h
index 0a86b3e6092a..e31f607b3e76 100644
--- a/layout/svg/base/src/nsISVGGlyphFragmentNode.h
+++ b/layout/svg/base/src/nsISVGGlyphFragmentNode.h
@@ -42,7 +42,6 @@
 
 #include "nsQueryFrame.h"
 
-class nsISVGGlyphFragmentLeaf;
 class nsIDOMSVGPoint;
 
 class nsISVGGlyphFragmentNode : public nsQueryFrame
@@ -54,8 +53,8 @@ public:
   virtual float GetComputedTextLength()=0;
   virtual float GetSubStringLength(PRUint32 charnum, PRUint32 fragmentChars)=0;
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point)=0;
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment()=0;
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment()=0;
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame()=0;
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame()=0;
   NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace)=0;
 };
 
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index 05e3cea06aea..e47380733245 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -228,7 +228,6 @@ NS_IMPL_FRAMEARENA_HELPERS(nsSVGGlyphFrame)
 // nsQueryFrame methods
 
 NS_QUERYFRAME_HEAD(nsSVGGlyphFrame)
-  NS_QUERYFRAME_ENTRY(nsISVGGlyphFragmentLeaf)
   NS_QUERYFRAME_ENTRY(nsISVGGlyphFragmentNode)
   NS_QUERYFRAME_ENTRY(nsISVGChildFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsSVGGlyphFrameBase)
@@ -1033,9 +1032,9 @@ nsSVGGlyphFrame::GetHighlight(PRUint32 *charnum, PRUint32 *nchars,
 
 
 //----------------------------------------------------------------------
-// nsISVGGlyphFragmentLeaf interface:
+// Internal methods
 
-NS_IMETHODIMP_(void)
+void
 nsSVGGlyphFrame::SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransform)
 {
   float drawScale, metricsScale;
@@ -1102,7 +1101,7 @@ nsSVGGlyphFrame::SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransf
   }
 }
 
-NS_IMETHODIMP
+nsresult
 nsSVGGlyphFrame::GetStartPositionOfChar(PRUint32 charnum,
                                         nsIDOMSVGPoint **_retval)
 {
@@ -1116,7 +1115,7 @@ nsSVGGlyphFrame::GetStartPositionOfChar(PRUint32 charnum,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsSVGGlyphFrame::GetEndPositionOfChar(PRUint32 charnum,
                                       nsIDOMSVGPoint **_retval)
 {
@@ -1134,7 +1133,7 @@ nsSVGGlyphFrame::GetEndPositionOfChar(PRUint32 charnum,
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsSVGGlyphFrame::GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retval)
 {
   *_retval = nsnull;
@@ -1167,7 +1166,7 @@ nsSVGGlyphFrame::GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retval)
   return NS_NewSVGRect(_retval, tmpCtx->GetUserPathExtent());
 }
 
-NS_IMETHODIMP
+nsresult
 nsSVGGlyphFrame::GetRotationOfChar(PRUint32 charnum, float *_retval)
 {
   CharacterIterator iter(this, PR_FALSE);
@@ -1183,7 +1182,7 @@ nsSVGGlyphFrame::GetRotationOfChar(PRUint32 charnum, float *_retval)
   return NS_OK;
 }
 
-NS_IMETHODIMP_(float)
+float
 nsSVGGlyphFrame::GetAdvance(PRBool aForceGlobalTransform)
 {
   float drawScale, metricsScale;
@@ -1193,7 +1192,7 @@ nsSVGGlyphFrame::GetAdvance(PRBool aForceGlobalTransform)
   return GetSubStringAdvance(0, mTextRun->GetLength(), metricsScale);
 }
 
-NS_IMETHODIMP_(nsSVGTextPathFrame*) 
+nsSVGTextPathFrame*
 nsSVGGlyphFrame::FindTextPathParent()
 {
   /* check if we're the child of a textPath */
@@ -1209,7 +1208,7 @@ nsSVGGlyphFrame::FindTextPathParent()
   return nsnull;
 }
 
-NS_IMETHODIMP_(PRBool)
+PRBool
 nsSVGGlyphFrame::IsStartOfChunk()
 {
   // this fragment is a chunk if it has a corresponding absolute
@@ -1219,19 +1218,19 @@ nsSVGGlyphFrame::IsStartOfChunk()
   return PR_FALSE;
 }
 
-NS_IMETHODIMP_(void)
+void
 nsSVGGlyphFrame::GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY)
 {
   static_cast<nsSVGTextContainerFrame *>(mParent)->GetXY(aX, aY);
 }
 
-NS_IMETHODIMP_(void)
+void
 nsSVGGlyphFrame::SetStartIndex(PRUint32 aStartIndex)
 {
   mStartIndex = aStartIndex;
 }
 
-NS_IMETHODIMP_(void)
+void
 nsSVGGlyphFrame::GetEffectiveXY(PRInt32 strLength, nsTArray<float> &aX, nsTArray<float> &aY)
 {
   nsTArray<float> x, y;
@@ -1293,13 +1292,13 @@ nsSVGGlyphFrame::GetEffectiveRotate(PRInt32 strLength, nsTArray<float> &aRotate)
   }
 }
 
-NS_IMETHODIMP_(PRUint16)
+PRUint16
 nsSVGGlyphFrame::GetTextAnchor()
 {
   return GetStyleSVG()->mTextAnchor;
 }
 
-NS_IMETHODIMP_(PRBool)
+PRBool
 nsSVGGlyphFrame::IsAbsolutelyPositioned()
 {
   PRBool hasTextPathAncestor = PR_FALSE;
@@ -1416,24 +1415,24 @@ nsSVGGlyphFrame::GetCharNumAtPosition(nsIDOMSVGPoint *point)
   return last;
 }
 
-NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
-nsSVGGlyphFrame::GetFirstGlyphFragment()
+NS_IMETHODIMP_(nsSVGGlyphFrame *)
+nsSVGGlyphFrame::GetFirstGlyphFrame()
 {
-  nsISVGGlyphFragmentLeaf *leaf = this;
-  while (leaf && leaf->IsTextEmpty()) {
-    leaf = leaf->GetNextGlyphFragment();
+  nsSVGGlyphFrame *frame = this;
+  while (frame && frame->IsTextEmpty()) {
+    frame = frame->GetNextGlyphFrame();
   }
-  return leaf;
+  return frame;
 }
 
-NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
-nsSVGGlyphFrame::GetNextGlyphFragment()
+NS_IMETHODIMP_(nsSVGGlyphFrame *)
+nsSVGGlyphFrame::GetNextGlyphFrame()
 {
   nsIFrame* sibling = GetNextSibling();
   while (sibling) {
     nsISVGGlyphFragmentNode *node = do_QueryFrame(sibling);
     if (node)
-      return node->GetFirstGlyphFragment();
+      return node->GetFirstGlyphFrame();
     sibling = sibling->GetNextSibling();
   }
 
@@ -1441,10 +1440,10 @@ nsSVGGlyphFrame::GetNextGlyphFragment()
   
   NS_ASSERTION(GetParent(), "null parent");
   nsISVGGlyphFragmentNode *node = do_QueryFrame(GetParent());
-  return node ? node->GetNextGlyphFragment() : nsnull;
+  return node ? node->GetNextGlyphFrame() : nsnull;
 }
 
-NS_IMETHODIMP_(PRBool)
+PRBool
 nsSVGGlyphFrame::EndsWithWhitespace() const
 {
   const nsTextFragment* text = mContent->GetText();
@@ -1453,7 +1452,7 @@ nsSVGGlyphFrame::EndsWithWhitespace() const
   return NS_IsAsciiWhitespace(text->CharAt(text->GetLength() - 1));
 }
 
-NS_IMETHODIMP_(PRBool)
+PRBool
 nsSVGGlyphFrame::IsAllWhitespace() const
 {
   const nsTextFragment* text = mContent->GetText();
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index a54dd6ebbf9d..2cdeead84bf3 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -40,7 +40,7 @@
 #define __NS_SVGGLYPHFRAME_H__
 
 #include "nsSVGGeometryFrame.h"
-#include "nsISVGGlyphFragmentLeaf.h"
+#include "nsISVGGlyphFragmentNode.h"
 #include "nsISVGChildFrame.h"
 #include "gfxContext.h"
 #include "gfxFont.h"
@@ -49,6 +49,7 @@
 #include "nsSVGMatrix.h"
 
 class nsSVGTextFrame;
+class nsSVGTextPathFrame;
 class nsSVGGlyphFrame;
 class CharacterIterator;
 struct CharacterPosition;
@@ -56,7 +57,7 @@ struct CharacterPosition;
 typedef nsSVGGeometryFrame nsSVGGlyphFrameBase;
 
 class nsSVGGlyphFrame : public nsSVGGlyphFrameBase,
-                        public nsISVGGlyphFragmentLeaf, // : nsISVGGlyphFragmentNode
+                        public nsISVGGlyphFragmentNode,
                         public nsISVGChildFrame
 {
   friend nsIFrame*
@@ -80,6 +81,56 @@ public:
   NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS
 
+  // These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
+  nsresult GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval);
+  nsresult GetEndPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval);
+  nsresult GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retval);
+  nsresult GetRotationOfChar(PRUint32 charnum, float *_retval);
+  /**
+   * @param aForceGlobalTransform controls whether to use the
+   * global transform even when NS_STATE_NONDISPLAY_CHILD
+   */
+  float GetAdvance(PRBool aForceGlobalTransform);
+
+  void SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransform);
+  nsSVGTextPathFrame* FindTextPathParent();
+  PRBool IsStartOfChunk(); // == is new absolutely positioned chunk.
+
+  void GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY);
+  void SetStartIndex(PRUint32 aStartIndex);
+  /*
+   * Returns inherited x and y values instead of parent element's attribute
+   * values.
+   */
+  void GetEffectiveXY(PRInt32 strLength,
+                      nsTArray<float> &aX, nsTArray<float> &aY);
+  /*
+   * Returns inherited dx and dy values instead of parent element's attribute
+   * values.
+   */
+  void GetEffectiveDxDy(PRInt32 strLength, 
+                        nsTArray<float> &aDx,
+                        nsTArray<float> &aDy);
+  /*
+   * Returns inherited rotate values instead of parent element's attribute
+   * values.
+   */
+  void GetEffectiveRotate(PRInt32 strLength,
+                          nsTArray<float> &aRotate);
+  PRUint16 GetTextAnchor();
+  PRBool IsAbsolutelyPositioned();
+  PRBool IsTextEmpty() const {
+    return mContent->GetText()->GetLength() == 0;
+  }
+  void SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace) {
+    mTrimLeadingWhitespace = aTrimLeadingWhitespace;
+  }
+  void SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace) {
+    mTrimTrailingWhitespace = aTrimTrailingWhitespace;
+  }
+  PRBool EndsWithWhitespace() const;
+  PRBool IsAllWhitespace() const;
+
   // nsIFrame interface:
   NS_IMETHOD  CharacterDataChanged(CharacterDataChangeInfo* aInfo);
 
@@ -135,53 +186,14 @@ public:
   // nsSVGGeometryFrame methods
   gfxMatrix GetCanvasTM();
 
-  // nsISVGGlyphFragmentLeaf interface:
-  // These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
-  NS_IMETHOD GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval);
-  NS_IMETHOD GetEndPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval);
-  NS_IMETHOD GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retval);
-  NS_IMETHOD GetRotationOfChar(PRUint32 charnum, float *_retval);
-  /**
-   * @param aForceGlobalTransform controls whether to use the
-   * global transform even when NS_STATE_NONDISPLAY_CHILD
-   */
-  NS_IMETHOD_(float) GetAdvance(PRBool aForceGlobalTransform);
-
-  NS_IMETHOD_(void) SetGlyphPosition(gfxPoint *aPosition, PRBool aForceGlobalTransform);
-  NS_IMETHOD_(nsSVGTextPathFrame*) FindTextPathParent();
-  NS_IMETHOD_(PRBool) IsStartOfChunk(); // == is new absolutely positioned chunk.
-
-  NS_IMETHOD_(void) GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY);
-  NS_IMETHOD_(void) SetStartIndex(PRUint32 aStartIndex);
-  NS_IMETHOD_(void) GetEffectiveXY(PRInt32 strLength,
-                                   nsTArray<float> &aX, nsTArray<float> &aY);
-  NS_IMETHOD_(void) GetEffectiveDxDy(PRInt32 strLength, 
-                                     nsTArray<float> &aDx,
-                                     nsTArray<float> &aDy);
-  NS_IMETHOD_(void) GetEffectiveRotate(PRInt32 strLength,
-                                       nsTArray<float> &aRotate);
-  NS_IMETHOD_(PRUint16) GetTextAnchor();
-  NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();
-  NS_IMETHOD_(PRBool) IsTextEmpty() const {
-    return mContent->GetText()->GetLength() == 0;
-  }
-  NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace) {
-    mTrimLeadingWhitespace = aTrimLeadingWhitespace;
-  }
-  NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace) {
-    mTrimTrailingWhitespace = aTrimTrailingWhitespace;
-  }
-  NS_IMETHOD_(PRBool) EndsWithWhitespace() const;
-  NS_IMETHOD_(PRBool) IsAllWhitespace() const;
-
   // nsISVGGlyphFragmentNode interface:
   // These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
   virtual PRUint32 GetNumberOfChars();
   virtual float GetComputedTextLength();
   virtual float GetSubStringLength(PRUint32 charnum, PRUint32 fragmentChars);
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point);
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment();
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment();
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame();
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame();
   NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace) {
     mCompressWhitespace = aCompressWhitespace;
   }
diff --git a/layout/svg/base/src/nsSVGTSpanFrame.cpp b/layout/svg/base/src/nsSVGTSpanFrame.cpp
index 14dce0a5a28a..ef2969559283 100644
--- a/layout/svg/base/src/nsSVGTSpanFrame.cpp
+++ b/layout/svg/base/src/nsSVGTSpanFrame.cpp
@@ -154,31 +154,31 @@ nsSVGTSpanFrame::GetCharNumAtPosition(nsIDOMSVGPoint *point)
   return nsSVGTSpanFrameBase::GetCharNumAtPosition(point);
 }
 
-NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
-nsSVGTSpanFrame::GetFirstGlyphFragment()
+NS_IMETHODIMP_(nsSVGGlyphFrame *)
+nsSVGTSpanFrame::GetFirstGlyphFrame()
 {
   // try children first:
   nsIFrame* kid = mFrames.FirstChild();
   while (kid) {
     nsISVGGlyphFragmentNode *node = do_QueryFrame(kid);
     if (node)
-      return node->GetFirstGlyphFragment();
+      return node->GetFirstGlyphFrame();
     kid = kid->GetNextSibling();
   }
 
   // nope. try siblings:
-  return GetNextGlyphFragment();
+  return GetNextGlyphFrame();
 
 }
 
-NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
-nsSVGTSpanFrame::GetNextGlyphFragment()
+NS_IMETHODIMP_(nsSVGGlyphFrame *)
+nsSVGTSpanFrame::GetNextGlyphFrame()
 {
   nsIFrame* sibling = GetNextSibling();
   while (sibling) {
     nsISVGGlyphFragmentNode *node = do_QueryFrame(sibling);
     if (node)
-      return node->GetFirstGlyphFragment();
+      return node->GetFirstGlyphFrame();
     sibling = sibling->GetNextSibling();
   }
 
@@ -186,7 +186,7 @@ nsSVGTSpanFrame::GetNextGlyphFragment()
   
   NS_ASSERTION(GetParent(), "null parent");
   nsISVGGlyphFragmentNode *node = do_QueryFrame(GetParent());
-  return node ? node->GetNextGlyphFragment() : nsnull;
+  return node ? node->GetNextGlyphFrame() : nsnull;
 }
 
 NS_IMETHODIMP_(void)
diff --git a/layout/svg/base/src/nsSVGTSpanFrame.h b/layout/svg/base/src/nsSVGTSpanFrame.h
index 4001ceee5559..034429d864e8 100644
--- a/layout/svg/base/src/nsSVGTSpanFrame.h
+++ b/layout/svg/base/src/nsSVGTSpanFrame.h
@@ -90,8 +90,8 @@ public:
   virtual float GetComputedTextLength();
   virtual float GetSubStringLength(PRUint32 charnum, PRUint32 fragmentChars);
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point);
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment();
-  NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment();
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetFirstGlyphFrame();
+  NS_IMETHOD_(nsSVGGlyphFrame *) GetNextGlyphFrame();
   NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace);
 };
 
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.cpp b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
index a58616ceb22f..15c34b59045c 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
@@ -42,7 +42,7 @@
 #include "nsIDOMSVGAnimatedLengthList.h"
 #include "SVGAnimatedNumberList.h"
 #include "SVGNumberList.h"
-#include "nsISVGGlyphFragmentLeaf.h"
+#include "nsSVGGlyphFrame.h"
 #include "nsDOMError.h"
 #include "SVGLengthList.h"
 #include "nsSVGTextPositioningElement.h"
@@ -136,12 +136,12 @@ nsSVGTextContainerFrame::GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint
   }
 
   PRUint32 offset;
-  nsISVGGlyphFragmentLeaf *fragment = GetGlyphFragmentAtCharNum(node, charnum, &offset);
-  if (!fragment) {
+  nsSVGGlyphFrame *frame = GetGlyphFrameAtCharNum(node, charnum, &offset);
+  if (!frame) {
     return NS_ERROR_FAILURE;
   }
 
-  return fragment->GetStartPositionOfChar(charnum - offset, _retval);
+  return frame->GetStartPositionOfChar(charnum - offset, _retval);
 }
 
 NS_IMETHODIMP
@@ -159,12 +159,12 @@ nsSVGTextContainerFrame::GetEndPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint *
   }
 
   PRUint32 offset;
-  nsISVGGlyphFragmentLeaf *fragment = GetGlyphFragmentAtCharNum(node, charnum, &offset);
-  if (!fragment) {
+  nsSVGGlyphFrame *frame = GetGlyphFrameAtCharNum(node, charnum, &offset);
+  if (!frame) {
     return NS_ERROR_FAILURE;
   }
 
-  return fragment->GetEndPositionOfChar(charnum - offset, _retval);
+  return frame->GetEndPositionOfChar(charnum - offset, _retval);
 }
 
 NS_IMETHODIMP
@@ -182,12 +182,12 @@ nsSVGTextContainerFrame::GetExtentOfChar(PRUint32 charnum, nsIDOMSVGRect **_retv
   }
 
   PRUint32 offset;
-  nsISVGGlyphFragmentLeaf *fragment = GetGlyphFragmentAtCharNum(node, charnum, &offset);
-  if (!fragment) {
+  nsSVGGlyphFrame *frame = GetGlyphFrameAtCharNum(node, charnum, &offset);
+  if (!frame) {
     return NS_ERROR_FAILURE;
   }
 
-  return fragment->GetExtentOfChar(charnum - offset, _retval);
+  return frame->GetExtentOfChar(charnum - offset, _retval);
 }
 
 NS_IMETHODIMP
@@ -205,12 +205,12 @@ nsSVGTextContainerFrame::GetRotationOfChar(PRUint32 charnum, float *_retval)
   }
 
   PRUint32 offset;
-  nsISVGGlyphFragmentLeaf *fragment = GetGlyphFragmentAtCharNum(node, charnum, &offset);
-  if (!fragment) {
+  nsSVGGlyphFrame *frame = GetGlyphFrameAtCharNum(node, charnum, &offset);
+  if (!frame) {
     return NS_ERROR_FAILURE;
   }
 
-  return fragment->GetRotationOfChar(charnum - offset, _retval);
+  return frame->GetRotationOfChar(charnum - offset, _retval);
 }
 
 PRUint32
@@ -323,21 +323,21 @@ nsSVGTextContainerFrame::GetNextGlyphFragmentChildNode(nsISVGGlyphFragmentNode *
 // Private functions
 // -------------------------------------------------------------------------
 
-nsISVGGlyphFragmentLeaf *
-nsSVGTextContainerFrame::GetGlyphFragmentAtCharNum(nsISVGGlyphFragmentNode* node,
-                                                   PRUint32 charnum,
-                                                   PRUint32 *offset)
+nsSVGGlyphFrame *
+nsSVGTextContainerFrame::GetGlyphFrameAtCharNum(nsISVGGlyphFragmentNode* node,
+                                                PRUint32 charnum,
+                                                PRUint32 *offset)
 {
-  nsISVGGlyphFragmentLeaf *fragment = node->GetFirstGlyphFragment();
+  nsSVGGlyphFrame *frame = node->GetFirstGlyphFrame();
   *offset = 0;
   
-  while (fragment) {
-    PRUint32 count = fragment->GetNumberOfChars();
+  while (frame) {
+    PRUint32 count = frame->GetNumberOfChars();
     if (count > charnum)
-      return fragment;
+      return frame;
     charnum -= count;
     *offset += count;
-    fragment = fragment->GetNextGlyphFragment();
+    frame = frame->GetNextGlyphFrame();
   }
 
   // not found
@@ -450,10 +450,10 @@ nsSVGTextContainerFrame::BuildPositionList(PRUint32 aOffset,
   nsIFrame* kid = mFrames.FirstChild();
   while (kid) {
     nsSVGTextContainerFrame *text = do_QueryFrame(kid);
-    nsISVGGlyphFragmentLeaf *leaf = do_QueryFrame(kid);
     if (text) {
       startIndex += text->BuildPositionList(startIndex, aDepth + 1);
-    } else if (leaf) {
+    } else if (kid->GetType() == nsGkAtoms::svgGlyphFrame) {
+      nsSVGGlyphFrame *leaf = static_cast<nsSVGGlyphFrame*>(kid);
       leaf->SetStartIndex(startIndex);
       startIndex += leaf->GetNumberOfChars();
     }
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.h b/layout/svg/base/src/nsSVGTextContainerFrame.h
index 93488affab3e..c51e54c993fd 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.h
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.h
@@ -40,8 +40,8 @@
 #include "nsSVGContainerFrame.h"
 
 class nsISVGGlyphFragmentNode;
-class nsISVGGlyphFragmentLeaf;
 class nsSVGTextFrame;
+class nsSVGGlyphFrame;
 
 class nsSVGTextContainerFrame : public nsSVGDisplayContainerFrame
 {
@@ -119,12 +119,12 @@ protected:
   void SetWhitespaceCompression();
 private:
   /*
-   * Returns the glyph fragment containing a particular character
+   * Returns the glyph frame containing a particular character
    */
-  static nsISVGGlyphFragmentLeaf *
-  GetGlyphFragmentAtCharNum(nsISVGGlyphFragmentNode* node,
-                            PRUint32 charnum,
-                            PRUint32 *offset);
+  static nsSVGGlyphFrame *
+  GetGlyphFrameAtCharNum(nsISVGGlyphFragmentNode* node,
+                         PRUint32 charnum,
+                         PRUint32 *offset);
 
   /*
    * Returns the text frame ancestor of this frame (or the frame itself
diff --git a/layout/svg/base/src/nsSVGTextFrame.cpp b/layout/svg/base/src/nsSVGTextFrame.cpp
index 13fa67125375..ae3726077f99 100644
--- a/layout/svg/base/src/nsSVGTextFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextFrame.cpp
@@ -43,7 +43,7 @@
 #include "nsIDOMSVGLength.h"
 #include "nsIDOMSVGAnimatedNumber.h"
 #include "nsISVGGlyphFragmentNode.h"
-#include "nsISVGGlyphFragmentLeaf.h"
+#include "nsSVGGlyphFrame.h"
 #include "nsSVGOuterSVGFrame.h"
 #include "nsIDOMSVGRect.h"
 #include "nsSVGRect.h"
@@ -295,26 +295,25 @@ nsSVGTextFrame::NotifyGlyphMetricsChange()
 }
 
 void
-nsSVGTextFrame::SetWhitespaceHandling(
-  nsISVGGlyphFragmentLeaf *fragment)
+nsSVGTextFrame::SetWhitespaceHandling(nsSVGGlyphFrame *aFrame)
 {
   SetWhitespaceCompression();
 
   PRBool trimLeadingWhitespace = PR_TRUE;
-  nsISVGGlyphFragmentLeaf* lastNonWhitespaceFragment = fragment;
+  nsSVGGlyphFrame* lastNonWhitespaceFrame = aFrame;
 
-  while (fragment) {
-    if (!fragment->IsAllWhitespace()) {
-      lastNonWhitespaceFragment = fragment;
+  while (aFrame) {
+    if (!aFrame->IsAllWhitespace()) {
+      lastNonWhitespaceFrame = aFrame;
     }
 
-    fragment->SetTrimLeadingWhitespace(trimLeadingWhitespace);
-    trimLeadingWhitespace = fragment->EndsWithWhitespace();
+    aFrame->SetTrimLeadingWhitespace(trimLeadingWhitespace);
+    trimLeadingWhitespace = aFrame->EndsWithWhitespace();
 
-    fragment = fragment->GetNextGlyphFragment();
+    aFrame = aFrame->GetNextGlyphFrame();
   }
 
-  lastNonWhitespaceFragment->SetTrimTrailingWhitespace(PR_TRUE);
+  lastNonWhitespaceFrame->SetTrimTrailingWhitespace(PR_TRUE);
 }
 
 void
@@ -329,26 +328,26 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
   if (!node)
     return;
 
-  nsISVGGlyphFragmentLeaf *fragment, *firstFragment;
+  nsSVGGlyphFrame *frame, *firstFrame;
 
-  firstFragment = node->GetFirstGlyphFragment();
-  if (!firstFragment) {
+  firstFrame = node->GetFirstGlyphFrame();
+  if (!firstFrame) {
     return;
   }
 
-  SetWhitespaceHandling(firstFragment);
+  SetWhitespaceHandling(firstFrame);
 
   BuildPositionList(0, 0);
 
   gfxPoint ctp(0.0, 0.0);
 
   // loop over chunks
-  while (firstFragment) {
-    nsSVGTextPathFrame *textPath = firstFragment->FindTextPathParent();
+  while (firstFrame) {
+    nsSVGTextPathFrame *textPath = firstFrame->FindTextPathParent();
 
     nsTArray<float> effectiveXList, effectiveYList;
-    firstFragment->GetEffectiveXY(firstFragment->GetNumberOfChars(),
-                                  effectiveXList, effectiveYList);
+    firstFrame->GetEffectiveXY(firstFrame->GetNumberOfChars(),
+                               effectiveXList, effectiveYList);
     if (!effectiveXList.IsEmpty()) ctp.x = effectiveXList[0];
     if (!textPath && !effectiveYList.IsEmpty()) ctp.y = effectiveYList[0];
 
@@ -363,7 +362,7 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
 
     // determine x offset based on text_anchor:
   
-    PRUint8 anchor = firstFragment->GetTextAnchor();
+    PRUint8 anchor = firstFrame->GetTextAnchor();
 
     /**
      * XXXsmontagu: The SVG spec is very vague as to how 'text-anchor'
@@ -402,11 +401,11 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
     if (anchor != NS_STYLE_TEXT_ANCHOR_START) {
       // need to get the total chunk length
     
-      fragment = firstFragment;
-      while (fragment) {
-        chunkLength += fragment->GetAdvance(aForceGlobalTransform);
-        fragment = fragment->GetNextGlyphFragment();
-        if (fragment && fragment->IsAbsolutelyPositioned())
+      frame = firstFrame;
+      while (frame) {
+        chunkLength += frame->GetAdvance(aForceGlobalTransform);
+        frame = frame->GetNextGlyphFrame();
+        if (frame && frame->IsAbsolutelyPositioned())
           break;
       }
     }
@@ -416,17 +415,17 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
     else if (anchor == NS_STYLE_TEXT_ANCHOR_END)
       ctp.x -= chunkLength;
   
-    // set position of each fragment in this chunk:
+    // set position of each frame in this chunk:
   
-    fragment = firstFragment;
-    while (fragment) {
+    frame = firstFrame;
+    while (frame) {
 
-      fragment->SetGlyphPosition(&ctp, aForceGlobalTransform);
-      fragment = fragment->GetNextGlyphFragment();
-      if (fragment && fragment->IsAbsolutelyPositioned())
+      frame->SetGlyphPosition(&ctp, aForceGlobalTransform);
+      frame = frame->GetNextGlyphFrame();
+      if (frame && frame->IsAbsolutelyPositioned())
         break;
     }
-    firstFragment = fragment;
+    firstFrame = frame;
   }
   nsSVGUtils::UpdateGraphic(this);
 }
diff --git a/layout/svg/base/src/nsSVGTextFrame.h b/layout/svg/base/src/nsSVGTextFrame.h
index 0805324463d4..15dbd44ed3f3 100644
--- a/layout/svg/base/src/nsSVGTextFrame.h
+++ b/layout/svg/base/src/nsSVGTextFrame.h
@@ -121,7 +121,7 @@ private:
    */
   void UpdateGlyphPositioning(PRBool aForceGlobalTransform);
 
-  void SetWhitespaceHandling(nsISVGGlyphFragmentLeaf *fragment);
+  void SetWhitespaceHandling(nsSVGGlyphFrame *aFrame);
 
   nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
 
diff --git a/layout/svg/base/src/nsSVGUtils.cpp b/layout/svg/base/src/nsSVGUtils.cpp
index 6245f0f882b8..fc2e392f78a2 100644
--- a/layout/svg/base/src/nsSVGUtils.cpp
+++ b/layout/svg/base/src/nsSVGUtils.cpp
@@ -49,7 +49,6 @@
 #include "nsIURI.h"
 #include "nsStyleStruct.h"
 #include "nsIPresShell.h"
-#include "nsISVGGlyphFragmentLeaf.h"
 #include "nsNetUtil.h"
 #include "nsFrameList.h"
 #include "nsISVGChildFrame.h"

From 203e0039002774febcd6d643aedefcf19b02a8ff Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 8 May 2011 10:29:59 +0200
Subject: [PATCH 013/314] Bug 655480 - Remove WinCE code from memory/* ;
 r=pbiggar

---
 memory/Makefile.in          |   5 --
 memory/jemalloc/jemalloc.c  | 121 ++----------------------------------
 memory/mozalloc/Makefile.in |   8 +--
 3 files changed, 6 insertions(+), 128 deletions(-)

diff --git a/memory/Makefile.in b/memory/Makefile.in
index 5bd1c4e21fbb..408d49f6f515 100644
--- a/memory/Makefile.in
+++ b/memory/Makefile.in
@@ -47,11 +47,6 @@ ifdef MOZ_MEMORY
 DIRS += jemalloc
 endif
 
-ifdef WINCE
-# mozalloc depends on the shunt
-DIRS += $(DEPTH)/build/wince/shunt
-endif
-
 DIRS += mozalloc
 
 include $(topsrcdir)/config/rules.mk
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index 8ce2fe1c0e68..1391fb0f7b17 100644
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -195,27 +195,20 @@
 #endif
 #endif
 
-#ifndef MOZ_MEMORY_WINCE
 #include <sys/types.h>
 
 #include <errno.h>
 #include <stdlib.h>
-#endif
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
 #ifdef MOZ_MEMORY_WINDOWS
-#ifndef MOZ_MEMORY_WINCE
+
 #include <cruntime.h>
 #include <internal.h>
 #include <io.h>
-#else
-#include <cmnintrin.h>
-#include <crtdefs.h>
-#define SIZE_MAX UINT_MAX
-#endif
 #include <windows.h>
 
 #pragma warning( disable: 4267 4996 4146 )
@@ -234,14 +227,9 @@ static unsigned long tlsIndex = 0xffffffff;
 #endif 
 
 #define	__thread
-#ifdef MOZ_MEMORY_WINCE
-#define	_pthread_self() GetCurrentThreadId()
-#else
 #define	_pthread_self() __threadid()
-#endif
 #define	issetugid() 0
 
-#ifndef MOZ_MEMORY_WINCE
 /* use MSVC intrinsics */
 #pragma intrinsic(_BitScanForward)
 static __forceinline int
@@ -270,19 +258,6 @@ getenv(const char *name)
 	return (NULL);
 }
 
-#else /* WIN CE */
-
-#define ENOMEM          12
-#define EINVAL          22
-
-static __forceinline int
-ffs(int x)
-{
-
-	return 32 - _CountLeadingZeros((-x) & x);
-}
-#endif
-
 typedef unsigned char uint8_t;
 typedef unsigned uint32_t;
 typedef unsigned long long uint64_t;
@@ -433,10 +408,6 @@ static const bool __isthreaded = true;
 #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
 #endif
 
-#if defined(MOZ_MEMORY_WINCE) && !defined(MOZ_MEMORY_WINCE6)
-#define JEMALLOC_USES_MAP_ALIGN	 /* Required for Windows CE < 6 */
-#endif
-
 #define __DECONST(type, var) ((type)(uintptr_t)(const void *)(var))
 
 #ifdef MOZ_MEMORY_WINDOWS
@@ -534,11 +505,7 @@ static const bool __isthreaded = true;
  * Size and alignment of memory chunks that are allocated by the OS's virtual
  * memory system.
  */
-#if defined(MOZ_MEMORY_WINCE) && !defined(MOZ_MEMORY_WINCE6)
-#define	CHUNK_2POW_DEFAULT	21
-#else
 #define	CHUNK_2POW_DEFAULT	20
-#endif
 /* Maximum number of dirty pages per arena. */
 #define	DIRTY_MAX_DEFAULT	(1U << 10)
 
@@ -1334,17 +1301,6 @@ umax2s(uintmax_t x, char *s)
 static void
 wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
 {
-#ifdef MOZ_MEMORY_WINCE
-       wchar_t buf[1024];
-#define WRT_PRINT(s) \
-       MultiByteToWideChar(CP_ACP, 0, s, -1, buf, 1024); \
-       OutputDebugStringW(buf)
-
-       WRT_PRINT(p1);
-       WRT_PRINT(p2);
-       WRT_PRINT(p3);
-       WRT_PRINT(p4);
-#else
 #if defined(MOZ_MEMORY) && !defined(MOZ_MEMORY_WINDOWS)
 #define	_write	write
 #endif
@@ -1352,8 +1308,6 @@ wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
 	_write(STDERR_FILENO, p2, (unsigned int) strlen(p2));
 	_write(STDERR_FILENO, p3, (unsigned int) strlen(p3));
 	_write(STDERR_FILENO, p4, (unsigned int) strlen(p4));
-#endif
-
 }
 
 #define _malloc_message malloc_message
@@ -1385,9 +1339,7 @@ void	(*_malloc_message)(const char *p1, const char *p2, const char *p3,
 static bool
 malloc_mutex_init(malloc_mutex_t *mutex)
 {
-#if defined(MOZ_MEMORY_WINCE)
-	InitializeCriticalSection(mutex);
-#elif defined(MOZ_MEMORY_WINDOWS)
+#if defined(MOZ_MEMORY_WINDOWS)
 	if (__isthreaded)
 		if (! __crtInitCritSecAndSpinCount(mutex, _CRT_SPINCOUNT))
 			return (true);
@@ -1449,9 +1401,7 @@ malloc_mutex_unlock(malloc_mutex_t *mutex)
 static bool
 malloc_spin_init(malloc_spinlock_t *lock)
 {
-#if defined(MOZ_MEMORY_WINCE)
-	InitializeCriticalSection(lock);
-#elif defined(MOZ_MEMORY_WINDOWS)
+#if defined(MOZ_MEMORY_WINDOWS)
 	if (__isthreaded)
 		if (! __crtInitCritSecAndSpinCount(lock, _CRT_SPINCOUNT))
 			return (true);
@@ -1732,7 +1682,6 @@ _getprogname(void)
 static void
 malloc_printf(const char *format, ...)
 {
-#ifndef WINCE
 	char buf[4096];
 	va_list ap;
 
@@ -1740,7 +1689,6 @@ malloc_printf(const char *format, ...)
 	vsnprintf(buf, sizeof(buf), format, ap);
 	va_end(ap);
 	_malloc_message(buf, "", "", "");
-#endif
 }
 #endif
 
@@ -2094,64 +2042,13 @@ rb_wrap(static, extent_tree_ad_, extent_tree_t, extent_node_t, link_ad,
  */
 
 #ifdef MOZ_MEMORY_WINDOWS
-#ifdef MOZ_MEMORY_WINCE
-#define ALIGN_ADDR2OFFSET(al, ad) \
-	((uintptr_t)ad & (al - 1))
-static void *
-pages_map_align(size_t size, int pfd, size_t alignment)
-{
-	
-	void *ret; 
-	int offset;
-	if (size % alignment)
-		size += (alignment - (size % alignment));
-	assert(size >= alignment);
-	ret = pages_map(NULL, size, pfd);
-	offset = ALIGN_ADDR2OFFSET(alignment, ret);
-	if (offset) {  
-		/* try to over allocate by the ammount we're offset */
-		void *tmp;
-		pages_unmap(ret, size);
-		tmp = VirtualAlloc(NULL, size + alignment - offset, 
-					 MEM_RESERVE, PAGE_NOACCESS);
-		if (offset == ALIGN_ADDR2OFFSET(alignment, tmp))
-			ret = VirtualAlloc((void*)((intptr_t)tmp + alignment 
-						   - offset), size, MEM_COMMIT,
-					   PAGE_READWRITE);
-		else 
-			VirtualFree(tmp, 0, MEM_RELEASE);
-		offset = ALIGN_ADDR2OFFSET(alignment, ret);
-		
-	
-		if (offset) {  
-			/* over allocate to ensure we have an aligned region */
-			ret = VirtualAlloc(NULL, size + alignment, MEM_RESERVE, 
-					   PAGE_NOACCESS);
-			offset = ALIGN_ADDR2OFFSET(alignment, ret);
-			ret = VirtualAlloc((void*)((intptr_t)ret + 
-						   alignment - offset),
-					   size, MEM_COMMIT, PAGE_READWRITE);
-		}
-	}
-	return (ret);
-}
-#endif
 
 static void *
 pages_map(void *addr, size_t size, int pfd)
 {
 	void *ret = NULL;
-#if defined(MOZ_MEMORY_WINCE) && !defined(MOZ_MEMORY_WINCE6)
-	void *va_ret;
-	assert(addr == NULL);
-	va_ret = VirtualAlloc(addr, size, MEM_RESERVE, PAGE_NOACCESS);
-	if (va_ret)
-		ret = VirtualAlloc(va_ret, size, MEM_COMMIT, PAGE_READWRITE);
-	assert(va_ret == ret);
-#else
 	ret = VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE,
 	    PAGE_READWRITE);
-#endif
 	return (ret);
 }
 
@@ -2159,14 +2056,6 @@ static void
 pages_unmap(void *addr, size_t size)
 {
 	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
-#if defined(MOZ_MEMORY_WINCE) && !defined(MOZ_MEMORY_WINCE6)
-		if (GetLastError() == ERROR_INVALID_PARAMETER) {
-			MEMORY_BASIC_INFORMATION info;
-			VirtualQuery(addr, &info, sizeof(info));
-			if (VirtualFree(info.AllocationBase, 0, MEM_RELEASE))
-				return;
-		}
-#endif
 		_malloc_message(_getprogname(),
 		    ": (malloc) Error in VirtualFree()\n", "", "");
 		if (opt_abort)
@@ -5231,7 +5120,7 @@ malloc_print_stats(void)
  * implementation has to take pains to avoid infinite recursion during
  * initialization.
  */
-#if (defined(MOZ_MEMORY_WINDOWS) || defined(MOZ_MEMORY_DARWIN)) && !defined(MOZ_MEMORY_WINCE)
+#if (defined(MOZ_MEMORY_WINDOWS) || defined(MOZ_MEMORY_DARWIN))
 #define	malloc_init() false
 #else
 static inline bool
@@ -5245,7 +5134,7 @@ malloc_init(void)
 }
 #endif
 
-#if !defined(MOZ_MEMORY_WINDOWS) || defined(MOZ_MEMORY_WINCE) 
+#if !defined(MOZ_MEMORY_WINDOWS)
 static
 #endif
 bool
diff --git a/memory/mozalloc/Makefile.in b/memory/mozalloc/Makefile.in
index 2cfd6ee4e2b8..80e22dc62251 100644
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -67,12 +67,6 @@ endif
 endif
 endif
 
-ifeq (,$(filter-out WINCE,$(OS_ARCH)))
-# mozalloc gets its allocation methods from the shunt, which gets their 
-# implementation by direcly linking with jemalloc.obj
-OS_LIBS		=
-endif
-
 ifeq (,$(filter-out OS2,$(OS_ARCH)))
 # The strndup declaration in string.h is in an ifdef __USE_GNU section
 DEFINES		+= -D_GNU_SOURCE
@@ -114,7 +108,7 @@ endif #}
 endif #}
 endif #}
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)

From d48f3abda24d4a73248de8bc3a4a638877164a89 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sun, 8 May 2011 10:30:06 +0200
Subject: [PATCH 014/314] Bug 655496 - Remove WinCE code from Mozilla owned
 parts of media/* ; r=kinetik

---
 media/libsydneyaudio/src/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/libsydneyaudio/src/Makefile.in b/media/libsydneyaudio/src/Makefile.in
index ee94ba53cc3c..9bc528a18318 100644
--- a/media/libsydneyaudio/src/Makefile.in
+++ b/media/libsydneyaudio/src/Makefile.in
@@ -61,7 +61,7 @@ CSRCS		= \
 		$(NULL)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 CSRCS		= \
 		sydney_audio_waveapi.c \
 		$(NULL)

From e6d71c2141cad9d5dead32328e800bc329db6e1e Mon Sep 17 00:00:00 2001
From: "Ms2ger@gmail.com" <Ms2ger@gmail.com>
Date: Sun, 8 May 2011 10:33:18 +0200
Subject: [PATCH 015/314] Bug 572652 - Remove the Accept-Charset header from
 HTTP requests. r=bz

---
 .../src/nsSeamonkeyProfileMigrator.cpp        |   1 -
 docshell/base/nsDocShell.cpp                  |   2 -
 modules/libpref/src/init/all.js               |   1 -
 netwerk/protocol/http/nsHttpHandler.cpp       | 149 ------------------
 netwerk/protocol/http/nsHttpHandler.h         |   2 -
 5 files changed, 155 deletions(-)

diff --git a/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp b/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
index 35eb877ef3f1..447c2b57f23f 100644
--- a/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/browser/components/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -393,7 +393,6 @@ nsSeamonkeyProfileMigrator::PrefTransform gTransforms[] = {
   MAKESAMETYPEPREFTRANSFORM("browser.display.use_document_fonts",       Bool),
   MAKESAMETYPEPREFTRANSFORM("intl.charset.default",                     String),
   MAKESAMETYPEPREFTRANSFORM("intl.accept_languages",                    String),
-  MAKESAMETYPEPREFTRANSFORM("intl.accept_charsets",                     String),
 
   MAKEPREFTRANSFORM("network.image.imageBehavior",      0, Int, Image),
   MAKEPREFTRANSFORM("network.cookie.cookieBehavior",    0, Int, Cookie),
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 7223a4e6d338..31eabfc76b20 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -585,8 +585,6 @@ SendPing(void *closure, nsIContent *content, nsIURI *uri, nsIIOService *ios)
                              EmptyCString(), PR_FALSE);
   httpChan->SetRequestHeader(NS_LITERAL_CSTRING("accept-language"),
                              EmptyCString(), PR_FALSE);
-  httpChan->SetRequestHeader(NS_LITERAL_CSTRING("accept-charset"),
-                             EmptyCString(), PR_FALSE);
   httpChan->SetRequestHeader(NS_LITERAL_CSTRING("accept-encoding"),
                              EmptyCString(), PR_FALSE);
 
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index c4cbde0ef49a..fcf7fb9eba4f 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1018,7 +1018,6 @@ pref("converter.html2txt.structs",          true); // Output structured phrases
 pref("converter.html2txt.header_strategy",  1); // 0 = no indention; 1 = indention, increased with header level; 2 = numbering and slight indention
 
 pref("intl.accept_languages",               "chrome://global/locale/intl.properties");
-pref("intl.accept_charsets",                "iso-8859-1,*,utf-8");
 pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
 pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.static",     "chrome://global/locale/intl.properties");
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index baf2e99ca504..402cfc6d7e8a 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -122,7 +122,6 @@ static NS_DEFINE_CID(kSocketProviderServiceCID, NS_SOCKETPROVIDERSERVICE_CID);
 
 #define HTTP_PREF_PREFIX        "network.http."
 #define INTL_ACCEPT_LANGUAGES   "intl.accept_languages"
-#define INTL_ACCEPT_CHARSET     "intl.charset.default"
 #define NETWORK_ENABLEIDN       "network.enableIDN"
 #define BROWSER_PREF_PREFIX     "browser.cache."
 #define DONOTTRACK_HEADER_ENABLED "privacy.donottrackheader.enabled"
@@ -255,7 +254,6 @@ nsHttpHandler::Init()
         prefBranch->AddObserver(HTTP_PREF_PREFIX, this, PR_TRUE);
         prefBranch->AddObserver(UA_PREF_PREFIX, this, PR_TRUE);
         prefBranch->AddObserver(INTL_ACCEPT_LANGUAGES, this, PR_TRUE); 
-        prefBranch->AddObserver(INTL_ACCEPT_CHARSET, this, PR_TRUE);
         prefBranch->AddObserver(NETWORK_ENABLEIDN, this, PR_TRUE);
         prefBranch->AddObserver(BROWSER_PREF("disk_cache_ssl"), this, PR_TRUE);
         prefBranch->AddObserver(DONOTTRACK_HEADER_ENABLED, this, PR_TRUE);
@@ -376,10 +374,6 @@ nsHttpHandler::AddStandardRequestHeaders(nsHttpHeaderArray *request,
     rv = request->SetHeader(nsHttp::Accept_Encoding, mAcceptEncodings);
     if (NS_FAILED(rv)) return rv;
 
-    // Add the "Accept-Charset" header
-    rv = request->SetHeader(nsHttp::Accept_Charset, mAcceptCharsets);
-    if (NS_FAILED(rv)) return rv;
-
     // RFC2616 section 19.6.2 states that the "Connection: keep-alive"
     // and "Keep-alive" request headers should not be sent by HTTP/1.1
     // user-agents.  Otherwise, problems with proxy servers (especially
@@ -1083,19 +1077,6 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
         } 
     }
 
-    if (PREF_CHANGED(INTL_ACCEPT_CHARSET)) {
-        nsCOMPtr<nsIPrefLocalizedString> pls;
-        prefs->GetComplexValue(INTL_ACCEPT_CHARSET,
-                                NS_GET_IID(nsIPrefLocalizedString),
-                                getter_AddRefs(pls));
-        if (pls) {
-            nsXPIDLString uval;
-            pls->ToString(getter_Copies(uval));
-            if (uval)
-                SetAcceptCharsets(NS_ConvertUTF16toUTF8(uval).get());
-        } 
-    }
-
     //
     // IDN options
     //
@@ -1215,136 +1196,6 @@ nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages)
     return rv;
 }
 
-/**
- *  Allocates a C string into that contains a character set/encoding list
- *  notated with HTTP "q" values for output with a HTTP Accept-Charset
- *  header. If the UTF-8 character set is not present, it will be added.
- *  If a wildcard catch-all is not present, it will be added. If more than
- *  one charset is set (as of 2001-02-07, only one is used), they will be
- *  comma delimited and with q values set for each charset in decending order.
- *
- *  Ex: passing: "euc-jp"
- *      returns: "euc-jp,utf-8;q=0.6,*;q=0.6"
- *
- *      passing: "UTF-8"
- *      returns: "UTF-8, *"
- */
-static nsresult
-PrepareAcceptCharsets(const char *i_AcceptCharset, nsACString &o_AcceptCharset)
-{
-    PRUint32 n, size, wrote, u;
-    PRInt32 available;
-    double q, dec;
-    char *p, *p2, *token, *q_Accept, *o_Accept;
-    const char *acceptable, *comma;
-    PRBool add_utf = PR_FALSE;
-    PRBool add_asterisk = PR_FALSE;
-
-    if (!i_AcceptCharset)
-        acceptable = "";
-    else
-        acceptable = i_AcceptCharset;
-    o_Accept = nsCRT::strdup(acceptable);
-    if (nsnull == o_Accept)
-        return NS_ERROR_OUT_OF_MEMORY;
-    for (p = o_Accept, n = size = 0; '\0' != *p; p++) {
-        if (*p == ',') n++;
-            size++;
-    }
-
-    // only add "utf-8" and "*" to the list if they aren't
-    // already specified.
-
-    if (PL_strcasestr(acceptable, "utf-8") == NULL) {
-        n++;
-        add_utf = PR_TRUE;
-    }
-    if (PL_strchr(acceptable, '*') == NULL) {
-        n++;
-        add_asterisk = PR_TRUE;
-    }
-
-    available = size + ++n * 11 + 1;
-    q_Accept = new char[available];
-    if ((char *) 0 == q_Accept)
-        return NS_ERROR_OUT_OF_MEMORY;
-    *q_Accept = '\0';
-    q = 1.0;
-    dec = q / (double) n;
-    n = 0;
-    p2 = q_Accept;
-    for (token = nsCRT::strtok(o_Accept, ",", &p);
-         token != (char *) 0;
-         token = nsCRT::strtok(p, ",", &p)) {
-        token = net_FindCharNotInSet(token, HTTP_LWS);
-        char* trim;
-        trim = net_FindCharInSet(token, ";" HTTP_LWS);
-        if (trim != (char*)0)  // remove "; q=..." if present
-            *trim = '\0';
-
-        if (*token != '\0') {
-            comma = n++ != 0 ? "," : ""; // delimiter if not first item
-            u = QVAL_TO_UINT(q);
-            if (u < 10)
-                wrote = PR_snprintf(p2, available, "%s%s;q=0.%u", comma, token, u);
-            else
-                wrote = PR_snprintf(p2, available, "%s%s", comma, token);
-            q -= dec;
-            p2 += wrote;
-            available -= wrote;
-            NS_ASSERTION(available > 0, "allocated string not long enough");
-        }
-    }
-    if (add_utf) {
-        comma = n++ != 0 ? "," : ""; // delimiter if not first item
-        u = QVAL_TO_UINT(q);
-        if (u < 10)
-            wrote = PR_snprintf(p2, available, "%sutf-8;q=0.%u", comma, u);
-        else
-            wrote = PR_snprintf(p2, available, "%sutf-8", comma);
-        q -= dec;
-        p2 += wrote;
-        available -= wrote;
-        NS_ASSERTION(available > 0, "allocated string not long enough");
-    }
-    if (add_asterisk) {
-        comma = n++ != 0 ? "," : ""; // delimiter if not first item
-
-        // keep q of "*" equal to the lowest q value
-        // in the event of a tie between the q of "*" and a non-wildcard
-        // the non-wildcard always receives preference.
-
-        q += dec;
-        u = QVAL_TO_UINT(q);
-        if (u < 10)
-            wrote = PR_snprintf(p2, available, "%s*;q=0.%u", comma, u);
-        else
-            wrote = PR_snprintf(p2, available, "%s*", comma);
-        available -= wrote;
-        p2 += wrote;
-        NS_ASSERTION(available > 0, "allocated string not long enough");
-    }
-    nsCRT::free(o_Accept);
-
-    // change alloc from C++ new/delete to nsCRT::strdup's way
-    o_AcceptCharset.Assign(q_Accept);
-#if defined DEBUG_havill
-    printf("Accept-Charset: %s\n", q_Accept);
-#endif
-    delete [] q_Accept;
-    return NS_OK;
-}
-
-nsresult
-nsHttpHandler::SetAcceptCharsets(const char *aAcceptCharsets) 
-{
-    nsCString buf;
-    nsresult rv = PrepareAcceptCharsets(aAcceptCharsets, buf);
-    if (NS_SUCCEEDED(rv))
-        mAcceptCharsets.Assign(buf);
-    return rv;
-}
-
 nsresult
 nsHttpHandler::SetAccept(const char *aAccept) 
 {
diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h
index 19fe7b1cb5b6..ceea8a41bb79 100644
--- a/netwerk/protocol/http/nsHttpHandler.h
+++ b/netwerk/protocol/http/nsHttpHandler.h
@@ -229,7 +229,6 @@ private:
     nsresult SetAccept(const char *);
     nsresult SetAcceptLanguages(const char *);
     nsresult SetAcceptEncodings(const char *);
-    nsresult SetAcceptCharsets(const char *);
 
     nsresult InitConnectionMgr();
 
@@ -294,7 +293,6 @@ private:
     nsCString mAccept;
     nsCString mAcceptLanguages;
     nsCString mAcceptEncodings;
-    nsCString mAcceptCharsets;
 
     nsXPIDLCString mDefaultSocketType;
 

From bc645b6f71f5c31fdc2e997aac2c6d9381483210 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Thu, 17 Feb 2011 16:41:36 +0900
Subject: [PATCH 016/314] Bug 519972 part.2 Move text event dispatcher to
 nsCocoaIMEHandler r=smichaud

---
 widget/src/cocoa/nsChildView.mm             | 166 ++------------------
 widget/src/cocoa/nsCocoaTextInputHandler.h  |  57 +++++++
 widget/src/cocoa/nsCocoaTextInputHandler.mm | 135 ++++++++++++++++
 3 files changed, 202 insertions(+), 156 deletions(-)

diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index f863dff91f22..264d1800e920 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -158,13 +158,6 @@ PRUint32 nsChildView::sLastInputEventCount = 0;
 // sends gecko an ime composition event
 - (void) sendCompositionEvent:(PRInt32)aEventType;
 
-// sends gecko an ime text event
-- (void) sendTextEvent:(PRUnichar*) aBuffer 
-                       attributedString:(NSAttributedString*) aString
-                       selectedRange:(NSRange)selRange
-                       markedRange:(NSRange)markRange
-                       doCommit:(BOOL)doCommit;
-
 // do generic gecko event setup with a generic cocoa event. accepts nil inEvent.
 - (void) convertGenericCocoaEvent:(NSEvent*)inEvent toGeckoEvent:(nsInputEvent*)outGeckoEvent;
 
@@ -346,121 +339,6 @@ InitNPCocoaEvent(NPCocoaEvent* event)
   memset(event, 0, sizeof(NPCocoaEvent));
 }
 
-static PRUint32
-UnderlineAttributeToTextRangeType(PRUint32 aUnderlineStyle, NSRange selRange)
-{
-#ifdef DEBUG_IME
-  NSLog(@"****in underlineAttributeToTextRangeType = %d", aUnderlineStyle);
-#endif
-
-  // For more info on the underline attribute, please see: 
-  // http://developer.apple.com/techpubs/macosx/Cocoa/TasksAndConcepts/ProgrammingTopics/AttributedStrings/Tasks/AccessingAttrs.html
-  // We are not clear where the define for value 2 is right now. 
-  // To see this value in japanese ime, type 'aaaaaaaaa' and hit space to make the
-  // ime send you some part of text in 1 (NSSingleUnderlineStyle) and some part in 2. 
-  // ftang will ask apple for more details
-  //
-  // It probably means show 1-pixel thickness underline vs 2-pixel thickness.
-  
-  PRUint32 attr;
-  if (selRange.length == 0) {
-    switch (aUnderlineStyle) {
-      case 1:
-        attr = NS_TEXTRANGE_RAWINPUT;
-        break;
-      case 2:
-      default:
-        attr = NS_TEXTRANGE_SELECTEDRAWTEXT;
-        break;
-    }
-  }
-  else {
-    switch (aUnderlineStyle) {
-      case 1:
-        attr = NS_TEXTRANGE_CONVERTEDTEXT;
-        break;
-      case 2:
-      default:
-        attr = NS_TEXTRANGE_SELECTEDCONVERTEDTEXT;
-        break;
-    }
-  }
-  return attr;
-}
-
-static PRUint32
-CountRanges(NSAttributedString *aString)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-  // Iterate through aString for the NSUnderlineStyleAttributeName and count the 
-  // different segments adjusting limitRange as we go.
-  PRUint32 count = 0;
-  NSRange effectiveRange;
-  NSRange limitRange = NSMakeRange(0, [aString length]);
-  while (limitRange.length > 0) {
-    [aString attribute:NSUnderlineStyleAttributeName 
-               atIndex:limitRange.location 
- longestEffectiveRange:&effectiveRange
-               inRange:limitRange];
-    limitRange = NSMakeRange(NSMaxRange(effectiveRange), 
-                             NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
-    count++;
-  }
-  return count;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
-}
-
-static void
-ConvertAttributeToGeckoRange(NSAttributedString *aString, NSRange markRange, NSRange selRange, PRUint32 inCount, nsTextRange* aRanges)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Convert the Cocoa range into the nsTextRange Array used in Gecko.
-  // Iterate through the attributed string and map the underline attribute to Gecko IME textrange attributes.
-  // We may need to change the code here if we change the implementation of validAttributesForMarkedText.
-  PRUint32 i = 0;
-  NSRange effectiveRange;
-  NSRange limitRange = NSMakeRange(0, [aString length]);
-  while ((limitRange.length > 0) && (i < inCount)) {
-    id attributeValue = [aString attribute:NSUnderlineStyleAttributeName 
-                              atIndex:limitRange.location 
-                              longestEffectiveRange:&effectiveRange
-                              inRange:limitRange];
-    aRanges[i].mStartOffset = effectiveRange.location;                         
-    aRanges[i].mEndOffset = NSMaxRange(effectiveRange);                         
-    aRanges[i].mRangeType = UnderlineAttributeToTextRangeType([attributeValue intValue], selRange); 
-    limitRange = NSMakeRange(NSMaxRange(effectiveRange), 
-                             NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
-    i++;
-  }
-  // Get current caret position.
-  aRanges[i].mStartOffset = selRange.location + selRange.length;                         
-  aRanges[i].mEndOffset = aRanges[i].mStartOffset;                         
-  aRanges[i].mRangeType = NS_TEXTRANGE_CARETPOSITION;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
-static void
-FillTextRangeInTextEvent(nsTextEvent *aTextEvent, NSAttributedString* aString, NSRange markRange, NSRange selRange)
-{
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
-
-  // Count the number of segments in the attributed string and add one more count for sending current caret position to Gecko.
-  // Allocate the right size of nsTextRange and draw caret at right position.
-  // Convert the attributed string into an array of nsTextRange and get current caret position by calling above functions.
-  PRUint32 count = CountRanges(aString) + 1;
-  aTextEvent->rangeArray = new nsTextRange[count];
-  if (aTextEvent->rangeArray) {
-    aTextEvent->rangeCount = count;
-    ConvertAttributeToGeckoRange(aString, markRange, selRange, aTextEvent->rangeCount,  aTextEvent->rangeArray);
-  }
-
-  NS_OBJC_END_TRY_ABORT_BLOCK;
-}
-
 #if defined(DEBUG) && defined(PR_LOGGING)
 
 static void DebugPrintAllKeyboardLayouts()
@@ -4879,30 +4757,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
   mGeckoChild->DispatchWindowEvent(event);
 }
 
-- (void)sendTextEvent:(PRUnichar*) aBuffer 
-                      attributedString:(NSAttributedString*) aString  
-                      selectedRange:(NSRange) selRange 
-                      markedRange:(NSRange) markRange
-                      doCommit:(BOOL) doCommit
-{
-#ifdef DEBUG_IME
-  NSLog(@"****in sendTextEvent; string = '%@'", aString);
-  NSLog(@" markRange = %d, %d;  selRange = %d, %d", markRange.location, markRange.length, selRange.location, selRange.length);
-#endif
-
-  if (!mGeckoChild)
-    return;
-
-  nsTextEvent textEvent(PR_TRUE, NS_TEXT_TEXT, mGeckoChild);
-  textEvent.time = PR_IntervalNow();
-  textEvent.theText = aBuffer;
-  if (!doCommit)
-    FillTextRangeInTextEvent(&textEvent, aString, markRange, selRange);
-
-  mGeckoChild->DispatchWindowEvent(textEvent);
-  if (textEvent.rangeArray)
-    delete [] textEvent.rangeArray;
-}
 
 #pragma mark -
 // NSTextInput implementation
@@ -5012,10 +4866,12 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
       insertString =
         [[[NSAttributedString alloc] initWithString:tmpStr] autorelease];
     }
-    [self sendTextEvent:bufPtr attributedString:insertString
-                               selectedRange:NSMakeRange(0, len)
-                               markedRange:mMarkedRange
-                               doCommit:YES];
+    if (mGeckoChild) {
+      NSRange range = NSMakeRange(0, len);
+      mGeckoChild->TextInputHandler()->
+        DispatchTextEvent(nsDependentString(bufPtr), insertString,
+                          range, PR_TRUE);
+    }
     // Note: mGeckoChild might have become null here. Don't count on it from here on.
 
     [self sendCompositionEvent:NS_COMPOSITION_END];
@@ -5107,14 +4963,12 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
   if (mGeckoChild->TextInputHandler()->IsIMEComposing()) {
     mGeckoChild->TextInputHandler()->OnUpdateIMEComposition(tmpStr);
 
-    BOOL commit = len == 0;
-    [self sendTextEvent:bufPtr attributedString:aString
-                                  selectedRange:selRange
-                                    markedRange:mMarkedRange
-                                       doCommit:commit];
+    PRBool doCommit = (len == 0);
+    mGeckoChild->TextInputHandler()->
+      DispatchTextEvent(nsDependentString(bufPtr), aString, selRange, doCommit);
     // Note: mGeckoChild might have become null here. Don't count on it from here on.
 
-    if (commit) {
+    if (doCommit) {
       [self sendCompositionEvent:NS_COMPOSITION_END];
       // Note: mGeckoChild might have become null here. Don't count on it from here on.
       if (mGeckoChild) {
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.h b/widget/src/cocoa/nsCocoaTextInputHandler.h
index 5ffb5be92898..103d5b6df281 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.h
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.h
@@ -49,9 +49,11 @@
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
 #include "npapi.h"
+#include "nsTArray.h"
 
 struct PRLogModuleInfo;
 class nsChildView;
+struct nsTextRange;
 
 /**
  * nsTISInputSource is a wrapper for the TISInputSourceRef.  If we get the
@@ -235,6 +237,21 @@ public:
   void OnUpdateIMEComposition(NSString* aIMECompositionString);
   void OnEndIMEComposition();
 
+  /**
+   * DispatchTextEvent() dispatches a text event on mOwnerWidget.
+   *
+   * @param aText                 User text input.
+   * @param aAttrString           An NSAttributedString instance which indicates
+   *                              current composition string.
+   * @param aSelectedRange        Current selected range (or caret position).
+   * @param aDoCommit             TRUE if the composition string should be
+   *                              committed.  Otherwise, FALSE.
+   */
+  PRBool DispatchTextEvent(const nsString& aText,
+                           NSAttributedString* aAttrString,
+                           NSRange& aSelectedRange,
+                           PRBool aDoCommit);
+
   PRBool IsIMEComposing() { return mIsIMEComposing; }
   PRBool IsIMEOpened();
   PRBool IsIMEEnabled() { return mIsIMEEnabled; }
@@ -322,6 +339,46 @@ private:
 
   static void FlushPendingMethods(nsITimer* aTimer, void* aClosure);
 
+  /**
+   * ConvertToTextRangeStyle converts the given native underline style to
+   * our defined text range type.
+   *
+   * @param aUnderlineStyle       NSUnderlineStyleSingle or
+   *                              NSUnderlineStyleThick.
+   * @param aSelectedRange        Current selected range (or caret position).
+   * @return                      NS_TEXTRANGE_*.
+   */
+  PRUint32 ConvertToTextRangeType(PRUint32 aUnderlineStyle,
+                                  NSRange& aSelectedRange);
+
+  /**
+   * GetRangeCount() computes the range count of aAttrString.
+   *
+   * @param aAttrString           An NSAttributedString instance whose number of
+   *                              NSUnderlineStyleAttributeName ranges you with
+   *                              to know.
+   * @return                      The count of NSUnderlineStyleAttributeName
+   *                              ranges in aAttrString.
+   */
+  PRUint32 GetRangeCount(NSAttributedString *aString);
+
+  /**
+   * SetTextRangeList() appends text ranges to aTextRangeList.
+   *
+   * @param aTextRangeList        When SetTextRangeList() returns, this will
+   *                              be set to the NSUnderlineStyleAttributeName
+   *                              ranges in aAttrString.  Note that if you pass
+   *                              in a large enough auto-range instance for most
+   *                              cases (e.g., nsAutoTArray<nsTextRange, 4>),
+   *                              it prevents memory fragmentation.
+   * @param aAttrString           An NSAttributedString instance which indicates
+   *                              current composition string.
+   * @param aSelectedRange        Current selected range (or caret position).
+   */
+  void SetTextRangeList(nsTArray<nsTextRange>& aTextRangeList,
+                        NSAttributedString *aAttrString,
+                        NSRange& aSelectedRange);
+
   // The focused IME handler.  Please note that the handler might lost the
   // actual focus by deactivating the application.  If we are active, this
   // must have the actual focused handle.
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.mm b/widget/src/cocoa/nsCocoaTextInputHandler.mm
index 3fa779bd07d2..43f916f4c3a4 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.mm
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.mm
@@ -899,6 +899,141 @@ nsCocoaIMEHandler::ExecutePendingMethods()
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
+#pragma mark -
+
+
+/******************************************************************************
+ *
+ * nsCocoaIMEHandler implementation (native event handlers)
+ *
+ ******************************************************************************/
+
+PRUint32
+nsCocoaIMEHandler::ConvertToTextRangeType(PRUint32 aUnderlineStyle,
+                                          NSRange& aSelectedRange)
+{
+#ifdef DEBUG_IME_HANDLER
+  NSLog(@"****in ConvertToTextRangeType = %d", aUnderlineStyle);
+#endif
+  // We assume that aUnderlineStyle is NSUnderlineStyleSingle or
+  // NSUnderlineStyleThick.  NSUnderlineStyleThick should indicate a selected
+  // clause.  Otherwise, should indicate non-selected clause.
+
+  if (aSelectedRange.length == 0) {
+    switch (aUnderlineStyle) {
+      case NSUnderlineStyleSingle:
+        return NS_TEXTRANGE_RAWINPUT;
+      case NSUnderlineStyleThick:
+        return NS_TEXTRANGE_SELECTEDRAWTEXT;
+      default:
+        NS_WARNING("Unexpected line style");
+        return NS_TEXTRANGE_SELECTEDRAWTEXT;
+    }
+  }
+
+  switch (aUnderlineStyle) {
+    case NSUnderlineStyleSingle:
+      return NS_TEXTRANGE_CONVERTEDTEXT;
+    case NSUnderlineStyleThick:
+      return NS_TEXTRANGE_SELECTEDCONVERTEDTEXT;
+    default:
+      NS_WARNING("Unexpected line style");
+      return NS_TEXTRANGE_SELECTEDCONVERTEDTEXT;
+  }
+}
+
+PRUint32
+nsCocoaIMEHandler::GetRangeCount(NSAttributedString *aAttrString)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
+
+  // Iterate through aAttrString for the NSUnderlineStyleAttributeName and
+  // count the different segments adjusting limitRange as we go.
+  PRUint32 count = 0;
+  NSRange effectiveRange;
+  NSRange limitRange = NSMakeRange(0, [aAttrString length]);
+  while (limitRange.length > 0) {
+    [aAttrString  attribute:NSUnderlineStyleAttributeName 
+                    atIndex:limitRange.location 
+      longestEffectiveRange:&effectiveRange
+                    inRange:limitRange];
+    limitRange =
+      NSMakeRange(NSMaxRange(effectiveRange), 
+                  NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
+    count++;
+  }
+  return count;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(0);
+}
+
+void
+nsCocoaIMEHandler::SetTextRangeList(nsTArray<nsTextRange>& aTextRangeList,
+                                    NSAttributedString *aAttrString,
+                                    NSRange& aSelectedRange)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
+
+  // Convert the Cocoa range into the nsTextRange Array used in Gecko.
+  // Iterate through the attributed string and map the underline attribute to
+  // Gecko IME textrange attributes.  We may need to change the code here if
+  // we change the implementation of validAttributesForMarkedText.
+  NSRange limitRange = NSMakeRange(0, [aAttrString length]);
+  PRUint32 rangeCount = GetRangeCount(aAttrString);
+  for (PRUint32 i = 0; i < rangeCount && limitRange.length > 0; i++) {
+    NSRange effectiveRange;
+    id attributeValue = [aAttrString attribute:NSUnderlineStyleAttributeName
+                                       atIndex:limitRange.location
+                         longestEffectiveRange:&effectiveRange
+                                       inRange:limitRange];
+
+    nsTextRange range;
+    range.mStartOffset = effectiveRange.location;
+    range.mEndOffset = NSMaxRange(effectiveRange);
+    range.mRangeType =
+      ConvertToTextRangeType([attributeValue intValue], aSelectedRange);
+    aTextRangeList.AppendElement(range);
+
+    limitRange =
+      NSMakeRange(NSMaxRange(effectiveRange), 
+                  NSMaxRange(limitRange) - NSMaxRange(effectiveRange));
+  }
+
+  // Get current caret position.
+  nsTextRange range;
+  range.mStartOffset = aSelectedRange.location + aSelectedRange.length;
+  range.mEndOffset = range.mStartOffset;
+  range.mRangeType = NS_TEXTRANGE_CARETPOSITION;
+  aTextRangeList.AppendElement(range);
+
+  NS_OBJC_END_TRY_ABORT_BLOCK;
+}
+
+PRBool
+nsCocoaIMEHandler::DispatchTextEvent(const nsString& aText,
+                                     NSAttributedString* aAttrString,
+                                     NSRange& aSelectedRange,
+                                     PRBool aDoCommit)
+{
+#ifdef DEBUG_IME_HANDLER
+  NSLog(@"****in DispatchTextEvent; string = '%@'", aAttrString);
+  NSLog(@" aSelectedRange = %d, %d",
+        aSelectedRange.location, aSelectedRange.length);
+#endif
+
+  nsTextEvent textEvent(PR_TRUE, NS_TEXT_TEXT, mOwnerWidget);
+  textEvent.time = PR_IntervalNow();
+  textEvent.theText = aText;
+  nsAutoTArray<nsTextRange, 4> textRanges;
+  if (!aDoCommit) {
+    SetTextRangeList(textRanges, aAttrString, aSelectedRange);
+  }
+  textEvent.rangeArray = textRanges.Elements();
+  textEvent.rangeCount = textRanges.Length();
+
+  return mOwnerWidget->DispatchWindowEvent(textEvent);
+}
+
 
 #pragma mark -
 

From 6e4e9904262ed8c8a5ac42f10af56afe96be8ab5 Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 19 Feb 2011 13:55:34 +0900
Subject: [PATCH 017/314] Bug 519972 part.3 Move marked text handler to
 nsCocoaIMEHandler r=smichaud

---
 widget/src/cocoa/nsChildView.h              |   3 -
 widget/src/cocoa/nsChildView.mm             | 159 ++------------------
 widget/src/cocoa/nsCocoaTextInputHandler.h  |  65 +++++++-
 widget/src/cocoa/nsCocoaTextInputHandler.mm | 136 ++++++++++++++++-
 4 files changed, 209 insertions(+), 154 deletions(-)

diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 08a338cabe83..994d0ed5416a 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -151,9 +151,6 @@ extern "C" long TSMProcessRawKeyEvent(EventRef carbonEvent);
   // Valid when mKeyPressSent is true.
   PRBool mKeyPressHandled;
 
-  // needed for NSTextInput implementation
-  NSRange mMarkedRange;
-  
   // when mouseDown: is called, we store its event here (strong)
   NSEvent* mLastMouseDownEvent;
 
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 264d1800e920..fbf486f2b191 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -155,9 +155,6 @@ PRUint32 nsChildView::sLastInputEventCount = 0;
 - (id)initWithFrame:(NSRect)inFrame geckoChild:(nsChildView*)inChild;
 - (void)forceRefreshOpenGL;
 
-// sends gecko an ime composition event
-- (void) sendCompositionEvent:(PRInt32)aEventType;
-
 // do generic gecko event setup with a generic cocoa event. accepts nil inEvent.
 - (void) convertGenericCocoaEvent:(NSEvent*)inEvent toGeckoEvent:(nsInputEvent*)outGeckoEvent;
 
@@ -2200,10 +2197,6 @@ NSEvent* gLastDragMouseDownEvent = nil;
     mPendingDisplay = NO;
     mBlockedLastMouseDown = NO;
 
-    // initialization for NSTextInput
-    mMarkedRange.location = NSNotFound;
-    mMarkedRange.length = 0;
-
     mLastMouseDownEvent = nil;
     mClickThroughMouseDownEvent = nil;
     mDragService = nsnull;
@@ -4742,21 +4735,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
   mPluginComplexTextInputRequested = YES;
 }
 
-- (void)sendCompositionEvent:(PRInt32) aEventType
-{
-#ifdef DEBUG_IME
-  NSLog(@"****in sendCompositionEvent; type = %d", aEventType);
-#endif
-
-  if (!mGeckoChild)
-    return;
-
-  // static void init_composition_event( *aEvent, int aType)
-  nsCompositionEvent event(PR_TRUE, aEventType, mGeckoChild);
-  event.time = PR_IntervalNow();
-  mGeckoChild->DispatchWindowEvent(event);
-}
-
 
 #pragma mark -
 // NSTextInput implementation
@@ -4769,7 +4747,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
 #if DEBUG_IME
   NSLog(@"****in insertText: '%@'", insertString);
-  NSLog(@" markRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
   if (!mGeckoChild)
     return;
@@ -4850,37 +4827,9 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
     }
   }
   else {
-    if (!mGeckoChild->TextInputHandler()->IsIMEComposing()) {
-      [self sendCompositionEvent:NS_COMPOSITION_START];
-      // Note: mGeckoChild might have become null here. Don't count on it from here on.
-      if (mGeckoChild) {
-        mGeckoChild->TextInputHandler()->OnStartIMEComposition(self);
-        // Note: mGeckoChild might have become null here. Don't count on it from here on.
-      }
-    }
-
-    if (mGeckoChild && mGeckoChild->TextInputHandler()->IgnoreIMECommit()) {
-      tmpStr = [tmpStr init];
-      len = 0;
-      bufPtr[0] = PRUnichar('\0');
-      insertString =
-        [[[NSAttributedString alloc] initWithString:tmpStr] autorelease];
-    }
-    if (mGeckoChild) {
-      NSRange range = NSMakeRange(0, len);
-      mGeckoChild->TextInputHandler()->
-        DispatchTextEvent(nsDependentString(bufPtr), insertString,
-                          range, PR_TRUE);
-    }
-    // Note: mGeckoChild might have become null here. Don't count on it from here on.
-
-    [self sendCompositionEvent:NS_COMPOSITION_END];
-    // Note: mGeckoChild might have become null here. Don't count on it from here on.
-    if (mGeckoChild) {
-      mGeckoChild->TextInputHandler()->OnEndIMEComposition();
-      // Note: mGeckoChild might have become null here. Don't count on it from here on.
-    }
-    mMarkedRange = NSMakeRange(NSNotFound, 0);
+    NSAttributedString* attrStr =
+      static_cast<NSAttributedString*>(insertString);
+    mGeckoChild->TextInputHandler()->InsertTextAsCommittingComposition(attrStr);
   }
 
   if (bufPtr != buffer)
@@ -4912,95 +4861,32 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-#if DEBUG_IME 
-  NSLog(@"****in setMarkedText location: %d, length: %d", selRange.location, selRange.length);
-  NSLog(@" markRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
-  NSLog(@" aString = '%@'", aString);
-#endif
-
-  if (!mGeckoChild)
-    return;
-
-  if (mGeckoChild->TextInputHandler()->IgnoreIMEComposition())
-    return;
+  NS_ENSURE_TRUE(mGeckoChild, );
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
 
-  if (![aString isKindOfClass:[NSAttributedString class]])
-    aString = [[[NSAttributedString alloc] initWithString:aString] autorelease];
-
-  NSMutableAttributedString *mutableAttribStr = aString;
-  NSString *tmpStr = [mutableAttribStr string];
-  unsigned int len = [tmpStr length];
-  PRUnichar buffer[MAX_BUFFER_SIZE];
-  PRUnichar *bufPtr = (len >= MAX_BUFFER_SIZE) ? new PRUnichar[len + 1] : buffer;
-  [tmpStr getCharacters:bufPtr];
-  bufPtr[len] = PRUnichar('\0');
-
-#if DEBUG_IME 
-  printf("****in setMarkedText, len = %d, text = ", len);
-  PRUint32 n = 0;
-  PRUint32 maxlen = len > 12 ? 12 : len;
-  for (PRUnichar *a = bufPtr; (*a != PRUnichar('\0')) && n<maxlen; a++, n++)
-    printf((*a&0xff80) ? "\\u%4X" : "%c", *a); 
-  printf("\n");
-#endif
-
-  mMarkedRange.length = len;
-
-  if (!mGeckoChild->TextInputHandler()->IsIMEComposing() && len > 0) {
-    nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, mGeckoChild);
-    mGeckoChild->DispatchWindowEvent(selection);
-    mMarkedRange.location = selection.mSucceeded ? selection.mReply.mOffset : 0;
-    [self sendCompositionEvent:NS_COMPOSITION_START];
-    // Note: mGeckoChild might have become null here. Don't count on it from here on.
-    if (mGeckoChild) {
-      mGeckoChild->TextInputHandler()->OnStartIMEComposition(self);
-      // Note: mGeckoChild might have become null here. Don't count on it from here on.
-    }
+  NSAttributedString* attrStr;
+  if ([aString isKindOfClass:[NSAttributedString class]]) {
+    attrStr = static_cast<NSAttributedString*>(aString);
+  } else {
+    attrStr = [[[NSAttributedString alloc] initWithString:aString] autorelease];
   }
 
-  if (mGeckoChild->TextInputHandler()->IsIMEComposing()) {
-    mGeckoChild->TextInputHandler()->OnUpdateIMEComposition(tmpStr);
-
-    PRBool doCommit = (len == 0);
-    mGeckoChild->TextInputHandler()->
-      DispatchTextEvent(nsDependentString(bufPtr), aString, selRange, doCommit);
-    // Note: mGeckoChild might have become null here. Don't count on it from here on.
-
-    if (doCommit) {
-      [self sendCompositionEvent:NS_COMPOSITION_END];
-      // Note: mGeckoChild might have become null here. Don't count on it from here on.
-      if (mGeckoChild) {
-        mGeckoChild->TextInputHandler()->OnEndIMEComposition();
-        // Note: mGeckoChild might have become null here. Don't count on it from here on.
-      }
-    }
-  }
-
-  if (bufPtr != buffer)
-    delete[] bufPtr;
+  mGeckoChild->TextInputHandler()->SetMarkedText(attrStr, selRange);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 - (void) unmarkText
 {
-#if DEBUG_IME
-  NSLog(@"****in unmarkText");
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
-#endif
-  if (mGeckoChild)
-    mGeckoChild->TextInputHandler()->CommitIMEComposition();
+  NS_ENSURE_TRUE(mGeckoChild, );
+  mGeckoChild->TextInputHandler()->CommitIMEComposition();
 }
 
 - (BOOL) hasMarkedText
 {
-#if DEBUG_IME
-  NSLog(@"****in hasMarkText");
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
-#endif
-  return (mMarkedRange.location != NSNotFound) && (mMarkedRange.length != 0);
+  NS_ENSURE_TRUE(mGeckoChild, NO);
+  return mGeckoChild->TextInputHandler()->HasMarkedText();
 }
 
 - (NSInteger) conversationIdentifier
@@ -5028,7 +4914,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 #if DEBUG_IME
   NSLog(@"****in attributedSubstringFromRange");
   NSLog(@" theRange      = %d, %d", theRange.location, theRange.length);
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
   if (!mGeckoChild || theRange.length == 0)
     return nil;
@@ -5054,16 +4939,8 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-#if DEBUG_IME
-  NSLog(@"****in markedRange");
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
-#endif
-
-  if (![self hasMarkedText]) {
-    return NSMakeRange(NSNotFound, 0);
-  }
-
-  return mMarkedRange;
+  NS_ENSURE_TRUE(mGeckoChild, NSMakeRange(NSNotFound, 0));
+  return mGeckoChild->TextInputHandler()->MarkedRange();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
 }
@@ -5074,7 +4951,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
 #if DEBUG_IME
   NSLog(@"****in selectedRange");
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
   if (!mGeckoChild)
     return NSMakeRange(NSNotFound, 0);
@@ -5100,7 +4976,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 #if DEBUG_IME
   NSLog(@"****in firstRectForCharacterRange");
   NSLog(@" theRange      = %d, %d", theRange.location, theRange.length);
-  NSLog(@" markedRange   = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
   // XXX this returns first character rect or caret rect, it is limitation of
   // now. We need more work for returns first line rect. But current
@@ -5155,7 +5030,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
 #if DEBUG_IME
   NSLog(@"****in characterIndexForPoint");
-  NSLog(@" markRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
 
   // To implement this, we'd have to grovel in text frames looking at text offsets.
@@ -5168,7 +5042,6 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
 #if DEBUG_IME
   NSLog(@"****in validAttributesForMarkedText");
-  NSLog(@" markRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
 
   //return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName, NSMarkedClauseSegmentAttributeName, NSTextInputReplacementRangeAttributeName, nil];
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.h b/widget/src/cocoa/nsCocoaTextInputHandler.h
index 103d5b6df281..bf58fec183c0 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.h
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.h
@@ -50,6 +50,7 @@
 #include "nsITimer.h"
 #include "npapi.h"
 #include "nsTArray.h"
+#include "nsEvent.h"
 
 struct PRLogModuleInfo;
 class nsChildView;
@@ -233,10 +234,6 @@ public:
   virtual void OnFocusChangeInGecko(PRBool aFocus);
   virtual void OnDestroyView(NSView<mozView> *aDestroyingView);
 
-  void OnStartIMEComposition(NSView<mozView> *aView);
-  void OnUpdateIMEComposition(NSString* aIMECompositionString);
-  void OnEndIMEComposition();
-
   /**
    * DispatchTextEvent() dispatches a text event on mOwnerWidget.
    *
@@ -252,6 +249,41 @@ public:
                            NSRange& aSelectedRange,
                            PRBool aDoCommit);
 
+  /**
+   * SetMarkedText() is a handler of setMarkedText of NSTextInput.
+   *
+   * @param aAttrString           This mut be an instance of NSAttributedString.
+   *                              If the aString parameter to
+   *                              [ChildView setMarkedText:setSelectedRange:]
+   *                              isn't an instance of NSAttributedString,
+   *                              create an NSAttributedString from it and pass
+   *                              that instead.
+   * @param aSelectedRange        Current selected range (or caret position).
+   */
+  void SetMarkedText(NSAttributedString* aAttrString,
+                     NSRange& aSelectedRange);
+
+  /**
+   * InsertTextAsCommittingComposition() commits current composition.  If there
+   * is no composition, this starts a composition and commits it immediately.
+   *
+   * @param aAttrString           A string which is committed.
+   */
+  void InsertTextAsCommittingComposition(NSAttributedString* aAttrString);
+
+  PRBool HasMarkedText()
+  {
+    return (mMarkedRange.location != NSNotFound) && (mMarkedRange.length != 0);
+  }
+
+  NSRange MarkedRange()
+  {
+    if (!HasMarkedText()) {
+      return NSMakeRange(NSNotFound, 0);
+    }
+    return mMarkedRange;
+  }
+
   PRBool IsIMEComposing() { return mIsIMEComposing; }
   PRBool IsIMEOpened();
   PRBool IsIMEEnabled() { return mIsIMEEnabled; }
@@ -309,6 +341,8 @@ private:
   // If mIsIMEComposing is true, the composition string is stored here.
   NSString* mIMECompositionString;
 
+  NSRange mMarkedRange;
+
   PRPackedBool mIsIMEComposing;
   PRPackedBool mIsIMEEnabled;
   PRPackedBool mIsASCIICapableOnly;
@@ -379,6 +413,29 @@ private:
                         NSAttributedString *aAttrString,
                         NSRange& aSelectedRange);
 
+  /**
+   * InitCompositionEvent() initializes aCompositionEvent.
+   *
+   * @param aCompositionEvent     A composition event which you want to
+   *                              initialize.
+   */
+  void InitCompositionEvent(nsCompositionEvent& aCompositionEvent);
+
+  /**
+   * When a composition starts, OnStartIMEComposition() is called.
+   */
+  void OnStartIMEComposition();
+
+  /**
+   * When a composition is updated, OnUpdateIMEComposition() is called.
+   */
+  void OnUpdateIMEComposition(NSString* aIMECompositionString);
+
+  /**
+   * When a composition is finished, OnEndIMEComposition() is called.
+   */
+  void OnEndIMEComposition();
+
   // The focused IME handler.  Please note that the handler might lost the
   // actual focus by deactivating the application.  If we are active, this
   // must have the actual focused handle.
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.mm b/widget/src/cocoa/nsCocoaTextInputHandler.mm
index 43f916f4c3a4..cf40104e9f13 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.mm
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.mm
@@ -1034,6 +1034,132 @@ nsCocoaIMEHandler::DispatchTextEvent(const nsString& aText,
   return mOwnerWidget->DispatchWindowEvent(textEvent);
 }
 
+void
+nsCocoaIMEHandler::InitCompositionEvent(nsCompositionEvent& aCompositionEvent)
+{
+  aCompositionEvent.time = PR_IntervalNow();
+}
+
+void
+nsCocoaIMEHandler::InsertTextAsCommittingComposition(
+                     NSAttributedString* aAttrString)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
+
+#if DEBUG_IME
+  NSLog(@"****in InsertTextAsCommittingComposition: '%@'", aAttrString);
+  NSLog(@" mMarkedRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
+#endif
+
+  nsRefPtr<nsChildView> kungFuDeathGrip(mOwnerWidget);
+
+  nsString str;
+  GetStringForNSString([aAttrString string], str);
+
+  if (!IsIMEComposing()) {
+    // XXXmnakano Probably, we shouldn't emulate composition in this case.
+    // I think that we should just fire DOM3 textInput event if we implement it.
+    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mOwnerWidget);
+    InitCompositionEvent(compStart);
+
+    mOwnerWidget->DispatchWindowEvent(compStart);
+    if (!mView) {
+      return; // we're destroyed
+    }
+
+    OnStartIMEComposition();
+  }
+
+  if (IgnoreIMECommit()) {
+    str.Truncate();
+  }
+
+  NSRange range = NSMakeRange(0, str.Length());
+  DispatchTextEvent(str, aAttrString, range, PR_TRUE);
+  if (!mView) {
+    return; // we're destroyed
+  }
+
+  OnUpdateIMEComposition([aAttrString string]);
+
+  nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mOwnerWidget);
+  InitCompositionEvent(compEnd);
+  mOwnerWidget->DispatchWindowEvent(compEnd);
+  if (!mView) {
+    return; // we're destroyed
+  }
+
+  OnEndIMEComposition();
+
+  mMarkedRange = NSMakeRange(NSNotFound, 0);
+
+  NS_OBJC_END_TRY_ABORT_BLOCK;
+}
+
+void
+nsCocoaIMEHandler::SetMarkedText(NSAttributedString* aAttrString,
+                                 NSRange& aSelectedRange)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
+
+#if DEBUG_IME_HANDLER 
+  NSLog(@"****in SetMarkedText location: %d, length: %d",
+        aSelectedRange.location, aSelectedRange.length);
+  NSLog(@" mMarkedRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
+  NSLog(@" aAttrString = '%@'", aAttrString);
+#endif
+
+  if (IgnoreIMEComposition()) {
+    return;
+  }
+
+  nsRefPtr<nsChildView> kungFuDeathGrip(mOwnerWidget);
+
+  nsString str;
+  GetStringForNSString([aAttrString string], str);
+
+  mMarkedRange.length = str.Length();
+
+  if (!IsIMEComposing() && !str.IsEmpty()) {
+    nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT,
+                                  mOwnerWidget);
+    mOwnerWidget->DispatchWindowEvent(selection);
+    mMarkedRange.location = selection.mSucceeded ? selection.mReply.mOffset : 0;
+
+    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mOwnerWidget);
+    InitCompositionEvent(compStart);
+
+    mOwnerWidget->DispatchWindowEvent(compStart);
+    if (!mView) {
+      return; // we're destroyed
+    }
+
+    OnStartIMEComposition();
+  }
+
+  if (IsIMEComposing()) {
+    OnUpdateIMEComposition([aAttrString string]);
+
+    PRBool doCommit = str.IsEmpty();
+    DispatchTextEvent(str, aAttrString, aSelectedRange, doCommit);
+    if (!mView) {
+      return; // we're destroyed
+    }
+
+    if (doCommit) {
+      nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mOwnerWidget);
+      InitCompositionEvent(compEnd);
+      mOwnerWidget->DispatchWindowEvent(compEnd);
+      if (!mView) {
+        return; // we're destroyed
+      }
+      OnEndIMEComposition();
+    }
+  }
+
+  NS_OBJC_END_TRY_ABORT_BLOCK;
+}
+
 
 #pragma mark -
 
@@ -1053,6 +1179,9 @@ nsCocoaIMEHandler::nsCocoaIMEHandler() :
 {
   gHandlerInstanceCount++;
   InitStaticMembers();
+
+  mMarkedRange.location = NSNotFound;
+  mMarkedRange.length = 0;
 }
 
 nsCocoaIMEHandler::~nsCocoaIMEHandler()
@@ -1131,19 +1260,18 @@ nsCocoaIMEHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
 }
 
 void
-nsCocoaIMEHandler::OnStartIMEComposition(NSView<mozView> *aView)
+nsCocoaIMEHandler::OnStartIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
   NSLog(@"nsCocoaIMEHandler::OnStartIMEComposition");
-  NSLog(@"  aView:%p mView:%p currentInputManager:%p",
-        aView, mView, [NSInputManager currentInputManager]);
+  NSLog(@"  mView=%p, currentInputManager:%p",
+        mView, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
 
   NS_ASSERTION(!mIsIMEComposing, "There is a composition already");
-  NS_ASSERTION(aView == mView, "The composition is started on another view");
   mIsIMEComposing = PR_TRUE;
 
   NS_OBJC_END_TRY_ABORT_BLOCK;

From 6f6a0d477b28bb57803d77123f21582ad25e108f Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sat, 19 Feb 2011 13:55:49 +0900
Subject: [PATCH 018/314] Bug 519972 part.4 Move NSTextInput handler to
 nsCocoaIMEHandler (except insertText) r=smichaud

---
 widget/src/cocoa/nsChildView.mm             | 131 ++------------
 widget/src/cocoa/nsCocoaTextInputHandler.h  |  63 +++++++
 widget/src/cocoa/nsCocoaTextInputHandler.mm | 180 ++++++++++++++++++++
 3 files changed, 256 insertions(+), 118 deletions(-)

diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index fbf486f2b191..b7e0c8c96ce3 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -4891,48 +4891,15 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
 - (NSInteger) conversationIdentifier
 {
-#if DEBUG_IME
-  NSLog(@"****in conversationIdentifier");
-#endif
-  if (!mGeckoChild)
-    return (long)self;
-  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mGeckoChild);
-  textContent.InitForQueryTextContent(0, 0);
-  mGeckoChild->DispatchWindowEvent(textContent);
-  if (!textContent.mSucceeded)
-    return (long)self;
-#if DEBUG_IME
-  NSLog(@" the ID = %ld", (long)textContent.mReply.mContentsRoot);
-#endif
-  return (long)textContent.mReply.mContentsRoot;
+  NS_ENSURE_TRUE(mGeckoChild, reinterpret_cast<NSInteger>(self));
+  return mGeckoChild->TextInputHandler()->ConversationIdentifier();
 }
 
 - (NSAttributedString *) attributedSubstringFromRange:(NSRange)theRange
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
-
-#if DEBUG_IME
-  NSLog(@"****in attributedSubstringFromRange");
-  NSLog(@" theRange      = %d, %d", theRange.location, theRange.length);
-#endif
-  if (!mGeckoChild || theRange.length == 0)
-    return nil;
-
-  nsAutoString str;
-  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mGeckoChild);
-  textContent.InitForQueryTextContent(theRange.location, theRange.length);
-  mGeckoChild->DispatchWindowEvent(textContent);
-
-  if (!textContent.mSucceeded || textContent.mReply.mString.IsEmpty())
-    return nil;
-
-  NSString* nsstr = ToNSString(textContent.mReply.mString);
-  NSAttributedString* result =
-    [[[NSAttributedString alloc] initWithString:nsstr
-                                     attributes:nil] autorelease];
-  return result;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
+  NS_ENSURE_TRUE(mGeckoChild, nil);
+  return mGeckoChild->TextInputHandler()->
+    GetAttributedSubstringFromRange(theRange);
 }
 
 - (NSRange) markedRange
@@ -4949,103 +4916,31 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-#if DEBUG_IME
-  NSLog(@"****in selectedRange");
-#endif
-  if (!mGeckoChild)
-    return NSMakeRange(NSNotFound, 0);
-  nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, mGeckoChild);
-  mGeckoChild->DispatchWindowEvent(selection);
-  if (!selection.mSucceeded)
-    return NSMakeRange(NSNotFound, 0);
-
-#if DEBUG_IME
-  NSLog(@" result of selectedRange = %d, %d",
-        selection.mReply.mOffset, selection.mReply.mString.Length());
-#endif
-  return NSMakeRange(selection.mReply.mOffset,
-                     selection.mReply.mString.Length());
+  NS_ENSURE_TRUE(mGeckoChild, NSMakeRange(NSNotFound, 0));
+  return mGeckoChild->TextInputHandler()->SelectedRange();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
 }
 
 - (NSRect) firstRectForCharacterRange:(NSRange)theRange
 {
-  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
-
-#if DEBUG_IME
-  NSLog(@"****in firstRectForCharacterRange");
-  NSLog(@" theRange      = %d, %d", theRange.location, theRange.length);
-#endif
-  // XXX this returns first character rect or caret rect, it is limitation of
-  // now. We need more work for returns first line rect. But current
-  // implementation is enough for IMEs.
-
   NSRect rect;
-  if (!mGeckoChild || theRange.location == NSNotFound)
-    return rect;
-
-  nsIntRect r;
-  PRBool useCaretRect = theRange.length == 0;
-  if (!useCaretRect) {
-    nsQueryContentEvent charRect(PR_TRUE, NS_QUERY_TEXT_RECT, mGeckoChild);
-    charRect.InitForQueryTextRect(theRange.location, 1);
-    mGeckoChild->DispatchWindowEvent(charRect);
-    if (charRect.mSucceeded)
-      r = charRect.mReply.mRect;
-    else
-      useCaretRect = PR_TRUE;
-  }
-
-  if (useCaretRect) {
-    nsQueryContentEvent caretRect(PR_TRUE, NS_QUERY_CARET_RECT, mGeckoChild);
-    caretRect.InitForQueryCaretRect(theRange.location);
-    mGeckoChild->DispatchWindowEvent(caretRect);
-    if (!caretRect.mSucceeded)
-      return rect;
-    r = caretRect.mReply.mRect;
-    r.width = 0;
-  }
-
-  nsIWidget* rootWidget = mGeckoChild->GetTopLevelWidget();
-  NSWindow* rootWindow =
-    static_cast<NSWindow*>(rootWidget->GetNativeData(NS_NATIVE_WINDOW));
-  NSView* rootView =
-    static_cast<NSView*>(rootWidget->GetNativeData(NS_NATIVE_WIDGET));
-  if (!rootWindow || !rootView)
-    return rect;
-  GeckoRectToNSRect(r, rect);
-  rect = [rootView convertRect:rect toView:nil];
-  rect.origin = [rootWindow convertBaseToScreen:rect.origin];
-#if DEBUG_IME
-  NSLog(@" result rect (x,y,w,h) = %f, %f, %f, %f",
-        rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
-#endif
-  return rect;
-
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRect(0.0, 0.0, 0.0, 0.0));
+  NS_ENSURE_TRUE(mGeckoChild, rect);
+  return mGeckoChild->TextInputHandler()->FirstRectForCharacterRange(theRange);
 }
 
 - (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
 {
-#if DEBUG_IME
-  NSLog(@"****in characterIndexForPoint");
-#endif
-
-  // To implement this, we'd have to grovel in text frames looking at text offsets.
-  return 0;
+  NS_ENSURE_TRUE(mGeckoChild, 0);
+  return mGeckoChild->TextInputHandler()->CharacterIndexForPoint(thePoint);
 }
 
 - (NSArray*) validAttributesForMarkedText
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-#if DEBUG_IME
-  NSLog(@"****in validAttributesForMarkedText");
-#endif
-
-  //return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName, NSMarkedClauseSegmentAttributeName, NSTextInputReplacementRangeAttributeName, nil];
-  return [NSArray array]; // empty array; we don't support any attributes right now
+  NS_ENSURE_TRUE(mGeckoChild, [NSArray array]);
+  return mGeckoChild->TextInputHandler()->GetValidAttributesForMarkedText();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.h b/widget/src/cocoa/nsCocoaTextInputHandler.h
index bf58fec183c0..58dbe93f17a4 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.h
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.h
@@ -271,6 +271,69 @@ public:
    */
   void InsertTextAsCommittingComposition(NSAttributedString* aAttrString);
 
+  /**
+   * ConversationIdentifier() returns an ID for the current editor.  The ID is
+   * guaranteed to be unique among currently existing editors.  But it might be
+   * the same as the ID of an editor that has already been destroyed.
+   *
+   * @return                      An identifier of current focused editor.
+   */
+  NSInteger ConversationIdentifier();
+
+  /**
+   * GetAttributedSubstringFromRange() returns an NSAttributedString instance
+   * which is allocated as autorelease for aRange.
+   *
+   * @param aRange                The range of string which you want.
+   * @return                      The string in aRange.  If the string is empty,
+   *                              this returns nil.  If succeeded, this returns
+   *                              an instance which is allocated as autorelease.
+   *                              If this has some troubles, returns nil.
+   */
+  NSAttributedString* GetAttributedSubstringFromRange(NSRange& aRange);
+
+  /**
+   * SelectedRange() returns current selected range.
+   *
+   * @return                      If an editor has focus, this returns selection
+   *                              range in the editor.  Otherwise, this returns
+   *                              selection range  in the focused document.
+   */
+  NSRange SelectedRange();
+
+  /**
+   * FirstRectForCharacterRange() returns first *character* rect in the range.
+   * Cocoa needs the first line rect in the range, but we cannot compute it
+   * on current implementation.
+   *
+   * @param aRange                A range of text to examine.  Its position is
+   *                              an offset from the beginning of the focused
+   *                              editor or document.
+   * @return                      An NSRect containing the first character in
+   *                              aRange, in screen coordinates.
+   *                              If the length of aRange is 0, the width will
+   *                              be 0.
+   */
+  NSRect FirstRectForCharacterRange(NSRange& aRange);
+
+  /**
+   * CharacterIndexForPoint() returns an offset of a character at aPoint.
+   * XXX This isn't implemented, always returns 0.
+   *
+   * @param                       The point in screen coordinates.
+   * @return                      The offset of the character at aPoint from
+   *                              the beginning of the focused editor or
+   *                              document.
+   */
+  NSUInteger CharacterIndexForPoint(NSPoint& aPoint);
+
+  /**
+   * GetValidAttributesForMarkedText() returns attributes which we support.
+   *
+   * @return                      Always empty array for now.
+   */
+  NSArray* GetValidAttributesForMarkedText();
+
   PRBool HasMarkedText()
   {
     return (mMarkedRange.location != NSNotFound) && (mMarkedRange.length != 0);
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.mm b/widget/src/cocoa/nsCocoaTextInputHandler.mm
index cf40104e9f13..0fd5fdf9c2f6 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.mm
+++ b/widget/src/cocoa/nsCocoaTextInputHandler.mm
@@ -53,6 +53,8 @@
 //#define DEBUG_IME_HANDLER 1
 //#define DEBUG_TEXT_INPUT_HANDLER 1
 
+// TODO: static methods should be moved to nsCocoaUtils
+
 static void
 GetStringForNSString(const NSString *aSrc, nsAString& aDist)
 {
@@ -69,6 +71,21 @@ GetStringForNSString(const NSString *aSrc, nsAString& aDist)
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
+static NSString* ToNSString(const nsAString& aString)
+{
+  return [NSString stringWithCharacters:aString.BeginReading()
+                                 length:aString.Length()];
+}
+
+static inline void
+GeckoRectToNSRect(const nsIntRect& inGeckoRect, NSRect& outCocoaRect)
+{
+  outCocoaRect.origin.x = inGeckoRect.x;
+  outCocoaRect.origin.y = inGeckoRect.y;
+  outCocoaRect.size.width = inGeckoRect.width;
+  outCocoaRect.size.height = inGeckoRect.height;
+}
+
 #ifdef DEBUG_IME_HANDLER
 
 static const char*
@@ -1160,6 +1177,169 @@ nsCocoaIMEHandler::SetMarkedText(NSAttributedString* aAttrString,
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
+NSInteger
+nsCocoaIMEHandler::ConversationIdentifier()
+{
+  // NOTE: The size of NSInteger is same as pointer size.
+  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mOwnerWidget);
+  textContent.InitForQueryTextContent(0, 0);
+  mOwnerWidget->DispatchWindowEvent(textContent);
+  if (!textContent.mSucceeded) {
+    return reinterpret_cast<NSInteger>(mView);
+  }
+  // XXX This might return same ID as a previously existing editor if the
+  //     deleted editor was created at the same address.  Is there a better way?
+  return reinterpret_cast<NSInteger>(textContent.mReply.mContentsRoot);
+}
+
+NSAttributedString*
+nsCocoaIMEHandler::GetAttributedSubstringFromRange(NSRange& aRange)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
+
+#if DEBUG_IME_HANDLER
+  NSLog(@"****in GetAttributedSubstringFromRange");
+  NSLog(@" aRange      = %d, %d", aRange.location, aRange.length);
+#endif
+
+  if (aRange.location == NSNotFound || aRange.length == 0) {
+    return nil;
+  }
+
+  nsAutoString str;
+  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mOwnerWidget);
+  textContent.InitForQueryTextContent(aRange.location, aRange.length);
+  mOwnerWidget->DispatchWindowEvent(textContent);
+
+  if (!textContent.mSucceeded || textContent.mReply.mString.IsEmpty()) {
+    return nil;
+  }
+
+  NSString* nsstr = ToNSString(textContent.mReply.mString);
+  NSAttributedString* result =
+    [[[NSAttributedString alloc] initWithString:nsstr
+                                     attributes:nil] autorelease];
+  return result;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
+}
+
+NSRange
+nsCocoaIMEHandler::SelectedRange()
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
+
+#if DEBUG_IME_HANDLER
+  NSLog(@"****in SelectedRange");
+#endif
+  nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, mOwnerWidget);
+  mOwnerWidget->DispatchWindowEvent(selection);
+  if (!selection.mSucceeded) {
+    return NSMakeRange(NSNotFound, 0);
+  }
+
+#if DEBUG_IME_HANDLER
+  NSLog(@" result of SelectedRange = %d, %d",
+        selection.mReply.mOffset, selection.mReply.mString.Length());
+#endif
+  return NSMakeRange(selection.mReply.mOffset,
+                     selection.mReply.mString.Length());
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
+}
+
+NSRect
+nsCocoaIMEHandler::FirstRectForCharacterRange(NSRange& aRange)
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
+
+#if DEBUG_IME_HANDLER
+  NSLog(@"****in FirstRectForCharacterRange");
+  NSLog(@" aRange      = %d, %d", aRange.location, aRange.length);
+#endif
+  // XXX this returns first character rect or caret rect, it is limitation of
+  // now. We need more work for returns first line rect. But current
+  // implementation is enough for IMEs.
+
+  NSRect rect;
+  if (aRange.location == NSNotFound) {
+    return rect;
+  }
+
+  nsIntRect r;
+  PRBool useCaretRect = (aRange.length == 0);
+  if (!useCaretRect) {
+    nsQueryContentEvent charRect(PR_TRUE, NS_QUERY_TEXT_RECT, mOwnerWidget);
+    charRect.InitForQueryTextRect(aRange.location, 1);
+    mOwnerWidget->DispatchWindowEvent(charRect);
+    if (charRect.mSucceeded) {
+      r = charRect.mReply.mRect;
+    } else {
+      useCaretRect = PR_TRUE;
+    }
+  }
+
+  if (useCaretRect) {
+    nsQueryContentEvent caretRect(PR_TRUE, NS_QUERY_CARET_RECT, mOwnerWidget);
+    caretRect.InitForQueryCaretRect(aRange.location);
+    mOwnerWidget->DispatchWindowEvent(caretRect);
+    if (!caretRect.mSucceeded) {
+      return rect;
+    }
+    r = caretRect.mReply.mRect;
+    r.width = 0;
+  }
+
+  nsIWidget* rootWidget = mOwnerWidget->GetTopLevelWidget();
+  NSWindow* rootWindow =
+    static_cast<NSWindow*>(rootWidget->GetNativeData(NS_NATIVE_WINDOW));
+  NSView* rootView =
+    static_cast<NSView*>(rootWidget->GetNativeData(NS_NATIVE_WIDGET));
+  if (!rootWindow || !rootView) {
+    return rect;
+  }
+  GeckoRectToNSRect(r, rect);
+  rect = [rootView convertRect:rect toView:nil];
+  rect.origin = [rootWindow convertBaseToScreen:rect.origin];
+#if DEBUG_IME_HANDLER
+  NSLog(@" result rect (x,y,w,h) = %f, %f, %f, %f",
+        rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
+#endif
+  return rect;
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRect(0.0, 0.0, 0.0, 0.0));
+}
+
+NSUInteger
+nsCocoaIMEHandler::CharacterIndexForPoint(NSPoint& aPoint)
+{
+#if DEBUG_IME
+  NSLog(@"****in CharacterIndexForPoint");
+#endif
+  // To implement this, we'd have to grovel in text frames looking at text
+  // offsets.
+  return 0;
+}
+
+NSArray*
+nsCocoaIMEHandler::GetValidAttributesForMarkedText()
+{
+  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
+
+#if DEBUG_IME
+  NSLog(@"****in GetValidAttributesForMarkedText");
+#endif
+
+  //return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName,
+  //                                 NSMarkedClauseSegmentAttributeName,
+  //                                 NSTextInputReplacementRangeAttributeName,
+  //                                 nil];
+  // empty array; we don't support any attributes right now
+  return [NSArray array];
+
+  NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
+}
+
 
 #pragma mark -
 

From fed2749368d8c91b0701f420419511ebcc6a0157 Mon Sep 17 00:00:00 2001
From: Yury <async.processingjs@yahoo.com>
Date: Thu, 5 May 2011 17:12:04 -0400
Subject: [PATCH 019/314] Bug 451165.  Fix ParseColorString to report errors
 when there's garbage at the end of the color.  r=dbaron

---
 content/canvas/test/test_canvas.html | 78 ++++++++++++++++++++++++++++
 layout/reftests/bugs/579349-1.html   |  2 +-
 layout/style/nsCSSParser.cpp         |  3 +-
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
index 535f0991708d..012aae841f05 100644
--- a/content/canvas/test/test_canvas.html
+++ b/content/canvas/test/test_canvas.html
@@ -4791,6 +4791,69 @@ ctx.fillRect(0, 0, 100, 50);
 isPixel(ctx, 50,25, 0,255,0,255, 0);
 
 
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.name-1.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.name-1</p>
+<canvas id="c174a" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_name_1() {
+
+var canvas = document.getElementById('c174a');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'darkbrown'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.name-2.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.name-2</p>
+<canvas id="c174b" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_name_2() {
+
+var canvas = document.getElementById('c174b');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'firebrick1'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
+}
+</script>
+
+<!-- [[[ test_2d.fillStyle.parse.invalid.name-3.html ]]] -->
+
+<p>Canvas test: 2d.fillStyle.parse.invalid.name-3</p>
+<canvas id="c174c" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+<script>
+
+
+function test_2d_fillStyle_parse_invalid_name_3() {
+
+var canvas = document.getElementById('c174c');
+var ctx = canvas.getContext('2d');
+
+ctx.fillStyle = '#0f0';
+try { ctx.fillStyle = 'red blue'; } catch (e) { } // this shouldn't throw, but it shouldn't matter here if it does
+ctx.fillRect(0, 0, 100, 50);
+isPixel(ctx, 50,25, 0,255,0,255, 0);
+
+
 }
 </script>
 
@@ -22035,6 +22098,21 @@ function runTests() {
  } catch (e) {
   ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_hsla_2");
  }
+ try {
+   test_2d_fillStyle_parse_invalid_name_1()
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_name_1");
+ }
+ try {
+   test_2d_fillStyle_parse_invalid_name_2()
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_name_2");
+ }
+ try {
+   test_2d_fillStyle_parse_invalid_name_3()
+ } catch (e) {
+  ok(false, "unexpected exception thrown in: test_2d_fillStyle_parse_invalid_name_3");
+ }
  try {
   test_2d_fillStyle_parse_invalid_rgb_1();
  } catch (e) {
diff --git a/layout/reftests/bugs/579349-1.html b/layout/reftests/bugs/579349-1.html
index 3db92d23e1c2..d2e9239b889b 100644
--- a/layout/reftests/bugs/579349-1.html
+++ b/layout/reftests/bugs/579349-1.html
@@ -6,7 +6,7 @@
 <script>
 var c = document.getElementById("c");
 var ctx = c.getContext("2d");
-ctx.fillStyle = "blue;";
+ctx.fillStyle = "blue";
 ctx.fillRect(0, 0, c.width, c.height);
 </script>
 </body>
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 47eb784104ad..bd6c0fb7a81c 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -1238,7 +1238,8 @@ CSSParserImpl::ParseColorString(const nsSubstring& aBuffer,
   InitScanner(aBuffer, aURI, aLineNumber, aURI, nsnull);
 
   nsCSSValue value;
-  PRBool colorParsed = ParseColor(value);
+  // Parse a color, and check that there's nothing else after it.
+  PRBool colorParsed = ParseColor(value) && !GetToken(PR_TRUE);
   nsresult rv = mScanner.GetLowLevelError();
   OUTPUT_ERROR();
   ReleaseScanner();

From d4082fca1611e65d8975e3b08e957b61c4d6a468 Mon Sep 17 00:00:00 2001
From: Dylan Helling <dylanhelling@gmail.com>
Date: Thu, 5 May 2011 17:12:04 -0400
Subject: [PATCH 020/314] Bug 557726.  Allow passing a pseudo-element argument
 to getCSSStyleRules in inspector utils.  r=bzbarsky

---
 layout/inspector/public/inIDOMUtils.idl    |  4 +-
 layout/inspector/src/inDOMUtils.cpp        | 20 +++--
 layout/inspector/src/inDOMUtils.h          |  2 +
 layout/inspector/tests/Makefile.in         |  1 +
 layout/inspector/tests/test_bug557726.html | 97 ++++++++++++++++++++++
 5 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 layout/inspector/tests/test_bug557726.html

diff --git a/layout/inspector/public/inIDOMUtils.idl b/layout/inspector/public/inIDOMUtils.idl
index f7888cbda146..ef5bd5a05a46 100644
--- a/layout/inspector/public/inIDOMUtils.idl
+++ b/layout/inspector/public/inIDOMUtils.idl
@@ -46,11 +46,11 @@ interface nsIDOMDocument;
 interface nsIDOMCSSStyleRule;
 interface nsIDOMNode;
 
-[scriptable, uuid(aa6562de-2628-44fa-90a8-13d6aee404d6)]
+[scriptable, uuid(e01c9987-1ba2-44f0-a6a7-3148b55b7e6d)]
 interface inIDOMUtils : nsISupports
 {
   // CSS utilities
-  nsISupportsArray getCSSStyleRules(in nsIDOMElement aElement);
+  nsISupportsArray getCSSStyleRules(in nsIDOMElement aElement, [optional] in DOMString aPseudo);
   unsigned long getRuleLine(in nsIDOMCSSStyleRule aRule);
 
   // DOM Node utilities
diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 25dfe94cf9eb..3347d48fa6fd 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -53,11 +53,11 @@
 #include "nsIDOMWindowInternal.h"
 #include "nsXBLBinding.h"
 #include "nsXBLPrototypeBinding.h"
-#include "nsIDOMElement.h"
 #include "nsIMutableArray.h"
 #include "nsBindingManager.h"
 #include "nsComputedDOMStyle.h"
 #include "nsEventStateManager.h"
+#include "nsIAtom.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -151,16 +151,22 @@ inDOMUtils::GetParentForNode(nsIDOMNode* aNode,
 
 NS_IMETHODIMP
 inDOMUtils::GetCSSStyleRules(nsIDOMElement *aElement,
+                             const nsAString& aPseudo,
                              nsISupportsArray **_retval)
 {
   NS_ENSURE_ARG_POINTER(aElement);
 
   *_retval = nsnull;
 
+  nsCOMPtr<nsIAtom> pseudoElt;
+  if (!aPseudo.IsEmpty()) {
+    pseudoElt = do_GetAtom(aPseudo);
+  }
+
   nsRuleNode* ruleNode = nsnull;
   nsCOMPtr<nsIContent> content = do_QueryInterface(aElement);
   nsRefPtr<nsStyleContext> styleContext;
-  GetRuleNodeForContent(content, getter_AddRefs(styleContext), &ruleNode);
+  GetRuleNodeForContent(content, pseudoElt, getter_AddRefs(styleContext), &ruleNode);
   if (!ruleNode) {
     // This can fail for content nodes that are not in the document or
     // if the document they're in doesn't have a presshell.  Bail out.
@@ -270,6 +276,7 @@ inDOMUtils::GetContentState(nsIDOMElement *aElement, nsEventStates::InternalType
 
 /* static */ nsresult
 inDOMUtils::GetRuleNodeForContent(nsIContent* aContent,
+                                  nsIAtom* aPseudo,
                                   nsStyleContext** aStyleContext,
                                   nsRuleNode** aRuleNode)
 {
@@ -293,9 +300,10 @@ inDOMUtils::GetRuleNodeForContent(nsIContent* aContent,
   NS_ENSURE_TRUE(safe, NS_ERROR_OUT_OF_MEMORY);
 
   nsRefPtr<nsStyleContext> sContext =
-    nsComputedDOMStyle::GetStyleContextForElement(aContent->AsElement(),
-						  nsnull, presShell);
-  *aRuleNode = sContext->GetRuleNode();
-  sContext.forget(aStyleContext);
+    nsComputedDOMStyle::GetStyleContextForElement(aContent->AsElement(), aPseudo, presShell);
+  if (sContext) {
+    *aRuleNode = sContext->GetRuleNode();
+    sContext.forget(aStyleContext);
+  }
   return NS_OK;
 }
diff --git a/layout/inspector/src/inDOMUtils.h b/layout/inspector/src/inDOMUtils.h
index f589da4a324b..602dc0969566 100644
--- a/layout/inspector/src/inDOMUtils.h
+++ b/layout/inspector/src/inDOMUtils.h
@@ -44,6 +44,7 @@
 
 class nsRuleNode;
 class nsStyleContext;
+class nsIAtom;
 class nsIContent;
 
 class inDOMUtils : public inIDOMUtils
@@ -58,6 +59,7 @@ public:
 private:
   // aStyleContext must be released by the caller once he's done with aRuleNode.
   static nsresult GetRuleNodeForContent(nsIContent* aContent,
+                                        nsIAtom* aPseudo,
                                         nsStyleContext** aStyleContext,
                                         nsRuleNode** aRuleNode);
 };
diff --git a/layout/inspector/tests/Makefile.in b/layout/inspector/tests/Makefile.in
index 66fc681d3329..3c0182220a56 100644
--- a/layout/inspector/tests/Makefile.in
+++ b/layout/inspector/tests/Makefile.in
@@ -50,6 +50,7 @@ _TEST_FILES =\
 		test_bug522601.xhtml \
 		test_bug536379.html \
 		test_bug536379-2.html \
+		test_bug557726.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/layout/inspector/tests/test_bug557726.html b/layout/inspector/tests/test_bug557726.html
new file mode 100644
index 000000000000..15fbe199f3cc
--- /dev/null
+++ b/layout/inspector/tests/test_bug557726.html
@@ -0,0 +1,97 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=557726
+-->
+<head>
+  <title>Test for Bug 557726</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"/>
+  <style id="pseudo-style">
+    #div1 {
+      color: blue;
+    }
+
+    #div1:first-letter {
+      font-weight: bold;
+    }
+
+    #div1:before {
+      content: '"';
+    }
+
+    #div1:after {
+      content: '"';
+    }
+
+    #div1:after, #div1:before {
+      color: red;
+    }
+  </style>
+</head>
+<body>
+
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=557726">Mozilla Bug 557726</a>
+
+<div id="div1">
+  text with :before, :after, and :first-letter pseudo-elements
+</div>
+
+<script type="application/javascript">
+
+/** Test for Bug 557726 **/
+netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+
+function getSelectors (rules) {
+  var styleElement = document.getElementById("pseudo-style");
+  var selectors = [];
+  for (var i = 0; i < rules.Count(); i++) {
+    var rule = rules.GetElementAt(i).QueryInterface(Components.interfaces.nsIDOMCSSStyleRule);
+    if (rule.parentStyleSheet.ownerNode == styleElement) // no user agent rules
+      selectors.push(rule.selectorText);
+  }
+  return selectors;
+}
+
+var domUtils = Components.classes["@mozilla.org/inspector/dom-utils;1"]
+               .getService(Components.interfaces.inIDOMUtils);
+
+var div = document.getElementById("div1");
+
+/* empty or missing pseudo-element argument */
+var selectors = getSelectors(domUtils.getCSSStyleRules(div));
+is(selectors.length, 1, "psuedo-element argument should be optional");
+is(selectors[0], "#div1", "should only have the non-pseudo element rule");
+
+selectors = getSelectors(domUtils.getCSSStyleRules(div, null));
+is(selectors.length, 1, "pseudo-element argument can be null");
+is(selectors[0], "#div1", "should only have the non pseudo-element rule");
+
+selectors = getSelectors(domUtils.getCSSStyleRules(div, ""));
+is(selectors.length, 1, "pseudo-element argument can be empty string");
+is(selectors[0], "#div1", "should only have the non pseudo-element rule");
+
+
+/* invalid pseudo-element argument */
+var rules = domUtils.getCSSStyleRules(div, "not a valid pseudo element");
+is(rules, null, "invalid pseudo-element returns no rules list");
+
+
+/* valid pseudo-element argument */
+selectors = getSelectors(domUtils.getCSSStyleRules(div, ":first-letter"));
+is(selectors.length, 1, "pseudo-element argument can be used");
+is(selectors[0], "#div1:first-letter", "should only have the :first-letter rule");
+
+selectors = getSelectors(domUtils.getCSSStyleRules(div, ":before"));
+is(selectors.length, 2, ":before pseudo-element has two matching rules");
+isnot(selectors.indexOf("#div1:after, #div1:before"), -1, "fetched rule for :before")
+isnot(selectors.indexOf("#div1:before"), -1, "fetched rule for :before")
+
+selectors = getSelectors(domUtils.getCSSStyleRules(div, ":first-line"));
+is(selectors.length, 0, "valid pseudo-element but no matching rules");
+
+</script>
+</pre>
+</body>
+</html>

From 145338b8cb61287a1672fa4ba70c432ab8b77bcb Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 5 May 2011 17:12:04 -0400
Subject: [PATCH 021/314] Bug 651968.  Fix linking with ossaudio, and include
 soundcard.h instead of sys/soundcard.h on OpenBSD.  r=kinetik

---
 layout/build/Makefile.in                    | 4 ++++
 media/libsydneyaudio/src/sydney_audio_oss.c | 6 +++++-
 toolkit/library/Makefile.in                 | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index f36829e6b0db..9dceb32a4c5e 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -282,6 +282,10 @@ EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
 endif
 
 ifdef MOZ_SYDNEYAUDIO
+ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+EXTRA_DSO_LDOPTS += -lossaudio
+endif
+
 ifeq ($(OS_ARCH),Linux)
 EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
 endif
diff --git a/media/libsydneyaudio/src/sydney_audio_oss.c b/media/libsydneyaudio/src/sydney_audio_oss.c
index c7041ca9e610..296ba4f41fed 100644
--- a/media/libsydneyaudio/src/sydney_audio_oss.c
+++ b/media/libsydneyaudio/src/sydney_audio_oss.c
@@ -37,7 +37,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+#include <soundcard.h>
+#else
 #include <sys/soundcard.h>
+#endif
 #include <sys/ioctl.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -49,7 +53,7 @@
 // for versions newer than 3.6.1
 #define OSS_VERSION(x, y, z) (x << 16 | y << 8 | z)
 // support only versions newer than 3.6.1
-#define SUPP_OSS_VERSION OSS_VERSION(3,6,1)
+#define SUPP_OSS_VERSION OSS_VERSION(3,0,1)
 
 #if (SOUND_VERSION < SUPP_OSS_VERSION)
 #error Unsupported OSS Version
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 45665ec1e95c..75d7869f8952 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -167,6 +167,12 @@ EXTRA_DSO_LDOPTS += \
 endif
 endif
 
+ifneq (,$(filter DragonFly FreeBSD GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ifdef MOZ_SYDNEYAUDIO
+EXTRA_DSO_LDOPTS += -lossaudio
+endif
+endif
+
 ifdef MOZ_PLATFORM_MAEMO
 EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
 endif 

From d3d5f4c3e2b20285e0d12f638a3094b554bac0e1 Mon Sep 17 00:00:00 2001
From: Landry Breuil <landry@openbsd.org>
Date: Thu, 5 May 2011 17:13:59 -0400
Subject: [PATCH 022/314] Bug 654929.  Fix fallout from 633653, failure on
 sparc64. Add some #ifdef JS_METHODJIT/JS_TRACER.  r=nnethercode

/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected type-specifier before 'MemoryReporter_XPConnectJSMjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: expected `)' before 'MemoryReporter_XPConnectJSMjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1484: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: expected type-specifier before 'MemoryReporter_XPConnectJSMjitData'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: expected `)' before 'MemoryReporter_XPConnectJSMjitData'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1485: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: expected `)' before 'MemoryReporter_XPConnectJSTjitCode'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1486: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitDataAllocatorsMain'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: expected `)' before 'MemoryReporter_XPConnectJSTjitDataAllocatorsMain'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1487: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: expected type-specifier before 'MemoryReporter_XPConnectJSTjitDataAllocatorsReserve'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: expected `)' before 'MemoryReporter_XPConnectJSTjitDataAllocatorsReserve'
/var/buildslave/mozilla-central-sparc64/build/js/src/xpconnect/src/xpcjsruntime.cpp:1488: error: cannot convert 'int*' to 'nsIMemoryReporter*' for argument '1' to 'nsresult NS_RegisterMemoryReporter(nsIMemoryReporter*)'
---
 js/src/xpconnect/src/xpcjsruntime.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp
index c460615b5b09..169d9922ba5a 100644
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -1481,11 +1481,15 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
 
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSGCHeap));
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSStringData));
+#ifdef JS_METHODJIT
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitCode));
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitData));
+#endif
+#ifdef JS_TRACER
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitCode));
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsMain));
         NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsReserve));
+#endif
     }
 
     if(!JS_DHashTableInit(&mJSHolders, JS_DHashGetStubOps(), nsnull,

From 8f81bdd6cfee83f6a6a32982a52805016dc656ff Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 17:14:27 -0400
Subject: [PATCH 023/314] Bug 655010 - Remove WinCE code from mozilla owned
 parts of ImageLib; r=joe

---
 modules/libpr0n/decoders/Makefile.in      |  2 +-
 modules/libpr0n/decoders/icon/Makefile.in |  2 +-
 modules/libpr0n/src/imgFrame.cpp          | 15 +++------------
 modules/libpr0n/src/imgFrame.h            |  4 ++--
 modules/zlib/src/Makefile.in              |  4 ++--
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/modules/libpr0n/decoders/Makefile.in b/modules/libpr0n/decoders/Makefile.in
index 0b5f51fc52fc..a45abf64beaa 100644
--- a/modules/libpr0n/decoders/Makefile.in
+++ b/modules/libpr0n/decoders/Makefile.in
@@ -73,7 +73,7 @@ endif
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = icon/qt icon
 endif
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 DIRS = icon/win icon
 endif
 ifeq ($(OS_ARCH),OS2)
diff --git a/modules/libpr0n/decoders/icon/Makefile.in b/modules/libpr0n/decoders/icon/Makefile.in
index f1791c6c8a83..eef4b03d5a68 100644
--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@@ -59,7 +59,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_QT_LIBS)
 PLATFORM = qt
 endif
 
-ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LIBS = gkgfx
 PLATFORM = win
 endif
diff --git a/modules/libpr0n/src/imgFrame.cpp b/modules/libpr0n/src/imgFrame.cpp
index b0a2d1a57904..d2c0eee0e842 100644
--- a/modules/libpr0n/src/imgFrame.cpp
+++ b/modules/libpr0n/src/imgFrame.cpp
@@ -50,11 +50,9 @@ static PRBool gDisableOptimize = PR_FALSE;
 
 #include "cairo.h"
 
-#if defined(XP_WIN) || defined(WINCE)
-#include "gfxWindowsPlatform.h"
-#endif
+#if defined(XP_WIN)
 
-#if defined(XP_WIN) && !defined(WINCE)
+#include "gfxWindowsPlatform.h"
 
 /* Whether to use the windows surface; only for desktop win32 */
 #define USE_WIN_SURFACE 1
@@ -112,14 +110,7 @@ static PRBool AllowedImageSize(PRInt32 aWidth, PRInt32 aHeight)
 // optimized platform-specific surfaces.
 static PRBool ShouldUseImageSurfaces()
 {
-#if defined(WINCE)
-  // There is no test on windows mobile to check for Gui resources.
-  // Allocate, until we run out of memory.
-  gfxWindowsPlatform::RenderMode rmode = gfxWindowsPlatform::GetPlatform()->GetRenderMode();
-  return rmode != gfxWindowsPlatform::RENDER_DDRAW &&
-      rmode != gfxWindowsPlatform::RENDER_DDRAW_GL;
-
-#elif defined(USE_WIN_SURFACE)
+#if defined(USE_WIN_SURFACE)
   static const DWORD kGDIObjectsHighWaterMark = 7000;
 
   if (gfxWindowsPlatform::GetPlatform()->GetRenderMode() ==
diff --git a/modules/libpr0n/src/imgFrame.h b/modules/libpr0n/src/imgFrame.h
index 9469202b68ff..fb934e2055c7 100644
--- a/modules/libpr0n/src/imgFrame.h
+++ b/modules/libpr0n/src/imgFrame.h
@@ -125,7 +125,7 @@ public:
   {
     if (mOptSurface)
       return mOptSurface;
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
     if (mWinSurface)
       return mWinSurface;
 #elif defined(XP_MACOSX)
@@ -165,7 +165,7 @@ private: // methods
 private: // data
   nsRefPtr<gfxImageSurface> mImageSurface;
   nsRefPtr<gfxASurface> mOptSurface;
-#if defined(XP_WIN) && !defined(WINCE)
+#if defined(XP_WIN)
   nsRefPtr<gfxWindowsSurface> mWinSurface;
 #elif defined(XP_MACOSX)
   nsRefPtr<gfxQuartzImageSurface> mQuartzSurface;
diff --git a/modules/zlib/src/Makefile.in b/modules/zlib/src/Makefile.in
index fc12071a67c2..9179a3aa40c7 100644
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -50,7 +50,7 @@ LIBXUL_LIBRARY = 1
 DIST_INSTALL = 1
 
 ifndef MOZ_ENABLE_LIBXUL
-ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 MAPFILE	= $(LIBRARY_NAME).map
 DEFFILE	= $(win_srcdir)/zlib.def
@@ -58,7 +58,7 @@ endif
 endif
 endif
 
-ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH)))
+ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 DEFINES	+= -DZLIB_DLL=1
 endif
 

From 370527db8c64c1063475a6afedd649ead6f4ad3b Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 17:14:43 -0400
Subject: [PATCH 024/314] Bug 655039 - Remove WinCE code from libmar; r=rstrong

---
 modules/libmar/src/mar.h         |  6 ------
 modules/libmar/src/mar_create.c  | 29 -----------------------------
 modules/libmar/src/mar_extract.c | 16 +---------------
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/modules/libmar/src/mar.h b/modules/libmar/src/mar.h
index 2ffd4ddbe97a..45f46e835a75 100644
--- a/modules/libmar/src/mar.h
+++ b/modules/libmar/src/mar.h
@@ -40,13 +40,7 @@
 #define MAR_H__
 
 /* We use NSPR here just to import the definition of PRUint32 */
-#ifndef WINCE
 #include "prtypes.h"
-#else
-typedef int PRInt32;
-typedef unsigned int PRUint32;
-typedef wchar_t PRUnichar;
-#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/modules/libmar/src/mar_create.c b/modules/libmar/src/mar_create.c
index 04e5f7634a67..daf45d9ce7b7 100644
--- a/modules/libmar/src/mar_create.c
+++ b/modules/libmar/src/mar_create.c
@@ -128,14 +128,7 @@ static int mar_concat_file(FILE *fp, const char *path) {
 int mar_create(const char *dest, int num_files, char **files) {
   struct MarItemStack stack;
   PRUint32 offset_to_index = 0, size_of_index;
-#ifdef WINCE
-  WIN32_FIND_DATAW file_data;
-  PRUnichar wide_path[MAX_PATH];
-  size_t size;
-  PRInt32 flags;
-#else
   struct stat st;
-#endif
   FILE *fp;
   int i, rv = -1;
 
@@ -155,27 +148,12 @@ int mar_create(const char *dest, int num_files, char **files) {
   stack.last_offset = MAR_ID_SIZE + sizeof(PRUint32);
 
   for (i = 0; i < num_files; ++i) {
-#ifdef WINCE
-    HANDLE handle;
-    MultiByteToWideChar(CP_ACP, 0, files[i], -1, wide_path, MAX_PATH);
-    handle = FindFirstFile(wide_path, &file_data);
-    if (handle == INVALID_HANDLE_VALUE) {
-#else
     if (stat(files[i], &st)) {
-#endif
       fprintf(stderr, "ERROR: file not found: %s\n", files[i]);
       goto failure;
     }
-#ifdef WINCE
-    flags = (file_data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) ?
-      0444 : 0666;
-    size = (file_data.nFileSizeHigh * (MAXDWORD + 1)) + file_data.nFileSizeLow;
-    FindClose(handle);
-    if (mar_push(&stack, size, flags, files[i]))
-#else
 
     if (mar_push(&stack, st.st_size, st.st_mode & 0777, files[i]))
-#endif
       goto failure;
 
     /* concatenate input file to archive */
@@ -203,13 +181,6 @@ failure:
     free(stack.head);
   fclose(fp);
   if (rv)
-#ifdef WINCE
-    {
-      MultiByteToWideChar(CP_ACP, 0, dest, -1, wide_path, MAX_PATH);
-      DeleteFileW(wide_path);
-    }
-#else
     remove(dest);
-#endif
   return rv;
 }
diff --git a/modules/libmar/src/mar_extract.c b/modules/libmar/src/mar_extract.c
index ce1d6e15d3d2..563838daf770 100644
--- a/modules/libmar/src/mar_extract.c
+++ b/modules/libmar/src/mar_extract.c
@@ -48,29 +48,18 @@
 #ifdef XP_WIN
 #include <io.h>
 #include <direct.h>
-#ifdef WINCE
-#include <windows.h>
-#endif
 #endif
 
 /* Ensure that the directory containing this file exists */
 static int mar_ensure_parent_dir(const char *path)
 {
   char *slash = strrchr(path, '/');
-#ifdef WINCE
-  wchar_t wide_path[MAX_PATH];
-#endif
   if (slash)
   {
     *slash = '\0';
     mar_ensure_parent_dir(path);
 #ifdef XP_WIN
-#ifdef WINCE
-    MultiByteToWideChar(CP_ACP, 0, path, -1, wide_path, MAX_PATH);
-    CreateDirectory(wide_path, NULL);
-#else
     _mkdir(path);
-#endif
 #else
     mkdir(path, 0755);
 #endif
@@ -86,9 +75,7 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
 
   if (mar_ensure_parent_dir(item->name))
     return -1;
-#ifdef WINCE 
-  fp = fopen(item->name, "bw");
-#else
+
 #ifdef XP_WIN
   fd = _open(item->name, _O_BINARY|_O_CREAT|_O_TRUNC|_O_WRONLY, item->flags);
 #else
@@ -98,7 +85,6 @@ static int mar_test_callback(MarFile *mar, const MarItem *item, void *unused) {
     return -1;
 
   fp = fdopen(fd, "wb");
-#endif
   if (!fp)
     return -1;
 

From c6af44fb4860e6ddcf197917d04bf2fd6e2f2096 Mon Sep 17 00:00:00 2001
From: Paul ADENOT <paul@paul.cx>
Date: Fri, 6 May 2011 11:03:44 +0200
Subject: [PATCH 025/314] Bug 654976 : changed the AudioChild
 mAudioReentrantMonitor name. r=kinetik

---
 dom/ipc/AudioChild.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/ipc/AudioChild.cpp b/dom/ipc/AudioChild.cpp
index a9bd5db4b0fa..2f25f7f775f1 100644
--- a/dom/ipc/AudioChild.cpp
+++ b/dom/ipc/AudioChild.cpp
@@ -48,7 +48,7 @@ NS_IMPL_THREADSAFE_RELEASE(AudioChild);
 AudioChild::AudioChild()
   : mLastSampleOffset(-1),
     mLastSampleOffsetTime(0),
-    mAudioReentrantMonitor("AutoChild.mReentrantMonitor"),
+    mAudioReentrantMonitor("AudioChild.mReentrantMonitor"),
     mIPCOpen(PR_TRUE),
     mDrained(PR_FALSE)
 {

From 07d375091375255988333c10c435d8afdc1c916e Mon Sep 17 00:00:00 2001
From: Oleg Romashin <romaxa@gmail.com>
Date: Fri, 6 May 2011 11:04:14 +0200
Subject: [PATCH 026/314] Bug 612407 - Add FPS counter like fraps r=joe

---
 gfx/layers/opengl/LayerManagerOGL.cpp | 131 ++++++++++++++++++++++++++
 gfx/layers/opengl/LayerManagerOGL.h   |  23 +++++
 widget/src/xpwidgets/nsBaseWidget.cpp |   4 +
 widget/src/xpwidgets/nsBaseWidget.h   |   1 +
 4 files changed, 159 insertions(+)

diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 80350afd6b7d..ea216a71b915 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -45,6 +45,7 @@
 #include "ImageLayerOGL.h"
 #include "ColorLayerOGL.h"
 #include "CanvasLayerOGL.h"
+#include "mozilla/TimeStamp.h"
 
 #include "LayerManagerOGLShaders.h"
 
@@ -80,6 +81,7 @@ LayerManagerOGL::LayerManagerOGL(nsIWidget *aWidget)
   , mBackBufferTexture(0)
   , mBackBufferSize(-1, -1)
   , mHasBGRA(0)
+  , mRenderFPS(false)
 {
 }
 
@@ -538,6 +540,131 @@ LayerManagerOGL::RootLayer() const
   return static_cast<LayerOGL*>(mRoot->ImplData());
 }
 
+void
+LayerManagerOGL::FPSState::DrawFPS(GLContext* context, CopyProgram* copyprog)
+{
+  fcount++;
+
+  int rate = 30;
+  if (fcount >= rate) {
+    TimeStamp now = TimeStamp::Now();
+    TimeDuration duration = now - last;
+    last = now;
+    fps = rate / duration.ToSeconds() + .5;
+    fcount = 0;
+  }
+
+  GLint viewport[4];
+  context->fGetIntegerv(LOCAL_GL_VIEWPORT, viewport);
+
+  static GLuint texture;
+  if (!initialized) {
+    // Bind the number of textures we need, in this case one.
+    context->fGenTextures(1, &texture);
+    context->fBindTexture(LOCAL_GL_TEXTURE_2D, texture);
+    context->fTexParameteri(LOCAL_GL_TEXTURE_2D,LOCAL_GL_TEXTURE_MIN_FILTER,LOCAL_GL_NEAREST);
+    context->fTexParameteri(LOCAL_GL_TEXTURE_2D,LOCAL_GL_TEXTURE_MAG_FILTER,LOCAL_GL_NEAREST);
+
+    char text[] = {
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      0, 255, 255, 255,   0, 255, 255,   0,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,
+      0, 255,   0, 255,   0,   0, 255,   0,   0,   0,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0,   0,   0,   0,   0, 255,   0, 255,   0, 255,   0, 255,   0, 255,   0,
+      0, 255,   0, 255,   0,   0, 255,   0,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,
+      0, 255,   0, 255,   0,   0, 255,   0,   0, 255,   0,   0,   0,   0,   0, 255,   0,   0,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0,
+      0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0,
+      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+    };
+
+    unsigned long* buf = (unsigned long*)malloc(64 * 8 * 4);
+    for (int i = 0; i < 7; i++) {
+      for (int j = 0; j < 41; j++) {
+        buf[i * 64 + j] = (text[i * 41 + j] == 0) ? 0xfff000ff : 0xffffffff;
+      }
+    }
+    context->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, 64, 8, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, buf);
+    initialized = true;
+  }
+
+  struct Vertex2D {
+    float x,y;
+  };
+  const Vertex2D vertices[] = {
+    { -1.0, 1.0 - 42. / viewport[3] },
+    { -1.0, 1.0},
+    { -1.0 + 22. / viewport[2], 1.0 - 42. / viewport[3] },
+    { -1.0 + 22. / viewport[2], 1.0 },
+
+    {  -1.0 + 22. / viewport[2], 1.0 - 42. / viewport[3] },
+    {  -1.0 + 22. / viewport[2], 1.0 },
+    {  -1.0 + 44. / viewport[2], 1.0 - 42. / viewport[3] },
+    {  -1.0 + 44. / viewport[2], 1.0 },
+
+    { -1.0 + 44. / viewport[2], 1.0 - 42. / viewport[3] },
+    { -1.0 + 44. / viewport[2], 1.0 },
+    { -1.0 + 66. / viewport[2], 1.0 - 42. / viewport[3] },
+    { -1.0 + 66. / viewport[2], 1.0 }
+  };
+
+  int v1   = fps % 10;
+  int v10  = (fps % 100) / 10;
+  int v100 = (fps % 1000) / 100;
+
+  // Feel free to comment these texture coordinates out and use one
+  // of the ones below instead, or play around with your own values.
+  const GLfloat texCoords[] = {
+    (v100 * 4.) / 64, 7. / 8,
+    (v100 * 4.) / 64, 0.0,
+    (v100 * 4. + 4) / 64, 7. / 8,
+    (v100 * 4. + 4) / 64, 0.0,
+
+    (v10 * 4.) / 64, 7. / 8,
+    (v10 * 4.) / 64, 0.0,
+    (v10 * 4. + 4) / 64, 7. / 8,
+    (v10 * 4. + 4) / 64, 0.0,
+
+    (v1 * 4.) / 64, 7. / 8,
+    (v1 * 4.) / 64, 0.0,
+    (v1 * 4. + 4) / 64, 7. / 8,
+    (v1 * 4. + 4) / 64, 0.0,
+  };
+
+  // Turn necessary features on
+  context->fEnable(LOCAL_GL_BLEND);
+  context->fBlendFunc(LOCAL_GL_ONE, LOCAL_GL_SRC_COLOR);
+
+  context->fBindTexture(LOCAL_GL_TEXTURE_2D, texture);
+
+  copyprog->Activate();
+  copyprog->SetTextureUnit(0);
+
+  // we're going to use client-side vertex arrays for this.
+  context->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
+
+  // "COPY"
+  context->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ZERO,
+                              LOCAL_GL_ONE, LOCAL_GL_ZERO);
+
+  // enable our vertex attribs; we'll call glVertexPointer below
+  // to fill with the correct data.
+  GLint vcattr = copyprog->AttribLocation(CopyProgram::VertexCoordAttrib);
+  GLint tcattr = copyprog->AttribLocation(CopyProgram::TexCoordAttrib);
+
+  context->fEnableVertexAttribArray(vcattr);
+  context->fEnableVertexAttribArray(tcattr);
+
+  context->fVertexAttribPointer(vcattr,
+                                2, LOCAL_GL_FLOAT,
+                                LOCAL_GL_FALSE,
+                                0, vertices);
+
+  context->fVertexAttribPointer(tcattr,
+                                2, LOCAL_GL_FLOAT,
+                                LOCAL_GL_FALSE,
+                                0, texCoords);
+
+  context->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 12);
+}
+
 void
 LayerManagerOGL::Render()
 {
@@ -605,6 +732,10 @@ LayerManagerOGL::Render()
     return;
   }
 
+  if (mRenderFPS) {
+    mFPS.DrawFPS(mGLContext, GetCopy2DProgram());
+  }
+
   if (mGLContext->IsDoubleBuffered()) {
     mGLContext->SwapBuffers();
     return;
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index 0cc7d76968fa..ba842ad369d1 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -44,6 +44,8 @@
 
 #include "mozilla/layers/ShadowLayers.h"
 
+#include "mozilla/TimeStamp.h"
+
 #ifdef XP_WIN
 #include <windows.h>
 #endif
@@ -386,6 +388,8 @@ public:
   gfxMatrix& GetWorldTransform(void);
   void WorldTransformRect(nsIntRect& aRect);
 
+  void SetRenderFPS(bool aRenderFPS) { mRenderFPS = aRenderFPS; };
+
 private:
   /** Widget associated with this layer manager */
   nsIWidget *mWidget;
@@ -464,6 +468,25 @@ private:
   DrawThebesLayerCallback mThebesLayerCallback;
   void *mThebesLayerCallbackData;
   gfxMatrix mWorldMatrix;
+
+  struct FPSState
+  {
+      GLuint texture;
+      int fps;
+      bool initialized;
+      int fcount;
+      TimeStamp last;
+
+      FPSState()
+        : texture(0)
+        , fps(0)
+        , initialized(false)
+        , fcount(0)
+      {}
+      void DrawFPS(GLContext*, CopyProgram*);
+  } mFPS;
+
+  bool mRenderFPS;
 };
 
 /**
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index e66c7b037080..867774b0ac1b 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -115,6 +115,7 @@ nsBaseWidget::nsBaseWidget()
 , mZIndex(0)
 , mSizeMode(nsSizeMode_Normal)
 , mPopupLevel(ePopupLevelTop)
+, mDrawFPS(PR_FALSE)
 {
 #ifdef NOISY_WIDGET_LEAKS
   gNumWidgets++;
@@ -823,6 +824,8 @@ nsBaseWidget::GetShouldAccelerate()
     prefs->GetBoolPref("layers.acceleration.force-enabled",
                        &forceAcceleration);
 
+    prefs->GetBoolPref("layers.acceleration.draw-fps",
+                       &mDrawFPS);
   }
 
   const char *acceleratedEnv = PR_GetEnv("MOZ_ACCELERATED");
@@ -876,6 +879,7 @@ LayerManager* nsBaseWidget::GetLayerManager(LayerManagerPersistence,
        * deal with it though!
        */
       if (layerManager->Initialize()) {
+        layerManager->SetRenderFPS(mDrawFPS);
         mLayerManager = layerManager;
       }
     }
diff --git a/widget/src/xpwidgets/nsBaseWidget.h b/widget/src/xpwidgets/nsBaseWidget.h
index 65b1a2839c5a..e8286d86c948 100644
--- a/widget/src/xpwidgets/nsBaseWidget.h
+++ b/widget/src/xpwidgets/nsBaseWidget.h
@@ -288,6 +288,7 @@ protected:
   PRInt32           mZIndex;
   nsSizeMode        mSizeMode;
   nsPopupLevel      mPopupLevel;
+  PRBool            mDrawFPS;
 
   // the last rolled up popup. Only set this when an nsAutoRollup is in scope,
   // so it can be cleared automatically.

From 6779c1dd57e4ace96e477e5c6da40532c4e65c44 Mon Sep 17 00:00:00 2001
From: Alex Pakhotin <alexp@mozilla.com>
Date: Wed, 30 Mar 2011 11:04:41 -0700
Subject: [PATCH 027/314] Bug 641906 - Use system theme colors in nsLookAndFeel
 on Android. r=blassey

---
 dom/ipc/ContentParent.cpp            |  17 +++
 dom/ipc/ContentParent.h              |   2 +
 dom/ipc/PContent.ipdl                |   3 +
 embedding/android/GeckoAppShell.java |  36 ++++++
 widget/src/android/AndroidBridge.cpp |  37 ++++++
 widget/src/android/AndroidBridge.h   |  20 +++
 widget/src/android/nsLookAndFeel.cpp | 181 +++++++++++++++++----------
 widget/src/android/nsLookAndFeel.h   |   8 ++
 8 files changed, 238 insertions(+), 66 deletions(-)

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 46807fd9ef9d..0281012a00eb 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -100,6 +100,7 @@
 
 #ifdef ANDROID
 #include "gfxAndroidPlatform.h"
+#include "AndroidBridge.h"
 #endif
 
 #include "nsIClipboard.h"
@@ -535,6 +536,22 @@ ContentParent::RecvClipboardHasText(PRBool* hasText)
     return true;
 }
 
+bool
+ContentParent::RecvGetSystemColors(const PRUint32& colorsCount, InfallibleTArray<PRUint32>* colors)
+{
+#ifdef ANDROID
+    if (!AndroidBridge::Bridge())
+        return false;
+
+    colors->AppendElements(colorsCount);
+
+    // The array elements correspond to the members of AndroidSystemColors structure,
+    // so just pass the pointer to the elements buffer
+    AndroidBridge::Bridge()->GetSystemColors((AndroidSystemColors*)colors->Elements());
+#endif
+    return true;
+}
+
 NS_IMPL_THREADSAFE_ISUPPORTS3(ContentParent,
                               nsIObserver,
                               nsIThreadObserver,
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index 4243dc07d90d..36e832106ab6 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -165,6 +165,8 @@ private:
     virtual bool RecvEmptyClipboard();
     virtual bool RecvClipboardHasText(PRBool* hasText);
 
+    virtual bool RecvGetSystemColors(const PRUint32& colorsCount, InfallibleTArray<PRUint32>* colors);
+
     virtual bool RecvStartVisitedQuery(const IPC::URI& uri);
 
     virtual bool RecvVisitURI(const IPC::URI& uri,
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 7c19acb884a9..a2ca6a04d8d8 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -194,6 +194,9 @@ parent:
     sync ClipboardHasText()
         returns (PRBool hasText);
 
+    sync GetSystemColors(PRUint32 colorsCount)
+        returns (PRUint32[] colors);
+
 both:
      AsyncMessage(nsString aMessage, nsString aJSON);
 
diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java
index 5a351d291615..4c60c0e8aab7 100644
--- a/embedding/android/GeckoAppShell.java
+++ b/embedding/android/GeckoAppShell.java
@@ -1007,6 +1007,42 @@ public class GeckoAppShell
         res.updateConfiguration(config, res.getDisplayMetrics());
     }
 
+    public static int[] getSystemColors() {
+        // attrsAppearance[] must correspond to AndroidSystemColors structure in android/AndroidBridge.h
+        final int[] attrsAppearance = {
+            android.R.attr.textColor,
+            android.R.attr.textColorPrimary,
+            android.R.attr.textColorPrimaryInverse,
+            android.R.attr.textColorSecondary,
+            android.R.attr.textColorSecondaryInverse,
+            android.R.attr.textColorTertiary,
+            android.R.attr.textColorTertiaryInverse,
+            android.R.attr.textColorHighlight,
+            android.R.attr.colorForeground,
+            android.R.attr.colorBackground,
+            android.R.attr.panelColorForeground,
+            android.R.attr.panelColorBackground
+        };
+
+        int[] result = new int[attrsAppearance.length];
+
+        final ContextThemeWrapper contextThemeWrapper =
+            new ContextThemeWrapper(GeckoApp.mAppContext, android.R.style.TextAppearance);
+
+        final TypedArray appearance = contextThemeWrapper.getTheme().obtainStyledAttributes(attrsAppearance);
+
+        if (appearance != null) {
+            for (int i = 0; i < appearance.getIndexCount(); i++) {
+                int idx = appearance.getIndex(i);
+                int color = appearance.getColor(idx, 0);
+                result[idx] = color;
+            }
+            appearance.recycle();
+        }
+
+        return result;
+    }
+
     public static void killAnyZombies() {
         GeckoProcessesVisitor visitor = new GeckoProcessesVisitor() {
             public boolean callback(int pid) {
diff --git a/widget/src/android/AndroidBridge.cpp b/widget/src/android/AndroidBridge.cpp
index 0baa7c90e2c2..b604ef2b7bf5 100644
--- a/widget/src/android/AndroidBridge.cpp
+++ b/widget/src/android/AndroidBridge.cpp
@@ -140,6 +140,7 @@ AndroidBridge::Init(JNIEnv *jEnv,
     jIsNetworkLinkKnown = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "isNetworkLinkKnown", "()Z");
     jSetSelectedLocale = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "setSelectedLocale", "(Ljava/lang/String;)V");
     jScanMedia = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "scanMedia", "(Ljava/lang/String;Ljava/lang/String;)V");
+    jGetSystemColors = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getSystemColors", "()[I");
 
     jEGLContextClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("javax/microedition/khronos/egl/EGLContext"));
     jEGL10Class = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("javax/microedition/khronos/egl/EGL10"));
@@ -680,6 +681,42 @@ AndroidBridge::SetSelectedLocale(const nsAString& aLocale)
     GetJNIForThread()->CallStaticVoidMethod(mGeckoAppShellClass, jSetSelectedLocale, jLocale);
 }
 
+void
+AndroidBridge::GetSystemColors(AndroidSystemColors *aColors)
+{
+    ALOG_BRIDGE("AndroidBridge::GetSystemColors");
+
+    NS_ASSERTION(aColors != nsnull, "AndroidBridge::GetSystemColors: aColors is null!");
+    if (!aColors)
+        return;
+
+    AutoLocalJNIFrame jniFrame;
+
+    jobject obj = mJNIEnv->CallStaticObjectMethod(mGeckoAppShellClass, jGetSystemColors);
+    jintArray arr = static_cast<jintArray>(obj);
+    if (!arr)
+        return;
+
+    jsize len = mJNIEnv->GetArrayLength(arr);
+    jint *elements = mJNIEnv->GetIntArrayElements(arr, 0);
+
+    PRUint32 colorsCount = sizeof(AndroidSystemColors) / sizeof(nscolor);
+    if (len < colorsCount)
+        colorsCount = len;
+
+    // Convert Android colors to nscolor by switching R and B in the ARGB 32 bit value
+    nscolor *colors = (nscolor*)aColors;
+
+    for (PRUint32 i = 0; i < colorsCount; i++) {
+        PRUint32 androidColor = static_cast<PRUint32>(elements[i]);
+        PRUint8 r = (androidColor & 0x00ff0000) >> 16;
+        PRUint8 b = (androidColor & 0x000000ff);
+        colors[i] = androidColor & 0xff00ff00 | b << 16 | r;
+    }
+
+    mJNIEnv->ReleaseIntArrayElements(arr, elements, 0);
+}
+
 void
 AndroidBridge::SetSurfaceView(jobject obj)
 {
diff --git a/widget/src/android/AndroidBridge.h b/widget/src/android/AndroidBridge.h
index 3ffd4401a806..5f7832da6ec8 100644
--- a/widget/src/android/AndroidBridge.h
+++ b/widget/src/android/AndroidBridge.h
@@ -49,6 +49,7 @@
 
 #include "nsIMutableArray.h"
 #include "nsIMIMEInfo.h"
+#include "nsColor.h"
 
 // Some debug #defines
 // #define ANDROID_DEBUG_EVENTS
@@ -58,6 +59,22 @@ class nsWindow;
 
 namespace mozilla {
 
+// The order and number of the members in this structure must correspond
+// to the attrsAppearance array in GeckoAppShell.getSystemColors()
+typedef struct AndroidSystemColors {
+    nscolor textColorPrimary;
+    nscolor textColorPrimaryInverse;
+    nscolor textColorSecondary;
+    nscolor textColorSecondaryInverse;
+    nscolor textColorTertiary;
+    nscolor textColorTertiaryInverse;
+    nscolor textColorHighlight;
+    nscolor colorForeground;
+    nscolor colorBackground;
+    nscolor panelColorForeground;
+    nscolor panelColorBackground;
+} AndroidSystemColors;
+
 class AndroidBridge
 {
 public:
@@ -189,6 +206,8 @@ public:
 
     void SetSelectedLocale(const nsAString&);
 
+    void GetSystemColors(AndroidSystemColors *aColors);
+
     struct AutoLocalJNIFrame {
         AutoLocalJNIFrame(int nEntries = 128) : mEntries(nEntries) {
             // Make sure there is enough space to store a local ref to the
@@ -281,6 +300,7 @@ protected:
     jmethodID jIsNetworkLinkKnown;
     jmethodID jSetSelectedLocale;
     jmethodID jScanMedia;
+    jmethodID jGetSystemColors;
 
     // stuff we need for CallEglCreateWindowSurface
     jclass jEGLSurfaceImplClass;
diff --git a/widget/src/android/nsLookAndFeel.cpp b/widget/src/android/nsLookAndFeel.cpp
index 7fd97566dc77..abc8237e4d92 100644
--- a/widget/src/android/nsLookAndFeel.cpp
+++ b/widget/src/android/nsLookAndFeel.cpp
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *   Vladimir Vukicevic <vladimir@pobox.com>
+ *   Alex Pakhotin <alexp@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
@@ -36,8 +37,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsLookAndFeel.h"
+#include "mozilla/dom/ContentChild.h"
 #include "nsStyleConsts.h"
+#include "nsXULAppAPI.h"
+#include "nsLookAndFeel.h"
+
+using namespace mozilla;
+using mozilla::dom::ContentChild;
+
+PRBool nsLookAndFeel::mInitialized = PR_FALSE;
+AndroidSystemColors nsLookAndFeel::mSystemColors;
 
 nsLookAndFeel::nsLookAndFeel()
     : nsXPLookAndFeel()
@@ -48,28 +57,68 @@ nsLookAndFeel::~nsLookAndFeel()
 {
 }
 
+#define BG_PRELIGHT_COLOR      NS_RGB(0xee,0xee,0xee)
+#define FG_PRELIGHT_COLOR      NS_RGB(0x77,0x77,0x77)
+#define BLACK_COLOR            NS_RGB(0x00,0x00,0x00)
+#define DARK_GRAY_COLOR        NS_RGB(0x40,0x40,0x40)
+#define GRAY_COLOR             NS_RGB(0x80,0x80,0x80)
+#define LIGHT_GRAY_COLOR       NS_RGB(0xa0,0xa0,0xa0)
+#define RED_COLOR              NS_RGB(0xff,0x00,0x00)
+
+nsresult
+nsLookAndFeel::GetSystemColors()
+{
+    if (mInitialized)
+        return NS_OK;
+
+    if (!AndroidBridge::Bridge())
+        return NS_ERROR_FAILURE;
+
+    AndroidBridge::Bridge()->GetSystemColors(&mSystemColors);
+
+    mInitialized = PR_TRUE;
+
+    return NS_OK;
+}
+
+nsresult
+nsLookAndFeel::CallRemoteGetSystemColors()
+{
+    // An array has to be used to get data from remote process
+    InfallibleTArray<PRUint32> colors;
+    PRUint32 colorsCount = sizeof(AndroidSystemColors) / sizeof(nscolor);
+
+    if (!ContentChild::GetSingleton()->SendGetSystemColors(colorsCount, &colors))
+        return NS_ERROR_FAILURE;
+
+    NS_ASSERTION(colors.Length() == colorsCount, "System colors array is incomplete");
+    if (colors.Length() == 0)
+        return NS_ERROR_FAILURE;
+
+    if (colors.Length() < colorsCount)
+        colorsCount = colors.Length();
+
+    // Array elements correspond to the members of mSystemColors structure,
+    // so just copy the memory block
+    memcpy(&mSystemColors, colors.Elements(), sizeof(nscolor) * colorsCount);
+
+    mInitialized = PR_TRUE;
+
+    return NS_OK;
+}
+
 nsresult
 nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
 {
     nsresult rv = NS_OK;
 
-#define BASE_ACTIVE_COLOR     NS_RGB(0xaa,0xaa,0xaa)
-#define BASE_NORMAL_COLOR     NS_RGB(0xff,0xff,0xff)
-#define BASE_SELECTED_COLOR   NS_RGB(0xaa,0xaa,0xaa)
-#define BG_ACTIVE_COLOR       NS_RGB(0xff,0xff,0xff)
-#define BG_INSENSITIVE_COLOR  NS_RGB(0xaa,0xaa,0xaa)
-#define BG_NORMAL_COLOR       NS_RGB(0xff,0xff,0xff)
-#define BG_PRELIGHT_COLOR     NS_RGB(0xee,0xee,0xee)
-#define BG_SELECTED_COLOR     NS_RGB(0x99,0x99,0x99)
-#define DARK_NORMAL_COLOR     NS_RGB(0x88,0x88,0x88)
-#define FG_INSENSITIVE_COLOR  NS_RGB(0x44,0x44,0x44)
-#define FG_NORMAL_COLOR       NS_RGB(0x00,0x00,0x00)
-#define FG_PRELIGHT_COLOR     NS_RGB(0x77,0x77,0x77)
-#define FG_SELECTED_COLOR     NS_RGB(0xaa,0xaa,0xaa)
-#define LIGHT_NORMAL_COLOR    NS_RGB(0xaa,0xaa,0xaa)
-#define TEXT_ACTIVE_COLOR     NS_RGB(0x99,0x99,0x99)
-#define TEXT_NORMAL_COLOR     NS_RGB(0x00,0x00,0x00)
-#define TEXT_SELECTED_COLOR   NS_RGB(0x00,0x00,0x00)
+    if (!mInitialized) {
+        if (XRE_GetProcessType() == GeckoProcessType_Default)
+            rv = GetSystemColors();
+        else
+            rv = CallRemoteGetSystemColors();
+        NS_ENSURE_SUCCESS(rv, rv);
+    }
 
     // XXX we'll want to use context.obtainStyledAttributes on the java side to
     // get all of these; see TextView.java for a good exmaple.
@@ -79,48 +128,48 @@ nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
         // (except here at least TextSelectBackground and TextSelectForeground)
         // The CSS2 colors below are used.
     case eColor_WindowBackground:
-        aColor = BASE_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_WindowForeground:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.textColorPrimary;
         break;
     case eColor_WidgetBackground:
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_WidgetForeground:
-        aColor = FG_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor_WidgetSelectBackground:
-        aColor = BG_SELECTED_COLOR;
+        aColor = mSystemColors.textColorHighlight;
         break;
     case eColor_WidgetSelectForeground:
-        aColor = FG_SELECTED_COLOR;
+        aColor = mSystemColors.textColorPrimaryInverse;
         break;
     case eColor_Widget3DHighlight:
-        aColor = NS_RGB(0xa0,0xa0,0xa0);
+        aColor = LIGHT_GRAY_COLOR;
         break;
     case eColor_Widget3DShadow:
-        aColor = NS_RGB(0x40,0x40,0x40);
+        aColor = DARK_GRAY_COLOR;
         break;
     case eColor_TextBackground:
         // not used?
-        aColor = BASE_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_TextForeground:
         // not used?
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.textColorPrimary;
         break;
     case eColor_TextSelectBackground:
     case eColor_IMESelectedRawTextBackground:
     case eColor_IMESelectedConvertedTextBackground:
         // still used
-        aColor = BASE_SELECTED_COLOR;
+        aColor = mSystemColors.textColorHighlight;
         break;
     case eColor_TextSelectForeground:
     case eColor_IMESelectedRawTextForeground:
     case eColor_IMESelectedConvertedTextForeground:
         // still used
-        aColor = TEXT_SELECTED_COLOR;
+        aColor = mSystemColors.textColorPrimaryInverse;
         break;
     case eColor_IMERawInputBackground:
     case eColor_IMEConvertedTextBackground:
@@ -139,138 +188,138 @@ nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
         aColor = NS_TRANSPARENT;
         break;
     case eColor_SpellCheckerUnderline:
-      aColor = NS_RGB(0xff, 0, 0);
+      aColor = RED_COLOR;
       break;
 
         // css2  http://www.w3.org/TR/REC-CSS2/ui.html#system-colors
     case eColor_activeborder:
         // active window border
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_activecaption:
         // active window caption background
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_appworkspace:
         // MDI background color
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_background:
         // desktop background
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_captiontext:
         // text in active window caption, size box, and scrollbar arrow box (!)
-        aColor = FG_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor_graytext:
         // disabled text in windows, menus, etc.
-        aColor = FG_INSENSITIVE_COLOR;
+        aColor = mSystemColors.textColorTertiary;
         break;
     case eColor_highlight:
         // background of selected item
-        aColor = BASE_SELECTED_COLOR;
+        aColor = mSystemColors.textColorHighlight;
         break;
     case eColor_highlighttext:
         // text of selected item
-        aColor = TEXT_SELECTED_COLOR;
+        aColor = mSystemColors.textColorPrimaryInverse;
         break;
     case eColor_inactiveborder:
         // inactive window border
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_inactivecaption:
         // inactive window caption
-        aColor = BG_INSENSITIVE_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_inactivecaptiontext:
         // text in inactive window caption
-        aColor = FG_INSENSITIVE_COLOR;
+        aColor = mSystemColors.textColorTertiary;
         break;
     case eColor_infobackground:
         // tooltip background color
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_infotext:
         // tooltip text color
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor_menu:
         // menu background
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor_menutext:
         // menu text
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor_scrollbar:
         // scrollbar gray area
-        aColor = BG_ACTIVE_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
 
     case eColor_threedface:
     case eColor_buttonface:
         // 3-D face color
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
 
     case eColor_buttontext:
         // text on push buttons
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
 
     case eColor_buttonhighlight:
         // 3-D highlighted edge color
     case eColor_threedhighlight:
         // 3-D highlighted outer edge color
-        aColor = LIGHT_NORMAL_COLOR;
+        aColor = LIGHT_GRAY_COLOR;
         break;
 
     case eColor_threedlightshadow:
         // 3-D highlighted inner edge color
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
 
     case eColor_buttonshadow:
         // 3-D shadow edge color
     case eColor_threedshadow:
         // 3-D shadow inner edge color
-        aColor = DARK_NORMAL_COLOR;
+        aColor = GRAY_COLOR;
         break;
 
     case eColor_threeddarkshadow:
         // 3-D shadow outer edge color
-        aColor = NS_RGB(0,0,0);
+        aColor = BLACK_COLOR;
         break;
 
     case eColor_window:
     case eColor_windowframe:
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
 
     case eColor_windowtext:
-        aColor = FG_NORMAL_COLOR;
+        aColor = mSystemColors.textColorPrimary;
         break;
 
     case eColor__moz_eventreerow:
     case eColor__moz_field:
-        aColor = BASE_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor__moz_fieldtext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.textColorPrimary;
         break;
     case eColor__moz_dialog:
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor__moz_dialogtext:
-        aColor = FG_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor__moz_dragtargetzone:
-        aColor = BG_SELECTED_COLOR;
+        aColor = mSystemColors.textColorHighlight;
         break;
     case eColor__moz_buttondefault:
         // default button border color
-        aColor = NS_RGB(0,0,0);
+        aColor = BLACK_COLOR;
         break;
     case eColor__moz_buttonhoverface:
         aColor = BG_PRELIGHT_COLOR;
@@ -280,11 +329,11 @@ nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
         break;
     case eColor__moz_cellhighlight:
     case eColor__moz_html_cellhighlight:
-        aColor = BASE_ACTIVE_COLOR;
+        aColor = mSystemColors.textColorHighlight;
         break;
     case eColor__moz_cellhighlighttext:
     case eColor__moz_html_cellhighlighttext:
-        aColor = TEXT_ACTIVE_COLOR;
+        aColor = mSystemColors.textColorPrimaryInverse;
         break;
     case eColor__moz_menuhover:
         aColor = BG_PRELIGHT_COLOR;
@@ -299,13 +348,13 @@ nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor &aColor)
         aColor = NS_SAME_AS_FOREGROUND_COLOR;
         break;
     case eColor__moz_comboboxtext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor__moz_combobox:
-        aColor = BG_NORMAL_COLOR;
+        aColor = mSystemColors.colorBackground;
         break;
     case eColor__moz_menubartext:
-        aColor = TEXT_NORMAL_COLOR;
+        aColor = mSystemColors.colorForeground;
         break;
     case eColor__moz_menubarhovertext:
         aColor = FG_PRELIGHT_COLOR;
diff --git a/widget/src/android/nsLookAndFeel.h b/widget/src/android/nsLookAndFeel.h
index e8c7356f5459..0f095b044bca 100644
--- a/widget/src/android/nsLookAndFeel.h
+++ b/widget/src/android/nsLookAndFeel.h
@@ -40,6 +40,7 @@
 #define __nsLookAndFeel
 
 #include "nsXPLookAndFeel.h"
+#include "AndroidBridge.h"
 
 class nsLookAndFeel: public nsXPLookAndFeel
 {
@@ -50,6 +51,13 @@ public:
     nsresult NativeGetColor(const nsColorID aID, nscolor &aColor);
     NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric);
     NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric);
+
+protected:
+    static PRBool mInitialized;
+    static mozilla::AndroidSystemColors mSystemColors;
+
+    nsresult GetSystemColors();
+    nsresult CallRemoteGetSystemColors();
 };
 
 #endif

From 074fb0d28a3ea48617a4ca37256a51a00701aa2a Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 6 May 2011 11:05:57 +0200
Subject: [PATCH 028/314] Bug 654737 - Remove WinCE code from editor/*; r=ehsan

---
 editor/libeditor/base/nsEditPropertyAtomList.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/editor/libeditor/base/nsEditPropertyAtomList.h b/editor/libeditor/base/nsEditPropertyAtomList.h
index 2e539587804f..491b75843a9e 100644
--- a/editor/libeditor/base/nsEditPropertyAtomList.h
+++ b/editor/libeditor/base/nsEditPropertyAtomList.h
@@ -53,10 +53,6 @@
 
  ******/
 
-#ifdef WINCE
-#undef small
-#endif
-
 EDITOR_ATOM(a, "a")
 EDITOR_ATOM(abbr, "abbr")
 EDITOR_ATOM(acronym, "acronym")

From 3ba0ae6a9ecfc4f43a8ce14b2183bf5e4599347b Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 6 May 2011 11:42:42 +0200
Subject: [PATCH 029/314] Backout 2348924d6410 (bug 612407) for build bustage.

---
 gfx/layers/opengl/LayerManagerOGL.cpp | 131 --------------------------
 gfx/layers/opengl/LayerManagerOGL.h   |  23 -----
 widget/src/xpwidgets/nsBaseWidget.cpp |   4 -
 widget/src/xpwidgets/nsBaseWidget.h   |   1 -
 4 files changed, 159 deletions(-)

diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index ea216a71b915..80350afd6b7d 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -45,7 +45,6 @@
 #include "ImageLayerOGL.h"
 #include "ColorLayerOGL.h"
 #include "CanvasLayerOGL.h"
-#include "mozilla/TimeStamp.h"
 
 #include "LayerManagerOGLShaders.h"
 
@@ -81,7 +80,6 @@ LayerManagerOGL::LayerManagerOGL(nsIWidget *aWidget)
   , mBackBufferTexture(0)
   , mBackBufferSize(-1, -1)
   , mHasBGRA(0)
-  , mRenderFPS(false)
 {
 }
 
@@ -540,131 +538,6 @@ LayerManagerOGL::RootLayer() const
   return static_cast<LayerOGL*>(mRoot->ImplData());
 }
 
-void
-LayerManagerOGL::FPSState::DrawFPS(GLContext* context, CopyProgram* copyprog)
-{
-  fcount++;
-
-  int rate = 30;
-  if (fcount >= rate) {
-    TimeStamp now = TimeStamp::Now();
-    TimeDuration duration = now - last;
-    last = now;
-    fps = rate / duration.ToSeconds() + .5;
-    fcount = 0;
-  }
-
-  GLint viewport[4];
-  context->fGetIntegerv(LOCAL_GL_VIEWPORT, viewport);
-
-  static GLuint texture;
-  if (!initialized) {
-    // Bind the number of textures we need, in this case one.
-    context->fGenTextures(1, &texture);
-    context->fBindTexture(LOCAL_GL_TEXTURE_2D, texture);
-    context->fTexParameteri(LOCAL_GL_TEXTURE_2D,LOCAL_GL_TEXTURE_MIN_FILTER,LOCAL_GL_NEAREST);
-    context->fTexParameteri(LOCAL_GL_TEXTURE_2D,LOCAL_GL_TEXTURE_MAG_FILTER,LOCAL_GL_NEAREST);
-
-    char text[] = {
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0, 255, 255, 255,   0, 255, 255,   0,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,
-      0, 255,   0, 255,   0,   0, 255,   0,   0,   0,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0,   0,   0,   0,   0, 255,   0, 255,   0, 255,   0, 255,   0, 255,   0,
-      0, 255,   0, 255,   0,   0, 255,   0,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,
-      0, 255,   0, 255,   0,   0, 255,   0,   0, 255,   0,   0,   0,   0,   0, 255,   0,   0,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0, 255,   0, 255,   0,   0,   0, 255,   0,
-      0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0, 255, 255, 255,   0,   0,   0, 255,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-    };
-
-    unsigned long* buf = (unsigned long*)malloc(64 * 8 * 4);
-    for (int i = 0; i < 7; i++) {
-      for (int j = 0; j < 41; j++) {
-        buf[i * 64 + j] = (text[i * 41 + j] == 0) ? 0xfff000ff : 0xffffffff;
-      }
-    }
-    context->fTexImage2D(LOCAL_GL_TEXTURE_2D, 0, LOCAL_GL_RGBA, 64, 8, 0, LOCAL_GL_RGBA, LOCAL_GL_UNSIGNED_BYTE, buf);
-    initialized = true;
-  }
-
-  struct Vertex2D {
-    float x,y;
-  };
-  const Vertex2D vertices[] = {
-    { -1.0, 1.0 - 42. / viewport[3] },
-    { -1.0, 1.0},
-    { -1.0 + 22. / viewport[2], 1.0 - 42. / viewport[3] },
-    { -1.0 + 22. / viewport[2], 1.0 },
-
-    {  -1.0 + 22. / viewport[2], 1.0 - 42. / viewport[3] },
-    {  -1.0 + 22. / viewport[2], 1.0 },
-    {  -1.0 + 44. / viewport[2], 1.0 - 42. / viewport[3] },
-    {  -1.0 + 44. / viewport[2], 1.0 },
-
-    { -1.0 + 44. / viewport[2], 1.0 - 42. / viewport[3] },
-    { -1.0 + 44. / viewport[2], 1.0 },
-    { -1.0 + 66. / viewport[2], 1.0 - 42. / viewport[3] },
-    { -1.0 + 66. / viewport[2], 1.0 }
-  };
-
-  int v1   = fps % 10;
-  int v10  = (fps % 100) / 10;
-  int v100 = (fps % 1000) / 100;
-
-  // Feel free to comment these texture coordinates out and use one
-  // of the ones below instead, or play around with your own values.
-  const GLfloat texCoords[] = {
-    (v100 * 4.) / 64, 7. / 8,
-    (v100 * 4.) / 64, 0.0,
-    (v100 * 4. + 4) / 64, 7. / 8,
-    (v100 * 4. + 4) / 64, 0.0,
-
-    (v10 * 4.) / 64, 7. / 8,
-    (v10 * 4.) / 64, 0.0,
-    (v10 * 4. + 4) / 64, 7. / 8,
-    (v10 * 4. + 4) / 64, 0.0,
-
-    (v1 * 4.) / 64, 7. / 8,
-    (v1 * 4.) / 64, 0.0,
-    (v1 * 4. + 4) / 64, 7. / 8,
-    (v1 * 4. + 4) / 64, 0.0,
-  };
-
-  // Turn necessary features on
-  context->fEnable(LOCAL_GL_BLEND);
-  context->fBlendFunc(LOCAL_GL_ONE, LOCAL_GL_SRC_COLOR);
-
-  context->fBindTexture(LOCAL_GL_TEXTURE_2D, texture);
-
-  copyprog->Activate();
-  copyprog->SetTextureUnit(0);
-
-  // we're going to use client-side vertex arrays for this.
-  context->fBindBuffer(LOCAL_GL_ARRAY_BUFFER, 0);
-
-  // "COPY"
-  context->fBlendFuncSeparate(LOCAL_GL_ONE, LOCAL_GL_ZERO,
-                              LOCAL_GL_ONE, LOCAL_GL_ZERO);
-
-  // enable our vertex attribs; we'll call glVertexPointer below
-  // to fill with the correct data.
-  GLint vcattr = copyprog->AttribLocation(CopyProgram::VertexCoordAttrib);
-  GLint tcattr = copyprog->AttribLocation(CopyProgram::TexCoordAttrib);
-
-  context->fEnableVertexAttribArray(vcattr);
-  context->fEnableVertexAttribArray(tcattr);
-
-  context->fVertexAttribPointer(vcattr,
-                                2, LOCAL_GL_FLOAT,
-                                LOCAL_GL_FALSE,
-                                0, vertices);
-
-  context->fVertexAttribPointer(tcattr,
-                                2, LOCAL_GL_FLOAT,
-                                LOCAL_GL_FALSE,
-                                0, texCoords);
-
-  context->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 12);
-}
-
 void
 LayerManagerOGL::Render()
 {
@@ -732,10 +605,6 @@ LayerManagerOGL::Render()
     return;
   }
 
-  if (mRenderFPS) {
-    mFPS.DrawFPS(mGLContext, GetCopy2DProgram());
-  }
-
   if (mGLContext->IsDoubleBuffered()) {
     mGLContext->SwapBuffers();
     return;
diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h
index ba842ad369d1..0cc7d76968fa 100644
--- a/gfx/layers/opengl/LayerManagerOGL.h
+++ b/gfx/layers/opengl/LayerManagerOGL.h
@@ -44,8 +44,6 @@
 
 #include "mozilla/layers/ShadowLayers.h"
 
-#include "mozilla/TimeStamp.h"
-
 #ifdef XP_WIN
 #include <windows.h>
 #endif
@@ -388,8 +386,6 @@ public:
   gfxMatrix& GetWorldTransform(void);
   void WorldTransformRect(nsIntRect& aRect);
 
-  void SetRenderFPS(bool aRenderFPS) { mRenderFPS = aRenderFPS; };
-
 private:
   /** Widget associated with this layer manager */
   nsIWidget *mWidget;
@@ -468,25 +464,6 @@ private:
   DrawThebesLayerCallback mThebesLayerCallback;
   void *mThebesLayerCallbackData;
   gfxMatrix mWorldMatrix;
-
-  struct FPSState
-  {
-      GLuint texture;
-      int fps;
-      bool initialized;
-      int fcount;
-      TimeStamp last;
-
-      FPSState()
-        : texture(0)
-        , fps(0)
-        , initialized(false)
-        , fcount(0)
-      {}
-      void DrawFPS(GLContext*, CopyProgram*);
-  } mFPS;
-
-  bool mRenderFPS;
 };
 
 /**
diff --git a/widget/src/xpwidgets/nsBaseWidget.cpp b/widget/src/xpwidgets/nsBaseWidget.cpp
index 867774b0ac1b..e66c7b037080 100644
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -115,7 +115,6 @@ nsBaseWidget::nsBaseWidget()
 , mZIndex(0)
 , mSizeMode(nsSizeMode_Normal)
 , mPopupLevel(ePopupLevelTop)
-, mDrawFPS(PR_FALSE)
 {
 #ifdef NOISY_WIDGET_LEAKS
   gNumWidgets++;
@@ -824,8 +823,6 @@ nsBaseWidget::GetShouldAccelerate()
     prefs->GetBoolPref("layers.acceleration.force-enabled",
                        &forceAcceleration);
 
-    prefs->GetBoolPref("layers.acceleration.draw-fps",
-                       &mDrawFPS);
   }
 
   const char *acceleratedEnv = PR_GetEnv("MOZ_ACCELERATED");
@@ -879,7 +876,6 @@ LayerManager* nsBaseWidget::GetLayerManager(LayerManagerPersistence,
        * deal with it though!
        */
       if (layerManager->Initialize()) {
-        layerManager->SetRenderFPS(mDrawFPS);
         mLayerManager = layerManager;
       }
     }
diff --git a/widget/src/xpwidgets/nsBaseWidget.h b/widget/src/xpwidgets/nsBaseWidget.h
index e8286d86c948..65b1a2839c5a 100644
--- a/widget/src/xpwidgets/nsBaseWidget.h
+++ b/widget/src/xpwidgets/nsBaseWidget.h
@@ -288,7 +288,6 @@ protected:
   PRInt32           mZIndex;
   nsSizeMode        mSizeMode;
   nsPopupLevel      mPopupLevel;
-  PRBool            mDrawFPS;
 
   // the last rolled up popup. Only set this when an nsAutoRollup is in scope,
   // so it can be cleared automatically.

From 7d3e2c97ade678eaabd2de649c1c78b151f8f400 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 6 May 2011 16:04:44 -0400
Subject: [PATCH 030/314] Bug 654989 part 1.  Allow handing out both an
 nsIContent and an nsStyleContext from CreateAnonymousContent.  r=roc

---
 layout/base/nsCSSFrameConstructor.cpp        | 18 ++++++++++--------
 layout/base/nsCSSFrameConstructor.h          |  3 ++-
 layout/forms/nsComboboxControlFrame.cpp      |  2 +-
 layout/forms/nsComboboxControlFrame.h        |  2 +-
 layout/forms/nsFileControlFrame.cpp          |  2 +-
 layout/forms/nsFileControlFrame.h            |  2 +-
 layout/forms/nsGfxButtonControlFrame.cpp     |  2 +-
 layout/forms/nsGfxButtonControlFrame.h       |  2 +-
 layout/forms/nsIsIndexFrame.cpp              |  2 +-
 layout/forms/nsIsIndexFrame.h                |  2 +-
 layout/forms/nsTextControlFrame.cpp          |  2 +-
 layout/forms/nsTextControlFrame.h            |  2 +-
 layout/generic/nsGfxScrollFrame.cpp          |  7 ++++---
 layout/generic/nsGfxScrollFrame.h            |  7 ++++---
 layout/generic/nsIAnonymousContentCreator.h  | 16 +++++++++++++++-
 layout/generic/nsVideoFrame.cpp              |  2 +-
 layout/generic/nsVideoFrame.h                |  2 +-
 layout/svg/base/src/nsSVGUseFrame.cpp        |  4 ++--
 layout/xul/base/src/nsDocElementBoxFrame.cpp |  4 ++--
 19 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index c93e5c2da130..0d8831b8c62c 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3851,7 +3851,7 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
                                              PendingBinding*          aPendingBinding,
                                              nsFrameItems&            aChildItems)
 {
-  nsAutoTArray<nsIContent*, 4> newAnonymousItems;
+  nsAutoTArray<nsIAnonymousContentCreator::ContentInfo, 4> newAnonymousItems;
   nsresult rv = GetAnonymousContent(aParent, aParentFrame, newAnonymousItems);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -3868,8 +3868,9 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
                "How can that happen if we have nodes to construct frames for?");
 
   for (PRUint32 i=0; i < count; i++) {
-    nsIContent* content = newAnonymousItems[i];
+    nsIContent* content = newAnonymousItems[i].mContent;
     NS_ASSERTION(content, "null anonymous content?");
+    NS_ASSERTION(!newAnonymousItems[i].mStyleContext, "Unexpected style context");
 
     nsIFrame* newFrame = creator->CreateFrameFor(content);
     if (newFrame) {
@@ -3889,7 +3890,7 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsFrameConstructorState& aState,
 nsresult
 nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
                                            nsIFrame* aParentFrame,
-                                           nsTArray<nsIContent*>& aContent)
+                                           nsTArray<nsIAnonymousContentCreator::ContentInfo>& aContent)
 {
   nsIAnonymousContentCreator* creator = do_QueryFrame(aParentFrame);
   if (!creator)
@@ -3901,7 +3902,7 @@ nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
   PRUint32 count = aContent.Length();
   for (PRUint32 i=0; i < count; i++) {
     // get our child's content and set its parent to our content
-    nsIContent* content = aContent[i];
+    nsIContent* content = aContent[i].mContent;
     NS_ASSERTION(content, "null anonymous content?");
 
     // least-surprise CSS binding until we do the SVG specified
@@ -9534,18 +9535,19 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
   // Create any anonymous frames we need here.  This must happen before the
   // non-anonymous children are processed to ensure that popups are never
   // constructed before the popupset.
-  nsAutoTArray<nsIContent*, 4> anonymousItems;
+  nsAutoTArray<nsIAnonymousContentCreator::ContentInfo, 4> anonymousItems;
   GetAnonymousContent(aContent, aFrame, anonymousItems);
   for (PRUint32 i = 0; i < anonymousItems.Length(); ++i) {
 #ifdef DEBUG
     nsIAnonymousContentCreator* creator = do_QueryFrame(aFrame);
-    NS_ASSERTION(!creator || !creator->CreateFrameFor(anonymousItems[i]),
+    NS_ASSERTION(!creator ||
+                 !creator->CreateFrameFor(anonymousItems[i].mContent),
                  "If you need to use CreateFrameFor, you need to call "
                  "CreateAnonymousFrames manually and not follow the standard "
                  "ProcessChildren() codepath for this frame");
 #endif
-    AddFrameConstructionItems(aState, anonymousItems[i], PR_TRUE, aFrame,
-                              itemsToConstruct);
+    AddFrameConstructionItems(aState, anonymousItems[i].mContent, PR_TRUE,
+                              aFrame, itemsToConstruct);
   }
 
   if (!aFrame->IsLeaf()) {
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 4b8e588dfb11..8c9bd0541f4f 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -53,6 +53,7 @@
 #include "nsPageContentFrame.h"
 #include "nsCSSPseudoElements.h"
 #include "RestyleTracker.h"
+#include "nsIAnonymousContentCreator.h"
 
 class nsIDocument;
 struct nsFrameItems;
@@ -1267,7 +1268,7 @@ private:
 
   nsresult GetAnonymousContent(nsIContent* aParent,
                                nsIFrame* aParentFrame,
-                               nsTArray<nsIContent*>& aAnonContent);
+                               nsTArray<nsIAnonymousContentCreator::ContentInfo>& aAnonContent);
 
 //MathML Mod - RBS
 #ifdef MOZ_MATHML
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp
index 2172a4a4e1c7..f405d91b0e11 100644
--- a/layout/forms/nsComboboxControlFrame.cpp
+++ b/layout/forms/nsComboboxControlFrame.cpp
@@ -991,7 +991,7 @@ nsComboboxControlFrame::GetContentInsertionFrame() {
 }
 
 nsresult
-nsComboboxControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsComboboxControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   // The frames used to display the combo box and the button used to popup the dropdown list
   // are created through anonymous content. The dropdown list is not created through anonymous
diff --git a/layout/forms/nsComboboxControlFrame.h b/layout/forms/nsComboboxControlFrame.h
index fd90c98515d3..4cc48fa9c6b7 100644
--- a/layout/forms/nsComboboxControlFrame.h
+++ b/layout/forms/nsComboboxControlFrame.h
@@ -98,7 +98,7 @@ public:
   NS_DECL_FRAMEARENA_HELPERS
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
   virtual nsIFrame* CreateFrameFor(nsIContent* aContent);
diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp
index 65c9c65a4d91..a57847ebe532 100644
--- a/layout/forms/nsFileControlFrame.cpp
+++ b/layout/forms/nsFileControlFrame.cpp
@@ -218,7 +218,7 @@ PRBool CapturePickerAcceptCallback(const nsAString& aAccept, void* aClosure)
 }
 
 nsresult
-nsFileControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsFileControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   // Get the NodeInfoManager and tag necessary to create input elements
   nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
diff --git a/layout/forms/nsFileControlFrame.h b/layout/forms/nsFileControlFrame.h
index 6eb8e10ef540..599a31a92eec 100644
--- a/layout/forms/nsFileControlFrame.h
+++ b/layout/forms/nsFileControlFrame.h
@@ -93,7 +93,7 @@ public:
 
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp
index 1296ce4be583..64cf1575ed54 100644
--- a/layout/forms/nsGfxButtonControlFrame.cpp
+++ b/layout/forms/nsGfxButtonControlFrame.cpp
@@ -112,7 +112,7 @@ nsGfxButtonControlFrame::GetFrameName(nsAString& aResult) const
 // Create the text content used as label for the button.
 // The frame will be generated by the frame constructor.
 nsresult
-nsGfxButtonControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsGfxButtonControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   nsXPIDLString label;
   GetLabel(label);
diff --git a/layout/forms/nsGfxButtonControlFrame.h b/layout/forms/nsGfxButtonControlFrame.h
index b3a464108e16..bc3cc6d1c76b 100644
--- a/layout/forms/nsGfxButtonControlFrame.h
+++ b/layout/forms/nsGfxButtonControlFrame.h
@@ -75,7 +75,7 @@ public:
   NS_DECL_QUERYFRAME
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
   virtual nsIFrame* CreateFrameFor(nsIContent* aContent);
diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp
index 336f80a61dac..67b3dcf1e86b 100644
--- a/layout/forms/nsIsIndexFrame.cpp
+++ b/layout/forms/nsIsIndexFrame.cpp
@@ -187,7 +187,7 @@ nsIsIndexFrame::SetFocus(PRBool aOn, PRBool aRepaint)
 }
 
 nsresult
-nsIsIndexFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsIsIndexFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   // Get the node info manager (used to create hr's and input's)
   nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
diff --git a/layout/forms/nsIsIndexFrame.h b/layout/forms/nsIsIndexFrame.h
index b717c6079461..92b408c64a5e 100644
--- a/layout/forms/nsIsIndexFrame.h
+++ b/layout/forms/nsIsIndexFrame.h
@@ -97,7 +97,7 @@ public:
   void           SetFocus(PRBool aOn, PRBool aRepaint);
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
index 20c6c00bf359..8567f82d5111 100644
--- a/layout/forms/nsTextControlFrame.cpp
+++ b/layout/forms/nsTextControlFrame.cpp
@@ -391,7 +391,7 @@ nsTextControlFrame::EnsureEditorInitialized()
 }
 
 nsresult
-nsTextControlFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsTextControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   NS_ASSERTION(mContent, "We should have a content!");
 
diff --git a/layout/forms/nsTextControlFrame.h b/layout/forms/nsTextControlFrame.h
index b1b18dece88b..f6e87c6f20f9 100644
--- a/layout/forms/nsTextControlFrame.h
+++ b/layout/forms/nsTextControlFrame.h
@@ -121,7 +121,7 @@ public:
   }
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index ab4d179dbb64..ccc20b475f17 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -106,7 +106,7 @@ nsHTMLScrollFrame::nsHTMLScrollFrame(nsIPresShell* aShell, nsStyleContext* aCont
 }
 
 nsresult
-nsHTMLScrollFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsHTMLScrollFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   return mInner.CreateAnonymousContent(aElements);
 }
@@ -1024,7 +1024,7 @@ nsMargin nsGfxScrollFrameInner::GetDesiredScrollbarSizes(nsBoxLayoutState* aStat
 }
 
 nsresult
-nsXULScrollFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsXULScrollFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   return mInner.CreateAnonymousContent(aElements);
 }
@@ -2386,7 +2386,8 @@ nsGfxScrollFrameInner::ReloadChildFrames()
 }
   
 nsresult
-nsGfxScrollFrameInner::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsGfxScrollFrameInner::CreateAnonymousContent(
+  nsTArray<nsIAnonymousContentCreator::ContentInfo>& aElements)
 {
   nsPresContext* presContext = mOuter->PresContext();
   nsIFrame* parent = mOuter->GetParent();
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index 01cdbc0ec4a9..bab8a5cabe8b 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -81,7 +81,8 @@ public:
   // We need this if a scrollbar frame is recreated.
   void ReloadChildFrames();
 
-  nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  nsresult CreateAnonymousContent(
+    nsTArray<nsIAnonymousContentCreator::ContentInfo>& aElements);
   void AppendAnonymousContentTo(nsBaseContentList& aElements, PRUint32 aFilter);
   nsresult FireScrollPortEvent();
   void PostOverflowEvent();
@@ -424,7 +425,7 @@ public:
   }
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
@@ -624,7 +625,7 @@ public:
   }
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
diff --git a/layout/generic/nsIAnonymousContentCreator.h b/layout/generic/nsIAnonymousContentCreator.h
index 6f7d65378079..c3391ee17912 100644
--- a/layout/generic/nsIAnonymousContentCreator.h
+++ b/layout/generic/nsIAnonymousContentCreator.h
@@ -45,6 +45,7 @@
 
 #include "nsQueryFrame.h"
 #include "nsIContent.h"
+#include "nsStyleContext.h"
 
 class nsIFrame;
 template <class T, class A> class nsTArray;
@@ -60,6 +61,19 @@ class nsIAnonymousContentCreator
 public:
   NS_DECL_QUERYFRAME_TARGET(nsIAnonymousContentCreator)
 
+  struct ContentInfo {
+    ContentInfo(nsIContent* aContent) :
+      mContent(aContent)
+    {}
+
+    ContentInfo(nsIContent* aContent, nsStyleContext* aStyleContext) :
+      mContent(aContent), mStyleContext(aStyleContext)
+    {}
+
+    nsIContent* mContent;
+    nsRefPtr<nsStyleContext> mStyleContext;
+  };
+
   /**
    * Creates "native" anonymous content and adds the created content to
    * the aElements array. None of the returned elements can be nsnull.
@@ -69,7 +83,7 @@ public:
    *       from CreateAnonymousContent when appropriate (i.e. before releasing
    *       them).
    */
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements)=0;
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements)=0;
 
   /**
    * Appends "native" anonymous children created by CreateAnonymousContent()
diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp
index 49a8d3598e2e..c638736970b0 100644
--- a/layout/generic/nsVideoFrame.cpp
+++ b/layout/generic/nsVideoFrame.cpp
@@ -89,7 +89,7 @@ NS_QUERYFRAME_HEAD(nsVideoFrame)
 NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
 
 nsresult
-nsVideoFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsVideoFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   nsNodeInfoManager *nodeInfoManager = GetContent()->GetCurrentDoc()->NodeInfoManager();
   nsCOMPtr<nsINodeInfo> nodeInfo;
diff --git a/layout/generic/nsVideoFrame.h b/layout/generic/nsVideoFrame.h
index a6584cd2dac6..83bcf3088cba 100644
--- a/layout/generic/nsVideoFrame.h
+++ b/layout/generic/nsVideoFrame.h
@@ -103,7 +103,7 @@ public:
     return nsSplittableFrame::IsFrameOfType(aFlags & ~(nsIFrame::eReplaced));
   }
   
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilters);
 
diff --git a/layout/svg/base/src/nsSVGUseFrame.cpp b/layout/svg/base/src/nsSVGUseFrame.cpp
index 110d021c27d1..04b9eec53b39 100644
--- a/layout/svg/base/src/nsSVGUseFrame.cpp
+++ b/layout/svg/base/src/nsSVGUseFrame.cpp
@@ -88,7 +88,7 @@ public:
 #endif
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 };
@@ -171,7 +171,7 @@ nsSVGUseFrame::IsLeaf() const
 // nsIAnonymousContentCreator methods:
 
 nsresult
-nsSVGUseFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsSVGUseFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   nsSVGUseElement *use = static_cast<nsSVGUseElement*>(mContent);
 
diff --git a/layout/xul/base/src/nsDocElementBoxFrame.cpp b/layout/xul/base/src/nsDocElementBoxFrame.cpp
index 3c618df71458..866ef2ce7d80 100644
--- a/layout/xul/base/src/nsDocElementBoxFrame.cpp
+++ b/layout/xul/base/src/nsDocElementBoxFrame.cpp
@@ -71,7 +71,7 @@ public:
   NS_DECL_FRAMEARENA_HELPERS
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 
@@ -110,7 +110,7 @@ nsDocElementBoxFrame::DestroyFrom(nsIFrame* aDestructRoot)
 }
 
 nsresult
-nsDocElementBoxFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsDocElementBoxFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   nsIDocument* doc = mContent->GetDocument();
   if (!doc) {

From 24257a4235fa9d74ea2a7e56ef4b701797350c1e Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 6 May 2011 16:04:44 -0400
Subject: [PATCH 031/314] Bug 654989 part 2.  Use the nsStyleContext handed
 back from CreateAnonymousContent.  r=roc

This asserts the parts of AddFrameConstructionItems that should never matter for anonymous content and then just copies the one-line style context get if it's needed.
---
 layout/base/nsCSSFrameConstructor.cpp | 31 +++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 0d8831b8c62c..043eabf266e0 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -9538,16 +9538,39 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState,
   nsAutoTArray<nsIAnonymousContentCreator::ContentInfo, 4> anonymousItems;
   GetAnonymousContent(aContent, aFrame, anonymousItems);
   for (PRUint32 i = 0; i < anonymousItems.Length(); ++i) {
+    nsIContent* content = anonymousItems[i].mContent;
 #ifdef DEBUG
     nsIAnonymousContentCreator* creator = do_QueryFrame(aFrame);
-    NS_ASSERTION(!creator ||
-                 !creator->CreateFrameFor(anonymousItems[i].mContent),
+    NS_ASSERTION(!creator || !creator->CreateFrameFor(content),
                  "If you need to use CreateFrameFor, you need to call "
                  "CreateAnonymousFrames manually and not follow the standard "
                  "ProcessChildren() codepath for this frame");
 #endif
-    AddFrameConstructionItems(aState, anonymousItems[i].mContent, PR_TRUE,
-                              aFrame, itemsToConstruct);
+    // Assert some things about this content
+    NS_ABORT_IF_FALSE(!(content->GetFlags() &
+                        (NODE_DESCENDANTS_NEED_FRAMES | NODE_NEEDS_FRAME)),
+                      "Should not be marked as needing frames");
+    NS_ABORT_IF_FALSE(!content->IsElement() ||
+                      !(content->GetFlags() & ELEMENT_ALL_RESTYLE_FLAGS),
+                      "Should have no pending restyle flags");
+    NS_ABORT_IF_FALSE(!content->GetPrimaryFrame(),
+                      "Should have no existing frame");
+    NS_ABORT_IF_FALSE(!content->IsNodeOfType(nsINode::eCOMMENT) &&
+                      !content->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION),
+                      "Why is someone creating garbage anonymous content");
+
+    nsRefPtr<nsStyleContext> styleContext;
+    if (anonymousItems[i].mStyleContext) {
+      styleContext = anonymousItems[i].mStyleContext.forget();
+    } else {
+      styleContext = ResolveStyleContext(aFrame, content, &aState);
+    }
+
+    AddFrameConstructionItemsInternal(aState, content, aFrame,
+                                      content->Tag(), content->GetNameSpaceID(),
+                                      PR_TRUE, styleContext,
+                                      ITEM_ALLOW_XBL_BASE | ITEM_ALLOW_PAGE_BREAK,
+                                      itemsToConstruct);
   }
 
   if (!aFrame->IsLeaf()) {

From c3d4c659c70b4c35a17089eb078a69f1df3adee1 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Thu, 7 Apr 2011 18:23:46 -0700
Subject: [PATCH 032/314] Bug 648925 - Part 1: Change uses of nsICSSRule to
 css::Rule.  r=bzbarsky

---
 .../html/content/src/nsGenericHTMLElement.cpp |   4 +-
 .../src/nsHTMLFragmentContentSink.cpp         |   8 +-
 content/xul/content/src/nsXULElement.cpp      |   4 +-
 dom/base/nsDOMClassInfo.cpp                   |   1 -
 layout/mathml/nsMathMLFrame.cpp               |  12 --
 layout/style/GroupRule.h                      |  16 +--
 layout/style/ImportRule.h                     |   6 +-
 layout/style/Makefile.in                      |   2 +-
 layout/style/NameSpaceRule.h                  |   8 +-
 layout/style/Rule.h                           |  44 ++++++-
 layout/style/StyleRule.cpp                    |   9 +-
 layout/style/StyleRule.h                      |   4 +-
 layout/style/nsAnimationManager.cpp           |   4 +-
 layout/style/nsCSSParser.cpp                  |  34 +++---
 layout/style/nsCSSParser.h                    |   4 +-
 layout/style/nsCSSRuleProcessor.cpp           |  12 +-
 layout/style/nsCSSRules.cpp                   |  96 +++++++--------
 layout/style/nsCSSRules.h                     |  32 ++---
 layout/style/nsCSSStyleSheet.cpp              | 106 ++++++++---------
 layout/style/nsCSSStyleSheet.h                |  18 +--
 layout/style/nsDOMCSSDeclaration.cpp          |   4 +-
 layout/style/nsDOMCSSDeclaration.h            |   6 +-
 layout/style/nsFontFaceLoader.cpp             |   2 +-
 layout/style/nsICSSRule.h                     | 112 ------------------
 24 files changed, 226 insertions(+), 322 deletions(-)
 delete mode 100644 layout/style/nsICSSRule.h

diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 0da5c474f1b8..de962cd29c37 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -315,8 +315,8 @@ nsGenericHTMLElement::CopyInnerTo(nsGenericElement* aDst) const
         value->Type() == nsAttrValue::eCSSStyleRule) {
       // We can't just set this as a string, because that will fail
       // to reparse the string into style data until the node is
-      // inserted into the document.  Clone the nsICSSRule instead.
-      nsCOMPtr<nsICSSRule> ruleClone = value->GetCSSStyleRuleValue()->Clone();
+      // inserted into the document.  Clone the Rule instead.
+      nsRefPtr<mozilla::css::Rule> ruleClone = value->GetCSSStyleRuleValue()->Clone();
       nsRefPtr<mozilla::css::StyleRule> styleRule = do_QueryObject(ruleClone);
       NS_ENSURE_TRUE(styleRule, NS_ERROR_UNEXPECTED);
 
diff --git a/content/html/document/src/nsHTMLFragmentContentSink.cpp b/content/html/document/src/nsHTMLFragmentContentSink.cpp
index 2d4f14a21fee..b47eb478c18d 100644
--- a/content/html/document/src/nsHTMLFragmentContentSink.cpp
+++ b/content/html/document/src/nsHTMLFragmentContentSink.cpp
@@ -1180,7 +1180,7 @@ nsHTMLParanoidFragmentSink::CloseContainer(const nsHTMLTag aTag)
             // Loop through all the rules found in the CSS text
             PRInt32 ruleCount = sheet->StyleRuleCount();
             for (PRInt32 i = 0; i < ruleCount; ++i) {
-              nsRefPtr<nsICSSRule> rule;
+              nsRefPtr<css::Rule> rule;
               rv = sheet->GetStyleRuleAt(i, *getter_AddRefs(rule));
               if (NS_FAILED(rv))
                 continue;
@@ -1190,8 +1190,8 @@ nsHTMLParanoidFragmentSink::CloseContainer(const nsHTMLTag aTag)
                   didSanitize = PR_TRUE;
                   // Ignore these rule types.
                   break;
-                case nsICSSRule::NAMESPACE_RULE:
-                case nsICSSRule::FONT_FACE_RULE: {
+                case css::Rule::NAMESPACE_RULE:
+                case css::Rule::FONT_FACE_RULE: {
                   // Append @namespace and @font-face rules verbatim.
                   nsAutoString cssText;
                   nsCOMPtr<nsIDOMCSSRule> styleRule = do_QueryInterface(rule);
@@ -1203,7 +1203,7 @@ nsHTMLParanoidFragmentSink::CloseContainer(const nsHTMLTag aTag)
                   }
                   break;
                 }
-                case nsICSSRule::STYLE_RULE: {
+                case css::Rule::STYLE_RULE: {
                   // For style rules, we will just look for and remove the
                   // -moz-binding properties.
                   nsRefPtr<css::StyleRule> styleRule = do_QueryObject(rule);
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 24d9b857e259..f09f322b49b6 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -1960,7 +1960,7 @@ nsXULElement::EnsureLocalStyle()
         nsXULPrototypeAttribute *protoattr =
                   FindPrototypeAttribute(kNameSpaceID_None, nsGkAtoms::style);
         if (protoattr && protoattr->mValue.Type() == nsAttrValue::eCSSStyleRule) {
-            nsCOMPtr<nsICSSRule> ruleClone =
+            nsRefPtr<css::Rule> ruleClone =
                 protoattr->mValue.GetCSSStyleRuleValue()->Clone();
 
             nsString stringValue;
@@ -2339,7 +2339,7 @@ nsresult nsXULElement::MakeHeavyweight()
         
         // Style rules need to be cloned.
         if (protoattr->mValue.Type() == nsAttrValue::eCSSStyleRule) {
-            nsCOMPtr<nsICSSRule> ruleClone =
+            nsRefPtr<css::Rule> ruleClone =
                 protoattr->mValue.GetCSSStyleRuleValue()->Clone();
 
             nsString stringValue;
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index e2ba752a2cf3..163610c8de80 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -179,7 +179,6 @@
 #include "nsIDOMStyleSheetList.h"
 #include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSRule.h"
-#include "nsICSSRule.h"
 #include "nsICSSRuleList.h"
 #include "nsIDOMRect.h"
 #include "nsIDOMRGBColor.h"
diff --git a/layout/mathml/nsMathMLFrame.cpp b/layout/mathml/nsMathMLFrame.cpp
index ee660e57ed72..a02e059de5a2 100644
--- a/layout/mathml/nsMathMLFrame.cpp
+++ b/layout/mathml/nsMathMLFrame.cpp
@@ -42,21 +42,9 @@
 #include "nsCSSPseudoElements.h"
 
 // used to map attributes into CSS rules
-#include "nsIDocument.h"
 #include "nsStyleSet.h"
-#include "nsIStyleSheet.h"
-#include "nsIDOMCSSStyleSheet.h"
-#include "nsICSSRule.h"
-#include "nsStyleChangeList.h"
-#include "nsFrameManager.h"
-#include "nsNetUtil.h"
-#include "nsIURI.h"
-#include "nsContentCID.h"
 #include "nsAutoPtr.h"
-#include "nsStyleSet.h"
-#include "nsStyleUtil.h"
 #include "nsDisplayList.h"
-#include "nsAttrName.h"
 #include "nsRenderingContext.h"
 
 eMathMLFrameType
diff --git a/layout/style/GroupRule.h b/layout/style/GroupRule.h
index 8f61f62c55e0..e8f2ec4ae7b2 100644
--- a/layout/style/GroupRule.h
+++ b/layout/style/GroupRule.h
@@ -43,7 +43,7 @@
 #ifndef mozilla_css_GroupRule_h__
 #define mozilla_css_GroupRule_h__
 
-#include "Rule.h"
+#include "mozilla/css/Rule.h"
 #include "nsCOMArray.h"
 #include "nsAutoPtr.h"
 
@@ -65,7 +65,7 @@ protected:
   virtual ~GroupRule();
 public:
 
-  // implement part of nsIStyleRule and nsICSSRule
+  // implement part of nsIStyleRule and Rule
   DECL_STYLE_RULE_INHERIT_NO_DOMRULE
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);
 
@@ -75,12 +75,12 @@ public:
 #endif
 
 public:
-  void AppendStyleRule(nsICSSRule* aRule);
+  void AppendStyleRule(Rule* aRule);
 
   PRInt32 StyleRuleCount() const { return mRules.Count(); }
-  nsICSSRule* GetStyleRuleAt(PRInt32 aIndex) const;
+  Rule* GetStyleRuleAt(PRInt32 aIndex) const;
 
-  typedef nsCOMArray<nsICSSRule>::nsCOMArrayEnumFunc RuleEnumFunc;
+  typedef nsCOMArray<Rule>::nsCOMArrayEnumFunc RuleEnumFunc;
   PRBool EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const;
 
   /*
@@ -90,8 +90,8 @@ public:
    */
   nsresult DeleteStyleRuleAt(PRUint32 aIndex);
   nsresult InsertStyleRulesAt(PRUint32 aIndex,
-                              nsCOMArray<nsICSSRule>& aRules);
-  nsresult ReplaceStyleRule(nsICSSRule *aOld, nsICSSRule *aNew);
+                              nsCOMArray<Rule>& aRules);
+  nsresult ReplaceStyleRule(Rule *aOld, Rule *aNew);
 
   virtual PRBool UseForPresentation(nsPresContext* aPresContext,
                                     nsMediaQueryResultCacheKey& aKey) = 0;
@@ -109,7 +109,7 @@ protected:
                       PRUint32* _retval);
   nsresult DeleteRule(PRUint32 aIndex);
 
-  nsCOMArray<nsICSSRule> mRules;
+  nsCOMArray<Rule> mRules;
   nsRefPtr<GroupRuleRuleList> mRuleCollection; // lazily constructed
 };
 
diff --git a/layout/style/ImportRule.h b/layout/style/ImportRule.h
index 2a366c5208b6..b1903fd8bb10 100644
--- a/layout/style/ImportRule.h
+++ b/layout/style/ImportRule.h
@@ -40,7 +40,7 @@
 #ifndef mozilla_css_ImportRule_h__
 #define mozilla_css_ImportRule_h__
 
-#include "Rule.h"
+#include "mozilla/css/Rule.h"
 #include "nsIDOMCSSImportRule.h"
 #include "nsCSSRules.h"
 
@@ -73,9 +73,9 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
 
   void SetSheet(nsCSSStyleSheet*);
 
diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in
index c1b629537729..330fe21321e5 100644
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -75,7 +75,6 @@ EXPORTS		= \
 		nsICSSDeclaration.h \
 		nsICSSLoaderObserver.h \
 		nsICSSPseudoComparator.h \
-		nsICSSRule.h \
 		nsICSSRuleList.h \
 		nsICSSStyleRuleDOMWrapper.h \
 		nsIStyleRule.h \
@@ -103,6 +102,7 @@ EXPORTS_mozilla/css = \
 		ImportRule.h \
 		Loader.h \
 		NameSpaceRule.h \
+		Rule.h \
 		StyleRule.h \
 		$(NULL)
 
diff --git a/layout/style/NameSpaceRule.h b/layout/style/NameSpaceRule.h
index 03e827b3ec44..48976ef22dba 100644
--- a/layout/style/NameSpaceRule.h
+++ b/layout/style/NameSpaceRule.h
@@ -40,12 +40,12 @@
 #ifndef mozilla_css_NameSpaceRule_h__
 #define mozilla_css_NameSpaceRule_h__
 
-#include "Rule.h"
+#include "mozilla/css/Rule.h"
 #include "nsIDOMCSSRule.h"
 
 class nsIAtom;
 
-// IID for the nsCSSNameSpaceRule class {f0b0dbe1-5031-4a21-b06a-dc141ef2af98}
+// IID for the NameSpaceRule class {f0b0dbe1-5031-4a21-b06a-dc141ef2af98}
 #define NS_CSS_NAMESPACE_RULE_IMPL_CID     \
 {0xf0b0dbe1, 0x5031, 0x4a21, {0xb0, 0x6a, 0xdc, 0x14, 0x1e, 0xf2, 0xaf, 0x98}}
 
@@ -74,9 +74,9 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
 
   nsIAtom* GetPrefix() const { return mPrefix; }
 
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 75afbd1d567f..6a908d927cae 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -40,7 +40,8 @@
 #ifndef mozilla_css_Rule_h___
 #define mozilla_css_Rule_h___
 
-#include "nsICSSRule.h"
+#include "nsIStyleRule.h"
+#include "nsIDOMCSSRule.h"
 
 class nsIStyleSheet;
 class nsCSSStyleSheet;
@@ -58,7 +59,7 @@ virtual void MapRuleInfoInto(nsRuleData* aRuleData);
 DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
 virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult);
 
-class Rule : public nsICSSRule {
+class Rule : public nsIStyleRule {
 protected:
   Rule()
     : mSheet(nsnull),
@@ -83,11 +84,48 @@ protected:
   NS_DECL_OWNINGTHREAD
 public:
 
+  // The constants in this list must maintain the following invariants:
+  //   If a rule of type N must appear before a rule of type M in stylesheets
+  //   then N < M
+  // Note that nsCSSStyleSheet::RebuildChildList assumes that no other kinds of
+  // rules can come between two rules of type IMPORT_RULE.
+  enum {
+    UNKNOWN_RULE = 0,
+    CHARSET_RULE,
+    IMPORT_RULE,
+    NAMESPACE_RULE,
+    STYLE_RULE,
+    MEDIA_RULE,
+    FONT_FACE_RULE,
+    PAGE_RULE,
+#ifdef MOZ_CSS_ANIMATIONS
+    KEYFRAME_RULE,
+    KEYFRAMES_RULE,
+#endif
+    DOCUMENT_RULE
+  };
+
+  virtual PRInt32 GetType() const = 0;
+
   virtual nsIStyleSheet* GetStyleSheet() const;
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);
-
   virtual void SetParentRule(GroupRule* aRule);
 
+  /**
+   * Clones |this|. Never returns NULL.
+   */
+  virtual already_AddRefed<Rule> Clone() const = 0;
+
+  // Note that this returns null for inline style rules since they aren't
+  // supposed to have a DOM rule representation (and our code wouldn't work).
+  nsresult GetDOMRule(nsIDOMCSSRule** aDOMRule)
+  {
+    nsresult rv;
+    NS_IF_ADDREF(*aDOMRule = GetDOMRuleWeak(&rv));
+    return rv;
+  }
+  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult) = 0;
+
 protected:
   nsCSSStyleSheet*  mSheet;
   GroupRule*        mParentRule;
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 905d152aac8f..f17a2b007e1e 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1306,9 +1306,8 @@ NS_INTERFACE_MAP_BEGIN(StyleRule)
     return NS_OK;
   }
   else
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_ADDREF_INHERITED(StyleRule, Rule)
@@ -1336,13 +1335,13 @@ StyleRule::RuleMatched()
 /* virtual */ PRInt32
 StyleRule::GetType() const
 {
-  return nsICSSRule::STYLE_RULE;
+  return Rule::STYLE_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 StyleRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new StyleRule(*this);
+  nsRefPtr<Rule> clone = new StyleRule(*this);
   return clone.forget();
 }
 
diff --git a/layout/style/StyleRule.h b/layout/style/StyleRule.h
index ccea1697fc83..0bac085e8c2e 100644
--- a/layout/style/StyleRule.h
+++ b/layout/style/StyleRule.h
@@ -46,7 +46,7 @@
 #define mozilla_css_StyleRule_h__
 
 //#include <stdio.h>
-#include "Rule.h"
+#include "mozilla/css/Rule.h"
 #include "nsString.h"
 #include "nsCOMPtr.h"
 #include "nsCSSPseudoElements.h"
@@ -348,7 +348,7 @@ public:
 
   virtual PRInt32 GetType() const;
 
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
 
   nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult);
 
diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp
index f0d4becc47cc..6024a7371647 100644
--- a/layout/style/nsAnimationManager.cpp
+++ b/layout/style/nsAnimationManager.cpp
@@ -670,9 +670,9 @@ nsAnimationManager::BuildAnimations(nsStyleContext* aStyleContext,
     keyframes.Init(16); // FIXME: make infallible!
     for (PRUint32 ruleIdx = 0, ruleEnd = rule->StyleRuleCount();
          ruleIdx != ruleEnd; ++ruleIdx) {
-      nsICSSRule* cssRule = rule->GetStyleRuleAt(ruleIdx);
+      css::Rule* cssRule = rule->GetStyleRuleAt(ruleIdx);
       NS_ABORT_IF_FALSE(cssRule, "must have rule");
-      NS_ABORT_IF_FALSE(cssRule->GetType() == nsICSSRule::KEYFRAME_RULE,
+      NS_ABORT_IF_FALSE(cssRule->GetType() == css::Rule::KEYFRAME_RULE,
                         "must be keyframe rule");
       nsCSSKeyframeRule *kfRule = static_cast<nsCSSKeyframeRule*>(cssRule);
 
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index bd6c0fb7a81c..5f17d5852f7a 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -178,9 +178,9 @@ nsCSSProps::kParserVariantTable[eCSSProperty_COUNT_no_shorthands] = {
 namespace {
 
 // Rule processing function
-typedef void (* RuleAppendFunc) (nsICSSRule* aRule, void* aData);
-static void AppendRuleToArray(nsICSSRule* aRule, void* aArray);
-static void AppendRuleToSheet(nsICSSRule* aRule, void* aParser);
+typedef void (* RuleAppendFunc) (css::Rule* aRule, void* aData);
+static void AppendRuleToArray(css::Rule* aRule, void* aArray);
+static void AppendRuleToSheet(css::Rule* aRule, void* aParser);
 
 // Your basic top-down recursive descent style parser
 // The exposed methods and members of this class are precisely those
@@ -227,7 +227,7 @@ public:
                      nsIURI*                 aSheetURL,
                      nsIURI*                 aBaseURL,
                      nsIPrincipal*           aSheetPrincipal,
-                     nsCOMArray<nsICSSRule>& aResult);
+                     nsCOMArray<css::Rule>&  aResult);
 
   nsresult ParseProperty(const nsCSSProperty aPropID,
                          const nsAString& aPropValue,
@@ -270,8 +270,8 @@ protected:
   class nsAutoParseCompoundProperty;
   friend class nsAutoParseCompoundProperty;
 
-  void AppendRule(nsICSSRule* aRule);
-  friend void AppendRuleToSheet(nsICSSRule*, void*); // calls AppendRule
+  void AppendRule(css::Rule* aRule);
+  friend void AppendRuleToSheet(css::Rule*, void*); // calls AppendRule
 
   /**
    * This helper class automatically calls SetParsingCompoundProperty in its
@@ -703,12 +703,12 @@ public:
   CSSParserImpl* mNextFree;
 };
 
-static void AppendRuleToArray(nsICSSRule* aRule, void* aArray)
+static void AppendRuleToArray(css::Rule* aRule, void* aArray)
 {
-  static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(aRule);
+  static_cast<nsCOMArray<css::Rule>*>(aArray)->AppendObject(aRule);
 }
 
-static void AppendRuleToSheet(nsICSSRule* aRule, void* aParser)
+static void AppendRuleToSheet(css::Rule* aRule, void* aParser)
 {
   CSSParserImpl* parser = (CSSParserImpl*) aParser;
   parser->AppendRule(aRule);
@@ -921,15 +921,15 @@ CSSParserImpl::Parse(nsIUnicharInputStream* aInput,
 
   PRInt32 ruleCount = mSheet->StyleRuleCount();
   if (0 < ruleCount) {
-    nsICSSRule* lastRule = nsnull;
+    css::Rule* lastRule = nsnull;
     mSheet->GetStyleRuleAt(ruleCount - 1, lastRule);
     if (lastRule) {
       switch (lastRule->GetType()) {
-        case nsICSSRule::CHARSET_RULE:
-        case nsICSSRule::IMPORT_RULE:
+        case css::Rule::CHARSET_RULE:
+        case css::Rule::IMPORT_RULE:
           mSection = eCSSSection_Import;
           break;
-        case nsICSSRule::NAMESPACE_RULE:
+        case css::Rule::NAMESPACE_RULE:
           mSection = eCSSSection_NameSpace;
           break;
         default:
@@ -1076,7 +1076,7 @@ CSSParserImpl::ParseRule(const nsAString&        aRule,
                          nsIURI*                 aSheetURI,
                          nsIURI*                 aBaseURI,
                          nsIPrincipal*           aSheetPrincipal,
-                         nsCOMArray<nsICSSRule>& aResult)
+                         nsCOMArray<css::Rule>&  aResult)
 {
   NS_PRECONDITION(aSheetPrincipal, "Must have principal here!");
   AssertInitialState();
@@ -1646,7 +1646,7 @@ CSSParserImpl::ParseCharsetRule(RuleAppendFunc aAppendFunc,
     return PR_FALSE;
   }
 
-  nsCOMPtr<nsICSSRule> rule = new css::CharsetRule(charset);
+  nsRefPtr<css::CharsetRule> rule = new css::CharsetRule(charset);
   (*aAppendFunc)(rule, aData);
 
   return PR_TRUE;
@@ -2582,7 +2582,7 @@ CSSParserImpl::PopGroup()
 }
 
 void
-CSSParserImpl::AppendRule(nsICSSRule* aRule)
+CSSParserImpl::AppendRule(css::Rule* aRule)
 {
   PRUint32 count = mGroupStack.Length();
   if (0 < count) {
@@ -8804,7 +8804,7 @@ nsCSSParser::ParseRule(const nsAString&        aRule,
                        nsIURI*                 aSheetURI,
                        nsIURI*                 aBaseURI,
                        nsIPrincipal*           aSheetPrincipal,
-                       nsCOMArray<nsICSSRule>& aResult)
+                       nsCOMArray<css::Rule>&  aResult)
 {
   return static_cast<CSSParserImpl*>(mImpl)->
     ParseRule(aRule, aSheetURI, aBaseURI, aSheetPrincipal, aResult);
diff --git a/layout/style/nsCSSParser.h b/layout/style/nsCSSParser.h
index 696ea1b331ad..93d472294d7c 100644
--- a/layout/style/nsCSSParser.h
+++ b/layout/style/nsCSSParser.h
@@ -46,7 +46,6 @@
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 
-class nsICSSRule;
 class nsCSSStyleSheet;
 class nsIPrincipal;
 class nsIURI;
@@ -59,6 +58,7 @@ class nsCSSKeyframeRule;
 
 namespace mozilla {
 namespace css {
+class Rule;
 class Declaration;
 class Loader;
 class StyleRule;
@@ -145,7 +145,7 @@ public:
                      nsIURI*                 aSheetURL,
                      nsIURI*                 aBaseURL,
                      nsIPrincipal*           aSheetPrincipal,
-                     nsCOMArray<nsICSSRule>& aResult);
+                     nsCOMArray<mozilla::css::Rule>& aResult);
 
   nsresult ParseProperty(const nsCSSProperty aPropID,
                          const nsAString&    aPropValue,
diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp
index 8127df965c31..aa1f247b3ea2 100644
--- a/layout/style/nsCSSRuleProcessor.cpp
+++ b/layout/style/nsCSSRuleProcessor.cpp
@@ -2822,12 +2822,12 @@ struct CascadeEnumData {
  *  (3) add any @keyframes rules, in order, into data->mKeyframesRules.
  */
 static PRBool
-CascadeRuleEnumFunc(nsICSSRule* aRule, void* aData)
+CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
 {
   CascadeEnumData* data = (CascadeEnumData*)aData;
   PRInt32 type = aRule->GetType();
 
-  if (nsICSSRule::STYLE_RULE == type) {
+  if (css::Rule::STYLE_RULE == type) {
     css::StyleRule* styleRule = static_cast<css::StyleRule*>(aRule);
 
     for (nsCSSSelectorList *sel = styleRule->Selector();
@@ -2844,14 +2844,14 @@ CascadeRuleEnumFunc(nsICSSRule* aRule, void* aData)
                                                         sel->mSelectors));
     }
   }
-  else if (nsICSSRule::MEDIA_RULE == type ||
-           nsICSSRule::DOCUMENT_RULE == type) {
+  else if (css::Rule::MEDIA_RULE == type ||
+           css::Rule::DOCUMENT_RULE == type) {
     css::GroupRule* groupRule = static_cast<css::GroupRule*>(aRule);
     if (groupRule->UseForPresentation(data->mPresContext, data->mCacheKey))
       if (!groupRule->EnumerateRulesForwards(CascadeRuleEnumFunc, aData))
         return PR_FALSE;
   }
-  else if (nsICSSRule::FONT_FACE_RULE == type) {
+  else if (css::Rule::FONT_FACE_RULE == type) {
     nsCSSFontFaceRule *fontFaceRule = static_cast<nsCSSFontFaceRule*>(aRule);
     nsFontFaceRuleContainer *ptr = data->mFontFaceRules.AppendElement();
     if (!ptr)
@@ -2860,7 +2860,7 @@ CascadeRuleEnumFunc(nsICSSRule* aRule, void* aData)
     ptr->mSheetType = data->mSheetType;
   }
 #ifdef MOZ_CSS_ANIMATIONS
-  else if (nsICSSRule::KEYFRAMES_RULE == type) {
+  else if (css::Rule::KEYFRAMES_RULE == type) {
     nsCSSKeyframesRule *keyframesRule =
       static_cast<nsCSSKeyframesRule*>(aRule);
     if (!data->mKeyframesRules.AppendElement(keyframesRule)) {
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 48eb670d365e..803d8dc2888e 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -182,7 +182,7 @@ GroupRuleRuleList::GetItemAt(PRUint32 aIndex, nsresult* aResult)
   *aResult = NS_OK;
 
   if (mGroupRule) {
-    nsCOMPtr<nsICSSRule> rule = mGroupRule->GetStyleRuleAt(aIndex);
+    nsRefPtr<Rule> rule = mGroupRule->GetStyleRuleAt(aIndex);
     if (rule) {
       return rule->GetDOMRuleWeak(aResult);
     }
@@ -238,11 +238,10 @@ NS_IMPL_RELEASE_INHERITED(CharsetRule, css::Rule)
 
 // QueryInterface implementation for CharsetRule
 NS_INTERFACE_MAP_BEGIN(CharsetRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSCharsetRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSCharsetRule)
 NS_INTERFACE_MAP_END
 
@@ -264,13 +263,13 @@ CharsetRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 CharsetRule::GetType() const
 {
-  return nsICSSRule::CHARSET_RULE;
+  return Rule::CHARSET_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 CharsetRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new CharsetRule(*this);
+  nsRefPtr<Rule> clone = new CharsetRule(*this);
   return clone.forget();
 }
 
@@ -372,11 +371,10 @@ NS_IMPL_RELEASE_INHERITED(ImportRule, Rule)
 
 // QueryInterface implementation for ImportRule
 NS_INTERFACE_MAP_BEGIN(ImportRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSImportRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSImportRule)
 NS_INTERFACE_MAP_END
 
@@ -403,13 +401,13 @@ ImportRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 ImportRule::GetType() const
 {
-  return nsICSSRule::IMPORT_RULE;
+  return Rule::IMPORT_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 ImportRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new ImportRule(*this);
+  nsRefPtr<Rule> clone = new ImportRule(*this);
   return clone.forget();
 }
 
@@ -512,10 +510,10 @@ ImportRule::GetStyleSheet(nsIDOMCSSStyleSheet * *aStyleSheet)
 DOMCI_DATA(CSSImportRule, css::ImportRule)
 
 static PRBool
-CloneRuleInto(nsICSSRule* aRule, void* aArray)
+CloneRuleInto(css::Rule* aRule, void* aArray)
 {
-  nsCOMPtr<nsICSSRule> clone = aRule->Clone();
-  static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(clone);
+  nsRefPtr<css::Rule> clone = aRule->Clone();
+  static_cast<nsCOMArray<css::Rule>*>(aArray)->AppendObject(clone);
   return PR_TRUE;
 }
 
@@ -528,7 +526,7 @@ GroupRule::GroupRule()
 }
 
 static PRBool
-SetParentRuleReference(nsICSSRule* aRule, void* aParentRule)
+SetParentRuleReference(Rule* aRule, void* aParentRule)
 {
   GroupRule* parentRule = static_cast<GroupRule*>(aParentRule);
   aRule->SetParentRule(parentRule);
@@ -554,7 +552,7 @@ GroupRule::~GroupRule()
 IMPL_STYLE_RULE_INHERIT_MAP_RULE_INFO_INTO(GroupRule, Rule)
 
 static PRBool
-SetStyleSheetReference(nsICSSRule* aRule, void* aSheet)
+SetStyleSheetReference(Rule* aRule, void* aSheet)
 {
   nsCSSStyleSheet* sheet = (nsCSSStyleSheet*)aSheet;
   aRule->SetStyleSheet(sheet);
@@ -582,7 +580,7 @@ GroupRule::List(FILE* out, PRInt32 aIndent) const
 #endif
 
 void
-GroupRule::AppendStyleRule(nsICSSRule* aRule)
+GroupRule::AppendStyleRule(Rule* aRule)
 {
   mRules.AppendObject(aRule);
   aRule->SetStyleSheet(mSheet);
@@ -592,7 +590,7 @@ GroupRule::AppendStyleRule(nsICSSRule* aRule)
   }
 }
 
-nsICSSRule*
+Rule*
 GroupRule::GetStyleRuleAt(PRInt32 aIndex) const
 {
   return mRules.SafeObjectAt(aIndex);
@@ -614,7 +612,7 @@ GroupRule::EnumerateRulesForwards(RuleEnumFunc aFunc, void * aData) const
 nsresult
 GroupRule::DeleteStyleRuleAt(PRUint32 aIndex)
 {
-  nsICSSRule* rule = mRules.SafeObjectAt(aIndex);
+  Rule* rule = mRules.SafeObjectAt(aIndex);
   if (rule) {
     rule->SetStyleSheet(nsnull);
     rule->SetParentRule(nsnull);
@@ -624,7 +622,7 @@ GroupRule::DeleteStyleRuleAt(PRUint32 aIndex)
 
 nsresult
 GroupRule::InsertStyleRulesAt(PRUint32 aIndex,
-                              nsCOMArray<nsICSSRule>& aRules)
+                              nsCOMArray<Rule>& aRules)
 {
   aRules.EnumerateForwards(SetStyleSheetReference, mSheet);
   aRules.EnumerateForwards(SetParentRuleReference, this);
@@ -635,7 +633,7 @@ GroupRule::InsertStyleRulesAt(PRUint32 aIndex,
 }
 
 nsresult
-GroupRule::ReplaceStyleRule(nsICSSRule* aOld, nsICSSRule* aNew)
+GroupRule::ReplaceStyleRule(Rule* aOld, Rule* aNew)
 {
   PRInt32 index = mRules.IndexOf(aOld);
   NS_ENSURE_TRUE(index != -1, NS_ERROR_UNEXPECTED);
@@ -654,7 +652,7 @@ GroupRule::AppendRulesToCssText(nsAString& aCssText)
 
   // get all the rules
   for (PRInt32 index = 0, count = mRules.Count(); index < count; ++index) {
-    nsICSSRule* rule = mRules.ObjectAt(index);
+    Rule* rule = mRules.ObjectAt(index);
     nsCOMPtr<nsIDOMCSSRule> domRule;
     rule->GetDOMRule(getter_AddRefs(domRule));
     if (domRule) {
@@ -752,11 +750,10 @@ NS_IMPL_RELEASE_INHERITED(MediaRule, Rule)
 
 // QueryInterface implementation for MediaRule
 NS_INTERFACE_MAP_BEGIN(MediaRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMediaRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMediaRule)
 NS_INTERFACE_MAP_END
 
@@ -795,13 +792,13 @@ MediaRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 MediaRule::GetType() const
 {
-  return nsICSSRule::MEDIA_RULE;
+  return Rule::MEDIA_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 MediaRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new MediaRule(*this);
+  nsRefPtr<Rule> clone = new MediaRule(*this);
   return clone.forget();
 }
 
@@ -922,11 +919,10 @@ NS_IMPL_RELEASE_INHERITED(DocumentRule, Rule)
 
 // QueryInterface implementation for DocumentRule
 NS_INTERFACE_MAP_BEGIN(DocumentRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSMozDocumentRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSMozDocumentRule)
 NS_INTERFACE_MAP_END
 
@@ -967,13 +963,13 @@ DocumentRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 DocumentRule::GetType() const
 {
-  return nsICSSRule::DOCUMENT_RULE;
+  return Rule::DOCUMENT_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 DocumentRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new DocumentRule(*this);
+  nsRefPtr<Rule> clone = new DocumentRule(*this);
   return clone.forget();
 }
 
@@ -1147,10 +1143,9 @@ NS_INTERFACE_MAP_BEGIN(NameSpaceRule)
     return NS_OK;
   }
   else
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSNameSpaceRule)
 NS_INTERFACE_MAP_END
 
@@ -1181,13 +1176,13 @@ NameSpaceRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 NameSpaceRule::GetType() const
 {
-  return nsICSSRule::NAMESPACE_RULE;
+  return Rule::NAMESPACE_RULE;
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<Rule>
 NameSpaceRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new NameSpaceRule(*this);
+  nsRefPtr<Rule> clone = new NameSpaceRule(*this);
   return clone.forget();
 }
 
@@ -1574,10 +1569,10 @@ nsCSSFontFaceStyleDecl::GetParentRule(nsIDOMCSSRule** aParentRule)
 // nsCSSFontFaceRule
 // 
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<css::Rule>
 nsCSSFontFaceRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new nsCSSFontFaceRule(*this);
+  nsRefPtr<css::Rule> clone = new nsCSSFontFaceRule(*this);
   return clone.forget();
 }
 
@@ -1588,11 +1583,10 @@ DOMCI_DATA(CSSFontFaceRule, nsCSSFontFaceRule)
 
 // QueryInterface implementation for nsCSSFontFaceRule
 NS_INTERFACE_MAP_BEGIN(nsCSSFontFaceRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSFontFaceRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSFontFaceRule)
 NS_INTERFACE_MAP_END
 
@@ -1632,7 +1626,7 @@ nsCSSFontFaceRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSFontFaceRule::GetType() const
 {
-  return nsICSSRule::FONT_FACE_RULE;
+  return css::Rule::FONT_FACE_RULE;
 }
 
 NS_IMETHODIMP
@@ -1783,10 +1777,10 @@ nsCSSKeyframeRule::~nsCSSKeyframeRule()
   }
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<css::Rule>
 nsCSSKeyframeRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new nsCSSKeyframeRule(*this);
+  nsRefPtr<css::Rule> clone = new nsCSSKeyframeRule(*this);
   return clone.forget();
 }
 
@@ -1797,11 +1791,10 @@ DOMCI_DATA(MozCSSKeyframeRule, nsCSSKeyframeRule)
 
 // QueryInterface implementation for nsCSSKeyframeRule
 NS_INTERFACE_MAP_BEGIN(nsCSSKeyframeRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframeRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframeRule)
 NS_INTERFACE_MAP_END
 
@@ -1833,7 +1826,7 @@ nsCSSKeyframeRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSKeyframeRule::GetType() const
 {
-  return nsICSSRule::KEYFRAME_RULE;
+  return css::Rule::KEYFRAME_RULE;
 }
 
 NS_IMETHODIMP
@@ -1953,10 +1946,10 @@ nsCSSKeyframesRule::~nsCSSKeyframesRule()
 {
 }
 
-/* virtual */ already_AddRefed<nsICSSRule>
+/* virtual */ already_AddRefed<css::Rule>
 nsCSSKeyframesRule::Clone() const
 {
-  nsCOMPtr<nsICSSRule> clone = new nsCSSKeyframesRule(*this);
+  nsRefPtr<css::Rule> clone = new nsCSSKeyframesRule(*this);
   return clone.forget();
 }
 
@@ -1967,11 +1960,10 @@ DOMCI_DATA(MozCSSKeyframesRule, nsCSSKeyframesRule)
 
 // QueryInterface implementation for nsCSSKeyframesRule
 NS_INTERFACE_MAP_BEGIN(nsCSSKeyframesRule)
-  NS_INTERFACE_MAP_ENTRY(nsICSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIStyleRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMCSSRule)
   NS_INTERFACE_MAP_ENTRY(nsIDOMMozCSSKeyframesRule)
-  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsICSSRule)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIStyleRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(MozCSSKeyframesRule)
 NS_INTERFACE_MAP_END
 
@@ -1986,7 +1978,7 @@ nsCSSKeyframesRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSKeyframesRule::GetType() const
 {
-  return nsICSSRule::KEYFRAMES_RULE;
+  return css::Rule::KEYFRAMES_RULE;
 }
 
 NS_IMETHODIMP
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 742b26bd65c8..61335dc550e0 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -43,7 +43,6 @@
 #ifndef nsCSSRules_h_
 #define nsCSSRules_h_
 
-#include "Rule.h"
 #include "mozilla/css/GroupRule.h"
 #include "nsIDOMCSSMediaRule.h"
 #include "nsIDOMCSSMozDocumentRule.h"
@@ -90,10 +89,10 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet); //override GroupRule
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
   virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
   {
     *aResult = NS_OK;
@@ -134,9 +133,9 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
   virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
   {
     *aResult = NS_OK;
@@ -234,11 +233,11 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   DECL_STYLE_RULE_INHERIT
 
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<mozilla::css::Rule> Clone() const;
 
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
@@ -298,9 +297,9 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<Rule> Clone() const;
 
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
@@ -361,10 +360,10 @@ public:
   {
     mKeys.SwapElements(aKeys);
   }
-
+private:
   nsCSSKeyframeRule(const nsCSSKeyframeRule& aCopy);
   ~nsCSSKeyframeRule();
-
+public:
   NS_DECL_ISUPPORTS
 
   // nsIStyleRule methods
@@ -372,10 +371,10 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   DECL_STYLE_RULE_INHERIT
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<mozilla::css::Rule> Clone() const;
 
   // nsIDOMCSSRule interface
   NS_DECL_NSIDOMCSSRULE
@@ -403,9 +402,10 @@ public:
     : mName(aName)
   {
   }
+private:
   nsCSSKeyframesRule(const nsCSSKeyframesRule& aCopy);
   ~nsCSSKeyframesRule();
-
+public:
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIStyleRule methods
@@ -413,9 +413,9 @@ public:
   virtual void List(FILE* out = stdout, PRInt32 aIndent = 0) const;
 #endif
 
-  // nsICSSRule methods
+  // Rule methods
   virtual PRInt32 GetType() const;
-  virtual already_AddRefed<nsICSSRule> Clone() const;
+  virtual already_AddRefed<mozilla::css::Rule> Clone() const;
   virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
   {
     *aResult = NS_OK;
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index d486f9b876df..152b8299fdd9 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -148,7 +148,7 @@ CSSRuleListImpl::GetItemAt(PRUint32 aIndex, nsresult* aResult)
     // ensure rules have correct parent
     if (mStyleSheet->EnsureUniqueInner() !=
           nsCSSStyleSheet::eUniqueInner_CloneFailed) {
-      nsCOMPtr<nsICSSRule> rule;
+      nsRefPtr<css::Rule> rule;
 
       result = mStyleSheet->GetStyleRuleAt(aIndex, *getter_AddRefs(rule));
       if (rule) {
@@ -805,7 +805,7 @@ nsCSSStyleSheetInner::nsCSSStyleSheetInner(nsCSSStyleSheet* aPrimarySheet)
   mPrincipal = do_CreateInstance("@mozilla.org/nullprincipal;1");
 }
 
-static PRBool SetStyleSheetReference(nsICSSRule* aRule, void* aSheet)
+static PRBool SetStyleSheetReference(css::Rule* aRule, void* aSheet)
 {
   if (aRule) {
     aRule->SetStyleSheet(static_cast<nsCSSStyleSheet*>(aSheet));
@@ -814,10 +814,10 @@ static PRBool SetStyleSheetReference(nsICSSRule* aRule, void* aSheet)
 }
 
 static PRBool
-CloneRuleInto(nsICSSRule* aRule, void* aArray)
+CloneRuleInto(css::Rule* aRule, void* aArray)
 {
-  nsCOMPtr<nsICSSRule> clone = aRule->Clone();
-  static_cast<nsCOMArray<nsICSSRule>*>(aArray)->AppendObject(clone);
+  nsRefPtr<css::Rule> clone = aRule->Clone();
+  static_cast<nsCOMArray<css::Rule>*>(aArray)->AppendObject(clone);
   return PR_TRUE;
 }
 
@@ -841,15 +841,15 @@ struct ChildSheetListBuilder {
 };
   
 PRBool
-nsCSSStyleSheet::RebuildChildList(nsICSSRule* aRule, void* aBuilder)
+nsCSSStyleSheet::RebuildChildList(css::Rule* aRule, void* aBuilder)
 {
   PRInt32 type = aRule->GetType();
-  if (type < nsICSSRule::IMPORT_RULE) {
+  if (type < css::Rule::IMPORT_RULE) {
     // Keep going till we get to the import rules.
     return PR_TRUE;
   }
 
-  if (type != nsICSSRule::IMPORT_RULE) {
+  if (type != css::Rule::IMPORT_RULE) {
     // We're past all the import rules; stop the enumeration.
     return PR_FALSE;
   }
@@ -942,9 +942,9 @@ nsCSSStyleSheetInner::RemoveSheet(nsCSSStyleSheet* aSheet)
 }
 
 static void
-AddNamespaceRuleToMap(nsICSSRule* aRule, nsXMLNameSpaceMap* aMap)
+AddNamespaceRuleToMap(css::Rule* aRule, nsXMLNameSpaceMap* aMap)
 {
-  NS_ASSERTION(aRule->GetType() == nsICSSRule::NAMESPACE_RULE, "Bogus rule type");
+  NS_ASSERTION(aRule->GetType() == css::Rule::NAMESPACE_RULE, "Bogus rule type");
 
   nsRefPtr<css::NameSpaceRule> nameSpaceRule = do_QueryObject(aRule);
 
@@ -955,17 +955,17 @@ AddNamespaceRuleToMap(nsICSSRule* aRule, nsXMLNameSpaceMap* aMap)
 }
 
 static PRBool
-CreateNameSpace(nsICSSRule* aRule, void* aNameSpacePtr)
+CreateNameSpace(css::Rule* aRule, void* aNameSpacePtr)
 {
   PRInt32 type = aRule->GetType();
-  if (nsICSSRule::NAMESPACE_RULE == type) {
+  if (css::Rule::NAMESPACE_RULE == type) {
     AddNamespaceRuleToMap(aRule,
                           static_cast<nsXMLNameSpaceMap*>(aNameSpacePtr));
     return PR_TRUE;
   }
   // stop if not namespace, import or charset because namespace can't follow
   // anything else
-  return (nsICSSRule::CHARSET_RULE == type || nsICSSRule::IMPORT_RULE == type);
+  return (css::Rule::CHARSET_RULE == type || css::Rule::IMPORT_RULE == type);
 }
 
 void 
@@ -1329,7 +1329,7 @@ nsCSSStyleSheet::InsertStyleSheetAt(nsCSSStyleSheet* aSheet, PRInt32 aIndex)
 }
 
 void
-nsCSSStyleSheet::PrependStyleRule(nsICSSRule* aRule)
+nsCSSStyleSheet::PrependStyleRule(css::Rule* aRule)
 {
   NS_PRECONDITION(nsnull != aRule, "null arg");
 
@@ -1338,7 +1338,7 @@ nsCSSStyleSheet::PrependStyleRule(nsICSSRule* aRule)
     aRule->SetStyleSheet(this);
     DidDirty();
 
-    if (nsICSSRule::NAMESPACE_RULE == aRule->GetType()) {
+    if (css::Rule::NAMESPACE_RULE == aRule->GetType()) {
       // no api to prepend a namespace (ugh), release old ones and re-create them all
       mInner->RebuildNameSpaces();
     }
@@ -1346,7 +1346,7 @@ nsCSSStyleSheet::PrependStyleRule(nsICSSRule* aRule)
 }
 
 void
-nsCSSStyleSheet::AppendStyleRule(nsICSSRule* aRule)
+nsCSSStyleSheet::AppendStyleRule(css::Rule* aRule)
 {
   NS_PRECONDITION(nsnull != aRule, "null arg");
 
@@ -1355,7 +1355,7 @@ nsCSSStyleSheet::AppendStyleRule(nsICSSRule* aRule)
     aRule->SetStyleSheet(this);
     DidDirty();
 
-    if (nsICSSRule::NAMESPACE_RULE == aRule->GetType()) {
+    if (css::Rule::NAMESPACE_RULE == aRule->GetType()) {
 #ifdef DEBUG
       nsresult rv =
 #endif
@@ -1367,7 +1367,7 @@ nsCSSStyleSheet::AppendStyleRule(nsICSSRule* aRule)
 }
 
 void
-nsCSSStyleSheet::ReplaceStyleRule(nsICSSRule* aOld, nsICSSRule* aNew)
+nsCSSStyleSheet::ReplaceStyleRule(css::Rule* aOld, css::Rule* aNew)
 {
   NS_PRECONDITION(mInner->mOrderedRules.Count() != 0, "can't have old rule");
   NS_PRECONDITION(mInner->mComplete, "No replacing in an incomplete sheet!");
@@ -1383,8 +1383,8 @@ nsCSSStyleSheet::ReplaceStyleRule(nsICSSRule* aOld, nsICSSRule* aNew)
     aNew->SetStyleSheet(this);
     aOld->SetStyleSheet(nsnull);
     DidDirty();
-    NS_ASSERTION(nsICSSRule::NAMESPACE_RULE != aNew->GetType(), "not yet implemented");
-    NS_ASSERTION(nsICSSRule::NAMESPACE_RULE != aOld->GetType(), "not yet implemented");
+    NS_ASSERTION(css::Rule::NAMESPACE_RULE != aNew->GetType(), "not yet implemented");
+    NS_ASSERTION(css::Rule::NAMESPACE_RULE != aOld->GetType(), "not yet implemented");
   }
 }
 
@@ -1395,7 +1395,7 @@ nsCSSStyleSheet::StyleRuleCount() const
 }
 
 nsresult
-nsCSSStyleSheet::GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const
+nsCSSStyleSheet::GetStyleRuleAt(PRInt32 aIndex, css::Rule*& aRule) const
 {
   // Important: If this function is ever made scriptable, we must add
   // a security check here. See GetCssRules below for an example.
@@ -1477,7 +1477,7 @@ nsCSSStyleSheet::Clone(nsCSSStyleSheet* aCloneParent,
 
 #ifdef DEBUG
 static void
-ListRules(const nsCOMArray<nsICSSRule>& aRules, FILE* aOut, PRInt32 aIndent)
+ListRules(const nsCOMArray<css::Rule>& aRules, FILE* aOut, PRInt32 aIndent)
 {
   for (PRInt32 index = aRules.Count() - 1; index >= 0; --index) {
     aRules.ObjectAt(index)->List(aOut, aIndent);
@@ -1597,7 +1597,7 @@ nsCSSStyleSheet::SubjectSubsumesInnerPrincipal() const
 }
 
 nsresult
-nsCSSStyleSheet::RegisterNamespaceRule(nsICSSRule* aRule)
+nsCSSStyleSheet::RegisterNamespaceRule(css::Rule* aRule)
 {
   if (!mInner->mNameSpaceMap) {
     nsresult rv = mInner->CreateNamespaceMap();
@@ -1785,7 +1785,7 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
 
   mozAutoDocUpdate updateBatch(mDocument, UPDATE_STYLE, PR_TRUE);
 
-  nsCOMArray<nsICSSRule> rules;
+  nsCOMArray<css::Rule> rules;
   result = css.ParseRule(aRule, mInner->mSheetURI, mInner->mBaseURI,
                          mInner->mPrincipal, rules);
   if (NS_FAILED(result))
@@ -1800,52 +1800,52 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
   // Hierarchy checking.  Just check the first and last rule in the list.
   
   // check that we're not inserting before a charset rule
-  nsICSSRule* nextRule = mInner->mOrderedRules.SafeObjectAt(aIndex);
+  css::Rule* nextRule = mInner->mOrderedRules.SafeObjectAt(aIndex);
   if (nextRule) {
     PRInt32 nextType = nextRule->GetType();
-    if (nextType == nsICSSRule::CHARSET_RULE) {
+    if (nextType == css::Rule::CHARSET_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
 
     // check last rule in list
-    nsICSSRule* lastRule = rules.ObjectAt(rulecount - 1);
+    css::Rule* lastRule = rules.ObjectAt(rulecount - 1);
     PRInt32 lastType = lastRule->GetType();
 
-    if (nextType == nsICSSRule::IMPORT_RULE &&
-        lastType != nsICSSRule::CHARSET_RULE &&
-        lastType != nsICSSRule::IMPORT_RULE) {
+    if (nextType == css::Rule::IMPORT_RULE &&
+        lastType != css::Rule::CHARSET_RULE &&
+        lastType != css::Rule::IMPORT_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
     
-    if (nextType == nsICSSRule::NAMESPACE_RULE &&
-        lastType != nsICSSRule::CHARSET_RULE &&
-        lastType != nsICSSRule::IMPORT_RULE &&
-        lastType != nsICSSRule::NAMESPACE_RULE) {
+    if (nextType == css::Rule::NAMESPACE_RULE &&
+        lastType != css::Rule::CHARSET_RULE &&
+        lastType != css::Rule::IMPORT_RULE &&
+        lastType != css::Rule::NAMESPACE_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     } 
   }
   
   // check first rule in list
-  nsICSSRule* firstRule = rules.ObjectAt(0);
+  css::Rule* firstRule = rules.ObjectAt(0);
   PRInt32 firstType = firstRule->GetType();
   if (aIndex != 0) {
-    if (firstType == nsICSSRule::CHARSET_RULE) { // no inserting charset at nonzero position
+    if (firstType == css::Rule::CHARSET_RULE) { // no inserting charset at nonzero position
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
   
-    nsICSSRule* prevRule = mInner->mOrderedRules.SafeObjectAt(aIndex - 1);
+    css::Rule* prevRule = mInner->mOrderedRules.SafeObjectAt(aIndex - 1);
     PRInt32 prevType = prevRule->GetType();
 
-    if (firstType == nsICSSRule::IMPORT_RULE &&
-        prevType != nsICSSRule::CHARSET_RULE &&
-        prevType != nsICSSRule::IMPORT_RULE) {
+    if (firstType == css::Rule::IMPORT_RULE &&
+        prevType != css::Rule::CHARSET_RULE &&
+        prevType != css::Rule::IMPORT_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
 
-    if (firstType == nsICSSRule::NAMESPACE_RULE &&
-        prevType != nsICSSRule::CHARSET_RULE &&
-        prevType != nsICSSRule::IMPORT_RULE &&
-        prevType != nsICSSRule::NAMESPACE_RULE) {
+    if (firstType == css::Rule::NAMESPACE_RULE &&
+        prevType != css::Rule::CHARSET_RULE &&
+        prevType != css::Rule::IMPORT_RULE &&
+        prevType != css::Rule::NAMESPACE_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
   }
@@ -1855,11 +1855,11 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
   DidDirty();
 
   for (PRInt32 counter = 0; counter < rulecount; counter++) {
-    nsICSSRule* cssRule = rules.ObjectAt(counter);
+    css::Rule* cssRule = rules.ObjectAt(counter);
     cssRule->SetStyleSheet(this);
 
     PRInt32 type = cssRule->GetType();
-    if (type == nsICSSRule::NAMESPACE_RULE) {
+    if (type == css::Rule::NAMESPACE_RULE) {
       // XXXbz does this screw up when inserting a namespace rule before
       // another namespace rule that binds the same prefix to a different
       // namespace?
@@ -1870,7 +1870,7 @@ nsCSSStyleSheet::InsertRuleInternal(const nsAString& aRule,
     // We don't notify immediately for @import rules, but rather when
     // the sheet the rule is importing is loaded
     PRBool notify = PR_TRUE;
-    if (type == nsICSSRule::IMPORT_RULE) {
+    if (type == css::Rule::IMPORT_RULE) {
       nsCOMPtr<nsIDOMCSSImportRule> importRule(do_QueryInterface(cssRule));
       NS_ASSERTION(importRule, "Rule which has type IMPORT_RULE and does not implement nsIDOMCSSImportRule!");
       nsCOMPtr<nsIDOMCSSStyleSheet> childSheet;
@@ -1915,7 +1915,7 @@ nsCSSStyleSheet::DeleteRule(PRUint32 aIndex)
                  "Too many style rules!");
 
     // Hold a strong ref to the rule so it doesn't die when we RemoveObjectAt
-    nsCOMPtr<nsICSSRule> rule = mInner->mOrderedRules.ObjectAt(aIndex);
+    nsRefPtr<css::Rule> rule = mInner->mOrderedRules.ObjectAt(aIndex);
     if (rule) {
       mInner->mOrderedRules.RemoveObjectAt(aIndex);
       rule->SetStyleSheet(nsnull);
@@ -1936,7 +1936,7 @@ nsCSSStyleSheet::DeleteRuleFromGroup(css::GroupRule* aGroup, PRUint32 aIndex)
   NS_ENSURE_ARG_POINTER(aGroup);
   NS_ASSERTION(mInner->mComplete, "No deleting from an incomplete sheet!");
   nsresult result;
-  nsCOMPtr<nsICSSRule> rule = aGroup->GetStyleRuleAt(aIndex);
+  nsRefPtr<css::Rule> rule = aGroup->GetStyleRuleAt(aIndex);
   NS_ENSURE_TRUE(rule, NS_ERROR_ILLEGAL_VALUE);
 
   // check that the rule actually belongs to this sheet!
@@ -1997,7 +1997,7 @@ nsCSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
   result = WillDirty();
   NS_ENSURE_SUCCESS(result, result);
 
-  nsCOMArray<nsICSSRule> rules;
+  nsCOMArray<css::Rule> rules;
   result = css.ParseRule(aRule, mInner->mSheetURI, mInner->mBaseURI,
                          mInner->mPrincipal, rules);
   NS_ENSURE_SUCCESS(result, result);
@@ -2009,11 +2009,11 @@ nsCSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
   }
 
   PRInt32 counter;
-  nsICSSRule* rule;
+  css::Rule* rule;
   for (counter = 0; counter < rulecount; counter++) {
     // Only rulesets are allowed in a group as of CSS2
     rule = rules.ObjectAt(counter);
-    if (rule->GetType() != nsICSSRule::STYLE_RULE) {
+    if (rule->GetType() != css::Rule::STYLE_RULE) {
       return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
     }
   }
@@ -2035,7 +2035,7 @@ nsCSSStyleSheet::InsertRuleIntoGroup(const nsAString & aRule,
 
 nsresult
 nsCSSStyleSheet::ReplaceRuleInGroup(css::GroupRule* aGroup,
-                                    nsICSSRule* aOld, nsICSSRule* aNew)
+                                    css::Rule* aOld, css::Rule* aNew)
 {
   nsresult result;
   NS_PRECONDITION(mInner->mComplete, "No replacing in an incomplete sheet!");
diff --git a/layout/style/nsCSSStyleSheet.h b/layout/style/nsCSSStyleSheet.h
index 3462e2728d52..dbf8e72d2ef6 100644
--- a/layout/style/nsCSSStyleSheet.h
+++ b/layout/style/nsCSSStyleSheet.h
@@ -52,7 +52,6 @@
 #include "nsICSSLoaderObserver.h"
 #include "nsCOMArray.h"
 
-class nsICSSRule;
 class nsXMLNameSpaceMap;
 class nsCSSRuleProcessor;
 class nsMediaList;
@@ -66,6 +65,7 @@ template<class E, class A> class nsTArray;
 
 namespace mozilla {
 namespace css {
+class Rule;
 class GroupRule;
 class ImportRule;
 }
@@ -100,7 +100,7 @@ private:
   nsCOMPtr<nsIURI>       mOriginalSheetURI;  // for GetHref.  Can be null.
   nsCOMPtr<nsIURI>       mBaseURI; // for resolving relative URIs
   nsCOMPtr<nsIPrincipal> mPrincipal;
-  nsCOMArray<nsICSSRule> mOrderedRules;
+  nsCOMArray<mozilla::css::Rule> mOrderedRules;
   nsAutoPtr<nsXMLNameSpaceMap> mNameSpaceMap;
   // Linked list of child sheets.  This is al fundamentally broken, because
   // each of the child sheets has a unique parent... We can only hope (and
@@ -165,16 +165,16 @@ public:
   void InsertStyleSheetAt(nsCSSStyleSheet* aSheet, PRInt32 aIndex);
 
   // XXX do these belong here or are they generic?
-  void PrependStyleRule(nsICSSRule* aRule);
-  void AppendStyleRule(nsICSSRule* aRule);
-  void ReplaceStyleRule(nsICSSRule* aOld, nsICSSRule* aNew);
+  void PrependStyleRule(mozilla::css::Rule* aRule);
+  void AppendStyleRule(mozilla::css::Rule* aRule);
+  void ReplaceStyleRule(mozilla::css::Rule* aOld, mozilla::css::Rule* aNew);
 
   PRInt32 StyleRuleCount() const;
-  nsresult GetStyleRuleAt(PRInt32 aIndex, nsICSSRule*& aRule) const;
+  nsresult GetStyleRuleAt(PRInt32 aIndex, mozilla::css::Rule*& aRule) const;
 
   nsresult DeleteRuleFromGroup(mozilla::css::GroupRule* aGroup, PRUint32 aIndex);
   nsresult InsertRuleIntoGroup(const nsAString& aRule, mozilla::css::GroupRule* aGroup, PRUint32 aIndex, PRUint32* _retval);
-  nsresult ReplaceRuleInGroup(mozilla::css::GroupRule* aGroup, nsICSSRule* aOld, nsICSSRule* aNew);
+  nsresult ReplaceRuleInGroup(mozilla::css::GroupRule* aGroup, mozilla::css::Rule* aOld, mozilla::css::Rule* aNew);
 
   PRInt32 StyleSheetCount() const;
 
@@ -260,7 +260,7 @@ public:
 
   // Function used as a callback to rebuild our inner's child sheet
   // list after we clone a unique inner for ourselves.
-  static PRBool RebuildChildList(nsICSSRule* aRule, void* aBuilder);
+  static PRBool RebuildChildList(mozilla::css::Rule* aRule, void* aBuilder);
 
 private:
   nsCSSStyleSheet(const nsCSSStyleSheet& aCopy,
@@ -287,7 +287,7 @@ protected:
   nsresult SubjectSubsumesInnerPrincipal() const;
 
   // Add the namespace mapping from this @namespace rule to our namespace map
-  nsresult RegisterNamespaceRule(nsICSSRule* aRule);
+  nsresult RegisterNamespaceRule(mozilla::css::Rule* aRule);
 
 protected:
   nsString              mTitle;
diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp
index ba63fe0632f6..f309a92c2140 100644
--- a/layout/style/nsDOMCSSDeclaration.cpp
+++ b/layout/style/nsDOMCSSDeclaration.cpp
@@ -44,7 +44,7 @@
 #include "mozilla/css/Loader.h"
 #include "nsCSSStyleSheet.h"
 #include "nsIStyleRule.h"
-#include "nsICSSRule.h"
+#include "mozilla/css/Rule.h"
 #include "mozilla/css/Declaration.h"
 #include "nsCSSProps.h"
 #include "nsCOMPtr.h"
@@ -265,7 +265,7 @@ nsDOMCSSDeclaration::RemoveProperty(const nsAString& aPropertyName,
 }
 
 /* static */ void
-nsDOMCSSDeclaration::GetCSSParsingEnvironmentForRule(nsICSSRule* aRule,
+nsDOMCSSDeclaration::GetCSSParsingEnvironmentForRule(css::Rule* aRule,
                                                      CSSParsingEnvironment& aCSSParseEnv)
 {
   nsIStyleSheet* sheet = aRule ? aRule->GetStyleSheet() : nsnull;
diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h
index 0e48022a33bd..01af139cd35e 100644
--- a/layout/style/nsDOMCSSDeclaration.h
+++ b/layout/style/nsDOMCSSDeclaration.h
@@ -48,12 +48,12 @@ class nsCSSParser;
 class nsIURI;
 class nsIPrincipal;
 class nsIDocument;
-class nsICSSRule;
 
 namespace mozilla {
 namespace css {
 class Declaration;
 class Loader;
+class Rule;
 }
 }
 
@@ -120,8 +120,8 @@ protected:
   virtual void GetCSSParsingEnvironment(CSSParsingEnvironment& aCSSParseEnv) = 0;
 
   // An implementation for GetCSSParsingEnvironment for callers wrapping
-  // an nsICSSRule.
-  static void GetCSSParsingEnvironmentForRule(nsICSSRule* aRule,
+  // an css::Rule.
+  static void GetCSSParsingEnvironmentForRule(mozilla::css::Rule* aRule,
                                               CSSParsingEnvironment& aCSSParseEnv);
 
   nsresult ParsePropertyValue(const nsCSSProperty aPropID,
diff --git a/layout/style/nsFontFaceLoader.cpp b/layout/style/nsFontFaceLoader.cpp
index 97489db91c2b..2eaebf5e9c57 100644
--- a/layout/style/nsFontFaceLoader.cpp
+++ b/layout/style/nsFontFaceLoader.cpp
@@ -478,7 +478,7 @@ nsUserFontSet::InsertRule(nsCSSFontFaceRule *aRule, PRUint8 aSheetType,
                           nsTArray<FontFaceRuleRecord>& aOldRules,
                           PRBool& aFontSetModified)
 {
-  NS_ABORT_IF_FALSE(aRule->GetType() == nsICSSRule::FONT_FACE_RULE,
+  NS_ABORT_IF_FALSE(aRule->GetType() == mozilla::css::Rule::FONT_FACE_RULE,
                     "InsertRule passed a non-fontface CSS rule");
 
   // set up family name
diff --git a/layout/style/nsICSSRule.h b/layout/style/nsICSSRule.h
deleted file mode 100644
index 5f48f850ba30..000000000000
--- a/layout/style/nsICSSRule.h
+++ /dev/null
@@ -1,112 +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 mozilla.org code.
- *
- * 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):
- *
- * 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 ***** */
-
-/* internal interface for all rule types in a CSS style sheet */
-
-#ifndef nsICSSRule_h
-#define nsICSSRule_h
-
-#include "nsIStyleRule.h"
-#include "nsIDOMCSSRule.h"
-
-class nsCSSStyleSheet;
-class nsAString;
-template<class T> struct already_AddRefed;
-class nsIStyleSheet;
-
-namespace mozilla {
-namespace css {
-class GroupRule;
-}
-}
-
-// IID for the nsICSSRule interface
-#define NS_ICSS_RULE_IID     \
-{ 0x471d733e, 0xc138, 0x4a50, \
- { 0x9e, 0x1a, 0xd1, 0x3c, 0xbb, 0x65, 0xb5, 0x26 } }
-
-
-// inheriting from nsIStyleRule is only for style rules, not other rule types
-class nsICSSRule : public nsIStyleRule {
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICSS_RULE_IID)
-  // The constants in this list must maintain the following invariants:
-  //   If a rule of type N must appear before a rule of type M in stylesheets
-  //   then N < M
-  // Note that nsCSSStyleSheet::RebuildChildList assumes that no other kinds of
-  // rules can come between two rules of type IMPORT_RULE.
-  enum {
-    UNKNOWN_RULE = 0,
-    CHARSET_RULE,
-    IMPORT_RULE,
-    NAMESPACE_RULE,
-    STYLE_RULE,
-    MEDIA_RULE,
-    FONT_FACE_RULE,
-    PAGE_RULE,
-#ifdef MOZ_CSS_ANIMATIONS
-    KEYFRAME_RULE,
-    KEYFRAMES_RULE,
-#endif
-    DOCUMENT_RULE
-  };
-
-  virtual PRInt32 GetType() const = 0;
-
-  virtual nsIStyleSheet* GetStyleSheet() const = 0;
-  virtual void SetStyleSheet(nsCSSStyleSheet* aSheet) = 0;
-  virtual void SetParentRule(mozilla::css::GroupRule* aRule) = 0;
-
-  /**
-   * Clones |this|. Never returns NULL.
-   */
-  virtual already_AddRefed<nsICSSRule> Clone() const = 0;
-
-  // Note that this returns null for inline style rules since they aren't
-  // supposed to have a DOM rule representation (and our code wouldn't work).
-  nsresult GetDOMRule(nsIDOMCSSRule** aDOMRule)
-  {
-    nsresult rv;
-    NS_IF_ADDREF(*aDOMRule = GetDOMRuleWeak(&rv));
-    return rv;
-  }
-  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult) = 0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsICSSRule, NS_ICSS_RULE_IID)
-
-#endif /* nsICSSRule_h */

From 0a33ba66bba8a1575ea840b6ae6ebc232263ece4 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Thu, 7 Apr 2011 20:51:25 -0700
Subject: [PATCH 033/314] Bug 648925 - Part 2: Make several css::Rule methods
 non-virtual and inline.  r=bzbarsky

---
 layout/style/Rule.h         | 11 +++++++++--
 layout/style/nsCSSRules.cpp | 21 ---------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 6a908d927cae..0887cff4394c 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -107,9 +107,16 @@ public:
 
   virtual PRInt32 GetType() const = 0;
 
-  virtual nsIStyleSheet* GetStyleSheet() const;
+  nsCSSStyleSheet* GetStyleSheet() const { return mSheet; }
+
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet);
-  virtual void SetParentRule(GroupRule* aRule);
+
+  void SetParentRule(GroupRule* aRule) {
+    // We don't reference count this up reference. The group rule
+    // will tell us when it's going away or when we're detached from
+    // it.
+    mParentRule = aRule;
+  }
 
   /**
    * Clones |this|. Never returns NULL.
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 803d8dc2888e..272ab44c20ab 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -86,12 +86,6 @@ namespace css {
 NS_IMPL_ADDREF(Rule)
 NS_IMPL_RELEASE(Rule)
 
-/* virtual */ nsIStyleSheet*
-Rule::GetStyleSheet() const
-{
-  return mSheet;
-}
-
 /* virtual */ void
 Rule::SetStyleSheet(nsCSSStyleSheet* aSheet)
 {
@@ -101,26 +95,11 @@ Rule::SetStyleSheet(nsCSSStyleSheet* aSheet)
   mSheet = aSheet;
 }
 
-/* virtual */ void
-Rule::SetParentRule(css::GroupRule* aRule)
-{
-  // We don't reference count this up reference. The group rule
-  // will tell us when it's going away or when we're detached from
-  // it.
-  mParentRule = aRule;
-}
-
-} // namespace css
-} // namespace mozilla
-
 
 // -------------------------------
 // Style Rule List for group rules
 //
 
-namespace mozilla {
-namespace css {
-
 class NS_FINAL_CLASS GroupRuleRuleList : public nsICSSRuleList
 {
 public:

From 17f74aee24372c82e91c2f090246431486daea21 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Mon, 11 Apr 2011 19:46:35 -0700
Subject: [PATCH 034/314] Bug 648925 - Part 3: Factor some common method bodies
 into css::Rule.  r=bzbarsky

---
 layout/style/GroupRule.h    |   4 +-
 layout/style/Rule.h         |   4 ++
 layout/style/StyleRule.cpp  |  11 +--
 layout/style/StyleRule.h    |   2 -
 layout/style/nsCSSRules.cpp | 137 ++++++++++++++----------------------
 5 files changed, 61 insertions(+), 97 deletions(-)

diff --git a/layout/style/GroupRule.h b/layout/style/GroupRule.h
index e8f2ec4ae7b2..65e731925fcb 100644
--- a/layout/style/GroupRule.h
+++ b/layout/style/GroupRule.h
@@ -99,12 +99,10 @@ public:
 protected:
   // to help implement nsIDOMCSSRule
   nsresult AppendRulesToCssText(nsAString& aCssText);
-  // to implement methods on nsIDOMCSSRule
-  nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
 
   // to implement common methods on nsIDOMCSSMediaRule and
   // nsIDOMCSSMozDocumentRule
-  nsIDOMCSSRuleList* GetCssRules();
+  nsresult GetCssRules(nsIDOMCSSRuleList* *aRuleList);
   nsresult InsertRule(const nsAString & aRule, PRUint32 aIndex,
                       PRUint32* _retval);
   nsresult DeleteRule(PRUint32 aIndex);
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 0887cff4394c..75d4db515ca6 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -133,6 +133,10 @@ public:
   }
   virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult) = 0;
 
+  // to implement methods on nsIDOMCSSRule
+  nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
+  nsresult GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet);
+
 protected:
   nsCSSStyleSheet*  mSheet;
   GroupRule*        mParentRule;
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index f17a2b007e1e..87d72b252797 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1169,9 +1169,7 @@ DOMCSSStyleRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
     *aSheet = nsnull;
     return NS_OK;
   }
-  nsRefPtr<nsCSSStyleSheet> sheet = Rule()->GetParentStyleSheet();
-  sheet.forget(aSheet);
-  return NS_OK;
+  return Rule()->GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
@@ -1181,12 +1179,7 @@ DOMCSSStyleRule::GetParentRule(nsIDOMCSSRule** aParentRule)
     *aParentRule = nsnull;
     return NS_OK;
   }
-  GroupRule* rule = Rule()->GetParentRule();
-  if (!rule) {
-    *aParentRule = nsnull;
-    return NS_OK;
-  }
-  return rule->GetDOMRule(aParentRule);
+  return Rule()->GetParentRule(aParentRule);
 }
 
 NS_IMETHODIMP
diff --git a/layout/style/StyleRule.h b/layout/style/StyleRule.h
index 0bac085e8c2e..9e7a09aa6533 100644
--- a/layout/style/StyleRule.h
+++ b/layout/style/StyleRule.h
@@ -341,8 +341,6 @@ public:
   // hooks for DOM rule
   void GetCssText(nsAString& aCssText);
   void SetCssText(const nsAString& aCssText);
-  nsCSSStyleSheet* GetParentStyleSheet() { return mSheet; }
-  GroupRule* GetParentRule() { return mParentRule; }
   void GetSelectorText(nsAString& aSelectorText);
   void SetSelectorText(const nsAString& aSelectorText);
 
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 272ab44c20ab..250e16542b7e 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -95,6 +95,25 @@ Rule::SetStyleSheet(nsCSSStyleSheet* aSheet)
   mSheet = aSheet;
 }
 
+nsresult
+Rule::GetParentRule(nsIDOMCSSRule** aParentRule)
+{
+  if (mParentRule) {
+    return mParentRule->GetDOMRule(aParentRule);
+  }
+  *aParentRule = nsnull;
+  return NS_OK;
+}
+
+nsresult
+Rule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
+{
+  NS_ENSURE_ARG_POINTER(aSheet);
+
+  NS_IF_ADDREF(*aSheet = mSheet);
+  return NS_OK;
+}
+
 
 // -------------------------------
 // Style Rule List for group rules
@@ -201,19 +220,19 @@ namespace mozilla {
 namespace css {
 
 CharsetRule::CharsetRule(const nsAString& aEncoding)
-  : css::Rule(),
+  : Rule(),
     mEncoding(aEncoding)
 {
 }
 
 CharsetRule::CharsetRule(const CharsetRule& aCopy)
-  : css::Rule(aCopy),
+  : Rule(aCopy),
     mEncoding(aCopy.mEncoding)
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(CharsetRule, css::Rule)
-NS_IMPL_RELEASE_INHERITED(CharsetRule, css::Rule)
+NS_IMPL_ADDREF_INHERITED(CharsetRule, Rule)
+NS_IMPL_RELEASE_INHERITED(CharsetRule, Rule)
 
 // QueryInterface implementation for CharsetRule
 NS_INTERFACE_MAP_BEGIN(CharsetRule)
@@ -224,7 +243,7 @@ NS_INTERFACE_MAP_BEGIN(CharsetRule)
   NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSCharsetRule)
 NS_INTERFACE_MAP_END
 
-IMPL_STYLE_RULE_INHERIT(CharsetRule, css::Rule)
+IMPL_STYLE_RULE_INHERIT(CharsetRule, Rule)
 
 #ifdef DEBUG
 /* virtual */ void
@@ -291,20 +310,13 @@ CharsetRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 CharsetRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_ENSURE_ARG_POINTER(aSheet);
-
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return Rule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 CharsetRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return Rule::GetParentRule(aParentRule);
 }
 
 
@@ -441,20 +453,13 @@ ImportRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 ImportRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_ENSURE_ARG_POINTER(aSheet);
-
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return Rule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 ImportRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return Rule::GetParentRule(aParentRule);
 }
 
 NS_IMETHODIMP
@@ -648,25 +653,16 @@ GroupRule::AppendRulesToCssText(nsAString& aCssText)
   return NS_OK;
 }
 
-nsresult
-GroupRule::GetParentRule(nsIDOMCSSRule** aParentRule)
-{
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
-}
-
 // nsIDOMCSSMediaRule or nsIDOMCSSMozDocumentRule methods
-nsIDOMCSSRuleList*
-GroupRule::GetCssRules()
+nsresult
+GroupRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
   if (!mRuleCollection) {
     mRuleCollection = new css::GroupRuleRuleList(this);
   }
 
-  return mRuleCollection;
+  NS_ADDREF(*aRuleList = mRuleCollection);
+  return NS_OK;
 }
 
 nsresult
@@ -821,8 +817,7 @@ MediaRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 MediaRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return GroupRule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
@@ -843,8 +838,7 @@ MediaRule::GetMedia(nsIDOMMediaList* *aMedia)
 NS_IMETHODIMP
 MediaRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
-  NS_ADDREF(*aRuleList = GroupRule::GetCssRules());
-  return NS_OK;
+  return GroupRule::GetCssRules(aRuleList);
 }
 
 NS_IMETHODIMP
@@ -998,8 +992,7 @@ DocumentRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 DocumentRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return GroupRule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
@@ -1011,8 +1004,7 @@ DocumentRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 NS_IMETHODIMP
 DocumentRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
-  NS_ADDREF(*aRuleList = GroupRule::GetCssRules());
-  return NS_OK;
+  return GroupRule::GetCssRules(aRuleList);
 }
 
 NS_IMETHODIMP
@@ -1195,18 +1187,13 @@ NameSpaceRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 NameSpaceRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return Rule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 NameSpaceRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return Rule::GetParentRule(aParentRule);
 }
 
 } // namespace css
@@ -1555,8 +1542,8 @@ nsCSSFontFaceRule::Clone() const
   return clone.forget();
 }
 
-NS_IMPL_ADDREF_INHERITED(nsCSSFontFaceRule, css::Rule)
-NS_IMPL_RELEASE_INHERITED(nsCSSFontFaceRule, css::Rule)
+NS_IMPL_ADDREF_INHERITED(nsCSSFontFaceRule, Rule)
+NS_IMPL_RELEASE_INHERITED(nsCSSFontFaceRule, Rule)
 
 DOMCI_DATA(CSSFontFaceRule, nsCSSFontFaceRule)
 
@@ -1605,7 +1592,7 @@ nsCSSFontFaceRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSFontFaceRule::GetType() const
 {
-  return css::Rule::FONT_FACE_RULE;
+  return Rule::FONT_FACE_RULE;
 }
 
 NS_IMETHODIMP
@@ -1636,18 +1623,13 @@ nsCSSFontFaceRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 nsCSSFontFaceRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return Rule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 nsCSSFontFaceRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return Rule::GetParentRule(aParentRule);
 }
 
 NS_IMETHODIMP
@@ -1745,7 +1727,7 @@ nsCSSKeyframeRule::nsCSSKeyframeRule(const nsCSSKeyframeRule& aCopy)
   // copy everything except our reference count and mDOMDeclaration
   : Rule(aCopy)
   , mKeys(aCopy.mKeys)
-  , mDeclaration(new mozilla::css::Declaration(*aCopy.mDeclaration))
+  , mDeclaration(new css::Declaration(*aCopy.mDeclaration))
 {
 }
 
@@ -1805,7 +1787,7 @@ nsCSSKeyframeRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSKeyframeRule::GetType() const
 {
-  return css::Rule::KEYFRAME_RULE;
+  return Rule::KEYFRAME_RULE;
 }
 
 NS_IMETHODIMP
@@ -1837,18 +1819,13 @@ nsCSSKeyframeRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 nsCSSKeyframeRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return Rule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 nsCSSKeyframeRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return Rule::GetParentRule(aParentRule);
 }
 
 NS_IMETHODIMP
@@ -1899,7 +1876,7 @@ nsCSSKeyframeRule::GetStyle(nsIDOMCSSStyleDeclaration** aStyle)
 }
 
 void
-nsCSSKeyframeRule::ChangeDeclaration(mozilla::css::Declaration* aDeclaration)
+nsCSSKeyframeRule::ChangeDeclaration(css::Declaration* aDeclaration)
 {
   mDeclaration = aDeclaration;
 
@@ -1932,8 +1909,8 @@ nsCSSKeyframesRule::Clone() const
   return clone.forget();
 }
 
-NS_IMPL_ADDREF_INHERITED(nsCSSKeyframesRule, mozilla::css::GroupRule)
-NS_IMPL_RELEASE_INHERITED(nsCSSKeyframesRule, mozilla::css::GroupRule)
+NS_IMPL_ADDREF_INHERITED(nsCSSKeyframesRule, css::GroupRule)
+NS_IMPL_RELEASE_INHERITED(nsCSSKeyframesRule, css::GroupRule)
 
 DOMCI_DATA(MozCSSKeyframesRule, nsCSSKeyframesRule)
 
@@ -1957,7 +1934,7 @@ nsCSSKeyframesRule::List(FILE* out, PRInt32 aIndent) const
 /* virtual */ PRInt32
 nsCSSKeyframesRule::GetType() const
 {
-  return css::Rule::KEYFRAMES_RULE;
+  return Rule::KEYFRAMES_RULE;
 }
 
 NS_IMETHODIMP
@@ -1993,18 +1970,13 @@ nsCSSKeyframesRule::SetCssText(const nsAString& aCssText)
 NS_IMETHODIMP
 nsCSSKeyframesRule::GetParentStyleSheet(nsIDOMCSSStyleSheet** aSheet)
 {
-  NS_IF_ADDREF(*aSheet = mSheet);
-  return NS_OK;
+  return GroupRule::GetParentStyleSheet(aSheet);
 }
 
 NS_IMETHODIMP
 nsCSSKeyframesRule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
-  }
-  *aParentRule = nsnull;
-  return NS_OK;
+  return GroupRule::GetParentRule(aParentRule);
 }
 
 NS_IMETHODIMP
@@ -2029,8 +2001,7 @@ nsCSSKeyframesRule::SetName(const nsAString& aName)
 NS_IMETHODIMP
 nsCSSKeyframesRule::GetCssRules(nsIDOMCSSRuleList* *aRuleList)
 {
-  NS_ADDREF(*aRuleList = GroupRule::GetCssRules());
-  return NS_OK;
+  return GroupRule::GetCssRules(aRuleList);
 }
 
 NS_IMETHODIMP

From a96af92a846ba0f336db179c7b4ee81d8a18ebf5 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Thu, 7 Apr 2011 23:36:09 -0700
Subject: [PATCH 035/314] Bug 648925 - Part 4: DeCOMtaminate GetDOMRule and
 GetDOMRuleWeak.  r=bzbarsky

---
 layout/inspector/src/inDOMUtils.cpp |  3 +--
 layout/style/Rule.h                 | 10 ++--------
 layout/style/StyleRule.cpp          | 12 ++++--------
 layout/style/StyleRule.h            |  2 +-
 layout/style/nsCSSRules.cpp         | 17 +++++++++--------
 layout/style/nsCSSRules.h           |  9 +++------
 layout/style/nsCSSStyleSheet.cpp    | 11 ++++++-----
 7 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/layout/inspector/src/inDOMUtils.cpp b/layout/inspector/src/inDOMUtils.cpp
index 3347d48fa6fd..eef80658601d 100644
--- a/layout/inspector/src/inDOMUtils.cpp
+++ b/layout/inspector/src/inDOMUtils.cpp
@@ -178,11 +178,10 @@ inDOMUtils::GetCSSStyleRules(nsIDOMElement *aElement,
   if (!rules) return NS_ERROR_OUT_OF_MEMORY;
 
   nsRefPtr<mozilla::css::StyleRule> cssRule;
-  nsCOMPtr<nsIDOMCSSRule> domRule;
   for ( ; !ruleNode->IsRoot(); ruleNode = ruleNode->GetParent()) {
     cssRule = do_QueryObject(ruleNode->GetRule());
     if (cssRule) {
-      cssRule->GetDOMRule(getter_AddRefs(domRule));
+      nsCOMPtr<nsIDOMCSSRule> domRule = cssRule->GetDOMRule();
       if (domRule)
         rules->InsertElementAt(domRule, 0);
     }
diff --git a/layout/style/Rule.h b/layout/style/Rule.h
index 75d4db515ca6..55ffc118139d 100644
--- a/layout/style/Rule.h
+++ b/layout/style/Rule.h
@@ -57,7 +57,7 @@ virtual void MapRuleInfoInto(nsRuleData* aRuleData);
 
 #define DECL_STYLE_RULE_INHERIT  \
 DECL_STYLE_RULE_INHERIT_NO_DOMRULE \
-virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult);
+virtual nsIDOMCSSRule* GetDOMRule();
 
 class Rule : public nsIStyleRule {
 protected:
@@ -125,13 +125,7 @@ public:
 
   // Note that this returns null for inline style rules since they aren't
   // supposed to have a DOM rule representation (and our code wouldn't work).
-  nsresult GetDOMRule(nsIDOMCSSRule** aDOMRule)
-  {
-    nsresult rv;
-    NS_IF_ADDREF(*aDOMRule = GetDOMRuleWeak(&rv));
-    return rv;
-  }
-  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult) = 0;
+  virtual nsIDOMCSSRule* GetDOMRule() = 0;
 
   // to implement methods on nsIDOMCSSRule
   nsresult GetParentRule(nsIDOMCSSRule** aParentRule);
diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 87d72b252797..6a2ba22ad4e1 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1068,7 +1068,8 @@ DOMCSSDeclarationImpl::GetParentRule(nsIDOMCSSRule **aParent)
     return NS_OK;
   }
 
-  return mRule->GetDOMRule(aParent);
+  NS_IF_ADDREF(*aParent = mRule->GetDOMRule());
+  return NS_OK;
 }
 
 nsresult
@@ -1338,10 +1339,9 @@ StyleRule::Clone() const
   return clone.forget();
 }
 
-nsIDOMCSSRule*
-StyleRule::GetDOMRuleWeak(nsresult *aResult)
+/* virtual */ nsIDOMCSSRule*
+StyleRule::GetDOMRule()
 {
-  *aResult = NS_OK;
   if (!mSheet) {
     // inline style rules aren't supposed to have a DOM rule object, only
     // a declaration.
@@ -1349,10 +1349,6 @@ StyleRule::GetDOMRuleWeak(nsresult *aResult)
   }
   if (!mDOMRule) {
     mDOMRule = new DOMCSSStyleRule(this);
-    if (!mDOMRule) {
-      *aResult = NS_ERROR_OUT_OF_MEMORY;
-      return nsnull;
-    }
     NS_ADDREF(mDOMRule);
   }
   return mDOMRule;
diff --git a/layout/style/StyleRule.h b/layout/style/StyleRule.h
index 9e7a09aa6533..6fe9889abd83 100644
--- a/layout/style/StyleRule.h
+++ b/layout/style/StyleRule.h
@@ -348,7 +348,7 @@ public:
 
   virtual already_AddRefed<Rule> Clone() const;
 
-  nsIDOMCSSRule* GetDOMRuleWeak(nsresult* aResult);
+  virtual nsIDOMCSSRule* GetDOMRule();
 
   // The new mapping function.
   virtual void MapRuleInfoInto(nsRuleData* aRuleData);
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 250e16542b7e..37f947a6528f 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -68,8 +68,8 @@
 namespace css = mozilla::css;
 
 #define IMPL_STYLE_RULE_INHERIT_GET_DOM_RULE_WEAK(class_, super_) \
-nsIDOMCSSRule* class_::GetDOMRuleWeak(nsresult *aResult) \
-  { *aResult = NS_OK; return this; }
+/* virtual */ nsIDOMCSSRule* class_::GetDOMRule() \
+  { return this; }
 #define IMPL_STYLE_RULE_INHERIT_MAP_RULE_INFO_INTO(class_, super_) \
 /* virtual */ void class_::MapRuleInfoInto(nsRuleData* aRuleData) \
   { NS_ABORT_IF_FALSE(PR_FALSE, "should not be called"); }
@@ -99,9 +99,10 @@ nsresult
 Rule::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
   if (mParentRule) {
-    return mParentRule->GetDOMRule(aParentRule);
+    NS_IF_ADDREF(*aParentRule = mParentRule->GetDOMRule());
+  } else {
+    *aParentRule = nsnull;
   }
-  *aParentRule = nsnull;
   return NS_OK;
 }
 
@@ -182,7 +183,7 @@ GroupRuleRuleList::GetItemAt(PRUint32 aIndex, nsresult* aResult)
   if (mGroupRule) {
     nsRefPtr<Rule> rule = mGroupRule->GetStyleRuleAt(aIndex);
     if (rule) {
-      return rule->GetDOMRuleWeak(aResult);
+      return rule->GetDOMRule();
     }
   }
 
@@ -637,8 +638,7 @@ GroupRule::AppendRulesToCssText(nsAString& aCssText)
   // get all the rules
   for (PRInt32 index = 0, count = mRules.Count(); index < count; ++index) {
     Rule* rule = mRules.ObjectAt(index);
-    nsCOMPtr<nsIDOMCSSRule> domRule;
-    rule->GetDOMRule(getter_AddRefs(domRule));
+    nsIDOMCSSRule* domRule = rule->GetDOMRule();
     if (domRule) {
       nsAutoString cssText;
       domRule->GetCssText(cssText);
@@ -1527,7 +1527,8 @@ nsCSSFontFaceStyleDecl::Item(PRUint32 index, nsAString & aResult NS_OUTPARAM)
 NS_IMETHODIMP
 nsCSSFontFaceStyleDecl::GetParentRule(nsIDOMCSSRule** aParentRule)
 {
-  return ContainingRule()->GetDOMRule(aParentRule);
+  NS_IF_ADDREF(*aParentRule = ContainingRule()->GetDOMRule());
+  return NS_OK;
 }
 
 
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 61335dc550e0..445a0f19714b 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -93,9 +93,8 @@ public:
   virtual void SetStyleSheet(nsCSSStyleSheet* aSheet); //override GroupRule
   virtual PRInt32 GetType() const;
   virtual already_AddRefed<Rule> Clone() const;
-  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
+  virtual nsIDOMCSSRule* GetDOMRule()
   {
-    *aResult = NS_OK;
     return this;
   }
 
@@ -136,9 +135,8 @@ public:
   // Rule methods
   virtual PRInt32 GetType() const;
   virtual already_AddRefed<Rule> Clone() const;
-  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
+  virtual nsIDOMCSSRule* GetDOMRule()
   {
-    *aResult = NS_OK;
     return this;
   }
 
@@ -416,9 +414,8 @@ public:
   // Rule methods
   virtual PRInt32 GetType() const;
   virtual already_AddRefed<mozilla::css::Rule> Clone() const;
-  virtual nsIDOMCSSRule* GetDOMRuleWeak(nsresult *aResult)
+  virtual nsIDOMCSSRule* GetDOMRule()
   {
-    *aResult = NS_OK;
     return this;
   }
 
diff --git a/layout/style/nsCSSStyleSheet.cpp b/layout/style/nsCSSStyleSheet.cpp
index 152b8299fdd9..c7091bd0c3fa 100644
--- a/layout/style/nsCSSStyleSheet.cpp
+++ b/layout/style/nsCSSStyleSheet.cpp
@@ -152,7 +152,8 @@ CSSRuleListImpl::GetItemAt(PRUint32 aIndex, nsresult* aResult)
 
       result = mStyleSheet->GetStyleRuleAt(aIndex, *getter_AddRefs(rule));
       if (rule) {
-        return rule->GetDOMRuleWeak(aResult);
+        *aResult = NS_OK;
+        return rule->GetDOMRule();
       }
       if (result == NS_ERROR_ILLEGAL_VALUE) {
         result = NS_OK; // per spec: "Return Value ... null if ... not a valid index."
@@ -1699,11 +1700,11 @@ NS_IMETHODIMP
 nsCSSStyleSheet::GetOwnerRule(nsIDOMCSSRule** aOwnerRule)
 {
   if (mOwnerRule) {
-    return mOwnerRule->GetDOMRule(aOwnerRule);
+    NS_IF_ADDREF(*aOwnerRule = mOwnerRule->GetDOMRule());
+  } else {
+    *aOwnerRule = nsnull;
   }
-
-  *aOwnerRule = nsnull;
-  return NS_OK;    
+  return NS_OK;
 }
 
 NS_IMETHODIMP    

From eb80bcd6c47b7472309e6e5409e6cf48a9704fb7 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend>
Date: Wed, 4 May 2011 10:36:00 -0700
Subject: [PATCH 036/314] Bug 642795 - Remove support for finding system
 XULRunner in the standalone glue [r=mark.finkle]

---
 xulrunner/app/nsXULRunnerApp.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index 7cc993f25875..41bcfd2f7709 100644
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -174,14 +174,6 @@ static void Usage(const char *argv0)
            "  -h, --help                 show this message\n"
            "  -v, --version              show version\n"
            "  --gre-version              print the GRE version string on stdout\n"
-           "  --register-global          register this GRE in the machine registry\n"
-           "  --register-user            register this GRE in the user registry\n"
-           "  --unregister-global        unregister this GRE formerly registered with\n"
-           "                             --register-global\n"
-           "  --unregister-user          unregister this GRE formely registered with\n"
-           "                             --register-user\n"
-           "  --find-gre <version>       Find a GRE with version <version> and print\n"
-           "                             the path on stdout\n"
            "  --install-app <application> [<destination> [<directoryname>]]\n"
            "                             Install a XUL application.\n"
            "\n"

From 86b1f63fcc917485c4c96d412af79c0301bb4c36 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 4 May 2011 11:40:12 -0700
Subject: [PATCH 037/314] Bug 654752 - Make runtests.py work out of the box
 with Fennec [r=ctalbert]

---
 build/binary-location.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/binary-location.mk b/build/binary-location.mk
index 81e46f3d7bd1..aae6c249383d 100644
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -40,8 +40,12 @@
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
+ifeq ($(MOZ_BUILD_APP),mobile)
+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
+endif
 
 TARGET_DIST = $(TARGET_DEPTH)/dist
 

From 2dc5dc38b431be4befa091f95b79316812b7cdad Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 4 May 2011 13:25:24 -0700
Subject: [PATCH 038/314] Bug 654798 - Fennec browser chrome tests install to
 the wrong place [r=jmaher]

---
 mobile/chrome/tests/Makefile.in                           | 2 +-
 mobile/chrome/tests/addons/browser_install1_1/install.rdf | 2 +-
 mobile/chrome/tests/addons/browser_install1_3/install.rdf | 2 +-
 mobile/chrome/tests/browser_addons.js                     | 2 +-
 mobile/chrome/tests/browser_formsZoom.js                  | 2 --
 mobile/chrome/tests/browser_history.js                    | 2 +-
 mobile/chrome/tests/browser_install.xml                   | 4 ++--
 mobile/chrome/tests/browser_navigation.js                 | 1 -
 mobile/chrome/tests/browser_scroll.js                     | 3 +--
 mobile/chrome/tests/browser_scrollbar.js                  | 1 -
 mobile/chrome/tests/browser_thumbnails.js                 | 1 -
 mobile/chrome/tests/browser_title.sjs                     | 4 ++--
 mobile/chrome/tests/browser_upgrade.rdf                   | 2 +-
 mobile/chrome/tests/browser_viewport.js                   | 1 -
 mobile/chrome/tests/head.js                               | 2 +-
 15 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 7e7e1fd2f594..34eb8fbf9f14 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -39,7 +39,7 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = mobile/chrome
+relativesrcdir  = mobile/chrome/tests
 TESTXPI  = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 ADDONSRC = $(srcdir)/addons
 
diff --git a/mobile/chrome/tests/addons/browser_install1_1/install.rdf b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
index 49891b5988c4..0825d11aa0cb 100644
--- a/mobile/chrome/tests/addons/browser_install1_1/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>1.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
     <em:bootstrap>true</em:bootstrap>
 
     <em:targetApplication>
diff --git a/mobile/chrome/tests/addons/browser_install1_3/install.rdf b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
index 43052832baf6..2c10f4921628 100644
--- a/mobile/chrome/tests/addons/browser_install1_3/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>3.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
 
     <em:targetApplication>
       <Description>
diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 8ebd9d9a89ca..75299408b1f5 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -7,7 +7,7 @@ Components.utils.import("resource://gre/modules/AddonUpdateChecker.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
-const RELATIVE_DIR = "browser/mobile/chrome/";
+const RELATIVE_DIR = "browser/mobile/chrome/tests/";
 const TESTROOT     = "http://example.com/" + RELATIVE_DIR;
 const TESTROOT2    = "http://example.org/" + RELATIVE_DIR;
 const PREF_LOGGING_ENABLED            = "extensions.logging.enabled";
diff --git a/mobile/chrome/tests/browser_formsZoom.js b/mobile/chrome/tests/browser_formsZoom.js
index 145e918993bb..d78a26771690 100644
--- a/mobile/chrome/tests/browser_formsZoom.js
+++ b/mobile/chrome/tests/browser_formsZoom.js
@@ -1,6 +1,4 @@
 let testURL_01 = chromeRoot + "browser_formsZoom.html";
-
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_02 = baseURI + "browser_formsZoom.html";
 messageManager.loadFrameScript(baseURI + "remote_formsZoom.js", true);
 
diff --git a/mobile/chrome/tests/browser_history.js b/mobile/chrome/tests/browser_history.js
index 87a3ee03d1b8..dd4ad8061cea 100644
--- a/mobile/chrome/tests/browser_history.js
+++ b/mobile/chrome/tests/browser_history.js
@@ -2,7 +2,7 @@
  * Make sure history is being recorded when we visit websites.
  */
 
-var testURL_01 = "http://mochi.test:8888/browser/mobile/chrome/browser_blank_01.html";
+var testURL_01 = baseURI + "browser_blank_01.html";
 
 // A queue to order the tests and a handle for each test
 var gTests = [];
diff --git a/mobile/chrome/tests/browser_install.xml b/mobile/chrome/tests/browser_install.xml
index bb76898036bb..3e96873c2afd 100644
--- a/mobile/chrome/tests/browser_install.xml
+++ b/mobile/chrome/tests/browser_install.xml
@@ -25,7 +25,7 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_1.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_1.xpi</install>
   </addon>
 
   <addon>
@@ -53,6 +53,6 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_2.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_2.xpi</install>
   </addon>
 </searchresults>
diff --git a/mobile/chrome/tests/browser_navigation.js b/mobile/chrome/tests/browser_navigation.js
index ad5f4177c7df..aa69a0ff7615 100644
--- a/mobile/chrome/tests/browser_navigation.js
+++ b/mobile/chrome/tests/browser_navigation.js
@@ -1,7 +1,6 @@
 var testURL_01 = chromeRoot + "browser_blank_01.html";
 var testURL_02 = chromeRoot + "browser_blank_02.html";
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 var titleURL = baseURI + "browser_title.sjs?";
 var pngURL = "data:image/gif;base64,R0lGODlhCwALAIAAAAAA3pn/ZiH5BAEAAAEALAAAAAALAAsAAAIUhA+hkcuO4lmNVindo7qyrIXiGBYAOw==";
 
diff --git a/mobile/chrome/tests/browser_scroll.js b/mobile/chrome/tests/browser_scroll.js
index 08b03525e387..bb299e0d36e1 100644
--- a/mobile/chrome/tests/browser_scroll.js
+++ b/mobile/chrome/tests/browser_scroll.js
@@ -4,8 +4,7 @@
 var gTab;
 registerCleanupFunction(function() Browser.closeTab(gTab));
 
-const BASE_URL = "http://mochi.test:8888/browser/mobile/chrome/";
-const TEST_URL = BASE_URL + "browser_scroll.html";
+const TEST_URL = baseURI + "browser_scroll.html";
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index 3efbb7d9a7e8..be54149b9735 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -1,4 +1,3 @@
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_01 = baseURI + "browser_scrollbar.sjs?";
 
 let gCurrentTest = null;
diff --git a/mobile/chrome/tests/browser_thumbnails.js b/mobile/chrome/tests/browser_thumbnails.js
index 0787a76a5564..59ac82d731e0 100644
--- a/mobile/chrome/tests/browser_thumbnails.js
+++ b/mobile/chrome/tests/browser_thumbnails.js
@@ -37,7 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/browser_title.sjs b/mobile/chrome/tests/browser_title.sjs
index ba525cddac4c..a523c1de5de6 100644
--- a/mobile/chrome/tests/browser_title.sjs
+++ b/mobile/chrome/tests/browser_title.sjs
@@ -55,10 +55,10 @@ function handleRequest(request, response) {
       response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.title = 'This is not a french title'; }, false);</script>");
       break;
     case "redirect":
-      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title'></meta>");
+      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title'></meta>");
       break;
     case "location":
-      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title' ; }, false);</script>");
+      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title' ; }, false);</script>");
       break;
     default:
       break;
diff --git a/mobile/chrome/tests/browser_upgrade.rdf b/mobile/chrome/tests/browser_upgrade.rdf
index 507d574cc03b..bfde13200e03 100644
--- a/mobile/chrome/tests/browser_upgrade.rdf
+++ b/mobile/chrome/tests/browser_upgrade.rdf
@@ -14,7 +14,7 @@
                 <em:id>toolkit@mozilla.org</em:id>
                 <em:minVersion>0</em:minVersion>
                 <em:maxVersion>*</em:maxVersion>
-                <em:updateLink>http://example.com/browser/mobile/chrome/addons/browser_install1_3.xpi</em:updateLink>
+                <em:updateLink>http://example.com/browser/mobile/chrome/tests/addons/browser_install1_3.xpi</em:updateLink>
               </Description>
             </em:targetApplication>
           </Description>
diff --git a/mobile/chrome/tests/browser_viewport.js b/mobile/chrome/tests/browser_viewport.js
index c0cebe1b1fc4..bb95cc2eb6d2 100644
--- a/mobile/chrome/tests/browser_viewport.js
+++ b/mobile/chrome/tests/browser_viewport.js
@@ -38,7 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index 85133ce9028e..b2709c3f6996 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -83,6 +83,6 @@ let AsyncTests = {
 let chromeRoot = getRootDirectory(gTestPath);
 // For some security reasons (which?), loading remote_head using chromeRoot
 // instead of baseURI make the browser_formsZoom.js test fails.
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/tests/";
 messageManager.loadFrameScript(baseURI + "remote_head.js", true);
 messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);

From 23415b3715e019d2b5a9a420ca24e2cde5a038be Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Fri, 6 May 2011 08:53:43 -0700
Subject: [PATCH 039/314] Bug 654122 - Enable browser_scroll.js mobile
 browser-chrome test [r=stechz]

---
 mobile/chrome/tests/Makefile.in       | 2 ++
 mobile/chrome/tests/browser_scroll.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 34eb8fbf9f14..4bcad913b399 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -78,6 +78,8 @@ _BROWSER_FILES = \
   browser_preferences_text.js \
   browser_rect.js \
   browser_rememberPassword.js \
+  browser_scroll.js \
+  browser_scroll.html \
   browser_scrollbar.js \
   browser_select.html \
   browser_select.js \
diff --git a/mobile/chrome/tests/browser_scroll.js b/mobile/chrome/tests/browser_scroll.js
index bb299e0d36e1..5445280589bc 100644
--- a/mobile/chrome/tests/browser_scroll.js
+++ b/mobile/chrome/tests/browser_scroll.js
@@ -13,6 +13,7 @@ function test() {
     executeSoon(function() {
       let rect = Elements.browsers.getBoundingClientRect();
       is(rect.top, 0, "Titlebar is hidden.");
+      finish();
     });
   });
 }

From 7400fa953615370e74f6171f81d9b9b2d49e053b Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 6 May 2011 09:49:56 -0700
Subject: [PATCH 040/314] Bug 625229 - Slide sidebars in and out on firstrun
 page. r=mfinkle

---
 mobile/chrome/content/browser-ui.js           |  7 +++++-
 mobile/chrome/content/browser.xul             |  7 +++---
 mobile/chrome/content/firstrun/firstrun.xhtml | 22 ++++++++++++++++++-
 mobile/themes/core/browser.css                | 17 ++++++++++++++
 mobile/themes/core/firstRun.css               | 10 +++++++++
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index f9fd26c222e6..94addab12cee 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -1102,8 +1102,13 @@ var BrowserUI = {
   },
 
   isCommandEnabled : function(cmd) {
+    // disable all commands during the first-run sidebar discovery
+    let broadcaster = document.getElementById("bcast_uidiscovery");
+    if (broadcaster && broadcaster.getAttribute("mode") == "discovery")
+      return false;
+
     let elem = document.getElementById(cmd);
-    if (elem && (elem.getAttribute("disabled") == "true"))
+    if (elem && elem.getAttribute("disabled") == "true")
       return false;
     return true;
   },
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index d75a1e81c119..e463e29486a2 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -85,6 +85,7 @@
   <broadcasterset id="broadcasterset">
     <broadcaster id="bcast_contentShowing" disabled="false"/>
     <broadcaster id="bcast_urlbarState" mode="view"/>
+    <broadcaster id="bcast_uidiscovery"/>
   </broadcasterset>
 
   <observerset id="observerset">
@@ -196,7 +197,7 @@
 
   <stack flex="1" id="stack">
     <scrollbox id="controls-scrollbox" style="overflow: hidden; -moz-box-orient: horizontal; position: relative;" flex="1">
-      <vbox class="panel-dark">
+      <vbox id="tabs-sidebar" class="sidebar" observes="bcast_uidiscovery">
         <spacer class="toolbar-height"/>
         <!-- Left toolbar -->
         <vbox id="tabs-container" class="panel-dark" flex="1">
@@ -217,7 +218,7 @@
           <vbox>
             <!-- Main Toolbar -->
             <box id="toolbar-container" class="panel-dark toolbar-height">
-              <box id="toolbar-moveable-container">
+              <box id="toolbar-moveable-container" observes="bcast_uidiscovery">
                 <toolbar id="toolbar-main" class="panel-dark window-width">
 #ifdef MOZ_PLATFORM_MAEMO
 #if MOZ_PLATFORM_MAEMO != 6
@@ -286,7 +287,7 @@
       </stack>
 
       <!-- Right toolbar -->
-      <vbox class="panel-dark">
+      <vbox id="controls-sidebar" class="sidebar" observes="bcast_uidiscovery">
         <!-- Because of the stack + fixed position of the urlbar when it is in
              locked mode the event on the top-right part of the urlbar are
              swallow by this spacer, but not with the mousethrough attribute
diff --git a/mobile/chrome/content/firstrun/firstrun.xhtml b/mobile/chrome/content/firstrun/firstrun.xhtml
index da9b5e5cd482..98df77faaf82 100644
--- a/mobile/chrome/content/firstrun/firstrun.xhtml
+++ b/mobile/chrome/content/firstrun/firstrun.xhtml
@@ -70,7 +70,7 @@
       <p>&firstrun.heading2;</p>
     </div>
 
-    <div id="content">
+    <div id="content" hidden="true">
       <h2></h2>
       <ul id="recommended">
         <li id="sync"><a href="javascript:loadSync();"><b>&firstrun.sync2.title;</b> <span>&firstrun.sync2.description;</span></a></li>
@@ -116,6 +116,26 @@
 
         function init() {
           setupLinks();
+          startDiscovery();
+        }
+        
+        function startDiscovery() {
+          let doc = getChromeWin().document;
+          let broadcaster = doc.getElementById("bcast_uidiscovery");
+
+          doc.addEventListener("animationend", endDiscovery, false);
+          doc.addEventListener("PanBegin", endDiscovery, false);
+          broadcaster.setAttribute("mode", "discovery");
+        }
+
+        function endDiscovery() {
+          let doc = getChromeWin().document;
+          let broadcaster = doc.getElementById("bcast_uidiscovery");
+
+          broadcaster.removeAttribute("mode");
+          doc.removeEventListener("animationend", endDiscovery, false);
+          doc.removeEventListener("PanBegin", endDiscovery, false);
+          document.getElementById("content").removeAttribute("hidden");
         }
 
         function setupLinks() {
diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css
index 5da7204fa86a..e0951b079555 100644
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -47,6 +47,7 @@
   background: #5e6166;
 }
 
+#toolbar-moveable-container[mode="discover"],
 #toolbar-moveable-container[top="0"] {
   position: fixed;
   left: 0;
@@ -1433,3 +1434,19 @@ richlistitem.appmenu-downloads-button > image,
   height: @scroller_thickness@;
   min-width: @scroller_minimum@;
 }
+
+/* Sidebar peeking */
+.sidebar[mode="discovery"] {
+  -moz-animation-delay: 1s;
+  -moz-animation-duration: 5s;
+  -moz-animation-name: sidebardiscovery;
+}
+
+@-moz-keyframes sidebardiscovery {
+  from { -moz-transform: translateX(0%); }
+  10% { -moz-transform: translateX(100%); }
+  45% { -moz-transform: translateX(100%); }
+  55% { -moz-transform: translateX(-100%); }
+  90% { -moz-transform: translateX(-100%); }
+  to { -moz-transform: translateX(0%); }
+}
diff --git a/mobile/themes/core/firstRun.css b/mobile/themes/core/firstRun.css
index c713e7448410..57123b6f6788 100644
--- a/mobile/themes/core/firstRun.css
+++ b/mobile/themes/core/firstRun.css
@@ -87,6 +87,16 @@ img {
   clear: both;
 }
 
+#content {
+  opacity: 1;
+  -moz-transition: opacity 1s linear;
+}
+
+#content[hidden] {
+  display: block;
+  opacity: 0;
+}
+
 #head p {
   font-size: xx-large;
 }

From b9eb1319624e1ac760b02e073cbbf6bd9ce2ffd5 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 6 May 2011 09:49:58 -0700
Subject: [PATCH 041/314] Bug 651048 - Firstrun screen should not show setup
 dialog is sync is already set up. r=mfinkle

---
 mobile/chrome/content/firstrun/firstrun.xhtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/firstrun/firstrun.xhtml b/mobile/chrome/content/firstrun/firstrun.xhtml
index 98df77faaf82..5fbdfe2128e3 100644
--- a/mobile/chrome/content/firstrun/firstrun.xhtml
+++ b/mobile/chrome/content/firstrun/firstrun.xhtml
@@ -106,7 +106,9 @@
 
         function loadSync() {
           let win = getChromeWin();
-          win.WeaveGlue.open();
+          // If Sync is not setup, we'll open the setup dialog. Otherwise,
+          // we show the remote tabs view
+          win.BrowserUI.doCommand("cmd_remoteTabs");
         }
 
         function loadAddons() {

From e19f154571f36b6a92e168bbfbc2139daa03562e Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Fri, 6 May 2011 09:50:01 -0700
Subject: [PATCH 042/314] Bug 654733 - Stop using the word computer in offline
 storage notifcations. r=mfinkle,madhava

---
 mobile/locales/en-US/chrome/browser.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/locales/en-US/chrome/browser.properties b/mobile/locales/en-US/chrome/browser.properties
index 215415d17103..2ead1b058c02 100644
--- a/mobile/locales/en-US/chrome/browser.properties
+++ b/mobile/locales/en-US/chrome/browser.properties
@@ -122,7 +122,7 @@ popupButtonAlwaysAllow2=Always Show
 popupButtonNeverWarn2=Never Show
 
 # XPInstall
-xpinstallPromptWarning=%S prevented this site (%S) from asking you to install software on your computer.
+xpinstallPromptWarning=%S prevented this site (%S) from asking you to install software on your device.
 xpinstallPromptAllowButton=Allow
 xpinstallDisabledMessageLocked=Software installation has been disabled by your system administrator.
 xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again.
@@ -159,19 +159,19 @@ typeError=Error:
 typeWarning=Warning:
 
 # Offline web applications
-offlineApps.available=%S wants to store data on your computer for offline use.
+offlineApps.available=%S wants to store data on your device for offline use.
 offlineApps.allow=Allow
 offlineApps.never=Don't Allow
 offlineApps.notNow=Not Now
 
 # New-style ContentPermissionPrompt values
 offlineApps.dontAllow=Don't Allow
-offlineApps.siteWantsTo=%S wants to store data on your computer for offline use.
+offlineApps.siteWantsTo=%S wants to store data on your device for offline use.
 
 # IndexedDB Quota increases
 indexedDBQuota.allow=Allow
 indexedDBQuota.dontAllow=Don't Allow
-indexedDBQuota.siteWantsTo=%S wants to store a lot of data on your computer for offline use.
+indexedDBQuota.siteWantsTo=%S wants to store a lot of data on your device for offline use.
 
 # Bookmark List
 bookmarkList.desktop=Desktop Bookmarks

From d883e5825365d776c0d192b534f09089ea997fc8 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 27 Apr 2011 19:41:43 -0400
Subject: [PATCH 043/314] Bug 10209 - Part 1: Add an API for absolute container
 support for all frame types; r=roc

---
 layout/base/nsCSSFrameConstructor.cpp |  2 ++
 layout/generic/nsFrame.cpp            | 29 +++++++++++++++++++++++++++
 layout/generic/nsIFrame.h             | 16 ++++++++++++++-
 layout/generic/nsViewportFrame.h      |  3 +++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index c93e5c2da130..431889fbbd01 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1022,6 +1022,8 @@ nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteConta
    */
   mFixedPosIsAbsPos = (aNewAbsoluteContainingBlock &&
                        aNewAbsoluteContainingBlock->GetStyleDisplay()->HasTransform());
+
+  aNewAbsoluteContainingBlock->MarkAsAbsoluteContainingBlock();
 }
 
 void
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 7ffcfa1805c4..e2111d530e56 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -128,6 +128,7 @@
 
 #include "gfxContext.h"
 #include "CSSCalc.h"
+#include "nsAbsoluteContainingBlock.h"
 
 using namespace mozilla;
 using namespace mozilla::layers;
@@ -258,6 +259,34 @@ nsFrame::RootFrameList(nsPresContext* aPresContext, FILE* out, PRInt32 aIndent)
 }
 #endif
 
+static void
+DestroyAbsoluteContainingBlock(void* aPropertyValue)
+{
+  delete static_cast<nsAbsoluteContainingBlock*>(aPropertyValue);
+}
+
+NS_DECLARE_FRAME_PROPERTY(AbsoluteContainingBlockProperty, DestroyAbsoluteContainingBlock)
+
+PRBool
+nsIFrame::HasAbsolutelyPositionedChildren() const {
+  return IsAbsoluteContainer() && GetAbsoluteContainingBlock()->HasAbsoluteFrames();
+}
+
+nsAbsoluteContainingBlock*
+nsIFrame::GetAbsoluteContainingBlock() const {
+  NS_ASSERTION(IsAbsoluteContainer(), "The frame is not marked as an abspos container correctly");
+  nsAbsoluteContainingBlock* absCB = static_cast<nsAbsoluteContainingBlock*>
+    (Properties().Get(AbsoluteContainingBlockProperty()));
+  NS_ASSERTION(absCB, "The frame is marked as an abspos container but doesn't have the property");
+  return absCB;
+}
+
+void
+nsIFrame::MarkAsAbsoluteContainingBlock() {
+  AddStateBits(NS_FRAME_HAS_ABSPOS_CHILDREN);
+  Properties().Set(AbsoluteContainingBlockProperty(), new nsAbsoluteContainingBlock(GetAbsoluteListName()));
+}
+
 void
 NS_MergeReflowStatusInto(nsReflowStatus* aPrimary, nsReflowStatus aSecondary)
 {
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index f9f7a407c092..f5a6dda9d3b5 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -103,6 +103,7 @@ class gfxSkipChars;
 class gfxSkipCharsIterator;
 class gfxContext;
 class nsLineList_iterator;
+class nsAbsoluteContainingBlock;
 
 struct nsPeekOffsetStruct;
 struct nsPoint;
@@ -285,6 +286,9 @@ typedef PRUint64 nsFrameState;
 // bit; we could free up this bit with a little extra complexity.
 #define NS_FRAME_UPDATE_LAYER_TREE                  NS_FRAME_STATE_BIT(36)
 
+// Frame can accept absolutely positioned children.
+#define NS_FRAME_HAS_ABSPOS_CHILDREN                NS_FRAME_STATE_BIT(37)
+
 // The lower 20 bits and upper 32 bits of the frame state are reserved
 // by this API.
 #define NS_FRAME_RESERVED                           ~NS_FRAME_IMPL_RESERVED
@@ -2699,7 +2703,17 @@ NS_PTR_TO_INT32(frame->Properties().Get(nsIFrame::EmbeddingLevelProperty()))
       }
     }
   }  
-  
+
+  /**
+   * Accessors for the absolute containing block.
+   */
+  PRBool IsAbsoluteContainer() const { return !!(mState & NS_FRAME_HAS_ABSPOS_CHILDREN); }
+  PRBool HasAbsolutelyPositionedChildren() const;
+  nsAbsoluteContainingBlock* GetAbsoluteContainingBlock() const;
+  virtual void MarkAsAbsoluteContainingBlock();
+  // Child frame types override this function to select their own child list name
+  virtual nsIAtom* GetAbsoluteListName() const { return nsGkAtoms::absoluteList; }
+
 protected:
   // Members
   nsRect           mRect;
diff --git a/layout/generic/nsViewportFrame.h b/layout/generic/nsViewportFrame.h
index 0ff6eeb117ff..5a4566634c5a 100644
--- a/layout/generic/nsViewportFrame.h
+++ b/layout/generic/nsViewportFrame.h
@@ -118,6 +118,9 @@ public:
   NS_IMETHOD GetFrameName(nsAString& aResult) const;
 #endif
 
+private:
+  virtual nsIAtom* GetAbsoluteListName() const { return nsGkAtoms::fixedList; }
+
 protected:
   nsPoint AdjustReflowStateForScrollbars(nsHTMLReflowState* aReflowState) const;
 

From e66b9024c834a9e0dafebb2ac59b15f6682f7f09 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 29 Apr 2011 19:02:33 -0400
Subject: [PATCH 044/314] Bug 10209 - Part 2: Implement the absolute
 positioning support for all frames; r=roc

---
 content/base/src/nsGkAtomList.h              |   1 -
 layout/base/nsCSSFrameConstructor.cpp        |  52 +++---
 layout/base/nsCSSRendering.cpp               |   3 +-
 layout/base/nsFrameManager.cpp               |  32 +++-
 layout/base/nsFrameManager.h                 |   5 +-
 layout/doc/frame_reflow_debug.html           |   1 -
 layout/generic/nsAbsoluteContainingBlock.cpp |   2 +-
 layout/generic/nsBlockFrame.cpp              |  59 ++-----
 layout/generic/nsBlockFrame.h                |   7 +-
 layout/generic/nsCanvasFrame.cpp             |  52 +-----
 layout/generic/nsCanvasFrame.h               |   8 +-
 layout/generic/nsContainerFrame.cpp          |  10 +-
 layout/generic/nsContainerFrame.h            |   4 +-
 layout/generic/nsFrame.cpp                   |  92 +++++++++-
 layout/generic/nsFrame.h                     |   9 +
 layout/generic/nsHTMLParts.h                 |   2 -
 layout/generic/nsHTMLReflowState.cpp         |   2 +-
 layout/generic/nsIFrame.h                    |   4 +
 layout/generic/nsInlineFrame.cpp             | 173 ++-----------------
 layout/generic/nsInlineFrame.h               |  52 +-----
 layout/generic/nsLineLayout.cpp              |   3 +-
 layout/generic/nsPageContentFrame.cpp        |   9 +-
 layout/generic/nsQueryFrame.h                |   1 -
 layout/generic/nsViewportFrame.cpp           | 116 +++----------
 layout/generic/nsViewportFrame.h             |  14 +-
 layout/tables/nsTableFrame.cpp               |   2 +-
 layout/tables/nsTableOuterFrame.cpp          |   4 +-
 layout/xul/base/src/nsMenuFrame.cpp          |   2 +-
 28 files changed, 235 insertions(+), 486 deletions(-)

diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index cb9f51bb1f15..d8a62c77ceea 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -1748,7 +1748,6 @@ GK_ATOM(pageBreakFrame, "PageBreakFrame")
 GK_ATOM(pageContentFrame, "PageContentFrame")
 GK_ATOM(placeholderFrame, "PlaceholderFrame")
 GK_ATOM(popupSetFrame, "PopupSetFrame")
-GK_ATOM(positionedInlineFrame, "PositionedInlineFrame")
 GK_ATOM(canvasFrame, "CanvasFrame")
 GK_ATOM(rootFrame, "RootFrame")
 GK_ATOM(scrollFrame, "ScrollFrame")
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 431889fbbd01..cfdd89d2518e 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1023,7 +1023,9 @@ nsFrameConstructorState::PushAbsoluteContainingBlock(nsIFrame* aNewAbsoluteConta
   mFixedPosIsAbsPos = (aNewAbsoluteContainingBlock &&
                        aNewAbsoluteContainingBlock->GetStyleDisplay()->HasTransform());
 
-  aNewAbsoluteContainingBlock->MarkAsAbsoluteContainingBlock();
+  if (aNewAbsoluteContainingBlock) {
+    aNewAbsoluteContainingBlock->MarkAsAbsoluteContainingBlock();
+  }
 }
 
 void
@@ -1219,7 +1221,14 @@ nsFrameConstructorState::ProcessFrameInsertions(nsAbsoluteItems& aFrameItems,
   nsresult rv = NS_OK;
   if (childList.IsEmpty() &&
       (containingBlock->GetStateBits() & NS_FRAME_FIRST_REFLOW)) {
-    rv = containingBlock->SetInitialChildList(aChildListName, aFrameItems);
+    // If we're injecting absolutely positioned frames, inject them on the
+    // absolute containing block
+    if (aChildListName == containingBlock->GetAbsoluteListName()) {
+      rv = containingBlock->GetAbsoluteContainingBlock()->
+           SetInitialChildList(containingBlock, aChildListName, aFrameItems);
+    } else {
+      rv = containingBlock->SetInitialChildList(aChildListName, aFrameItems);
+    }
   } else {
     // Note that whether the frame construction context is doing an append or
     // not is not helpful here, since it could be appending to some frame in
@@ -1237,7 +1246,7 @@ nsFrameConstructorState::ProcessFrameInsertions(nsAbsoluteItems& aFrameItems,
     if (!lastChild ||
         nsLayoutUtils::CompareTreePosition(lastChild, firstNewFrame, containingBlock) < 0) {
       // no lastChild, or lastChild comes before the new children, so just append
-      rv = containingBlock->AppendFrames(aChildListName, aFrameItems);
+      rv = mFrameManager->AppendFrames(containingBlock, aChildListName, aFrameItems);
     } else {
       // try the other children
       nsIFrame* insertionPoint = nsnull;
@@ -1252,8 +1261,8 @@ nsFrameConstructorState::ProcessFrameInsertions(nsAbsoluteItems& aFrameItems,
         }
         insertionPoint = f;
       }
-      rv = containingBlock->InsertFrames(aChildListName, insertionPoint,
-                                         aFrameItems);
+      rv = mFrameManager->InsertFrames(containingBlock, aChildListName,
+                                       insertionPoint, aFrameItems);
     }
   }
 
@@ -2560,6 +2569,8 @@ nsCSSFrameConstructor::ConstructRootFrame(nsIFrame** aNewFrame)
 
   // The viewport is the containing block for 'fixed' elements
   mFixedContainingBlock = viewportFrame;
+  // Make it an absolute container for fixed-pos elements
+  mFixedContainingBlock->MarkAsAbsoluteContainingBlock();
 
   *aNewFrame = viewportFrame;
   return NS_OK;
@@ -2844,6 +2855,8 @@ nsCSSFrameConstructor::ConstructPageFrame(nsIPresShell*  aPresShell,
   pageContentFrame->Init(nsnull, aPageFrame, prevPageContentFrame);
   SetInitialSingleChild(aPageFrame, pageContentFrame);
   mFixedContainingBlock = pageContentFrame;
+  // Make it an absolute container for fixed-pos elements
+  mFixedContainingBlock->MarkAsAbsoluteContainingBlock();
 
   nsRefPtr<nsStyleContext> canvasPseudoStyle;
   canvasPseudoStyle = styleSet->ResolveAnonymousBoxStyle(nsCSSAnonBoxes::canvas,
@@ -5539,7 +5552,7 @@ nsCSSFrameConstructor::GetAbsoluteContainingBlock(nsIFrame* aFrame)
 #ifdef MOZ_XUL
             nsGkAtoms::XULLabelFrame == frameType ||
 #endif
-            nsGkAtoms::positionedInlineFrame == frameType) {
+            (nsGkAtoms::inlineFrame == frameType && wrappedFrame->IsAbsoluteContainer())) {
           containingBlock = wrappedFrame;
         } else if (nsGkAtoms::fieldSetFrame == frameType) {
           // If the positioned frame is a fieldset, use the area frame inside it.
@@ -8503,13 +8516,6 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
     if (newFrame) {
       newFrame->Init(content, aParentFrame, aFrame);
     }
-  
-  } else if (nsGkAtoms::positionedInlineFrame == frameType) {
-    newFrame = NS_NewPositionedInlineFrame(shell, styleContext);
-
-    if (newFrame) {
-      newFrame->Init(content, aParentFrame, aFrame);
-    }
 
   } else if (nsGkAtoms::pageFrame == frameType) {
     nsIFrame* canvasFrame;
@@ -10720,11 +10726,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
     NS_STYLE_DISPLAY_INLINE == aDisplay->mDisplay &&
     (NS_STYLE_POSITION_RELATIVE == aDisplay->mPosition ||
      aDisplay->HasTransform());
-  if (positioned) {
-    newFrame = NS_NewPositionedInlineFrame(mPresShell, styleContext);
-  } else {
-    newFrame = NS_NewInlineFrame(mPresShell, styleContext);
-  }
+  newFrame = NS_NewInlineFrame(mPresShell, styleContext);
 
   // Initialize the frame
   InitAndRestoreFrame(aState, content, aParentFrame, nsnull, newFrame);
@@ -10733,7 +10735,7 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
                                                   // because the object's destructor is significant
                                                   // this is part of the fix for bug 42372
 
-  if (positioned) {                            
+  if (positioned) {
     // Relatively positioned frames becomes a container for child
     // frames that are positioned
     aState.PushAbsoluteContainingBlock(newFrame, absoluteSaveState);
@@ -10832,17 +10834,15 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState,
 
     // Now grab the initial inlines in aChildItems and put them into an inline
     // frame
-    nsIFrame* inlineFrame;
-    if (aIsPositioned) {
-      inlineFrame = NS_NewPositionedInlineFrame(mPresShell, styleContext);
-    }
-    else {
-      inlineFrame = NS_NewInlineFrame(mPresShell, styleContext);
-    }
+    nsIFrame* inlineFrame = NS_NewInlineFrame(mPresShell, styleContext);
 
     InitAndRestoreFrame(aState, content, parentFrame, nsnull, inlineFrame,
                         PR_FALSE);
 
+    if (aIsPositioned) {
+      inlineFrame->MarkAsAbsoluteContainingBlock();
+    }
+
     if (aChildItems.NotEmpty()) {
       nsFrameList::FrameLinkEnumerator firstBlock(aChildItems);
       FindFirstBlock(firstBlock);
diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index dcb2e28b3816..81fea63abd7b 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -2543,8 +2543,7 @@ PrepareBackgroundLayer(nsPresContext* aPresContext,
 
   nsIAtom* frameType = aForFrame->GetType();
   nsIFrame* geometryFrame = aForFrame;
-  if (frameType == nsGkAtoms::inlineFrame ||
-      frameType == nsGkAtoms::positionedInlineFrame) {
+  if (frameType == nsGkAtoms::inlineFrame) {
     // XXXjwalden Strictly speaking this is not quite faithful to how
     // background-break is supposed to interact with background-origin values,
     // but it's a non-trivial amount of work to make it fully conformant, and
diff --git a/layout/base/nsFrameManager.cpp b/layout/base/nsFrameManager.cpp
index b7e93faa330a..5bdb590699a0 100644
--- a/layout/base/nsFrameManager.cpp
+++ b/layout/base/nsFrameManager.cpp
@@ -93,6 +93,7 @@
 #include "imgIRequest.h"
 #include "nsTransitionManager.h"
 #include "RestyleTracker.h"
+#include "nsAbsoluteContainingBlock.h"
 
 #include "nsFrameManager.h"
 
@@ -472,6 +473,19 @@ nsFrameManager::ClearAllUndisplayedContentIn(nsIContent* aParentContent)
 }
 
 //----------------------------------------------------------------------
+nsresult
+nsFrameManager::AppendFrames(nsIFrame*       aParentFrame,
+                             nsIAtom*        aListName,
+                             nsFrameList&    aFrameList)
+{
+  if (aParentFrame->IsAbsoluteContainer() &&
+      aListName == aParentFrame->GetAbsoluteListName()) {
+    return aParentFrame->GetAbsoluteContainingBlock()->
+           AppendFrames(aParentFrame, aListName, aFrameList);
+  } else {
+    return aParentFrame->AppendFrames(aListName, aFrameList);
+  }
+}
 
 nsresult
 nsFrameManager::InsertFrames(nsIFrame*       aParentFrame,
@@ -484,7 +498,13 @@ nsFrameManager::InsertFrames(nsIFrame*       aParentFrame,
                   && !IS_TRUE_OVERFLOW_CONTAINER(aPrevFrame),
                   "aPrevFrame must be the last continuation in its chain!");
 
-  return aParentFrame->InsertFrames(aListName, aPrevFrame, aFrameList);
+  if (aParentFrame->IsAbsoluteContainer() &&
+      aListName == aParentFrame->GetAbsoluteListName()) {
+    return aParentFrame->GetAbsoluteContainingBlock()->
+           InsertFrames(aParentFrame, aListName, aPrevFrame, aFrameList);
+  } else {
+    return aParentFrame->InsertFrames(aListName, aPrevFrame, aFrameList);
+  }
 }
 
 nsresult
@@ -509,7 +529,15 @@ nsFrameManager::RemoveFrame(nsIAtom*        aListName,
   NS_ASSERTION(!(aOldFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW &&
                  GetPlaceholderFrameFor(aOldFrame)),
                "Must call RemoveFrame on placeholder for out-of-flows.");
-  nsresult rv = aOldFrame->GetParent()->RemoveFrame(aListName, aOldFrame);
+  nsresult rv = NS_OK;
+  nsIFrame* parentFrame = aOldFrame->GetParent();
+  if (parentFrame->IsAbsoluteContainer() &&
+      aListName == parentFrame->GetAbsoluteListName()) {
+    parentFrame->GetAbsoluteContainingBlock()->
+      RemoveFrame(parentFrame, aListName, aOldFrame);
+  } else {
+    rv = parentFrame->RemoveFrame(aListName, aOldFrame);
+  }
 
   mIsDestroyingFrames = wasDestroyingFrames;
 
diff --git a/layout/base/nsFrameManager.h b/layout/base/nsFrameManager.h
index 86f1c04766cb..987bcff67809 100644
--- a/layout/base/nsFrameManager.h
+++ b/layout/base/nsFrameManager.h
@@ -122,10 +122,7 @@ public:
   // Functions for manipulating the frame model
   NS_HIDDEN_(nsresult) AppendFrames(nsIFrame*       aParentFrame,
                                     nsIAtom*        aListName,
-                                    nsFrameList&    aFrameList)
-  {
-    return aParentFrame->AppendFrames(aListName, aFrameList);
-  }
+                                    nsFrameList&    aFrameList);
 
   NS_HIDDEN_(nsresult) InsertFrames(nsIFrame*       aParentFrame,
                                     nsIAtom*        aListName,
diff --git a/layout/doc/frame_reflow_debug.html b/layout/doc/frame_reflow_debug.html
index 163b1711d015..171b658ebbbe 100644
--- a/layout/doc/frame_reflow_debug.html
+++ b/layout/doc/frame_reflow_debug.html
@@ -173,7 +173,6 @@ The entries in the reflow log can be controlled on a frame level.  For instance
  <tr><td>obj</td><td>object</td></tr>
  <tr><td>page</td><td>page</td></tr>
  <tr><td>place</td><td>placeholder</td></tr>
- <tr><td>posInline</td><td>positionedInline</td></tr>
  <tr><td>canvas</td><td>canvas</td></tr>
  <tr><td>root</td><td>root</td></tr>
  <tr><td>scroll</td><td>scroll</td></tr>
diff --git a/layout/generic/nsAbsoluteContainingBlock.cpp b/layout/generic/nsAbsoluteContainingBlock.cpp
index 0f34819088bc..b74f2639d4d5 100644
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@@ -427,7 +427,7 @@ nsAbsoluteContainingBlock::ReflowAbsoluteFrame(nsIFrame*                aDelegat
   PRBool constrainHeight = (aReflowState.availableHeight != NS_UNCONSTRAINEDSIZE)
     && aConstrainHeight
        // Don't split if told not to (e.g. for fixed frames)
-    && (aDelegatingFrame->GetType() != nsGkAtoms::positionedInlineFrame)
+    && (aDelegatingFrame->GetType() != nsGkAtoms::inlineFrame)
        //XXX we don't handle splitting frames for inline absolute containing blocks yet
     && (aKidFrame->GetRect().y <= aReflowState.availableHeight);
        // Don't split things below the fold. (Ideally we shouldn't *have*
diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 75d51cd017e5..17d5793ae5e5 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -305,7 +305,7 @@ nsBlockFrame::~nsBlockFrame()
 void
 nsBlockFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
-  mAbsoluteContainer.DestroyFrames(this, aDestructRoot);
+  DestroyAbsoluteFrames(aDestructRoot);
   // Outside bullets are not in our child-list so check for them here
   // and delete them when present.
   if (mBullet && HaveOutsideBullet()) {
@@ -582,10 +582,7 @@ nsBlockFrame::GetCaretBaseline() const
 nsFrameList
 nsBlockFrame::GetChildList(nsIAtom* aListName) const
 {
-  if (nsGkAtoms::absoluteList == aListName) {
-    return mAbsoluteContainer.GetChildList();
-  }
-  else if (nsnull == aListName) {
+  if (nsnull == aListName) {
     return mFrames;
   }
   else if (aListName == nsGkAtoms::overflowList) {
@@ -617,8 +614,7 @@ nsBlockFrame::GetChildList(nsIAtom* aListName) const
 #define NS_BLOCK_FRAME_OVERFLOW_OOF_LIST_INDEX  (NS_CONTAINER_LIST_COUNT_INCL_OC + 0)
 #define NS_BLOCK_FRAME_FLOAT_LIST_INDEX         (NS_CONTAINER_LIST_COUNT_INCL_OC + 1)
 #define NS_BLOCK_FRAME_BULLET_LIST_INDEX        (NS_CONTAINER_LIST_COUNT_INCL_OC + 2)
-#define NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX      (NS_CONTAINER_LIST_COUNT_INCL_OC + 3)
-#define NS_BLOCK_FRAME_PUSHED_FLOATS_LIST_INDEX (NS_CONTAINER_LIST_COUNT_INCL_OC + 4)
+#define NS_BLOCK_FRAME_PUSHED_FLOATS_LIST_INDEX (NS_CONTAINER_LIST_COUNT_INCL_OC + 3)
 // If adding/removing lists, don't forget to update the count in nsBlockFrame.h
 
 nsIAtom*
@@ -634,8 +630,6 @@ nsBlockFrame::GetAdditionalChildListName(PRInt32 aIndex) const
     return nsGkAtoms::bulletList;
   case NS_BLOCK_FRAME_OVERFLOW_OOF_LIST_INDEX:
     return nsGkAtoms::overflowOutOfFlowList;
-  case NS_BLOCK_FRAME_ABSOLUTE_LIST_INDEX:
-    return nsGkAtoms::absoluteList;
   case NS_BLOCK_FRAME_PUSHED_FLOATS_LIST_INDEX:
     return nsGkAtoms::pushedFloatsList;
   default:
@@ -1173,7 +1167,8 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
   // resetting the size. Because of this, we must not reflow our abs-pos children
   // in that situation --- what we think is our "new size"
   // will not be our real new size. This also happens to be more efficient.
-  if (mAbsoluteContainer.HasAbsoluteFrames()) {
+  if (HasAbsolutelyPositionedChildren()) {
+    nsAbsoluteContainingBlock* absoluteContainer = GetAbsoluteContainingBlock();
     PRBool haveInterrupt = aPresContext->HasPendingInterrupt();
     if (reflowState->WillReflowAgainForClearance() ||
         haveInterrupt) {
@@ -1184,9 +1179,9 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
       // better than that, because we don't really know what our size will be,
       // and it might in fact not change on the followup reflow!
       if (haveInterrupt && (GetStateBits() & NS_FRAME_IS_DIRTY)) {
-        mAbsoluteContainer.MarkAllFramesDirty();
+        absoluteContainer->MarkAllFramesDirty();
       } else {
-        mAbsoluteContainer.MarkSizeDependentFramesDirty();
+        absoluteContainer->MarkSizeDependentFramesDirty();
       }
     } else {
       nsSize containingBlockSize =
@@ -1210,12 +1205,12 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
         !(isRoot && NS_UNCONSTRAINEDSIZE == reflowState->ComputedHeight()) &&
         aMetrics.height != oldSize.height;
 
-      rv = mAbsoluteContainer.Reflow(this, aPresContext, *reflowState,
-                                     state.mReflowStatus,
-                                     containingBlockSize.width,
-                                     containingBlockSize.height, PR_TRUE,
-                                     cbWidthChanged, cbHeightChanged,
-                                     &aMetrics.mOverflowAreas);
+      absoluteContainer->Reflow(this, aPresContext, *reflowState,
+                                state.mReflowStatus,
+                                containingBlockSize.width,
+                                containingBlockSize.height, PR_TRUE,
+                                cbWidthChanged, cbHeightChanged,
+                                &aMetrics.mOverflowAreas);
 
       //XXXfr Why isn't this rv (and others in this file) checked/returned?
     }
@@ -4710,10 +4705,7 @@ nsBlockFrame::AppendFrames(nsIAtom*  aListName,
     return NS_OK;
   }
   if (aListName) {
-    if (nsGkAtoms::absoluteList == aListName) {
-      return mAbsoluteContainer.AppendFrames(this, aListName, aFrameList);
-    }
-    else if (nsGkAtoms::floatList == aListName) {
+    if (nsGkAtoms::floatList == aListName) {
       mFloats.AppendFrames(nsnull, aFrameList);
       return NS_OK;
     }
@@ -4758,11 +4750,7 @@ nsBlockFrame::InsertFrames(nsIAtom*  aListName,
                "inserting after sibling frame with different parent");
 
   if (aListName) {
-    if (nsGkAtoms::absoluteList == aListName) {
-      return mAbsoluteContainer.InsertFrames(this, aListName, aPrevFrame,
-                                             aFrameList);
-    }
-    else if (nsGkAtoms::floatList == aListName) {
+    if (nsGkAtoms::floatList == aListName) {
       mFloats.InsertFrames(this, aPrevFrame, aFrameList);
       return NS_OK;
     }
@@ -5023,10 +5011,6 @@ nsBlockFrame::RemoveFrame(nsIAtom*  aListName,
       MarkSameFloatManagerLinesDirty(this);
     }
   }
-  else if (nsGkAtoms::absoluteList == aListName) {
-    mAbsoluteContainer.RemoveFrame(this, aListName, aOldFrame);
-    return NS_OK;
-  }
   else if (nsGkAtoms::floatList == aListName) {
     // Make sure to mark affected lines dirty for the float frame
     // we are removing; this way is a bit messy, but so is the rest of the code.
@@ -5069,9 +5053,9 @@ nsBlockFrame::DoRemoveOutOfFlowFrame(nsIFrame* aFrame)
   const nsStyleDisplay* display = aFrame->GetStyleDisplay();
   if (display->IsAbsolutelyPositioned()) {
     // This also deletes the next-in-flows
-    block->mAbsoluteContainer.RemoveFrame(block,
-                                          nsGkAtoms::absoluteList,
-                                          aFrame);
+    block->GetAbsoluteContainingBlock()->RemoveFrame(block,
+                                                     nsGkAtoms::absoluteList,
+                                                     aFrame);
   }
   else {
     // First remove aFrame's next-in-flows
@@ -6256,8 +6240,6 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
   }
 
   aBuilder->MarkFramesForDisplayList(this, mFloats, aDirtyRect);
-  aBuilder->MarkFramesForDisplayList(this, mAbsoluteContainer.GetChildList(),
-                                     aDirtyRect);
 
   // Don't use the line cursor if we might have a descendant placeholder ...
   // it might skip lines that contain placeholders but don't themselves
@@ -6512,10 +6494,7 @@ nsBlockFrame::SetInitialChildList(nsIAtom*        aListName,
 {
   nsresult rv = NS_OK;
 
-  if (nsGkAtoms::absoluteList == aListName) {
-    mAbsoluteContainer.SetInitialChildList(this, aListName, aChildList);
-  }
-  else if (nsGkAtoms::floatList == aListName) {
+  if (nsGkAtoms::floatList == aListName) {
     mFloats.SetFrames(aChildList);
   }
   else {
diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h
index 7eefb632dbbf..20d8184b4009 100644
--- a/layout/generic/nsBlockFrame.h
+++ b/layout/generic/nsBlockFrame.h
@@ -84,7 +84,7 @@ class nsIntervalSet;
  * Child list name indices
  * @see #GetAdditionalChildListName()
  */
-#define NS_BLOCK_LIST_COUNT  (NS_CONTAINER_LIST_COUNT_INCL_OC + 5)
+#define NS_BLOCK_LIST_COUNT  (NS_CONTAINER_LIST_COUNT_INCL_OC + 4)
 
 /**
  * Some invariants:
@@ -341,7 +341,6 @@ protected:
     : nsHTMLContainerFrame(aContext)
     , mMinWidth(NS_INTRINSIC_WIDTH_UNKNOWN)
     , mPrefWidth(NS_INTRINSIC_WIDTH_UNKNOWN)
-    , mAbsoluteContainer(nsGkAtoms::absoluteList)
   {
 #ifdef DEBUG
   InitDebugFlags();
@@ -776,10 +775,6 @@ protected:
   friend class nsBlockReflowState;
   friend class nsBlockInFlowLineIterator;
 
-private:
-  nsAbsoluteContainingBlock mAbsoluteContainer;
-
-
 #ifdef DEBUG
 public:
   static PRBool gLamePaintMetrics;
diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp
index caeca99bf370..1dee3841c732 100644
--- a/layout/generic/nsCanvasFrame.cpp
+++ b/layout/generic/nsCanvasFrame.cpp
@@ -52,7 +52,6 @@
 #include "nsIPresShell.h"
 #include "nsIScrollPositionListener.h"
 #include "nsDisplayList.h"
-#include "nsAbsoluteContainingBlock.h"
 #include "nsCSSFrameConstructor.h"
 #include "nsFrameManager.h"
 
@@ -65,8 +64,6 @@
 //#define DEBUG_CANVAS_FOCUS
 #endif
 
-#define CANVAS_ABS_POS_CHILD_LIST NS_CONTAINER_LIST_COUNT_INCL_OC
-
 
 nsIFrame*
 NS_NewCanvasFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
@@ -83,8 +80,7 @@ NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 void
 nsCanvasFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
-  mAbsoluteContainer.DestroyFrames(this, aDestructRoot);
-
+  DestroyAbsoluteFrames(aDestructRoot);
   nsIScrollableFrame* sf =
     PresContext()->GetPresShell()->GetRootScrollFrameAsScrollable();
   if (sf) {
@@ -126,9 +122,6 @@ NS_IMETHODIMP
 nsCanvasFrame::SetInitialChildList(nsIAtom*        aListName,
                                    nsFrameList&    aChildList)
 {
-  if (nsGkAtoms::absoluteList == aListName)
-    return mAbsoluteContainer.SetInitialChildList(this, aListName, aChildList);
-
   NS_ASSERTION(aListName || aChildList.IsEmpty() || aChildList.OnlyChild(),
                "Primary child list can have at most one frame in it");
   return nsHTMLContainerFrame::SetInitialChildList(aListName, aChildList);
@@ -138,9 +131,6 @@ NS_IMETHODIMP
 nsCanvasFrame::AppendFrames(nsIAtom*        aListName,
                             nsFrameList&    aFrameList)
 {
-  if (nsGkAtoms::absoluteList == aListName)
-    return mAbsoluteContainer.AppendFrames(this, aListName, aFrameList);
-
   NS_ASSERTION(!aListName, "unexpected child list name");
   NS_PRECONDITION(mFrames.IsEmpty(), "already have a child frame");
   if (aListName) {
@@ -173,9 +163,6 @@ nsCanvasFrame::InsertFrames(nsIAtom*        aListName,
                             nsIFrame*       aPrevFrame,
                             nsFrameList&    aFrameList)
 {
-  if (nsGkAtoms::absoluteList == aListName)
-    return mAbsoluteContainer.InsertFrames(this, aListName, aPrevFrame, aFrameList);
-
   // Because we only support a single child frame inserting is the same
   // as appending
   NS_PRECONDITION(!aPrevFrame, "unexpected previous sibling frame");
@@ -189,11 +176,6 @@ NS_IMETHODIMP
 nsCanvasFrame::RemoveFrame(nsIAtom*        aListName,
                            nsIFrame*       aOldFrame)
 {
-  if (nsGkAtoms::absoluteList == aListName) {
-    mAbsoluteContainer.RemoveFrame(this, aListName, aOldFrame);
-    return NS_OK;
-  }
-
   NS_ASSERTION(!aListName, "unexpected child list name");
   if (aListName) {
     // We only support the unnamed principal child list
@@ -218,24 +200,6 @@ nsCanvasFrame::RemoveFrame(nsIAtom*        aListName,
   return NS_OK;
 }
 
-nsIAtom*
-nsCanvasFrame::GetAdditionalChildListName(PRInt32 aIndex) const
-{
-  if (CANVAS_ABS_POS_CHILD_LIST == aIndex)
-    return nsGkAtoms::absoluteList;
-
-  return nsHTMLContainerFrame::GetAdditionalChildListName(aIndex);
-}
-
-nsFrameList
-nsCanvasFrame::GetChildList(nsIAtom* aListName) const
-{
-  if (nsGkAtoms::absoluteList == aListName)
-    return mAbsoluteContainer.GetChildList();
-
-  return nsHTMLContainerFrame::GetChildList(aListName);
-}
-
 nsRect nsCanvasFrame::CanvasArea() const
 {
   // Not clear which overflow rect we want here, but it probably doesn't
@@ -314,9 +278,6 @@ nsCanvasFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
     DisplayOverflowContainers(aBuilder, aDirtyRect, aLists);
   }
 
-  aBuilder->MarkFramesForDisplayList(this, mAbsoluteContainer.GetChildList(),
-                                     aDirtyRect);
-  
   // Force a background to be shown. We may have a background propagated to us,
   // in which case GetStyleBackground wouldn't have the right background
   // and the code in nsFrame::DisplayBorderBackgroundOutline might not give us
@@ -553,15 +514,6 @@ nsCanvasFrame::Reflow(nsPresContext*           aPresContext,
     aDesiredSize.mOverflowAreas.UnionWith(
       kidDesiredSize.mOverflowAreas + kidPt);
 
-    if (mAbsoluteContainer.HasAbsoluteFrames()) {
-      PRBool widthChanged = aDesiredSize.width != mRect.width;
-      PRBool heightChanged = aDesiredSize.height != mRect.height;
-      mAbsoluteContainer.Reflow(this, aPresContext, aReflowState, aStatus,
-                                aDesiredSize.width, aDesiredSize.height,
-                                PR_TRUE, widthChanged, heightChanged,
-                                &aDesiredSize.mOverflowAreas);
-    }
-
     // Handle invalidating fixed-attachment backgrounds propagated to the
     // canvas when the canvas size (and therefore the background positioning
     // area's size) changes.  Such backgrounds are not invalidated in the
@@ -602,7 +554,7 @@ nsCanvasFrame::Reflow(nsPresContext*           aPresContext,
                                     aStatus);
   }
 
-  FinishAndStoreOverflow(&aDesiredSize);
+  FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, aStatus);
 
   NS_FRAME_TRACE_REFLOW_OUT("nsCanvasFrame::Reflow", aStatus);
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
diff --git a/layout/generic/nsCanvasFrame.h b/layout/generic/nsCanvasFrame.h
index 6affa1a1ad8c..113dc728313d 100644
--- a/layout/generic/nsCanvasFrame.h
+++ b/layout/generic/nsCanvasFrame.h
@@ -42,7 +42,6 @@
 
 #include "nsHTMLContainerFrame.h"
 #include "nsIScrollPositionListener.h"
-#include "nsAbsoluteContainingBlock.h"
 #include "nsDisplayList.h"
 #include "nsGkAtoms.h"
 
@@ -64,8 +63,7 @@ public:
   nsCanvasFrame(nsStyleContext* aContext)
   : nsHTMLContainerFrame(aContext),
     mDoPaintFocus(PR_FALSE),
-    mAddedScrollPositionListener(PR_FALSE),
-    mAbsoluteContainer(nsGkAtoms::absoluteList) {}
+    mAddedScrollPositionListener(PR_FALSE) {}
 
   NS_DECL_QUERYFRAME_TARGET(nsCanvasFrame)
   NS_DECL_QUERYFRAME
@@ -84,9 +82,6 @@ public:
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
-  virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
-  virtual nsFrameList GetChildList(nsIAtom* aListName) const;
-
   virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
   virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
   NS_IMETHOD Reflow(nsPresContext*          aPresContext,
@@ -152,7 +147,6 @@ protected:
   // Data members
   PRPackedBool              mDoPaintFocus;
   PRPackedBool              mAddedScrollPositionListener;
-  nsAbsoluteContainingBlock mAbsoluteContainer;
 };
 
 /**
diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
index cbed44bacec3..8e45b5a77181 100644
--- a/layout/generic/nsContainerFrame.cpp
+++ b/layout/generic/nsContainerFrame.cpp
@@ -319,12 +319,12 @@ nsContainerFrame::GetChildList(nsIAtom* aListName) const
     return list ? *list : nsFrameList::EmptyList();
   }
 
-  return nsFrameList::EmptyList();
+  return nsSplittableFrame::GetChildList(aListName);
 }
 
-#define NS_CONTAINER_FRAME_OVERFLOW_LIST_INDEX                   0
-#define NS_CONTAINER_FRAME_OVERFLOW_CONTAINERS_LIST_INDEX        1
-#define NS_CONTAINER_FRAME_EXCESS_OVERFLOW_CONTAINERS_LIST_INDEX 2
+#define NS_CONTAINER_FRAME_OVERFLOW_LIST_INDEX                   1
+#define NS_CONTAINER_FRAME_OVERFLOW_CONTAINERS_LIST_INDEX        2
+#define NS_CONTAINER_FRAME_EXCESS_OVERFLOW_CONTAINERS_LIST_INDEX 3
 // If adding/removing lists, don't forget to update count in .h file
 
 
@@ -339,7 +339,7 @@ nsContainerFrame::GetAdditionalChildListName(PRInt32 aIndex) const
     else if (NS_CONTAINER_FRAME_EXCESS_OVERFLOW_CONTAINERS_LIST_INDEX == aIndex)
       return nsGkAtoms::excessOverflowContainersList;
   }
-  return nsnull;
+  return nsSplittableFrame::GetAdditionalChildListName(aIndex);
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
index f1e19c9fa186..91f5f265430a 100644
--- a/layout/generic/nsContainerFrame.h
+++ b/layout/generic/nsContainerFrame.h
@@ -50,9 +50,7 @@
  * Child list name indices
  * @see #GetAdditionalChildListName()
  */
-#define NS_CONTAINER_LIST_COUNT_SANS_OC 1
-  // for frames that don't use overflow containers
-#define NS_CONTAINER_LIST_COUNT_INCL_OC 3
+#define NS_CONTAINER_LIST_COUNT_INCL_OC 4
   // for frames that support overflow containers
 
 // Option flags for ReflowChild() and FinishReflowChild()
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index e2111d530e56..8b6d3349df54 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -959,13 +959,23 @@ nsIAtom*
 nsFrame::GetAdditionalChildListName(PRInt32 aIndex) const
 {
   NS_PRECONDITION(aIndex >= 0, "invalid index number");
+  // An index of 0 should always be an absolute list, we should ignore anything
+  // else if child frame types have ignored them.
+  if (aIndex == 0) {
+    return GetAbsoluteListName();
+  }
   return nsnull;
 }
 
 nsFrameList
 nsFrame::GetChildList(nsIAtom* aListName) const
 {
-  return nsFrameList::EmptyList();
+  if (IsAbsoluteContainer() &&
+      aListName == GetAbsoluteListName()) {
+    return GetAbsoluteContainingBlock()->GetChildList();
+  } else {
+    return nsFrameList::EmptyList();
+  }
 }
 
 static nsIFrame*
@@ -1487,6 +1497,9 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
   }
 #endif
 
+  // Mark the display list items for absolutely positioned children
+  MarkAbsoluteFramesForDisplayList(aBuilder, aDirtyRect);
+
   nsDisplayListCollection set;
   nsresult rv;
   {    
@@ -1621,7 +1634,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
 
   if (aChild->GetStateBits() & NS_FRAME_TOO_DEEP_IN_FRAME_TREE)
     return NS_OK;
-  
+
   const nsStyleDisplay* disp = aChild->GetStyleDisplay();
   // PR_TRUE if this is a real or pseudo stacking context
   PRBool pseudoStackingContext =
@@ -1667,9 +1680,15 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
       dirty.SetEmpty();
     }
     pseudoStackingContext = PR_TRUE;
-  } else if (aBuilder->GetSelectedFramesOnly() &&
-             aChild->IsLeaf() &&
-             !(aChild->GetStateBits() & NS_FRAME_SELECTED_CONTENT)) {
+  }
+
+  // Mark the display list items for absolutely positioned children
+  aChild->MarkAbsoluteFramesForDisplayList(aBuilder, dirty);
+
+  if (childType != nsGkAtoms::placeholderFrame &&
+      aBuilder->GetSelectedFramesOnly() &&
+      aChild->IsLeaf() &&
+      !(aChild->GetStateBits() & NS_FRAME_SELECTED_CONTENT)) {
     return NS_OK;
   }
 
@@ -1834,6 +1853,15 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder*   aBuilder,
   return NS_OK;
 }
 
+void
+nsIFrame::MarkAbsoluteFramesForDisplayList(nsDisplayListBuilder* aBuilder,
+                                           const nsRect& aDirtyRect)
+{
+  if (IsAbsoluteContainer()) {
+    aBuilder->MarkFramesForDisplayList(this, GetAbsoluteContainingBlock()->GetChildList(), aDirtyRect);
+  }
+}
+
 void
 nsIFrame::WrapReplacedContentForBorderRadius(nsDisplayListBuilder* aBuilder,
                                              nsDisplayList* aFromList,
@@ -3584,6 +3612,7 @@ nsFrame::DidReflow(nsPresContext*           aPresContext,
 {
   NS_FRAME_TRACE_MSG(NS_FRAME_TRACE_CALLS,
                      ("nsFrame::DidReflow: aStatus=%d", aStatus));
+
   if (NS_FRAME_REFLOW_FINISHED == aStatus) {
     mState &= ~(NS_FRAME_IN_REFLOW | NS_FRAME_FIRST_REFLOW | NS_FRAME_IS_DIRTY |
                 NS_FRAME_HAS_DIRTY_CHILDREN);
@@ -3604,6 +3633,55 @@ nsFrame::DidReflow(nsPresContext*           aPresContext,
   return NS_OK;
 }
 
+void
+nsFrame::FinishReflowWithAbsoluteFrames(nsPresContext*           aPresContext,
+                                        nsHTMLReflowMetrics&     aDesiredSize,
+                                        const nsHTMLReflowState& aReflowState,
+                                        nsReflowStatus&          aStatus)
+{
+  ReflowAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, aStatus);
+
+  FinishAndStoreOverflow(&aDesiredSize);
+}
+
+void
+nsFrame::DestroyAbsoluteFrames(nsIFrame* aDestructRoot)
+{
+  if (IsAbsoluteContainer()) {
+    GetAbsoluteContainingBlock()->DestroyFrames(this, aDestructRoot);
+  }
+}
+
+void
+nsFrame::ReflowAbsoluteFrames(nsPresContext*           aPresContext,
+                              nsHTMLReflowMetrics&     aDesiredSize,
+                              const nsHTMLReflowState& aReflowState,
+                              nsReflowStatus&          aStatus)
+{
+  if (HasAbsolutelyPositionedChildren()) {
+    nsAbsoluteContainingBlock* absoluteContainer = GetAbsoluteContainingBlock();
+
+    // Let the absolutely positioned container reflow any absolutely positioned
+    // child frames that need to be reflowed
+
+    // The containing block for the abs pos kids is formed by our padding edge.
+    nsMargin computedBorder =
+      aReflowState.mComputedBorderPadding - aReflowState.mComputedPadding;
+    nscoord containingBlockWidth =
+      aDesiredSize.width - computedBorder.LeftRight();
+    nscoord containingBlockHeight =
+      aDesiredSize.height - computedBorder.TopBottom();
+
+    nsContainerFrame* container = do_QueryFrame(this);
+    NS_ASSERTION(container, "Abs-pos children only supported on container frames for now");
+
+    absoluteContainer->Reflow(container, aPresContext, aReflowState, aStatus,
+                              containingBlockWidth, containingBlockHeight,
+                              PR_TRUE, PR_TRUE, PR_TRUE, // XXX could be optimized
+                              &aDesiredSize.mOverflowAreas);
+  }
+}
+
 /* virtual */ PRBool
 nsFrame::CanContinueTextRun() const
 {
@@ -6189,8 +6267,7 @@ inline PRBool
 IsInlineFrame(nsIFrame *aFrame)
 {
   nsIAtom *type = aFrame->GetType();
-  return type == nsGkAtoms::inlineFrame ||
-         type == nsGkAtoms::positionedInlineFrame;
+  return type == nsGkAtoms::inlineFrame;
 }
 
 void 
@@ -7905,7 +7982,6 @@ void DR_State::InitFrameTypeTable()
   AddFrameTypeInfo(nsGkAtoms::objectFrame,           "obj",       "object");
   AddFrameTypeInfo(nsGkAtoms::pageFrame,             "page",      "page");
   AddFrameTypeInfo(nsGkAtoms::placeholderFrame,      "place",     "placeholder");
-  AddFrameTypeInfo(nsGkAtoms::positionedInlineFrame, "posInline", "positionedInline");
   AddFrameTypeInfo(nsGkAtoms::canvasFrame,           "canvas",    "canvas");
   AddFrameTypeInfo(nsGkAtoms::rootFrame,             "root",      "root");
   AddFrameTypeInfo(nsGkAtoms::scrollFrame,           "scroll",    "scroll");
diff --git a/layout/generic/nsFrame.h b/layout/generic/nsFrame.h
index 4064abf8227c..a4724a198ac1 100644
--- a/layout/generic/nsFrame.h
+++ b/layout/generic/nsFrame.h
@@ -328,6 +328,15 @@ public:
   NS_IMETHOD  DidReflow(nsPresContext*           aPresContext,
                         const nsHTMLReflowState*  aReflowState,
                         nsDidReflowStatus         aStatus);
+  void ReflowAbsoluteFrames(nsPresContext*           aPresContext,
+                            nsHTMLReflowMetrics&     aDesiredSize,
+                            const nsHTMLReflowState& aReflowState,
+                            nsReflowStatus&          aStatus);
+  void FinishReflowWithAbsoluteFrames(nsPresContext*           aPresContext,
+                                      nsHTMLReflowMetrics&     aDesiredSize,
+                                      const nsHTMLReflowState& aReflowState,
+                                      nsReflowStatus&          aStatus);
+  void DestroyAbsoluteFrames(nsIFrame* aDestructRoot);
   virtual PRBool CanContinueTextRun() const;
 
   // Selection Methods
diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h
index 70d5ed763209..56f323a8c0a5 100644
--- a/layout/generic/nsHTMLParts.h
+++ b/layout/generic/nsHTMLParts.h
@@ -139,8 +139,6 @@ NS_NewImageFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 nsIFrame*
 NS_NewInlineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 nsIFrame*
-NS_NewPositionedInlineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
-nsIFrame*
 NS_NewObjectFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 nsIFrame*
 NS_NewTextFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
diff --git a/layout/generic/nsHTMLReflowState.cpp b/layout/generic/nsHTMLReflowState.cpp
index f9a064231bd9..6bc0f1b6df7d 100644
--- a/layout/generic/nsHTMLReflowState.cpp
+++ b/layout/generic/nsHTMLReflowState.cpp
@@ -1575,7 +1575,7 @@ nsHTMLReflowState::ComputeContainingBlockRectangle(nsPresContext*          aPres
     if (NS_FRAME_GET_TYPE(aContainingBlockRS->mFrameType) == NS_CSS_FRAME_TYPE_INLINE) {
       // Base our size on the actual size of the frame.  In cases when this is
       // completely bogus (eg initial reflow), this code shouldn't even be
-      // called, since the code in nsPositionedInlineFrame::Reflow will pass in
+      // called, since the code in nsInlineFrame::Reflow will pass in
       // the containing block dimensions to our constructor.
       // XXXbz we should be taking the in-flows into account too, but
       // that's very hard.
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index f5a6dda9d3b5..8162d40c739f 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -588,6 +588,8 @@ public:
    *            name means the unnamed principal child list
    * @param   aChildList list of child frames. Each of the frames has its
    *            NS_FRAME_IS_DIRTY bit set.  Must not be empty.
+   *            This method cannot handle the child list returned by
+   *            GetAbsoluteListName().
    * @return  NS_ERROR_INVALID_ARG if there is no child list with the specified
    *            name,
    *          NS_ERROR_UNEXPECTED if the frame is an atomic frame or if the
@@ -2724,6 +2726,8 @@ private:
   nsIFrame*        mNextSibling;  // doubly-linked list of frames
   nsIFrame*        mPrevSibling;  // Do not touch outside SetNextSibling!
 
+  void MarkAbsoluteFramesForDisplayList(nsDisplayListBuilder* aBuilder, const nsRect& aDirtyRect);
+
   static void DestroyPaintedPresShellList(void* propertyValue) {
     nsTArray<nsWeakPtr>* list = static_cast<nsTArray<nsWeakPtr>*>(propertyValue);
     list->Clear();
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 60c78a6ae222..5d7b01d0b49e 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -47,7 +47,6 @@
 #include "nsIPresShell.h"
 #include "nsPresContext.h"
 #include "nsRenderingContext.h"
-#include "nsAbsoluteContainingBlock.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsAutoPtr.h"
 #include "nsFrameManager.h"
@@ -414,7 +413,9 @@ nsInlineFrame::Reflow(nsPresContext*          aPresContext,
   }
 
   rv = ReflowFrames(aPresContext, aReflowState, irs, aMetrics, aStatus);
-  
+
+  ReflowAbsoluteFrames(aPresContext, aMetrics, aReflowState, aStatus);
+
   // Note: the line layout code will properly compute our
   // overflow-rect state for us.
 
@@ -922,6 +923,13 @@ nsInlineFrame::GetBaseline() const
   return NS_MIN(mRect.height, ascent + GetUsedBorderAndPadding().top);
 }
 
+void
+nsInlineFrame::DestroyFrom(nsIFrame* aDestructRoot)
+{
+  DestroyAbsoluteFrames(aDestructRoot);
+  nsInlineFrameSuper::DestroyFrom(aDestructRoot);
+}
+
 #ifdef ACCESSIBILITY
 already_AddRefed<nsAccessible>
 nsInlineFrame::CreateAccessible()
@@ -1101,6 +1109,8 @@ nsFirstLineFrame::Reflow(nsPresContext* aPresContext,
   rv = ReflowFrames(aPresContext, aReflowState, irs, aMetrics, aStatus);
   aReflowState.mLineLayout->SetInFirstLine(PR_FALSE);
 
+  ReflowAbsoluteFrames(aPresContext, aMetrics, aReflowState, aStatus);
+
   // Note: the line layout code will properly compute our overflow state for us
 
   return rv;
@@ -1121,162 +1131,3 @@ nsFirstLineFrame::PullOverflowsFromPrevInFlow()
   }
 }
 
-//////////////////////////////////////////////////////////////////////
-
-nsIFrame*
-NS_NewPositionedInlineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
-{
-  return new (aPresShell) nsPositionedInlineFrame(aContext);
-}
-
-NS_IMPL_FRAMEARENA_HELPERS(nsPositionedInlineFrame)
-
-void
-nsPositionedInlineFrame::DestroyFrom(nsIFrame* aDestructRoot)
-{
-  mAbsoluteContainer.DestroyFrames(this, aDestructRoot);
-  nsInlineFrame::DestroyFrom(aDestructRoot);
-}
-
-NS_IMETHODIMP
-nsPositionedInlineFrame::SetInitialChildList(nsIAtom*        aListName,
-                                             nsFrameList&    aChildList)
-{
-  nsresult  rv;
-
-  if (nsGkAtoms::absoluteList == aListName) {
-    rv = mAbsoluteContainer.SetInitialChildList(this, aListName, aChildList);
-  } else {
-    rv = nsInlineFrame::SetInitialChildList(aListName, aChildList);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPositionedInlineFrame::AppendFrames(nsIAtom*        aListName,
-                                      nsFrameList&    aFrameList)
-{
-  nsresult  rv;
-  
-  if (nsGkAtoms::absoluteList == aListName) {
-    rv = mAbsoluteContainer.AppendFrames(this, aListName, aFrameList);
-  } else {
-    rv = nsInlineFrame::AppendFrames(aListName, aFrameList);
-  }
-
-  return rv;
-}
-  
-NS_IMETHODIMP
-nsPositionedInlineFrame::InsertFrames(nsIAtom*        aListName,
-                                      nsIFrame*       aPrevFrame,
-                                      nsFrameList&    aFrameList)
-{
-  nsresult  rv;
-
-  if (nsGkAtoms::absoluteList == aListName) {
-    rv = mAbsoluteContainer.InsertFrames(this, aListName, aPrevFrame,
-                                         aFrameList);
-  } else {
-    rv = nsInlineFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
-  }
-
-  return rv;
-}
-  
-NS_IMETHODIMP
-nsPositionedInlineFrame::RemoveFrame(nsIAtom*        aListName,
-                                     nsIFrame*       aOldFrame)
-{
-  nsresult  rv;
-
-  if (nsGkAtoms::absoluteList == aListName) {
-    mAbsoluteContainer.RemoveFrame(this, aListName, aOldFrame);
-    rv = NS_OK;
-  } else {
-    rv = nsInlineFrame::RemoveFrame(aListName, aOldFrame);
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsPositionedInlineFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
-                                          const nsRect&           aDirtyRect,
-                                          const nsDisplayListSet& aLists)
-{
-  aBuilder->MarkFramesForDisplayList(this, mAbsoluteContainer.GetChildList(),
-				     aDirtyRect);
-  return nsHTMLContainerFrame::BuildDisplayList(aBuilder, aDirtyRect, aLists);
-}
-
-nsIAtom*
-nsPositionedInlineFrame::GetAdditionalChildListName(PRInt32 aIndex) const
-{
-  if (0 == aIndex) {
-    return nsGkAtoms::absoluteList;
-  }
-  return nsnull;
-}
-
-nsFrameList
-nsPositionedInlineFrame::GetChildList(nsIAtom* aListName) const
-{
-  if (nsGkAtoms::absoluteList == aListName)
-    return mAbsoluteContainer.GetChildList();
-
-  return nsInlineFrame::GetChildList(aListName);
-}
-
-nsIAtom*
-nsPositionedInlineFrame::GetType() const
-{
-  return nsGkAtoms::positionedInlineFrame;
-}
-
-NS_IMETHODIMP
-nsPositionedInlineFrame::Reflow(nsPresContext*          aPresContext,
-                                nsHTMLReflowMetrics&     aDesiredSize,
-                                const nsHTMLReflowState& aReflowState,
-                                nsReflowStatus&          aStatus)
-{
-  nsresult  rv = NS_OK;
-
-  // Don't bother optimizing for fast incremental reflow of absolute
-  // children of an inline
-
-  // Let the inline frame do its reflow first
-  rv = nsInlineFrame::Reflow(aPresContext, aDesiredSize, aReflowState, aStatus);
-
-  // Let the absolutely positioned container reflow any absolutely positioned
-  // child frames that need to be reflowed
-  // We want to do this under either of two conditions:
-  //  1. If we didn't do the incremental reflow above.
-  //  2. If our size changed.
-  // Even though it's the padding edge that's the containing block, we
-  // can use our rect (the border edge) since if the border style
-  // changed, the reflow would have been targeted at us so we'd satisfy
-  // condition 1.
-  if (NS_SUCCEEDED(rv) &&
-      mAbsoluteContainer.HasAbsoluteFrames()) {
-    // The containing block for the abs pos kids is formed by our padding edge.
-    nsMargin computedBorder =
-      aReflowState.mComputedBorderPadding - aReflowState.mComputedPadding;
-    nscoord containingBlockWidth =
-      aDesiredSize.width - computedBorder.LeftRight();
-    nscoord containingBlockHeight =
-      aDesiredSize.height - computedBorder.TopBottom();
-
-    // Factor the absolutely positioned child bounds into the overflow area
-    // Don't include this frame's bounds, nor its inline descendants' bounds,
-    // and don't store the overflow property.
-    // That will all be done by nsLineLayout::RelativePositionFrames.
-    rv = mAbsoluteContainer.Reflow(this, aPresContext, aReflowState, aStatus,
-                                   containingBlockWidth, containingBlockHeight,
-                                   PR_TRUE, PR_TRUE, PR_TRUE, // XXX could be optimized
-                                   &aDesiredSize.mOverflowAreas);
-  }
-
-  return rv;
-}
diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h
index 1a07b833dcdf..0208ed7fc816 100644
--- a/layout/generic/nsInlineFrame.h
+++ b/layout/generic/nsInlineFrame.h
@@ -41,7 +41,6 @@
 #define nsInlineFrame_h___
 
 #include "nsHTMLContainerFrame.h"
-#include "nsAbsoluteContainingBlock.h"
 #include "nsLineLayout.h"
 
 class nsAnonymousBlockFrame;
@@ -97,6 +96,8 @@ public:
   virtual PRBool IsEmpty();
   virtual PRBool IsSelfEmpty();
 
+  virtual void DestroyFrom(nsIFrame* aDestructRoot);
+
   virtual PRBool PeekOffsetCharacter(PRBool aForward, PRInt32* aOffset,
                                      PRBool aRespectClusters = PR_TRUE);
   
@@ -227,53 +228,4 @@ protected:
                                  PRBool* aIsComplete);
 };
 
-//----------------------------------------------------------------------
-
-// Derived class created for relatively positioned inline-level elements
-// that acts as a containing block for child absolutely positioned
-// elements
-
-class nsPositionedInlineFrame : public nsInlineFrame
-{
-public:
-  NS_DECL_FRAMEARENA_HELPERS
-
-  nsPositionedInlineFrame(nsStyleContext* aContext)
-    : nsInlineFrame(aContext)
-    , mAbsoluteContainer(nsGkAtoms::absoluteList)
-  {}
-
-  virtual ~nsPositionedInlineFrame() { } // useful for debugging
-
-  virtual void DestroyFrom(nsIFrame* aDestructRoot);
-
-  NS_IMETHOD SetInitialChildList(nsIAtom*        aListName,
-                                 nsFrameList&    aChildList);
-  NS_IMETHOD AppendFrames(nsIAtom*        aListName,
-                          nsFrameList&    aFrameList);
-  NS_IMETHOD InsertFrames(nsIAtom*        aListName,
-                          nsIFrame*       aPrevFrame,
-                          nsFrameList&    aFrameList);
-  NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
-                         nsIFrame*       aOldFrame);
-
-  NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
-                              const nsRect&           aDirtyRect,
-                              const nsDisplayListSet& aLists);
-
-  virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
-
-  virtual nsFrameList GetChildList(nsIAtom* aListName) const;
-
-  NS_IMETHOD Reflow(nsPresContext*          aPresContext,
-                    nsHTMLReflowMetrics&     aDesiredSize,
-                    const nsHTMLReflowState& aReflowState,
-                    nsReflowStatus&          aStatus);
-  
-  virtual nsIAtom* GetType() const;
-
-protected:
-  nsAbsoluteContainingBlock mAbsoluteContainer;
-};
-
 #endif /* nsInlineFrame_h___ */
diff --git a/layout/generic/nsLineLayout.cpp b/layout/generic/nsLineLayout.cpp
index 7fbb88587c7e..ae67cb2f9a08 100644
--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -662,8 +662,7 @@ IsPercentageAware(const nsIFrame* aFrame)
   }
 
   // Some of these things don't apply to non-replaced inline frames
-  // (that is, fType == nsGkAtoms::inlineFrame || fType ==
-  // nsGkAtoms::positionedInlineFrame), but we won't bother making
+  // (that is, fType == nsGkAtoms::inlineFrame), but we won't bother making
   // things unnecessarily complicated, since they'll probably be set
   // quite rarely.
 
diff --git a/layout/generic/nsPageContentFrame.cpp b/layout/generic/nsPageContentFrame.cpp
index 2e85b4d2c715..3f30219da104 100644
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -137,13 +137,10 @@ nsPageContentFrame::Reflow(nsPresContext*           aPresContext,
     NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_FULLY_COMPLETE(aStatus) ||
                   !frame->GetNextInFlow(), "bad child flow list");
   }
-  // Reflow our fixed frames 
+
+  // Reflow our fixed frames
   nsReflowStatus fixedStatus = NS_FRAME_COMPLETE;
-  mFixedContainer.Reflow(this, aPresContext, aReflowState, fixedStatus,
-                         aReflowState.availableWidth,
-                         aReflowState.availableHeight,
-                         PR_FALSE, PR_TRUE, PR_TRUE, // XXX could be optimized
-                         nsnull /* ignore overflow */);
+  ReflowAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, fixedStatus);
   NS_ASSERTION(NS_FRAME_IS_COMPLETE(fixedStatus), "fixed frames can be truncated, but not incomplete");
 
   // Return our desired size
diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h
index 9cc8960d66da..e474daa9a132 100644
--- a/layout/generic/nsQueryFrame.h
+++ b/layout/generic/nsQueryFrame.h
@@ -185,7 +185,6 @@ public:
     nsPageFrame_id,
     nsPlaceholderFrame_id,
     nsPopupSetFrame_id,
-    nsPositionedInlineFrame_id,
     nsProgressMeterFrame_id,
     nsResizerFrame_id,
     nsRootBoxFrame_id,
diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp
index b7de4eb48155..8bb19008f6f0 100644
--- a/layout/generic/nsViewportFrame.cpp
+++ b/layout/generic/nsViewportFrame.cpp
@@ -47,6 +47,7 @@
 #include "nsIScrollableFrame.h"
 #include "nsDisplayList.h"
 #include "FrameLayerBuilder.h"
+#include "nsAbsoluteContainingBlock.h"
 
 using namespace mozilla;
 
@@ -69,7 +70,7 @@ ViewportFrame::Init(nsIContent*      aContent,
 void
 ViewportFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
-  mFixedContainer.DestroyFrames(this, aDestructRoot);
+  DestroyAbsoluteFrames(aDestructRoot);
   nsContainerFrame::DestroyFrom(aDestructRoot);
 }
 
@@ -77,20 +78,11 @@ NS_IMETHODIMP
 ViewportFrame::SetInitialChildList(nsIAtom*        aListName,
                                    nsFrameList&    aChildList)
 {
-  nsresult rv = NS_OK;
-
   // See which child list to add the frames to
 #ifdef NS_DEBUG
   nsFrame::VerifyDirtyBitSet(aChildList);
 #endif
-  if (nsGkAtoms::fixedList == aListName) {
-    rv = mFixedContainer.SetInitialChildList(this, aListName, aChildList);
-  } 
-  else {
-    rv = nsContainerFrame::SetInitialChildList(aListName, aChildList);
-  }
-
-  return rv;
+  return nsContainerFrame::SetInitialChildList(aListName, aChildList);
 }
 
 NS_IMETHODIMP
@@ -98,13 +90,6 @@ ViewportFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                                 const nsRect&           aDirtyRect,
                                 const nsDisplayListSet& aLists)
 {
-  // We don't need any special painting or event handling. We just need to
-  // mark our visible out-of-flow frames (i.e., the fixed position frames) so
-  // that display list construction is guaranteed to recurse into their
-  // ancestors.
-  aBuilder->MarkFramesForDisplayList(this, mFixedContainer.GetChildList(),
-                                     aDirtyRect);
-
   nsIFrame* kid = mFrames.FirstChild();
   if (!kid)
     return NS_OK;
@@ -119,18 +104,9 @@ NS_IMETHODIMP
 ViewportFrame::AppendFrames(nsIAtom*        aListName,
                             nsFrameList&    aFrameList)
 {
-  nsresult rv = NS_OK;
-
-  if (nsGkAtoms::fixedList == aListName) {
-    rv = mFixedContainer.AppendFrames(this, aListName, aFrameList);
-  }
-  else {
-    NS_ASSERTION(!aListName, "unexpected child list");
-    NS_ASSERTION(GetChildList(nsnull).IsEmpty(), "Shouldn't have any kids!");
-    rv = nsContainerFrame::AppendFrames(aListName, aFrameList);
-  }
-
-  return rv;
+  NS_ASSERTION(!aListName, "unexpected child list");
+  NS_ASSERTION(GetChildList(nsnull).IsEmpty(), "Shouldn't have any kids!");
+  return nsContainerFrame::AppendFrames(aListName, aFrameList);
 }
 
 NS_IMETHODIMP
@@ -138,57 +114,17 @@ ViewportFrame::InsertFrames(nsIAtom*        aListName,
                             nsIFrame*       aPrevFrame,
                             nsFrameList&    aFrameList)
 {
-  nsresult rv = NS_OK;
-
-  if (nsGkAtoms::fixedList == aListName) {
-    rv = mFixedContainer.InsertFrames(this, aListName, aPrevFrame, aFrameList);
-  }
-  else {
-    NS_ASSERTION(!aListName, "unexpected child list");
-    NS_ASSERTION(GetChildList(nsnull).IsEmpty(), "Shouldn't have any kids!");
-    rv = nsContainerFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
-  }
-
-  return rv;
+  NS_ASSERTION(!aListName, "unexpected child list");
+  NS_ASSERTION(GetChildList(nsnull).IsEmpty(), "Shouldn't have any kids!");
+  return nsContainerFrame::InsertFrames(aListName, aPrevFrame, aFrameList);
 }
 
 NS_IMETHODIMP
 ViewportFrame::RemoveFrame(nsIAtom*        aListName,
                            nsIFrame*       aOldFrame)
 {
-  nsresult rv = NS_OK;
-
-  if (nsGkAtoms::fixedList == aListName) {
-    mFixedContainer.RemoveFrame(this, aListName, aOldFrame);
-    rv = NS_OK;
-  }
-  else {
-    NS_ASSERTION(!aListName, "unexpected child list");
-    rv = nsContainerFrame::RemoveFrame(aListName, aOldFrame);
-  }
-
-  return rv;
-}
-
-nsIAtom*
-ViewportFrame::GetAdditionalChildListName(PRInt32 aIndex) const
-{
-  NS_PRECONDITION(aIndex >= 0, "illegal index");
-
-  if (0 == aIndex) {
-    return nsGkAtoms::fixedList;
-  }
-
-  return nsnull;
-}
-
-nsFrameList
-ViewportFrame::GetChildList(nsIAtom* aListName) const
-{
-  if (nsGkAtoms::fixedList == aListName)
-    return mFixedContainer.GetChildList();
-
-  return nsContainerFrame::GetChildList(aListName);
+  NS_ASSERTION(!aListName, "unexpected child list");
+  return nsContainerFrame::RemoveFrame(aListName, aOldFrame);
 }
 
 /* virtual */ nscoord
@@ -200,8 +136,6 @@ ViewportFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
     result = 0;
   else
     result = mFrames.FirstChild()->GetMinWidth(aRenderingContext);
-    
-  // XXXldb Deal with mFixedContainer (matters for SizeToContent)!
 
   return result;
 }
@@ -215,8 +149,6 @@ ViewportFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
     result = 0;
   else
     result = mFrames.FirstChild()->GetPrefWidth(aRenderingContext);
-    
-  // XXXldb Deal with mFixedContainer (matters for SizeToContent)!
 
   return result;
 }
@@ -314,20 +246,24 @@ ViewportFrame::Reflow(nsPresContext*           aPresContext,
   // to reflect the available space for the fixed items
   nsHTMLReflowState reflowState(aReflowState);
   nsPoint offset = AdjustReflowStateForScrollbars(&reflowState);
-  
+
 #ifdef DEBUG
-  NS_ASSERTION(mFixedContainer.GetChildList().IsEmpty() ||
-               (offset.x == 0 && offset.y == 0),
-               "We don't handle correct positioning of fixed frames with "
-               "scrollbars in odd positions");
+  if (IsAbsoluteContainer()) {
+    NS_ASSERTION(GetAbsoluteContainingBlock()->GetChildList().IsEmpty() ||
+                 (offset.x == 0 && offset.y == 0),
+                 "We don't handle correct positioning of fixed frames with "
+                 "scrollbars in odd positions");
+  }
 #endif
 
-  // Just reflow all the fixed-pos frames.
-  rv = mFixedContainer.Reflow(this, aPresContext, reflowState, aStatus,
-                              reflowState.ComputedWidth(),
-                              reflowState.ComputedHeight(),
-                              PR_FALSE, PR_TRUE, PR_TRUE, // XXX could be optimized
-                              nsnull /* ignore overflow */);
+  if (IsAbsoluteContainer()) {
+    // Just reflow all the fixed-pos frames.
+    rv = GetAbsoluteContainingBlock()->Reflow(this, aPresContext, reflowState, aStatus,
+                                              reflowState.ComputedWidth(),
+                                              reflowState.ComputedHeight(),
+                                              PR_FALSE, PR_TRUE, PR_TRUE, // XXX could be optimized
+                                              nsnull /* ignore overflow */);
+  }
 
   // If we were dirty then do a repaint
   if (GetStateBits() & NS_FRAME_IS_DIRTY) {
diff --git a/layout/generic/nsViewportFrame.h b/layout/generic/nsViewportFrame.h
index 5a4566634c5a..eed9892269d1 100644
--- a/layout/generic/nsViewportFrame.h
+++ b/layout/generic/nsViewportFrame.h
@@ -45,15 +45,13 @@
 
 #include "nsContainerFrame.h"
 #include "nsGkAtoms.h"
-#include "nsAbsoluteContainingBlock.h"
 
 class nsPresContext;
 
 /**
   * ViewportFrame is the parent of a single child - the doc root frame or a scroll frame 
   * containing the doc root frame. ViewportFrame stores this child in its primary child 
-  * list. It stores fixed positioned items in a secondary child list and its mFixedContainer 
-  * delegate handles them. 
+  * list.
   */
 class ViewportFrame : public nsContainerFrame {
 public:
@@ -63,7 +61,6 @@ public:
 
   ViewportFrame(nsStyleContext* aContext)
     : nsContainerFrame(aContext)
-    , mFixedContainer(nsGkAtoms::fixedList)
   {}
   virtual ~ViewportFrame() { } // useful for debugging
 
@@ -86,10 +83,6 @@ public:
   NS_IMETHOD RemoveFrame(nsIAtom*        aListName,
                          nsIFrame*       aOldFrame);
 
-  virtual nsIAtom* GetAdditionalChildListName(PRInt32 aIndex) const;
-
-  virtual nsFrameList GetChildList(nsIAtom* aListName) const;
-
   NS_IMETHOD BuildDisplayList(nsDisplayListBuilder*   aBuilder,
                               const nsRect&           aDirtyRect,
                               const nsDisplayListSet& aLists);
@@ -123,11 +116,6 @@ private:
 
 protected:
   nsPoint AdjustReflowStateForScrollbars(nsHTMLReflowState* aReflowState) const;
-
-protected:
-  // position: fixed content is really content which is absolutely positioned with
-  // respect to the viewport.
-  nsAbsoluteContainingBlock mFixedContainer;
 };
 
 
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index c3e4d96032dc..2b01126541d9 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1086,7 +1086,7 @@ nsTableFrame::GetAdditionalChildListName(PRInt32 aIndex) const
   if (aIndex == NS_TABLE_FRAME_OVERFLOW_LIST_INDEX) {
     return nsGkAtoms::overflowList;
   }
-  return nsnull;
+  return nsHTMLContainerFrame::GetAdditionalChildListName(aIndex);
 }
 
 nsRect
diff --git a/layout/tables/nsTableOuterFrame.cpp b/layout/tables/nsTableOuterFrame.cpp
index 316cbf0f3e4a..3ce836260053 100644
--- a/layout/tables/nsTableOuterFrame.cpp
+++ b/layout/tables/nsTableOuterFrame.cpp
@@ -227,7 +227,7 @@ nsTableOuterFrame::GetChildList(nsIAtom* aListName) const
   if (!aListName) {
     return mFrames;
   }
-  return nsFrameList::EmptyList();
+  return nsHTMLContainerFrame::GetChildList(aListName);
 }
 
 nsIAtom*
@@ -236,7 +236,7 @@ nsTableOuterFrame::GetAdditionalChildListName(PRInt32 aIndex) const
   if (aIndex == NS_TABLE_FRAME_CAPTION_LIST_INDEX) {
     return nsGkAtoms::captionList;
   }
-  return nsnull;
+  return nsHTMLContainerFrame::GetAdditionalChildListName(aIndex);
 }
 
 NS_IMETHODIMP 
diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp
index 9eeae9d7bc8d..8727a305ef4e 100644
--- a/layout/xul/base/src/nsMenuFrame.cpp
+++ b/layout/xul/base/src/nsMenuFrame.cpp
@@ -400,7 +400,7 @@ nsMenuFrame::GetAdditionalChildListName(PRInt32 aIndex) const
   if (NS_MENU_POPUP_LIST_INDEX == aIndex) {
     return nsGkAtoms::popupList;
   }
-  return nsnull;
+  return nsBoxFrame::GetAdditionalChildListName(aIndex);
 }
 
 void

From 40016e520e225d93ab4baa0d13429ddb69b97ff1 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Fri, 6 May 2011 11:45:17 +0100
Subject: [PATCH 045/314] Bug 655025 - Fix zippity graph. r=dholbert

---
 layout/svg/base/src/nsISVGGlyphFragmentLeaf.h |  1 +
 layout/svg/base/src/nsSVGGlyphFrame.cpp       | 10 ++++++++--
 layout/svg/base/src/nsSVGGlyphFrame.h         |  3 +++
 layout/svg/crashtests/655025-1.svg            |  6 ++++++
 layout/svg/crashtests/655025-2.svg            |  6 ++++++
 layout/svg/crashtests/655025-3.svg            |  9 +++++++++
 layout/svg/crashtests/crashtests.list         |  3 +++
 7 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 layout/svg/crashtests/655025-1.svg
 create mode 100644 layout/svg/crashtests/655025-2.svg
 create mode 100644 layout/svg/crashtests/655025-3.svg

diff --git a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
index cfdbd2a7aa72..a1024841d567 100644
--- a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
+++ b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
@@ -87,6 +87,7 @@ public:
                                        nsTArray<float> &aRotate)=0;
   NS_IMETHOD_(PRUint16) GetTextAnchor()=0;
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned()=0;
+  NS_IMETHOD_(PRBool) IsEmpty() const=0;
   NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace)=0;
   NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace)=0;
   NS_IMETHOD_(PRBool) EndsWithWhitespace() const=0;
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index e816d46ed2fd..efa87789d517 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -692,7 +692,7 @@ nsSVGGlyphFrame::GetCharacterPositions(nsTArray<CharacterPosition>* aCharacterPo
                                        float aMetricsScale)
 {
   PRUint32 strLength = mTextRun->GetLength();
-  NS_ASSERTION(strLength > 0, "no text");
+  NS_ABORT_IF_FALSE(strLength > 0, "no text");
 
   const gfxFloat radPerDeg = M_PI / 180.0;
 
@@ -1419,7 +1419,11 @@ nsSVGGlyphFrame::GetCharNumAtPosition(nsIDOMSVGPoint *point)
 NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
 nsSVGGlyphFrame::GetFirstGlyphFragment()
 {
-  return this;
+  nsISVGGlyphFragmentLeaf *leaf = this;
+  while (leaf && leaf->IsEmpty()) {
+    leaf = leaf->GetNextGlyphFragment();
+  }
+  return leaf;
 }
 
 NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
@@ -1444,6 +1448,8 @@ NS_IMETHODIMP_(PRBool)
 nsSVGGlyphFrame::EndsWithWhitespace() const
 {
   const nsTextFragment* text = mContent->GetText();
+  NS_ABORT_IF_FALSE(text->GetLength() > 0, "text expected");
+
   return NS_IsAsciiWhitespace(text->CharAt(text->GetLength() - 1));
 }
 
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index 075cf9ff5766..7b3fee53c76e 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -162,6 +162,9 @@ public:
                                        nsTArray<float> &aRotate);
   NS_IMETHOD_(PRUint16) GetTextAnchor();
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();
+  NS_IMETHOD_(PRBool) IsEmpty() const {
+    return mContent->GetText()->GetLength() == 0;
+  }
   NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace) {
     mTrimLeadingWhitespace = aTrimLeadingWhitespace;
   }
diff --git a/layout/svg/crashtests/655025-1.svg b/layout/svg/crashtests/655025-1.svg
new file mode 100644
index 000000000000..4501bb57fa36
--- /dev/null
+++ b/layout/svg/crashtests/655025-1.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <text id="a">a</text>
+  <script>
+    document.getElementById("a").firstChild.nodeValue = "";
+  </script>
+</svg>
diff --git a/layout/svg/crashtests/655025-2.svg b/layout/svg/crashtests/655025-2.svg
new file mode 100644
index 000000000000..601006e83156
--- /dev/null
+++ b/layout/svg/crashtests/655025-2.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <text id="a">a</text>
+  <script>
+    document.getElementById("a").appendChild(document.createTextNode(""));
+  </script>
+</svg>
diff --git a/layout/svg/crashtests/655025-3.svg b/layout/svg/crashtests/655025-3.svg
new file mode 100644
index 000000000000..43e06b6fc396
--- /dev/null
+++ b/layout/svg/crashtests/655025-3.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <script>
+    var a = document.createElementNS("http://www.w3.org/2000/svg", "text");
+    a.appendChild(document.createTextNode(""));
+    document.documentElement.appendChild(a);
+    a.getNumberOfChars();
+    document.documentElement.removeChild(a);
+  </script>
+</svg>
diff --git a/layout/svg/crashtests/crashtests.list b/layout/svg/crashtests/crashtests.list
index 91b71096d098..5be88d486739 100644
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -106,3 +106,6 @@ load 614367-1.svg
 load 620034-1.html
 load 621598-1.svg
 load 648819-1.html
+load 655025-1.svg
+load 655025-2.svg
+load 655025-3.svg

From 98b1f87993da0ccb40b6ad87fe71f2659f0c8675 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Fri, 6 May 2011 11:33:21 -0700
Subject: [PATCH 046/314] Bug 655025 followup: Rename added IsEmpty method to
 avoid clashing with inherited nsIFrame method. r=longsonr

---
 layout/svg/base/src/nsISVGGlyphFragmentLeaf.h | 2 +-
 layout/svg/base/src/nsSVGGlyphFrame.cpp       | 2 +-
 layout/svg/base/src/nsSVGGlyphFrame.h         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
index a1024841d567..ab12df8c6724 100644
--- a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
+++ b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
@@ -87,7 +87,7 @@ public:
                                        nsTArray<float> &aRotate)=0;
   NS_IMETHOD_(PRUint16) GetTextAnchor()=0;
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned()=0;
-  NS_IMETHOD_(PRBool) IsEmpty() const=0;
+  NS_IMETHOD_(PRBool) IsTextEmpty() const=0;
   NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace)=0;
   NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace)=0;
   NS_IMETHOD_(PRBool) EndsWithWhitespace() const=0;
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index efa87789d517..05e3cea06aea 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -1420,7 +1420,7 @@ NS_IMETHODIMP_(nsISVGGlyphFragmentLeaf *)
 nsSVGGlyphFrame::GetFirstGlyphFragment()
 {
   nsISVGGlyphFragmentLeaf *leaf = this;
-  while (leaf && leaf->IsEmpty()) {
+  while (leaf && leaf->IsTextEmpty()) {
     leaf = leaf->GetNextGlyphFragment();
   }
   return leaf;
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index 7b3fee53c76e..a54dd6ebbf9d 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -162,7 +162,7 @@ public:
                                        nsTArray<float> &aRotate);
   NS_IMETHOD_(PRUint16) GetTextAnchor();
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();
-  NS_IMETHOD_(PRBool) IsEmpty() const {
+  NS_IMETHOD_(PRBool) IsTextEmpty() const {
     return mContent->GetText()->GetLength() == 0;
   }
   NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace) {

From e7486342c4b8726e7e81c5ecbcff55e0ad7556de Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 6 May 2011 11:40:46 -0700
Subject: [PATCH 047/314] Bug 654472 - Remove WinCE code (incl
 MOZ_FLASH_ACTIVEX_PATCH & USE_HTIFACE) from embedding/* ; r=bsmedberg

---
 config/system-headers                         |   1 -
 embedding/browser/Makefile.in                 |   2 +-
 .../activex/src/common/ControlSite.cpp        |   8 --
 embedding/browser/activex/src/common/StdAfx.h |  24 ----
 .../activex/src/plugin/LegacyPlugin.cpp       |  19 ---
 .../browser/activex/src/plugin/Makefile.in    |  29 ----
 .../activex/src/plugin/MozActiveX-flash.rc    | 130 ------------------
 embedding/browser/activex/src/plugin/StdAfx.h |  24 ----
 .../activex/src/plugin/XPCDocument.cpp        |  31 -----
 .../browser/activex/src/plugin/XPConnect.cpp  |  20 ---
 embedding/components/Makefile.in              |   2 -
 embedding/components/build/Makefile.in        |   4 -
 .../components/build/nsEmbeddingModule.cpp    |  10 --
 js/src/config/system-headers                  |   1 -
 14 files changed, 1 insertion(+), 304 deletions(-)
 delete mode 100644 embedding/browser/activex/src/plugin/MozActiveX-flash.rc

diff --git a/config/system-headers b/config/system-headers
index 6b5a307e5fa4..12a88bf75aa2 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -310,7 +310,6 @@ gtk/gtkprintjob.h
 gtk/gtkprintunixdialog.h
 HIToolbox/HIToolbox.h
 hlink.h
-htiface.h
 ia64/sys/inline.h
 Icons.h
 iconv.h
diff --git a/embedding/browser/Makefile.in b/embedding/browser/Makefile.in
index 5a9fdfe0bf2b..72130b61e64e 100644
--- a/embedding/browser/Makefile.in
+++ b/embedding/browser/Makefile.in
@@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = webBrowser build
 
-ifneq (,$(filter $(OS_ARCH),WINNT WINCE))
+ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_NO_ACTIVEX_SUPPORT
 TOOL_DIRS += activex/src
 endif
diff --git a/embedding/browser/activex/src/common/ControlSite.cpp b/embedding/browser/activex/src/common/ControlSite.cpp
index 8eb5c83636c9..6bb8c4946e9f 100644
--- a/embedding/browser/activex/src/common/ControlSite.cpp
+++ b/embedding/browser/activex/src/common/ControlSite.cpp
@@ -60,7 +60,6 @@ public:
 BOOL
 CDefaultControlSiteSecurityPolicy::ClassImplementsCategory(const CLSID &clsid, const CATID &catid, BOOL &bClassExists)
 {
-#ifndef WINCE
     bClassExists = FALSE;
 
     // Test if there is a CLSID entry. If there isn't then obviously
@@ -117,7 +116,6 @@ CDefaultControlSiteSecurityPolicy::ClassImplementsCategory(const CLSID &clsid, c
             return TRUE;
         }
     }
-#endif
 
     return FALSE;
 }
@@ -1276,9 +1274,7 @@ HRESULT STDMETHODCALLTYPE CControlSite::TransformCoords(/* [out][in] */ POINTL _
     }
 
     HDC hdc = ::GetDC(m_hWndParent);
-#ifndef WINCE
     ::SetMapMode(hdc, MM_HIMETRIC);
-#endif
     POINT rgptConvert[2];
     rgptConvert[0].x = 0;
     rgptConvert[0].y = 0;
@@ -1287,9 +1283,7 @@ HRESULT STDMETHODCALLTYPE CControlSite::TransformCoords(/* [out][in] */ POINTL _
     {
         rgptConvert[1].x = pPtlHimetric->x;
         rgptConvert[1].y = pPtlHimetric->y;
-#ifndef WINCE
         ::LPtoDP(hdc, rgptConvert, 2);
-#endif
         if (dwFlags & XFORMCOORDS_SIZE)
         {
             pPtfContainer->x = (float)(rgptConvert[1].x - rgptConvert[0].x);
@@ -1309,9 +1303,7 @@ HRESULT STDMETHODCALLTYPE CControlSite::TransformCoords(/* [out][in] */ POINTL _
     {
         rgptConvert[1].x = (int)(pPtfContainer->x);
         rgptConvert[1].y = (int)(pPtfContainer->y);
-#ifndef WINCE
         ::DPtoLP(hdc, rgptConvert, 2);
-#endif
         if (dwFlags & XFORMCOORDS_SIZE)
         {
             pPtlHimetric->x = rgptConvert[1].x - rgptConvert[0].x;
diff --git a/embedding/browser/activex/src/common/StdAfx.h b/embedding/browser/activex/src/common/StdAfx.h
index 675bdff3803a..faaeb4566732 100644
--- a/embedding/browser/activex/src/common/StdAfx.h
+++ b/embedding/browser/activex/src/common/StdAfx.h
@@ -89,30 +89,6 @@
 #pragma conform(forScope, push, atlhack, off)
 #endif
 
-#ifdef WINCE
-/* atlbase.h on WINCE has a bug, in that it tries to use
- * GetProcAddress with a wide string, when that is explicitly not
- * supported.  So we use C++ to overload that here, and implement
- * something that works.
- */
-#include <windows.h>
-static FARPROC GetProcAddressA(HMODULE hMod, wchar_t *procName) {
-  FARPROC ret = NULL;
-  int len = wcslen(procName);
-  char *s = new char[len + 1];
-
-  for (int i = 0; i < len; i++) {
-    s[i] = (char) procName[i];
-  }
-  s[len-1] = 0;
-
-  ret = ::GetProcAddress(hMod, s);
-  delete [] s;
-
-  return ret;
-}
-#endif
-
 #include <atlbase.h>
 
 //You may derive a class from CComModule and use it if you want to override
diff --git a/embedding/browser/activex/src/plugin/LegacyPlugin.cpp b/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
index 9601c5fb9238..dc360a4bdcdc 100644
--- a/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
+++ b/embedding/browser/activex/src/plugin/LegacyPlugin.cpp
@@ -560,26 +560,7 @@ CreateControl(const CLSID &clsid, PluginInstanceData *pData, PropertyList &pl, L
     PRBool hostSafeControlsOnly;
     PRBool downloadControlsIfMissing;
 #if defined(MOZ_ACTIVEX_PLUGIN_XPCONNECT) && defined(XPC_IDISPATCH_SUPPORT)
-#ifdef MOZ_FLASH_ACTIVEX_PATCH
-    GUID flashGUID;
-    ::CLSIDFromString(_T("{D27CDB6E-AE6D-11CF-96B8-444553540000}"), &flashGUID);
-
-    // HACK: Allow anything but downloading for the wrapped Flash control.
-    PRUint32 hostingFlags;
-    if (clsid == flashGUID)
-    {
-      hostingFlags = (nsIActiveXSecurityPolicy::HOSTING_FLAGS_HOST_SAFE_OBJECTS |
-                      nsIActiveXSecurityPolicy::HOSTING_FLAGS_SCRIPT_SAFE_OBJECTS |
-                      nsIActiveXSecurityPolicy::HOSTING_FLAGS_SCRIPT_ALL_OBJECTS |
-                      nsIActiveXSecurityPolicy::HOSTING_FLAGS_HOST_ALL_OBJECTS);
-    }
-    else
-    {
-      hostingFlags = MozAxPlugin::PrefGetHostingFlags();
-    }
-#else
     PRUint32 hostingFlags = MozAxPlugin::PrefGetHostingFlags();
-#endif
     if (hostingFlags & nsIActiveXSecurityPolicy::HOSTING_FLAGS_HOST_SAFE_OBJECTS &&
         !(hostingFlags & nsIActiveXSecurityPolicy::HOSTING_FLAGS_HOST_ALL_OBJECTS))
     {
diff --git a/embedding/browser/activex/src/plugin/Makefile.in b/embedding/browser/activex/src/plugin/Makefile.in
index 804439894b8f..f429f491a008 100644
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -48,16 +48,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE          = npmozax
 LIBRARY_NAME    = npmozax
 
-ifdef WINCE
-MOZ_FLASH_ACTIVEX_PATCH = 1
-endif
-
-ifdef MOZ_FLASH_ACTIVEX_PATCH
-RESFILE         = MozActiveX-flash.res
-else
 RESFILE         = MozActiveX.res
-endif
-
 DEFFILE         = npmozax.def
 GRE_MODULE	= 1
 
@@ -132,21 +123,6 @@ ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
 LOCAL_INCLUDES += -I$(XPIDL_GEN_DIR)
 endif
 
-ifdef WINCE
-OS_LIBS += \
-	coredll.lib \
-	ole32.lib \
-	oleaut32.lib \
-	uuid.lib \
-	ceshell.lib \
-	corelibc.lib \
-	atls.lib \
-	atlce400.lib \
-	urlmon.lib \
-	libcmt.lib \
-	comsuppw.lib \
-	$(NULL)
-else
 OS_LIBS += \
     comdlg32.lib                   \
     ole32.lib                      \
@@ -154,7 +130,6 @@ OS_LIBS += \
     uuid.lib                       \
     shell32.lib                    \
     $(NULL)
-endif
 
 ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
 DEFINES += -DMOZ_ACTIVEX_PLUGIN_LIVECONNECT -DXPCOM_GLUE
@@ -168,10 +143,6 @@ ifdef XPC_IDISPATCH_SUPPORT
 DEFINES += -DXPC_IDISPATCH_SUPPORT
 endif
 
-ifdef MOZ_FLASH_ACTIVEX_PATCH
-DEFINES += -DMOZ_FLASH_ACTIVEX_PATCH
-endif
-
 EXTRA_DSO_LDOPTS = \
     $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
     $(MOZ_COMPONENT_LIBS) \
diff --git a/embedding/browser/activex/src/plugin/MozActiveX-flash.rc b/embedding/browser/activex/src/plugin/MozActiveX-flash.rc
deleted file mode 100644
index 325363582ad4..000000000000
--- a/embedding/browser/activex/src/plugin/MozActiveX-flash.rc
+++ /dev/null
@@ -1,130 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-#if OSARCH != WINCE
-#include "winresrc.h"
-#else
-#include <dlgs.h>
-#include <winbase.h>
-#include <commctrl.h>
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,4
- PRODUCTVERSION 1,0,0,4
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Shockwave Flash 9.0 r83\0"
-            VALUE "FileExtents", "*.ocx|*.ocx|*.swf|*.flv\0"
-            VALUE "FileOpenName", "ActiveX (*.ocx)|ActiveX (*.ocx)|Adobe Flash Movie (*.swf)|Adobe Flash Video (*.flv)\0"
-            VALUE "FileVersion", "9, 0, 83, 0\0"
-            VALUE "InternalName", "NPMOZAX\0"
-            VALUE "LegalCopyright", "Copyright 1999, 2009\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "MIMEType", "application/x-oleobject|application/oleobject|application/x-shockwave-flash|application/x-shockwave-flash\0"
-            VALUE "OriginalFilename", "NPMOZAX.DLL\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Shockwave Flash\0"
-            VALUE "ProductVersion", "9, 0, 83, 0\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/embedding/browser/activex/src/plugin/StdAfx.h b/embedding/browser/activex/src/plugin/StdAfx.h
index fa8b22b97245..b44681c0540e 100644
--- a/embedding/browser/activex/src/plugin/StdAfx.h
+++ b/embedding/browser/activex/src/plugin/StdAfx.h
@@ -65,30 +65,6 @@
 #pragma conform(forScope, push, atlhack, off)
 #endif
 
-#ifdef WINCE
-/* atlbase.h on WINCE has a bug, in that it tries to use
- * GetProcAddress with a wide string, when that is explicitly not
- * supported.  So we use C++ to overload that here, and implement
- * something that works.
- */
-#include <windows.h>
-static FARPROC GetProcAddressA(HMODULE hMod, wchar_t *procName) {
-  FARPROC ret = NULL;
-  int len = wcslen(procName);
-  char *s = new char[len + 1];
-
-  for (int i = 0; i < len; i++) {
-    s[i] = (char) procName[i];
-  }
-  s[len-1] = 0;
-
-  ret = ::GetProcAddress(hMod, s);
-  delete [] s;
-
-  return ret;
-}
-#endif
-
 #include <atlbase.h>
 //You may derive a class from CComModule and use it if you want to override
 //something, but do not change the name of _Module
diff --git a/embedding/browser/activex/src/plugin/XPCDocument.cpp b/embedding/browser/activex/src/plugin/XPCDocument.cpp
index a92022db4bb5..2302a1757f9f 100644
--- a/embedding/browser/activex/src/plugin/XPCDocument.cpp
+++ b/embedding/browser/activex/src/plugin/XPCDocument.cpp
@@ -57,13 +57,6 @@
 //
 // Neither Visual C++ 6.0 or 7.0 ship with this interface.
 //
-#ifdef WINCE
-#define USE_HTIFACE
-#endif
-
-#ifdef USE_HTIFACE
-#include <htiface.h>
-#endif
 #ifndef __ITargetFrame_INTERFACE_DEFINED__
 // No ITargetFrame so make a binary compatible one
 MIDL_INTERFACE("d5f78c80-5252-11cf-90fa-00AA0042106e")
@@ -943,27 +936,7 @@ public:
         mData(NULL),
         mUseTarget(NULL)
     {
-#ifdef MOZ_FLASH_ACTIVEX_PATCH
-        // HACK+TODO:
-        //
-        // AddRef()ing here causes leaking the MozAxPlugin's
-        // PrefObserver() because IEDocument() itself leaks.
-        // CControlSite::Attach() adds references to this object that
-        // aren't countered; most likely in the
-        // DoVerb(OLEIVERB_INPLACEACTIVATE) call. Maybe it results in a
-        // circular reference but the rest of the problem happens inside
-        // ATL and COM, so good luck with that.
-        //
-        // Sadly, I have no time to debug the original problem
-        // throughoutly but leaking pref observers visibly causes XUL to
-        // crash upon exit. XUL tries to release the stale pref observer
-        // after npmozax.dll has long since been unloaded. Note that a
-        // callback to IEDocument after unloading npmozax.dll would also
-        // crash but that doesn't seem to happen after tearing down the
-        // plugin instance itself. -Simo
-#else
         MozAxPlugin::AddRef();
-#endif
     }
 
     HRESULT Init(PluginInstanceData *pData)
@@ -1033,11 +1006,7 @@ public:
         {
             mWindow->Release();
         }
-#ifdef MOZ_FLASH_ACTIVEX_PATCH
-        // HACK+TODO: See IEDocument::IEDocument()
-#else
         MozAxPlugin::Release();
-#endif
     }
 
 BEGIN_COM_MAP(IEDocument)
diff --git a/embedding/browser/activex/src/plugin/XPConnect.cpp b/embedding/browser/activex/src/plugin/XPConnect.cpp
index 3acea988f1c0..9bf27c3312e2 100644
--- a/embedding/browser/activex/src/plugin/XPConnect.cpp
+++ b/embedding/browser/activex/src/plugin/XPConnect.cpp
@@ -124,11 +124,6 @@ nsScriptablePeer::QueryInterface(const nsIID & aIID, void **aInstancePtr)
     return (*aInstancePtr) ? NS_OK : NS_NOINTERFACE;
 }
 
-#ifdef WINCE
-typedef _com_ptr_t<_com_IIID<IUnknown, &__uuidof(IUnknown)> > IUnknownPtr;
-typedef _com_ptr_t<_com_IIID<IDispatch, &__uuidof(IDispatch)> > IDispatchPtr;
-#endif
-
 HRESULT
 nsScriptablePeer::GetIDispatch(IDispatch **pdisp)
 {
@@ -996,21 +991,6 @@ CLSID MozAxPlugin::GetCLSIDForType(const char *mimeType)
         return CLSID_NULL;
     }
 
-#ifdef MOZ_FLASH_ACTIVEX_PATCH
-    // If the Flash activex control doesn't advertise the supported
-    // mimetypes correctly, we map Shockwave Flash manually to the
-    // appropriate CLSID of the ActiveX control here.
-    if (!strcmp(mimeType, "application/x-shockwave-flash"))
-    {
-        GUID guidValue;
-
-        // The Flash CLSID
-        ::CLSIDFromString(_T("{D27CDB6E-AE6D-11CF-96B8-444553540000}"), &guidValue);
-
-        return guidValue;
-    }
-#endif
-
     // Read the registry to see if there is a CLSID for an object to be associated with
     // this MIME type.
     USES_CONVERSION;
diff --git a/embedding/components/Makefile.in b/embedding/components/Makefile.in
index ffee211616a3..22871b3d3a75 100644
--- a/embedding/components/Makefile.in
+++ b/embedding/components/Makefile.in
@@ -49,11 +49,9 @@ DIRS = windowwatcher appstartup find webbrowserpersist commandhandler
 
 ifdef MOZ_XUL
 ifdef NS_PRINTING
-ifndef WINCE
 DIRS += printingui
 endif
 endif
-endif
 
 DIRS += build
 
diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in
index 15529589890e..44e7d20cb423 100644
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -62,13 +62,11 @@ SHARED_LIBRARY_LIBS = \
 
 ifdef MOZ_XUL
 ifdef NS_PRINTING
-ifndef WINCE
 SHARED_LIBRARY_LIBS += \
 	../printingui/src/$(LIB_PREFIX)printingui_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 endif
-endif
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../windowwatcher/src  \
@@ -88,10 +86,8 @@ endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/win 
-ifneq ($(OS_ARCH), WINCE)
 OS_LIBS	+= $(call EXPAND_LIBNAME,winspool comdlg32)
 endif
-endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LOCAL_INCLUDES += -I$(srcdir)/../printingui/src/mac
diff --git a/embedding/components/build/nsEmbeddingModule.cpp b/embedding/components/build/nsEmbeddingModule.cpp
index 0fc9401c59e5..04d864a56363 100644
--- a/embedding/components/build/nsEmbeddingModule.cpp
+++ b/embedding/components/build/nsEmbeddingModule.cpp
@@ -51,10 +51,8 @@
 #include "nsEmbedCID.h"
 
 #ifdef NS_PRINTING
-#ifndef WINCE
 #include "nsPrintingPromptService.h"
 #endif
-#endif
 
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
@@ -71,20 +69,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseCommandController)
 #ifdef MOZ_XUL
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDialogParamBlock)
 #ifdef NS_PRINTING
-#ifndef WINCE
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintingPromptService, Init)
 #endif
 #endif
-#endif
 
 #ifdef MOZ_XUL
 NS_DEFINE_NAMED_CID(NS_DIALOGPARAMBLOCK_CID);
 #ifdef NS_PRINTING
-#ifndef WINCE
 NS_DEFINE_NAMED_CID(NS_PRINTINGPROMPTSERVICE_CID);
 #endif
 #endif
-#endif
 NS_DEFINE_NAMED_CID(NS_WINDOWWATCHER_CID);
 NS_DEFINE_NAMED_CID(NS_FIND_CID);
 NS_DEFINE_NAMED_CID(NS_WEB_BROWSER_FIND_CID);
@@ -100,10 +94,8 @@ static const mozilla::Module::CIDEntry kEmbeddingCIDs[] = {
 #ifdef MOZ_XUL
     { &kNS_DIALOGPARAMBLOCK_CID, false, NULL, nsDialogParamBlockConstructor },
 #ifdef NS_PRINTING
-#ifndef WINCE
     { &kNS_PRINTINGPROMPTSERVICE_CID, false, NULL, nsPrintingPromptServiceConstructor },
 #endif
-#endif
 #endif
     { &kNS_WINDOWWATCHER_CID, false, NULL, nsWindowWatcherConstructor },
     { &kNS_FIND_CID, false, NULL, nsFindConstructor },
@@ -122,10 +114,8 @@ static const mozilla::Module::ContractIDEntry kEmbeddingContracts[] = {
 #ifdef MOZ_XUL
     { NS_DIALOGPARAMBLOCK_CONTRACTID, &kNS_DIALOGPARAMBLOCK_CID },
 #ifdef NS_PRINTING
-#ifndef WINCE
     { NS_PRINTINGPROMPTSERVICE_CONTRACTID, &kNS_PRINTINGPROMPTSERVICE_CID },
 #endif
-#endif
 #endif
     { NS_WINDOWWATCHER_CONTRACTID, &kNS_WINDOWWATCHER_CID },
     { NS_FIND_CONTRACTID, &kNS_FIND_CID },
diff --git a/js/src/config/system-headers b/js/src/config/system-headers
index 6b5a307e5fa4..12a88bf75aa2 100644
--- a/js/src/config/system-headers
+++ b/js/src/config/system-headers
@@ -310,7 +310,6 @@ gtk/gtkprintjob.h
 gtk/gtkprintunixdialog.h
 HIToolbox/HIToolbox.h
 hlink.h
-htiface.h
 ia64/sys/inline.h
 Icons.h
 iconv.h

From cb7a1ae33e6200c36888d916cfc1b6c61d79913e Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 6 May 2011 11:41:19 -0700
Subject: [PATCH 048/314] Bug 654719 - Remove WinCE code from testing/* ;
 r=cjones

---
 testing/mochitest/ssltunnel/Makefile.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in
index 7e4ea9325ddb..60218c9d8f65 100644
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@@ -60,9 +60,4 @@ LIBS = \
 	$(NSS_LIBS) \
 	$(NULL)
 
-# WINCE needs libcmt. See Bug 487694.
-ifeq ($(OS_ARCH),WINCE)
-EXTRA_LIBS += libcmt.lib
-endif
-
 include $(topsrcdir)/config/rules.mk

From a37b1c3cf1b47c2a02ee2ced7b2a784c96d51c50 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Fri, 6 May 2011 11:41:29 -0700
Subject: [PATCH 049/314] Bug 655176 - Remove WinCE code from docshell (incl
 broken uriloader/exthandler/Makefile.in WINNT |ifeq|s); r=bz

---
 docshell/build/Makefile.in                 |  3 ---
 uriloader/exthandler/Makefile.in           | 12 ------------
 uriloader/exthandler/win/nsMIMEInfoWin.cpp | 22 +---------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in
index b656531e44c4..dcb685238fd2 100644
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -60,9 +60,6 @@ EXPORTS = \
 ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
 EXTRA_DSO_LIBS	= gkgfx
 endif
-ifeq ($(OS_ARCH),WINCE)
-EXTRA_DSO_LIBS	= gkgfx
-endif
 
 
 CPPSRCS		= \
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 95279823b211..49ce1bd22f86 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -180,12 +180,6 @@ ifdef MOZ_ENABLE_CONTENTACTION
 CPPSRCS += nsContentHandlerApp.cpp
 endif
 
-ifeq ($(OS_ARCH),WINNT WINCE)
-OS_LIBS		+= shell32.lib
-GARBAGE		+= nsOSHelperAppService.cpp $(srcdir)/nsOSHelperAppService.cpp \
-             nsMIMEInfoWin.cpp $(srcdir)/nsMIMEInfoWin.cpp
-endif
-
 EXTRA_COMPONENTS = \
   nsHandlerService.js \
   nsHandlerService.manifest \
@@ -203,9 +197,3 @@ include $(topsrcdir)/config/rules.mk
 ifneq (,$(filter qt gtk2, $(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 endif
-
-# the use of multiple VPATH dirs is broken in cygwin make
-ifeq ($(OS_ARCH),WINNT WINCE)
-export:: $(OSDIR)/nsOSHelperAppService.cpp $(OSDIR)/nsMIMEInfoWin.cpp
-	$(INSTALL) $^ .
-endif
diff --git a/uriloader/exthandler/win/nsMIMEInfoWin.cpp b/uriloader/exthandler/win/nsMIMEInfoWin.cpp
index 3c1d5024fc69..62d3103d8699 100644
--- a/uriloader/exthandler/win/nsMIMEInfoWin.cpp
+++ b/uriloader/exthandler/win/nsMIMEInfoWin.cpp
@@ -56,15 +56,6 @@
 #include "nsOSHelperAppService.h"
 #include "nsUnicharUtils.h"
 
-#ifdef WINCE 
-#ifdef UNICODE
-#define SHELLEXECUTEINFOW SHELLEXECUTEINFO
-#define ShellExecuteExW ShellExecuteEx
-#else
-#error "we don't support narrow char wince"
-#endif
-#endif
-
 #define RUNDLL32_EXE L"\\rundll32.exe"
 
 
@@ -256,14 +247,12 @@ nsMIMEInfoWin::GetProperty(const nsAString& aName, nsIVariant* *_retval)
   return NS_OK;
 }
 
-#ifndef WINCE
 typedef HRESULT (STDMETHODCALLTYPE *MySHParseDisplayName)
                  (PCWSTR pszName,
                   IBindCtx *pbc,
                   LPITEMIDLIST *ppidl,
                   SFGAOF sfgaoIn,
                   SFGAOF *psfgaoOut);
-#endif
 
 // this implementation was pretty much copied verbatime from 
 // Tony Robinson's code in nsExternalProtocolWin.cpp
@@ -298,17 +287,12 @@ nsMIMEInfoWin::LoadUriInternal(nsIURI * aURL)
     SHELLEXECUTEINFOW sinfo;
     memset(&sinfo, 0, sizeof(sinfo));
     sinfo.cbSize   = sizeof(sinfo);
-#ifdef WINCE
-    sinfo.fMask    = SEE_MASK_FLAG_NO_UI;
-#else
     sinfo.fMask    = SEE_MASK_FLAG_DDEWAIT |
       SEE_MASK_FLAG_NO_UI;
-#endif
     sinfo.hwnd     = NULL;
     sinfo.lpVerb   = (LPWSTR)&cmdVerb;
     sinfo.nShow    = SW_SHOWNORMAL;
     
-#ifndef WINCE
     LPITEMIDLIST pidl = NULL;
     SFGAOF sfgao;
     
@@ -327,9 +311,7 @@ nsMIMEInfoWin::LoadUriInternal(nsIURI * aURL)
         // Microsoft Security Bulletin MS07-061
         rv = NS_ERROR_FAILURE;
       }
-    } else 
-#endif
-    {
+    } else {
       sinfo.lpFile =  NS_ConvertUTF8toUTF16(urlSpec).get();
     }
     if (NS_SUCCEEDED(rv)) {
@@ -337,10 +319,8 @@ nsMIMEInfoWin::LoadUriInternal(nsIURI * aURL)
       if (!result || ((LONG_PTR)sinfo.hInstApp) < 32)
         rv = NS_ERROR_FAILURE;
     }
-#ifndef WINCE
     if (pidl)
       CoTaskMemFree(pidl);
-#endif
     if (hDll) 
       ::FreeLibrary(hDll);
   }

From c2a19cd2e6c50c1559ee83265408c4a883533e91 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Fri, 6 May 2011 14:44:23 -0400
Subject: [PATCH 050/314] Bug 648705 - memory corruption due to dangling
 pointers in WebGLProgram - r=joedrew

WebGLProgram has a data member,

nsTArray<WebGLShader*> mAttachedShaders;

and bug 648705 showed that the pointers in this array were sometimes dangling, leading to invalid writes at non-null addresses.

This patch makes these pointers be refptrs, so that they will keep alive the WebGLShaders they point to. So the mAttachedShaders member becomes

nsTArray<nsRefPtr<WebGLShader> > mAttachedShaders;
---
 content/canvas/src/WebGLContext.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h
index a918beefc302..09d64b8b47b0 100644
--- a/content/canvas/src/WebGLContext.h
+++ b/content/canvas/src/WebGLContext.h
@@ -1309,7 +1309,8 @@ public:
 
     void DetachShaders() {
         for (PRUint32 i = 0; i < mAttachedShaders.Length(); ++i) {
-            mAttachedShaders[i]->DecrementAttachCount();
+            if (mAttachedShaders[i])
+                mAttachedShaders[i]->DecrementAttachCount();
         }
         mAttachedShaders.Clear();
     }
@@ -1320,7 +1321,7 @@ public:
     PRBool HasDeletePending() { return mDeletePending; }
 
     WebGLuint GLName() { return mName; }
-    const nsTArray<WebGLShader*>& AttachedShaders() const { return mAttachedShaders; }
+    const nsTArray<nsRefPtr<WebGLShader> >& AttachedShaders() const { return mAttachedShaders; }
     PRBool LinkStatus() { return mLinkStatus; }
     PRUint32 Generation() const { return mGeneration.value(); }
     void SetLinkStatus(PRBool val) { mLinkStatus = val; }
@@ -1349,7 +1350,7 @@ public:
 
     PRBool HasAttachedShaderOfType(GLenum shaderType) {
         for (PRUint32 i = 0; i < mAttachedShaders.Length(); ++i) {
-            if (mAttachedShaders[i]->ShaderType() == shaderType) {
+            if (mAttachedShaders[i] && mAttachedShaders[i]->ShaderType() == shaderType) {
                 return PR_TRUE;
             }
         }
@@ -1392,7 +1393,7 @@ protected:
     PRPackedBool mDeletePending;
     PRPackedBool mLinkStatus;
     // attached shaders of the program object
-    nsTArray<WebGLShader*> mAttachedShaders;
+    nsTArray<nsRefPtr<WebGLShader> > mAttachedShaders;
     CheckedUint32 mGeneration;
 
     // post-link data

From 6264fb10fac9f5575a3d499d1ef532c6c8cbf743 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Fri, 6 May 2011 14:44:25 -0400
Subject: [PATCH 051/314] Bug 653419 - correctly mark WebGL context creation as
 successful - r=joedrew

WebGLContext::SetDimensions has early return paths in cases where the WebGL context does not need to get recreated. A bug made that be recorded as WebGL creation failures, giving "WebGL-" in crash reports. This patch fixes that.
---
 content/canvas/src/WebGLContext.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index 61680fd5dce4..7f048cdd304d 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -352,8 +352,6 @@ WebGLContext::SetContextOptions(nsIPropertyBag *aOptions)
 NS_IMETHODIMP
 WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
 {
-    ScopedGfxFeatureReporter reporter("WebGL");
-
     if (mCanvasElement) {
         HTMLCanvasElement()->InvalidateCanvas();
     }
@@ -373,6 +371,8 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
         return NS_OK;
     }
 
+    ScopedGfxFeatureReporter reporter("WebGL");
+
     // We're going to create an entirely new context.  If our
     // generation is not 0 right now (that is, if this isn't the first
     // context we're creating), we may have to dispatch a context lost

From 0c9baae3998e68b8ef239c180ab7ec57a50aa91e Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Fri, 6 May 2011 14:44:26 -0400
Subject: [PATCH 052/314] Bug 653419 - check for null gl ptr in SetDimensions
 NOP path - r=joedrew

WebGLContext::SetDimensions has an early success exit path when the dimensions are unchanged. However it wasn't checking that the gl pointer was non-null. Thus, after a failed WebGL context creation, such a SetDimensions call could incorrectly "succeed", only to crash when dereferencing the gl pointer.
---
 content/canvas/src/WebGLContext.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index 7f048cdd304d..00f14e01aac3 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -356,7 +356,7 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
         HTMLCanvasElement()->InvalidateCanvas();
     }
 
-    if (mWidth == width && mHeight == height)
+    if (gl && mWidth == width && mHeight == height)
         return NS_OK;
 
     // If we already have a gl context, then we just need to resize

From 4114d6051da77abe716093a0f2ebfa58a4cb2d2b Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Thu, 5 May 2011 16:03:01 +0100
Subject: [PATCH 053/314] Bug 253317 - Provide hyphenation dictionary for
 justified text (android packaging) [r=blassey]

---
 embedding/android/GeckoApp.java       | 10 ++++++++++
 mobile/installer/package-manifest.in  |  1 +
 mobile/locales/Makefile.in            |  2 ++
 toolkit/mozapps/installer/packager.mk |  1 +
 4 files changed, 14 insertions(+)

diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index d74c94df93d9..d22db8e23c6e 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -465,6 +465,16 @@ abstract public class GeckoApp
             unpackFile(zip, buf, entry, entry.getName());
           }
         }
+
+        // copy any hyphenation dictionaries file into a hyphenation/ directory
+        Enumeration<? extends ZipEntry> hyphenEntries = zip.entries();
+        while (hyphenEntries.hasMoreElements()) {
+          ZipEntry entry = hyphenEntries.nextElement();
+          if (entry.getName().startsWith("hyphenation/")) {
+            Log.i("GeckoAppJava", "installing hyphenation : " + entry.getName());
+            unpackFile(zip, buf, entry, entry.getName());
+          }
+        }
     }
 
     void removeFiles() throws IOException {
diff --git a/mobile/installer/package-manifest.in b/mobile/installer/package-manifest.in
index a03136640167..4a939f019f29 100644
--- a/mobile/installer/package-manifest.in
+++ b/mobile/installer/package-manifest.in
@@ -32,6 +32,7 @@
 @BINPATH@/updater.ini
 #endif
 @BINPATH@/dictionaries/*
+@BINPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
diff --git a/mobile/locales/Makefile.in b/mobile/locales/Makefile.in
index f1c1dc7fd9df..448a3595e507 100644
--- a/mobile/locales/Makefile.in
+++ b/mobile/locales/Makefile.in
@@ -103,6 +103,7 @@ clobber-zip:
 	  $(STAGEDIST)/chrome/$(AB_CD).manifest \
 	  $(STAGEDIST)/defaults/preferences/mobile-l10n.js
 	$(RM) -r $(STAGEDIST)/dictionaries \
+	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD)
 
@@ -110,6 +111,7 @@ libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -B bookmarks.json AB_CD=$*
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/preferences BOTH_MANIFESTS=1
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 3c9f0ff898dd..219a097ffe48 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -233,6 +233,7 @@ DIST_FILES = \
   components \
   defaults \
   modules \
+  hyphenation \
   res \
   lib \
   lib.id \

From 0a9646e2c6f4494c03338a555ddc4083a1a1181e Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 6 May 2011 15:08:02 -0400
Subject: [PATCH 054/314] Bug 653717 - Add aurora branding to fennec
 [r=blassey]

---
 mobile/branding/aurora/Makefile.in            |  49 ++++++++++++
 mobile/branding/aurora/android-resources.mn   |   3 +
 mobile/branding/aurora/configure.sh           |   3 +
 mobile/branding/aurora/content/Makefile.in    |  25 ++++++
 mobile/branding/aurora/content/about.png      | Bin 0 -> 16858 bytes
 mobile/branding/aurora/content/favicon32.png  | Bin 0 -> 1761 bytes
 .../branding/aurora/content/fennec_26x26.png  | Bin 0 -> 1677 bytes
 .../branding/aurora/content/fennec_40x40.png  | Bin 0 -> 2997 bytes
 .../branding/aurora/content/fennec_48x48.png  | Bin 0 -> 3258 bytes
 .../branding/aurora/content/fennec_72x72.png  | Bin 0 -> 7223 bytes
 .../aurora/content/fennec_maemo_icon26.txt    |  74 ++++++++++++++++++
 .../aurora/content/fennec_scalable.png        | Bin 0 -> 5937 bytes
 mobile/branding/aurora/content/jar.mn         |   6 ++
 mobile/branding/aurora/content/logo.png       | Bin 0 -> 19844 bytes
 .../branding/aurora/content/logoWordmark.png  | Bin 0 -> 15088 bytes
 mobile/branding/aurora/content/splash.png     | Bin 0 -> 19766 bytes
 mobile/branding/aurora/locales/Makefile.in    |  47 +++++++++++
 .../branding/aurora/locales/en-US/brand.dtd   |   4 +
 .../aurora/locales/en-US/brand.properties     |   2 +
 mobile/branding/aurora/locales/jar.mn         |   7 ++
 20 files changed, 220 insertions(+)
 create mode 100644 mobile/branding/aurora/Makefile.in
 create mode 100644 mobile/branding/aurora/android-resources.mn
 create mode 100644 mobile/branding/aurora/configure.sh
 create mode 100644 mobile/branding/aurora/content/Makefile.in
 create mode 100644 mobile/branding/aurora/content/about.png
 create mode 100644 mobile/branding/aurora/content/favicon32.png
 create mode 100644 mobile/branding/aurora/content/fennec_26x26.png
 create mode 100644 mobile/branding/aurora/content/fennec_40x40.png
 create mode 100644 mobile/branding/aurora/content/fennec_48x48.png
 create mode 100644 mobile/branding/aurora/content/fennec_72x72.png
 create mode 100644 mobile/branding/aurora/content/fennec_maemo_icon26.txt
 create mode 100644 mobile/branding/aurora/content/fennec_scalable.png
 create mode 100644 mobile/branding/aurora/content/jar.mn
 create mode 100644 mobile/branding/aurora/content/logo.png
 create mode 100644 mobile/branding/aurora/content/logoWordmark.png
 create mode 100644 mobile/branding/aurora/content/splash.png
 create mode 100644 mobile/branding/aurora/locales/Makefile.in
 create mode 100644 mobile/branding/aurora/locales/en-US/brand.dtd
 create mode 100644 mobile/branding/aurora/locales/en-US/brand.properties
 create mode 100644 mobile/branding/aurora/locales/jar.mn

diff --git a/mobile/branding/aurora/Makefile.in b/mobile/branding/aurora/Makefile.in
new file mode 100644
index 000000000000..bdf28e61f920
--- /dev/null
+++ b/mobile/branding/aurora/Makefile.in
@@ -0,0 +1,49 @@
+# ***** 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) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Justin Dolske <dolske@mozilla.com> (original author)
+#
+# 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 *****
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = \
+	content \
+	locales \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mobile/branding/aurora/android-resources.mn b/mobile/branding/aurora/android-resources.mn
new file mode 100644
index 000000000000..e97d67c9ace1
--- /dev/null
+++ b/mobile/branding/aurora/android-resources.mn
@@ -0,0 +1,3 @@
+mobile/app/android/drawable/alertaddons.png
+mobile/app/android/drawable/alertdownloads.png
+mobile/branding/nightly/content/splash.png
diff --git a/mobile/branding/aurora/configure.sh b/mobile/branding/aurora/configure.sh
new file mode 100644
index 000000000000..d39212ccf388
--- /dev/null
+++ b/mobile/branding/aurora/configure.sh
@@ -0,0 +1,3 @@
+MOZ_APP_DISPLAYNAME=Aurora
+ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
+MOZ_UPDATER=1
diff --git a/mobile/branding/aurora/content/Makefile.in b/mobile/branding/aurora/content/Makefile.in
new file mode 100644
index 000000000000..973bfd053d8d
--- /dev/null
+++ b/mobile/branding/aurora/content/Makefile.in
@@ -0,0 +1,25 @@
+# Branding Makefile
+#  - jars chrome artwork
+
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+LINUX_BRANDING_FILES = \
+	fennec_26x26.png \
+	fennec_40x40.png \
+	fennec_48x48.png \
+	fennec_72x72.png \
+	fennec_scalable.png \
+	fennec_maemo_icon26.txt \
+	$(NULL)
+
+export::
+	$(NSINSTALL) -D $(DIST)/branding
+	cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
+	$(NSINSTALL) -D $(DIST)/install
diff --git a/mobile/branding/aurora/content/about.png b/mobile/branding/aurora/content/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..3819f6337a171cf8ab8e5171bbab6f787b5f77ae
GIT binary patch
literal 16858
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
W8+~_f-T>S@$KdJe=d#Wzp$Py9N-@;{

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/favicon32.png b/mobile/branding/aurora/content/favicon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f04acd50d303235149c6a2822003ed94f8a51a7
GIT binary patch
literal 1761
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
Di}Ylk

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/fennec_26x26.png b/mobile/branding/aurora/content/fennec_26x26.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c97a5d4daffa1afee77b107b18e04c27cbdc49b
GIT binary patch
literal 1677
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
X<(k9cQX-E500000NkvXXu0mjf(W4)q

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/fennec_40x40.png b/mobile/branding/aurora/content/fennec_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..13532c21c13455285573a8fb062f7b9cd6cd172b
GIT binary patch
literal 2997
zcmV;m3rh5fP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW1
z6+14bu~3=-01GuqL_t(o!|j-Ba1_^-$A7oG=b;&mMx!Sn3lIeH67Q!V1|b0!$Pr)`
z5<790TC&;fZk3(aW~<_CYHN4xWK*flCb8ormDp^|f&m8z#tv^p1O|b4o3{i4Jx3ai
z=An6XPj}z_pu|bau@}3Xt^L5is=sudKKFO~oO|y%7ar(=9_Y`fe|h=U`?7oMMB|4Z
zLwuNzjvYV7;*T!|AkucG@IX_~`s3%@mPZUZN!2q}z^!!8pEjzgd_w-V>2nvK2l(1^
zkMW(a@BDCphjwq8l$0JVDhfNET)iaxUdBz$$Cx*J2<*A<zx>HJI$VF3(p-y_Tt5ZF
zbD1!`kVvo2oz@uLU0rbd9ur;3;F3uNo1fgc@Y#I-_<_b_4LrQK>W}<39BH7lvyo3f
z`A_e>d**vDy1w|tLR|nf@B4XwZnh^cC7pCdj0?h*^K3Gjcw_at^(lZOhYu4B>OB6$
zN=`K#D)`Bv_RX97vmdFPSt{q17hzjMWP26LN?h0i+V1J3(iV!IV%w&@GThWGK36}3
z>g7{w>sHq77h))I4Tld=RkIXEN)EiRBg^T|S}e@?mjYg`S}_gn?T%!r1~3pel6g7K
zJUbSn*u`{TK-*#FyL)!L`irgWKK0ozSJ%`4Fc|C{wfL($PMvd)7&d=VnJg>G6+MQH
zL=uWaz;q%Ml|IuVVVby82CG-j6USp=`O44siKgb3eQHMh6!@Dr_wJ&qW+^Yc@N)62
z$vb~AdU(#Va8FOb7AA@z>5p5srTIz)z|Ji%{boXu{jk5#kIUsD5)Pv|oYI$@D=xQ2
zBf*&bOPA^v-+kru_Tv%NsTJijtF96}E^>1mgku@XOFa|?TmancND~gHC{lFnmJY<-
zyPS_jk$%4{m6mvVLFvCKS)TtY4P;h5ROJ4yiwrk!v`AIagywMIc53ocYuHo^Cr%dt
zufMT>jX!mLr>00O+rsDbQZa1;v3OEC9Gd8jr0g%f*v#nxRf%_mq<?LV$c|a$mJeg}
zxBwYjplN`jfPhQ}RAHk^Xy1Dp&fTE3sTt?OS%^m#Fsb<*&-}$GW5KL3&gK&riN^<}
z=2V5IX=s{?CREwfW+mn?tQq#sD&D{K`J_iP+!@ml8N)&dLB-VZ6cy(Ia4TZ7Zqrp_
z!$)8RJh+1i3M)opI|Pa<kU}t&TSG3Tln7fQk_LTS_LCGgA}<$h+(Z0ehMN^1%jW38
zlVnmEG^Ych2^<auP1A@bECyX=uRs3y`g(El<Vh+kE7`UA#cjDtY`taM*tUh0fmABR
z=&}*y=jD<=ynwXkqH1S1QD-)`O9iJ3sVPH`qVT)q2MN-~HY|j+5vGlzOJpj>uPU>c
zHr&Im*AAiqZkHQpmJ4sT8>d^tNM*PkvKdi6dv^7b#b>q3%E}>^?t<-!Xk@+Dt;#H~
zTNIZRlb@GMXL}DVx9`%|KS0IwiEOF%vvg}asy_=f6{#uMnm{TFiU5Iv*%L-7@RMx3
zh!r0suw*u=gvl?K<}<T2z}C&X7(T3!Dbpt4bi26QdY6HL7>U6YHkM4u+)LF<7N33B
zM*Zr`KkCfZgCk7aMo$~KvYgDAGnJCkV%qO^(0cP8RW)<jf4!HDd+vZ^2vAWpq^ckl
zP=rEg|4D2kgVW<6)zwSEylH%6)g+#-F6a2s(@dOPPEL-Oix;kQ<4OxIhXbe6iKZ#C
zJ8p~Y(rI7#)F;>e<XwQT@80=wz4LOTv~;YDjhV@i$rz|E2X*x|n0ku7aEyr+WBB~f
zj`RAB0TfLGp@1sjw|SWA>LGIZ#!#pYgW8(u?D_VmL4txsOG_7Rt!)$+7ocbgk#LMq
zPd~O$81$CKHvH8_|Dl72ShjrG?*aE8I7qh7E84DHIIRranT<f^=KF;|KZigd7fn&|
zWxELmdnqU?qIg6B^S-i`_NakSh8Bmd49!_n6cX+Ch_!c6;B|59z_WOrDh|zo6c!0X
zC6?3(heF)Ac!^{rg4^YgVLM9{kDFPwX4NN-z2{kcqUlUoOVh#IcDx7MlGrvFnGCu4
zeri`NBArgrdg~6;XHTWACraHjTM??DFx!pa=Rvm&`l33awocNaUJkzW56qhSF$Uu?
z{Dp<|8wI3wi=wO;ij^RdNbvT>7J2nXyYP&f{p%?+E9&~YLvq=&>URU~+5JoESFdIF
z_E*;jZ#8cd8C_~Fk8t?{3>!O<qTwZ2i4c0|CaFY<1rN{RYHKI?*&d2Vk3$t2rZlk(
zoA&k=!u@^Bnlzr%&F2|EcR7};024th*iP%!^MpF?l1awN*fv=uQ|>;pa?SXXk|O<m
ztC^z>4J@guV%Lss|Jilr)YC>XCf#12aAx_*$uDNwf+ge?6?47m0Hpy7Pj(ijCDDAt
zP&5UZF)`vn6l{dzWH6mX`lgUKVkCouac-VH#l2gXu`>pV=m0_p)M4YIV<%3VTD!dF
z-qB+XEct_C;(g1l9ox75d&h;QugUa)43vx(xy2=nshCS3zkn>C54*bwW3V5~0vmzL
zm4lfX#5PS3Hma)N^cCTLXaR|Mj8L$hj+>V-QfVUL5W%hvnLD~7Icmb>i7S>aZEt8e
zLRD4uA2BHJ1-Ebi0oJX5{2%ki&wB01`8y&M43Ze=XCT;xZe~dJwUP|?pr<YLw1J*X
zF&OP75s#Bj>*#3{J#7*Xb&&|&21SrDOw!2|{XLz$d8kp6H%5#cJHBqk(xvVD4!;`?
zKzlF1+DDcH;Pqy0><B08zWM$CcCW6PBj&VS!{{z&%-Awa)5J6-wryeCHd6lfh!X-u
zC@88xQ5CHAGmu@%z3VMpym*D@U)qj8FHfxb?8x0KSJWN@sI95~lN`$XR?f!`vv%#;
z*oF-ocH1CQ8AJN>^3ZjgzTQ5}jE%1Aq|-WST_>fdNgF!4p_4Y!=(>TKv554?xp(mt
z(XJabpT9&bk(7^qVnxF53w-V)Dfy+8-mgCWR4~@v;vHR_hs&W6$S)$xn?+$!4sN%=
z%veZig9ITIR81w7vIzGN5(`I(#lx5;v~>2#U`i2x{kNb0QGNZYzyJOD%?JO30DJbl
zi4Y>OxTa>!>6=0MAFu3}9<PUSlcz9h@=X5qhdVfa_BMu|!ANB=(k2<*;=o&1`TDmv
zF>=yuibsva>B;7MTMqE%$+yMob&s80wQBYM3U^<C_4O+`dh`hOt5zTU)^pE(rMzN_
zxO%&jbRx|31&gR&G?T-P=SZdujI@D~)(J<GG@Q7^sx{S2nKK6?5$43%D|r0@zWLAJ
z=$tsdd<8&5L&Hbc)$QB2kJ{Q=wr%?Huhc|Wz1yiUcKXAVO`e6o;_A6G+-y36EhWo8
z^Aui>hE!c#YCJ%H`!%BR4Bd7Pl?$tiD=X*s-tV}|{TkNR)(*``SVugbY#a_Zy{#9x
z*7%x?M+PXLHlJi#M^Rn)@(Sq>c5|&^J0jhKFV|0?AcvAX@9E0Q`MrDh?!E7}Q~Mx2
z>RZ1#!ti3p^Ve^ut_4HEjfrr4v?mgskW;4T`17-*qPhgC3q{prB%TnL??#EF#a)NP
z)93T$wfcR|=K&sl^wB?W<Ni*ce5P6HXm5AxiRdenCs#an>EKT3^k#{iQIqAp&Yu2<
zMvhu;+u}-LQGq#s?pzyS^Ur_GXEuI;k37VGN=7<u|GKd;`NWeO)?Ru0@|L#lptyRg
zjgHP>XvU0%Q|eaMop(AN#_!;O4+Qs-Y1htQ(%ltQzWl|f_I~GE&s{&-a4hiu>JsVr
r@y0*g)B!kj_{f9XwFi2j{|o&OgmNT&uA_ID00000NkvXXu0mjf=w{`=

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/fennec_48x48.png b/mobile/branding/aurora/content/fennec_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e01e7aec57e36b910270ff2cf3f634fdfb2e6dd
GIT binary patch
literal 3258
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/fennec_72x72.png b/mobile/branding/aurora/content/fennec_72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7874013f6af9174fda8b201f513ea0baaba9e00
GIT binary patch
literal 7223
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
FV1ld%%{c%7

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/fennec_maemo_icon26.txt b/mobile/branding/aurora/content/fennec_maemo_icon26.txt
new file mode 100644
index 000000000000..8428b289f456
--- /dev/null
+++ b/mobile/branding/aurora/content/fennec_maemo_icon26.txt
@@ -0,0 +1,74 @@
+    iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAGXRFWHRTb2Z0
+    d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAADFxJREFUeNrsWWtwVOUZfs45
+    e89es5v7bQMh3DGBtpJWIRQvaEWg0FFbOyX9oR3bjtDRTjuditjpj05narWt
+    o84oYB11nCLRVqtUIYQKImiWS7gFyIaETbLJ3u97ds/p+3274WLFUsQZmeGb
+    fHPO7jn7ned53+e9fCeCqqq4moeIq3xcI3CNwDUCV/kQrtRCTauedCslJatV
+    c8lCu1HTbnXZYauxI+0LIBZKYiSSCguZjEc6M/S6zjvU2XvsGe8VIZAa/2iN
+    VqvxaGzXdV0m8Ha5vm6dzWltn99cjmkVZtiNWlgtGpTatQiGZURjOX7v0ZEo
+    Pug5Dp+nF8LQaKcukln7eYjkIvvdwuHdr4Us1hK7qcQEm8PaSd+/TrOTCIU/
+    68czp95vT9yyeJ1ita65bpILK+ZUXnDdbtPCbtXwc/94FslUHqCiKaSTOH70
+    FDo3b0NmcBQaWVh/vG/To5cKmA7Ls5nsskQ82ZJMpCAc6H51uySJ7UpegaQR
+    4apwodTlYOAZmfVExPsp4FsSbfM25OvqW2bWO7F0duV/CbPUqoWDSLDzsUAW
+    sQR5QVHI5QmINEcGfNj45KtQZRmSoPUYJPMi8kb4IsBX0+HBeCzREhwLgsBD
+    FEWIktSlMZoMHrOlpN1WaoOcIUsRq0HvkN3msK222iyr6cd/LBIJT4DP1jm3
+    i8jYlZAfM75ag6FomoAKF0SV1ipCyRbOh5MZhJmM8nmIiQSERAyCKKBxcjV8
+    /hD0dktLdeus7eT7C0gUga/LpDPuQe8ZxCIxkLEZcPImmEd3iAR406hvFEcO
+    HIVvcJgvXOeuhV6vQy6XZ+usodlDi7Uz2VQtadmQy6fsamAMZXIMoTMj8PnG
+    kM1nYLECcTKCoFWQQQ7BVBahdBaBeBb+SBqCToWxzIhAOIbhQT+XVDoYha2x
+    Go45DS2u66dsLwJvodlDpxsIk/vAvkNgls+TAfKkFH5U+HkXt9eH72wKMdkq
+    5OI8gTZbzahtqGExcYEr3+o+7XlhQGn5+NnXYJ3WiOm3tUEZiSAlA7MXTIPe
+    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
+    nEzLJzdlAAAAAElFTkSuQmCC
+
diff --git a/mobile/branding/aurora/content/fennec_scalable.png b/mobile/branding/aurora/content/fennec_scalable.png
new file mode 100644
index 0000000000000000000000000000000000000000..b940df9b1e90d2c077bf2111c5ed942a30ca06ff
GIT binary patch
literal 5937
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
TA@#s?00000NkvXXu0mjfGjyaB

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/jar.mn b/mobile/branding/aurora/content/jar.mn
new file mode 100644
index 000000000000..0a9f7ca1e3ae
--- /dev/null
+++ b/mobile/branding/aurora/content/jar.mn
@@ -0,0 +1,6 @@
+chrome.jar:
+% content branding %content/branding/
+  content/branding/about.png                     (about.png)
+  content/branding/logoWordmark.png              (logoWordmark.png)
+  content/branding/logo.png                      (logo.png)
+  content/branding/favicon32.png                 (favicon32.png)
diff --git a/mobile/branding/aurora/content/logo.png b/mobile/branding/aurora/content/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..91377a312090ce5032e4ceff60f173abc5a0da64
GIT binary patch
literal 19844
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/logoWordmark.png b/mobile/branding/aurora/content/logoWordmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3017f59ecf02808ee8793f118d02bd04b2bae8a
GIT binary patch
literal 15088
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
Q8vy_yE2$(=4K)7of2pjRH~;_u

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/content/splash.png b/mobile/branding/aurora/content/splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..25a0830eac7003d6dec6992b18b9f17a0f27d723
GIT binary patch
literal 19766
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
JPDHLkV1fgOBhLT;

literal 0
HcmV?d00001

diff --git a/mobile/branding/aurora/locales/Makefile.in b/mobile/branding/aurora/locales/Makefile.in
new file mode 100644
index 000000000000..fd37ba4097c7
--- /dev/null
+++ b/mobile/branding/aurora/locales/Makefile.in
@@ -0,0 +1,47 @@
+# ***** 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 code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# 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 *****
+
+DEPTH          = ../../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = mobile/branding/nightly/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mobile/branding/aurora/locales/en-US/brand.dtd b/mobile/branding/aurora/locales/en-US/brand.dtd
new file mode 100644
index 000000000000..a8c29fe812a9
--- /dev/null
+++ b/mobile/branding/aurora/locales/en-US/brand.dtd
@@ -0,0 +1,4 @@
+<!ENTITY  brandShortName  "Aurora">
+<!ENTITY  brandFullName   "Mozilla Aurora">
+<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  logoTrademark   "">
diff --git a/mobile/branding/aurora/locales/en-US/brand.properties b/mobile/branding/aurora/locales/en-US/brand.properties
new file mode 100644
index 000000000000..9cd7fda33cbb
--- /dev/null
+++ b/mobile/branding/aurora/locales/en-US/brand.properties
@@ -0,0 +1,2 @@
+brandShortName=Aurora
+brandFullName=Mozilla Aurora
diff --git a/mobile/branding/aurora/locales/jar.mn b/mobile/branding/aurora/locales/jar.mn
new file mode 100644
index 000000000000..de3d979b7751
--- /dev/null
+++ b/mobile/branding/aurora/locales/jar.mn
@@ -0,0 +1,7 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Nightly branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+* locale/branding/brand.properties (en-US/brand.properties)

From 738e0f9a9f5b840714dd49325eb52c18c8be198e Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 6 May 2011 15:08:04 -0400
Subject: [PATCH 055/314] Bug 654838 - Create a unique branding for Fennec beta
 [r=blassey]

---
 mobile/branding/beta/Makefile.in              |  49 +++++++
 mobile/branding/beta/android-resources.mn     |   3 +
 mobile/branding/beta/configure.sh             |   3 +
 mobile/branding/beta/content/Makefile.in      |  25 ++++
 mobile/branding/beta/content/about.png        | Bin 0 -> 25842 bytes
 mobile/branding/beta/content/favicon32.png    | Bin 0 -> 2670 bytes
 mobile/branding/beta/content/fennec_26x26.png | Bin 0 -> 1915 bytes
 mobile/branding/beta/content/fennec_40x40.png | Bin 0 -> 4409 bytes
 mobile/branding/beta/content/fennec_48x48.png | Bin 0 -> 5625 bytes
 mobile/branding/beta/content/fennec_72x72.png | Bin 0 -> 11160 bytes
 .../beta/content/fennec_maemo_icon26.txt      | 126 ++++++++++++++++++
 .../branding/beta/content/fennec_scalable.png | Bin 0 -> 9387 bytes
 mobile/branding/beta/content/jar.mn           |   6 +
 mobile/branding/beta/content/logo.png         | Bin 0 -> 19488 bytes
 mobile/branding/beta/content/logoWordmark.png | Bin 0 -> 14021 bytes
 mobile/branding/beta/content/splash.png       | Bin 0 -> 19610 bytes
 mobile/branding/beta/locales/Makefile.in      |  47 +++++++
 mobile/branding/beta/locales/en-US/brand.dtd  |   4 +
 .../beta/locales/en-US/brand.properties       |   2 +
 mobile/branding/beta/locales/jar.mn           |   7 +
 20 files changed, 272 insertions(+)
 create mode 100644 mobile/branding/beta/Makefile.in
 create mode 100644 mobile/branding/beta/android-resources.mn
 create mode 100644 mobile/branding/beta/configure.sh
 create mode 100644 mobile/branding/beta/content/Makefile.in
 create mode 100644 mobile/branding/beta/content/about.png
 create mode 100644 mobile/branding/beta/content/favicon32.png
 create mode 100644 mobile/branding/beta/content/fennec_26x26.png
 create mode 100644 mobile/branding/beta/content/fennec_40x40.png
 create mode 100644 mobile/branding/beta/content/fennec_48x48.png
 create mode 100644 mobile/branding/beta/content/fennec_72x72.png
 create mode 100644 mobile/branding/beta/content/fennec_maemo_icon26.txt
 create mode 100644 mobile/branding/beta/content/fennec_scalable.png
 create mode 100644 mobile/branding/beta/content/jar.mn
 create mode 100644 mobile/branding/beta/content/logo.png
 create mode 100644 mobile/branding/beta/content/logoWordmark.png
 create mode 100644 mobile/branding/beta/content/splash.png
 create mode 100644 mobile/branding/beta/locales/Makefile.in
 create mode 100644 mobile/branding/beta/locales/en-US/brand.dtd
 create mode 100644 mobile/branding/beta/locales/en-US/brand.properties
 create mode 100644 mobile/branding/beta/locales/jar.mn

diff --git a/mobile/branding/beta/Makefile.in b/mobile/branding/beta/Makefile.in
new file mode 100644
index 000000000000..bdf28e61f920
--- /dev/null
+++ b/mobile/branding/beta/Makefile.in
@@ -0,0 +1,49 @@
+# ***** 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) 2009
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Justin Dolske <dolske@mozilla.com> (original author)
+#
+# 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 *****
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = \
+	content \
+	locales \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mobile/branding/beta/android-resources.mn b/mobile/branding/beta/android-resources.mn
new file mode 100644
index 000000000000..e5e89fb2d2d0
--- /dev/null
+++ b/mobile/branding/beta/android-resources.mn
@@ -0,0 +1,3 @@
+mobile/app/android/drawable/alertaddons.png
+mobile/app/android/drawable/alertdownloads.png
+mobile/branding/official/content/splash.png
diff --git a/mobile/branding/beta/configure.sh b/mobile/branding/beta/configure.sh
new file mode 100644
index 000000000000..5d7d123e4a05
--- /dev/null
+++ b/mobile/branding/beta/configure.sh
@@ -0,0 +1,3 @@
+MOZ_APP_DISPLAYNAME=Firefox Beta
+ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
+MOZ_UPDATER=
diff --git a/mobile/branding/beta/content/Makefile.in b/mobile/branding/beta/content/Makefile.in
new file mode 100644
index 000000000000..973bfd053d8d
--- /dev/null
+++ b/mobile/branding/beta/content/Makefile.in
@@ -0,0 +1,25 @@
+# Branding Makefile
+#  - jars chrome artwork
+
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
+LINUX_BRANDING_FILES = \
+	fennec_26x26.png \
+	fennec_40x40.png \
+	fennec_48x48.png \
+	fennec_72x72.png \
+	fennec_scalable.png \
+	fennec_maemo_icon26.txt \
+	$(NULL)
+
+export::
+	$(NSINSTALL) -D $(DIST)/branding
+	cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
+	$(NSINSTALL) -D $(DIST)/install
diff --git a/mobile/branding/beta/content/about.png b/mobile/branding/beta/content/about.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cc1444f645b1a36a885816ffd6caa799482ea7a
GIT binary patch
literal 25842
zcmV)4K+3;~P)<h;3K|Lk000e1NJLTq009C3003hM1^@s6aF7lg00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z003GYNkl<Zc-ri}cbF_!b?*J!dskJbiDyoZI?53V2?P?@<Qxnbu1Ut}VthZ_IO71=
z##|fYd%@QM8*E=}3>e!4UraI?kpx0W0_A*ioIIVXYVW<iKlbjKKEuqMpd*rIJx@K;
zQ&rtv-CgV5YrQKe5rKbx3@0XnQyETWfRGvCo(aQce=$niCnQ>fGN2Vo8MHQ_H7Jcj
zqqG8LP#7>8rQ$K&|2RBXX^j|#LZP%7R$6b@+MJ=Z+NPA=q_iGUTGvs!p_D37x{20J
zD@=&652g34y?D#6wGZER&^syT_DrKIDW;k-ea*KRNIcfVKvh#(Pc>B-qnK`65~HYR
z3Z(>Rh3R&|xN6{lx!DenReSl@^FGg-r)IdKAfM<^OmxU6I_QBR1}<HPsVfi*MnG{&
zQq4U7b;B6{_T>#!Gta7gcSYh4_wv0TVq^CxR+%5@&y$Gb{ac>Jy#r^E`tsOg-+x~|
z4FzW_rOwi#uF}dp%4l;|T1_{k^@>Sq8K#nAvILzNv<W|sD1{b9y_zw!V+=K1!=`B~
z7uhRtV^T}MqSNHtUSzjew?`##${M;VtMWr8$@hu!D+Q0!O1;=9^Ry%}+p}t_v*9ZB
z&BF|B9${$H2qR;Ij1JWqZd4ekq}0*`tu-E@VKh7H8L80}N;92X##=?>NUJ#i@LX~J
z(ZTE`b8Sbb>ssY`+iz;!z4t#7<v*a5-mTOsB&^CR5PUD?YOU0ZjWLf+jd^&rZm4Y>
zX5g$13~wG`^Y(R|vwZ^_hZ+oIDMMMpK$=iDFqVXim$-E${GSo5@p3@uj@Icq&#d$8
zYvt^j$vM(28{?ZBkJ-I>^f7y{x%Ktk@%*cms{U-+Fz-q<<EwzMDyu;7-Fwf+Yo&i7
zO_LwbQcZO*V_@qV8s}_c!v)*ev3ZPh*N?G%xIx`0jDng98sG7ddZ_xv{tx(Q?0di{
zMZ+j+Ml%d-tY(}u++csV;BeQnb8~}xHr9r3{P<1Jm_0oAj8@nG>QF<!1I53min~?;
zVO3Uv;KB0&o~*QbbDAcXS1O8H9U5CVGI0Kx3~gV-1!ryIk{ufusiqhOrH5$;+cH?E
zgO-;Xyg(u0B^N8Kj}`&~62YOjH4@EP164NHg>|(GQ{66Go_!wG+Yd8!%fYRa&GL<c
zdhI|}|6Mke{8?tyeuu2yC9ARu1gD7uc!W~?ib>4ND-}(p>Zy;dW$=u%scl`)=AENl
za=})%t{XxDtul}X6$OJPSOHxPi2@B61$G58UKVX0a1uAbpr~XiXN|4F=9Y^_6_aNU
za^2SsFtvNCI^A}!?iBuo!*%_Z;hO#jrPS=|t+FbsKyd1k0l%mfZ_ZMkW>u)xG>wht
zFnGqfWWy<Eow=6Ft~irQYG~&UR8aU-!<MRMW4f@i_bb0f_16AHqVUN45zivaAcDcL
zg0WhKGe_63@2+v4zrEm<m!HiCzI24oet9?hkK~)DCz7|UY3P?!wErcQsjnle*1@X$
zaEgAQFJN?7y_b;71^J3ryfw>ITB&+!jR6L>K8k_O=aFTa^UmAAg%@qdmzGYui}sGO
zM5rsz#zYt~Lhb}7g7<>+3oE-7Sy<)eJNJ75=Lye~xb;0oghU*Ikk-d|`xgt|`=M|1
z+NV_c^8dbyxBueVT(ZM+WVZW={WI>1-r7IK`J@kTR%KNlsz9I+)Kx&*Q-<k|!dkUh
zFaC#8a*Z)OBFz+)RH!!AQ{Qj}^`W&S%CT|tFgtc`pv)~rUQ(70<2_>;?5JyoQ$^{+
z>TT!Edclg|rBAs<a2)%;KW2Xf1qrWXMX+8dy|6Y@tQ*W2-7><ZS6;v^-Ss@<^*8d(
zo9^PpPuk9B|LiLM>Qy_q@@$<=jnDpe-fVwJX?2N4&`#FrbT#g{DnCR(AVI;8yE!q>
z^rHV=#HS(xM)>C&Ds;OF9TcJh@@}Qn-)N%-k_6HOD)lwg)?PxjHcX-&^+ttlJJ*wU
z3yN+*QCNziq_BaSvm*0bZ$-CpMfbh^{gyzVr4aTnSOD{{)qCtYX5ZS1VW65av~h&1
zpL`kF8RzlR|Fw%hd&d{3*9u<w+;jNUn=aw^Us$1$6wfKz<>&8JW0&1_cjHwv-^kx%
z5;dUo>W#E2KLkKvoj#E*^IrWQ#BT-8P7}EQh~{0_S5T<{>_EvEl#-Wg?J*is1C{C!
z)sb__(u_oV6tH&F2-;}!PC=gA00gB)izgRNp%aQEp{y9n%;1y`t32PS>|O-Vf)%i&
z%g_f1rFhCdtH6seni-t)R0nHZdi90uxcoxi`bqf3Km0O9`&P2rQGWmDHuI%FTf>X4
z=#K4bHNO0JowJ^~|AXT%+x3yo4WOQ+^r~sFDnH<4q4Fn?$FB7g#c_^^2kW1q@!!7Y
zjw(|#iloljAn!%gl}dwFkZ47k*2xAolO_hEJX(P<nk-Am+a)Fe?>!!c&Jy-?5{f-X
zI6rG*I#VRg35>JInU`ZnH=spA?E!(8m{+|%4o@OE7$OG2a**g=*yt+sT#c^xc!9(y
zycden(HN++;mj>)Qr`RZyJ`Hz{rt~g86r#DoV#<Fe|`NZXTEc$@wQK%e^sS9$xnXn
z>*wUH`oC?yT)kW={%iG?T9qGIAduq$fiUW={5@TV7mtYi6sdjljk{7%YP$$uP$FAU
zp-jUlO_FG`#yYaJ5-oxF9-?s8lXnV|M4@yAsx_+JHWyy|4lcRjT~za<(Cwhx)3l%c
zD|F9!WQY++WGMh81V~u45R1q$VM7s_k2sXklCT7;Vy<xPpXrilO(!q0R<NazRjLea
zSjRb6DE|JMdzhXc=kNZw0nOXd*%*KN3+wsOi*sK57ms1G>-g_q_`;a8gCASJlP3uB
z#Z~KIRem6W09&ra4<e=ftn2u#6dvy!f<ND<{!K@lycgs{z?L4BsCB5~ORK}AX%(Y9
z3IQBQ0E4n?$=inZz#wBs_OR`yuXD)_?`G4)El8sACM9t#T91D@)310liB8eBL@W9%
zf=E#IB^F8KJD3N91umgvA)*jSLr*2qR8!4?$u1(H($MCDIM6y_V9gjiE{6a3Hf;Oz
zabEvFD$u+SvT2_A*sWZ<sloI9^hf#MUl)Gqvmevh(}(}HK2m$LYq@WjhWV=4)f;RX
zxg5A3m|C=d5ZDgf5pI}y83Wb;cdveR4<bk4JLU3QyHIwv^HSgJ;#yt&bQ|C7C^ymi
zouRVz8Js_dxY{eFFdC91BhBjQ2m&G&d<o*fd%7J*t1xW8>r*`Ey)WbOAN+MTjNd__
zYm~Y|qPt9A`D5(+xpz=Vf-Q<b2>Qqkz&t0=%MWmbs6vlRm?s836e58a5a?J>*Lkcc
zrn;8#*&Js*Md2xON8WYV!hv&ia?p)YHk@@PZ~o6Z|MFoCwG5d%gv{K>MQ6?Ng*Oh;
zdi;;_cm7K5{l?^`Vlscrp^wddLY#fvYDD2XBm@2q_$Kf*;NrM{1MptpR^U@WBksQt
z_>Z{%A6LJ=2N?(?x65yx@_g6KALg1lzLjHV+PJw6?U{ntZn<Z})nf;6d5Ftf(R6)6
z&Hx>k(6*X(sc7cVDuk}}6kgG6InKZ1KX~DP{SStx_u+<z={kdGp;jpv-*^!>Jo8QD
zI-@8`a^G9U!HSBjy27E32@iTvI8pQGSqUJJ`;e|&ig4dln<K3Pi%_ek3=dT37LFo!
z6kSiJRnna8GF(jXnjdL$_0~4pDC!$G@oRsVa^1BCl?i@!0zYvVTQ-jK$v;}d;io*6
zckkLk>+oSSb$2mz^efGeCj-e-@Iq|0aLU^ck(>*>vhVRP#>X|_rNA~|fL?ey0L1g+
z-yu#z-pi`2;2PL&v5Z@wkla1VHH$=Yi#U&;%aK%YC<fbI{$blqyrSc{zSzq7o8i*U
zjt#?84AomyD;304DRhk%0~~f^?3T?u<*v8!j3fU>ZVkRtL9EAQP-%dx)cN$of1TmM
zbvRp4C>^bTAwi)L1cg?D5_L>6Qy>Y0JK&=mPzpE{&C+uJRGVhkGS{(WnPIMLnVHM6
zg~ygc+4XcgCCYp5+}+_CdxSrH#dhw0%n1MTnHKN-K*}rM4A;IxQ`24S><r@XWpvE(
zk^i}tryqDGA3OL_p0Re0d;XuP4_q|#ca2Ty)4PX?JC!<l^FXJb){I&<W9tV{4gz;Y
z5CHgM{5uOwL>Hi+uxj=_HW3I`JG4AlK+rlgyDUp+9FNmZ@Er@@<7RVwB3KmDZBG@;
zKVE$g`_|`NvPm;i(I5$;Qk2Ocsi4y;Dy>pvgY4eZp?k+ivEE=K^{<sDZ6q`*IiFwu
zG-l4aip>p;MfH(?fo@FuxB#UBX&7mN2nOmH5Ga9}Zpn1FWVU1RPAI%%vRSg{;4DSq
z@D9q{Q|2D;Ajv8WtXadqT|2|!1K;F5e|!axeD%Y5=ELCUUpLNgzD0Q3?<k~`<7Ncp
zeztAg%s>CH?flAbJ(er-&(S$7?E2*N8JGR;`S0)S-F>AOx+j}`<h`TW{-Ig~CxEBL
z)&Hx&7vg@qjDp+vb1#=qzAC2^2+CHztWT#rmykPLVR2T-o0hH<eBCg3PMzxJDkGU@
zTX~Sqv|`F7h$M(kQAq`rRM1%kU8$nfIQpjB5HA#^MvP#zkTndAn&&`uGuP~VDd%k&
zLZu1Thn6MBtokSt6$+2E3d=-Kzxw%tQot!VFk5hFHph#HUfQvPgGX9;7oP0B;NyPh
z6kw>-2ibAn4nA{3lb`stYxv;X9?er8zlj?^@;H9=bzkHIAKS}|o&ud_7qK3^aK*(N
zdChN}#p_=^#c%qru<O&iIQ!-2Uov#r$RCtPCVv-w;!3R)XstQ)^%`28vJRXHoCACk
zcz7h~rh)$gTJfAG#`7lPdF>@$=jp(e@qW1h_ymwIBKfXbo^HkhUjmBwysrS40rvp=
zSRNs}@#kEwCT0|PLi}vCNGAS2;PB~E5SfotJp_PYS<BPQsBe}Vi`-L`o^CD_9ihIx
z!q_DPqys6oW9dwnxLk0#!?{ktZmq#2s5C>T6->2Cd#a#4+s2AQ@Mr@`MUhrD)g<Rz
zgO7k6=TdECxMl8+Ug1y@K|o?8!K;N@gpe~3ijTC`vF0Fb68~BkT?h}}E^ICrd?AQH
zQmwK1%*}lM)@k1S*I(hce{lmNqgDR#FE8K=pYTi{*+sP~xOO)NM1<%5$S60z>MTC@
zXLoV+)ZN_qfxEc!^%wo7ot*x>SpTV$G4nN^fr>@sly1a##FaM%{u6j%-&cAQ@P_EG
zKeO*SHv=z-3QAPgH$@=mmu~>C1wI}BKRbfRa^irkz#-s$z~kcnFGV0&A!fCtTm-xv
zcv<8X`sMY&OX6!kAn{6J#8dIb4?P%YfUa9&^U$?4nk`?QX?iASJhN?K__6^uK6aF}
zo>5FY%4vn2Q`kAdb`??>#3o3ok*>uy=O|~!=^Qys>+p0ySP^szCRHR=MVf(467Cwh
zguyipB+;=zXrb1ioLBH*?iaBqL06zFLM~ysDdKU9P<j}wC5$#wlqm3^jh+Vu@4>}@
zhKpgtf%P@gdP-SXL_FDGgRyNJdBZ<8`TXbZ2Dt+zdwIgMH&NYm4zBQc>#=if%E>uo
zdXnG!InBODUe2AJD);`^T@-UBF{49o3ZG^n#<9{S;xNW?&Xzg+sTl-2BJoxMUKICr
z`V{;>A_(+WU4ToX67?AV_w<3lZs7L#_>sT|h+*US8V7*=@$YVq4Gs3cN79Gs?iBCa
zCj!3{K|p|`eU{9Y2yzcdb9<J+l~XserkKY4kmr$Wfc!}JJGaAKy5o5|(-J*C?P&|_
zc;YZ?FC4~p4EfO#J13OWj&iod6%MfiUV$jYE4(w{Qg8`HGt&D?&_+lyMOslLnZ{%q
z+qM)_9c+>=006zZfCvVC|Cb^G3_Rp<EBXN=W)hYHYe%YVUSDV9h5@#39b{;vN>O;q
zTyP!1bv-&UtUY&x4G$Y*)1x*pa>g*On<LIq9Ui2<c8ouKdx!k!1T^<RzMJay0n$wm
zM+%QGEah~IVzP<qPVuJK4RPy^OK9z%p*3MK1A`A&#ynjqAGnPZ*hCbY*K|pZKNSag
zqVMs?flDI*?Cw*<x5U-;*ZR)wt+20*$9fjPrNG00e~9~rfIo?k?*z^R&X2Ch)r-vY
z_X6X6@B2XIoiPOYzWABWjNmlgXED?t$QyJ_l}AtBz!Q#s;|IQb@reV0l_j@sDNM~c
zN)0<7GtA)T24xF6M{;aSu(KA|EfDXK=x>V%-g>-sVZRr|Ymm?$Tx&>DMUsWhBw!Ln
z-m+YB^G7Ksj?xi>rQggy78J_9O2TqJM_{4)&@KXl+zTetq!oh$21hCkjZ_&Kt1&QE
zWq3=2&6kbQSYM;)dYpyfv(~Wo@~x!9HBd0JZis8|s_^#rI?x`On}K3K+13W>#)ska
z65A;$rrMMf9WFVi!xLVyottKcano&7t*Ufw=rwq2km#cvXLC;2vZl>Y-QxX8FL3<|
z_rYlP-_>XKPXK=a+!qyn@$+8Nx9{J8nfNojt8f1^fsy!}X588lAkL5H+#b#K(@FNV
zqI>bu_?ddqhMD;V{Q-m;3!QTL^vyhW;(7}G(1=(j07s52omuD{WxI`g#B)c|H9PC%
zvn8D)U0fG@SK+OTO+X@h=R&n$@0URL82v!hDJ_`TMqDQfohr0ZC=GMnl(Y7HlY#gB
zI=Ak4FS2PZX>3Spba?qhEi@?gA}H~wzGfl4I)nLA<mguT2oAmCBhiYrTL)s{QQ!;m
zQYZ_-TCjzuETOu7gt1zk{L4*}W|hIUL%icZXL;3&hN!Be_}M0U<aVk%FQA+}i{j{A
zl%+>$MPfWJ{jr3X{qqGJymyARkE%d6@C4}`x<ZQ9btl3V2r!_94TCMFTca3#s+KgB
zMK9a?Tj?VW`<Z&v7vh6sGy3*L7o!#xa9iI>OynYds_*}w1CBfh_wIJ!jlg4ob@7_}
zU6E7D>+I?Z7tGzwvk!efICAPC1Oyj9ZsU?PP2Tq1!gti#9W{#ClJ=1t+j2<maLxk;
z@d}k_#0lO-6ILli^#y+78e<el5<`Y&0R%u%<PKX&IOq0HvF*)IWBTf6(>(ifv`NrN
zcy3muosKYFSx0SffOPE`zH|X-LJni-Ml_#bw9t>h_VpxiLMTgiLg}D%LTSNT!IcpV
ztWf3-(HZH$038JbV?*3`SC#jFqTnZAFo>TShXnNC-83%PMlpF1*O{g8kR-5f%<%KS
zFv@L{noCj#6o{){>5lHd4wIhH4^&G^Hdd#&jj;#dQZGxusU`MF#M*xF=#LPTajV7W
zRr`)z5lPCP{3&qlgK*zIF-8Xl7g-6lxcua&@?{k|V@G=*&ph;nKuSM^>dO;=Esxpx
zokxtJoSpfx?&Oh*%RTvYK{;!obT}6jPF#sfvIP*3FlYoM06{DhlwKF3xG5C?pjSaC
z5)=@naA}3LyKdmjLpM+xfF#um_ovcyO`RJzK9TDx7tmb4l^rks8IrUT+z=LujQo5#
zatIBErY2xrOjGvZv2{Jg2UkKFH)j>jL1{f^Z~#$4Qmv6T2Kbu~9^ge!9wM`XpXq}3
z==vUNJ2o==tr@&^6w?K%GCb)Kit8sc@D6b;RFXYGocy&qL04InXJc(P)@yv%+{G?1
z7kL2s{t^kup8s9+aS<u-W<pH>z;!XQaB5uL%KLw&4+K6B{BCp$zCg%AJb6D#X{xTv
z6UM(r-E}Fn;h`iNLcIN$O)JVgzqEDa$e();Wz&*RJ18v9hPFYz?dBr@zHJd36fS^*
z%>V5@j`c>tTj+0Z)+-f^JS|G_SruEWQJ5NYWrdcj(D7BelA>+F;}3om{pEM_;lFqb
zvy+opr766GO`!0BB<yhsr4Z{57672MLSdn_;j!zv2BqM=!RA6f*Tq{;wssBKnlY48
z3=Y@0{$9nkw~nGK!}!@QezrimbJTZ2wssWPRd}<B?o@|CQ}TpMOT=1`5>+3$3Q+@M
z9VfJvj-jOe-3(rt_=|k2Z{H<-kI(I6{_h9&_O1R;ijSwGdvKz}prXGW<<gc)f0W_k
zzWsj#e4S9JWc$uNDc8WEdD4+Db4KgnLk<MyEdpsQGE=oC-*xnNmAHz}p*!nv9gA28
zqVXM%C_yQO&mAHvZhibf&pn9AFiN6tp!m)<!+?&ZyZv{7iG2c`54VR#BN41Fk^T6A
zhtt$+XdUT9_h5l12&-w>(c9-mLQn&RS42<{oDBt-!97s44o@<D_byuF<J7lqp|WuU
zLl1ixwk*(7lQ>i3#@nZO!Xw6z{2+c-qbdqhpQ3(7LhHURX3ZA-#8F&#mei!-3rHNQ
z(%7I>c9s<FZ=DEF;Jv4&x+F1j@Ld3e-dp@73poZqNyrm83cRN8+_yzH;qkz)^zHvl
z<POg21DCHXiexP2C3=cmixG&g#(ll(8H=I8{fl^wt725-slagDw?4lA?h~^H41=!4
zIjvpf=Al_B7BUNGn~UJl@9^!`vz1cVW`S>qv^(z=V#CczMWejJ7Y<32kO~|VUj&d|
zHk?vH8FgqutmCd82!yg>NGqByz0g^><&`+X?-Jbu5v1rMBSW0^@|Upwni}m~qooY)
zNStLL(H-zUDt|9?(0iPZ=cwSuh*pT`kX2|EWiCwIau?mnNu0CH+;%%=?_P!<@d&al
z+tB+DkTvRDbNvy1{iPcbG5A)As)W+z%34LXPT`s@s_QpV-hY%dZNzLQ0oB!1>gP&#
z?pvI|%HzCdU3HGCDal<Dznc@c_Lf*#b)Rysbo`URzXSgbI0N`{RQj~f^#9wwP@`Ey
z7`|{3uW&}63$b|RZ^o#`#(4Z=kq5XH*aPeYHUrm39^w;`BqWADU(omZ5Hb$`8hGxB
zL@TT^4A>@#w-1Rd!exP=d;hV?T}ty?CN&K=XR&R9CE!%Z5pV*jLFpubf?iN)@v$x-
zD*ya<8Z}S(g;jcC3%-A~kupacUld3Jq#8fG24@97H;HxvwT$}Xp26sU`$=xPw~D{d
zGJgMlMmCM1j1Cq_Z?K6E?uhS25PAtj(On7Lz(RLq?-X8XT(`vL-PnM|gH}|wY{4r{
zGCD@m7@$_KaNS+7Z_g~7Du%qBV`l_i0bPNS3#!cCdz8WL8z^iUZh33L31Zu*YPOS^
zz?B?#dDenQ<4!)iFz+Mz>>@_Jh+#gNw~WJny@(imMO>MGBd)M1Fi9v0eq-P39w8(W
zEk{azs_*#0_}Itm=*h1DABthe5#ZUtjlfS6@&z_Wpm=n&RxXbKpdtu#;{N9X7sP8k
zE(qj0V{I|X^Y?!WL+F<EkOcyr9J4ZQ(iQy*W*xRe^z*@&KKS}7{Kg86buQ|8T=hj3
z8iVxT<i3|6b1VobA&f)Un(9D`NfSmcyMmFkwlRG9rPMCGg!0gSx;K6m1q?pwM@hGB
z=hpiRUjMEGw31P}tuAFLC?61@-zw<21I{m42*D!IIPXLDq6;LUbsmQ>cmHl$hYuq<
zOioa#!HkTMA3jX?zyW-blhrGXA4<9D_Bpm*0p1F#>2UQDg(9sBO3k9O9VBBhY*GTH
zM_i7=ub0B2vf~^3-V4K~$yl|;{?;g&I$_uMcUVaHIkG66*NCfhFYNa%LK2Q%6bj6N
zzX1Lzn(G?aMMxFym)`^akmUwV1dyT6&FGD->^Jdm2OiPKN8Azrevy#ObZ!KWJ0p?#
z<G^DhaFh|S?gri-ul1A1`+`cHu(p`wxd%SONICbA<OYrbf@6wdG*>B=47%9@rxdnp
zLk&U4BUuCir4cJZ+0+6E5Y2p1YGD>g<Pt=VEg@6!eU&kwG?j*C`_rDrrYAjz%GUK{
zo5s+C71B*xXk785fTMHU?flDoZs(1k5n8Ikj*ACL8V#%ym<OeP5Qw!2K3D;+^tjT|
znVdt{tEgH7=RDRrtg|>L=;2|qt=lQ4rzmHp!CI!SyACM|#FmKGm?XoJa?@Q+o_$4N
zBE1*foS-v<HbQN*jk5`rO%3oRQYc*4p(F?6hXqY*wubk|_xmf_@}q-y^8VJ9cr^ON
zIJhG$9lt-g#J(;ev1mD&iLStM(qSQe`FPSg&atm8v45O}%*1~Aa@_i5SKN*R0x1Kw
z$qV;?oOSs$`9l~4=7B)<5hN<pKgX2A8-?w<&{(JlmO*F^W&jiO2%_$b#2EgfAeZX1
z5S2Q{TTl@Mlrf++X)R^=tc|FoMtSHker^IYP@%SI493U#@F(~3=C5dOpGc@yQpUEe
zWqA7*l3Jb8$~?l%a|HdMfTFp7oYtWUy!VvNHY5qzhV`gQ6;-KGmKNtcVp1w+oP}vN
zDQ~<EDND+thy*C$EJ|rimT=qN00Lrt0Gc^ZQWGQ-DuWhX@lXsP`D|$ETzZ5Oo!NTl
z$a==761;aO!~pKl<2<u^6Cdkbh8XqT3@0uV$5S|EFyg-F*K)E_=#;TyniuZ-7;DN^
z5a_cA=I_LvO4Q?}>u^Rwq(EuBb&%+Jen)!AJ5k$v$|ijZ&!W;{HQ#zz1pr74%4n3)
zXk##y6gP1Pc4!MSH${>_bui<W>j(JzuY2Bg=Kx7HW6k;ojj<6%cWj|LHii=&auE7~
zAYPlq)@Go{n;r7mCg@O==sImWcioNmp33H}B<nX~t;N|87WKA7oLlIJ;5|wlT4}na
z4JE=;9$UD;jaZLu38pEe0}8PvN*74dz|R~(4^|N;C|zQUq?oyTbYuP8>9xA<ZaI<a
zLPg4>^+DP*Lwx4Y*(c*7%oDh38HHX-k*zXl@#rOwC1k!}Lq5)->N-3cBkl*{hPNtV
zxSZpehd#%;Vig3A<p_F7J6b(Y71Uit;hKW8ks$PfO3ZwDanAxEb`P4rRg?;@LSHgb
zD6Cg8ktkIE=|rOvgHDqG2#E>(3j8c~?-!{IUqCHOc;}4?fB5x`IaOor#vukbu47>1
zI_hJiR0bQ6rWA#I#|=LZOwvo+ccf!$$sDu~9m16*-nkG(C`(G~kg~*Eix-7BOMd7e
zz9{C&4PSIAn{&M8ryjxIf8;JEywJ@d@7iDyln%V$W`!gT<e<1NI;-Jaf@|hT?od^*
zbAG%t!ON;9Nz#$xmJ`+?Wq54$K5iP{$RR&MqWlSiKq3~eG`??Yq{d^!Q>yfsbB#DQ
zc8@Zh4be0W5^*GAaY|!V!rEerXCC?-+uDb?edtU+zwR+ir9)^ussH}%*jnh6;c||b
z?)`tPDP~te;5#gWm`bUPzLKIujNtN6A0Re{__PX1K`O-dMM6UW=`{$5Ll9LjWY_}&
z9b$$`tDy9$L8k_tguf<DF<Ameq0<U!HOHzse(CdP@-O!^7#<s9>*n<gZrMa*?FebT
zhE7wwg3`M0xZ&r+k|MaGL?T#uWk@$~CI#|)?nS)doDG0*@Bm&wkB*Ta+)uu5H?GqO
z){YNo;)|TA0|(hL+TuNb@Ccs#Q+sK)JVnQ$tw)&@R}|QmC95kG4x~V|pprUvb{b!J
zbOmhFsrFp{lA*5LKQIu=pidA97#_5|;KJMa@>fPklsf?s&@^0&vzmLDO$XRr-wFs`
zX*PEbv#C4IT?1#(OdB9VDweaGyEvo0pUG^PUG=TpHgpbqYnvG>rg+@Zud}nghq~=z
zwdTUvd)d}G$iC_(ZWz6o`|I1#coP5p<uVjHWnDhWa}R!+(Q@`7O$;v25hNNET3I<?
z052ME2{Q<~K1P;fjzEw7@1+lyexY4ZKL}_w|5#}i*!QFd0!jF53_43N^(v;4ptPb|
zHQYEg!@u8KWn|+T)||PW#)kD|LxYeQtbi`;{QIj#x4nqMTT6S-KFYZ{RGLveV+Xd~
z!Fz{j9aetl!e%XYb`GaBsVLg_-h~wTLQb^!`EZAnC3oGkmlr>O9Y6nqO?=>e_u#r7
z<%HS=XVJR(PHd~hH6Ten%D4!y2|mw|vV{^&^Qanax5^93wjUhWEQv3aJ<;MkRY^Jb
z!2PV<JB~_E{D<!SWDlFU^Vt0gwssC4L+g0JYR$TQf=%5CE}glJTZhi&jMhHZ6*Ck{
zQAR~7w4r7@TsU_xXSa57+t4}OG<+cktLyO?((i+w?!g_H<v9mG!{+Wd-Bl1+&LU6%
z=PHp+zM?wPrbe%uPvIcb3;6+P5R0f@FLWSP3oXU^Eddp*25lk$q`@7~S>Oarl7x)I
z!l4K1m|BJx$Iw8+`c1<mJ9bdpyaAnMIP37v$Mj?sV(^QBASMd=ZkNvZ1mZou*`nxn
z@nwN)wGm@*Wr=eRDFYxl1b6rV`H@42wdh&{U8!QH#)DhXLq3ym=<qbiZhrq4Qg+=u
zLTh@0k+lO<wl-+p>T$Cc+ftYT54x|7yBb1@BZ$xV>Ky}@4d$I%dotOo6SYZc*?U4b
zpa2}x-)vH7&1oB?qLx!2gH^#*xMJ#7oMK5O@=BAdz#d&XeFqoM+{wL-?R;tNqc~Vy
zk4Dhqzb8CGp;Ly+CNJIlVMdGDRS-Bn5U8t3*(;@cnAk|P6(MgxX@$1}T1A>LD5I#5
zO{9!Q^a22=o<*P)I??Fp5|}hWSJD6imH0SIL#we)PEyOD)?k}1IdkVQ`v%8Az?LOC
zhArs>0<{2Q^m2&>VtKU3m3esn^mG6P5qzG9$32U{g;@(C5_*-1AbAH@hV!In4aE58
zk%<=AoRQit-ta3U_**=>o}$bwm9@j<hg$d!P}iUZ$`Y|HRJsPSLRr9_hqKEswUgxe
zx;mw7rEKjzk<fuk6`j2W`N0yEe)kez1a(5DbniTcaBg!qJKFoXZRlL?8raEnHpFx~
z93#r})G|&PtTGt!XpSu_k5u$`yoXmhP}cn==rMI%_q}$hQ^txZo^|l^tSMIAf#U-K
zdIOp>@JwPQ^QFhzz=UIBl)!nES%?TouY<4#OuzESjJXH`Dh+NxQb{qDU=f%sfIwQ$
z&{>MkQnEx*6c$lJtyVJF&^Qvx!p%4GRN93}NAnF$)v+sDBnbqlY~M*aJxOQJ-k4M1
zBLKv<>=6WHAp>cC^VWtjaP#>Q0b#V#OwZ=vbC}xCCFfR{*qa7RDQ{BSGC+IRAhtb;
ztgWK7M{EgY7o8SpG_5AwbhN?wWsY?Tn94@Ur{K6<aKenInXk>_OF>t@rx|b=Vfe_|
zgyf=I=u1TE0fNSJ`SfjEI&&LN89ue)N4aC*Yy>Dw1_&FwM>)5-i+dZ}m`esIbcTzH
zE-0)rBoe1&>jWd7HN`ZAPRVs8<g5Uhvt&}zHdQ*hipDc&TRivRXV}_4Lf4!S2xvkw
z($$29sB7X~b%@Zk^;%ZWxA?&Z0&iuf(%d3m&hkYslQ5*{_A&{@1wHpY7onF%Y@&~#
zRWMa`EHO?DCQC>v38FNumZO|;BvsFmebY=H=~5r6u<gtSYcANtcrwO$n_(a++25{k
zU`pW!b6lKV;B{#Dp<)>`edEuLAq!*80VbvFme`_*>CZld1D(fv7rPoSD1Q$SdgS1I
zmLd!1>BLajF1R@;bD&FQ+YmkvWsIskLgUOTty?@KDJX~7B2*sw8H^E*OepT1sM0M8
zBz5Te&>CNKjtc}jQ?%}CGIw+Pdkq5T1Meo}{P!+o522apmlm(yJ!W2u=P8H3$kh|y
zq^mQ&xb{)ZB@JG*@1u;A9Ue9LO**DV-U9*=G;qz@M{&#Wc~o7_md;_Wn*1g^+WYD1
zj9h2)WN_*&6<;u(jdJ(EPPTRqvZZ^NhHafF2wX&H!*+QDx}~H`X#D!W30<Fl$bcaC
zhn1H5l~(^Bg_`d#;Jv4pMil*lXojhUJbA4`LXrwVpiF2~q7zM7dd82oIk>OO#L<Gh
z<I!5-%Aj0TC4A<N9ennVOPDha&K}MAiHFb8^fm53>=>$av82)Ch#&*=fbgBxz(Oto
z%2T#l*lrh;LFO$2*Ozdx2n6OI`^XRa04!dR(EB_#HMJ;};OC~OtRJR0>hbLkuAP%L
zO8k}-Y8kjZWFtBO*CtVp`wkcmwK6)kq_R<CYD&8q&GA~Dt3=bew}X^|N=^s}o=(WQ
zKONNldkC3*qrgX^CD1S133URGClm@T$s;I)p>mE95ngcM6LfWjy6e(0!JVkvHVs<y
z;Y}m(w8LLuQ}-~Nx<}aFK7bLA)tZKFGZ4>R2o@=}cMh<#eIQs6DkMFffINxNj&1BX
z=T!-{4*%Z|B@l@9_oJzMrFQyU5a(mTPR|8U^G!#@%e-kWC`clA&<_L(irjMeP|3bM
zIkVGtKE)V>EY)O2(23%c>z~5ivXx4nvu{t8FYRe?{uTuz1->ljDGaYwbPHm%K&j<2
zWP)=bkgVN+D=qn<1BeTiWlHOy=rJ?09|U?zKMxT2$RC6>WxQamMd+dsT&F;%Ioa9-
z-)@DpYj4TcDw4I;5Ph&^_&!UA5zno=Gv-`Iw<sChX}~u{TuvZaR`9=_#^>e9)FHo;
zP?U2z<U{fAla~O2o~(`Uck4<Vf>R0?iN%`h&UXhE)Uov`ggUpH%X#d?4fBzVGAgz#
zQ?TU$dvXTTTHybl00{KI#T$P(If76^yuo+<hWtp5uX*OPf@C3N*jGL<&lRZ1UaP)*
z0qcbEqn7=9a+)*2uTPSYY7kFjFmc>iJ)8Y&FJS$e(GaW8yV!1*-31J$3EtU-a3qUd
zf<=Q*j<E(JxhE*h`pr}aM(FOj2g!4)XJ1HuU>9y`a-l?e-c2AVK0R>o3mk%v)0}+?
zzJpkcln&o)V%7}cnq?@=isi=2c*xsGo(CYX9<h!)4`z5%2~AWtd+d>krkj{Mu0<df
zg%m}97U=P$eVXo(J6Nb3yz)5bZaWzQQck2FgHq%VZWrM<5L&;VsQfbv6PkXwfIumY
zGHRWjD=NiIj>?jGmR$ToY*{bV6@|jpbOA4VAb^5S$8+RRL2J&T1kwbIfy4wvNsUlT
zpgp=4Uu}?%u0bbBP%dW?=P=bO2zck_OBSTxA6VWXm?!t<+a_iil^y3G&Y`kO==|ec
zNTgb15iGa}3;6@RsVEY+p2?47h^yk8O{BC)87vKzY7`F1OMJH*%DAnkEIbFNQ^ac4
zoHNM!^ApNjI}_6Juu_(w0&f+*^F2x99cQ83c<Q?ZKHp8!^Jyy_{|4~c`1v0OJc=;Q
z`G+-XpitV36_Yt-yClg?NGQ^=$3QO^-iHprsL+y3^^%2pu7OcFC(KM+=B8~3C?t?(
zD$F-bLe74cX{r@CZ%YArV1zLV+AK`AQYu6$LU~?aveLo{D>%Okp~QLe5QWkSzT3rj
zIzh2jZ?&JVPB?}ez(=dV3kw}h1biM+l6{I9I2$+hb);1IGNc-3g9%VXASe*)Q8=dO
z;LbxCqEoK=wVhO|ZQm^IAu8s00Rsdmr~UV0I`U-S<4*v8yu!IR{D9s6BP+NBp8=l1
zvArDDv3!@M9|DdbL|%vOTsc3-FI2krfPk1<>_MAwGddP{f%(5s6hd<@<lScp7%fz?
zu;8Uhc&{vlq>=L2%}3d>=O{<>P1LkK#{cgXG^t+8Gx{2NED9Z}WA%R#a~NHpp5LGp
z$+}JCyYGtnE(=^iud7LP38YucEP*Wa&XE|4_8rR7;tNOzH{y>bNZtvf(v)BZHIzA0
zSbSb0)=@E@Z|_RjcmDv-eYtSqQ-tD<$w}9=`;XhQEFP9P3-Y@x{q3v11-upb^(D^x
zN8tTGfI!e#=Ggz?JNq6U<%d-Ist?t$FI{Lh8WqEfqG)@nm0*^84_aiwPt}B~WVK+r
z7lmNEmMjT}lLWE|1c?D{AT>f-OW0cP@RHFR_><NJR8qZ=EvObU73ZTCJ#w<A_<af?
zOZo?L3}-Ok4ape1Ed&2RUsJ<*qA-RGJ@bGtpIcBCRI~-(#TNy>)aVq%3}IWdxKfc0
z8%%1E!Xdd2f4yLo<9*i-anZvH-u}xsBS*$5#@qLcXDawyD>~GtdmixTqRD$a`$7|X
z4fYddzd>kN`rH^rm;<f>exDz_iNzVmwpi<zX&yo{&k=~I#Fs8u1QI(FdFZx0)zO8t
zf!-1&adoA?+7RZ;a<fzxfFMyQ5e$%Kfi%oAMO!NT?Aq(tGrpPkwx7jt)nW+lhw70@
z{b|IiufgdtK%j7Fyo5|gjmM~vr6$NR-B2ViaWhk4rKistm=75q3jjUB(EHHye6&$Q
zS>QVb*cALEDy?GM4iSy18+;jnz;!)7w;1i&H=%Hilu!KOJ!~>_w0BwTth-TMY@V=^
zL7>341=l=nuE8gPKYIYr|37j2L6>%1^_R*UFb_c>P>4gM^i#g@Bi@FYp(0RrLuVh+
zJ(FF{lY+-I8tMB#)q+VC8b}ifWT6ISJ!zuCDD+g}Q5daw-P-@8HY2<*e+s2ZsA#*e
z`l|(YS*eA>C(x9l$(<&19o90%sBYnvX38}<;)anVqndzGE-1P8*ztpuM-Bw?0y!qL
zus@4X7DWxpLZI}VxuJxjz_m*RjVh0#l*Jc9GNjN|h3g996ut=20;hy(P4V_$ouZ*~
zTK7AOmO$Zel2VQz64W5&LQDA5Ak_!yemcE&%Xf$W=q>{U#X}AVL}{dS-WTqA@8l`A
z?a@Yo1zSMTaU?Z;jD;%S;fe>vH9BwsJ&z+XkSI?Yzv?svqh$UZi@_Mr8`k_g7dH3v
z7tJ4If4QEDv1H0E^fy4od~!`!5|p!S;xLa*Z{e9E-{!30Cd0!CdT@x@bd+1BM)=_U
zXYl2tTWBZ4R8>KFbRVucgJ=^P6~<lzy{4x<tKirKqrjQ`*du58z{g51+nGbNi)&j{
zRf8Qz>k{#bqyfI`7Oamlq-l#5DhO(#VAcz^2t+HT-*rODt-#KC#PR?p`kht~8H(FB
zLaOm)(ck`QmTpBh0Bj<39)2dF4`RQ|@n}M3;v?fdc^6?=%1ukW))=9;;nN874c5ln
za-0zA{8VK753TSSh6v42hY0-+my)xViIU_j-wG`uByl}1UgIW0Y;7uD+qHz@tp`tn
z!`MM+)&66^M+x&ImXZp`c5+?}&~qxZg75u*PW;;f_QixE!F65B<^Ea`9$(Jc)Qp5|
zJTHnO_n2xZFz~W40b^c&q93ma15LA31=36f3qV;<mTFWF7z`Nve2CIxXsQ8zeBkRm
zu6ir~+I%eUZ$E~;e*Jtouu_4vtV^3Kl6!es<BME1a3AaHB~owT>O)9l0Mn?mX(-{$
z^WZs8IKu7w#`)EMUC%e$I~g3?f*#q3lm+(49$b4iYOE|YTj|vp#IT_&OSE`?=Xnzx
z-QD7{?QQ%-iETO3s)c+KqZHXt$ei;X7g~-R!L~v&5h9cwi|_jRv1}%hS)a>|C$!8e
zaP43be2=GaWszGrk1%N{TY*S3z{`N=N2OTbcm5C|^HCFqs=kb4?V`&GnR_=ax|x3)
zcy&~;rR2%LFGa=s5TVui+!E(Kk1$bLR&W8{wS;w}B3b&HCC>lx$dg=r9Jrp2*Y-y&
zJ$K=Z2y#Cb0d`~GcXK81U&{dGZ?Sv>*~Ezd>G5pjT?eb{Nxc2F_#504zw56h0M@0t
z?3DYhuvdg%v@JWPhfK%~h>K@$<x&#Z>xB|nwJ<0E$SRszP2)NiqeAEq72SoJMte_I
z0WB6OeCUo8h9%QcHHNc-Um5*4Ki;^O>+*BhXV*}WqVbHXIWEZdb7^Ha746A&g_g~r
zD=6PV+t`_?TEpdnsU|$^5kq`%=OjP>x5B6P?Vw%-vO0QbEp~QMQW4B26NNHtPuc0R
zZm{6YwM}02q#3pi<aCaDT-Q;pq)_B2@5u%|Hg_l!k_4q2CP0N30+)Mi*Q0!Bd+xjP
z1z*ac6Uh`*D9Rbn_kk$FjDfLb{O!dQ=P$B!64K>yMS3If6H6RF8pC%z*$(_wBq&cr
zMhV@TuOPH!zj+A~^mrV=a>qZr=>J-@a9(*5tNhPK(E80KA}yB_Ix#OLX#}B{F4})i
zBypF!=1&-rfB)vl!)PXriz>e80JlZ!>{{Tm1YqhL2fR3cmvd^?IoVe_H)cu+LrPVM
z9Mnfm003b=oQUs>0lg$b+qgx$AgyX@1BSw?(7GxSj8<qRWEH{K(8^0=X-(y1gB8*g
zRH_jzIF-;cgRHA`cz$;M!W%@fV#vLr<#d=8ASJXT;~z_+b)!Lc)|s$vJ97wY&l=+o
zo_UzB{AG<IS&NYl<@o*>9`%bthtWFl5?YycbH>)qP}6ff?~xr`(~?gMzVIY9kitbP
z!XsT9$2Ws*g-k+Jn7V447Tfli3aA7mm-mU|gi?k@1Uu_b=a{1h;>Vw;@9cpOF9QUP
zc<h2@o_l8>Yd;pr&GS#;S}!BaM0oNdSK(AY{~?a;=3FOa8vghxyw-NY0Ga2-@1iIF
z5#5`oF7v#X5ZcRss&C(KM}S#MX0`ZN&L#EE-2*#G#hw{~wjN!z{|jUZK<mCqK<)D(
z)%ZrS{!*KJ(!m7ro=#V2<U&#jZOZ6X1WKqaM?xDj(P2hHWiUnM1<HC7<4J28?SwQD
zl1!tNU^H~bTTIL;Hf%`4=v|`_6{-xaGL%&Nl6{U{mwJ5>dN~3;BGH$Q;>Z-m(d!ww
z?c133>&frg&hU6iRo2n9qbQrBY9nAO_?biVvlx0H5Qd`&;w*G>&e=Fe#dIiuqU9)>
zg3@4Wf-ib4xddN&bi7{IiNK;fQhJJMhcdCEv*57L`Pj**t?S753lN-)d~=!o^%Xz>
z!ldKgs{F1~1c9Dh1pGbloJA|^smOa4@dj@@MG)whe~p&Tr~7`JSH$mb%QDY-a~}{4
zM>k?Q`Jai%{#}i&%%uaQzPus2V%J4W=4#;LWd5!Y2?I{y%Od=AccLI0&QOV_oU?SB
zo<^p_q@$!SwB475+w)<QT7nwPpdAWrQtdHDW0atbpmlHu1}lzTdpeZ4W8H>~`d~tm
z>3IX7*W*Af&LWgJ+q^H2*g7b4q1zFR6P#AuI6cVpE@AZM`}uhDQjXdYs%0okR`p@*
z<bhBJ0C7rFuhKAD1+kaFGp=aO&n~dJ$F&^QjS0#Ke$Iu-Wj<H{USdO+QsPVp!L=PO
z_n3-=0kWQN`cloEkYcM~^n?Vi)25)W1fH^jFRP-@`9MdS?}_2L<OI&`Kd-k!{&(P6
zD}?^u9ZmHzex4UbE@H7fC0YkP-}<g-DOBR?SC)9rSNll89!LHUeaEj_!bI<v>j;&a
z2MI%4Ucl0|7}coQ*YsIihY7=J-nPtZUjqCHq3rwTBVoFfd>Z(31$1?#H_mN8p?2g7
zLW0<nfcGT;MZPdVRKd+?C}vCYrlm5JV8;tuvyS?R306Q76y7^QIUSRUWC09}AsMQm
zuq0)HR)R@G2V+qnS|dg=G$b@k$vw9^=B6EM)~5`uNvJgpX+?*~g^KOA`$84H3PJC|
zl|r6-I!#a6ab#HT$Vd6}@vFGeo{39p7_Fc>K)tT8F_B2REnK%fpFt?H@VXLf3tYF$
z$XJJGU(vzNI>ZUZoWph<>0k<l#mACr@g8qI*k}#(MmcGrY=#0QNn)obr~h8u3HB&d
zp%03;r*#qE9=DZb-D!BAabT8(QRz#`HwZZi*Twg|Ad*;yQ0}{wbfeOLVv!Z`UczJ~
zvjn65yM27b7voloV6_wwyp`okjnlZAF4wo<!_iXcFAjN2T*a5NZXO<agMMz{ZzG}l
zoMrfnKZ@`1n=80xuO<uvXI(MT-zx4sF_JSz7%T5WKZ0X3a_?2BNu^lRJW^0wTS0(s
z+hJYE3@p1Yb|4m%_ZZRhARxWT#aV(Ltf4vzZOhn6ICL@=5tPz+t=PF!*n7}&XjjhM
zlw)AnFffwP7&KIBiZs*cB=#dvVdb`^$62Awg`(rIC1lEyd(GcYJ)94BE~8o7NPVyx
z^94dw!`t4R0*#awXYHaq0%DIsANmY7yZrd$=GZ)3&^jCjk+{O+OOL4ut{DoAybmMc
zy!A0;*arj%#Z2gmBo3rhUlk`GJz-TcU}puf-}Q*W>8NmObL=d|#TLMy0ROWugm+J$
z74mdKq0dtCfkhzDzl#5R^rIKcvtlT2_ad%Btq>+%POgZdPL>HTzIKW4Z*Sbc9Ju^8
z@GlWKd+YKq#TC20#Q8rG`HA(*yx!|$$P%X%qs1&W*P&~w=s=7&=}R9EKyWM}J)x9*
zP8s#WylJVguaedbt=W?HoM&)2!4{sm8PA%H3Euj!(nmy5J`&|dA=L`rC{$OWY$z_$
zJupCUXog1=mpn{y-Pdy5gs0oo%uQJ;4MU}>$*P(p36@zHoi1UJY3cC}l0?zS9Jl0a
zc>Cn#+$iUf4GvSURzpuke{AECU|cxF^?D50`Ea4c-UGqcD8ROP>LqQMv-mRb0<P;w
z2O+J2ZHDJ+5yXZ}LMZ^{gB7C!-(cGzq$p0|wf|diC*Imuz|HC(yyV>lFj<aV{4($d
zD?InVt#Is`6^?y)86arH(BAIT@VOqh!m+Qid{2h!V%)y5OxW-O;OmQAtJg*AWGSm)
zIk)Nh{(J*biiYbjQqFQ9srP{3*!bdNiy+>7|Agj+-U@R^3n~K%v(qKh<0Xxu6dcSR
z&8ZD)stt{E9<4Oqg|uU%Leo<pa*07JOkSXT@S(L*A@^83rBm$Kkufm|_uiG0icsVZ
zXNA0_Fp0t#g*M@FuW4ny0s}SZism1Wp3A#uA5Kx<5C)$l8Kw0L9flSc9!VJ7DoG7#
zPX)45DM%YocEIM)?y_TRi>F-BqBUvbjKVPeX=rDL?^=9U!n9%!KKHn`n+E_vK!a^L
zd^gN9@MYF?t#zMAos3p1T=OVOmGIr2)O)(@kL5n>+zQXhSQvZ0l&r*E+`YoFO{eKI
zJ!^$ypI_nFz6cV_^>x^>2nYcFJaQb*IEm|fO>_<751`1rV^iladuyAQBy1A;pV9we
zJolujKD#+ykd9>NRMVQXwB{@W13~F$#!IS=D!z<ntAJ?1hZZzwC5Tb@GzG2E&Z1)b
zaP0+^Bq3`~;F8O$ID!4U3WlnRBn!PdlopH$DalEUC=@2)4m-j(kBss4&KB;J9ncse
zt=92kkkT&Pf_)u}7D|#s*HzJ#knm$N7}*~7Puv#)B;og-JI#p7nQDVhG_G`*M97AM
zH4r{`u!3CIg?<EjVcfGeLNV>|9*l>4d}l+KTP{Yq{U-wi;##1lPbUz}5(b;<<Cyi|
zE1(%$!Q}PPZ@z4aFGL8*PRq%b({SBujuY{?^El7HX9XZw?sflwF!_1#1g`H*OM#I9
z8}f-|ht4eJ8ibob<crF1wgPO|QyWZ~o6MP+v<!~a$f}0viITBR6-)}shSp;}QcJ~7
z$6kTf3ZEoMV$jZ_oyW)G=iXR!rQzXMHjrAzSMSbP<1JYddJ%}xl&-=d-{9VIm|MGJ
z+;7()W&o-UbiEE~73Wp#BqZ~nKC~jx3q1xxzjH*HkcTk18Io#XKxg(sWf*MA&h`6w
z@fB0dPI|;@^xE~5yZ2FBANmg1mc-8}s03Wc;jKqSAW$kKVij|aih;e8L)7#2YOq>t
z5`PlOK`Mcy0p--`RKmZGrlVRRYS8)~x)cK|g!pv4*-u5borY`Mx&liNOHZKgmzC0s
zcdS6Dz83h)6Nu9MujS0Lk#Z(f4=)P@OVdK{RQR8*R1&79OH{>RGQ-SN!N_cd#!$lH
zBL$O3a@KCC;H(c-jL|df^(@dT6xa2dkNPx)NHQXQqf{kC2_E^#8edE{@jKUT#v~q{
z7@SV=q@c2}dM6nSR8VOJk}N2-6XwgumF{b8uAw^tNiFaJ`@aTdJG{o43t?a_xEzWu
z)Yk=6oEzu$FSwm*nKLylWScglY7KN!k`5WlX**AfDitgO+qQA)(}D+AHa)3>yXPu=
z`u>afscj`vYm_QEajRRDhVE&f7SuV8Y5u*IDyJUnUrE-UhSxY=G^PCjj*qTz?5`qu
zc<u`4ypCnMNI9h#Dw{N1o0h4QESf;IG)EBRE6U4%YQuBWR5RPMXrm~BgZtZ@apnM7
z#V~%TWMr&DQUQx#P<ZL3AP3Gs)0;M+z$m;5GY=#VqfmroB!@;E{O%(TFjlp^;cGi6
z{18;?v3@xLorchbNrIC5-dM62(ohL>Cxcax*5JsuVP+Ssy9Ck!XdVncNA3b2pzF}d
zLjXxvV79|6AAKt?zGy#Fhd>VwlI`41d0;<?VA~!Sxq;BLQBXE;0pcX~K8ej<+n&P0
zTW`C97ms*+nKSm1=e4WbH!ip@$BP{*#nHFkL9vUI8gcer^8X(!F%J?UaynkK{s5of
zJq|aroLo&Plv+t%O~_1aeuqD$G$Z94&p7ls{&Uk)DRp|x<f)Z_0ED+{YoA-GCg`ri
z112>z=Pb>pWoR_z@PRI~lO=05Rss{R7F+~H7(w3q4dzE|>)4ez-stn4(iJ#SGz-ly
zTylg9)^vI8*U#b3W`gf#VTOVcNL*~97{;`t4YVhrxj(G@lXnCVO6$;>2*<}Gk=vVg
zqYZRtsZHO&FFg@HaLZcmKQPK8cJAg69)AbzNsqUN`q^7iMsRaYT-PF96J{L5Sq|u6
zMA)t@q+Dx(LXei{&u+hfx*z63bqDOcm~~J7kwZE$oRE8<LVLBTMuWmVNNeQxr#x7N
z6{n;8`gkeU@&JIOy@Dn4f1}H^k~{+V1;X5g?~qa(&Y#=ERCXPoTlW~8GV@@tG7!L5
zd@0{Zsywn<H8eXeOfgOjd-t?iyS@rqad3Z5ZO~Ayo8Y2HGEV7ZyNdN5YFV%rf_dH7
zi3so_Oy`=bHqP;pXWhg-({*kfAK=cJ1_wJ0?rDy)t22r-H85$=#L5Uv-31f31ouG*
zCclmx=`p5|2kY28TJYYV-_PT>HM#x1DW3EQ#T%Y<4`$BMb_qk5Z$Z}$t~raHZR1)V
zm4pE<J~nLC25d+0h0MqKl_=^R%irF+jej}v7~Zk&t8}&Df>%BNppxb-Zmu}7wMlEF
z)4@(pJ;d5%&?V#+RF(mW>!Q+}%nGlgul+z}{5Z#J4*&=zm)ZX(oOqh`n}8en&f=)x
z6B@%KC%?^DKE+2iJ(*@YfD(UPAg~CpQ>FW8tzyz<J0##FsiD;_XwF$`4MS_rF@D&x
zb%%*fL<EONX^l3z&nf^NT?dU?Xp5|ZuPs{5;{!muR3u7x*w`G8+%QXS;S=`{^Tqws
zRD6d!nj7$Gb-`T_zt9$Z9)Wr+ey<l}C<IzRQ1Jd&S+3rZb9C<vZ+rX%)tZn`YHXS^
zaONncVsKL}yaPMaMQrG_q@p1bA|(pj@p!vnpj5>2x!oiD<$=fZ)ZrP{why!UC!fXe
zIrWeG*}Ze>1n*y!B;-d9QcfHVLu4L0(u^x_WtrnYLrj+W9>{^nuMD0d53yl|V@u^Y
zJPY`#leoTwkfilRmg%)nYQveWy}V-2hq!6vLMGFZ*qCHxW9C!N`p=kDKcku%+J!@9
zDOr{<GgDHphi0Zn4;Ks#Ck&26_f7&BkSVl^(S&FT=x9a94BS|Ttorx@6+-PQWTbSg
zrei@PoH1N*?Lo`zTnpbm0#Xkqx=~Qs46VH(IbY_@i@1n*Dyiei=fQZ>^C!=5bLD2s
z#6e4^=_m^*I*P1e7~D2UQcrMGZA4}G(&Ac0^!-C}k{N6uWr6ED$~gy4@B*0;CZ`pz
zz4M6-)YkEw+4peHFJ8{MKX<wH6L<dg$t+^3no-<)3%+g975z{Gf}@0-`16-p*>`*o
zf#47!1o-e}j-Pd$=byR4vD+8@KSC(F%1-hcA5F+C{Qc!lD79g@oZ*Q_uEi@(2nZ1P
z14{SAdc{=A(vcUIG)r(!Xtf<$D@y0ty{p4{7dApSA_LBb{J~V2*d5%@6NbS>=v6SP
zK)%TWAj}V0?Hgp`fpdmCyy@!Q{PM&0bMJJO+ol?PWv}6`!?PSN#^|ap)(J)lwG`Gj
zJQuF>JZ`7sk((R`+lrAjo~yT(Ods{+O;2aeV=_f;B&D_{MLUa|>fkZxI^;)YafL@G
zq3Fs~E9k*t?BRpBj)Xn~DsUj)3x9ayBiSvN@bk$RdB$&zu>FNQVDj7F&?>v>q^wz=
zVh`_L(PaA}m6Fhp;QSScvrm4Hu1$cCuK)xq4T0HAsD@llb}jn<uUWp``rVNje9bb)
ze~-`r<)-D{%qfFYePp2=|33SM6M2)y{b4oL*xX~SC(R7D?E|x;q1ATm-IKFpXB8u$
zOt1tj4wISCkhBcUdawi(%EU3*(wk`*EeG8*@8htNhz6xol-4kkIUcoXj>l}C<!3L1
zxf~|j)65l`b_rD@j8uiOhA`3qV?0j5g{e@{!tA7ww;Y{0M^Z_sjb^0vaD6t<0gI|-
z*xb=QG>b^+L8wwq<&5pv<{Yl;DCS}l6D2ef&%5v3!UylafR{h+R(|ItceDLR#*l-z
zxm{nJePeslqV<U@wMq@@-oxlr@eq{vMB;0yM7U>0zd1jF*ZGOaDcpY=ukEvhxc*Y|
zI6{bVsn+M0tl(1IzR1e?X+pX1a`IP%z638{CYoRfg;CF1DvGd_KXIZI?OT+SpG~#e
zUQHCUg@eS9Ruj5iOOj}`fx`#87_HcORu$)hf?E+p97)B5T!J#L{zlLe=Oy~k4M|1c
zyXP7ZXB~*@HAM@GWWB;lm{g<?DhX^G(P%B`*gZvJ4nq;z0)$XsS7?=v&a9;@71=<Q
ztR9#++Yaf=S_|4(w1LiK5m)@cJ2uYVg31(jW;S#d&Vx0OXyN9AHQss88T{pczlmRd
z#gWj!@xFsJ4^`gU+1vhvI6sfTClD|Q?$rJ{5~Goa9uRz;khlM%%dq2rPpI2pPPRt&
z{3qhd`GV7UZQqEi_ZdqZTStiZFI7kJ8!PD-A-@Acd$Knjhp>DnA?fS)A|Na!KN<n^
z)h7l7Cx!$~;N@EJ(Q2xON`Yns1FaR-3yIO_RCDl9mo$UTTPi(n4i^g@k}M2Bbfutu
zz%4DYsY&Dudh-^0LsLX806?z^!a^caoXr@yK<(%GM^v1(h!4}9T@f0G+AatgX)U-c
zWyhl<0O=$YOeqbWse;aQ0bbDcgn^4Tk_^`<rkc36rJQq!4})LQhC*F1!h4^8fXgpy
z;U*Q*wMfY=&3o-1uUS`}|7<4&1V&SicbJ_YP5+RTzgY$d0Ddwm-NzzmG~;S}IiWi6
z*-@c-7Q~a5W71EN%=|5uAL#O$_}(8NWD=ekt(&JTbN<cI0_t%f@9MkurR4vxkooy9
z5e$|~H2UumG;TUB5Y$inM*9*XZ}eLIFPmzt^Rx;VT!7MJ@uZ2y0r%b4!Dz+$4e5NM
z4RL&!$wC&PkEOpNk%8CI8i*UQ>(P9xbTyxr6!BmoufI3p$j{G6irt26=vm-Oh4;Y~
z(J}1j3PDUrffgen(ikT=6>Z1dcphdntf?}5={j`1LOI>SHVZljI*5gIP*dNWGJH{u
zGdEbUb9C<&loyoIhiC3fUf4OTXBHwECkO;u$nS2=PiK0F%D+YB`MG6|KRs?C!nJ$@
zlnP-I)76B+pVJ{9AXGXo)g7oxXc+SI(coT*=`Ern_uQP9vV5B|2xH~myogWvGmdSV
z(l0ea4#MMBauE`Me{G$F;VHcJ;*`rSuBn%~Op{wj;X{eAwL$sPRFhWV-uv2=MTITf
zs(2^3I6h6h4|5L^h4L~V^%E0U<wao7o1+pegWjliiSEKeLsf5muYF+H;!>)N##9Yi
zmSLOSI3oR64o<01{iKwlXj$5mT?80BYlz0#Bd9c?oGkDT{9Kd4Er!OnD%qNpq@nRn
z(cELf3rV7=4Cz@){UUWVy>qa7l5NJcqG*?Ny5&O|1bXtzk%@o&iCDKQ$TmVz&%V=m
zZ9hxsFR;?J9WUJTN<y1*2t5vtH)Qqq`OZ;n|2G2CbC!9|<%BVHf3)J4_patiC35*O
z%`d!BasG~qxuUEZW;&s1hZsd}Jx+vLCAbXx_UAY+Y~E5qo9Oq3-iR0<_yH{fCZ;0y
ztN`7|7pR5I!(N$h|C}Qsv;@<M!l+&cC519Vn5Zpy>nNHzu5k0|&;2SEcu7UsE+|?h
zm643bjsYs`YJos(S)2u}N(MJMl3Iq+3fK17xn8SrMZKXY97kXGPwf{>Hu-Y<X#3>z
z<P=<8vpl&bbWa@z)F~c2)z>{;`xi@x(BSh=qj`NQ@`b2CUpmd-#bms;w*xOe$>&ZH
zx(oetpDz9_D<>qqJ4P&)k~c+nXt~exTZBFi*PIH9F8Kpac$$Ac>t6WUVLm;YnX^l8
zn9ChTE7C+!T2H6zsMid-V%UEm$CkpDEfvy=io8Jp1nm_{Vk^=(OcgJPj|8Do!9q~P
z9)LlyRsZDEd8LjPLYy9?VqXAX3bs(8wc30rQqA)YLYTtje2LP+$e9f)qZwo=uIcay
zl9&+kbWNP~*zQ8J5S<DtQ4H4<2PXV|uX<<aMW6Uq`G6(^-!=?SyV5+6K0)RItWu}4
z@}BJelgX8w0saReN#^$m4MvW;U_~bWZNNKL;Kb7h_#Mp<8lijv_*IUd0oaMk_*xdG
zM;qV`k=s~KrXz4HXTDz>NyDF6=J-G)Sg&A-f-@D`hMg2BMsFT_wo#Y9Zcu+@q>^kq
zntNut4rRh1ldcW32Wu5Wnke#)rC!tQ*im6%FbU>;EECX1#X2H|PGbX-xN65D#RZEX
zD)_=M<mfK+%9`iDr(Q>5g|p!|?e!v<AK9otYmZ4Bm4;9m&M@^P3@UN-CbmK~h1B3@
zXCUvOl8{8D(_qmgnPPNM@uhqGXJ7SC-JiMRklP!-qf^eAuWI<{qYXP7&^<LUxPZ`z
z!!Pms-N*9NdXD$oUl~^|S+uHlBAf0`;CxL8uibnK*O11j!3(0#zqRl6=i+Dk0-=@J
z%}bcki(l(XLc-4C>${cEMD%1Ni)Q%KSeSHVBC&Tbp>xp3<KxB8draTTw$%52BHvdn
zejc>~C|}PK171%R2$D#^_;ZYU)Nc&ve_Ed<+a^k3CJ$AL#%Q|MBhFLHG>KN&(vce2
zxT(ULwONQD5W;mT5_mdMm{bQ2!31kyzRPg0yReUnKR+%#DtO;_C<5NAV{#;V%}KQu
zk_x1mkXE5GpwU@KTo4!EODR+(K~)pT5?rf=Z?)0!x>OQ4j#^b=p?v?1?q7fBKl0bk
zbmVaSA>wqCQ;+;TZN1`eF4g3Yhhq5fL}h@5%)2%#SNE;Ta%TQX0zoXbA&t!F0H8N$
z&i{?N`HS;v$@x<rraBf;kY$?E3q|3`bR31|!a$LM0mGK9H3kNgFdayIBnTz6Crfl6
zAO!zg$EF|R1?N28_ACZjQ21jAK$-t*OxThNq!k@HAeqpjO#HD)RRUl%x|%|!DO)Xk
zr;APvIthtVS*B>z6uV~G_u7w^Z~o7l?SI6lcjM|<#MSWu>F^uQ*Zj<O#hhKeSy$!z
z3kXa^;93NNAwUl*Hou~(fBC5c<{2HWndmrj>&Y^MP83BEMy@9&#`b~4D29g;)^E;e
z45cB7#(NY26ii%oO&WnA>48E>KGLeMTd*)cXhbO=8iw>-0IgzpQY}n6_I<OQdqY-_
z`IH8)JY~BB&Y@C`P82#7(oC2ul9_jW!~NU4u6O@$vMmSuOw%R{-FqDmu%vc-Ew~81
zkrJ!2D&KEFP$wjC3=+DsCP3vyHS^QY9!Q@zl+l>zI@-BI8%3HLya=`kt;CWTzlY$4
zuUVHdx;CXTn8waxE)GeMc^<(;P|!NM4RLig5g0<~Q5JZFd9I-6S}cq?pU*n#BaQ=a
zp>d_BEJ~a>lz4OsmDJ;mqO^5}*~sr*Gy4zky#44qql;8V<)4dND*}P#G+6b&akl2w
zI~7g0dc&^D_dgKS=6QoGz4A4K@@t!GW^_hix@qy=lcXAxCOGTyg+*yd6CHXQdXLdC
zvL<2e#tH+&Y3O3)Exrs3tJVw2K=Yh}VLnMHkbl8a=qD6=nTODu4X`k3z4uVic;_iP
zCDu98H5rL_m{vid;r4tpc6Nj_Y>l>LvoHM8O}~Dq)7c-Dy%Uwc`CtISXbPXc+Axr;
zS_P}}{RISRpKH(qf_mIn2a<J0?R;57z3@o`$rYtm%oakP2kyY6I+P|m!8?c6nj}>i
z9fpz`4UGZK;BdmwSVpyO&?c<tL8JXV$=FLi>RAFhJ`TMB78G9kQW90){xB`cVZ}k}
zF#|%qp<vc?*X{~m=st|`VlCU6b6i<%F*Iu3tFOD~Enhv_{z^3cJ4*mTJ8}f41qcBC
z_yWz#x2{?RtMdIv7FHqv^njor3<e^ZIP}!Idcw;G%@fBex<2O=-P~b)NEbA*Z=th+
z@lO&>l4=suGvys=0`&pS@S2p`P)eF9OcD!-l%T}-aRL&$hs|du9{ah35J~Vpq$E4>
zc;%oXm<H79g5<)t?-}9~2QJ`C`NP@aTRc~;=hBUB(v7<Ot2>T<=pS!velUVSJAy!)
zg~>5Z7CP*>(**=qjw;@Fg(ml_5rkFw-U9(F%$D!D2aTxs{b11OBNA()nys%K(NB5e
zfIi!bV$KOR775J<{lw#4Sjp2wk!B_+y=K0%kkOtrRiqU~rEbV-nzW+hTtyXK0zXe0
z##ts<8>S;UCpaH`ep3y-N=+Ig6&~(BGQeNm^C)gLS8!If!wdW;xnko%&bXk;r1;h^
zeR%p^U%KCYEw1#f2mq}`K+s;~7MvEnRls|$&|EdD==jwecU8VWfS^B@pxy@p{oBAI
z4q@o(y1MYc4eQG<s;IRc4_zNJ{CcYEUC297D%36{i6TvP7;cjGG7J|+FKY$HEF>j`
z5Mxkm>CIK>r6ikhu1Z2P<d6rzJn1M-^NrSKCTbfvYpmq_^gcF?b}3ZG`>!v*^}oN+
z{jc4#+#5~)p3=7#0YUr0um*ba>N7RJdG=~3aaB&goJxvuulJXYfY4>3jY$8d7jIu}
z%eSuUxZN)u)sK9}pgwm)m3qeug_kfPSsB0tK=2_m(OXODL7XDVG-;+uvLrS}^=Lx>
z0j&k2!*rq0)jTBqphMA-O4a<n-eaAG7U4S4s7&+p$~d*;2-QR}-7#EyuRiz}*R;O$
zsonnisPH{^px-5E_W?jJci=%;vv+r7QH8{+tjhNm2#7cPas&BfiT@oiU<Lkp(qHr8
z8GrM0hxNtJU!yPDP$BDhAN*gX&=rF+NvJsV9&rxhUz<C;C2$FeLKz)Hiy>N|m8Umb
zFpfM7eGYuj#UPd%gSU!QD=L|yk{A-5GCu3ek9@m(=lgE#-gNyTe?K9Yyoie5T*eyc
z^tl7>bh-q`06`mKeb*{auqxkkAXo|v`u8t%3!PUxTvU=WDphU9QM`N7kAJQycRY7g
zUvSl++IeP84U0h6TfA3P5{<5C{QNxdzGNW+pJ0r{kYS7%Bsy3DNnkRR4$V?@68Hd<
zY0`=ztAzbchukqKlXp+Li5vHJ4}J2^{LVeIa<FfO@9_Zr%D)r{lq{qbKPYmrE3_Td
z%n7xZTa{ILP&tBr{;HomOjt-guJ&;U^+iNtZ|j|x0H&fDeB!V^_s7QcMHe*G2BlE9
zwB%?*ldVr_3>cLpTH%cfQ<imD{WU_8Dk>F4BMU`9ViYO~{S8Po-e{abEXuc>Dh{=!
zdH0l?xZ$8Zc;mtH&|MSmh+ByL_rR*Vhz#sk{vH7Iz@l8_5<Dnsy15D;d$gfy9*X@;
zSLOQ^2>Jn`mtSD|NW=;ulvrB?06h?>#lO9C)A%~IGplOd1r4?Fyt>*r=f&OAmZPPI
ziyLa=g>|)Ydrgh5NmZp{6k0(gfsar4-CvuQJz8Vhp3;GvbCecr;VC<gvTY@wE2KSJ
zN-y?b_E{`N1cGj#lDC)O1bP-gzUcX$2iam@1%g%ieg*=TAP9TbK^B#~+Nb=rJ`m^!
zf-G*)s7C>n^%<izt+L%+nTraSji%JMR@BIjni|<uRU@OR%I2JuA3N-C-_w<eJ{P6m
zRdLI>DrHpa9uV|Epa%&3|L2R`fPMgY&{cC42v+6$jU!l!Gg!<I^pvfqVC_YU-~YHD
z2(kzw36LBqm<&CONP9ptRU%WR?7q1<-?T9HIwn=I0=e&6q)+*K*VNBflzrEjFH-oW
zl)oPUJgdCjs;mORiX@^eQalqCDrF%vv0w2QgTOo(^tm1V;mCfTqHhAiG1t()*(HFW
z>;r<OwtnUBj|hC%tbkQnl^;YP=(i4f?n2Kx&{45^O5LyM$ua=Y4+4vUKrI4;ejw^s
zR=<ozVEYt(@!x*X@EjWwTm^ttSp|Yq00b5(WKW3;79tL2358$I5?GwPbUZgj7V!g%
zc>=%4+;@vCiN&8|RaRvc2u_2Q&{HPI0>P*jDY;o<U%yMB7lFXy92;2%5c~?8ETj0V
z%D*bBK=54v1i#3{@Av<g+E~FFSk4+*3LKU)^<@b+V^vn=hhF~w0RXpK9L%rz4GaJP
N002ovPDHLkV1j~^$B_U4

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/favicon32.png b/mobile/branding/beta/content/favicon32.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4a6968bf2746ad89a82d85df3a8679b5530cca
GIT binary patch
literal 2670
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/fennec_26x26.png b/mobile/branding/beta/content/fennec_26x26.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5bf9c25c09d1e89bbb75e774dcb797330a6249f
GIT binary patch
literal 1915
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
Bm&yPD

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/fennec_40x40.png b/mobile/branding/beta/content/fennec_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bf715b96a29fd0e7297e699cd2bed76e9348ace
GIT binary patch
literal 4409
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/fennec_48x48.png b/mobile/branding/beta/content/fennec_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8b62e0c1db7923d002e22f89622d2269dde5c57
GIT binary patch
literal 5625
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
TsoKwn00000NkvXXu0mjfFXhKa

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/fennec_72x72.png b/mobile/branding/beta/content/fennec_72x72.png
new file mode 100644
index 0000000000000000000000000000000000000000..6156f2d8c1f11bce42c594dcc28b143c30bd22b2
GIT binary patch
literal 11160
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/fennec_maemo_icon26.txt b/mobile/branding/beta/content/fennec_maemo_icon26.txt
new file mode 100644
index 000000000000..92142d070071
--- /dev/null
+++ b/mobile/branding/beta/content/fennec_maemo_icon26.txt
@@ -0,0 +1,126 @@
+    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
+
diff --git a/mobile/branding/beta/content/fennec_scalable.png b/mobile/branding/beta/content/fennec_scalable.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5dbde761c7aa125a40aa4216c9adf6b3f868dfb
GIT binary patch
literal 9387
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/jar.mn b/mobile/branding/beta/content/jar.mn
new file mode 100644
index 000000000000..0a9f7ca1e3ae
--- /dev/null
+++ b/mobile/branding/beta/content/jar.mn
@@ -0,0 +1,6 @@
+chrome.jar:
+% content branding %content/branding/
+  content/branding/about.png                     (about.png)
+  content/branding/logoWordmark.png              (logoWordmark.png)
+  content/branding/logo.png                      (logo.png)
+  content/branding/favicon32.png                 (favicon32.png)
diff --git a/mobile/branding/beta/content/logo.png b/mobile/branding/beta/content/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d9d0c57e030717c7fd59beaaa4a9b6d9a913b7d
GIT binary patch
literal 19488
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
DSx3k5

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/logoWordmark.png b/mobile/branding/beta/content/logoWordmark.png
new file mode 100644
index 0000000000000000000000000000000000000000..878363181ace30dda780d211d8c3ee54153dbc84
GIT binary patch
literal 14021
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

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/content/splash.png b/mobile/branding/beta/content/splash.png
new file mode 100644
index 0000000000000000000000000000000000000000..84ab581d20e557e9189a59f2de64ad889e727cf0
GIT binary patch
literal 19610
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
Z0{|AVu5bG-AkqK;002ovPDHLkV1ikw85RHl

literal 0
HcmV?d00001

diff --git a/mobile/branding/beta/locales/Makefile.in b/mobile/branding/beta/locales/Makefile.in
new file mode 100644
index 000000000000..6baeb6366347
--- /dev/null
+++ b/mobile/branding/beta/locales/Makefile.in
@@ -0,0 +1,47 @@
+# ***** 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 code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <benjamin@smedbergs.us>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# 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 *****
+
+DEPTH          = ../../../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = mobile/branding/official/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mobile/branding/beta/locales/en-US/brand.dtd b/mobile/branding/beta/locales/en-US/brand.dtd
new file mode 100644
index 000000000000..20b887c5f596
--- /dev/null
+++ b/mobile/branding/beta/locales/en-US/brand.dtd
@@ -0,0 +1,4 @@
+<!ENTITY  brandShortName  "Firefox Beta">
+<!ENTITY  brandFullName   "Mozilla Firefox Beta">
+<!ENTITY  vendorShortName "Mozilla">
+<!ENTITY  logoTrademark   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
diff --git a/mobile/branding/beta/locales/en-US/brand.properties b/mobile/branding/beta/locales/en-US/brand.properties
new file mode 100644
index 000000000000..e43630ac08ca
--- /dev/null
+++ b/mobile/branding/beta/locales/en-US/brand.properties
@@ -0,0 +1,2 @@
+brandShortName=Firefox Beta
+brandFullName=Mozilla Firefox Beta
diff --git a/mobile/branding/beta/locales/jar.mn b/mobile/branding/beta/locales/jar.mn
new file mode 100644
index 000000000000..b9ad682dc04f
--- /dev/null
+++ b/mobile/branding/beta/locales/jar.mn
@@ -0,0 +1,7 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale branding @AB_CD@ %locale/branding/
+# Branding only exists in en-US
+  locale/branding/brand.dtd        (en-US/brand.dtd)
+* locale/branding/brand.properties (en-US/brand.properties)

From 51a816c89b976267083c8c1d991e1d92fd5d8a5d Mon Sep 17 00:00:00 2001
From: Tyler Downer <tyler.downer@gmail.com>
Date: Fri, 6 May 2011 12:43:35 -0700
Subject: [PATCH 056/314] Bug 471588 - Remove String docs. r=dbaron DONTBUILD

---
 xpcom/string/doc/README.html       |   44 -
 xpcom/string/doc/string-guide.html | 2508 ----------------------------
 2 files changed, 2552 deletions(-)
 delete mode 100644 xpcom/string/doc/README.html
 delete mode 100644 xpcom/string/doc/string-guide.html

diff --git a/xpcom/string/doc/README.html b/xpcom/string/doc/README.html
deleted file mode 100644
index 154b79690961..000000000000
--- a/xpcom/string/doc/README.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<!-- ***** 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.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Scott Collins <scc@mozilla.org> (original author)
-   -
-   - 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 ***** -->
-<body>
-  <h1><span class="LXRSHORTDESC">documentation aimed at programmers who are clients of the string library</span></h1>
-<p>
-  <span class="LXRLONGDESC"></span>
-</p>
-</body>
-</html>
diff --git a/xpcom/string/doc/string-guide.html b/xpcom/string/doc/string-guide.html
deleted file mode 100644
index d954fe67a07a..000000000000
--- a/xpcom/string/doc/string-guide.html
+++ /dev/null
@@ -1,2508 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-  <head>
-    <title>an incomplete guide to mozilla/string</title>
-
-    <link rel="stylesheet" href="http://www.mozilla.org/projects/string/string-guide.css" title="remote stylesheet" type="text/css">
-    <link rel="alternate stylesheet" href="string-guide.css" title="local stylesheet" type="text/css">
-  </head>
-  <body>
-<!-- ----|---------|---------|---------|---------|---------|---------|---------| -->
-<!-- ...............................................................Front Matter -->
-<h1>an incomplete guide to <a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/string/">mozilla/string</a></h1>
-    <h1><font color="red">This document is now deprecated in favor of <a href="http://www.mozilla.org/projects/xpcom/string-guide.html">The new string guide</a>.</font></h1>
-<div class="author-note">
-  <p>by <a href="http://ScottCollins.net/">Scott Collins</a><!-- /p -->
-  <p>last modified 8 April 2001<!-- /p -->
-</div>
-
-<div class="abstract">
-  <p>
-    <h1>Abstract</h1>
-    This document <span class="LXRSHORTDESC">provides
-      an <a href="#users_guide">introduction</a> to the design and use of the string classes in mozilla,
-      <a href="#implementors_guide">detailed information</a> on their implementation and how one may extend them,
-      and <a href="#faq">answers</a> to frequently asked questions about strings</span>.
-  </p>
-</div>
-
-
-
-<h2><a name="contents">contents</a></h2>
-
-<div class="contents">
-  <ul>
-    <li><a href="#users_guide"       >user's guide</a></li>
-    <li><a href="#implementors_guide">implementor's guide</a></li>
-    <li><a href="#faq"               >frequently asked questions</a></li>
-  </ul>
-</div>
-
-<p>
-  Please direct all comments, requests, and contributions to,
-      in order of preference,
-    the tracking bug <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=70076">#70076</a> for this document,
-    the author <a class="exact-uri" href="mailto:scc@mozilla.org?subject=string-guide">scc@mozilla.org</a>, and/or
-    the newsgroup <a class="exact-uri" href="news:netscape.public.mozilla.xpcom">news:netscape.public.mozilla.xpcom</a>
-      (should there be a strings newsgroup?)
-</p>
-
-<div class="author-note">
-  <p>
-    A note to potential editors:
-      don't even <strong>consider</strong> modifying this document with an HTML editor.
-    That would destroy the internal formatting,
-      and make patches unmanagable.
-  </p>
-</div>
-
-
-
-
-<!-- ...............................................................User's Guide -->
-<hr>
-<h1><a name="users_guide">user's guide</a></h1>
-
-<div class="author-note">
-  <p>
-    Strings in mozilla are a world apart from <span class="code">char*</span>s.
-    If you don't know why they are different,
-      this section is the place for you to start.
-    If you're already familiar with the hierarchy of string classes in mozilla,
-      then you might want to skip ahead to the <a href="#implementors_guide">implementor's guide</a>
-      or the <a href="#faq">FAQ</a>.
-  </p>
-</div>
-
-<div class="contents">
-  <ul>
-    <li><a href="#users_guide_introduction">introduction</a></li>
-    <li><a href="#users_guide_how_to"      >using the string classes correctly; using the correct string class</a></li>
-    <li><a href="#users_guide_iterators"   >using string iterators</a></li>
-    <li><a href="#users_guide_summary"     >summary</a></li>
-  </ul>
-</div>
-
-<h2><a name="users_guide_introduction">introduction</a></h2>
-  <h3>what and what isn't a string?</h3>
-<p>
-  A string is an opaque container holding a, possibly zero length, linear sequence of characters.
-  Understanding the implications of this statement is the foundation for understanding all mozilla's string classes.
-</p>
-
-  <h3>readable and writable</h3>
-  <h3>dependent strings</h3>
-  <h3>flat strings</h3>
-  <h3>encoding</h3>
-  <h3>sharing</h3>
-
-<h2><a name="users_guide_how_to">using the string classes correctly; using the correct string class</a></h2>
-  <h3>basic string operations</h3>
-    <h4>comparison</h4>
-    <h4>concatenation</h4>
-    <h4>substrings</h4>
-    <h4>find and replace</h4>
-  <h3>conversions</h3>
-    <h4>calling a function that expects a different kind of string</h4>
-    <h4>converting between string classes</h4>
-    <h4>converting between encodings</h4>
-  <h3>selecting the right string class</h3>
-    <h4>user string classes</h4>
-    <h4>selecting the right string class for a parameter</h4>
-    <h4>selecting the right string class for a local variable</h4>
-    <h4>selecting the right string class for a member variable</h4>
-    <h4>selecting the right string class for a return value</h4>
-    <h4>selecting the right string class in IDL</h4>
-  <h3>dont's</h3>
-
-<h2><a name="users_guide_iterators">using string iterators</a></h2>
-  <h3>what is an iterator?</h3>
-  <h3>reading iterators and writing iterators</h3>
-  <h3>`chunky' iterating for efficiency</h3>
-  <h3><span class="code">copy_string</span>, character sources and sinks</h3>
-  <h3>encoding conversion iterators</h3>
-
-<h2><a name="users_guide_summary">summary</a></h2>
-
-
-<!-- ........................................................Implementor's Guide -->
-<hr>
-<h1><a name="implementors_guide">implementor's guide</a></h1>
-
-<div class="author-note">
-  <p>
-    
-  </p>
-</div>
-
-<div class="contents">
-  <ul>
-    <!-- li></li -->
-  </ul>
-</div>
-
-
-
-<!-- ........................................................................FAQ -->
-<hr>
-<h1><a name="faq">frequently asked questions</a></h1>
-
-<div class="author-note">
-</div>
-
-<div class="contents">
-  <ul>
-<!--
-    <li>
-      I have a wide string, i.e., an instance of a class derived from <span class="code">nsAString</span>
-      <ul>
-        <li>I want a pointer to the characters</span>
-        <li>I want a narrow string</li>
-        <li>I want to <span class="code">printf</span> it</li>
-      </ul>
-    </li>
-    <li>
-      I have a <span class="code">PRUnichar*</span>
-      <ul>
-        <li>I want a wide string</span>
-        <li>I want a narrow string</span>
-        <li>I want to <span class="code">printf</span> it</li>
-      </ul>
-    </li>
-    <li>
-      I have a narrow string, i.e., an instance of a class derived from <span class="code">nsACString</span>
-      <ul>
-        <li>I want a pointer to the characters</span>
-        <li>I want a narrow string</li>
-        <li>I want to <span class="code">printf</span> it</li>
-      </ul>
-    </li>
-    <li>
-      I have a <span class="code">char*</span>
-      <ul>
-        <li>I want a wide string</span>
-        <li>I want a narrow string</span>
-      </ul>
-    </li>
-    <li>
-      I have a literal character sequence, e.g., <span class="code">"Hello, World!\n"</span>
-      <ul>
-        <li>I want a wide string</span>
-        <li>I want a narrow string</span>
-      </ul>
-    </li>
-    <li>What's the best way to return a string?</li>
-    <li>How can I get a pointer to the characters in a string?</li>
-    <li>How can I <span class="code">printf</span> a string?</li>
-  </ul>
--->
-</div>
-
-
-<table class="chart">
-  <tr>
-    <th></th>
-    <th colspan="5">you have some <span class="code">char</span>s</th>
-  </tr>
-  <tr>
-    <th>you want</th>
-    <th><span class="code">'x'</span></th>
-    <th><span class="code">char c</span></th>
-    <th><span class="code">"foo"</span></th>
-    <th><span class="code">char* cp</span></th>
-    <th><span class="code">nsACString& cs</span></th>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">char</span></th>
-    <td colspan="2">.</td>
-<!-- "foo"          -->    <td><span class="code">[]</span></td>
-<!-- char* cp       -->    <td><span class="code">[]</span></td>
-<!-- nsACString& cs -->    <td><a href="#faq_how_to_extract_a_character">extract a character</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">PRUnichar</span></th>
-<!-- 'x'            -->    <td><span class="code">PRUnichar('x')</span></td>
-<!-- char c         -->    <td><span class="code">PRUnichar(c)</span></td>
-    <td colspan="3"><a href="#faq_how_to_convert_encoding">convert encoding</a>, <a href="#faq_how_to_extract_a_character">extract a character</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">char*</span></th>
-<!-- 'x'            -->    <td><span class="code">&amp;</span></td>
-<!-- char c         -->    <td><span class="code">&amp;</span></td>
-<!-- "foo"          -->    <td><span class="code">&amp;</span></td>
-<!-- char* cp       -->    <td>.</td>
-<!-- nsACString& cs -->    <td><a href="#faq_how_to_get_a_pointer">get a pointer</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">PRUnichar*</span></th>
-    <td colspan="5"><a href="#faq_how_to_convert_encoding">convert encoding</a>, <a href="#faq_how_to_get_a_pointer">get a pointer</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">nsACString</span></th>
-<!-- 'x'            -->    <td><span class="code">NS_LITERAL_CSTRING("x")</span></td>
-<!-- char c         -->    <td><a href="#faq_how_to_make_a_string">make a string</a></td>
-<!-- "foo"          -->    <td><span class="code">NS_LITERAL_CSTRING("foo")</td>
-<!-- char* cp       -->    <td><a href="#faq_how_to_make_a_string">make a string</a></td>
-<!-- nsACString& cs -->    <td>.</td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">nsAString</span></th>
-<!-- 'x'            -->    <td><span class="code">NS_LITERAL_STRING("x")</span></td>
-<!-- char c         -->    <td><a href="#faq_how_to_convert_encoding">convert encoding</a></td>
-<!-- "foo"          -->    <td><span class="code">NS_LITERAL_STRING("foo")</span></td>
-    <td colspan="2"><a href="#faq_how_to_convert_encoding">convert encoding</a></td>
-  </tr>
-  <tr>
-    <th class="row-label">to call <span class="code">printf</span></th>
-    <td colspan="4">.</td>
-<!-- nsACString& cs -->    <td><a href="#faq_how_to_call_printf">call <span class="code">printf</span></a></td>
-  </tr>
-</table>
-
-<table class="chart">
-  <tr>
-    <th></th>
-    <th colspan="3">you have some <span class="code">PRUnichar</span>s</th>
-  </tr>
-  <tr>
-    <th>you want</th>
-    <th><span class="code">PRUnichar w</span></th>
-    <th><span class="code">PRUnichar* wp</span></th>
-    <th><span class="code">nsAString& s</span></th>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">char</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">PRUnichar</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td><span class="code">[]</span></td>
-<!-- nsAString& s   -->    <td><a href="#faq_how_to_extract_a_character">extract a character</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">char*</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">PRUnichar*</span></th>
-<!-- PRUnichar w    -->    <td><span class="code">&amp;</span></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td><a href="#faq_how_to_get_a_pointer">get a pointer</a></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">nsACString</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td></td>
-  </tr>
-  <tr>
-    <th class="row-label"><span class="code">nsAString</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td></td>
-  </tr>
-  <tr>
-    <th class="row-label">to call <span class="code">printf</span></th>
-<!-- PRUnichar w    -->    <td></td>
-<!-- PRUnichar* wp  -->    <td></td>
-<!-- nsAString& s   -->    <td><a href="#faq_how_to_call_printf">call <span class="code">printf</span></a></td>
-  </tr>
-</table>
-
-<div class="faq">
-  <dl>
-    <dt>
-      is there any string doc?
-    </dt>
-    <dd>
-      Yes, you're soaking in it!
-    </dd>
-
-
-
-<!-- getting a pointer -->
-    <dt>
-      <a name="faq_how_to_get_a_pointer">I have a string, how do I get a pointer to the characters?</a>
-    </dt>
-    <dd>
-      You want to avoid this situation.
-      In your own interfaces, prefer string types over raw pointers.
-      Any interface that wants to process a string using a single pointer is making two expensive assumptions.
-      First, that the string is stored in one contiguous hunk; and
-        second, that the string is zero-terminated.
-      If this isn't the case,
-        then to get a pointer, storage must be allocated and the entire string must be copied to it and zero-terminated.
-      You may not be able to avoid needing a pointer when interacting with system calls. 
-    </dd>
-    <dd>
-      Some string classes guarantee that they are `flat'.
-      That is, that their data is stored in one contiguous zero-terminated hunk.
-      This <strong>does not</strong> imply that there are no embedded nulls.  Caveat emptor.
-      All strings that explicitly promise flatness
-        inherit from the class <span class="code">nsAFlatString</span>
-          or <span class="code">nsAFlatCString</span>
-        and can produce a constant pointer to their data with the <span class="code">get()</span> member function.
-      Even strings that don't explicitly promise to be flat
-        may happen to be flat.
-      The helper function <span class="code">PromiseFlatString</span> will produce
-        a <span class="code">const</span> dependent string that is guaranteed to be flat.
-      If you use this on a string that already happens to be flat,
-        the result is simply a reference through to that string.
-      Otherwise,
-        <span class="code">PromiseFlatString</span> does the work to allocate, copy, terminate, and manage
-        a temporary flat string.
-      Since the result of <span class="code">PromiseFlatString</span> is a temporary,
-        you must be careful not to get and hold a pointer to its data for longer than the temporary itself lives.
-    </dd>
-    <dd>
-<div class="source-code">
-<pre>
-  /* I have a string, how do I get a pointer to the characters? */
-
-extern void EvilNarrowOSFunction( const char* );    // evil OS routines that want a pointers
-extern void EvilWideOSFunction( const PRUnichar* );
-
-void func( const nsAString&amp; aString, const nsACString&amp; aCString )
-  {
-    EvilWideOSFunction( NS_LITERAL_STRING("Hello, World!").<span class="notice">get()</span> );
-      // literal strings are flat already (as are |nsString|s, et al), just use |.get()|
-
-    EvilWideOSFunction( <span class="notice">PromiseFlatString(</span>aString<span class="notice">).get()</span> );
-      // for strings that don't explicitly guarantee flatness, use |PromiseFlatString|
-
-
-      // beware holding the pointer for longer than the life of the promise
-    <span class="warning">const PRUnichar* wp = PromiseFlatString(aString).get(); // BAD! |wp| dangles
-    EvilWideOSFunction(wp);</span>
-
-      // if you really need to use the pointer from |PromiseFlatString| in more than one expression...
-    const nsAFlatString&amp; flat = <span class="notice">PromiseFlatString(</span>aString<span class="notice">)</span>;
-    EvilWideOSFunction(flat.<span class="notice">get()</span>);
-    SomeOtherFunction(flat.<span class="notice">get()</span>);
-
-      // similarly for |char| strings
-    EvilNarrowOSFunction( <span class="notice">PromiseFlatCString(</span>aCString<span class="notice">).get()</span> );
-  }
-</pre>
-</div>
-    </dd>
-
-
-
-<!-- extracting a character -->
-    <dt>
-      <a name="faq_how_to_extract_a_character">How do I get a particular character out of a string?</a>
-    </dt>
-    <dd>
-      Flat strings provide <span class="code">operator[]</span> and <span class="code">CharAt()</span>.
-      All strings provide <span class="code">First()</span>, <span class="code">Last()</span>, and access with iterators.
-      <strong>Don't</strong> promise a string flat just to do character indexing.
-      Prefer, instead, to get an iterator and <span class="code">advance</span> it to the position you care about.
-    </dd>
-    <dd>
-<div class="source-code">
-<pre>
-  /* How do I get a particular character out of a string? */
-
-PRUnichar Get5thCharacterOf( const nsAString& aString )
-  {
-    if ( aString.Length() >= 5 )
-      {
-        nsAString::const_iterator iter;
-        aString.BeginReading(iter); // make |iter| point to the beginning of |aString|
-        iter.advance(5);
-        return *iter;
-      }
-
-    return PRUnichar(0);
-  }
-</pre>
-</div>
-    </dd>
-    <dd>
-      Using iterators isn't as bad as the example above makes it feel.
-      The typical use is for advancing through a string, examining many characters.
-    </dd>
-
-
-
-<!-- how to convert encoding -->
-    <dt>
-      <a name="faq_how_to_convert_encoding">How do I convert from one encoding to another?</a>
-    </dt>
-    <dd>
-    </dd>
-
-
-
-<!-- how to make a string -->
-    <dt>
-      <a name="faq_how_to_make_a_string">How do I create a string?</a>
-    </dt>
-    <dd>
-    </dd>
-
-
-<!-- how to return a string -->
-    <dt>
-      What is the best way to return a string?
-    </dt>
-    <dd>
-      <p>
-        There are several reasonable ways to produce a string result from a function.
-        If you are already holding the answer as a sharable string,
-          you can simply return that string (pass-by-value).
-        Otherwise,
-          the most efficient and flexible way to return a string is
-          to assign your result into a non-<span class="code">const</span> reference parameter.
-        Don't bother to create a sharable string from scratch with your generated result.
-      </p>
-      <p>
-        Why?
-        The two things you want to minimize in string manipulation are,
-          in order of importance,
-            heap allocation, and
-            moving characters around.
-      </p>
-    </dd>
-    <dd>
-<div class="source-code">
-<pre>
-  /* What is the best way to return a string? */
-
-class foo
-  {
-    public:
-      // ...
-      void GetShortName( nsAString&amp; aResult ) const;
-      nsCommonString GetFullName() const;
-      
-    private:
-      nsCommonString    mFullName;
-
-      const PRUnichar*  mShortName;
-      PRUint32          mShortNameLength;
-      
-  };
-
-nsCommonString
-foo::GetFullName() const
-  {
-    return mFullName;
-  }
-
-void
-foo::GetShortName( nsAString&amp; aResult ) const
-  {
-    aResult = DependentString(mShortName, mShortNameLength);
-  }
-</pre>
-</div>
-    </dd>
-
-
-    <dt>
-      <a name="faq_how_to_call_printf">How do I <span class="code">printf</span> a string, e.g., for debugging.</a>
-    </dt>
-    <dd>
-      If your string is already narrow, you just have to worry about <a href="#faq_how_to_get_a_pointer">making it flat, and then getting a pointer</a>.
-    </dd>
-    <dd>
-      If your string happens to be wide,
-        you'll need to convert it before you can <span class="code">printf</span> something reasonable.
-      If it's just for debugging,
-        you probably wouldn't care if something odd was printed in the case of a Unicode character that didn't have
-        an ASCII equivalent. (If you have a UTF-8 terminal, the result is 
-       perfectly legible and nothing odd is printed.)
-      The simplest thing in this case is to make a temporary conversion using <span class="code">NS_ConvertUTF16toUTF8</span>.
-      The result is conveniently flat already, so getting the pointer is simple.
-      Remember not to hold onto the pointer you get out of this beyond the lifetime of temporary.
-    </dd>
-    <dd>
-<div class="source-code">
-<pre>
-  /* How do I |printf| a string? */
-
-
-void PrintSomeStrings( const nsAString& aString, const PRUnichar* aKey, const nsACString& aCString )
-  {
-      // |printf|ing a narrow string is easy
-    printf("%s\n", <span class="notice">PromiseFlatCString(</span>aCString<span class="notice">).get()</span>);     // GOOD
-
-      // the simplest way to get a |printf|-able |const char*| out of a string
-    printf("%s\n", <span class="notice">NS_ConvertUTF16toUTF8(</span>aKey<span class="notice">).get()</span>);       // GOOD
-
-      // works just as well with an formal wide string type...
-    printf("%s\n", <span class="notice">NS_ConvertUTF16toUTF8(</span>aString<span class="notice">).get()</span>);
-
-
-      // But don't hold onto the pointer longer than the lifetime of the temporary!
-    <span class="warning">const char* cstring = NS_ConvertUTF16toUTF8(aKey).get(); // BAD! |cstring| is dangling
-    printf("%s\n", cstring);</span>
-  }
-</pre>
-</div>
-    </dd>
-
-  </dl>
-
-<p>
-  Here are the email answers I have yet to format into the FAQ.
-  Some of the URLs may be out-dated or moved.
-  The messages are in order from oldest to newest.
-</p>
-<p class="editnote">[Note : In June, 2003, these emails were modified
-to better reflect what is stored in 'wide' string
-classes (UTF-16 string instead of UCS-2)  and what        
-related methods do as a part of the patch for <a href=
-"http://bugzilla.mozilla.org/show_bug.cgi?id=183156" 
-title="replace UCS2 in function/class/method names with UTF16">bug 183156</a>.
-Therefore, they're a little different from  the original emails
-written by <a href="http://ScottCollins.net/">Scott Collins</a>]
-</p>
-<hr>
-<pre>
-Date: Thu, 13 Apr 2000 19:41:47 -0400
-</pre>
-
-<p>Encoding Wars
-
-<p>This message is all about strings and the various encodings that might
-be used to interpret their contents, the ramifications of that, and
-where we're heading.  The point of this message is to say what we're
-currently thinking, and get feedback.  I apologize in advance for the
-rambling, and for the fact that this message may accidentally mix
-discussion of how things <strong>are</strong> and how they will be.
-
-<p>There are many different possible encodings.  Three in common use in
-the Mozilla source base are: ASCII, UTF-16, and UTF-8.  In ASCII, every
-<!--the Mozilla source base are: ASCII, UCS2, and UTF8.  In ASCII, every-->
-character fits in 7-bits and is typically stored in an 8-bit byte.  We
-usually represent ASCII strings with <span class="code">nsCString</span>s, <span class="code">nsXPIDLCString</span>s,
-or <span class="code">char</span> string literals.  In UTF-16, characters occupy one 16-bit code unit (
-<a href="http://www.unicode.org/glossary/index.html#BMP_character">
-<abbr title="Basic Multilingual Plane">BMP</abbr>characters</a>) 
-or two 16-bit code units 
-(<a href="http://www.unicode.org/glossary/index.html#supplementary_character">
-<abbr title="Supplementary Plane : Plane 1 through 16">non-BMP</abbr> characters</a>).
-We usually represent UTF-16 strings as <span class="code">nsString</span>s, etc., i.e., two-byte
-or `wide' strings.  UTF-8 is a multi-byte encoding.  A character might
-occupy one, two, three, or four bytes.  It is easiest to store and
-manipulate such a string within a single-byte or `narrow' string
-implementation.
-
-<p>None of our current string implementations know the encoding of the
-data they hold at any given moment.  An <span class="code">nsCString</span> might legitimately
-hold data encoded in ASCII, UTF-8 or even EBCDIC for that matter.
-
-<p>Operations that convert from one encoding to another, or operations
-that are encoding sensitive (e.g., <span class="code">to_upper</span>), rightly belong in
-i18n.  The fact that our current string interfaces automatically and
-implicitly convert between wide and narrow strings is actually the
-source of many errors in two particular categories: (1) unintended
-extra work, (2) mistaken re-encoding, e.g., accidentally `converting'
-a UTF-8 string to UTF-16 by pretending the UTF-8 string is ASCII and then
-padding with <span class="code">'\0'</span>s.
-
-<p>We've known these were bad for a long time, and have been trying to
-find the right way to fix them.  The current thinking is to just byte
-the bullet and eliminate implicit conversions.  That has interesting
-ramifications.
-
-<div class="source-code">
-<pre>
-void foo( const nsString&amp;  aUTF16string );
-
-foo("hello"); // works!  constructs a temporary |nsString| by
-              // converting the ASCII literal with padding.
-              // Note: this requires an allocation
-</pre>
-</div>
-
-<p>Though we've always hated this form since it requires a heap
-allocation.  In current code, we recommend
-
-<div class="source-code">
-<pre>
-foo( nsAutoString("hello") );
-</pre>
-</div>
-
-<p>which still copy/converts, but at least it probably doesn't need to do
-a heap allocation.  In the best of all worlds, no conversion, copying,
-or allocation would be necessary.  To do that, you would need to be
-able to directly specify a UTF-16 string, e.g., with the <span class="code">L"hello"</span>
-notation, and wrap that in an interface that just held a pointer. 
-E.g., something like
-
-<div class="source-code">
-<pre>
-void foo( const nsAReadableString&amp;  aUTF16string );
-
-foo( nsLiteralString(L"hello") );
-</pre>
-</div>
-
-<p>There are problems with this example, however.  The <span class="code">L</span> notation
-specifically makes objects that are arrays of <span class="code">wchar_t</span>, which under
-GCC is a 4-byte element.  This leads to incompatibility with JS, and
-the annoyance of possibly bloated storage  (I'm sort of minimizing the
-situation here.  It's worse that I make it sound).  More about tricks
-to get around this in a bit, but first, let me talk about what to do
-in the meantime while we're just getting rid of implicit constructors.
- Initially to get around this problem (what problem?  The problem that
-<span class="code">foo("hello")</span> stopped compiling on my machine when I threw the
-switch) I made a routine called <span class="code">NS_ConvertToString</span> which looked like
-this
-
-<div class="source-code">
-<pre>
-inline
-nsAutoString
-NS_ConvertToString( const char* anASCIIstring )
-  {
-    nsAutoString aUCS2string;
-    aUCS2string.AssignWithConversion(anASCIIstring);
-    return aUCS2string;
-  }
-</pre>
-</div>
-
-<p>Which lets me write
-
-<div class="source-code">
-<pre>
-foo( NS_ConvertToString("hello") );
-</pre>
-</div>
-
-<p>This was <strong>OK</strong>, but in discussion there were concerns about performance
-on machines that didn't <span class="code">inline</span> well, and issues about naming.  In
-that meeting we came up with an alternate naming strategy that we
-think has room for growth and an implementation more likely to be
-efficient on every platform.  The implementation is to define a new
-class that derives from <span class="code">nsAutoString</span>, but allows construction from a
-<span class="code">char*</span>
-
-<div class="source-code">
-<pre>
-class NS_ConvertASCIItoUTF16 : public nsAutoString
-  {
-    public:
-      NS_ConvertASCIItoUTF16( const char* );
-      // ...
-  };
-</pre>
-</div>
-
-<p>Which gives identical (though renamed) notation for calling <span class="code">foo</span>:
-
-<div class="source-code">
-<pre>
-foo( NS_ConvertASCIItoUTF16("hello") );
-</pre>
-</div>
-
-<p>It looks like a function call to an explicit encoding conversion.  It
-acts like a function call to an explicit encoding conversion.  It <strong>is</strong>
-a function call to an explicit encoding conversion.  We think that
-this naming pattern has room for growth.  In the meeting, we concluded
-that the best representation for encoding conversions is a family of
-functions, and <span class="code">NS_ConvertASCIItoUTF16</span> fits right in.  We think that
-XPCOM probably can't live without the ASCII to UTF-16 conversion (though
-as explicit as possible) but that all others rightly belong in i18n
-land.
-
-<p>You can probably deduce from the clues in <span class="code">NS_ConvertToString</span>, above,
-that constructors weren't the only thing that became explicit. 
-Assignment, appending, comparison, et al, got renamed so that when
-assigning, appending, or comparing to a value in a different encoding
-the `WithConversion' form must be used.  E.g.,
-
-<div class="source-code">
-<pre>
-nsString aUTF16string;
-nsCString anASCIIstring;
-// ...
-
-aUTF16string += anASCIIstring;  // Currently legal, but not for long
-aUTF16string.Append(anASCIIstring); // same
-
-aUTF16string.AppendWithConversion(anASCIIstring); // the new way
-
-if ( aUTF16string == anASCIIstring ) // Sorry, this is going away too
-  // ...
-
-if ( aUTF16string.EqualsWithConversion(anASCIIstring) )
-  // ...
-</pre>
-</div>
-
-<p>Yes, it's long and annoying.  Just like the extra work you were
-implicitly asking to have done, perhaps incorrectly.  There are other
-reasons to rename these functions.  When <span class="code">nsString</span> and <span class="code">nsCString</span>
-defined a ton of, e.g., <span class="code">Append</span>s each there was no problem, because
-nobody wanted to override <span class="code">Append</span>.  Now, with strings inheriting from
-abstract base classes we immediately run into the problem that
-overriding and overloading don't mix very well in C++.  Because of a
-feature of C++ called name hiding, it is problematic to override only
-a single signature of a name overloaded in a base class.  The base
-<span class="code">nsAWritableString</span> provides several <span class="code">Append</span>s, all for objects of
-(hopefully) the same encoding.  <span class="code">nsString</span> can't easily add a bunch of
-new <span class="code">Append</span>s (the converting ones) without running face first into
-the name hiding problem.  The discussion of the fix for this is mostly
-unrelated to encoding issues, so I'll defer it to another post.
-
-<p>In hindsight, after the meeting, it seemed clear that all the
-`WithConversion' forms would be better named
-
-<div class="source-code">
-<pre>
-xxxConvertingASCIItoUTF16
-xxxConvertingUTF16toASCII
-</pre>
-</div>
-
-<p>however, the <strong>real</strong> goal (probably) is to move most such conversions
-into i18n.  Just bringing attention to the previously implicit
-conversions is a good first step.  Renaming these conversions as just
-suggested is probably the right thing to do, though it sort of
-validates them, which I'm not sure we really want.  This is a decision
-we need to discuss further.
-
-<p>Now, back to the string literal problem above.  One possible solution
-is to use a macro.  Imagine
-
-<div class="source-code">
-<pre>
-NS_LITERAL_STRING("Hello")
-</pre>
-</div>
-
-<p>which on a machine where the <span class="code">L</span> trick works, turns into
-
-<div class="source-code">
-<pre>
-nsLiteralString(L"Hello")
-</pre>
-</div>
-
-<p>but on a machine where there is trouble, turns into something less
-appealing, but more likely to work, like
-
-<div class="source-code">
-<pre>
-NS_ConvertASCIItoUTF16("Hello")
-</pre>
-</div>
-
-<p>Another solution is to add a compilation step that fixes <span class="code">L</span> strings
-on bad platforms to be non-<span class="code">L</span> strings, but padded with <span class="code">\0</span>s.  E.g.,
-<span class="code">L"Hello"</span> gets preprocessed into <span class="code">"\000H\000e\000l\000l\000o\000"</span>. 
-This solution is more annoying to the developer, where the prior
-solution is more annoying during the runtime.
-
-<p>Before we go to too much trouble on this specific feature, we will
-probably want to do more measurement to see just how much and how
-often we are converting constant literal strings, and why.
-
-
-<p>I'm currently ripping through the tree fixing things to use the
-`WithConversion' forms where appropriate.  I was also converting
-things to use <span class="code">NS_ConvertToString</span> where appropriate; unless I get
-talked out of it, I want to switch midstream to
-<span class="code">NS_ConvertASCIItoUTF16</span>, then go back and fix up the
-<span class="code">NS_ConvertToString</span> instances later.  I've set things up so I can
-check in as I go.  After all these conversions have been done, I'll be
-able to throw the switch (what switch?  NEW_STRING_APIS) which will
-make <span class="code">nsString</span> inherit from <span class="code">nsAWritableString</span>, etc. and allow us to
-start exploiting these other opportunities (e.g., for literal strings,
-shared strings, etc.  See
-<a class="exact-uri" href="http://bugzilla.mozilla.org/show_bug.cgi?id=28221">http://bugzilla.mozilla.org/show_bug.cgi?id=28221</a> for details and
-reasoning.)
-
-<p>I guess I'm expecting comments on:
-
-<ul>
-  <li>how really annoying this whole topic is
-  <li>how bad <span class="code">L"xxx"</span> is
-  <li>whether to move forward with <span class="code">NS_ConvertASCIItoUTF16</span>
-  <li>whether we should move to xxxConvertingASCIItoUTF16 etc instead
-      of `WithConverting'
-  <li>arguments about where encoding conversions should live
-  <li>arguments about whether going between 1 and 2 byte storage is an
-      encoding conversion
-  <li>questions about stuff I didn't mention or didn't explain well
-  <li>pointing out stuff I'm just plain wrong about, or things I forgot
-  <li>etc
-</ul>
-
-<p>So as not to jumble the discussion, I'll be separately posting other
-requests for comments about specific features of the design of the new
-string hierarchy.
-
-<p>I hope this helps keep everybody filled in on what we're thinking and
-able to point out what we're forgetting or screwing up :-)
-
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 19 Apr 2000 21:12:47 -0400
-Subject: more string info
-</pre>
-
-<p>  <a class="exact-uri" href="news://news.mozilla.org/scc-705460.16423913042000@news.mozilla.org">news://news.mozilla.org/scc-705460.16423913042000@news.mozilla.org</a>
-
-
-
-
-
-<hr>
-<pre>
-Date: Fri, 26 May 2000 15:31:37 -0400
-Subject: Re: Question on ==
-</pre>
-
-<p>I would prefer you compare with <span class="code">Equals</span> (which should really be named
-<span class="code">IsEqualTo</span>) rather than <span class="code">operator==()</span> because of this:
-
-<div class="source-code">
-<pre>
-char* a;
-char* b;
-
-// ...
-
-if ( a == b )
-  // ...
-</pre>
-</div>
-
-<p>Comparing two raw `string' pointers doesn't compare the characters
-they point to, but instead compares the bits of the pointers.  For
-this reason, I may eventually make comparison of a string with a
-pointer using operators just go away.
-
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 14 Jun 2000 14:38:55 -0400
-Subject: Re: Fix to XprtDefs.h
-</pre>
-
-<p>Yes, we're aware that turning off <span class="code">wchar_t</span> support makes <span class="code">wchar_t</span> be
-a synonym for <span class="code">unsigned short</span> under Metrowerks.  We know that the
-current version of VC++ also makes these types equivalent.  In theory,
-though, the types are distinct even when they are the same size and
-shape.  By using real <span class="code">wchar_t</span> support, we are forced to recognize
-the distinction and navigate it appropriately with <span class="code">reinterpret_cast</span>.
-The win here is that we aren't caught by
-compiler changes that suddenly make some set of compilers compliant
-and therefore break our code.  We will add an autoconf test that lets
-UNIX compilers opt in to our string scheme when they have an
-appropriately shaped <span class="code">wchar_t</span>.  If these happen to be compliant
-compilers, all will be well.  If they don't, the casts don't hurt,
-because they are type correct.  We are writing our code to meet the
-standard as we move forward.
-
-<p>The win for us is realized by the following macros
-
-<div class="source-code">
-<pre>
-#ifdef HAVE_CPP_2BYTE_WCHAR_T
-  #define NS_LITERAL_STRING(s)  nsLiteralString(L##s, \
-                      (sizeof(L##s)/sizeof(wchar_t))-1)
-#else
-  #define NS_LITERAL_STRING(s)  NS_ConvertASCIItoUTF16(s, \
-                       sizeof(s)-1)
-#endif
-</pre>
-</div>
-
-<p>An <span class="code">nsLiteralString</span> points directly to the literal characters.  No
-copying, no conversion, and the length calculation happens at compile
-time.  This has turned out to be as large a savings as 15% of code
-space and 8% of data space, net, in our string test harness  It's
-faster as well, again by eliminating the copying, conversion, and
-length calculation.  We don't know yet what those numbers translate
-into in our real code base, but we have high hopes.
-
-<p>I don't want to be in the position to ask you to change your code.  I
-don't think it's appropriate for me to do so.  The AIM application
-that is your client is our client as well.  They need to resolve this
-difference between us in whatever way they think best.  That may mean
-asking you if changing your apis is the right thing to do.  Or it may
-mean applying the casts.  Our code-base and yours, Justin, are more
-like cousins.  I don't think you should have to change just to conform
-to us.  You may think my arguments for using real <span class="code">wchar_t</span> have
-merit, and adopt similar usage just because you agree; but I think the
-only obligation you have is to follow the technical solution you think
-is right for your code.
-
-<p>If you decide to make this api change, it will mean shipping a new
-binary (on Mac) for your library to clients who want to switch over to
-the new api (since the name mangling will be different, and therefore,
-the link requirements will change).
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 15 Jun 2000 19:36:55 -0400
-Subject: Re: Checkin approval for bug 32336
-</pre>
-
-<div class="source-code">
-<pre>
-S.Equals(NS_LITERAL_STRING("bar"), PR_TRUE, 3)
-</pre>
-</div>
-
-<p>doesn't compile because there is no three parameter form for <span class="code">Equals</span>.
- For all definitions of <span class="code">Equals</span> on strings, see "nsAReadableString.h"
-
-<p><a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h</a>
-
-<p>There is an <span class="code">EqualsWithConversion</span> that takes three parameters.
-
-<p>  <a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsString2.h#731">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsString2.h#731</a>
-
-<p>It is ``EqualsWithConversion'' because it admits the possibility of an
-encoding specific transformation, in this case to provide
-case-insensitive comparison.  This also wouldn't compile, however,
-since, at the moment, an <span class="code">nsLiteralString</span> doesn't provide an operator
-to produce a <span class="code">const PRUnichar*</span> (though perhaps it should), and it
-doesn't satisfy the other interfaces that match this call, e.g., a
-<span class="code">const nsString&</span>.
-
-<p>Perhaps I need to move case-insensitive comparison up out of
-<span class="code">nsString</span> into a global encoding specific transformations and
-algorithms file (which was on its way anyway as Waterson, knows); this
-use is one bit of evidence to support this.  In the short term, this
-can be fixed (if we think the current behavior is wrong) by providing
-<span class="code">operator const CharT*() const</span> on literal string.
-
-<p>If you can live with out case-folding, the earlier form is preferred
-
-<div class="source-code">
-<pre>
-S == NS_LITERAL_STRING("bar")
-</pre>
-</div>
-
-<p>if you can't, then one of the fixes I mentioned is in order.
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 15 Jun 2000 19:47:12 -0400
-Subject: Re: [Fwd: how to use nsString ?]
-</pre>
-
-<pre class="email-quote">
-  >I see these same examples time and again in the embedding
-  >samples/docs, but I can't compile them.
-</pre>
-
-<p>Apologies.  Documentation mentioning strings is getting out of date. 
-Here are some specific answers.
-
-
-<pre class="email-quote">
-  >nsString URLString("http://www.mozilla.org");
-</pre>
-
-<p>...is now perhaps best expressed as
-
-  nsString URLString( NS_LITERAL_STRING("http://www.mozilla.org") );
-
-<p>since an <span class="code">nsString</span> is a sequence of 2-byte wide characters, and the
-routines that implicitly convert 1-byte sequences (like the literal
-sequence you specified, "http:...") are now gone.
-
-<p>Up until not too long ago, one would have had to say
-
-<div class="source-code">
-<pre>
-nsString URLString;
-URLString.AssignWithConversion("http://www.mozilla.org");
-</pre>
-</div>
-
-<p>The <span class="code">NS_LITERAL_STRING</span> construction is new machinery that has the
-potential to make many operations much more efficient.
-
-<pre class="email-quote">
-  >nsString URLString;
-  >URLString.SetString("www.mozilla.org");
-</pre>
-
-<p><span class="code">SetString</span> was a synonym for <span class="code">Assign</span> or assignment with
-<span class="code">operator=()</span>, it too went away.  The equivalent is the second
-example I gave above, that is, the one with <span class="code">AssignWithConversion</span>. 
-
-<p><span class="code">Assign</span> still exists.  <span class="code">AssignWithConversion</span> takes on that
-functionality for assignments that require encoding transformations
-(e.g., from ASCII to UTF16).  <span class="code">SetString</span> is gone, since it was always
-a synonym for <span class="code">Assign</span>. 
-
-<p>Learn more about the general APIs for strings that we are trying to
-move to by examining
-
-<a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h</a>
-<a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAWritableString.h">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAWritableString.h</a>
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 15 Jun 2000 21:26:51 -0400
-Subject: Re: Checkin approval for bug 32336
-</pre>
-
-<pre class="email-quote">
-  >I *need* the count attribute, because I need to compare only the first 
-  >chars (that's inherent to the logic).
-</pre>
-
-<p>This is what substrings are for.  In that case, you could use
-
-<div class="source-code">
-<pre>
-Substring(S, 0, 3) == NS_LITERAL_STRING("bar")
-</pre>
-</div>
-
-<p>As for case-folding, it's best if you can case-fold everything up
-front, instead of doing it repeatedly.  I'll have to get back to you
-on a general solution to that problem, or what my schedule for getting
-it checked in would be.  I'm sorry, I know that's not what you needed
-to hear.  If the source string is an <span class="code">nsString</span>, you can continue to
-exploit its implementation of these routines, e.g., <span class="code">ToLower</span> all
-up-front.
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Mon, 19 Jun 2000 14:23:47 -0400
-Subject: Re: string fu
-</pre>
-
-<pre class="email-quote">
-  >It seems less convenient to have to first check path.IsEmpty, and
-  >then if false get path.Last and test it.
-</pre>
-
-<p>What would you prefer?  That extracting a character not in the string
-always return <span class="code">CharT(0)</span>?  Can't do it for two reasons: (1) <span class="code">0</span> may be
-a valid character in a particular encoding, so it can't be used in
-general as a ``no character at that position'' marker; and (2) I can't
-control what an individual string implementation does when asked to
-get an out-of-bounds fragment, it's explicitly undefined.  That means
-the result of <span class="code">CharAt</span> is explicitly undefined for indexes outside the
-defined contents of the string.  As a debugging convenience, I have
-made this assert, but it has always been the case that retrieving such
-a character had undefined results ... even in [the old] code.
-
-<p>OK, you might say, well at least let me ask for a character that is
-only off the end by one.  E.g., <span class="code">Last</span> of an empty string.  Reason (1)
-from above still applies.  How bad is it to say, for the case you gave
-
-<div class="source-code">
-<pre>
-PRBool needsDelim = PR_FALSE;
-if ( !path.IsEmpty() )
-  {
-    PRUnichar last = path.Last();
-    needsDelim = !(last == '/' || last == '\\');
-  }
-</pre>
-</div>
-
-<p>In general, you probably want to opt out of a whole lot of work when
-the source string is empty.  It is slightly less convenient, but it
-doesn't tie us to a bunch of implementation specific mojo.
-
-
-<pre class="email-quote">
-  >Can we fix GetUnicode in this case?
-</pre>
-
-<p>This is an annoying property of auto strings, e.g., that they always
-have an allocated buffer.  I'm happy to fix this bug, however, be
-aware that <span class="code">GetUnicode</span> and <span class="code">GetBuffer</span> are artifacts of [the old]
-implementation that we don't want to support.  They are not part of
-the abstract interface.  We will keep them no longer than we have to. 
-They don't support our multi-fragment paradigm.  People who require a
-contiguous hunk of characters in the future, and are unwilling to
-switch over to chunky-iterators, may be forced to copy the string to
-their own buffer.  There will be an implementation of narrow character
-string that guarantees contiguous allocation and a zero-terminator,
-much as <span class="code">nsCString</span> does now, for compatibility with platform uses,
-but this won't be the default string class.
-
-
-
-
-
-<hr>
-<pre>
-Date: Mon, 19 Jun 2000 17:22:31 -0400
-</pre>
-
-<p>Clarifying String Sematics
-
-<p>Recently, I added an assert to the string operations that extract
-characters, namely <span class="code">First()</span>, <span class="code">Last()</span>, <span class="code">CharAt()</span>, and
-<span class="code">operator[]()</span>.  This assert fires when any of these routines are used
-to access a character outside the defined contents of the string.  For
-<span class="code">First()</span> and <span class="code">Last()</span> that means whenever they are applied to an
-empty string.  For <span class="code">CharAt()</span> and <span class="code">operator[]()</span>, that means whenever
-they are used to access an index outside the range of
-<span class="code">0</span>..<span class="code">Length()-1</span>.  There have been some complaints, however, the
-result was always undefined.  What follows is extracted from an email
-exchange between me and warren on this topic.  I hope it clarifies
-strings semantics
-
-<p>Warren writes:
-<pre class="email-quote">
-  >I hit your funky CharAt assertion tonight in this piece of code:
-
-  >NS_IMETHODIMP
-  >nsIOService::ResolveRelativePath(
-  >    const char *relativePath,
-  >    const char* basePath,
-  >    char **result )
-  >  {
-  >    nsCAutoString name;
-  >    nsCAutoString path(basePath);
-  >    
-  >    PRUnichar last = path.Last();
-  >    PRBool needsDelim = !(last == '/' || last == '\\' || last ==
-  >    '\0');
-  >    ...
-
-  >where basePath is null. It seems less convenient to have to first
-  >check path.IsEmpty, and then if false get path.Last and test it.
-</pre>
-
-<p>I replied:
-<pre class="email-quote">
-  >What would you prefer?  That extracting a character not in the
-  >string always return <span class="code">CharT(0)</span>?  Can't do it for two reasons:
-  >(1) <span class="code">0</span> may be a valid character in a particular encoding, so it
-  >can't be used in general as a ``no character at that position''
-  >marker; and (2) I can't control what an individual string
-  >implementation does when asked to get an out-of-bounds fragment,
-  >it's explicitly undefined.  That means the result of <span class="code">CharAt</span> is
-  >explicitly undefined for indexes outside the defined contents of
-  >the string.  As a debugging convenience, I have made this assert,
-  >but it has always been the case that retrieving such a character
-  >had undefined results ... even in [the old] code.
-
-  >OK, you might say, well at least let me ask for a character that
-  >is only off the end by one.  E.g., <span class="code">Last</span> of an empty string.
-  >Reason (1) from above still applies.  How bad is it to say, for the
-  >case you gave
-
-  >  PRBool needsDelim = PR_FALSE;
-  >  if ( !path.IsEmpty() )
-  >    {
-  >      PRUnichar last = path.Last();
-  >      needsDelim = !(last == '/' || last == '\\');
-  >    }
-
-  >In general, you probably want to opt out of a whole lot of work
-  >when the source string is empty.  It is slightly less convenient,
-  >but it doesn't tie us to a bunch of implementation specific mojo.
-</pre>
-
-<p>Warren also asks:
-<pre class="email-quote">
-  >Here's another issue, perhaps more serious. If I say this:
-
-  >  foo(const PRUnichar* s) {
-  >    nsAutoString str(s);
-  >    bar(str.get());
-  >  }
-
-  >where s is null, bar will get passed a zero-length PRUnichar
-  >sequence instead of null. This makes it so that you can't just
-  >test for the argument == null. You have to nsCRT::strlen(arg) == 0
-  >which is much less efficient. Can we fix GetUnicode in this case?
-</pre>
-
-<p>And I reply:
-<pre class="email-quote">
-  >This is an annoying property of auto strings, e.g., that they
-  >always have an allocated buffer.  I'm happy to fix this bug,
-  >however, be aware that <span class="code">GetUnicode</span> and <span class="code">GetBuffer</span> are artifacts
-  >of [the old] implementation that we don't want to support.  They
-  >are not part of the abstract interface.  We will keep them no
-  >longer than we have to.  They don't support our multi-fragment
-  >paradigm.  People who require a contiguous hunk of characters in
-  >the future, and are unwilling to switch over to chunky-iterators,
-  >may be forced to copy the string to their own buffer.  There will
-  >be an implementation of narrow character string that guarantees
-  >contiguous allocation and a zero-terminator, much as <span class="code">nsCString</span>
-  >does now, for compatibility with platform uses, but this won't be
-  >the default string class.
-</pre>
-
-<p>In a later message, Chris Waterson asks a related question
-<pre class="email-quote">
-  >scc: should we add <span class="code">operator PRUnichar*()</span> to
-  >NS_ConvertASCIItoUTF16?
-</pre>
-
-<p>And I reply:
-<pre class="email-quote">
-  >It seems reasonable.  A lot more reasonable that forcing people to
-  >call <span class="code">GetUnicode()</span>.  I alluded to platform specific classes in an
-  >earlier message to warren that you were cc'd on, Chris.  I imagine
-  >that the <span class="code">...Convert...</span> routines would be required to produce
-  >contiguous allocation 0-terminated strings (though the as yet
-  >unimplemented <span class="code">...Copy...</span> forms, of course wouldn't.  So <span class="code">operator
-  >const PRUnichar*() const</span> makes perfect sense to me here.
-</pre>
-
-<p>Hope this makes sense,
-
-
-
-
-<hr>
-<pre>
-Date: Tue, 20 Jun 2000 04:05:31 -0400
-Subject: Re: NS_LITERAL_STRING is broken
-</pre>
-
-<p>The behavior you describe sounds exactly like when you say
-
-<div class="source-code">
-<pre>
-const char* foobar = "foobar";
-
-... NS_LITERAL_STRING(foobar).get() ...
-</pre>
-</div>
-
-<p>because in this case, the thing passed in is a <span class="code">const char*</span>. 
-<span class="code">NS_LITERAL_STRING</span> is not meant to be used in this way.  It is only
-meant to be used around a <span class="code">"</span> delimited string.  The type of such is
-<span class="code">const char[N]</span> where N is the number of characters in the string + 1
-for the zero terminator it helpfully adds.  <span class="code">sizeof</span> such a type is
-<span class="code">N</span>.
-
-<p>Are you sure you had the actual string as an argument, as in your
-example to me?  Or could the actual code have been like my sample,
-above?
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 29 Jun 2000 13:35:10 -0400
-Subject: Re: a fix
-</pre>
-
-<pre class="email-quote">
-  > +       if (Length() == 0) { return nsnull; }
-</pre>
-
-
-<p>Dave,
-
-<p>please read
-
-  <a class="exact-uri" href="news://news.mozilla.org/scc-314ABF.14261619062000@news.mozilla.org">news://news.mozilla.org/scc-314ABF.14261619062000@news.mozilla.org</a>
-
-<p>It's just plain wrong to let people try to index into a string outside
-its defined contents.  I can't just return <span class="code">'\0'</span> or <span class="code">PRUnichar('\0')</span>
-there as that <strong>could</strong> be a legal value to have somewhere in your
-string for some encodings ... and the encoding is not specified.  So
-your patch has the basic problem of defeating my plan to stop people
-from doing this bad thing.
-
-<p>The second problem with your patch is that you use the symbolic
-constant <span class="code">nsnull</span>, which is ostensibly a pointer value; <span class="code">Last</span> returns
-a character.  <span class="code">nsnull</span> is not appropriate for that purpose.  In fact,
-C++ gurus pretty much eschew the use of symbolic constants for <span class="code">0</span>. 
-<span class="code">NULL</span> is to be avoided.  <span class="code">nsnull</span> is wrong-headed in that it presumes
-we could have some <strong>other</strong> application specific value for <span class="code">NULL</span>.  We
-can't, it would never work.  It's just wasted brain-print.  Always use
-<span class="code">0</span> for these situations, and if you want to communicate the fact that
-something is a pointer type, either use a comment or a
-(construction-style) cast, like so (graded examples from worst to
-best:)
-
-<ul>
-  <li>F: FindChildByNameWithHint("Chuck", nsnull);
-
-  <li>D: FindChildByNameWithHint("Chuck", NULL);
-
-  <li>C: FindChildByNameWithHint("Chuck", /* Child* */ 0);
-
-  <li>B: typedef Child* Child_ptr;
-     FindChildByNameWithHint("Chuck", Child_ptr(0));
-
-  <li>A: FindChildByNameWithHint("Chuck", 0);
-</ul>
-
-<p>Don't let this discourage you; keep up the good work :-)
-
-
-
-
-
-<hr>
-<pre>
-Date: Tue, 8 Aug 2000 23:47:16 -0400
-Subject: Re: nsWritingIterator?
-</pre>
-
-<pre class="email-quote">
-  >Can you give me any pointers to examples, or docs, or just some
-  >general advice?
-</pre>
-
-  <a class="exact-uri" href="http://ScottCollins.net/Journal/discussion/string_iterators.html">http://ScottCollins.net/Journal/discussion/string_iterators.html</a>
-
-<p>does this help?
-
-<p>I can personally walk you through any specific scenario you need.
-
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 9 Aug 2000 02:35:03 -0400
-Subject: Re: nsWritingIterator?
-</pre>
-
-<p>You got it right... it's <span class="code">nsWritingIterator<CharT></span> for whichever
-character type you care about, either <span class="code">char</span> or <span class="code">PRUnichar</span>.  You
-_can_ use this iterator like a character pointer ... that is, you can
-dereference it, assign into its dereference, etc.  It is more
-efficient, though, to directly address a particular range of
-characters around where it points by asking it for its actual
-character pointer with <span class="code">get</span>, and knowing that there are
-<span class="code">size_forward()</span> characters available ahead of that pointer and
-<span class="code">size_backward()</span> characters available behind it.  After examining
-those characters by hand, you can advance the iterator beyond the
-characters you have examined (and possibly into the next chunk, should
-one exist) by adding into it (with +=) the count of the characters you
-have processed.
-
-<p>Here are three examples of running through a string and modifying some
-of the characters in it.  All use <span class="code">nsWritingIterator</span>s.
-
-
-<div class="source-code">
-<pre>
-  // inefficient, but works in a pinch:
-  //  iterators can hide all details of chunks by acting like
-  //  a raw character pointer
-
-nsWritingIterator&lt;PRUnichar&gt; s = S.BeginWriting();
-nsWritingIterator&lt;PRUnichar&gt; done_with_string = S.EndWriting();
-
-  // for each character in the string |S|
-while ( s != done_with_string )
-  {
-      // if the character is lower case, capitalize it
-    if ( 'a' &lt;= *s &amp;&amp; *s &lt;= 'z' )
-      *s = *s -'a' + 'A';
-  }
-
-
-
-
-  // efficient
-  //  iterators provide a mechanism by which you can process
-  //  a chunk-at-a-time
-
-nsWritingIterator&lt;PRUnichar&gt; iter = S.BeginWriting();
-nsWritingIterator&lt;PRUnichar&gt; done_with_string = S.EndWriting();
-
-  // for each chunk of the string
-while ( iter != done_with_string )
-  {
-    size_t N = iter.size_forward();  // # of chars in this chunk
-    PRUnichar* s = iter.get();
-    PRUnichar* done_with_chunk = s + N;
-
-      // for each character in this chunk
-    for ( ; s &lt; done_with_chunk; ++s )
-      {
-         // if the character is lower case, capitalize it
-       if ( 'a' &lt;= *s &amp;&amp; *s &lt;= 'z' )
-          *s = *s - 'a' + 'A';
-      } 
-
-      // advance the iterator past characters
-      //  we examined (and into the next chunk, if any)
-    s += N;
-  }
-
-
-
-  // elegant
-  //  pull your transformation into a `sink', and |copy_string|
-  //  will efficiently pump any kind of string into it
-
-struct Capitalize
-  {
-      // inline
-    PRUint32
-    write( PRUnichar* s, PRUint32 N )
-        // processes one chunk, called repeatedly by |copy_string|
-      {
-        PRUnichar* done_with_chunk = s + N;
-
-         // for each character in this chunk
-        for ( ; s &lt; done_with_chunk; ++s )
-          {
-              // if the character is lower case, capitalize it
-            if ( 'a' &lt;= *s &amp;&amp; *s &lt;= 'z' )
-              *s = *s - 'a' + 'A';
-          }
-      }
-  };
-
-copy_string(S.BeginWriting(), S.EndWriting(), Capitalize());
-</pre>
-</div>
-
-
-
-<p>Does this show it better?
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 17 Aug 2000 18:23:22 -0400
-</pre>
-
-<pre class="email-quote">
-  >I tried looking at the string header files but they
-  >are awfully complicated.
-</pre>
-
-<p>I'll explain things in a little <strong>more</strong> detail than you need, then so
-that some of the stuff you see in these headers will make more sense. 
-I'll also answer your questions out of order.
-
-<p>First: the string hierarchy looks like this
-
-<a class="exact-uri" href="http://ScottCollins.net/Journal/discussion/string_hierarchy.gif">http://ScottCollins.net/Journal/discussion/string_hierarchy.gif</a>
-
-<p>The two most important headers are:
-
-<a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAReadableString.h</a>
-<a class="exact-uri" href="http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAWritableString.h">http://lxr.mozilla.org/seamonkey/source/xpcom/ds/nsAWritableString.h</a>
-
-<p>These abstract classes, <span class="code">nsAReadable[C]String</span>, and
-<span class="code">nsAWritable[C]String</span> are typically what you will want to use in the
-interfaces of new code.  If you write a piece of code that takes a
-string for input, consider, e.g.,
-
-<div class="source-code">
-<pre>
-void consumes_a_string( const nsAReadableString&amp;  aInput );
-</pre>
-</div>
-
-<p>If you write a piece of code that modifies a string, consider
-
-<div class="source-code">
-<pre>
-void modifies_a_string( nsAWritableString&amp;  aResult );
-</pre>
-</div>
-
-
-<p>When creating your own classes, member strings will typically be
-<span class="code">nsString</span>s.  When you can't avoid creating a short string that you
-need only temporarily during a function, you will typically use
-<span class="code">nsAutoString</span>.  When someone passes you a raw pointer, or a raw
-pointer and a length, representing a buffer of characters that you may
-examine, but won't own, you can treat it like a string by wrapping it
-in an <span class="code">nsLiteralString</span>, e.g.,
-
-<div class="source-code">
-<pre>
-void
-reads_a_buffer( const PRUnichar* aInput, PRUint32 aInputLength )
-  {
-    nsLiteralString input(aInput, aInputLength);
-      // doesn't allocate or copy
-
-    // ...
-  }
-</pre>
-</div>
-
-<p>You will use <span class="code">nsLiteralString</span> around quoted constant strings as well,
-though typically through the <span class="code">NS_LITERAL_STRING</span> macro, to avoid doing
-a length calculation 
-
-<div class="source-code">
-<pre>
-NS_LITERAL_STRING("x")
-</pre>
-</div>
-
-<p>expands to
-
-<div class="source-code">
-<pre>
-nsLiteralString(L"x", (sizeof(L"x")/sizeof(PRUnichar) - 1))
-</pre>
-</div>
-
-<p>if <span class="code">L</span> notation works as needed on your platform.
-
-Those are the basics.  Now onto your questions:
-
-
-<pre class="email-quote">
-  >For example this won't compile. [...]
-
-  >str1 += L"abc " + str2 + L"def";
-</pre>
-
-
-<p><span class="code">L"abc "</span> makes a an object that is a <span class="code">const wchar_t[5]</span>, and none of
-the string code knows about <span class="code">wchar_t</span>.  The main reason is that
-<span class="code">wchar_t</span> is not necessarily the right size (it can be 4 bytes under
-gcc).  If you wrap these constant expressions in <span class="code">NS_LITERAL_STRING</span>,
-as described above, you should get the right thing, e.g., 
-
-<div class="source-code">
-<pre>
-str1 += NS_LITERAL_STRING("abc ") + str2 + NS_LITERAL_STRING("def");
-</pre>
-</div>
-
-
-<pre class="email-quote">
-  >Another one is:
-  >function(const PRUnichar *foo);
-  >call function(L"abc " + str2);
-
-  >It won't create a temporary nsString.
-</pre>
-
-<p>This one, I have a quick and easy explanation for.  If <span class="code">function</span> was
-declared like this
-
-<div class="source-code">
-<pre>
-function( const nsAReadableString&amp;  )
-</pre>
-</div>
-
-<p>then, no problem, since a <span class="code">nsPromiseConcatenation</span> (which was the
-result of adding those two things together) <strong>is</strong> a readable string. 
-No other objects need to be created; no copying needs to be performed.
-
-<p>In all cases, we want the creation of <span class="code">nsString</span>s et al, to be
-<span class="code">explicit</span>, since creation is unbelievably expensive, requiring heap
-allocation, locks, copying, etc.
-
-<p>I hope this answers both your posts,
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 17 Aug 2000 20:57:08 -0400
-Subject: re our conversation
-</pre>
-
-  return ToNewUnicode( nsLiteralCString(buffer) );
-
-
-
-
-
-
-<hr>
-<pre>
-Date: Fri, 18 Aug 2000 02:52:45 -0400
-Subject: Re: More questions and new string API
-</pre>
-
-<pre class="email-quote">
-  >1) How do I return a static string?
-
-  >const nsAReadableString&amp;  foo() {return NS_LITERAL_STRING("x");}
-  >errors on taking the address of a temporary variable.
-</pre>
-
-<p>Unfortunately, <span class="code">NS_LITERAL_STRING</span>s definition is not particularly
-amenable to this use.  Instead, you would have to say something like
-this:
-
-<div class="source-code">
-<pre>
-const nsAReadableString&
-foo()
-  {
-#ifdef HAVE_CPP_2BYTE_WCHAR_T
-    static nsLiteralString static_foo(L"x", 1);
-#else
-    static nsLiteralString static_foo;
-    static PRBool initialized = PR_FALSE;
-    if ( !initialized )
-      {
-        static_foo.AssignWithConversion("x", 1);
-        initialized = PR_TRUE;
-      }
-#endif
-    return static_foo;
-  }
-</pre>
-</div>
-
-
-<pre class="email-quote">
-  >2) I'm using these with the STL library in an XPCOM component.
-  >What type should I use with map?  This doesn't work...
-
-  >typedef map<const nsAReadableString&, myType*> mapStringMyType;
-  >mapStringMyType foo;
-  >foo.find(nsAReadableString);  - I want to find on a ReadableString
-</pre>
-
-<p>I don't know what errors you are getting; but it probably doesn't work
-because a reference isn't an assignable type.  This is just a guess. 
-You may need to use
-
-<div class="source-code">
-<pre>
-map<const nsAReadableString*, myType*>
-</pre>
-</div>
-
-<p>If you actually want the map to manage ownership of the keys, then
-you'll want to use a concrete type, e.g.,
-
-<div class="source-code">
-<pre>
-map<nsString, myType*>
-</pre>
-</div>
-
-<p>or perhaps
-
-<div class="source-code">
-<pre>
-map<nsSharedStringPtr, myType*>
-</pre>
-</div>
-
-<p>Or maybe there's something else wrong.  Send me the error messages. 
-If you end up using a pointer, then of course you'll have to supply a
-comparison function to the <span class="code">map</span> template.  You won't be satisfied
-with the default comparison of pointers :-)  Sorry I couldn't answer
-this one more completely.
-
-
-<pre class="email-quote">
-  >3) How do a get a raw PRUnichar pointer out of nsAReadableString
-  >when I need to call something that wants 'unsigned short *'?
-</pre>
-
-<p>The problem with this scenario is that an <span class="code">nsAReadableString</span> doesn't
-promise that all its data is contiguous, nor that it is
-zero-terminated, which is what I suspect you want in this case.  If
-the function you want to call can take {pointer, length} tuples, and
-can consume the string in hunks without zero termination ... then you
-can use <span class="code">copy_string</span> to pump the string into your function, see
-
-  <a class="exact-uri" href="http://ScottCollins.net/Journal/discussion/string_iterators.html">http://ScottCollins.net/Journal/discussion/string_iterators.html</a>
-
-<p>If not, and you absolutely have to have a contiguous zero-terminated
-buffer, then there is a new facility (part of the DOMAPI branch) that
-does what you need.  It's not checked in on the trunk; it should
-be in early next week.  It is <span class="code">nsPromiseFlatString</span>.  This class
-promises a contiguous zero-terminated buffer; and has an <span class="code">operator
-PRUnichar*</span> to produce a pointer to that buffer automatically.  If the
-underlying class <strong>is</strong> one that happens to be a single fragment and
-zero-terminated, then, like <span class="code">nsPromiseSubstring</span> and
-<span class="code">nsPromiseConcatenation</span>, this class merely holds a reference into the
-original data.  If, however, the underlying string is multi-fragment
-or not zero-terminated, then <span class="code">nsPromiseFlatString</span> allocates a
-contiguous buffer of appropriate size and copies the fragmented string
-data to it.  So given
-
-<div class="source-code">
-<pre>
-void ReadBuffer( PRUnichar* );
-</pre>
-</div>
-
-<p>You can call this as efficiently as possible with an arbitrary string
-like so
-
-<div class="source-code">
-<pre>
-ReadBuffer( nsPromiseFlatString(aString) );
-</pre>
-</div>
-
-
-<p>If the function you are calling needs to take ownership of the buffer
-you hand it, then you will probably call <span class="code">ToNewUnicode</span> like so
-
-<div class="source-code">
-<pre>
-void ConsumeBuffer( PRUnichar* );
-
-ConsumeBuffer( ToNewUnicode(aString) );
-</pre>
-</div>
-
-<p>The global function <span class="code">ToNewUnicode</span> is declared in "nsReadableUtils.h",
-and was only recently added to the build.  It is currently being used
-in the DOMAPI branch.  It is part of the build, but the file
-"dlldeps.c" in XPCOM may need to be modified to ensure it is exported
-on your platform if you are building the tip.
-
-Needless to say, you want to avoid functions that require bare
-pointers for several reasons: (a) they typically assume
-zero-termination, which is not guaranteed by the normal encodings; (b)
-they require contiguous allocation, which may not be possible; (c)
-they scan for the end of the string, at linear cost (if the encoding
-makes it possible at all), when the length could be known in advance. 
-If you have to do it, the above mechanisms work, but be aware of the
-cost and the potential need to copy.
-
-
-<pre class="email-quote">
-  >4) How do I declare a local variable to hold a nsAReadableString?
-  >and a member variable?
-</pre>
-
-<p><span class="code">nsAReadableString</span> is an abstract type.  So you can't have a concrete
-instance of it.  All strings in the hierarchy are readable strings. 
-If you just want a reference to a readable string, you can say, e.g.,
-
-<div class="source-code">
-<pre>
-struct foo
-  {
-    const nsAReadableString&amp;  mString;
-    // ...
-
-    foo( const nsAReadableString&amp;  aString ) : mString(aString) { }
-  };
-</pre>
-</div>
-
-<p>...similarly with pointers; but I suspect you are looking for
-something more concrete.  An <span class="code">nsString</span> is a <span class="code">nsAReadableString</span>, and
-is the typical thing you want as a member variable.  An <span class="code">nsAutoString</span>
-is also an <span class="code">nsAReadableString</span> and is typically what you would use for
-a short (in length) temporary (in lifetime) local variable, as I
-mentioned in my previous post.
-
-
-<pre class="email-quote">
-  >5) If I call a function that returns a PRUnichar* and I want t
-  >use it as a nsAReadableString should I wrap it in a
-  >nsLiteralString?
-</pre>
-
-<p>Yes, though remember, an <span class="code">nsLiteralString</span> assumes the lifetime of the
-underlying data is under someone else's control.  If the called
-function gives you a buffer that you need to <span class="code">delete</span>, you will have
-to manage that yourself.  Currently, people often use <span class="code">nsXPIDLString</span>
-to handle that.  XPIDL strings are <strong>not</strong> part of the hierarchy.  They
-are only used as a sort of string-<span class="code">auto_ptr</span>.  However, I'm
-integrating their functionality into <span class="code">nsString</span>.  There is no problem
-in wrapping the same pointer in both as two separate local variables,
-one to give you the readable interface, and one to manage the
-lifetime.
-
-<p>If it's OK with you, I'd like to post this reply (including your
-quoted questions) to n.p.m.xpcom and also put a copy near the string
-iterator discussion I provided a link to above, so that other people
-with similar questions can see these answers.
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Sun, 3 Sep 2000 03:52:17 -0400
-</pre>
-
-<p>In article <8nu9m2$eo14@secnews.netscape.com>, "Jon Smirl" 
-<jonsmirl@mediaone.com> wrote:
-
-> I have the new strings up and running in my app. They work as
-> advertised  and
-> I haven't found any bugs. Thanks for the good job in designing and
-> implementing them.  Here's are a summary of issues I've encountered
-> so far...
-
-<p>Thanks, and I appreciate your comments and insights.
-
-
-> 
-> 1) Should there be a nsSegmentedString derived from nsString instead
-> of building segment support into nsString? None of my strings are
-> segmented  but
-> I keep executing code that is supports it. nsPromiseFlatString would
-> be trivial in the non-segmented case.
-
-<p>The general case is that a string does not promise to have contiguous
-data.  A specific case is that, for some implementations, it does. 
-You couldn't do it the other way around, because a segmented string
-couldn't satisfy all the promises of a flat string.  However, through
-the use of chunky iterators, operating on strings that happen to be
-flat is very efficient.  In fact, <span class="code">nsPromiseFlatString</span> is trivial in
-the non-segmented case.  In addition, I'll be adding an abstract flat
-class into the hierarchy, which will present additional interface ...
-in your local routines where you actually have declared a concrete
-string instance that happens to be flat, the compiler will give you
-the benefit of using the flat specific routines (e.g., a substring
-object over a flat string is simpler than the general purpose
-substring).  I need to be cautious about this, though, since I don't
-automatically want people propagating the flat type through their
-interfaces.  That would put us in the same boat we're in right now ...
-where routines only work on a specific kind of string, which denies
-other parts of the code the opportunity to use an implementation
-beneficial to its specific needs, and typically for no good reason.
-
-> 
-> 2) Should nsAWritableString have a way to get the buffer and then
-> return  it?
-> I need to get the buffer to pass it to OS calls. I'm doing this now
-> by passing around nsStrings instead of the interface.  If I just use
-> the interface I encur an extra copy since I have to use a temporary
-> buffer. 
-
-<p>A specific string implementation could promise this, but in general, a
-writable could not.  After all, a writable doesn't even guarantee
-contiguous storage.  To some degree, this is what
-<span class="code">nsPromiseFlatString</span> is for.  However, this is a readable promise
-only.  It will also be the case that <span class="code">ns[C]String</span>s, in the very near
-future will be able to just assume ownership of an arbitrary buffer
-allocated on the free store with the XPCOM allocators ... getting one
-to give up its buffer, on the other hand, presents some problems.  Do
-you have a lot of places where the system writes into your string
-buffer space?  Or do you have a lot of system routines that return you
-new buffers?  I can imagine using <span class="code">nsPromiseFlatString</span> for this, but
-what happens when the OS alters the underlying data?  If the promise
-had generated that flat data on behalf of a multi-fragment string,
-should it now put the changes back?  It's possible to do, I just want
-to know if it's correct to allow this situation to happen.
-
-
-
-> 
-> 3) There needs to be a NS_LITERAL_CHAR() to go along with
-> NS_LITERAL_STRING().
-
-<p>OK.
-
-
-
-> Having NS_LITERAL_STRING() all over the code  clutters
-> it up and makes it hard to tell what the code is doing, could we
-> have a standard short alias for this?
-
-<p>Yes, I'll try to think of something ... perhaps <span class="code">NS_LSTR</span>?
-
-
-> 4) nsLiteralString should support n.ToInteger(&error);
-
-<p><span class="code">ToInteger</span> is actually a bad interface.  It's only good if your
-entire string is the number; this encourages you to edit your string
-until it is one, or perhaps copy the numeric part to another string. 
-Better if you just <span class="code">sscanf</span> a string (don't know if I can provide
-that in the general case, but I'm thinking about it), or else use
-regular C++ extractors (which wouldn't be too hard for me to
-provide), or else I could give you a <span class="code">ToInteger</span> that works on a pair
-of iterators, extracting the integer from the digits between them. 
-
-> 
-> 5) There should be a global define for an interface to a readonly
-> empty string.
-
-<p>Yes, there will be.
-
-
-> 
-> 6) Something is wrong with concatenation....
-
-<p>Hopefully I've fixed this now.
-
-
-
-> 8) A forward definition is missing in the h files
-
-<p>I'll check it out.
-
-
-
-<p>My understanding is that you have already found the answers to your
-other questions.
-
-<p>I hope this helps,
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 20 Sep 2000 17:32:13 -0400
-Subject: Re: how to free an nsString::ToNewCString
-</pre>
-
-<pre class="email-quote">
-  >What's the current approved way to free an nsString::ToNewCString? 
-</pre>
-
-<p><span class="code">nsMemory::Free</span>
-
-
-
-
-
-<hr>
-
-<p>You use several <span class="code">NS_ConvertASCIItoUTF16("...").get()</span>, these should be
-
-  NS_LITERAL_STRING("...").get()
-
-<p>Don't do this to the very first case where you aren't wrapping an actual literal string.
-The first instance would should exploit <span class="code">NS_LITERAL_STRING</span> technology as well,
-around the initial declarations of the strings ... probably want to do this with
-<span class="code">NS_NAMED_LITERAL_STRING</span>.
-
-
-
-<hr>
-<pre>
-Date: Thu, 12 Oct 2000 00:57:28 -0400
-Subject: string answers
-</pre>
-
-<div class="source-code">
-<pre>
-nsresult
-DoSomething( nsAWritableString&amp;  answer )
-  {
-    nsresult rv;
-
-    nsXPIDLString registry_data;
-    Fetch("key", getter_Shares(registry_data));
-
-    nsLiteralString path(not_my_string);
-
-    PRInt32 first_colon = path.FindChar(PRUnichar(':'));
-    if ( first_colon != -1 )
-      {
-        // convert ... extract path from |path|
-        nsCOMPtr<nsILocalFile> localFile( do_CreateInstance(CID, &rv)
-);
-        if ( localFile )
-          {
-           
-localFile->SetPersistentDescriptor(NS_ConvertUTF16toUTF8(path));
-
-            nsXPIDLString converted_path;
-            localFile->GetUnicodePath(getter_Copies(converted_path));
-            answer = converted_path.get();
-          }
-      }
-    else
-      {
-        answer = path;
-      }
-
-
-    return rv;
-  }
-</pre>
-</div>
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 12 Oct 2000 02:03:49 -0400
-Subject: Re: and the answer is ...
-</pre>
-
-<p>You can see from the line of code that you're on, that this should
-have been fine.  <span class="code">nsMemory::Alloc</span> would be asked to allocate a 1 byte
-object.  But it failed trying to allocate that.  Which suggests that
-the allocator was busy and non-reentrant and the debugger tried to
-misuse it.  Yes?
-
-<p>Of course, this doesn't solve your problem.  Perhaps we need to go
-back to the idea of a function that returns a pointer to the first
-hunk of the string.
-
-<div class="source-code">
-<pre>
-const char*
-debug_string( const nsAReadableCString& aCString )
-  {
-    nsReadingIterator&lt;char&gt; iter;
-    aCString.BeginReading(iter);
-    return aCString.IsEmpty() ? "" : iter.get();
-  }
-</pre>
-</div>
-
-<p>This code should work regardless of what the allocator is doing.  The
-downsides are (a) it only returns the first hunk of the string, in the
-case of a multi-fragment string; and (b) that hunk <strong>might</strong> not be
-zero-terminated.
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 12 Oct 2000 08:30:32 -0400
-Subject: Re: Self healing the cache :-)
-</pre>
-
-<p>At 3:04 PM -0400 10/11/00, Mike Shaver wrote:
-<pre class="email-quote">
-  >NS_LITERAL_STRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID);
-</pre>
-
-<p>Macro ugliness makes <span class="code">NS_LITERAL_STRING</span> inappropriate for use over
-other macros.  In other words:
-
-<div class="source-code">
-<pre>
-NS_LITERAL_STRING("foo")
-</pre>
-</div>
-
-<p>is <strong>good</strong>.
-
-<div class="source-code">
-<pre>
-#define FOO "foo"
-NS_LITERAL_STRING(FOO)
-</pre>
-</div>
-
-<p>is <strong>bad</strong>.  Why?  Because it turns into
-
-<div class="source-code">
-<pre>
-nsLiteralString(LFOO, sizeof(LFOO)...
-</pre>
-</div>
-
-<p>and there is no <span class="code">LFOO</span>.  Sorry.  If you have to do this to a
-macro-ized string, do the magic by hand, e.g.,
-
-<div class="source-code">
-<pre>
-nsLiteralString(FOO, sizeof(FOO)/sizeof(PRUnichar)
-                                          + sizeof(PRUnichar('\0')))
-</pre>
-</div>
-
-<p>or else if you don't care that <span class="code">nsLiteralString</span> will scan for the
-length, just say
-
-<div class="source-code">
-<pre>
-nsLiteralString(FOO)
-</pre>
-</div>
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 12 Oct 2000 08:36:14 -0400
-Subject: Re: Self healing the cache :-)
-</pre>
-
-<p>Actually, I'm not even sure you can do it by hand, since you didn't
-
-<div class="source-code">
-<pre>
-#define FOO L"foo"
-</pre>
-</div>
-
-<p>and <strong>can't</strong> do that cross-platform.  The other way around this is to
-define a global instead of a macro, that is, instead of saying
-
-<div class="source-code">
-<pre>
-#define FOO "foo"
-</pre>
-</div>
-
-<p>at the top of your file, say
-
-<div class="source-code">
-<pre>
-NS_NAMED_LITERAL_STRING(FOO, "foo")
-</pre>
-</div>
-
-<p>or else, if the macro was used only in one spot ... perhaps you could
-just eliminate the macro in favor of <span class="code">NS_NAMED_LITERAL</span> in situ.
-
-<p>Arghh.  In this case, you may be stuck with the extra work of
-<span class="code">AssignWithConversion</span>.
-
-
-
-
-
-<hr>
-<pre>
-Date: Sun, 3 Dec 2000 16:38:07 -0400
-Subject: Re: another copy_string question
-</pre>
-
-<pre class="email-quote">
-  >Is there a way to tell, inside the write() sink, if one is in the
-  >final hunk?  I need to do some special processing at the end.
-</pre>
-
-<p>No, there isn't.  But you could move such special processing into the
-destructor of the sink.  Remember, the sink is passed by reference, so
-you can exactly control its lifetime.
-
-<div class="source-code">
-<pre>
-{
-  MySink sink;
-  nsReadingIterator&lt;PRUnichar&gt; sourceStart = aStr.BeginReading();
-  nsReadingIterator&lt;PRUnichar&gt; sourceEnd = aStr.EndReading();
-  copy_string(sourceStart, sourceEnd, sink);
-    // |sink| destructor executed here
-}
-</pre>
-</div>
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Fri, 15 Dec 2000 20:02:08 -0400
-Subject: fragment of code
-</pre>
-
-<div class="source-code">
-<pre>
-nsPromiseFlatString flatKey(aReadable);
-
-flatKey.get()
-</pre>
-</div>
-
-
-
-
-
-
-<hr>
-<pre>
-Date: Tue, 16 Jan 2001 16:47:37 -0400
-Subject: Re: a few string questions...
-</pre>
-
->I've accumulated a few questions I've been wanting to ask you, mostly
->about string stuff.  Nothing urgent, but I want to ask them before I
->forget.  So here goes...:
->
->1) Is it acceptable to use nsLiteralCString or nsLiteralString on 
->something that's not a literal?  This can be useful in some places,
->for example, to convert a char* to PRUnichar*:
->
->PRUnichar* new = ToNewUnicode(nsLiteralCString(myCharPtr));
-
-<p>This is explicitly allowed.  That's why I'm proposing to change the
-names of those classes to <span class="code">nsLocal[C]String</span>.
-
-
->2) Should nsString2x.h and nsString2x.cpp go away?  They look like a
->never-completed rewrite or something...
-
-<p>Yes.  They should go away.  They are uncompleted [old] bullshit,
-exactly as you diagnosed.
-
-<p>I'll look into the other two questions.
-
-
-
-
-
-<hr>
-<pre>
-Date: Thu, 1 Feb 2001 15:12:41 -0400
-Subject: Re: [Fwd: bad string, bad string]
-</pre>
-
-<p>We've been removing implicit conversion operators because they
-_always_ lead to trouble.  Usually they make it harder to pick the
-right function when overloading is involved and in the past they have
-led to huge performance suckage because we ended up doing conversions
-when we didn't need to because the implicit operator made us pick the
-wrong function.
-
-<p>It's borderline when the class implements something that is <strong>so</strong>
-close, as with a guaranteed flat string or an <span class="code">nsCOMPtr</span> ... but the
-general recommendation is to avoid implicit conversions.
-
-<p>See bug #53057.
-
-
-
-
-
-<hr>
-<pre>
-Date: Tue, 6 Feb 2001 18:52:23 -0400
-Subject: seeking review for bug #57087
-</pre>
-
-<p>  bug:
-    <a class="exact-uri" href="http://bugzilla.mozilla.org/show_bug.cgi?id=57087">http://bugzilla.mozilla.org/show_bug.cgi?id=57087</a>
-
-  patch:
-    <a class="exact-uri" href="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=24576">http://bugzilla.mozilla.org/showattachment.cgi?attach_id=24576</a>
-
-<p>This patch is supposed to add the ability to define very long literal
-strings more easily by breaking lines, e.g.,
-
-<div class="source-code">
-<pre>
-NS_MULTILINE_LITERAL( NS_L("This is the start of a very long line")
-                      NS_L(" which actually continues across")
-                      NS_L(" a couple more.") )
-</pre>
-</div>
-
-<p>The main danger in this scheme is callers who omit the inner <span class="code">NS_L</span>
-wrapping.  Though I believe this will be caught at compile time as the
-wrong type initializer.
-
-<p>Seeking input from everybody, and waterson in particular.
-
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 14 Feb 2001 16:09:10 -0400
-Subject: Re: Question...
-</pre>
-
-<p>There are some utilities in "xpcom/ds/nsReadableUtils.h".  In
-particular, if you want to get back a new heap-allocated ASCII string
-with the minimal work, you would say
-
-<div class="source-code">
-<pre>
-PRUnichar* sourceChars = ...;
-
-char* destChars = ToNewCString(nsLiteralString(sourceChars));
-</pre>
-</div>
-
-
-<p>It's more efficient if you happen to already know the length.  If you
-don't, don't bother counting, that's what I'll do in the constructor
-for <span class="code">nsLiteralString</span>.  If you do, then call like this
-
-<div class="source-code">
-<pre>
-destChars = ToNewCString( nsLiteralString(sourceChars, length) );
-</pre>
-</div>
-
-<p>Other routines in that file will help you if, for instance, you wanted
-to translate into a buffer you had already allocated.
-
-<p>Hope this helps,
-
-
-
-
-
-<hr>
-<pre>
-Date: Fri, 23 Feb 2001 03:12:58 -0400
-Subject: string snippet
-</pre>
-
-<div class="source-code">
-<pre>
-nsCString aInput;
-
-
-
-nsReadingIterator&lt;char&gt; search_start;
-aInput.BeginReading(search_start);
-
-nsReadingIterator&lt;char&gt; search_end;
-aInput.EndReading(search_end);
-
-if ( FindCharInReadable(':', search_start, search_end) )
-  {
-    ++search_start;
-    return ToNewCString( Substring(aInput, search_start, search_end)
-);
-  }
-</pre>
-</div>
-
-
-
-
-
-
-<hr>
-<pre>
-Date: Wed, 7 Mar 2001 19:44:08 -0400
-Subject: string help
-</pre>
-
-<p>Here you go, Mike:
-
-  http://scottcollins.net/journal/discussion/mjudge-scratch.cpp
-
-
-
-
-
-
-<hr>
-<pre>
-Date: Fri, 9 Mar 2001 20:56:07 -0400
-Subject: Re: string assertions
-</pre>
-
-<p>If you get an iterator into a string and you advance it all the way to
-the end of the string, and then <strong>keep</strong> trying to advance it, you hit
-this assert.  This could happen, for example if you tried to copy 10
-characters out of a 9 character string.  I've tried to make this
-impossible to get to.  As far as I know, all my routines trim requests
-in advance of manipulating iterators.  When you see this, you should
-get the stack.  That will take you right to the bad spot.
-
-
-
-
-
-<hr>
-<pre>
-Date: Sat, 31 Mar 2001 11:04:03 -0400
-Subject: Re: Sun bustage and string advice
-</pre>
-
-<p>You do know you are comparing two pointers now?  It seems unlikely
-those two pointers would ever be the same pointer.  You probably want
-to say something like
-
-<div class="source-code">
-<pre>
-NS_LITERAL_STRING("foo").Equals(aTopic) // or
-
-NS_LITERAL_STRING("foo") == nsLiteralString(aTopic)
-</pre>
-</div>
-
-<p>...so that you compare the <strong>contents</strong> of two strings.  Right now,
-you're just testing to see if two pointers both point to the same
-location in memory.  A lot of people make this mistake.  I would like
-to make it obvious to people that comparing two pointers does not
-compare strings.  Can you tell me what gave you that impression so
-that I can figure out how to better educate people not to do this?  By
-the way, it's not that I don't <strong>want</strong> to make this compare two
-strings; it's that in C++, you can't override operations for built-in
-types.  And pointers are built-in types.  So I can't make
-<span class="code">operator==(const PRUnichar*, const PRUnichar*)</span> do anything different
-than it already does, which is the same thing it does for any other
-pointer.
-
-
-
-
-
-
-</div>
-
-
-
-<!-- .................................................................End Matter -->
-
-
-
-  </body>
-</html>

From 2322d30923422eaa824c2bd7267e218b9d6b88b5 Mon Sep 17 00:00:00 2001
From: Taras Glek <tglek@mozilla.com>
Date: Fri, 6 May 2011 12:57:36 -0700
Subject: [PATCH 057/314] Bug 627591: preload (xul|mozjs).dll on Windows when
 prefetch is off r=shaver

---
 browser/app/Makefile.in        |  3 +-
 browser/app/nsBrowserApp.cpp   |  1 +
 toolkit/xre/nsWindowsWMain.cpp | 68 ++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index d9d1515d8a00..dab91cef4869 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -178,7 +178,8 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
-OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
+OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32 delayimp)
+LDFLAGS += -delayload:xul.dll -delayload:xpcom.dll -delayload:plc4.dll -delayload:nspr4.dll -delayload:mozalloc.dll
 endif
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
index f8cbf7933824..e0f034055fec 100644
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -56,6 +56,7 @@
 #ifdef XP_WIN
 // we want to use the DLL blocklist if possible
 #define XRE_WANT_DLL_BLOCKLIST
+#define XRE_PRELOAD_XUL
 // we want a wmain entry point
 #include "nsWindowsWMain.cpp"
 #endif
diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index a1c0179a7977..b978972a9ca5 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -73,8 +73,76 @@ FreeAllocStrings(int argc, char **argv)
   delete [] argv;
 }
 
+#ifdef XRE_PRELOAD_XUL
+static void preload(LPCWSTR dll)
+{
+  HANDLE fd = CreateFileW(dll, GENERIC_READ, FILE_SHARE_READ,
+                          NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+  char buf[64 * 1024];
+
+  if (fd == INVALID_HANDLE_VALUE)
+    return;
+  
+  DWORD dwBytesRead;
+  // Do dummy reads to trigger kernel-side readhead via FILE_FLAG_SEQUENTIAL_SCAN.
+  // Abort when underfilling because during testing the buffers are read fully
+  // A buffer that's not keeping up would imply that readahead isn't working right
+  while (ReadFile(fd, buf, sizeof(buf), &dwBytesRead, NULL) && dwBytesRead == sizeof(buf))
+    /* Nothing */;
+  
+  CloseHandle(fd);
+}
+
+/** Populate the windows page cache */
+static void preload_libs(LPCWSTR appPath) 
+{
+  wchar_t buf[MAX_PATH];
+  size_t pathlen = wcslen(appPath);
+
+  // rewind until the last \
+  for(;pathlen && appPath[pathlen] != L'\\'; pathlen--);
+ 
+  // if there is a directory name present, keep the last \
+  if (pathlen)
+    pathlen++;
+
+  if (pathlen + 10 > MAX_PATH) {
+    return;
+  }
+
+  wcsncpy(buf, appPath, pathlen);
+  size_t remaining = sizeof(buf)/sizeof(buf[0]) - pathlen - 1;
+  // For now only preload only the most expensive libs.
+  // The rest cost a few magnitudes less.
+  LPCWSTR files[] = {L"xul.dll", 
+#ifndef MOZ_STATIC_JS
+                     L"mozjs.dll",
+#endif
+                     0};
+  for(int i = 0; files[i]; i++) {
+    wcsncpy(buf + pathlen, files[i], remaining);
+    preload(buf);
+  }
+  return;
+}
+#endif
+
 int wmain(int argc, WCHAR **argv)
 {
+#ifdef XRE_PRELOAD_XUL 
+  // GetProcessIoCounters().ReadOperationCount seems to have little to
+  // do with actual read operations. It reports 0 or 1 at this stage
+  // in the program. Luckily 1 coincides with when prefetch is
+  // enabled. If Windows prefetch didn't happen we can do our own
+  // faster dll preloading.
+  IO_COUNTERS ioCounters;
+  if (GetProcessIoCounters(GetCurrentProcess(), &ioCounters)
+      && !ioCounters.ReadOperationCount)
+    {
+      preload_libs(argv[0]);
+    }
+#endif
+
 #ifndef XRE_DONT_PROTECT_DLL_LOAD
   mozilla::NS_SetDllDirectory(L"");
 #endif

From 08e36a68ef8a355efd96b534e583a6c12dbb5b8c Mon Sep 17 00:00:00 2001
From: Patrick McManus <mcmanus@ducksong.com>
Date: Thu, 5 May 2011 17:16:44 -0400
Subject: [PATCH 058/314] Bug 654197 - nsWebSocket::Initialize uses an
 unanchored JSString unsafely r=jorendorff

--HG--
extra : rebase_source : 53e857796305b1a54601ff9125721d6c0f9e67aa
---
 content/base/src/nsWebSocket.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/base/src/nsWebSocket.cpp b/content/base/src/nsWebSocket.cpp
index 7c222ff278b2..64841ad1d0b7 100644
--- a/content/base/src/nsWebSocket.cpp
+++ b/content/base/src/nsWebSocket.cpp
@@ -2960,6 +2960,7 @@ nsWebSocket::Initialize(nsISupports* aOwner,
     return NS_ERROR_DOM_SYNTAX_ERR;
   }
 
+  JS::Anchor<JSString *> deleteProtector(jsstr);
   size_t length;
   const jschar *chars = JS_GetStringCharsAndLength(aContext, jsstr, &length);
   if (!chars) {
@@ -2967,6 +2968,7 @@ nsWebSocket::Initialize(nsISupports* aOwner,
   }
 
   urlParam.Assign(chars, length);
+  deleteProtector.clear();
 
   if (aArgc == 2) {
     jsstr = JS_ValueToString(aContext, aArgv[1]);
@@ -2974,6 +2976,7 @@ nsWebSocket::Initialize(nsISupports* aOwner,
       return NS_ERROR_DOM_SYNTAX_ERR;
     }
 
+    deleteProtector.set(jsstr);
     chars = JS_GetStringCharsAndLength(aContext, jsstr, &length);
     if (!chars) {
       return NS_ERROR_OUT_OF_MEMORY;

From 520cac0fe4b46265c81435b834895aa35be9a721 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Fri, 6 May 2011 00:33:57 -0700
Subject: [PATCH 059/314] Bug 648925 - Part 5: Make nsCSSKeyframeRule use
 inherited AddRef/Release from Rule.  r=bzbarsky

---
 layout/style/nsCSSRules.cpp | 12 ++++++------
 layout/style/nsCSSRules.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 37f947a6528f..26daf093915a 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -720,8 +720,8 @@ MediaRule::~MediaRule()
   }
 }
 
-NS_IMPL_ADDREF_INHERITED(MediaRule, Rule)
-NS_IMPL_RELEASE_INHERITED(MediaRule, Rule)
+NS_IMPL_ADDREF_INHERITED(MediaRule, GroupRule)
+NS_IMPL_RELEASE_INHERITED(MediaRule, GroupRule)
 
 // QueryInterface implementation for MediaRule
 NS_INTERFACE_MAP_BEGIN(MediaRule)
@@ -887,8 +887,8 @@ DocumentRule::~DocumentRule()
 {
 }
 
-NS_IMPL_ADDREF_INHERITED(DocumentRule, Rule)
-NS_IMPL_RELEASE_INHERITED(DocumentRule, Rule)
+NS_IMPL_ADDREF_INHERITED(DocumentRule, GroupRule)
+NS_IMPL_RELEASE_INHERITED(DocumentRule, GroupRule)
 
 // QueryInterface implementation for DocumentRule
 NS_INTERFACE_MAP_BEGIN(DocumentRule)
@@ -1746,8 +1746,8 @@ nsCSSKeyframeRule::Clone() const
   return clone.forget();
 }
 
-NS_IMPL_ADDREF(nsCSSKeyframeRule)
-NS_IMPL_RELEASE(nsCSSKeyframeRule)
+NS_IMPL_ADDREF_INHERITED(nsCSSKeyframeRule, Rule)
+NS_IMPL_RELEASE_INHERITED(nsCSSKeyframeRule, Rule)
 
 DOMCI_DATA(MozCSSKeyframeRule, nsCSSKeyframeRule)
 
diff --git a/layout/style/nsCSSRules.h b/layout/style/nsCSSRules.h
index 445a0f19714b..e90c19d1d820 100644
--- a/layout/style/nsCSSRules.h
+++ b/layout/style/nsCSSRules.h
@@ -362,7 +362,7 @@ private:
   nsCSSKeyframeRule(const nsCSSKeyframeRule& aCopy);
   ~nsCSSKeyframeRule();
 public:
-  NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS_INHERITED
 
   // nsIStyleRule methods
 #ifdef DEBUG

From 336a8dec55b085cb631d480851b4f8dd5ac3149a Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Fri, 6 May 2011 13:32:12 -0700
Subject: [PATCH 060/314] Bug 655340, require NSS 3.12.10 and NSPR 4.8.8 for
 --with-system-nss, r=wtc

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 656bf9189e1c..5152f3c30250 100644
--- a/configure.in
+++ b/configure.in
@@ -4479,7 +4479,7 @@ MOZ_ARG_WITH_BOOL(system-nspr,
     _USE_SYSTEM_NSPR=1 )
 
 if test -n "$_USE_SYSTEM_NSPR"; then
-    AM_PATH_NSPR(4.8.7, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
+    AM_PATH_NSPR(4.8.8, [MOZ_NATIVE_NSPR=1], [AC_MSG_ERROR([your don't have NSPR installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSPR"; then
@@ -4553,7 +4553,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
     _USE_SYSTEM_NSS=1 )
 
 if test -n "$_USE_SYSTEM_NSS"; then
-    AM_PATH_NSS(3.12.9, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+    AM_PATH_NSS(3.12.10, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
 fi
 
 if test -n "$MOZ_NATIVE_NSS"; then

From fd1dcbdc9e3a7df18cab26ed4ce036b4ae8c5e1a Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Fri, 6 May 2011 14:03:10 -0700
Subject: [PATCH 061/314] Bug 521113 Don't allow kinetic scrolling to move
 sidebars r=mbrubeck

---
 mobile/chrome/content/browser.js        | 32 ++++-----
 mobile/chrome/tests/Makefile.in         |  1 +
 mobile/chrome/tests/browser_dragger.js  | 89 +++++++++++++++++++++++++
 mobile/chrome/tests/browser_sidebars.js |  1 -
 mobile/chrome/tests/head.js             | 17 +++++
 5 files changed, 123 insertions(+), 17 deletions(-)
 create mode 100644 mobile/chrome/tests/browser_dragger.js

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 26773f810fae..9ef09984311f 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1224,7 +1224,6 @@ Browser.MainDragger.prototype = {
     let bcr = browser.getBoundingClientRect();
     this._contentView = browser.getViewAt(clientX - bcr.left, clientY - bcr.top);
     this._stopAtSidebar = 0;
-    this._hitSidebar = false;
     if (this._sidebarTimeout) {
       clearTimeout(this._sidebarTimeout);
       this._sidebarTimeout = null;
@@ -1244,7 +1243,7 @@ Browser.MainDragger.prototype = {
 
     // If the sidebars are showing, we pan them out of the way before panning the content.
     // The panning distance that should be used for the sidebars in is stored in sidebarOffset,
-    // and subtracted from doffset
+    // and subtracted from doffset.
     let sidebarOffset = this._getSidebarOffset(doffset);
 
     // If we started with one sidebar open, stop when we get to the other.
@@ -1254,13 +1253,10 @@ Browser.MainDragger.prototype = {
     if (!this.contentMouseCapture)
       this._panContent(doffset);
 
-    if (this._hitSidebar && aIsKinetic)
-      return false; // No kinetic panning after we've stopped at the sidebar.
+    if (aIsKinetic && doffset.x != 0)
+      return false;
 
-    // allow panning the sidebars if the page hasn't prevented it, or if any of the sidebars are showing
-    // (i.e. we always allow panning sidebars off screen but not necessarily panning them back on)
-    if (!this.contentMouseCapture || sidebarOffset.x != 0 || sidebarOffset.y > 0)
-      this._panChrome(doffset, sidebarOffset);
+    this._panChrome(doffset, sidebarOffset);
 
     this._updateScrollbars();
 
@@ -1318,17 +1314,21 @@ Browser.MainDragger.prototype = {
     this._panContentView(getBrowser().getRootView(), aOffset);
   },
 
-  _panChrome: function md_panSidebars(aOffset, aSidebarOffset) {
-    // Any panning aOffset would bring controls into view. Add to aSidebarOffset
+  _panChrome: function md_panChrome(aOffset, aSidebarOffset) {
+    // In order to prevent users from hiding one sidebar and followed by immediately bringing
+    // out the other one, we absorb sidebar pans here for a fixed time.
+    //
+    // Also, if users are panning a website then we allow them to pan away sidebars, but
+    // nothing more.
+    //
     let offsetX = aOffset.x;
-    if ((this._stopAtSidebar > 0 && offsetX > 0) ||
-        (this._stopAtSidebar < 0 && offsetX < 0)) {
-      if (offsetX != aSidebarOffset.x)
-        this._hitSidebar = true;
+    if (this.contentMouseCapture)
+      aOffset.set(aSidebarOffset);
+    else if ((this._stopAtSidebar > 0 && offsetX > 0) ||
+             (this._stopAtSidebar < 0 && offsetX < 0))
       aOffset.x = aSidebarOffset.x;
-    } else {
+    else
       aOffset.add(aSidebarOffset);
-    }
 
     Browser.tryFloatToolbar(aOffset.x, 0);
 
diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 4bcad913b399..7c81e540ce8d 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -67,6 +67,7 @@ _BROWSER_FILES = \
   browser_click_content.html \
   browser_click_content.js \
   browser_contacts.js \
+  browser_dragger.js \
   browser_find.js \
   browser_forms.html \
   $(warning browser_forms.js disabled due to failures) \
diff --git a/mobile/chrome/tests/browser_dragger.js b/mobile/chrome/tests/browser_dragger.js
new file mode 100644
index 000000000000..6450064e1c15
--- /dev/null
+++ b/mobile/chrome/tests/browser_dragger.js
@@ -0,0 +1,89 @@
+"use strict";
+
+const testURL_01 = chromeRoot + "browser_blank_01.html";
+const testURL_01_Remote = serverRoot + "browser_blank_01.html";
+
+function test() {
+  waitForExplicitFinish();
+  runNextTest();
+}
+
+gTests.push({
+  desc: "Test that kinetic panning does not open sidebars.",
+  tab: null,
+
+  run: function() {
+    gCurrentTest.tab = Browser.addTab(testURL_01, true);
+    onMessageOnce(gCurrentTest.tab.browser.messageManager, "MozScrolledAreaChanged", gCurrentTest.checkPan);
+  },
+
+  checkPan: function() {
+    let browser = gCurrentTest.tab.browser;
+    let docWidth = browser.contentDocumentWidth * browser.scale;
+    let winWidth = window.innerWidth;
+    info("Browser document width is " + docWidth);
+    info("Window width is " + winWidth);
+    is(docWidth, winWidth,
+       "Sanity check. Blank document cannot be panned left or right.");
+
+    function dragAndCheck(dx) {
+      let dragger = Elements.browsers.customDragger;
+      try {
+        dragger.dragStart(0, 0, null, null);
+        dragger.dragMove(dx, 0, null, true);
+
+        let [leftVis, rightVis] = Browser.computeSidebarVisibility();
+        is(leftVis, 0, "Left sidebar is not visible");
+        is(rightVis, 0, "Right sidebar is not visible");
+      } finally {
+        // Be fail tolerant and hide sidebars in case tests failed.
+        Browser.hideSidebars();
+        dragger.dragStop();
+      }
+    }
+
+    dragAndCheck(-20);
+    dragAndCheck(20);
+
+    Browser._doCloseTab(gCurrentTest.tab);
+    runNextTest();
+  }
+});
+
+gTests.push({
+  desc: "Test that urlbar cannot be panned in when content is captured.",
+  tab: null,
+
+  run: function() {
+    gCurrentTest.tab = Browser.addTab(testURL_01_Remote, true);
+    Browser.selectedTab = gCurrentTest.tab;
+    onMessageOnce(gCurrentTest.tab.browser.messageManager, "MozScrolledAreaChanged", gCurrentTest.mouseMove);
+  },
+
+  mouseMove: function(json) {
+    let inputHandler = gCurrentTest.tab.browser.parentNode;
+    function fireMouseEvent(y, type) {
+      EventUtils.synthesizeMouse(inputHandler, 0, y, { type: type });
+    }
+
+    Browser.hideTitlebar();
+    let rect = Elements.browsers.getBoundingClientRect();
+    is(rect.top, 0, "Titlebar begins hidden");
+
+    let dragger = Elements.browsers.customDragger;
+    try {
+      dragger.contentCanCapture = true;
+      dragger.dragStart(0, 0, null, null);
+      dragger.dragMove(0, 20, null, true);
+      dragger.dragStop();
+    } finally {
+      dragger.contentCanCapture = false;
+    }
+
+    rect = Elements.browsers.getBoundingClientRect();
+    is(rect.top, 0, "Titlebar is still hidden");
+
+    Browser._doCloseTab(gCurrentTest.tab);
+    runNextTest();
+  }
+});
diff --git a/mobile/chrome/tests/browser_sidebars.js b/mobile/chrome/tests/browser_sidebars.js
index eb05e6399d06..c61dfb899934 100644
--- a/mobile/chrome/tests/browser_sidebars.js
+++ b/mobile/chrome/tests/browser_sidebars.js
@@ -218,4 +218,3 @@ gTests.push({
     runNextTest();
   }
 });
-
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index b2709c3f6996..b1609b71f4bc 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -80,6 +80,23 @@ let AsyncTests = {
   }
 };
 
+let gCurrentTest = null;
+let gTests = [];
+
+// Iterating tests by shifting test out one by one as runNextTest is called.
+function runNextTest() {
+  // Run the next test until all tests completed
+  if (gTests.length > 0) {
+    gCurrentTest = gTests.shift();
+    info(gCurrentTest.desc);
+    gCurrentTest.run();
+  }
+  else {
+    finish();
+  }
+}
+
+let serverRoot = "http://example.com/browser/mobile/chrome/tests/";
 let chromeRoot = getRootDirectory(gTestPath);
 // For some security reasons (which?), loading remote_head using chromeRoot
 // instead of baseURI make the browser_formsZoom.js test fails.

From 21b4ae682e377ef3af8ff77369db3c5b53f6d672 Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Fri, 6 May 2011 15:10:17 -0700
Subject: [PATCH 062/314] Bug 642148: Upgrade Mozilla to NSPR 4.8.8 final. 
 Only the version number is changed, plus a properly generated configure file.

---
 nsprpub/TAG-INFO            |  2 +-
 nsprpub/config/prdepend.h   |  1 -
 nsprpub/configure           | 46 ++++++++++++++++++-------------------
 nsprpub/pr/include/prinit.h |  4 ++--
 4 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index e669ae2c34c7..a91fe0faf07d 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_8_8_BETA3
+NSPR_4_8_8_RTM
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index 55444c40b3aa..df72c56882d2 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -42,4 +42,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/nsprpub/configure b/nsprpub/configure
index b38815afdedb..d6ff36f7a10a 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -4739,17 +4739,17 @@ EOF
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4745: checking for machine/builtins.h" >&5
+echo "configure:4743: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5398,7 +5398,7 @@ case $target in
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5404: checking for dlopen in -ldl" >&5
+echo "configure:5402: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5406,7 +5406,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5412 "configure"
+#line 5410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5417,7 +5417,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5434,17 +5434,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5440: checking for dlfcn.h" >&5
+echo "configure:5438: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5477,13 +5477,13 @@ esac
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5489 "configure"
+#line 5487 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -5501,7 +5501,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5507 "configure"
+#line 5505 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -5525,12 +5525,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5531: checking for $ac_func" >&5
+echo "configure:5529: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5553,7 +5553,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5604,7 +5604,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5610: checking for $ac_word" >&5
+echo "configure:5608: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5663,7 +5663,7 @@ hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5669: checking for +Olit support" >&5
+echo "configure:5667: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5705,7 +5705,7 @@ wince*)
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5711: checking for pthread_create in -lpthreads" >&5
+echo "configure:5709: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5727,7 +5727,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5733: checking for pthread_create in -lpthread" >&5
+echo "configure:5731: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5749,7 +5749,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5755: checking for pthread_create in -lc_r" >&5
+echo "configure:5753: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5771,7 +5771,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5777: checking for pthread_create in -lc" >&5
+echo "configure:5775: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5889,7 +5889,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5912,7 +5912,7 @@ echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h
index cc50dc6eb6f3..075455e57138 100644
--- a/nsprpub/pr/include/prinit.h
+++ b/nsprpub/pr/include/prinit.h
@@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.8.8 Beta"
+#define PR_VERSION  "4.8.8"
 #define PR_VMAJOR   4
 #define PR_VMINOR   8
 #define PR_VPATCH   8
-#define PR_BETA     PR_TRUE
+#define PR_BETA     PR_FALSE
 
 /*
 ** PRVersionCheck

From a8711ede9fdb819c007fad5741a9f1741eaefecd Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Sat, 7 May 2011 10:03:16 +0200
Subject: [PATCH 063/314] Bug 654552 - Remove WinCE code from netwerk/* ;
 r=cbiesinger

---
 netwerk/base/public/security-prefs.js         |   3 -
 netwerk/base/src/Makefile.in                  |   4 -
 netwerk/base/src/nsAutodialWinCE.cpp          | 129 ------------------
 netwerk/base/src/nsAutodialWinCE.h            |  69 ----------
 netwerk/base/src/nsNativeConnectionHelper.cpp |   4 +-
 netwerk/base/src/nsURLHelperWin.cpp           |  10 +-
 netwerk/build.mk                              |   2 -
 netwerk/build/Makefile.in                     |  13 --
 .../protocol/file/nsFileProtocolHandler.cpp   |   9 +-
 netwerk/protocol/http/nsHttpHandler.cpp       |   6 +-
 netwerk/system/Makefile.in                    |   4 -
 netwerk/system/wince/Makefile.in              |  55 --------
 netwerk/system/wince/nsNotifyAddrListener.cpp | 121 ----------------
 netwerk/system/wince/nsNotifyAddrListener.h   |  61 ---------
 14 files changed, 8 insertions(+), 482 deletions(-)
 delete mode 100644 netwerk/base/src/nsAutodialWinCE.cpp
 delete mode 100644 netwerk/base/src/nsAutodialWinCE.h
 delete mode 100644 netwerk/system/wince/Makefile.in
 delete mode 100644 netwerk/system/wince/nsNotifyAddrListener.cpp
 delete mode 100644 netwerk/system/wince/nsNotifyAddrListener.h

diff --git a/netwerk/base/public/security-prefs.js b/netwerk/base/public/security-prefs.js
index 1d6f10f01512..e143f88d0875 100644
--- a/netwerk/base/public/security-prefs.js
+++ b/netwerk/base/public/security-prefs.js
@@ -26,15 +26,12 @@ pref("security.ssl3.rsa_1024_rc4_56_sha", false);
 pref("security.ssl3.rsa_1024_des_cbc_sha", false);
 pref("security.ssl3.rsa_rc4_40_md5", false);
 pref("security.ssl3.rsa_rc2_40_md5", false);
-// Camellia is broken on Windows CE for now, see bug 508113
-#ifndef WINCE
 pref("security.ssl3.dhe_rsa_camellia_256_sha", true);
 pref("security.ssl3.dhe_dss_camellia_256_sha", true);
 pref("security.ssl3.rsa_camellia_256_sha", true);
 pref("security.ssl3.dhe_rsa_camellia_128_sha", true);
 pref("security.ssl3.dhe_dss_camellia_128_sha", true);
 pref("security.ssl3.rsa_camellia_128_sha", true);
-#endif
 pref("security.ssl3.dhe_rsa_aes_256_sha", true);
 pref("security.ssl3.dhe_dss_aes_256_sha", true);
 pref("security.ssl3.rsa_aes_256_sha", true);
diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in
index c6ba9ceb2ccb..242fe5b3d184 100644
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -99,11 +99,7 @@ else
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 	CPPSRCS += nsURLHelperWin.cpp
 	CPPSRCS += nsNativeConnectionHelper.cpp
-ifneq ($(OS_ARCH), WINCE)
 	CPPSRCS += nsAutodialWin.cpp
-else
-	CPPSRCS += nsAutodialWinCE.cpp
-endif
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	CPPSRCS += nsURLHelperOSX.cpp
diff --git a/netwerk/base/src/nsAutodialWinCE.cpp b/netwerk/base/src/nsAutodialWinCE.cpp
deleted file mode 100644
index f0ed5ed7c520..000000000000
--- a/netwerk/base/src/nsAutodialWinCE.cpp
+++ /dev/null
@@ -1,129 +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.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Steve Meredith <smeredith@netscape.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 <objbase.h>
-
-#ifdef WINCE_WINDOWS_MOBILE
-#include <connmgr.h>
-#endif
-
-#include "nsAutodialWinCE.h"
-
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsIPrefBranch.h"
-#include "nsIPrefService.h"
-#include "nsIServiceManager.h"
-
-// pulled from the header so that we do not get multiple define errors during link
-static const GUID autodial_DestNetInternet =
-        { 0x436ef144, 0xb4fb, 0x4863, { 0xa0, 0x41, 0x8f, 0x90, 0x5a, 0x62, 0xc5, 0x72 } };
-
-nsAutodial::nsAutodial()
-{
-}
-
-nsAutodial::~nsAutodial()
-{
-}
-
-nsresult
-nsAutodial::Init()
-{
-  return NS_OK;
-}
-
-nsresult nsAutodial::DialDefault(const PRUnichar* hostName)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  HANDLE connectionHandle;
-
-  // always use http://
-  nsString theURL;
-  theURL.Append(L"http://");
-  theURL.Append(hostName);
-  
-  GUID networkUID;
-  ConnMgrMapURL(theURL.get(), &networkUID, 0);
-
-  // Make the connection to the new network
-  CONNMGR_CONNECTIONINFO conn_info;
-  memset(&conn_info, 0, sizeof(conn_info));
-  
-  conn_info.cbSize      = sizeof(conn_info);
-  conn_info.dwParams    = CONNMGR_PARAM_GUIDDESTNET;
-  conn_info.dwPriority  = CONNMGR_PRIORITY_USERINTERACTIVE;
-  conn_info.guidDestNet = networkUID;
-  conn_info.bExclusive  = FALSE;
-  conn_info.bDisabled   = FALSE;
-  conn_info.dwFlags     = CONNMGR_FLAG_PROXY_HTTP | CONNMGR_FLAG_PROXY_WAP | 
-                          CONNMGR_FLAG_PROXY_SOCKS4 | CONNMGR_FLAG_PROXY_SOCKS5 |
-                          CONNMGR_FLAG_NO_ERROR_MSGS;
-
-  DWORD status;
-  HRESULT result = ConnMgrEstablishConnectionSync(&conn_info, 
-                                                  &connectionHandle, 
-                                                  60000,
-                                                  &status);
-  
-  if (conn_info.guidDestNet != autodial_DestNetInternet &&
-      (result != S_OK || status != CONNMGR_STATUS_CONNECTED)) {
-    conn_info.guidDestNet = autodial_DestNetInternet;  
-    result = ConnMgrEstablishConnectionSync(&conn_info, 
-                                            &connectionHandle, 
-                                            60000,
-                                            &status);
-  }
-  
-  if (result != S_OK || status != CONNMGR_STATUS_CONNECTED)
-    return NS_ERROR_FAILURE;
-
-  return NS_OK;
-#else
-  return NS_ERROR_FAILURE;
-#endif
-}
-
-PRBool
-nsAutodial::ShouldDialOnNetworkError()
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  return PR_TRUE;
-#else
-  return PR_FALSE;
-#endif
-}
diff --git a/netwerk/base/src/nsAutodialWinCE.h b/netwerk/base/src/nsAutodialWinCE.h
deleted file mode 100644
index 82760039c9f2..000000000000
--- a/netwerk/base/src/nsAutodialWinCE.h
+++ /dev/null
@@ -1,69 +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.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Steve Meredith <smeredith@netscape.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 nsAutodialWin_h__
-#define nsAutodialWin_h__
-
-#include "nspr.h"
-#include "nscore.h"
-
-#include <windows.h>
-
-
-class nsAutodial
-{
-public:
-  
-    // ctor
-    nsAutodial();
-
-    // dtor
-    virtual ~nsAutodial();
-
-    // Get the autodial info from the OS and init this obj with it. Call it any
-    // time to refresh the object's settings from the OS.
-    nsresult Init();
-
-    // Dial the default RAS dialup connection.
-    nsresult DialDefault(const PRUnichar* hostName);
-
-    // Should we try to dial on network error?
-    PRBool ShouldDialOnNetworkError();
-};
-
-
-#endif
diff --git a/netwerk/base/src/nsNativeConnectionHelper.cpp b/netwerk/base/src/nsNativeConnectionHelper.cpp
index ecdea58f7380..f256dff259b2 100644
--- a/netwerk/base/src/nsNativeConnectionHelper.cpp
+++ b/netwerk/base/src/nsNativeConnectionHelper.cpp
@@ -40,8 +40,6 @@
 
 #if defined(MOZ_PLATFORM_MAEMO)
 #include "nsAutodialMaemo.h"
-#elif defined(WINCE)
-#include "nsAutodialWinCE.h"
 #else
 #include "nsAutodialWin.h"
 #endif
@@ -59,7 +57,7 @@ nsNativeConnectionHelper::OnConnectionFailed(const PRUnichar* hostName)
   // should ask the dialer directly.  This allows the dialer to update
   // link status more forcefully rather than passively watching link
   // status changes.
-#if !defined(MOZ_PLATFORM_MAEMO) && !defined(WINCE_WINDOWS_MOBILE)
+#if !defined(MOZ_PLATFORM_MAEMO)
     if (gIOService->IsLinkUp())
         return PR_FALSE;
 #endif
diff --git a/netwerk/base/src/nsURLHelperWin.cpp b/netwerk/base/src/nsURLHelperWin.cpp
index 2a108b7b3cf4..da52b1b27744 100644
--- a/netwerk/base/src/nsURLHelperWin.cpp
+++ b/netwerk/base/src/nsURLHelperWin.cpp
@@ -59,13 +59,11 @@ net_GetURLSpecFromActualFile(nsIFile *aFile, nsACString &result)
 
     nsCAutoString escPath;
 
-    // Windows Desktop paths beging with a drive letter, so need an 'extra'
+    // Windows Desktop paths begin with a drive letter, so need an 'extra'
     // slash at the begining
-#ifdef WINCE  //  /Windows  => file:///Windows
-    NS_NAMED_LITERAL_CSTRING(prefix, "file://");
-#else  // C:\Windows =>  file:///C:/Windows
+    // C:\Windows =>  file:///C:/Windows
     NS_NAMED_LITERAL_CSTRING(prefix, "file:///");
-#endif  
+
     // Escape the path with the directory mask
     NS_ConvertUTF16toUTF8 ePath(path);
     if (NS_EscapeURL(ePath.get(), -1, esc_Directory+esc_Forced, escPath))
@@ -128,11 +126,9 @@ net_GetFileFromURLSpec(const nsACString &aURL, nsIFile **result)
     if (path.Length() != strlen(path.get()))
         return NS_ERROR_FILE_INVALID_PATH;
 
-#ifndef WINCE
     // remove leading '\'
     if (path.CharAt(0) == '\\')
         path.Cut(0, 1);
-#endif
 
     if (IsUTF8(path))
         rv = localFile->InitWithPath(NS_ConvertUTF8toUTF16(path));
diff --git a/netwerk/build.mk b/netwerk/build.mk
index c91345cce4ce..ead898fcb956 100644
--- a/netwerk/build.mk
+++ b/netwerk/build.mk
@@ -62,11 +62,9 @@ endif
 
 # these are only in the necko tier because libpref needs it
 
-ifndef WINCE
 ifneq (,$(MOZ_XPINSTALL))
 tier_necko_dirs += modules/libreg
 endif
-endif
 
 tier_necko_dirs += \
 		modules/libpref \
diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in
index 067bad3a9438..b154827ba83d 100644
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -72,11 +72,6 @@ ifeq ($(OS_ARCH),WINNT)
         ../system/win32/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    SHARED_LIBRARY_LIBS += \
-        ../system/wince/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     SHARED_LIBRARY_LIBS += \
         ../system/mac/$(LIB_PREFIX)neckosystem_s.$(LIB_SUFFIX)
@@ -114,10 +109,6 @@ ifeq ($(OS_ARCH),WINNT)
     LOCAL_INCLUDES += -I$(srcdir)/../system/win32
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    LOCAL_INCLUDES += -I$(srcdir)/../system/wince
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     LOCAL_INCLUDES += -I$(srcdir)/../system/mac
 endif
@@ -192,8 +183,4 @@ ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-OS_LIBS += $(call EXPAND_LIBNAME,cellcore ws2)
-endif
-
 DEFINES += -DIMPL_NS_NET
diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp
index 35521f72d4d4..f3b1c57275d9 100644
--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp
+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp
@@ -51,13 +51,8 @@
 
 // URL file handling, copied and modified from xpfe/components/bookmarks/src/nsBookmarksService.cpp
 #ifdef XP_WIN
-#ifndef WINCE
-// Windows mobile does not support internet shortcuts including
-// CLSID_InternetShortcut and IUniformResourceLocator used in
-// this file
 #include <shlobj.h>
 #include <intshcut.h>
-#endif
 #include "nsIFileURL.h"
 #ifdef CompareString
 #undef CompareString
@@ -102,7 +97,7 @@ NS_IMETHODIMP
 nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI)
 {
 // IUniformResourceLocator isn't supported by VC5 (bless its little heart)
-#if _MSC_VER < 1200 || defined (WINCE)
+#if _MSC_VER < 1200
     return NS_ERROR_NOT_AVAILABLE;
 #else
     nsAutoString path;
@@ -145,7 +140,7 @@ nsFileProtocolHandler::ReadURLFile(nsIFile* aFile, nsIURI** aURI)
     }
     return rv;
 
-#endif //_MSC_VER < 1200 || defined (WINCE)
+#endif //_MSC_VER < 1200
 }
 
 #elif defined(XP_OS2)
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index baf2e99ca504..125973287721 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -700,13 +700,11 @@ nsHttpHandler::InitUserAgentComponents()
     else if (os2ver == 45)
         mOscpu.AssignLiteral("Warp 4.5");
 
-#elif defined(WINCE) || defined(XP_WIN)
+#elif defined(XP_WIN)
     OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
     if (GetVersionEx(&info)) {
         const char *format;
-#ifdef WINCE
-        format = "WindowsCE %ld.%ld";
-#elif defined _M_IA64
+#if defined _M_IA64
         format = WNT_BASE W64_PREFIX "; IA64";
 #elif defined _M_X64 || defined _M_AMD64
         format = WNT_BASE W64_PREFIX "; x64";
diff --git a/netwerk/system/Makefile.in b/netwerk/system/Makefile.in
index e9aca60f0ebf..bca55ded2522 100644
--- a/netwerk/system/Makefile.in
+++ b/netwerk/system/Makefile.in
@@ -48,10 +48,6 @@ ifeq ($(OS_ARCH),WINNT)
     DIRS += win32
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-    DIRS += wince
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
     DIRS += mac
 endif
diff --git a/netwerk/system/wince/Makefile.in b/netwerk/system/wince/Makefile.in
deleted file mode 100644
index a007eb3a2c49..000000000000
--- a/netwerk/system/wince/Makefile.in
+++ /dev/null
@@ -1,55 +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
-# Juan Lang
-# Portions created by the Initial Developer are Copyright (C) 2006
-# 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 *****
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE	       = necko
-LIBRARY_NAME   = neckosystem_s
-LIBXUL_LIBRARY = 1
-
-FORCE_STATIC_LIB = 1
-
-CPPSRCS += nsNotifyAddrListener.cpp
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DIMPL_NS_NET
diff --git a/netwerk/system/wince/nsNotifyAddrListener.cpp b/netwerk/system/wince/nsNotifyAddrListener.cpp
deleted file mode 100644
index 45126fd2f866..000000000000
--- a/netwerk/system/wince/nsNotifyAddrListener.cpp
+++ /dev/null
@@ -1,121 +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 Windows CE Link Monitoring.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Doug Turner <dougt@meer.net>  (Original Author)
- *
- * 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 "nsNotifyAddrListener.h"
-#include "nsServiceManagerUtils.h"
-#include "nsString.h"
-#include "nsIObserverService.h"
-
-#include <objbase.h>
-#ifdef WINCE_WINDOWS_MOBILE
-#include <connmgr.h>
-#endif
-
-// pulled from the header so that we do not get multiple define errors during link
-static const GUID nal_DestNetInternet =
-        { 0x436ef144, 0xb4fb, 0x4863, { 0xa0, 0x41, 0x8f, 0x90, 0x5a, 0x62, 0xc5, 0x72 } };
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsNotifyAddrListener,
-                              nsINetworkLinkService)
-
-nsNotifyAddrListener::nsNotifyAddrListener()
-: mConnectionHandle(NULL)
-{
-}
-
-nsNotifyAddrListener::~nsNotifyAddrListener()
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  if (mConnectionHandle)
-    ConnMgrReleaseConnection(mConnectionHandle, 0);
-#endif
-}
-
-nsresult
-nsNotifyAddrListener::Init(void)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  CONNMGR_CONNECTIONINFO conn_info;
-  memset(&conn_info, 0, sizeof(conn_info));
-  
-  conn_info.cbSize      = sizeof(conn_info);
-  conn_info.dwParams    = CONNMGR_PARAM_GUIDDESTNET;
-  conn_info.dwPriority  = CONNMGR_PRIORITY_LOWBKGND;
-  conn_info.guidDestNet = nal_DestNetInternet;
-  conn_info.bExclusive  = FALSE;
-  conn_info.bDisabled   = FALSE;
-  
-  ConnMgrEstablishConnection(&conn_info, 
-                             &mConnectionHandle);
-
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNotifyAddrListener::GetIsLinkUp(PRBool *aIsUp)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  DWORD status;
-  HRESULT result = ConnMgrConnectionStatus(mConnectionHandle, &status);
-  if (FAILED(result)) {
-    *aIsUp = PR_FALSE;
-    return NS_ERROR_FAILURE;
-  }
-  *aIsUp = status == CONNMGR_STATUS_CONNECTED;
-#else
-  *aIsUp = PR_TRUE;
-#endif
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsNotifyAddrListener::GetLinkStatusKnown(PRBool *aIsKnown)
-{
-#ifdef WINCE_WINDOWS_MOBILE
-  DWORD status;
-  HRESULT result = ConnMgrConnectionStatus(mConnectionHandle, &status);
-  if (FAILED(result)) {
-    *aIsKnown = PR_FALSE;
-    return NS_ERROR_FAILURE;
-  }
-  *aIsKnown = status != CONNMGR_STATUS_UNKNOWN;
-#else
-  *aIsKnown = PR_TRUE;
-#endif
-  return NS_OK;
-}
diff --git a/netwerk/system/wince/nsNotifyAddrListener.h b/netwerk/system/wince/nsNotifyAddrListener.h
deleted file mode 100644
index 680e5c03eb4f..000000000000
--- a/netwerk/system/wince/nsNotifyAddrListener.h
+++ /dev/null
@@ -1,61 +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 Windows CE Link Monitoring.
- *
- * The Initial Developer of the Original Code is Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *  Doug Turner <dougt@meer.net>  (Original Author)
- *
- * 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 NSNOTIFYADDRLISTENER_H_
-#define NSNOTIFYADDRLISTENER_H_
-
-#include <windows.h>
-
-#include "nsINetworkLinkService.h"
-#include "nsCOMPtr.h"
-
-
-class nsNotifyAddrListener : public nsINetworkLinkService
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSINETWORKLINKSERVICE
-
-    nsNotifyAddrListener();
-    virtual ~nsNotifyAddrListener();
-
-    nsresult Init(void);
-
-protected:
-    HANDLE mConnectionHandle;
-};
-
-#endif /* NSNOTIFYADDRLISTENER_H_ */

From 30f0d86da88d6035b2c2553cdc3125c1fd940b84 Mon Sep 17 00:00:00 2001
From: Sebastian Kromp <46b@gulli.com>
Date: Sat, 7 May 2011 10:04:56 +0200
Subject: [PATCH 064/314] Bug 633750 - deCOM nsIHTMLEditRules and move methods
 to nsHTMLEditRules. r=ehsan

---
 editor/libeditor/html/nsHTMLAbsPosition.cpp |  4 +-
 editor/libeditor/html/nsHTMLEditRules.cpp   | 18 +++---
 editor/libeditor/html/nsHTMLEditRules.h     | 19 +++----
 editor/libeditor/html/nsHTMLEditor.cpp      | 10 ++--
 editor/libeditor/html/nsIHTMLEditRules.h    | 63 ---------------------
 5 files changed, 23 insertions(+), 91 deletions(-)
 delete mode 100644 editor/libeditor/html/nsIHTMLEditRules.h

diff --git a/editor/libeditor/html/nsHTMLAbsPosition.cpp b/editor/libeditor/html/nsHTMLAbsPosition.cpp
index 5c685dc5cc11..08836d8fb5fe 100644
--- a/editor/libeditor/html/nsHTMLAbsPosition.cpp
+++ b/editor/libeditor/html/nsHTMLAbsPosition.cpp
@@ -50,7 +50,7 @@
 #include "nsEditorUtils.h"
 #include "nsHTMLEditUtils.h"
 #include "nsTextEditRules.h"
-#include "nsIHTMLEditRules.h"
+#include "nsHTMLEditRules.h"
 
 #include "nsIDOMHTMLElement.h"
 #include "nsIDOMNSHTMLElement.h"
@@ -595,7 +595,7 @@ nsHTMLEditor::AbsolutelyPositionElement(nsIDOMElement * aElement,
     res = HasStyleOrIdOrClass(aElement, &hasStyleOrIdOrClass);
     NS_ENSURE_SUCCESS(res, res);
     if (!hasStyleOrIdOrClass && nsHTMLEditUtils::IsDiv(aElement)) {
-      nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+      nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
       NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
       res = htmlRules->MakeSureElemStartsOrEndsOnCR(aElement);
       NS_ENSURE_SUCCESS(res, res);
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index a85baf2253c7..09e68e0e317c 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -242,7 +242,7 @@ nsHTMLEditRules::~nsHTMLEditRules()
 
 NS_IMPL_ADDREF_INHERITED(nsHTMLEditRules, nsTextEditRules)
 NS_IMPL_RELEASE_INHERITED(nsHTMLEditRules, nsTextEditRules)
-NS_IMPL_QUERY_INTERFACE_INHERITED2(nsHTMLEditRules, nsTextEditRules, nsIHTMLEditRules, nsIEditActionListener)
+NS_IMPL_QUERY_INTERFACE_INHERITED1(nsHTMLEditRules, nsTextEditRules, nsIEditActionListener)
 
 
 /********************************************************
@@ -727,11 +727,7 @@ nsHTMLEditRules::DidDoAction(nsISelection *aSelection,
   return nsTextEditRules::DidDoAction(aSelection, aInfo, aResult);
 }
   
-/********************************************************
- *  nsIHTMLEditRules methods
- ********************************************************/
-
-NS_IMETHODIMP 
+nsresult
 nsHTMLEditRules::GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *aDL)
 {
   NS_ENSURE_TRUE(aMixed && aOL && aUL && aDL, NS_ERROR_NULL_POINTER);
@@ -782,7 +778,7 @@ nsHTMLEditRules::GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *
   return res;
 }
 
-NS_IMETHODIMP 
+nsresult 
 nsHTMLEditRules::GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBool *aDD)
 {
   NS_ENSURE_TRUE(aMixed && aLI && aDT && aDD, NS_ERROR_NULL_POINTER);
@@ -835,7 +831,7 @@ nsHTMLEditRules::GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBo
   return res;
 }
 
-NS_IMETHODIMP 
+nsresult 
 nsHTMLEditRules::GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign)
 {
   // for now, just return first alignment.  we'll lie about
@@ -1005,7 +1001,7 @@ nsIAtom* MarginPropertyAtomForIndent(nsHTMLCSSUtils* aHTMLCSSUtils, nsIDOMNode*
     nsEditProperty::cssMarginRight : nsEditProperty::cssMarginLeft;
 }
 
-NS_IMETHODIMP 
+nsresult 
 nsHTMLEditRules::GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent)
 {
   NS_ENSURE_TRUE(aCanIndent && aCanOutdent, NS_ERROR_FAILURE);
@@ -1108,7 +1104,7 @@ nsHTMLEditRules::GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent)
 }
 
 
-NS_IMETHODIMP 
+nsresult 
 nsHTMLEditRules::GetParagraphState(PRBool *aMixed, nsAString &outFormat)
 {
   // This routine is *heavily* tied to our ui choices in the paragraph
@@ -8796,7 +8792,7 @@ nsHTMLEditRules::MakeSureElemStartsOrEndsOnCR(nsIDOMNode *aNode, PRBool aStarts)
   return NS_OK;
 }
 
-NS_IMETHODIMP
+nsresult
 nsHTMLEditRules::MakeSureElemStartsOrEndsOnCR(nsIDOMNode *aNode)
 {
   nsresult res = MakeSureElemStartsOrEndsOnCR(aNode, PR_FALSE);
diff --git a/editor/libeditor/html/nsHTMLEditRules.h b/editor/libeditor/html/nsHTMLEditRules.h
index db3dbb946d7d..92d8c53556f8 100644
--- a/editor/libeditor/html/nsHTMLEditRules.h
+++ b/editor/libeditor/html/nsHTMLEditRules.h
@@ -21,6 +21,7 @@
  *
  * Contributor(s):
  *   Daniel Glazman <glazman@netscape.com>
+ *   Sebastian Kromp <46b@gulli.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"),
@@ -40,7 +41,7 @@
 #define nsHTMLEditRules_h__
 
 #include "nsTextEditRules.h"
-#include "nsIHTMLEditRules.h"
+#include "nsIHTMLEditor.h"
 #include "nsIEditActionListener.h"
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
@@ -75,7 +76,7 @@ struct StyleCache : public PropItem
 
 #define SIZE_STYLE_TABLE 19
 
-class nsHTMLEditRules : public nsTextEditRules, public nsIHTMLEditRules, public nsIEditActionListener
+class nsHTMLEditRules : public nsTextEditRules, public nsIEditActionListener
 {
 public:
 
@@ -94,14 +95,12 @@ public:
   NS_IMETHOD DidDoAction(nsISelection *aSelection, nsRulesInfo *aInfo, nsresult aResult);
   NS_IMETHOD DocumentModified();
 
-  // nsIHTMLEditRules methods
-  
-  NS_IMETHOD GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *aDL);
-  NS_IMETHOD GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBool *aDD);
-  NS_IMETHOD GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent);
-  NS_IMETHOD GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign);
-  NS_IMETHOD GetParagraphState(PRBool *aMixed, nsAString &outFormat);
-  NS_IMETHOD MakeSureElemStartsOrEndsOnCR(nsIDOMNode *aNode);
+  nsresult GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *aDL);
+  nsresult GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBool *aDD);
+  nsresult GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent);
+  nsresult GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign);
+  nsresult GetParagraphState(PRBool *aMixed, nsAString &outFormat);
+  nsresult MakeSureElemStartsOrEndsOnCR(nsIDOMNode *aNode);
 
   // nsIEditActionListener methods
   
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index 512943255496..bfd4d3f1efa0 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -2278,7 +2278,7 @@ nsHTMLEditor::GetParagraphState(PRBool *aMixed, nsAString &outFormat)
 {
   if (!mRules) { return NS_ERROR_NOT_INITIALIZED; }
   NS_ENSURE_TRUE(aMixed, NS_ERROR_NULL_POINTER);
-  nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+  nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
   NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
   
   return htmlRules->GetParagraphState(aMixed, outFormat);
@@ -2480,7 +2480,7 @@ nsHTMLEditor::GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *aDL
 {
   if (!mRules) { return NS_ERROR_NOT_INITIALIZED; }
   NS_ENSURE_TRUE(aMixed && aOL && aUL && aDL, NS_ERROR_NULL_POINTER);
-  nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+  nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
   NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
   
   return htmlRules->GetListState(aMixed, aOL, aUL, aDL);
@@ -2492,7 +2492,7 @@ nsHTMLEditor::GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBool
   if (!mRules) { return NS_ERROR_NOT_INITIALIZED; }
   NS_ENSURE_TRUE(aMixed && aLI && aDT && aDD, NS_ERROR_NULL_POINTER);
 
-  nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+  nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
   NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
   
   return htmlRules->GetListItemState(aMixed, aLI, aDT, aDD);
@@ -2503,7 +2503,7 @@ nsHTMLEditor::GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign)
 {
   if (!mRules) { return NS_ERROR_NOT_INITIALIZED; }
   NS_ENSURE_TRUE(aMixed && aAlign, NS_ERROR_NULL_POINTER);
-  nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+  nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
   NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
   
   return htmlRules->GetAlignment(aMixed, aAlign);
@@ -2516,7 +2516,7 @@ nsHTMLEditor::GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent)
   if (!mRules) { return NS_ERROR_NOT_INITIALIZED; }
   NS_ENSURE_TRUE(aCanIndent && aCanOutdent, NS_ERROR_NULL_POINTER);
 
-  nsCOMPtr<nsIHTMLEditRules> htmlRules = do_QueryInterface(mRules);
+  nsHTMLEditRules* htmlRules = static_cast<nsHTMLEditRules*>(mRules.get());
   NS_ENSURE_TRUE(htmlRules, NS_ERROR_FAILURE);
   
   return htmlRules->GetIndentState(aCanIndent, aCanOutdent);
diff --git a/editor/libeditor/html/nsIHTMLEditRules.h b/editor/libeditor/html/nsIHTMLEditRules.h
deleted file mode 100644
index c0f49db9360c..000000000000
--- a/editor/libeditor/html/nsIHTMLEditRules.h
+++ /dev/null
@@ -1,63 +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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-#ifndef nsIHTMLEditRules_h__
-#define nsIHTMLEditRules_h__
-
-#define NS_IHTMLEDITRULES_IID \
-{ /* a6cf9121-15b3-11d2-932e-00805f8add32 */ \
-0xa6cf9121, 0x15b3, 0x11d2, \
-{0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
-
-#include "nsIHTMLEditor.h"
-
-class nsIHTMLEditRules : public nsISupports
-{
-public:
-  NS_DECLARE_STATIC_IID_ACCESSOR(NS_IHTMLEDITRULES_IID)
-  
-  NS_IMETHOD GetListState(PRBool *aMixed, PRBool *aOL, PRBool *aUL, PRBool *aDL)=0;
-  NS_IMETHOD GetListItemState(PRBool *aMixed, PRBool *aLI, PRBool *aDT, PRBool *aDD)=0;
-  NS_IMETHOD GetIndentState(PRBool *aCanIndent, PRBool *aCanOutdent)=0;
-  NS_IMETHOD GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign)=0;
-  NS_IMETHOD GetParagraphState(PRBool *aMixed, nsAString &outFormat)=0;
-  NS_IMETHOD MakeSureElemStartsOrEndsOnCR(nsIDOMNode *aNode)=0;
-};
-
-NS_DEFINE_STATIC_IID_ACCESSOR(nsIHTMLEditRules, NS_IHTMLEDITRULES_IID)
-
-#endif //nsIHTMLEditRules_h__

From 6caadfb6f9328fc52aebe01535ba8c5441b50cbd Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sun, 8 May 2011 19:19:15 +0900
Subject: [PATCH 065/314] Bug 519972 part 5: Make TextInputHandlerBase and
 PluginTextInputHandler classes, and rename nsCocoa*Hander to *InputHandler
 with namespace r=smichaud

--HG--
rename : widget/src/cocoa/nsCocoaTextInputHandler.h => widget/src/cocoa/TextInputHandler.h
rename : widget/src/cocoa/nsCocoaTextInputHandler.mm => widget/src/cocoa/TextInputHandler.mm
---
 widget/src/cocoa/Makefile.in                  |   2 +-
 ...aTextInputHandler.h => TextInputHandler.h} | 117 ++++--
 ...extInputHandler.mm => TextInputHandler.mm} | 339 ++++++++++--------
 widget/src/cocoa/nsBidiKeyboard.mm            |   6 +-
 widget/src/cocoa/nsChildView.h                |  10 +-
 widget/src/cocoa/nsChildView.mm               |  10 +-
 6 files changed, 296 insertions(+), 188 deletions(-)
 rename widget/src/cocoa/{nsCocoaTextInputHandler.h => TextInputHandler.h} (88%)
 rename widget/src/cocoa/{nsCocoaTextInputHandler.mm => TextInputHandler.mm} (85%)

diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index e5806ee0564a..92ea3b99c388 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -89,7 +89,7 @@ CMMSRCS = \
   nsPrintOptionsX.mm \
   nsPrintSettingsX.mm \
   nsIdleServiceX.mm \
-  nsCocoaTextInputHandler.mm \
+  TextInputHandler.mm \
   nsMacDockSupport.mm \
   nsStandaloneNativeMenu.mm \
   GfxInfo.mm \
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.h b/widget/src/cocoa/TextInputHandler.h
similarity index 88%
rename from widget/src/cocoa/nsCocoaTextInputHandler.h
rename to widget/src/cocoa/TextInputHandler.h
index 58dbe93f17a4..92f702d475b7 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.h
+++ b/widget/src/cocoa/TextInputHandler.h
@@ -37,8 +37,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef nsCocoaTextInputHandler_h_
-#define nsCocoaTextInputHandler_h_
+#ifndef TextInputHandler_h_
+#define TextInputHandler_h_
 
 #include "nsCocoaUtils.h"
 
@@ -56,44 +56,47 @@ struct PRLogModuleInfo;
 class nsChildView;
 struct nsTextRange;
 
+namespace mozilla {
+namespace widget {
+
 /**
- * nsTISInputSource is a wrapper for the TISInputSourceRef.  If we get the
+ * TISInputSourceWrapper is a wrapper for the TISInputSourceRef.  If we get the
  * TISInputSourceRef from InputSourceID, we need to release the CFArray instance
  * which is returned by TISCreateInputSourceList.  However, when we release the
  * list, we cannot access the TISInputSourceRef.  So, it's not usable, and it
  * may cause the memory leak bugs.  nsTISInputSource automatically releases the
  * list when the instance is destroyed.
  */
-class nsTISInputSource
+class TISInputSourceWrapper
 {
 public:
-  static nsTISInputSource& CurrentKeyboardLayout();
+  static TISInputSourceWrapper& CurrentKeyboardLayout();
 
-  nsTISInputSource()
+  TISInputSourceWrapper()
   {
     mInputSourceList = nsnull;
     Clear();
   }
 
-  nsTISInputSource(const char* aID)
+  TISInputSourceWrapper(const char* aID)
   {
     mInputSourceList = nsnull;
     InitByInputSourceID(aID);
   }
 
-  nsTISInputSource(SInt32 aLayoutID)
+  TISInputSourceWrapper(SInt32 aLayoutID)
   {
     mInputSourceList = nsnull;
     InitByLayoutID(aLayoutID);
   }
 
-  nsTISInputSource(TISInputSourceRef aInputSource)
+  TISInputSourceWrapper(TISInputSourceRef aInputSource)
   {
     mInputSourceList = nsnull;
     InitByTISInputSourceRef(aInputSource);
   }
 
-  ~nsTISInputSource() { Clear(); }
+  ~TISInputSourceWrapper() { Clear(); }
 
   void InitByInputSourceID(const char* aID);
   void InitByInputSourceID(const nsAFlatString &aID);
@@ -207,7 +210,61 @@ protected:
 };
 
 /**
- * nsCocoaIMEHandler manages:
+ * TextInputHandlerBase is a base class of PluginTextInputHandler,
+ * IMEInputHandler and TextInputHandler.  Utility methods should be implemented
+ * this level.
+ */
+
+class TextInputHandlerBase
+{
+public:
+  /**
+   * Init must be called when aOwner is initializing and finished attaching
+   * an NSView.
+   *
+   * @param aOwner                An owner nsChildView of the instance.
+   */
+  virtual void Init(nsChildView* aOwner);
+
+  /**
+   * OnDestroyView must be called when mOwnerWidget is destroying and detaching
+   * mView.
+   *
+   * @param aDestroyingView       Destroying view.  This might not be mView.
+   * @return                      This result doesn't have any meaning for
+   *                              callers.  When the aDstroyingView isn't same
+   *                              as mView, FALSE.  Then, inherited methods in
+   *                              sub classes should return from this method
+   *                              without cleaning up.
+   */
+  virtual PRBool OnDestroyView(NSView<mozView> *aDestroyingView);
+
+protected:
+  // The owner of this instance.  The result of mOwnerWidget->TextInputHandler
+  // returns this instance.  This must not be null after initialized.
+  nsChildView* mOwnerWidget;
+
+  // The native focused view, this is the native NSView of mOwnerWidget.
+  // This view handles the actual text inputting.
+  NSView<mozView>* mView;
+
+  TextInputHandlerBase();
+  virtual ~TextInputHandlerBase();
+};
+
+/**
+ * PluginTextInputHandler handles text input events for plugins.
+ */
+
+class PluginTextInputHandler : public TextInputHandlerBase
+{
+protected:
+  PluginTextInputHandler();
+  ~PluginTextInputHandler();
+};
+
+/**
+ * IMEInputHandler manages:
  *   1. The IME/keyboard layout statement of nsChildView.
  *   2. The IME composition statement of nsChildView.
  * And also provides the methods which controls the current IME transaction of
@@ -217,22 +274,14 @@ protected:
  * a text editor on XUL panel element, the input events handled on the parent
  * (or its ancestor) widget handles it (the native focus is set to it).  The
  * actual focused view is notified by OnFocusChangeInGecko.
- *
- * NOTE: This class must not be used directly.  The purpose of this class is
- *       to protect the IME related code from non-IME using developers.
- *       Use nsCocoaTextInputHandler class which inherits this class.
  */
 
-class nsCocoaIMEHandler
+class IMEInputHandler : public PluginTextInputHandler
 {
 public:
-  nsCocoaIMEHandler();
-  virtual ~nsCocoaIMEHandler();
-
-  virtual void Init(nsChildView* aOwner);
+  virtual PRBool OnDestroyView(NSView<mozView> *aDestroyingView);
 
   virtual void OnFocusChangeInGecko(PRBool aFocus);
-  virtual void OnDestroyView(NSView<mozView> *aDestroyingView);
 
   /**
    * DispatchTextEvent() dispatches a text event on mOwnerWidget.
@@ -376,14 +425,6 @@ public:
   static TSMDocumentID GetCurrentTSMDocumentID();
 
 protected:
-  // The owner of this instance.  The result of mOwnerWidget->TextInputHandler
-  // returns this instance.  This must not be null after initialized.
-  nsChildView* mOwnerWidget;
-
-  // The native focused view, this is the native NSView of mOwnerWidget.
-  // This view handling the actual text inputting.
-  NSView<mozView>* mView;
-
   // We cannot do some jobs in the given stack by some reasons.
   // Following flags and the timer provide the execution pending mechanism,
   // See the comment in nsCocoaTextInputHandler.mm.
@@ -395,6 +436,9 @@ protected:
   };
   PRUint32 mPendingMethods;
 
+  IMEInputHandler();
+  virtual ~IMEInputHandler();
+
   PRBool IsFocused();
   void ResetTimer();
 
@@ -504,20 +548,23 @@ private:
   // must have the actual focused handle.
   // We cannot access to the NSInputManager during we aren't active, so, the
   // focused handler can have an IME transaction even if we are deactive.
-  static nsCocoaIMEHandler* sFocusedIMEHandler;
+  static IMEInputHandler* sFocusedIMEHandler;
 };
 
 /**
- * nsCocoaTextInputHandler is going to implement the NSTextInput protocol.
+ * TextInputHandler implements the NSTextInput protocol.
  */
-class nsCocoaTextInputHandler : public nsCocoaIMEHandler
+class TextInputHandler : public IMEInputHandler
 {
 public:
   static CFArrayRef CreateAllKeyboardLayoutList();
   static void DebugPrintAllKeyboardLayouts(PRLogModuleInfo* aLogModuleInfo);
 
-  nsCocoaTextInputHandler();
-  virtual ~nsCocoaTextInputHandler();
+  TextInputHandler();
+  virtual ~TextInputHandler();
 };
 
-#endif // nsCocoaTextInputHandler_h_
+} // namespace widget
+} // namespace mozilla
+
+#endif // TextInputHandler_h_
diff --git a/widget/src/cocoa/nsCocoaTextInputHandler.mm b/widget/src/cocoa/TextInputHandler.mm
similarity index 85%
rename from widget/src/cocoa/nsCocoaTextInputHandler.mm
rename to widget/src/cocoa/TextInputHandler.mm
index 0fd5fdf9c2f6..e845cd204adf 100644
--- a/widget/src/cocoa/nsCocoaTextInputHandler.mm
+++ b/widget/src/cocoa/TextInputHandler.mm
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsCocoaTextInputHandler.h"
+#include "TextInputHandler.h"
 
 #include "nsChildView.h"
 #include "nsObjCExceptions.h"
@@ -48,6 +48,8 @@
 #endif
 #include "prlog.h"
 
+using namespace mozilla::widget;
+
 #undef DEBUG_IME_HANDLER
 #undef DEBUG_TEXT_INPUT_HANDLER
 //#define DEBUG_IME_HANDLER 1
@@ -95,9 +97,9 @@ TrueOrFalse(PRBool aBool)
 }
 
 static void
-DebugPrintPointer(nsCocoaIMEHandler* aHandler)
+DebugPrintPointer(IMEInputHandler* aHandler)
 {
-  static nsCocoaIMEHandler* sLastHandler = nsnull;
+  static IMEInputHandler* sLastHandler = nsnull;
   if (aHandler == sLastHandler)
     return;
   sLastHandler = aHandler;
@@ -158,7 +160,7 @@ GetWindowLevelName(NSInteger aWindowLevel)
 #endif // DEBUG_IME_HANDLER
 
 static PRUint32 gHandlerInstanceCount = 0;
-static nsTISInputSource gCurrentKeyboardLayout;
+static TISInputSourceWrapper gCurrentKeyboardLayout;
 
 static void
 InitCurrentKeyboardLayout()
@@ -181,13 +183,13 @@ FinalizeCurrentKeyboardLayout()
 
 /******************************************************************************
  *
- *  nsTISInputSource implementation
+ *  TISInputSourceWrapper implementation
  *
  ******************************************************************************/
 
 // static
-nsTISInputSource&
-nsTISInputSource::CurrentKeyboardLayout()
+TISInputSourceWrapper&
+TISInputSourceWrapper::CurrentKeyboardLayout()
 {
   InitCurrentKeyboardLayout();
   return gCurrentKeyboardLayout;
@@ -195,12 +197,13 @@ nsTISInputSource::CurrentKeyboardLayout()
 
 // static
 PRBool
-nsTISInputSource::UCKeyTranslateToString(const UCKeyboardLayout* aHandle,
-                                         UInt32 aKeyCode, UInt32 aModifiers,
-                                         UInt32 aKbType, nsAString &aStr)
+TISInputSourceWrapper::UCKeyTranslateToString(
+                         const UCKeyboardLayout* aHandle,
+                         UInt32 aKeyCode, UInt32 aModifiers,
+                         UInt32 aKbType, nsAString &aStr)
 {
 #ifdef DEBUG_TEXT_INPUT_HANDLER
-  NSLog(@"**** nsTISInputSource::UCKeyTranslateToString: aHandle: %p, aKeyCode: %X, aModifiers: %X, aKbType: %X",
+  NSLog(@"**** TISInputSourceWrapper::UCKeyTranslateToString: aHandle: %p, aKeyCode: %X, aModifiers: %X, aKbType: %X",
         aHandle, aKeyCode, aModifiers, aKbType);
   PRBool isShift = aModifiers & shiftKey;
   PRBool isCtrl = aModifiers & controlKey;
@@ -241,7 +244,7 @@ nsTISInputSource::UCKeyTranslateToString(const UCKeyboardLayout* aHandle,
 }
 
 void
-nsTISInputSource::InitByInputSourceID(const char* aID)
+TISInputSourceWrapper::InitByInputSourceID(const char* aID)
 {
   Clear();
   if (!aID)
@@ -254,7 +257,7 @@ nsTISInputSource::InitByInputSourceID(const char* aID)
 }
 
 void
-nsTISInputSource::InitByInputSourceID(const nsAFlatString &aID)
+TISInputSourceWrapper::InitByInputSourceID(const nsAFlatString &aID)
 {
   Clear();
   if (aID.IsEmpty())
@@ -266,7 +269,7 @@ nsTISInputSource::InitByInputSourceID(const nsAFlatString &aID)
 }
 
 void
-nsTISInputSource::InitByInputSourceID(const CFStringRef aID)
+TISInputSourceWrapper::InitByInputSourceID(const CFStringRef aID)
 {
   Clear();
   if (!aID)
@@ -285,7 +288,7 @@ nsTISInputSource::InitByInputSourceID(const CFStringRef aID)
 }
 
 void
-nsTISInputSource::InitByLayoutID(SInt32 aLayoutID)
+TISInputSourceWrapper::InitByLayoutID(SInt32 aLayoutID)
 {
   Clear();
   // XXX On TIS, the LayoutID is abolished completely.  Therefore, the numbers
@@ -309,49 +312,49 @@ nsTISInputSource::InitByLayoutID(SInt32 aLayoutID)
 }
 
 void
-nsTISInputSource::InitByCurrentInputSource()
+TISInputSourceWrapper::InitByCurrentInputSource()
 {
   Clear();
   mInputSource = ::TISCopyCurrentKeyboardInputSource();
 }
 
 void
-nsTISInputSource::InitByCurrentKeyboardLayout()
+TISInputSourceWrapper::InitByCurrentKeyboardLayout()
 {
   Clear();
   mInputSource = ::TISCopyCurrentKeyboardLayoutInputSource();
 }
 
 void
-nsTISInputSource::InitByCurrentASCIICapableInputSource()
+TISInputSourceWrapper::InitByCurrentASCIICapableInputSource()
 {
   Clear();
   mInputSource = ::TISCopyCurrentASCIICapableKeyboardInputSource();
 }
 
 void
-nsTISInputSource::InitByCurrentASCIICapableKeyboardLayout()
+TISInputSourceWrapper::InitByCurrentASCIICapableKeyboardLayout()
 {
   Clear();
   mInputSource = ::TISCopyCurrentASCIICapableKeyboardLayoutInputSource();
 }
 
 void
-nsTISInputSource::InitByTISInputSourceRef(TISInputSourceRef aInputSource)
+TISInputSourceWrapper::InitByTISInputSourceRef(TISInputSourceRef aInputSource)
 {
   Clear();
   mInputSource = aInputSource;
 }
 
 void
-nsTISInputSource::InitByLanguage(CFStringRef aLanguage)
+TISInputSourceWrapper::InitByLanguage(CFStringRef aLanguage)
 {
   Clear();
   mInputSource = ::TISCopyInputSourceForLanguage(aLanguage);
 }
 
 const UCKeyboardLayout*
-nsTISInputSource::GetUCKeyboardLayout()
+TISInputSourceWrapper::GetUCKeyboardLayout()
 {
   NS_ENSURE_TRUE(mInputSource, nsnull);
   if (mUCKeyboardLayout) {
@@ -369,7 +372,7 @@ nsTISInputSource::GetUCKeyboardLayout()
 }
 
 PRBool
-nsTISInputSource::GetBoolProperty(const CFStringRef aKey)
+TISInputSourceWrapper::GetBoolProperty(const CFStringRef aKey)
 {
   CFBooleanRef ret = static_cast<CFBooleanRef>(
     ::TISGetInputSourceProperty(mInputSource, aKey));
@@ -377,7 +380,8 @@ nsTISInputSource::GetBoolProperty(const CFStringRef aKey)
 }
 
 PRBool
-nsTISInputSource::GetStringProperty(const CFStringRef aKey, CFStringRef &aStr)
+TISInputSourceWrapper::GetStringProperty(const CFStringRef aKey,
+                                         CFStringRef &aStr)
 {
   aStr = static_cast<CFStringRef>(
     ::TISGetInputSourceProperty(mInputSource, aKey));
@@ -385,7 +389,8 @@ nsTISInputSource::GetStringProperty(const CFStringRef aKey, CFStringRef &aStr)
 }
 
 PRBool
-nsTISInputSource::GetStringProperty(const CFStringRef aKey, nsAString &aStr)
+TISInputSourceWrapper::GetStringProperty(const CFStringRef aKey,
+                                         nsAString &aStr)
 {
   CFStringRef str;
   GetStringProperty(aKey, str);
@@ -394,7 +399,7 @@ nsTISInputSource::GetStringProperty(const CFStringRef aKey, nsAString &aStr)
 }
 
 PRBool
-nsTISInputSource::IsOpenedIMEMode()
+TISInputSourceWrapper::IsOpenedIMEMode()
 {
   NS_ENSURE_TRUE(mInputSource, PR_FALSE);
   if (!IsIMEMode())
@@ -403,7 +408,7 @@ nsTISInputSource::IsOpenedIMEMode()
 }
 
 PRBool
-nsTISInputSource::IsIMEMode()
+TISInputSourceWrapper::IsIMEMode()
 {
   NS_ENSURE_TRUE(mInputSource, PR_FALSE);
   CFStringRef str;
@@ -414,7 +419,7 @@ nsTISInputSource::IsIMEMode()
 }
 
 PRBool
-nsTISInputSource::GetLanguageList(CFArrayRef &aLanguageList)
+TISInputSourceWrapper::GetLanguageList(CFArrayRef &aLanguageList)
 {
   NS_ENSURE_TRUE(mInputSource, PR_FALSE);
   aLanguageList = static_cast<CFArrayRef>(
@@ -424,7 +429,7 @@ nsTISInputSource::GetLanguageList(CFArrayRef &aLanguageList)
 }
 
 PRBool
-nsTISInputSource::GetPrimaryLanguage(CFStringRef &aPrimaryLanguage)
+TISInputSourceWrapper::GetPrimaryLanguage(CFStringRef &aPrimaryLanguage)
 {
   NS_ENSURE_TRUE(mInputSource, PR_FALSE);
   CFArrayRef langList;
@@ -437,7 +442,7 @@ nsTISInputSource::GetPrimaryLanguage(CFStringRef &aPrimaryLanguage)
 }
 
 PRBool
-nsTISInputSource::GetPrimaryLanguage(nsAString &aPrimaryLanguage)
+TISInputSourceWrapper::GetPrimaryLanguage(nsAString &aPrimaryLanguage)
 {
   NS_ENSURE_TRUE(mInputSource, PR_FALSE);
   CFStringRef primaryLanguage;
@@ -447,7 +452,7 @@ nsTISInputSource::GetPrimaryLanguage(nsAString &aPrimaryLanguage)
 }
 
 PRBool
-nsTISInputSource::IsForRTLLanguage()
+TISInputSourceWrapper::IsForRTLLanguage()
 {
   if (mIsRTL < 0) {
     // Get the input character of the 'A' key of ANSI keyboard layout.
@@ -461,14 +466,14 @@ nsTISInputSource::IsForRTLLanguage()
 }
 
 PRBool
-nsTISInputSource::IsInitializedByCurrentKeyboardLayout()
+TISInputSourceWrapper::IsInitializedByCurrentKeyboardLayout()
 {
   return mInputSource == ::TISCopyCurrentKeyboardLayoutInputSource();
 }
 
 PRBool
-nsTISInputSource::TranslateToString(UInt32 aKeyCode, UInt32 aModifiers,
-                                    UInt32 aKbdType, nsAString &aStr)
+TISInputSourceWrapper::TranslateToString(UInt32 aKeyCode, UInt32 aModifiers,
+                                         UInt32 aKbdType, nsAString &aStr)
 {
   aStr.Truncate();
   const UCKeyboardLayout* UCKey = GetUCKeyboardLayout();
@@ -477,7 +482,7 @@ nsTISInputSource::TranslateToString(UInt32 aKeyCode, UInt32 aModifiers,
 }
 
 void
-nsTISInputSource::Select()
+TISInputSourceWrapper::Select()
 {
   if (!mInputSource)
     return;
@@ -485,7 +490,7 @@ nsTISInputSource::Select()
 }
 
 void
-nsTISInputSource::Clear()
+TISInputSourceWrapper::Clear()
 {
   if (mInputSourceList) {
     ::CFRelease(mInputSourceList);
@@ -502,13 +507,13 @@ nsTISInputSource::Clear()
 
 /******************************************************************************
  *
- *  nsCocoaTextInputHandler implementation (static methods)
+ *  TextInputHandler implementation (static methods)
  *
  ******************************************************************************/
 
 // static
 CFArrayRef
-nsCocoaTextInputHandler::CreateAllKeyboardLayoutList()
+TextInputHandler::CreateAllKeyboardLayoutList()
 {
   const void* keys[] = { kTISPropertyInputSourceType };
   const void* values[] = { kTISTypeKeyboardLayout };
@@ -522,13 +527,12 @@ nsCocoaTextInputHandler::CreateAllKeyboardLayoutList()
 
 // static
 void
-nsCocoaTextInputHandler::DebugPrintAllKeyboardLayouts(
-                           PRLogModuleInfo* aLogModuleInfo)
+TextInputHandler::DebugPrintAllKeyboardLayouts(PRLogModuleInfo* aLogModuleInfo)
 {
   CFArrayRef list = CreateAllKeyboardLayoutList();
   PR_LOG(aLogModuleInfo, PR_LOG_ALWAYS, ("Keyboard layout configuration:"));
   CFIndex idx = ::CFArrayGetCount(list);
-  nsTISInputSource tis;
+  TISInputSourceWrapper tis;
   for (CFIndex i = 0; i < idx; ++i) {
     TISInputSourceRef inputSource = static_cast<TISInputSourceRef>(
       const_cast<void *>(::CFArrayGetValueAtIndex(list, i)));
@@ -552,16 +556,16 @@ nsCocoaTextInputHandler::DebugPrintAllKeyboardLayouts(
 
 /******************************************************************************
  *
- *  nsCocoaTextInputHandler implementation
+ *  TextInputHandler implementation
  *
  ******************************************************************************/
 
-nsCocoaTextInputHandler::nsCocoaTextInputHandler() :
-  nsCocoaIMEHandler()
+TextInputHandler::TextInputHandler() :
+  IMEInputHandler()
 {
 }
 
-nsCocoaTextInputHandler::~nsCocoaTextInputHandler()
+TextInputHandler::~TextInputHandler()
 {
 }
 
@@ -571,17 +575,17 @@ nsCocoaTextInputHandler::~nsCocoaTextInputHandler()
 
 /******************************************************************************
  *
- *  nsCocoaIMEHandler implementation (static methods)
+ *  IMEInputHandler implementation (static methods)
  *
  ******************************************************************************/
 
-PRBool nsCocoaIMEHandler::sStaticMembersInitialized = PR_FALSE;
-CFStringRef nsCocoaIMEHandler::sLatestIMEOpenedModeInputSourceID = nsnull;
-nsCocoaIMEHandler* nsCocoaIMEHandler::sFocusedIMEHandler = nsnull;
+PRBool IMEInputHandler::sStaticMembersInitialized = PR_FALSE;
+CFStringRef IMEInputHandler::sLatestIMEOpenedModeInputSourceID = nsnull;
+IMEInputHandler* IMEInputHandler::sFocusedIMEHandler = nsnull;
 
 // static
 void
-nsCocoaIMEHandler::InitStaticMembers()
+IMEInputHandler::InitStaticMembers()
 {
   if (sStaticMembersInitialized)
     return;
@@ -603,15 +607,14 @@ nsCocoaIMEHandler::InitStaticMembers()
 
 // static
 void
-nsCocoaIMEHandler::OnCurrentTextInputSourceChange(
-                     CFNotificationCenterRef aCenter,
-                     void* aObserver,
-                     CFStringRef aName,
-                     const void* aObject,
-                     CFDictionaryRef aUserInfo)
+IMEInputHandler::OnCurrentTextInputSourceChange(CFNotificationCenterRef aCenter,
+                                                void* aObserver,
+                                                CFStringRef aName,
+                                                const void* aObject,
+                                                CFDictionaryRef aUserInfo)
 {
   // Cache the latest IME opened mode to sLatestIMEOpenedModeInputSourceID.
-  nsTISInputSource tis;
+  TISInputSourceWrapper tis;
   tis.InitByCurrentInputSource();
   if (tis.IsOpenedIMEMode()) {
     tis.GetInputSourceID(sLatestIMEOpenedModeInputSourceID);
@@ -623,7 +626,7 @@ nsCocoaIMEHandler::OnCurrentTextInputSourceChange(
   tis.GetInputSourceID(newTIS);
   if (!sLastTIS ||
       ::CFStringCompare(sLastTIS, newTIS, 0) != kCFCompareEqualTo) {
-    nsTISInputSource tis1, tis2, tis3;
+    TISInputSourceWrapper tis1, tis2, tis3;
     tis1.InitByCurrentKeyboardLayout();
     tis2.InitByCurrentASCIICapableInputSource();
     tis3.InitByCurrentASCIICapableKeyboardLayout();
@@ -654,15 +657,15 @@ nsCocoaIMEHandler::OnCurrentTextInputSourceChange(
 
 // static
 void
-nsCocoaIMEHandler::FlushPendingMethods(nsITimer* aTimer, void* aClosure)
+IMEInputHandler::FlushPendingMethods(nsITimer* aTimer, void* aClosure)
 {
   NS_ASSERTION(aClosure, "aClosure is null");
-  static_cast<nsCocoaIMEHandler*>(aClosure)->ExecutePendingMethods();
+  static_cast<IMEInputHandler*>(aClosure)->ExecutePendingMethods();
 }
 
 // static
 CFArrayRef
-nsCocoaIMEHandler::CreateAllIMEModeList()
+IMEInputHandler::CreateAllIMEModeList()
 {
   const void* keys[] = { kTISPropertyInputSourceType };
   const void* values[] = { kTISTypeKeyboardInputMode };
@@ -676,12 +679,12 @@ nsCocoaIMEHandler::CreateAllIMEModeList()
 
 // static
 void
-nsCocoaIMEHandler::DebugPrintAllIMEModes(PRLogModuleInfo* aLogModuleInfo)
+IMEInputHandler::DebugPrintAllIMEModes(PRLogModuleInfo* aLogModuleInfo)
 {
   CFArrayRef list = CreateAllIMEModeList();
   PR_LOG(aLogModuleInfo, PR_LOG_ALWAYS, ("IME mode configuration:"));
   CFIndex idx = ::CFArrayGetCount(list);
-  nsTISInputSource tis;
+  TISInputSourceWrapper tis;
   for (CFIndex i = 0; i < idx; ++i) {
     TISInputSourceRef inputSource = static_cast<TISInputSourceRef>(
       const_cast<void *>(::CFArrayGetValueAtIndex(list, i)));
@@ -701,7 +704,7 @@ nsCocoaIMEHandler::DebugPrintAllIMEModes(PRLogModuleInfo* aLogModuleInfo)
 
 //static
 TSMDocumentID
-nsCocoaIMEHandler::GetCurrentTSMDocumentID()
+IMEInputHandler::GetCurrentTSMDocumentID()
 {
   // On OS X 10.6.x at least, ::TSMGetActiveDocument() has a bug that prevents
   // it from returning accurate results unless
@@ -716,7 +719,7 @@ nsCocoaIMEHandler::GetCurrentTSMDocumentID()
 
 /******************************************************************************
  *
- *  nsCocoaIMEHandler implementation #1
+ *  IMEInputHandler implementation #1
  *    The methods are releated to the pending methods.  Some jobs should be
  *    run after the stack is finished, e.g, some methods cannot run the jobs
  *    during processing the focus event.  And also some other jobs should be
@@ -727,13 +730,13 @@ nsCocoaIMEHandler::GetCurrentTSMDocumentID()
  ******************************************************************************/
 
 void
-nsCocoaIMEHandler::ResetIMEWindowLevel()
+IMEInputHandler::ResetIMEWindowLevel()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::ResetIMEWindowLevel");
+  NSLog(@"IMEInputHandler::ResetIMEWindowLevel");
   NSLog(@"  IsFocused:%s GetCurrentTSMDocumentID():%p",
         TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID());
 #endif // DEBUG_IME_HANDLER
@@ -788,13 +791,13 @@ nsCocoaIMEHandler::ResetIMEWindowLevel()
 }
 
 void
-nsCocoaIMEHandler::DiscardIMEComposition()
+IMEInputHandler::DiscardIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::DiscardIMEComposition");
+  NSLog(@"IMEInputHandler::DiscardIMEComposition");
   NSLog(@"  currentInputManager:%p", [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
 
@@ -824,13 +827,13 @@ nsCocoaIMEHandler::DiscardIMEComposition()
 }
 
 void
-nsCocoaIMEHandler::SyncASCIICapableOnly()
+IMEInputHandler::SyncASCIICapableOnly()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::SyncASCIICapableOnly");
+  NSLog(@"IMEInputHandler::SyncASCIICapableOnly");
   NSLog(@"  IsFocused:%s GetCurrentTSMDocumentID():%p",
         TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID());
 #endif
@@ -869,7 +872,7 @@ nsCocoaIMEHandler::SyncASCIICapableOnly()
 }
 
 void
-nsCocoaIMEHandler::ResetTimer()
+IMEInputHandler::ResetTimer()
 {
   NS_ASSERTION(mPendingMethods != 0,
                "There are not pending methods, why this is called?");
@@ -884,7 +887,7 @@ nsCocoaIMEHandler::ResetTimer()
 }
 
 void
-nsCocoaIMEHandler::ExecutePendingMethods()
+IMEInputHandler::ExecutePendingMethods()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -921,13 +924,13 @@ nsCocoaIMEHandler::ExecutePendingMethods()
 
 /******************************************************************************
  *
- * nsCocoaIMEHandler implementation (native event handlers)
+ * IMEInputHandler implementation (native event handlers)
  *
  ******************************************************************************/
 
 PRUint32
-nsCocoaIMEHandler::ConvertToTextRangeType(PRUint32 aUnderlineStyle,
-                                          NSRange& aSelectedRange)
+IMEInputHandler::ConvertToTextRangeType(PRUint32 aUnderlineStyle,
+                                        NSRange& aSelectedRange)
 {
 #ifdef DEBUG_IME_HANDLER
   NSLog(@"****in ConvertToTextRangeType = %d", aUnderlineStyle);
@@ -960,7 +963,7 @@ nsCocoaIMEHandler::ConvertToTextRangeType(PRUint32 aUnderlineStyle,
 }
 
 PRUint32
-nsCocoaIMEHandler::GetRangeCount(NSAttributedString *aAttrString)
+IMEInputHandler::GetRangeCount(NSAttributedString *aAttrString)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
@@ -985,9 +988,9 @@ nsCocoaIMEHandler::GetRangeCount(NSAttributedString *aAttrString)
 }
 
 void
-nsCocoaIMEHandler::SetTextRangeList(nsTArray<nsTextRange>& aTextRangeList,
-                                    NSAttributedString *aAttrString,
-                                    NSRange& aSelectedRange)
+IMEInputHandler::SetTextRangeList(nsTArray<nsTextRange>& aTextRangeList,
+                                  NSAttributedString *aAttrString,
+                                  NSRange& aSelectedRange)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1027,10 +1030,10 @@ nsCocoaIMEHandler::SetTextRangeList(nsTArray<nsTextRange>& aTextRangeList,
 }
 
 PRBool
-nsCocoaIMEHandler::DispatchTextEvent(const nsString& aText,
-                                     NSAttributedString* aAttrString,
-                                     NSRange& aSelectedRange,
-                                     PRBool aDoCommit)
+IMEInputHandler::DispatchTextEvent(const nsString& aText,
+                                   NSAttributedString* aAttrString,
+                                   NSRange& aSelectedRange,
+                                   PRBool aDoCommit)
 {
 #ifdef DEBUG_IME_HANDLER
   NSLog(@"****in DispatchTextEvent; string = '%@'", aAttrString);
@@ -1052,14 +1055,14 @@ nsCocoaIMEHandler::DispatchTextEvent(const nsString& aText,
 }
 
 void
-nsCocoaIMEHandler::InitCompositionEvent(nsCompositionEvent& aCompositionEvent)
+IMEInputHandler::InitCompositionEvent(nsCompositionEvent& aCompositionEvent)
 {
   aCompositionEvent.time = PR_IntervalNow();
 }
 
 void
-nsCocoaIMEHandler::InsertTextAsCommittingComposition(
-                     NSAttributedString* aAttrString)
+IMEInputHandler::InsertTextAsCommittingComposition(
+                   NSAttributedString* aAttrString)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1114,8 +1117,8 @@ nsCocoaIMEHandler::InsertTextAsCommittingComposition(
 }
 
 void
-nsCocoaIMEHandler::SetMarkedText(NSAttributedString* aAttrString,
-                                 NSRange& aSelectedRange)
+IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
+                               NSRange& aSelectedRange)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1178,7 +1181,7 @@ nsCocoaIMEHandler::SetMarkedText(NSAttributedString* aAttrString,
 }
 
 NSInteger
-nsCocoaIMEHandler::ConversationIdentifier()
+IMEInputHandler::ConversationIdentifier()
 {
   // NOTE: The size of NSInteger is same as pointer size.
   nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mOwnerWidget);
@@ -1193,7 +1196,7 @@ nsCocoaIMEHandler::ConversationIdentifier()
 }
 
 NSAttributedString*
-nsCocoaIMEHandler::GetAttributedSubstringFromRange(NSRange& aRange)
+IMEInputHandler::GetAttributedSubstringFromRange(NSRange& aRange)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
@@ -1225,7 +1228,7 @@ nsCocoaIMEHandler::GetAttributedSubstringFromRange(NSRange& aRange)
 }
 
 NSRange
-nsCocoaIMEHandler::SelectedRange()
+IMEInputHandler::SelectedRange()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
@@ -1249,7 +1252,7 @@ nsCocoaIMEHandler::SelectedRange()
 }
 
 NSRect
-nsCocoaIMEHandler::FirstRectForCharacterRange(NSRange& aRange)
+IMEInputHandler::FirstRectForCharacterRange(NSRange& aRange)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
@@ -1311,7 +1314,7 @@ nsCocoaIMEHandler::FirstRectForCharacterRange(NSRange& aRange)
 }
 
 NSUInteger
-nsCocoaIMEHandler::CharacterIndexForPoint(NSPoint& aPoint)
+IMEInputHandler::CharacterIndexForPoint(NSPoint& aPoint)
 {
 #if DEBUG_IME
   NSLog(@"****in CharacterIndexForPoint");
@@ -1322,7 +1325,7 @@ nsCocoaIMEHandler::CharacterIndexForPoint(NSPoint& aPoint)
 }
 
 NSArray*
-nsCocoaIMEHandler::GetValidAttributesForMarkedText()
+IMEInputHandler::GetValidAttributesForMarkedText()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
@@ -1346,25 +1349,24 @@ nsCocoaIMEHandler::GetValidAttributesForMarkedText()
 
 /******************************************************************************
  *
- *  nsCocoaIMEHandler implementation #2
+ *  IMEInputHandler implementation #2
  *
  ******************************************************************************/
 
-nsCocoaIMEHandler::nsCocoaIMEHandler() :
-  mOwnerWidget(nsnull), mView(nsnull),
+IMEInputHandler::IMEInputHandler() :
+  PluginTextInputHandler(),
   mPendingMethods(0), mIMECompositionString(nsnull),
   mIsIMEComposing(PR_FALSE), mIsIMEEnabled(PR_TRUE),
   mIsASCIICapableOnly(PR_FALSE), mIgnoreIMECommit(PR_FALSE),
   mIsInFocusProcessing(PR_FALSE)
 {
-  gHandlerInstanceCount++;
   InitStaticMembers();
 
   mMarkedRange.location = NSNotFound;
   mMarkedRange.length = 0;
 }
 
-nsCocoaIMEHandler::~nsCocoaIMEHandler()
+IMEInputHandler::~IMEInputHandler()
 {
   if (mTimer) {
     mTimer->Cancel();
@@ -1373,25 +1375,14 @@ nsCocoaIMEHandler::~nsCocoaIMEHandler()
   if (sFocusedIMEHandler == this) {
     sFocusedIMEHandler = nsnull;
   }
-  if (--gHandlerInstanceCount == 0) {
-    FinalizeCurrentKeyboardLayout();
-  }
 }
 
 void
-nsCocoaIMEHandler::Init(nsChildView* aOwner)
-{
-  mOwnerWidget = aOwner;
-  mView =
-    static_cast<NSView<mozView>*>(aOwner->GetNativeData(NS_NATIVE_WIDGET));
-}
-
-void
-nsCocoaIMEHandler::OnFocusChangeInGecko(PRBool aFocus)
+IMEInputHandler::OnFocusChangeInGecko(PRBool aFocus)
 {
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::OnFocusChangeInGecko");
+  NSLog(@"IMEInputHandler::OnFocusChangeInGecko");
   NSLog(@"  aFocus:%s sFocusedIMEHandler:%p",
         TrueOrFalse(aFocus), sFocusedIMEHandler);
 #endif // DEBUG_IME_HANDLER
@@ -1416,8 +1407,8 @@ nsCocoaIMEHandler::OnFocusChangeInGecko(PRBool aFocus)
   ResetTimer();
 }
 
-void
-nsCocoaIMEHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
+PRBool
+IMEInputHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
 {
   // If we're not focused, the destroying view might be composing with it in
   // another instance.
@@ -1425,8 +1416,8 @@ nsCocoaIMEHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
     sFocusedIMEHandler->OnDestroyView(aDestroyingView);
   }
 
-  if (aDestroyingView != mView) {
-    return;
+  if (!PluginTextInputHandler::OnDestroyView(aDestroyingView)) {
+    return PR_FALSE;
   }
 
   if (IsIMEComposing()) {
@@ -1436,17 +1427,17 @@ nsCocoaIMEHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
     OnEndIMEComposition();
   }
 
-  mView = nsnull;
+  return PR_TRUE;
 }
 
 void
-nsCocoaIMEHandler::OnStartIMEComposition()
+IMEInputHandler::OnStartIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::OnStartIMEComposition");
+  NSLog(@"IMEInputHandler::OnStartIMEComposition");
   NSLog(@"  mView=%p, currentInputManager:%p",
         mView, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
@@ -1458,13 +1449,13 @@ nsCocoaIMEHandler::OnStartIMEComposition()
 }
 
 void
-nsCocoaIMEHandler::OnUpdateIMEComposition(NSString* aIMECompositionString)
+IMEInputHandler::OnUpdateIMEComposition(NSString* aIMECompositionString)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::OnUpdateIMEComposition");
+  NSLog(@"IMEInputHandler::OnUpdateIMEComposition");
   NSLog(@"  aIMECompositionString:%@ currentInputManager:%p",
         aIMECompositionString, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
@@ -1479,13 +1470,13 @@ nsCocoaIMEHandler::OnUpdateIMEComposition(NSString* aIMECompositionString)
 }
 
 void
-nsCocoaIMEHandler::OnEndIMEComposition()
+IMEInputHandler::OnEndIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::OnEndIMEComposition");
+  NSLog(@"IMEInputHandler::OnEndIMEComposition");
   NSLog(@"  mIMECompositionString:%@ currentInputManager:%p",
         mIMECompositionString, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
@@ -1503,7 +1494,7 @@ nsCocoaIMEHandler::OnEndIMEComposition()
 }
 
 void
-nsCocoaIMEHandler::SendCommittedText(NSString *aString)
+IMEInputHandler::SendCommittedText(NSString *aString)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1518,13 +1509,13 @@ nsCocoaIMEHandler::SendCommittedText(NSString *aString)
 }
 
 void
-nsCocoaIMEHandler::KillIMEComposition()
+IMEInputHandler::KillIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::KillIMEComposition");
+  NSLog(@"IMEInputHandler::KillIMEComposition");
   NSLog(@"  currentInputManager:%p", [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
 
@@ -1538,7 +1529,7 @@ nsCocoaIMEHandler::KillIMEComposition()
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"Pending nsCocoaIMEHandler::KillIMEComposition...");
+  NSLog(@"Pending IMEInputHandler::KillIMEComposition...");
 #endif // DEBUG_IME_HANDLER
 
   // Commit the composition internally.
@@ -1551,7 +1542,7 @@ nsCocoaIMEHandler::KillIMEComposition()
 }
 
 void
-nsCocoaIMEHandler::CommitIMEComposition()
+IMEInputHandler::CommitIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1560,7 +1551,7 @@ nsCocoaIMEHandler::CommitIMEComposition()
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::CommitIMEComposition");
+  NSLog(@"IMEInputHandler::CommitIMEComposition");
   NSLog(@"  mIMECompositionString:%@ currentInputManager:%p",
         mIMECompositionString, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
@@ -1578,7 +1569,7 @@ nsCocoaIMEHandler::CommitIMEComposition()
 }
 
 void
-nsCocoaIMEHandler::CancelIMEComposition()
+IMEInputHandler::CancelIMEComposition()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1587,7 +1578,7 @@ nsCocoaIMEHandler::CancelIMEComposition()
 
 #ifdef DEBUG_IME_HANDLER
   DebugPrintPointer(this);
-  NSLog(@"nsCocoaIMEHandler::CancelIMEComposition");
+  NSLog(@"IMEInputHandler::CancelIMEComposition");
   NSLog(@"  mIMECompositionString:%@ currentInputManager:%p",
         mIMECompositionString, [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
@@ -1609,7 +1600,7 @@ nsCocoaIMEHandler::CancelIMEComposition()
 }
 
 PRBool
-nsCocoaIMEHandler::IsFocused()
+IMEInputHandler::IsFocused()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
@@ -1624,15 +1615,15 @@ nsCocoaIMEHandler::IsFocused()
 }
 
 PRBool
-nsCocoaIMEHandler::IsIMEOpened()
+IMEInputHandler::IsIMEOpened()
 {
-  nsTISInputSource tis;
+  TISInputSourceWrapper tis;
   tis.InitByCurrentInputSource();
   return tis.IsOpenedIMEMode();
 }
 
 void
-nsCocoaIMEHandler::SetASCIICapableOnly(PRBool aASCIICapableOnly)
+IMEInputHandler::SetASCIICapableOnly(PRBool aASCIICapableOnly)
 {
   if (aASCIICapableOnly == mIsASCIICapableOnly)
     return;
@@ -1643,7 +1634,7 @@ nsCocoaIMEHandler::SetASCIICapableOnly(PRBool aASCIICapableOnly)
 }
 
 void
-nsCocoaIMEHandler::EnableIME(PRBool aEnableIME)
+IMEInputHandler::EnableIME(PRBool aEnableIME)
 {
   if (aEnableIME == mIsIMEEnabled)
     return;
@@ -1653,13 +1644,13 @@ nsCocoaIMEHandler::EnableIME(PRBool aEnableIME)
 }
 
 void
-nsCocoaIMEHandler::SetIMEOpenState(PRBool aOpenIME)
+IMEInputHandler::SetIMEOpenState(PRBool aOpenIME)
 {
   if (!IsFocused() || IsIMEOpened() == aOpenIME)
     return;
 
   if (!aOpenIME) {
-    nsTISInputSource tis;
+    TISInputSourceWrapper tis;
     tis.InitByCurrentASCIICapableInputSource();
     tis.Select();
     return;
@@ -1667,7 +1658,7 @@ nsCocoaIMEHandler::SetIMEOpenState(PRBool aOpenIME)
 
   // If we know the latest IME opened mode, we should select it.
   if (sLatestIMEOpenedModeInputSourceID) {
-    nsTISInputSource tis;
+    TISInputSourceWrapper tis;
     tis.InitByInputSourceID(sLatestIMEOpenedModeInputSourceID);
     tis.Select();
     return;
@@ -1687,7 +1678,7 @@ nsCocoaIMEHandler::SetIMEOpenState(PRBool aOpenIME)
 }
 
 void
-nsCocoaIMEHandler::OpenSystemPreferredLanguageIME()
+IMEInputHandler::OpenSystemPreferredLanguageIME()
 {
   CFArrayRef langList = ::CFLocaleCopyPreferredLanguages();
   if (!langList) {
@@ -1707,13 +1698,13 @@ nsCocoaIMEHandler::OpenSystemPreferredLanguageIME()
       ::CFLocaleGetValue(locale, kCFLocaleLanguageCode));
     NS_ASSERTION(lang, "lang is null");
     if (lang) {
-      nsTISInputSource tis;
+      TISInputSourceWrapper tis;
       tis.InitByLanguage(lang);
       if (tis.IsOpenedIMEMode()) {
 #ifdef DEBUG_IME_HANDLER
         CFStringRef foundTIS;
         tis.GetInputSourceID(foundTIS);
-        NSLog(@"nsCocoaIMEHandler::OpenSystemPreferredLanguageIME");
+        NSLog(@"IMEInputHandler::OpenSystemPreferredLanguageIME");
         NSLog(@"  found Input Source: %@ by %@",
               (const NSString*)foundTIS, lang);
 #endif // DEBUG_IME_HANDLER
@@ -1728,3 +1719,65 @@ nsCocoaIMEHandler::OpenSystemPreferredLanguageIME()
   }
   ::CFRelease(langList);
 }
+
+
+#pragma mark -
+
+
+/******************************************************************************
+ *
+ *  PluginTextInputHandler implementation
+ *
+ ******************************************************************************/
+
+PluginTextInputHandler::PluginTextInputHandler() :
+  TextInputHandlerBase()
+{
+}
+
+PluginTextInputHandler::~PluginTextInputHandler()
+{
+}
+
+
+#pragma mark -
+
+
+/******************************************************************************
+ *
+ *  TextInputHandlerBase implementation
+ *
+ ******************************************************************************/
+
+TextInputHandlerBase::TextInputHandlerBase() :
+  mOwnerWidget(nsnull), mView(nsnull)
+{
+  gHandlerInstanceCount++;
+}
+
+TextInputHandlerBase::~TextInputHandlerBase()
+{
+  if (--gHandlerInstanceCount == 0) {
+    FinalizeCurrentKeyboardLayout();
+  }
+}
+
+void
+TextInputHandlerBase::Init(nsChildView* aOwner)
+{
+  mOwnerWidget = aOwner;
+  mView =
+    static_cast<NSView<mozView>*>(aOwner->GetNativeData(NS_NATIVE_WIDGET));
+}
+
+PRBool
+TextInputHandlerBase::OnDestroyView(NSView<mozView> *aDestroyingView)
+{
+  if (aDestroyingView != mView) {
+    return PR_FALSE;
+  }
+
+  mView = nsnull;
+
+  return PR_TRUE;
+}
diff --git a/widget/src/cocoa/nsBidiKeyboard.mm b/widget/src/cocoa/nsBidiKeyboard.mm
index f0ea1cf51eef..f121a2e170d3 100644
--- a/widget/src/cocoa/nsBidiKeyboard.mm
+++ b/widget/src/cocoa/nsBidiKeyboard.mm
@@ -41,7 +41,9 @@
 #include "nsBidiKeyboard.h"
 #include "nsObjCExceptions.h"
 #include "nsCocoaUtils.h"
-#include "nsCocoaTextInputHandler.h"
+#include "TextInputHandler.h"
+
+using namespace mozilla::widget;
 
 NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
 
@@ -55,7 +57,7 @@ nsBidiKeyboard::~nsBidiKeyboard()
 
 NS_IMETHODIMP nsBidiKeyboard::IsLangRTL(PRBool *aIsRTL)
 {
-  *aIsRTL = nsTISInputSource::CurrentKeyboardLayout().IsForRTLLanguage();
+  *aIsRTL = TISInputSourceWrapper::CurrentKeyboardLayout().IsForRTLLanguage();
   return NS_OK;
 }
 
diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 994d0ed5416a..1a1f6141e68f 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -52,7 +52,7 @@
 #include "nsIPluginInstanceOwner.h"
 #include "nsIPluginWidget.h"
 #include "nsWeakPtr.h"
-#include "nsCocoaTextInputHandler.h"
+#include "TextInputHandler.h"
 #include "nsCocoaUtils.h"
 
 #include "nsIAppShell.h"
@@ -418,7 +418,11 @@ public:
   static PRUint32 GetCurrentInputEventCount();
   static void UpdateCurrentInputEventCount();
 
-  nsCocoaTextInputHandler* TextInputHandler() { return &mTextInputHandler; }
+  mozilla::widget::TextInputHandler* TextInputHandler()
+  {
+    return &mTextInputHandler;
+  }
+
   NSView<mozView>* GetEditorView();
 
   PRBool IsPluginView() { return (mWindowType == eWindowType_plugin); }
@@ -450,7 +454,7 @@ protected:
 protected:
 
   NSView<mozView>*      mView;      // my parallel cocoa view (ChildView or NativeScrollbarView), [STRONG]
-  nsCocoaTextInputHandler mTextInputHandler;
+  mozilla::widget::TextInputHandler mTextInputHandler;
   IMEContext            mIMEContext;
 
   NSView<mozView>*      mParentView;
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index b7e0c8c96ce3..08dab0a115b2 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -96,6 +96,8 @@
 
 using namespace mozilla::layers;
 using namespace mozilla::gl;
+using namespace mozilla::widget;
+
 #undef DEBUG_IME
 #undef DEBUG_UPDATE
 #undef INVALIDATE_DEBUGGING  // flash areas as they are invalidated
@@ -340,8 +342,8 @@ InitNPCocoaEvent(NPCocoaEvent* event)
 
 static void DebugPrintAllKeyboardLayouts()
 {
-  nsCocoaTextInputHandler::DebugPrintAllKeyboardLayouts(sCocoaLog);
-  nsCocoaIMEHandler::DebugPrintAllIMEModes(sCocoaLog);
+  TextInputHandler::DebugPrintAllKeyboardLayouts(sCocoaLog);
+  IMEInputHandler::DebugPrintAllIMEModes(sCocoaLog);
 }
 
 #endif // defined(DEBUG) && defined(PR_LOGGING)
@@ -4398,7 +4400,7 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   static const UCKeyboardLayout* sUSLayout = nsnull;
   if (!sUSLayout) {
-    nsTISInputSource tis("com.apple.keylayout.US");
+    TISInputSourceWrapper tis("com.apple.keylayout.US");
     sUSLayout = tis.GetUCKeyboardLayout();
     NS_ENSURE_TRUE(sUSLayout, 0);
   }
@@ -4449,7 +4451,7 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
       PRBool isRomanKeyboardLayout;
 
-      nsTISInputSource tis;
+      TISInputSourceWrapper tis;
       if (gOverrideKeyboardLayout.mOverrideEnabled) {
         tis.InitByLayoutID(gOverrideKeyboardLayout.mKeyboardLayout);
       } else {

From 34e8fcc741e7c831424768507f9163a3bbaad6ef Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Sun, 8 May 2011 19:19:23 +0900
Subject: [PATCH 066/314] Bug 519972 part 6: Make TextInputHandler grabbed by
 nsChildView and its methods which dispatch events r=smichaud

---
 widget/src/cocoa/TextInputHandler.h  |  67 ++++++----
 widget/src/cocoa/TextInputHandler.mm | 186 ++++++++++++++++-----------
 widget/src/cocoa/mozView.h           |  12 ++
 widget/src/cocoa/nsChildView.h       |  16 ++-
 widget/src/cocoa/nsChildView.mm      | 122 ++++++++++--------
 5 files changed, 247 insertions(+), 156 deletions(-)

diff --git a/widget/src/cocoa/TextInputHandler.h b/widget/src/cocoa/TextInputHandler.h
index 92f702d475b7..be1cd7441730 100644
--- a/widget/src/cocoa/TextInputHandler.h
+++ b/widget/src/cocoa/TextInputHandler.h
@@ -218,38 +218,55 @@ protected:
 class TextInputHandlerBase
 {
 public:
-  /**
-   * Init must be called when aOwner is initializing and finished attaching
-   * an NSView.
-   *
-   * @param aOwner                An owner nsChildView of the instance.
-   */
-  virtual void Init(nsChildView* aOwner);
+  nsrefcnt AddRef()
+  {
+    NS_PRECONDITION(PRInt32(mRefCnt) >= 0, "mRefCnt is negative");
+    ++mRefCnt;
+    NS_LOG_ADDREF(this, mRefCnt, "TextInputHandlerBase", sizeof(*this));
+    return mRefCnt;
+  }
+  nsrefcnt Release()
+  {
+    NS_PRECONDITION(mRefCnt != 0, "mRefCnt is alrady zero");
+    --mRefCnt;
+    NS_LOG_RELEASE(this, mRefCnt, "TextInputHandlerBase");
+    if (mRefCnt == 0) {
+        mRefCnt = 1; /* stabilize */
+        delete this;
+        return 0;
+    }
+    return mRefCnt;
+  }
 
-  /**
-   * OnDestroyView must be called when mOwnerWidget is destroying and detaching
-   * mView.
+protected:
+  nsAutoRefCnt mRefCnt;
+
+public:
+   /**
+   * mWidget must not be destroyed without OnDestroyWidget being called.
    *
-   * @param aDestroyingView       Destroying view.  This might not be mView.
+   * @param aDestroyingWidget     Destroying widget.  This might not be mWidget.
    * @return                      This result doesn't have any meaning for
-   *                              callers.  When the aDstroyingView isn't same
-   *                              as mView, FALSE.  Then, inherited methods in
+   *                              callers.  When aDstroyingWidget isn't the same
+   *                              as mWidget, FALSE.  Then, inherited methods in
    *                              sub classes should return from this method
    *                              without cleaning up.
    */
-  virtual PRBool OnDestroyView(NSView<mozView> *aDestroyingView);
+  virtual PRBool OnDestroyWidget(nsChildView* aDestroyingWidget);
 
 protected:
-  // The owner of this instance.  The result of mOwnerWidget->TextInputHandler
-  // returns this instance.  This must not be null after initialized.
-  nsChildView* mOwnerWidget;
+  // The creater of this instance and client.
+  // This must not be null after initialized until OnDestroyWidget() is called.
+  nsChildView* mWidget; // [WEAK]
 
-  // The native focused view, this is the native NSView of mOwnerWidget.
+  // The native view for mWidget.
   // This view handles the actual text inputting.
-  NSView<mozView>* mView;
+  NSView<mozView>* mView; // [STRONG]
 
-  TextInputHandlerBase();
+  TextInputHandlerBase(nsChildView* aWidget, NSView<mozView> *aNativeView);
   virtual ~TextInputHandlerBase();
+
+  PRBool Destroyed() { return !mWidget; }
 };
 
 /**
@@ -259,7 +276,7 @@ protected:
 class PluginTextInputHandler : public TextInputHandlerBase
 {
 protected:
-  PluginTextInputHandler();
+  PluginTextInputHandler(nsChildView* aWidget, NSView<mozView> *aNativeView);
   ~PluginTextInputHandler();
 };
 
@@ -279,12 +296,12 @@ protected:
 class IMEInputHandler : public PluginTextInputHandler
 {
 public:
-  virtual PRBool OnDestroyView(NSView<mozView> *aDestroyingView);
+  virtual PRBool OnDestroyWidget(nsChildView* aDestroyingWidget);
 
   virtual void OnFocusChangeInGecko(PRBool aFocus);
 
   /**
-   * DispatchTextEvent() dispatches a text event on mOwnerWidget.
+   * DispatchTextEvent() dispatches a text event on mWidget.
    *
    * @param aText                 User text input.
    * @param aAttrString           An NSAttributedString instance which indicates
@@ -436,7 +453,7 @@ protected:
   };
   PRUint32 mPendingMethods;
 
-  IMEInputHandler();
+  IMEInputHandler(nsChildView* aWidget, NSView<mozView> *aNativeView);
   virtual ~IMEInputHandler();
 
   PRBool IsFocused();
@@ -560,7 +577,7 @@ public:
   static CFArrayRef CreateAllKeyboardLayoutList();
   static void DebugPrintAllKeyboardLayouts(PRLogModuleInfo* aLogModuleInfo);
 
-  TextInputHandler();
+  TextInputHandler(nsChildView* aWidget, NSView<mozView> *aNativeView);
   virtual ~TextInputHandler();
 };
 
diff --git a/widget/src/cocoa/TextInputHandler.mm b/widget/src/cocoa/TextInputHandler.mm
index e845cd204adf..e0bf3dfd614b 100644
--- a/widget/src/cocoa/TextInputHandler.mm
+++ b/widget/src/cocoa/TextInputHandler.mm
@@ -560,13 +560,16 @@ TextInputHandler::DebugPrintAllKeyboardLayouts(PRLogModuleInfo* aLogModuleInfo)
  *
  ******************************************************************************/
 
-TextInputHandler::TextInputHandler() :
-  IMEInputHandler()
+TextInputHandler::TextInputHandler(nsChildView* aWidget,
+                                   NSView<mozView> *aNativeView) :
+  IMEInputHandler(aWidget, aNativeView)
 {
+  [mView installTextInputHandler:this];
 }
 
 TextInputHandler::~TextInputHandler()
 {
+  [mView uninstallTextInputHandler];
 }
 
 
@@ -741,8 +744,9 @@ IMEInputHandler::ResetIMEWindowLevel()
         TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID());
 #endif // DEBUG_IME_HANDLER
 
-  if (!mView)
+  if (Destroyed()) {
     return;
+  }
 
   if (!IsFocused()) {
     // retry at next focus event
@@ -763,7 +767,7 @@ IMEInputHandler::ResetIMEWindowLevel()
   // focused view is the panel's parent view (mView). But the editor is
   // displayed on the popuped widget's view (editorView).  So, their window
   // level may be different.
-  NSView<mozView>* editorView = mOwnerWidget->GetEditorView();
+  NSView<mozView>* editorView = mWidget->GetEditorView();
   if (!editorView) {
     NS_ERROR("editorView is null");
     return;
@@ -801,8 +805,9 @@ IMEInputHandler::DiscardIMEComposition()
   NSLog(@"  currentInputManager:%p", [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
 
-  if (!mView)
+  if (Destroyed()) {
     return;
+  }
 
   if (!IsFocused()) {
     // retry at next focus event
@@ -838,8 +843,9 @@ IMEInputHandler::SyncASCIICapableOnly()
         TrueOrFalse(IsFocused()), GetCurrentTSMDocumentID());
 #endif
 
-  if (!mView)
+  if (Destroyed()) {
     return;
+  }
 
   if (!IsFocused()) {
     // retry at next focus event
@@ -1041,7 +1047,11 @@ IMEInputHandler::DispatchTextEvent(const nsString& aText,
         aSelectedRange.location, aSelectedRange.length);
 #endif
 
-  nsTextEvent textEvent(PR_TRUE, NS_TEXT_TEXT, mOwnerWidget);
+  NS_ENSURE_TRUE(!Destroyed(), PR_FALSE);
+
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
+  nsTextEvent textEvent(PR_TRUE, NS_TEXT_TEXT, mWidget);
   textEvent.time = PR_IntervalNow();
   textEvent.theText = aText;
   nsAutoTArray<nsTextRange, 4> textRanges;
@@ -1051,7 +1061,7 @@ IMEInputHandler::DispatchTextEvent(const nsString& aText,
   textEvent.rangeArray = textRanges.Elements();
   textEvent.rangeCount = textRanges.Length();
 
-  return mOwnerWidget->DispatchWindowEvent(textEvent);
+  return mWidget->DispatchWindowEvent(textEvent);
 }
 
 void
@@ -1071,7 +1081,11 @@ IMEInputHandler::InsertTextAsCommittingComposition(
   NSLog(@" mMarkedRange = %d, %d", mMarkedRange.location, mMarkedRange.length);
 #endif
 
-  nsRefPtr<nsChildView> kungFuDeathGrip(mOwnerWidget);
+  if (Destroyed()) {
+    return;
+  }
+
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
 
   nsString str;
   GetStringForNSString([aAttrString string], str);
@@ -1079,12 +1093,12 @@ IMEInputHandler::InsertTextAsCommittingComposition(
   if (!IsIMEComposing()) {
     // XXXmnakano Probably, we shouldn't emulate composition in this case.
     // I think that we should just fire DOM3 textInput event if we implement it.
-    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mOwnerWidget);
+    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mWidget);
     InitCompositionEvent(compStart);
 
-    mOwnerWidget->DispatchWindowEvent(compStart);
-    if (!mView) {
-      return; // we're destroyed
+    mWidget->DispatchWindowEvent(compStart);
+    if (Destroyed()) {
+      return;
     }
 
     OnStartIMEComposition();
@@ -1096,17 +1110,17 @@ IMEInputHandler::InsertTextAsCommittingComposition(
 
   NSRange range = NSMakeRange(0, str.Length());
   DispatchTextEvent(str, aAttrString, range, PR_TRUE);
-  if (!mView) {
-    return; // we're destroyed
+  if (Destroyed()) {
+    return;
   }
 
   OnUpdateIMEComposition([aAttrString string]);
 
-  nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mOwnerWidget);
+  nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mWidget);
   InitCompositionEvent(compEnd);
-  mOwnerWidget->DispatchWindowEvent(compEnd);
-  if (!mView) {
-    return; // we're destroyed
+  mWidget->DispatchWindowEvent(compEnd);
+  if (Destroyed()) {
+    return;
   }
 
   OnEndIMEComposition();
@@ -1129,11 +1143,11 @@ IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
   NSLog(@" aAttrString = '%@'", aAttrString);
 #endif
 
-  if (IgnoreIMEComposition()) {
+  if (Destroyed() || IgnoreIMEComposition()) {
     return;
   }
 
-  nsRefPtr<nsChildView> kungFuDeathGrip(mOwnerWidget);
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
 
   nsString str;
   GetStringForNSString([aAttrString string], str);
@@ -1142,16 +1156,16 @@ IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
 
   if (!IsIMEComposing() && !str.IsEmpty()) {
     nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT,
-                                  mOwnerWidget);
-    mOwnerWidget->DispatchWindowEvent(selection);
+                                  mWidget);
+    mWidget->DispatchWindowEvent(selection);
     mMarkedRange.location = selection.mSucceeded ? selection.mReply.mOffset : 0;
 
-    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mOwnerWidget);
+    nsCompositionEvent compStart(PR_TRUE, NS_COMPOSITION_START, mWidget);
     InitCompositionEvent(compStart);
 
-    mOwnerWidget->DispatchWindowEvent(compStart);
-    if (!mView) {
-      return; // we're destroyed
+    mWidget->DispatchWindowEvent(compStart);
+    if (Destroyed()) {
+      return;
     }
 
     OnStartIMEComposition();
@@ -1162,16 +1176,16 @@ IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
 
     PRBool doCommit = str.IsEmpty();
     DispatchTextEvent(str, aAttrString, aSelectedRange, doCommit);
-    if (!mView) {
-      return; // we're destroyed
+    if (Destroyed()) {
+      return;
     }
 
     if (doCommit) {
-      nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mOwnerWidget);
+      nsCompositionEvent compEnd(PR_TRUE, NS_COMPOSITION_END, mWidget);
       InitCompositionEvent(compEnd);
-      mOwnerWidget->DispatchWindowEvent(compEnd);
-      if (!mView) {
-        return; // we're destroyed
+      mWidget->DispatchWindowEvent(compEnd);
+      if (Destroyed()) {
+        return;
       }
       OnEndIMEComposition();
     }
@@ -1183,10 +1197,16 @@ IMEInputHandler::SetMarkedText(NSAttributedString* aAttrString,
 NSInteger
 IMEInputHandler::ConversationIdentifier()
 {
+  if (Destroyed()) {
+    return reinterpret_cast<NSInteger>(mView);
+  }
+
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
   // NOTE: The size of NSInteger is same as pointer size.
-  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mOwnerWidget);
+  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mWidget);
   textContent.InitForQueryTextContent(0, 0);
-  mOwnerWidget->DispatchWindowEvent(textContent);
+  mWidget->DispatchWindowEvent(textContent);
   if (!textContent.mSucceeded) {
     return reinterpret_cast<NSInteger>(mView);
   }
@@ -1205,14 +1225,16 @@ IMEInputHandler::GetAttributedSubstringFromRange(NSRange& aRange)
   NSLog(@" aRange      = %d, %d", aRange.location, aRange.length);
 #endif
 
-  if (aRange.location == NSNotFound || aRange.length == 0) {
+  if (Destroyed() || aRange.location == NSNotFound || aRange.length == 0) {
     return nil;
   }
 
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
   nsAutoString str;
-  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mOwnerWidget);
+  nsQueryContentEvent textContent(PR_TRUE, NS_QUERY_TEXT_CONTENT, mWidget);
   textContent.InitForQueryTextContent(aRange.location, aRange.length);
-  mOwnerWidget->DispatchWindowEvent(textContent);
+  mWidget->DispatchWindowEvent(textContent);
 
   if (!textContent.mSucceeded || textContent.mReply.mString.IsEmpty()) {
     return nil;
@@ -1235,10 +1257,18 @@ IMEInputHandler::SelectedRange()
 #if DEBUG_IME_HANDLER
   NSLog(@"****in SelectedRange");
 #endif
-  nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, mOwnerWidget);
-  mOwnerWidget->DispatchWindowEvent(selection);
+
+  NSRange range = NSMakeRange(NSNotFound, 0);
+  if (Destroyed()) {
+    return range;
+  }
+
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
+  nsQueryContentEvent selection(PR_TRUE, NS_QUERY_SELECTED_TEXT, mWidget);
+  mWidget->DispatchWindowEvent(selection);
   if (!selection.mSucceeded) {
-    return NSMakeRange(NSNotFound, 0);
+    return range;
   }
 
 #if DEBUG_IME_HANDLER
@@ -1260,21 +1290,24 @@ IMEInputHandler::FirstRectForCharacterRange(NSRange& aRange)
   NSLog(@"****in FirstRectForCharacterRange");
   NSLog(@" aRange      = %d, %d", aRange.location, aRange.length);
 #endif
+
   // XXX this returns first character rect or caret rect, it is limitation of
   // now. We need more work for returns first line rect. But current
   // implementation is enough for IMEs.
 
   NSRect rect;
-  if (aRange.location == NSNotFound) {
+  if (Destroyed() || aRange.location == NSNotFound) {
     return rect;
   }
 
+  nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
   nsIntRect r;
   PRBool useCaretRect = (aRange.length == 0);
   if (!useCaretRect) {
-    nsQueryContentEvent charRect(PR_TRUE, NS_QUERY_TEXT_RECT, mOwnerWidget);
+    nsQueryContentEvent charRect(PR_TRUE, NS_QUERY_TEXT_RECT, mWidget);
     charRect.InitForQueryTextRect(aRange.location, 1);
-    mOwnerWidget->DispatchWindowEvent(charRect);
+    mWidget->DispatchWindowEvent(charRect);
     if (charRect.mSucceeded) {
       r = charRect.mReply.mRect;
     } else {
@@ -1283,9 +1316,9 @@ IMEInputHandler::FirstRectForCharacterRange(NSRange& aRange)
   }
 
   if (useCaretRect) {
-    nsQueryContentEvent caretRect(PR_TRUE, NS_QUERY_CARET_RECT, mOwnerWidget);
+    nsQueryContentEvent caretRect(PR_TRUE, NS_QUERY_CARET_RECT, mWidget);
     caretRect.InitForQueryCaretRect(aRange.location);
-    mOwnerWidget->DispatchWindowEvent(caretRect);
+    mWidget->DispatchWindowEvent(caretRect);
     if (!caretRect.mSucceeded) {
       return rect;
     }
@@ -1293,7 +1326,7 @@ IMEInputHandler::FirstRectForCharacterRange(NSRange& aRange)
     r.width = 0;
   }
 
-  nsIWidget* rootWidget = mOwnerWidget->GetTopLevelWidget();
+  nsIWidget* rootWidget = mWidget->GetTopLevelWidget();
   NSWindow* rootWindow =
     static_cast<NSWindow*>(rootWidget->GetNativeData(NS_NATIVE_WINDOW));
   NSView* rootView =
@@ -1319,6 +1352,9 @@ IMEInputHandler::CharacterIndexForPoint(NSPoint& aPoint)
 #if DEBUG_IME
   NSLog(@"****in CharacterIndexForPoint");
 #endif
+
+  //nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
   // To implement this, we'd have to grovel in text frames looking at text
   // offsets.
   return 0;
@@ -1333,6 +1369,8 @@ IMEInputHandler::GetValidAttributesForMarkedText()
   NSLog(@"****in GetValidAttributesForMarkedText");
 #endif
 
+  //nsRefPtr<IMEInputHandler> kungFuDeathGrip(this);
+
   //return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName,
   //                                 NSMarkedClauseSegmentAttributeName,
   //                                 NSTextInputReplacementRangeAttributeName,
@@ -1353,8 +1391,9 @@ IMEInputHandler::GetValidAttributesForMarkedText()
  *
  ******************************************************************************/
 
-IMEInputHandler::IMEInputHandler() :
-  PluginTextInputHandler(),
+IMEInputHandler::IMEInputHandler(nsChildView* aWidget,
+                                 NSView<mozView> *aNativeView) :
+  PluginTextInputHandler(aWidget, aNativeView),
   mPendingMethods(0), mIMECompositionString(nsnull),
   mIsIMEComposing(PR_FALSE), mIsIMEEnabled(PR_TRUE),
   mIsASCIICapableOnly(PR_FALSE), mIgnoreIMECommit(PR_FALSE),
@@ -1408,21 +1447,20 @@ IMEInputHandler::OnFocusChangeInGecko(PRBool aFocus)
 }
 
 PRBool
-IMEInputHandler::OnDestroyView(NSView<mozView> *aDestroyingView)
+IMEInputHandler::OnDestroyWidget(nsChildView* aDestroyingWidget)
 {
-  // If we're not focused, the destroying view might be composing with it in
-  // another instance.
+  // If we're not focused, the focused IMEInputHandler may have been
+  // created by another widget/nsChildView.
   if (sFocusedIMEHandler && sFocusedIMEHandler != this) {
-    sFocusedIMEHandler->OnDestroyView(aDestroyingView);
+    sFocusedIMEHandler->OnDestroyWidget(aDestroyingWidget);
   }
 
-  if (!PluginTextInputHandler::OnDestroyView(aDestroyingView)) {
+  if (!PluginTextInputHandler::OnDestroyWidget(aDestroyingWidget)) {
     return PR_FALSE;
   }
 
   if (IsIMEComposing()) {
     // If our view is in the composition, we should clean up it.
-    // XXX Might CancelIMEComposition() fail because mView is being destroyed?
     CancelIMEComposition();
     OnEndIMEComposition();
   }
@@ -1498,7 +1536,11 @@ IMEInputHandler::SendCommittedText(NSString *aString)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  NS_ASSERTION(mView, "mView is null");
+  NS_ENSURE_TRUE(mWidget, );
+  // XXX We should send the string without mView.
+  if (!mView) {
+    return;
+  }
 
   NSAttributedString* attrStr =
     [[NSAttributedString alloc] initWithString:aString];
@@ -1519,8 +1561,9 @@ IMEInputHandler::KillIMEComposition()
   NSLog(@"  currentInputManager:%p", [NSInputManager currentInputManager]);
 #endif // DEBUG_IME_HANDLER
 
-  if (!mView)
+  if (Destroyed()) {
     return;
+  }
 
   if (IsFocused()) {
     [[NSInputManager currentInputManager] markedTextAbandoned: mView];
@@ -1604,7 +1647,7 @@ IMEInputHandler::IsFocused()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  NS_ENSURE_TRUE(mView, PR_FALSE);
+  NS_ENSURE_TRUE(!Destroyed(), PR_FALSE);
   NSWindow* window = [mView window];
   NS_ENSURE_TRUE(window, PR_FALSE);
   return [window firstResponder] == mView &&
@@ -1730,8 +1773,9 @@ IMEInputHandler::OpenSystemPreferredLanguageIME()
  *
  ******************************************************************************/
 
-PluginTextInputHandler::PluginTextInputHandler() :
-  TextInputHandlerBase()
+PluginTextInputHandler::PluginTextInputHandler(nsChildView* aWidget,
+                                               NSView<mozView> *aNativeView) :
+  TextInputHandlerBase(aWidget, aNativeView)
 {
 }
 
@@ -1749,35 +1793,29 @@ PluginTextInputHandler::~PluginTextInputHandler()
  *
  ******************************************************************************/
 
-TextInputHandlerBase::TextInputHandlerBase() :
-  mOwnerWidget(nsnull), mView(nsnull)
+TextInputHandlerBase::TextInputHandlerBase(nsChildView* aWidget,
+                                           NSView<mozView> *aNativeView) :
+  mWidget(aWidget)
 {
   gHandlerInstanceCount++;
+  mView = [aNativeView retain];
 }
 
 TextInputHandlerBase::~TextInputHandlerBase()
 {
+  [mView release];
   if (--gHandlerInstanceCount == 0) {
     FinalizeCurrentKeyboardLayout();
   }
 }
 
-void
-TextInputHandlerBase::Init(nsChildView* aOwner)
-{
-  mOwnerWidget = aOwner;
-  mView =
-    static_cast<NSView<mozView>*>(aOwner->GetNativeData(NS_NATIVE_WIDGET));
-}
-
 PRBool
-TextInputHandlerBase::OnDestroyView(NSView<mozView> *aDestroyingView)
+TextInputHandlerBase::OnDestroyWidget(nsChildView* aDestroyingWidget)
 {
-  if (aDestroyingView != mView) {
+  if (aDestroyingWidget != mWidget) {
     return PR_FALSE;
   }
 
-  mView = nsnull;
-
+  mWidget = nsnull;
   return PR_TRUE;
 }
diff --git a/widget/src/cocoa/mozView.h b/widget/src/cocoa/mozView.h
index 7ce6b91680e2..abdd139d803c 100644
--- a/widget/src/cocoa/mozView.h
+++ b/widget/src/cocoa/mozView.h
@@ -42,12 +42,24 @@
 #import <Cocoa/Cocoa.h>
 class nsIWidget;
 
+namespace mozilla {
+namespace widget{
+class TextInputHandler;
+} // namespace widget
+} // namespace mozilla
+
 // A protocol listing all the methods that an object which wants
 // to live in gecko's widget hierarchy must implement. |nsChildView|
 // makes assumptions that any NSView with which it comes in contact will
 // implement this protocol.
 @protocol mozView
 
+  // aHandler is Gecko's default text input handler:  It implements the
+  // NSTextInput protocol to handle key events.  Don't make aHandler a
+  // strong reference -- that causes a memory leak.
+- (void)installTextInputHandler:(mozilla::widget::TextInputHandler*)aHandler;
+- (void)uninstallTextInputHandler;
+
   // access the nsIWidget associated with this view. DOES NOT ADDREF.
 - (nsIWidget*)widget;
 
diff --git a/widget/src/cocoa/nsChildView.h b/widget/src/cocoa/nsChildView.h
index 1a1f6141e68f..a881acd8c012 100644
--- a/widget/src/cocoa/nsChildView.h
+++ b/widget/src/cocoa/nsChildView.h
@@ -133,6 +133,15 @@ extern "C" long TSMProcessRawKeyEvent(EventRef carbonEvent);
   // the link back to it must be weak.
   nsChildView* mGeckoChild;
 
+  // Text input handler for mGeckoChild and us.  Note that this is a weak
+  // reference.  Ideally, this should be a strong reference but a ChildView
+  // object can live longer than the mGeckoChild that owns it.  And if
+  // mTextInputHandler were a strong reference, this would make it difficult
+  // for Gecko's leak detector to detect leaked TextInputHandler objects.
+  // This is initialized by [mozView installTextInputHandler:aHandler] and
+  // cleared by [mozView uninstallTextInputHandler].
+  mozilla::widget::TextInputHandler* mTextInputHandler;  // [WEAK]
+
   BOOL mIsPluginView;
   NPEventModel mPluginEventModel;
   NPDrawingModel mPluginDrawingModel;
@@ -418,11 +427,6 @@ public:
   static PRUint32 GetCurrentInputEventCount();
   static void UpdateCurrentInputEventCount();
 
-  mozilla::widget::TextInputHandler* TextInputHandler()
-  {
-    return &mTextInputHandler;
-  }
-
   NSView<mozView>* GetEditorView();
 
   PRBool IsPluginView() { return (mWindowType == eWindowType_plugin); }
@@ -454,7 +458,7 @@ protected:
 protected:
 
   NSView<mozView>*      mView;      // my parallel cocoa view (ChildView or NativeScrollbarView), [STRONG]
-  mozilla::widget::TextInputHandler mTextInputHandler;
+  nsRefPtr<mozilla::widget::TextInputHandler> mTextInputHandler;
   IMEContext            mIMEContext;
 
   NSView<mozView>*      mParentView;
diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm
index 08dab0a115b2..b6a816f6b56d 100644
--- a/widget/src/cocoa/nsChildView.mm
+++ b/widget/src/cocoa/nsChildView.mm
@@ -491,7 +491,8 @@ nsresult nsChildView::Create(nsIWidget *aParent,
   if ([mView isKindOfClass:[ChildView class]])
     [[WindowDataMap sharedWindowDataMap] ensureDataForWindow:[mView window]];
 
-  mTextInputHandler.Init(this);
+  NS_ASSERTION(!mTextInputHandler, "mTextInputHandler has already existed");
+  mTextInputHandler = new TextInputHandler(this, mView);
 
   return NS_OK;
 
@@ -1654,7 +1655,8 @@ NS_IMETHODIMP nsChildView::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStat
   debug_DumpEvent(stdout, event->widget, event, nsCAutoString("something"), 0);
 #endif
 
-  NS_ASSERTION(!(mTextInputHandler.IsIMEComposing() && NS_IS_KEY_EVENT(event)),
+  NS_ASSERTION(!(mTextInputHandler && mTextInputHandler->IsIMEComposing() &&
+                 NS_IS_KEY_EVENT(event)),
     "Any key events should not be fired during IME composing");
 
   aStatus = nsEventStatus_eIgnore;
@@ -1832,7 +1834,8 @@ NS_IMETHODIMP nsChildView::ResetInputState()
   NSLog(@"**** ResetInputState");
 #endif
 
-  mTextInputHandler.CommitIMEComposition();
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
+  mTextInputHandler->CommitIMEComposition();
   return NS_OK;
 }
 
@@ -1843,7 +1846,8 @@ NS_IMETHODIMP nsChildView::SetIMEOpenState(PRBool aState)
   NSLog(@"**** SetIMEOpenState aState = %d", aState);
 #endif
 
-  mTextInputHandler.SetIMEOpenState(aState);
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
+  mTextInputHandler->SetIMEOpenState(aState);
   return NS_OK;
 }
 
@@ -1854,7 +1858,8 @@ NS_IMETHODIMP nsChildView::GetIMEOpenState(PRBool* aState)
   NSLog(@"**** GetIMEOpenState");
 #endif
 
-  *aState = mTextInputHandler.IsIMEOpened();
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
+  *aState = mTextInputHandler->IsIMEOpened();
   return NS_OK;
 }
 
@@ -1864,20 +1869,21 @@ NS_IMETHODIMP nsChildView::SetInputMode(const IMEContext& aContext)
   NSLog(@"**** SetInputMode mStatus = %d", aContext.mStatus);
 #endif
 
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
   mIMEContext = aContext;
   switch (aContext.mStatus) {
     case nsIWidget::IME_STATUS_ENABLED:
     case nsIWidget::IME_STATUS_PLUGIN:
-      mTextInputHandler.SetASCIICapableOnly(PR_FALSE);
-      mTextInputHandler.EnableIME(PR_TRUE);
+      mTextInputHandler->SetASCIICapableOnly(PR_FALSE);
+      mTextInputHandler->EnableIME(PR_TRUE);
       break;
     case nsIWidget::IME_STATUS_DISABLED:
-      mTextInputHandler.SetASCIICapableOnly(PR_FALSE);
-      mTextInputHandler.EnableIME(PR_FALSE);
+      mTextInputHandler->SetASCIICapableOnly(PR_FALSE);
+      mTextInputHandler->EnableIME(PR_FALSE);
       break;
     case nsIWidget::IME_STATUS_PASSWORD:
-      mTextInputHandler.SetASCIICapableOnly(PR_TRUE);
-      mTextInputHandler.EnableIME(PR_FALSE);
+      mTextInputHandler->SetASCIICapableOnly(PR_TRUE);
+      mTextInputHandler->EnableIME(PR_FALSE);
       break;
     default:
       NS_ERROR("not implemented!");
@@ -1902,7 +1908,8 @@ NS_IMETHODIMP nsChildView::CancelIMEComposition()
   NSLog(@"**** CancelIMEComposition");
 #endif
 
-  mTextInputHandler.CancelIMEComposition();
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
+  mTextInputHandler->CancelIMEComposition();
   return NS_OK;
 }
 
@@ -1936,7 +1943,8 @@ NS_IMETHODIMP nsChildView::GetToggledKeyState(PRUint32 aKeyCode,
 
 NS_IMETHODIMP nsChildView::OnIMEFocusChange(PRBool aFocus)
 {
-  mTextInputHandler.OnFocusChangeInGecko(aFocus);
+  NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
+  mTextInputHandler->OnFocusChangeInGecko(aFocus);
   // XXX Return NS_ERROR_NOT_IMPLEMENTED, see bug 496360.
   return NS_ERROR_NOT_IMPLEMENTED;
 }
@@ -2267,6 +2275,16 @@ NSEvent* gLastDragMouseDownEvent = nil;
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
 
+- (void)installTextInputHandler:(TextInputHandler*)aHandler
+{
+  mTextInputHandler = aHandler;
+}
+
+- (void)uninstallTextInputHandler
+{
+  mTextInputHandler = nsnull;
+}
+
 // Work around bug 603134.
 // OS X has a bug that causes new OpenGL windows to only paint once or twice,
 // then stop painting altogether. By clearing the drawable from the GL context,
@@ -2354,7 +2372,10 @@ NSEvent* gLastDragMouseDownEvent = nil;
 
 - (void)widgetDestroyed
 {
-  mGeckoChild->TextInputHandler()->OnDestroyView(self);
+  if (mTextInputHandler) {
+    mTextInputHandler->OnDestroyWidget(mGeckoChild);
+    mTextInputHandler = nsnull;
+  }
   mGeckoChild = nsnull;
 
   // Just in case we're destroyed abruptly and missed the draggingExited
@@ -4750,10 +4771,10 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 #if DEBUG_IME
   NSLog(@"****in insertText: '%@'", insertString);
 #endif
-  if (!mGeckoChild)
+  if (!mGeckoChild || !mTextInputHandler)
     return;
 
-  if (mGeckoChild->TextInputHandler()->IgnoreIMEComposition())
+  if (mTextInputHandler->IgnoreIMEComposition())
     return;
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
@@ -4763,14 +4784,14 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 
   NSString *tmpStr = [insertString string];
   unsigned int len = [tmpStr length];
-  if (!mGeckoChild->TextInputHandler()->IsIMEComposing() && len == 0)
+  if (!mTextInputHandler->IsIMEComposing() && len == 0)
     return; // nothing to do
   PRUnichar buffer[MAX_BUFFER_SIZE];
   PRUnichar *bufPtr = (len >= MAX_BUFFER_SIZE) ? new PRUnichar[len + 1] : buffer;
   [tmpStr getCharacters:bufPtr];
   bufPtr[len] = PRUnichar('\0');
 
-  if (len == 1 && !mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+  if (len == 1 && !mTextInputHandler->IsIMEComposing()) {
     // don't let the same event be fired twice when hitting
     // enter/return! (Bug 420502)
     if (mKeyPressSent)
@@ -4831,7 +4852,7 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
   else {
     NSAttributedString* attrStr =
       static_cast<NSAttributedString*>(insertString);
-    mGeckoChild->TextInputHandler()->InsertTextAsCommittingComposition(attrStr);
+    mTextInputHandler->InsertTextAsCommittingComposition(attrStr);
   }
 
   if (bufPtr != buffer)
@@ -4863,7 +4884,7 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  NS_ENSURE_TRUE(mGeckoChild, );
+  NS_ENSURE_TRUE(mTextInputHandler, );
 
   nsAutoRetainCocoaObject kungFuDeathGrip(self);
 
@@ -4874,42 +4895,41 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
     attrStr = [[[NSAttributedString alloc] initWithString:aString] autorelease];
   }
 
-  mGeckoChild->TextInputHandler()->SetMarkedText(attrStr, selRange);
+  mTextInputHandler->SetMarkedText(attrStr, selRange);
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
 - (void) unmarkText
 {
-  NS_ENSURE_TRUE(mGeckoChild, );
-  mGeckoChild->TextInputHandler()->CommitIMEComposition();
+  NS_ENSURE_TRUE(mTextInputHandler, );
+  mTextInputHandler->CommitIMEComposition();
 }
 
 - (BOOL) hasMarkedText
 {
-  NS_ENSURE_TRUE(mGeckoChild, NO);
-  return mGeckoChild->TextInputHandler()->HasMarkedText();
+  NS_ENSURE_TRUE(mTextInputHandler, NO);
+  return mTextInputHandler->HasMarkedText();
 }
 
 - (NSInteger) conversationIdentifier
 {
-  NS_ENSURE_TRUE(mGeckoChild, reinterpret_cast<NSInteger>(self));
-  return mGeckoChild->TextInputHandler()->ConversationIdentifier();
+  NS_ENSURE_TRUE(mTextInputHandler, reinterpret_cast<NSInteger>(self));
+  return mTextInputHandler->ConversationIdentifier();
 }
 
 - (NSAttributedString *) attributedSubstringFromRange:(NSRange)theRange
 {
-  NS_ENSURE_TRUE(mGeckoChild, nil);
-  return mGeckoChild->TextInputHandler()->
-    GetAttributedSubstringFromRange(theRange);
+  NS_ENSURE_TRUE(mTextInputHandler, nil);
+  return mTextInputHandler->GetAttributedSubstringFromRange(theRange);
 }
 
 - (NSRange) markedRange
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  NS_ENSURE_TRUE(mGeckoChild, NSMakeRange(NSNotFound, 0));
-  return mGeckoChild->TextInputHandler()->MarkedRange();
+  NS_ENSURE_TRUE(mTextInputHandler, NSMakeRange(NSNotFound, 0));
+  return mTextInputHandler->MarkedRange();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
 }
@@ -4918,8 +4938,8 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  NS_ENSURE_TRUE(mGeckoChild, NSMakeRange(NSNotFound, 0));
-  return mGeckoChild->TextInputHandler()->SelectedRange();
+  NS_ENSURE_TRUE(mTextInputHandler, NSMakeRange(NSNotFound, 0));
+  return mTextInputHandler->SelectedRange();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(NSMakeRange(0, 0));
 }
@@ -4927,22 +4947,22 @@ GetUSLayoutCharFromKeyTranslate(UInt32 aKeyCode, UInt32 aModifiers)
 - (NSRect) firstRectForCharacterRange:(NSRange)theRange
 {
   NSRect rect;
-  NS_ENSURE_TRUE(mGeckoChild, rect);
-  return mGeckoChild->TextInputHandler()->FirstRectForCharacterRange(theRange);
+  NS_ENSURE_TRUE(mTextInputHandler, rect);
+  return mTextInputHandler->FirstRectForCharacterRange(theRange);
 }
 
 - (NSUInteger)characterIndexForPoint:(NSPoint)thePoint
 {
-  NS_ENSURE_TRUE(mGeckoChild, 0);
-  return mGeckoChild->TextInputHandler()->CharacterIndexForPoint(thePoint);
+  NS_ENSURE_TRUE(mTextInputHandler, 0);
+  return mTextInputHandler->CharacterIndexForPoint(thePoint);
 }
 
 - (NSArray*) validAttributesForMarkedText
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
-  NS_ENSURE_TRUE(mGeckoChild, [NSArray array]);
-  return mGeckoChild->TextInputHandler()->GetValidAttributesForMarkedText();
+  NS_ENSURE_TRUE(mTextInputHandler, [NSArray array]);
+  return mTextInputHandler->GetValidAttributesForMarkedText();
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
 }
@@ -4991,7 +5011,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  if (!mGeckoChild)
+  if (!mGeckoChild || !mTextInputHandler)
     return NO;
 
 #ifdef PR_LOGGING
@@ -5009,7 +5029,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
   mCurKeyEvent = theEvent;
 
   BOOL nonDeadKeyPress = [[theEvent characters] length] > 0;
-  if (nonDeadKeyPress && !mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+  if (nonDeadKeyPress && !mTextInputHandler->IsIMEComposing()) {
     NSResponder* firstResponder = [[self window] firstResponder];
 
     nsKeyEvent geckoKeydown(PR_TRUE, NS_KEY_DOWN, nsnull);
@@ -5059,7 +5079,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
     // control-letter combinations etc before Cocoa tries to use
     // them for keybindings.
     if ((!geckoKeypress.isChar || geckoKeypress.isControl) &&
-        !mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+        !mTextInputHandler->IsIMEComposing()) {
       if (mKeyDownHandled)
         geckoKeypress.flags |= NS_EVENT_FLAG_NO_DEFAULT;
       mKeyPressHandled = mGeckoChild->DispatchWindowEvent(geckoKeypress);
@@ -5070,10 +5090,10 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
   }
 
   // Let Cocoa interpret the key events, caching IsIMEComposing first.
-  PRBool wasComposing = mGeckoChild->TextInputHandler()->IsIMEComposing();
+  PRBool wasComposing = mTextInputHandler->IsIMEComposing();
   PRBool interpretKeyEventsCalled = PR_FALSE;
-  if (mGeckoChild->TextInputHandler()->IsIMEEnabled() ||
-      mGeckoChild->TextInputHandler()->IsASCIICapableOnly()) {
+  if (mTextInputHandler->IsIMEEnabled() ||
+      mTextInputHandler->IsASCIICapableOnly()) {
     [super interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
     interpretKeyEventsCalled = PR_TRUE;
   }
@@ -5083,7 +5103,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
   }
 
   if (!mKeyPressSent && nonDeadKeyPress && !wasComposing &&
-      !mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+      !mTextInputHandler->IsIMEComposing()) {
     nsKeyEvent geckoKeypress(PR_TRUE, NS_KEY_PRESS, nsnull);
     [self convertCocoaKeyEvent:theEvent toGeckoEvent:&geckoKeypress];
 
@@ -5327,7 +5347,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
           ToEscapedString([theEvent characters], str1),
           ToEscapedString([theEvent charactersIgnoringModifiers], str2)));
 
-  if (!mGeckoChild)
+  if (!mGeckoChild || !mTextInputHandler)
     return;
 
   if (mIgnoreNextKeyUpEvent) {
@@ -5388,7 +5408,7 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
 
   // if we don't have any characters we can't generate a keyUp event
   if ([[theEvent characters] length] == 0 ||
-      mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+      mTextInputHandler->IsIMEComposing()) {
     return;
   }
 
@@ -5474,8 +5494,8 @@ static const char* ToEscapedString(NSString* aString, nsCAutoString& aBuf)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  if (!mGeckoChild || [theEvent type] != NSFlagsChanged ||
-      mGeckoChild->TextInputHandler()->IsIMEComposing()) {
+  if (!mGeckoChild || !mTextInputHandler || [theEvent type] != NSFlagsChanged ||
+      mTextInputHandler->IsIMEComposing()) {
     return;
   }
 

From a0b59b8e30758c44fe3a12e43308d78e69306978 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Sun, 8 May 2011 13:09:03 +0100
Subject: [PATCH 067/314] bug 655138 - don't use font entry after it's been
 replaced. r=jdaggett

---
 gfx/thebes/gfxUserFontSet.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gfx/thebes/gfxUserFontSet.h b/gfx/thebes/gfxUserFontSet.h
index c1fdc05bff27..365ec41d62bc 100644
--- a/gfx/thebes/gfxUserFontSet.h
+++ b/gfx/thebes/gfxUserFontSet.h
@@ -103,8 +103,10 @@ public:
         for (PRUint32 i = 0; i < numFonts; i++) {
             gfxFontEntry *fe = mAvailableFonts[i];
             if (fe == aOldFontEntry) {
-                mAvailableFonts[i] = aNewFontEntry;
                 aOldFontEntry->SetFamily(nsnull);
+                // note that this may delete aOldFontEntry, if there's no
+                // other reference to it except from its family
+                mAvailableFonts[i] = aNewFontEntry;
                 aNewFontEntry->SetFamily(this);
                 return;
             }

From 57b88014328659595f6804d43faf10b2467d1019 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 8 May 2011 22:27:50 +0900
Subject: [PATCH 068/314] Bug 652747 - 64-bit Nightly [build 25-04-2011]
 crashes on launch in DLL Blacklist code with certain antivirus software
 installed. r=vlad

---
 toolkit/xre/nsWindowsDllInterceptor.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/xre/nsWindowsDllInterceptor.h b/toolkit/xre/nsWindowsDllInterceptor.h
index 20a6f34b657b..2526c5516dc8 100644
--- a/toolkit/xre/nsWindowsDllInterceptor.h
+++ b/toolkit/xre/nsWindowsDllInterceptor.h
@@ -185,12 +185,12 @@ protected:
       }
     }
 #elif defined(_M_X64)
-    int pJmp32 = 0;
+    int pJmp32 = -1;
 
     while (nBytes < 13) {
 
       // if found JMP 32bit offset, next bytes must be NOP 
-      if (pJmp32) {
+      if (pJmp32 >= 0) {
         if (origBytes[nBytes++] != 0x90)
           return 0;
 
@@ -311,7 +311,7 @@ protected:
     *((intptr_t*)(tramp+nBytes+1)) = (intptr_t)trampDest - (intptr_t)(tramp+nBytes+5); // target displacement
 #elif defined(_M_X64)
     // If JMP32 opcode found, we don't insert to trampoline jump 
-    if (pJmp32) {
+    if (pJmp32 >= 0) {
       // convert JMP 32bit offset to JMP 64bit direct
       byteptr_t directJmpAddr = origBytes + pJmp32 + 5 + (*((LONG*)(origBytes+pJmp32+1)));
       // mov r11, address

From 6bc5540bc3ffbb20481ff19ed875b3481ca095f8 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 8 May 2011 20:14:16 +0200
Subject: [PATCH 069/314] Bug 414638 - Disallow mixed space/comma syntax for
 CSS rect() value; r=dbaron

---
 layout/reftests/bugs/414638-ref.html | 27 +++++++++++++++++++++++
 layout/reftests/bugs/414638.html     | 33 ++++++++++++++++++++++++++++
 layout/reftests/bugs/reftest.list    |  1 +
 layout/style/nsCSSParser.cpp         | 12 +++++++---
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 layout/reftests/bugs/414638-ref.html
 create mode 100644 layout/reftests/bugs/414638.html

diff --git a/layout/reftests/bugs/414638-ref.html b/layout/reftests/bugs/414638-ref.html
new file mode 100644
index 000000000000..dc10d2437725
--- /dev/null
+++ b/layout/reftests/bugs/414638-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+  <title>CSS Test: clip: Missing commas in rect()</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visufx.html#clipping">
+  <meta name="flags" content="invalid may">
+  <meta name="assert" content="User agents may support separation of values     within rect() by whitespace instead of commas, but not a combination of     whitespace and commas.">
+  <style type="text/css">
+    div {
+      background: red;
+      width: 100px; height: 100px;
+    }
+    .inner {
+      position: absolute;
+      background: green;
+    }
+  </style>
+
+ </head>
+ <body>
+    <p>There must be a green box below and no red.</p>
+    <div class="outer">
+      <div class="inner"></div>
+    </div>
+ </body>
+</html>
diff --git a/layout/reftests/bugs/414638.html b/layout/reftests/bugs/414638.html
new file mode 100644
index 000000000000..80579d047754
--- /dev/null
+++ b/layout/reftests/bugs/414638.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+  <title>CSS Test: clip: Missing commas in rect()</title>
+  <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/">
+  <link rel="help" href="http://www.w3.org/TR/CSS21/visufx.html#clipping">
+  <meta name="flags" content="invalid may">
+  <meta name="assert" content="User agents may support separation of values     within rect() by whitespace instead of commas, but not a combination of     whitespace and commas.">
+  <style type="text/css">
+    div {
+      background: red;
+      width: 100px; height: 100px;
+    }
+    .inner {
+      position: absolute;
+      background: green;
+      clip: rect(0,0,0,0);
+      clip: rect( 0 auto auto 0 );
+      clip: rect(0,0 0,0);
+      clip: rect(0 0,0,0);
+      clip: rect(0,0,0 0);
+      clip: rect(0 0,0 0);
+    }
+  </style>
+
+ </head>
+ <body>
+    <p>There must be a green box below and no red.</p>
+    <div class="outer">
+      <div class="inner"></div>
+    </div>
+ </body>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 4285b6bc4ae6..3fbf493c8390 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -967,6 +967,7 @@ skip-if(cocoaWidget) == 413292-1.html 413292-1-ref.html # disabling due to failu
 == 413840-bullet-first-line.html 413840-bullet-first-line-ref.html
 == 413982.html 413982-ref.html
 == 414123.xhtml 414123-ref.xhtml
+== 414638.html 414638-ref.html
 == 414851-1.html 414851-1-ref.html
 == 416106-1.xhtml 416106-1-ref.xhtml
 == 416752-1.html 416752-1-ref.html
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 5f17d5852f7a..85ce0a69b5df 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -6869,14 +6869,20 @@ CSSParserImpl::ParseRect(nsCSSProperty aPropID)
   } else if (mToken.mType == eCSSToken_Function &&
              mToken.mIdent.LowerCaseEqualsLiteral("rect")) {
     nsCSSRect& rect = val.SetRectValue();
+    PRBool useCommas;
     NS_FOR_CSS_SIDES(side) {
       if (! ParseVariant(rect.*(nsCSSRect::sides[side]),
                          VARIANT_AL, nsnull)) {
         return PR_FALSE;
       }
-      if (side < 3) {
-        // skip optional commas between elements
-        (void)ExpectSymbol(',', PR_TRUE);
+      if (side == 0) {
+        useCommas = ExpectSymbol(',', PR_TRUE);
+      } else if (useCommas && side < 3) {
+        // Skip optional commas between elements, but only if the first
+        // separator was a comma.
+        if (!ExpectSymbol(',', PR_TRUE)) {
+          return PR_FALSE;
+        }
       }
     }
     if (!ExpectSymbol(')', PR_TRUE)) {

From 39d488a08ba178d91c3e3a55bd6da0f3a038c111 Mon Sep 17 00:00:00 2001
From: "Luyun Xie ext:(%2C%20Ms2ger%20%3Cms2ger%40gmail.com%3E)"
 <mftian@gmail.com>
Date: Sun, 8 May 2011 20:14:16 +0200
Subject: [PATCH 070/314] Bug 113580 - switch uses of getAttribute to
 hasAttribute whenever possible; r=sdwilsh

---
 browser/base/content/web-panels.js                     |  6 +++---
 toolkit/components/microformats/Microformats.js        | 10 +++++-----
 .../components/passwordmgr/nsLoginManagerPrompter.js   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/web-panels.js b/browser/base/content/web-panels.js
index 4d690b6bf96e..56c3fe2da5c6 100644
--- a/browser/base/content/web-panels.js
+++ b/browser/base/content/web-panels.js
@@ -108,10 +108,10 @@ function load()
     var panelBrowser = getPanelBrowser();
     panelBrowser.webProgress.addProgressListener(panelProgressListener,
                                                  Ci.nsIWebProgress.NOTIFY_ALL);
-    if (panelBrowser.getAttribute("cachedurl")) {
+    var cachedurl = panelBrowser.getAttribute("cachedurl")
+    if (cachedurl) {
         panelBrowser.webNavigation
-                    .loadURI(panelBrowser.getAttribute("cachedurl"),
-                             nsIWebNavigation.LOAD_FLAGS_NONE, null,
+                    .loadURI(cachedurl, nsIWebNavigation.LOAD_FLAGS_NONE, null,
                              null, null);
     }
 
diff --git a/toolkit/components/microformats/Microformats.js b/toolkit/components/microformats/Microformats.js
index 615c929a26e8..38c846af90fa 100644
--- a/toolkit/components/microformats/Microformats.js
+++ b/toolkit/components/microformats/Microformats.js
@@ -353,11 +353,11 @@ var Microformats = {
       
       
       if (((((propnode.localName.toLowerCase() == "abbr") || (propnode.localName.toLowerCase() == "html:abbr")) && !propnode.namespaceURI) || 
-         ((propnode.localName.toLowerCase() == "abbr") && (propnode.namespaceURI == "http://www.w3.org/1999/xhtml"))) && (propnode.getAttribute("title"))) {
+         ((propnode.localName.toLowerCase() == "abbr") && (propnode.namespaceURI == "http://www.w3.org/1999/xhtml"))) && (propnode.hasAttribute("title"))) {
         return propnode.getAttribute("title");
-      } else if ((propnode.nodeName.toLowerCase() == "img") && (propnode.getAttribute("alt"))) {
+      } else if ((propnode.nodeName.toLowerCase() == "img") && (propnode.hasAttribute("alt"))) {
         return propnode.getAttribute("alt");
-      } else if ((propnode.nodeName.toLowerCase() == "area") && (propnode.getAttribute("alt"))) {
+      } else if ((propnode.nodeName.toLowerCase() == "area") && (propnode.hasAttribute("alt"))) {
         return propnode.getAttribute("alt");
       } else if ((propnode.nodeName.toLowerCase() == "textarea") ||
                  (propnode.nodeName.toLowerCase() == "select") ||
@@ -647,7 +647,7 @@ var Microformats = {
       }
       if (in_node.ownerDocument) {
         if (Microformats[microformat].attributeName) {
-          if (!(in_node.getAttribute(Microformats[microformat].attributeName))) {
+          if (!(in_node.hasAttribute(Microformats[microformat].attributeName))) {
             throw("Node is not a microformat (" + microformat + ")");
           }
         } else {
@@ -850,7 +850,7 @@ var Microformats = {
      */
     preProcessMicroformat: function preProcessMicroformat(in_mfnode) {
       var mfnode;
-      if ((in_mfnode.nodeName.toLowerCase() == "td") && (in_mfnode.getAttribute("headers"))) {
+      if ((in_mfnode.nodeName.toLowerCase() == "td") && (in_mfnode.hasAttribute("headers"))) {
         mfnode = in_mfnode.cloneNode(true);
         mfnode.origNode = in_mfnode;
         var headers = in_mfnode.getAttribute("headers").split(" ");
diff --git a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
index 6aa4a7e3ce0c..85d740eb58c0 100644
--- a/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
+++ b/toolkit/components/passwordmgr/nsLoginManagerPrompter.js
@@ -1237,7 +1237,7 @@ LoginManagerPrompter.prototype = {
                 // disabled, and if so use the opener window. But if the window
                 // has been used to visit other pages (ie, has a history),
                 // assume it'll stick around and *don't* use the opener.
-                if (chromeDoc.getAttribute("chromehidden") &&
+                if (chromeDoc.hasAttribute("chromehidden") &&
                     webnav.sessionHistory.count == 1) {
                     this.log("Using opener window for notification bar.");
                     notifyWin = notifyWin.opener;

From 2373184a70f55d537dd64b86237efb011eff36a5 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 8 May 2011 20:15:45 +0200
Subject: [PATCH 071/314] Bug 652192 - Remove layout/html; r=dbaron,bernd

---
 .../FrameSetNav/frameset1/simple_main.html    |    6 -
 .../FrameSetNav/frameset1/simple_sub1.html    |   76 -
 .../FrameSetNav/frameset1/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset10/simple_main.html   |    6 -
 .../FrameSetNav/frameset10/simple_sub1.html   |   11 -
 .../FrameSetNav/frameset10/simple_sub2.html   |    9 -
 .../FrameSetNav/frameset11/simple_main.html   |    6 -
 .../FrameSetNav/frameset12/simple_main.html   |    6 -
 .../tests/FrameSetNav/frameset13/simple.html  |    5 -
 .../FrameSetNav/frameset14/simple_main.html   |    6 -
 .../FrameSetNav/frameset14/simple_sub1.html   |   10 -
 .../FrameSetNav/frameset14/simple_sub2.html   |    8 -
 .../FrameSetNav/frameset15/simple_main.html   |    6 -
 .../FrameSetNav/frameset15/simple_sub1.html   |   75 -
 .../FrameSetNav/frameset15/simple_sub2.html   |   83 -
 .../FrameSetNav/frameset15/sub_iframe.html    |   21 -
 .../FrameSetNav/frameset15/sub_iframe2.html   |   33 -
 .../FrameSetNav/frameset2/simple_main.html    |    6 -
 .../FrameSetNav/frameset2/simple_sub1.html    |   77 -
 .../FrameSetNav/frameset2/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset2/sub_iframe.html     |   36 -
 .../FrameSetNav/frameset3/simple_main.html    |    6 -
 .../FrameSetNav/frameset3/simple_sub1.html    |   78 -
 .../FrameSetNav/frameset3/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset3/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset4/simple_main.html    |    6 -
 .../FrameSetNav/frameset4/simple_sub1.html    |    7 -
 .../FrameSetNav/frameset4/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset4/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset5/simple_main.html    |    6 -
 .../FrameSetNav/frameset5/simple_sub1.html    |   76 -
 .../FrameSetNav/frameset5/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset5/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset6/simple_main.html    |    6 -
 .../FrameSetNav/frameset6/simple_sub1.html    |   77 -
 .../FrameSetNav/frameset6/simple_sub2.html    |   74 -
 .../FrameSetNav/frameset6/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset7/simple_main.html    |    6 -
 .../FrameSetNav/frameset7/simple_sub1.html    |   78 -
 .../FrameSetNav/frameset7/simple_sub2.html    |   74 -
 .../FrameSetNav/frameset7/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset8/simple_main.html    |    6 -
 .../FrameSetNav/frameset8/simple_sub1.html    |    7 -
 .../FrameSetNav/frameset8/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset8/sub_iframe.html     |   22 -
 .../FrameSetNav/frameset9/simple_main.html    |    6 -
 .../FrameSetNav/frameset9/simple_sub1.html    |   76 -
 .../FrameSetNav/frameset9/simple_sub2.html    |   73 -
 .../FrameSetNav/frameset9/sub_iframe.html     |   10 -
 layout/html/tests/FrameSetNav/index.html      |   32 -
 .../tests/FrameSetNav/no_tabinx_noIFrame.html |   25 -
 .../tests/FrameSetNav/notabinx_IFrame.html    |   26 -
 layout/html/tests/FrameSetNav/raptor.jpg      |  Bin 49629 -> 0 bytes
 .../FrameSetNav/subdoc_tabindex_iframe.html   |    5 -
 .../html/tests/FrameSetNav/tabinx_IFrame.html |   26 -
 .../tests/FrameSetNav/tabinx_noIFrame.html    |   25 -
 layout/html/tests/attributes/br-standard.html |   49 -
 layout/html/tests/attributes/br.html          |   37 -
 .../html/tests/attributes/div_p_heading.html  |   40 -
 layout/html/tests/attributes/font.html        |   76 -
 layout/html/tests/attributes/hr.html          |   87 -
 layout/html/tests/attributes/map_area.html    |   65 -
 layout/html/tests/attributes/mapimg87.gif     |  Bin 5033 -> 0 bytes
 layout/html/tests/attributes/ol_li.html       |   92 -
 layout/html/tests/attributes/pre.html         |   29 -
 layout/html/tests/attributes/ul_li.html       |   78 -
 .../block/base/intrinsic-cases-quirks.html    |  211 -
 .../block/base/intrinsic-cases-standards.html |  212 -
 .../intrinsic-with-box-sizing-strict.html     |   19 -
 .../block/base/intrinsic-with-box-sizing.html |   18 -
 layout/html/tests/block/base/jlbtest1.html    |   34 -
 layout/html/tests/block/base/margin1.html     |   82 -
 layout/html/tests/block/base/pre.html         |   45 -
 layout/html/tests/block/base/pre1.html        |   15 -
 layout/html/tests/block/base/rtest.lst        |   10 -
 layout/html/tests/block/base/width-fixed.html |  153 -
 .../html/tests/block/base/width-percent.html  |  150 -
 layout/html/tests/block/bugs/10458.html       |   56 -
 layout/html/tests/block/bugs/10490-a.html     |   15 -
 layout/html/tests/block/bugs/10490-b.html     |   98 -
 layout/html/tests/block/bugs/10509.html       |   56 -
 layout/html/tests/block/bugs/10675.html       |    1 -
 layout/html/tests/block/bugs/10777.html       |   27 -
 layout/html/tests/block/bugs/111255.html      |    5 -
 layout/html/tests/block/bugs/11435.html       |    9 -
 layout/html/tests/block/bugs/11566.html       |    2 -
 layout/html/tests/block/bugs/11589.html       |   22 -
 layout/html/tests/block/bugs/12003.html       |   11 -
 layout/html/tests/block/bugs/12072.html       |   26 -
 layout/html/tests/block/bugs/12233.html       |   46 -
 layout/html/tests/block/bugs/124167.html      |   15 -
 layout/html/tests/block/bugs/12451.html       |   26 -
 layout/html/tests/block/bugs/124637.html      |   11 -
 layout/html/tests/block/bugs/125506.html      |   35 -
 layout/html/tests/block/bugs/126213-1.html    |   42 -
 layout/html/tests/block/bugs/126213-2.html    |   75 -
 layout/html/tests/block/bugs/12709.html       |   19 -
 layout/html/tests/block/bugs/12760.html       |   17 -
 layout/html/tests/block/bugs/131065-1.html    |   14 -
 layout/html/tests/block/bugs/131065-2.html    |   14 -
 layout/html/tests/block/bugs/131065-3.html    |   23 -
 layout/html/tests/block/bugs/131065-4.html    |   25 -
 layout/html/tests/block/bugs/13196.html       |   12 -
 layout/html/tests/block/bugs/13258.html       |    8 -
 layout/html/tests/block/bugs/134580-1.html    |  105 -
 layout/html/tests/block/bugs/134580-2.html    |   29 -
 layout/html/tests/block/bugs/13481.html       |   27 -
 layout/html/tests/block/bugs/13553.html       |   52 -
 layout/html/tests/block/bugs/13599.html       |   13 -
 layout/html/tests/block/bugs/13869.html       |    9 -
 layout/html/tests/block/bugs/13940.html       |   16 -
 layout/html/tests/block/bugs/14118-a.html     |   29 -
 layout/html/tests/block/bugs/14118-b.html     |   38 -
 layout/html/tests/block/bugs/14140.html       |    7 -
 layout/html/tests/block/bugs/14161.html       |    7 -
 layout/html/tests/block/bugs/14363.html       |   23 -
 layout/html/tests/block/bugs/14459.html       |    2 -
 layout/html/tests/block/bugs/14489.html       |   69 -
 layout/html/tests/block/bugs/148245.html      |   11 -
 layout/html/tests/block/bugs/151620.html      |   23 -
 layout/html/tests/block/bugs/15340.html       |   23 -
 layout/html/tests/block/bugs/153429a.html     |   17 -
 layout/html/tests/block/bugs/153429b.html     |   22 -
 layout/html/tests/block/bugs/153429c.html     |   37 -
 layout/html/tests/block/bugs/154741.html      |    4 -
 layout/html/tests/block/bugs/155333-1.html    |    3 -
 layout/html/tests/block/bugs/155333-2.html    |    2 -
 layout/html/tests/block/bugs/15882-a.html     |   24 -
 layout/html/tests/block/bugs/15882-b.html     |   24 -
 layout/html/tests/block/bugs/15933-a.html     |   10 -
 layout/html/tests/block/bugs/15933-b.html     |   10 -
 layout/html/tests/block/bugs/16053.html       |   17 -
 layout/html/tests/block/bugs/161644.html      |   11 -
 layout/html/tests/block/bugs/16173.html       |   54 -
 layout/html/tests/block/bugs/16417.html       |   26 -
 layout/html/tests/block/bugs/16580.html       |   27 -
 layout/html/tests/block/bugs/16656.html       |    1 -
 layout/html/tests/block/bugs/16889.html       |    6 -
 layout/html/tests/block/bugs/169620.html      |   62 -
 layout/html/tests/block/bugs/17054.html       |   17 -
 layout/html/tests/block/bugs/17130-a.html     |   36 -
 layout/html/tests/block/bugs/17130-b.html     |   20 -
 layout/html/tests/block/bugs/17318.html       |   17 -
 layout/html/tests/block/bugs/17331.html       |   22 -
 layout/html/tests/block/bugs/17372.html       |    8 -
 layout/html/tests/block/bugs/17518.html       |    9 -
 layout/html/tests/block/bugs/17532.html       |   27 -
 layout/html/tests/block/bugs/17636.html       |   12 -
 layout/html/tests/block/bugs/176423.html      |   20 -
 layout/html/tests/block/bugs/177331.html      |   40 -
 layout/html/tests/block/bugs/17844.html       |    6 -
 layout/html/tests/block/bugs/18445.html       |   74 -
 layout/html/tests/block/bugs/18445_1.html     |   76 -
 layout/html/tests/block/bugs/18445_2.html     |   28 -
 layout/html/tests/block/bugs/18445_3.html     |   30 -
 layout/html/tests/block/bugs/18445_4.html     |    8 -
 layout/html/tests/block/bugs/185411-1.html    |   61 -
 layout/html/tests/block/bugs/185411-2.html    |   25 -
 layout/html/tests/block/bugs/185411-3.html    |   24 -
 layout/html/tests/block/bugs/18754.html       |    2 -
 layout/html/tests/block/bugs/196919.html      |   33 -
 layout/html/tests/block/bugs/199673-1.html    |   26 -
 layout/html/tests/block/bugs/199673-2.html    |   25 -
 layout/html/tests/block/bugs/199673-3.html    |   26 -
 .../block/bugs/20020515_60x60_scooby.jpg      |  Bin 2059 -> 0 bytes
 layout/html/tests/block/bugs/20582.html       |   11 -
 layout/html/tests/block/bugs/215857-2.html    |   18 -
 layout/html/tests/block/bugs/215857-3.html    |   13 -
 layout/html/tests/block/bugs/215857.html      |   18 -
 layout/html/tests/block/bugs/216303.html      |   28 -
 layout/html/tests/block/bugs/217369-1.html    |   23 -
 layout/html/tests/block/bugs/217369-2.html    |   23 -
 layout/html/tests/block/bugs/22037.html       |   15 -
 layout/html/tests/block/bugs/223394-1.html    |   10 -
 layout/html/tests/block/bugs/223394-2.html    |   12 -
 layout/html/tests/block/bugs/223394-3.html    |   10 -
 layout/html/tests/block/bugs/223394-4.html    |   12 -
 layout/html/tests/block/bugs/22413.html       |   38 -
 layout/html/tests/block/bugs/22496.html       |   44 -
 layout/html/tests/block/bugs/228172.html      |   39 -
 layout/html/tests/block/bugs/239079.html      |    2 -
 layout/html/tests/block/bugs/239079.xml       |   15 -
 layout/html/tests/block/bugs/262624.html      |   33 -
 layout/html/tests/block/bugs/263406-1.xml     |    5 -
 layout/html/tests/block/bugs/263406-2.xml     |    5 -
 layout/html/tests/block/bugs/263406-3.xml     |    8 -
 layout/html/tests/block/bugs/263406-4.html    |   80 -
 layout/html/tests/block/bugs/263406-5.xml     |    7 -
 layout/html/tests/block/bugs/263406-6.xml     |    4 -
 layout/html/tests/block/bugs/263406-7.html    |   18 -
 layout/html/tests/block/bugs/264914-1.html    |    7 -
 layout/html/tests/block/bugs/264914-2.html    |    7 -
 layout/html/tests/block/bugs/265566.html      |   35 -
 layout/html/tests/block/bugs/27211.html       |   21 -
 layout/html/tests/block/bugs/276286.html      |   37 -
 layout/html/tests/block/bugs/276602.html      |   49 -
 layout/html/tests/block/bugs/277420.html      |   54 -
 layout/html/tests/block/bugs/282754-1.html    |   38 -
 layout/html/tests/block/bugs/282754-2.html    |   13 -
 layout/html/tests/block/bugs/282754.html      |   13 -
 layout/html/tests/block/bugs/28811.html       |    7 -
 layout/html/tests/block/bugs/299148.html      |  531 --
 layout/html/tests/block/bugs/299148.xml       |   15 -
 layout/html/tests/block/bugs/300816-01.xml    |   24 -
 layout/html/tests/block/bugs/300816-02.xml    |   25 -
 layout/html/tests/block/bugs/300816-03.xml    |   26 -
 layout/html/tests/block/bugs/300816-04.xml    |   27 -
 layout/html/tests/block/bugs/300816-05.xml    |   26 -
 layout/html/tests/block/bugs/300816-06.xml    |   27 -
 layout/html/tests/block/bugs/300816-07.xml    |   26 -
 layout/html/tests/block/bugs/300816-08.xml    |   27 -
 layout/html/tests/block/bugs/300816-09.xml    |   26 -
 layout/html/tests/block/bugs/300816-10.xml    |   27 -
 layout/html/tests/block/bugs/300816-11.xml    |   28 -
 layout/html/tests/block/bugs/300816-12.xml    |   28 -
 layout/html/tests/block/bugs/304004.html      |    8 -
 layout/html/tests/block/bugs/306534.html      |   22 -
 layout/html/tests/block/bugs/310124.html      |   54 -
 layout/html/tests/block/bugs/317961.html      |   27 -
 layout/html/tests/block/bugs/36401-a.html     |    1 -
 layout/html/tests/block/bugs/36401-b.html     |   42 -
 layout/html/tests/block/bugs/36401-c.html     |    1 -
 layout/html/tests/block/bugs/36401.html       |    1 -
 layout/html/tests/block/bugs/37083-1.html     |   16 -
 layout/html/tests/block/bugs/37083-2.html     |    2 -
 layout/html/tests/block/bugs/37083-3.html     |    4 -
 layout/html/tests/block/bugs/37511_1.html     |    1 -
 layout/html/tests/block/bugs/38157-a.html     |   23 -
 layout/html/tests/block/bugs/38157-b.html     |   37 -
 layout/html/tests/block/bugs/39211-a.html     |   24 -
 layout/html/tests/block/bugs/39211-b.html     |   18 -
 layout/html/tests/block/bugs/39211-c.html     |   32 -
 layout/html/tests/block/bugs/39211.html       |   24 -
 layout/html/tests/block/bugs/39683.html       |   20 -
 layout/html/tests/block/bugs/40038-1.xml      |   30 -
 layout/html/tests/block/bugs/40038-2.html     |   30 -
 layout/html/tests/block/bugs/40129.html       |    6 -
 layout/html/tests/block/bugs/41521.html       |   12 -
 layout/html/tests/block/bugs/41777.html       |    1 -
 layout/html/tests/block/bugs/42495.html       |    2 -
 layout/html/tests/block/bugs/4324.html        |   24 -
 layout/html/tests/block/bugs/43882-1.html     |   12 -
 layout/html/tests/block/bugs/43882-10.html    |   14 -
 layout/html/tests/block/bugs/43882-11.html    |   14 -
 layout/html/tests/block/bugs/43882-12.html    |   10 -
 layout/html/tests/block/bugs/43882-13.html    |   13 -
 layout/html/tests/block/bugs/43882-14.html    |   13 -
 layout/html/tests/block/bugs/43882-15.html    |   14 -
 layout/html/tests/block/bugs/43882-16.html    |   14 -
 layout/html/tests/block/bugs/43882-2.html     |   12 -
 layout/html/tests/block/bugs/43882-3.html     |   14 -
 layout/html/tests/block/bugs/43882-4.html     |   14 -
 layout/html/tests/block/bugs/43882-5.html     |   14 -
 layout/html/tests/block/bugs/43882-6.html     |   14 -
 layout/html/tests/block/bugs/43882-7.html     |   14 -
 layout/html/tests/block/bugs/43882-8.html     |   14 -
 layout/html/tests/block/bugs/43882-9.html     |   14 -
 layout/html/tests/block/bugs/44264-1.html     |    6 -
 layout/html/tests/block/bugs/44264-2.html     |    3 -
 layout/html/tests/block/bugs/44264-3.html     |    5 -
 layout/html/tests/block/bugs/4468.html        |   22 -
 layout/html/tests/block/bugs/44709.html       |    9 -
 layout/html/tests/block/bugs/4515.html        |  216 -
 layout/html/tests/block/bugs/4519.html        |  112 -
 layout/html/tests/block/bugs/45621.html       |   37 -
 layout/html/tests/block/bugs/4677.html        |    9 -
 layout/html/tests/block/bugs/46918.html       |   51 -
 layout/html/tests/block/bugs/47456.html       |    9 -
 layout/html/tests/block/bugs/47456_1.html     |   35 -
 layout/html/tests/block/bugs/4803.html        |   12 -
 layout/html/tests/block/bugs/48057.html       |   14 -
 layout/html/tests/block/bugs/4831-a.html      |   36 -
 layout/html/tests/block/bugs/4831-b.html      |   36 -
 layout/html/tests/block/bugs/48653.html       |   14 -
 layout/html/tests/block/bugs/4956.html        |   40 -
 layout/html/tests/block/bugs/50480.html       |    2 -
 layout/html/tests/block/bugs/50758.html       |    7 -
 layout/html/tests/block/bugs/5114.html        |   12 -
 layout/html/tests/block/bugs/5119.html        |   46 -
 layout/html/tests/block/bugs/5196.html        |   16 -
 layout/html/tests/block/bugs/52242.html       |    5 -
 layout/html/tests/block/bugs/52265.html       |   16 -
 layout/html/tests/block/bugs/52307.html       |    1 -
 layout/html/tests/block/bugs/52773.html       |    9 -
 layout/html/tests/block/bugs/53259.html       |   27 -
 layout/html/tests/block/bugs/53690.html       |    3 -
 layout/html/tests/block/bugs/5375.html        |   29 -
 layout/html/tests/block/bugs/53960.html       |    3 -
 layout/html/tests/block/bugs/53974.html       |   11 -
 layout/html/tests/block/bugs/54005.html       |   10 -
 layout/html/tests/block/bugs/5418.html        |   80 -
 layout/html/tests/block/bugs/54618.html       |   20 -
 layout/html/tests/block/bugs/54833.html       |    7 -
 layout/html/tests/block/bugs/54876.html       |   12 -
 layout/html/tests/block/bugs/55095.html       | 3040 ---------
 layout/html/tests/block/bugs/55250.html       |   14 -
 layout/html/tests/block/bugs/55317.html       |   20 -
 layout/html/tests/block/bugs/5537.html        |   28 -
 layout/html/tests/block/bugs/55874.html       |   29 -
 layout/html/tests/block/bugs/55961.html       |   16 -
 layout/html/tests/block/bugs/56102.html       |    9 -
 layout/html/tests/block/bugs/56265.html       |    5 -
 layout/html/tests/block/bugs/56335.html       |   36 -
 layout/html/tests/block/bugs/56563_1.html     |    7 -
 layout/html/tests/block/bugs/5688.html        |   13 -
 layout/html/tests/block/bugs/57554.html       |    3 -
 layout/html/tests/block/bugs/5821.html        |   19 -
 layout/html/tests/block/bugs/5847.html        |   21 -
 layout/html/tests/block/bugs/5859-a.html      |   39 -
 layout/html/tests/block/bugs/5859-b.html      |   16 -
 layout/html/tests/block/bugs/5859-c.html      |   17 -
 layout/html/tests/block/bugs/5859-d.html      |   13 -
 layout/html/tests/block/bugs/58652.html       | 1120 ----
 layout/html/tests/block/bugs/58652.js         |  147 -
 layout/html/tests/block/bugs/58674-a.html     |   35 -
 layout/html/tests/block/bugs/58674-b.html     |   35 -
 layout/html/tests/block/bugs/59200-a.html     |   10 -
 layout/html/tests/block/bugs/59200-c.html     |    6 -
 layout/html/tests/block/bugs/59200-d.html     |    6 -
 layout/html/tests/block/bugs/59200-e.html     |    6 -
 layout/html/tests/block/bugs/59790.html       |   35 -
 layout/html/tests/block/bugs/59834.html       |  185 -
 layout/html/tests/block/bugs/6093.html        |   15 -
 layout/html/tests/block/bugs/6097.html        |    6 -
 layout/html/tests/block/bugs/60992.html       |   17 -
 layout/html/tests/block/bugs/6126.html        |   17 -
 layout/html/tests/block/bugs/6155.html        |   29 -
 layout/html/tests/block/bugs/63785.html       |   19 -
 layout/html/tests/block/bugs/67690.html       |   22 -
 layout/html/tests/block/bugs/69960.html       |   37 -
 layout/html/tests/block/bugs/7093.html        |   12 -
 layout/html/tests/block/bugs/71594.html       |    1 -
 layout/html/tests/block/bugs/7282.html        |    9 -
 layout/html/tests/block/bugs/7352.html        |   15 -
 layout/html/tests/block/bugs/7806.html        |   22 -
 layout/html/tests/block/bugs/7993.html        |   11 -
 layout/html/tests/block/bugs/81118.html       |   14 -
 layout/html/tests/block/bugs/81776.html       |    1 -
 layout/html/tests/block/bugs/82221.css        |    1 -
 layout/html/tests/block/bugs/82221.html       |   13 -
 layout/html/tests/block/bugs/82221.js         |    2 -
 layout/html/tests/block/bugs/8438.html        |   57 -
 layout/html/tests/block/bugs/8466.html        |    9 -
 layout/html/tests/block/bugs/8683.html        |   21 -
 layout/html/tests/block/bugs/8749.html        |   17 -
 layout/html/tests/block/bugs/87543.html       |    8 -
 layout/html/tests/block/bugs/8878.html        |   10 -
 layout/html/tests/block/bugs/8905.html        |   28 -
 layout/html/tests/block/bugs/9100.html        |   21 -
 layout/html/tests/block/bugs/9237-b.html      |   18 -
 layout/html/tests/block/bugs/9282.html        |  254 -
 layout/html/tests/block/bugs/94468.html       |   30 -
 layout/html/tests/block/bugs/9601.html        |  368 --
 layout/html/tests/block/bugs/97383-a.html     |   15 -
 layout/html/tests/block/bugs/97383.html       |    1 -
 layout/html/tests/block/bugs/Aj.gif           |  Bin 2925 -> 0 bytes
 layout/html/tests/block/bugs/RealSnow.jar     |  Bin 4810 -> 0 bytes
 layout/html/tests/block/bugs/ant.jpg          |  Bin 8474 -> 0 bytes
 layout/html/tests/block/bugs/hack.gif         |  Bin 492 -> 0 bytes
 layout/html/tests/block/bugs/logo-star.gif    |  Bin 7798 -> 0 bytes
 layout/html/tests/block/bugs/rtest.lst        |  262 -
 layout/html/tests/block/bugs/support.gif      |  Bin 887 -> 0 bytes
 .../html/tests/block/bugs/top_buttons16.jpg   |  Bin 5448 -> 0 bytes
 layout/html/tests/block/bugs/top_middle2.jpg  |  Bin 5219 -> 0 bytes
 .../html/tests/block/images/animated_gif.gif  |  Bin 18502 -> 0 bytes
 layout/html/tests/block/images/ant.jpg        |  Bin 8474 -> 0 bytes
 .../block/images/audio_mixer_22tracks_tn.JPG  |  Bin 7543 -> 0 bytes
 .../html/tests/block/images/black_1pix.html   |    2 -
 layout/html/tests/block/images/continue.jpg   |  Bin 9633 -> 0 bytes
 layout/html/tests/block/images/fig1s.jpg      |  Bin 17624 -> 0 bytes
 layout/html/tests/block/images/fig2s.jpg      |  Bin 16383 -> 0 bytes
 layout/html/tests/block/images/fig3s.jpg      |  Bin 18126 -> 0 bytes
 .../html/tests/block/images/filterrt_tn.JPG   |  Bin 5654 -> 0 bytes
 .../tests/block/images/horiz_pixel_ruler.gif  |  Bin 1943 -> 0 bytes
 layout/html/tests/block/images/icoAnimals.gif |  Bin 15816 -> 0 bytes
 layout/html/tests/block/images/ifc-home.gif   |  Bin 1788 -> 0 bytes
 .../block/images/logoweb_gif64_150_49.gif     |  Bin 1975 -> 0 bytes
 .../tests/block/images/mozilla-banner.gif     |  Bin 4518 -> 0 bytes
 layout/html/tests/block/images/november.gif   |  Bin 2531 -> 0 bytes
 .../html/tests/block/images/tech-banner1.gif  |  Bin 15807 -> 0 bytes
 .../html/tests/block/images/tech-banner2.gif  |  Bin 11865 -> 0 bytes
 .../tests/block/images/vert_pixel_ruler.gif   |  Bin 1795 -> 0 bytes
 layout/html/tests/block/net/rtest.lst         | 2541 --------
 .../html/tests/block/printing/127145-1.html   |   33 -
 .../html/tests/block/printing/127145-2.html   |    7 -
 .../html/tests/block/printing/127145-3.html   |   13 -
 .../html/tests/block/printing/127286-1.html   |   30 -
 .../html/tests/block/printing/127286-2.html   |   14 -
 layout/html/tests/block/printing/127286.css   |  337 -
 .../html/tests/block/printing/145305-1.html   |    6 -
 .../html/tests/block/printing/145305-10.html  |   22 -
 .../html/tests/block/printing/145305-11.html  |   15 -
 .../html/tests/block/printing/145305-12.html  |   24 -
 .../html/tests/block/printing/145305-13.html  |   19 -
 .../html/tests/block/printing/145305-14.html  |   46 -
 .../html/tests/block/printing/145305-15.html  |   50 -
 .../html/tests/block/printing/145305-16.html  |   46 -
 .../html/tests/block/printing/145305-17.html  |   27 -
 .../html/tests/block/printing/145305-18.html  |    4 -
 .../html/tests/block/printing/145305-19.html  |   15 -
 .../html/tests/block/printing/145305-2.html   |    6 -
 .../html/tests/block/printing/145305-20.html  |   46 -
 .../html/tests/block/printing/145305-21.html  |   27 -
 .../html/tests/block/printing/145305-3.html   |    7 -
 .../html/tests/block/printing/145305-4.html   |    7 -
 .../html/tests/block/printing/145305-5.html   |    8 -
 .../html/tests/block/printing/145305-6.html   |    8 -
 .../html/tests/block/printing/145305-7.html   |   11 -
 .../html/tests/block/printing/145305-8.html   |   22 -
 .../html/tests/block/printing/145305-9.html   |   15 -
 layout/html/tests/block/printing/150652.html  |  467 --
 layout/html/tests/block/printing/163614.html  |  192 -
 .../html/tests/block/printing/179683-1.html   |   21 -
 .../html/tests/block/printing/179683-2.html   |   24 -
 layout/html/tests/block/printing/rtest.lst    |   31 -
 layout/html/tests/block/rtest.lst             |   15 -
 layout/html/tests/css/IMPORTANT.css           |   54 -
 layout/html/tests/css/INVALID.css             |  410 --
 layout/html/tests/css/SELECTORS.css           |   51 -
 layout/html/tests/css/azimuth.css             |   65 -
 .../html/tests/css/background-attachment.css  |   47 -
 layout/html/tests/css/background-color.css    |   43 -
 layout/html/tests/css/background-image.css    |   42 -
 layout/html/tests/css/background-position.css |   62 -
 layout/html/tests/css/background-repeat.css   |   44 -
 layout/html/tests/css/background.css          |   51 -
 layout/html/tests/css/border-bottom-color.css |   46 -
 layout/html/tests/css/border-bottom-style.css |   47 -
 layout/html/tests/css/border-bottom-width.css |   42 -
 layout/html/tests/css/border-bottom.css       |   43 -
 layout/html/tests/css/border-collapse.css     |   44 -
 layout/html/tests/css/border-color.css        |   39 -
 layout/html/tests/css/border-left-color.css   |   46 -
 layout/html/tests/css/border-left-style.css   |   47 -
 layout/html/tests/css/border-left-width.css   |   39 -
 layout/html/tests/css/border-left.css         |   43 -
 layout/html/tests/css/border-right-color.css  |   46 -
 layout/html/tests/css/border-right-style.css  |   47 -
 layout/html/tests/css/border-right-width.css  |   39 -
 layout/html/tests/css/border-right.css        |   43 -
 layout/html/tests/css/border-spacing.css      |   43 -
 layout/html/tests/css/border-style.css        |   47 -
 layout/html/tests/css/border-top-color.css    |   46 -
 layout/html/tests/css/border-top-style.css    |   54 -
 layout/html/tests/css/border-top-width.css    |   39 -
 layout/html/tests/css/border-top.css          |   43 -
 layout/html/tests/css/border-width.css        |   44 -
 layout/html/tests/css/border.css              |   43 -
 layout/html/tests/css/bottom.css              |   47 -
 layout/html/tests/css/bugs/bug01.css          |   38 -
 layout/html/tests/css/bugs/bug02.css          |   39 -
 layout/html/tests/css/bugs/bug03.css          |    9 -
 layout/html/tests/css/bugs/bug04.css          |    1 -
 layout/html/tests/css/caption-side.css        |   47 -
 layout/html/tests/css/clear.css               |   39 -
 layout/html/tests/css/clip.css                |   72 -
 layout/html/tests/css/color.css               |   41 -
 layout/html/tests/css/content.css             |   67 -
 layout/html/tests/css/counter-increment.css   |   47 -
 layout/html/tests/css/counter-reset.css       |   47 -
 layout/html/tests/css/cue-after.css           |   44 -
 layout/html/tests/css/cue-before.css          |   44 -
 layout/html/tests/css/cue.css                 |   47 -
 layout/html/tests/css/cursor.css              |   42 -
 layout/html/tests/css/direction.css           |   41 -
 layout/html/tests/css/display.css             |   39 -
 layout/html/tests/css/elevation.css           |   55 -
 layout/html/tests/css/empty-cells.css         |   45 -
 layout/html/tests/css/float.css               |   39 -
 layout/html/tests/css/font-family.css         |   36 -
 layout/html/tests/css/font-size-adjust.css    |   53 -
 layout/html/tests/css/font-size.css           |   48 -
 layout/html/tests/css/font-stretch.css        |   53 -
 layout/html/tests/css/font-style.css          |   42 -
 layout/html/tests/css/font-variant.css        |   41 -
 layout/html/tests/css/font-weight.css         |   50 -
 layout/html/tests/css/font.css                |   48 -
 layout/html/tests/css/height.css              |   37 -
 layout/html/tests/css/left.css                |   38 -
 layout/html/tests/css/letter-spacing.css      |   37 -
 layout/html/tests/css/line-height.css         |   39 -
 layout/html/tests/css/list-style-image.css    |   37 -
 layout/html/tests/css/list-style-position.css |   37 -
 layout/html/tests/css/list-style-type.css     |   44 -
 layout/html/tests/css/list-style.css          |   45 -
 layout/html/tests/css/margin-bottom.css       |   38 -
 layout/html/tests/css/margin-left.css         |   38 -
 layout/html/tests/css/margin-right.css        |   38 -
 layout/html/tests/css/margin-top.css          |   38 -
 layout/html/tests/css/margin.css              |   57 -
 layout/html/tests/css/marker-offset.css       |   43 -
 layout/html/tests/css/marks.css               |   45 -
 layout/html/tests/css/max-height.css          |   44 -
 layout/html/tests/css/max-width.css           |   46 -
 layout/html/tests/css/min-height.css          |   46 -
 layout/html/tests/css/min-width.css           |   44 -
 layout/html/tests/css/opacity.css             |   40 -
 layout/html/tests/css/orphans.css             |   45 -
 layout/html/tests/css/outline-color.css       |   47 -
 layout/html/tests/css/outline-style.css       |   46 -
 layout/html/tests/css/outline-width.css       |   45 -
 layout/html/tests/css/outline.css             |   58 -
 layout/html/tests/css/overflow.css            |   39 -
 layout/html/tests/css/padding-bottom.css      |   37 -
 layout/html/tests/css/padding-left.css        |   37 -
 layout/html/tests/css/padding-right.css       |   37 -
 layout/html/tests/css/padding-top.css         |   37 -
 layout/html/tests/css/padding.css             |   49 -
 layout/html/tests/css/pointer-events.css      |   46 -
 layout/html/tests/css/position.css            |   40 -
 layout/html/tests/css/text-align.css          |   39 -
 layout/html/tests/css/text-decoration.css     |   45 -
 layout/html/tests/css/text-indent.css         |   37 -
 layout/html/tests/css/text-transform.css      |   40 -
 layout/html/tests/css/top.css                 |   38 -
 layout/html/tests/css/vertical-align.css      |   46 -
 layout/html/tests/css/visibility.css          |   38 -
 layout/html/tests/css/white-space.css         |   38 -
 layout/html/tests/css/width.css               |   38 -
 layout/html/tests/css/word-spacing.css        |   44 -
 layout/html/tests/css/z-index.css             |   39 -
 .../formctls/base/button_button_strict.html   |   45 -
 .../formctls/base/button_css_sizing.html      |   44 -
 .../formctls/base/button_min_max_widths.html  |   21 -
 .../base/button_min_max_widths_strict.html    |   22 -
 .../tests/formctls/base/button_no_margin.html |   16 -
 .../base/button_no_margin_strict.html         |   17 -
 .../formctls/base/button_overconstrained.html |   32 -
 .../base/button_overconstrained_strict.html   |   33 -
 .../formctls/base/button_reset_strict.html    |   44 -
 .../formctls/base/button_sizing_tests.html    |   34 -
 .../base/button_small_avail_width.html        |   10 -
 .../base/button_small_avail_width_strict.html |   11 -
 .../formctls/base/button_submit_strict.html   |   46 -
 .../formctls/base/button_with_margin.html     |   16 -
 .../base/button_with_margin_strict.html       |   17 -
 .../tests/formctls/base/fieldset_strict.html  |   45 -
 .../tests/formctls/base/fieldset_strict2.html |  101 -
 .../tests/formctls/base/form_overview.html    |   60 -
 layout/html/tests/formctls/base/index.html    |   75 -
 .../base/input_button_overconstrained.html    |   19 -
 .../input_button_overconstrained_strict.html  |   20 -
 .../formctls/base/input_button_strict.html    |   43 -
 .../formctls/base/input_checkbox_strict.html  |   44 -
 .../formctls/base/input_file_strict.html      |   43 -
 .../formctls/base/input_file_strict2.html     |   17 -
 .../formctls/base/input_hidden_strict.html    |   43 -
 .../formctls/base/input_image_strict.html     |   43 -
 .../formctls/base/input_password_strict.html  |   44 -
 .../formctls/base/input_radio_strict.html     |   44 -
 .../formctls/base/input_reset_strict.html     |   44 -
 .../formctls/base/input_submit_strict.html    |   43 -
 .../formctls/base/input_text_strict.html      |   43 -
 .../tests/formctls/base/inputtext_sizes.html  |   21 -
 .../tests/formctls/base/inputtext_tests.html  |   70 -
 .../tests/formctls/base/isindex_strict.html   |   44 -
 .../tests/formctls/base/legend_strict.html    |   45 -
 .../tests/formctls/base/optgroup_test1.html   |   61 -
 .../tests/formctls/base/radio_disabled.html   |   38 -
 .../html/tests/formctls/base/radio_init.html  |   41 -
 .../html/tests/formctls/base/radio_jsadd.html |   26 -
 .../tests/formctls/base/radio_onchange.html   |   21 -
 layout/html/tests/formctls/base/rtest.lst     |   56 -
 .../html/tests/formctls/base/select1_js.html  |  258 -
 .../formctls/base/select_combobox_basics.html |  283 -
 .../tests/formctls/base/select_disabled.html  |  285 -
 .../html/tests/formctls/base/select_init.html |  298 -
 .../html/tests/formctls/base/select_js.html   |   41 -
 .../tests/formctls/base/select_jsadd.html     |  352 -
 .../formctls/base/select_listbox_sizing.html  |  558 --
 .../base/select_listbox_sizing_quirks.html    |  557 --
 .../tests/formctls/base/select_onchange.html  |  107 -
 .../formctls/base/select_small_sizes.html     |   58 -
 .../formctls/base/select_small_sizes2.html    |   45 -
 .../tests/formctls/base/select_strict.html    |  193 -
 .../tests/formctls/base/selectsize3_js.html   |   41 -
 .../tests/formctls/base/testarea_wrap.html    |   22 -
 .../tests/formctls/base/textarea_sizes.html   |   21 -
 .../tests/formctls/base/textarea_strict.html  |   45 -
 .../tests/formctls/base/textarea_tests.html   |   66 -
 .../html/tests/formctls/bugs/bug101122.html   |   28 -
 layout/html/tests/formctls/bugs/bug10410.html |    9 -
 .../html/tests/formctls/bugs/bug108526.html   |   18 -
 .../html/tests/formctls/bugs/bug109316.html   |   64 -
 .../html/tests/formctls/bugs/bug109368.html   |   21 -
 .../html/tests/formctls/bugs/bug113245.html   |  134 -
 .../html/tests/formctls/bugs/bug117606.html   |   48 -
 .../html/tests/formctls/bugs/bug138403-1.html |   36 -
 .../html/tests/formctls/bugs/bug138403-2.html |   20 -
 .../html/tests/formctls/bugs/bug167236-1.html |   26 -
 .../tests/formctls/bugs/bug167236-10.html     |   37 -
 .../tests/formctls/bugs/bug167236-11.html     |   40 -
 .../tests/formctls/bugs/bug167236-12.html     |   41 -
 .../tests/formctls/bugs/bug167236-13.html     |   23 -
 .../tests/formctls/bugs/bug167236-14.html     |   25 -
 .../tests/formctls/bugs/bug167236-15.html     |   30 -
 .../tests/formctls/bugs/bug167236-16.html     |   31 -
 .../html/tests/formctls/bugs/bug167236-2.html |   27 -
 .../html/tests/formctls/bugs/bug167236-3.html |   12 -
 .../html/tests/formctls/bugs/bug167236-4.html |   13 -
 .../html/tests/formctls/bugs/bug167236-5.html |   10 -
 .../html/tests/formctls/bugs/bug167236-6.html |   12 -
 .../html/tests/formctls/bugs/bug167236-7.html |   39 -
 .../html/tests/formctls/bugs/bug167236-8.html |   40 -
 .../html/tests/formctls/bugs/bug167236-9.html |   36 -
 layout/html/tests/formctls/bugs/bug17450.html |   14 -
 .../html/tests/formctls/bugs/bug17474-1.html  |   33 -
 .../html/tests/formctls/bugs/bug17474-2.html  |   44 -
 .../html/tests/formctls/bugs/bug17474-3.html  |   49 -
 .../html/tests/formctls/bugs/bug180085-1.html |   18 -
 .../html/tests/formctls/bugs/bug180085-2.html |   18 -
 .../html/tests/formctls/bugs/bug180085-3.html |   16 -
 .../html/tests/formctls/bugs/bug180085-4.html |   34 -
 layout/html/tests/formctls/bugs/bug20322.html |    5 -
 .../html/tests/formctls/bugs/bug222864.html   |    7 -
 layout/html/tests/formctls/bugs/bug22708.html |    9 -
 .../html/tests/formctls/bugs/bug231574.html   |   14 -
 layout/html/tests/formctls/bugs/bug26644.html |   32 -
 layout/html/tests/formctls/bugs/bug26650.html |   25 -
 layout/html/tests/formctls/bugs/bug28598.html |    8 -
 .../html/tests/formctls/bugs/bug297389.html   |   15 -
 .../html/tests/formctls/bugs/bug300474-1.html |   31 -
 .../html/tests/formctls/bugs/bug300474-2.html |  531 --
 .../html/tests/formctls/bugs/bug305705.html   |  112 -
 layout/html/tests/formctls/bugs/bug33327.html |   33 -
 .../html/tests/formctls/bugs/bug342531.html   |  102 -
 .../html/tests/formctls/bugs/bug357449.html   |   22 -
 .../html/tests/formctls/bugs/bug358408.html   |   22 -
 layout/html/tests/formctls/bugs/bug35934.html |    4 -
 layout/html/tests/formctls/bugs/bug36130.html |   16 -
 .../html/tests/formctls/bugs/bug36364-1.html  |   12 -
 .../html/tests/formctls/bugs/bug36364-2.html  |   14 -
 layout/html/tests/formctls/bugs/bug36964.html |    1 -
 layout/html/tests/formctls/bugs/bug37261.html |    1 -
 layout/html/tests/formctls/bugs/bug37459.html |   33 -
 layout/html/tests/formctls/bugs/bug39425.html |   31 -
 layout/html/tests/formctls/bugs/bug4050.html  |   12 -
 .../html/tests/formctls/bugs/bug40596-1.html  |   35 -
 .../html/tests/formctls/bugs/bug40596-2.html  |   50 -
 .../html/tests/formctls/bugs/bug40596-3.html  |   50 -
 .../html/tests/formctls/bugs/bug40596-4.html  |   54 -
 .../html/tests/formctls/bugs/bug40596-5.html  |   50 -
 .../html/tests/formctls/bugs/bug40596-6.html  |   54 -
 .../html/tests/formctls/bugs/bug40596-7.html  |   54 -
 layout/html/tests/formctls/bugs/bug41049.html |   21 -
 layout/html/tests/formctls/bugs/bug41050.html |    9 -
 layout/html/tests/formctls/bugs/bug42481.html |   58 -
 layout/html/tests/formctls/bugs/bug43771.html |    9 -
 layout/html/tests/formctls/bugs/bug44000.html |   85 -
 layout/html/tests/formctls/bugs/bug45095.html |    9 -
 layout/html/tests/formctls/bugs/bug45152.html |   14 -
 layout/html/tests/formctls/bugs/bug45562.html |    7 -
 layout/html/tests/formctls/bugs/bug45625.html |    8 -
 layout/html/tests/formctls/bugs/bug45670.html |   14 -
 layout/html/tests/formctls/bugs/bug46099.html |   47 -
 layout/html/tests/formctls/bugs/bug46224.html |   44 -
 layout/html/tests/formctls/bugs/bug48237.html |   36 -
 layout/html/tests/formctls/bugs/bug50419.html |   65 -
 .../html/tests/formctls/bugs/bug53259-1.html  |   40 -
 .../html/tests/formctls/bugs/bug53259-2.html  |   24 -
 .../html/tests/formctls/bugs/bug53259-3.html  |   46 -
 layout/html/tests/formctls/bugs/bug55063.html |   20 -
 layout/html/tests/formctls/bugs/bug58190.html |  140 -
 layout/html/tests/formctls/bugs/bug58220.html |   11 -
 layout/html/tests/formctls/bugs/bug58299.html |   33 -
 layout/html/tests/formctls/bugs/bug59294.html |    9 -
 layout/html/tests/formctls/bugs/bug62568.html |  301 -
 layout/html/tests/formctls/bugs/bug62954.html |   18 -
 layout/html/tests/formctls/bugs/bug63309.html |   67 -
 layout/html/tests/formctls/bugs/bug65275.html |  117 -
 layout/html/tests/formctls/bugs/bug67207.html |   14 -
 layout/html/tests/formctls/bugs/bug68963.html |   52 -
 layout/html/tests/formctls/bugs/bug69984.html |   66 -
 .../html/tests/formctls/bugs/bug7025-1.html   |   27 -
 .../html/tests/formctls/bugs/bug7025-2.html   |   78 -
 .../html/tests/formctls/bugs/bug70251-1.html  |   16 -
 .../html/tests/formctls/bugs/bug70251-2.html  |   16 -
 .../html/tests/formctls/bugs/bug70251-3.html  |   13 -
 .../html/tests/formctls/bugs/bug70251-4.html  |   16 -
 layout/html/tests/formctls/bugs/bug73081.html |   27 -
 layout/html/tests/formctls/bugs/bug74069.html |   21 -
 layout/html/tests/formctls/bugs/bug7543.html  |   38 -
 layout/html/tests/formctls/bugs/bug7549.html  |   17 -
 layout/html/tests/formctls/bugs/bug77068.html |   14 -
 layout/html/tests/formctls/bugs/bug79863.html |   24 -
 .../html/tests/formctls/bugs/bug79927-1.html  |   21 -
 .../html/tests/formctls/bugs/bug79927-2.html  |   24 -
 .../html/tests/formctls/bugs/bug79927-3.html  |   24 -
 layout/html/tests/formctls/bugs/bug81448.html |   31 -
 layout/html/tests/formctls/bugs/bug8665.html  |    1 -
 layout/html/tests/formctls/bugs/bug88849.html |   20 -
 layout/html/tests/formctls/bugs/bug91789.html |   17 -
 layout/html/tests/formctls/bugs/bug92647.html |   33 -
 layout/html/tests/formctls/bugs/bug94268.html |   73 -
 layout/html/tests/formctls/bugs/bug95703.html |   40 -
 layout/html/tests/formctls/bugs/bug95937.html |   66 -
 layout/html/tests/formctls/bugs/bug96506.html |   59 -
 layout/html/tests/formctls/bugs/bug96604.html |    3 -
 layout/html/tests/formctls/bugs/bug98918.html |   76 -
 layout/html/tests/formctls/bugs/rtest.lst     |  119 -
 layout/html/tests/images/polarBears.jpg       |  Bin 16219 -> 0 bytes
 .../CSSPage/frameset1/simple_main.html        |   12 -
 .../CSSPage/frameset1/simple_sub1.html        |   78 -
 .../CSSPage/frameset1/simple_sub2.html        |   77 -
 .../CSSPage/frameset2/simple_main.html        |   12 -
 .../CSSPage/frameset2/simple_sub1.html        |   78 -
 .../CSSPage/frameset2/simple_sub2.html        |   78 -
 .../printer/CSSPage/frameset2/sub_iframe.html |   36 -
 .../html/tests/printer/CSSPage/landscape.html |   65 -
 .../printer/CSSPage/margin10percent.html      |   64 -
 .../tests/printer/CSSPage/marginauto.html     |   64 -
 .../CSSPage/marginleftautoright1in.html       |   64 -
 .../CSSPage/page8x11margin10percent.html      |   64 -
 .../printer/CSSPage/page8x11margin254cm.html  |   64 -
 .../printer/CSSPage/page8x11marginhalfin.html |   64 -
 .../tests/printer/CSSPage/pagesizeauto.html   |   64 -
 .../html/tests/printer/CSSPage/portrait.html  |   65 -
 layout/html/tests/printer/CSSPage/right.html  |   68 -
 .../frameset/frameset1/simple_main.html       |    6 -
 .../frameset/frameset1/simple_sub1.html       |   76 -
 .../frameset/frameset1/simple_sub2.html       |   73 -
 .../frameset/frameset2/simple_main.html       |    6 -
 .../frameset/frameset2/simple_sub1.html       |   77 -
 .../frameset/frameset2/simple_sub2.html       |   73 -
 .../frameset/frameset2/sub_iframe.html        |   36 -
 .../printer/frameset/frameset3/frame1.html    |    8 -
 .../printer/frameset/frameset3/frame2.html    |    8 -
 .../printer/frameset/frameset3/frame3.html    |    8 -
 .../printer/frameset/frameset3/root.html      |   13 -
 .../printer/frameset/frameset3/subroot.html   |   13 -
 .../printer/frameset/frameset4/frame1.html    |    8 -
 .../printer/frameset/frameset4/frame2.html    |    8 -
 .../printer/frameset/frameset4/frame3.html    |    8 -
 .../printer/frameset/frameset4/root.html      |   16 -
 .../printer/frameset/frameset5/frame1.html    |    8 -
 .../printer/frameset/frameset5/frame2.html    |    8 -
 .../printer/frameset/frameset5/frame3.html    |    9 -
 .../printer/frameset/frameset5/root.html      |   13 -
 .../printer/frameset/frameset5/subroot.html   |   13 -
 .../frameset/frameset5/the_iframe.html        |    6 -
 .../printer/frameset/frameset6/frame1.html    |    8 -
 .../printer/frameset/frameset6/frame2.html    |    8 -
 .../printer/frameset/frameset6/frame3.html    |    9 -
 .../printer/frameset/frameset6/root.html      |   16 -
 .../frameset/frameset6/the_iframe.html        |    6 -
 .../printer/frameset/frameset7/index.html     |    6 -
 .../frameset/frameset7/simple_sub1.html       |   76 -
 .../frameset/frameset7/simple_sub2.html       |  877 ---
 .../printer/frameset/frameset8/index.html     |    6 -
 .../frameset/frameset8/js_pp_timer.html       |   25 -
 .../frameset/frameset8/simple_sub1.html       |   76 -
 layout/html/tests/printer/general/Anieyes.gif |  Bin 13539 -> 0 bytes
 layout/html/tests/printer/general/raptor.jpg  |  Bin 49629 -> 0 bytes
 layout/html/tests/printer/general/test0.html  |  210 -
 layout/html/tests/printer/general/test1.html  |   84 -
 layout/html/tests/printer/general/test2.html  |   41 -
 layout/html/tests/printer/general/test3.html  |  126 -
 layout/html/tests/printer/general/test4.html  |   26 -
 layout/html/tests/printer/general/test5.html  |   26 -
 layout/html/tests/printer/general/test6.html  |   47 -
 .../tests/printer/hidden_iframe/index.html    |   55 -
 .../printer/hidden_iframe/the_iframe.html     |    6 -
 .../printer/hidden_iframe/the_iframe1.html    |    6 -
 .../printer/hidden_iframe/the_iframe2.html    |    6 -
 .../printer/hidden_iframe/the_iframe3.html    |    6 -
 .../iframe_2nd_page/iframe_example.html       |   71 -
 .../tests/printer/iframe_2nd_page/index.html  |   72 -
 .../printer/iframe_2nd_page/the_iframe.html   |    6 -
 layout/html/tests/printer/images/Anieyes.gif  |  Bin 13539 -> 0 bytes
 .../tests/printer/images/animatedgif.html     |    7 -
 .../html/tests/printer/images/imagegif.html   |    7 -
 .../html/tests/printer/images/imagejpg.html   |    7 -
 layout/html/tests/printer/images/raptor.GIF   |  Bin 12341 -> 0 bytes
 layout/html/tests/printer/images/raptor.jpg   |  Bin 49619 -> 0 bytes
 layout/html/tests/printer/images/test2.html   |   41 -
 layout/html/tests/printer/index.html          |  154 -
 .../js/change_while_in_printdialog.html       |   18 -
 layout/html/tests/printer/js/js_pp_timer.html |   25 -
 .../printer/js/load_new_site_from_js.html     |    9 -
 .../tests/printer/js/load_print_close.html    |    6 -
 .../printer/js/load_print_close_page2.html    |   84 -
 .../tests/printer/js/load_print_reload.html   |    6 -
 .../printer/js/load_print_reload_page2.html   |   86 -
 .../html/tests/printer/js/print_from_js.html  |   40 -
 .../tests/printer/js/print_from_onload.html   |   45 -
 .../tests/printer/js/print_from_script.html   |   43 -
 .../tests/printer/long_pages/105_pages.html   | 5633 -----------------
 .../tests/printer/long_pages/2_pages.html     |  107 -
 .../tests/printer/long_pages/8_pages.html     |  877 ---
 layout/html/tests/printer/misc/abs_pos.html   |   44 -
 layout/html/tests/printer/misc/abs_pos2.html  |   81 -
 .../tests/printer/misc/embed_obj_tag.html     |   11 -
 .../tests/printer/misc/font_size_scaling.html |   65 -
 .../printer/misc/page_with_long_title.html    |   21 -
 .../tests/printer/misc/scaled_scrollbars.html |   51 -
 .../more_iframes/iframe_in_iframe/index.html  |   73 -
 .../iframe_in_iframe/the_iframe.html          |    7 -
 .../iframe_in_iframe/the_iframe2.html         |    6 -
 .../tests/printer/noframes/simple_main.html   | 1272 ----
 .../tests/printer/noframes/simple_sub1.html   |    9 -
 .../tests/printer/printing_checklist.html     |  110 -
 .../shrink_to_fit/test1/simple_main.html      |    6 -
 .../shrink_to_fit/test1/simple_sub1.html      |   11 -
 .../shrink_to_fit/test1/simple_sub2.html      |   73 -
 .../shrink_to_fit/test2/simple_main.html      |    9 -
 .../shrink_to_fit/test2/simple_sub1.html      |   17 -
 .../shrink_to_fit/test2/simple_sub2.html      |   73 -
 .../shrink_to_fit/test2/simple_sub3.html      |   12 -
 .../shrink_to_fit/test3/simple_main.html      |    4 -
 .../printer/shrink_to_fit/test4/index.html    |   76 -
 .../shrink_to_fit/test5/simple_main.html      |    9 -
 .../shrink_to_fit/test5/simple_sub1.html      |   12 -
 .../shrink_to_fit/test5/simple_sub2.html      |   74 -
 .../shrink_to_fit/test5/simple_sub3.html      |   77 -
 .../shrink_to_fit/test5/sub_iframe.html       |   37 -
 .../printer/shrink_to_fit/test6/index.html    |   77 -
 .../shrink_to_fit/test6/sub_iframe.html       |   37 -
 .../shrink_to_fit/test7/simple_main.html      |    9 -
 .../shrink_to_fit/test7/simple_sub1.html      |   17 -
 .../shrink_to_fit/test7/simple_sub2.html      |   73 -
 .../shrink_to_fit/test7/simple_sub3.html      |   76 -
 layout/html/tests/printer/table/table1.html   | 2125 -------
 layout/html/tests/printer/table/table2.html   |   27 -
 .../tests/printer/zeropos_iframes/index.html  |   10 -
 .../printer/zeropos_iframes/sub_iframe.html   |   37 -
 layout/html/tests/style/bugs/bug224188.html   |    7 -
 layout/html/tests/style/bugs/bug224737.html   |   38 -
 layout/html/tests/style/bugs/bug273719.html   |   26 -
 layout/html/tests/style/bugs/bug302186-1.html |   23 -
 .../html/tests/style/bugs/bug302186-10.html   |   31 -
 .../html/tests/style/bugs/bug302186-11.html   |   31 -
 .../html/tests/style/bugs/bug302186-12.html   |   23 -
 .../html/tests/style/bugs/bug302186-13.html   |   23 -
 .../html/tests/style/bugs/bug302186-14.html   |   23 -
 .../html/tests/style/bugs/bug302186-15.html   |   22 -
 .../html/tests/style/bugs/bug302186-16.html   |   22 -
 layout/html/tests/style/bugs/bug302186-2.html |   25 -
 layout/html/tests/style/bugs/bug302186-3.html |   25 -
 layout/html/tests/style/bugs/bug302186-4.html |   26 -
 layout/html/tests/style/bugs/bug302186-5.html |   26 -
 layout/html/tests/style/bugs/bug302186-6.html |   25 -
 layout/html/tests/style/bugs/bug302186-7.html |   25 -
 layout/html/tests/style/bugs/bug302186-8.html |   25 -
 layout/html/tests/style/bugs/bug302186-9.html |   25 -
 layout/html/tests/style/bugs/bug348809-1.html |   13 -
 .../html/tests/style/bugs/bug348809-10.html   |   23 -
 .../html/tests/style/bugs/bug348809-11.html   |   24 -
 .../html/tests/style/bugs/bug348809-12.html   |   24 -
 .../html/tests/style/bugs/bug348809-13.html   |   19 -
 .../html/tests/style/bugs/bug348809-14.html   |   13 -
 layout/html/tests/style/bugs/bug348809-2.html |   13 -
 layout/html/tests/style/bugs/bug348809-3.html |   22 -
 layout/html/tests/style/bugs/bug348809-4.html |   23 -
 layout/html/tests/style/bugs/bug348809-5.html |   23 -
 layout/html/tests/style/bugs/bug348809-6.html |   23 -
 layout/html/tests/style/bugs/bug348809-7.html |   13 -
 layout/html/tests/style/bugs/bug348809-8.html |   13 -
 layout/html/tests/style/bugs/bug348809-9.html |   22 -
 layout/html/tests/style/bugs/bug84400-1.html  |  184 -
 layout/html/tests/style/bugs/bug84400-2.html  |   78 -
 layout/html/tests/style/bugs/bug84400-3.html  |   28 -
 layout/html/tests/style/bugs/rtest.lst        |   36 -
 layout/html/tests/table/bugs/45621.html       |   37 -
 layout/html/tests/table/bugs/97619.html       |   41 -
 .../tests/table/bugs/adforce_imgis_com.html   |   10 -
 layout/html/tests/table/bugs/bug10009.html    |   33 -
 layout/html/tests/table/bugs/bug100334.html   |   24 -
 layout/html/tests/table/bugs/bug10036.html    |   16 -
 layout/html/tests/table/bugs/bug10039.html    |    4 -
 layout/html/tests/table/bugs/bug1010.html     |   35 -
 layout/html/tests/table/bugs/bug101201.html   |   30 -
 layout/html/tests/table/bugs/bug10140.html    |  241 -
 layout/html/tests/table/bugs/bug101674.html   |   41 -
 layout/html/tests/table/bugs/bug101759.html   |   67 -
 layout/html/tests/table/bugs/bug102145-1.html |   21 -
 layout/html/tests/table/bugs/bug102145-2.html |   21 -
 layout/html/tests/table/bugs/bug102145-3.html |   21 -
 layout/html/tests/table/bugs/bug102145-4.html |   21 -
 layout/html/tests/table/bugs/bug10216.html    |   42 -
 layout/html/tests/table/bugs/bug10269-1.html  |   11 -
 layout/html/tests/table/bugs/bug10269-2.html  |  350 -
 layout/html/tests/table/bugs/bug10296-1.html  |  459 --
 layout/html/tests/table/bugs/bug10296-2.html  |   23 -
 layout/html/tests/table/bugs/bug103533.html   |   37 -
 layout/html/tests/table/bugs/bug104898.html   |   42 -
 layout/html/tests/table/bugs/bug1055-1.html   |  183 -
 layout/html/tests/table/bugs/bug1055-2.html   |  103 -
 layout/html/tests/table/bugs/bug10565.html    |   19 -
 layout/html/tests/table/bugs/bug106158-1.html |   28 -
 layout/html/tests/table/bugs/bug106158-2.html |   29 -
 layout/html/tests/table/bugs/bug10633.html    |   47 -
 layout/html/tests/table/bugs/bug106336.html   |    6 -
 layout/html/tests/table/bugs/bug1067-1.html   |   31 -
 layout/html/tests/table/bugs/bug1067-2.html   |   12 -
 layout/html/tests/table/bugs/bug106795.html   |   15 -
 layout/html/tests/table/bugs/bug106816.html   |   48 -
 layout/html/tests/table/bugs/bug106966.html   |  158 -
 layout/html/tests/table/bugs/bug108340.html   |   27 -
 layout/html/tests/table/bugs/bug109043.html   |   24 -
 layout/html/tests/table/bugs/bug11026.html    |   15 -
 layout/html/tests/table/bugs/bug110566.html   |   11 -
 layout/html/tests/table/bugs/bug1128.html     |   46 -
 layout/html/tests/table/bugs/bug11321.html    |   17 -
 layout/html/tests/table/bugs/bug113235-1.html |  744 ---
 layout/html/tests/table/bugs/bug113235-2.html |   19 -
 layout/html/tests/table/bugs/bug113235-3.html |  105 -
 layout/html/tests/table/bugs/bug11331.html    |   23 -
 layout/html/tests/table/bugs/bug113424.html   |   44 -
 layout/html/tests/table/bugs/bug11384q.html   |   19 -
 layout/html/tests/table/bugs/bug11384s.html   |   19 -
 layout/html/tests/table/bugs/bug1163-1.html   |   35 -
 layout/html/tests/table/bugs/bug1164.html     |   78 -
 layout/html/tests/table/bugs/bug1188.html     |   71 -
 layout/html/tests/table/bugs/bug11944.html    |   23 -
 layout/html/tests/table/bugs/bug11945.html    |   40 -
 layout/html/tests/table/bugs/bug119786.html   |   48 -
 layout/html/tests/table/bugs/bug12008.html    |   16 -
 layout/html/tests/table/bugs/bug120107.html   |   21 -
 layout/html/tests/table/bugs/bug12012.css     |  179 -
 layout/html/tests/table/bugs/bug12012.js      |  948 ---
 layout/html/tests/table/bugs/bug12012.rdf     | 1921 ------
 layout/html/tests/table/bugs/bug12012.xul     |  494 --
 layout/html/tests/table/bugs/bug120364.html   |   23 -
 layout/html/tests/table/bugs/bug1220.html     |   30 -
 layout/html/tests/table/bugs/bug1224.html     |   15 -
 layout/html/tests/table/bugs/bug12268.html    |    7 -
 layout/html/tests/table/bugs/bug12287.xul     |   15 -
 layout/html/tests/table/bugs/bug12384.html    |   13 -
 layout/html/tests/table/bugs/bug123862.html   |    1 -
 layout/html/tests/table/bugs/bug1261.html     |   18 -
 layout/html/tests/table/bugs/bug1262.html     |   13 -
 layout/html/tests/table/bugs/bug126742.html   |   58 -
 layout/html/tests/table/bugs/bug12709.html    |   11 -
 layout/html/tests/table/bugs/bug1271.html     |   15 -
 layout/html/tests/table/bugs/bug127267.html   |   39 -
 layout/html/tests/table/bugs/bug128229.html   |   30 -
 layout/html/tests/table/bugs/bug128876.html   |   22 -
 layout/html/tests/table/bugs/bug12908-1.html  |   29 -
 layout/html/tests/table/bugs/bug12908-2.html  |   10 -
 layout/html/tests/table/bugs/bug12910-2.html  |   17 -
 layout/html/tests/table/bugs/bug12910.html    |    7 -
 layout/html/tests/table/bugs/bug1296.html     |   53 -
 layout/html/tests/table/bugs/bug1302.html     |  161 -
 layout/html/tests/table/bugs/bug131020-2.html |   25 -
 layout/html/tests/table/bugs/bug131020-3.html |  155 -
 layout/html/tests/table/bugs/bug131020.html   |   21 -
 .../tests/table/bugs/bug131020_iframe.html    |  201 -
 layout/html/tests/table/bugs/bug13105.html    |   13 -
 layout/html/tests/table/bugs/bug13118.html    |   27 -
 layout/html/tests/table/bugs/bug13169.html    |   25 -
 layout/html/tests/table/bugs/bug1318.html     |   34 -
 layout/html/tests/table/bugs/bug13196.html    |   12 -
 layout/html/tests/table/bugs/bug133756-1.html |   27 -
 layout/html/tests/table/bugs/bug133756-2.html |   62 -
 layout/html/tests/table/bugs/bug133948.html   |   36 -
 layout/html/tests/table/bugs/bug13484.html    |    7 -
 layout/html/tests/table/bugs/bug13526.html    |   16 -
 layout/html/tests/table/bugs/bug137388-1.html |   11 -
 layout/html/tests/table/bugs/bug137388-2.html |   16 -
 layout/html/tests/table/bugs/bug137388-3.html |   11 -
 layout/html/tests/table/bugs/bug138725.html   |   32 -
 layout/html/tests/table/bugs/bug139524-1.html |   18 -
 layout/html/tests/table/bugs/bug139524-2.html |   49 -
 layout/html/tests/table/bugs/bug139524-3.html |   20 -
 layout/html/tests/table/bugs/bug139524-4.html |   18 -
 layout/html/tests/table/bugs/bug139843.html   |   11 -
 layout/html/tests/table/bugs/bug14007-1.html  |   79 -
 layout/html/tests/table/bugs/bug14007-2.html  |  123 -
 layout/html/tests/table/bugs/bug14159-1.html  |   23 -
 layout/html/tests/table/bugs/bug14159-2.html  |   32 -
 layout/html/tests/table/bugs/bug14159-3.html  |   11 -
 layout/html/tests/table/bugs/bug141818.html   |   17 -
 layout/html/tests/table/bugs/bug1430.html     |   66 -
 layout/html/tests/table/bugs/bug14323.html    |   34 -
 layout/html/tests/table/bugs/bug14489.html    |   69 -
 layout/html/tests/table/bugs/bug145572.html   |   28 -
 layout/html/tests/table/bugs/bug1474.html     |    5 -
 layout/html/tests/table/bugs/bug149275-1.html |   30 -
 layout/html/tests/table/bugs/bug149275-2.html |   13 -
 layout/html/tests/table/bugs/bug14929.html    |   48 -
 layout/html/tests/table/bugs/bug15247.html    |   41 -
 layout/html/tests/table/bugs/bug154780.html   |   21 -
 layout/html/tests/table/bugs/bug15544.html    |   19 -
 layout/html/tests/table/bugs/bug157890.html   |  113 -
 layout/html/tests/table/bugs/bug159108.html   |   25 -
 layout/html/tests/table/bugs/bug15933.html    |   18 -
 layout/html/tests/table/bugs/bug16012.html    |   31 -
 layout/html/tests/table/bugs/bug16252.html    |  156 -
 layout/html/tests/table/bugs/bug1647.html     |   26 -
 layout/html/tests/table/bugs/bug17130-1.html  |   36 -
 layout/html/tests/table/bugs/bug17130-2.html  |   20 -
 layout/html/tests/table/bugs/bug17138.html    |   29 -
 layout/html/tests/table/bugs/bug17168.html    |   26 -
 layout/html/tests/table/bugs/bug1725.html     |   60 -
 layout/html/tests/table/bugs/bug174470.html   |   38 -
 layout/html/tests/table/bugs/bug175455-4.html |   25 -
 layout/html/tests/table/bugs/bug17548.html    |   23 -
 layout/html/tests/table/bugs/bug17587.html    |   40 -
 layout/html/tests/table/bugs/bug17826.html    |   34 -
 layout/html/tests/table/bugs/bug178739.html   |   81 -
 layout/html/tests/table/bugs/bug178762.html   |   16 -
 layout/html/tests/table/bugs/bug178855.xml    |    5 -
 layout/html/tests/table/bugs/bug1800.html     |   49 -
 layout/html/tests/table/bugs/bug1802.html     |   27 -
 layout/html/tests/table/bugs/bug1802s.html    |   27 -
 layout/html/tests/table/bugs/bug1809.html     |   33 -
 layout/html/tests/table/bugs/bug1818-1.html   |   18 -
 layout/html/tests/table/bugs/bug1818-2.html   |   21 -
 layout/html/tests/table/bugs/bug1818-3.html   |   18 -
 layout/html/tests/table/bugs/bug1818-4.html   |   18 -
 layout/html/tests/table/bugs/bug1818-5.html   |   11 -
 layout/html/tests/table/bugs/bug1818-6.html   |   11 -
 layout/html/tests/table/bugs/bug1828.html     |   14 -
 layout/html/tests/table/bugs/bug18359.html    |  253 -
 layout/html/tests/table/bugs/bug18440.html    |    1 -
 layout/html/tests/table/bugs/bug18558.html    |   12 -
 layout/html/tests/table/bugs/bug18664.html    |   77 -
 layout/html/tests/table/bugs/bug18770.html    |   31 -
 layout/html/tests/table/bugs/bug18955.html    |   49 -
 layout/html/tests/table/bugs/bug19061-1.html  |   50 -
 layout/html/tests/table/bugs/bug19061-2.html  |   54 -
 layout/html/tests/table/bugs/bug19356.html    |  485 --
 layout/html/tests/table/bugs/bug194024.html   |   87 -
 layout/html/tests/table/bugs/bug19526.html    |   39 -
 layout/html/tests/table/bugs/bug19599.html    |   36 -
 layout/html/tests/table/bugs/bug196870.html   |   20 -
 layout/html/tests/table/bugs/bug2050.html     |   19 -
 layout/html/tests/table/bugs/bug20579.html    |   24 -
 layout/html/tests/table/bugs/bug2065.html     |   24 -
 layout/html/tests/table/bugs/bug20804.html    |   73 -
 layout/html/tests/table/bugs/bug2123.html     |   18 -
 layout/html/tests/table/bugs/bug21299.html    |   27 -
 layout/html/tests/table/bugs/bug21518.html    |   75 -
 layout/html/tests/table/bugs/bug215629.html   |   22 -
 layout/html/tests/table/bugs/bug217527.html   |   25 -
 layout/html/tests/table/bugs/bug21918.html    |   28 -
 layout/html/tests/table/bugs/bug219693-1.html |    8 -
 layout/html/tests/table/bugs/bug219693-2.html |    8 -
 layout/html/tests/table/bugs/bug22019.html    |   71 -
 layout/html/tests/table/bugs/bug220536.html   |   62 -
 layout/html/tests/table/bugs/bug220653.html   |   18 -
 layout/html/tests/table/bugs/bug22122.html    |  145 -
 layout/html/tests/table/bugs/bug221784-1.html |    9 -
 layout/html/tests/table/bugs/bug221784-2.html |   11 -
 layout/html/tests/table/bugs/bug222336.html   |   21 -
 layout/html/tests/table/bugs/bug22246-2.html  |   31 -
 layout/html/tests/table/bugs/bug22246-2a.html |   31 -
 layout/html/tests/table/bugs/bug22246-3.html  |   33 -
 layout/html/tests/table/bugs/bug22246-3a.html |   33 -
 layout/html/tests/table/bugs/bug222467.html   |   27 -
 layout/html/tests/table/bugs/bug222846.html   |   29 -
 layout/html/tests/table/bugs/bug22513.html    |   14 -
 layout/html/tests/table/bugs/bug2267.html     |   73 -
 layout/html/tests/table/bugs/bug227123.xml    |   12 -
 layout/html/tests/table/bugs/bug2296.html     |   30 -
 layout/html/tests/table/bugs/bug23072.html    |   10 -
 layout/html/tests/table/bugs/bug23151.html    |    5 -
 layout/html/tests/table/bugs/bug23235.html    |   57 -
 layout/html/tests/table/bugs/bug23299.html    |   33 -
 layout/html/tests/table/bugs/bug234593.html   |   23 -
 layout/html/tests/table/bugs/bug23847.html    |   12 -
 layout/html/tests/table/bugs/bug23994.html    |    7 -
 layout/html/tests/table/bugs/bug240248.html   |   22 -
 layout/html/tests/table/bugs/bug24200.html    |  105 -
 layout/html/tests/table/bugs/bug24503.html    |   21 -
 layout/html/tests/table/bugs/bug24627.html    |   32 -
 layout/html/tests/table/bugs/bug24661.html    |   14 -
 layout/html/tests/table/bugs/bug2469.html     |    6 -
 layout/html/tests/table/bugs/bug2479-1.html   |  175 -
 layout/html/tests/table/bugs/bug2479-2.html   |  110 -
 layout/html/tests/table/bugs/bug2479-3.html   |  161 -
 layout/html/tests/table/bugs/bug2479-4.html   |  154 -
 layout/html/tests/table/bugs/bug2479-5.html   |  118 -
 layout/html/tests/table/bugs/bug24880-1.html  |   39 -
 layout/html/tests/table/bugs/bug24880.html    |   39 -
 layout/html/tests/table/bugs/bug25004.html    |   33 -
 layout/html/tests/table/bugs/bug25074.html    |   13 -
 layout/html/tests/table/bugs/bug25086.html    |   56 -
 layout/html/tests/table/bugs/bug2509.html     |   20 -
 layout/html/tests/table/bugs/bug2516.html     |   17 -
 layout/html/tests/table/bugs/bug25367.html    |   15 -
 layout/html/tests/table/bugs/bug253781.html   |   24 -
 layout/html/tests/table/bugs/bug25663.html    |   23 -
 layout/html/tests/table/bugs/bug25707.html    |   25 -
 layout/html/tests/table/bugs/bug2585.html     |    9 -
 layout/html/tests/table/bugs/bug26178.html    |   30 -
 layout/html/tests/table/bugs/bug263050.html   |   10 -
 layout/html/tests/table/bugs/bug26553.html    |   22 -
 layout/html/tests/table/bugs/bug2684.html     |   65 -
 layout/html/tests/table/bugs/bug269566.html   |   12 -
 layout/html/tests/table/bugs/bug27038-1.html  |   35 -
 layout/html/tests/table/bugs/bug27038-2.html  |   48 -
 layout/html/tests/table/bugs/bug27038-3.html  |   43 -
 layout/html/tests/table/bugs/bug275625.html   |    8 -
 layout/html/tests/table/bugs/bug2757.html     |   17 -
 layout/html/tests/table/bugs/bug2763.html     |   10 -
 layout/html/tests/table/bugs/bug277062.html   |    4 -
 layout/html/tests/table/bugs/bug2773.html     |   65 -
 layout/html/tests/table/bugs/bug278266.html   |    7 -
 layout/html/tests/table/bugs/bug278385.html   |   25 -
 layout/html/tests/table/bugs/bug27993-1.html  |   16 -
 layout/html/tests/table/bugs/bug27993-2.html  |   16 -
 layout/html/tests/table/bugs/bug280009.html   |    8 -
 layout/html/tests/table/bugs/bug280217.html   |   10 -
 layout/html/tests/table/bugs/bug282172.html   |   26 -
 layout/html/tests/table/bugs/bug28341.html    |    8 -
 layout/html/tests/table/bugs/bug286137.html   |   12 -
 layout/html/tests/table/bugs/bug28856.xul     |  421 --
 layout/html/tests/table/bugs/bug2886-2.css    |  816 ---
 layout/html/tests/table/bugs/bug2886-2.html   |   65 -
 layout/html/tests/table/bugs/bug2886.html     |   69 -
 layout/html/tests/table/bugs/bug28928.html    |   48 -
 layout/html/tests/table/bugs/bug28933.html    |   10 -
 layout/html/tests/table/bugs/bug29058-1.html  |   18 -
 layout/html/tests/table/bugs/bug29058-2.html  |  119 -
 layout/html/tests/table/bugs/bug29058-3.html  |   38 -
 layout/html/tests/table/bugs/bug29157.html    |   30 -
 layout/html/tests/table/bugs/bug29314.html    |   14 -
 layout/html/tests/table/bugs/bug29326.html    |   17 -
 layout/html/tests/table/bugs/bug29429.html    |   27 -
 layout/html/tests/table/bugs/bug2947.html     |   75 -
 layout/html/tests/table/bugs/bug294823.html   |   19 -
 layout/html/tests/table/bugs/bug2954.html     |   10 -
 layout/html/tests/table/bugs/bug2962.html     |   15 -
 layout/html/tests/table/bugs/bug2973.html     |   12 -
 layout/html/tests/table/bugs/bug2981-1.html   |   15 -
 layout/html/tests/table/bugs/bug2981-2.html   |   35 -
 layout/html/tests/table/bugs/bug2997.html     |   75 -
 layout/html/tests/table/bugs/bug299723.html   |    9 -
 layout/html/tests/table/bugs/bug30273.html    |   24 -
 layout/html/tests/table/bugs/bug30332-1.html  |   41 -
 layout/html/tests/table/bugs/bug30332-2.html  |   41 -
 layout/html/tests/table/bugs/bug3037-1.html   |   22 -
 layout/html/tests/table/bugs/bug3037-2.html   |    6 -
 layout/html/tests/table/bugs/bug30418.html    |   62 -
 layout/html/tests/table/bugs/bug30559.html    |   31 -
 layout/html/tests/table/bugs/bug30692.html    |   47 -
 layout/html/tests/table/bugs/bug30985.html    |   21 -
 layout/html/tests/table/bugs/bug3103.html     |   19 -
 layout/html/tests/table/bugs/bug3105.html     |   29 -
 layout/html/tests/table/bugs/bug312770.html   |   21 -
 layout/html/tests/table/bugs/bug3166-1.html   |   17 -
 layout/html/tests/table/bugs/bug3166-10.html  |   21 -
 layout/html/tests/table/bugs/bug3166-11.html  |   26 -
 layout/html/tests/table/bugs/bug3166-12.html  |   21 -
 layout/html/tests/table/bugs/bug3166-13.html  |   25 -
 layout/html/tests/table/bugs/bug3166-14.html  |   26 -
 layout/html/tests/table/bugs/bug3166-15.html  |   26 -
 layout/html/tests/table/bugs/bug3166-16.html  |   26 -
 layout/html/tests/table/bugs/bug3166-17.html  |   25 -
 layout/html/tests/table/bugs/bug3166-18.html  |   42 -
 layout/html/tests/table/bugs/bug3166-2.html   |   19 -
 layout/html/tests/table/bugs/bug3166-3.html   |   18 -
 layout/html/tests/table/bugs/bug3166-4.html   |   18 -
 layout/html/tests/table/bugs/bug3166-5.html   |   18 -
 layout/html/tests/table/bugs/bug3166-6.html   |   17 -
 layout/html/tests/table/bugs/bug3166-7.html   |   18 -
 layout/html/tests/table/bugs/bug3166-8.html   |   19 -
 layout/html/tests/table/bugs/bug3166-9.html   |   18 -
 layout/html/tests/table/bugs/bug3191.html     |    9 -
 layout/html/tests/table/bugs/bug32205-1.html  |   68 -
 layout/html/tests/table/bugs/bug32205-2.html  |   76 -
 layout/html/tests/table/bugs/bug32205-3.html  |   34 -
 layout/html/tests/table/bugs/bug32205-4.html  |   12 -
 layout/html/tests/table/bugs/bug32205-5.html  |   23 -
 layout/html/tests/table/bugs/bug32447.html    |   13 -
 layout/html/tests/table/bugs/bug3260.html     |   32 -
 layout/html/tests/table/bugs/bug3263.html     |   12 -
 layout/html/tests/table/bugs/bug32841.html    |   18 -
 layout/html/tests/table/bugs/bug3309-1.html   |    8 -
 layout/html/tests/table/bugs/bug3309-2.html   |    5 -
 layout/html/tests/table/bugs/bug33137.html    |   27 -
 layout/html/tests/table/bugs/bug33784.html    |   19 -
 layout/html/tests/table/bugs/bug33855.html    |   22 -
 layout/html/tests/table/bugs/bug34176.html    |   12 -
 layout/html/tests/table/bugs/bug34538.html    |   13 -
 layout/html/tests/table/bugs/bug3454.html     |   28 -
 layout/html/tests/table/bugs/bug3517.html     |   37 -
 layout/html/tests/table/bugs/bug35662.html    |   34 -
 layout/html/tests/table/bugs/bug3681-1.html   |   29 -
 layout/html/tests/table/bugs/bug3681-2.html   |   29 -
 layout/html/tests/table/bugs/bug3718.html     |    9 -
 layout/html/tests/table/bugs/bug38916.html    |   94 -
 layout/html/tests/table/bugs/bug39209.html    |   23 -
 layout/html/tests/table/bugs/bug3977.html     |  152 -
 layout/html/tests/table/bugs/bug40828.html    |   31 -
 layout/html/tests/table/bugs/bug4093.html     |   29 -
 layout/html/tests/table/bugs/bug41890.html    |   11 -
 layout/html/tests/table/bugs/bug42043.html    |   43 -
 layout/html/tests/table/bugs/bug42187.html    |   32 -
 layout/html/tests/table/bugs/bug42443.html    |   14 -
 layout/html/tests/table/bugs/bug4284.html     |   15 -
 layout/html/tests/table/bugs/bug4294.css      |    1 -
 layout/html/tests/table/bugs/bug4294.html     |   28 -
 layout/html/tests/table/bugs/bug43039.html    |  158 -
 layout/html/tests/table/bugs/bug43204.html    |  126 -
 layout/html/tests/table/bugs/bug4382.html     |   27 -
 layout/html/tests/table/bugs/bug4385.html     |   15 -
 layout/html/tests/table/bugs/bug43854-1.html  |   47 -
 layout/html/tests/table/bugs/bug43854-2.html  |   83 -
 layout/html/tests/table/bugs/bug4427.html     |  103 -
 layout/html/tests/table/bugs/bug4429.html     |    7 -
 layout/html/tests/table/bugs/bug44505.html    |   74 -
 layout/html/tests/table/bugs/bug44523.html    |   24 -
 layout/html/tests/table/bugs/bug4501.html     |   32 -
 layout/html/tests/table/bugs/bug45055-2.html  |   60 -
 layout/html/tests/table/bugs/bug45055.html    |   25 -
 layout/html/tests/table/bugs/bug4520.html     |   23 -
 layout/html/tests/table/bugs/bug4523.html     |   30 -
 layout/html/tests/table/bugs/bug4527.html     |   30 -
 layout/html/tests/table/bugs/bug45350.html    |    9 -
 layout/html/tests/table/bugs/bug45486.html    |   42 -
 layout/html/tests/table/bugs/bug45621.html    |   40 -
 layout/html/tests/table/bugs/bug4576.html     |   46 -
 layout/html/tests/table/bugs/bug46268-1.html  |   32 -
 layout/html/tests/table/bugs/bug46268-2.html  |   31 -
 layout/html/tests/table/bugs/bug46268-3.html  |   30 -
 layout/html/tests/table/bugs/bug46268-4.html  |   26 -
 layout/html/tests/table/bugs/bug46268-5.html  |   41 -
 layout/html/tests/table/bugs/bug46268.html    |   41 -
 layout/html/tests/table/bugs/bug46368-1.html  |   35 -
 layout/html/tests/table/bugs/bug46368-2.html  |   29 -
 layout/html/tests/table/bugs/bug46480-1.html  |   65 -
 layout/html/tests/table/bugs/bug46480-2.html  |   66 -
 layout/html/tests/table/bugs/bug46623-1.html  |   28 -
 layout/html/tests/table/bugs/bug46623-2.html  |   25 -
 layout/html/tests/table/bugs/bug46924.html    |   26 -
 layout/html/tests/table/bugs/bug46944.html    |   16 -
 layout/html/tests/table/bugs/bug47163.html    |   16 -
 layout/html/tests/table/bugs/bug4739.html     |    6 -
 layout/html/tests/table/bugs/bug47432.html    |   46 -
 layout/html/tests/table/bugs/bug48028-1.html  |   27 -
 layout/html/tests/table/bugs/bug48028-2.html  |   19 -
 layout/html/tests/table/bugs/bug4803.html     |   13 -
 layout/html/tests/table/bugs/bug4849-2.html   |   45 -
 layout/html/tests/table/bugs/bug4849.html     |   23 -
 layout/html/tests/table/bugs/bug48827.html    |   62 -
 layout/html/tests/table/bugs/bug50695-1.html  |    7 -
 layout/html/tests/table/bugs/bug50695-2.html  |    7 -
 layout/html/tests/table/bugs/bug51000.html    |   43 -
 layout/html/tests/table/bugs/bug51037.html    |   47 -
 layout/html/tests/table/bugs/bug51140.html    |   45 -
 layout/html/tests/table/bugs/bug51727.html    |   64 -
 layout/html/tests/table/bugs/bug5188.html     |   36 -
 layout/html/tests/table/bugs/bug52505.html    |   34 -
 layout/html/tests/table/bugs/bug52506.html    |   34 -
 layout/html/tests/table/bugs/bug53663.html    |   15 -
 layout/html/tests/table/bugs/bug53690-1.html  |    7 -
 layout/html/tests/table/bugs/bug53690-2.html  |    7 -
 layout/html/tests/table/bugs/bug53891.html    |   25 -
 layout/html/tests/table/bugs/bug54450.html    |   14 -
 layout/html/tests/table/bugs/bug5538.html     |   35 -
 layout/html/tests/table/bugs/bug55527.html    |   70 -
 layout/html/tests/table/bugs/bug55545.html    |   26 -
 layout/html/tests/table/bugs/bug55694.html    |   27 -
 layout/html/tests/table/bugs/bug55789.html    |   13 -
 layout/html/tests/table/bugs/bug56024.html    |   19 -
 layout/html/tests/table/bugs/bug56201.html    |   24 -
 layout/html/tests/table/bugs/bug56405.html    |   20 -
 layout/html/tests/table/bugs/bug56563.html    |    7 -
 layout/html/tests/table/bugs/bug57300.html    |   31 -
 layout/html/tests/table/bugs/bug57378.html    |   10 -
 layout/html/tests/table/bugs/bug57828-2.html  |   51 -
 layout/html/tests/table/bugs/bug57828.html    |   23 -
 layout/html/tests/table/bugs/bug5797.html     |   35 -
 layout/html/tests/table/bugs/bug5798.html     |    8 -
 layout/html/tests/table/bugs/bug5799.html     |   30 -
 layout/html/tests/table/bugs/bug5835.html     |  104 -
 layout/html/tests/table/bugs/bug5838.html     |   16 -
 layout/html/tests/table/bugs/bug58402-1.html  |   14 -
 layout/html/tests/table/bugs/bug58402-2.html  |   58 -
 layout/html/tests/table/bugs/bug59252.html    |   18 -
 layout/html/tests/table/bugs/bug59354.html    |   50 -
 layout/html/tests/table/bugs/bug60013.html    |   20 -
 layout/html/tests/table/bugs/bug60749.html    |   36 -
 layout/html/tests/table/bugs/bug60804.html    |   34 -
 layout/html/tests/table/bugs/bug60807.html    |   34 -
 layout/html/tests/table/bugs/bug60992.html    |   27 -
 layout/html/tests/table/bugs/bug61042-1.html  |   50 -
 layout/html/tests/table/bugs/bug61042-2.html  |   51 -
 layout/html/tests/table/bugs/bug6184.html     |   21 -
 layout/html/tests/table/bugs/bug625.html      |   15 -
 layout/html/tests/table/bugs/bug6304.html     |  122 -
 layout/html/tests/table/bugs/bug63785.html    |   19 -
 layout/html/tests/table/bugs/bug6404.html     |   40 -
 layout/html/tests/table/bugs/bug641-1.html    |    7 -
 layout/html/tests/table/bugs/bug641-2.html    |    7 -
 layout/html/tests/table/bugs/bug647.html      |   23 -
 layout/html/tests/table/bugs/bug650.html      |   16 -
 layout/html/tests/table/bugs/bug65372.html    |   33 -
 layout/html/tests/table/bugs/bug6674.html     |   26 -
 layout/html/tests/table/bugs/bug67864.html    |   11 -
 layout/html/tests/table/bugs/bug67915-1.html  |  221 -
 layout/html/tests/table/bugs/bug67915-2.html  |    6 -
 layout/html/tests/table/bugs/bug68912.html    |   28 -
 layout/html/tests/table/bugs/bug68998.html    |   34 -
 layout/html/tests/table/bugs/bug69187.html    |   44 -
 layout/html/tests/table/bugs/bug6933.html     |   13 -
 layout/html/tests/table/bugs/bug69382-1.html  |  117 -
 layout/html/tests/table/bugs/bug69382-2.html  |   31 -
 layout/html/tests/table/bugs/bug709.html      |    6 -
 layout/html/tests/table/bugs/bug7112-1.html   |  123 -
 layout/html/tests/table/bugs/bug7112-2.html   |  123 -
 layout/html/tests/table/bugs/bug7113.html     |   27 -
 layout/html/tests/table/bugs/bug7121-1.html   |  109 -
 layout/html/tests/table/bugs/bug7121-2.html   |   15 -
 layout/html/tests/table/bugs/bug72359.xml     |   24 -
 layout/html/tests/table/bugs/bug72393.html    |   46 -
 layout/html/tests/table/bugs/bug7243.html     |   92 -
 layout/html/tests/table/bugs/bug727.html      |   14 -
 layout/html/tests/table/bugs/bug73321.html    |  111 -
 layout/html/tests/table/bugs/bug7342.html     |   68 -
 layout/html/tests/table/bugs/bug73629.html    |   28 -
 layout/html/tests/table/bugs/bug7471.html     |  106 -
 layout/html/tests/table/bugs/bug75250.html    |   11 -
 layout/html/tests/table/bugs/bug7714.html     |   60 -
 layout/html/tests/table/bugs/bug78162.html    |   41 -
 layout/html/tests/table/bugs/bug8032-1.html   |   29 -
 layout/html/tests/table/bugs/bug8032-2.html   |   19 -
 layout/html/tests/table/bugs/bug80762-1.html  |   35 -
 layout/html/tests/table/bugs/bug80762-2.html  |   37 -
 layout/html/tests/table/bugs/bug81934.html    |   35 -
 layout/html/tests/table/bugs/bug82946-1.html  |   31 -
 layout/html/tests/table/bugs/bug82946-2.html  |   53 -
 layout/html/tests/table/bugs/bug8361.html     |    7 -
 layout/html/tests/table/bugs/bug83786.html    |   45 -
 layout/html/tests/table/bugs/bug8381.html     |   76 -
 layout/html/tests/table/bugs/bug8411.css      |   14 -
 layout/html/tests/table/bugs/bug8411.xml      |    7 -
 layout/html/tests/table/bugs/bug8499.html     |   93 -
 layout/html/tests/table/bugs/bug85016.html    |   35 -
 layout/html/tests/table/bugs/bug86220.html    |   16 -
 layout/html/tests/table/bugs/bug86708.html    |   19 -
 layout/html/tests/table/bugs/bug88035-1.html  |   16 -
 layout/html/tests/table/bugs/bug88035-2.html  |   18 -
 layout/html/tests/table/bugs/bug88524.html    |   12 -
 layout/html/tests/table/bugs/bug8858.html     |   36 -
 layout/html/tests/table/bugs/bug89315.html    | 2227 -------
 layout/html/tests/table/bugs/bug8950.html     |  102 -
 layout/html/tests/table/bugs/bug9024.html     |   25 -
 layout/html/tests/table/bugs/bug9072.html     |    7 -
 layout/html/tests/table/bugs/bug91057.html    |  181 -
 layout/html/tests/table/bugs/bug9123-1.html   |   78 -
 layout/html/tests/table/bugs/bug9123-2.html   |   56 -
 layout/html/tests/table/bugs/bug92143.html    |   49 -
 layout/html/tests/table/bugs/bug92647-1.html  |   33 -
 layout/html/tests/table/bugs/bug92647-2.html  |   18 -
 layout/html/tests/table/bugs/bug9271-1.html   |   42 -
 layout/html/tests/table/bugs/bug9271-2.html   |   41 -
 layout/html/tests/table/bugs/bug92868.html    |   41 -
 layout/html/tests/table/bugs/bug92868_1.html  |   27 -
 .../tests/table/bugs/bug92868_1_test1.css     |    2 -
 .../tests/table/bugs/bug92868_1_test2.css     |    3 -
 layout/html/tests/table/bugs/bug93363.html    |   56 -
 layout/html/tests/table/bugs/bug963.html      |   16 -
 layout/html/tests/table/bugs/bug96334.html    |   74 -
 layout/html/tests/table/bugs/bug96343.html    |  369 --
 layout/html/tests/table/bugs/bug965.html      |   50 -
 layout/html/tests/table/bugs/bug97138.html    |  161 -
 layout/html/tests/table/bugs/bug97383.html    |    1 -
 layout/html/tests/table/bugs/bug98196.html    |   15 -
 layout/html/tests/table/bugs/bug9879-1.html   |   63 -
 layout/html/tests/table/bugs/bug9879.html     |   63 -
 layout/html/tests/table/bugs/bug99923.html    |   31 -
 layout/html/tests/table/bugs/bug99948.html    |   33 -
 layout/html/tests/table/bugs/helloWorld.html  |    1 -
 layout/html/tests/table/bugs/rtest.lst        |  494 --
 .../table/collapsing_borders/bug127040.html   |   36 -
 .../table/collapsing_borders/bug41262-1.html  |   49 -
 .../table/collapsing_borders/bug41262-2.html  |  161 -
 .../table/collapsing_borders/bug41262-3.html  |  108 -
 .../table/collapsing_borders/bug41262-4.html  |   26 -
 .../table/collapsing_borders/bug41262-5.html  |   40 -
 .../table/collapsing_borders/bug41262-6.html  |   40 -
 layout/html/tests/table/core/backgrounds.html |  280 -
 layout/html/tests/table/core/bloomberg.html   |  112 -
 layout/html/tests/table/core/borders.html     |   92 -
 layout/html/tests/table/core/box_sizing.html  |   26 -
 layout/html/tests/table/core/captions.html    |   58 -
 layout/html/tests/table/core/captions1.html   |  106 -
 layout/html/tests/table/core/captions2.html   |  103 -
 layout/html/tests/table/core/captions3.html   |  240 -
 .../html/tests/table/core/cell_heights.html   |  112 -
 layout/html/tests/table/core/col_span.html    |   70 -
 layout/html/tests/table/core/col_span2.html   |  616 --
 .../table/core/col_widths_auto_auto.html      |    7 -
 .../table/core/col_widths_auto_autoFix.html   |   39 -
 .../core/col_widths_auto_autoFixPer.html      |   22 -
 .../table/core/col_widths_auto_autoPer.html   |   28 -
 .../tests/table/core/col_widths_auto_fix.html |   74 -
 .../table/core/col_widths_auto_fixPer.html    |   25 -
 .../tests/table/core/col_widths_auto_per.html |   14 -
 .../tests/table/core/col_widths_fix_auto.html |    5 -
 .../table/core/col_widths_fix_autoFix.html    |   48 -
 .../table/core/col_widths_fix_autoFixPer.html |    0
 .../table/core/col_widths_fix_autoPer.html    |   43 -
 .../tests/table/core/col_widths_fix_fix.html  |   47 -
 .../table/core/col_widths_fix_fixPer.html     |   93 -
 .../tests/table/core/col_widths_fix_per.html  |   28 -
 layout/html/tests/table/core/cols1.html       |   26 -
 layout/html/tests/table/core/columns.html     |  120 -
 layout/html/tests/table/core/conflicts.html   |  151 -
 layout/html/tests/table/core/margins.html     |   90 -
 layout/html/tests/table/core/misc.html        |   26 -
 layout/html/tests/table/core/nested1.html     |   82 -
 layout/html/tests/table/core/one_row.html     |  102 -
 layout/html/tests/table/core/row_span.html    |   89 -
 layout/html/tests/table/core/rtest.lst        |   38 -
 layout/html/tests/table/core/standards1.html  |  627 --
 layout/html/tests/table/core/table_frame.html |   52 -
 .../html/tests/table/core/table_heights.html  |   19 -
 layout/html/tests/table/core/table_rules.html |   50 -
 .../html/tests/table/core/table_widths.html   |   29 -
 layout/html/tests/table/dom/appendCells1.html |   46 -
 .../tests/table/dom/appendCellsRebuild1.html  |   68 -
 layout/html/tests/table/dom/appendCol1.html   |   37 -
 layout/html/tests/table/dom/appendCol2.html   |   41 -
 .../html/tests/table/dom/appendColGroup1.html |   48 -
 .../tests/table/dom/appendRowsExpand1.html    |   45 -
 .../tests/table/dom/appendTbodyExpand1.html   |   46 -
 .../tests/table/dom/deleteCellsRebuild1.html  |   37 -
 .../tests/table/dom/deleteCellsShrink1.html   |   31 -
 .../tests/table/dom/deleteCellsShrink2.html   |   37 -
 layout/html/tests/table/dom/deleteCol1.html   |   38 -
 layout/html/tests/table/dom/deleteCol2.html   |   38 -
 layout/html/tests/table/dom/deleteCol3.html   |   38 -
 .../html/tests/table/dom/deleteColGroup1.html |   37 -
 .../html/tests/table/dom/deleteColGroup2.html |   37 -
 .../tests/table/dom/deleteRowsRebuild1.html   |   50 -
 .../tests/table/dom/deleteRowsShrink1.html    |   50 -
 .../tests/table/dom/deleteTbodyExpand1.html   |   81 -
 .../tests/table/dom/deleteTbodyRebuild1.html  |   53 -
 .../tests/table/dom/insertCellsExpand1.html   |   41 -
 .../tests/table/dom/insertCellsExpand2.html   |   44 -
 .../tests/table/dom/insertCellsRebuild1.html  |   70 -
 .../tests/table/dom/insertCellsRebuild2.html  |   44 -
 .../tests/table/dom/insertColGroups1.html     |   45 -
 .../tests/table/dom/insertColGroups2.html     |   51 -
 layout/html/tests/table/dom/insertCols1.html  |   34 -
 layout/html/tests/table/dom/insertCols2.html  |   35 -
 layout/html/tests/table/dom/insertCols3.html  |   37 -
 layout/html/tests/table/dom/insertCols4.html  |   38 -
 layout/html/tests/table/dom/insertCols5.html  |   38 -
 .../tests/table/dom/insertRowsExpand1.html    |   39 -
 .../tests/table/dom/insertRowsRebuild1.html   |   39 -
 .../tests/table/dom/insertTbodyExpand1.html   |   48 -
 .../tests/table/dom/insertTbodyRebuild1.html  |   48 -
 layout/html/tests/table/dom/rtest.lst         |   35 -
 layout/html/tests/table/dom/tableDom.html     |  164 -
 layout/html/tests/table/dom/tableDom.js       |  161 -
 layout/html/tests/table/images/0.gif          |  Bin 54 -> 0 bytes
 .../tests/table/images/002-bizcard-small.gif  |  Bin 2629 -> 0 bytes
 layout/html/tests/table/images/1.gif          |  Bin 11508 -> 0 bytes
 layout/html/tests/table/images/1.jpg          |  Bin 754 -> 0 bytes
 layout/html/tests/table/images/10empty.jpg    |  Bin 938 -> 0 bytes
 layout/html/tests/table/images/125_ncbug.gif  |  Bin 986 -> 0 bytes
 layout/html/tests/table/images/15.gif         |  Bin 50 -> 0 bytes
 layout/html/tests/table/images/160x160.JPG    |  Bin 5346 -> 0 bytes
 layout/html/tests/table/images/160x40.JPG     |  Bin 3875 -> 0 bytes
 layout/html/tests/table/images/160x80.JPG     |  Bin 3826 -> 0 bytes
 layout/html/tests/table/images/1ptrans.gif    |  Bin 44 -> 0 bytes
 layout/html/tests/table/images/2.gif          |  Bin 10645 -> 0 bytes
 layout/html/tests/table/images/2.jpg          |  Bin 791 -> 0 bytes
 layout/html/tests/table/images/24pipe.7.jpg   |  Bin 15457 -> 0 bytes
 layout/html/tests/table/images/40x80.JPG      |  Bin 2173 -> 0 bytes
 layout/html/tests/table/images/5.jpg          |  Bin 766 -> 0 bytes
 layout/html/tests/table/images/6.jpg          |  Bin 765 -> 0 bytes
 layout/html/tests/table/images/9empty.jpg     |  Bin 912 -> 0 bytes
 layout/html/tests/table/images/Ad-1.GIF       |  Bin 11790 -> 0 bytes
 .../table/images/Ad169638St1Sz1Sq1Id2.gif     |  Bin 9353 -> 0 bytes
 .../html/tests/table/images/MBIAuto120x90.gif |  Bin 5304 -> 0 bytes
 layout/html/tests/table/images/N.gif          |  Bin 6162 -> 0 bytes
 layout/html/tests/table/images/TopRule.gif    |  Bin 139 -> 0 bytes
 layout/html/tests/table/images/abc.gif        |  Bin 606 -> 0 bytes
 .../html/tests/table/images/aboutHeader.gif   |   99 -
 layout/html/tests/table/images/ad_info.gif    |  Bin 291 -> 0 bytes
 .../tests/table/images/adforce_imgis_com.html |  Bin 125 -> 0 bytes
 layout/html/tests/table/images/alpha-2.jpg    |  Bin 3870 -> 0 bytes
 .../html/tests/table/images/amazon-logo.gif   |  Bin 1150 -> 0 bytes
 layout/html/tests/table/images/ananova.gif    |  Bin 459 -> 0 bytes
 layout/html/tests/table/images/animated.gif   |  Bin 21710 -> 0 bytes
 layout/html/tests/table/images/ant.jpg        |  Bin 8474 -> 0 bytes
 layout/html/tests/table/images/b_pre2.gif     |  Bin 1231 -> 0 bytes
 layout/html/tests/table/images/b_sui.gif      |  Bin 281 -> 0 bytes
 layout/html/tests/table/images/b_sui2.gif     |  Bin 1296 -> 0 bytes
 layout/html/tests/table/images/banner.gif     |  Bin 5520 -> 0 bytes
 .../tests/table/images/banner_bizinternet.gif |  Bin 1900 -> 0 bytes
 layout/html/tests/table/images/bar.gif        |  Bin 265 -> 0 bytes
 .../tests/table/images/bar_yellow_left.gif    |  Bin 699 -> 0 bytes
 .../tests/table/images/bar_yellow_right.gif   |  Bin 208 -> 0 bytes
 layout/html/tests/table/images/bg.jpg         |  Bin 9407 -> 0 bytes
 .../html/tests/table/images/bkgd_yellow.gif   |  495 --
 layout/html/tests/table/images/blue_1x1.gif   |  Bin 35 -> 0 bytes
 layout/html/tests/table/images/bnr_all.gif    |  Bin 7976 -> 0 bytes
 layout/html/tests/table/images/bnum.gif       |  Bin 3178 -> 0 bytes
 layout/html/tests/table/images/book1.jpg      |  Bin 2747 -> 0 bytes
 layout/html/tests/table/images/book2.jpg      |  Bin 2556 -> 0 bytes
 layout/html/tests/table/images/box1.gif       |  Bin 821 -> 0 bytes
 layout/html/tests/table/images/box2.gif       |  Bin 819 -> 0 bytes
 layout/html/tests/table/images/box3.gif       |  Bin 819 -> 0 bytes
 .../images/breaking_weather_314_anim.gif      |  Bin 574 -> 0 bytes
 .../html/tests/table/images/browsecathead.gif |  Bin 678 -> 0 bytes
 layout/html/tests/table/images/bug106024.jpg  |  Bin 13375 -> 0 bytes
 layout/html/tests/table/images/bug120107.cgi  |  Bin 11055 -> 0 bytes
 layout/html/tests/table/images/bullet.gif     |  Bin 64 -> 0 bytes
 .../html/tests/table/images/button_go_nav.gif |  Bin 98 -> 0 bytes
 layout/html/tests/table/images/c-tl.gif       |  Bin 872 -> 0 bytes
 layout/html/tests/table/images/c-tr.gif       |  Bin 872 -> 0 bytes
 layout/html/tests/table/images/canoe.gif      |  Bin 241 -> 0 bytes
 layout/html/tests/table/images/clearpixel.gif |  Bin 43 -> 0 bytes
 layout/html/tests/table/images/cnn.gif        |  Bin 1634 -> 0 bytes
 layout/html/tests/table/images/control.gif    |  Bin 1245 -> 0 bytes
 layout/html/tests/table/images/corner.JPG     |  Bin 4568 -> 0 bytes
 layout/html/tests/table/images/couverture.jpg |  Bin 6634 -> 0 bytes
 layout/html/tests/table/images/curve.gif      |  Bin 139 -> 0 bytes
 layout/html/tests/table/images/detach.gif     |  Bin 96 -> 0 bytes
 layout/html/tests/table/images/dot.gif        |  Bin 824 -> 0 bytes
 layout/html/tests/table/images/dot_black.gif  |  Bin 34 -> 0 bytes
 layout/html/tests/table/images/edge.gif       |  Bin 3692 -> 0 bytes
 layout/html/tests/table/images/edit2.gif      |  Bin 117 -> 0 bytes
 layout/html/tests/table/images/espn.gif       |  Bin 542 -> 0 bytes
 layout/html/tests/table/images/ex22.gif       |  Bin 268 -> 0 bytes
 layout/html/tests/table/images/ex23.gif       |  Bin 238 -> 0 bytes
 layout/html/tests/table/images/ex24.gif       |  Bin 911 -> 0 bytes
 layout/html/tests/table/images/ex25.gif       |  Bin 739 -> 0 bytes
 layout/html/tests/table/images/ex26.gif       |  Bin 416 -> 0 bytes
 layout/html/tests/table/images/ex27.gif       |  Bin 869 -> 0 bytes
 layout/html/tests/table/images/ex29.gif       |  Bin 684 -> 0 bytes
 layout/html/tests/table/images/ex3.gif        |  Bin 156 -> 0 bytes
 layout/html/tests/table/images/ex30.gif       |  Bin 951 -> 0 bytes
 layout/html/tests/table/images/ex31.gif       |  Bin 1763 -> 0 bytes
 layout/html/tests/table/images/ex34.gif       |  Bin 1135 -> 0 bytes
 layout/html/tests/table/images/ex41.gif       |  Bin 522 -> 0 bytes
 layout/html/tests/table/images/ex43.gif       |  Bin 1476 -> 0 bytes
 layout/html/tests/table/images/ex44.gif       |  Bin 467 -> 0 bytes
 layout/html/tests/table/images/ex5.gif        |  Bin 144 -> 0 bytes
 layout/html/tests/table/images/ex51.gif       |  Bin 1072 -> 0 bytes
 layout/html/tests/table/images/ex52.gif       |  Bin 1039 -> 0 bytes
 layout/html/tests/table/images/ex53.gif       |  Bin 1603 -> 0 bytes
 layout/html/tests/table/images/ex54.gif       |  Bin 2003 -> 0 bytes
 layout/html/tests/table/images/excite.gif     |  Bin 454 -> 0 bytes
 .../html/tests/table/images/fall_167x105.jpg  |  Bin 5633 -> 0 bytes
 layout/html/tests/table/images/g_back.gif     |  Bin 99 -> 0 bytes
 layout/html/tests/table/images/go.gif         |  Bin 162 -> 0 bytes
 .../html/tests/table/images/go_earthlink.gif  |  Bin 162 -> 0 bytes
 layout/html/tests/table/images/google.gif     |  Bin 1593 -> 0 bytes
 layout/html/tests/table/images/gray.gif       |  Bin 77 -> 0 bytes
 layout/html/tests/table/images/gray2.gif      |  Bin 41 -> 0 bytes
 .../html/tests/table/images/header-bolt.gif   |  Bin 1860 -> 0 bytes
 .../tests/table/images/header-getwinamp.gif   |  Bin 1773 -> 0 bytes
 .../table/images/header-highfidelity.gif      |  Bin 2023 -> 0 bytes
 .../tests/table/images/header-logotext.gif    |  Bin 1947 -> 0 bytes
 .../tests/table/images/home_beige_top.gif     |  Bin 814 -> 0 bytes
 layout/html/tests/table/images/horiz-tall.gif |  Bin 45 -> 0 bytes
 .../html/tests/table/images/howstuffworks.gif |  Bin 905 -> 0 bytes
 .../tests/table/images/icom-logo-micro.gif    |  Bin 1828 -> 0 bytes
 .../tests/table/images/icon-unsubscribe.gif   |  Bin 180 -> 0 bytes
 layout/html/tests/table/images/iconchart.gif  |  Bin 98 -> 0 bytes
 layout/html/tests/table/images/join.gif       |  Bin 996 -> 0 bytes
 layout/html/tests/table/images/join_eln.gif   |  Bin 2623 -> 0 bytes
 layout/html/tests/table/images/l_logo.gif     |  Bin 5642 -> 0 bytes
 layout/html/tests/table/images/latimes.gif    |  Bin 598 -> 0 bytes
 .../tests/table/images/left_menu_bottom2.gif  |  Bin 240 -> 0 bytes
 layout/html/tests/table/images/leftbit.jpg    |  Bin 1053 -> 0 bytes
 layout/html/tests/table/images/lime.gif       |  Bin 80 -> 0 bytes
 layout/html/tests/table/images/ll-tall.gif    |  Bin 60 -> 0 bytes
 layout/html/tests/table/images/logo.gif       |  Bin 1095 -> 0 bytes
 layout/html/tests/table/images/logo2.gif      |  Bin 4023 -> 0 bytes
 layout/html/tests/table/images/logosummer.gif |  Bin 4880 -> 0 bytes
 layout/html/tests/table/images/lr-tall.gif    |  Bin 59 -> 0 bytes
 .../table/images/main-horizontal-scroll.gif   |   86 -
 .../tests/table/images/mozilla-banner.gif     |  Bin 4518 -> 0 bytes
 layout/html/tests/table/images/mslogo.gif     |  Bin 628 -> 0 bytes
 layout/html/tests/table/images/my16.gif       |  Bin 417 -> 0 bytes
 .../tests/table/images/nav_buy_checklist.gif  |  Bin 786 -> 0 bytes
 .../table/images/nav_top_left_frag_2.gif      |  Bin 518 -> 0 bytes
 .../html/tests/table/images/navtop_buy_pr.gif |  Bin 1718 -> 0 bytes
 .../tests/table/images/navtop_devzone.gif     |  Bin 432 -> 0 bytes
 .../tests/table/images/navtop_products.gif    |  Bin 571 -> 0 bytes
 layout/html/tests/table/images/next.gif       |  Bin 9842 -> 0 bytes
 .../table/images/ns_netcenter_bar_new.gif     |  Bin 3560 -> 0 bytes
 .../html/tests/table/images/orange-arrow.gif  |  Bin 58 -> 0 bytes
 layout/html/tests/table/images/pc.gif         |  Bin 42 -> 0 bytes
 layout/html/tests/table/images/pfeil1.gif     |  Bin 858 -> 0 bytes
 layout/html/tests/table/images/pfeil2.gif     |  Bin 857 -> 0 bytes
 layout/html/tests/table/images/pikajumpr.gif  |  Bin 16989 -> 0 bytes
 layout/html/tests/table/images/pixel_none.gif |  Bin 43 -> 0 bytes
 layout/html/tests/table/images/pxl_df9f3b.gif |  Bin 35 -> 0 bytes
 layout/html/tests/table/images/pxl_white.gif  |  Bin 35 -> 0 bytes
 layout/html/tests/table/images/raccoon21.jpg  |  Bin 104416 -> 0 bytes
 layout/html/tests/table/images/raf_header.gif |  Bin 4816 -> 0 bytes
 layout/html/tests/table/images/rainbowh.gif   |  Bin 1197 -> 0 bytes
 layout/html/tests/table/images/rainbowhb.gif  |  Bin 1197 -> 0 bytes
 layout/html/tests/table/images/rainbowv.gif   |  Bin 1622 -> 0 bytes
 layout/html/tests/table/images/rainbowvb.gif  |  Bin 1622 -> 0 bytes
 layout/html/tests/table/images/raptor.jpg     |  Bin 49629 -> 0 bytes
 layout/html/tests/table/images/rclogo460.gif  |  Bin 7933 -> 0 bytes
 layout/html/tests/table/images/rle.cgi        |  Bin 258 -> 0 bytes
 .../html/tests/table/images/rnsite_logo.gif   |  Bin 1088 -> 0 bytes
 layout/html/tests/table/images/rock_gra.gif   |  Bin 23780 -> 0 bytes
 layout/html/tests/table/images/ruler.gif      |  Bin 498 -> 0 bytes
 layout/html/tests/table/images/sbs.gif        |  Bin 149 -> 0 bytes
 layout/html/tests/table/images/sell_side.gif  |  Bin 77 -> 0 bytes
 .../html/tests/table/images/sell_text1a.gif   |  Bin 1920 -> 0 bytes
 layout/html/tests/table/images/sell_text2.gif |  Bin 2837 -> 0 bytes
 layout/html/tests/table/images/sell_text3.gif |  Bin 3624 -> 0 bytes
 layout/html/tests/table/images/sfgate.gif     |  Bin 640 -> 0 bytes
 .../tests/table/images/showattachment.cgi     |  Bin 220 -> 0 bytes
 layout/html/tests/table/images/slc.gif        |  Bin 139 -> 0 bytes
 layout/html/tests/table/images/slr.gif        |  Bin 153 -> 0 bytes
 .../html/tests/table/images/smblue_paper.gif  |  Bin 6585 -> 0 bytes
 layout/html/tests/table/images/spacer.gif     |  Bin 63 -> 0 bytes
 layout/html/tests/table/images/srs.gif        |  Bin 147 -> 0 bytes
 layout/html/tests/table/images/star.gif       |  Bin 227 -> 0 bytes
 layout/html/tests/table/images/sun.gif        |  Bin 732 -> 0 bytes
 layout/html/tests/table/images/support.gif    |  Bin 887 -> 0 bytes
 layout/html/tests/table/images/tab_left.gif   |  Bin 120 -> 0 bytes
 layout/html/tests/table/images/tab_right.gif  |  Bin 114 -> 0 bytes
 .../tests/table/images/take5_change468.gif    |  Bin 11602 -> 0 bytes
 .../table/images/tbl-border-conflict.gif      |  Bin 2061 -> 0 bytes
 layout/html/tests/table/images/test77.jpg     |  Bin 2149 -> 0 bytes
 layout/html/tests/table/images/the_web.gif    |  Bin 116 -> 0 bytes
 layout/html/tests/table/images/title.gif      |  Bin 1013 -> 0 bytes
 .../tests/table/images/topnavfeatures.gif     |  Bin 851 -> 0 bytes
 .../html/tests/table/images/topnavlogin.gif   |  Bin 197 -> 0 bytes
 .../tests/table/images/topnavregister2.gif    |  Bin 1010 -> 0 bytes
 layout/html/tests/table/images/tos1.gif       |  Bin 121 -> 0 bytes
 layout/html/tests/table/images/tos3.gif       |  Bin 139 -> 0 bytes
 layout/html/tests/table/images/tos4.gif       |  Bin 138 -> 0 bytes
 layout/html/tests/table/images/tos9.gif       |  Bin 144 -> 0 bytes
 layout/html/tests/table/images/tosdot.gif     |  Bin 72 -> 0 bytes
 layout/html/tests/table/images/trans.gif      |  Bin 43 -> 0 bytes
 layout/html/tests/table/images/transpix.gif   |  Bin 43 -> 0 bytes
 layout/html/tests/table/images/trout.gif      |  Bin 195 -> 0 bytes
 layout/html/tests/table/images/usatoday.gif   |  Bin 997 -> 0 bytes
 .../html/tests/table/images/valid-html401.png |  Bin 2948 -> 0 bytes
 layout/html/tests/table/images/vh40           |  Bin 906 -> 0 bytes
 layout/html/tests/table/images/w.gif          |  Bin 85 -> 0 bytes
 .../tests/table/images/washingtonpost.gif     |  Bin 490 -> 0 bytes
 .../html/tests/table/images/wiz438sidebar.gif |  Bin 2447 -> 0 bytes
 layout/html/tests/table/images/wsp600bot.gif  |  Bin 4801 -> 0 bytes
 layout/html/tests/table/images/x.gif          |  Bin 96 -> 0 bytes
 layout/html/tests/table/images/yahoo.gif      |  Bin 430 -> 0 bytes
 .../interactive/TableIncrementalReflow.html   |  352 -
 .../tests/table/interactive/bug105268.html    |   24 -
 .../tests/table/interactive/bug106024.html    |   13 -
 .../tests/table/interactive/bug107857.html    |   19 -
 .../tests/table/interactive/bug110523.html    |   37 -
 .../tests/table/interactive/bug111872.html    |    8 -
 .../html/tests/table/interactive/bug1128.html |   20 -
 .../tests/table/interactive/bug113659.html    |   17 -
 .../tests/table/interactive/bug114706.html    |   13 -
 .../tests/table/interactive/bug11479.html     |   30 -
 .../tests/table/interactive/bug127022.html    |   15 -
 .../tests/table/interactive/bug127471.html    |   45 -
 .../html/tests/table/interactive/bug1295.html |   50 -
 .../tests/table/interactive/bug130550.html    |   15 -
 .../tests/table/interactive/bug135112.html    |   74 -
 .../tests/table/interactive/bug138292.html    |   21 -
 .../interactive/bug144024-1_printing.html     |   12 -
 .../interactive/bug144024-2_printing.html     |   49 -
 .../interactive/bug144024-3_printing.html     |   59 -
 .../tests/table/interactive/bug151230.html    |   15 -
 .../tests/table/interactive/bug175455-1.html  |   19 -
 .../tests/table/interactive/bug175455-2.html  |   33 -
 .../tests/table/interactive/bug175455-3.html  |   16 -
 .../tests/table/interactive/bug19535.html     |   55 -
 .../tests/table/interactive/bug27124.html     |   30 -
 .../tests/table/interactive/bug39209.html     |   25 -
 .../tests/table/interactive/bug40721.html     |   21 -
 .../tests/table/interactive/bug42643.html     |   66 -
 .../tests/table/interactive/bug43732.html     |   17 -
 .../tests/table/interactive/bug44148.html     |   71 -
 .../tests/table/interactive/bug47252.html     |  119 -
 .../tests/table/interactive/bug52531.html     |  103 -
 .../tests/table/interactive/bug52598.html     |   17 -
 .../tests/table/interactive/bug66804.html     |   22 -
 .../tests/table/interactive/bug72181.html     |   27 -
 .../html/tests/table/interactive/bug7522.html |   35 -
 .../tests/table/interactive/bug77982.html     |    5 -
 .../tests/table/interactive/bug80817.html     |   32 -
 .../html/tests/table/interactive/bug8398.html |   56 -
 .../tests/table/interactive/bug86314.html     |   17 -
 .../html/tests/table/interactive/bug8950.html |  102 -
 .../html/tests/table/interactive/bug9043.html |   40 -
 .../tests/table/interactive/bug90960.html     |  115 -
 .../tests/table/interactive/bug91443.html     |   64 -
 .../tests/table/interactive/bug91934.html     |   61 -
 .../tests/table/interactive/bug92647.html     |   20 -
 .../tests/table/interactive/bug94341.html     |  103 -
 .../marvin/backgr_border-table-cell.html      |  127 -
 .../backgr_border-table-column-group.html     |  129 -
 .../marvin/backgr_border-table-column.html    |  133 -
 .../marvin/backgr_border-table-quirks.html    |  123 -
 .../marvin/backgr_border-table-row-group.html |  130 -
 .../table/marvin/backgr_border-table-row.html |  132 -
 .../table/marvin/backgr_border-table.html     |  123 -
 .../tests/table/marvin/backgr_fixed-bg.html   |  154 -
 .../html/tests/table/marvin/backgr_index.html |   77 -
 .../table/marvin/backgr_layers-hide.html      |  129 -
 .../table/marvin/backgr_layers-opacity.html   |  130 -
 .../table/marvin/backgr_layers-show.html      |  154 -
 .../marvin/backgr_position-table-cell.html    |  127 -
 .../backgr_position-table-column-group.html   |  126 -
 .../marvin/backgr_position-table-column.html  |  129 -
 .../backgr_position-table-row-group.html      |  128 -
 .../marvin/backgr_position-table-row.html     |  135 -
 .../table/marvin/backgr_position-table.html   |  124 -
 .../marvin/backgr_simple-table-cell.html      |  129 -
 .../backgr_simple-table-column-group.html     |  136 -
 .../marvin/backgr_simple-table-column.html    |  134 -
 .../marvin/backgr_simple-table-row-group.html |  134 -
 .../table/marvin/backgr_simple-table-row.html |  134 -
 .../table/marvin/backgr_simple-table.html     |  129 -
 layout/html/tests/table/marvin/body_col.html  |   82 -
 .../html/tests/table/marvin/body_tbody.html   |   98 -
 .../html/tests/table/marvin/body_tfoot.html   |   99 -
 .../html/tests/table/marvin/body_thead.html   |   99 -
 layout/html/tests/table/marvin/col_span.html  |   85 -
 .../table/marvin/colgroup_align_center.html   |  183 -
 .../table/marvin/colgroup_align_justify.html  |  183 -
 .../table/marvin/colgroup_align_left.html     |  183 -
 .../table/marvin/colgroup_align_right.html    |  183 -
 .../tests/table/marvin/colgroup_span.html     |  179 -
 .../marvin/colgroup_valign_baseline.html      |  195 -
 .../table/marvin/colgroup_valign_bottom.html  |  195 -
 .../table/marvin/colgroup_valign_middle.html  |  195 -
 .../table/marvin/colgroup_valign_top.html     |  195 -
 .../table/marvin/colgroup_width_pct.html      |  179 -
 .../tests/table/marvin/colgroup_width_px.html |  179 -
 layout/html/tests/table/marvin/common.css     |   43 -
 layout/html/tests/table/marvin/rtest.lst      |  334 -
 .../tests/table/marvin/table_frame_above.html |   94 -
 .../tests/table/marvin/table_frame_below.html |   94 -
 .../table/marvin/table_frame_border.html      |   94 -
 .../tests/table/marvin/table_frame_box.html   |   94 -
 .../table/marvin/table_frame_hsides.html      |   94 -
 .../tests/table/marvin/table_frame_lhs.html   |   94 -
 .../tests/table/marvin/table_frame_rhs.html   |   94 -
 .../tests/table/marvin/table_frame_void.html  |   94 -
 .../table/marvin/table_frame_vsides.html      |   94 -
 .../table/marvin/table_overflow_caption.html  |   74 -
 .../marvin/table_overflow_caption_bottom.html |   74 -
 .../marvin/table_overflow_caption_hidden.html |   74 -
 .../table_overflow_caption_hidden_table.html  |   75 -
 .../marvin/table_overflow_caption_left.html   |   74 -
 .../marvin/table_overflow_caption_right.html  |   74 -
 .../marvin/table_overflow_caption_top.html    |   74 -
 .../marvin/table_overflow_dirty_reflow.html   |   89 -
 .../table_overflow_dirty_reflow_row.html      |   92 -
 .../table_overflow_dirty_reflow_table.html    |   99 -
 .../table_overflow_dirty_reflow_tbody.html    |   95 -
 .../marvin/table_overflow_hidden_table.html   |   56 -
 .../marvin/table_overflow_hidden_tbody.html   |   56 -
 .../marvin/table_overflow_hidden_td.html      |   56 -
 .../marvin/table_overflow_hidden_tr.html      |   56 -
 .../table_overflow_style_reflow_cell.html     |   93 -
 ...le_overflow_style_reflow_cell_sibling.html |   93 -
 .../table_overflow_style_reflow_row.html      |   93 -
 ...ble_overflow_style_reflow_row_sibling.html |   96 -
 .../table_overflow_style_reflow_table.html    |   93 -
 ...e_overflow_style_reflow_table_caption.html |   93 -
 .../table_overflow_style_reflow_tbody.html    |   95 -
 ...e_overflow_style_reflow_tbody_sibling.html |   99 -
 .../marvin/table_overflow_td_align_right.html |   75 -
 .../table_overflow_td_dynamic_activate.html   |   83 -
 .../table_overflow_td_dynamic_deactivate.html |   83 -
 .../table_overflow_td_valign_bottom.html      |   75 -
 .../table_overflow_td_valign_middle.html      |   75 -
 .../marvin/table_overflow_td_valign_top.html  |   75 -
 .../table/marvin/table_row_align_center.html  |  103 -
 .../table/marvin/table_row_align_left.html    |  103 -
 .../table/marvin/table_row_align_right.html   |  103 -
 .../tests/table/marvin/table_rules_all.html   |   94 -
 .../tests/table/marvin/table_rules_cols.html  |   94 -
 .../table/marvin/table_rules_groups.html      |   99 -
 .../tests/table/marvin/table_rules_none.html  |   94 -
 .../tests/table/marvin/table_rules_rows.html  |   94 -
 .../table/marvin/tables_align_center.html     |   99 -
 .../tests/table/marvin/tables_align_left.html |   99 -
 .../table/marvin/tables_align_right.html      |   67 -
 .../table/marvin/tables_bgcolor_aqua.html     |  111 -
 .../table/marvin/tables_bgcolor_aqua_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_black.html    |  111 -
 .../marvin/tables_bgcolor_black_rgb.html      |  111 -
 .../table/marvin/tables_bgcolor_blue.html     |  111 -
 .../table/marvin/tables_bgcolor_blue_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_fuchsia.html  |  111 -
 .../marvin/tables_bgcolor_fuchsia_rgb.html    |  111 -
 .../table/marvin/tables_bgcolor_gray.html     |  111 -
 .../table/marvin/tables_bgcolor_gray_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_green.html    |  111 -
 .../marvin/tables_bgcolor_green_rgb.html      |  111 -
 .../table/marvin/tables_bgcolor_lime.html     |  111 -
 .../table/marvin/tables_bgcolor_lime_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_maroon.html   |  111 -
 .../marvin/tables_bgcolor_maroon_rgb.html     |  111 -
 .../table/marvin/tables_bgcolor_navy.html     |  111 -
 .../table/marvin/tables_bgcolor_navy_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_olive.html    |  111 -
 .../marvin/tables_bgcolor_olive_rgb.html      |  111 -
 .../table/marvin/tables_bgcolor_purple.html   |  111 -
 .../marvin/tables_bgcolor_purple_rgb.html     |  111 -
 .../table/marvin/tables_bgcolor_red.html      |  111 -
 .../table/marvin/tables_bgcolor_red_rgb.html  |  111 -
 .../table/marvin/tables_bgcolor_silver.html   |  111 -
 .../marvin/tables_bgcolor_silver_rgb.html     |  111 -
 .../table/marvin/tables_bgcolor_teal.html     |  111 -
 .../table/marvin/tables_bgcolor_teal_rgb.html |  111 -
 .../table/marvin/tables_bgcolor_white.html    |  111 -
 .../marvin/tables_bgcolor_white_rgb.html      |  111 -
 .../table/marvin/tables_bgcolor_yellow.html   |  111 -
 .../marvin/tables_bgcolor_yellow_rgb.html     |  111 -
 .../tests/table/marvin/tables_border_0.html   |   99 -
 .../tests/table/marvin/tables_border_1.html   |   99 -
 .../tests/table/marvin/tables_border_2.html   |   99 -
 .../tests/table/marvin/tables_border_3.html   |   99 -
 .../marvin/tables_caption_align_bot.html      |  115 -
 .../marvin/tables_caption_align_left.html     |  139 -
 .../marvin/tables_caption_align_right.html    |  139 -
 .../marvin/tables_caption_align_top.html      |  119 -
 .../table/marvin/tables_cellpadding.html      |  139 -
 .../table/marvin/tables_cellpadding_pct.html  |  137 -
 .../table/marvin/tables_cellspacing.html      |  135 -
 .../table/marvin/tables_cellspacing_pct.html  |  137 -
 .../html/tests/table/marvin/tables_class.html |   95 -
 .../tests/table/marvin/tables_default.html    |   99 -
 layout/html/tests/table/marvin/tables_id.html |  113 -
 .../tests/table/marvin/tables_onclick.html    |   95 -
 .../tests/table/marvin/tables_ondblclick.html |   95 -
 .../tests/table/marvin/tables_onkeydown.html  |   95 -
 .../tests/table/marvin/tables_onkeypress.html |   95 -
 .../tests/table/marvin/tables_onkeyup.html    |   95 -
 .../table/marvin/tables_onmousedown.html      |   95 -
 .../table/marvin/tables_onmousemove.html      |   95 -
 .../tests/table/marvin/tables_onmouseout.html |   95 -
 .../table/marvin/tables_onmouseover.html      |   95 -
 .../tests/table/marvin/tables_onmouseup.html  |   95 -
 .../table/marvin/tables_row_th_nowrap.html    |   93 -
 .../html/tests/table/marvin/tables_style.html |   91 -
 .../table/marvin/tables_td_align_center.html  |   63 -
 .../table/marvin/tables_td_align_left.html    |   63 -
 .../table/marvin/tables_td_align_right.html   |   63 -
 .../tests/table/marvin/tables_td_colspan.html |   69 -
 .../tests/table/marvin/tables_td_height.html  |   63 -
 .../tests/table/marvin/tables_td_nowrap.html  |   64 -
 .../tests/table/marvin/tables_td_rowspan.html |   65 -
 .../tests/table/marvin/tables_td_width.html   |   73 -
 .../table/marvin/tables_th_align_center.html  |   63 -
 .../table/marvin/tables_th_align_left.html    |   63 -
 .../table/marvin/tables_th_align_right.html   |   63 -
 .../tests/table/marvin/tables_th_colspan.html |   69 -
 .../tests/table/marvin/tables_th_height.html  |   63 -
 .../tests/table/marvin/tables_th_rowspan.html |   65 -
 .../tests/table/marvin/tables_th_width.html   |   73 -
 .../table/marvin/tables_width_percent.html    |  131 -
 .../tests/table/marvin/tables_width_px.html   |  129 -
 .../table/marvin/tbody_align_center.html      |  108 -
 .../tests/table/marvin/tbody_align_char.html  |  126 -
 .../table/marvin/tbody_align_justify.html     |  108 -
 .../tests/table/marvin/tbody_align_left.html  |  108 -
 .../tests/table/marvin/tbody_align_right.html |  108 -
 .../html/tests/table/marvin/tbody_char.html   |  126 -
 .../table/marvin/tbody_valign_baseline.html   |  114 -
 .../table/marvin/tbody_valign_bottom.html     |  114 -
 .../table/marvin/tbody_valign_middle.html     |  114 -
 .../tests/table/marvin/tbody_valign_top.html  |  114 -
 .../table/marvin/td_valign_baseline.html      |  103 -
 .../tests/table/marvin/td_valign_bottom.html  |  103 -
 .../tests/table/marvin/td_valign_middle.html  |  103 -
 .../tests/table/marvin/td_valign_top.html     |  103 -
 .../table/marvin/tfoot_align_center.html      |  108 -
 .../tests/table/marvin/tfoot_align_char.html  |  126 -
 .../table/marvin/tfoot_align_justify.html     |  108 -
 .../tests/table/marvin/tfoot_align_left.html  |  108 -
 .../tests/table/marvin/tfoot_align_right.html |  108 -
 .../html/tests/table/marvin/tfoot_char.html   |  126 -
 .../table/marvin/tfoot_valign_baseline.html   |  114 -
 .../table/marvin/tfoot_valign_bottom.html     |  114 -
 .../table/marvin/tfoot_valign_middle.html     |  114 -
 .../tests/table/marvin/tfoot_valign_top.html  |  114 -
 .../table/marvin/th_valign_baseline.html      |  103 -
 .../tests/table/marvin/th_valign_bottom.html  |  103 -
 .../tests/table/marvin/th_valign_middle.html  |  103 -
 .../tests/table/marvin/th_valign_top.html     |  103 -
 .../table/marvin/thead_align_center.html      |  108 -
 .../tests/table/marvin/thead_align_char.html  |  126 -
 .../table/marvin/thead_align_justify.html     |  108 -
 .../tests/table/marvin/thead_align_left.html  |  108 -
 .../tests/table/marvin/thead_align_right.html |  108 -
 .../html/tests/table/marvin/thead_char.html   |  126 -
 .../table/marvin/thead_valign_baseline.html   |  106 -
 .../table/marvin/thead_valign_bottom.html     |  106 -
 .../table/marvin/thead_valign_middle.html     |  106 -
 .../tests/table/marvin/thead_valign_top.html  |  106 -
 .../table/marvin/tr_bgcolor_aqua_rgb.html     |  111 -
 .../tests/table/marvin/tr_bgcolor_black.html  |  111 -
 .../table/marvin/tr_bgcolor_black_rgb.html    |  111 -
 .../tests/table/marvin/tr_bgcolor_blue.html   |  111 -
 .../table/marvin/tr_bgcolor_blue_rgb.html     |  111 -
 .../table/marvin/tr_bgcolor_fuchsia.html      |  111 -
 .../table/marvin/tr_bgcolor_fuchsia_rgb.html  |  111 -
 .../tests/table/marvin/tr_bgcolor_gray.html   |  111 -
 .../table/marvin/tr_bgcolor_gray_rgb.html     |  111 -
 .../tests/table/marvin/tr_bgcolor_green.html  |  111 -
 .../table/marvin/tr_bgcolor_green_rgb.html    |  111 -
 .../tests/table/marvin/tr_bgcolor_lime.html   |  111 -
 .../table/marvin/tr_bgcolor_lime_rgb.html     |  111 -
 .../tests/table/marvin/tr_bgcolor_maroon.html |  111 -
 .../table/marvin/tr_bgcolor_maroon_rgb.html   |  111 -
 .../tests/table/marvin/tr_bgcolor_navy.html   |  111 -
 .../table/marvin/tr_bgcolor_navy_rgb.html     |  111 -
 .../tests/table/marvin/tr_bgcolor_olive.html  |  111 -
 .../table/marvin/tr_bgcolor_olive_rgb.html    |  111 -
 .../tests/table/marvin/tr_bgcolor_purple.html |  111 -
 .../table/marvin/tr_bgcolor_purple_rgb.html   |  111 -
 .../tests/table/marvin/tr_bgcolor_red.html    |  111 -
 .../table/marvin/tr_bgcolor_red_rgb.html      |  111 -
 .../tests/table/marvin/tr_bgcolor_silver.html |  111 -
 .../table/marvin/tr_bgcolor_silver_rgb.html   |  111 -
 .../tests/table/marvin/tr_bgcolor_teal.html   |  111 -
 .../table/marvin/tr_bgcolor_teal_rgb.html     |  111 -
 .../tests/table/marvin/tr_bgcolor_white.html  |  111 -
 .../table/marvin/tr_bgcolor_white_rgb.html    |  111 -
 .../tests/table/marvin/tr_bgcolor_yellow.html |  111 -
 .../table/marvin/tr_bgcolor_yellow_rgb.html   |  111 -
 .../table/marvin/tr_valign_baseline.html      |  103 -
 .../tests/table/marvin/tr_valign_bottom.html  |  103 -
 .../tests/table/marvin/tr_valign_middle.html  |  103 -
 .../tests/table/marvin/tr_valign_top.html     |  103 -
 .../table/marvin/x_caption_align_bottom.xml   |   99 -
 .../table/marvin/x_caption_align_left.xml     |  101 -
 .../table/marvin/x_caption_align_right.xml    |   99 -
 .../table/marvin/x_caption_align_top.xml      |  101 -
 .../tests/table/marvin/x_caption_class.xml    |   93 -
 .../html/tests/table/marvin/x_caption_id.xml  |   93 -
 .../tests/table/marvin/x_caption_style.xml    |   83 -
 .../tests/table/marvin/x_col_align_center.xml |   87 -
 .../tests/table/marvin/x_col_align_char.xml   |  101 -
 .../table/marvin/x_col_align_justify.xml      |   99 -
 .../tests/table/marvin/x_col_align_left.xml   |   87 -
 .../tests/table/marvin/x_col_align_right.xml  |   89 -
 layout/html/tests/table/marvin/x_col_span.xml |   83 -
 .../table/marvin/x_col_valign_baseline.xml    |   99 -
 .../table/marvin/x_col_valign_bottom.xml      |  101 -
 .../table/marvin/x_col_valign_middle.xml      |   95 -
 .../tests/table/marvin/x_col_valign_top.xml   |   93 -
 .../tests/table/marvin/x_col_width_pct.xml    |   89 -
 .../tests/table/marvin/x_col_width_px.xml     |   91 -
 .../tests/table/marvin/x_col_width_rel.xml    |   95 -
 .../table/marvin/x_colgroup_align_center.xml  |   87 -
 .../table/marvin/x_colgroup_align_char.xml    |  101 -
 .../table/marvin/x_colgroup_align_justify.xml |   97 -
 .../table/marvin/x_colgroup_align_left.xml    |   87 -
 .../table/marvin/x_colgroup_align_right.xml   |   87 -
 .../tests/table/marvin/x_colgroup_span.xml    |   83 -
 .../marvin/x_colgroup_valign_baseline.xml     |   97 -
 .../table/marvin/x_colgroup_valign_bottom.xml |  101 -
 .../table/marvin/x_colgroup_valign_middle.xml |   95 -
 .../table/marvin/x_colgroup_valign_top.xml    |   95 -
 .../table/marvin/x_colgroup_width_pct.xml     |   95 -
 .../table/marvin/x_colgroup_width_px.xml      |   91 -
 .../table/marvin/x_colgroup_width_rel.xml     |   95 -
 layout/html/tests/table/marvin/x_table.xml    |  111 -
 .../table/marvin/x_table_align_center.xml     |   73 -
 .../tests/table/marvin/x_table_align_left.xml |   73 -
 .../table/marvin/x_table_align_right.xml      |   75 -
 .../table/marvin/x_table_bgcolor_name.xml     |  575 --
 .../table/marvin/x_table_bgcolor_rgb.xml      |  575 --
 .../tests/table/marvin/x_table_border.xml     |  151 -
 .../table/marvin/x_table_border_none.xml      |  151 -
 .../tests/table/marvin/x_table_border_px.xml  |  151 -
 .../table/marvin/x_table_cellpadding.xml      |   77 -
 .../table/marvin/x_table_cellpadding_pct.xml  |   75 -
 .../table/marvin/x_table_cellspacing.xml      |   75 -
 .../table/marvin/x_table_cellspacing_pct.xml  |   75 -
 .../html/tests/table/marvin/x_table_class.xml |   91 -
 .../table/marvin/x_table_frame_above.xml      |  149 -
 .../table/marvin/x_table_frame_below.xml      |  151 -
 .../table/marvin/x_table_frame_border.xml     |  149 -
 .../tests/table/marvin/x_table_frame_box.xml  |  149 -
 .../table/marvin/x_table_frame_hsides.xml     |  151 -
 .../tests/table/marvin/x_table_frame_lhs.xml  |  151 -
 .../tests/table/marvin/x_table_frame_rhs.xml  |  151 -
 .../tests/table/marvin/x_table_frame_void.xml |  151 -
 .../table/marvin/x_table_frame_vsides.xml     |  149 -
 layout/html/tests/table/marvin/x_table_id.xml |   87 -
 .../tests/table/marvin/x_table_rules_all.xml  |  151 -
 .../tests/table/marvin/x_table_rules_cols.xml |  151 -
 .../table/marvin/x_table_rules_groups.xml     |  151 -
 .../tests/table/marvin/x_table_rules_none.xml |  151 -
 .../tests/table/marvin/x_table_rules_rows.xml |  151 -
 .../html/tests/table/marvin/x_table_style.xml |   77 -
 .../tests/table/marvin/x_table_width_pct.xml  |  135 -
 .../tests/table/marvin/x_table_width_px.xml   |  145 -
 .../table/marvin/x_tbody_align_center.xml     |  105 -
 .../tests/table/marvin/x_tbody_align_char.xml |  153 -
 .../table/marvin/x_tbody_align_justify.xml    |  109 -
 .../tests/table/marvin/x_tbody_align_left.xml |  107 -
 .../table/marvin/x_tbody_align_right.xml      |  107 -
 .../html/tests/table/marvin/x_tbody_class.xml |   87 -
 layout/html/tests/table/marvin/x_tbody_id.xml |   87 -
 .../html/tests/table/marvin/x_tbody_style.xml |   81 -
 .../table/marvin/x_tbody_valign_baseline.xml  |  121 -
 .../table/marvin/x_tbody_valign_bottom.xml    |  123 -
 .../table/marvin/x_tbody_valign_middle.xml    |  117 -
 .../tests/table/marvin/x_tbody_valign_top.xml |  117 -
 .../tests/table/marvin/x_td_align_center.xml  |  115 -
 .../tests/table/marvin/x_td_align_char.xml    |   93 -
 .../tests/table/marvin/x_td_align_justify.xml |   83 -
 .../tests/table/marvin/x_td_align_left.xml    |  115 -
 .../tests/table/marvin/x_td_align_right.xml   |  115 -
 .../tests/table/marvin/x_td_bgcolor_name.xml  |  767 ---
 .../tests/table/marvin/x_td_bgcolor_rgb.xml   |  767 ---
 layout/html/tests/table/marvin/x_td_class.xml |   81 -
 .../html/tests/table/marvin/x_td_colspan.xml  |   96 -
 .../html/tests/table/marvin/x_td_height.xml   |  145 -
 layout/html/tests/table/marvin/x_td_id.xml    |   83 -
 .../html/tests/table/marvin/x_td_nowrap.xml   |   93 -
 .../html/tests/table/marvin/x_td_rowspan.xml  |   96 -
 layout/html/tests/table/marvin/x_td_style.xml |   79 -
 .../table/marvin/x_td_valign_baseline.xml     |   89 -
 .../tests/table/marvin/x_td_valign_bottom.xml |   89 -
 .../tests/table/marvin/x_td_valign_middle.xml |   83 -
 .../tests/table/marvin/x_td_valign_top.xml    |   83 -
 layout/html/tests/table/marvin/x_td_width.xml |  147 -
 .../table/marvin/x_tfoot_align_center.xml     |  107 -
 .../tests/table/marvin/x_tfoot_align_char.xml |  155 -
 .../table/marvin/x_tfoot_align_justify.xml    |  109 -
 .../tests/table/marvin/x_tfoot_align_left.xml |  107 -
 .../table/marvin/x_tfoot_align_right.xml      |  105 -
 .../html/tests/table/marvin/x_tfoot_class.xml |  101 -
 layout/html/tests/table/marvin/x_tfoot_id.xml |  101 -
 .../html/tests/table/marvin/x_tfoot_style.xml |   95 -
 .../table/marvin/x_tfoot_valign_baseline.xml  |  121 -
 .../table/marvin/x_tfoot_valign_bottom.xml    |  123 -
 .../table/marvin/x_tfoot_valign_middle.xml    |  117 -
 .../tests/table/marvin/x_tfoot_valign_top.xml |  117 -
 .../tests/table/marvin/x_th_align_center.xml  |  115 -
 .../tests/table/marvin/x_th_align_char.xml    |   95 -
 .../tests/table/marvin/x_th_align_justify.xml |   85 -
 .../tests/table/marvin/x_th_align_left.xml    |  115 -
 .../tests/table/marvin/x_th_align_right.xml   |  115 -
 .../tests/table/marvin/x_th_bgcolor_name.xml  |  767 ---
 .../tests/table/marvin/x_th_bgcolor_rgb.xml   |  767 ---
 layout/html/tests/table/marvin/x_th_class.xml |   87 -
 .../html/tests/table/marvin/x_th_colspan.xml  |   96 -
 .../html/tests/table/marvin/x_th_height.xml   |  145 -
 layout/html/tests/table/marvin/x_th_id.xml    |   83 -
 .../html/tests/table/marvin/x_th_nowrap.xml   |   93 -
 .../html/tests/table/marvin/x_th_rowspan.xml  |   96 -
 layout/html/tests/table/marvin/x_th_style.xml |   81 -
 .../table/marvin/x_th_valign_baseline.xml     |   91 -
 .../tests/table/marvin/x_th_valign_bottom.xml |   91 -
 .../tests/table/marvin/x_th_valign_middle.xml |   85 -
 .../tests/table/marvin/x_th_valign_top.xml    |   83 -
 layout/html/tests/table/marvin/x_th_width.xml |  147 -
 .../table/marvin/x_thead_align_center.xml     |  107 -
 .../tests/table/marvin/x_thead_align_char.xml |  155 -
 .../table/marvin/x_thead_align_justify.xml    |  111 -
 .../tests/table/marvin/x_thead_align_left.xml |  105 -
 .../table/marvin/x_thead_align_right.xml      |  105 -
 .../html/tests/table/marvin/x_thead_class.xml |  113 -
 layout/html/tests/table/marvin/x_thead_id.xml |  113 -
 .../html/tests/table/marvin/x_thead_style.xml |  109 -
 .../table/marvin/x_thead_valign_baseline.xml  |  121 -
 .../table/marvin/x_thead_valign_bottom.xml    |  123 -
 .../table/marvin/x_thead_valign_middle.xml    |  117 -
 .../tests/table/marvin/x_thead_valign_top.xml |  117 -
 .../tests/table/marvin/x_tr_align_center.xml  |   77 -
 .../tests/table/marvin/x_tr_align_char.xml    |   95 -
 .../tests/table/marvin/x_tr_align_justify.xml |   83 -
 .../tests/table/marvin/x_tr_align_left.xml    |   77 -
 .../tests/table/marvin/x_tr_align_right.xml   |   77 -
 .../tests/table/marvin/x_tr_bgcolor_name.xml  |  575 --
 .../tests/table/marvin/x_tr_bgcolor_rgb.xml   |  575 --
 layout/html/tests/table/marvin/x_tr_class.xml |   83 -
 layout/html/tests/table/marvin/x_tr_id.xml    |   83 -
 layout/html/tests/table/marvin/x_tr_style.xml |   77 -
 .../table/marvin/x_tr_valign_baseline.xml     |   89 -
 .../tests/table/marvin/x_tr_valign_bottom.xml |   89 -
 .../tests/table/marvin/x_tr_valign_middle.xml |   85 -
 .../tests/table/marvin/x_tr_valign_top.xml    |   83 -
 .../html/tests/table/other/cell_widths.html   |  124 -
 .../html/tests/table/other/cellspacing.html   |   34 -
 .../html/tests/table/other/empty_cells.html   |  536 --
 layout/html/tests/table/other/move_row.html   |   50 -
 layout/html/tests/table/other/ms.html         |   40 -
 layout/html/tests/table/other/nested2.html    |   12 -
 .../html/tests/table/other/nestedTables.html  |  351 -
 layout/html/tests/table/other/padding.html    |   39 -
 layout/html/tests/table/other/rtest.lst       |   15 -
 layout/html/tests/table/other/slashlogo.html  | 3471 ----------
 .../other/table-intrinsic-cases-quirks.html   | 2499 --------
 .../table-intrinsic-cases-standards.html      | 2500 --------
 .../table/other/wa_table_thtd_rowspan.html    |  977 ---
 .../tests/table/other/wa_table_tr_align.html  |  251 -
 .../tests/table/other/wf_table_index.html     |  240 -
 .../html/tests/table/printing/bug102784.html  |   24 -
 .../html/tests/table/printing/bug105166.html  |   14 -
 .../html/tests/table/printing/bug111028.html  |   11 -
 .../tests/table/printing/bug111028Bottom.html |    5 -
 .../tests/table/printing/bug111028Middle.html |   15 -
 .../tests/table/printing/bug111028Top.html    |    7 -
 .../html/tests/table/printing/bug123983.html  |   38 -
 .../html/tests/table/printing/bug124041.html  |    9 -
 .../table/printing/bug124041_iframe.html      |   19 -
 .../html/tests/table/printing/bug125543.html  |  124 -
 .../html/tests/table/printing/bug126118.html  |   24 -
 .../tests/table/printing/bug138349-1.html     |   83 -
 .../tests/table/printing/bug138349-2.html     |    6 -
 .../html/tests/table/printing/bug145842.html  |   25 -
 .../tests/table/printing/bug153785-1.html     |   53 -
 .../tests/table/printing/bug153785-2.html     |    3 -
 .../tests/table/printing/bug153785-3.html     |   30 -
 .../tests/table/printing/bug153785-4.html     |   32 -
 .../tests/table/printing/bug153785-5.html     |    6 -
 .../tests/table/printing/bug165772-1.html     |  295 -
 .../tests/table/printing/bug165772-2.html     |   17 -
 .../tests/table/printing/bug165772-3.html     |   17 -
 .../tests/table/printing/bug165772-4.html     |   17 -
 .../tests/table/printing/bug165772-5.html     |   18 -
 .../html/tests/table/printing/bug24000-1.html |   20 -
 .../html/tests/table/printing/bug24000-2.html |   27 -
 .../html/tests/table/printing/bug26792.html   |   47 -
 .../html/tests/table/printing/bug362348.html  |   15 -
 .../html/tests/table/printing/bug53690.html   |    7 -
 .../html/tests/table/printing/bug54829.html   |   15 -
 .../html/tests/table/printing/bug57378.html   |  151 -
 .../html/tests/table/printing/bug57467.html   |   95 -
 .../html/tests/table/printing/bug58665.html   |  114 -
 .../html/tests/table/printing/bug59280-1.html |  509 --
 .../html/tests/table/printing/bug59280-2.html |  188 -
 .../html/tests/table/printing/bug61663.html   |  131 -
 .../html/tests/table/printing/bug66804.html   |   50 -
 .../html/tests/table/printing/bug80966.html   |  354 --
 .../html/tests/table/printing/bug82401.html   |   25 -
 .../html/tests/table/printing/bug85738.html   |   12 -
 .../html/tests/table/printing/bug92215.html   |    9 -
 layout/html/tests/table/printing/rtest.lst    |   44 -
 .../html/tests/table/printing/split2Rows.html |    4 -
 .../html/tests/table/printing/split3Rows.html |    5 -
 .../tests/table/printing/splitCell-1.html     |   85 -
 .../tests/table/printing/splitCell-2.html     |   65 -
 layout/html/tests/table/printing/tfoot.html   |   11 -
 layout/html/tests/table/printing/thead.html   |   11 -
 .../html/tests/table/printing/theadtfoot.html |    6 -
 .../tests/table/testcases/nestedTables.html   |  337 -
 .../html/tests/table/testcases/slashlogo.html | 3471 ----------
 .../testcases/wa_table_thtd_rowspan.html      |  977 ---
 .../table/testcases/wa_table_tr_align.html    |  250 -
 .../tests/table/testcases/wf_table_index.html |  240 -
 .../tests/table/viewer_tests/body_col.html    |   81 -
 .../html/tests/table/viewer_tests/rtest.lst   |    4 -
 .../html/tests/table/viewer_tests/test3.html  |  126 -
 .../html/tests/table/viewer_tests/test4.html  |  335 -
 .../html/tests/table/viewer_tests/test6.html  |  335 -
 layout/html/tests/xbl/insaneInsertion.css     |   18 -
 layout/html/tests/xbl/insaneInsertion.xml     |   20 -
 layout/html/tests/xbl/insaneInsertion.xul     |   21 -
 layout/html/tests/xbl/insaneInsertion2.xml    |   20 -
 layout/html/tests/xbl/rtest.lst               |    1 -
 2162 files changed, 154346 deletions(-)
 delete mode 100644 layout/html/tests/FrameSetNav/frameset1/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset1/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset1/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset10/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset10/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset10/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset11/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset12/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset13/simple.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset14/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset14/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset14/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset15/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset15/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset15/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset15/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset15/sub_iframe2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset2/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset2/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset2/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset2/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset3/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset3/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset3/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset3/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset4/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset4/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset4/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset4/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset5/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset5/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset5/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset5/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset6/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset6/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset6/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset6/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset7/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset7/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset7/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset7/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset8/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset8/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset8/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset8/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset9/simple_main.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset9/simple_sub1.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset9/simple_sub2.html
 delete mode 100644 layout/html/tests/FrameSetNav/frameset9/sub_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/index.html
 delete mode 100644 layout/html/tests/FrameSetNav/no_tabinx_noIFrame.html
 delete mode 100644 layout/html/tests/FrameSetNav/notabinx_IFrame.html
 delete mode 100644 layout/html/tests/FrameSetNav/raptor.jpg
 delete mode 100644 layout/html/tests/FrameSetNav/subdoc_tabindex_iframe.html
 delete mode 100644 layout/html/tests/FrameSetNav/tabinx_IFrame.html
 delete mode 100644 layout/html/tests/FrameSetNav/tabinx_noIFrame.html
 delete mode 100644 layout/html/tests/attributes/br-standard.html
 delete mode 100644 layout/html/tests/attributes/br.html
 delete mode 100644 layout/html/tests/attributes/div_p_heading.html
 delete mode 100644 layout/html/tests/attributes/font.html
 delete mode 100644 layout/html/tests/attributes/hr.html
 delete mode 100644 layout/html/tests/attributes/map_area.html
 delete mode 100644 layout/html/tests/attributes/mapimg87.gif
 delete mode 100644 layout/html/tests/attributes/ol_li.html
 delete mode 100644 layout/html/tests/attributes/pre.html
 delete mode 100644 layout/html/tests/attributes/ul_li.html
 delete mode 100644 layout/html/tests/block/base/intrinsic-cases-quirks.html
 delete mode 100644 layout/html/tests/block/base/intrinsic-cases-standards.html
 delete mode 100644 layout/html/tests/block/base/intrinsic-with-box-sizing-strict.html
 delete mode 100644 layout/html/tests/block/base/intrinsic-with-box-sizing.html
 delete mode 100644 layout/html/tests/block/base/jlbtest1.html
 delete mode 100644 layout/html/tests/block/base/margin1.html
 delete mode 100644 layout/html/tests/block/base/pre.html
 delete mode 100644 layout/html/tests/block/base/pre1.html
 delete mode 100644 layout/html/tests/block/base/rtest.lst
 delete mode 100644 layout/html/tests/block/base/width-fixed.html
 delete mode 100644 layout/html/tests/block/base/width-percent.html
 delete mode 100644 layout/html/tests/block/bugs/10458.html
 delete mode 100644 layout/html/tests/block/bugs/10490-a.html
 delete mode 100644 layout/html/tests/block/bugs/10490-b.html
 delete mode 100644 layout/html/tests/block/bugs/10509.html
 delete mode 100644 layout/html/tests/block/bugs/10675.html
 delete mode 100644 layout/html/tests/block/bugs/10777.html
 delete mode 100644 layout/html/tests/block/bugs/111255.html
 delete mode 100644 layout/html/tests/block/bugs/11435.html
 delete mode 100644 layout/html/tests/block/bugs/11566.html
 delete mode 100644 layout/html/tests/block/bugs/11589.html
 delete mode 100644 layout/html/tests/block/bugs/12003.html
 delete mode 100644 layout/html/tests/block/bugs/12072.html
 delete mode 100644 layout/html/tests/block/bugs/12233.html
 delete mode 100644 layout/html/tests/block/bugs/124167.html
 delete mode 100644 layout/html/tests/block/bugs/12451.html
 delete mode 100644 layout/html/tests/block/bugs/124637.html
 delete mode 100644 layout/html/tests/block/bugs/125506.html
 delete mode 100644 layout/html/tests/block/bugs/126213-1.html
 delete mode 100644 layout/html/tests/block/bugs/126213-2.html
 delete mode 100644 layout/html/tests/block/bugs/12709.html
 delete mode 100644 layout/html/tests/block/bugs/12760.html
 delete mode 100644 layout/html/tests/block/bugs/131065-1.html
 delete mode 100644 layout/html/tests/block/bugs/131065-2.html
 delete mode 100644 layout/html/tests/block/bugs/131065-3.html
 delete mode 100644 layout/html/tests/block/bugs/131065-4.html
 delete mode 100644 layout/html/tests/block/bugs/13196.html
 delete mode 100644 layout/html/tests/block/bugs/13258.html
 delete mode 100644 layout/html/tests/block/bugs/134580-1.html
 delete mode 100644 layout/html/tests/block/bugs/134580-2.html
 delete mode 100644 layout/html/tests/block/bugs/13481.html
 delete mode 100644 layout/html/tests/block/bugs/13553.html
 delete mode 100644 layout/html/tests/block/bugs/13599.html
 delete mode 100644 layout/html/tests/block/bugs/13869.html
 delete mode 100644 layout/html/tests/block/bugs/13940.html
 delete mode 100644 layout/html/tests/block/bugs/14118-a.html
 delete mode 100644 layout/html/tests/block/bugs/14118-b.html
 delete mode 100644 layout/html/tests/block/bugs/14140.html
 delete mode 100644 layout/html/tests/block/bugs/14161.html
 delete mode 100644 layout/html/tests/block/bugs/14363.html
 delete mode 100644 layout/html/tests/block/bugs/14459.html
 delete mode 100644 layout/html/tests/block/bugs/14489.html
 delete mode 100644 layout/html/tests/block/bugs/148245.html
 delete mode 100644 layout/html/tests/block/bugs/151620.html
 delete mode 100644 layout/html/tests/block/bugs/15340.html
 delete mode 100644 layout/html/tests/block/bugs/153429a.html
 delete mode 100644 layout/html/tests/block/bugs/153429b.html
 delete mode 100644 layout/html/tests/block/bugs/153429c.html
 delete mode 100644 layout/html/tests/block/bugs/154741.html
 delete mode 100644 layout/html/tests/block/bugs/155333-1.html
 delete mode 100644 layout/html/tests/block/bugs/155333-2.html
 delete mode 100644 layout/html/tests/block/bugs/15882-a.html
 delete mode 100644 layout/html/tests/block/bugs/15882-b.html
 delete mode 100644 layout/html/tests/block/bugs/15933-a.html
 delete mode 100644 layout/html/tests/block/bugs/15933-b.html
 delete mode 100644 layout/html/tests/block/bugs/16053.html
 delete mode 100644 layout/html/tests/block/bugs/161644.html
 delete mode 100644 layout/html/tests/block/bugs/16173.html
 delete mode 100644 layout/html/tests/block/bugs/16417.html
 delete mode 100644 layout/html/tests/block/bugs/16580.html
 delete mode 100644 layout/html/tests/block/bugs/16656.html
 delete mode 100644 layout/html/tests/block/bugs/16889.html
 delete mode 100644 layout/html/tests/block/bugs/169620.html
 delete mode 100644 layout/html/tests/block/bugs/17054.html
 delete mode 100644 layout/html/tests/block/bugs/17130-a.html
 delete mode 100644 layout/html/tests/block/bugs/17130-b.html
 delete mode 100644 layout/html/tests/block/bugs/17318.html
 delete mode 100644 layout/html/tests/block/bugs/17331.html
 delete mode 100644 layout/html/tests/block/bugs/17372.html
 delete mode 100644 layout/html/tests/block/bugs/17518.html
 delete mode 100644 layout/html/tests/block/bugs/17532.html
 delete mode 100644 layout/html/tests/block/bugs/17636.html
 delete mode 100644 layout/html/tests/block/bugs/176423.html
 delete mode 100644 layout/html/tests/block/bugs/177331.html
 delete mode 100644 layout/html/tests/block/bugs/17844.html
 delete mode 100644 layout/html/tests/block/bugs/18445.html
 delete mode 100644 layout/html/tests/block/bugs/18445_1.html
 delete mode 100644 layout/html/tests/block/bugs/18445_2.html
 delete mode 100644 layout/html/tests/block/bugs/18445_3.html
 delete mode 100644 layout/html/tests/block/bugs/18445_4.html
 delete mode 100644 layout/html/tests/block/bugs/185411-1.html
 delete mode 100644 layout/html/tests/block/bugs/185411-2.html
 delete mode 100644 layout/html/tests/block/bugs/185411-3.html
 delete mode 100644 layout/html/tests/block/bugs/18754.html
 delete mode 100644 layout/html/tests/block/bugs/196919.html
 delete mode 100644 layout/html/tests/block/bugs/199673-1.html
 delete mode 100644 layout/html/tests/block/bugs/199673-2.html
 delete mode 100644 layout/html/tests/block/bugs/199673-3.html
 delete mode 100644 layout/html/tests/block/bugs/20020515_60x60_scooby.jpg
 delete mode 100644 layout/html/tests/block/bugs/20582.html
 delete mode 100644 layout/html/tests/block/bugs/215857-2.html
 delete mode 100644 layout/html/tests/block/bugs/215857-3.html
 delete mode 100644 layout/html/tests/block/bugs/215857.html
 delete mode 100644 layout/html/tests/block/bugs/216303.html
 delete mode 100644 layout/html/tests/block/bugs/217369-1.html
 delete mode 100644 layout/html/tests/block/bugs/217369-2.html
 delete mode 100644 layout/html/tests/block/bugs/22037.html
 delete mode 100644 layout/html/tests/block/bugs/223394-1.html
 delete mode 100644 layout/html/tests/block/bugs/223394-2.html
 delete mode 100644 layout/html/tests/block/bugs/223394-3.html
 delete mode 100644 layout/html/tests/block/bugs/223394-4.html
 delete mode 100644 layout/html/tests/block/bugs/22413.html
 delete mode 100644 layout/html/tests/block/bugs/22496.html
 delete mode 100644 layout/html/tests/block/bugs/228172.html
 delete mode 100644 layout/html/tests/block/bugs/239079.html
 delete mode 100644 layout/html/tests/block/bugs/239079.xml
 delete mode 100644 layout/html/tests/block/bugs/262624.html
 delete mode 100644 layout/html/tests/block/bugs/263406-1.xml
 delete mode 100644 layout/html/tests/block/bugs/263406-2.xml
 delete mode 100644 layout/html/tests/block/bugs/263406-3.xml
 delete mode 100644 layout/html/tests/block/bugs/263406-4.html
 delete mode 100644 layout/html/tests/block/bugs/263406-5.xml
 delete mode 100644 layout/html/tests/block/bugs/263406-6.xml
 delete mode 100644 layout/html/tests/block/bugs/263406-7.html
 delete mode 100644 layout/html/tests/block/bugs/264914-1.html
 delete mode 100644 layout/html/tests/block/bugs/264914-2.html
 delete mode 100644 layout/html/tests/block/bugs/265566.html
 delete mode 100644 layout/html/tests/block/bugs/27211.html
 delete mode 100644 layout/html/tests/block/bugs/276286.html
 delete mode 100644 layout/html/tests/block/bugs/276602.html
 delete mode 100644 layout/html/tests/block/bugs/277420.html
 delete mode 100644 layout/html/tests/block/bugs/282754-1.html
 delete mode 100644 layout/html/tests/block/bugs/282754-2.html
 delete mode 100644 layout/html/tests/block/bugs/282754.html
 delete mode 100644 layout/html/tests/block/bugs/28811.html
 delete mode 100644 layout/html/tests/block/bugs/299148.html
 delete mode 100644 layout/html/tests/block/bugs/299148.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-01.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-02.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-03.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-04.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-05.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-06.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-07.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-08.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-09.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-10.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-11.xml
 delete mode 100644 layout/html/tests/block/bugs/300816-12.xml
 delete mode 100644 layout/html/tests/block/bugs/304004.html
 delete mode 100644 layout/html/tests/block/bugs/306534.html
 delete mode 100644 layout/html/tests/block/bugs/310124.html
 delete mode 100644 layout/html/tests/block/bugs/317961.html
 delete mode 100644 layout/html/tests/block/bugs/36401-a.html
 delete mode 100644 layout/html/tests/block/bugs/36401-b.html
 delete mode 100644 layout/html/tests/block/bugs/36401-c.html
 delete mode 100644 layout/html/tests/block/bugs/36401.html
 delete mode 100644 layout/html/tests/block/bugs/37083-1.html
 delete mode 100644 layout/html/tests/block/bugs/37083-2.html
 delete mode 100644 layout/html/tests/block/bugs/37083-3.html
 delete mode 100644 layout/html/tests/block/bugs/37511_1.html
 delete mode 100644 layout/html/tests/block/bugs/38157-a.html
 delete mode 100644 layout/html/tests/block/bugs/38157-b.html
 delete mode 100644 layout/html/tests/block/bugs/39211-a.html
 delete mode 100644 layout/html/tests/block/bugs/39211-b.html
 delete mode 100644 layout/html/tests/block/bugs/39211-c.html
 delete mode 100644 layout/html/tests/block/bugs/39211.html
 delete mode 100644 layout/html/tests/block/bugs/39683.html
 delete mode 100644 layout/html/tests/block/bugs/40038-1.xml
 delete mode 100644 layout/html/tests/block/bugs/40038-2.html
 delete mode 100644 layout/html/tests/block/bugs/40129.html
 delete mode 100644 layout/html/tests/block/bugs/41521.html
 delete mode 100644 layout/html/tests/block/bugs/41777.html
 delete mode 100644 layout/html/tests/block/bugs/42495.html
 delete mode 100644 layout/html/tests/block/bugs/4324.html
 delete mode 100644 layout/html/tests/block/bugs/43882-1.html
 delete mode 100644 layout/html/tests/block/bugs/43882-10.html
 delete mode 100644 layout/html/tests/block/bugs/43882-11.html
 delete mode 100644 layout/html/tests/block/bugs/43882-12.html
 delete mode 100644 layout/html/tests/block/bugs/43882-13.html
 delete mode 100644 layout/html/tests/block/bugs/43882-14.html
 delete mode 100644 layout/html/tests/block/bugs/43882-15.html
 delete mode 100644 layout/html/tests/block/bugs/43882-16.html
 delete mode 100644 layout/html/tests/block/bugs/43882-2.html
 delete mode 100644 layout/html/tests/block/bugs/43882-3.html
 delete mode 100644 layout/html/tests/block/bugs/43882-4.html
 delete mode 100644 layout/html/tests/block/bugs/43882-5.html
 delete mode 100644 layout/html/tests/block/bugs/43882-6.html
 delete mode 100644 layout/html/tests/block/bugs/43882-7.html
 delete mode 100644 layout/html/tests/block/bugs/43882-8.html
 delete mode 100644 layout/html/tests/block/bugs/43882-9.html
 delete mode 100644 layout/html/tests/block/bugs/44264-1.html
 delete mode 100644 layout/html/tests/block/bugs/44264-2.html
 delete mode 100644 layout/html/tests/block/bugs/44264-3.html
 delete mode 100644 layout/html/tests/block/bugs/4468.html
 delete mode 100644 layout/html/tests/block/bugs/44709.html
 delete mode 100644 layout/html/tests/block/bugs/4515.html
 delete mode 100644 layout/html/tests/block/bugs/4519.html
 delete mode 100644 layout/html/tests/block/bugs/45621.html
 delete mode 100644 layout/html/tests/block/bugs/4677.html
 delete mode 100644 layout/html/tests/block/bugs/46918.html
 delete mode 100644 layout/html/tests/block/bugs/47456.html
 delete mode 100644 layout/html/tests/block/bugs/47456_1.html
 delete mode 100644 layout/html/tests/block/bugs/4803.html
 delete mode 100644 layout/html/tests/block/bugs/48057.html
 delete mode 100644 layout/html/tests/block/bugs/4831-a.html
 delete mode 100644 layout/html/tests/block/bugs/4831-b.html
 delete mode 100644 layout/html/tests/block/bugs/48653.html
 delete mode 100644 layout/html/tests/block/bugs/4956.html
 delete mode 100644 layout/html/tests/block/bugs/50480.html
 delete mode 100644 layout/html/tests/block/bugs/50758.html
 delete mode 100644 layout/html/tests/block/bugs/5114.html
 delete mode 100644 layout/html/tests/block/bugs/5119.html
 delete mode 100644 layout/html/tests/block/bugs/5196.html
 delete mode 100644 layout/html/tests/block/bugs/52242.html
 delete mode 100644 layout/html/tests/block/bugs/52265.html
 delete mode 100644 layout/html/tests/block/bugs/52307.html
 delete mode 100644 layout/html/tests/block/bugs/52773.html
 delete mode 100644 layout/html/tests/block/bugs/53259.html
 delete mode 100644 layout/html/tests/block/bugs/53690.html
 delete mode 100644 layout/html/tests/block/bugs/5375.html
 delete mode 100644 layout/html/tests/block/bugs/53960.html
 delete mode 100644 layout/html/tests/block/bugs/53974.html
 delete mode 100644 layout/html/tests/block/bugs/54005.html
 delete mode 100644 layout/html/tests/block/bugs/5418.html
 delete mode 100644 layout/html/tests/block/bugs/54618.html
 delete mode 100644 layout/html/tests/block/bugs/54833.html
 delete mode 100644 layout/html/tests/block/bugs/54876.html
 delete mode 100644 layout/html/tests/block/bugs/55095.html
 delete mode 100644 layout/html/tests/block/bugs/55250.html
 delete mode 100644 layout/html/tests/block/bugs/55317.html
 delete mode 100644 layout/html/tests/block/bugs/5537.html
 delete mode 100644 layout/html/tests/block/bugs/55874.html
 delete mode 100644 layout/html/tests/block/bugs/55961.html
 delete mode 100644 layout/html/tests/block/bugs/56102.html
 delete mode 100644 layout/html/tests/block/bugs/56265.html
 delete mode 100644 layout/html/tests/block/bugs/56335.html
 delete mode 100644 layout/html/tests/block/bugs/56563_1.html
 delete mode 100644 layout/html/tests/block/bugs/5688.html
 delete mode 100644 layout/html/tests/block/bugs/57554.html
 delete mode 100644 layout/html/tests/block/bugs/5821.html
 delete mode 100644 layout/html/tests/block/bugs/5847.html
 delete mode 100644 layout/html/tests/block/bugs/5859-a.html
 delete mode 100644 layout/html/tests/block/bugs/5859-b.html
 delete mode 100644 layout/html/tests/block/bugs/5859-c.html
 delete mode 100644 layout/html/tests/block/bugs/5859-d.html
 delete mode 100644 layout/html/tests/block/bugs/58652.html
 delete mode 100644 layout/html/tests/block/bugs/58652.js
 delete mode 100644 layout/html/tests/block/bugs/58674-a.html
 delete mode 100644 layout/html/tests/block/bugs/58674-b.html
 delete mode 100644 layout/html/tests/block/bugs/59200-a.html
 delete mode 100644 layout/html/tests/block/bugs/59200-c.html
 delete mode 100644 layout/html/tests/block/bugs/59200-d.html
 delete mode 100644 layout/html/tests/block/bugs/59200-e.html
 delete mode 100644 layout/html/tests/block/bugs/59790.html
 delete mode 100644 layout/html/tests/block/bugs/59834.html
 delete mode 100644 layout/html/tests/block/bugs/6093.html
 delete mode 100644 layout/html/tests/block/bugs/6097.html
 delete mode 100644 layout/html/tests/block/bugs/60992.html
 delete mode 100644 layout/html/tests/block/bugs/6126.html
 delete mode 100644 layout/html/tests/block/bugs/6155.html
 delete mode 100644 layout/html/tests/block/bugs/63785.html
 delete mode 100644 layout/html/tests/block/bugs/67690.html
 delete mode 100644 layout/html/tests/block/bugs/69960.html
 delete mode 100644 layout/html/tests/block/bugs/7093.html
 delete mode 100644 layout/html/tests/block/bugs/71594.html
 delete mode 100644 layout/html/tests/block/bugs/7282.html
 delete mode 100644 layout/html/tests/block/bugs/7352.html
 delete mode 100644 layout/html/tests/block/bugs/7806.html
 delete mode 100644 layout/html/tests/block/bugs/7993.html
 delete mode 100644 layout/html/tests/block/bugs/81118.html
 delete mode 100644 layout/html/tests/block/bugs/81776.html
 delete mode 100644 layout/html/tests/block/bugs/82221.css
 delete mode 100644 layout/html/tests/block/bugs/82221.html
 delete mode 100644 layout/html/tests/block/bugs/82221.js
 delete mode 100644 layout/html/tests/block/bugs/8438.html
 delete mode 100644 layout/html/tests/block/bugs/8466.html
 delete mode 100644 layout/html/tests/block/bugs/8683.html
 delete mode 100644 layout/html/tests/block/bugs/8749.html
 delete mode 100644 layout/html/tests/block/bugs/87543.html
 delete mode 100644 layout/html/tests/block/bugs/8878.html
 delete mode 100644 layout/html/tests/block/bugs/8905.html
 delete mode 100644 layout/html/tests/block/bugs/9100.html
 delete mode 100644 layout/html/tests/block/bugs/9237-b.html
 delete mode 100644 layout/html/tests/block/bugs/9282.html
 delete mode 100644 layout/html/tests/block/bugs/94468.html
 delete mode 100644 layout/html/tests/block/bugs/9601.html
 delete mode 100644 layout/html/tests/block/bugs/97383-a.html
 delete mode 100644 layout/html/tests/block/bugs/97383.html
 delete mode 100644 layout/html/tests/block/bugs/Aj.gif
 delete mode 100644 layout/html/tests/block/bugs/RealSnow.jar
 delete mode 100644 layout/html/tests/block/bugs/ant.jpg
 delete mode 100644 layout/html/tests/block/bugs/hack.gif
 delete mode 100644 layout/html/tests/block/bugs/logo-star.gif
 delete mode 100644 layout/html/tests/block/bugs/rtest.lst
 delete mode 100644 layout/html/tests/block/bugs/support.gif
 delete mode 100644 layout/html/tests/block/bugs/top_buttons16.jpg
 delete mode 100644 layout/html/tests/block/bugs/top_middle2.jpg
 delete mode 100644 layout/html/tests/block/images/animated_gif.gif
 delete mode 100644 layout/html/tests/block/images/ant.jpg
 delete mode 100644 layout/html/tests/block/images/audio_mixer_22tracks_tn.JPG
 delete mode 100644 layout/html/tests/block/images/black_1pix.html
 delete mode 100644 layout/html/tests/block/images/continue.jpg
 delete mode 100644 layout/html/tests/block/images/fig1s.jpg
 delete mode 100644 layout/html/tests/block/images/fig2s.jpg
 delete mode 100644 layout/html/tests/block/images/fig3s.jpg
 delete mode 100644 layout/html/tests/block/images/filterrt_tn.JPG
 delete mode 100644 layout/html/tests/block/images/horiz_pixel_ruler.gif
 delete mode 100644 layout/html/tests/block/images/icoAnimals.gif
 delete mode 100644 layout/html/tests/block/images/ifc-home.gif
 delete mode 100644 layout/html/tests/block/images/logoweb_gif64_150_49.gif
 delete mode 100644 layout/html/tests/block/images/mozilla-banner.gif
 delete mode 100644 layout/html/tests/block/images/november.gif
 delete mode 100644 layout/html/tests/block/images/tech-banner1.gif
 delete mode 100644 layout/html/tests/block/images/tech-banner2.gif
 delete mode 100644 layout/html/tests/block/images/vert_pixel_ruler.gif
 delete mode 100644 layout/html/tests/block/net/rtest.lst
 delete mode 100644 layout/html/tests/block/printing/127145-1.html
 delete mode 100644 layout/html/tests/block/printing/127145-2.html
 delete mode 100644 layout/html/tests/block/printing/127145-3.html
 delete mode 100644 layout/html/tests/block/printing/127286-1.html
 delete mode 100644 layout/html/tests/block/printing/127286-2.html
 delete mode 100644 layout/html/tests/block/printing/127286.css
 delete mode 100644 layout/html/tests/block/printing/145305-1.html
 delete mode 100644 layout/html/tests/block/printing/145305-10.html
 delete mode 100644 layout/html/tests/block/printing/145305-11.html
 delete mode 100644 layout/html/tests/block/printing/145305-12.html
 delete mode 100644 layout/html/tests/block/printing/145305-13.html
 delete mode 100644 layout/html/tests/block/printing/145305-14.html
 delete mode 100644 layout/html/tests/block/printing/145305-15.html
 delete mode 100644 layout/html/tests/block/printing/145305-16.html
 delete mode 100644 layout/html/tests/block/printing/145305-17.html
 delete mode 100644 layout/html/tests/block/printing/145305-18.html
 delete mode 100644 layout/html/tests/block/printing/145305-19.html
 delete mode 100644 layout/html/tests/block/printing/145305-2.html
 delete mode 100644 layout/html/tests/block/printing/145305-20.html
 delete mode 100644 layout/html/tests/block/printing/145305-21.html
 delete mode 100644 layout/html/tests/block/printing/145305-3.html
 delete mode 100644 layout/html/tests/block/printing/145305-4.html
 delete mode 100644 layout/html/tests/block/printing/145305-5.html
 delete mode 100644 layout/html/tests/block/printing/145305-6.html
 delete mode 100644 layout/html/tests/block/printing/145305-7.html
 delete mode 100644 layout/html/tests/block/printing/145305-8.html
 delete mode 100644 layout/html/tests/block/printing/145305-9.html
 delete mode 100644 layout/html/tests/block/printing/150652.html
 delete mode 100644 layout/html/tests/block/printing/163614.html
 delete mode 100644 layout/html/tests/block/printing/179683-1.html
 delete mode 100644 layout/html/tests/block/printing/179683-2.html
 delete mode 100644 layout/html/tests/block/printing/rtest.lst
 delete mode 100644 layout/html/tests/block/rtest.lst
 delete mode 100644 layout/html/tests/css/IMPORTANT.css
 delete mode 100644 layout/html/tests/css/INVALID.css
 delete mode 100644 layout/html/tests/css/SELECTORS.css
 delete mode 100644 layout/html/tests/css/azimuth.css
 delete mode 100644 layout/html/tests/css/background-attachment.css
 delete mode 100644 layout/html/tests/css/background-color.css
 delete mode 100644 layout/html/tests/css/background-image.css
 delete mode 100644 layout/html/tests/css/background-position.css
 delete mode 100644 layout/html/tests/css/background-repeat.css
 delete mode 100644 layout/html/tests/css/background.css
 delete mode 100644 layout/html/tests/css/border-bottom-color.css
 delete mode 100644 layout/html/tests/css/border-bottom-style.css
 delete mode 100644 layout/html/tests/css/border-bottom-width.css
 delete mode 100644 layout/html/tests/css/border-bottom.css
 delete mode 100644 layout/html/tests/css/border-collapse.css
 delete mode 100644 layout/html/tests/css/border-color.css
 delete mode 100644 layout/html/tests/css/border-left-color.css
 delete mode 100644 layout/html/tests/css/border-left-style.css
 delete mode 100644 layout/html/tests/css/border-left-width.css
 delete mode 100644 layout/html/tests/css/border-left.css
 delete mode 100644 layout/html/tests/css/border-right-color.css
 delete mode 100644 layout/html/tests/css/border-right-style.css
 delete mode 100644 layout/html/tests/css/border-right-width.css
 delete mode 100644 layout/html/tests/css/border-right.css
 delete mode 100644 layout/html/tests/css/border-spacing.css
 delete mode 100644 layout/html/tests/css/border-style.css
 delete mode 100644 layout/html/tests/css/border-top-color.css
 delete mode 100644 layout/html/tests/css/border-top-style.css
 delete mode 100644 layout/html/tests/css/border-top-width.css
 delete mode 100644 layout/html/tests/css/border-top.css
 delete mode 100644 layout/html/tests/css/border-width.css
 delete mode 100644 layout/html/tests/css/border.css
 delete mode 100644 layout/html/tests/css/bottom.css
 delete mode 100644 layout/html/tests/css/bugs/bug01.css
 delete mode 100644 layout/html/tests/css/bugs/bug02.css
 delete mode 100644 layout/html/tests/css/bugs/bug03.css
 delete mode 100644 layout/html/tests/css/bugs/bug04.css
 delete mode 100644 layout/html/tests/css/caption-side.css
 delete mode 100644 layout/html/tests/css/clear.css
 delete mode 100644 layout/html/tests/css/clip.css
 delete mode 100644 layout/html/tests/css/color.css
 delete mode 100644 layout/html/tests/css/content.css
 delete mode 100644 layout/html/tests/css/counter-increment.css
 delete mode 100644 layout/html/tests/css/counter-reset.css
 delete mode 100644 layout/html/tests/css/cue-after.css
 delete mode 100644 layout/html/tests/css/cue-before.css
 delete mode 100644 layout/html/tests/css/cue.css
 delete mode 100644 layout/html/tests/css/cursor.css
 delete mode 100644 layout/html/tests/css/direction.css
 delete mode 100644 layout/html/tests/css/display.css
 delete mode 100644 layout/html/tests/css/elevation.css
 delete mode 100644 layout/html/tests/css/empty-cells.css
 delete mode 100644 layout/html/tests/css/float.css
 delete mode 100644 layout/html/tests/css/font-family.css
 delete mode 100644 layout/html/tests/css/font-size-adjust.css
 delete mode 100644 layout/html/tests/css/font-size.css
 delete mode 100644 layout/html/tests/css/font-stretch.css
 delete mode 100644 layout/html/tests/css/font-style.css
 delete mode 100644 layout/html/tests/css/font-variant.css
 delete mode 100644 layout/html/tests/css/font-weight.css
 delete mode 100644 layout/html/tests/css/font.css
 delete mode 100644 layout/html/tests/css/height.css
 delete mode 100644 layout/html/tests/css/left.css
 delete mode 100644 layout/html/tests/css/letter-spacing.css
 delete mode 100644 layout/html/tests/css/line-height.css
 delete mode 100644 layout/html/tests/css/list-style-image.css
 delete mode 100644 layout/html/tests/css/list-style-position.css
 delete mode 100644 layout/html/tests/css/list-style-type.css
 delete mode 100644 layout/html/tests/css/list-style.css
 delete mode 100644 layout/html/tests/css/margin-bottom.css
 delete mode 100644 layout/html/tests/css/margin-left.css
 delete mode 100644 layout/html/tests/css/margin-right.css
 delete mode 100644 layout/html/tests/css/margin-top.css
 delete mode 100644 layout/html/tests/css/margin.css
 delete mode 100644 layout/html/tests/css/marker-offset.css
 delete mode 100644 layout/html/tests/css/marks.css
 delete mode 100644 layout/html/tests/css/max-height.css
 delete mode 100644 layout/html/tests/css/max-width.css
 delete mode 100644 layout/html/tests/css/min-height.css
 delete mode 100644 layout/html/tests/css/min-width.css
 delete mode 100644 layout/html/tests/css/opacity.css
 delete mode 100644 layout/html/tests/css/orphans.css
 delete mode 100644 layout/html/tests/css/outline-color.css
 delete mode 100644 layout/html/tests/css/outline-style.css
 delete mode 100644 layout/html/tests/css/outline-width.css
 delete mode 100644 layout/html/tests/css/outline.css
 delete mode 100644 layout/html/tests/css/overflow.css
 delete mode 100644 layout/html/tests/css/padding-bottom.css
 delete mode 100644 layout/html/tests/css/padding-left.css
 delete mode 100644 layout/html/tests/css/padding-right.css
 delete mode 100644 layout/html/tests/css/padding-top.css
 delete mode 100644 layout/html/tests/css/padding.css
 delete mode 100644 layout/html/tests/css/pointer-events.css
 delete mode 100644 layout/html/tests/css/position.css
 delete mode 100644 layout/html/tests/css/text-align.css
 delete mode 100644 layout/html/tests/css/text-decoration.css
 delete mode 100644 layout/html/tests/css/text-indent.css
 delete mode 100644 layout/html/tests/css/text-transform.css
 delete mode 100644 layout/html/tests/css/top.css
 delete mode 100644 layout/html/tests/css/vertical-align.css
 delete mode 100644 layout/html/tests/css/visibility.css
 delete mode 100644 layout/html/tests/css/white-space.css
 delete mode 100644 layout/html/tests/css/width.css
 delete mode 100644 layout/html/tests/css/word-spacing.css
 delete mode 100644 layout/html/tests/css/z-index.css
 delete mode 100644 layout/html/tests/formctls/base/button_button_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_css_sizing.html
 delete mode 100644 layout/html/tests/formctls/base/button_min_max_widths.html
 delete mode 100644 layout/html/tests/formctls/base/button_min_max_widths_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_no_margin.html
 delete mode 100644 layout/html/tests/formctls/base/button_no_margin_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_overconstrained.html
 delete mode 100644 layout/html/tests/formctls/base/button_overconstrained_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_reset_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_sizing_tests.html
 delete mode 100644 layout/html/tests/formctls/base/button_small_avail_width.html
 delete mode 100644 layout/html/tests/formctls/base/button_small_avail_width_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_submit_strict.html
 delete mode 100644 layout/html/tests/formctls/base/button_with_margin.html
 delete mode 100644 layout/html/tests/formctls/base/button_with_margin_strict.html
 delete mode 100644 layout/html/tests/formctls/base/fieldset_strict.html
 delete mode 100644 layout/html/tests/formctls/base/fieldset_strict2.html
 delete mode 100644 layout/html/tests/formctls/base/form_overview.html
 delete mode 100644 layout/html/tests/formctls/base/index.html
 delete mode 100644 layout/html/tests/formctls/base/input_button_overconstrained.html
 delete mode 100644 layout/html/tests/formctls/base/input_button_overconstrained_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_button_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_checkbox_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_file_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_file_strict2.html
 delete mode 100644 layout/html/tests/formctls/base/input_hidden_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_image_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_password_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_radio_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_reset_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_submit_strict.html
 delete mode 100644 layout/html/tests/formctls/base/input_text_strict.html
 delete mode 100644 layout/html/tests/formctls/base/inputtext_sizes.html
 delete mode 100644 layout/html/tests/formctls/base/inputtext_tests.html
 delete mode 100644 layout/html/tests/formctls/base/isindex_strict.html
 delete mode 100644 layout/html/tests/formctls/base/legend_strict.html
 delete mode 100644 layout/html/tests/formctls/base/optgroup_test1.html
 delete mode 100644 layout/html/tests/formctls/base/radio_disabled.html
 delete mode 100644 layout/html/tests/formctls/base/radio_init.html
 delete mode 100644 layout/html/tests/formctls/base/radio_jsadd.html
 delete mode 100644 layout/html/tests/formctls/base/radio_onchange.html
 delete mode 100644 layout/html/tests/formctls/base/rtest.lst
 delete mode 100644 layout/html/tests/formctls/base/select1_js.html
 delete mode 100644 layout/html/tests/formctls/base/select_combobox_basics.html
 delete mode 100644 layout/html/tests/formctls/base/select_disabled.html
 delete mode 100644 layout/html/tests/formctls/base/select_init.html
 delete mode 100644 layout/html/tests/formctls/base/select_js.html
 delete mode 100644 layout/html/tests/formctls/base/select_jsadd.html
 delete mode 100644 layout/html/tests/formctls/base/select_listbox_sizing.html
 delete mode 100644 layout/html/tests/formctls/base/select_listbox_sizing_quirks.html
 delete mode 100644 layout/html/tests/formctls/base/select_onchange.html
 delete mode 100644 layout/html/tests/formctls/base/select_small_sizes.html
 delete mode 100644 layout/html/tests/formctls/base/select_small_sizes2.html
 delete mode 100644 layout/html/tests/formctls/base/select_strict.html
 delete mode 100644 layout/html/tests/formctls/base/selectsize3_js.html
 delete mode 100644 layout/html/tests/formctls/base/testarea_wrap.html
 delete mode 100644 layout/html/tests/formctls/base/textarea_sizes.html
 delete mode 100644 layout/html/tests/formctls/base/textarea_strict.html
 delete mode 100644 layout/html/tests/formctls/base/textarea_tests.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug101122.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug10410.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug108526.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug109316.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug109368.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug113245.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug117606.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug138403-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug138403-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-10.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-11.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-12.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-13.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-14.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-15.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-16.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-4.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-5.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-6.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-7.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-8.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug167236-9.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug17450.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug17474-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug17474-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug17474-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug180085-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug180085-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug180085-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug180085-4.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug20322.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug222864.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug22708.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug231574.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug26644.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug26650.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug28598.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug297389.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug300474-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug300474-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug305705.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug33327.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug342531.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug357449.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug358408.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug35934.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug36130.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug36364-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug36364-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug36964.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug37261.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug37459.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug39425.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug4050.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-4.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-5.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-6.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug40596-7.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug41049.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug41050.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug42481.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug43771.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug44000.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug45095.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug45152.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug45562.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug45625.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug45670.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug46099.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug46224.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug48237.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug50419.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug53259-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug53259-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug53259-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug55063.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug58190.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug58220.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug58299.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug59294.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug62568.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug62954.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug63309.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug65275.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug67207.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug68963.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug69984.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug7025-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug7025-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug70251-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug70251-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug70251-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug70251-4.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug73081.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug74069.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug7543.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug7549.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug77068.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug79863.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug79927-1.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug79927-2.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug79927-3.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug81448.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug8665.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug88849.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug91789.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug92647.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug94268.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug95703.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug95937.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug96506.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug96604.html
 delete mode 100644 layout/html/tests/formctls/bugs/bug98918.html
 delete mode 100644 layout/html/tests/formctls/bugs/rtest.lst
 delete mode 100644 layout/html/tests/images/polarBears.jpg
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset1/simple_main.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset1/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset1/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset2/simple_main.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset2/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset2/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/CSSPage/frameset2/sub_iframe.html
 delete mode 100644 layout/html/tests/printer/CSSPage/landscape.html
 delete mode 100644 layout/html/tests/printer/CSSPage/margin10percent.html
 delete mode 100644 layout/html/tests/printer/CSSPage/marginauto.html
 delete mode 100644 layout/html/tests/printer/CSSPage/marginleftautoright1in.html
 delete mode 100644 layout/html/tests/printer/CSSPage/page8x11margin10percent.html
 delete mode 100644 layout/html/tests/printer/CSSPage/page8x11margin254cm.html
 delete mode 100644 layout/html/tests/printer/CSSPage/page8x11marginhalfin.html
 delete mode 100644 layout/html/tests/printer/CSSPage/pagesizeauto.html
 delete mode 100644 layout/html/tests/printer/CSSPage/portrait.html
 delete mode 100644 layout/html/tests/printer/CSSPage/right.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset1/simple_main.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset1/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset1/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset2/simple_main.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset2/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset2/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset2/sub_iframe.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset3/frame1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset3/frame2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset3/frame3.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset3/root.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset3/subroot.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset4/frame1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset4/frame2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset4/frame3.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset4/root.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/frame1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/frame2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/frame3.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/root.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/subroot.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset5/the_iframe.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset6/frame1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset6/frame2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset6/frame3.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset6/root.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset6/the_iframe.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset7/index.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset7/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset7/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset8/index.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset8/js_pp_timer.html
 delete mode 100644 layout/html/tests/printer/frameset/frameset8/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/general/Anieyes.gif
 delete mode 100644 layout/html/tests/printer/general/raptor.jpg
 delete mode 100644 layout/html/tests/printer/general/test0.html
 delete mode 100644 layout/html/tests/printer/general/test1.html
 delete mode 100644 layout/html/tests/printer/general/test2.html
 delete mode 100644 layout/html/tests/printer/general/test3.html
 delete mode 100644 layout/html/tests/printer/general/test4.html
 delete mode 100644 layout/html/tests/printer/general/test5.html
 delete mode 100644 layout/html/tests/printer/general/test6.html
 delete mode 100644 layout/html/tests/printer/hidden_iframe/index.html
 delete mode 100644 layout/html/tests/printer/hidden_iframe/the_iframe.html
 delete mode 100644 layout/html/tests/printer/hidden_iframe/the_iframe1.html
 delete mode 100644 layout/html/tests/printer/hidden_iframe/the_iframe2.html
 delete mode 100644 layout/html/tests/printer/hidden_iframe/the_iframe3.html
 delete mode 100644 layout/html/tests/printer/iframe_2nd_page/iframe_example.html
 delete mode 100644 layout/html/tests/printer/iframe_2nd_page/index.html
 delete mode 100644 layout/html/tests/printer/iframe_2nd_page/the_iframe.html
 delete mode 100644 layout/html/tests/printer/images/Anieyes.gif
 delete mode 100644 layout/html/tests/printer/images/animatedgif.html
 delete mode 100644 layout/html/tests/printer/images/imagegif.html
 delete mode 100644 layout/html/tests/printer/images/imagejpg.html
 delete mode 100644 layout/html/tests/printer/images/raptor.GIF
 delete mode 100644 layout/html/tests/printer/images/raptor.jpg
 delete mode 100644 layout/html/tests/printer/images/test2.html
 delete mode 100644 layout/html/tests/printer/index.html
 delete mode 100644 layout/html/tests/printer/js/change_while_in_printdialog.html
 delete mode 100644 layout/html/tests/printer/js/js_pp_timer.html
 delete mode 100644 layout/html/tests/printer/js/load_new_site_from_js.html
 delete mode 100644 layout/html/tests/printer/js/load_print_close.html
 delete mode 100644 layout/html/tests/printer/js/load_print_close_page2.html
 delete mode 100644 layout/html/tests/printer/js/load_print_reload.html
 delete mode 100644 layout/html/tests/printer/js/load_print_reload_page2.html
 delete mode 100644 layout/html/tests/printer/js/print_from_js.html
 delete mode 100644 layout/html/tests/printer/js/print_from_onload.html
 delete mode 100644 layout/html/tests/printer/js/print_from_script.html
 delete mode 100644 layout/html/tests/printer/long_pages/105_pages.html
 delete mode 100644 layout/html/tests/printer/long_pages/2_pages.html
 delete mode 100644 layout/html/tests/printer/long_pages/8_pages.html
 delete mode 100644 layout/html/tests/printer/misc/abs_pos.html
 delete mode 100644 layout/html/tests/printer/misc/abs_pos2.html
 delete mode 100644 layout/html/tests/printer/misc/embed_obj_tag.html
 delete mode 100644 layout/html/tests/printer/misc/font_size_scaling.html
 delete mode 100644 layout/html/tests/printer/misc/page_with_long_title.html
 delete mode 100644 layout/html/tests/printer/misc/scaled_scrollbars.html
 delete mode 100644 layout/html/tests/printer/more_iframes/iframe_in_iframe/index.html
 delete mode 100644 layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe.html
 delete mode 100644 layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe2.html
 delete mode 100644 layout/html/tests/printer/noframes/simple_main.html
 delete mode 100644 layout/html/tests/printer/noframes/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/printing_checklist.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test1/simple_main.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test1/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test1/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test2/simple_main.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test2/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test2/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test2/simple_sub3.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test3/simple_main.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test4/index.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test5/simple_main.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test5/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test5/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test5/simple_sub3.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test5/sub_iframe.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test6/index.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test6/sub_iframe.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test7/simple_main.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test7/simple_sub1.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test7/simple_sub2.html
 delete mode 100644 layout/html/tests/printer/shrink_to_fit/test7/simple_sub3.html
 delete mode 100644 layout/html/tests/printer/table/table1.html
 delete mode 100644 layout/html/tests/printer/table/table2.html
 delete mode 100644 layout/html/tests/printer/zeropos_iframes/index.html
 delete mode 100644 layout/html/tests/printer/zeropos_iframes/sub_iframe.html
 delete mode 100644 layout/html/tests/style/bugs/bug224188.html
 delete mode 100644 layout/html/tests/style/bugs/bug224737.html
 delete mode 100644 layout/html/tests/style/bugs/bug273719.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-1.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-10.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-11.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-12.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-13.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-14.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-15.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-16.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-2.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-3.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-4.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-5.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-6.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-7.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-8.html
 delete mode 100644 layout/html/tests/style/bugs/bug302186-9.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-1.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-10.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-11.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-12.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-13.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-14.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-2.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-3.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-4.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-5.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-6.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-7.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-8.html
 delete mode 100644 layout/html/tests/style/bugs/bug348809-9.html
 delete mode 100644 layout/html/tests/style/bugs/bug84400-1.html
 delete mode 100644 layout/html/tests/style/bugs/bug84400-2.html
 delete mode 100644 layout/html/tests/style/bugs/bug84400-3.html
 delete mode 100644 layout/html/tests/style/bugs/rtest.lst
 delete mode 100644 layout/html/tests/table/bugs/45621.html
 delete mode 100644 layout/html/tests/table/bugs/97619.html
 delete mode 100644 layout/html/tests/table/bugs/adforce_imgis_com.html
 delete mode 100644 layout/html/tests/table/bugs/bug10009.html
 delete mode 100644 layout/html/tests/table/bugs/bug100334.html
 delete mode 100644 layout/html/tests/table/bugs/bug10036.html
 delete mode 100644 layout/html/tests/table/bugs/bug10039.html
 delete mode 100644 layout/html/tests/table/bugs/bug1010.html
 delete mode 100644 layout/html/tests/table/bugs/bug101201.html
 delete mode 100644 layout/html/tests/table/bugs/bug10140.html
 delete mode 100644 layout/html/tests/table/bugs/bug101674.html
 delete mode 100644 layout/html/tests/table/bugs/bug101759.html
 delete mode 100644 layout/html/tests/table/bugs/bug102145-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug102145-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug102145-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug102145-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug10216.html
 delete mode 100644 layout/html/tests/table/bugs/bug10269-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug10269-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug10296-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug10296-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug103533.html
 delete mode 100644 layout/html/tests/table/bugs/bug104898.html
 delete mode 100644 layout/html/tests/table/bugs/bug1055-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug1055-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug10565.html
 delete mode 100644 layout/html/tests/table/bugs/bug106158-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug106158-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug10633.html
 delete mode 100644 layout/html/tests/table/bugs/bug106336.html
 delete mode 100644 layout/html/tests/table/bugs/bug1067-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug1067-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug106795.html
 delete mode 100644 layout/html/tests/table/bugs/bug106816.html
 delete mode 100644 layout/html/tests/table/bugs/bug106966.html
 delete mode 100644 layout/html/tests/table/bugs/bug108340.html
 delete mode 100644 layout/html/tests/table/bugs/bug109043.html
 delete mode 100644 layout/html/tests/table/bugs/bug11026.html
 delete mode 100644 layout/html/tests/table/bugs/bug110566.html
 delete mode 100644 layout/html/tests/table/bugs/bug1128.html
 delete mode 100644 layout/html/tests/table/bugs/bug11321.html
 delete mode 100644 layout/html/tests/table/bugs/bug113235-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug113235-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug113235-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug11331.html
 delete mode 100644 layout/html/tests/table/bugs/bug113424.html
 delete mode 100644 layout/html/tests/table/bugs/bug11384q.html
 delete mode 100644 layout/html/tests/table/bugs/bug11384s.html
 delete mode 100644 layout/html/tests/table/bugs/bug1163-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug1164.html
 delete mode 100644 layout/html/tests/table/bugs/bug1188.html
 delete mode 100644 layout/html/tests/table/bugs/bug11944.html
 delete mode 100644 layout/html/tests/table/bugs/bug11945.html
 delete mode 100644 layout/html/tests/table/bugs/bug119786.html
 delete mode 100644 layout/html/tests/table/bugs/bug12008.html
 delete mode 100644 layout/html/tests/table/bugs/bug120107.html
 delete mode 100644 layout/html/tests/table/bugs/bug12012.css
 delete mode 100644 layout/html/tests/table/bugs/bug12012.js
 delete mode 100644 layout/html/tests/table/bugs/bug12012.rdf
 delete mode 100644 layout/html/tests/table/bugs/bug12012.xul
 delete mode 100644 layout/html/tests/table/bugs/bug120364.html
 delete mode 100644 layout/html/tests/table/bugs/bug1220.html
 delete mode 100644 layout/html/tests/table/bugs/bug1224.html
 delete mode 100644 layout/html/tests/table/bugs/bug12268.html
 delete mode 100644 layout/html/tests/table/bugs/bug12287.xul
 delete mode 100644 layout/html/tests/table/bugs/bug12384.html
 delete mode 100644 layout/html/tests/table/bugs/bug123862.html
 delete mode 100644 layout/html/tests/table/bugs/bug1261.html
 delete mode 100644 layout/html/tests/table/bugs/bug1262.html
 delete mode 100644 layout/html/tests/table/bugs/bug126742.html
 delete mode 100644 layout/html/tests/table/bugs/bug12709.html
 delete mode 100644 layout/html/tests/table/bugs/bug1271.html
 delete mode 100644 layout/html/tests/table/bugs/bug127267.html
 delete mode 100644 layout/html/tests/table/bugs/bug128229.html
 delete mode 100644 layout/html/tests/table/bugs/bug128876.html
 delete mode 100644 layout/html/tests/table/bugs/bug12908-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug12908-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug12910-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug12910.html
 delete mode 100644 layout/html/tests/table/bugs/bug1296.html
 delete mode 100644 layout/html/tests/table/bugs/bug1302.html
 delete mode 100644 layout/html/tests/table/bugs/bug131020-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug131020-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug131020.html
 delete mode 100644 layout/html/tests/table/bugs/bug131020_iframe.html
 delete mode 100644 layout/html/tests/table/bugs/bug13105.html
 delete mode 100644 layout/html/tests/table/bugs/bug13118.html
 delete mode 100644 layout/html/tests/table/bugs/bug13169.html
 delete mode 100644 layout/html/tests/table/bugs/bug1318.html
 delete mode 100644 layout/html/tests/table/bugs/bug13196.html
 delete mode 100644 layout/html/tests/table/bugs/bug133756-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug133756-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug133948.html
 delete mode 100644 layout/html/tests/table/bugs/bug13484.html
 delete mode 100644 layout/html/tests/table/bugs/bug13526.html
 delete mode 100644 layout/html/tests/table/bugs/bug137388-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug137388-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug137388-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug138725.html
 delete mode 100644 layout/html/tests/table/bugs/bug139524-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug139524-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug139524-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug139524-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug139843.html
 delete mode 100644 layout/html/tests/table/bugs/bug14007-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug14007-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug14159-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug14159-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug14159-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug141818.html
 delete mode 100644 layout/html/tests/table/bugs/bug1430.html
 delete mode 100644 layout/html/tests/table/bugs/bug14323.html
 delete mode 100644 layout/html/tests/table/bugs/bug14489.html
 delete mode 100644 layout/html/tests/table/bugs/bug145572.html
 delete mode 100644 layout/html/tests/table/bugs/bug1474.html
 delete mode 100644 layout/html/tests/table/bugs/bug149275-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug149275-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug14929.html
 delete mode 100644 layout/html/tests/table/bugs/bug15247.html
 delete mode 100644 layout/html/tests/table/bugs/bug154780.html
 delete mode 100644 layout/html/tests/table/bugs/bug15544.html
 delete mode 100644 layout/html/tests/table/bugs/bug157890.html
 delete mode 100644 layout/html/tests/table/bugs/bug159108.html
 delete mode 100644 layout/html/tests/table/bugs/bug15933.html
 delete mode 100644 layout/html/tests/table/bugs/bug16012.html
 delete mode 100644 layout/html/tests/table/bugs/bug16252.html
 delete mode 100644 layout/html/tests/table/bugs/bug1647.html
 delete mode 100644 layout/html/tests/table/bugs/bug17130-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug17130-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug17138.html
 delete mode 100644 layout/html/tests/table/bugs/bug17168.html
 delete mode 100644 layout/html/tests/table/bugs/bug1725.html
 delete mode 100644 layout/html/tests/table/bugs/bug174470.html
 delete mode 100644 layout/html/tests/table/bugs/bug175455-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug17548.html
 delete mode 100644 layout/html/tests/table/bugs/bug17587.html
 delete mode 100644 layout/html/tests/table/bugs/bug17826.html
 delete mode 100644 layout/html/tests/table/bugs/bug178739.html
 delete mode 100644 layout/html/tests/table/bugs/bug178762.html
 delete mode 100644 layout/html/tests/table/bugs/bug178855.xml
 delete mode 100644 layout/html/tests/table/bugs/bug1800.html
 delete mode 100644 layout/html/tests/table/bugs/bug1802.html
 delete mode 100644 layout/html/tests/table/bugs/bug1802s.html
 delete mode 100644 layout/html/tests/table/bugs/bug1809.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-5.html
 delete mode 100644 layout/html/tests/table/bugs/bug1818-6.html
 delete mode 100644 layout/html/tests/table/bugs/bug1828.html
 delete mode 100644 layout/html/tests/table/bugs/bug18359.html
 delete mode 100644 layout/html/tests/table/bugs/bug18440.html
 delete mode 100644 layout/html/tests/table/bugs/bug18558.html
 delete mode 100644 layout/html/tests/table/bugs/bug18664.html
 delete mode 100644 layout/html/tests/table/bugs/bug18770.html
 delete mode 100644 layout/html/tests/table/bugs/bug18955.html
 delete mode 100644 layout/html/tests/table/bugs/bug19061-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug19061-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug19356.html
 delete mode 100644 layout/html/tests/table/bugs/bug194024.html
 delete mode 100644 layout/html/tests/table/bugs/bug19526.html
 delete mode 100644 layout/html/tests/table/bugs/bug19599.html
 delete mode 100644 layout/html/tests/table/bugs/bug196870.html
 delete mode 100644 layout/html/tests/table/bugs/bug2050.html
 delete mode 100644 layout/html/tests/table/bugs/bug20579.html
 delete mode 100644 layout/html/tests/table/bugs/bug2065.html
 delete mode 100644 layout/html/tests/table/bugs/bug20804.html
 delete mode 100644 layout/html/tests/table/bugs/bug2123.html
 delete mode 100644 layout/html/tests/table/bugs/bug21299.html
 delete mode 100644 layout/html/tests/table/bugs/bug21518.html
 delete mode 100644 layout/html/tests/table/bugs/bug215629.html
 delete mode 100644 layout/html/tests/table/bugs/bug217527.html
 delete mode 100644 layout/html/tests/table/bugs/bug21918.html
 delete mode 100644 layout/html/tests/table/bugs/bug219693-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug219693-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug22019.html
 delete mode 100644 layout/html/tests/table/bugs/bug220536.html
 delete mode 100644 layout/html/tests/table/bugs/bug220653.html
 delete mode 100644 layout/html/tests/table/bugs/bug22122.html
 delete mode 100644 layout/html/tests/table/bugs/bug221784-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug221784-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug222336.html
 delete mode 100644 layout/html/tests/table/bugs/bug22246-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug22246-2a.html
 delete mode 100644 layout/html/tests/table/bugs/bug22246-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug22246-3a.html
 delete mode 100644 layout/html/tests/table/bugs/bug222467.html
 delete mode 100644 layout/html/tests/table/bugs/bug222846.html
 delete mode 100644 layout/html/tests/table/bugs/bug22513.html
 delete mode 100644 layout/html/tests/table/bugs/bug2267.html
 delete mode 100644 layout/html/tests/table/bugs/bug227123.xml
 delete mode 100644 layout/html/tests/table/bugs/bug2296.html
 delete mode 100644 layout/html/tests/table/bugs/bug23072.html
 delete mode 100644 layout/html/tests/table/bugs/bug23151.html
 delete mode 100644 layout/html/tests/table/bugs/bug23235.html
 delete mode 100644 layout/html/tests/table/bugs/bug23299.html
 delete mode 100644 layout/html/tests/table/bugs/bug234593.html
 delete mode 100644 layout/html/tests/table/bugs/bug23847.html
 delete mode 100644 layout/html/tests/table/bugs/bug23994.html
 delete mode 100644 layout/html/tests/table/bugs/bug240248.html
 delete mode 100644 layout/html/tests/table/bugs/bug24200.html
 delete mode 100644 layout/html/tests/table/bugs/bug24503.html
 delete mode 100644 layout/html/tests/table/bugs/bug24627.html
 delete mode 100644 layout/html/tests/table/bugs/bug24661.html
 delete mode 100644 layout/html/tests/table/bugs/bug2469.html
 delete mode 100644 layout/html/tests/table/bugs/bug2479-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug2479-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug2479-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug2479-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug2479-5.html
 delete mode 100644 layout/html/tests/table/bugs/bug24880-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug24880.html
 delete mode 100644 layout/html/tests/table/bugs/bug25004.html
 delete mode 100644 layout/html/tests/table/bugs/bug25074.html
 delete mode 100644 layout/html/tests/table/bugs/bug25086.html
 delete mode 100644 layout/html/tests/table/bugs/bug2509.html
 delete mode 100644 layout/html/tests/table/bugs/bug2516.html
 delete mode 100644 layout/html/tests/table/bugs/bug25367.html
 delete mode 100644 layout/html/tests/table/bugs/bug253781.html
 delete mode 100644 layout/html/tests/table/bugs/bug25663.html
 delete mode 100644 layout/html/tests/table/bugs/bug25707.html
 delete mode 100644 layout/html/tests/table/bugs/bug2585.html
 delete mode 100644 layout/html/tests/table/bugs/bug26178.html
 delete mode 100644 layout/html/tests/table/bugs/bug263050.html
 delete mode 100644 layout/html/tests/table/bugs/bug26553.html
 delete mode 100644 layout/html/tests/table/bugs/bug2684.html
 delete mode 100644 layout/html/tests/table/bugs/bug269566.html
 delete mode 100644 layout/html/tests/table/bugs/bug27038-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug27038-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug27038-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug275625.html
 delete mode 100644 layout/html/tests/table/bugs/bug2757.html
 delete mode 100644 layout/html/tests/table/bugs/bug2763.html
 delete mode 100644 layout/html/tests/table/bugs/bug277062.html
 delete mode 100644 layout/html/tests/table/bugs/bug2773.html
 delete mode 100644 layout/html/tests/table/bugs/bug278266.html
 delete mode 100644 layout/html/tests/table/bugs/bug278385.html
 delete mode 100644 layout/html/tests/table/bugs/bug27993-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug27993-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug280009.html
 delete mode 100644 layout/html/tests/table/bugs/bug280217.html
 delete mode 100644 layout/html/tests/table/bugs/bug282172.html
 delete mode 100644 layout/html/tests/table/bugs/bug28341.html
 delete mode 100644 layout/html/tests/table/bugs/bug286137.html
 delete mode 100644 layout/html/tests/table/bugs/bug28856.xul
 delete mode 100644 layout/html/tests/table/bugs/bug2886-2.css
 delete mode 100644 layout/html/tests/table/bugs/bug2886-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug2886.html
 delete mode 100644 layout/html/tests/table/bugs/bug28928.html
 delete mode 100644 layout/html/tests/table/bugs/bug28933.html
 delete mode 100644 layout/html/tests/table/bugs/bug29058-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug29058-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug29058-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug29157.html
 delete mode 100644 layout/html/tests/table/bugs/bug29314.html
 delete mode 100644 layout/html/tests/table/bugs/bug29326.html
 delete mode 100644 layout/html/tests/table/bugs/bug29429.html
 delete mode 100644 layout/html/tests/table/bugs/bug2947.html
 delete mode 100644 layout/html/tests/table/bugs/bug294823.html
 delete mode 100644 layout/html/tests/table/bugs/bug2954.html
 delete mode 100644 layout/html/tests/table/bugs/bug2962.html
 delete mode 100644 layout/html/tests/table/bugs/bug2973.html
 delete mode 100644 layout/html/tests/table/bugs/bug2981-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug2981-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug2997.html
 delete mode 100644 layout/html/tests/table/bugs/bug299723.html
 delete mode 100644 layout/html/tests/table/bugs/bug30273.html
 delete mode 100644 layout/html/tests/table/bugs/bug30332-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug30332-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug3037-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug3037-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug30418.html
 delete mode 100644 layout/html/tests/table/bugs/bug30559.html
 delete mode 100644 layout/html/tests/table/bugs/bug30692.html
 delete mode 100644 layout/html/tests/table/bugs/bug30985.html
 delete mode 100644 layout/html/tests/table/bugs/bug3103.html
 delete mode 100644 layout/html/tests/table/bugs/bug3105.html
 delete mode 100644 layout/html/tests/table/bugs/bug312770.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-10.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-11.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-12.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-13.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-14.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-15.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-16.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-17.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-18.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-5.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-6.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-7.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-8.html
 delete mode 100644 layout/html/tests/table/bugs/bug3166-9.html
 delete mode 100644 layout/html/tests/table/bugs/bug3191.html
 delete mode 100644 layout/html/tests/table/bugs/bug32205-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug32205-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug32205-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug32205-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug32205-5.html
 delete mode 100644 layout/html/tests/table/bugs/bug32447.html
 delete mode 100644 layout/html/tests/table/bugs/bug3260.html
 delete mode 100644 layout/html/tests/table/bugs/bug3263.html
 delete mode 100644 layout/html/tests/table/bugs/bug32841.html
 delete mode 100644 layout/html/tests/table/bugs/bug3309-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug3309-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug33137.html
 delete mode 100644 layout/html/tests/table/bugs/bug33784.html
 delete mode 100644 layout/html/tests/table/bugs/bug33855.html
 delete mode 100644 layout/html/tests/table/bugs/bug34176.html
 delete mode 100644 layout/html/tests/table/bugs/bug34538.html
 delete mode 100644 layout/html/tests/table/bugs/bug3454.html
 delete mode 100644 layout/html/tests/table/bugs/bug3517.html
 delete mode 100644 layout/html/tests/table/bugs/bug35662.html
 delete mode 100644 layout/html/tests/table/bugs/bug3681-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug3681-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug3718.html
 delete mode 100644 layout/html/tests/table/bugs/bug38916.html
 delete mode 100644 layout/html/tests/table/bugs/bug39209.html
 delete mode 100644 layout/html/tests/table/bugs/bug3977.html
 delete mode 100644 layout/html/tests/table/bugs/bug40828.html
 delete mode 100644 layout/html/tests/table/bugs/bug4093.html
 delete mode 100644 layout/html/tests/table/bugs/bug41890.html
 delete mode 100644 layout/html/tests/table/bugs/bug42043.html
 delete mode 100644 layout/html/tests/table/bugs/bug42187.html
 delete mode 100644 layout/html/tests/table/bugs/bug42443.html
 delete mode 100644 layout/html/tests/table/bugs/bug4284.html
 delete mode 100644 layout/html/tests/table/bugs/bug4294.css
 delete mode 100644 layout/html/tests/table/bugs/bug4294.html
 delete mode 100644 layout/html/tests/table/bugs/bug43039.html
 delete mode 100644 layout/html/tests/table/bugs/bug43204.html
 delete mode 100644 layout/html/tests/table/bugs/bug4382.html
 delete mode 100644 layout/html/tests/table/bugs/bug4385.html
 delete mode 100644 layout/html/tests/table/bugs/bug43854-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug43854-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug4427.html
 delete mode 100644 layout/html/tests/table/bugs/bug4429.html
 delete mode 100644 layout/html/tests/table/bugs/bug44505.html
 delete mode 100644 layout/html/tests/table/bugs/bug44523.html
 delete mode 100644 layout/html/tests/table/bugs/bug4501.html
 delete mode 100644 layout/html/tests/table/bugs/bug45055-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug45055.html
 delete mode 100644 layout/html/tests/table/bugs/bug4520.html
 delete mode 100644 layout/html/tests/table/bugs/bug4523.html
 delete mode 100644 layout/html/tests/table/bugs/bug4527.html
 delete mode 100644 layout/html/tests/table/bugs/bug45350.html
 delete mode 100644 layout/html/tests/table/bugs/bug45486.html
 delete mode 100644 layout/html/tests/table/bugs/bug45621.html
 delete mode 100644 layout/html/tests/table/bugs/bug4576.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268-3.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268-4.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268-5.html
 delete mode 100644 layout/html/tests/table/bugs/bug46268.html
 delete mode 100644 layout/html/tests/table/bugs/bug46368-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug46368-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug46480-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug46480-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug46623-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug46623-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug46924.html
 delete mode 100644 layout/html/tests/table/bugs/bug46944.html
 delete mode 100644 layout/html/tests/table/bugs/bug47163.html
 delete mode 100644 layout/html/tests/table/bugs/bug4739.html
 delete mode 100644 layout/html/tests/table/bugs/bug47432.html
 delete mode 100644 layout/html/tests/table/bugs/bug48028-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug48028-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug4803.html
 delete mode 100644 layout/html/tests/table/bugs/bug4849-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug4849.html
 delete mode 100644 layout/html/tests/table/bugs/bug48827.html
 delete mode 100644 layout/html/tests/table/bugs/bug50695-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug50695-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug51000.html
 delete mode 100644 layout/html/tests/table/bugs/bug51037.html
 delete mode 100644 layout/html/tests/table/bugs/bug51140.html
 delete mode 100644 layout/html/tests/table/bugs/bug51727.html
 delete mode 100644 layout/html/tests/table/bugs/bug5188.html
 delete mode 100644 layout/html/tests/table/bugs/bug52505.html
 delete mode 100644 layout/html/tests/table/bugs/bug52506.html
 delete mode 100644 layout/html/tests/table/bugs/bug53663.html
 delete mode 100644 layout/html/tests/table/bugs/bug53690-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug53690-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug53891.html
 delete mode 100644 layout/html/tests/table/bugs/bug54450.html
 delete mode 100644 layout/html/tests/table/bugs/bug5538.html
 delete mode 100644 layout/html/tests/table/bugs/bug55527.html
 delete mode 100644 layout/html/tests/table/bugs/bug55545.html
 delete mode 100644 layout/html/tests/table/bugs/bug55694.html
 delete mode 100644 layout/html/tests/table/bugs/bug55789.html
 delete mode 100644 layout/html/tests/table/bugs/bug56024.html
 delete mode 100644 layout/html/tests/table/bugs/bug56201.html
 delete mode 100644 layout/html/tests/table/bugs/bug56405.html
 delete mode 100644 layout/html/tests/table/bugs/bug56563.html
 delete mode 100644 layout/html/tests/table/bugs/bug57300.html
 delete mode 100644 layout/html/tests/table/bugs/bug57378.html
 delete mode 100644 layout/html/tests/table/bugs/bug57828-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug57828.html
 delete mode 100644 layout/html/tests/table/bugs/bug5797.html
 delete mode 100644 layout/html/tests/table/bugs/bug5798.html
 delete mode 100644 layout/html/tests/table/bugs/bug5799.html
 delete mode 100644 layout/html/tests/table/bugs/bug5835.html
 delete mode 100644 layout/html/tests/table/bugs/bug5838.html
 delete mode 100644 layout/html/tests/table/bugs/bug58402-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug58402-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug59252.html
 delete mode 100644 layout/html/tests/table/bugs/bug59354.html
 delete mode 100644 layout/html/tests/table/bugs/bug60013.html
 delete mode 100644 layout/html/tests/table/bugs/bug60749.html
 delete mode 100644 layout/html/tests/table/bugs/bug60804.html
 delete mode 100644 layout/html/tests/table/bugs/bug60807.html
 delete mode 100644 layout/html/tests/table/bugs/bug60992.html
 delete mode 100644 layout/html/tests/table/bugs/bug61042-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug61042-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug6184.html
 delete mode 100644 layout/html/tests/table/bugs/bug625.html
 delete mode 100644 layout/html/tests/table/bugs/bug6304.html
 delete mode 100644 layout/html/tests/table/bugs/bug63785.html
 delete mode 100644 layout/html/tests/table/bugs/bug6404.html
 delete mode 100644 layout/html/tests/table/bugs/bug641-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug641-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug647.html
 delete mode 100644 layout/html/tests/table/bugs/bug650.html
 delete mode 100644 layout/html/tests/table/bugs/bug65372.html
 delete mode 100644 layout/html/tests/table/bugs/bug6674.html
 delete mode 100644 layout/html/tests/table/bugs/bug67864.html
 delete mode 100644 layout/html/tests/table/bugs/bug67915-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug67915-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug68912.html
 delete mode 100644 layout/html/tests/table/bugs/bug68998.html
 delete mode 100644 layout/html/tests/table/bugs/bug69187.html
 delete mode 100644 layout/html/tests/table/bugs/bug6933.html
 delete mode 100644 layout/html/tests/table/bugs/bug69382-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug69382-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug709.html
 delete mode 100644 layout/html/tests/table/bugs/bug7112-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug7112-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug7113.html
 delete mode 100644 layout/html/tests/table/bugs/bug7121-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug7121-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug72359.xml
 delete mode 100644 layout/html/tests/table/bugs/bug72393.html
 delete mode 100644 layout/html/tests/table/bugs/bug7243.html
 delete mode 100644 layout/html/tests/table/bugs/bug727.html
 delete mode 100644 layout/html/tests/table/bugs/bug73321.html
 delete mode 100644 layout/html/tests/table/bugs/bug7342.html
 delete mode 100644 layout/html/tests/table/bugs/bug73629.html
 delete mode 100644 layout/html/tests/table/bugs/bug7471.html
 delete mode 100644 layout/html/tests/table/bugs/bug75250.html
 delete mode 100644 layout/html/tests/table/bugs/bug7714.html
 delete mode 100644 layout/html/tests/table/bugs/bug78162.html
 delete mode 100644 layout/html/tests/table/bugs/bug8032-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug8032-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug80762-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug80762-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug81934.html
 delete mode 100644 layout/html/tests/table/bugs/bug82946-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug82946-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug8361.html
 delete mode 100644 layout/html/tests/table/bugs/bug83786.html
 delete mode 100644 layout/html/tests/table/bugs/bug8381.html
 delete mode 100644 layout/html/tests/table/bugs/bug8411.css
 delete mode 100644 layout/html/tests/table/bugs/bug8411.xml
 delete mode 100644 layout/html/tests/table/bugs/bug8499.html
 delete mode 100644 layout/html/tests/table/bugs/bug85016.html
 delete mode 100644 layout/html/tests/table/bugs/bug86220.html
 delete mode 100644 layout/html/tests/table/bugs/bug86708.html
 delete mode 100644 layout/html/tests/table/bugs/bug88035-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug88035-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug88524.html
 delete mode 100644 layout/html/tests/table/bugs/bug8858.html
 delete mode 100644 layout/html/tests/table/bugs/bug89315.html
 delete mode 100644 layout/html/tests/table/bugs/bug8950.html
 delete mode 100644 layout/html/tests/table/bugs/bug9024.html
 delete mode 100644 layout/html/tests/table/bugs/bug9072.html
 delete mode 100644 layout/html/tests/table/bugs/bug91057.html
 delete mode 100644 layout/html/tests/table/bugs/bug9123-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug9123-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug92143.html
 delete mode 100644 layout/html/tests/table/bugs/bug92647-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug92647-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug9271-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug9271-2.html
 delete mode 100644 layout/html/tests/table/bugs/bug92868.html
 delete mode 100644 layout/html/tests/table/bugs/bug92868_1.html
 delete mode 100644 layout/html/tests/table/bugs/bug92868_1_test1.css
 delete mode 100644 layout/html/tests/table/bugs/bug92868_1_test2.css
 delete mode 100644 layout/html/tests/table/bugs/bug93363.html
 delete mode 100644 layout/html/tests/table/bugs/bug963.html
 delete mode 100644 layout/html/tests/table/bugs/bug96334.html
 delete mode 100644 layout/html/tests/table/bugs/bug96343.html
 delete mode 100644 layout/html/tests/table/bugs/bug965.html
 delete mode 100644 layout/html/tests/table/bugs/bug97138.html
 delete mode 100644 layout/html/tests/table/bugs/bug97383.html
 delete mode 100644 layout/html/tests/table/bugs/bug98196.html
 delete mode 100644 layout/html/tests/table/bugs/bug9879-1.html
 delete mode 100644 layout/html/tests/table/bugs/bug9879.html
 delete mode 100644 layout/html/tests/table/bugs/bug99923.html
 delete mode 100644 layout/html/tests/table/bugs/bug99948.html
 delete mode 100644 layout/html/tests/table/bugs/helloWorld.html
 delete mode 100644 layout/html/tests/table/bugs/rtest.lst
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug127040.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-1.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-2.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-3.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-4.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-5.html
 delete mode 100644 layout/html/tests/table/collapsing_borders/bug41262-6.html
 delete mode 100644 layout/html/tests/table/core/backgrounds.html
 delete mode 100644 layout/html/tests/table/core/bloomberg.html
 delete mode 100644 layout/html/tests/table/core/borders.html
 delete mode 100644 layout/html/tests/table/core/box_sizing.html
 delete mode 100644 layout/html/tests/table/core/captions.html
 delete mode 100644 layout/html/tests/table/core/captions1.html
 delete mode 100644 layout/html/tests/table/core/captions2.html
 delete mode 100644 layout/html/tests/table/core/captions3.html
 delete mode 100644 layout/html/tests/table/core/cell_heights.html
 delete mode 100644 layout/html/tests/table/core/col_span.html
 delete mode 100644 layout/html/tests/table/core/col_span2.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_auto.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_autoFix.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_autoFixPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_autoPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_fix.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_fixPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_auto_per.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_auto.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_autoFix.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_autoFixPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_autoPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_fix.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_fixPer.html
 delete mode 100644 layout/html/tests/table/core/col_widths_fix_per.html
 delete mode 100644 layout/html/tests/table/core/cols1.html
 delete mode 100644 layout/html/tests/table/core/columns.html
 delete mode 100644 layout/html/tests/table/core/conflicts.html
 delete mode 100644 layout/html/tests/table/core/margins.html
 delete mode 100644 layout/html/tests/table/core/misc.html
 delete mode 100644 layout/html/tests/table/core/nested1.html
 delete mode 100644 layout/html/tests/table/core/one_row.html
 delete mode 100644 layout/html/tests/table/core/row_span.html
 delete mode 100644 layout/html/tests/table/core/rtest.lst
 delete mode 100644 layout/html/tests/table/core/standards1.html
 delete mode 100644 layout/html/tests/table/core/table_frame.html
 delete mode 100644 layout/html/tests/table/core/table_heights.html
 delete mode 100644 layout/html/tests/table/core/table_rules.html
 delete mode 100644 layout/html/tests/table/core/table_widths.html
 delete mode 100644 layout/html/tests/table/dom/appendCells1.html
 delete mode 100644 layout/html/tests/table/dom/appendCellsRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/appendCol1.html
 delete mode 100644 layout/html/tests/table/dom/appendCol2.html
 delete mode 100644 layout/html/tests/table/dom/appendColGroup1.html
 delete mode 100644 layout/html/tests/table/dom/appendRowsExpand1.html
 delete mode 100644 layout/html/tests/table/dom/appendTbodyExpand1.html
 delete mode 100644 layout/html/tests/table/dom/deleteCellsRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/deleteCellsShrink1.html
 delete mode 100644 layout/html/tests/table/dom/deleteCellsShrink2.html
 delete mode 100644 layout/html/tests/table/dom/deleteCol1.html
 delete mode 100644 layout/html/tests/table/dom/deleteCol2.html
 delete mode 100644 layout/html/tests/table/dom/deleteCol3.html
 delete mode 100644 layout/html/tests/table/dom/deleteColGroup1.html
 delete mode 100644 layout/html/tests/table/dom/deleteColGroup2.html
 delete mode 100644 layout/html/tests/table/dom/deleteRowsRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/deleteRowsShrink1.html
 delete mode 100644 layout/html/tests/table/dom/deleteTbodyExpand1.html
 delete mode 100644 layout/html/tests/table/dom/deleteTbodyRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/insertCellsExpand1.html
 delete mode 100644 layout/html/tests/table/dom/insertCellsExpand2.html
 delete mode 100644 layout/html/tests/table/dom/insertCellsRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/insertCellsRebuild2.html
 delete mode 100644 layout/html/tests/table/dom/insertColGroups1.html
 delete mode 100644 layout/html/tests/table/dom/insertColGroups2.html
 delete mode 100644 layout/html/tests/table/dom/insertCols1.html
 delete mode 100644 layout/html/tests/table/dom/insertCols2.html
 delete mode 100644 layout/html/tests/table/dom/insertCols3.html
 delete mode 100644 layout/html/tests/table/dom/insertCols4.html
 delete mode 100644 layout/html/tests/table/dom/insertCols5.html
 delete mode 100644 layout/html/tests/table/dom/insertRowsExpand1.html
 delete mode 100644 layout/html/tests/table/dom/insertRowsRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/insertTbodyExpand1.html
 delete mode 100644 layout/html/tests/table/dom/insertTbodyRebuild1.html
 delete mode 100644 layout/html/tests/table/dom/rtest.lst
 delete mode 100644 layout/html/tests/table/dom/tableDom.html
 delete mode 100644 layout/html/tests/table/dom/tableDom.js
 delete mode 100644 layout/html/tests/table/images/0.gif
 delete mode 100644 layout/html/tests/table/images/002-bizcard-small.gif
 delete mode 100644 layout/html/tests/table/images/1.gif
 delete mode 100644 layout/html/tests/table/images/1.jpg
 delete mode 100644 layout/html/tests/table/images/10empty.jpg
 delete mode 100644 layout/html/tests/table/images/125_ncbug.gif
 delete mode 100644 layout/html/tests/table/images/15.gif
 delete mode 100644 layout/html/tests/table/images/160x160.JPG
 delete mode 100644 layout/html/tests/table/images/160x40.JPG
 delete mode 100644 layout/html/tests/table/images/160x80.JPG
 delete mode 100644 layout/html/tests/table/images/1ptrans.gif
 delete mode 100644 layout/html/tests/table/images/2.gif
 delete mode 100644 layout/html/tests/table/images/2.jpg
 delete mode 100644 layout/html/tests/table/images/24pipe.7.jpg
 delete mode 100644 layout/html/tests/table/images/40x80.JPG
 delete mode 100644 layout/html/tests/table/images/5.jpg
 delete mode 100644 layout/html/tests/table/images/6.jpg
 delete mode 100644 layout/html/tests/table/images/9empty.jpg
 delete mode 100644 layout/html/tests/table/images/Ad-1.GIF
 delete mode 100644 layout/html/tests/table/images/Ad169638St1Sz1Sq1Id2.gif
 delete mode 100644 layout/html/tests/table/images/MBIAuto120x90.gif
 delete mode 100644 layout/html/tests/table/images/N.gif
 delete mode 100644 layout/html/tests/table/images/TopRule.gif
 delete mode 100644 layout/html/tests/table/images/abc.gif
 delete mode 100644 layout/html/tests/table/images/aboutHeader.gif
 delete mode 100644 layout/html/tests/table/images/ad_info.gif
 delete mode 100644 layout/html/tests/table/images/adforce_imgis_com.html
 delete mode 100644 layout/html/tests/table/images/alpha-2.jpg
 delete mode 100644 layout/html/tests/table/images/amazon-logo.gif
 delete mode 100644 layout/html/tests/table/images/ananova.gif
 delete mode 100644 layout/html/tests/table/images/animated.gif
 delete mode 100644 layout/html/tests/table/images/ant.jpg
 delete mode 100644 layout/html/tests/table/images/b_pre2.gif
 delete mode 100644 layout/html/tests/table/images/b_sui.gif
 delete mode 100644 layout/html/tests/table/images/b_sui2.gif
 delete mode 100644 layout/html/tests/table/images/banner.gif
 delete mode 100644 layout/html/tests/table/images/banner_bizinternet.gif
 delete mode 100644 layout/html/tests/table/images/bar.gif
 delete mode 100644 layout/html/tests/table/images/bar_yellow_left.gif
 delete mode 100644 layout/html/tests/table/images/bar_yellow_right.gif
 delete mode 100644 layout/html/tests/table/images/bg.jpg
 delete mode 100644 layout/html/tests/table/images/bkgd_yellow.gif
 delete mode 100644 layout/html/tests/table/images/blue_1x1.gif
 delete mode 100644 layout/html/tests/table/images/bnr_all.gif
 delete mode 100644 layout/html/tests/table/images/bnum.gif
 delete mode 100644 layout/html/tests/table/images/book1.jpg
 delete mode 100644 layout/html/tests/table/images/book2.jpg
 delete mode 100644 layout/html/tests/table/images/box1.gif
 delete mode 100644 layout/html/tests/table/images/box2.gif
 delete mode 100644 layout/html/tests/table/images/box3.gif
 delete mode 100644 layout/html/tests/table/images/breaking_weather_314_anim.gif
 delete mode 100644 layout/html/tests/table/images/browsecathead.gif
 delete mode 100644 layout/html/tests/table/images/bug106024.jpg
 delete mode 100644 layout/html/tests/table/images/bug120107.cgi
 delete mode 100644 layout/html/tests/table/images/bullet.gif
 delete mode 100644 layout/html/tests/table/images/button_go_nav.gif
 delete mode 100644 layout/html/tests/table/images/c-tl.gif
 delete mode 100644 layout/html/tests/table/images/c-tr.gif
 delete mode 100644 layout/html/tests/table/images/canoe.gif
 delete mode 100644 layout/html/tests/table/images/clearpixel.gif
 delete mode 100644 layout/html/tests/table/images/cnn.gif
 delete mode 100644 layout/html/tests/table/images/control.gif
 delete mode 100644 layout/html/tests/table/images/corner.JPG
 delete mode 100644 layout/html/tests/table/images/couverture.jpg
 delete mode 100644 layout/html/tests/table/images/curve.gif
 delete mode 100644 layout/html/tests/table/images/detach.gif
 delete mode 100644 layout/html/tests/table/images/dot.gif
 delete mode 100644 layout/html/tests/table/images/dot_black.gif
 delete mode 100644 layout/html/tests/table/images/edge.gif
 delete mode 100644 layout/html/tests/table/images/edit2.gif
 delete mode 100644 layout/html/tests/table/images/espn.gif
 delete mode 100644 layout/html/tests/table/images/ex22.gif
 delete mode 100644 layout/html/tests/table/images/ex23.gif
 delete mode 100644 layout/html/tests/table/images/ex24.gif
 delete mode 100644 layout/html/tests/table/images/ex25.gif
 delete mode 100644 layout/html/tests/table/images/ex26.gif
 delete mode 100644 layout/html/tests/table/images/ex27.gif
 delete mode 100644 layout/html/tests/table/images/ex29.gif
 delete mode 100644 layout/html/tests/table/images/ex3.gif
 delete mode 100644 layout/html/tests/table/images/ex30.gif
 delete mode 100644 layout/html/tests/table/images/ex31.gif
 delete mode 100644 layout/html/tests/table/images/ex34.gif
 delete mode 100644 layout/html/tests/table/images/ex41.gif
 delete mode 100644 layout/html/tests/table/images/ex43.gif
 delete mode 100644 layout/html/tests/table/images/ex44.gif
 delete mode 100644 layout/html/tests/table/images/ex5.gif
 delete mode 100644 layout/html/tests/table/images/ex51.gif
 delete mode 100644 layout/html/tests/table/images/ex52.gif
 delete mode 100644 layout/html/tests/table/images/ex53.gif
 delete mode 100644 layout/html/tests/table/images/ex54.gif
 delete mode 100644 layout/html/tests/table/images/excite.gif
 delete mode 100644 layout/html/tests/table/images/fall_167x105.jpg
 delete mode 100644 layout/html/tests/table/images/g_back.gif
 delete mode 100644 layout/html/tests/table/images/go.gif
 delete mode 100644 layout/html/tests/table/images/go_earthlink.gif
 delete mode 100644 layout/html/tests/table/images/google.gif
 delete mode 100644 layout/html/tests/table/images/gray.gif
 delete mode 100644 layout/html/tests/table/images/gray2.gif
 delete mode 100644 layout/html/tests/table/images/header-bolt.gif
 delete mode 100644 layout/html/tests/table/images/header-getwinamp.gif
 delete mode 100644 layout/html/tests/table/images/header-highfidelity.gif
 delete mode 100644 layout/html/tests/table/images/header-logotext.gif
 delete mode 100644 layout/html/tests/table/images/home_beige_top.gif
 delete mode 100644 layout/html/tests/table/images/horiz-tall.gif
 delete mode 100644 layout/html/tests/table/images/howstuffworks.gif
 delete mode 100644 layout/html/tests/table/images/icom-logo-micro.gif
 delete mode 100644 layout/html/tests/table/images/icon-unsubscribe.gif
 delete mode 100644 layout/html/tests/table/images/iconchart.gif
 delete mode 100644 layout/html/tests/table/images/join.gif
 delete mode 100644 layout/html/tests/table/images/join_eln.gif
 delete mode 100644 layout/html/tests/table/images/l_logo.gif
 delete mode 100644 layout/html/tests/table/images/latimes.gif
 delete mode 100644 layout/html/tests/table/images/left_menu_bottom2.gif
 delete mode 100644 layout/html/tests/table/images/leftbit.jpg
 delete mode 100644 layout/html/tests/table/images/lime.gif
 delete mode 100644 layout/html/tests/table/images/ll-tall.gif
 delete mode 100644 layout/html/tests/table/images/logo.gif
 delete mode 100644 layout/html/tests/table/images/logo2.gif
 delete mode 100644 layout/html/tests/table/images/logosummer.gif
 delete mode 100644 layout/html/tests/table/images/lr-tall.gif
 delete mode 100644 layout/html/tests/table/images/main-horizontal-scroll.gif
 delete mode 100644 layout/html/tests/table/images/mozilla-banner.gif
 delete mode 100644 layout/html/tests/table/images/mslogo.gif
 delete mode 100644 layout/html/tests/table/images/my16.gif
 delete mode 100644 layout/html/tests/table/images/nav_buy_checklist.gif
 delete mode 100644 layout/html/tests/table/images/nav_top_left_frag_2.gif
 delete mode 100644 layout/html/tests/table/images/navtop_buy_pr.gif
 delete mode 100644 layout/html/tests/table/images/navtop_devzone.gif
 delete mode 100644 layout/html/tests/table/images/navtop_products.gif
 delete mode 100644 layout/html/tests/table/images/next.gif
 delete mode 100644 layout/html/tests/table/images/ns_netcenter_bar_new.gif
 delete mode 100644 layout/html/tests/table/images/orange-arrow.gif
 delete mode 100644 layout/html/tests/table/images/pc.gif
 delete mode 100644 layout/html/tests/table/images/pfeil1.gif
 delete mode 100644 layout/html/tests/table/images/pfeil2.gif
 delete mode 100644 layout/html/tests/table/images/pikajumpr.gif
 delete mode 100644 layout/html/tests/table/images/pixel_none.gif
 delete mode 100644 layout/html/tests/table/images/pxl_df9f3b.gif
 delete mode 100644 layout/html/tests/table/images/pxl_white.gif
 delete mode 100644 layout/html/tests/table/images/raccoon21.jpg
 delete mode 100644 layout/html/tests/table/images/raf_header.gif
 delete mode 100644 layout/html/tests/table/images/rainbowh.gif
 delete mode 100644 layout/html/tests/table/images/rainbowhb.gif
 delete mode 100644 layout/html/tests/table/images/rainbowv.gif
 delete mode 100644 layout/html/tests/table/images/rainbowvb.gif
 delete mode 100644 layout/html/tests/table/images/raptor.jpg
 delete mode 100644 layout/html/tests/table/images/rclogo460.gif
 delete mode 100644 layout/html/tests/table/images/rle.cgi
 delete mode 100644 layout/html/tests/table/images/rnsite_logo.gif
 delete mode 100644 layout/html/tests/table/images/rock_gra.gif
 delete mode 100644 layout/html/tests/table/images/ruler.gif
 delete mode 100644 layout/html/tests/table/images/sbs.gif
 delete mode 100644 layout/html/tests/table/images/sell_side.gif
 delete mode 100644 layout/html/tests/table/images/sell_text1a.gif
 delete mode 100644 layout/html/tests/table/images/sell_text2.gif
 delete mode 100644 layout/html/tests/table/images/sell_text3.gif
 delete mode 100644 layout/html/tests/table/images/sfgate.gif
 delete mode 100644 layout/html/tests/table/images/showattachment.cgi
 delete mode 100644 layout/html/tests/table/images/slc.gif
 delete mode 100644 layout/html/tests/table/images/slr.gif
 delete mode 100644 layout/html/tests/table/images/smblue_paper.gif
 delete mode 100644 layout/html/tests/table/images/spacer.gif
 delete mode 100644 layout/html/tests/table/images/srs.gif
 delete mode 100644 layout/html/tests/table/images/star.gif
 delete mode 100644 layout/html/tests/table/images/sun.gif
 delete mode 100644 layout/html/tests/table/images/support.gif
 delete mode 100644 layout/html/tests/table/images/tab_left.gif
 delete mode 100644 layout/html/tests/table/images/tab_right.gif
 delete mode 100644 layout/html/tests/table/images/take5_change468.gif
 delete mode 100644 layout/html/tests/table/images/tbl-border-conflict.gif
 delete mode 100644 layout/html/tests/table/images/test77.jpg
 delete mode 100644 layout/html/tests/table/images/the_web.gif
 delete mode 100644 layout/html/tests/table/images/title.gif
 delete mode 100644 layout/html/tests/table/images/topnavfeatures.gif
 delete mode 100644 layout/html/tests/table/images/topnavlogin.gif
 delete mode 100644 layout/html/tests/table/images/topnavregister2.gif
 delete mode 100644 layout/html/tests/table/images/tos1.gif
 delete mode 100644 layout/html/tests/table/images/tos3.gif
 delete mode 100644 layout/html/tests/table/images/tos4.gif
 delete mode 100644 layout/html/tests/table/images/tos9.gif
 delete mode 100644 layout/html/tests/table/images/tosdot.gif
 delete mode 100644 layout/html/tests/table/images/trans.gif
 delete mode 100644 layout/html/tests/table/images/transpix.gif
 delete mode 100644 layout/html/tests/table/images/trout.gif
 delete mode 100644 layout/html/tests/table/images/usatoday.gif
 delete mode 100644 layout/html/tests/table/images/valid-html401.png
 delete mode 100644 layout/html/tests/table/images/vh40
 delete mode 100644 layout/html/tests/table/images/w.gif
 delete mode 100644 layout/html/tests/table/images/washingtonpost.gif
 delete mode 100644 layout/html/tests/table/images/wiz438sidebar.gif
 delete mode 100644 layout/html/tests/table/images/wsp600bot.gif
 delete mode 100644 layout/html/tests/table/images/x.gif
 delete mode 100644 layout/html/tests/table/images/yahoo.gif
 delete mode 100644 layout/html/tests/table/interactive/TableIncrementalReflow.html
 delete mode 100644 layout/html/tests/table/interactive/bug105268.html
 delete mode 100644 layout/html/tests/table/interactive/bug106024.html
 delete mode 100644 layout/html/tests/table/interactive/bug107857.html
 delete mode 100644 layout/html/tests/table/interactive/bug110523.html
 delete mode 100644 layout/html/tests/table/interactive/bug111872.html
 delete mode 100644 layout/html/tests/table/interactive/bug1128.html
 delete mode 100644 layout/html/tests/table/interactive/bug113659.html
 delete mode 100644 layout/html/tests/table/interactive/bug114706.html
 delete mode 100644 layout/html/tests/table/interactive/bug11479.html
 delete mode 100644 layout/html/tests/table/interactive/bug127022.html
 delete mode 100644 layout/html/tests/table/interactive/bug127471.html
 delete mode 100644 layout/html/tests/table/interactive/bug1295.html
 delete mode 100644 layout/html/tests/table/interactive/bug130550.html
 delete mode 100644 layout/html/tests/table/interactive/bug135112.html
 delete mode 100644 layout/html/tests/table/interactive/bug138292.html
 delete mode 100644 layout/html/tests/table/interactive/bug144024-1_printing.html
 delete mode 100644 layout/html/tests/table/interactive/bug144024-2_printing.html
 delete mode 100644 layout/html/tests/table/interactive/bug144024-3_printing.html
 delete mode 100644 layout/html/tests/table/interactive/bug151230.html
 delete mode 100644 layout/html/tests/table/interactive/bug175455-1.html
 delete mode 100644 layout/html/tests/table/interactive/bug175455-2.html
 delete mode 100644 layout/html/tests/table/interactive/bug175455-3.html
 delete mode 100644 layout/html/tests/table/interactive/bug19535.html
 delete mode 100644 layout/html/tests/table/interactive/bug27124.html
 delete mode 100644 layout/html/tests/table/interactive/bug39209.html
 delete mode 100644 layout/html/tests/table/interactive/bug40721.html
 delete mode 100644 layout/html/tests/table/interactive/bug42643.html
 delete mode 100644 layout/html/tests/table/interactive/bug43732.html
 delete mode 100644 layout/html/tests/table/interactive/bug44148.html
 delete mode 100644 layout/html/tests/table/interactive/bug47252.html
 delete mode 100644 layout/html/tests/table/interactive/bug52531.html
 delete mode 100644 layout/html/tests/table/interactive/bug52598.html
 delete mode 100644 layout/html/tests/table/interactive/bug66804.html
 delete mode 100644 layout/html/tests/table/interactive/bug72181.html
 delete mode 100644 layout/html/tests/table/interactive/bug7522.html
 delete mode 100644 layout/html/tests/table/interactive/bug77982.html
 delete mode 100644 layout/html/tests/table/interactive/bug80817.html
 delete mode 100644 layout/html/tests/table/interactive/bug8398.html
 delete mode 100644 layout/html/tests/table/interactive/bug86314.html
 delete mode 100644 layout/html/tests/table/interactive/bug8950.html
 delete mode 100644 layout/html/tests/table/interactive/bug9043.html
 delete mode 100644 layout/html/tests/table/interactive/bug90960.html
 delete mode 100644 layout/html/tests/table/interactive/bug91443.html
 delete mode 100644 layout/html/tests/table/interactive/bug91934.html
 delete mode 100644 layout/html/tests/table/interactive/bug92647.html
 delete mode 100644 layout/html/tests/table/interactive/bug94341.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-cell.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-column-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-column.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-quirks.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-row-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table-row.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_border-table.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_fixed-bg.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_index.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_layers-hide.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_layers-opacity.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_layers-show.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table-cell.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table-column-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table-column.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table-row-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table-row.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_position-table.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table-cell.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table-column-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table-column.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table-row-group.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table-row.html
 delete mode 100644 layout/html/tests/table/marvin/backgr_simple-table.html
 delete mode 100644 layout/html/tests/table/marvin/body_col.html
 delete mode 100644 layout/html/tests/table/marvin/body_tbody.html
 delete mode 100644 layout/html/tests/table/marvin/body_tfoot.html
 delete mode 100644 layout/html/tests/table/marvin/body_thead.html
 delete mode 100644 layout/html/tests/table/marvin/col_span.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_align_justify.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_span.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_width_pct.html
 delete mode 100644 layout/html/tests/table/marvin/colgroup_width_px.html
 delete mode 100644 layout/html/tests/table/marvin/common.css
 delete mode 100644 layout/html/tests/table/marvin/rtest.lst
 delete mode 100644 layout/html/tests/table/marvin/table_frame_above.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_below.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_border.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_box.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_hsides.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_lhs.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_rhs.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_void.html
 delete mode 100644 layout/html/tests/table/marvin/table_frame_vsides.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_hidden.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_hidden_table.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_left.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_right.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_caption_top.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_dirty_reflow.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_dirty_reflow_row.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_dirty_reflow_table.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_dirty_reflow_tbody.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_hidden_table.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_hidden_tbody.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_hidden_td.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_hidden_tr.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_cell.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_cell_sibling.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_row.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_row_sibling.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_table.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_table_caption.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_tbody.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_style_reflow_tbody_sibling.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_dynamic_activate.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_dynamic_deactivate.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/table_overflow_td_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/table_row_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/table_row_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/table_row_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/table_rules_all.html
 delete mode 100644 layout/html/tests/table/marvin/table_rules_cols.html
 delete mode 100644 layout/html/tests/table/marvin/table_rules_groups.html
 delete mode 100644 layout/html/tests/table/marvin/table_rules_none.html
 delete mode 100644 layout/html/tests/table/marvin/table_rules_rows.html
 delete mode 100644 layout/html/tests/table/marvin/tables_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/tables_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tables_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_aqua.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_aqua_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_black.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_black_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_blue.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_blue_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_fuchsia.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_fuchsia_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_gray.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_gray_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_green.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_green_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_lime.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_lime_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_maroon.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_maroon_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_navy.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_navy_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_olive.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_olive_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_purple.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_purple_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_red.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_red_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_silver.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_silver_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_teal.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_teal_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_white.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_white_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_yellow.html
 delete mode 100644 layout/html/tests/table/marvin/tables_bgcolor_yellow_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tables_border_0.html
 delete mode 100644 layout/html/tests/table/marvin/tables_border_1.html
 delete mode 100644 layout/html/tests/table/marvin/tables_border_2.html
 delete mode 100644 layout/html/tests/table/marvin/tables_border_3.html
 delete mode 100644 layout/html/tests/table/marvin/tables_caption_align_bot.html
 delete mode 100644 layout/html/tests/table/marvin/tables_caption_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tables_caption_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tables_caption_align_top.html
 delete mode 100644 layout/html/tests/table/marvin/tables_cellpadding.html
 delete mode 100644 layout/html/tests/table/marvin/tables_cellpadding_pct.html
 delete mode 100644 layout/html/tests/table/marvin/tables_cellspacing.html
 delete mode 100644 layout/html/tests/table/marvin/tables_cellspacing_pct.html
 delete mode 100644 layout/html/tests/table/marvin/tables_class.html
 delete mode 100644 layout/html/tests/table/marvin/tables_default.html
 delete mode 100644 layout/html/tests/table/marvin/tables_id.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onclick.html
 delete mode 100644 layout/html/tests/table/marvin/tables_ondblclick.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onkeydown.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onkeypress.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onkeyup.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onmousedown.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onmousemove.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onmouseout.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onmouseover.html
 delete mode 100644 layout/html/tests/table/marvin/tables_onmouseup.html
 delete mode 100644 layout/html/tests/table/marvin/tables_row_th_nowrap.html
 delete mode 100644 layout/html/tests/table/marvin/tables_style.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_colspan.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_height.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_nowrap.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_rowspan.html
 delete mode 100644 layout/html/tests/table/marvin/tables_td_width.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_colspan.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_height.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_rowspan.html
 delete mode 100644 layout/html/tests/table/marvin/tables_th_width.html
 delete mode 100644 layout/html/tests/table/marvin/tables_width_percent.html
 delete mode 100644 layout/html/tests/table/marvin/tables_width_px.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_align_char.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_align_justify.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_char.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/tbody_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/td_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/td_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/td_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/td_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_align_char.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_align_justify.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_char.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/tfoot_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/th_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/th_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/th_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/th_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/thead_align_center.html
 delete mode 100644 layout/html/tests/table/marvin/thead_align_char.html
 delete mode 100644 layout/html/tests/table/marvin/thead_align_justify.html
 delete mode 100644 layout/html/tests/table/marvin/thead_align_left.html
 delete mode 100644 layout/html/tests/table/marvin/thead_align_right.html
 delete mode 100644 layout/html/tests/table/marvin/thead_char.html
 delete mode 100644 layout/html/tests/table/marvin/thead_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/thead_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/thead_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/thead_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_aqua_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_black.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_black_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_blue.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_blue_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_fuchsia.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_fuchsia_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_gray.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_gray_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_green.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_green_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_lime.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_lime_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_maroon.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_maroon_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_navy.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_navy_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_olive.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_olive_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_purple.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_purple_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_red.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_red_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_silver.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_silver_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_teal.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_teal_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_white.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_white_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_yellow.html
 delete mode 100644 layout/html/tests/table/marvin/tr_bgcolor_yellow_rgb.html
 delete mode 100644 layout/html/tests/table/marvin/tr_valign_baseline.html
 delete mode 100644 layout/html/tests/table/marvin/tr_valign_bottom.html
 delete mode 100644 layout/html/tests/table/marvin/tr_valign_middle.html
 delete mode 100644 layout/html/tests/table/marvin/tr_valign_top.html
 delete mode 100644 layout/html/tests/table/marvin/x_caption_align_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_align_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_caption_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_span.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_width_pct.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_width_px.xml
 delete mode 100644 layout/html/tests/table/marvin/x_col_width_rel.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_span.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_width_pct.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_width_px.xml
 delete mode 100644 layout/html/tests/table/marvin/x_colgroup_width_rel.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_bgcolor_name.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_bgcolor_rgb.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_border.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_border_none.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_border_px.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_cellpadding.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_cellpadding_pct.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_cellspacing.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_cellspacing_pct.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_above.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_below.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_border.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_box.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_hsides.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_lhs.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_rhs.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_void.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_frame_vsides.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_rules_all.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_rules_cols.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_rules_groups.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_rules_none.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_rules_rows.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_width_pct.xml
 delete mode 100644 layout/html/tests/table/marvin/x_table_width_px.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tbody_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_bgcolor_name.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_bgcolor_rgb.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_colspan.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_height.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_nowrap.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_rowspan.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_td_width.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tfoot_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_bgcolor_name.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_bgcolor_rgb.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_colspan.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_height.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_nowrap.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_rowspan.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_th_width.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_thead_valign_top.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_align_center.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_align_char.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_align_justify.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_align_left.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_align_right.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_bgcolor_name.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_bgcolor_rgb.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_class.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_id.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_style.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_valign_baseline.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_valign_bottom.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_valign_middle.xml
 delete mode 100644 layout/html/tests/table/marvin/x_tr_valign_top.xml
 delete mode 100644 layout/html/tests/table/other/cell_widths.html
 delete mode 100644 layout/html/tests/table/other/cellspacing.html
 delete mode 100644 layout/html/tests/table/other/empty_cells.html
 delete mode 100644 layout/html/tests/table/other/move_row.html
 delete mode 100644 layout/html/tests/table/other/ms.html
 delete mode 100644 layout/html/tests/table/other/nested2.html
 delete mode 100644 layout/html/tests/table/other/nestedTables.html
 delete mode 100644 layout/html/tests/table/other/padding.html
 delete mode 100644 layout/html/tests/table/other/rtest.lst
 delete mode 100644 layout/html/tests/table/other/slashlogo.html
 delete mode 100644 layout/html/tests/table/other/table-intrinsic-cases-quirks.html
 delete mode 100644 layout/html/tests/table/other/table-intrinsic-cases-standards.html
 delete mode 100644 layout/html/tests/table/other/wa_table_thtd_rowspan.html
 delete mode 100644 layout/html/tests/table/other/wa_table_tr_align.html
 delete mode 100644 layout/html/tests/table/other/wf_table_index.html
 delete mode 100644 layout/html/tests/table/printing/bug102784.html
 delete mode 100644 layout/html/tests/table/printing/bug105166.html
 delete mode 100644 layout/html/tests/table/printing/bug111028.html
 delete mode 100644 layout/html/tests/table/printing/bug111028Bottom.html
 delete mode 100644 layout/html/tests/table/printing/bug111028Middle.html
 delete mode 100644 layout/html/tests/table/printing/bug111028Top.html
 delete mode 100644 layout/html/tests/table/printing/bug123983.html
 delete mode 100644 layout/html/tests/table/printing/bug124041.html
 delete mode 100644 layout/html/tests/table/printing/bug124041_iframe.html
 delete mode 100644 layout/html/tests/table/printing/bug125543.html
 delete mode 100644 layout/html/tests/table/printing/bug126118.html
 delete mode 100644 layout/html/tests/table/printing/bug138349-1.html
 delete mode 100644 layout/html/tests/table/printing/bug138349-2.html
 delete mode 100644 layout/html/tests/table/printing/bug145842.html
 delete mode 100644 layout/html/tests/table/printing/bug153785-1.html
 delete mode 100644 layout/html/tests/table/printing/bug153785-2.html
 delete mode 100644 layout/html/tests/table/printing/bug153785-3.html
 delete mode 100644 layout/html/tests/table/printing/bug153785-4.html
 delete mode 100644 layout/html/tests/table/printing/bug153785-5.html
 delete mode 100644 layout/html/tests/table/printing/bug165772-1.html
 delete mode 100644 layout/html/tests/table/printing/bug165772-2.html
 delete mode 100644 layout/html/tests/table/printing/bug165772-3.html
 delete mode 100644 layout/html/tests/table/printing/bug165772-4.html
 delete mode 100644 layout/html/tests/table/printing/bug165772-5.html
 delete mode 100644 layout/html/tests/table/printing/bug24000-1.html
 delete mode 100644 layout/html/tests/table/printing/bug24000-2.html
 delete mode 100644 layout/html/tests/table/printing/bug26792.html
 delete mode 100644 layout/html/tests/table/printing/bug362348.html
 delete mode 100644 layout/html/tests/table/printing/bug53690.html
 delete mode 100644 layout/html/tests/table/printing/bug54829.html
 delete mode 100644 layout/html/tests/table/printing/bug57378.html
 delete mode 100644 layout/html/tests/table/printing/bug57467.html
 delete mode 100644 layout/html/tests/table/printing/bug58665.html
 delete mode 100644 layout/html/tests/table/printing/bug59280-1.html
 delete mode 100644 layout/html/tests/table/printing/bug59280-2.html
 delete mode 100644 layout/html/tests/table/printing/bug61663.html
 delete mode 100644 layout/html/tests/table/printing/bug66804.html
 delete mode 100644 layout/html/tests/table/printing/bug80966.html
 delete mode 100644 layout/html/tests/table/printing/bug82401.html
 delete mode 100644 layout/html/tests/table/printing/bug85738.html
 delete mode 100644 layout/html/tests/table/printing/bug92215.html
 delete mode 100644 layout/html/tests/table/printing/rtest.lst
 delete mode 100644 layout/html/tests/table/printing/split2Rows.html
 delete mode 100644 layout/html/tests/table/printing/split3Rows.html
 delete mode 100644 layout/html/tests/table/printing/splitCell-1.html
 delete mode 100644 layout/html/tests/table/printing/splitCell-2.html
 delete mode 100644 layout/html/tests/table/printing/tfoot.html
 delete mode 100644 layout/html/tests/table/printing/thead.html
 delete mode 100644 layout/html/tests/table/printing/theadtfoot.html
 delete mode 100644 layout/html/tests/table/testcases/nestedTables.html
 delete mode 100644 layout/html/tests/table/testcases/slashlogo.html
 delete mode 100644 layout/html/tests/table/testcases/wa_table_thtd_rowspan.html
 delete mode 100644 layout/html/tests/table/testcases/wa_table_tr_align.html
 delete mode 100644 layout/html/tests/table/testcases/wf_table_index.html
 delete mode 100644 layout/html/tests/table/viewer_tests/body_col.html
 delete mode 100644 layout/html/tests/table/viewer_tests/rtest.lst
 delete mode 100644 layout/html/tests/table/viewer_tests/test3.html
 delete mode 100644 layout/html/tests/table/viewer_tests/test4.html
 delete mode 100644 layout/html/tests/table/viewer_tests/test6.html
 delete mode 100644 layout/html/tests/xbl/insaneInsertion.css
 delete mode 100644 layout/html/tests/xbl/insaneInsertion.xml
 delete mode 100644 layout/html/tests/xbl/insaneInsertion.xul
 delete mode 100644 layout/html/tests/xbl/insaneInsertion2.xml
 delete mode 100644 layout/html/tests/xbl/rtest.lst

diff --git a/layout/html/tests/FrameSetNav/frameset1/simple_main.html b/layout/html/tests/FrameSetNav/frameset1/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset1/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset1/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset1/simple_sub1.html
deleted file mode 100644
index 74619dbbf153..000000000000
--- a/layout/html/tests/FrameSetNav/frameset1/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset1/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset1/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset1/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset10/simple_main.html b/layout/html/tests/FrameSetNav/frameset10/simple_main.html
deleted file mode 100644
index 9a31d1407953..000000000000
--- a/layout/html/tests/FrameSetNav/frameset10/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub2.html">
-  <FRAME id="frmContent" name="display" src="simple_sub1.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset10/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset10/simple_sub1.html
deleted file mode 100644
index 8c3e1b12bc0b..000000000000
--- a/layout/html/tests/FrameSetNav/frameset10/simple_sub1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset10/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset10/simple_sub2.html
deleted file mode 100644
index 4ff21840bec7..000000000000
--- a/layout/html/tests/FrameSetNav/frameset10/simple_sub2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-</BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset11/simple_main.html b/layout/html/tests/FrameSetNav/frameset11/simple_main.html
deleted file mode 100644
index 18db93c1a653..000000000000
--- a/layout/html/tests/FrameSetNav/frameset11/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="../tabinx_IFrame.html">
-  <FRAME id="frmContent" name="display" src="../tabinx_noIFrame.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset12/simple_main.html b/layout/html/tests/FrameSetNav/frameset12/simple_main.html
deleted file mode 100644
index 61ac78808212..000000000000
--- a/layout/html/tests/FrameSetNav/frameset12/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmContent" name="display" src="../tabinx_noIFrame.html">
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="../tabinx_IFrame.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset13/simple.html b/layout/html/tests/FrameSetNav/frameset13/simple.html
deleted file mode 100644
index 299f5a4a9ca1..000000000000
--- a/layout/html/tests/FrameSetNav/frameset13/simple.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<HTML>
-<body>
-some text
-</body>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset14/simple_main.html b/layout/html/tests/FrameSetNav/frameset14/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset14/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset14/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset14/simple_sub1.html
deleted file mode 100644
index 5e4db80e6bd9..000000000000
--- a/layout/html/tests/FrameSetNav/frameset14/simple_sub1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset14/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset14/simple_sub2.html
deleted file mode 100644
index a858ae8afb81..000000000000
--- a/layout/html/tests/FrameSetNav/frameset14/simple_sub2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-Some text Before >>>>>>>> 
-</BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset15/simple_main.html b/layout/html/tests/FrameSetNav/frameset15/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset15/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset15/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset15/simple_sub1.html
deleted file mode 100644
index 046af00bc14d..000000000000
--- a/layout/html/tests/FrameSetNav/frameset15/simple_sub1.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<IFRAME SRC="sub_iframe2.html" NAME="sub_iframe"> IFRAME TEXT</IFRAME>Some text after<br>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src=raptor.jpg width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset15/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset15/simple_sub2.html
deleted file mode 100644
index 9d7462808a4c..000000000000
--- a/layout/html/tests/FrameSetNav/frameset15/simple_sub2.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<HTML>
-<HEAD>
-<style>
-@media print {
-  iframe {
-    border: 2px inset black;
-  }
-@media screen {
-  iframe {
-    border: 2px inset blue;
-  }
-}
-</style>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-Some text Before >>>>>>>> 
-<IFRAME SRC="sub_iframe.html" NAME="sub_iframe"> IFRAME TEXT</IFRAME>Some text after<br>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset15/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset15/sub_iframe.html
deleted file mode 100644
index 32b58e7a3fc0..000000000000
--- a/layout/html/tests/FrameSetNav/frameset15/sub_iframe.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset15/sub_iframe2.html b/layout/html/tests/FrameSetNav/frameset15/sub_iframe2.html
deleted file mode 100644
index 7ba080840ab1..000000000000
--- a/layout/html/tests/FrameSetNav/frameset15/sub_iframe2.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>sub_iframe2.html title</title>
-</head>
-<body>
-This is sub_iframe2.html
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-<p>
-<input type="submit" name="submit_button" value="Go!">
-</form>
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text More Text More Text More Text More Text More Text More Text More Text More Text More Text 
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-More Text<br>
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset2/simple_main.html b/layout/html/tests/FrameSetNav/frameset2/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset2/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset2/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset2/simple_sub1.html
deleted file mode 100644
index 0f25ccd1eadb..000000000000
--- a/layout/html/tests/FrameSetNav/frameset2/simple_sub1.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset2/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset2/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset2/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset2/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset2/sub_iframe.html
deleted file mode 100644
index 155db95cbd64..000000000000
--- a/layout/html/tests/FrameSetNav/frameset2/sub_iframe.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset3/simple_main.html b/layout/html/tests/FrameSetNav/frameset3/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset3/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset3/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset3/simple_sub1.html
deleted file mode 100644
index 0c908115cf1e..000000000000
--- a/layout/html/tests/FrameSetNav/frameset3/simple_sub1.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset3/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset3/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset3/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset3/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset3/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset3/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset4/simple_main.html b/layout/html/tests/FrameSetNav/frameset4/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset4/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset4/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset4/simple_sub1.html
deleted file mode 100644
index d00d6a7b6231..000000000000
--- a/layout/html/tests/FrameSetNav/frameset4/simple_sub1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>Some text before<iframe src=sub_iframe.html></iframe></BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset4/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset4/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset4/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset4/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset4/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset4/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset5/simple_main.html b/layout/html/tests/FrameSetNav/frameset5/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/FrameSetNav/frameset5/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset5/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset5/simple_sub1.html
deleted file mode 100644
index 2d15b629d7a5..000000000000
--- a/layout/html/tests/FrameSetNav/frameset5/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset5/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset5/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset5/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset5/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset5/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset5/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset6/simple_main.html b/layout/html/tests/FrameSetNav/frameset6/simple_main.html
deleted file mode 100644
index 9a31d1407953..000000000000
--- a/layout/html/tests/FrameSetNav/frameset6/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub2.html">
-  <FRAME id="frmContent" name="display" src="simple_sub1.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset6/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset6/simple_sub1.html
deleted file mode 100644
index 0f25ccd1eadb..000000000000
--- a/layout/html/tests/FrameSetNav/frameset6/simple_sub1.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset6/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset6/simple_sub2.html
deleted file mode 100644
index c1ba49a18589..000000000000
--- a/layout/html/tests/FrameSetNav/frameset6/simple_sub2.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<HTML>
-<HEAD>
-</style>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset6/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset6/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset6/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset7/simple_main.html b/layout/html/tests/FrameSetNav/frameset7/simple_main.html
deleted file mode 100644
index 9a31d1407953..000000000000
--- a/layout/html/tests/FrameSetNav/frameset7/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub2.html">
-  <FRAME id="frmContent" name="display" src="simple_sub1.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset7/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset7/simple_sub1.html
deleted file mode 100644
index 0c908115cf1e..000000000000
--- a/layout/html/tests/FrameSetNav/frameset7/simple_sub1.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset7/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset7/simple_sub2.html
deleted file mode 100644
index c1ba49a18589..000000000000
--- a/layout/html/tests/FrameSetNav/frameset7/simple_sub2.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<HTML>
-<HEAD>
-</style>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset7/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset7/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset7/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset8/simple_main.html b/layout/html/tests/FrameSetNav/frameset8/simple_main.html
deleted file mode 100644
index 9a31d1407953..000000000000
--- a/layout/html/tests/FrameSetNav/frameset8/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub2.html">
-  <FRAME id="frmContent" name="display" src="simple_sub1.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset8/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset8/simple_sub1.html
deleted file mode 100644
index d00d6a7b6231..000000000000
--- a/layout/html/tests/FrameSetNav/frameset8/simple_sub1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>Some text before<iframe src=sub_iframe.html></iframe></BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset8/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset8/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset8/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset8/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset8/sub_iframe.html
deleted file mode 100644
index d1c15b90bc3a..000000000000
--- a/layout/html/tests/FrameSetNav/frameset8/sub_iframe.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-
-</form>
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/frameset9/simple_main.html b/layout/html/tests/FrameSetNav/frameset9/simple_main.html
deleted file mode 100644
index 9a31d1407953..000000000000
--- a/layout/html/tests/FrameSetNav/frameset9/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub2.html">
-  <FRAME id="frmContent" name="display" src="simple_sub1.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset9/simple_sub1.html b/layout/html/tests/FrameSetNav/frameset9/simple_sub1.html
deleted file mode 100644
index 2d15b629d7a5..000000000000
--- a/layout/html/tests/FrameSetNav/frameset9/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/FrameSetNav/frameset9/simple_sub2.html b/layout/html/tests/FrameSetNav/frameset9/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/FrameSetNav/frameset9/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/FrameSetNav/frameset9/sub_iframe.html b/layout/html/tests/FrameSetNav/frameset9/sub_iframe.html
deleted file mode 100644
index 666b641d5bcd..000000000000
--- a/layout/html/tests/FrameSetNav/frameset9/sub_iframe.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-
-</body>
diff --git a/layout/html/tests/FrameSetNav/index.html b/layout/html/tests/FrameSetNav/index.html
deleted file mode 100644
index 90cc23894557..000000000000
--- a/layout/html/tests/FrameSetNav/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head><title>Index of FrameSet Navigation Tests</title></head>
-	<body bgcolor="#c0d0e0">
-  <h2>Index of FrameSet Navigation Tests</h2>
-  <table border=1>
-  <tr><td><center>Test</center></td><td><center>Tab Index</center></td><td><center>IFrame</center></td><td><center>Forward</center></td><td><center>Backward</center></td></tr>
-  <tr><td><a href=tabinx_IFrame.html>Test 1</a></td><td><center>X</center></td><td><center>X</center></td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href=tabinx_noIFrame.html>Test 2</a></td><td><center>X</center></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href=notabinx_IFrame.html>Test 3</a></td><td>&nbsp;</td><td><center>X</center></td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href=no_tabinx_noIFrame.html>Test 4</a></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  </table><br>
-  <table border=1>
-  <tr><td><center>Test</center></td><td><center>Desc</center></td><td><center>Frame</center></td><td><center>Forward</center></td><td><center>Backward</center></td></tr>
-  <tr><td><a href="frameset1/simple_main.html">FrameSet Test #1</a></td><td>Link, Link</td><td>1st</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset2/simple_main.html">FrameSet Test #2</a></td><td>Link, Link, IFrame</td><td>1st</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset3/simple_main.html">FrameSet Test #3</a></td><td>Link, IFrame, Link, IFrame</td><td>1st</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset4/simple_main.html">FrameSet Test #4</a></td><td>IFrame only</td><td>1st</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset5/simple_main.html">FrameSet Test #5</a></td><td>Starts With IFrame ends with Link</td><td>1st</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset6/simple_main.html">FrameSet Test #6</a></td><td>Link, Link, IFrame</td><td>2nd</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset7/simple_main.html">FrameSet Test #7</a></td><td>Link, IFrame, Link, IFrame</td><td>2nd</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset8/simple_main.html">FrameSet Test #8</a></td><td>IFrame only</td><td>2nd</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset9/simple_main.html">FrameSet Test #9</a></td><td>Starts With IFrame ends with Link</td><td>2nd</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset10/simple_main.html">FrameSet Test #10</a></td><td>Single Link in Each Frame</td><td>1st & 2nd</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset11/simple_main.html">FrameSet Test #11</a></td><td>Tab Inx w/ IFrame, Tab Inx</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset12/simple_main.html">FrameSet Test #12</a></td><td>Tab Inx, Tab Inx w/ IFrame</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset13/simple.html">Test #13</a></td><td>Just Text</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset14/simple_main.html">FrameSet Test #14</a></td><td>FrameSet with just text</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  <tr><td><a href="frameset15/simple_main.html">FrameSet Test #15</a></td><td>FrameSet with each frame containing an IFrame</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>
-  </table>
-	</body>
-
-</html>
diff --git a/layout/html/tests/FrameSetNav/no_tabinx_noIFrame.html b/layout/html/tests/FrameSetNav/no_tabinx_noIFrame.html
deleted file mode 100644
index 6cda6b4abe38..000000000000
--- a/layout/html/tests/FrameSetNav/no_tabinx_noIFrame.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head><title>No Tab Index No IFrame</title></head>
-<b>No Tab Index No IFrame</b><br>
-	<body bgcolor="#c0d0e0">
-		<table border="1">
-			<tr>
-				<td>none</td>
-				<td><select ><option>One</select></td>
-			</tr>
-			<tr>
-				<td>none</td>
-				<td><input type="text" name="vorname" ></td>
-			</tr>
-			<tr>
-				<td>none</td>
-				<td><input type="text" name="name" ></td>
-			</tr>
-			<tr>
-				<td width="57"></td>
-				<td><a href="http://195.124.75.172/gigagames/win/index_games_win/0,2261,,00.html?">GIGA GAMES</a></td>
-			</tr>
-		</table> 
-	</body>
-
-</html>
diff --git a/layout/html/tests/FrameSetNav/notabinx_IFrame.html b/layout/html/tests/FrameSetNav/notabinx_IFrame.html
deleted file mode 100644
index c2ac0dc86f90..000000000000
--- a/layout/html/tests/FrameSetNav/notabinx_IFrame.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head><title>No Tab Index With IFrame</title></head>
-<b>No Tab Index With IFrame</b><br>
-	<body bgcolor="#c0d0e0">
-  <iframe src=subdoc_tabindex_iframe.html></iframe>
-		<table border="1">
-			<tr>
-				<td>none</td>
-				<td><select ><option>One</select></td>
-			</tr>
-			<tr>
-				<td>none</td>
-				<td><input type="text" name="vorname" ></td>
-			</tr>
-			<tr>
-				<td>none</td>
-				<td><input type="text" name="name" ></td>
-			</tr>
-			<tr>
-				<td width="57"></td>
-				<td><a href="http://195.124.75.172/gigagames/win/index_games_win/0,2261,,00.html?">GIGA GAMES</a></td>
-			</tr>
-		</table> 
-	</body>
-
-</html>
diff --git a/layout/html/tests/FrameSetNav/raptor.jpg b/layout/html/tests/FrameSetNav/raptor.jpg
deleted file mode 100644
index 243ba9e2d43e0073bd2b8d35f570ea4522b4e408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/FrameSetNav/subdoc_tabindex_iframe.html b/layout/html/tests/FrameSetNav/subdoc_tabindex_iframe.html
deleted file mode 100644
index b25ccad15ef2..000000000000
--- a/layout/html/tests/FrameSetNav/subdoc_tabindex_iframe.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#c0d0e0">
-<input type="text" value="Hardware">
-</body>
-</html>
diff --git a/layout/html/tests/FrameSetNav/tabinx_IFrame.html b/layout/html/tests/FrameSetNav/tabinx_IFrame.html
deleted file mode 100644
index 28219e659762..000000000000
--- a/layout/html/tests/FrameSetNav/tabinx_IFrame.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head><title>Tab Index With IFrame</title></head>
-	<body bgcolor="#c0d0e0">
-<b>Tab Index With IFrame</b><br>
-  <iframe src=subdoc_tabindex_iframe.html></iframe>
-		<table border="1">
-			<tr>
-				<td>tabindex="0"</td>
-				<td><input type="text" name="vorname" tabindex="0"></td>
-			</tr>
-			<tr>
-				<td>tabindex="1"</td>
-				<td><select tabindex="1"><option>One</select></td>
-			</tr>
-			<tr>
-				<td>tabindex="2"</td>
-				<td><input type="text" name="name" tabindex="2"></td>
-			</tr>
-			<tr>
-				<td width="57"></td>
-				<td><a href="http://195.124.75.172/gigagames/win/index_games_win/0,2261,,00.html?">GIGA GAMES</a></td>
-			</tr>
-		</table> 
-	</body>
-
-</html>
diff --git a/layout/html/tests/FrameSetNav/tabinx_noIFrame.html b/layout/html/tests/FrameSetNav/tabinx_noIFrame.html
deleted file mode 100644
index e76ef3a52389..000000000000
--- a/layout/html/tests/FrameSetNav/tabinx_noIFrame.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head><title>Tab Index No IFrame</title></head>
-<b>Tab Index No IFrame</b><br>
-	<body bgcolor="#c0d0e0">
-		<table border="1">
-			<tr>
-				<td>tabindex="0"</td>
-				<td><select tabindex="0"><option>One</select></td>
-			</tr>
-			<tr>
-				<td>tabindex="1"</td>
-				<td><input type="text" name="vorname" tabindex="1"></td>
-			</tr>
-			<tr>
-				<td>tabindex="2"</td>
-				<td><input type="text" name="name" tabindex="2"></td>
-			</tr>
-			<tr>
-				<td width="57"></td>
-				<td><a href="http://195.124.75.172/gigagames/win/index_games_win/0,2261,,00.html?">GIGA GAMES</a></td>
-			</tr>
-		</table>
-	</body>
-
-</html>
diff --git a/layout/html/tests/attributes/br-standard.html b/layout/html/tests/attributes/br-standard.html
deleted file mode 100644
index 31b6bfb35586..000000000000
--- a/layout/html/tests/attributes/br-standard.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
- <head>
-  <title>BR Test</title>
-  <style type="text/css">
-   img.left { float: left; }
-   img.right { float: right; height: 4em; }
-  </style>
- </head>
- <body>
-  <p>
-   <img src="resource:/res/samples/raptor.jpg" class="left">
-   <img src="resource:/res/samples/raptor.jpg" class="right">
-   This text should appear between a left justified and right
-   justified image of a raptor. <br clear="all"> Resize the window
-   such that this paragraph is located between the two images. Then
-   use the form below to change the "clear" attribute of the BR tag
-   that adds a line break between this para and the previous one.
-   Clearing to left should position this para below the big raptor.
-   Clearing to the right or clearing all should position this para
-   below the smaller raptor image.
-  </p>
-  <form action="">
-   <p>
-    Set <code>clear</code> to
-    <select size="1" name="clear">
-     <option value="none">None</option>
-     <option value="left">Left</option>
-     <option value="right">Right</option>
-     <option selected="selected" value="all">All</option>
-    </select>
-    <input type="button" value="Change Clear" onclick="changeClear(); return true;">
-   </p>
-  </form>
-  <script type="application/x-javascript">
-   var br = document.getElementsByTagName("br")[0];
-   function changeClear() {
-     if (document.forms[0].clear.selectedIndex == 0)
-       br.clear = "none";
-     else if (document.forms[0].clear.selectedIndex == 1)
-       br.clear = "left";
-     else if (document.forms[0].clear.selectedIndex == 2)
-       br.clear = "right";
-     else
-       br.clear = "all";
-   }
-  </script>
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/br.html b/layout/html/tests/attributes/br.html
deleted file mode 100644
index 7c09743c5ca4..000000000000
--- a/layout/html/tests/attributes/br.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HTML>
-<BODY>
-<IMG src="resource:/res/samples/raptor.jpg" STYLE="float: left;">
-<IMG src="resource:/res/samples/raptor.jpg" STYLE="float: right; height: 100px;">
-This text should appear between a left justified and right justified image of a raptor.<BR clear="all">
-Resize the window such that this paragraph is located between the two images.  Then 
-use the form below to change the "clear" attribute of the BR tag that adds a line break
-between this para and the previous one.  Clearing to left should position this para below
-the big raptor.  Clearing to the right or clearing all should position this para below the 
-smaller raptor image.
-<FORM>
-<P>
-Set <I>clear</I> to
-<SELECT SIZE="1" NAME="clear">
-<OPTION VALUE="none">None</OPTION>
-<OPTION VALUE="left">Left</OPTION>
-<OPTION VALUE="right">Right</OPTION>
-<OPTION SELECTED VALUE="all">All</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Clear" onClick="changeClear(); return true;">
-</P>
-</FORM>
-<SCRIPT>
-var br = document.getElementsByTagName("br")[0];
-function changeClear() {
-   if (document.forms[0].clear.selectedIndex == 0)
-      br.clear = "none";
-   else if (document.forms[0].clear.selectedIndex == 1)
-      br.clear = "left";
-   else if (document.forms[0].clear.selectedIndex == 2)
-      br.clear = "right";
-   else
-      br.clear = "all";
-}
-</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/div_p_heading.html b/layout/html/tests/attributes/div_p_heading.html
deleted file mode 100644
index 3a7b9cd5143c..000000000000
--- a/layout/html/tests/attributes/div_p_heading.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<HTML>
-<BODY>
-<H1 ALIGN="center">This text is inside an H1 tag.</H1>
-<DIV ALIGN="center" NOSHADE SIZE="5" WIDTH="50">This text is inside a DIV tag.</DIV>
-<P ALIGN="center"> This text is inside a P tag.</P>
-
-<P>
-Use the buttons below to change the align attribute for the text showm
-above.
-</P>
-
-<FORM>
-<P>
-Set <I>align</I> to
-<SELECT SIZE="1" NAME="align">
-<OPTION SELECTED VALUE="center">Center</OPTION>
-<OPTION VALUE="left">Left</OPTION>
-<OPTION VALUE="right">Right</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Align" onClick="changeAlign(); return true;">
-</P>
-</FORM>
-<SCRIPT>
-var h1 = document.getElementsByTagName("h1")[0];
-var div = document.getElementsByTagName("div")[0];
-var para = document.getElementsByTagName("p")[0];
-function changeAlign() {   
-   if (document.forms[0].align.selectedIndex == 0) {
-      h1.align = div.align = para.align = "center";
-   }
-   else if (document.forms[0].align.selectedIndex == 1) {
-      h1.align = div.align = para.align = "left";
-   }
-   else {
-      h1.align = div.align = para.align = "right";
-   }
-}
-</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/font.html b/layout/html/tests/attributes/font.html
deleted file mode 100644
index 078e76513fbb..000000000000
--- a/layout/html/tests/attributes/font.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<BODY>
-
-<BASEFONT COLOR="green" FACE="Times New Roman" SIZE="3">
-<P>
-This text's style is affected by applying style changes to the BASEFONT tag.
-</P>
-<P>
-<FONT COLOR="red" FACE="Arial" SIZE="5">This text is contained in
-a FONT tag.  So, style changes to the BASEFONT and the FONT tag affect it.</FONT>
-</P>
-
-<P>
-Use the form below to apply style changes to the text above.  
-</P>
-
-<FORM>
-<P>
-<INPUT TYPE="radio" NAME="applyTo" VALUE="font" CHECKED>Apply style change to FONT tag <BR>
-<INPUT TYPE="radio" NAME="applyTo" VALUE="basefont">Apply style change to BASEFONT tag <BR>
-</P>
-<P>
-Set <I>size</I> to
-<INPUT TYPE="text" NAME="size" VALUE="5">
-<INPUT TYPE="button" VALUE="Change Size" onClick="changeSize(); return true;">
-</P>
-<P>
-Set <I>face</I> to
-<SELECT SIZE="1" NAME="face">
-<OPTION SELECTED VALUE="times">Times New Roman</OPTION>
-<OPTION VALUE="arial">Arial</OPTION>
-<OPTION VALUE="courier">Courier</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Face" onClick="changeFace(); return true;">
-</P>
-<P>
-Set <I>color</I> to
-<INPUT TYPE="text" NAME="color" VALUE="red">
-<INPUT TYPE="button" VALUE="Change Color" onClick="changeColor(); return true;">
-</P>
-</FORM>
-<SCRIPT>
-var fnt = document.getElementsByTagName("font")[0];
-var basefnt = document.getElementsByTagName("basefont")[0];
-var obj = null;
-
-function determineTarget() {
-   if (document.forms[0].applyTo[0].checked)
-      obj = fnt;
-   else
-      obj = basefnt;
-}
-
-function changeSize() {   
-   determineTarget();
-   obj.size = document.forms[0].size.value;
-}
-
-function changeFace() {
-   determineTarget();
-   if (document.forms[0].face.selectedIndex == 0)
-      obj.face = "Times New Roman";
-   else if (document.forms[0].face.selectedIndex == 1)
-      obj.face = "Arial";
-   else
-      obj.face = "Courier New";
-}
-
-function changeColor() {
-   determineTarget();
-   obj.color = document.forms[0].color.value;
-}
-
-</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/hr.html b/layout/html/tests/attributes/hr.html
deleted file mode 100644
index 6ab42d5be1b7..000000000000
--- a/layout/html/tests/attributes/hr.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<HTML>
-<BODY>
-
-<div style="border: solid; margin: 0 1em 1em 1em; padding: 1em; float: left; background: white;"> floater </div>
-<div style="border: solid; margin: 0 1em 1em 1em; padding: 1em; float: right; background: white;"> another floater </div>
-
-<hr ALIGN="center" NOSHADE SIZE="5" WIDTH="50"> 
-
-<P style="clear:both">
-Use the buttons below to set values for the different attributes for the HR shown
-above.  
-</P>
-
-<FORM>
-<P>
-Set <I>size</I> to
-<INPUT TYPE="text" NAME="size" VALUE="5">
-<INPUT TYPE="button" VALUE="Change Size" onClick="changeSize(); return true;">
-</P>
-<P>
-Set <I>align</I> to
-<SELECT SIZE="1" NAME="align">
-<OPTION SELECTED VALUE="center">Center</OPTION>
-<OPTION VALUE="left">Left</OPTION>
-<OPTION VALUE="right">Right</OPTION>
-<OPTION VALUE="none">None</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Align" onClick="changeAlign(); return true;">
-</P>
-<P>
-Set <I>noshade</I> to
-<SELECT SIZE="1" NAME="noshade">
-<OPTION SELECTED VALUE="true" >True</OPTION>
-<OPTION VALUE="false">False</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change NoShade" onClick="changeNoShade(); return true;">
-</P>
-<P>
-Set <I>width</I> to
-<INPUT TYPE="text" NAME="width" VALUE="50">
-<INPUT TYPE="button" VALUE="Change Width" onClick="changeWidth(); return true;">
-</P>
-<P>
-Set <I>color</I> to
-<INPUT TYPE="text" NAME="color" VALUE="">
-<INPUT TYPE="button" VALUE="Change Color" onClick="changeColor(); return true;">
-</P>
-<P>
-Set <I>background color</I> to
-<INPUT TYPE="text" NAME="bgcolor" VALUE="">
-<INPUT TYPE="button" VALUE="Change Background Color" onClick="changeBGColor(); return true;">
-</P>
-
-</FORM>
-<SCRIPT>
-var hr = document.getElementsByTagName("hr")[0];
-function changeSize() {
-   hr.size = document.forms[0].size.value;
-}
-function changeAlign() {   
-   if (document.forms[0].align.selectedIndex == 0)
-      hr.align = "center";
-   else if (document.forms[0].align.selectedIndex == 1)
-      hr.align = "left";
-   else if (document.forms[0].align.selectedIndex == 2)
-      hr.align = "right";
-   else
-      hr.align = "";
-}
-function changeNoShade(value) {   
-   if (document.forms[0].noshade.selectedIndex == 0)
-      hr.noShade = true;
-   else 
-      hr.noShade = false;
-}
-function changeWidth() {
-   hr.width = document.forms[0].width.value;
-}
-function changeColor() {
-   hr.color = document.forms[0].color.value;
-}
-function changeBGColor() {
-   document.documentElement.style.backgroundColor = document.forms[0].bgcolor.value;
-}
-</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/map_area.html b/layout/html/tests/attributes/map_area.html
deleted file mode 100644
index 52f9d052965a..000000000000
--- a/layout/html/tests/attributes/map_area.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML>
-<BODY>
-<H1>Map and area element test</H1>
-
-<P>
-<IMG SRC="mapimg87.gif" USEMAP="#firstmap" BORDER=0 ALT="This is a tooltip">
-
-<MAP NAME=firstmap>
-<AREA SHAPE=rect ID="upper_left" COORDS="12,15,82,86" HREF=up_left.htm >
-<AREA SHAPE=rect ID="middle_middle" COORDS="122,103,191,172" HREF=mid_mid.htm >
-<AREA SHAPE=rect ID="lower_middle" COORDS="121,192,192,261" HREF=low_mid.htm >
-<AREA SHAPE=circle ID="upper_middle" COORDS="157,52,33" HREF=up_mid.htm >
-<AREA SHAPE=circle ID="middle_left" COORDS="47,135,33" HREF=mid_left.htm >
-<AREA SHAPE=circle ID="lower_right" COORDS="259,227,34" HREF=low_rt.htm >
-<AREA SHAPE=poly ID="lower_left" COORDS="57,198,23,221,23,241,58,265,93,241,93,221"  HREF=low_left.htm >
-<AREA SHAPE=poly ID="middle_right" COORDS="264,106,232,127,230,148,264,171,298,148,298,126"       HREF=mid_rt.htm >
-<AREA SHAPE=poly ID="upper_right" COORDS="261,18,226,41,226,59,263,85,295,59,296,38"  HREF=up_rt.htm >
-<AREA SHAPE=poly ID="left_brown" COORDS="89,8,89,156,5,193,9,223,63,190,97,214,97,246,62,274,109,275,109,98,140,97" HREF = left_brn.htm >
-<AREA SHAPE=poly ID="top_brown" COORDS="94,4,105,22,166,11,164,5"  HREF=top_brn.htm >
-<AREA SHAPE=poly ID="right_brown" COORDS="168,5,169,11,194,33,194,257,265,283,265,270,220,247,220,200,255,179,227,158,227,123,265,98,221,68,220,36,269,6" HREF=rt_brn.htm >
-<AREA SHAPE=default HREF="default.htm">
-</MAP>
-</P>
-
-<FORM>
-<P>
-Set the
-<SELECT SIZE="1" NAME="nth">
-<SCRIPT>
-var m = document.getElementsByTagName("MAP")[0];
-var a = m.areas;
-for (var i = 0; i < a.length-1; i++) {
-  document.write("\<OPTION VALUE=\'" + a[i].id + "\'>" + a[i].id + "\</OPTION>");
-}
-</SCRIPT>
-</SELECT>
-element's
-</P>
-<P>
-shape attribute to
-<SELECT SIZE="1" NAME="shape">
-<OPTION SELECTED VALUE="rect">rect</OPTION>
-<OPTION VALUE="circle">circle</OPTION>
-<OPTION VALUE="poly">poly</OPTION>
-<OPTION VALUE="default">default</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Shape" onClick="changeElementShape(); return true;">
-(turn on visual debugging in the viewer to see the area boundaries)
-</P>
-</FORM>
-<SCRIPT>
-var nth = new Array("upper_left", "middle_middle", "lower_middle",
-                    "upper_middle", "middle_left", "lower_right",
-                    "lower_left", "middle_right", "upper_right",
-		    "left_brown", "top_brown", "right_brown");
-var shapes = new Array("rect", "circle", "poly", "default");
-function changeElementShape() {
-   var area = document.getElementById(nth[document.forms[0].nth.selectedIndex]);
-   area.shape = shapes[document.forms[0].shape.selectedIndex];
-}
-</SCRIPT>
-</BODY>
-</HTML>
-
-
diff --git a/layout/html/tests/attributes/mapimg87.gif b/layout/html/tests/attributes/mapimg87.gif
deleted file mode 100644
index 617d84aba2160f3a3ceddea3e2d527df376685d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5033
zcmYk51z3|^`@kQ34M1L%Zcsu}RHT`JNDI=iF-l4r1ci~K$LQYJMoNzuT_Pc!B1nmf
zzyJY7Q5xJg@caJP|6JF7&i(xEJomXCbxk!H=_d*l*D3aZ(-lHqr#o5xdxV@aB|u3D
z2q6JVWQ}wxBvMC52MHi6WclwwI>jMmdkFa;3ppS}X)|;ZXx{@uC({5RDRfd7fGS2L
zkafS%NzeAZ0{{xNAFzZ@kW2dk0D<fY0Ac`Cw|!4AA|V>yq6|Dtf;UnE76t&61aD#>
zkwyS0HN266><0kU0DuF4C;&(UplQH47U0|&1~@OORZ#4LPOax?0pR>!`oBGwtiW69
z0KgM~Hl3w4B9U$aP;wz0U_s9LH#s@H41n5_leF*sAJhc^#mERp0N_3Cd`}$!EC33>
z_Je}|*EtXw5kW4&udW6FivU3Gs+}A~CKLjS{OW5I0-xoV|2Eagc0k5w1*xx{LST|S
zOTURVe)Z2F5%tsI0^|@r6VN{ZKz1$;JM|~Gha+E|f}D~P!qi?4ZxjWfm(DICLn18#
zP%=>gpj~G~k3=Gz5pw`4c}5&bq#tAgJa`U3Psjv#Kz=K|GZF_tUCs!aL@GWb006B!
zBQzwE2mqx89{e2+n%oAwh1|^FMQ-IUCx5;pO9(r8yYScczg_$6vB+Qjr^J$MC0|P7
zbP$$glM(=BK*W#@DSsc4Ag+f18B#D)nEVK)xXrBf<u<)JV6p(1`~VQa0K(xk2SCvQ
z0A2vV4A)zL8{Re{xg*NWDVPC@+hksTR&Kvzk32+jZwq910NAIvoeNksoQ34V4SW5B
z#0ld27yEo^%T2C^iJrQg{tEyl3E-sU&>-Y?hEviDoA(p)-XN~=YT-1h^Lt`h?m5r*
zSHJ8_y#6qTL$jt}AXU(?%zU7xa0qqBb`YmoTQq`|@m`OhvMwIWQKF#a)T%2Pf2olw
zY++_}eWF<JrB;?OV~H^mkaGMuSdX8svVIf8*_tQNS#CE`W--*@2F^2Gx+x)lt>Qx~
z>~r?WP-E5SN>3uSg2wdM&u?5We^4E6`Z?Vd&MQx8K3z@hOTX=+pbe>6E>B|iPy<Q)
zTAOgc5s*MLm+Lr*#4-i`+uATaidS^`*G;}+GqNt=O>Y*|7c$+|%$CIhYIb<v6VILF
zcC@FOH>ykjRHwexx2V5yn-uKcX8UV1I1gUb@w)A3@5j<mj&8d`!28&rsbY%Tpu^S=
zI=z^n^GuG`p@%~17M91V=eaydCycpzwC9`XflCf0Pok(|n6o|pm6KsO&zIrIgH#z|
zykWJj!_*mjy8%rf#XjX|8_4P3v|uabEU}1Gx=8iFsq&z4(QRFyk~fa&lgd)O-W+<#
zom=cF7ohBrN%T?U(&SeLM1>sUOzyK1GcP?pAVPF(_|h^w-Ajv5gZ!*3Xxj#%)J(@+
z$Y<O{=5GgF1T_+hnuWjwvg6hd=yHP9sJU~+F{W#U(C->gb5+IHg;M1n2!AbM00x~j
zz&2&VNlSjEYsG|K64>ccehOP@X{{w{z3f%S46BbwLy28^^-7sRMZ>PsdMU@Zxs6&u
zXUsgl+XR|dEpP+7nK@*$alLNgP}t2aM$Fl*{!>c9w+212p>ph(Uisywxe@#C%~Nt_
z?^-ss4)QEV2H7iH<Md;<I_<V6w@S_zU&eL(Tto=Q?((=+mnVve3UzLYU#fofRtJY6
zFr#pH9vwRme`yD-_NqH>$eUCSNNjBA4+^vQKkK_Ddn8_`$yENfO#<cmOHF1~dtvm-
z*zUdIh-WuN$5pZOb*h>oCjvt@7T+c(uB&H#dTWeoTOOZw8o4!XVYqy6MyWQ74Q+(A
zsGGi0#z`D?2_{|k?e=P9toay`6W{m{vJr2)U@d#R`+2NE>zTzHCQF$)uuw4X=OErI
zelr2_I?coas}DIVf8NQPv?Rh`mo3xOKw60C)%e3GobMmPMhI4_+3>}f`_2~{{@|ma
zxJGl(RvY_GxgTBhmH}gZF6h>Tp?g;=ZRiHM+GZyd?T&v=Z(J$b{ebv{vgw2;dhSP?
zw%4q`woeS6AFbMIJMyK!iaU1Fvi#uV+una5=JRsNiuCxB(s?S+5O1ODe{N2+ofr0m
z(YWRY4I<ipX%bAI(`If9`#y;6th%w(%6UnC4RbZ@M+oeR71dqA6o!2FNKsJiWk1F)
zYGscoX89*SNfJ$Umny}=<c*B4=16DmQqY<xA9K?-s<n5+?jTWS`F}+BRRUF?IT{w^
z9|o^Vh&s?l0drQ&V>>;~5y=WNMtYY=z=F3@k|SLBOxQbr_a1cXC&(4>=50oIaIf68
z`ty%1H?yf~=ZJoiCyyP?dsx2>|GW5DTpI2BFm4TJWPo<JE&u&`^)5Su)cEIitoK>@
z^xVgjUPdhPAHcNsj%n}U?TAQoKXrlLZL?Yl`&%EpA1MXvpvu{7Z-lN6J<LeScq97$
z<}@9f9fr~;m2dd=ue1tBp4;h8<*|}Ig~P7S-q@mzBI#J<qh|@;mP8tXkHM_k4E~0g
zg|t<>UO&<hL~<f%r*2iQ*h$rwr#46M`03Yd*7nd9!<>pYHp6I2oWMn+z&*QFw{ru7
z$k*a|{I3MnIN5aHc^V}>NKI;FFq2G9kif9@4Bx$xX)yYGGk|7<LvvhEA{?U+j<3!X
z?3AWwcNQxW&vK%(=Tm<CDa}XXZrNf|%Xn%q!9a(|*AT^~f)W>ad0ui=0Y#m+3fggh
zd~W06fXo!0$wNX})y2#gqu8`U7t}nsK7Xyx;4V>u*Wf+7F}pN2I!wpP|D(v_C*K?O
z8I$5SY(HrY)Ej5`GZGSrU+sC0WT$o<3fB%bt=~(5yXble|9Im(Bj#SWV+3knsE$lp
zO0{*9g6m-MErX8rCT0_Jm+fG+-wqoFbv|}wgyr1&lxr!V^2Ok}qp#O34Ig~nC*i9t
zL+OU>S=j8sD=YE~|9T{HwX*izBJ$4f-0&1*=QNT<v`s%_4EzvVvv<hXcC)Z5I9a~p
zvRj$xua8@=>4=|6+u9w^I;#}i@)vS1vUIMUjD-g{SlcSgbkb$(N8SqjlB?p_75%|8
zORoIG)un<?B7ZePXV{vSSF`8BsAsH&xiO18mD1w<!8j)xmfDb+UTZT#h`u)DI<s;A
z5r2(qJclvghUozD<ZfzsIhgXHU#+27xxpmSPKvlcWH`PFFAT`z4ocCG-te;E2q0#Q
z&yt3<MD0yZ1{~N@54uZ67Wr2}Dk%*I%`d9GvNJD(CFKi88MF1!-*G9M?{+-{GkCOn
z;<!?>D%!%`xx8uav#LyJj>Bx8!}*}e8X{irs_lQuY93^2KP>kt>g6jtIC>)gReuod
zjSrX6`H0i>GRsgaaQ9uC6@KWAZh!n8#42KjG?<y`!tLa=GP%+(&UxE0a#!7Nn~NFP
z>3%-H-f%****v2&dH<zTblx{M_p5y$-r<q>dero@N3C)VmTUDDhlUJu?6YY;wJrc#
zs^8L1#b$PVt2EXl#PY+!Z?z_2-G6@=4GquVOB3(Ds!#`?7N0eMN?jZOHj$9=VzGu)
zDN_+1^AnUGu(W4e)~8G5#U%ME<yWL^UuoR7EgZB!<x4BKRsJg)FSzD%Q+h}~^0D6g
zA6d%`(6N^lUJOgcU;XHu#(lY_{^2(J>dr+y^)P6>g56^MLgD_{tv_0oQum7;1SH2M
zvbXE2<`M4P{z^;1yY(xCkJe)z^nH(gek-3~yo()jw%UGo(toN7Pz;<raaV}E^r?st
z7$|p(-w)=KHHzvBu(IGf7@bc0u23xdRv>%NO+0POi*&q*5B@o<_-7|;4@7MH^!2S`
z)y{9xwq@NanC8UmpB;((-*s|e#cZFyo2=%qpcIc+rne5to*r$bC~B>9XYY@i29S2Q
z{v3^0jUVY<BJK3#3}CRSM>4kqb}Dq4-riH#T-oB8UrpRytc53k7tsB&s=d7zq%Qp;
z#1|eW9a11|aV!upGaZaa`Ov_E%}~Ldi04+tA?Q^Y266Yw{$ugt(6+wN{Jl_ZuTUOz
zD5ay{O>nRvrMB)<9k8S~T}jXopHHJNgy0JnK=>P73aXc8k3e}};(w-u4(Su{eEQRe
zVk*2YGUAV^?-Fwm55il7B2tex@{4+;v_^2Fq$e01d9yEaV>J?x2{nX8vLal}WbSNC
zg*~nI3~6w_VeI*($c=BtMVLN>PcTTv*l4r};e~#Fn<a{|NAalF<AM=HiiD1m5j2Tq
zyw8VF?(Q`mO7pjJjN}oQkA<n;Md?Mag*^h_(Mg5-8#%xtjXT6+yw?IaXYQ5E2<A8{
zX4PA2vqTu9ZHD!w>Z9F~-WcJcqk@(ZQq!@LyetX3cZp&4w3JBe8CcDXamB9Vb8q`y
z(-{4zI7=grAxdSR8oM!YoHH1)(WCbJ!c%mZL!_!$tw6;4FH(7ucIz`*n``!iyYOWe
zWYUY6ik(===a#!RR!jS8y)qG3QlOA1<av{%C(o0_y<>XnlV%E?ch5Pn954{0lNRYM
z09NCPsYptulxuuE3{)1_?POXL7jRxm;=7m}H5)z%T%c5hXC-BY^wUX(RrsC|@}ZQ2
z<ZLpiH=ubum4`LWOe!rMm4IwW6{ASi`kJQTm8wAn(t_BUsHIEFGMHu>L7c49*Z9=F
z#xYA};Ca)JY%=T)($(oQwlAhze1*CSJ#n1nc81*M^g*@iqbOKWku0441E`4$s9?=h
zzf8d}zkB|fiQW)9h#LCMgCzR{2-1%~dNwIlmLnZ0kt76FkjlU!8M6=2p|dY4HDp;c
zF`CuMVf2^~M)Z1L?4e^)d2<v`jXlUIxtN%6MOO71EBmm1V!2mhfHLZtqiLI_N;?(L
zEh_KsgS2QN9+)ilDg+yEYuRCpJ0VK-Yi7N6%DO+5GDX@K#9wgI%ZUF0i{m*b?LLtB
zPKLepB4n#6*7ZUhd?^YetE>LdZcQ^M(-HaV<+C|`H%6Y=t<qR545L~T1DVOvzT`K?
z6pNvZ@2WR$iK1K8%%vBKS(nT^Vu@F$iiw|bJfZZ+smbAt$z>?Z)q0Wlk58^nzghw~
zM+=>;pve+0C|Kl}zorqLxSz-99E&P>Nv9Q|#_KMv6(i;B=z&(aEoTm5Q&Db4JV!_H
zPkWdbWm|i>Yd9BH!J-=mqGvM-olQbZ`;%^z75vF8a3gANN<KAQLRvVZKb7JZ2JY!l
z%bkp4?C7H%%~H6uu-~alOv~H@*or~~ixq@Xp(L}caDR))7y~>1j39pmJSIK<Fe`De
z<W|`u%lG_UCGg&NnJ1aK5}4v)Scylc(a$}TPW>_w|1uWvLp-&`@899*vV0}Bs1mlw
z@5FSUl0c;krIIa0%2W8#Lp(22VdEV9n^7@a9d3-R)V`$LQaYAeg=3Wh-)ffAf9Q-b
z6PxjWfKV>!aW2c;uNaU+m$QUp5#jT~CD;9<+~n{R7Yy!#E4#~z)`XGk)RiS+Re~i|
zIRDCOOl9+`fuCgMa*Pg#1L0!~VR$d)yB49N48P4*VB;UbfUUZ6<a_K-_=6#UItjCf
z)sLK_=Nw&0Es?rTH8IgOulf*dycJBOsTzMRkvkin#tc;na#hdgN{@|d7)5Fo@TE!t
zD(oAjDjU`J<#SG2tYz>{g0;0W_H}w9HGPL6a?m<mEN<MtILj_XN1gz_-0-hmt*k^n
z{qGvfN0#a?#aRDpR~IGwqfjO+{u;JA8r)b_D`4^n`SfyylSqS1OV|bGrmob+2~4RM
zwr*v;QR{q@hls;7_6Bc!<IZ}KYGG3hbt8nmT2r|B#bh&=d{cLSql9oBc&<5H<UZGn
z>VTtKwt%Mh!XB!ykQ(-yd}vYQkoDvKu-2nO5omM)RtPj(-i2@OZY^Mgy&B*%`?%_H
zH212v1>pz2Sta7?uuph}Z=oSA>dKZunR@b84%_PR1`qGOZmDl8pK2S%*Nn2i)>zIT
zL|05cs$#*umUnK=YhwG34I3mDZU?ljx90v{!Ca*_{sC>fz)^n^V7ixSS77L2L>+td
zQ-fYR(HzqbhlKU8Cr9>VQ-hG7qf%TCJIq?+UB$D-{kmF?UM^sBZgJe@=fF+QbT~P;
zT?1h(FD6LGNe)NFu9S2sIcLlX<63{?JRBfg!}$`eck;$FMa}t|AnA|qCN@#`l+E^-
z*z^#QJ>Xx7y5`;Xnmzo&z1u9#D<ZH0+0<{D3G8fd+_jU<HQzXc;<vQ=Uc5@@W9<uR
zCe$E%d_lQ>^T~3!{D_3O-W$IC?mP(z!`e|C1K5iLX`%zhfdeY81DLo0n(2W+P=9V5
z#zAs$xjv&PF7b~4K%8h!X<%~D@F4nNkT9HYv)N<(U}!KM{GfaYVcs9TKGa2%avn6?
zYhIJ<KRgKHHJTq9(jMrbsTl)}AhFz&fg`XfwwYHWG%LgN$0G|Iql=)?W%JP$94!R}
GApak0g=7f;

diff --git a/layout/html/tests/attributes/ol_li.html b/layout/html/tests/attributes/ol_li.html
deleted file mode 100644
index b328091529ad..000000000000
--- a/layout/html/tests/attributes/ol_li.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<HTML>
-<BODY>
-<h1>Attribute tests for OL and LI elements</h1>
-<ol ID="myol">
-  <li id="1st">One</li>
-  <li id="2nd">Two 
-    <ol>
-      <li>Apples</li>
-      <li>Oranges</li>
-      <li>Bananas</li>
-    </ol>
-  </li>
-  <li id="3rd">Three</li>
-</ol>
-<P>
-Use the buttons below to change the attributes of the OL and LI elements.
-</P>
-
-<FORM>
-<P>
-Set OL element's <I>type</I> to
-<SELECT SIZE="1" NAME="type">
-<OPTION SELECTED VALUE="1">numerical</OPTION>
-<OPTION VALUE="a">lower arabic</OPTION>
-<OPTION VALUE="A">upper ararbic</OPTION>
-<OPTION VALUE="i">lower roman</OPTION>
-<OPTION VALUE="I">upper roman</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeType(); return true;">
-</P>
-<P>
-Set OL element's <I>start</I> to
-<INPUT TYPE="text" MAXLENGTH="2" SIZE="2" NAME="start">
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeStart(); return true;">
-</P>
-<P>
-Set the
-<SELECT SIZE="1" NAME="nth">
-<OPTION SELECTED VALUE="1st">1st</OPTION>
-<OPTION VALUE="2nd">2nd</OPTION>
-<OPTION VALUE="3rd">3rd</OPTION>
-</SELECT>
-LI element's <I>type</I> attribute to
-<SELECT SIZE="1" NAME="type2">
-<OPTION SELECTED VALUE="1">numerical</OPTION>
-<OPTION VALUE="a">lower arabic</OPTION>
-<OPTION VALUE="A">upper ararbic</OPTION>
-<OPTION VALUE="i">lower roman</OPTION>
-<OPTION VALUE="I">upper roman</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeElementType(); return true;">
-</P>
-<P>
-Set the
-<SELECT SIZE="1" NAME="nth2">
-<OPTION SELECTED VALUE="1st">1st</OPTION>
-<OPTION VALUE="2nd">2nd</OPTION>
-<OPTION VALUE="3rd">3rd</OPTION>
-</SELECT>
-LI element's <I>value</I> attribute to
-<INPUT TYPE="text" MAXLENGTH="2" SIZE="2" NAME="start2">
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeElementStart(); return true;">
-</P>
-</P>
-</FORM>
-<SCRIPT>
-var ol = document.getElementById("myol");
-var types = new Array("1", "a", "A", "i", "I");
-function changeType() {
-   ol.type = types[document.forms[0].type.selectedIndex];
-}
-
-function changeStart() {
-   ol.start = Number(document.forms[0].start.value);
-}
-
-// We should be able to do this with the select elements value, but
-// since that doesn't work we need to maintain this array.
-var nth = new Array("1st", "2nd", "3rd");
-function changeElementType() {
-   var li = document.getElementById(nth[document.forms[0].nth.selectedIndex]);
-   li.type = types[document.forms[0].type2.selectedIndex];
-}
-
-function changeElementStart() {
-   var li = document.getElementById(nth[document.forms[0].nth2.selectedIndex]);
-   li.value = Number(document.forms[0].start2.value);
-}
-</SCRIPT>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/pre.html b/layout/html/tests/attributes/pre.html
deleted file mode 100644
index 8d3d8b6e76f9..000000000000
--- a/layout/html/tests/attributes/pre.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<BODY>
-<PRE WIDTH="50">
-This text is within a PRE tag.  This text is within a PRE tag.
-This text is within a PRE tag.  This text is within a PRE tag.
-This text is within a PRE tag.  This text is within a PRE tag.
-This text is within a PRE tag.  This text is within a PRE tag.
-This text is within a PRE tag.  This text is within a PRE tag.
-</PRE>
-<P>
-Use the buttons below to change the width attributes for the preformatted text above.  
-</P>
-
-<FORM>
-<P>
-Set <I>width</I> to
-<INPUT TYPE="text" NAME="width" VALUE="50">
-<INPUT TYPE="button" VALUE="Change Width" onClick="changeWidth(); return true;">
-</P>
-
-</FORM>
-<SCRIPT>
-var pre = document.getElementsByTagName("pre")[0];
-function changeWidth() {
-   pre.width = Math.abs(document.forms[0].width.value);
-}
-</SCRIPT>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/attributes/ul_li.html b/layout/html/tests/attributes/ul_li.html
deleted file mode 100644
index bcec5ab1e338..000000000000
--- a/layout/html/tests/attributes/ul_li.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<BODY>
-<h1>Attribute tests for UL and LI elements</h1>
-<ul ID="myul">
-  <li id="1st">One</li>
-  <li id="2nd">Two
-    <ul>
-      <li>Apples</li>
-      <li>Oranges</li>
-      <li>Bananas</li>
-    </ul>
-  </li>
-  <li id="3rd">Three</li>
-</ul>
-
-<P>
-Use the buttons below to change the attributes of the UL and LI elements.
-</P>
-
-<FORM>
-<P>
-Set UL element's <I>type</I> to
-<SELECT SIZE="1" NAME="type">
-<OPTION SELECTED VALUE="disc">disc</OPTION>
-<OPTION VALUE="circle">circle</OPTION>
-<OPTION VALUE="square">square</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeType(); return true;">
-</P>
-<P>
-Set the
-<SELECT SIZE="1" NAME="nth">
-<OPTION SELECTED VALUE="1st">1st</OPTION>
-<OPTION VALUE="2nd">2nd</OPTION>
-<OPTION VALUE="3rd">3rd</OPTION>
-</SELECT>
-LI element's <I>type</I> attribute to
-<SELECT SIZE="1" NAME="type2">
-<OPTION SELECTED VALUE="disc">disc</OPTION>
-<OPTION VALUE="circle">circle</OPTION>
-<OPTION VALUE="square">square</OPTION>
-</SELECT>
-<INPUT TYPE="button" VALUE="Change Type" onClick="changeElementType(); return true;">
-</P>
-</FORM>
-<SCRIPT>
-var ul = document.getElementById("myul");
-function changeType() {
-   if (document.forms[0].type.selectedIndex == 0) {
-      ul.type = "disc";
-   }
-   else if (document.forms[0].type.selectedIndex == 1) {
-      ul.type = "circle";
-   }
-   else {
-      ul.type = "square";
-   }
-}
-
-// We should be able to do this with the select elements value, but
-// since that doesn't work we need to maintain this array.
-var nth = new Array("1st", "2nd", "3rd");
-function changeElementType() {
-   var li = document.getElementById(nth[document.forms[0].nth.selectedIndex]);
-   if (document.forms[0].type2.selectedIndex == 0) {
-      li.type = "disc";
-   }
-   else if (document.forms[0].type2.selectedIndex == 1) {
-      li.type = "circle";
-   }
-   else {
-      li.type = "square";
-   }  
-}
-</SCRIPT>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/base/intrinsic-cases-quirks.html b/layout/html/tests/block/base/intrinsic-cases-quirks.html
deleted file mode 100644
index b2dc22895af7..000000000000
--- a/layout/html/tests/block/base/intrinsic-cases-quirks.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<html>
-<head>
-<title>Intrinsic width cases</title>
-<style type="text/css">
-
-table, td { margin: 0; border-spacing: 0; border: none; padding: 0; }
-
-td { background: #f6f; padding: 2px 0; }
-div.contain { background: #99f; padding: 2px 0; }
-
-hr, table, div.contain { clear: left; }
-table, div.contain { float: left; margin: 0.5em; }
-
-.narrow { width: 1px; }
-
-
-</style>
-</head>
-<body>
-
-<table><tr><td>
-text text
-</td></tr></table>
-<div class="contain">
-text text
-</div>
-<table class="narrow"><tr><td>
-text text
-</td></tr></table>
-<div class="contain narrow">
-text text
-</div>
-
-<table><tr><td>
-<div style="width: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="width: 100%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 100%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 100%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 100%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="width: 150%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 150%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 150%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 150%;background:yellow;">text</div>
-</div>
-
-<hr>
-
-<table><tr><td>
-<div style="margin-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="margin-left: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="margin-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="margin-left: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="padding-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="padding-left: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="padding-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="padding-left: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="margin-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="margin-right: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="margin-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="margin-right: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="padding-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="padding-right: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="padding-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="padding-right: 50%;background:yellow;">text</div>
-</div>
-
-<hr>
-
-<table><tr><td>
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</div>
-
-<hr>
-
-<table><tr><td>
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</div>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/base/intrinsic-cases-standards.html b/layout/html/tests/block/base/intrinsic-cases-standards.html
deleted file mode 100644
index eb04b6b3c7aa..000000000000
--- a/layout/html/tests/block/base/intrinsic-cases-standards.html
+++ /dev/null
@@ -1,212 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>Intrinsic width cases</title>
-<style type="text/css">
-
-table, td { margin: 0; border-spacing: 0; border: none; padding: 0; }
-
-td { background: #f6f; padding: 2px 0; }
-div.contain { background: #99f; padding: 2px 0; }
-
-hr, table, div.contain { clear: left; }
-table, div.contain { float: left; margin: 0.5em; }
-
-.narrow { width: 1px; }
-
-
-</style>
-</head>
-<body>
-
-<table><tr><td>
-text text
-</td></tr></table>
-<div class="contain">
-text text
-</div>
-<table class="narrow"><tr><td>
-text text
-</td></tr></table>
-<div class="contain narrow">
-text text
-</div>
-
-<table><tr><td>
-<div style="width: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="width: 100%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 100%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 100%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 100%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="width: 150%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="width: 150%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="width: 150%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="width: 150%;background:yellow;">text</div>
-</div>
-
-<hr>
-
-<table><tr><td>
-<div style="margin-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="margin-left: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="margin-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="margin-left: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="padding-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="padding-left: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="padding-left: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="padding-left: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="margin-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="margin-right: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="margin-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="margin-right: 50%;background:yellow;">text</div>
-</div>
-
-<table><tr><td>
-<div style="padding-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain">
-<div style="padding-right: 50%;background:yellow;">text</div>
-</div>
-<table class="narrow"><tr><td>
-<div style="padding-right: 50%;background:yellow;">text</div>
-</td></tr></table>
-<div class="contain narrow">
-<div style="padding-right: 50%;background:yellow;">text</div>
-</div>
-
-<hr>
-
-<table><tr><td>
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 50%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 100%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="width: 150%;background:yellow;" src="../images/green-square">
-</div>
-
-<hr>
-
-<table><tr><td>
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 50%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 100%;background:yellow;" src="../images/green-square">
-</div>
-
-<table><tr><td>
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain">
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</div>
-<table class="narrow"><tr><td>
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</td></tr></table>
-<div class="contain narrow">
-<img style="display:block; width: 150%;background:yellow;" src="../images/green-square">
-</div>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/base/intrinsic-with-box-sizing-strict.html b/layout/html/tests/block/base/intrinsic-with-box-sizing-strict.html
deleted file mode 100644
index 2acffa2d9f1e..000000000000
--- a/layout/html/tests/block/base/intrinsic-with-box-sizing-strict.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<body>
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green">
-</div>
-</div>
-
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green; -moz-box-sizing: padding-box">
-</div>
-</div>
-
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green; -moz-box-sizing: border-box">
-</div>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/block/base/intrinsic-with-box-sizing.html b/layout/html/tests/block/base/intrinsic-with-box-sizing.html
deleted file mode 100644
index 22d503619064..000000000000
--- a/layout/html/tests/block/base/intrinsic-with-box-sizing.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<body>
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green">
-</div>
-</div>
-
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green; -moz-box-sizing: padding-box">
-</div>
-</div>
-
-<div style="float: left; border: 1px solid red">
-<div style="padding: 50px; width: 200px; border: 25px solid green; -moz-box-sizing: border-box">
-</div>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/block/base/jlbtest1.html b/layout/html/tests/block/base/jlbtest1.html
deleted file mode 100644
index e819829e53b2..000000000000
--- a/layout/html/tests/block/base/jlbtest1.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=Shift_JIS">
-   <META NAME="Author" CONTENT="Frank Tang">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (WinNT; I) [Netscape]">
-   <TITLE>Japanese Line Break Test 1</TITLE>
-</HEAD>
-<BODY>
-Japanese Line Breaking Test:
-<BR>&nbsp;
-
-<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-----ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-----------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>-------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>--------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>---------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-<BR>----------------ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B
-
-<P>The valide break point should be : [Need to spec out]
-
-<P>ƒtƒWƒeƒŒƒr‚̉¹Šy”Ô‘g�uHEY! HEY! HEY!�v‚̃z�[ƒ€ƒy�[ƒW�B&nbsp;
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/base/margin1.html b/layout/html/tests/block/base/margin1.html
deleted file mode 100644
index b6ebd0d29d67..000000000000
--- a/layout/html/tests/block/base/margin1.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<html>
- <head>
-  <title>Test case for collapsing margins</title>
-  <style>
-   div { margin: 10px 0; background-color: khaki; }
-   div.i { background-color: orange; }
-   div.b { border: 1px solid black; }
-   div.p { padding: 1px; }
-   div.bp { border: 1px solid black; padding: 1px; }
-   div.box {
-    border: 2px solid green;
-    background: transparent url(../images/vert_pixel_ruler.gif) repeat-y;
-    margin: 0;
-    padding: 0 0 0 20px;  /* get past background image */
-   }
-   div.testbox {
-    border: 2px solid blue;
-    background-color: yellow;
-    margin: 0;
-    height: 160px;
-   }
-   span.label {
-    display: block;
-    margin: 0;
-    height: 40px;
-    background-color: rgb(192,192,192);
-   }
-  </style>
- </head>
- <body>
-  <div class="box">
-
-   <span class="label">Simple sibling collapsing tests:</span>
-   <div class="testbox">
-    <div class="i">This has a top/bottom 10px margin</div>
-    <div class="i">This has a top/bottom 10px margin</div>
-    <div class="i">This has a top/bottom 10px margin</div>
-   </div>
-
-   <span class="label">Simple generational + sibling collapsing tests:</span>
-   <div class="testbox">
-    <div>
-     <div class="i">This has a top/bottom 10px margin</div>
-    </div>
-    <div>
-     <div>
-      <div class="i">This has a top/bottom 10px margin</div>
-     </div>
-    </div>
-    <div>
-     <div>
-      <div>
-       <div class="i">This has a top/bottom 10px margin</div>
-      </div>
-     </div>
-    </div>
-   </div>
-
-   <span class="label">Verify that borders/padding interfere with
-    sibling + generational collapsing:</span>
-
-   <div class="testbox">
-    <div class="i b">This has a top/bottom 10px margin</div>
-    <div class="i b">This has a top/bottom 10px margin</div>
-    <div class="i b">This has a top/bottom 10px margin</div>
-   </div>
-
-   <div class="tesbox">
-    <div class="i p">This has a top/bottom 10px margin</div>
-    <div class="i p">This has a top/bottom 10px margin</div>
-    <div class="i p">This has a top/bottom 10px margin</div>
-   </div>
-
-   <div class="testbox">
-    <div class="i bp">This has a top/bottom 10px margin</div>
-    <div class="i bp">This has a top/bottom 10px margin</div>
-    <div class="i bp">This has a top/bottom 10px margin</div>
-   </div>
-
-  </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/base/pre.html b/layout/html/tests/block/base/pre.html
deleted file mode 100644
index 1d07b6218831..000000000000
--- a/layout/html/tests/block/base/pre.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
- <head>
-  <title>Test case for PRE formatted text</title>
-  <style>
-  </style>
- </head>
- <body>
-
-These next three sections should be spaced identical: there should be
-a blank line before the preformatted text and a blank line after the
-pre-formatted text, but no other blank lines.<br><br>
-
-Before<pre>Preformatted text, no newlines inside</pre>After<br>
-
-Before<pre>
-Preformatted text, one newline after open-pre tag</pre>After<br>
-
-Before<pre>
-Preformatted text, one newline after open-pre tag and before close tag</pre>
-After<br>
-
-<hr>
-
-<pre>
-Make sure newlines are preserved: one
-Make sure newlines are preserved: two
-
-Make sure newlines are preserved: three
-
-
-End of this section
-</pre>
-
-These next set of lines should be lined up neatly
-<pre>
-x       x       x       x       x       x       x       x       x       end
-X	X	X	X	X	X	X	X	X	end
-X	x       X	x       x       X	X	x       x       end
-</pre>
-
-Make sure whitespace is preserved:
-<pre>     Five blanks<br>    Four blanks<br>   Three blanks<br>  Two blanks<br> Blank<br>None!</pre>
-
- </body>
-</html>
diff --git a/layout/html/tests/block/base/pre1.html b/layout/html/tests/block/base/pre1.html
deleted file mode 100644
index 50f59f3431b2..000000000000
--- a/layout/html/tests/block/base/pre1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
- <head>
-  <title>Test case for PRE formatted text</title>
-  <style>
-   pre { background-color: khaki; }
-  </style>
- </head>
- <body>
-There are five newlines in this pre:
-<pre>
-
-
-
-
-</pre>The end</body></html>
diff --git a/layout/html/tests/block/base/rtest.lst b/layout/html/tests/block/base/rtest.lst
deleted file mode 100644
index 4fd62d42614f..000000000000
--- a/layout/html/tests/block/base/rtest.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-width-fixed.html
-width-percent.html
-margin1.html
-pre.html
-pre1.html
-jlbtest1.html
-intrinsic-with-box-sizing.html
-intrinsic-with-box-sizing-strict.html
-intrinsic-cases-standards.html
-intrinsic-cases-quirks.html
diff --git a/layout/html/tests/block/base/width-fixed.html b/layout/html/tests/block/base/width-fixed.html
deleted file mode 100644
index 0f7ec1a7f545..000000000000
--- a/layout/html/tests/block/base/width-fixed.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<html>
- <head>
-  <title>Test case for width property as applied to blocks</title>
-  <style>
-   div.b { border: 2px solid black; }
-   div.bp { border: 2px solid black; padding: 2px; }
-  </style>
- </head>
- <body>
-  Fixed width div's with no border or padding:
-
-  <div style="width: 200px;">
-   Text in a div.
-   Text in a div.
-   Text in a div.
-   Text in a div.
-  </div>
-
-  <div style="width: 200px;">
-   <div style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-  </div>
-
-  <hr>
-
-  Fixed width div's with border:
-
-  <div class="b" style="width: 200px;">
-   Text in a div.
-   Text in a div.
-   Text in a div.
-   Text in a div.
-  </div>
-
-  <div class="b" style="width: 200px;">
-   <div style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-  </div>
-
-  <hr>
-
-  Fixed width div's with border and padding:
-
-  <div class="bp" style="width: 200px;">
-   Text in a div.
-   Text in a div.
-   Text in a div.
-   Text in a div.
-  </div>
-
-  <div class="bp" style="width: 200px;">
-   <div style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 50px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="b" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-
-   <div class="bp" style="width: 200px;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-   </div>
-  </div>
-
- </body>
-</html>
diff --git a/layout/html/tests/block/base/width-percent.html b/layout/html/tests/block/base/width-percent.html
deleted file mode 100644
index 0ed0045620db..000000000000
--- a/layout/html/tests/block/base/width-percent.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<html>
- <head>
-  <title>Test case for width property as applied to blocks</title>
-  <style>
-   div.b { border: 2px solid black; }
-   div.bp { border: 2px solid black; padding: 2px; }
-  </style>
- </head>
- <body>
-  <div style="width: 400px; border: 2px dashed green;">
-
-   Percentage width outer div with no border or padding:
-
-   <div style="width: 50%;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-
-    <div style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-
-    <div class="b" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-
-    <div class="bp" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-
-    <div class="b" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-
-    <div class="bp" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-   </div>
-
-   <hr>
-
-   Percentage width outer div with border:
-
-   <div class="b" style="width: 50%;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
-
-    <div style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-
-    <div class="b" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="bp" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="b" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="bp" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-   </div>
- 
-   <hr>
- 
-   Percentage width outer div with border and padding:
- 
-   <div class="bp" style="width: 50%;">
-    Text in a div.
-    Text in a div.
-    Text in a div.
-    Text in a div.
- 
-    <div style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="b" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="bp" style="width: 50px;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="b" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
- 
-    <div class="bp" style="width: 50%;">
-     Text in a div.
-     Text in a div.
-     Text in a div.
-     Text in a div.
-    </div>
-   </div>
-  </div>
- 
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/10458.html b/layout/html/tests/block/bugs/10458.html
deleted file mode 100644
index 0687ce081b3f..000000000000
--- a/layout/html/tests/block/bugs/10458.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Underline Test</TITLE>
-</HEAD>
-
-<BODY>
-<CENTER>
-<BR>
-
-<B>This below code hides underline on the hyperlinked text:</B>
-
-<BR>
-
-<B>Code:</B>
-<NOBR>
-<FONT COLOR="RED">
-   &lt;A HREF="http://www.mozilla.org/" STYLE="text-decoration:none;"&gt;Go to Mozilla Homepage&lt;/A&gt;
-</FONT>
-</NOBR>
-
-<BR>
-
-<B>Result:</B>
-<NOBR>
-   <A HREF="http://www.mozilla.org/" STYLE="text-decoration:none;">Go to Mozilla Homepage</A>
-</NOBR>
-
-<BR>
-<BR>
-<BR>
-
-
-<B>However, the following code does not work on mozilla 5.0 (M8):</B>
-
-<BR>
-
-<B>Code:</B>
-<NOBR>
-<FONT COLOR="RED">
-   &lt;A HREF="http://www.mozilla.org/"&gt;&lt;SPAN STYLE="text-decoration:none;"&gt;Go to Mozilla Homepage&lt;/SPAN&gt;&lt;/A&gt;
-</FONT>
-</NOBR>
-
-<BR>
-
-<B>Result:</B>
-<NOBR>
-<FONT COLOR="GOLD">
-   <A HREF="http://www.mozilla.org/"><SPAN STYLE="text-decoration:none;">Go to Mozilla Homepage</SPAN></A>
-</FONT>
-</NOBR>
-<BR>
-
-</CENTER>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/10490-a.html b/layout/html/tests/block/bugs/10490-a.html
deleted file mode 100644
index 6cba792ee274..000000000000
--- a/layout/html/tests/block/bugs/10490-a.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-        "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-</head>
-<body>
-
-<a href="document.html">My favorite Website</a>
-
-<a href="document.html">
-My favorite Website
-</a>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/10490-b.html b/layout/html/tests/block/bugs/10490-b.html
deleted file mode 100644
index ea21c61015cc..000000000000
--- a/layout/html/tests/block/bugs/10490-b.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<html>
-
-<head>
-
-<title>Testcase For 10490 Bug</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style type="text/css">
-
-<!--
-
-.Testcase {  font-family: Tahoma; font-size: 9pt; font-style: normal; line-height: normal; font-weight: normal; font-variant: normal; color: #000000}
-
--->
-
-</style></head>
-
-
-
-<body bgcolor="#FFFFFF" class="Testcase">
-
-<p><font color="#CC0000"><b>Testcase for 10490</b></font></p>
-
-<p><b>example 1:</b></p>
-
-<p><a href="">My favorite Website</a> - this one code iis &lt;a href=&quot;&quot;&gt;My 
-
-  Favorite Website&lt;/a&gt;</p>
-
-<p><a href=""> 
-
-My favorite Website 
-
-</a> - this code is &lt;a href=&quot;&quot;&gt;</p>
-
-<blockquote> 
-
-  <blockquote> 
-
-    <blockquote> 
-
-      <blockquote> 
-
-        <p> My favorite Website</p>
-
-        <p>&lt;/a&gt;</p>
-
-      </blockquote>
-
-    </blockquote>
-
-  </blockquote>
-
-</blockquote>
-
-<p><b>exmaple 2:</b></p>
-
-<p><b>Nav5, the future is here!</b>b - this code is &lt;B&gt; Nav5, the future 
-
-  is here! &lt;/B&gt;b</p>
-
-<p> <b> Nav5, the future is here!</b>b - this code is &lt;B&gt;</p>
-
-<blockquote> 
-
-  <blockquote> 
-
-    <blockquote> 
-
-      <blockquote> 
-
-        <p>Nav5, the future is here!</p>
-
-        <p>&lt;/B&gt;b</p>
-
-        <p>&nbsp;</p>
-
-      </blockquote>
-
-    </blockquote>
-
-  </blockquote>
-
-</blockquote>
-
-<p>Look at example one, item 2. the link is OK but it continue the link out space 
-
-  more then should be.</p>
-
-<p>example 2 is rendered OK - the &quot;b&quot; in the end of the sentence is 
-
-  in a normal mode and not in bold mode.</p>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/block/bugs/10509.html b/layout/html/tests/block/bugs/10509.html
deleted file mode 100644
index e2c35f211574..000000000000
--- a/layout/html/tests/block/bugs/10509.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-	<title></title>
-	<style type="text/css">
-
-	p { line-height: 2; }
-
-	</style>
-</head>
-<body>
-
-<p><span>text</span>
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-</p>
-
-<p>
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-This is lots of text.
-</p>
-
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/10675.html b/layout/html/tests/block/bugs/10675.html
deleted file mode 100644
index 7f1a8bfea75d..000000000000
--- a/layout/html/tests/block/bugs/10675.html
+++ /dev/null
@@ -1 +0,0 @@
-<HTML><BODY><ol><li><P>first line</P></body></html>
diff --git a/layout/html/tests/block/bugs/10777.html b/layout/html/tests/block/bugs/10777.html
deleted file mode 100644
index a186d9fc7885..000000000000
--- a/layout/html/tests/block/bugs/10777.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>empty_image</title>
-<style type="text/css">
-	ul.one { 
-		list-style: url(blue_square.gif) circle  
-}
-</style>
-</head>
-<body>
-<ul class="one">
-<li>List item should be designated by an image, or if image cannot be displayed, by a circle</li>
-<li>List item should be designated by an image, or if image cannot be displayed, by a circle</li>
-<li>List item should be designated by an image, or if image cannot be displayed, by a circle</li>
-</ul>
-</body>
-</html>
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/block/bugs/111255.html b/layout/html/tests/block/bugs/111255.html
deleted file mode 100644
index 9fdc0e5f0eaa..000000000000
--- a/layout/html/tests/block/bugs/111255.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>
-<img style="border: 2px solid red;" src="logo-star.gif" alt="" height="150px" align="left">
-<img style="border: 2px solid red;" src="ant.jpg" alt="">
-</p>
-
diff --git a/layout/html/tests/block/bugs/11435.html b/layout/html/tests/block/bugs/11435.html
deleted file mode 100644
index b0a39df7d426..000000000000
--- a/layout/html/tests/block/bugs/11435.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><title>Bug</title>
-<style>
-body:first-letter { font-weight:bold; }
-</style>
-
-</head><body>The first letter is not bold.
-
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/11566.html b/layout/html/tests/block/bugs/11566.html
deleted file mode 100644
index 482a381fa527..000000000000
--- a/layout/html/tests/block/bugs/11566.html
+++ /dev/null
@@ -1,2 +0,0 @@
-This test page has long<wbr>words in that should be break<wbr>able at some
-non-obvious points.
diff --git a/layout/html/tests/block/bugs/11589.html b/layout/html/tests/block/bugs/11589.html
deleted file mode 100644
index 05c1f8e70fb2..000000000000
--- a/layout/html/tests/block/bugs/11589.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-
-<head><title>Testcase for bug 11589</title></head>
-<body bgcolor="#FFFFFF">
-
-<table border="1" width="600">
-<tr> 
-  <td width="557"> 
-    <table border="1" width="100%" bgcolor="#EEEEEE" align="right">
-    <tr> 
-      <td> 
-  	<img src="hack.gif" align="right">
-      </td>
-    </tr>
-    </table>
-
-  This table cell should be 557 pixels wide.
-  </td>
-</tr>
-</table>
-
-</body>
diff --git a/layout/html/tests/block/bugs/12003.html b/layout/html/tests/block/bugs/12003.html
deleted file mode 100644
index 7b74b327fae8..000000000000
--- a/layout/html/tests/block/bugs/12003.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body bgcolor="#C0C0C0">
-
-<table border>
-	<tr>
-		<td><img align="right" src="ant.jpg"></td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/12072.html b/layout/html/tests/block/bugs/12072.html
deleted file mode 100644
index 0ba9808f64d0..000000000000
--- a/layout/html/tests/block/bugs/12072.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head><title>Testcase for bug 12072</title></head>
-<body>
-
-<table border=0 cellpadding=0 cellspacing=0 width=331>
-<tr><td>
-  <table align=left>
-    <tr><td width=95><img src="logo-star.gif"
-                      height=120 width=95></td></tr>
-    <tr><td width=95><font face=arial size=-2><b>Butch Davis has Miami in
-                      the national spotlight.</b></font></td></tr>
-  </table>
-  Big East believes<br>balance is best<br>
-  <font face=arial size=-1>The Big East is battling an image problem, a rap as the 
-     weak link in the BCS and a top-heavy outfit that relies on a few powerhouses
-     to promote its national profile. It will have a different look this year, says
-     ESPN.com's Bill Doherty. And despite Miami's rise, coaches believe balance is 
-     in the conference's best interest.<br>
-     <li>Chat wrap: Pitt coach Walt Harris
-     <li>Miami's Jackson making some noise
-     <li>ESPN.com's season preview</font>
-</td></tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/12233.html b/layout/html/tests/block/bugs/12233.html
deleted file mode 100644
index 1b0b653fbee8..000000000000
--- a/layout/html/tests/block/bugs/12233.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-	<title></title>
-	<style type="text/css">
-
-	p {
-		height: 50px;
-		width: 300px;
-		border: 3px solid green;
-		background: yellow;
-		color: black;
-		margin: 0;
-		}
-
-	.one {
-		}
-
-	.two {
-		margin-left: 30px;
-		margin-top: -56px;
-		}
-
-	.three {
-		margin-left: 60px;
-		margin-top: -56px;
-		}
-
-
-	</style>
-	<script type="text/javascript">
-
-	function dealwith(str) {
-		alert("You clicked on paragraph " + str + ".");
-		}
-	</script>
-</head>
-<body>
-
-<p class="one" onclick="dealwith('one')">Paragraph one</p>
-<p class="two" onclick="dealwith('two')">Paragraph two</p>
-<p class="three" onclick="dealwith('three')">Paragraph three</p>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/124167.html b/layout/html/tests/block/bugs/124167.html
deleted file mode 100644
index 310619fe101e..000000000000
--- a/layout/html/tests/block/bugs/124167.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<title>List Item Test</title>
-</head>
-<body>
-
-You should see two list items with "circle"s before them (not filled
-in), not discs
-
-    <ul>
-        <li type="CIRCLE">Me</li>
-        <li type="circle">You</li>
-    </ul>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/12451.html b/layout/html/tests/block/bugs/12451.html
deleted file mode 100644
index 2c247387db56..000000000000
--- a/layout/html/tests/block/bugs/12451.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-	<title></title>
-	<style type="text/css">
-
-	.one, .two {
-		list-style-position: outside;
-		list-style-type: circle;
-		}
-
-	.two {
-		list-style-image: url(dummy.gif); /* nonexistent */
-		}
-
-	</style>
-</head>
-<body>
-
-<ul>
-	<li class="one">Should have a circle marker.</li>
-	<li class="two">Should have a circle marker.</li>
-</ul>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/124637.html b/layout/html/tests/block/bugs/124637.html
deleted file mode 100644
index 99464d54654f..000000000000
--- a/layout/html/tests/block/bugs/124637.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body>
-<img align="left" width="100" height="100">
-There should not be any space below this sentence.<hr />
-This fails without an align attribute in the hr.
-<br clear="all" /><br /><br />
-<img align="left" width="100" height="100">
-There should not be any space below this sentence.<hr align="left" />
-This works with an align attribute in the hr.
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/125506.html b/layout/html/tests/block/bugs/125506.html
deleted file mode 100644
index 87ee12539329..000000000000
--- a/layout/html/tests/block/bugs/125506.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html dir="ltr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <title>Directions in lists</title>
-  <style type="text/css"> 
-	   .rtl {direction: rtl;}
-	   .ltr {direction: ltr;}
-     h3 {text-align: center;}
-  </style>
-</head>
-
-<body>
-<h3>This list does not specify its direction</h3>
-<ul>
-  <li>This list item does not specify its direction.</li>
-  <li class="ltr">This list item is left-to-right.</li>
-  <li class="rtl">This list item is right-to-left.</li>
-</ul>
-<hr>
-<h3>This list is left-to-right</h3>
-<ul class="ltr">
-  <li>This list item does not specify its direction.</li>
-  <li class="ltr">This list item is left-to-right.</li>
-  <li class="rtl">This list item is right-to-left.</li>
-</ul>
-<hr>
-<h3>This list is right-to-left</h3>
-<ul class="rtl">
-  <li>This list item does not specify its direction.</li>
-  <li class="ltr">This list item is left-to-right.</li>
-  <li class="rtl">This list item is right-to-left.</li>
-</ul>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/126213-1.html b/layout/html/tests/block/bugs/126213-1.html
deleted file mode 100644
index 79d64fe156ce..000000000000
--- a/layout/html/tests/block/bugs/126213-1.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="content-type" content="text/html; charset=iso-8859-1"><title>mozilla bug 126213</title>
-<style type="text/css">
-body { background-color: #CFC; color: #000; margin: 0; }
-    div#page_footer {
-        right: 0;
-        width: auto;
-        height: auto;
-        bottom: 0;
-        float: none;
-        position: fixed;
-        padding: 50px;
-        background: #DDDDDD;
-        border: 30px solid #000;
-    }
-    p#main {
-        margin: 10%;
-        padding: 1em;
-        background: #FFF;
-    }
-    /* t r b l */
-</style></head>
-
-<body>
-<div id="page_footer">
-        this footer box has been positioned 0px from the bottom/right
-        content boundaries, so should render right up against the
-        lower-right corner of the viewport.
-</div>
-<p><br><br><br><br></p>
-<p id="main">
-    The page footer div should render flush with the bottom
-    of the bottom of the viewport, but in Mozilla 2002021413
-    I see some body (note background color) rendered below
-    the footer. This is <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=126213">bug 126213</a>.
-    MSIE 5.1.3 for Mac OS X handles this
-    correctly (and I think other MSIE 5.x for Mac OS will as well,
-    but I have not actually tested them).
-</p>
-<p> <!-- ensure that footer covers only empty space at end of page -->
-    <br><br><br><br><br><br><br><br><br><br><br>
-</p>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/126213-2.html b/layout/html/tests/block/bugs/126213-2.html
deleted file mode 100644
index c355fab63452..000000000000
--- a/layout/html/tests/block/bugs/126213-2.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title></title>
-<style type="text/css">
-BODY {
-    background-color: yellow;
-    color: black;
-}
-
-DIV.horiz {
-    border: 2px solid black;
-    color: inherit;
-    right: 0px;
-    padding-left: 10px;
-    padding-right: 200px;
-    position: absolute;
-    height: 100px;
-    background-color: lightblue;
-}
-
-DIV.vert {
-    border: 2px solid black;
-    color: inherit;
-    bottom: 0px;
-    padding-top: 10px;
-    padding-bottom: 200px;
-    position: absolute;
-    width: 200px;
-    background-color: lightgreen;
-}
-
-DIV#foo2 {
-    top: 200px;
-    width: 300px;
-}
-DIV#bar2 {
-    top: 300px;
-}
-
-DIV#foo {
-    left: 0px;
-    height: 38px;
-}
-DIV#bar {
-    left: 300px;
-}
-</style>
-</head>
-
-<body>
-The green divs should be flush with the bottom of the initial containing
-block, the blue divs should be flush with the right edge of the initial
-containing block.
-<div id="foo" title="foo" class="vert">
-This <tt>&lt;div&gt;</tt> has been set to <tt>height: 38px</tt>.
-</div>
-
-<div id="bar" title="bar" class="vert">
-This <tt>&lt;div&gt;</tt> has no <tt>height</tt> property.
-</div>
-
-<div id="foo2" title="foo" class="horiz">
-This <tt>&lt;div&gt;</tt> has been set to <tt>width: 300px</tt>.
-</div>
-
-<div id="bar2" title="bar" class="horiz">
-This <tt>&lt;div&gt;</tt> has no <tt>width</tt> property.
-</div>
-
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/12709.html b/layout/html/tests/block/bugs/12709.html
deleted file mode 100644
index 2e9df18052f4..000000000000
--- a/layout/html/tests/block/bugs/12709.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HTML>
-<HEAD><TITLE>Testcase for bug 12709</TITLE></HEAD>
-<BODY>
-
-<TABLE BORDER="1" WIDTH="334">
-  <TR>
-    <TD>
-        This section will provide you with all the information you 
-        may need to use any of your Internet software.
-    </TD>
-    <TD>
-      <IMG SRC="support.gif" ALIGN="RIGHT">
-    </TD>
-  </TR>
-</TABLE>
-
-</BODY>
-
-</HTML>
diff --git a/layout/html/tests/block/bugs/12760.html b/layout/html/tests/block/bugs/12760.html
deleted file mode 100644
index 2bf6ec198c4d..000000000000
--- a/layout/html/tests/block/bugs/12760.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML><HEAD>
-<STYLE>
-
-span{color:tomato} /* visual effect */
-
-:first-letter { font-size: 200%;}
-
-</STYLE>
-</HEAD>
-<BODY>
-
-<!--<p>--> <!-- comment out the p, and the :first-letter will work correctly. -->
-
-<span>My first letter</span> doesn't get the correct style propagated to it.
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/131065-1.html b/layout/html/tests/block/bugs/131065-1.html
deleted file mode 100644
index b5ac98deab3b..000000000000
--- a/layout/html/tests/block/bugs/131065-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=77509&action=view -->
-<HTML><HEAD><TITLE>HTML Functional -- APPLET - HEIGHT=percent</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-
-<body>
-<applet CODE=RealSnow.class archive="RealSnow.jar" height=50%>
-<param name="Background" value="../../images/polarBears.jpg">
-<param name="NumberOfFlakes" value="500">
-<param name="Turbulence" value="4">
-</applet>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/131065-2.html b/layout/html/tests/block/bugs/131065-2.html
deleted file mode 100644
index 6bb5f25e2406..000000000000
--- a/layout/html/tests/block/bugs/131065-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=77509&action=view -->
-<HTML><HEAD><TITLE>HTML Functional -- APPLET - HEIGHT=percent</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-
-<body style="margin-top:0px; margin-bottom:10px">
-<applet CODE=RealSnow.class archive="RealSnow.jar" width=50% height=100%>
-<param name="Background" value="../../images/polarBears.jpg">
-<param name="NumberOfFlakes" value="500">
-<param name="Turbulence" value="4">
-</applet>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/131065-3.html b/layout/html/tests/block/bugs/131065-3.html
deleted file mode 100644
index be8c465ecc5d..000000000000
--- a/layout/html/tests/block/bugs/131065-3.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=77509&action=view -->
-<HTML><HEAD><TITLE>HTML Functional -- APPLET - HEIGHT=percent</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-
-<style type="text/css">
-.abs { position: absolute;
-       top: 150px;
-       left: 50px;
-       width: 50%;
-       height: 100%;
-</style>
-</head>
-	   
-<body style="margin-top:0px; margin-bottom:10px">
-<applet class=abs CODE=RealSnow.class archive="RealSnow.jar" width=50% height=100%>
-<param name="Background" value="../../images/polarBears.jpg">
-<param name="NumberOfFlakes" value="500">
-<param name="Turbulence" value="4">
-</applet>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/131065-4.html b/layout/html/tests/block/bugs/131065-4.html
deleted file mode 100644
index bc5777535699..000000000000
--- a/layout/html/tests/block/bugs/131065-4.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=77509&action=view -->
-<HTML><HEAD><TITLE>HTML Functional -- APPLET - HEIGHT=percent</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-
-<style type="text/css">
-.abs { position: absolute;
-       top: 150px;
-       left: 50px;
-       width: 50%;
-       height: 100%;
-</style>
-</head>
-	   
-<body style="margin-top:0px; margin-bottom:10px">
-<div class=abs>
-<applet CODE=RealSnow.class archive="RealSnow.jar" width=50% height=100%>
-<param name="Background" value="../../images/polarBears.jpg">
-<param name="NumberOfFlakes" value="500">
-<param name="Turbulence" value="4">
-</applet>
-</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/13196.html b/layout/html/tests/block/bugs/13196.html
deleted file mode 100644
index 11ead938d09f..000000000000
--- a/layout/html/tests/block/bugs/13196.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><title>Testcase for bug 13196</title></head><body bgcolor="white">
-
-<TABLE WIDTH="100%"><TR><TD>
-
-  <TABLE WIDTH="100%" ALIGN="right">
-    <TR><TD>WINGs is a small widget set with the N*XTSTEP look and feel. It's API is inspired in OpenStep and it's implementation borrows some ideas from Tk.
-    </TD></TR>
-  </TABLE>
-
-</TD></TR></TABLE>
-
-</body></html> 
diff --git a/layout/html/tests/block/bugs/13258.html b/layout/html/tests/block/bugs/13258.html
deleted file mode 100644
index 88878809832c..000000000000
--- a/layout/html/tests/block/bugs/13258.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-<p>This link <A HREF="bg3upgrade.html"><B>Blue G3 ROM Block</B></A> is surrounded by B tags.</P>
-<p>This link is not: <A HREF="http://www.apple.com/quicktime/download/support/">stand-alone installer</A></P>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/134580-1.html b/layout/html/tests/block/bugs/134580-1.html
deleted file mode 100644
index 858c6eacdd96..000000000000
--- a/layout/html/tests/block/bugs/134580-1.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<title>Testcase, bug 134580</title>
-
-<h2>Testcases where whitespace a single text node</h2>
-
-Leading and trailing whitespace:
-<table border><tr><td> <img src="hack.gif" height=20 width=20> </td></tr></table>
-
-Only leading whitespace:
-<table border><tr><td> <img src="hack.gif" height=20 width=20></td></tr></table>
-
-Only trailing whitespace:
-<table border><tr><td><img src="hack.gif" height=20 width=20> </td></tr></table>
-
-A pair of images with whitespace between only:
-<table border><tr><td><img src="hack.gif" height=20 width=20> <img src="hack.gif" height=20 width=20></td></tr></table>
-
-A pair of images with no whitespace:
-<table border><tr><td><img src="hack.gif" height=20 width=20><img src="hack.gif" height=20 width=20></td></tr></table>
-
-Text with no whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font></font></td></tr></table>
-Text with leading whitespace:
-<table border><tr><td><font size=7> <font size=3>Text</font></font></td></tr></table>
-Text with trailing whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font> </font></td></tr></table>
-Text with intermediate whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font> <font size=3>Text</font></font></td></tr></table>
-
-<h2>Testcases where whitespace is two text nodes separated by comments</h2>
-
-Leading and trailing whitespace:
-<table border><tr><td> <!-- --> <img src="hack.gif" height=20 width=20> <!-- --> </td></tr></table>
-
-Only leading whitespace:
-<table border><tr><td> <!-- --> <img src="hack.gif" height=20 width=20></td></tr></table>
-
-Only trailing whitespace:
-<table border><tr><td><img src="hack.gif" height=20 width=20> <!-- --> </td></tr></table>
-
-A pair of images with whitespace between only:
-<table border><tr><td><img src="hack.gif" height=20 width=20> <!-- --> <img src="hack.gif" height=20 width=20></td></tr></table>
-
-A pair of images with no whitespace:
-<table border><tr><td><img src="hack.gif" height=20 width=20><img src="hack.gif" height=20 width=20></td></tr></table>
-
-Text with no whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font></font></td></tr></table>
-Text with leading whitespace:
-<table border><tr><td><font size=7> <!-- --> <font size=3>Text</font></font></td></tr></table>
-Text with trailing whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font> <!-- --> </font></td></tr></table>
-Text with intermediate whitespace:
-<table border><tr><td><font size=7><font size=3>Text</font> <!-- --> <font size=3>Text</font></font></td></tr></table>
-
-<h2>Testcases where whitespace a single text node</h2>
-
-<p>Leading and trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br> <img src="hack.gif" height=20 width=20> <br><img src="hack.gif" height=5 width=80><br>
-
-<p>Only leading whitespace:
-<br><img src="hack.gif" height=5 width=80><br> <img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>Only trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20> <br><img src="hack.gif" height=5 width=80><br>
-
-<p>A pair of images with whitespace between only:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20> <img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>A pair of images with no whitespace:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20><img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>Text with no whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with leading whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7> <font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font> </font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with intermediate whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font> <font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-
-<h2>Testcases where whitespace is two text nodes separated by comments</h2>
-
-<p>Leading and trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br> <!-- --> <img src="hack.gif" height=20 width=20> <!-- --> <br><img src="hack.gif" height=5 width=80><br>
-
-<p>Only leading whitespace:
-<br><img src="hack.gif" height=5 width=80><br> <!-- --> <img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>Only trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20> <!-- --> <br><img src="hack.gif" height=5 width=80><br>
-
-<p>A pair of images with whitespace between only:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20> <!-- --> <img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>A pair of images with no whitespace:
-<br><img src="hack.gif" height=5 width=80><br><img src="hack.gif" height=20 width=20><img src="hack.gif" height=20 width=20><br><img src="hack.gif" height=5 width=80><br>
-
-<p>Text with no whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with leading whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7> <!-- --> <font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with trailing whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font> <!-- --> </font><br><img src="hack.gif" height=5 width=80><br>
-<p>Text with intermediate whitespace:
-<br><img src="hack.gif" height=5 width=80><br><font size=7><font size=3>Text</font> <!-- --> <font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
diff --git a/layout/html/tests/block/bugs/134580-2.html b/layout/html/tests/block/bugs/134580-2.html
deleted file mode 100644
index 04c1dd4b8fba..000000000000
--- a/layout/html/tests/block/bugs/134580-2.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<title>Testcase, bug 134580</title>
-
-<h2>Testcases where whitespace a single text node and td has explicit span</h2>
-
-Leading and trailing whitespace:
-<table border><tr><td><span> <img src="hack.gif" height=20 width=20> </span></td></tr></table>
-
-Only leading whitespace:
-<table border><tr><td><span> <img src="hack.gif" height=20 width=20></span></td></tr></table>
-
-Only trailing whitespace:
-<table border><tr><td><span><img src="hack.gif" height=20 width=20> </span></td></tr></table>
-
-A pair of images with whitespace between only:
-<table border><tr><td><span><img src="hack.gif" height=20 width=20> <img src="hack.gif" height=20 width=20></span></td></tr></table>
-
-A pair of images with no whitespace:
-<table border><tr><td><span><img src="hack.gif" height=20 width=20><img src="hack.gif" height=20 width=20></span></td></tr></table>
-
-
-<h2>A few more</h2>
-
-<p>Text with initial whitespace containing a span:
-<br><img src="hack.gif" height=5 width=80><br><font size=7> <span></span> <font size=3>Text</font><font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-
-
-<p>Text with initial whitespace containing a span:
-<br><img src="hack.gif" height=5 width=80><br><font size=7> <span> </span> <font size=3>Text</font><font size=3>Text</font></font><br><img src="hack.gif" height=5 width=80><br>
-
diff --git a/layout/html/tests/block/bugs/13481.html b/layout/html/tests/block/bugs/13481.html
deleted file mode 100644
index 15925a9a8287..000000000000
--- a/layout/html/tests/block/bugs/13481.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<TITLE>Mozilla Tests: 'clear'</TITLE>
-
-<STYLE type="text/css">
-   P { margin: 30px; }
-   .clear { clear: both; color: navy; background: white; }
-</STYLE>
-
-<H1>Clear as Mud</H1>
-
-<P>Clear causes margins to be ignored.</P>
-
-<P>There are no floats on this page. The only styles are: </P>
-
-<PRE>
-   P { margin: 30px; }
-   .clear { clear: both; color: navy; background: white; }
-</PRE>
-
-<P>The next paragraph has a class of 'clear'. It should be the same
-distance from this paragraph as it is from the paragraph following
-it.</P>
-
-<P class="clear">I have a class of clear!</P>
-
-<P>Notice how the margins are dropped. They should not be.</P>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/13553.html b/layout/html/tests/block/bugs/13553.html
deleted file mode 100644
index a063c515ddf4..000000000000
--- a/layout/html/tests/block/bugs/13553.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html><head><title>Testcase for bug 13553</title></head>
-<body bgcolor="#FFFFFF">
-
-The following tables are identically coded except for the P end-tag.<BR>
-
-<table border="1">
-  <tr>
-    <td width="138">
-      <P><!-- NOTE THE P HERE (no end-tag) -->
-      <table width="160" align="right"><tr>
-        <td>ABCDE</td>
-      </tr></table>
-    </td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <td width="138">
-      <P><!-- NOTE THE P HERE -->
-      </P><!-- NOTE THE /P HERE --><table width="160" align="right"><tr>
-        <td>ABCDE</td>
-      </tr></table>
-    </td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <td width="138">
-      <P><!-- NOTE THE P HERE -->
-      <table width="160" align="right"><tr>
-        <td>ABCDE</td>
-      </tr></table></P><!-- NOTE THE /P HERE -->
-    </td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <td width="138">
-      <P><!-- NOTE THE P HERE -->
-      <table width="160" align="right"><tr>
-        <td>ABCDE</td>
-      </tr></table>
-    </td>
-  </tr>
-</table>
-</P><!-- NOTE THE /P HERE -->
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/13599.html b/layout/html/tests/block/bugs/13599.html
deleted file mode 100644
index fd8afa0efb08..000000000000
--- a/layout/html/tests/block/bugs/13599.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Testcase for bug 13599</title></head>
-<body bgcolor="#FFFFFF">
-<H3>Using apprunner 1999-09-10-10-M11 on Windows 98, the first and third
-items have no number displayed.</H2>
-
-<OL>
-<LI><P>first list item</P></LI>
-<LI>second list item</LI>
-<LI><P>third list</P> item</LI>
-<LI>fourth list<P>item</P></LI>
-</OL>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/13869.html b/layout/html/tests/block/bugs/13869.html
deleted file mode 100644
index 6b3071eaa648..000000000000
--- a/layout/html/tests/block/bugs/13869.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<title>indent on LI</title>
-
-<ul>
-  <li style="text-indent: 0">This item has a text-indent of 0.
-  <li style="text-indent: 2em">This item has a text-indent of 2em.
-  <li style="text-indent: -2em">This item has a text-indent of -2em.
-</ul>
diff --git a/layout/html/tests/block/bugs/13940.html b/layout/html/tests/block/bugs/13940.html
deleted file mode 100644
index e2e291808e40..000000000000
--- a/layout/html/tests/block/bugs/13940.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-  <title>Testcase for bug 12940</title>
-</head>
-<body>
-
-<TABLE width="100%"><TR>
-  <TD><IMG src="ant.jpg" width="65" align=right></TD>
-  <TD><IMG src="ant.jpg" width="65" align=right></TD>
-  <TD><IMG src="ant.jpg" width="65" align=right></TD>
-  <TD><IMG src="ant.jpg" width="65" align=right></TD>
-  <TD><IMG src="ant.jpg" width="65" align=right></TD>
-</TR></TABLE>
-
-</body></html>
-
diff --git a/layout/html/tests/block/bugs/14118-a.html b/layout/html/tests/block/bugs/14118-a.html
deleted file mode 100644
index a46b27ae3365..000000000000
--- a/layout/html/tests/block/bugs/14118-a.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html><head><title>Testcase for bug 14118</title></head>
-
-<body bgcolor="#ffffff">
-<P>
-Testcase distilled from <A href="http://www.webtrends.com/default.htm">http://www.webtrends.com/default.htm</A><BR>
-Table width=449 which is less than what is actually needed.<BR>
-Left image is 240 pixels wide, right is 330 pixels.
-<HR>
-</P>
-
-<table width="449" border="0" cellspacing="0" cellpadding="0">
-<tr valign="top">
-    <td><img src="top_middle2.jpg"></td>
-    <td><img src="top_buttons16.jpg"></td>
-</tr>
-<tr>
-    <td valign="top" colspan="2">
-    	<table align="left">
-            <tr><td>Manage Your WWWorld!
-    	          Management, analysis, and reporting for Internet and 
-	          intranet servers and firewalls
-            </td></tr>
-    	</table>
-    </td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/14118-b.html b/layout/html/tests/block/bugs/14118-b.html
deleted file mode 100644
index b31286b32778..000000000000
--- a/layout/html/tests/block/bugs/14118-b.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
-<head>
-    <base href="http://www.webtrends.com/">
-    <title>Testcase for bug 14118</title>
-</head>
-<body bgcolor="#ffffff">
-<P>
-Testcase distilled from <A href="http://www.webtrends.com/default.htm">http://www.webtrends.com/default.htm</A><BR>
-<HR>
-</P>
-<table border="0" cellspacing="0" width="540" height="100" bgcolor="#FDEBB4">
-  <tr>
-    <td width="49%" valign="top">
-    	<b>WebTrends announces <a href="/products/commerce/default.htm">CommerceTrends</a>,
-	   industry's first E-business measurement and forecasting solution!</b> 
-    	   Read the <a HREF="/news/releases/release.asp?id=89">press release</a>...
-    </td>
-    <td width="2%"><img src="ant.jpg" WIDTH="10" HEIGHT="100"></td>
-    <td width="49%" valign="top"><BR></td>
-  </tr>
-</table>
-
-<P>Same table but "CommerceTrends" and "press release" is not links:
-
-<table border="0" cellspacing="0" width="540" height="100" bgcolor="#FDEBB4">
-  <tr>
-    <td width="49%" valign="top">
-    	<b>WebTrends announces CommerceTrends,
-	   industry's first E-business measurement and forecasting solution!</b> 
-    	   Read the press release...
-    </td>
-    <td width="2%"><img src="ant.jpg" WIDTH="10" HEIGHT="100"></td>
-    <td width="49%" valign="top"><BR></td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/14140.html b/layout/html/tests/block/bugs/14140.html
deleted file mode 100644
index 3447f41c3375..000000000000
--- a/layout/html/tests/block/bugs/14140.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-
-<div style="float:left">Two words</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/14161.html b/layout/html/tests/block/bugs/14161.html
deleted file mode 100644
index c517b86ad3ba..000000000000
--- a/layout/html/tests/block/bugs/14161.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-  <body>
-    Test
-    <p></p>
-    Test2
-  </body>
-</html>
diff --git a/layout/html/tests/block/bugs/14363.html b/layout/html/tests/block/bugs/14363.html
deleted file mode 100644
index a58579df76b0..000000000000
--- a/layout/html/tests/block/bugs/14363.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>vertical_align_texttop.html</title>
-<style type="text/css">
-	.one {
-		font-size: 30pt
-}
-	.two {
-		vertical-align: text-top; font-size: 12pt
-}
-	</style>
-</head>
-<body>
-<p>Text-top aligns the top of the box with the top of the parent element's font. In the example below, the top of the box (the b's) should align with the top of the parent element's font (sentence). However, the sentence displays a little low.</p>
-<p class="one"><span class="two">bbbbbbbbbbbbbbb</span>Top of the b should align with the top of this sentence's font.</span>
-</p>
-</body>
-</html>
-
-
-
-
diff --git a/layout/html/tests/block/bugs/14459.html b/layout/html/tests/block/bugs/14459.html
deleted file mode 100644
index e10d79b1beef..000000000000
--- a/layout/html/tests/block/bugs/14459.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<img src="" width="50" height="10">
-<img src="" width="50" height="10"><img src="" width="50" height="10">
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/14489.html b/layout/html/tests/block/bugs/14489.html
deleted file mode 100644
index 6517220bf1c4..000000000000
--- a/layout/html/tests/block/bugs/14489.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html><body bgcolor="#c0c0c0">
-
-<table border="3">
-	<tr>
-		<td>
-
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-<br>
-
-<table border="3">
-	<tr>
-		<td>
-			blah blah
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-<br>
-
-<table border="3">
-	<tr>
-		<td>
-			blah blah
-			<p>
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/148245.html b/layout/html/tests/block/bugs/148245.html
deleted file mode 100644
index a941e2b43dc9..000000000000
--- a/layout/html/tests/block/bugs/148245.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-p:first-letter { float: left; }
-p:first-line { color: black; }
-</style>
-</head>
-<body>
-<p>Ly</p>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/151620.html b/layout/html/tests/block/bugs/151620.html
deleted file mode 100644
index a49ab6debb1f..000000000000
--- a/layout/html/tests/block/bugs/151620.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/transitional.dtd">
-<html>
-<head>
-        <title>Untitled</title>
-</head>
-
-<body bgcolor="#0000FF" text="#FFFFFF">
-
-<p>There should be no gaps between the top and bottom row or Scooby images if the pref layout.linelayout.prevent_strict_line_height is set to true</p>
-<table align="center" cellspacing="0" cellpadding="0" border="0">
-<tr>
-    <td><img src="20020515_60x60_scooby.jpg" alt="" width="48" height="48" border="0"></td>
-    <td><img src="20020515_60x60_scooby.jpg" alt="" width="48" height="48" border="0"></td>
-</tr>
-<tr>
-    <td><img src="20020515_60x60_scooby.jpg" alt="" width="48" height="48" border="0"></td>
-    <td><img src="20020515_60x60_scooby.jpg" alt="" width="48" height="48" border="0"></td>
-</tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/15340.html b/layout/html/tests/block/bugs/15340.html
deleted file mode 100644
index a9fa936de2a8..000000000000
--- a/layout/html/tests/block/bugs/15340.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-<style>
-
-	BLOCKQUOTE{margin-left : 0px}
-
-
-</style> 
-</head>
-<body>
-
-
-
-<BLOCKQUOTE>
-  GeForce should have the fastest fillrate of any shipping
-  product this year. As for hardware T&amp;L, I don't know about you but I'm tired of my
-  characters in games not having enough polygons to give me a realistic image. Think if we
-  could build games that put as much geometry into the faces and expressions of characters
-  as they do in just a few anatomical features of characters like Lara Croft. 
-</BLOCKQUOTE>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/153429a.html b/layout/html/tests/block/bugs/153429a.html
deleted file mode 100644
index 2e4af844e987..000000000000
--- a/layout/html/tests/block/bugs/153429a.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Testcase, bug 153429</title>
-</head>
-<body
-  ><table width="50">
-    <tr>
-      <td
-        ><div style="margin-bottom: -7px"><hr></div
-        ><img src="http://mozilla.org/images/mozilla-banner.gif" width="336" height="80" align="right" alt=""
-        ><span style="font-size: 30px">ARatherLongWord</span
-      ></td>
-    </tr>
-  </table
-></body>
-</html>
diff --git a/layout/html/tests/block/bugs/153429b.html b/layout/html/tests/block/bugs/153429b.html
deleted file mode 100644
index 21054ddb229c..000000000000
--- a/layout/html/tests/block/bugs/153429b.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<title>Regression testcase, bug 153429</title>
-<style type="text/css">
-
-div {
-    width: 400px;
-    border: medium solid green;
-}
-
-div > div {
-    width: 380px;
-    height: 4em;
-    float: left;
-    border: medium solid purple;
-}
-
-</style>
-
-<div>
-  <div></div>
-  This is some text.  How does it wrap around the float?
-</div>
diff --git a/layout/html/tests/block/bugs/153429c.html b/layout/html/tests/block/bugs/153429c.html
deleted file mode 100644
index 5d57c69e5d74..000000000000
--- a/layout/html/tests/block/bugs/153429c.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-    <title>Testcase, correctness bug fixed by patch to bug 153429</title>
-    <style type="text/css">
-
-    div {
-        border: medium solid purple;
-        padding: 0.25em;
-        margin: 1px;
-
-    }
-
-    #contain {
-        width: 400px;
-    }
-
-    #one {
-        margin-bottom: 100px;
-    }
-
-    #two {
-        float: left;
-        width: 370px;
-        height: 200px;
-    }
-
-    </style>
-</head>
-<body>
-
-<div id="contain">
-    <div id="one">This <code>div</code> (1) has a 100 px bottom margin.</div>
-    <div id="two">This <code>div</code> (2) is floating left and is 200px tall.</div>
-    This is text that should end up just below <code>div</code> (2) since it
-    can't fit next to it.  There should not be a large gap above it.
-</div>
diff --git a/layout/html/tests/block/bugs/154741.html b/layout/html/tests/block/bugs/154741.html
deleted file mode 100644
index b650e6c77479..000000000000
--- a/layout/html/tests/block/bugs/154741.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><head>
-        <title>Bug 154741</title>
-        <meta http-equiv="Content-Style-Type" content="text/css">
-</head><body><span><img style="float: left" src="../../table/images/mozilla-banner.gif" width="187" height="8">Line1<br>Line2</span></body></html>
diff --git a/layout/html/tests/block/bugs/155333-1.html b/layout/html/tests/block/bugs/155333-1.html
deleted file mode 100644
index 840024ae3df2..000000000000
--- a/layout/html/tests/block/bugs/155333-1.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><title>Testcase bug 155333</title></head>
-<body><small>Foo<br>Bar<br>Baz</small> </body></html>
diff --git a/layout/html/tests/block/bugs/155333-2.html b/layout/html/tests/block/bugs/155333-2.html
deleted file mode 100644
index 3fac6728293a..000000000000
--- a/layout/html/tests/block/bugs/155333-2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>Testcase bug 155333</title></head>
-<body><span style="font-size: 50%">foo<br>bar<br>baz </span> </body></html>
diff --git a/layout/html/tests/block/bugs/15882-a.html b/layout/html/tests/block/bugs/15882-a.html
deleted file mode 100644
index 8ca391dd9b40..000000000000
--- a/layout/html/tests/block/bugs/15882-a.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html><head><title>Testcase for bug 15882</title></head>
-<body bgcolor="#FFFFFF">
-
-Testcase distilled from <A href="http://www.cnn.com">http://www.cnn.com</A>:
-
-<TABLE WIDTH="225">
-<TR><TD WIDTH="225" BGCOLOR="#DDDDDD">
-<IMG SRC="ant.jpg"
-     ALIGN="RIGHT" WIDTH="55" HEIGHT="45">
-<FORM>Enter your U.S. zip code:</FORM>
-</TD></TR>
-</TABLE>
-
-<BR>Same as above but text is not embedded in &lt;FORM>:
-
-<TABLE WIDTH="225">
-<TR><TD WIDTH="225" BGCOLOR="#DDDDDD">
-<IMG SRC="ant.jpg"
-     ALIGN="RIGHT" WIDTH="55" HEIGHT="45">
-Enter your U.S. zip code:
-</TD></TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/15882-b.html b/layout/html/tests/block/bugs/15882-b.html
deleted file mode 100644
index 6c3f7c053ef5..000000000000
--- a/layout/html/tests/block/bugs/15882-b.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html><head><title>Testcase #2 for bug 15882</title></head>
-<body bgcolor="#FFFFFF">
-
-Testcase distilled from <A href="http://www.cnn.com">http://www.cnn.com</A>:
-
-<TABLE WIDTH="225">
-<TR><TD WIDTH="225" BGCOLOR="#DDDDDD">
-<IMG SRC="ant.jpg"
-     ALIGN="RIGHT" WIDTH="55" HEIGHT="45">
-<FORM>vvvEnter your U.S. zip code:</FORM>
-</TD></TR>
-</TABLE>
-
-<BR>Same as above but text is not embedded in &lt;FORM>:
-
-<TABLE WIDTH="225">
-<TR><TD WIDTH="225" BGCOLOR="#DDDDDD">
-<IMG SRC="ant.jpg"
-     ALIGN="RIGHT" WIDTH="55" HEIGHT="45">
-vvvEnter your U.S. zip code:
-</TD></TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/15933-a.html b/layout/html/tests/block/bugs/15933-a.html
deleted file mode 100644
index d1e29ec99b52..000000000000
--- a/layout/html/tests/block/bugs/15933-a.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<body>
- <table cellspacing=0 cellpadding=0 border=1>
-  <tr>
-   <td style="line-height: 0"><img src="ant.jpg" width=1 height=1></td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/15933-b.html b/layout/html/tests/block/bugs/15933-b.html
deleted file mode 100644
index 0cc0b99fd5da..000000000000
--- a/layout/html/tests/block/bugs/15933-b.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
- <table cellspacing=0 cellpadding=0 border=1>
-  <tr>
-   <td style="line-height: 0"><img src="ant.jpg" width=1 height=1></td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/16053.html b/layout/html/tests/block/bugs/16053.html
deleted file mode 100644
index fd1c6697741e..000000000000
--- a/layout/html/tests/block/bugs/16053.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-<title>Simplest <td><img ...></td> testcase: one cell table</title>
-</head>
-
-<body>
-
-<p>Simplest &lt;td&gt;&lt;img ...&gt;&lt;/td&gt; testcase: one cell table</p>
-
-<table border="1" cellpadding="0" cellspacing="0">
-<tr>
-<td><img border="0" width="329" height="220" alt="" src="ant.jpg"></td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/161644.html b/layout/html/tests/block/bugs/161644.html
deleted file mode 100644
index 5e5ab59c8b2e..000000000000
--- a/layout/html/tests/block/bugs/161644.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head>
-  
-  <title>First-Letter Test</title><style>
-    div.float:first-letter { float: left; font-size: 2em; }
-    div.nofloat:first-letter { font-size: 2em; }
-  </style></head><body>
-<div class="float">This is a testcase<br>
-of first-letter with float</div>
-<div class="nofloat">This is a testcase<br>
-of first-letter without float</div>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/16173.html b/layout/html/tests/block/bugs/16173.html
deleted file mode 100644
index 0c7dabc592e4..000000000000
--- a/layout/html/tests/block/bugs/16173.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html><head><title>Testcase for bug 16173</title></head>
-<body bgcolor="#FFFFFF">
-<H4>Testcase distilled from <A href="http://www.sportsline.com/u/ce/multi/0,1329,1462540_52,00.html">
-http://www.sportsline.com/u/ce/multi/0,1329,1462540_52,00.html</A><BR><BR>
-This is the original table, it has cellpadding="0" and cellspacing="0".</H4>
-
-<table cellpadding="0" cellspacing="0" width="450">
-<tr><td width=450>
-  <table width=145 align=right>
-    <tr><td bgcolor=#ffffcc>Pedro comes back at just the right time</td></tr>
-  </table>
-<p>That gave Martinez another day to recover -- just enough time, it turns out.</p>
-</td>
-</tr>
-</table>
-
-<HR><H4>Same as original table but cellpadding="0" and cellspacing="1".</H4>
-
-<table cellpadding="0" cellspacing="1" width="450">
-<tr><td width=450>
-  <table width=145 align=right>
-    <tr><td bgcolor=#ffffcc>Pedro comes back at just the right time</td></tr>
-  </table>
-<p>That gave Martinez another day to recover -- just enough time, it turns out.</p>
-</td>
-</tr>
-</table>
-
-<HR><H4>Same as original table but cellpadding="1" and cellspacing="0".</H4>
-
-<table cellpadding="1" cellspacing="0" width="450">
-<tr><td width=450>
-  <table width=145 align=right>
-    <tr><td bgcolor=#ffffcc>Pedro comes back at just the right time</td></tr>
-  </table>
-<p>That gave Martinez another day to recover -- just enough time, it turns out.</p>
-</td>
-</tr>
-</table>
-
-<HR><H4>Same as original table but cellpadding="1" and cellspacing="1".</H4>
-
-<table cellpadding="1" cellspacing="1" width="450">
-<tr><td width=450>
-  <table width=145 align=right>
-    <tr><td bgcolor=#ffffcc>Pedro comes back at just the right time</td></tr>
-  </table>
-<p>That gave Martinez another day to recover -- just enough time, it turns out.</p>
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/16417.html b/layout/html/tests/block/bugs/16417.html
deleted file mode 100644
index fe87c570b38f..000000000000
--- a/layout/html/tests/block/bugs/16417.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html><head><title>Testcase for bug 16417</title></head>
-<body bgcolor="#FFFFFF">
-
-<p>Testcase distilled from <a href="http://www.3dnews.net/">http://www.3dnews.net/</a></p>
-<TABLE width="290" cellspacing="0" cellpadding="0" bgcolor="#D0D0E0" border="0">
-<tr><td width=10><font face="verdana,arial" size=-2>&nbsp;&#149;&nbsp;</font></td>
-<td><font face="verdana,arial" size=-2><b><A HREF="/.">Nerf Arena!</A></b></font></td></tr>
-
-<tr><td width=10><font face="verdana,arial" size=-2>&nbsp;&#149;&nbsp;</font></td>
-<td><font face="verdana,arial" size=-2><b><A HREF="/.">Windows2000 Delayed</A></b></font></td></tr>
-
-<tr><td width=10><font face="verdana,arial" size=-2>&nbsp;&#149;&nbsp;</font></td>
-<td><font face="verdana,arial" size=-2><b><A HREF="/.">FiringSquad on Coppermine</A></b></font></td></tr>
-</TABLE>
-
-<P>Same as above but without last row:</P>
-<TABLE width="290" cellspacing="0" cellpadding="0" bgcolor="#D0D0E0" border="0">
-<tr><td width=10><font face="verdana,arial" size=-2>&nbsp;&#149;&nbsp;</font></td>
-<td><font face="verdana,arial" size=-2><b><A HREF="/.">Nerf Arena!</A></b></font></td></tr>
-
-<tr><td width=10><font face="verdana,arial" size=-2>&nbsp;&#149;&nbsp;</font></td>
-<td><font face="verdana,arial" size=-2><b><A HREF="/.">Windows2000 Delayed</A></b></font></td></tr>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/16580.html b/layout/html/tests/block/bugs/16580.html
deleted file mode 100644
index 93719a5f817e..000000000000
--- a/layout/html/tests/block/bugs/16580.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html><head><title>Testcase for bug 16580</title></head>
-<body bgcolor="#CCFFFF">
-
-<table width="100%" valign="top" align="center" cellspacing="19">
-  <tr><td> 
-      <table width="65%" border="0" cellpadding="12" align="right" valign="top" cellspacing="25">
-        <tr valign="top" bgcolor="#C8CCFF"> 
-          <td valign="top"> 
-            BCSF 
-              is a non-profit organization created to increase public awareness 
-              of the Middendorf breathwork by arranging for workshops, presentations, 
-              and community events, and by developing and disseminating educational 
-              materials for the general public.
-          </td>
-        </tr>
-      </table>
-
-      <p>You 
-        can help us define our role by your participation in BCSF, its funding, 
-        or its projects. You may even need support that BCSF provides, such as 
-        a scholarship to support your study of the work.</p>
-
-  </td></tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/16656.html b/layout/html/tests/block/bugs/16656.html
deleted file mode 100644
index 4f39d385851c..000000000000
--- a/layout/html/tests/block/bugs/16656.html
+++ /dev/null
@@ -1 +0,0 @@
-<b>&#0149;<i>|</i></b><tt>Side Air Bags Pose Threat to Children</tt>
diff --git a/layout/html/tests/block/bugs/16889.html b/layout/html/tests/block/bugs/16889.html
deleted file mode 100644
index fab56b679b54..000000000000
--- a/layout/html/tests/block/bugs/16889.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<head><TITLE>Nbsp TEST</TITLE></HEAD>
-<BODY>
-myCNN&nbsp
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/169620.html b/layout/html/tests/block/bugs/169620.html
deleted file mode 100644
index 089f8aea6d2d..000000000000
--- a/layout/html/tests/block/bugs/169620.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head>
-<title>Page Widening</title>
-</head>
-
-<body>
-<table>
-<tr>
-<td>
-
-<script>
-document;
-</script>
-<script src="http://nowhere.tld/"></script>
-
-<div style="padding-right:10px;">
-
-<p>Four score and seven years ago, our fathers brought
-forth upon this continent a new nation: conceived in
-liberty, and dedicated to the proposition that all men
-are created equal.</p>
-
-<p>Now we are engaged in a great civil war. . .testing
-whether that nation, or any nation so conceived and so
-dedicated. . . can long endure. We are met on a great
-battlefield of that war.</p>
-
-<p>We have come to dedicate a portion of that field as
-a final resting place for those who here gave their
-lives that that nation might live. It is altogether
-fitting and proper that we should do this.</p>
-
-<p>But, in a larger sense, we cannot dedicate. . .we
-cannot consecrate. . . we cannot hallow this ground.
-The brave men, living and dead, who struggled here have
-consecrated it, far above our poor power to add or
-detract. The world will little note, nor long remember,
-what we say here, but it can never forget what they did
-here.</p>
-
-<p>It is for us the living, rather, to be dedicated
-here to the unfinished work which they who fought here
-have thus far so nobly advanced. It is rather for us to
-be here dedicated to the great task remaining before
-us. . .that from these honored dead we take increased
-devotion to that cause for which they gave the last
-full measure of devotion. . . that we here highly
-resolve that these dead shall not have died in vain. .
-. that this nation, under God, shall have a new birth
-of freedom. . . and that government of the people. .
-.by the people. . .for the people. . . shall not perish
-from the earth.</p>
-<hr>
-</div>
-
-</td>
-<td>
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/17054.html b/layout/html/tests/block/bugs/17054.html
deleted file mode 100644
index 1d9439717234..000000000000
--- a/layout/html/tests/block/bugs/17054.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head><title>Testcase #2 for bug 17054</title></head>
-
-<body bgColor="#FFFFFF" marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-<P style="background-color:#0000FF">
-<BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>
-Last line of previous paragraph
-</P>
-<P>
-<TABLE width="100%" cellpadding="3" cellspacing="0" border="0" bgColor="#CCCCCC">
- <TR>
-  <TD align="center">
-       Copyright &copy; 1998-99 ONElist, Inc.
-  </TD>
- </TR>
-</TABLE>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/17130-a.html b/layout/html/tests/block/bugs/17130-a.html
deleted file mode 100644
index a23db24549b0..000000000000
--- a/layout/html/tests/block/bugs/17130-a.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html><head><title>Testcase for bug 17130, Vertical Alignment error</title></head>
-<body bgcolor="#FFFFFF">
-<H4>Testcase distilled from <a href="http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new">http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new</a></H4>
-<H4>Resize the width of the window and watch the Buy and Pick columns below.</H4>
-
-<table width="100%">
-<tr bgcolor="#CCCCCC">
-  <td>Re-sort by Title</td>
-  <td><SPAN>Buy</SPAN>&nbsp;</td>
-  <td>&nbsp;<SPAN>Pick</SPAN>&nbsp;</td>
-</tr>
-<tr>
-  <td>Norton AntiVirus Definitions Update 10/21/99 Update your NAV for
-      Windows 95/98/NT, Lotus Notes, or Exchange with the latest virus definitions.</td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-</table>
-
-<BR>
-<H4>This is the same table as above but with all &lt;SPAN> elements removed.</H4>
-<table width="100%">
-<tr bgcolor="#CCCCCC">
-  <td>Re-sort by Title</td>
-  <td>Buy&nbsp;</td>
-  <td>&nbsp;Pick&nbsp;</td>
-</tr>
-<tr>
-  <td>Norton AntiVirus Definitions Update 10/21/99 Update your NAV for
-      Windows 95/98/NT, Lotus Notes, or Exchange with the latest virus definitions.</td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/17130-b.html b/layout/html/tests/block/bugs/17130-b.html
deleted file mode 100644
index 03af7e41e7ad..000000000000
--- a/layout/html/tests/block/bugs/17130-b.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><title>Testcase for bug 17130, Line break Error</title></head>
-<body bgcolor="#FFFFFF">
-<H4>Testcase distilled from <a href="http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new">http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new</a></H4>
-<H4>Minimize the window and then open it again.</H4>
-
-<table width="100%">
-<tr bgcolor="#006633">
-  <td><font color="#ffcc00" size="3">&nbsp;&nbsp;<SPAN>CNET</SPAN> : <SPAN>Downloads</SPAN> : </font></td>
-</tr>
-</table>
-
-<BR>
-<H4>This is the same table as above but with all &lt;SPAN> elements removed.</H4>
-<table width="100%">
-<tr bgcolor="#006633">
-  <td><font color="#ffcc00" size="3">&nbsp;&nbsp;CNET : Downloads : </font></td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/17318.html b/layout/html/tests/block/bugs/17318.html
deleted file mode 100644
index d14f10837c09..000000000000
--- a/layout/html/tests/block/bugs/17318.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-<title>Div test case</title>
-</head>
-<body>
-
-<div style="border: thin solid black; float: right; width: auto; margin-right: 
-5%; text-align: right">
-        Today is Wednesday, October 27 1999
-</div>
-
-<div style="border: thin solid red">
-        what's new
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/17331.html b/layout/html/tests/block/bugs/17331.html
deleted file mode 100644
index cc21a8c4054e..000000000000
--- a/layout/html/tests/block/bugs/17331.html
+++ /dev/null
@@ -1,22 +0,0 @@
- <!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html40/loose.dtd">
-
-<html>
-
-<head>
-<title>Borders Shown on Empty DIV</title>
-</head>
-
-<body>
-
-<p>Div with Content:
-
-<div style="border: 1px solid black; text-align: center;">
-<p>Some Content Contained in a DIV with a solid black border of 1 pixel
-</div>
-
-<p>Empty Div (with same inline style):
-
-<div style="border: 1px solid black; text-align: center;"></div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/17372.html b/layout/html/tests/block/bugs/17372.html
deleted file mode 100644
index f4441e37dd97..000000000000
--- a/layout/html/tests/block/bugs/17372.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>BBS test</TITLE>
-</HEAD>
-<BODY>
-<A href="<A href="http://member.nifty.ne.jp/emk/index_j.html">http://member.nifty.ne.jp/emk/index_j.html</A>">Ž©•ª‚ŃAƒ“ƒJ�[‚ð�‘‚­</A><HR>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/17518.html b/layout/html/tests/block/bugs/17518.html
deleted file mode 100644
index bcdcc3d910be..000000000000
--- a/layout/html/tests/block/bugs/17518.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-
-<a name="Top">
-
-click me!
-<img width=40 height=30>
-
-</body></html>
-
diff --git a/layout/html/tests/block/bugs/17532.html b/layout/html/tests/block/bugs/17532.html
deleted file mode 100644
index bf68e804bd95..000000000000
--- a/layout/html/tests/block/bugs/17532.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<style>
-		.setfont { font-size: 10pt; }  
-</style>
-
-<BODY>
-		<span class=setfont>
-				This is a SPAN.<br>
-				Select from the choices below to learn<br>
-				more about WICF or to get information<br>
-				about electrical projects being considered<br>
-				for Western North America.<br>
-		</span>
-		<br>
-		<br>
-		<div class=setfont>
-				This is a DIV.<br>
-				Select from the choices below to learn<br>
-				more about WICF or to get information<br>
-				about electrical projects being considered<br>
-				for Western North America.<br>
-		</div>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/17636.html b/layout/html/tests/block/bugs/17636.html
deleted file mode 100644
index a5b0eade7d2e..000000000000
--- a/layout/html/tests/block/bugs/17636.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<title>S3 - Diamond Multimedia</title>
-</head>
-<body>
-
-<div style="width: 1px;">
-<nobr><img align="left" alt="Diamond Logo" height="195" src="ant.jpg" width="40"> 
-            &nbsp;&nbsp;&nbsp;<img alt="Diamond Home Page Header Logo" height="82" src="resource://gre/res/html/folder.png" width="83"><img border="0" height="82" isMap onmouseover src="resource://gre/res/html/folder.png" width="477"></nobr><br>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/176423.html b/layout/html/tests/block/bugs/176423.html
deleted file mode 100644
index 00faaae06b12..000000000000
--- a/layout/html/tests/block/bugs/176423.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-  "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> 
-<table border="1" width="785">
-<tr>
-    
-    <td width="4%">
-       <div style="width:50px; border:1px solid red">
-           <img src="../images/mozilla-banner.gif">
-
-       </div>
-    </td>
-    <td width="96%">&nbsp;</td>
-</tr>
-
-</table>
-
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/177331.html b/layout/html/tests/block/bugs/177331.html
deleted file mode 100644
index c2e66796a647..000000000000
--- a/layout/html/tests/block/bugs/177331.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-    <head>
-        <title>Testcase, bug 177331</title>
-        <style type="text/css">
-
-            div.button{
-                float: left;
-                margin: 4px;
-                width: 150px;
-                height: 150px;
-                background: #999;
-            }
-        </style>
-    </head>
-<body>
-
-<table border="0" width="500">
-<tr>
-    <td valign="top">
-        <div class="button">
-            <img height="100" width="100" alt="Mozilla"
-                 src="data:text/plain,foo" />
-        </div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-        <div class="button"></div>
-    </td>
-</tr>
-</table>
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/block/bugs/17844.html b/layout/html/tests/block/bugs/17844.html
deleted file mode 100644
index 434d8bb91024..000000000000
--- a/layout/html/tests/block/bugs/17844.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-<table BORSER CELLSPACING=2>
-<tr><td>&nbsp;</td><td>00</td><td>01</td><td>02</td><td>03</td><td>04</td><td>05</td><td>06</td><td>07</td><td>08</td><td>09</td><td>0A</td><td>0B</td><td>0C</td><td>0D</td><td>0E</td><td>0F</td></tr><tr><td>20</td><td> </td><td>!</td><td>"</td><td>#</td><td>$</td><td>%</td><td>&</td><td>'</td><td>(</td><td>)</td><td>*</td><td>+</td><td>,</td><td>-</td><td>.</td><td>/</td></tr><tr><td>30</td><td>0</td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td><td>7</td><td>8</td><td>9</td><td>:</td><td>;</td><td><</td><td>=</td><td>></td><td>?</td></tr><tr><td>40</td><td>@</td><td>A</td><td>B</td><td>C</td><td>D</td><td>E</td><td>F</td><td>G</td><td>H</td><td>I</td><td>J</td><td>K</td><td>L</td><td>M</td><td>N</td><td>O</td></tr><tr><td>50</font></td><td>P</td><td>Q</td><td>R</td><td>S</td><td>T</td><td>U</td><td>V</td><td>W</td><td>X</td><td>Y</td><td>Z</td><td>[</td><td>\</td><td>]</td><td>^</td><td>_</td></tr><tr><td>60</td><td>`</td><td>a</td><td>b</td><td>c</td><td>d</td><td>e</td><td>f</td><td>g</td><td>h</td><td>i</td><td>j</td><td>k</td><td>l</td><td>m</td><td>n</td><td>o</td></tr><tr><td>70</td><td>p</td><td>q</td><td>r</td><td>s</td><td>t</td><td>u</td><td>v</td><td>w</td><td>x</td><td>y</td><td>z</td><td>{</td><td>|</td><td>}</td><td>~</td><td></td></tr><tr><td>80</td><td>€</td><td>�</td><td>‚</td><td>ƒ</td><td>„</td><td>…</td><td>†</td><td>‡</td><td>ˆ</td><td>‰</td><td>Š</td><td>‹</td><td>Œ</td><td>�</td><td>Ž</td><td>�</td></tr><tr><td>90</font></td><td>�</td><td>‘</td><td>’</td><td>“</td><td>”</td><td>•</td><td>–</td><td>—</td><td>˜</td><td>™</td><td>š</td><td>›</td><td>œ</td><td>�</td><td>ž</td><td>Ÿ</td></tr><tr><td>A0</td><td> </td><td>¡</td><td>¢</td><td>£</td><td>¤</td><td>¥</td><td>¦</td><td>§</td><td>¨</td><td>©</td><td>ª</td><td>«</td><td>¬</td><td>­</td><td>®</td><td>¯</td></tr><tr><td>B0</td><td>°</td><td>±</td><td>²</td><td>³</td><td>´</td><td>µ</td><td>¶</td><td>·</td><td>¸</td><td>¹</td><td>º</td><td>»</td><td>¼</td><td>½</td><td>¾</td><td>¿</td></tr><tr><td>C0</td><td>À</td><td>Á</td><td>Â</td><td>Ã</td><td>Ä</td><td>Å</td><td>Æ</td><td>Ç</td><td>È</td><td>É</td><td>Ê</td><td>Ë</td><td>Ì</td><td>Í</td><td>Î</td><td>Ï</td></tr><tr><td>D0</td><td>Ð</td><td>Ñ</td><td>Ò</td><td>Ó</td><td>Ô</td><td>Õ</td><td>Ö</td><td>×</td><td>Ø</td><td>Ù</td><td>Ú</td><td>Û</td><td>Ü</td><td>Ý</td><td>Þ</td><td>ß</td></tr><tr><td>E0</td><td>à</td><td>á</td><td>â</td><td>ã</td><td>ä</td><td>å</td><td>æ</td><td>ç</td><td>è</td><td>é</td><td>ê</td><td>ë</td><td>ì</td><td>í</td><td>î</td><td>ï</td></tr><tr><td>F0</td><td>ð</td><td>ñ</td><td>ò</td><td>ó</td><td>ô</td><td>õ</td><td>ö</td><td>÷</td><td>ø</td><td>ù</td><td>ú</td><td>û</td><td>ü</td><td>ý</td><td>þ</td><td>ÿ</td></tr></table></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/18445.html b/layout/html/tests/block/bugs/18445.html
deleted file mode 100644
index 84f503845902..000000000000
--- a/layout/html/tests/block/bugs/18445.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<!-- http://www.bath.ac.uk/%7Epy8ieh/a/internet/projects/mozilla/widgets/ -->
-
-<html>
-
-<head>
-
-<title>Mozilla Tests: Styled Widgets Eleven</title>
-
-<style type="text/css">
-
-   div.right, div.left { width: 100px; height: 30px; background: green; color: white; }
-   div.left { float: left; } div.right { float: right; }
-   .center, input { display: block; margin: auto; width: 300px; }
-   input.left { margin-left: 0; } input.right { margin-right: 0; }
-   p, hr { clear: both; }
-   div { padding: 5px; border: solid; }
-
-</style>
-
-</head>
-
-<body>
-
-<H1>Styling Widgets! 11</H1>
-
-<p>In all these tests, INPUT should act as a BLOCK element because it
-is given 'display:block' in the stylesheet.</p>
-
-<p>In the following test case there a centered INPUT element.</p>
-
-<div>
-   <input type="text" value="I am centered with 'margin:auto'.">
-</div>
-
-<p>In the following test case, there is the same INPUT but this time
-it is next to a float. <em>The INPUT should be in the same place!</em></p>
-
-<div>
-   <div class="right">I float.</div>
-   <input type="text" value="I am centered with 'margin:auto'.">
-</div>
-
-<p>This problem does not seem to occur with left floated images: </p>
-
-<div>
-   <div class="left">I float.</div>
-   <input type="text" value="I am centered with 'margin:auto'.">
-</div>
-
-<p>Similarly, if we right align the INPUT, the INPUT does
-not go under the floated block as it should:</p>
-
-<div>
-   <div class="right">I float.</div>
-   <input class="right" type="text" value="I am right aligned with 'margin-left:auto'.">
-</div>
-
-<p>In this case, though, the problem <em>does</em> appear for the left
-case: </p>
-
-<div>
-   <div class="left">I float.</div>
-   <input class="left" type="text" value="I am left aligned with 'margin-right:auto'.">
-</div>
-
-<hr>
-
-<p><a href="10.html">Prev</a> <a href="12.html">Next</a></p>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/block/bugs/18445_1.html b/layout/html/tests/block/bugs/18445_1.html
deleted file mode 100644
index 7efab8dc416c..000000000000
--- a/layout/html/tests/block/bugs/18445_1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<!-- http://www.bath.ac.uk/%7Epy8ieh/a/internet/projects/mozilla/widgets/ -->
-
-<html>
-
-<head>
-
-<title>Mozilla Tests: Styled Widgets Eleven</title>
-
-<style type="text/css">
-
-   div.right, div.left { width: 100px; height: 30px; background: green; color: white; }
-   div.left { float: left; } div.right { float: right; }
-   .center, p { display: block; margin: auto; width: 300px; }
-   p {border: 1px solid black; background: yellow; }
-   p.left { margin-left: 0; } 
-   p.right { margin-right: 0; }
-   p.note {clear:both; width:auto; background: white;}
-   div { padding: 5px; border: solid; }
-
-</style>
-
-</head>
-
-<body>
-
-<H1>Styling Widgets! 11</H1>
-
-<p class=note>In all these tests, INPUT should act as a BLOCK element because it
-is given 'display:block' in the stylesheet.</p>
-
-<p class=note>In the following test case there a centered INPUT element.</p>
-
-<div>
-   <P>I am centered with 'margin:auto'."</P>
-</div>
-
-<p class=note>In the following test case, there is the same INPUT but this time
-it is next to a float. <em>The INPUT should be in the same place!</em></p>
-
-<div>
-   <div class="right">I float.</div>
-   <P>I am centered with 'margin:auto'."</P>
-</div>
-
-<p class=note>This problem does not seem to occur with left floated images: </p>
-
-<div>
-   <div class="left">I float.</div>
-   <P>I am centered with 'margin:auto'."</P>
-</div>
-
-<p class=note>Similarly, if we right align the INPUT, the INPUT does
-not go under the floated block as it should:</p>
-
-<div>
-   <div class="right">I float.</div>
-   <P class="right">I am right aligned with 'margin-left:auto'."</P>
-</div>
-
-<p class=note>In this case, though, the problem <em>does</em> appear for the left
-case: </p>
-
-<div>
-   <div class="left">I float.</div>
-   <P class="left">I am left aligned with 'margin-right:auto'."</P>
-</div>
-
-<hr>
-
-<p class=note><a href="10.html">Prev</a> <a href="12.html">Next</a></p>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/block/bugs/18445_2.html b/layout/html/tests/block/bugs/18445_2.html
deleted file mode 100644
index 25e99d5a4cbb..000000000000
--- a/layout/html/tests/block/bugs/18445_2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head>
-<title>Mozilla Tests: Styled Widgets Eleven</title>
-<style type="text/css">
-   div.right, div.left { width: 100px; height: 1000px; background: green; color: white; }
-   div.left { float: left; width: 50px;} div.right { float: right; }
-   .center, input { display: block; margin: auto; width: 300px; }
-   input.left { margin-left: 0; } input.right { margin-right: 0; }
-   p { margin: auto; background: yellow; border: 1px solid black; width:30px; height: 100px; }
-   div { padding: 5px; border: solid; }
-</style>
-</head><body>
-<div>
-  <div class="left">left</div>
-  <div class="right">right</div>
-  <input type="text">
-  <select name=select2 id=select1 size=1 style="display:block; margin:auto;">
-   <option>option 1</option>
-  </select>
-  <textarea style="display:block; margin:auto;">
-   here is the text
-  </textarea>
-
-  <p></p>
-  <img width=30 height=30 style="display:block; margin: auto; border: 1px solid black;">
-    text in the outer div
-</div>
-</body></html>
diff --git a/layout/html/tests/block/bugs/18445_3.html b/layout/html/tests/block/bugs/18445_3.html
deleted file mode 100644
index 9ff84946f0dd..000000000000
--- a/layout/html/tests/block/bugs/18445_3.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html> 
-<head> 
-  <title></title> 
-  <style type="text/css">  
-  .big {
-		display: block;
-		width: 100%;
-    width: 20px;
-    height: 400px;
-    border: 1px solid black;
-		}
-
-	.fl {
-		float: left;
-		clear: left;
-    width: 50px;
-    height: 50px;
-    border: 1px solid black;
-		}
-	</style> 
-</head> 
-<body>
-  <div class="fl">this div should be under the big img</div>
-  <img class="fl" >
-  <img class="fl" > 
-  <img class="fl" > 
-  <img class="fl" > 
-  <img class="big" >  
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/18445_4.html b/layout/html/tests/block/bugs/18445_4.html
deleted file mode 100644
index 0faa70825a87..000000000000
--- a/layout/html/tests/block/bugs/18445_4.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table width=50 height=50 bgcolor=yellow><tr><td>1</td></tr></table>
-<img align=left border=1 width=50 height=50>
-<table width=50 height=50 bgcolor=yellow><tr><td>2</td></tr></table>
-<img align=right border=1 width=50 height=50>
-<table width=50 height=50 bgcolor=yellow align=left><tr><td>3</td></tr></table>
-<img align=left border=1 width=50 height=50>
-<table width=50 height=50 bgcolor=yellow align=left><tr><td>4</td></tr></table>
-<img border=1 width=50 height=50>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/185411-1.html b/layout/html/tests/block/bugs/185411-1.html
deleted file mode 100644
index 5f08cece167f..000000000000
--- a/layout/html/tests/block/bugs/185411-1.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en-US">
-<head>
-	<title></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<meta http-equiv="Content-Style-Type" content="text/css">
-	<style type="text/css">
-
-	table { margin-left: auto; margin-right: auto; }
-	table:last-child { margin-right: 0; }
-	table:first-child { margin-left: 0; }
-	
-	div.constrained {
-		border: medium solid;
-		width: 20px;
-		margin: auto;
-	}
-
-	</style>
-</head>
-<body>
-
-<div>
-	<table border><tr><td>ABCDE</td></tr></table>
-	<table border><tr><td>ABCDE</td></tr></table>
-	<table border><tr><td>ABCDE</td></tr></table>
-</div>
-
-<div>
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-</div>
-
-<div>
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-</div>
-
-<div class="constrained">
-	<table border><tr><td>ABCDE</td></tr></table>
-	<table border><tr><td>ABCDE</td></tr></table>
-	<table border><tr><td>ABCDE</td></tr></table>
-</div>
-
-<div class="constrained">
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-	<table border width="5"><tr><td>ABCDE</td></tr></table>
-</div>
-
-<div class="constrained">
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-	<table border width="300"><tr><td>ABCDE</td></tr></table>
-</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/185411-2.html b/layout/html/tests/block/bugs/185411-2.html
deleted file mode 100644
index 3f562b42b957..000000000000
--- a/layout/html/tests/block/bugs/185411-2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-  <title>Inconsistency testcase</title>
-  <style type="text/css">
-div { margin-left: auto; margin-right: auto; margin-top: 1em; }
-  </style>
-</head>
-<body>
-<p>All divs have margin-left and margin-right set to auto.<p>
-<div style="width: 400px; border: 4px dashed green;">
- <p style="text-align: center; font-weight: bold;">Containing block (400px)</p>
-
- <div style="width: 500px; border-top: solid thin red; border-bottom: solid thin red;">
-  500px-wide div without left or right border
- </div>
-
- <div style="width: 500px; border: solid thin red;">
-  500px-wide div with left and right border
- </div>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/185411-3.html b/layout/html/tests/block/bugs/185411-3.html
deleted file mode 100644
index 3c522fd6211d..000000000000
--- a/layout/html/tests/block/bugs/185411-3.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Apple - iPod</title>
-</head>
-<body>
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" id="tabs">
-	<tr>
-		<td width="49%"><img src="logo-star.gif" width="1" height="52" alt=""></td>
-		<td width="2%" align="center">
-		<table width="725" border="0" cellpadding="0" cellspacing="0">
-			<tr>
-				<td width="725"><img src="logo-star.gif" width="725" height="32" alt=""></td>
-			</tr>
-		</table>
-		</td>
-		<td width="49%"><img src="logo-star.gif" width="1" height="52" alt=""></td>
-	</tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/18754.html b/layout/html/tests/block/bugs/18754.html
deleted file mode 100644
index 7cdf143bf3b5..000000000000
--- a/layout/html/tests/block/bugs/18754.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<img src="ant.jpg" width="180" height="400" align="left">
-<hr>
diff --git a/layout/html/tests/block/bugs/196919.html b/layout/html/tests/block/bugs/196919.html
deleted file mode 100644
index cdd21e901e3d..000000000000
--- a/layout/html/tests/block/bugs/196919.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en-US">
-<head>
-    <title>Testcase, bug 196919</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <meta http-equiv="Content-Style-Type" content="text/css">
-    <style type="text/css">
-
-    #float-one, #float-two, #float-three {
-        border: medium solid blue;
-        padding: 0.5em;
-        margin: 0.5em;
-        height: 5em;
-        width: 20%;
-    }
-
-    #float-one { float: left; }
-    #float-two { float: left; clear: left; }
-    #float-three { float: right; }
-
-    </style>
-</head>
-<body>
-
-<div id="float-one">Float one.</div>
-<div id="float-two">Float two.</div>
-<div> <!-- mLastFloaterY doesn't get copied down to this DIV -->
-    <div id="float-three">Float three, whose top should be even with float two.</div>
-</div>
-
-
-</body>
-</html> 
diff --git a/layout/html/tests/block/bugs/199673-1.html b/layout/html/tests/block/bugs/199673-1.html
deleted file mode 100644
index 5fa33b54418e..000000000000
--- a/layout/html/tests/block/bugs/199673-1.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Testcase, bug 199673</title>
-</head>
-<body>
-<p><a href="http://brazil.joelonsoftware.com"><font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p><a href="http://brazil.joelonsoftware.com">X<font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p style="text-decoration: underline"><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p style="text-decoration: underline">X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p>X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/199673-2.html b/layout/html/tests/block/bugs/199673-2.html
deleted file mode 100644
index 271ffc524667..000000000000
--- a/layout/html/tests/block/bugs/199673-2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-<title>Testcase, bug 199673</title>
-</head>
-<body>
-<p><a href="http://brazil.joelonsoftware.com"><font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p><a href="http://brazil.joelonsoftware.com">X<font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p style="text-decoration: underline"><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p style="text-decoration: underline">X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p>X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/199673-3.html b/layout/html/tests/block/bugs/199673-3.html
deleted file mode 100644
index 3fb9f7bea8f0..000000000000
--- a/layout/html/tests/block/bugs/199673-3.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-<title>Testcase, bug 199673</title>
-</head>
-<body>
-<p><a href="http://brazil.joelonsoftware.com"><font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p><a href="http://brazil.joelonsoftware.com">X<font size="1">Brazilian Portuguese</font></a><br>
-<a href="http://bulgarian.joelonsoftware.com"><font size="1">Bulgarian</font></a><br></p>
-
-<p style="text-decoration: underline"><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p style="text-decoration: underline">X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p><font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-<p>X<font size="1">Brazilian Portuguese</font><br>
-<font size="1">Bulgarian</font><br></p>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/20020515_60x60_scooby.jpg b/layout/html/tests/block/bugs/20020515_60x60_scooby.jpg
deleted file mode 100644
index 329ca6143b0c313fa7497b02e2b3da49b611e16a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2059
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
Mmq$dPdP>y&KmIFNKmY&$

diff --git a/layout/html/tests/block/bugs/20582.html b/layout/html/tests/block/bugs/20582.html
deleted file mode 100644
index 847c4f7e9960..000000000000
--- a/layout/html/tests/block/bugs/20582.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><style>
-body {
-  padding-left: 10%;
-  padding-right:10%;
-}
-</style></head><body>
-<hr>
-<hr width=100%>
-<hr style="margin: auto">
-abc
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/215857-2.html b/layout/html/tests/block/bugs/215857-2.html
deleted file mode 100644
index 13abcf16eb0e..000000000000
--- a/layout/html/tests/block/bugs/215857-2.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-   <head>
-      <title>bug 215857 part 2</title>
-   </head>
-   <body>
-      <table border="1" width="766"><tr>
-            <td width="135">
-               <script>var v = document.body.offsetHeight;</script>
-               <hr width="90%">
-               <script>var v = document.body.offsetHeight;</script>
-            </td>
-            <td></td>
-         </tr>
-      </table>
-   </body>
-</html>
diff --git a/layout/html/tests/block/bugs/215857-3.html b/layout/html/tests/block/bugs/215857-3.html
deleted file mode 100644
index f9931a8813f1..000000000000
--- a/layout/html/tests/block/bugs/215857-3.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><html><head><title>bug 215857 part 2</title></head>
-
-   <body>
-      <table border="1" width="766"><tbody><tr>
-            <td width="135">
-               <script>var v = document.body.offsetHeight;</script>
-               <table border width="90%" cellspacing="0" cellpadding="0"><tr><td></td></tr></table>
-               <script>var v = document.body.offsetHeight;</script>
-            </td>
-            <td></td>
-         </tr>
-      </tbody></table>
-   </body></html>
diff --git a/layout/html/tests/block/bugs/215857.html b/layout/html/tests/block/bugs/215857.html
deleted file mode 100644
index 4d9ebd802ac4..000000000000
--- a/layout/html/tests/block/bugs/215857.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-   <head>
-      <title>bug 215857 part 2</title>
-   </head>
-   <body>
-      <table border="1" width="766"><tr>
-            <td width="135">
-               <script>var v = document.body.offsetHeight;</script>
-               <div style="width:90%; border:solid 1px black; "></div>
-               <script>var v = document.body.offsetHeight;</script>
-            </td>
-            <td></td>
-         </tr>
-      </table>
-   </body>
-</html>
diff --git a/layout/html/tests/block/bugs/216303.html b/layout/html/tests/block/bugs/216303.html
deleted file mode 100644
index 7dfefff79a64..000000000000
--- a/layout/html/tests/block/bugs/216303.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-    <title>Testcase, bug 216303</title>
-    <style type="text/css">
-
-    body {
-        border: medium solid green;
-        padding: 1em;
-        margin: 1em;
-        height: 20em;
-    }
-
-    div {
-        float: left;
-        height: 50%;
-        border: medium solid orange;
-    }
-    </style>
-</head>
-<body>
-
-<div>This orange box should be 50% of the height of the green box.</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/217369-1.html b/layout/html/tests/block/bugs/217369-1.html
deleted file mode 100644
index f846467f94ef..000000000000
--- a/layout/html/tests/block/bugs/217369-1.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<title>Testcase, bug 217369</title>
-<body>
-
-<table width="300">
-	<tr>
-		<td width="120" bgcolor="yellow">
-			<div style="margin: 0px; width: 120px;">
-				120px
-				<script type="text/javascript">
-					var foo = document.body.offsetHeight;
-				</script>
-			</div>
-		</td>
-		<script type="text/javascript">
-			var foo = document.body.offsetHeight;
-		</script>
-		<td bgcolor="aqua">180px</td>
-	</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/217369-2.html b/layout/html/tests/block/bugs/217369-2.html
deleted file mode 100644
index 199d2226cf5d..000000000000
--- a/layout/html/tests/block/bugs/217369-2.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html
-<title>Testcase, bug 217369</title
-><body
-
-><table width="300"
-	><tr
-		><td width="120" bgcolor="yellow"
-			><div style="margin: 0px; width: 120px;">
-				120px
-				<script type="text/javascript">
-					var foo = document.body.offsetHeight;
-				</script>
-			</div
-		></td
-		><script type="text/javascript">
-			var foo = document.body.offsetHeight;
-		</script
-		><td bgcolor="aqua">180px</td
-	></tr
-></table
-
-></body
-></html>
diff --git a/layout/html/tests/block/bugs/22037.html b/layout/html/tests/block/bugs/22037.html
deleted file mode 100644
index a8c3213f9a34..000000000000
--- a/layout/html/tests/block/bugs/22037.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body>
-
-<p><span>You should see "This test worked!" <em>below</em> this line, <object src="foo"><h2>This test worked!</h2></object> and <em>above</em> this text</span>.</p>
-
-<p><span>You should see the text from <b>here <object src="foo">through this object with <span style="display:block;">this block</span> and this trailing inline</object> all the way to here</b> displayed in <b>bold</b>.</span></p>
-
-<p><span>Here is another <object src="foo"><h2>test</h2></object> with an <a href="">anchor</a></span></p>
-
-<p><span>before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before <object src="foo"><h2>block block block block block block block block block block block block block block block block block block block block</h2></object> after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after</span></p>
-
-<p><span><span><span>before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before before <object src="foo">left left left left left left left left left left left left left left left left left left <h2>block block block block block block block block block block block block block block block block block block block block</h2> right right right right right right right right right right right right right right right right right right</object> after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after after</span></span></span></p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/223394-1.html b/layout/html/tests/block/bugs/223394-1.html
deleted file mode 100644
index ff76c6a23cb1..000000000000
--- a/layout/html/tests/block/bugs/223394-1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
- <title>test page</title>
-</head>
-<body>
- <div style="position:absolute;">
-  <img src="http://www.mozilla.org/frontpage/header.gif" height="30%">
- </div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/223394-2.html b/layout/html/tests/block/bugs/223394-2.html
deleted file mode 100644
index f4c1018c0d0a..000000000000
--- a/layout/html/tests/block/bugs/223394-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>test page</title>
-</head>
-<body>
- <div style="position:absolute;">
-  <img src="http://www.mozilla.org/frontpage/header.gif" height="30%">
- </div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/223394-3.html b/layout/html/tests/block/bugs/223394-3.html
deleted file mode 100644
index b75e4646bf49..000000000000
--- a/layout/html/tests/block/bugs/223394-3.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
- <title>test page</title>
-</head>
-<body>
- <div style="position:absolute;">
-  <img src="http://www.mozilla.org/frontpage/header.gif" style="height:auto;">
- </div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/223394-4.html b/layout/html/tests/block/bugs/223394-4.html
deleted file mode 100644
index 6050dcf3e18b..000000000000
--- a/layout/html/tests/block/bugs/223394-4.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <title>test page</title>
-</head>
-<body>
- <div style="position:absolute;">
-  <img src="http://www.mozilla.org/frontpage/header.gif" style="height:auto;">
- </div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/22413.html b/layout/html/tests/block/bugs/22413.html
deleted file mode 100644
index 4bbb514584b2..000000000000
--- a/layout/html/tests/block/bugs/22413.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<html>
-<body>
-<p>
-This should be the only visible text when the page has loaded, and is with
-M11.
-</p>
-
-<div id="DescriptionText1">
-  <p>This paragraph disappears.</p>
-</div>
-
-<layer>
-  <div id="DescriptionText2">
-    <p>This is visible in M12 -- it should have disappeared.</p>
-  </div>
-</layer>
-
-<div id="DescriptionText3">
-  <layer>
-    <p>This is visible in M12 -- it should have disappeared.</p>
-  <layer>
-</div>
-
-<script LANGUAGE="JavaScript" type="text/javascript">
-  var n = document.getElementById("DescriptionText1");
-  while (n.hasChildNodes())
-    n.removeChild(n.firstChild);
-
-  n = document.getElementById("DescriptionText2");
-  while (n.hasChildNodes())
-    n.removeChild(n.firstChild);
-
-  n = document.getElementById("DescriptionText3");
-  while (n.hasChildNodes())
-    n.removeChild(n.firstChild);
-</script>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/22496.html b/layout/html/tests/block/bugs/22496.html
deleted file mode 100644
index a15b09a2f992..000000000000
--- a/layout/html/tests/block/bugs/22496.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html><head><base href='http://www.winamp.com/'></head>
-<BODY>
-<div style="width:50px; height:30px; background:yellow;">
-  <IMG SRC="ant.jpg" ALIGN=LEFT WIDTH=61 HEIGHT=20 ALT="foo">
-  <IMG SRC="ant.jpg" WIDTH=181 HEIGHT=20 ALT="bar">
-</DIV>
-<br clear=all>
-<div style="width:50px; height:30px; background:yellow;">
-  <div style="float:left; width:61px; height:20px; background:aqua;">50px float</div>
-  <IMG SRC="ant.jpg" WIDTH=181 HEIGHT=20 ALT="bar">
-</DIV>
-<br clear=all>
-<div style="width:50px; height:30px; background:yellow;">
-  <IMG SRC="ant.jpg" ALIGN=LEFT WIDTH=61 HEIGHT=20 ALT="foo">
-  xxxxxxxxxxxxxxxxxxxxxxxxx
-</DIV>
-<br clear=all>
-<div style="width:50px; height:30px; background:yellow;">
-  <div style="float:left; width:61px; height:20px; background:aqua;">50px float</div>
-  xxxxxxxxxxxxxxxxxxxxxxxxx
-</DIV>
-
-<hr>
-
-<table width=50 height=30 bgcolor=pink><tr><td>
-  <IMG SRC="ant.jpg" ALIGN=LEFT WIDTH=61 HEIGHT=20 ALT="foo">
-  <IMG SRC="ant.jpg" WIDTH=181 HEIGHT=20 ALT="bar">
-</td></tr></table>
-<br clear=all>
-<table width=50 height=30 bgcolor=pink><tr><td>
-  <div style="float:left; width:61px; height:20px; background:aqua;">50px float</div>
-  <IMG SRC="ant.jpg" WIDTH=181 HEIGHT=20 ALT="bar">
-</td></tr></table>
-<br clear=all>
-<table width=50 height=30 bgcolor=pink><tr><td>
-  <IMG SRC="ant.jpg" ALIGN=LEFT WIDTH=61 HEIGHT=20 ALT="foo">
-  xxxxxxxxxxxxxxxxxxxxxxxxx
-</td></tr></table>
-<br clear=all>
-<table width=50 height=30 bgcolor=pink><tr><td>
-  <div style="float:left; width:61px; height:20px; background:aqua;">50px float</div>
-  xxxxxxxxxxxxxxxxxxxxxxxxx
-</td></tr></table>
-</body></html>
diff --git a/layout/html/tests/block/bugs/228172.html b/layout/html/tests/block/bugs/228172.html
deleted file mode 100644
index 0e48557f61f3..000000000000
--- a/layout/html/tests/block/bugs/228172.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-    <title>Testcase</title>
-  </head>
-
-<body>
-
-<table border width="100%">
-<tbody>
-<tr valign="top">
-<td>
-<div style="width : 10px">
-<script>var v = document.body.offsetHeight;</script>
-</div>
-<script>var v = document.body.offsetHeight;</script>
-</td>
-<td>
-</td>
-</tr>
-</tbody>
-</table>
-
-<table border width="100%">
-<tbody>
-<tr>
-<td>
-<div style="width : 10px">
-</div>
-</td>
-<td>
-</td>
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/239079.html b/layout/html/tests/block/bugs/239079.html
deleted file mode 100644
index a2bb2c18dc93..000000000000
--- a/layout/html/tests/block/bugs/239079.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<style> #600 { color: red } </style>
-<body id="600">There should be no red</body>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/239079.xml b/layout/html/tests/block/bugs/239079.xml
deleted file mode 100644
index 1ef72f604c20..000000000000
--- a/layout/html/tests/block/bugs/239079.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: ID selectors starting with number</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#id-selectors"/>
-  <style type="text/css">
-    #div { color: green }
-    #1 { color: red }
-  </style>
- </head>
- <body>
-   <div id="div"><p id="1">This text should be green</p></div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/262624.html b/layout/html/tests/block/bugs/262624.html
deleted file mode 100644
index b8107e5cfba8..000000000000
--- a/layout/html/tests/block/bugs/262624.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-<style>
-a:before
-{
- content: "<";
-}
-
-a:after
-{
- content: ">";
-}
-
-a[class~="imglink"]:before
-{
- content: normal;
-}
-
-a[class~="imglink"]:after
-{
- content: normal;
-}
-</style>
-</head>
-
-<body>
-
- <a href="" class="imglink">
-  This should not have angle brackets.
-<br />
- <a href="">This should</a>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/263406-1.xml b/layout/html/tests/block/bugs/263406-1.xml
deleted file mode 100644
index 29522106e10a..000000000000
--- a/layout/html/tests/block/bugs/263406-1.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml-stylesheet type="text/css" href="data:text/css, root { display: table;
-position: fixed }"?>
-<root>
-aaa
-</root>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/263406-2.xml b/layout/html/tests/block/bugs/263406-2.xml
deleted file mode 100644
index 4ee10c537c37..000000000000
--- a/layout/html/tests/block/bugs/263406-2.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml-stylesheet type="text/css" href="data:text/css, root { display: table;
-position: absolute }"?>
-<root>
-aaa
-</root>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/263406-3.xml b/layout/html/tests/block/bugs/263406-3.xml
deleted file mode 100644
index ebd2e90cc224..000000000000
--- a/layout/html/tests/block/bugs/263406-3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml-stylesheet type="text/css" href="data:text/css, root { display: block; }
-table { display: table; } inner-table { display: table; position: absolute;
-width: 200px; right: 0; top: 0"?>
-<root>
-aaa
-<table><inner-table>bbb</inner-table></table>
-</root>
-
diff --git a/layout/html/tests/block/bugs/263406-4.html b/layout/html/tests/block/bugs/263406-4.html
deleted file mode 100644
index 73f204726c6d..000000000000
--- a/layout/html/tests/block/bugs/263406-4.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-<fieldset>
-  <legend style="position: fixed; top: 200px; right: 100px">Fixed legend</legend>
-</fieldset>
-
-<fieldset>
-  <legend style="position: absolute; top: 300px; right: 50px">Abs pos legend</legend>
-</fieldset>
-
-<spacer style="position: absolute; border: 1px solid green">
-
-<spacer style="position: fixed; border: 1px solid red">
-
-<div style="position: relative; top: 100px; left: 200px">
-This is text, rel pos
- <div style="position: absolute; top: 200px; left: 100px">More text, abs pos</div>
-</div>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-<div style="float: left">Floating</div>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-Long text<br>
-<div style="position: fixed; top: 0; right: 0">
-This is fixed
-</div>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/263406-5.xml b/layout/html/tests/block/bugs/263406-5.xml
deleted file mode 100644
index 182452443330..000000000000
--- a/layout/html/tests/block/bugs/263406-5.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml-stylesheet type="text/css" href="data:text/css, root { display: table; }
-   table {display: table; position: fixed; top: auto; left: 200px }
-   tbody { display: table-row-group }
-   tr { display: table-row }
-   td { display: table-cell }
-   "?>
-<root><table><tbody><tr><td>bbb</td></tr></tbody></table></root>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/263406-6.xml b/layout/html/tests/block/bugs/263406-6.xml
deleted file mode 100644
index b31b6f58c199..000000000000
--- a/layout/html/tests/block/bugs/263406-6.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml-stylesheet type="text/css" href="data:text/css, root { display: table; }
-   block {display: block; position: fixed; top: auto; left: 200px }
-   "?>
-<root><block>bbb</block></root>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/263406-7.html b/layout/html/tests/block/bugs/263406-7.html
deleted file mode 100644
index 82f4bd7b0b20..000000000000
--- a/layout/html/tests/block/bugs/263406-7.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
- <head>
-  <title>CSS Floats: Float Sizing</title>
-  <style type="text/css">
-   .table { display: table; }
-   .float { float: left; border: solid; display: table; }
-  </style>
- </head>
- <body>
-
-  <div class="table" style="margin-left: 100px">
-    <div class="float" style="width: 200px">This is a 200px wide float.  This is a 200px wide float.  This is a 200px wide float.  This is a 200px wide float.  This is a 200px wide float.  </div>
-    This text should be to the right of the float, and aligned with its top or so.
-  </div>
-
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/264914-1.html b/layout/html/tests/block/bugs/264914-1.html
deleted file mode 100644
index f6760a8e866c..000000000000
--- a/layout/html/tests/block/bugs/264914-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-This is text. <button>
-<div style="float: left">This is a float</div> And more text and so forth
-</button>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/264914-2.html b/layout/html/tests/block/bugs/264914-2.html
deleted file mode 100644
index c7e4c22fc83b..000000000000
--- a/layout/html/tests/block/bugs/264914-2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-This is text. <button style="position: relative; height: 100px; width: 100px; -moz-box-sizing: content-box">
-<div style="position: absolute; top: 50px; left: 50px; border: 2px solid green; height: 25px; width: 25px"></div>
-</button>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/265566.html b/layout/html/tests/block/bugs/265566.html
deleted file mode 100644
index eb7500bb5d0e..000000000000
--- a/layout/html/tests/block/bugs/265566.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<style type="text/css">
-.green {
-  width: 100px;
-  height: 100px;
-  background-color: green;
-}
-
-.red {
-  width: 100px;
-  height: 100px;
-  margin-top: 100px;
-  margin-left: 100px;
-  background-color: red;
-}
-
-.clip {
-  clip: rect(0px 100px 100px 0px);
-}
-
-.positioned {
-  position: fixed;
-}
-</style>
-<body>
-You should see a 100x100 green square below.  If you see any red, the test
-has failed.  This test is checking to make sure clip is applying to all
-descendants.
-
-<div class="clip green positioned">
-<div class="red"></div>
-<div class="red positioned"></div>
-</div>
diff --git a/layout/html/tests/block/bugs/27211.html b/layout/html/tests/block/bugs/27211.html
deleted file mode 100644
index 15b4c9f61e61..000000000000
--- a/layout/html/tests/block/bugs/27211.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<HTML>
-<HEAD>
-<SCRIPT>
-function doit()
-{
- var span = document.getElementById("foo")
- document.body.removeChild(span)
- document.body.appendChild(span)
-}
-</SCRIPT>
-</HEAD>
-<BODY onload='doit()'>
-<SPAN ID=foo>
-one
-<P>
-two
-</P>
-</SPAN>
-<HR>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/276286.html b/layout/html/tests/block/bugs/276286.html
deleted file mode 100644
index 4d6fc418ff24..000000000000
--- a/layout/html/tests/block/bugs/276286.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15">
-		<title>Mozilla overflow within table / JS style bug</title>
-		<style type="text/css">
-
-			div.code { border: 1px solid red; overflow: auto; }
-
-		</style>
-		<script type="text/javascript">
-
-			window.onload = function()
-			{
-				var el = document.getElementsByTagName('div'), i = el.length;
-
-				while (i--)
-				{
-					if (el.item(i).className == 'code')
-						el.item(i).style.paddingBottom = '0px';
-				}
-			}
-
-		</script>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td>
-					<div class="code">
-						content
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/276602.html b/layout/html/tests/block/bugs/276602.html
deleted file mode 100644
index 1a76f40555f9..000000000000
--- a/layout/html/tests/block/bugs/276602.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-        <title>Testcase for bug 276602</title>
-        <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
-        <style type="text/css">
-                .container {
-                        width: 600px;
-                        border: 1px solid black;
-                }
-                .blue {
-                        margin-right: 96px;
-			background:   blue;
-			color:        white;
-                }
-
-                .float {
-                        float:       right;
-                        width:       96px;
-                        height:      96px;
-			background:  red;
-                        opacity:     0.3;
-                }
-                .correct {
-                        margin-right: -95px;
-                }
-                .wrong {
-                        margin-right: -96px;
-                }
-
-        </style>
-</head>
-<body>
-
-<div class="container">
-        <div class="blue"><div class="float correct"></div>Notice the 1px overlap ==></div>
-        <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
-</div>
-
-<hr/>
-
-<div class="container">
-        <div class="blue"><div class="float wrong"></div>No overlap ==></div>
-        <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?</p>
-</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/277420.html b/layout/html/tests/block/bugs/277420.html
deleted file mode 100644
index 89d67b4ac3f4..000000000000
--- a/layout/html/tests/block/bugs/277420.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head>
-<style>div.col { -moz-column-count:2; -moz-column-gap:2em }
-</style></head>
-
-<body>
-  <p>All these tests should build a reasonable frame tree without asserting.
-
-  </p><div style="position: absolute; left: 100px; top: 50px; width: 200px; height: 100px; overflow: scroll;">
-    This text is in a positioned box with scrollbars.
-    <div style="position: absolute; left: 200px; top: 200px;">
-      Scroll to see this text. (#1)
-    </div>
-  </div>
-
-  <div style="height: 150px;"></div>
-
-  <div style="width: 200px; height: 100px; overflow: scroll;">
-    This text is in a box with scrollbars.
-    <div style="position: absolute; left: 200px; top: 350px;">
-      This text should be visible on the main page. (#1)
-    </div>
-  </div>
-
-  <div style="height: 250px;"></div>
-
-
-
-  <div class="col" style="position: absolute; left: 100px; top: 400px; width: 200px; height: 100px;">
-    This text is in a positioned box with columns, without scrollbars.
-    <div style="position: absolute; left: 200px; top: 450px;">
-      This text should be visible on the main page. (#2)
-    </div>
-  </div>
-
-
-
-  <div class="col" style="position: absolute; left: 100px; top: 550px; width: 200px; height: 100px; overflow: scroll;">
-    This text is in a positioned box with scrollbars and columns.
-    <div style="position: absolute; left: 200px; top: 200px;">
-      Scroll to see this text. (#2)
-    </div>
-  </div>
-
-  <div style="height: 250px;"></div>
-
-  <div class="col" style="width: 200px; height: 100px; overflow: scroll;">
-    This text is in a box with scrollbars and columns.
-    <div style="position: absolute; left: 200px; top: 750px;">
-      This text should be visible on the main page. (#3)
-    </div>
-  </div>
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/282754-1.html b/layout/html/tests/block/bugs/282754-1.html
deleted file mode 100644
index 358a7e5dba78..000000000000
--- a/layout/html/tests/block/bugs/282754-1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-	<title>Testcase for bug 282754</title>
-
-	<style type="text/css">
-		p {
-			width: 329px;
-			height: 25px;
-			position: relative;
-			background: red;
-		}
-
-		p.with-overflow-hidden
-		{
-			overflow: hidden;
-		}
-
-		span {
-			background: lime;
-			position: absolute;
-			width: 100%;
-			height: 100%;
-		}
-
-
-	</style>
-
-</head>
-
-<body>
-
-<p class="with-overflow-hidden"><span></span>Test</p>
-
-<p class="without-overflow-hidden"><span></span>Test</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/282754-2.html b/layout/html/tests/block/bugs/282754-2.html
deleted file mode 100644
index 2f7ee739b5ac..000000000000
--- a/layout/html/tests/block/bugs/282754-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<style>div.col { -moz-column-count:2; -moz-column-gap:2em }
-</style>
-</head>
-  <body>
-  <div class="col" style="position: absolute; left: 100px; top: 400px; width: 200px; padding:30px; border:1px solid black;">
-    This text is in a positioned box with columns, without scrollbars.
-    <div style="position: absolute; bottom:0; left:0;">BL</div>
-  </div>
-  </body>
-</html>
diff --git a/layout/html/tests/block/bugs/282754.html b/layout/html/tests/block/bugs/282754.html
deleted file mode 100644
index 2f7ee739b5ac..000000000000
--- a/layout/html/tests/block/bugs/282754.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<style>div.col { -moz-column-count:2; -moz-column-gap:2em }
-</style>
-</head>
-  <body>
-  <div class="col" style="position: absolute; left: 100px; top: 400px; width: 200px; padding:30px; border:1px solid black;">
-    This text is in a positioned box with columns, without scrollbars.
-    <div style="position: absolute; bottom:0; left:0;">BL</div>
-  </div>
-  </body>
-</html>
diff --git a/layout/html/tests/block/bugs/28811.html b/layout/html/tests/block/bugs/28811.html
deleted file mode 100644
index 52382daaf62d..000000000000
--- a/layout/html/tests/block/bugs/28811.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML><BODY>
-<TABLE bgcolor="#00FF00"><TR><TD><INPUT style="width: 90%"></TD></TR></TABLE>
-<TABLE bgcolor="#00FF00"><TR><TD><SMALL><INPUT style="width: 90%"></small></TD></TR></TABLE>
-<TABLE bgcolor="#00FF00"><TR><TD><small><SMALL><INPUT style="width: 90%"></small></SMALL></TD></TR></TABLE>
-<TABLE bgcolor="#00FF00"><TR><TD><SMALL><INPUT style="margin-left: 50%"></small></TD></TR></TABLE>
-<TABLE bgcolor="#00FF00" width=500><TR><TD><SMALL><INPUT style="margin-left: 50%"></small></TD></TR></TABLE>
-</BODY></HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/299148.html b/layout/html/tests/block/bugs/299148.html
deleted file mode 100644
index 44861336c177..000000000000
--- a/layout/html/tests/block/bugs/299148.html
+++ /dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Unicode Escape Characters in ID Selectors</title>	
-  <style type="text/css">
-  p { color: red; background: white; }
-
-  .control { color: green; }
-  #0invalid!, .control { color: red; }
-
-  #\0000, .class0000 { color: green; }
-  #\0001, .class0001 { color: green; }
-  #\0002, .class0002 { color: green; }
-  #\0003, .class0003 { color: green; }
-  #\0004, .class0004 { color: green; }
-  #\0005, .class0005 { color: green; }
-  #\0006, .class0006 { color: green; }
-  #\0007, .class0007 { color: green; }
-  #\0008, .class0008 { color: green; }
-  #\0009, .class0009 { color: green; }
-  #\000A, .class000A { color: green; }
-  #\000B, .class000B { color: green; }
-  #\000C, .class000C { color: green; }
-  #\000D, .class000D { color: green; }
-  #\000E, .class000E { color: green; }
-  #\000F, .class000F { color: green; }
-  #\0010, .class0010 { color: green; }
-  #\0011, .class0011 { color: green; }
-  #\0012, .class0012 { color: green; }
-  #\0013, .class0013 { color: green; }
-  #\0014, .class0014 { color: green; }
-  #\0015, .class0015 { color: green; }
-  #\0016, .class0016 { color: green; }
-  #\0017, .class0017 { color: green; }
-  #\0018, .class0018 { color: green; }
-  #\0019, .class0019 { color: green; }
-  #\001A, .class001A { color: green; }
-  #\001B, .class001B { color: green; }
-  #\001C, .class001C { color: green; }
-  #\001D, .class001D { color: green; }
-  #\001E, .class001E { color: green; }
-  #\001F, .class001F { color: green; }
-  #\0020, .class0020 { color: green; }
-  #\0021, .class0021 { color: green; }
-  #\0022, .class0022 { color: green; }
-  #\0023, .class0023 { color: green; }
-  #\0024, .class0024 { color: green; }
-  #\0025, .class0025 { color: green; }
-  #\0026, .class0026 { color: green; }
-  #\0027, .class0027 { color: green; }
-  #\0028, .class0028 { color: green; }
-  #\0029, .class0029 { color: green; }
-  #\002A, .class002A { color: green; }
-  #\002B, .class002B { color: green; }
-  #\002C, .class002C { color: green; }
-  #\002D, .class002D { color: green; }
-  #\002E, .class002E { color: green; }
-  #\002F, .class002F { color: green; }
-  #\0030, .class0030 { color: green; }
-  #\0031, .class0031 { color: green; }
-  #\0032, .class0032 { color: green; }
-  #\0033, .class0033 { color: green; }
-  #\0034, .class0034 { color: green; }
-  #\0035, .class0035 { color: green; }
-  #\0036, .class0036 { color: green; }
-  #\0037, .class0037 { color: green; }
-  #\0038, .class0038 { color: green; }
-  #\0039, .class0039 { color: green; }
-  #\003A, .class003A { color: green; }
-  #\003B, .class003B { color: green; }
-  #\003C, .class003C { color: green; }
-  #\003D, .class003D { color: green; }
-  #\003E, .class003E { color: green; }
-  #\003F, .class003F { color: green; }
-  #\0040, .class0040 { color: green; }
-  #\0041, .class0041 { color: green; }
-  #\0042, .class0042 { color: green; }
-  #\0043, .class0043 { color: green; }
-  #\0044, .class0044 { color: green; }
-  #\0045, .class0045 { color: green; }
-  #\0046, .class0046 { color: green; }
-  #\0047, .class0047 { color: green; }
-  #\0048, .class0048 { color: green; }
-  #\0049, .class0049 { color: green; }
-  #\004A, .class004A { color: green; }
-  #\004B, .class004B { color: green; }
-  #\004C, .class004C { color: green; }
-  #\004D, .class004D { color: green; }
-  #\004E, .class004E { color: green; }
-  #\004F, .class004F { color: green; }
-  #\0050, .class0050 { color: green; }
-  #\0051, .class0051 { color: green; }
-  #\0052, .class0052 { color: green; }
-  #\0053, .class0053 { color: green; }
-  #\0054, .class0054 { color: green; }
-  #\0055, .class0055 { color: green; }
-  #\0056, .class0056 { color: green; }
-  #\0057, .class0057 { color: green; }
-  #\0058, .class0058 { color: green; }
-  #\0059, .class0059 { color: green; }
-  #\005A, .class005A { color: green; }
-  #\005B, .class005B { color: green; }
-  #\005C, .class005C { color: green; }
-  #\005D, .class005D { color: green; }
-  #\005E, .class005E { color: green; }
-  #\005F, .class005F { color: green; }
-  #\0060, .class0060 { color: green; }
-  #\0061, .class0061 { color: green; }
-  #\0062, .class0062 { color: green; }
-  #\0063, .class0063 { color: green; }
-  #\0064, .class0064 { color: green; }
-  #\0065, .class0065 { color: green; }
-  #\0066, .class0066 { color: green; }
-  #\0067, .class0067 { color: green; }
-  #\0068, .class0068 { color: green; }
-  #\0069, .class0069 { color: green; }
-  #\006A, .class006A { color: green; }
-  #\006B, .class006B { color: green; }
-  #\006C, .class006C { color: green; }
-  #\006D, .class006D { color: green; }
-  #\006E, .class006E { color: green; }
-  #\006F, .class006F { color: green; }
-  #\0070, .class0070 { color: green; }
-  #\0071, .class0071 { color: green; }
-  #\0072, .class0072 { color: green; }
-  #\0073, .class0073 { color: green; }
-  #\0074, .class0074 { color: green; }
-  #\0075, .class0075 { color: green; }
-  #\0076, .class0076 { color: green; }
-  #\0077, .class0077 { color: green; }
-  #\0078, .class0078 { color: green; }
-  #\0079, .class0079 { color: green; }
-  #\007A, .class007A { color: green; }
-  #\007B, .class007B { color: green; }
-  #\007C, .class007C { color: green; }
-  #\007D, .class007D { color: green; }
-  #\007E, .class007E { color: green; }
-  #\007F, .class007F { color: green; }
-  #\0080, .class0080 { color: green; }
-  #\0081, .class0081 { color: green; }
-  #\0082, .class0082 { color: green; }
-  #\0083, .class0083 { color: green; }
-  #\0084, .class0084 { color: green; }
-  #\0085, .class0085 { color: green; }
-  #\0086, .class0086 { color: green; }
-  #\0087, .class0087 { color: green; }
-  #\0088, .class0088 { color: green; }
-  #\0089, .class0089 { color: green; }
-  #\008A, .class008A { color: green; }
-  #\008B, .class008B { color: green; }
-  #\008C, .class008C { color: green; }
-  #\008D, .class008D { color: green; }
-  #\008E, .class008E { color: green; }
-  #\008F, .class008F { color: green; }
-  #\0090, .class0090 { color: green; }
-  #\0091, .class0091 { color: green; }
-  #\0092, .class0092 { color: green; }
-  #\0093, .class0093 { color: green; }
-  #\0094, .class0094 { color: green; }
-  #\0095, .class0095 { color: green; }
-  #\0096, .class0096 { color: green; }
-  #\0097, .class0097 { color: green; }
-  #\0098, .class0098 { color: green; }
-  #\0099, .class0099 { color: green; }
-  #\009A, .class009A { color: green; }
-  #\009B, .class009B { color: green; }
-  #\009C, .class009C { color: green; }
-  #\009D, .class009D { color: green; }
-  #\009E, .class009E { color: green; }
-  #\009F, .class009F { color: green; }
-  #\00A0, .class00A0 { color: green; }
-  #\00A1, .class00A1 { color: green; }
-  #\00A2, .class00A2 { color: green; }
-  #\00A3, .class00A3 { color: green; }
-  #\00A4, .class00A4 { color: green; }
-  #\00A5, .class00A5 { color: green; }
-  #\00A6, .class00A6 { color: green; }
-  #\00A7, .class00A7 { color: green; }
-  #\00A8, .class00A8 { color: green; }
-  #\00A9, .class00A9 { color: green; }
-  #\00AA, .class00AA { color: green; }
-  #\00AB, .class00AB { color: green; }
-  #\00AC, .class00AC { color: green; }
-  #\00AD, .class00AD { color: green; }
-  #\00AE, .class00AE { color: green; }
-  #\00AF, .class00AF { color: green; }
-  #\00B0, .class00B0 { color: green; }
-  #\00B1, .class00B1 { color: green; }
-  #\00B2, .class00B2 { color: green; }
-  #\00B3, .class00B3 { color: green; }
-  #\00B4, .class00B4 { color: green; }
-  #\00B5, .class00B5 { color: green; }
-  #\00B6, .class00B6 { color: green; }
-  #\00B7, .class00B7 { color: green; }
-  #\00B8, .class00B8 { color: green; }
-  #\00B9, .class00B9 { color: green; }
-  #\00BA, .class00BA { color: green; }
-  #\00BB, .class00BB { color: green; }
-  #\00BC, .class00BC { color: green; }
-  #\00BD, .class00BD { color: green; }
-  #\00BE, .class00BE { color: green; }
-  #\00BF, .class00BF { color: green; }
-  #\00C0, .class00C0 { color: green; }
-  #\00C1, .class00C1 { color: green; }
-  #\00C2, .class00C2 { color: green; }
-  #\00C3, .class00C3 { color: green; }
-  #\00C4, .class00C4 { color: green; }
-  #\00C5, .class00C5 { color: green; }
-  #\00C6, .class00C6 { color: green; }
-  #\00C7, .class00C7 { color: green; }
-  #\00C8, .class00C8 { color: green; }
-  #\00C9, .class00C9 { color: green; }
-  #\00CA, .class00CA { color: green; }
-  #\00CB, .class00CB { color: green; }
-  #\00CC, .class00CC { color: green; }
-  #\00CD, .class00CD { color: green; }
-  #\00CE, .class00CE { color: green; }
-  #\00CF, .class00CF { color: green; }
-  #\00D0, .class00D0 { color: green; }
-  #\00D1, .class00D1 { color: green; }
-  #\00D2, .class00D2 { color: green; }
-  #\00D3, .class00D3 { color: green; }
-  #\00D4, .class00D4 { color: green; }
-  #\00D5, .class00D5 { color: green; }
-  #\00D6, .class00D6 { color: green; }
-  #\00D7, .class00D7 { color: green; }
-  #\00D8, .class00D8 { color: green; }
-  #\00D9, .class00D9 { color: green; }
-  #\00DA, .class00DA { color: green; }
-  #\00DB, .class00DB { color: green; }
-  #\00DC, .class00DC { color: green; }
-  #\00DD, .class00DD { color: green; }
-  #\00DE, .class00DE { color: green; }
-  #\00DF, .class00DF { color: green; }
-  #\00E0, .class00E0 { color: green; }
-  #\00E1, .class00E1 { color: green; }
-  #\00E2, .class00E2 { color: green; }
-  #\00E3, .class00E3 { color: green; }
-  #\00E4, .class00E4 { color: green; }
-  #\00E5, .class00E5 { color: green; }
-  #\00E6, .class00E6 { color: green; }
-  #\00E7, .class00E7 { color: green; }
-  #\00E8, .class00E8 { color: green; }
-  #\00E9, .class00E9 { color: green; }
-  #\00EA, .class00EA { color: green; }
-  #\00EB, .class00EB { color: green; }
-  #\00EC, .class00EC { color: green; }
-  #\00ED, .class00ED { color: green; }
-  #\00EE, .class00EE { color: green; }
-  #\00EF, .class00EF { color: green; }
-  #\00F0, .class00F0 { color: green; }
-  #\00F1, .class00F1 { color: green; }
-  #\00F2, .class00F2 { color: green; }
-  #\00F3, .class00F3 { color: green; }
-  #\00F4, .class00F4 { color: green; }
-  #\00F5, .class00F5 { color: green; }
-  #\00F6, .class00F6 { color: green; }
-  #\00F7, .class00F7 { color: green; }
-  #\00F8, .class00F8 { color: green; }
-  #\00F9, .class00F9 { color: green; }
-  #\00FA, .class00FA { color: green; }
-  #\00FB, .class00FB { color: green; }
-  #\00FC, .class00FC { color: green; }
-  #\00FD, .class00FD { color: green; }
-  #\00FE, .class00FE { color: green; }
-  #\00FF, .class00FF { color: green; }
-  </style>
- </head>
- <body>
-
- <p class="control">If this line is red, don't bother with the rest.</p>
-
- <p class="class0000">This should be green (U+0000).</p>
- <p class="class0001">This should be green (U+0001).</p>
- <p class="class0002">This should be green (U+0002).</p>
- <p class="class0003">This should be green (U+0003).</p>
- <p class="class0004">This should be green (U+0004).</p>
- <p class="class0005">This should be green (U+0005).</p>
- <p class="class0006">This should be green (U+0006).</p>
- <p class="class0007">This should be green (U+0007).</p>
- <p class="class0008">This should be green (U+0008).</p>
- <p class="class0009">This should be green (U+0009).</p>
- <p class="class000A">This should be green (U+000A).</p>
- <p class="class000B">This should be green (U+000B).</p>
- <p class="class000C">This should be green (U+000C).</p>
- <p class="class000D">This should be green (U+000D).</p>
- <p class="class000E">This should be green (U+000E).</p>
- <p class="class000F">This should be green (U+000F).</p>
- <p class="class0010">This should be green (U+0010).</p>
- <p class="class0011">This should be green (U+0011).</p>
- <p class="class0012">This should be green (U+0012).</p>
- <p class="class0013">This should be green (U+0013).</p>
- <p class="class0014">This should be green (U+0014).</p>
- <p class="class0015">This should be green (U+0015).</p>
- <p class="class0016">This should be green (U+0016).</p>
- <p class="class0017">This should be green (U+0017).</p>
- <p class="class0018">This should be green (U+0018).</p>
- <p class="class0019">This should be green (U+0019).</p>
- <p class="class001A">This should be green (U+001A).</p>
- <p class="class001B">This should be green (U+001B).</p>
- <p class="class001C">This should be green (U+001C).</p>
- <p class="class001D">This should be green (U+001D).</p>
- <p class="class001E">This should be green (U+001E).</p>
- <p class="class001F">This should be green (U+001F).</p>
- <p class="class0020">This should be green (U+0020).</p>
- <p class="class0021">This should be green (U+0021)(&#x0021;).</p>
- <p class="class0022">This should be green (U+0022)(&#x0022;).</p>
- <p class="class0023">This should be green (U+0023)(&#x0023;).</p>
- <p class="class0024">This should be green (U+0024)(&#x0024;).</p>
- <p class="class0025">This should be green (U+0025)(&#x0025;).</p>
- <p class="class0026">This should be green (U+0026)(&#x0026;).</p>
- <p class="class0027">This should be green (U+0027)(&#x0027;).</p>
- <p class="class0028">This should be green (U+0028)(&#x0028;).</p>
- <p class="class0029">This should be green (U+0029)(&#x0029;).</p>
- <p class="class002A">This should be green (U+002A)(&#x002A;).</p>
- <p class="class002B">This should be green (U+002B)(&#x002B;).</p>
- <p class="class002C">This should be green (U+002C)(&#x002C;).</p>
- <p class="class002D">This should be green (U+002D)(&#x002D;).</p>
- <p class="class002E">This should be green (U+002E)(&#x002E;).</p>
- <p class="class002F">This should be green (U+002F)(&#x002F;).</p>
- <p class="class0030">This should be green (U+0030)(&#x0030;).</p>
- <p class="class0031">This should be green (U+0031)(&#x0031;).</p>
- <p class="class0032">This should be green (U+0032)(&#x0032;).</p>
- <p class="class0033">This should be green (U+0033)(&#x0033;).</p>
- <p class="class0034">This should be green (U+0034)(&#x0034;).</p>
- <p class="class0035">This should be green (U+0035)(&#x0035;).</p>
- <p class="class0036">This should be green (U+0036)(&#x0036;).</p>
- <p class="class0037">This should be green (U+0037)(&#x0037;).</p>
- <p class="class0038">This should be green (U+0038)(&#x0038;).</p>
- <p class="class0039">This should be green (U+0039)(&#x0039;).</p>
- <p class="class003A">This should be green (U+003A)(&#x003A;).</p>
- <p class="class003B">This should be green (U+003B)(&#x003B;).</p>
- <p class="class003C">This should be green (U+003C)(&#x003C;).</p>
- <p class="class003D">This should be green (U+003D)(&#x003D;).</p>
- <p class="class003E">This should be green (U+003E)(&#x003E;).</p>
- <p class="class003F">This should be green (U+003F)(&#x003F;).</p>
- <p class="class0040">This should be green (U+0040)(&#x0040;).</p>
- <p class="class0041">This should be green (U+0041)(&#x0041;).</p>
- <p class="class0042">This should be green (U+0042)(&#x0042;).</p>
- <p class="class0043">This should be green (U+0043)(&#x0043;).</p>
- <p class="class0044">This should be green (U+0044)(&#x0044;).</p>
- <p class="class0045">This should be green (U+0045)(&#x0045;).</p>
- <p class="class0046">This should be green (U+0046)(&#x0046;).</p>
- <p class="class0047">This should be green (U+0047)(&#x0047;).</p>
- <p class="class0048">This should be green (U+0048)(&#x0048;).</p>
- <p class="class0049">This should be green (U+0049)(&#x0049;).</p>
- <p class="class004A">This should be green (U+004A)(&#x004A;).</p>
- <p class="class004B">This should be green (U+004B)(&#x004B;).</p>
- <p class="class004C">This should be green (U+004C)(&#x004C;).</p>
- <p class="class004D">This should be green (U+004D)(&#x004D;).</p>
- <p class="class004E">This should be green (U+004E)(&#x004E;).</p>
- <p class="class004F">This should be green (U+004F)(&#x004F;).</p>
- <p class="class0050">This should be green (U+0050)(&#x0050;).</p>
- <p class="class0051">This should be green (U+0051)(&#x0051;).</p>
- <p class="class0052">This should be green (U+0052)(&#x0052;).</p>
- <p class="class0053">This should be green (U+0053)(&#x0053;).</p>
- <p class="class0054">This should be green (U+0054)(&#x0054;).</p>
- <p class="class0055">This should be green (U+0055)(&#x0055;).</p>
- <p class="class0056">This should be green (U+0056)(&#x0056;).</p>
- <p class="class0057">This should be green (U+0057)(&#x0057;).</p>
- <p class="class0058">This should be green (U+0058)(&#x0058;).</p>
- <p class="class0059">This should be green (U+0059)(&#x0059;).</p>
- <p class="class005A">This should be green (U+005A)(&#x005A;).</p>
- <p class="class005B">This should be green (U+005B)(&#x005B;).</p>
- <p class="class005C">This should be green (U+005C)(&#x005C;).</p>
- <p class="class005D">This should be green (U+005D)(&#x005D;).</p>
- <p class="class005E">This should be green (U+005E)(&#x005E;).</p>
- <p class="class005F">This should be green (U+005F)(&#x005F;).</p>
- <p class="class0060">This should be green (U+0060)(&#x0060;).</p>
- <p class="class0061">This should be green (U+0061)(&#x0061;).</p>
- <p class="class0062">This should be green (U+0062)(&#x0062;).</p>
- <p class="class0063">This should be green (U+0063)(&#x0063;).</p>
- <p class="class0064">This should be green (U+0064)(&#x0064;).</p>
- <p class="class0065">This should be green (U+0065)(&#x0065;).</p>
- <p class="class0066">This should be green (U+0066)(&#x0066;).</p>
- <p class="class0067">This should be green (U+0067)(&#x0067;).</p>
- <p class="class0068">This should be green (U+0068)(&#x0068;).</p>
- <p class="class0069">This should be green (U+0069)(&#x0069;).</p>
- <p class="class006A">This should be green (U+006A)(&#x006A;).</p>
- <p class="class006B">This should be green (U+006B)(&#x006B;).</p>
- <p class="class006C">This should be green (U+006C)(&#x006C;).</p>
- <p class="class006D">This should be green (U+006D)(&#x006D;).</p>
- <p class="class006E">This should be green (U+006E)(&#x006E;).</p>
- <p class="class006F">This should be green (U+006F)(&#x006F;).</p>
- <p class="class0070">This should be green (U+0070)(&#x0070;).</p>
- <p class="class0071">This should be green (U+0071)(&#x0071;).</p>
- <p class="class0072">This should be green (U+0072)(&#x0072;).</p>
- <p class="class0073">This should be green (U+0073)(&#x0073;).</p>
- <p class="class0074">This should be green (U+0074)(&#x0074;).</p>
- <p class="class0075">This should be green (U+0075)(&#x0075;).</p>
- <p class="class0076">This should be green (U+0076)(&#x0076;).</p>
- <p class="class0077">This should be green (U+0077)(&#x0077;).</p>
- <p class="class0078">This should be green (U+0078)(&#x0078;).</p>
- <p class="class0079">This should be green (U+0079)(&#x0079;).</p>
- <p class="class007A">This should be green (U+007A)(&#x007A;).</p>
- <p class="class007B">This should be green (U+007B)(&#x007B;).</p>
- <p class="class007C">This should be green (U+007C)(&#x007C;).</p>
- <p class="class007D">This should be green (U+007D)(&#x007D;).</p>
- <p class="class007E">This should be green (U+007E)(&#x007E;).</p>
- <p class="class007F">This should be green (U+007F)(&#x007F;).</p>
- <p class="class0080">This should be green (U+0080)(&#x0080;).</p>
- <p class="class0081">This should be green (U+0081)(&#x0081;).</p>
- <p class="class0082">This should be green (U+0082)(&#x0082;).</p>
- <p class="class0083">This should be green (U+0083)(&#x0083;).</p>
- <p class="class0084">This should be green (U+0084)(&#x0084;).</p>
- <p class="class0085">This should be green (U+0085)(&#x0085;).</p>
- <p class="class0086">This should be green (U+0086)(&#x0086;).</p>
- <p class="class0087">This should be green (U+0087)(&#x0087;).</p>
- <p class="class0088">This should be green (U+0088)(&#x0088;).</p>
- <p class="class0089">This should be green (U+0089)(&#x0089;).</p>
- <p class="class008A">This should be green (U+008A)(&#x008A;).</p>
- <p class="class008B">This should be green (U+008B)(&#x008B;).</p>
- <p class="class008C">This should be green (U+008C)(&#x008C;).</p>
- <p class="class008D">This should be green (U+008D)(&#x008D;).</p>
- <p class="class008E">This should be green (U+008E)(&#x008E;).</p>
- <p class="class008F">This should be green (U+008F)(&#x008F;).</p>
- <p class="class0090">This should be green (U+0090)(&#x0090;).</p>
- <p class="class0091">This should be green (U+0091)(&#x0091;).</p>
- <p class="class0092">This should be green (U+0092)(&#x0092;).</p>
- <p class="class0093">This should be green (U+0093)(&#x0093;).</p>
- <p class="class0094">This should be green (U+0094)(&#x0094;).</p>
- <p class="class0095">This should be green (U+0095)(&#x0095;).</p>
- <p class="class0096">This should be green (U+0096)(&#x0096;).</p>
- <p class="class0097">This should be green (U+0097)(&#x0097;).</p>
- <p class="class0098">This should be green (U+0098)(&#x0098;).</p>
- <p class="class0099">This should be green (U+0099)(&#x0099;).</p>
- <p class="class009A">This should be green (U+009A)(&#x009A;).</p>
- <p class="class009B">This should be green (U+009B)(&#x009B;).</p>
- <p class="class009C">This should be green (U+009C)(&#x009C;).</p>
- <p class="class009D">This should be green (U+009D)(&#x009D;).</p>
- <p class="class009E">This should be green (U+009E)(&#x009E;).</p>
- <p class="class009F">This should be green (U+009F)(&#x009F;).</p>
- <p class="class00A0">This should be green (U+00A0)(&#x00A0;).</p>
- <p class="class00A1">This should be green (U+00A1)(&#x00A1;).</p>
- <p class="class00A2">This should be green (U+00A2)(&#x00A2;).</p>
- <p class="class00A3">This should be green (U+00A3)(&#x00A3;).</p>
- <p class="class00A4">This should be green (U+00A4)(&#x00A4;).</p>
- <p class="class00A5">This should be green (U+00A5)(&#x00A5;).</p>
- <p class="class00A6">This should be green (U+00A6)(&#x00A6;).</p>
- <p class="class00A7">This should be green (U+00A7)(&#x00A7;).</p>
- <p class="class00A8">This should be green (U+00A8)(&#x00A8;).</p>
- <p class="class00A9">This should be green (U+00A9)(&#x00A9;).</p>
- <p class="class00AA">This should be green (U+00AA)(&#x00AA;).</p>
- <p class="class00AB">This should be green (U+00AB)(&#x00AB;).</p>
- <p class="class00AC">This should be green (U+00AC)(&#x00AC;).</p>
- <p class="class00AD">This should be green (U+00AD)(&#x00AD;).</p>
- <p class="class00AE">This should be green (U+00AE)(&#x00AE;).</p>
- <p class="class00AF">This should be green (U+00AF)(&#x00AF;).</p>
- <p class="class00B0">This should be green (U+00B0)(&#x00B0;).</p>
- <p class="class00B1">This should be green (U+00B1)(&#x00B1;).</p>
- <p class="class00B2">This should be green (U+00B2)(&#x00B2;).</p>
- <p class="class00B3">This should be green (U+00B3)(&#x00B3;).</p>
- <p class="class00B4">This should be green (U+00B4)(&#x00B4;).</p>
- <p class="class00B5">This should be green (U+00B5)(&#x00B5;).</p>
- <p class="class00B6">This should be green (U+00B6)(&#x00B6;).</p>
- <p class="class00B7">This should be green (U+00B7)(&#x00B7;).</p>
- <p class="class00B8">This should be green (U+00B8)(&#x00B8;).</p>
- <p class="class00B9">This should be green (U+00B9)(&#x00B9;).</p>
- <p class="class00BA">This should be green (U+00BA)(&#x00BA;).</p>
- <p class="class00BB">This should be green (U+00BB)(&#x00BB;).</p>
- <p class="class00BC">This should be green (U+00BC)(&#x00BC;).</p>
- <p class="class00BD">This should be green (U+00BD)(&#x00BD;).</p>
- <p class="class00BE">This should be green (U+00BE)(&#x00BE;).</p>
- <p class="class00BF">This should be green (U+00BF)(&#x00BF;).</p>
- <p class="class00C0">This should be green (U+00C0)(&#x00C0;).</p>
- <p class="class00C1">This should be green (U+00C1)(&#x00C1;).</p>
- <p class="class00C2">This should be green (U+00C2)(&#x00C2;).</p>
- <p class="class00C3">This should be green (U+00C3)(&#x00C3;).</p>
- <p class="class00C4">This should be green (U+00C4)(&#x00C4;).</p>
- <p class="class00C5">This should be green (U+00C5)(&#x00C5;).</p>
- <p class="class00C6">This should be green (U+00C6)(&#x00C6;).</p>
- <p class="class00C7">This should be green (U+00C7)(&#x00C7;).</p>
- <p class="class00C8">This should be green (U+00C8)(&#x00C8;).</p>
- <p class="class00C9">This should be green (U+00C9)(&#x00C9;).</p>
- <p class="class00CA">This should be green (U+00CA)(&#x00CA;).</p>
- <p class="class00CB">This should be green (U+00CB)(&#x00CB;).</p>
- <p class="class00CC">This should be green (U+00CC)(&#x00CC;).</p>
- <p class="class00CD">This should be green (U+00CD)(&#x00CD;).</p>
- <p class="class00CE">This should be green (U+00CE)(&#x00CE;).</p>
- <p class="class00CF">This should be green (U+00CF)(&#x00CF;).</p>
- <p class="class00D0">This should be green (U+00D0)(&#x00D0;).</p>
- <p class="class00D1">This should be green (U+00D1)(&#x00D1;).</p>
- <p class="class00D2">This should be green (U+00D2)(&#x00D2;).</p>
- <p class="class00D3">This should be green (U+00D3)(&#x00D3;).</p>
- <p class="class00D4">This should be green (U+00D4)(&#x00D4;).</p>
- <p class="class00D5">This should be green (U+00D5)(&#x00D5;).</p>
- <p class="class00D6">This should be green (U+00D6)(&#x00D6;).</p>
- <p class="class00D7">This should be green (U+00D7)(&#x00D7;).</p>
- <p class="class00D8">This should be green (U+00D8)(&#x00D8;).</p>
- <p class="class00D9">This should be green (U+00D9)(&#x00D9;).</p>
- <p class="class00DA">This should be green (U+00DA)(&#x00DA;).</p>
- <p class="class00DB">This should be green (U+00DB)(&#x00DB;).</p>
- <p class="class00DC">This should be green (U+00DC)(&#x00DC;).</p>
- <p class="class00DD">This should be green (U+00DD)(&#x00DD;).</p>
- <p class="class00DE">This should be green (U+00DE)(&#x00DE;).</p>
- <p class="class00DF">This should be green (U+00DF)(&#x00DF;).</p>
- <p class="class00E0">This should be green (U+00E0)(&#x00E0;).</p>
- <p class="class00E1">This should be green (U+00E1)(&#x00E1;).</p>
- <p class="class00E2">This should be green (U+00E2)(&#x00E2;).</p>
- <p class="class00E3">This should be green (U+00E3)(&#x00E3;).</p>
- <p class="class00E4">This should be green (U+00E4)(&#x00E4;).</p>
- <p class="class00E5">This should be green (U+00E5)(&#x00E5;).</p>
- <p class="class00E6">This should be green (U+00E6)(&#x00E6;).</p>
- <p class="class00E7">This should be green (U+00E7)(&#x00E7;).</p>
- <p class="class00E8">This should be green (U+00E8)(&#x00E8;).</p>
- <p class="class00E9">This should be green (U+00E9)(&#x00E9;).</p>
- <p class="class00EA">This should be green (U+00EA)(&#x00EA;).</p>
- <p class="class00EB">This should be green (U+00EB)(&#x00EB;).</p>
- <p class="class00EC">This should be green (U+00EC)(&#x00EC;).</p>
- <p class="class00ED">This should be green (U+00ED)(&#x00ED;).</p>
- <p class="class00EE">This should be green (U+00EE)(&#x00EE;).</p>
- <p class="class00EF">This should be green (U+00EF)(&#x00EF;).</p>
- <p class="class00F0">This should be green (U+00F0)(&#x00F0;).</p>
- <p class="class00F1">This should be green (U+00F1)(&#x00F1;).</p>
- <p class="class00F2">This should be green (U+00F2)(&#x00F2;).</p>
- <p class="class00F3">This should be green (U+00F3)(&#x00F3;).</p>
- <p class="class00F4">This should be green (U+00F4)(&#x00F4;).</p>
- <p class="class00F5">This should be green (U+00F5)(&#x00F5;).</p>
- <p class="class00F6">This should be green (U+00F6)(&#x00F6;).</p>
- <p class="class00F7">This should be green (U+00F7)(&#x00F7;).</p>
- <p class="class00F8">This should be green (U+00F8)(&#x00F8;).</p>
- <p class="class00F9">This should be green (U+00F9)(&#x00F9;).</p>
- <p class="class00FA">This should be green (U+00FA)(&#x00FA;).</p>
- <p class="class00FB">This should be green (U+00FB)(&#x00FB;).</p>
- <p class="class00FC">This should be green (U+00FC)(&#x00FC;).</p>
- <p class="class00FD">This should be green (U+00FD)(&#x00FD;).</p>
- <p class="class00FE">This should be green (U+00FE)(&#x00FE;).</p>
- <p class="class00FF">This should be green (U+00FF)(&#x00FF;).</p>
-
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/299148.xml b/layout/html/tests/block/bugs/299148.xml
deleted file mode 100644
index ccb920ed9783..000000000000
--- a/layout/html/tests/block/bugs/299148.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Escapes in ID selectors</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/selector.html#id-selectors"/>
-  <style type="text/css">
-    #div { color: red }
-    #\0031 { color: green }
-  </style>
- </head>
- <body>
-   <div id="div"><p id="1">This text should be green</p></div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-01.xml b/layout/html/tests/block/bugs/300816-01.xml
deleted file mode 100644
index ef26b8bd40d8..000000000000
--- a/layout/html/tests/block/bugs/300816-01.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; }
-    #hider { position: absolute; background: green; top: 0; height: 20px;
-             left: 0; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: red; color: red; }
-    #test { position: absolute; top: 0; right: 0; left: 0; bottom: 0; background: red; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test"></span>XXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-02.xml b/layout/html/tests/block/bugs/300816-02.xml
deleted file mode 100644
index 9ea35325c020..000000000000
--- a/layout/html/tests/block/bugs/300816-02.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; }
-    #hider { position: absolute; background: red; top: 0; height: 20px;
-             left: 0; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: red; color: red; }
-    #test { position: absolute; top: 0; right: 0; left: 0; bottom: 0;
-            background: green; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test"></span>XXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-03.xml b/layout/html/tests/block/bugs/300816-03.xml
deleted file mode 100644
index 3a4fb98bf76b..000000000000
--- a/layout/html/tests/block/bugs/300816-03.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: green; top: -20px; height: 80px;
-             left: 0; width: 210px; z-index: 1; }
-    #cb { display: inline; position: relative; background: red; color: red;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; right: 0; left: 0; bottom: 0; background: red; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test"></span>XXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-04.xml b/layout/html/tests/block/bugs/300816-04.xml
deleted file mode 100644
index 3eaa216c8171..000000000000
--- a/layout/html/tests/block/bugs/300816-04.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: red; top: -20px; height: 80px;
-             left: 0; width: 210px; z-index: 1; }
-    #cb { display: inline; position: relative; background: red; color: red;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; right: 0; left: 0; bottom: 0;
-            background: green; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test"></span>XXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-05.xml b/layout/html/tests/block/bugs/300816-05.xml
deleted file mode 100644
index 7c411e69a3b0..000000000000
--- a/layout/html/tests/block/bugs/300816-05.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: green; top: -20px; height: 20px;
-             left: 0; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; left: 0; background: red; color: red; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-06.xml b/layout/html/tests/block/bugs/300816-06.xml
deleted file mode 100644
index 41ab71ea674d..000000000000
--- a/layout/html/tests/block/bugs/300816-06.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: red; top: -20px; height: 20px;
-             left: 0; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; left: 0; background: red;
-            color: green; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-07.xml b/layout/html/tests/block/bugs/300816-07.xml
deleted file mode 100644
index a71bb77a0d73..000000000000
--- a/layout/html/tests/block/bugs/300816-07.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: green; top: 40px; height: 20px;
-             left: 270px; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; left: 270px; bottom: 0; background: red; color: red; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-08.xml b/layout/html/tests/block/bugs/300816-08.xml
deleted file mode 100644
index 62f304398965..000000000000
--- a/layout/html/tests/block/bugs/300816-08.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: red; top: 40px; height: 20px;
-             left: 270px; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; left: 270px; bottom: 0; background: red;
-            color: green; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-09.xml b/layout/html/tests/block/bugs/300816-09.xml
deleted file mode 100644
index 6caece96688b..000000000000
--- a/layout/html/tests/block/bugs/300816-09.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: green; top: 40px; height: 20px;
-             left: 270px; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; right: 0; bottom: 0; background: red; color: red; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-10.xml b/layout/html/tests/block/bugs/300816-10.xml
deleted file mode 100644
index ae11690b0c39..000000000000
--- a/layout/html/tests/block/bugs/300816-10.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: red; top: 40px; height: 20px;
-             left: 270px; width: 60px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; right: 0; bottom: 0; background: red;
-            color: green; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb"><span id="test">XXX</span>XXXXXXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-11.xml b/layout/html/tests/block/bugs/300816-11.xml
deleted file mode 100644
index c85c15e69c78..000000000000
--- a/layout/html/tests/block/bugs/300816-11.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: green; top: -9px; height: 52px;
-             left: 33px; width: 275px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; bottom: 0; left: 0; right: 0;
-            background: red; color: red; margin-left: 33px; margin-right: 22px;
-	    margin-top: 11px; margin-bottom: 17px; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb">XXXX<span id="test">XXX</span>XXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/300816-12.xml b/layout/html/tests/block/bugs/300816-12.xml
deleted file mode 100644
index bfb1833e8381..000000000000
--- a/layout/html/tests/block/bugs/300816-12.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS 2.1 Test Suite: Positioned inline as absolute containing block</title>
-  <link rel="author" title="Boris Zbarsky" href="mailto:bzbarsky@mit.edu" />
-  <link rel="help" href="http://www.w3.org/TR/CSS21/visudet.html#containing-block-details"/>
-  <meta name="flags" content="ahem" />
-  <style type="text/css">
-    #testBlock { font-family: Ahem; font-size: 20px; line-height: 1; }
-    #testBlock { position: absolute; top: 100px; }
-    #hider { position: absolute; background: red; top: -9px; height: 52px;
-             left: 33px; width: 275px; z-index: 1; }
-    #cb { display: inline; position: relative; background: green; color: green;
-          padding-left: 100px; padding-right: 50px; padding-top: 20px;
-	  padding-bottom: 40px; }
-    #test { position: absolute; top: 0; bottom: 0; left: 0; right: 0;
-            background: green; color: green; margin-left: 33px; margin-right: 22px;
-	    margin-top: 11px; margin-bottom: 17px; z-index: 2; }
-  </style>
- </head>
- <body>
-   <p>There should be no red</p>
-   <div id="testBlock">
-     <div id="hider"></div>
-     <div id="cb">XXXX<span id="test">XXX</span>XXXXX</div>
-   </div>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/304004.html b/layout/html/tests/block/bugs/304004.html
deleted file mode 100644
index 364a04cd17ce..000000000000
--- a/layout/html/tests/block/bugs/304004.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head>
-
-<title>Testcase bug 304004 - contents of button not renderer equally when using style:position:absolute;</title>
-</head><body>
-<input value="hello" style="width: 40px;" type="button"><br>
-<input value="hello" style="width: 40px; display: block;" type="button">
-<input value="hello" style="width: 40px; position: absolute;" type="button">
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/306534.html b/layout/html/tests/block/bugs/306534.html
deleted file mode 100644
index d92101f29b5e..000000000000
--- a/layout/html/tests/block/bugs/306534.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase for bug 306534</title>
-    <style type="text/css">
-
-        html,body {
-            color:black; background-color:white; font-size:16px; padding:0; margin:0;
-        }
-	
-        span::first-letter { float:left; }
-        span               { display:list-item; list-style-position:inside; }
-
-        span::before       { content: 'Hello '}
-    </style>
-</head>
-<body>
-
-<span>Kitty</span>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/310124.html b/layout/html/tests/block/bugs/310124.html
deleted file mode 100644
index a2eb150d131d..000000000000
--- a/layout/html/tests/block/bugs/310124.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html><head>
- <title>Testcase bug 310124 - Double border is incorrectly compressed when rendered; regression.</title>
- <style>
-.gutter {
-    position: absolute;
-    border: 3px double black;
-    width: 10.2857%;
-    height: 10.2857%;
-}
-#container1, #container2, #container3 {
-  width:500px; 
-  height: 190px; 
-  position:relative;
-}
-
-#container2 .gutter {
-border: 5px double black;
-}
-#container3 .gutter {
-border: 7px double black;
-}
- </style>
-</head><body>
-All borders should have the same width. You should not see any single borders, only double borders.
-<div id="container1">
- <div class="gutter" style="left: 0%;">&nbsp;</div>
- <div class="gutter" style=" left: 14.2857%;">&nbsp;</div>
- <div class="gutter" style=" left: 28.5714%;">&nbsp;</div>
- <div class="gutter" style=" left: 42.8571%;">&nbsp;</div>
- <div class="gutter" style=" left: 57.1428%;">&nbsp;</div>
- <div class="gutter" style=" left: 71.4285%;">&nbsp;</div>
- <div class="gutter" style=" left: 85.7142%;">&nbsp;</div>
-</div>
-
-<div id="container2">
- <div class="gutter" style="left: 0%;">&nbsp;</div>
- <div class="gutter" style=" left: 14.2857%;">&nbsp;</div>
- <div class="gutter" style=" left: 28.5714%;">&nbsp;</div>
- <div class="gutter" style=" left: 42.8571%;">&nbsp;</div>
- <div class="gutter" style=" left: 57.1428%;">&nbsp;</div>
- <div class="gutter" style=" left: 71.4285%;">&nbsp;</div>
- <div class="gutter" style=" left: 85.7142%;">&nbsp;</div>
-</div>
-
-<div id="container3">
- <div class="gutter" style="left: 0%;">&nbsp;</div>
- <div class="gutter" style=" left: 14.2857%;">&nbsp;</div>
- <div class="gutter" style=" left: 28.5714%;">&nbsp;</div>
- <div class="gutter" style=" left: 42.8571%;">&nbsp;</div>
- <div class="gutter" style=" left: 57.1428%;">&nbsp;</div>
- <div class="gutter" style=" left: 71.4285%;">&nbsp;</div>
- <div class="gutter" style=" left: 85.7142%;">&nbsp;</div>
-</div>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/317961.html b/layout/html/tests/block/bugs/317961.html
deleted file mode 100644
index b81364d2aded..000000000000
--- a/layout/html/tests/block/bugs/317961.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<style>
-div { color: red }
-div::first-letter { color: green }
-</style>
-<script>
-function doit() {
-  var parent = document.getElementById('a');
-  var kid = document.createElement("span");
-  kid.style.display="none";
-  parent.appendChild(kid);
-
-  parent = document.getElementById('b');
-  kid = document.createElement("span");
-  kid.style.display="none";
-  parent.insertBefore(kid, document.getElementById('x'));
-  }
-</script>
-</head>
-<body onload="doit()">
-There should be no red
-<div id="a">
-T</div>
-<div id="b">
-T <span id="x"></span></div>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/36401-a.html b/layout/html/tests/block/bugs/36401-a.html
deleted file mode 100644
index 6e8e92884a55..000000000000
--- a/layout/html/tests/block/bugs/36401-a.html
+++ /dev/null
@@ -1 +0,0 @@
-<span><font><br> <center>word</center><img src="link"><a href="link">word2</A>word3</font></span>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/36401-b.html b/layout/html/tests/block/bugs/36401-b.html
deleted file mode 100644
index 4387c09b98a4..000000000000
--- a/layout/html/tests/block/bugs/36401-b.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<head>
-<style>
-span.main { font-family: sans-serif; }
-span.blah { color: red; }
-span.foo { color: green; }
-</style>
-<body>
-<span class="main">
-  <b><i>Here</i></b> is some
-  <span class="blah">
-    <a href="">text</a>
-  </span>
-  <i>in</i> <sup>a</sup> regular
-  <span class="foo">
-    <sub>old</sub> inline
-  </span>.
-
-  <span style="display: block;">
-    And <img src=""><em>now</em>
-    <span class="blah">
-      <a href="">we</a> embed some
-      <div style="background-color: lightgrey">
-        more <a href="">friggin</a>
-        <div style="background-color: grey">
-          blocks <img src=""><a href="">inside</a> the darn thing.
-        </div>
-        That's <em><b><font size="+3"><a href="">just</a></font></b> to</em>
-      </div>
-      drive you friggin <em><b><font size="-1"><a href=""><sup>nuts</sup></a></font>!!!</b>!</em>!
-    </span>
-    And that is all
-    <span class="foo">
-      she wrote.
-    </span>
-  </div>
-
-  So here we are, on the <em>other <b>side</b></em>
-  <span class="blah">
-    of the <a href="">block</a>.
-  </span>
-  Do <em><sup>things</sup> look <a href="">ok?</a>
-</span>
diff --git a/layout/html/tests/block/bugs/36401-c.html b/layout/html/tests/block/bugs/36401-c.html
deleted file mode 100644
index 9ec4ff395cb2..000000000000
--- a/layout/html/tests/block/bugs/36401-c.html
+++ /dev/null
@@ -1 +0,0 @@
-<b><a href="1">one</a><i><a href="2">two</a><span style="display: block;"><a href="3">three</a></span><a href="4">four</a></i><a href="5">five</a></b>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/36401.html b/layout/html/tests/block/bugs/36401.html
deleted file mode 100644
index 47791036ed2b..000000000000
--- a/layout/html/tests/block/bugs/36401.html
+++ /dev/null
@@ -1 +0,0 @@
-<b><span>here is <p>a <b><a href="">block</a></b></p> in an inline</span></b>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/37083-1.html b/layout/html/tests/block/bugs/37083-1.html
deleted file mode 100644
index 77dffb8c045c..000000000000
--- a/layout/html/tests/block/bugs/37083-1.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<title>Bug 37083</title>
-
-<style type="text/css">
-
-p { border: medium solid green; }
-
-</style>
-
-
-<div align="center">
-
-<p style="width: 300px;">Center</p>
-
-<p>Center</p>
-
-</div>
diff --git a/layout/html/tests/block/bugs/37083-2.html b/layout/html/tests/block/bugs/37083-2.html
deleted file mode 100644
index 064a02192f99..000000000000
--- a/layout/html/tests/block/bugs/37083-2.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<center style="width: 400px; border: medium solid green;">Center</center>
-<center style="border: medium solid green;">Center</center>
diff --git a/layout/html/tests/block/bugs/37083-3.html b/layout/html/tests/block/bugs/37083-3.html
deleted file mode 100644
index df573230cd21..000000000000
--- a/layout/html/tests/block/bugs/37083-3.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div align=right>
-<table><tr><td>table</td></tr></table>
-</div>
-text
diff --git a/layout/html/tests/block/bugs/37511_1.html b/layout/html/tests/block/bugs/37511_1.html
deleted file mode 100644
index c8bc13153efb..000000000000
--- a/layout/html/tests/block/bugs/37511_1.html
+++ /dev/null
@@ -1 +0,0 @@
-<input type="file">
diff --git a/layout/html/tests/block/bugs/38157-a.html b/layout/html/tests/block/bugs/38157-a.html
deleted file mode 100644
index 2924d03199b0..000000000000
--- a/layout/html/tests/block/bugs/38157-a.html
+++ /dev/null
@@ -1,23 +0,0 @@
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-

-<HTML>

-<HEAD>

-<TITLE>Coppied from Jigsaw</TITLE>

-<style>

-DIV.body {

-	  FLOAT: left; }

-.left {

-	FLOAT: left; }

-

-</style>

-</HEAD>

-<BODY>

-<DIV class=left>

-<P class=link>Local&nbsp;Links</P></DIV>

-<DIV class=body>

-    <P>Winie is a network utility to put files on the web using HTTP/1.1. The main 

-  feature of Winie is to solve the lost update problem  by storing 

-  ETags. Winie use the client side api of Jigsaw.</P>

-    </DIV>

-</BODY>

-</HTML>

diff --git a/layout/html/tests/block/bugs/38157-b.html b/layout/html/tests/block/bugs/38157-b.html
deleted file mode 100644
index 2b54b629a24b..000000000000
--- a/layout/html/tests/block/bugs/38157-b.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"

-                      "http://www.w3.org/TR/REC-html40/loose.dtd">

-<html>

-<head>

-<STYLE>

-

-DL {

-	margin-left: 20%;

-}

-

-DIV.body {

-  background-color: #F0F0E0;

-  float: left; 

-}

-

-.left {

-  text-align: left;

-  width: 100px;

-  float: left; 

-  background-color: yellow;

-}

-</STYLE>

-</head>

-

-<body bgcolor="#FFFFFF" class="smallmargin">

-

-

-<div class="left">abc</div>

-

-<div class="body">

-    <dl>

-      <dd>The design has been done in such way to minimize file system accesses. By 

-      </dd>

-    </dl>

-</div>

-

-</body></html>

diff --git a/layout/html/tests/block/bugs/39211-a.html b/layout/html/tests/block/bugs/39211-a.html
deleted file mode 100644
index d065a15a97ee..000000000000
--- a/layout/html/tests/block/bugs/39211-a.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-
-<head>
-
-<script>
-
-function m0 ()
-{
- document.getElementById('ds').innerHTML="<span>text before table <div style='display:block;'>block</div> text after table</span>";
-}
-
-</script>
-</head>
-
-
-<body onload="m0(); m0();">
-
-<div id="ds">
-orig contents of ds
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/39211-b.html b/layout/html/tests/block/bugs/39211-b.html
deleted file mode 100644
index 86e78966f08b..000000000000
--- a/layout/html/tests/block/bugs/39211-b.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-<script>
-function doit()
-{
-  var span = document.getElementById("span");
-  var div = span.parentNode;
-  div.removeChild(span);
-  div.appendChild(span);
-}
-</script>
-</head>
-<body onload="doit();">
-<div id="div">
-  <span id="span">here is a span <div style="display:block;">with a block</div> in it</span>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/39211-c.html b/layout/html/tests/block/bugs/39211-c.html
deleted file mode 100644
index 4306bd6e75d2..000000000000
--- a/layout/html/tests/block/bugs/39211-c.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<head>
-<script>
-function doit()
-{
-  const Elements = ["span", "div", "a", "b", "c", "d", "e"];
-  for (id in Elements) {
-    var child = document.getElementById(Elements[id]);
-    var parent = child.parentNode;
-    var next = child.nextSibling;
-    parent.removeChild(child);
-    parent.insertBefore(child, next);
-  }
-}
-</script>
-</head>
-<body onload="doit();">
-<div id="div">
-  <span id="span">
-    here <span id="a" style="color:green;">is</span> a span
-    <div id="div" style="display:block;">with a <span id="b" style="color:red;">block</span></div>
-    in
-    <span id="c" style="color:blue;">
-      it.
-      <span id="d" style="color:purple;">
-        And here is a much more <span id="e" style="color:pink;">deeply nested span</span>
-      </span>
-    </span>
-  </span>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/39211.html b/layout/html/tests/block/bugs/39211.html
deleted file mode 100644
index bae76c96a2af..000000000000
--- a/layout/html/tests/block/bugs/39211.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-
-<head>
-
-<script>
-
-function mO ()
-{
- document.getElementById('ds').innerHTML="<span>text before table<TABLE BGCOLOR=red><TR><TD>table</TD></TR></TABLE>text after table<\/span>";
-}
-
-</script>
-</head>
-
-
-<body onload="mO();mO();">
-
-<div id="ds">
-orig contents of ds
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/39683.html b/layout/html/tests/block/bugs/39683.html
deleted file mode 100644
index e5d9c2acefef..000000000000
--- a/layout/html/tests/block/bugs/39683.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-  <head>
-    <style>
-      div {
-        border: 3px solid red;
-      }
-    </style>
-  </head>
-  <body>
-    <table border="1">
-        <td>
-          <div id="d">test test test tes tes tes test es </div>
-        </td>
-    </table>
-	<script type="text/javascript">
-	  var v = document.body.offsetHeight;
-	  document.getElementById("d").style.width = "100px";
-	</script>
-  </body>
-</html>
diff --git a/layout/html/tests/block/bugs/40038-1.xml b/layout/html/tests/block/bugs/40038-1.xml
deleted file mode 100644
index 322bd1adbb82..000000000000
--- a/layout/html/tests/block/bugs/40038-1.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<title>Bug 40038</title>
-</head>
-<body>
-
-<div align="center">
-	<table width="400" frame="border">
-		<tr>
-			<td>
-				Table centered, left justified
-			</td>
-		</tr>
-	</table>
-</div>
-
-<div align="right">
-	<table width="400" frame="border">
-		<tr>
-			<td>
-				Table at right, left justified
-			</td>
-		</tr>
-	</table>
-</div>
-
-</body>
-</html> 
diff --git a/layout/html/tests/block/bugs/40038-2.html b/layout/html/tests/block/bugs/40038-2.html
deleted file mode 100644
index 322bd1adbb82..000000000000
--- a/layout/html/tests/block/bugs/40038-2.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<title>Bug 40038</title>
-</head>
-<body>
-
-<div align="center">
-	<table width="400" frame="border">
-		<tr>
-			<td>
-				Table centered, left justified
-			</td>
-		</tr>
-	</table>
-</div>
-
-<div align="right">
-	<table width="400" frame="border">
-		<tr>
-			<td>
-				Table at right, left justified
-			</td>
-		</tr>
-	</table>
-</div>
-
-</body>
-</html> 
diff --git a/layout/html/tests/block/bugs/40129.html b/layout/html/tests/block/bugs/40129.html
deleted file mode 100644
index a45ae0449ffc..000000000000
--- a/layout/html/tests/block/bugs/40129.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML><BODY><TABLE cellspacing=0 cellpadding=0 bgcolor=pink><TR><TD>
-  <div style="float:left; bgcolor:yellow;">
-    <IMG SRC="Aj.gif">
-  </DIV>
-  <div>x</div>
-</TD></TR></TABLE></BODY></HTML>
diff --git a/layout/html/tests/block/bugs/41521.html b/layout/html/tests/block/bugs/41521.html
deleted file mode 100644
index f0dcdf8f34a4..000000000000
--- a/layout/html/tests/block/bugs/41521.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<script>
-function change()
-{
-  document.getElementById("span").style.fontWeight = "bold";
-}
-</script>
-<body onload="change();">
-<span id="span">This is my happy span. <span style="display: block;">It's got an inline block.</span> It all should be bold.</span>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/41777.html b/layout/html/tests/block/bugs/41777.html
deleted file mode 100644
index 26d3770ca7b9..000000000000
--- a/layout/html/tests/block/bugs/41777.html
+++ /dev/null
@@ -1 +0,0 @@
-<HTML><ol><li>first</li><li></li></ol></HTML>
diff --git a/layout/html/tests/block/bugs/42495.html b/layout/html/tests/block/bugs/42495.html
deleted file mode 100644
index 909d9489bdcb..000000000000
--- a/layout/html/tests/block/bugs/42495.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body><table><tr><td width=60 align=center bgcolor=#C6E6E2>
- Leipzig <img src="ant.jpg" width="10" height="10" border="0" alt="" >&nbsp;Wien</td></tr></table></body></html>
diff --git a/layout/html/tests/block/bugs/4324.html b/layout/html/tests/block/bugs/4324.html
deleted file mode 100644
index 6eb350b6335c..000000000000
--- a/layout/html/tests/block/bugs/4324.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><TITLE>test</TITLE>
-</HEAD>
-<BODY>
-<OL type=A><LI>first list item</OL>
-<OL type=a><LI>first list item</OL>
-<OL type=I><LI>first list item</UL>
-<OL type=i><LI>first list item</UL>
-<OL type=upper-alpha><LI>first list item</OL>
-<OL type=lower-alpha><LI>first list item</OL>
-<OL type=upper-roman><LI>first list item</UL>
-<OL type=lower-roman><LI>first list item</UL>
-<SCRIPT TYPE="text/javascript">
-var bodyKids = document.body.childNodes;
-for (i = 0; i < bodyKids.length; i++) {
-  var it = bodyKids.item(i);
-  if (it.nodeType == Node.ELEMENT_NODE) {
-    document.writeln(it.type);
-  }
-}
-</SCRIPT>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-1.html b/layout/html/tests/block/bugs/43882-1.html
deleted file mode 100644
index 29437a5172f0..000000000000
--- a/layout/html/tests/block/bugs/43882-1.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<p style="margin: 1em 0; background: green; border: 1px solid black;"></p>
-<div style="background: blue"><input type=button value=button></div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-10.html b/layout/html/tests/block/bugs/43882-10.html
deleted file mode 100644
index fc015f383b2a..000000000000
--- a/layout/html/tests/block/bugs/43882-10.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="background: aqua; float: right; width: 50%;">
-<div style="margin: 1em 0 0 0; background: green;"></div>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-11.html b/layout/html/tests/block/bugs/43882-11.html
deleted file mode 100644
index 6fb8846e0d4e..000000000000
--- a/layout/html/tests/block/bugs/43882-11.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="background: aqua; float: right; width: 50%;">
-<div style="margin: 0 0 2em 0; background: green;"></div>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-12.html b/layout/html/tests/block/bugs/43882-12.html
deleted file mode 100644
index 3f2be14011d8..000000000000
--- a/layout/html/tests/block/bugs/43882-12.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="border: medium solid green"><p></p></div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-13.html b/layout/html/tests/block/bugs/43882-13.html
deleted file mode 100644
index 1765e823dc01..000000000000
--- a/layout/html/tests/block/bugs/43882-13.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="position: absolute; margin: 0; background: red;">
-<p>Test</p>
-</div>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-14.html b/layout/html/tests/block/bugs/43882-14.html
deleted file mode 100644
index 8615e1464855..000000000000
--- a/layout/html/tests/block/bugs/43882-14.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="position: absolute; margin: 0; background: red;">
-<p></p>
-</div>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-15.html b/layout/html/tests/block/bugs/43882-15.html
deleted file mode 100644
index 7f92ab049b87..000000000000
--- a/layout/html/tests/block/bugs/43882-15.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="position: absolute; margin: 0; background: red;">
-<p>Test</p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-16.html b/layout/html/tests/block/bugs/43882-16.html
deleted file mode 100644
index 89fba8a96db6..000000000000
--- a/layout/html/tests/block/bugs/43882-16.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="position: absolute; margin: 0; background: red;">
-<p></p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-2.html b/layout/html/tests/block/bugs/43882-2.html
deleted file mode 100644
index 3a92432df937..000000000000
--- a/layout/html/tests/block/bugs/43882-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<p style="margin: 1em 0; background: green;"></p>
-<div style="background: blue"><input type=button value=button></div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-3.html b/layout/html/tests/block/bugs/43882-3.html
deleted file mode 100644
index 8c62025e12d1..000000000000
--- a/layout/html/tests/block/bugs/43882-3.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="float: right; width: 300px; background: aqua">
-<p style="margin: 1em 0; background: green;"></p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-4.html b/layout/html/tests/block/bugs/43882-4.html
deleted file mode 100644
index bf36724737ba..000000000000
--- a/layout/html/tests/block/bugs/43882-4.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="float: right; width: 300px; background: aqua">
-<p style="margin: 1em 0; background: green;"></p>
-<div style="background: blue"><form style="margin: 0;"><input type=button value=button></form></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-5.html b/layout/html/tests/block/bugs/43882-5.html
deleted file mode 100644
index 61e680808fd6..000000000000
--- a/layout/html/tests/block/bugs/43882-5.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="float: right; width: 300px; background: aqua">
-<p style="margin: 1em 0; background: green;">Text</p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-6.html b/layout/html/tests/block/bugs/43882-6.html
deleted file mode 100644
index 467f82950018..000000000000
--- a/layout/html/tests/block/bugs/43882-6.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="float: right; width: 300px; background: aqua">
-<p style="margin: 1em 0 2em 0; background: green;"></p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-7.html b/layout/html/tests/block/bugs/43882-7.html
deleted file mode 100644
index c7153e9ec9eb..000000000000
--- a/layout/html/tests/block/bugs/43882-7.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="background: aqua">
-<p style="margin: 1em 0 2em 0; background: green;"></p>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-8.html b/layout/html/tests/block/bugs/43882-8.html
deleted file mode 100644
index 9a966cd88069..000000000000
--- a/layout/html/tests/block/bugs/43882-8.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="background: aqua; float: right; width: 50%;">
-<div style="margin: 1em 0 2em 0; background: green;"></div>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/43882-9.html b/layout/html/tests/block/bugs/43882-9.html
deleted file mode 100644
index 9a966cd88069..000000000000
--- a/layout/html/tests/block/bugs/43882-9.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN//">
-<HTML><HEAD>
-<TITLE>Empty P quirk not removed</TITLE>
-</HEAD>
-<BODY>
-
-<div style="background: red">Text.</div>
-<div style="background: aqua; float: right; width: 50%;">
-<div style="margin: 1em 0 2em 0; background: green;"></div>
-<div style="background: blue"><input type=button value=button></div>
-</div>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/44264-1.html b/layout/html/tests/block/bugs/44264-1.html
deleted file mode 100644
index 9b1795ad4b11..000000000000
--- a/layout/html/tests/block/bugs/44264-1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-<p style="float: right">Stuff</p>
-<ul>
-<li>test
-</ul>
-
diff --git a/layout/html/tests/block/bugs/44264-2.html b/layout/html/tests/block/bugs/44264-2.html
deleted file mode 100644
index 7f0769711fa3..000000000000
--- a/layout/html/tests/block/bugs/44264-2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
-<p style="float: right">Stuff</p>
-<p>test</p>
diff --git a/layout/html/tests/block/bugs/44264-3.html b/layout/html/tests/block/bugs/44264-3.html
deleted file mode 100644
index fdb1c2c58981..000000000000
--- a/layout/html/tests/block/bugs/44264-3.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<table border>
-<tr><td><p>text</p></td></tr>
-<tr><td><ul><li>item</li></ul></td></tr>
-</table>
diff --git a/layout/html/tests/block/bugs/4468.html b/layout/html/tests/block/bugs/4468.html
deleted file mode 100644
index 62beb42543b9..000000000000
--- a/layout/html/tests/block/bugs/4468.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<style type "text/css">
-   div { width: 306px; border: thin solid; margin: 1em; float:left; color: red; }
-   div + div img { margin: auto; }
-   div + div { color: lime; }
-</style>
-<title>image_margin_bug</title>
-
-<p>This page should show two identical columns of crumpled paper. </p>
-
-<p>Mozilla, as of 1999-05-17, displays the red (left hand side) column incorrectly. </p>
-
-<div>
-<img src="ant.jpg" alt=image height=185 width=300" align=left>
-<img src="ant.jpg" alt=image height=185 width=300" align=right>
-<img src="ant.jpg" alt=image height=185 width=306">
-</div>
-<div>
-<img src="ant.jpg" alt=image height=185 width=300" align=left>
-<img src="ant.jpg" alt=image height=185 width=300" align=right>
-<img src="ant.jpg" alt=image height=185 width=306">
-</div>
diff --git a/layout/html/tests/block/bugs/44709.html b/layout/html/tests/block/bugs/44709.html
deleted file mode 100644
index 74cbd5155fd2..000000000000
--- a/layout/html/tests/block/bugs/44709.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-
-<ol>
-<li>1</li><li>2</li><li>3</li><li>4</li><li>5</li><li>6</li><li>7</li><li>8</li><li>9</li><li>10</li><li>11</li><li>12</li><li>13</li><li>14</li><li>15</li><li>16</li><li>17</li><li>18</li><li>19</li><li>20</li><li>21</li><li>22</li><li>23</li><li>24</li><li>25</li><li>26</li><li>27</li><li>28</li><li>29</li><li>30</li><li>31</li><li>32</li><li>33</li><li>34</li><li>35</li><li>36</li><li>37</li><li>38</li><li>39</li><li>40</li><li>41</li><li>42</li><li>43</li><li>44</li><li>45</li><li>46</li><li>47</li><li>48</li><li>49</li><li>50</li><li>51</li><li>52</li><li>53</li><li>54</li><li>55</li><li>56</li><li>57</li><li>58</li><li>59</li><li>60</li><li>61</li><li>62</li><li>63</li><li>64</li><li>65</li><li>66</li><li>67</li><li>68</li><li>69</li><li>70</li><li>71</li><li>72</li><li>73</li><li>74</li><li>75</li><li>76</li><li>77</li><li>78</li><li>79</li><li>80</li><li>81</li><li>82</li><li>83</li><li>84</li><li>85</li><li>86</li><li>87</li><li>88</li><li>89</li><li>90</li><li>91</li><li>92</li><li>93</li><li>94</li><li>95</li><li>96</li><li>97</li><li>98</li><li>99</li><li>100</li><li>101</li><li>102</li><li>103</li><li>104</li><li>105</li><li>106</li><li>107</li><li>108</li><li>109</li>
-</ol>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/4515.html b/layout/html/tests/block/bugs/4515.html
deleted file mode 100644
index c864198f43cc..000000000000
--- a/layout/html/tests/block/bugs/4515.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html lang="en-US">
-<head>
-<title>Widths and margins of floating, non-replaced elements</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-DIV.contain { height: 10em; border: medium solid purple; text-align: justify;
-	color: black; background: white; }
-.fr { float: right; border: thin solid green; }
-.fl { float: left; border: thin solid green; }
-P.eight {  position: relative; width: 30%; margin-left: auto; margin-right: auto; left: auto; right: auto; }
-P.eleven { position: relative; width: 30%; left: 80px; }
-P.twelve { position: relative; width: 30%; left: 20px; right: 70px; }
-P.thirteen { position: relative; width: 30%; left: 10%; }
-P.fourteen { position: relative; width: 30%; right: 10%; }
-P.fifteen { position: relative; width: 30%; left: -10%; right: auto; }
-P.sixteen { position: relative; width: 30%; right: -10%; left: auto; }
-</style>
-</head>
-<body>
-<h1>Widths and margins of floating, non-replaced elements</h1>
-
-<p>
-	This is an excerpt from <a
-	href="http://dbaron.org/css/test/sec100305">my
-	test</a>  -David Baron.
-</p>
-
-<div class="contain">
-  <p class="fl eight">
-    This should be floating left and be 30% wide.  Its border should
-	touch its container's border.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to the edge of the float.  Therefore
-  its left edge should touch the float and its right edge should touch
-  the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr eight">
-    This should be floating right and be 30% wide.  Its border should
-	touch its container's border.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to the edge of the float.  Therefore
-  its right edge should touch the float and its left edge should touch
-  the border of the containing <code>div</code>.
-</div>
-
-
-<div class="contain">
-  <p class="fl eleven">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 80px to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including 80px of the float.  Therefore
-  its left edge should be 80px inside the float and its right edge should touch
-  the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr eleven">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 80px to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 80px away from the edge of the
-  float.  Therefore its right edge should be 80px away from the edge of
-  the float and its left edge should touch the border of the containing
-  <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fl twelve">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 20px to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including 20px of the float.  Therefore
-  its left edge should be 20px inside the float and its right edge should touch
-  the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr twelve">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 20px to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 20px away from the edge of the
-  float.  Therefore its right edge should be 20px away from the edge of
-  the float and its left edge should touch the border of the containing
-  <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fl thirteen">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including one third of the float (minus
-  the border width).  Therefore its left edge should be one third of
-  the way inside the float and its right edge should touch the border of
-  the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr thirteen">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 10% of the width of the
-  containing <code>div</code> from the edge of the float.  Therefore
-  its right edge should be 10% of the width of the containing
-  <code>div</code> away from the edge of the float and its left edge
-  should touch the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fl fourteen">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the left.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 10% of the width of the
-  containing <code>div</code> from the edge of the float.  Therefore
-  its left edge should be 10% of the width of the containing
-  <code>div</code> away from the edge of the float and its right edge
-  should touch the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr fourteen">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the left.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including one third of the float (minus
-  the border width).  Therefore its right edge should be one third of
-  the way inside the float and its left edge should touch the border of
-  the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fl fifteen">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the left.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 10% of the width of the
-  containing <code>div</code> from the edge of the float.  Therefore
-  its left edge should be 10% of the width of the containing
-  <code>div</code> away from the edge of the float and its right edge
-  should touch the border of the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr fifteen">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the left.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including one third of the float (minus
-  the border width).  Therefore its right edge should be one third of
-  the way inside the float and its left edge should touch the border of
-  the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fl sixteen">
-    This should be floating left and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> including one third of the float (minus
-  the border width).  Therefore its right edge should be one third of
-  the way inside the float and its left edge should touch the border of
-  the containing <code>div</code>.
-</div>
-
-<div class="contain">
-  <p class="fr sixteen">
-    This should be floating right and should be 30% of the width of its
-	parent.  It should be displaced 10% of the width of its parent
-	to the right.
-  </p>
-  This is text in the containing <code>div</code>.  It should span the
-  width of the <code>div</code> up to 10% of the width of the
-  containing <code>div</code> from the edge of the float.  Therefore
-  its left edge should be 10% of the width of the containing
-  <code>div</code> away from the edge of the float and its right edge
-  should touch the border of the containing <code>div</code>.
-</div>
-
-<hr title="Beginning of Footer">
-<p><a href="http://validator.w3.org/check/referer" title="W3C HTML Validator"><img src="ant.jpg" alt="Valid HTML 4.0!" height="31" width="88"></a></p>
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/4519.html b/layout/html/tests/block/bugs/4519.html
deleted file mode 100644
index e77a6319b419..000000000000
--- a/layout/html/tests/block/bugs/4519.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<title>bug 4519</title>
-
-<style type="text/css">
-
-div {
-  border: medium solid green;
-  margin: 40px;
-}
-
-div.two, div.four {
-  width: 300px;
-  height: 20px;
-}
-
-div.three, div.four {
-  position: relative;
-}
-
-p {
-  margin: 0 20px;
-  position: relative;
-}
-
-p.one {
-  top: -20px;
-  left: -20px;
-}
-
-p.two {
-  top: 20px;
-  left: 20px;
-}
-
-p.three {
-  bottom: -20px;
-  right: -20px;
-}
-
-p.four {
-  bottom: 20px;
-  right: 20px;
-}
-
-</style>
-
-<div class="one"><p class="one">This is some text.</p></div>
-<div class="one"><p class="two">This is some text.</p></div>
-<div class="one"><p class="three">This is some text.</p></div>
-<div class="one"><p class="four">This is some text.</p></div>
-<div class="two"><p class="one">This is some text.</p></div>
-<div class="two"><p class="two">This is some text.</p></div>
-<div class="two"><p class="three">This is some text.</p></div>
-<div class="two"><p class="four">This is some text.</p></div>
-<div class="three"><p class="one">This is some text.</p></div>
-<div class="three"><p class="two">This is some text.</p></div>
-<div class="three"><p class="three">This is some text.</p></div>
-<div class="three"><p class="four">This is some text.</p></div>
-<div class="four"><p class="one">This is some text.</p></div>
-<div class="four"><p class="two">This is some text.</p></div>
-<div class="four"><p class="three">This is some text.</p></div>
-<div class="four"><p class="four">This is some text.</p></div>
-
-<div class="one">
-  <p class="one">This is some text.</p>
-</div>
-<div class="one">
-  <p class="two">This is some text.</p>
-</div>
-<div class="one">
-  <p class="three">This is some text.</p>
-</div>
-<div class="one">
-  <p class="four">This is some text.</p>
-</div>
-<div class="two">
-  <p class="one">This is some text.</p>
-</div>
-<div class="two">
-  <p class="two">This is some text.</p>
-</div>
-<div class="two">
-  <p class="three">This is some text.</p>
-</div>
-<div class="two">
-  <p class="four">This is some text.</p>
-</div>
-<div class="three">
-  <p class="one">This is some text.</p>
-</div>
-<div class="three">
-  <p class="two">This is some text.</p>
-</div>
-<div class="three">
-  <p class="three">This is some text.</p>
-</div>
-<div class="three">
-  <p class="four">This is some text.</p>
-</div>
-<div class="four">
-  <p class="one">This is some text.</p>
-</div>
-<div class="four">
-  <p class="two">This is some text.</p>
-</div>
-<div class="four">
-  <p class="three">This is some text.</p>
-</div>
-<div class="four">
-  <p class="four">This is some text.</p>
-</div>
diff --git a/layout/html/tests/block/bugs/45621.html b/layout/html/tests/block/bugs/45621.html
deleted file mode 100644
index b21eeb54f463..000000000000
--- a/layout/html/tests/block/bugs/45621.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled</title>
-</head>
-<body>
-<!--
-<pre>
-table width=50%
-  td nowrap 
-    input width=100% 
-</pre>
-<table border style="background: silver; width:50%;">
- <tr>
-  <td border style="white-space: nowrap; background:#AABBFF;padding:8px;">
-      <input type="text" value=""  style="width:100%;"></input>
-  </td>
- </tr>
-</table>
-
-<br>
--->
-<pre>
-div width=50%, nowrap, border is outset/12px
-  input width=100% 
-  (must be as wide as its parent area inside the border)
-</pre>
-<div style="width:50%;
-            white-space:normal;
-            border:12px outset;">
- <input type="text" value="" style="width:100%;"></input>
-</div>
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/block/bugs/4677.html b/layout/html/tests/block/bugs/4677.html
deleted file mode 100644
index ecdaa59dfefb..000000000000
--- a/layout/html/tests/block/bugs/4677.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
- <body bgcolor=#c0c0c0>
-
-<b><img src="ant.jpg"></b><br>
-   <img src="ant.jpg"><br>
-   <img src="ant.jpg">
-
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/46918.html b/layout/html/tests/block/bugs/46918.html
deleted file mode 100644
index 0c2ff349e45b..000000000000
--- a/layout/html/tests/block/bugs/46918.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"><html lang="en"><head><title>Mozilla Tests: Inline margins</title>
-    
-    <style type="text/css">
-       span.left { margin-left: 10em; }
-       span.right { margin-right: 10em; }
-       div { width: 30em; border: thin solid; }
-    </style></head>
-
-  <body>
-    <h1>Inline margins</h1>
-    <p>The following DIV has a width of 50em, and the span it contains has margins of 20em.</p>
-    <div>
-       <span class="left right">
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-       </span>
-    </div>
-    <p>It should lay out identically to this:</p>
-    <div>
-       <span class="left"></span>
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-          a b c d e f g h i j k l m n o p q r s t u v w x y z 
-       <span class="right"></span>
-    </div>
-  </body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/47456.html b/layout/html/tests/block/bugs/47456.html
deleted file mode 100644
index 34cc939ff28b..000000000000
--- a/layout/html/tests/block/bugs/47456.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>Yahoo! Mail Netiquette Quiz from Peggy Post</title>
-</head>
-<body background=http://promotions.yahoo.com/promotions/netiquette/i/post_bg3.gif bgcolor="#C6E79C">
-abc
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/47456_1.html b/layout/html/tests/block/bugs/47456_1.html
deleted file mode 100644
index 3930355af365..000000000000
--- a/layout/html/tests/block/bugs/47456_1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html><body>
-
-<form method=post action=http://promo1.yahoo.com/sbin/generic.form>
-original table
-<table border=0 cellpadding=0 cellspacing=0 width=100 bgcolor=yellow>
-<tr><td bgcolor=pink valign=top>
-<font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=1>True</font><br></td>
-<td bgcolor=lightgrey>&nbsp;</td>
-<td bgcolor=violet><font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=-1>False</font><br></td>
-</tr></table>
-
-<br>table with NOBR tags in each cell
-<table border=0 cellpadding=0 cellspacing=0 bgcolor=aqua>
-<tr><nobr><td bgcolor=pink valign=top>
-<font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=1>True</font><br></td>
-<td bgcolor=lightgrey>&nbsp;</td>
-<td bgcolor=violet><nobr><font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=-1>False</font><br></td>
-</tr></table>
-
-<br>table that shows min required width for each cell (45, 52)
-<table border=0 cellpadding=0 cellspacing=0 >
-<tr><td bgcolor=pink width=45 valign=top>
-<font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=1>True</font><br></td>
-<td bgcolor=lightgrey>&nbsp;</td>
-<td bgcolor=violet width=52><font face=arial size=2 color="#CC3300">
-<input type=radio name=q1 value=-1>False</font><br></td>
-</tr></table>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/4803.html b/layout/html/tests/block/bugs/4803.html
deleted file mode 100644
index 96f5dd4f8a4d..000000000000
--- a/layout/html/tests/block/bugs/4803.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body>
-<table cellpadding=0 cellspacing=0 border=0>
-<tr>
-<td width="1" bgcolor="#999999">
-	<img src="ant.jpg" width=1 height=2 border=0>
-</td>
-<td width="139" bgcolor="#ffffcc">&nbsp;D A I LY&nbsp;&nbsp;C H E C K</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/48057.html b/layout/html/tests/block/bugs/48057.html
deleted file mode 100644
index 927a7cefe160..000000000000
--- a/layout/html/tests/block/bugs/48057.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML>
-<BODY>
-<table width="100% border="0" cellpadding="0" cellspacing="0" align="left">
-<tr>
-<td>fdsfds fd fds</td><td>
-<input class="FormLt1" type="text" name="ONCNNinput" size="12" value="your address">
-</td>
-<td align="right">
-<input type="submit" align="right" value="Sign up">
-</td>
-</tr>
-</table>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/4831-a.html b/layout/html/tests/block/bugs/4831-a.html
deleted file mode 100644
index 07a4e0586a68..000000000000
--- a/layout/html/tests/block/bugs/4831-a.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-<title>Bug 4831</title>
-<style type="text/css">
-p.test { margin: 0; border: 10px solid; }
-p.left { float: left; }
-p.right { float: right; }
-p.half { width: 50%; }
-p.quarter { width: 25%; }
-</style>
-</head>
-<body>
-<p>
-The top of paragraph four should be vertically aligned with the top of
-paragraph three.
-</p>
-<hr>
-<p class="test left half">
-one one one one one one one one one one one one one one
-one one one one one one one one one one one one one one
-</p>
-<p class="test right half">
-two two two two two two two two two two two
-two two two two two two two two two two two
-</p>
-<p class="test right half">
-three three three three three three three three three three
-three three three three three three three three three three
-</p>
-<p class="test left quarter">
-four four four four four four four four four four
-four four four four four four four four four four
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/4831-b.html b/layout/html/tests/block/bugs/4831-b.html
deleted file mode 100644
index b118e6702dea..000000000000
--- a/layout/html/tests/block/bugs/4831-b.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-<title>Bug 4831</title>
-<style type="text/css">
-p.test { margin: 0; border: 10px solid; }
-p.left { float: left; }
-p.right { float: right; }
-p.half { width: 50%; }
-p.quarter { width: 25%; }
-</style>
-</head>
-<body>
-<p>
-The top of paragraph four should be vertically aligned with the top of
-paragraph three.
-</p>
-<hr>
-<p class="test right half">
-one one one one one one one one one one one one one one
-one one one one one one one one one one one one one one
-</p>
-<p class="test left half">
-two two two two two two two two two two two
-two two two two two two two two two two two
-</p>
-<p class="test left half">
-three three three three three three three three three three
-three three three three three three three three three three
-</p>
-<p class="test right quarter">
-four four four four four four four four four four
-four four four four four four four four four four
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/48653.html b/layout/html/tests/block/bugs/48653.html
deleted file mode 100644
index af3457dd773b..000000000000
--- a/layout/html/tests/block/bugs/48653.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3c.org/TR/html4/strict.dtd">
-<HTML>
-<HEAD><TITLE>Bug 48653</TITLE></HEAD>
-<BODY>
-<h2>The following text is absolute positioned 20 pixels down from the red !</h2>
-<p>
-<span style="position:relative; color: red">RELATIVE 1
-<span style="position:absolute; top:20px; border:solid 1px; color:black;">
-This text is absolute-positioned and has top:20px.  It should be offset by the width of the red text,
-because it has a default value for "left" of "auto."
-</span>
-</span>
-</p>
-</BODY></HTML>
diff --git a/layout/html/tests/block/bugs/4956.html b/layout/html/tests/block/bugs/4956.html
deleted file mode 100644
index 5e419974fc6e..000000000000
--- a/layout/html/tests/block/bugs/4956.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- 
-
-this is the same HTML as before with one change (7B) remove the 
-
-<FONT> from the previous case and 'Mooney's grass ...' overlays 
-
-the image. 
-
--->
-
-<html><body>
-
-<font face=arial,helvetica size=-1>       
-
-<p>                                       
-
-<br clear=all>                            
-
-<p>                                       
-
- <table width=50 border=0 align=left>     
-
-  <tr><td>                                 
-
-    <img src="ant.jpg" 
-
-         width=50 height=62>
-
-  </td></tr>
-
- </table>                   
-
-BRIAN MCGRORY</font><br>                 <!-- (7B) --> 
-
-  Mooney's grass is always greener ... As the Sox return Tuesday for ...
-
-</body></html>
-
-
-
diff --git a/layout/html/tests/block/bugs/50480.html b/layout/html/tests/block/bugs/50480.html
deleted file mode 100644
index c7d5d8e271c6..000000000000
--- a/layout/html/tests/block/bugs/50480.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<HTML><ol><li>first</li><li>
-</ol></HTML>
diff --git a/layout/html/tests/block/bugs/50758.html b/layout/html/tests/block/bugs/50758.html
deleted file mode 100644
index 0888d09e6eb5..000000000000
--- a/layout/html/tests/block/bugs/50758.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML>
-<BODY>
-<FORM NAME="aForm">
-<INPUT TYPE="text" NAME="bField" STYLE="text-align:right;">
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/5114.html b/layout/html/tests/block/bugs/5114.html
deleted file mode 100644
index 8971f9200e01..000000000000
--- a/layout/html/tests/block/bugs/5114.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
- <head>
-  <title>Test case for bug #xxxxx</title>
-  <style>
-  </style>
- </head>
- <body>
-  <P>This is a paragraph</P><BR>
-  <P>This is another paragraph</P><BR>
-  <P>This is the last paragraph</P>
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/5119.html b/layout/html/tests/block/bugs/5119.html
deleted file mode 100644
index 7b2962648078..000000000000
--- a/layout/html/tests/block/bugs/5119.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-<title>
-Invalid &lt;dd&gt; indentation
-</title>
-<style type="text/css">
-.filler {color: #CCCCCC}
-</style>
-</head>
-<body>
-<h1>Invalid &lt;dd&gt; for Indentation</h1>
-<h2>Set 1 - &lt;dd&gt; indentation tests</h2>
-<p>Misplaced end tags appear after the test number, before the description.</p>
-<hr width=50%>
-<dd>Test 1</dd> with misplaced end tag. <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span><br>
-<dd>Test 2</dd> with misplaced end tag and preceding break. <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span><br>
-<dd></dd>
-<dd>Test 3</dd> with misplaced end tag and after empty &lt;dd&gt; with preceding break and end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd></dd>
-<dd>Test 4</dd> with misplaced end tag and after empty &lt;dd&gt; with no preceding break and with end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd>Test 5</dd> with misplaced end tag and no preceding break. <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span><br>
-<dd>Test 6 with preceding break and no end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd>Test 7 with no preceding break and no end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span><br>
-<dd>
-<dd>Test 8 with no end tag and after empty &lt;dd&gt; with preceding break and no end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd>
-<dd>Test 9 with no end tag and after empty &lt;dd&gt; with no preceding break and no end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd>
-<dd>
-<dd>
-<dd>Test 10 with no end tag and after three empty &lt;dd&gt;s with no preceding break and no end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<p>
-<dd>Test 11 with no end tag and after empty &lt;p&gt; without end tag <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd>Dummy Test with no end tag and no preceding break <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dd><p>Test 12 (paragraph) structure: &lt;dd&gt;&lt;p&gt;Test <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-
-<hr>
-
-<h2>Set 2 - Valid List
-<hr width=50%>
-<dl>
-<dt>term
-<dd>Definition <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-<dt>term
-<dd>Definition <span class="filler">(filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text filler text)</span>
-</dl>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/5196.html b/layout/html/tests/block/bugs/5196.html
deleted file mode 100644
index 8e440669e8eb..000000000000
--- a/layout/html/tests/block/bugs/5196.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
-<HEAD><TITLE>Testcase for bug 5196</TITLE></HEAD>
-<BODY>
-<CENTER>
-<TABLE BORDER=0 WIDTH=100% HEIGHT=100%>
-<TR><TD VALIGN=MIDDLE ALIGN=MIDDLE>
-
-<TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0>
- <TR><TD><IMG SRC="hack.gif"></TD></TR>
-</TABLE>
-
-</TD></TR>
-</TABLE>
-</CENTER>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/52242.html b/layout/html/tests/block/bugs/52242.html
deleted file mode 100644
index c24d3aaaa2b6..000000000000
--- a/layout/html/tests/block/bugs/52242.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html><head>
- <title>VSPACE</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head><body><table border><tr><td><img src="../../table/images/mozilla-banner.gif" width="500" height="58" style="float: left; margin: 20px;" alt="Mozilla Banner"></td></tr></table></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/52265.html b/layout/html/tests/block/bugs/52265.html
deleted file mode 100644
index d61c3f0f9960..000000000000
--- a/layout/html/tests/block/bugs/52265.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- TclProShowBanner -->
- <html><head>	<title>Tcl/Tk</title>
-</head>
-<body bgcolor=white text=black>
-
-<div>
-<img SRC="ant.jpg" align=left>
-<img width=5 height=150 align=left border=1>
-Tcl (Tool Command Language) is used by over
-</div>
-<p>Tk is a graphical user interface toolkit that makes it possible to create powerful
-GUIs incredibly quickly. It proved so popular that it now ships
-with all distributions of Tcl.
-</body></html>
- 
-
diff --git a/layout/html/tests/block/bugs/52307.html b/layout/html/tests/block/bugs/52307.html
deleted file mode 100644
index e2f32cd7e151..000000000000
--- a/layout/html/tests/block/bugs/52307.html
+++ /dev/null
@@ -1 +0,0 @@
-<hr align=left width=100%>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/52773.html b/layout/html/tests/block/bugs/52773.html
deleted file mode 100644
index e0b6039b3e67..000000000000
--- a/layout/html/tests/block/bugs/52773.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html> <body bgcolor="#408080" text="white" link="aqua" vlink="silver" alink="yellow">  <table width="600" border="0" cellspacing="0" cellpadding="0" align="center"
-bgcolor="maroon"> <TR> <TD> <font face="Tahoma" size="4" color="yellow" align = "left"> home&nbsp;
-<A href="about/about.html">about</A>&nbsp;
-<A href="biblio/biblio.html">bibliography</A>&nbsp;
-<A href="books/books.html">books</A>&nbsp;
-<A href="articles/articles.html">articles</A>&nbsp;
-<A href="links/links.html">links</A>&nbsp;
-<A href="survey/survey.html">survey</A>&nbsp;
-</font> </TD> </TR> </table> </body> </html>
diff --git a/layout/html/tests/block/bugs/53259.html b/layout/html/tests/block/bugs/53259.html
deleted file mode 100644
index 2c602ab31890..000000000000
--- a/layout/html/tests/block/bugs/53259.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--<hr align=left width=200>-->
-
-<div style="border: 1px solid blue; min-width: 200px;">
-  Div 1: min-width:200px
-</div>
-<br>
-<div style="border: 1px solid blue; width: 200px;">
-  Div 2: width:200px width:200px width:200px width:200px 
-max-width:200px
-</div>
-<br>
-<div style="border: 1px solid blue; max-width: 200px;">
-  Div 3: max-width:200px max-width:200px max-width:200px max-width:200px 
-max-width:200px
-</div>
-<br>
-<div style="border: 1px solid blue; min-width: 100px; max-width: 200px;">Div 4: </div>
-<br>
-
-<form>
-&lt;input type=text style="min-width:200px;"><br>
-<input type=text style="min-width:200px; width:100%">
-<input type=text style="max-width:200px; width:100%">
-<input type=text style="width:200px;">
-</form>
-
-
diff --git a/layout/html/tests/block/bugs/53690.html b/layout/html/tests/block/bugs/53690.html
deleted file mode 100644
index 8d893d56691d..000000000000
--- a/layout/html/tests/block/bugs/53690.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<HTML><BODY><form action="1"></form><form action="2"></form><TABLE border=1><TR><TD>
- <SCRIPT language=JavaScript>document.write('<form action="' + document.forms[1].action + '">');</SCRIPT>
-</TD><TD>X</TD></TR></TABLE>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/5375.html b/layout/html/tests/block/bugs/5375.html
deleted file mode 100644
index 3ee46db9df5a..000000000000
--- a/layout/html/tests/block/bugs/5375.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!-- 
-This example page should generate a vertical scrollbar. It does not.
-
-The three relevant "parameters" are: 
- 1) the 'marginheight=0' (must be zero) 
- 2) must be *only* a floated table in the page (recalls bug #2394)
- 3) table is floated 'align=left|right'.  
-
-Tested on win95 for M4 build and for Apr 21 nightly build (opt).
--->
-
-<html><head></head>
-<body marginheight="0">
-                  <!-- note 1: marginheight must be zero -->
-  <!-- FOOBAR --> <!-- note 2: add FOOBAR and scrollbar appears -->
-                  <!-- note 3: table must be align=left|right -->
-  <table border width="450" align="left">   
-    <tr>
-      <td>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-        make <br> me <br> tall <br> enough <br> make <br> me <br> tall <br>
-      </td>
-    </tr>      
-  </table>
-</body></html>
diff --git a/layout/html/tests/block/bugs/53960.html b/layout/html/tests/block/bugs/53960.html
deleted file mode 100644
index 8a1e85538b0e..000000000000
--- a/layout/html/tests/block/bugs/53960.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<HTML><BODY><TABLE><TR><TD>
- <TABLE border=1><TR><TD><SCRIPT language=JavaScript>document.write('<form method=post name = "DominoForm1" action="' + document.forms[1].action + '">');</SCRIPT>
-</TD></TR></TABLE></TD><TD>X</TD></TR></TABLE>
diff --git a/layout/html/tests/block/bugs/53974.html b/layout/html/tests/block/bugs/53974.html
deleted file mode 100644
index 8e469b97ba98..000000000000
--- a/layout/html/tests/block/bugs/53974.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><style>
-  BODY > *:after {content: '-X-'; }
-
-  IMG:before { content: "img="; }
-  IMG:after { content: "=img"; }
-</style></head><body>
-text
-<img width=50 height=50 border=1>
-<P>a paragraph</P>
-<hr>
-text
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/54005.html b/layout/html/tests/block/bugs/54005.html
deleted file mode 100644
index 81a5a7e3e7be..000000000000
--- a/layout/html/tests/block/bugs/54005.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<title>Bug 54005</title>
-</head>
-<body>
-<table style="background:red">
-<tr><td><b><font>Here_is_some_text</b><br><b><font>Here_is_some_text</b><br></td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/5418.html b/layout/html/tests/block/bugs/5418.html
deleted file mode 100644
index d97e62b6778a..000000000000
--- a/layout/html/tests/block/bugs/5418.html
+++ /dev/null
@@ -1,80 +0,0 @@
- <HTML>
-
-<HEAD>
-
-<style>
-
-/* This CSS, if enabled, of course, 'cures'. */
-
-/* IMG {vertical-align: text-bottom;} */
-
-</style>
-
-</HEAD>
-
-<BODY>
-
-
-
-<p>The following 'stack' of images are forced onto a new line by
-
-<code>&lt;br&gt;</code>.  The entire 'stack' is contained in a
-
-<code>&lt;font&gt;&lt;/font&gt;</code>. In jun08 viewer win95, there
-
-are vertical gaps between each image (the Nav4 vs. CSS2 incompatibility).</p>
-
-
-
-    <FONT>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=38 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=28 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=19 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=20 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=19 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=33 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=25 BORDER="0">
-
-    </FONT>
-
-
-
-<br>
-
-<p>These are the same images with <b>no</b>
-
-<code>&lt;font&gt;&lt;/font&gt;</code> wrapped around the 'stack'.</p>
-
-
-
-
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=38 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=28 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=19 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=20 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=19 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=33 BORDER="0"><BR>
-
-    <IMG SRC="ant.jpg" WIDTH=132 HEIGHT=25 BORDER="0">
-
-
-
-
-
-</BODY>
-
-</HTML>
-
diff --git a/layout/html/tests/block/bugs/54618.html b/layout/html/tests/block/bugs/54618.html
deleted file mode 100644
index 511a000d49d6..000000000000
--- a/layout/html/tests/block/bugs/54618.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><BODY>
-<TABLE style="border: 1px solid red;" CELLPADDING="0" CELLSPACING="0" WIDTH="600"><TR>
-  <TD WIDTH="447" VALIGN="TOP" ALIGN="RIGHT">
-    <FORM>
-    <TABLE BORDER="1" CELLSPACING="0" CELLPADDING="0" WIDTH="447">           
-      <TR>
-        <td>
-          <div style="width:220px; height:150px; border:1px solid black;">
-        </TD>
-      </TR>
-    </TABLE>
-    <TABLE BORDER="1" CELLPADDING="0" CELLSPACING="0" WIDTH="447" bgcolor=aqua>
-      <TR>
-        <TD WIDTH="302" VALIGN="TOP">
-          </form> <!-- move </form> to after the table, and it lays out correctly -->
-        </TD>
-      </TR>
-    </TABLE>
-</TR></TABLE>
-</BODY></HTML>
diff --git a/layout/html/tests/block/bugs/54833.html b/layout/html/tests/block/bugs/54833.html
deleted file mode 100644
index 9e6665903491..000000000000
--- a/layout/html/tests/block/bugs/54833.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<TABLE align=right cellpadding=0 cellspacing=0 border=0 bgcolor=yellow><TR><TD> 
-  <TABLE width=220 cellpadding=0 cellspacing=0 border=0 bgcolor=red> 
-    <TR><TD><IMG SRC="ant.jpg" ALT="Falwell, White" WIDTH="220" HEIGHT="168"></TD></TR>  
-    <TR><TD>The Rev. Jerry Falwell, left; an outspoken critic of homosexuality, met with the Rev. Mel White, an openly gay minister, on Saturday in Lynchburg, Virginia</TD></TR>
-  </TABLE>
-</TD></TR></TABLE>
-
diff --git a/layout/html/tests/block/bugs/54876.html b/layout/html/tests/block/bugs/54876.html
deleted file mode 100644
index d4c36ca45b3e..000000000000
--- a/layout/html/tests/block/bugs/54876.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><body>
-<table WIDTH="100"><tr><td>
-  <img src="ant.jpg" width=100% height="3">
-  <img src="ant.jpg" width=100% height="3">
-</td></tr></table>
-</body></html><!--
-1. doesn't matter which image is used, as long as the same image is used twice
-2. must be within a table, and table must have a width
-3. img must have %-width and fixed height
-4. only crashes on initial load.  if you change the test case, load successfully,
-change the test case back to what it was, and reload, you will not crash.
--->
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/55095.html b/layout/html/tests/block/bugs/55095.html
deleted file mode 100644
index f8be481645d8..000000000000
--- a/layout/html/tests/block/bugs/55095.html
+++ /dev/null
@@ -1,3040 +0,0 @@
-<html>
-
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-		<meta name="generator" content="Adobe GoLive 4">
-		<title>HPCU</title>
-		<csactions>
-			<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-<csaction name="B46084F4120" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46084FF121" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460850F122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460851A123" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608528124" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B4608545126" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B460854F127" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4608557128" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4608575129" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608580130" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085AF132" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B46085B8133" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B46085C0134" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B46085C9135" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46085D6136" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46085FB139" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608607140" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460860E141" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608616142" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460861E143" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B460863C145" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B4608644146" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B460864E147" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B4608656148" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B460865E149" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B4608E35158" class="Play Scene" type="ONEVENT" val0="products">
-			<csaction name="B4608E4D159" class="Play Scene" type="ONEVENT" val0="rates">
-			<csaction name="B4608E60161" class="Play Scene" type="ONEVENT" val0="access">
-			<csaction name="B4608E69162" class="Play Scene" type="ONEVENT" val0="member">
-			<csaction name="B4608E75163" class="Play Scene" type="ONEVENT" val0="forms">
-			<csaction name="B4608FF4173" class="Action Group" type="ONEVENT" val0="B460900C175,B460901C176,B460902B177,B4609036178,B4609049179,B4609055180">
-			<csaction name="B460900C175" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="0">
-			<csaction name="B460901C176" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460902B177" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609036178" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609049179" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609055180" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609088182" class="Action Group" type="ONEVENT" val0="B460908C183,B4609097184,B46090A1185,B46090AC186,B46090C2187,B46090CB188">
-			<csaction name="B460908C183" class="ShowHide" type="ONEVENT" val0="snbrates" val1="0">
-			<csaction name="B4609097184" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090A1185" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090AC186" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46090C2187" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B46090CB188" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B46090E1190" class="Action Group" type="ONEVENT" val0="B46090E6191,B46090EF192,B46090F8193,B46090FF194,B4609108195,B4609110196">
-			<csaction name="B46090E6191" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="0">
-			<csaction name="B46090EF192" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B46090F8193" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46090FF194" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609108195" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609110196" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B460912B198" class="Action Group" type="ONEVENT" val0="B460912F199,B4609137200,B4609142201,B460914B202,B4609155203,B460915F204">
-			<csaction name="B460912F199" class="ShowHide" type="ONEVENT" val0="snbmember" val1="0">
-			<csaction name="B4609137200" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4609142201" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460914B202" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609155203" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B460915F204" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609179206" class="Action Group" type="ONEVENT" val0="B460917D207,B4609189208,B460919B210,B46091A7211,B46091B2212,B46091C0213">
-			<csaction name="B460917D207" class="ShowHide" type="ONEVENT" val0="snbforms" val1="0">
-			<csaction name="B4609189208" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B460919B210" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B46091A7211" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B46091B2212" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B46091C0213" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4609363223" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B4609375224" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B460937F225" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B4609396227" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B46093A3228" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B46093B4230" class="Play Scene" type="ONEVENT" val0="about">
-			<csaction name="B46093F1231" class="Action Group" type="ONEVENT" val0="B46093F6232,B4609402233,B460940E234,B4609421235,B4609432236,B460943F237">
-			<csaction name="B46093F6232" class="ShowHide" type="ONEVENT" val0="snbabout" val1="0">
-			<csaction name="B4609402233" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B460940E234" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4609421235" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B4609432236" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B460943F237" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B4609EB7241" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="-50">
-			<csaction name="B4609ED6242" class="Move By" type="ONEVENT" val0="scroll" val1="0" val2="50">
-			<csaction name="B460A10E0" class="Netscape CSS Fix" type="ONLOAD">
-			<csaction name="B483FC822" class="Goto Link" type="ONEVENT" val0="whats_new/whatsnew.html" val1="content">
-			<csaction name="103AA697" class="Open Window" type="ONEVENT" val0="https://elink.hpefcu.com/elink/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B47A911D16" class="Goto Link" type="ONEVENT" val0="home2.html" val1="content">
-			<csaction name="B47A890E2" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B47A891A3" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B47A892C4" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B47A89385" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B47A89436" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B47A89E015" class="Action Group" type="ONEVENT" val0="B47A89E08,B47A89E09,B47A89E010,B47A89E011,B47A89E012,B47A89E013,B47A918A17">
-			<csaction name="B47A89E08" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B47A89E09" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B47A89E010" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B47A89E011" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B47A89E012" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B47A89E013" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B47A918A17" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B47A91D419" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="B49674E114" class="Action Group" type="ONEVENT" val0="B49674EA15,B496750D16,B496750F17,B496751418,B496751719,B496751A20">
-			<csaction name="B49674408" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="B49674499" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="B496746911" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="B496747312" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="B49674EA15" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B496750D16" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B496750F17" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B496751418" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="B496751719" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B496751A20" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="B49676A122" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="B496807A0" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="1068F168" class="Open Window" type="ONEVENT" val0="https://www.mybills.com/elinkbills/" val1 val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2B77D8" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="B4D2B79E9" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7AB10" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="B4D2B7B411" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="B4D2B7BD12" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="B4D2B7E714" class="ShowHide" type="ONEVENT" val0="snbhome" val1="1">
-			<csaction name="14D1D590" class="Open Window" type="ONEVENT" val0="AAFP/etrade.htm" val1="content" val2="0" val3="0" val4="true" val5="true" val6="true" val7="true" val8="true" val9="true" val10="true">
-			<csaction name="B4D2BA3A31" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="FD4BC93" class="Goto Link" type="ONEVENT" val0="https://www.mybills.com/elinkbills" val1>
-			<csaction name="11118DF7" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11148998" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="112FB539" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11329AE10" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="1134CBB11" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="113801712" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="113CDDC13" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="113FCCD14" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="114393E16" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="114716017" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="114BB5019" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="114E58F20" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="117AA9621" class="Action Group" type="ONEVENT" val0="117FBEA22,1183AF923,118600524,118858925,118A72D26,118D66E27">
-			<csaction name="117FBEA22" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1183AF923" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="118600524" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="118858925" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="118A72D26" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="118D66E27" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="11AA5A328" class="ShowHide" type="ONEVENT" val0="snsabout" val1="0">
-			<csaction name="11C98D529" class="ShowHide" type="ONEVENT" val0="snsproducts" val1="0">
-			<csaction name="11CBD5E30" class="ShowHide" type="ONEVENT" val0="snsrates" val1="0">
-			<csaction name="11CDC1D31" class="ShowHide" type="ONEVENT" val0="snsaccess" val1="0">
-			<csaction name="11CFDC232" class="ShowHide" type="ONEVENT" val0="snsmember" val1="0">
-			<csaction name="11F70B733" class="ShowHide" type="ONEVENT" val0="snsforms" val1="0">
-			<csaction name="122E4E034" class="Action Group" type="ONEVENT" val0="122FC6335,1232C9536,123531337,123734F38,1239D7A39,123C5D940">
-			<csaction name="122FC6335" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1232C9536" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="123531337" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="123734F38" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1239D7A39" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="123C5D940" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="124D3C441" class="Action Group" type="ONEVENT" val0="124E50F42,1250CB943,12532E744,1255C2345,1257E3546,125B84247">
-			<csaction name="124E50F42" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1250CB943" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="12532E744" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="1255C2345" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="1257E3546" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="125B84247" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="125F4F948" class="Action Group" type="ONEVENT" val0="126050D49,1263BE550,126591451,12677F152,126A05A53,126C3C154">
-			<csaction name="126050D49" class="ShowHide" type="ONEVENT" val0="snbabout" val1="1">
-			<csaction name="1263BE550" class="ShowHide" type="ONEVENT" val0="snbproducts" val1="1">
-			<csaction name="126591451" class="ShowHide" type="ONEVENT" val0="snbrates" val1="1">
-			<csaction name="12677F152" class="ShowHide" type="ONEVENT" val0="snbaccess" val1="1">
-			<csaction name="126A05A53" class="ShowHide" type="ONEVENT" val0="snbmember" val1="1">
-			<csaction name="126C3C154" class="ShowHide" type="ONEVENT" val0="snbforms" val1="1">
-			<csaction name="6DE5940" class="Goto Link" type="ONEVENT" val0="about/disclosure.html" val1="content">
-
-		</csactions>
-	</head>
-
-	<body>
-        <p>Hello</p>
-	</body>
-
-</html>
diff --git a/layout/html/tests/block/bugs/55250.html b/layout/html/tests/block/bugs/55250.html
deleted file mode 100644
index 9d85ac1e3940..000000000000
--- a/layout/html/tests/block/bugs/55250.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><meta name="author" content="steve clark">
-  <title>55250</title>
-</head>
-<body>
-<img src="ant.jpg" alt="xxx" width="250" height="170">
-<BR>
-<object style="width:50px; height:50px; border: 1px solid black"></object>
-<BR>
-<table style="width:50px; height:50px; border: 1px solid black"><tr><td>x</td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/55317.html b/layout/html/tests/block/bugs/55317.html
deleted file mode 100644
index d650681fb35b..000000000000
--- a/layout/html/tests/block/bugs/55317.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>.Online Handyshop, alles für Ihr Mobiltelefonm, Handypark.de</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<frameset cols="100%,180" frameborder="NO" border="0" framespacing="0" rows="*"> 
-  <frameset rows="80,*" frameborder="NO" border="0" framespacing="0"> 
-  <frame name="topFrame1" scrolling="NO" noresize src="about:blank" >
-  <frame name="links" src="about:blank" scrolling="AUTO" noresize>
-</frameset>
-  <frameset rows="65,1*" frameborder="NO" border="0" framespacing="0"> 
-    <frame name="topFrame" scrolling="NO" noresize src="about:blank" marginwidth="2" marginheight="3" >
-    <frame name="rightFrame" scrolling="AUTO" noresize src="about:blank" marginwidth="0" marginheight="0">
-</frameset>
-</frameset>
-<noframes><body bgcolor="#FFFFFF">
-
-</body></noframes>
-</html>
diff --git a/layout/html/tests/block/bugs/5537.html b/layout/html/tests/block/bugs/5537.html
deleted file mode 100644
index b4df43ab4c20..000000000000
--- a/layout/html/tests/block/bugs/5537.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<HTML>
-<HEAD><TITLE>Testcase for bug 5537</TITLE></HEAD>
-<BODY>
-
-<H2>Try resizing the width of the window!</H2>
-
-<TABLE width=120 align=left>
-<TR><TD bgcolor="#993366">
-left floater:<br>
-&lt;TABLE&nbsp;width=120&nbsp;align=left&gt;<br>
-</TD></TR>
-</TABLE>
-
-<TABLE width=350 align=left>
-<TR><TD bgcolor="#339966">
-center floater:<br>
-&lt;TABLE width=350 align=left&gt;<br>
-</TD></TR>
-</TABLE>
-
-<TABLE width=130 align=left>
-<TR><TD bgcolor="#336699">
-right floater:<br>
-&lt;TABLE width=130 align=left&gt;<br>
-</TD></TR>
-</TABLE>
-
-</BODY></HTML>
diff --git a/layout/html/tests/block/bugs/55874.html b/layout/html/tests/block/bugs/55874.html
deleted file mode 100644
index cbe1b393091b..000000000000
--- a/layout/html/tests/block/bugs/55874.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-  <style>
-    IMG, Input, Textarea {
-      width: 50px;
-      height: 25%;
-      border: 1px solid black;
-    }
-    DIV, TABLE {
-      height: 400px;
-      width: 400px;
-      border: 1px solid grey;
-    }
-  </style>
-</head>
-<body>
-<h1>children of the body</h1>
-<img> <input> <textarea></textarea>
-
-<h1>children of a div with height=400px</h1>
-<div>
-  <img> <input> <textarea></textarea>
-</div>
-
-<h1>children of a table with height=400px</h1>
-<table><tr><td>
-  <img> <input> <textarea></textarea>
-</td></tr></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/55961.html b/layout/html/tests/block/bugs/55961.html
deleted file mode 100644
index cb96a97c3d9a..000000000000
--- a/layout/html/tests/block/bugs/55961.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html> 
-<head> 
-<title>Macromedia Web Player Download Center</title> 
-</head> 
-<frameset rows="1*,64" cols="*" border="0" framespacing="0" frameborder="NO" marginwidth="0" marginheight="0"> 
-  <frame src="/shockwave/download/download.cgi?application/x-director" frameborder="NO" marginwidth="0" marginheight="0" noresize name="contents"> 
-  <frameset cols="292,1*" border="0" framespacing="0" frameborder="NO" marginwidth="0" marginheight="0"> 
-    <frame src="/nav/find.fhtml" frameborder="NO" marginwidth="0" marginheight="0" noresize scrolling="NO" name="find"> 
-    <frame src="/shockwave/ad.fhtml" frameborder="NO" marginwidth="0" marginheight="0" noresize scrolling="NO" name="ad"> 
-  </frameset> 
-</frameset> 
-<noframes> 
-<body bgcolor="#FFFFFF"> Your web browser does not support frames.
-Please upgrade to the latest 
-<a href="/OUTGOING/http://home.netscape.com/download/">Netscape</a> or <a href="/OUTGOING/http://www.microsoft.com/windows/ie/">Internet Explorer</a> browser. 
-</body> </noframes> </html>
diff --git a/layout/html/tests/block/bugs/56102.html b/layout/html/tests/block/bugs/56102.html
deleted file mode 100644
index 5b359c016173..000000000000
--- a/layout/html/tests/block/bugs/56102.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><title>Test case for bug 56102</title>
-<script language="JavaScript">
-function insert()
-{
-  var b = document.getElementById("b");
-  var br = document.getElementById("br");
-  b.insertBefore(document.createTextNode("ghi"), br);
-}
-</script></head><body onload="insert();">abc<b id="b">def<br><br id="br"></b></body></html>
diff --git a/layout/html/tests/block/bugs/56265.html b/layout/html/tests/block/bugs/56265.html
deleted file mode 100644
index cdf1a4c8a812..000000000000
--- a/layout/html/tests/block/bugs/56265.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<form action="show_bug.cgi" method="get">
-  Show bug: 
-  <INPUT name="id" size="6" > 
-  <INPUT type="submit" value="Show"> 
-</FORM>
diff --git a/layout/html/tests/block/bugs/56335.html b/layout/html/tests/block/bugs/56335.html
deleted file mode 100644
index 7b02bcddd7f4..000000000000
--- a/layout/html/tests/block/bugs/56335.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML><BODY>
-<nobr>
-<TABLE WIDTH="132" BORDER="0" CELLPADDING="0" CELLSPACING="0">
-  <TR><TD WIDTH="120" COLSPAN="3">
-    <IMG SRC="ant.jpg"  WIDTH=120 HEIGHT=60 ALT="New/Blue Tell A Friend" border=0 BORDER=0>
-  </TD></TR>
-  <tr><td WIDTH="120" colspan="3">
-    <FORM ACTION="http://my.lycos.com/setup.asp" METHOD=GET>
-      <input type="radio" checked>
-      <input TYPE="text" SIZE="10">
-      <input type="image" src="/a/lycos/ly25x25.gif" border="0" alt="go Get It" width="25" height="25" align="top" name="I1">
-      <br CLEAR="ALL">
-    </form>
-  </td>
-  <td WIDTH="12" ALIGN="CENTER" VALIGN="TOP">&nbsp;</td>
-  </tr>
-  <map name="smedcom">
-    <area shape="rect" coords="1,158,119,188" href="http://cgi.usatoday.com/cgi-bin/mp_redir.cgi?movienav002">
-    <area shape="rect" coords="0,110,117,153" href="http://cgi.usatoday.com/cgi-bin/mp_redir.cgi?movienav008">
-    <area shape="rect" coords="0,45,118,104" href="http://cgi.usatoday.com/cgi-bin/mp_redir.cgi?movienav001">
-  </map>
-  <TR><TD WIDTH="120" ALIGN="RIGHT"  VALIGN="TOP" COLSPAN="3">
-      <IMG SRC="ant.jpg"  ALT="" Height=1 Width=1 Border=0 BORDER=0>
-  </TD>
-  <TD WIDTH="12"  ALIGN="CENTER" VALIGN="TOP">&nbsp;</TD>
-  </TR>
-</TABLE>
-<SCRIPT LANGUAGE="JavaScript1.1" 
-  SRC="http://icover.realmedia.com/RealMedia/ads/adstream_jx.ads/www.usatoday.com/lifestyles@Position1">
-</script> 
-</body></HTML>
-
-
-
-
-
diff --git a/layout/html/tests/block/bugs/56563_1.html b/layout/html/tests/block/bugs/56563_1.html
deleted file mode 100644
index 3099403e9fd9..000000000000
--- a/layout/html/tests/block/bugs/56563_1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML>
-<table>
-<P>  
-<Sh><Sh>
-<P>M
-<p>
-<img SRC="ant.jpg" height=40 width=126>
diff --git a/layout/html/tests/block/bugs/5688.html b/layout/html/tests/block/bugs/5688.html
deleted file mode 100644
index ca8c3726e552..000000000000
--- a/layout/html/tests/block/bugs/5688.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<FONT FACE="Arial" SIZE="-1">
-<UL>
-   <LI style="background: maroon">Item</LI>
-   <LI style="background: fuchsia">Item</LI>
-   <LI style="background: green">Item</LI>
-   
-   <LI style="background: aqua"><FONT SIZE="-1" FACE="Arial,Helvetica">Item</FONT></LI>  
-   <LI style="background: yellow"><FONT SIZE="-1" FACE="Arial,Helvetica">Item</FONT></LI>  
-   <LI style="background: red"><FONT SIZE="-1" FACE="Arial,Helvetica">Item</FONT></LI>
-   
-</UL>
-
-</FONT>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/57554.html b/layout/html/tests/block/bugs/57554.html
deleted file mode 100644
index e4a2b51171e2..000000000000
--- a/layout/html/tests/block/bugs/57554.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>foo<sup>bar1</p></sup>foo
-<p>foo<sup>bar2</p></sup>foo 
-<p>foo<sup>bar3</p></sup> foo 
diff --git a/layout/html/tests/block/bugs/5821.html b/layout/html/tests/block/bugs/5821.html
deleted file mode 100644
index c37aab8d65bf..000000000000
--- a/layout/html/tests/block/bugs/5821.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-   <title>Mozilla test - Bug#7290 - #5821</title>
- <style>
-  div { border: 2px solid red; }
- </style>
-</head>
-<body>
-
-below has link:<br>
-
-<div><a href="testlink.html"><img SRC="ant.jpg" BORDER=0 height=20 width=50></a></div>
-
-below has no link:<br>
-
-<div><img SRC="ant.jpg" BORDER=0 height=20 width=50></div>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/5847.html b/layout/html/tests/block/bugs/5847.html
deleted file mode 100644
index b8af806facda..000000000000
--- a/layout/html/tests/block/bugs/5847.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href="nonexistent_or_existent.css">
-<style type="text/css"></style>
-</head>
-<body>
-  <table border="1">
-    <tr><td>
-            <script language="JavaScript"></script>
-1abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-2abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-3abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-4abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-5abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-6abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-7abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-8abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-    </td></tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/5859-a.html b/layout/html/tests/block/bugs/5859-a.html
deleted file mode 100644
index 52ebc1ceec85..000000000000
--- a/layout/html/tests/block/bugs/5859-a.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html><head><base href="http://www.browsertune.com/bt98/"></head>
-<body>
-
-<!-- TABLE ONE --> 
-<table border="1" width="128" align="left">
-  <tr>
-    <td width="127">
-      Windows Magazine<br>
-      Site Search<br>
-      etc.<br>   etc.<br>  etc.<br>  etc.<br>
-      etc.<br>   etc.<br>  etc.<br>  etc.<br>
-   </td>
-  </tr>
-</table>
-
-<!-- something in here is not right wrt layout .. principally the pattern
-     FONT around the P around an IMG                                      -->
-
-<font face="arial, geneva, helvetica">
-
-<p><img src="ant.jpg" 
-   width="5" height="5" alt="blank.gif"><img 
-   src="ant.jpg" alt="WinMag ShortCuts"></p>
-
-<font face="arial, geneva, helvetica, sans, swiss"></font>
-
-<!-- TABLE TWO .. intended to be to the right of TABLE ONE --> 
-<table border="1" width="466">
-  <tr>
-    <td width="100%"> 
-      WINDOWS Magazine Presents Fred Langa's <br>
-      blah, blah, <br>  blah, blah, <br>  blah, blah, <br>
-      blah, blah, <br>  blah, blah, <br>  blah, blah, <br>
-    </td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/5859-b.html b/layout/html/tests/block/bugs/5859-b.html
deleted file mode 100644
index 32d773684521..000000000000
--- a/layout/html/tests/block/bugs/5859-b.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><base href="http://www.browsertune.com/bt98/"></head>
-<body>
-
-<div style="float: left; border: medium solid purple; width: 10em;">
-Floating Div, floating left.
-</div>
-
-<font face="arial, geneva, helvetica">
-
-<p style="border: medium solid green; margin-top: 0;">Paragraph</p>
-
-<font face="arial, geneva, helvetica, sans, swiss"></font>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/5859-c.html b/layout/html/tests/block/bugs/5859-c.html
deleted file mode 100644
index 605d9147fe67..000000000000
--- a/layout/html/tests/block/bugs/5859-c.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head><base href="http://www.browsertune.com/bt98/"></head>
-<body>
-
-<div style="float: left; border: medium solid purple; width: 10em;">
-Floating Div, floating left.
-</div>
-
-<font face="arial, geneva, helvetica">
-
-<div style="border: medium solid green; margin-top: 0;">Division in normal flow</div>
-
-<font face="arial, geneva, helvetica, sans, swiss"></font>
-</font>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/5859-d.html b/layout/html/tests/block/bugs/5859-d.html
deleted file mode 100644
index d0249ecea44a..000000000000
--- a/layout/html/tests/block/bugs/5859-d.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><base href="http://www.browsertune.com/bt98/"></head>
-<body>
-
-<div style="float: left; border: medium solid purple; width: 10em;">
-Floating Div, floating left.
-</div>
-
-<div style="border: medium solid green; margin-top: 0;">Division in normal flow</div>
-
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/58652.html b/layout/html/tests/block/bugs/58652.html
deleted file mode 100644
index 45f76e07c764..000000000000
--- a/layout/html/tests/block/bugs/58652.html
+++ /dev/null
@@ -1,1120 +0,0 @@
-<HTML>
-
-<HEAD>
-
-<TITLE>Top Menu</TITLE>
-
-
-
-
-
-<style>
-
-a, a:visited {text-decoration: none;}
-
-a:hover, a:active {text-decoration: underline; color:yellow}
-
-
-
-.date {font-family: Arial, verdana, sans-serif; font-size: 10pt; color: white; text-decoration: none; font-weight : bold;}
-
-
-
-.dchoice {position:relative; left:0; top:0; width:auto; visibility:visible; text-transform: capitalize;}
-
-.choice  {position:absolute; left:0; top:0; width:auto; visibility:hidden; text-transform: capitalize;}
-
-.menubar {position:absolute; left:0; top:0; width:auto; visibility:hidden; text-transform: capitalize;}
-
-
-
-</style>
-
-<script>
-
-
-function openWindow() {
-  popupWin = window.open('/help2/help_index.html', 'remote', 'width=600,height=400')
-}
-
-function goHtml(x){
-
-parent.INFO.location="/out/"+x+".html";
-
-}
-
-
-function goAsp(x){
-//alert(parent.NAV.document.acctForm.fsiid.value)
-parent.INFO.location=x+"?UI="+parent.NAV.document.acctForm.fsiid.value;
-
-}
-
-
-function getHash(){
-var hash=location.hash;
-//alert(hash.substring(1,hash.length));
-return hash.substring(1,hash.length);
-}
-
-function goHelp(){
-
-if (document.topMenuForm.current.value.substring(1,6)=="level"){
-parent.NAV.popWin("/tsnhelp/Q_Reilly.htm",640,480);
-}
-else popHelp();
-
-
-}
-
-
-function popHelp(ch){
-if(window.helpWin && !window.helpWin.closed){
-helpWin.focus();
-//helpWin.replace(url);
-}
-
-else
-
-{
-helpWin = window.open('/help2/help_index.html','helpWin','toolbar=yes,location=no,directories=yes,menubar=yes,scrollbars=yes,resizable=yes,width=600,height=470')
-}
-
-}
-
-
-
-
-
-function showMenu(x){
-if(document.topMenuForm.current.value!=""){
-hide(document.topMenuForm.current.value);
-}
-
-show(x);
-document.topMenuForm.current.value=x;
-}
-
-function writeDate(){
-var mA = new Array('January','February',
-'March','April','May','June','July','August','September','October','November','December');
-
-var mD = new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-var date= new Date();
-
-document.write(mD[date.getDay()]+", "+mA[date.getMonth()]+" "+date.getDate());
-
-}
-
-
-var level=3;
-
-function getCookieVal (offset){
-var endstr = document.cookie.indexOf (";", offset);
-if (endstr == -1)
-endstr =document.cookie.length;
-return unescape(document.cookie.substring(offset, endstr));
-}
-
-
-
-function GetCookie (name) {
-var arg = name + "=";
-var alen = arg.length;
-var clen = document.cookie.length;
-var i = 0;
-while (i < clen) {
-var j = i + alen;
-if (document.cookie.substring(i, j) == arg)
-return getCookieVal (j);
-i = document.cookie.indexOf(" ", i) + 1;
-if (i == 0) break; 
-}
-return null;
-}
-
-
-
-
-function levelWrite (text, x) {
-if(level>(x-1)){
-document.write(text);
-}
-}
-
-
-function show(id) {
-document.getElementById(id).style.visibility = "visible"
-}
-
-
-function hide(id) {     
-document.getElementById(id).style.visibility = "hidden"
-}
-
-
-
-function ppii(x){
-parent.INFO.location=x;
-}
-
-
-
-
-
-
-function showResLevel(){
-showMenu(rlevel);
-}
-
-
-
-
-function ppiiEdu(x){
-parent.INFO.location="/education/"+x;
-}
-
-
-</script>
-<script>
-
-
-
-var FSIUSER=GetCookie("FSIUSER");
-var fsiuserArray = FSIUSER.split(',');
-var clevel=fsiuserArray[6];
-if(clevel!=''){
-var level=clevel
-};
-
-
-
-var rlevel= "rlevel"+level;
-var mlevel= "mlevel"+level;
-
-</script>
-
-
-</HEAD>
-
-
-
-
-
-<BODY text=white link=white vlink=white marginwidth=0 marginheight=0 leftmargin=0 topmargin=0 onLoad="showMenu('homemenu');" bgcolor="#ffffff">
-
-
-
-
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td><a href="javascript:showMenu('homemenu'); parent.NAV.goHome('home'); "><img src="ant.jpg" width="396" height="42" alt="" border="0"></a></td>
-
-<td width="100%">&nbsp;</td>
-
-<td><a href="/search/search.html" target=INFO><img src="ant.jpg" width="61" height="24" alt="" border="0"></a></td>
-
-<td width="60"><a href="javascript:goHelp();"><img src="ant.jpg" width="50" height="24" alt="" border="0"></a></td>
-
-<td width="79"><a href="/static/sitemap.html" target=INFO><img src="ant.jpg" width="69" height="24" alt="" border="0"></a></td>
-
-<td width="91"><a href="/static/new_contact.html" target="INFO"><img src="ant.jpg" width="81" height="24" alt="" border="0"></a></td>
-
-<td width="75"><a href="javascript:parent.NAV.gotoOptions('logout');" target="_top"><img src="ant.jpg" width="65" height="24" alt="" border="0"></a></td>
-
-<td width="5">&nbsp;</td>
-
-</tr>
-
-
-
-</table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="menubox" class="dchoice">
-
-
-
-<div id="homemenu" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom">
-
-<td align=left><img src="ant.jpg" width="460" height="22" border="0" usemap="#taboff"></td></tr>
-
-</table>
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td align="right"><font color="#2B4583">Members Home</font></td></tr>
-
-</table>
-
-
-
-</div>
-
-
-
-
-
-
-
-
-
-<div id="mlevel5" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom"><td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#marketsmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr valign="top" bgcolor="#2B4583">
-
-<td>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B><a href="javascript:goAsp('http://research2.quickandreilly.com/4/markets/market_state.asp');" >Commentaries</a> | 
-
-<a href="javascript:goAsp('http://research2.quickandreilly.com/5/markets/featured_stocks.asp');">Stock & Funds</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly5/market_statistics.html?Exchange=NYSE&template=msnyse.htm" target="INFO">US Markets</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly5/market_statistics.html?Exchange=CBOT&template=mscbot.htm" target="INFO">Futures</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly5/market_statistics.html?Exchange=TORONTO&template=mstoron.htm" target="INFO">Foreign Markets</a> |
-
-<a href="http://www.briefing.com/qronline/index.htm" target="INFO">Live Market Analysis</a>
-</b></font></td></tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-<div id="mlevel4" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom"><td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#marketsmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr valign="top" bgcolor="#2B4583">
-
-<td>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B><a href="javascript:goAsp('http://research2.quickandreilly.com/4/markets/market_state.asp');">Commentaries</a> | 
-
-<a href="javascript:goAsp('http://research2.quickandreilly.com/4/markets/featured_stocks.asp');">Stock & Funds</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly4/market_statistics.html?Exchange=NYSE&template=msnyse.htm" target="INFO">US Markets</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly4/market_statistics.html?Exchange=CBOT&template=mscbot.htm" target="INFO">Futures</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly4/market_statistics.html?Exchange=TORONTO&template=mstoron.htm" target="INFO">Foreign Markets</a> |
-<a href="http://www.briefing.com/qronline/index.htm" target="INFO">Live Market Analysis</a>
-</b></font></td></tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-<div id="mlevel3" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom"><td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#marketsmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr valign="top" bgcolor="#2B4583">
-
-<td>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B><a href="javascript:goAsp('http://research2.quickandreilly.com/3/markets/market_state.asp');">Commentaries</a> | 
-
-<a href="javascript:goAsp('http://research2.quickandreilly.com/3/markets/featured_stocks.asp');">Stock & Funds</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly3/market_statistics.html?Exchange=NYSE&template=msnyse.htm" target="INFO">US Markets</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly3/market_statistics.html?Exchange=CBOT&template=mscbot.htm" target="INFO">Futures</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly3/market_statistics.html?Exchange=TORONTO&template=mstoron.htm" target="INFO">Foreign Markets</a> |
-
-<a href="http://www.briefing.com/qronline/index.htm" target="INFO">Live Market Analysis</a>
-</b></font></td></tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="mlevel2" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom"><td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#marketsmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr valign="top" bgcolor="#2B4583">
-
-<td>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B><a href="javascript:goAsp('http://research2.quickandreilly.com/2/markets/market_state.asp');">Commentaries</a> | 
-
-<a href="javascript:goAsp('http://research2.quickandreilly.com/2/markets/featured_stocks.asp');">Stock & Funds</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly2/market_statistics.html?Exchange=NYSE&template=msnyse.htm" target="INFO">US Markets</a> |<!-- | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly2/market_statistics.html?Exchange=CBOT&template=mscbot.htm" target="INFO">Futures</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly2/market_statistics.html?Exchange=TORONTO&template=mstoron.htm" target="INFO">Foreign Markets</a> -->
-<a href="http://www.briefing.com/qronline/index.htm" target="INFO">Live Market Analysis</a>
-</b></font></td></tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="educationdiv" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#educationmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td nowrap>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="javascript:ppiiEdu('inertia.htm');">Investing 101</a> | 
-
-<a href="javascript:ppiiEdu('mortgagerefin.htm');">Debt Management</a> | 
-
-<a href="javascript:ppiiEdu('amatterofrisk.htm');">Short-Term Investing</a> | 
-
-<a href="javascript:ppiiEdu('smartmoney.htm');">Strategic Investments</a> | 
-
-<a href="javascript:ppiiEdu('mortgage.htm');">Calculators</a>
-
-</b></font></td>
-
-</tr></table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="rlevel2" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#qnrmap"></td></tr>
-
-</table>
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-
-
-<td valign="top" bgcolor="#2B4583">&nbsp;&nbsp;&nbsp;
-
-<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="javascript:parent.NAV.goTelescan('quotes',level)">Quotes & Charts</a> | 
-
-<!-- <a href="javascript:parent.NAV.goTelescan('charts',level)">Charts</a> |  -->
-
-<a href="javascript:parent.NAV.goTelescan('news',level)">News</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('portfolio',level)">Portfolio Tracker</a> | 
-
-<!-- <a href="javascript:parent.NAV.goTelescan('reports',level)">Reports</a> |  -->
-
-<a href="javascript:goAsp('http://research2.quickandreilly.com/2/quotes/quick_search.asp');">Prosearch</a>
-
-</B></font></td>
-
-</tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-<div id="rlevel3" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#qnrmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td valign="top" bgcolor="#2B4583">&nbsp;&nbsp;&nbsp;
-
-<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="javascript:parent.NAV.goTelescan('quotes',level)">Quotes & Charts</a> | 
-
-<!-- <a href="javascript:parent.NAV.goTelescan('charts',level)">Charts</a> | --> 
-
-<a href="javascript:parent.NAV.goTelescan('news',level)">News</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('portfolio',level)">Portfolio Tracker</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('reports',level)">Reports</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('prosearch',level)">Prosearch</a>
-
-</b></font></td>
-
-</tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-<div id="rlevel4" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#qnrmap"></td></tr>
-
-</table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td valign="top" bgcolor="#2B4583">&nbsp;&nbsp;&nbsp;
-
-<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="javascript:parent.NAV.goTelescan('quotes',level)">Quotes & Charts</a> |
-
-<a href="javascript:parent.NAV.goTelescan('news',level)">News</a> | 
-
-
-
-<!-- <a href="javascript:parent.NAV.goTelescan('charts',level)">Charts</a> |  -->
-
- 
-
-<a href="javascript:parent.NAV.goTelescan('reports',level)">Reports</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('portfolio',level)">Portfolio Tracker</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly4/Sector.html" target="INFO">Industry Groups</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly4/Industry_Group_Analysis.html?UI=&Button=ANALYST&template=stindrat.htm" target="INFO">Stocks In Group</a> |
-
-<a href="javascript:parent.NAV.goTelescan('prosearch',level)">Pro Search</a>
-
-</B></FONT></td>
-
-</tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="rlevel5" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#qnrmap"></td></tr>
-
-</table>
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td valign="top">&nbsp;&nbsp;&nbsp;
-
-<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="javascript:parent.NAV.goTelescan('quotes',level)">Quotes & Charts</a> |
-<A href="javascript:parent.NAV.digitradeStreamer();">
-
-<script>
-
-if(level>4){
-
-document.write("Streaming Quotes | ");
-
-}
-
-</script></a>
-
-<a href="javascript:parent.NAV.goTelescan('news',level)">News</a> | 
-
-
-
-<!-- <a href="javascript:parent.NAV.goTelescan('charts',level)">Charts</a> |  -->
-
- 
-
-<a href="javascript:parent.NAV.goTelescan('reports',level)">Reports</a> | 
-
-<a href="javascript:parent.NAV.goTelescan('portfolio',level)">Portfolio Tracker</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly5/Sector.html" target="INFO">Industry Groups</a> | 
-
-<a href="http://research.quickandreilly.com/QuickandReilly5/Industry_Group_Analysis.html?UI=&Button=ANALYST&template=stindrat.htm" target="INFO">Stocks In Group</a> |
-
-<a href="javascript:parent.NAV.goTelescan('prosearch',level)">Pro Search</a>
-
-</B></font></td>
-
-</tr>
-
-</table>
-
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="trade" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-
-
-<tr valign="bottom">
-
-<td align="left"><img src="ant.jpg" width="460" height="22" border="0" usemap="#trademap"></td></tr>
-
-</table>
-
-
-
-
-
-
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-<tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-
-
-<td nowrap>&nbsp;&nbsp;&nbsp;
-
-<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B>
-
-<a href="/static/basket.html" target="INFO">
-
-<script>
-
-if(level>4){
-
-document.write("Express Trade | ");
-
-}
-
-</script></a>
-
-<a href="javascript:parent.NAV.gotoOptions('stocks');">Stocks</a> | 
- <!-- 
- -->
-
-<a href="javascript:parent.NAV.gotoOptions('options');">Options</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('funds');">Mutual Funds</a> |
-<!-- A href="javascript:parent.NAV.gotoOptions('mutualfunds');">Mutual Funds</a> |  -->
-
-<a href="javascript:parent.NAV.gotoOptions('ipos');">IPOs</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('bonds');">Bonds</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('orderStatus');">Order Status</a> | 
-<!--  <A href="javascript:parent.NAV.gotoOptions('mfOrderStatus');">Mutual Fund Order Status</a> | --> 
-<a href="javascript:parent.NAV.gotoOptions('executions');">Executions</a>
-
-</b></font></td>
-
-</tr>
-
-</table>
-
-</div>
- parent.NAV.gotoOptions('funds')
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div id="accountinfodiv" class="menubar">
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0">
-
-
-
-<tr valign="bottom">
-
-<td align="left">
-
-<img src="ant.jpg" width="460" height="22" border="0" usemap="#portfoliomap"></td></tr>
-
-</table>
-
-
-
-<table border="0" width="100%" cellpadding="0" cellspacing="0"><tr><td valign="top" width="1" bgcolor="#2B4583"><img src="ant.jpg" width=1 height=1 alt="" border="0"></td></tr></table>
-
-
-
-
-
-<table border="0" width="100%" cellpadding="2" cellspacing="0">
-
-<tr bgcolor="#2B4583">
-
-<td>&nbsp;&nbsp;&nbsp;<FONT face="Arial, Helvetica, Verdana, sans-serif" size="2"><B><a href="javascript:parent.NAV.gotoOptions('balance');">Balances</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('position');">Positions</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('accountHistory');">History</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('accountProfile');">Account Profile</a> |
-
-<a href="javascript:parent.NAV.AddAccountsAndHash('/cgi-bin/confirm/ConfirmSite?');">Web Confirms</a> | 
-
-<a href="javascript:parent.NAV.gotoOptions('openAcct');">New Account Center</a>
-
-</B></FONT></td></tr></table>
-
-
-
-</div>
-
-
-
-
-
-
-
-
-
-</div>
-
-
-
-<map name="taboff">
-
-<area alt="Trading" coords="1,1,68,23" href="javascript:showMenu('trade');">
-
-<area alt="Account Info" coords="69,0,168,23" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes & Research" coords="169,0,306,23" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="307,1,374,24" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="377,0,454,23" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-<map name="trademap">
-
-<area alt="Trading" coords="0,0,69,21" href="javascript:showMenu('trade');">
-
-<area alt="Account info" coords="70,0,168,24" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes & Research" coords="168,0,306,26" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="306,0,375,22" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="375,0,454,29" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-<map name="portfoliomap">
-
-<area alt="Trading" coords="0,1,65,23" href="javascript:showMenu('trade');">
-
-<area alt="Account Info" coords="65,0,168,24" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes and Research" coords="168,0,307,23" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="307,0,375,22" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="375,0,457,27" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-<map name="qnrmap">
-
-<area alt="Trading" coords="0,0,66,23" href="javascript:showMenu('trade');">
-
-<area alt="Account Info" coords="66,0,164,23" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes and Research" coords="164,0,308,25" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="307,1,374,28" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="374,0,456,24" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-
-
-<map name="marketsmap">
-
-<area alt="Trading" coords="0,0,65,23" href="javascript:showMenu('trade');">
-
-<area alt="Account Info" coords="65,0,164,24" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes and Research" coords="164,0,305,24" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="305,0,377,23" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="377,0,455,24" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-
-
-<map name="educationmap">
-
-<area alt="Trading" coords="0,0,65,22" href="javascript:showMenu('trade');">
-
-<area alt="Account Info" coords="65,0,164,24" href="javascript:showMenu('accountinfodiv');">
-
-<area alt="Quotes and Research" coords="164,0,306,23" href="javascript:showMenu(rlevel); parent.NAV.goResearch('research');">
-
-<area alt="Markets" coords="306,0,376,25" href="javascript:showMenu(mlevel); parent.NAV.goResearch('markets');">
-
-<area alt="Education" coords="376,1,457,22" href="javascript:showMenu('educationdiv'); parent.NAV.goEducation('');">
-
-</map>
-
-
-
-
-
-
-
-
-<form name="topMenuForm">
-<input type="hidden" name="current" value="">
-<input type="hidden" name="loginStatus" value="in">
-<input name="level" type="hidden" value="3">
-</form><br><br><br>
-
-<font color=black>
-
-</font>
-
-</BODY>
-
-
-
-
-
-
-
-</HTML>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/block/bugs/58652.js b/layout/html/tests/block/bugs/58652.js
deleted file mode 100644
index 41ee6237f94b..000000000000
--- a/layout/html/tests/block/bugs/58652.js
+++ /dev/null
@@ -1,147 +0,0 @@
-
-function openWindow() {
-  popupWin = window.open('/help2/help_index.html', 'remote', 'width=600,height=400')
-}
-
-function goHtml(x){
-
-parent.INFO.location="/out/"+x+".html";
-
-}
-
-
-function goAsp(x){
-//alert(parent.NAV.document.acctForm.fsiid.value)
-parent.INFO.location=x+"?UI="+parent.NAV.document.acctForm.fsiid.value;
-
-}
-
-
-function getHash(){
-var hash=location.hash;
-//alert(hash.substring(1,hash.length));
-return hash.substring(1,hash.length);
-}
-
-function goHelp(){
-
-if (document.topMenuForm.current.value.substring(1,6)=="level"){
-parent.NAV.popWin("/tsnhelp/Q_Reilly.htm",640,480);
-}
-else popHelp();
-
-
-}
-
-
-function popHelp(ch){
-if(window.helpWin && !window.helpWin.closed){
-helpWin.focus();
-//helpWin.replace(url);
-}
-
-else
-
-{
-helpWin = window.open('/help2/help_index.html','helpWin','toolbar=yes,location=no,directories=yes,menubar=yes,scrollbars=yes,resizable=yes,width=600,height=470')
-}
-
-}
-
-
-
-
-
-function showMenu(x){
-if(document.topMenuForm.current.value!=""){
-hide(document.topMenuForm.current.value);
-}
-
-show(x);
-document.topMenuForm.current.value=x;
-}
-
-function writeDate(){
-var mA = new Array('January','February',
-'March','April','May','June','July','August','September','October','November','December');
-
-var mD = new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
-var date= new Date();
-
-document.write(mD[date.getDay()]+", "+mA[date.getMonth()]+" "+date.getDate());
-
-}
-
-
-var level=3;
-
-function getCookieVal (offset){
-var endstr = document.cookie.indexOf (";", offset);
-if (endstr == -1)
-endstr =document.cookie.length;
-return decodeURIComponent(document.cookie.substring(offset, endstr));
-}
-
-
-
-function GetCookie (name) {
-var arg = name + "=";
-var alen = arg.length;
-var clen = document.cookie.length;
-var i = 0;
-while (i < clen) {
-var j = i + alen;
-if (document.cookie.substring(i, j) == arg)
-return getCookieVal (j);
-i = document.cookie.indexOf(" ", i) + 1;
-if (i == 0) break; 
-}
-return null;
-}
-
-
-
-
-function levelWrite (text, x) {
-if(level>(x-1)){
-document.write(text);
-}
-}
-
-
-function show(id) {
-ns4 = (document.layers)? true:false;
-ie4 = (document.all)? true:false;
-if (ns4) document.layers['menubox'].layers[id].visibility = "show"
-else if (ie4) document.all[id].style.visibility = "visible"
-}
-
-
-function hide(id) {     
-ns4 = (document.layers)? true:false;
-ie4 = (document.all)? true:false;
-if (ns4) document.layers['menubox'].layers[id].visibility = "hide"
-else if (ie4) document.all[id].style.visibility = "hidden"
-}
-
-
-
-function ppii(x){
-parent.INFO.location=x;
-}
-
-
-
-
-
-
-function showResLevel(){
-showMenu(rlevel);
-}
-
-
-
-
-function ppiiEdu(x){
-parent.INFO.location="/education/"+x;
-}
diff --git a/layout/html/tests/block/bugs/58674-a.html b/layout/html/tests/block/bugs/58674-a.html
deleted file mode 100644
index fb97b7e950b2..000000000000
--- a/layout/html/tests/block/bugs/58674-a.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
- <head>
-  <title>Stress Test for Bug 58674</title>
- </head>
- <body>
-  <span>
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   <div>
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-    <script language="JavaScript">
-     document.write("blah blah blah");
-    </script>
-    block block block
-    block block block
-    block block block
-    block block block
-   </div>
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-  </span>
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/58674-b.html b/layout/html/tests/block/bugs/58674-b.html
deleted file mode 100644
index 58ef235c9d1c..000000000000
--- a/layout/html/tests/block/bugs/58674-b.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
- <head>
-  <title>Stress Test for Bug 58674</title>
- </head>
- <body>
-  <span>
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   inline inline inline
-   <div>
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-    block block block
-   </div>
-   inline inline inline
-   inline inline inline
-   inline inline inline
-    <script language="JavaScript">
-     document.write("blah blah blah");
-    </script>
-   inline inline inline
-   inline inline inline
-   inline inline inline
-  </span>
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/59200-a.html b/layout/html/tests/block/bugs/59200-a.html
deleted file mode 100644
index 0dd1bf6e1105..000000000000
--- a/layout/html/tests/block/bugs/59200-a.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>Bug 59200</title>
-<style type="text/css">
-   div {
-    width: auto;
-    border: solid black;
-    float: left;
-   }
-</style>
-</head><body><div>This is the first float. This is the first float.</div><div>This is the buggy float. It_should_be_as_wide_as_its_contents.</div></body></html>
diff --git a/layout/html/tests/block/bugs/59200-c.html b/layout/html/tests/block/bugs/59200-c.html
deleted file mode 100644
index 0d937312d6f4..000000000000
--- a/layout/html/tests/block/bugs/59200-c.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><style>
-div {
-  border: 1px solid;
-  float: left;
-}
-</style></head><body><div>XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX</div><div>YYYYYYYYYYYYYYYYYYYYYYYYY</div></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/59200-d.html b/layout/html/tests/block/bugs/59200-d.html
deleted file mode 100644
index 983263f5c53e..000000000000
--- a/layout/html/tests/block/bugs/59200-d.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><style>
-div {
-  border: 1px solid;
-  float: left;
-}
-</style></head><body><div>1111111111111111111111111111111111111111</div><div>2222 2222 2222 2222 2222 2222</div><div>33333333333333333333333333333333</div></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/59200-e.html b/layout/html/tests/block/bugs/59200-e.html
deleted file mode 100644
index 43248b4bb3a8..000000000000
--- a/layout/html/tests/block/bugs/59200-e.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><style>
-div {
-  border: 1px solid;
-  float: left;
-}
-</style></head><body><div>111111111111111111111111111111111111111111</div><div>22222222222222222222222222222222222222222</div><div>3333 3333 3333 3333 3333 3333</div></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/59790.html b/layout/html/tests/block/bugs/59790.html
deleted file mode 100644
index 60480e9b9ea7..000000000000
--- a/layout/html/tests/block/bugs/59790.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html><head>
-<BASE HREF="http://www.gateway.com/consumer/connectedhome/kepler/tour.shtml#">
-</head>
-<body bgcolor="#FFFFFF"leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" TEXT="#000000" LINK="#DD0000" VLINK="#DD0000" ALINK="#DD0000" onLoad="MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_10_0.jpg','/consumer/connectedhome/images/kepler_product_tour_voice.jpg','#971141798066');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_16_0.jpg','/consumer/connectedhome/images/kepler_product_tour_lspeak.jpg','#971142059866');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_20_0.jpg','/consumer/connectedhome/images/kepler_product_tour_rspeak.jpg','#971141906333');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_23_0.jpg','/consumer/connectedhome/images/kepler_product_tour_volume.jpg','#971142138133');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_27_0.jpg','/consumer/connectedhome/images/kepler_product_tour_scroll.jpg','#971142177050');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_31_0.jpg','/consumer/connectedhome/images/kepler_product_tour_contras.jpg','#971142226150');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_32_0.jpg','/consumer/connectedhome/images/kepler_product_tour_power.jpg','#971142297033');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_33_0.jpg','/consumer/connectedhome/images/kepler_product_tour_micro.jpg','#971142337666');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_46_0.jpg','/consumer/connectedhome/images/kepler_product_tour_wireles.jpg','#971142402250');MM_preloadImages('/consumer/connectedhome/images/kepler_product_tour_49_0.jpg','/consumer/connectedhome/images/kepler_product_tour_mouse.jpg','#971142443533')">
-<table width="500" border="3" cellspacing="0" cellpadding="0" align="center">
-  <tr>
-    <td height="323"> 
-      <table width="100%" border="2" cellspacing="0" cellpadding="0">
-        <tr>
-          <td height="253"> 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr align="center" valign="top"> 
-                <td width="100%" colspan="11" height="250">
-                  <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                    <tr> 
-                      <td width="65%" align="left" valign="top"> 
-                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                          <tr> 
-                            <td><img src="ant.jpg" width="57" height="35"><img src="/consumer/connectedhome/images/kepler_product_tour_08.jpg" width="53" height="35"><img src="/consumer/connectedhome/images/kepler_product_tour_09.jpg" width="39" height="35"><a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('document.voice','document.voice','/consumer/connectedhome/images/kepler_product_tour_10_0.jpg','document.blank','document.blank','/consumer/connectedhome/images/kepler_product_tour_voice.jpg','#971141798066')"><img src="/consumer/connectedhome/images/kepler_product_tour_10.jpg" width="39" height="35" name="voice" border="0"></a><img src="/consumer/connectedhome/images/kepler_product_tour_11.jpg" width="37" height="35"><img src="/consumer/connectedhome/images/kepler_product_tour_12.jpg" width="55" height="35"><img src="ant.jpg" border="2" width="48" height="35"></td>
-                          </tr>
-                        </table>
-                      </td>
-                      <td width="35%" align="left" valign="top"><img src="ant.jpg" width="172" height="226" name="blank"></td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/block/bugs/59834.html b/layout/html/tests/block/bugs/59834.html
deleted file mode 100644
index 887ff715ff40..000000000000
--- a/layout/html/tests/block/bugs/59834.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<HTML>
-<HEAD> <TITLE> Programming</TITLE>
-</HEAD>
-<BODY text=#FFFFFF link=#00FF00 vlink=#FFFF00>
-<FONT SIZE=+3>Programming And Programming Languages<FONT SIZE=3>
-
-<UL>
-<li><a href="#proglang"> Some Programming Languages</a></li>
-<UL>
-<li><a href="#cplus">C/C++</a></li>
-<li><a href="#scheme">Scheme</a></li>
-<li><a href="#pascal">Pascal</a></li>
-<li><a href="#assem">Assembly</a></li>
-<li><a href="#htmll">HTML</a></li>
-<li><a href="#oberon">Oberon</a></li>
-<li><a href="#smalltalk">Smalltalk</a></li>
-<li><a href="#perl">Perl</a></li>
-<li><a href="#eifel">Eifel</a></LI>
-<li><a href="#java">Java</a></LI>
-<li><a href="#general">General Resources</li></UL>
-<LI><a href="#plan">The Field of Programming Languages</a></LI>
-<li><a href="#case">CASE
-Tools,Debugging tools, Programming Environments</a></li>
-<UL>
-<li>EMACS</li>
-</UL>
-<LI><a href="#concept">Concepts,
-Paradigms, and Theory (Care to suggest a better way to divide
-these?) </a></li>
-<UL>
-<LI> Parallel Programming </LI>
-<LI> Object Oriented Programming </LI>
-</UL>
-</UL>
-<br><img src="ant.jpg"><br>
-<a name="proglang"></a>
-<a name="cplus">
-<FONT SIZE=+2>C/C++<FONT SIZE=3>
-</a><UL>
-<LI>General Pages/Topics</LI>
- <UL>
-  <LI><a href="ftp://ftp.cs.indiana.edu/pub/techreports/TR422a.ps.Z">C++
-  Stream I/O for Parallel Computing</LI>
-<LI><a href="http://info.desy.de/pub/www/projects/C++/Projects.html">C++ Libraries</a></LI>
-<LI><a href="http://sweetbay.will.uiuc.edu/cgi++/">cgi++ Class Library</a></LI>
-<LI><a href="http://www.fiu.edu/~eurzai01/cpp.html">C/C++ Programming Page</a></LI>
-<LI><a href="http://www.iftech.com/classes/c/c0.htm">Introduction to C Programming</a></LI>
-<LI><a href="http://vinny.csd.mu.edu/learn.html">Learning C/C++</a></LI>
-<LI><a href="http://www.gl.umbc.edu/~pjacks1/C/">Pete's C Page</a></LI>
-<LI><a href="http://uu-gna.mit.edu:8001/uu-gna/text/cc/">OOP in C++</a></LI>
-<LI><a href="http://www.lysator.liu.se/c/">Programming in ANSI C</a></LI>
- </UL>
-</UL><p><hr>
-<a name="scheme">
-<FONT SIZE=+2>Scheme<FONT SIZE=3></a>
-<UL>
-<li>Interpreters/Compilers</li>
-<li>Source Code</li>
-</uL>
-<FONT SIZE=+1>Scheme Indexes &amp; Sites<FONT SIZE=3>
-<UL>
-<li>
-<a href="http://www.cs.indiana.edu/scheme-repository/home.html">
-International Scheme Repository
-</a></li>
-<LI>
-<a href="http://www.ai.mit.edu/projects/su/su.html">
-The Scheme Underground</a></li>
-<LI><a href="http://www.cs.indiana.edu/classes/c311/c511home.html">c511
-home page: One of IU's best classes</a></LI>
-</UL><p><hr>
-<a name="pascal">
-<FONT SIZE=+2>Pascal<FONT SIZE=3></a>
-<UL>
-<li>Compilers</li>
-<li>Source Code</li>
-
-</UL>
-<FONT SIZE=+1>Other Resources<FONT SIZE=3><br>
-<UL>
-<LI><a href="http://www.cit.ac.nz/smac/pascal/default.htm">Learning
-Pascal</a></li>
-<LI><a href="http://www.cs.stir.ac.uk/~jsd/pascal_page.html">The Pascal
-Page</a></li>
-</UL><p><hr>
-<a name="assem">
-<FONT SIZE=+2>Assemblers<FONT SIZE=3></a>
-<UL>
-<LI>Assemblers</LI>
-<LI>Source Code</li>
-</UL><p><hr>
-<a name="htmll"><FONT SIZE=+2>HTML<FONT SIZE=3></a><br>
-<UL>
-<LI>Authoring Programs</li>
-<UL>
-<LI><a 
-href="http://www.curtin.edu.au/curtin/dept/cc/packages/htmledit/home.html">Hyper
-Edit</a></LI>
-</UL>
-<LI>Form-Based Page Construction Tools</LI>
-<UL>
-<LI><a href="http://www.cs.bin.ac.il:8080/~balder/createPage/">Automated
-Creation</a></LI>
-<LI><a href="http://www.lafayette.edu/acs/hayi/html-form1.html">HAYI
-Homepage Generator</a></LI>
-</UL>
-<li>HTML Guide Pages</li>
-<UL>
-<LI><a href="http://www.cs.bin.ac.il:8080/~balder/createPage/htut.html">
-</a></LI>
-<Li><a href="http://www.cs.bin.ac.il:8080/~balder/createPage/HTML_quick.html">
-Quick Reference Guide</a></LI>
-<li><a 
-href="http://www.cs.bin.ac.il:8080/~balder/createPage/basicCommands.html">HTML
-Basic Commands
-</a></LI>
-<li><a href="http://www.cs.bin.ac.il:8080/~balder/createPage/html-primer.html">
-HTML Primer</a></LI>
-</UL><p><hr>
-<a name="oberon">
-<FONT SIZE=+2>Oberon<FONT SIZE=3></a><br>
-<FONT SIZE=+1>Sites and Indices<FONT SIZE=3>
-<UL>
-<LI><a href="http://ics.inf.ethz.ch/Oberon.html"> Oberon </a></LI>
-<LI><a href="http://www.cis.ohio-state.edu/hypertext/faq/bngusenet/comp/lang/oberon/top.html">
-Oberon FAQ, from comp.lang.oberon</a></li>
-</UL><br>
-<FONT SIZE=+1>Newsgroups<FONT SIZE=3><br>
-<UL>
-<LI><a href="news:comp.lang.oberon">comp.lang.oberon</a></li>
-</UL><br><hr>
-<a name="eifel"><H4>Eifel</H4></a>
-<UL>
-<LI><a href="http://www.eiffel.com/">Eiffel</a></LI>
-</UL>
-<a name="java"><H4>Java</H4></a>
-<UL>
- <LI><a href="http://java.sun.com/">Java@Sun</A></LI>
-</UL>
-<FONT SIZE=+2>General Resources<FONT SIZE=3></a><br>
-<UL>
-<LI><a href="http://remarque.berkeley.edu/~muir/free-compilers/">Catalog
-of Free Compilers and Interpreters</a></LI>
-<LI><a href="http://www.albany.edu:1080/~mauro/docs/c1links.html">Links to
-Various Computer Programming Languages</a></LI>
-<LI><a href="http://www.yahoo.com/Computers/Languages/">Yahoo's page for
-Computer Languages</a></LI>
-<LI><a href="http://www.borland.com/">Borland Online</a></LI>
-</UL>
-<br><img src="ant.jpg"><br>
-<a name="plan">
-<FONT SIZE=+3>The Field of Programming Languages<FONT SIZE=3>
-</a><br><FONT SIZE=+1>Organizations and Universities<FONT SIZE=3>
-<br>
-<UL>
-<LI><a href="http://www.cs.indiana.edu/proglang/proglang.html">Indiana
- University Programming Languages Research</a></LI>
-<LI><a href="http://pauillac.inria.fr/SIGPLAN">ACM
-Sigplan</a></LI>
-</UL>
-<br><FONT SIZE=+1>Projects<FONT SIZE=3>
-<br><FONT SIZE=+1>Conventions and Conferences<FONT SIZE=3><br>
-<br><FONT SIZE=+1>Textbooks and other sources<FONT SIZE=3><br>
-<UL>
-<LI><a href="http://www.cs.indiana.edu/eip/eopl.html"><i>Essentials Of
-Programming Languages</i></a></li>
-</UL>
-
-<br><img src="ant.jpg"><br>
-<a name="case">
-<FONT SIZE=+3>CASE Tools, Debugging Tools, Programming Environments<FONT SIZE=3>
-</a><br>
-<UL>
-<LI></LI>
-<LI></LI>
-</UL>
-<br>
-
-<br><img src="ant.jpg"><br><a name="concept">
-<FONT SIZE=+3>Concepts, Paradigms, and Theory<FONT SIZE=3></a><br>
-<br><img src="ant.jpg"><br>
-If you have any good suggestions of sites which absolutely need to be here,
-<a href="mailto:ribowers@indiana.edu">tell</a> me.<br>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/block/bugs/6093.html b/layout/html/tests/block/bugs/6093.html
deleted file mode 100644
index 22ca838e37cf..000000000000
--- a/layout/html/tests/block/bugs/6093.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html> <head>
-<title> </title>
-</head>
-<body>
-<ol>
-  <h1>
-  <li>List Item 1.</li>
-	  </h1>
-	  <h1>
-  <li>list item 2.
-	  </h1>
-  </li>
-  <li><h1>list item 3</h1></li>
-</ol>
-</body> </html>
diff --git a/layout/html/tests/block/bugs/6097.html b/layout/html/tests/block/bugs/6097.html
deleted file mode 100644
index e4cfc4bad193..000000000000
--- a/layout/html/tests/block/bugs/6097.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<TABLE border STYLE="float: right">
- <tr><td>foo-foo-foo-foo-foo-foo-foo-foo-foo</td></tr>
-</TABLE>
-<TABLE border STYLE="background: white">
- <tr><td>bar-bar-bar-bar-bar-bar-bar-bar-bar</td></tr>
-</TABLE>
diff --git a/layout/html/tests/block/bugs/60992.html b/layout/html/tests/block/bugs/60992.html
deleted file mode 100644
index 2353616f3380..000000000000
--- a/layout/html/tests/block/bugs/60992.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
- <title>Mozilla Test Case - Bug 60992</title>
-</head>
-<body>
-a div with white-space: nowrap
-<div style="white-space: nowrap; width:400px; border: thin solid">
-<hr>
-</div
-<br>
-a div without white-space: nowrap
-<div style="width:400px; border: thin solid">
-<hr>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/6126.html b/layout/html/tests/block/bugs/6126.html
deleted file mode 100644
index 33c6884a9c83..000000000000
--- a/layout/html/tests/block/bugs/6126.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><body>
-<OL>
- <font>
-
-  <font><LI><a href="">Topic Line</a></font>
-   <UL>detail line...</UL>
-
-  <font><LI><a href="">Topic Line</a></font>
-   <UL>detail line...</UL>
-
-  <font><LI><a href="">Topic Line</a></font><font color=#ff0000> (recent)</font>
-   <UL>detail line...</UL>
-
- </font>
-</OL>
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/6155.html b/layout/html/tests/block/bugs/6155.html
deleted file mode 100644
index 4cd971fbc499..000000000000
--- a/layout/html/tests/block/bugs/6155.html
+++ /dev/null
@@ -1,29 +0,0 @@
-  <html><body>
-
-   <table align="center" border=1 width="760">
-
-    <tr><td width=50%>
-left half ... left half ... left half ... 
-left half ... left half ... left half ... 
-left half ... left half ... left half ... 
-left half ... left half ... left half ... 
-left half ... left half ... left half ... 
-left half ... left half ... left half ... 
-    </td><td width=50%>
-right half ... right half ... right half ... 
-right half ... right half ... right half ... 
-right half ... right half ... right half ... 
-right half ... right half ... right half ... 
-right half ... right half ... right half ... 
-right half ... right half ... right half ... 
-    </td></tr>
-   </table>
-
-<p>Shrink viewer.exe to <i><b>widths &lt;700px</b></i> to see that the table is being 
-centered on the viewport when there is not enough room. This should instead
-pin the left side of the table to the left margin of the viewport (or vice
-versa for 'dir=rtl' tables. [Of course, if you see the latter behaviour, then 
-this bug is fixed.] (tested 1999051308 win95)</P>
-
-  </body></html>
-
diff --git a/layout/html/tests/block/bugs/63785.html b/layout/html/tests/block/bugs/63785.html
deleted file mode 100644
index 741dd8880cdc..000000000000
--- a/layout/html/tests/block/bugs/63785.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>Bug 63785</title>
-</head>
-
-<body>
-<table>
-  <tr> 
-     <td> 
-      <div> 
-        <p>Paragraph one</p>
-        <p>Paragraph two (1em margin between the two paragraphs)</p>
-      </div>
-    </td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/67690.html b/layout/html/tests/block/bugs/67690.html
deleted file mode 100644
index c057b01f7c02..000000000000
--- a/layout/html/tests/block/bugs/67690.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<style>
-#check {
-  border: 2px inset ThreeDFace;
-  background-color: -moz-field;
-  color: WindowText;
-  width: 13px;
-  height: 13px;
-  cursor: default;
-  vertical-align: bottom;
-  -moz-binding: none;
-  margin: 3px 4px 3px 4px;
-  -moz-box-sizing: border-box;
-}
-
-</style>
-
-<body>
-  <div id=check></div>
-  <div id=check style="position: absolute; top: 30px; left: 10px;"></div>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/69960.html b/layout/html/tests/block/bugs/69960.html
deleted file mode 100644
index 3063bd716bae..000000000000
--- a/layout/html/tests/block/bugs/69960.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-uk" lang="en-uk">
-
-<head>
-
-  <title>Float test page.</title>
-
-  <style type="text/css">
-  <!--
-  	hr {
-	  clear: both;
-	}
-    span.floatright {
-	  float: right;
-	  margin-left: 10px;
-	}
-    span.floatright2 {
-	  float: right;
-	}
-  -->
-  </style>
-
-</head>
-
-<body>
-
-  <p><span class="floatright">XXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
-  <span class="floatright">XXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span></p>
-
-  <hr />
-  
-  <p><span class="floatright2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span>
-  <span class="floatright2">XXXXXXXXXXXXXXXXXXXXXXXXXXXXX</span></p>
-
-</body>
-</html>
-                                                
diff --git a/layout/html/tests/block/bugs/7093.html b/layout/html/tests/block/bugs/7093.html
deleted file mode 100644
index 1003b6dcd853..000000000000
--- a/layout/html/tests/block/bugs/7093.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-	<title>Bug 7093 test</title>
-</head>
-<body>
-
-<div style="margin-bottom: 10px">paragraph</div>  <!-- p also works -->
-<table style="float: left"><tr><td>first table</td></tr></table>
-<table><tr><td>second table</td></tr></table>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/71594.html b/layout/html/tests/block/bugs/71594.html
deleted file mode 100644
index bfc03bb57ca8..000000000000
--- a/layout/html/tests/block/bugs/71594.html
+++ /dev/null
@@ -1 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 Transitional//en" "http://www.w3.org/TR/REC-html40/strict.dtd"><html><body><span style="position:relative;left:20px;top:30px;"><hr /><span style="position:relative;left:70px;top:25px;">test</span></span></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/7282.html b/layout/html/tests/block/bugs/7282.html
deleted file mode 100644
index f47797c81387..000000000000
--- a/layout/html/tests/block/bugs/7282.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>text_point-height</TITLE>
-</HEAD>
-<BODY>
-<P style="border-style: solid; height: 10pt">This paragraph block is 10pt high.</P>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/block/bugs/7352.html b/layout/html/tests/block/bugs/7352.html
deleted file mode 100644
index 4d9fec45e205..000000000000
--- a/layout/html/tests/block/bugs/7352.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0>
-	<table border=3 width=600>
-		<tr><td align=left>
-				<table border><tr><td>left</td></tr></table>
-		</td></tr>
-		<tr><td align=center>
-				<table border><tr><td>center</td></tr></table>
-		</td></tr>
-		<tr><td align=right>
-				<table border><tr><td>right</td></tr></table>
-		</td></tr>
-	</table>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/7806.html b/layout/html/tests/block/bugs/7806.html
deleted file mode 100644
index 317d474dbe34..000000000000
--- a/layout/html/tests/block/bugs/7806.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-	<title></title>
-</head>
-<body>
-
-<p>All six of these should be numbered, I think (I'm not sure):</p>
-
-<ol>
-<li style="color: green;">First</li>
-<li style="background: red"></li>
-<li style="color: navy">Third</li>
-<li style="border: medium solid red"></li>
-<li style="color: maroon">Fifth</li>
-<li style="border: medium solid red; height: 1em;"></li>
-
-</ol>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/7993.html b/layout/html/tests/block/bugs/7993.html
deleted file mode 100644
index 0dcccd645232..000000000000
--- a/layout/html/tests/block/bugs/7993.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body>
-<center>
-<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" 
-codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=3,0,0,0" 
-id="newface" width="75%" height="75%">
-</object>
-<br>
-</center>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/81118.html b/layout/html/tests/block/bugs/81118.html
deleted file mode 100644
index 93ab4da69ef8..000000000000
--- a/layout/html/tests/block/bugs/81118.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE>Bug 81118</TITLE></HEAD>
-<BODY>
-<TABLE BORDER="1"><TBODY><TR>
-<TD VALIGN="TOP"><SPAN>
-Here is some text that should be visible. Blah blah blah blah
-blah blah blah. Is there text immediately below it? If not,
-that's a bug!<BR><BR>
-This text should also be visible. If not, that's a bug! Blah blah
-blah blah blah.<BR><BR></SPAN></TD>
-<TD VALIGN="TOP">
-Here is some more text that just takes up space. Blah blah blah
-blah blah blah blah.
-</TD></TR></TBODY></TABLE></BODY></HTML>
diff --git a/layout/html/tests/block/bugs/81776.html b/layout/html/tests/block/bugs/81776.html
deleted file mode 100644
index 737eeafc694f..000000000000
--- a/layout/html/tests/block/bugs/81776.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body><table width="100%" border="1"><tr><td><hr></td></tr></table></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/82221.css b/layout/html/tests/block/bugs/82221.css
deleted file mode 100644
index 67b43e793417..000000000000
--- a/layout/html/tests/block/bugs/82221.css
+++ /dev/null
@@ -1 +0,0 @@
-/* This style sheet does nothing. */
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/82221.html b/layout/html/tests/block/bugs/82221.html
deleted file mode 100644
index 5d24d7a12b94..000000000000
--- a/layout/html/tests/block/bugs/82221.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<HTML>
-<BODY>
-<SCRIPT SRC="82221.js"></SCRIPT>
-You should only see this text once.
-<TABLE>
- <TR>
-  <TD>
-   <LINK REL="STYLESHEET" TYPE="text/css" HREF="82221.css">
-  </TD>
- </TR>
-</TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/82221.js b/layout/html/tests/block/bugs/82221.js
deleted file mode 100644
index eae3737f4ae0..000000000000
--- a/layout/html/tests/block/bugs/82221.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/* This script does nothing. */
-
diff --git a/layout/html/tests/block/bugs/8438.html b/layout/html/tests/block/bugs/8438.html
deleted file mode 100644
index 854b8d7a3564..000000000000
--- a/layout/html/tests/block/bugs/8438.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.5 [en] (X11; I; Linux 2.0.36 i686) [Netscape]">
-</head>
-<body>
-
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>Hello there, how are you doing?&nbsp;I'm doing fine. You don't
-say. No, I did say. Weren't you listening?&nbsp;Who goes there?
-<pre>This is formatted text which will not get changed by the indent level. See?</pre>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-
-<pre></pre>
-
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>
-<blockquote>&nbsp;</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-</blockquote>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/8466.html b/layout/html/tests/block/bugs/8466.html
deleted file mode 100644
index 4ea83bacf920..000000000000
--- a/layout/html/tests/block/bugs/8466.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<BODY>
-  <CENTER>
-    <IMG SRC="ant.jpg" HEIGHT=18 WIDTH=296><BR>
-    <IMG name="section" SRC="ant.jpg" HEIGHT=13 WIDTH=296><BR>
-    <IMG SRC="ant.jpg" HEIGHT=12 WIDTH=296><BR>
-  </CENTER>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/8683.html b/layout/html/tests/block/bugs/8683.html
deleted file mode 100644
index b1e325afb740..000000000000
--- a/layout/html/tests/block/bugs/8683.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><body>
-
-
-
-<A href="">
-
-  <IMG align=left height=64 hspace=5 src="ant.jpg" width=64>
-
-</A>
-
-
-
-<UL type=disc>
-
-  <LI>Some text</LI>
-
-</UL>
-
-
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/8749.html b/layout/html/tests/block/bugs/8749.html
deleted file mode 100644
index 18b28d1a7cee..000000000000
--- a/layout/html/tests/block/bugs/8749.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head>
-<title>Nested DL's
-</title>
-<body>
-
-<dl>
-<dd>
-PARENT DL
-</dd>
-     <dl>
-     <dd>
-     Child DL
-     </dd>
-     </dl>
-</dl>
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/87543.html b/layout/html/tests/block/bugs/87543.html
deleted file mode 100644
index 60e9cc5fe4b9..000000000000
--- a/layout/html/tests/block/bugs/87543.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML><HEAD>
-<TITLE>Bug 87543</TITLE>
-<style type="text/css">
-div {
-  padding-left: 40px;
-}
-</style>
-</HEAD><BODY><TABLE><TR><TD><div><hr></div></TD></TR></TABLE></BODY></HTML>
diff --git a/layout/html/tests/block/bugs/8878.html b/layout/html/tests/block/bugs/8878.html
deleted file mode 100644
index fba62b5a03fd..000000000000
--- a/layout/html/tests/block/bugs/8878.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<style>
-:first-letter { color: blue }
-</style>
-</head>
-<body>
-<div><span style="display: none"></span></div>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/8905.html b/layout/html/tests/block/bugs/8905.html
deleted file mode 100644
index fbcbd258cbcf..000000000000
--- a/layout/html/tests/block/bugs/8905.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-        <title></title>
-<style type="text/css">
-p:first-letter { color: red; font-weight: bold; }
-.two:before { content: "Before pseudo-element! "; border: thin solid green; }
-.three:after { content: "After pseudo-element!"; }
-</style>
-</head>
-
-<body>
-
-<p>This is a normal paragraph.  The styles herein are:</p>
-
-<pre>
-p:first-letter { color: red; font-weight: bold; }
-.two:before { content: "Before pseudo-element! "; border: thin solid green; }
-</pre>
-
-<p class="two">This has class="two".  The first letter style should apply
-to the beginning of the generated content, so this paragraph should have
-started with "<span style="color:red; font-weight: bold">B</span>efore
-pseudo-element!".  </p>
-<p class="three"></p>
-
-</body>
-</html>
diff --git a/layout/html/tests/block/bugs/9100.html b/layout/html/tests/block/bugs/9100.html
deleted file mode 100644
index ce130a450470..000000000000
--- a/layout/html/tests/block/bugs/9100.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-<title>bidi overrides</title>
-</head><body>
-&amp;#x202d; forces ltr<br />
-&amp;#x202e; forces rtl<br />
-&amp;#x202c; restores bidi<br />
-<blockquote>
-this is ltr: &#x202d;hello&#x202c;<br />
-this is rtl: &#x202e;hello&#x202c;
-</blockquote>
-&lt;bdo dir="LTR"&gt; forces ltr<br />
-&lt;bdo dir="RTL"&gt; forces rtl<br />
-&lt;/bdo&gt; restores bidi<br />
-<blockquote>
-this is ltr: <bdo dir="LTR">hello</bdo><br />
-this is rtl: <bdo dir="RTL">hello</bdo>
-</blockquote>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/9237-b.html b/layout/html/tests/block/bugs/9237-b.html
deleted file mode 100644
index 53bde9c4fd64..000000000000
--- a/layout/html/tests/block/bugs/9237-b.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<HTML>
-<Head>
-	<Title>Message Details</Title>
-</Head>
-<Body>
-	<Table>
-		<TR>
-			<TD>
-				<Strong><Font><P>Cell beginning with <em>two</em> inline elements and then a P.</Font></Strong>
-			</TD>
-			<TD>
-				Another cell.
-			</TD>
-		</TR>
-	</table>
-</Body>
-</HTML>
diff --git a/layout/html/tests/block/bugs/9282.html b/layout/html/tests/block/bugs/9282.html
deleted file mode 100644
index b6c8952de15c..000000000000
--- a/layout/html/tests/block/bugs/9282.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<html>
- <head>
-  <style>
-   .clip-t { clip: rect(50px, 0px, 0px, 0px); }
-   .clip-r { clip: rect(0px, 50px, 0px, 0px); }
-   .clip-b { clip: rect(0px, 0px, 50px, 0px); }
-   .clip-l { clip: rect(0px, 0px, 0px, 50px); }
-
-   .clip-tr { clip: rect(50px, 50px, 0px, 0px); }
-   .clip-tb { clip: rect(50px, 0px, 50px, 0px); }
-   .clip-tl { clip: rect(50px, 0px, 0px, 50px); }
-   .clip-rb { clip: rect(0px, 50px, 50px, 0px); }
-   .clip-rl { clip: rect(0px, 50px, 0px, 50px); }
-   .clip-bl { clip: rect(0px, 0px, 50px, 50px); }
-
-   .clip-trb { clip: rect(50px, 50px, 50px, 0px); }
-   .clip-trl { clip: rect(50px, 50px, 0px, 50px); }
-   .clip-tbl { clip: rect(50px, 0px, 50px, 50px); }
-   .clip-rbl { clip: rect(0px, 50px, 50px, 50px); }
-
-   .clip-trbl { clip: rect(50px, 50px, 50px, 50px); }
-
-   .outer {
-     width: 50%;
-     overflow: hidden;
-     background: green;
-     border: 4px dashed purple;
-   }
-   .inner {
-     overflow: hidden;
-     background: green;
-     border: 2px dashed yellow;
-     margin: 5px;
-   }
-  </style>
- </head>
- <body>
-  <div class="outer">
-   Clip nothing:
-   <p class="inner">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-  </div>
-
-  <hr>
-
-  <div class="outer">
-   Clip top 50 pixels:
-   <p class="inner clip-t">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip right 50 pixels:
-   <p class="inner clip-r">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip bottom 50 pixels:
-   <p class="inner clip-b">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip left 50 pixels:
-   <p class="inner clip-l">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-  </div>
-  <hr>
-
-  <div class="outer">
-   Clip top-right 50 pixels:
-   <p class="inner clip-tr">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip top-bottom 50 pixels:
-   <p class="inner clip-tb">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip top-left 50 pixels:
-   <p class="inner clip-tl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-
-   Clip right-bottom 50 pixels:
-   <p class="inner clip-rb">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip right-left 50 pixels:
-   <p class="inner clip-rl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-
-   Clip bottom-left 50 pixels:
-   <p class="inner clip-bl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-  </div>
-  <hr>
-
-
-  <div class="outer">
-   Clip top-right-bottom 50 pixels:
-   <p class="inner clip-trb">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip top-right-left 50 pixels:
-   <p class="inner clip-trl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip top-bottom-left 50 pixels:
-   <p class="inner clip-tbl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-   Clip right-bottom-left 50 pixels:
-   <p class="inner clip-rbl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-  </div>
-  <hr>
-
-  <div class="outer">
-   Clip top-right-bottom-left 50 pixels:
-   <p class="inner clip-trbl">
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    <br>
-    <img src=ant.jpg width=100% height=50>
-    <br>
-    to make sure the parser and so on are not hosed.
-    This is a test of word wrapping. It is a boring simple test with no markup
-    to make sure the parser and so on are not hosed.
-   </p>
-  </div>
-
- </body>
-</html>
diff --git a/layout/html/tests/block/bugs/94468.html b/layout/html/tests/block/bugs/94468.html
deleted file mode 100644
index 5338df153a88..000000000000
--- a/layout/html/tests/block/bugs/94468.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head>
-  <title>Testcase for bug 94468</title>
-  <style>
-  #red {
-    position: absolute; /* missing top property */
-    left: 7px;
-    width: 300px;
-    height: 300px;
-    border: 1px solid red;
-  }
-  #blue {
-    position: absolute;
-    top: 0px;           /* specified top */
-    left: 310px;
-    width: 300px;
-    height: 300px;
-    border: 1px solid blue;
-  }
-  </style>
-</head>
-<body>
-
-
-<div id="red"></div>
-<div id="blue"></div>
-
-<img width="1" height="300" border="1">
-
-
-</body></html>
diff --git a/layout/html/tests/block/bugs/9601.html b/layout/html/tests/block/bugs/9601.html
deleted file mode 100644
index 2032a40c0a85..000000000000
--- a/layout/html/tests/block/bugs/9601.html
+++ /dev/null
@@ -1,368 +0,0 @@
-<HTML>
-<HEAD>
-  <TITLE>Cookies</TITLE>
-  <SCRIPT>
-
-    /* for xpconnect */
-//    var cookieviewer =
-//      Components.classes
-//        ["@mozilla.org/cookieviewer/cookieviewer-world;1"].createInstance();
-//    cookieviewer = cookieviewer.QueryInterface(Components.interfaces.nsICookieViewer);
-
-    function DoGetCookieList()
-    {
-//      return cookieviewer.GetCookieValue();
-    }
-
-    function DoGetPermissionList()
-    {
-//      return cookieviewer.GetPermissionValue();
-    }
-
-    function DoSave(value)
-    {
-//      cookieviewer.SetValue(value, window);
-    }
-    /* end of xpconnect stuff */
-
-    index_frame = 0;
-    title_frame = 1;
-    spacer1_frame = 2;
-    list_frame = 3;
-    spacer2_frame = 4;
-    prop_frame = 5;
-    spacer3_frame = 6;
-    button_frame = 7;
-
-    var cookie_mode;
-    var cookieList = [];
-    var permissionList =  [];
-    deleted_cookies = new Array;
-    deleted_permissions = new Array;
-
-    function DeleteItemSelected() {
-      if (cookie_mode == 0) {
-        DeleteCookieSelected();
-      } else if (cookie_mode == 1) {
-        DeletePermissionSelected();
-      }
-    }
-
-    function DeleteCookieSelected() {
-      selname = top.frames[list_frame].document.fSelectCookie.selname;
-      goneC = top.frames[button_frame].document.buttons.goneC;
-      var p;
-      var i;
-      for (i=selname.options.length; i>0; i--) {
-        if (selname.options[i-1].selected) {
-          selname.options[i-1].selected = 0;
-          goneC.value = goneC.value + selname.options[i-1].value + ",";
-          deleted_cookies[selname.options[i-1].value] = 1;
-          selname.remove(i-1);
-        }
-      }
-      top.frames[prop_frame].document.open();
-      top.frames[prop_frame].document.close();
-    }
-
-    function DeletePermissionSelected() {
-      selname = top.frames[list_frame].document.fSelectPermission.selname;
-      goneP = top.frames[button_frame].document.buttons.goneP;
-      var p;
-      var i;
-      for (i=selname.options.length; i>0; i--) {
-        if (selname.options[i-1].selected) {
-          selname.options[i-1].selected = 0;
-          goneP.value = goneP.value + selname.options[i-1].value + ",";
-          deleted_permissions[selname.options[i-1].value] = 1;
-          selname.remove(i-1);
-        }
-      }
-    }
-
-    function loadCookies(){
-      cookie_mode = 0;
-      top.frames[index_frame].document.open();
-      top.frames[index_frame].document.write(
-        "<BODY BGCOLOR=#C0C0C0>" +
-          "<TABLE BORDER=0 WIDTH=100%>" +
-            "<TR>" +
-              "<TD ALIGN=CENTER VALIGN=MIDDLE BGCOLOR=#FFFFFF>" +
-                "<FONT SIZE=2 COLOR=#666666>" +
-                  "<B>View stored cookies</B>" +
-                "</FONT>" +
-              "</TD>" +
-              "<TD ALIGN=CENTER VALIGN=MIDDLE BGCOLOR=#C0C0C0>" +
-                  "<A ONCLICK=top.loadPermissions(); HREF= >" +
-                  "<FONT SIZE=2>View sites that can or cannot store cookies</FONT>" +
-                "</A>" +
-              "</TD>" +
-            "</TR>" +
-          "</TABLE>" +
-        "</BODY>"
-      );
-      top.frames[index_frame].document.close();
-
-      top.frames[title_frame].document.open();
-      top.frames[title_frame].document.write
-        ("&nbsp;Cookies stored on your system");
-      top.frames[title_frame].document.close();
-
-      top.frames[prop_frame].document.open();
-      top.frames[prop_frame].document.close();
-
-      loadCookiesList();
-    }
-
-    function ViewCookieSelected() {
-      index = 8*(top.frames[list_frame].document.fSelectCookie.selname.selectedIndex) + 1;
-      top.frames[prop_frame].document.open();
-      top.frames[prop_frame].document.write(
-        "<NOBR><b>Name: </b>" + cookieList[index+1] + "</NOBR><BR>" +
-        "<NOBR><b>Value: </b>" + cookieList[index+2] + "</NOBR><BR>" +
-        "<NOBR><b>" + cookieList[index+3] + ": </b>" + cookieList[index+4] + "</NOBR><BR>" +
-        "<NOBR><b>Path: </b>" + cookieList[index+5] + "</NOBR><BR>" +
-        "<NOBR><b>Secure: </b>" + cookieList[index+6] + "</NOBR><BR>" +
-        "<NOBR><b>Expires: </b>" + cookieList[index+7] + "</NOBR><BR>"
-      );
-      top.frames[prop_frame].document.close();
-    }
-
-    function loadCookiesList(){
-      top.frames[list_frame].document.open();
-      top.frames[list_frame].document.write(
-        "<FORM name=fSelectCookie>" +
-          "<P>" +
-          "<TABLE BORDER=0 WIDTH=100%HEIGHT=95%>" +
-            "<TR>" +
-              "<TD WIDTH=100%VALIGN=TOP>" +
-                "<CENTER>" +
-                  "<P>" +
-                  "<SELECT " +
-                    "NAME=selname " +
-                    "SIZE=15 " +
-                    "MULTIPLE " +
-                    "onchange=top.ViewCookieSelected();" +
-                  ">"
-      );
-      for (i=1; i<cookieList.length; i+=8) {
-        if (!deleted_cookies[cookieList[i]]) {
-          top.frames[list_frame].document.write(
-            "<OPTION value=" + cookieList[i] + ">" +
-              cookieList[i+4] + ":" + cookieList[i+1] +
-            "</OPTION>"
-          );
-        }
-      }
-      top.frames[list_frame].document.write(
-                  "</SELECT>" +
-                "</CENTER>" +
-              "</TD>" +
-            "</TR>" +
-          "</TABLE>" +
-        "</FORM>"
-      );
-      top.frames[list_frame].document.close();
-    }
-
-    function loadPermissions(){
-      cookie_mode = 1;
-      top.frames[index_frame].document.open();
-      top.frames[index_frame].document.write(
-        "<BODY BGCOLOR=#C0C0C0>" +
-          "<TABLE BORDER=0 WIDTH=100%>" +
-            "<TR>" +
-              "<TD ALIGN=CENTER VALIGN=MIDDLE BGCOLOR=#C0C0C0>" +
-                "<A ONCLICK=top.loadCookies(); HREF= >" +
-                  "<FONT SIZE=2>View stored cookies</FONT>" +
-                "</A>" +
-              "</TD>" +
-              "<TD ALIGN=CENTER VALIGN=MIDDLE BGCOLOR=#FFFFFF>" +
-                "<FONT SIZE=2 COLOR=#666666>" +
-                  "<B>View sites that can or cannot store cookies</B>" +
-                "</FONT>" +
-              "</TD>" +
-              "<TD>&nbsp;&nbsp;&nbsp;</TD>" +
-            "</TR>" +
-          "</TABLE>" +
-        "</BODY>"
-      );
-      top.frames[index_frame].document.close();
-
-      top.frames[title_frame].document.open();
-      top.frames[title_frame].document.write
-        ("&nbsp;Sites that can(+) or cannot(-) store cookies");
-      top.frames[title_frame].document.close();
-
-      top.frames[prop_frame].document.open();
-      top.frames[prop_frame].document.close();
-
-      loadPermissionsList();
-    }
-
-    function loadPermissionsList(){
-      top.frames[list_frame].document.open();
-      top.frames[list_frame].document.write(
-        "<FORM name=fSelectPermission>" +
-          "<P>" +
-          "<TABLE BORDER=0 WIDTH=100%HEIGHT=95%>" +
-            "<TR>" +
-              "<TD WIDTH=100%VALIGN=TOP>" +
-                "<CENTER>" +
-                  "<P>" +
-                  "<SELECT NAME=selname SIZE=15 MULTIPLE> "
-      );
-      for (i=1; i<permissionList.length; i+=2) {
-        if (!deleted_permissions[permissionList[i]]) {
-          top.frames[list_frame].document.write(
-            "<OPTION value=" + permissionList[i] + ">" +
-              permissionList[i+1] +
-            "</OPTION>"
-          );
-        }
-      }
-      top.frames[list_frame].document.write(
-                  "</SELECT>" +
-                "</CENTER>" +
-              "</TD>" +
-            "</TR>" +
-          "</TABLE>" +
-        "</FORM>"
-      );
-      top.frames[list_frame].document.close();
-    }
-
-    function loadButtons(){
-      top.frames[button_frame].document.open();
-      top.frames[button_frame].document.write(
-        "<FORM name=buttons>" +
-          "<BR>" +
-          "&nbsp;" +
-          "<INPUT type=BUTTON " +
-                 "value=Remove " +
-                 "onclick=top.DeleteItemSelected();>" +
-          "<DIV align=right>" +
-            "<INPUT type=BUTTON value=OK width=80 onclick=parent.Save()>" +
-            " &nbsp;&nbsp;" +
-            "<INPUT type=BUTTON value=Cancel width=80 onclick=parent.Cancel()>" +
-          "</DIV>" +
-          "<INPUT TYPE=HIDDEN NAME=goneC VALUE=\"\" SIZE=-1>" +
-          "<INPUT TYPE=HIDDEN NAME=goneP VALUE=\"\" SIZE=-1>" +
-          "<INPUT TYPE=HIDDEN NAME=cookieList VALUE=\"\" SIZE=-1>" +
-          "<INPUT TYPE=HIDDEN NAME=permissionList VALUE=\"\" SIZE=-1>" +
-        "</FORM>"
-      );
-      top.frames[button_frame].document.close();
-    }
-
-    function loadFrames(){
-
-      /*
-       * The cookieList is a sequence of items separated by the BREAK character.  These
-       * items are:
-       *   empty
-       *   number for first cookie
-       *   name for first cookie
-       *   value for first cookie
-       *   domain indicator ("Domain" or "Host") for first cookie
-       *   domain or host name for first cookie
-       *   path for first cookie
-       *   secure indicator ("Yes" or "No") for first cookie
-       *   expiration for first cookie
-       * with the eight items above repeated for each successive cookie
-       */
-//      list = DoGetCookieList();
-//      BREAK = list[0];
-      cookieList = [0,0,0];
-
-      /*
-       * The permissionList is a sequence of items separated by the BREAK character.  These
-       * items are:
-       *   empty
-       *   number for first permission
-       *   +/- hostname for first permission
-       * with the above two items repeated for each successive permission
-       */
-//      list = DoGetPermissionList();
-//      BREAK = list[0];
-      permissionList = [0,0,0];
-      loadCookies();
-      loadButtons();
-    }
-
-    function Save(){
-      var goneC = top.frames[button_frame].document.buttons.goneC;
-      var goneP = top.frames[button_frame].document.buttons.goneP;
-      var result = "|goneC|"+goneC.value+"|goneP|"+goneP.value+"|";
-      DoSave(result);
-    }
-
-    function Cancel(){
-      var result = "|goneC||goneP||";
-      DoSave(result);
-    }
-
-  </SCRIPT>
-</HEAD>
-<FRAMESET ROWS = 25,25,*,75
-         BORDER=0
-         FRAMESPACING=0
-         onLoad=loadFrames()>
-  <FRAME SRC=about:blank
-        NAME=index_frame
-        SCROLLING=NO
-        MARGINWIDTH=1
-        MARGINHEIGHT=1
-        NORESIZE>
-  <FRAME SRC=about:blank
-        NAME=title_frame
-        SCROLLING=NO
-        MARGINWIDTH=1
-        MARGINHEIGHT=1
-        NORESIZE>
-  <FRAMESET COLS=5,*,10,*,5
-           BORDER=0
-           FRAMESPACING=0>
-    <FRAME SRC=about:blank
-          NAME=spacer1_frame
-          SCROLLING=AUTO
-          MARGINWIDTH=0
-          MARGINHEIGHT=0
-          NORESIZE>
-    <FRAME SRC=about:blank
-          NAME=list_frame
-          SCROLLING=AUTO
-          MARGINWIDTH=0
-          MARGINHEIGHT=0
-          NORESIZE>
-    <FRAME SRC=about:blank
-          NAME=spacer2_frame
-          SCROLLING=AUTO
-          MARGINWIDTH=0
-          MARGINHEIGHT=0
-          NORESIZE>
-    <FRAME SRC=about:blank
-          NAME=prop_frame
-          SCROLLING=AUTO
-          MARGINWIDTH=0
-          MARGINHEIGHT=0
-          NORESIZE>
-    <FRAME SRC=about:blank
-          NAME=spacer3_frame
-          SCROLLING=AUTO
-          MARGINWIDTH=0
-          MARGINHEIGHT=0
-          NORESIZE>
-  </FRAMESET>
-  <FRAME SRC=about:blank
-        NAME=button_frame
-        SCROLLING=NO
-        MARGINWIDTH=1
-        MARGINHEIGHT=1
-        NORESIZE>
-</FRAMESET>
-
-<NOFRAMES>
-  <BODY> <P> </BODY>
-</NOFRAMES>
-</HTML>
diff --git a/layout/html/tests/block/bugs/97383-a.html b/layout/html/tests/block/bugs/97383-a.html
deleted file mode 100644
index 5a7db7511b08..000000000000
--- a/layout/html/tests/block/bugs/97383-a.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
- <body>
-  <table width="100%" border="1">
-   <tr>
-    <td width="160">
-     <img src="../../table/images/mozilla-banner.gif" width="15" height="100" align="left">
-     <br>
-     <img src="../../table/images/mozilla-banner.gif" width="125" height="125" border="0">
-    </td>
-    <td width="100%">&nbsp;</td>
-   </tr>
-  </table>
- </body>
-</html>
-
diff --git a/layout/html/tests/block/bugs/97383.html b/layout/html/tests/block/bugs/97383.html
deleted file mode 100644
index 96903bebaa26..000000000000
--- a/layout/html/tests/block/bugs/97383.html
+++ /dev/null
@@ -1 +0,0 @@
-<head><html><title>Testcase for bug 97383</title></head><body><table><tr><td width="160"><div style="width: 15px; height: 100px; background-color: blue; float: left">&nbsp</div><img src="http://www.mozilla.org/images/mozilla-banner.gif" width="125" height="125"></td><td width="100%">&nbsp;</td></tr></table></body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/bugs/Aj.gif b/layout/html/tests/block/bugs/Aj.gif
deleted file mode 100644
index cab54934a293f6f4aebfced2a8358c1e941f3faa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/bugs/RealSnow.jar b/layout/html/tests/block/bugs/RealSnow.jar
deleted file mode 100644
index eecc30449b7a4822ab91115d44fb4d6c5d2fd5ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4810
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
Q3Ah_9s3<6r#P_TJ0vLsO?EnA(

diff --git a/layout/html/tests/block/bugs/ant.jpg b/layout/html/tests/block/bugs/ant.jpg
deleted file mode 100644
index 7cfaaed630d4866e9368e3638b3a20c0fa79ea96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8474
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
IlAe|S*_5cKH~;_u

diff --git a/layout/html/tests/block/bugs/hack.gif b/layout/html/tests/block/bugs/hack.gif
deleted file mode 100644
index 8abf068003870bb003fda8dbc396c68cac61019f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmV<I0Tcd5Nk%w1VORhk0HFW?00030|Ns9P0P~RmA^tZ*Z*X~XX=iA3ATc>PIV>Pe
zZ+dBLY+)coZ*(9}a%V0eXmoUNIxjDGcXuvrZ+dBLY+){Ma%TW600000SO6aY00RDm
zkEzS;51*K$)`_XTx%)k2AjWhf28JYnZk~|7ax5TL)LNpO898S<!BRvQZiN`?G`!VM
z6>Ju#10Rwln<S({EmjHKaj76h?<?B^X-;PN2_>f*p2YdEZnnWt@si)?R+Uskh}2;Q
zSohTh_cT*cV(4Xc<-@kuC>W==vk<^i`BkY^sP=dE_#vc8=>q_YHJXaZ(CMWb_18+6
zG-`)tdHPb>%GPDKxEQ>=@P;e+a%_~GRq9H5hZo5V%_q&eF=<^$PJ9}ed8_DlV1D>s
ztMKe?96s2cW|e;}U#%Q%)tGVm_E`%i%K*N7#nw$*NG=h-8U+Dx>(&sJBa0@l4${$A
z(PE@@8R<RD=C8y#hV%54Ovg?MN=mWZxhuF*p+Xuj!3{(M!Bm!4%vy>Z(No~Ai=QMi
z?9psnk#Yfb<zZSgQN&p(g-%Usl@qtD1c!1>nQ#-;Z%VH+Mfs1?*0|BY`f<CERD_#m
iwLY2|&)nVx?~+Yi8#uAhkb(X79Sk|L<jDXE002AJmf@@b

diff --git a/layout/html/tests/block/bugs/logo-star.gif b/layout/html/tests/block/bugs/logo-star.gif
deleted file mode 100644
index dbb6c226516924f3fc8f9e4abfdcf1b2db1f9ff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7798
zcmcgw`#;nD`+skH?O<auGa7bp%V8wV`Os<Rd~6O0p%IeM9FwGN&c{ZQN*a+vsyQT5
z_dTSLL`|vGJ(Aq1Zn@K4-QByteg28>^M~uV>v3Jr=XE_FkLz){y1UrgMGQkD&|Bz#
zC=Lf$6nIq)jLCp)3O+V~L=R9I39hDtiE^;o02a>zYdWwu0KyRPs}Kwd0i6V5T!4o;
zAYj3}IuK$H$OKRw1Ln_yhD6|F4W3s56dd@N17iw!R1V6+L8c!tr2{w|w55ZdOn}FN
zOUb~T4z?SEknJFRJ2)Ey?&gDVHdw3!Bs@s>0fF|wlmgDifw5wc9|E3K0vA(&g@Z^o
zcwP<KlEFkVNcRJN*5F+OAizOg9LOdBHWu8>2ES4O3I!+xK!Sr+18|oD49Fk`4-^LA
zivb|RL3SXxN(O;=fQN%h67a!;MLMV>1BEg8ZU78WVE$)sKbs^2>z~9)AlV1d$>0$k
zn4<t41u_XBod7z?poaonupov2ihpXt1_V49qW}^Cd^7+)SWq4b&XPgfPhpLLJr)?F
zKsE_bNWjk?B>qg#1Y`Li5)T^4U@#xNqJwZeu>M&z5tyPtPc}&O0m%dq=K`M4K|Tqb
zC4of)FhK`?cu<!JG6R9fPqGvcf(PX!&`ANpK=AzMq>KR`udGn~pwsoLNq~$3gA@=)
z0PhR{1qGgz11uKAdHjsZ6pD^H76b+cBqqjtcz78Y=;i0<+S_jp2?@2fwv3C57YcJT
zGqa41O<c@@VmtT}1HOlV?=IlG4_M6yU$ViMbf7Q=3Ujb31PXibB@=uRg74wrdm#7{
z2fq7(FUjD$2l$c*Rx81mNU&N56xLw18m#_Yt+PPE2CK#3)mhM)4)Vi6WeoW5{}(g`
z-a8^HntJ#^YAn^&-J1i^z5&?(Y+>@h@IRM87zG5w=(tJ5134IV<IoWaZ4kn5@Thg`
zXc#WhvM?qx`TV;lsE)-t?wwp10`1WjI@<Zh4WJ0UweDS)yoFd2vv;(s`C+LFNsB3$
zH&0!3Q`xQ+CwF+%%sIklQZ3oC%R#$5w2WnZemi$4vR0bPKz77Fw)WyYf#BD9ukr0%
zhb4GDcHy1(QGxO9daW<miL><|CUH6Hj?>&3DQZ|$mi%?gS|WN~g~jj6lWEd|PO4=|
z-Fjgw2BzC$s%3Wbx(6ZJu8KMEId}O5eO=2FenW0z+pQ$rL)*02VuF4^RhZc=J7=XZ
z6$vZ6;WMXjqRS?JU>ZWbGyS3Xb<!uizNjDN!`TeGcu;x$o7d{?QvM&MYYauU=-~yI
zXXNEmst&uYR}3$xWWQA9D%mnm<p|y+MLk8}e5|XG1Xjy=yw@hlpm2*UO>-SN=7x;3
z&7^Qv$?F@ZA!SEu9=}*08mK~T#=G*vaKPa;HhsM`wEV_1+bUH!$0irOY?iKh(CKDi
zEzGHXcdpuUf>fsF+hZU=hJKPz2+r-Uq+KMvsis(y+3S3y2j>P*_ild+Y8;UrmtwkA
z((YvLWU1v5mrtdi#vFACbO`oucSRC80UhBHjxR-ws0(IDYH}bG_J_u@FNc(M8ec6q
zx4FFl*~p3Ns8d#$F`Xk@g(}hjX!$_L@YT@Nj&R_m=CB-Yocd-iGhBilR$rduzseaJ
zo0fBQ^&DPmj<I2PGb2)$oVt_p_~EGKqJei;ecKJ^IQ#gQN$aD(xrMFoH$HebGhRji
zWPj|xJ<uW9`HD@AvF+&GFhthyp&(aY6D93{vT`0d-KBYGkUPq+gQ>UQKsEN~-$I@o
zIU>r5^NA?cSf`s^FiTj&kKfI7Vj=}&K^^);uza0n)|lA-H)^-CRA3RnyJIZFEDJta
z5R=*sT?;IA{v{T8**Uz#r?6<rBO-#wOO@<sZkpem@7hpiYW%0J7nOdy(f&JX%L3M!
zU)_IC@j~>fgF=apj=iz-WqKYujiPt|hNj+WDl5$Kwps7a$7B&b?MTMI*I$gi>j)nT
z*k*0FGvBZ86(y@{%p}d9X(e5<`9uS|kF{$S+^Kz9awl^*Sp)Uns%%OFahukR)@*e=
zo2TLZ+zPQ`30r=fnH@jztxvSrQMb<PU)XI=bIjDPdor4!zjKY`_3{iVXyurv2`^f3
zU*AM+SlYLD-SzV?Km7fx$E-G%`b52O;e3gbXVA{Ld|}Rit#<+)Bgko>-cC}#E=tre
zl&NZ2<zOq)bC6G6@{r{G6YY82?5~i?mLb6sV=jm8FbU5U<*aEr91lmV$J3k(*SIVv
z1u7P%?C577>iZV^b_?xoFE4-X7T+jFyTPSusA`?>J>1?cG}NhGg=;{%nI>v*F-9{N
zwBW~=`d_WJNa{3xxRz=i5rpA8D3-ClDZMG$>QDS(Dl_`}y!Jx%ACVBby;(UnU|y=)
zQRl?eM+({t>0^Gk2&wf#+wqsWnjI9E)TWS%TFjF2N<rOAHEda|kfige(11nX6D`+E
zi(5HO%j=}2COy`Eaxov5Od|wwrd0Lj@~th+Snf-#-IsWt1-t?yb8$IQRPd|$)Y4g*
zJItRjHJ<M!G_r{e)o?-?F)i`uEaTL76+V4X#*AT91wGX5oW?BDTvc)vBhBPlP7%$7
zp|U)e(_zabD|6&xjCTuLb8Ir-{&T%*!V)H+3xad*VZ$ENszt9+jPbdPwIxFRIuUCj
zV7_)otgqAVn~&B>J~yc#S*q_I*PMOcZI(FJ>T`JPaoxx6O{X1w7OOO@7D6LcEG)v+
z$o1{!jRPsLhN_*-9=k5Q`rH<@>AuphNN9T@Zrj$TSfAl{2Gdb%?Xgx5GMNHb1|-X{
zG-n$uJ#&7?q1qpKa5?<%F`_rai%JpEe9#BA_6erj_aP68h?j%dJ;-YX8=q}FrD2m=
z&01G80>5l6_~qBko;LBC5uz<!gt)`qS7KGYm(%}z35<5+1}Lt?ZIS8T>iOb*N;cFt
zo35mBW=<`RaR>k8wP0)S0KscTBdzi6v+n0Tefi%6SmI!jwoW>PUvfek^MxNX5BD?V
zR}c5!53@~eP-n0<AL%a%|8Vp4?N?UUG9UK8{9gXFKagDW9p0V8W=`YM-W=is&hK#T
zuTqSUMDXW*Ickd*(n0E90`F2){t<B<r7Em3xj%<LI@4KE_>45m^HGpseu5wo#rU5&
zQvb}*27c(?X_@Le&L9)!_Ne6W_-lUj!MwtYK7_4vMFi&bA^l$VcBQGdxi4Qww~$!S
zOUsaA5CIkE@t=stqw$)P2XmJ`WX@1M7gYPe;zccmOYksKZ>H-$@9rgaXfBB5b%RdG
znBSYsf{~BNAM)|tVzl=XTl?nZ7UnO+_wuNB;s|^g-?74TrATjF2^$@`v2k%FuTq7a
zl&@H+U+296f2YmFNGx&Ya1l>KSn9^?`NuKd%OQ`y<4g5S8RE%diw%avvYAusjU(9X
z*~>t{YV5ql*J=LO1Q*%Wj;2H(jJ{&Z^7Or85L>JE@s>5r-axJ+joIc^c{F9whj!(R
zJfCAyh!38D8^9L?tPBTY;tbI3m0Whab;dqMoTD$6zIUE{PN3AKU$2(}M-w+ltR4P~
zQ-kp2m2_wW`1&EaX2d^S_4t;6YKFpPZjbT%cWTKEIocSr0`mkR@#$+JnN)v!&1611
zW$Df1clwKX?ORVOR`&C2`8NA*%O~i9p}ZVoj>@(Dm=kTMkxizNH@siIGwOatTI3;H
zP$SCr1y%YV`MGvZ5%|Ly@W0?qCZ-(q5q&0GUDlEo{lUk13&Sj#RKF(L)-WZjhk5UD
zYOCbHcP5UpdRt$k7p9JtBplm%Z=)?!56u6rul{wx?sT5(!rX(HLYqdaK*?<O&=H({
z&IaP{WrsOkWnl)p`)`GX=~jn7_gYpX{q9z7HxX@Alf?38RR6rUUw64bVdFwQE3XXI
zf;-?=J-xFRwQ1`dL7b7xuvOg4b$$=2U7H=ucId{$8K_~6?jBX^k><JZg(~d-`Z_x~
zDcd_+Oc2y7p0$&bvIF9WFaoxLbwtM|&A!pSrphr|o>iElWM9Ch*)T;?H&3x`3KvP?
zBI8+Tof$zU6S&CJi=)!S$=<1QBN5y1z$CI0W#rAl;`|VH+#nkc!kPy84HJn3YM}Ul
zU6uRE0tZ$v^2KV}32|^&b(-iY_!xskELr=iqT36$T`T~VEFZ*>%S;ve9F*LjjN}*S
zY=s=c<`9fY^-umJoE$Mlq$XG#3(iejh)E1jNf`NrM4*p6zL7Qa+FB@&I#KC+z_Orr
zA1Y7eqzEbW_M6NLz#z%p)V{ZxB*<;MZ&E=twpNrmwwP3w;ZWP8=j)orZgD!wU_=LQ
z8@DMg>fT7a7<=wsmi`J-xtEHyIUeq+%i|sQnnLVPA~uUHmIk0wh<=!tsN|N`(2Hca
z>KdkJj~SZfs(Ow1vcoN~21LQL!T1>IA>NWz`~vDwp7$`uD6xl%SKaUu2BTCEDNKaN
zV~qmw;cQhTrq`LFms>8O6mr?uFXe{sQ|ht_;P6oAGCa;&hL+ak>5Gs;4u*Z$d-~)F
z+#q7D!_0JL_fB8vPnm{|Bzm6<W>-O0)oC`tU3b@HVUt#}uN<v!AlffEh-N6#956_)
zRSY8-s5xT7IexXt@ykgi`WxU0W<}fqw3-c38R9R~khdFM7)SUuJ=8PQ$|lUIJ(FN;
zcyAp6P2oGyPVW${77654;Rw{?-=dKUR5S;4X;QW1Zn<~%M^*s8Jc_L(Lr>=W)}X-R
zOhDS_BzsF{C@b>m0&36XftH{IAz!CprtHheNm-JT7ZYvbqPvl09SwtJiAg5BxUdT7
zv!kxz*JAcpEA40`(I3A3tM${zm^If8o}AoGU#rdzA*~J<Zn?*+DbR7@qcZo0Tz3Xq
zMI;senYIc9QbG-r1{}3Ji73)Bj6wOW6h|o;=|77IclX()P(t1>jBgxGY8{QBut0$Z
zqFAD7&Z>JE0c#P{Cl;%M0a8|v<Zv;CdXW}KPHq1q0?}Js>xez{C578+l06xbMcsBG
z7o9T)+c!x&TmjDrhF_E$r4(+DX6fdtB4s^UX0MT_o<%tF%Mx}gEz^{CxaIXfs<v!E
z{ANQ`6UXHYD5*A*H&e5gBQXA27xaVRUNPA_{82k6W1Xt8#*dH*&wTl3cJOw?n?&}S
zals#FNY>JX;(Fl9-)+WqgLQ&9uEWeeZ+!{M=!|19U+FxF+9p@J0MU~q7YbSRxh*DX
z1gaxnIQ^|25olpI3{};vcjrT_&jv8=CdHjMnAwa(=Uwn}v7?s=S+RmikYM!}4?1}?
zH?XklTG2@oN3K%Bh#83G#e01z<*YP5T>$>(#F;d0lSxFJ7A#@J+6{ArGmJX7f;lZl
zi~1=0?_y8(P)~_Wkj4SRua+Z!flNLsP8E4hsuv?ak@#1kB^$OW4w4w_Sn<oRst14X
zZOtl*TKcSXg#*93a@qJ&N&w3|^MFVcS=KdnaKvoqVHsw|62&FxA|L5AGnKS0h#yAx
z_Fr=G5;wH1VD%xKgahwj9%vKOPceD_-bKYiSUYkvho=-zJ?Wg+81-zUB^`QqK$8q1
z7V0sAILHV><5oeqy`mkx5vR|K>0%z}=Cm$<LhfF<Ix*TRVq<T=i9h?=Zc|I*9(gCs
z578P2(YQHp<{(3Lz4S}9kKS69=IC7K;zp8iBe1Tmv0%5@_PtFo4sDbqb&HWW$2A|A
zF5(#raTfN(<6O&C8tnK=2tuCf@u;ai`I0*m_f&@5DMm3yVg!6lB=5o}_dH*|()d24
zQtKwaNwDR9b{~mqLEWC4tBa}x{@frG6`uJP^SPyTrW@hRyuS1pWC!oq#Q|Tt_pA|+
zLV4Ozi(_1B&$Sxl<q{p9xH;Q5db7EIxfQ1VfL~C+PRSWj&^-{xYM4nyxkxYpQe?0g
z6{!%N(&trnw`Mi)Z;v=Y<5onPD%oieZG;Te71hF$Q8(1l@mypev*f5W(^rhzB~SbX
zmD5^~ySHdtX%E$Y#pgw8epoVAIIXddRnlc=)^!81SAy9kxx8%=_KQWK#VFFnQ};1J
zPbJl;m=|(+I3GvA{J<bZ{O0bj$O90zfr>3(IcwR8h@H$cKjRk8EYYVTV0Sdw@*Pd{
z5Oy-ev!7aGe<XnCg^NVRa+S7^8CP@qaH~lBf6lKxLg5Igw=Xm<QEi9l2v5Tu{oRxo
z1&$>pn3yc3F^?17cadW1fD5uRtEE7!O4XF>c~wBo(#;g6@08gN5A$BdzKspO+=87q
zY$VII<M|~yt{NNo>$QepKAjLvLV13Ue;Lz%G-F$}<edKGsR_H2GxtMDd|cq`wg3TQ
zIpSn($dKTOgZZdk!%ECALFVU*D@XPhsL+YJTq`Qe%_A5t61hjUCgN=FjYOcv_h2X-
zCEdf@<RNgps%~hLxq^Vm4T109(vzfIBO)MAZA2w@p*&T`_v{{g*6Aus!uHUKAA}aC
z)YOk37_H4H&0HFP<mBBb4h|4?eEY-tpWqt-9h<dI{?aD6aowxfB3Se4`x>*?nIp8q
z6tTnSBG-4Ma{WoMV?C_=7Slnl$)>`NkK+;v%KdcZM7HvTT%p{~)>tha?H|Og6zhDl
zMjw^$+%LYH)r)M9P{5?_Z#ia6f#!0OlBg5naG^1w3?;=mCdphAWK%rN+Sdj<6I7Nu
zHp(-R&eD_ro^cADjNQV;hSn<?=hy_m4$30XBVEuQkw1s3GQgKjbD=)5jN`2w|G^q3
z!nq_s161W~Z<WN?#`k7pA27zpI&c1NNwn!=ZcEU#mrxoxvORnmhb!YHJR?CfJCDg6
zeK#L{`E+C-w1+ywks^&f;sx&GPmC<nBVgdYsY@h;;9+F~j9oXB^ufx-Tc!VlEd7}5
z7FEUn!Bd~GXH8+7VKIJx4`nAZ6EWV`WC}Akuel-lAe~(S9dCVlDon<azwo#sJAWG*
zlq-u9W>L)NqgU8%k?dd=`oT<*2!7`7H_}HsbUE(^t>;Pq17ywZ7n75?mk%DXsmgb5
zKUw-<#a2}oez2YkhPP#*9jVA4Zr!3sDf-kZM_-$dgdOQ~6@h$*n+eZcyr;c&X9H*;
z;n=goNwX-f3W=Mx*IPG?gWBIVMvogGaX@GzE_TD!11gLw{;-niHMsYt?15CCzP`2B
zb^I>l<p>QCO|zS-1eb0>v1K~>@dItW4?I(!x6_sPsJ?E0bUw1(<n>pJ8@3(|7AD=f
zly@5+w|nzP(E>2Cu}}2q@javhNBBLIiQOA>LKInW{_=gfxo<#{%F|m|;j5$&qTs=U
z?4~m<BOS)!k1>1YFt0Vshgk%#j`Hr+;q6@ghQfubrCU<Cg~M$oyr;;&hmhsW(6Te7
z{eIU+DuAd9VoeTrrD$&AEvBL`%+3~7^M5OpDBT%f2!tvdpj}%ee{_90dn^)~VVaQ4
ziBUXX!?8DMbuJo~hn6Fdt2dpd@=?Lk$WLMXXYfm!n>vU33{3gP%TqOtHy^y1Fiw%o
zHV>7BcTtW&8UJJ~aHKsW4$h9g#MASz-}XC=)NkyGnX{E$n$a7MEbvazFt1jP-0+9*
zf7N7m$MR`5eCsM~&qYP>$V|adxdS0Fct4Y0)Jt7OBM(!N{Mt=k;qYG%YMdUtw?6&B
z!;ll<H=iHquFSlLAP_%_xl=n@@A^tG6lov}gOr!+Fr`Du{f7VEfSx}nT}%A)XbsY~
zG$+6TbY%KkRu)9xZ`9ZM^y9VW?Op>dUL2!?lJazndiWiO5568W%yiMPkwd!aC`)f$
znM>gk{7hyKq<hPNrbpCb>()yTjXr%dQKS?R1c$v3L5X3H2O<u|G+ghQ-Rq<g(QT;H
z4Ouzq?#_7Y6JG4gpOe)qb**Wx7ayKkxbi-3QTGAyT%SQq0@UKA%jKL8KQ!p(rE4y>
zSVatG!(hXTqu$OYzuU<iM~+{6)M0@74bt0dZt!sI<Ov5Z@0*IqFIo*AL51Z^l12^$
z(_&8@o^V=Df~U{H4-WoCR!z*OzW;k7$yb6l7Gfc_A*mFJB48j$ick}xNI_b@?0KhR
zKkJ_lIOLd1x%Ty-`K1DSlK_RvaI5iq<59gS?AP4&{)=8Uu2|Erj#Fw?oAy|LfB&q)
zaMI3&;qjR-jvCO~P}#mPAdPVUg;DNvYcQ&+z*YBHqF$82n2Qy0ca<eexERut@bXu0
z^Jyt4_RfaC`MRrxVYK_(Y-}$VqMY8C4e$=~xFXiEg3{?16%%!3DU85Lmg@ALiSyfT
zC_bb-=0_I!^@2BN?619YrCfcd#eX7I+0J}Z%Wz}5lnfIN&wo&o`4zcoKj3VwdU0?6
z;)C;umXlk6bD5(*x@>&mQ6$yONt-3vw^-GLKwx@}quV*tDe3Kz@Ft9NK;L?5R^8tJ
z#&z(TTg4b<*$N@9#6`K!1Bxf9mI)p_X`os3l}qKu8|M8tZDtr7)faAZs&C29$Ie`H
zQs0#vX{5^-8??Vo-?Ojia=_BME81k9r%*F$nLB)Of>D0EY?d*QV=ERjitrfnoRi_-
z2%!VwYKKR|)_{NFq?;y#N|CszzZ_5#_8ksmv-sZP%X0J5ArHoqn32<3o}uXUd8?=~
zZZ2XBeRO6l%2yaLRZ+6BPR+skdO=o;yp7H5o+v5$*ej%yFr6%~EjGt+d7E|T1$5ue
zTlbr7zuS)~ox>1H;cv-H4pW+Oy;wCj^W1smB1votUB4PD^pAKpFZD7sSe4#X?#qZO
zxV%!Ram68SWL=K>WC#nPb(IV+x?ue-vcWuGyd)7gX<3Jzc}HDB6`OwQGBm{o#{*ij
zHU{?NGfpa;rLegj+j`{;QIT=PhKcm)=w5wT@`yJmrUd`B(d~0DHjkKCnG84lr!awS
zd$nyokfHps4Bo95+xsS$C4G92zUN1JiB)@V8_GYbKc8=ZUI8g@LXmshaQ&QcW#m)_
zukQ_Gy-aFVqzWs?xsq}m1}n>15&kf9MylBC>T?HNqo#JF9{p^h)<Xe7T)4BY^XDN3
zNi^mKslK1^S5(N`Jc<oT-y+R)F4-4-NR3`8A4o7<ebQ{e-0qQ&v9&e|N=w7k-_q9W
z9aCnDRr6MhbXcCq;esY;@1#C?-jV^5zA(13O_ksmw5zEC$v*L1n}v)oEOIW7lwUFn
z)Fj0h%$|4KU|JXCRneNfA@cY9ZMLDN2+IocGkWPo2CS{-ZTD|Ny}Bhe_G+(3zT>SM
z+;7u6R9hyUs(Opd?H-9ov=So)SL^?Drv{B-6^vx$dfhyL{dyY4mO}{pflz-X80D&8
zu`34%^l25a^OnMMcf=mIjbP}?r=lG)mt5XVO>86+LG)Q5gQ;B1`6`UCQJn9t3R_fW
z!mE~;v=+t*m^Gh5B+zV9&F8bD<ky5Nmu#|vM4^%5K8C>^*woEYT=<O|oW$d3SQH)|
zSZ%)c?JZiy-sceo!Q##Mh}}P`V6m#MZ%2w8HZMJZwb-5_)(TH-9B`nhaA7*kPYf(W
z363AFC2yiaO3Cz)NPaQh$6S9?p?7^bHRm#;iE6VFwLgHvK>FPgdIn3a7&T+3TBxyo
zf55IVgt)8-esy98B?qP84H72hWaY63zbveHR!buYGo8=|1{~c=Tu>R0y5FWOA1azv
z*^6p%H0)?4z{U&^hPkXnYv#lm>A()0*i#9p!h+)X$oHv5i0a&Hn5D|Ch*5#<r_oBP
zyyQ3@(^Q43uNL$;!CianV3xdls1YPkNgK8JF9=S_I0QRB)Z)pJn)U@zA&tUnSd6M)
zbuR1tna?LwZATxS26O&?-*b#a-_U0-H8%WS;fZF?_@9<ZLx0y9fhG!lm&0~e`B3A$
z0C&6dxBW;b?`Bs`Q5oFD%3vQS${p|g7>jA#O6qOieV`$SLhaJaSu#?2^@m7D;&tWV
z9AaDWa46)RN4$g&o)3Egza!~0Zgl5s<wQbYAQ^?44rQT&$oZ9_`&!D<a7w}$Y&Cp<
x=E|eR*yRX_CXcSFG+nf=qlY}q;BRG0Ta+_Jfltg`(UtKn%DjL*J5d1I@_#Qk?%e<Y

diff --git a/layout/html/tests/block/bugs/rtest.lst b/layout/html/tests/block/bugs/rtest.lst
deleted file mode 100644
index a7ce2f3624e3..000000000000
--- a/layout/html/tests/block/bugs/rtest.lst
+++ /dev/null
@@ -1,262 +0,0 @@
-4324.html
-4515.html
-4519.html
-4677.html
-4803.html
-4831-a.html
-4831-b.html
-4956.html
-5114.html
-5119.html
-5196.html
-5375.html
-5537.html
-5688.html
-5821.html
-5847.html
-5859-a.html
-5859-b.html
-5859-c.html
-5859-d.html
-6093.html
-6097.html
-6126.html
-6155.html
-7093.html
-7282.html
-7352.html
-7806.html
-7993.html
-8438.html
-8466.html
-8683.html
-8749.html
-8878.html
-8905.html
-9100.html
-9237-b.html
-9601.html
-10458.html
-10490-a.html
-10490-b.html
-10509.html
-10675.html
-10777.html
-11435.html
-11566.html
-11589.html
-12003.html
-12072.html
-12233.html
-12451.html
-12709.html
-12760.html
-131065-1.html
-131065-2.html
-131065-3.html
-131065-4.html
-13196.html
-13258.html
-13481.html
-13553.html
-13599.html
-13869.html
-14118-a.html
-14118-b.html
-14140.html
-14161.html
-14363.html
-14459.html
-14489.html
-15340.html
-15882-a.html
-15882-b.html
-15933-a.html
-15933-b.html
-16053.html
-16173.html
-16417.html
-16580.html
-16656.html
-16889.html
-17054.html
-17130-a.html
-17130-b.html
-17318.html
-17331.html
-17372.html
-17518.html
-17532.html
-17636.html
-17844.html
-18445.html
-18445_1.html
-18445_2.html
-18445_3.html
-18445_4.html
-18754.html
-20582.html
-22037.html
-22413.html
-27211.html
-28811.html
-36401-a.html
-36401-b.html
-36401-c.html
-36401.html
-39683.html
-37083-1.html
-37083-2.html
-37083-3.html
-37511_1.html
-38157-a.html
-38157-b.html
-39211.html
-39211-a.html
-39211-b.html
-39211-c.html
-40038-1.xml
-40038-2.html
-40129.html
-41521.html
-41777.html
-42495.html
-43882-1.html
-43882-2.html
-43882-3.html
-43882-4.html
-43882-5.html
-43882-6.html
-43882-7.html
-43882-8.html
-43882-9.html
-43882-10.html
-43882-11.html
-43882-12.html
-43882-13.html
-43882-14.html
-43882-15.html
-43882-16.html
-44264-1.html
-44264-2.html
-44264-3.html
-44709.html
-45621.html
-46918.html
-47456.html
-47456_1.html
-48057.html
-48653.html
-50480.html
-50758.html
-52242.html
-52265.html
-52307.html
-52773.html
-53259.html
-53690.html
-53960.html
-53974.html
-54005.html
-54618.html
-54833.html
-54876.html
-55095.html
-55250.html
-55317.html
-55874.html
-56102.html
-56265.html
-56563_1.html
-57554.html
-58674-a.html
-58674-b.html
-59200-a.html
-59200-c.html
-59200-d.html
-59200-e.html
-60992.html
-63785.html
-67690.html
-69960.html
-71594.html
-81118.html
-81776.html
-82221.html
-87543.html
-94468.html
-97383.html
-97383-a.html
-111255.html
-124167.html
-124637.html
-125506.html
-126213-1.html
-126213-2.html
-134580-1.html
-134580-2.html
-148245.html
-151620.html
-153429a.html
-153429b.html
-153429c.html
-155333-1.html
-155333-2.html
-154741.html
-161644.html
-169620.html
-176423.html
-177331.html
-185411-1.html
-185411-2.html
-185411-3.html
-196919.html
-199673-1.html
-199673-2.html
-199673-3.html
-215857.html
-215857-2.html
-215857-3.html
-216303.html
-217369-1.html
-217369-2.html
-223394-1.html
-223394-2.html
-223394-3.html
-223394-4.html
-228172.html
-239079.html
-239079.xml
-262624.html
-263406-1.xml
-263406-2.xml
-263406-3.xml
-263406-4.html
-263406-5.xml
-263406-6.xml
-263406-7.html
-264914-1.html
-264914-2.html
-265566.html
-276286.html
-276602.html
-282754.html
-277420.html
-299148.html
-299148.xml
-306534.html
-300816-01.xml
-300816-02.xml
-300816-03.xml
-300816-04.xml
-300816-05.xml
-300816-06.xml
-300816-07.xml
-300816-08.xml
-300816-09.xml
-300816-10.xml
-300816-11.xml
-300816-12.xml
-304004.html
-310124.html
-317961.html
diff --git a/layout/html/tests/block/bugs/support.gif b/layout/html/tests/block/bugs/support.gif
deleted file mode 100644
index c52a6ede9a89c56c8e2737226bd2417d9cf9e79a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmZ?wbhEHbG+{7ixcZ;r|NsB*|NMXd{{8)*|L@<wfBx(L^XJd+|MY+V{{8FU|6jj;
z{roro=N~;kfByXbm;d|w`x_b>>Yx6vudgq7^uM5>AmRT1goK2EJO2X$0vvAsckm5x
zaBwiV_TRw3K;hDV1qB6x^Zx||1Q^czXW0LqVe@^4W#<`Y?q}#(&(JWRp}3zRt$`u3
zfWbF`!6AUb*nvUKfI&)ufmeWmXrKd93GxdA+kc0K0uLRj{u4`zPUcw6_iW)=+z_>p
zw<kw=N7c->3y;0s%u;$cMRi<=x|VWi@n+Wp>p3`WQ#RgT$R%$iD-v2C9?a67q9|L}
z9nL0gBrnFxHX*D?TG2>Rf|rSveF^hSS9Vd!)xtcyQievlYD!yWIJ3FswkpZ+F*1nm
zIV`zbUC&7GuxJXS%;7x>k{7OQRWsB$EF6FN>b<KPhUypC!&&dY*rQ=!q<!T~nBdE+
z${IQwH{T2Y^m&h(j#0`&iN<veqU?WNdNLFrA3abfs$^ksL&fosxIu<$%QVJ_NeqX6
z&79zvlx$kz&h*AB!pV(GL@R7Z#6qW5&Zf@}Dlf0)w{-oFU~J~9ow!J4mx{FahR2H;
zoH%@#1Z*~3@SJum%j5Ud4%UU;6WHW?G%hGLv-)K$>uY$y?%X5D!!Mw4z{F)zk3@L8
ztHmLHSuRNdImV7G#-<4?I5;>8yxiTkmAk7giB>#(L4c)^sqMyx28KpHv0W__4f|#_
zE3^Iza%OYb(6rk)mf`4zhk-LB+}bN0j2_J9l4N1ApJ4jtNVns<(@D0MZr|oSP{tB)
zS7C)~o*;uX$FkyS;bHl?yb>=A(mpInG4p5m^B}Zi+McbG)~xw9$EHn*Lx)4w<)L#W
zgTM)f`5c}r+;|-_6fVTY7F|?zV9!)2V5`}!D0m?1KEsv9iY7(JISkchvFeB7JXIPN
znonVDyV2y9Q^Cf4q2NKF5NnJ>FS{T|@}VFRfrN$_2ewWJ4iS?pvF`p8g1Q8_R~+W6
z=h84@VdQ#|o}w%16VNBc=&)EW;5X~j3kI176O~O>4;*RY*4wgxiA$-=K~RQ$hD)zs
z`<%>lU2dI6K2{26j-Sq)z;fX7TsBpKgNwMQ%=Bau<>-3cvpgj0<<c2kf-DTy0D7}j
AU;qFB

diff --git a/layout/html/tests/block/bugs/top_buttons16.jpg b/layout/html/tests/block/bugs/top_buttons16.jpg
deleted file mode 100644
index 2fe681a22ac0c424b6aafcebfd17c7f352f9e986..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5448
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
V+<kIN%kR(0`rThEJ_HWm{1-Rqg<k*w

diff --git a/layout/html/tests/block/bugs/top_middle2.jpg b/layout/html/tests/block/bugs/top_middle2.jpg
deleted file mode 100644
index 2afbe4dfb6679dd185017a17c4a96be4823e3185..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/animated_gif.gif b/layout/html/tests/block/images/animated_gif.gif
deleted file mode 100644
index e91e5a124d4a6f608217def49e192e9450a0da47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/ant.jpg b/layout/html/tests/block/images/ant.jpg
deleted file mode 100644
index 7cfaaed630d4866e9368e3638b3a20c0fa79ea96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8474
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
IlAe|S*_5cKH~;_u

diff --git a/layout/html/tests/block/images/audio_mixer_22tracks_tn.JPG b/layout/html/tests/block/images/audio_mixer_22tracks_tn.JPG
deleted file mode 100644
index c335ec485dd9f9394e8062d77f35c22ea7b94bda..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7543
zcmb7IbyQUCw;pon6zP)qU|>YLrMrh_2<eWY1PPH4Noka>0fz2UkZzFf8W@l+Q4kO=
zdcWVjYu*3uv(`ELdH1{bbKbqrIqN;^+%Md307z67RTKee=;(mIxJLp$EBHCu0RSp0
zAOOyT4;w&+h5<l(V1Eu8G_1eY;DOWr%grA+$G<UuWXRF~H{LN4^Kblv;9n>|od4+j
z$6^Bj2|xhmgXbCFvu9|D|IN`J6aabu`gx!6qUHUsB6{9`D_%e3VEoI?9{3;J-vJn8
z<m8!j{k^<xUA>s(9qk>xEnS#YTrKS#-RuGP%YbkI5EBa<3loTqg$)D(aqvj-@o;hR
zD2Pc2NU0yw&`>?5qM~EuctS_d&Ok-Q!o$MO2?B$`w9LE$yj%ht++Z#=e0+RjLShC|
zQU+-*RxauPH|~1@l>h)bItJRGPW%f@Y>bD_q62YA0B9KK7#P^Vhh<>{A7&q#fe9eR
zB4frT=Y8}<M#pjz$On6qm^?*6$s!9eNJ`D`dd$i%AgHTn6=Ch^l~P;RjXcF+vkeU|
z6q1uy@ChqG`-}fv>5u)RNeVzm!}tTN|IDC~qLYy`>sVs&Cdxoyk7SXUZ}KNk?>hmc
zH~=%iH3r%f06Hle1}WP85`X{$?O}jH3XlS%im;D=RrKT~fiq)?58<`AKMiZx7sQ5}
z4<4?Bk`!rhQ<x8ZfP7)MG>_Q0Bn;i@>`ghQpmDxNH>3m08~K{Y4b=F(mwDUdv3un;
z0vQ_YmZ=d#=N6DOYlL4%PdDoIGUy56+eHJEct#(&2g-~*y7rqX?Aif9H4in$c|K$*
zj4)JXb4^kA6yz7dVTE96qjJw|=PEhkpUP_p$=Pbe{>?{MrEEr^5jwsbPa1P=;m2Bq
z(83_T1Jpqt?+US1jS^J;!__kUMP_Xj;)ThI553QR)?3EI#CAwP`RHeUfn|{*R=y=#
zO{C(WvhvoVR_Xqi))*a=g8*E*kc&WABZ)Fz?~kLa*`B&Uh5>WK_IXz`O{=`uPKbK@
zpMF+x0+bBm9}Anb{hJxFaof8j1qr~Z^6j|^C00GUu{C;h)K3BQ63gpyW`-6T&~rPi
zluZVrJJ1<V<@AwWRBs^TDUeL6Z~91AX3<786r>#y8A$_C(IyN}e!X*wG}BnrV<#}?
z?g>vtj4h7R*6tj13054u`h16rKK#!iV;|MWJMLVkBK4zpyYA#teY!`w?9BBX??JSs
zQ6vKADiDe!6vpIOBaFq)kd}JoLoMFpDT?%uAINZ~Gv_CD#n!5&-Z;vC{6yu)ANAYe
zy%Su$JyC*X)BdVJvg~tIJy8jLGAV2mOnX=vqWe)8SM0kV45?!Y6=mK*)ok(V6}fvN
zu*5KTHa*vFL3YqD4`N0ip<HKHn~_&Zl4Xf}Le85#eb4KZ8Wp=cZIl<A&2)9-#`q{d
z%V@NT?7hk`$70&pO__#G?bA!^fHY+_t|PCfirp*{9nfuD?g8=ydiMZQrDh2Hmf)(z
z7xem_@X=(;TbvtL*@P(?Ra29MJa|d=3*4r(FElHo6jxUj`fOnA9D82bEG>e8w`qF}
zPIlYB*uDTty?|FOcHDpRXQI3acDrk>?*XRk&5CqHa#T}=BuPsX$?1MsoeAK{?eFv2
z&qVDhk_i<+s%D&;h7n!uV;9I$L}oe)dWx6YDe)}U=pHctM~OH1DPhb#z|4KQ>e($r
zVC-`>TgRsjQ-dbvG{!>nYHL3VBdxSv@F>f@BdSmI@0rtx9?<?m6#Y>&Sm6sA&dRMR
zG38y$d^02j{Mw`T1yJR~#65r>SDdKt?c?6G994t#simmb8HK5ajc?nQ<BWT|vJ<wR
zYC>X&*lao0u+U{R;ws(RoooVX-Me&RT#2Z|QgE;AI3~@`->@~F9@NE^sq;H}IF7OP
z7h2)qLz0B!eSBl0^G;hM8_^CW`1EbzFR|yQR^^&XSzLwwsb7{Nv3$?BkjUA&bCyya
zs)Qfivp>_A26bGxsEtO3EVDk8s&%K&@0Ug4SNY}O%kXDpT=P;PiJGT8j4`Mc#7nCT
z8p&7@L#)48>JutQBReBdX1iz~bxq;Js(hX7m0vME?<1lS<G9c)zq?M69u%a$lET$z
z8LZ2Mmr1l3#SMlIohPY6a;!B-z&+6%A8A31s{V>#QK1cKN5+LWP#^tPaEaw>`hgAE
z9)sJWK`2v9u|$Gic>>zG|6UN(wf>l+qQC#RQfo`-9zgLDX##pShskl3oV5JxGDdd9
z1}=j_3(RA{JgXL0dY8*)1wD4xl3VoUumYmJVR(|1fRa4N_3Ym44CU4;toy*+)oa1A
zt)}dUkq?Q+y3tFV)xRS)24Z(*k0E-}V%t2v6rJr(H+_7zZIcm}{M1#%RzfN(xC?^M
zw1yh{?c#1EUar<{Z)2cjwNu-;^7xCA0<WE+Nk`I6IX_pWg-Xy&IBT9JZqzn)jBrzv
z(bjJDlhc`*x3G7msp)*$4WS_}(kvxK2a^`E@f4ekNA%Yg_;*n!C+rEVc8f)-B1AYS
z&n0SkZF3d3?Qy$|Wwqb4Q@uq<c4-dMpiyPsp1||E#A!DPjWWUyAHj#TxK?5`go?JD
zew8Mrk0F(kQnudx+);k8_n(G0nGix9X|i?eks2-f%r^V1je^^fZJu07)P#I*J4dRD
zGM&V@)So~#g=QKB&a)Ga_f(v^@)MReS6@v;_p`S2#wsiz)Hv1nNci`wT#x3zO+{U*
z{9Kb8@8!7l@(nTE!g36zY!*Mv6Oq%66&Uc*09i)w7&aTI62UB;VNI#=yrL7|3B`u(
zm|K1oAwI#)1rNa`W;THes8&KA1+XY*v&pbwnG4<<<aByTRneuAS9Ci?FSB?*$)2$X
zfUlH&9(mR=jNvF>vcsvPH_ePdwHd5lMh)j+uenP~PuYURwd$ZwVn&JWF3n|Qvu-{O
zyB9iCf!o!jnFIn)dxkv9MQX=W9lMuoZk*`EJmJW?3^kc2pxhVbBJ<Mar@v3?LgG|X
zVkJ6WnkH&5;=T~JwcA;T`g<Q0<fy0F<><Ehq}w%7yAm!l)z0iy|I&`N;`&&BTjEWY
z(l6^`@chY4PE}ST?TxG<>8(-{H@2zmc`BCz*@6)E{Pzj0x|RMFON6TJynzL{LfEE>
zFUA!5^;_ws*N9U*T)?gvhxzxs02y*>uKfs3a?vNBOQ`C?<<Hr#BoS!4bjxASUYSl~
z?~R)ri4YzaZH4I1N^5@iGFPkY_enzu9Wc8iK1IZaqVOHfn%JbkC055<O)CS!T@I}<
z;a#B(Kl3JbZY!;xRs2%sgNXPDHX)>2#-P{ZtrI0R>kU@Ztj&REI{Qs&d6*DeDnwEQ
zb4vln8<)qwhV|p(j=mvmqQK0*h_L4=EaO&enr$(%g*!5S7!<1Mjj~P9;u7TVUUJcF
zH?_qt&BW?!9iFs7L&#|4T2%-742dYO8ZbX0)Q41U!I255<pz?~Fvr0vG3WW6Dr)t2
zWBu+V{^@jAkjIG$0OdLtXI^#F{uoA*RW|G3r8*$iuf4_=Q>gHw-m)2(JhOXd!9?dc
z?I8PwMymBr-eU<N67%jsrr3B7NkkF1L;V#$!SkIX)BM%Nkq;EcVvHOe1=)ezH7gER
z{M=Vju3i1#HqQj28e%(sjv~96*c{XL<0|upd5p{J0fg2M^7D~w8s{%HZP}DDcMgE>
zkUw>EL*p8$o<66DVmVWSu6`Tw5uP5~*XSE-SsycZfhM+dYBP_V3Ro+{h~aJ#MYIb)
zVk0B`8#Oh`Y;%n|`|_<9$cikdGGRPQ!mA>Wpdcj->wL=UT%iLB&1Z8o8)@dSEcPen
z!>ZAyINvbld@z4G8e%VN6m-6<IptP?#WuQ|$=k4!<$-;?+ynF_9JPkyH?_~C&-4-m
znV`k(gu}cf{f9VA!Z9coqc}3GhAW$y!83AHzL0@9>Bc4^erfuuP(jtOUmP{*@Zhg}
z+Igu3gg@Wh7{W95K#qvlX+n7V=NfO^cLYY>J_T9ea=j?e1H?qodW^XGlraKt<lb6-
zB7e)v3wp{{v^Ew2o6%J_btX!vSx{6crNFG@+#swTnAF4GmSX))eq>OWn-m=Nvpn7y
z_)AK<Vmsk=@&z7Xviq~#@50w=$k&sSzftpbT;$Oysgw#Kt-=(@H3r^Cn?^Yd2P*Z<
z%`a`T_4o;uck^g{$uFQL%Nt93QuQolZC#;?V;$Z=kDp(DN2(Irz$%_gP$incOe=Xa
zp@ZMN+(N=HycY<?9GYyJX)%1o3B}t{!?Mf5lhfl65q~ZH2(<Xu8|glb8G`Wf&%-tS
zQY?4__W+Z*bSX|jxV&zQWh4VZU$3!id3d=&fB4!e%_QH4pzS`{d^KI=#LtFZ6*ePf
zT7+)WQy~~Mj(q<hT@dnE@QbA6(kr$fGn(C&M+NG_Ra-1Xsy;fcb<0g1PPK^)a&?<6
zrQ{StOCCii?cqAU<+p9*izcXZP0(Qvx}}McoJMKB!IMjE<OC$!0bs?qbpw6JiBPo>
zI`pXq-;oM=WxR3-#0Hs}v#@Dag6vEa$R5e+`%Vb%?Ug&YsMwRIbFKXPxE{n*{iIP=
zNnmNo39e@pXbgMOLEBRdWTiCqNa6TCShKr_tAVB)swnI0IAlDV)eH4^hc}Px9!%(c
z_}I}^MB&(Ct(H6c&zJ#0S28WyvxT1Gl>t>%yhoZ=6~mOxCaJqsC6?pjktIZ$jG{XD
zarp+aZ&u-=?mclKM|oJ;Pvj25OQ^V8vUFr{bR>?0BL_7GG9of=!?}oG$%*EWn6nkn
zXnxdphV9l)RoU=^<Ud4v5v3=lr`^3Xh@Mp0-O&1}=hmBa*p&8J%#lC=EL2gpSpZQY
zPI8yV=j1EeDnot6`3mB9($OE+$)?mI{^6AN52wgQGPNsPhe7C>j_^ogpg{X>-b|tB
zUUW|}Wwds<7e$$WnIt`?Nn7|#F<j!;8(ywgG9b}M{sl-7az--+%N%EVB}1)1(IBbS
zQP<>qs`tX4oFE0^q1;sHeD(sTjEWfGaTP{KWr0#UEdi{lW-$sjBi4u>!5FTM>?!V<
zHhD$9+o>N}8>s<4o>)^aYo)Hr5AZfKnV@Jnw6i|^<m6zi)lTi)%Ki=HvyTwET3w+t
zzXzO<!oLoebIan_ZPw%Z1&*snPIlpS$d@R19N<pJ!D2cC9{Eyoh6!^KA&#A$b}F25
z;uLm?#ZMm|(}w-(q3ZXy4WGirnyf7kocJLI^nuu`?qY#@2ToR}-FaU;&)xapPnlBl
ziifG)1h<^ZI%^Ky%*US{W04airKtGxoTE4mcJfNVk!B~0IzIutLiptUut*C(5UaII
z8OKbfx6gqll~&m8b1_$5iCWn?ljGP9HF^$Qk>|_d<;fe%phrY9*^TrXm7N|3lCyTP
zv<%#hx%i8>sPNX*R1%yfXJ3bM2FgayfuV+tnwR#c#R&;(_@oL<`{4`ABd$&*<co*T
z<vmjlM{ToKkS{`kmh^(7hvE)2J*GjiEcPRBKJSS~q$Ixx{>{M)bbe$&+vN*`!Z9n3
zQ~YA~ira$P^y(A+KJjBKlE9eW4aYJ>C((}U0f?V0C5YWP)iOK@OxcP-UVVZxMoGmZ
z7i<id{lQJ88Y!#Pll|A(?meoSe?I?w;Id)dR*Sa`bg@F>RRcukVvj5J2oEz)#rB<g
z4@YIUO4Ws27OzIUEZEy-i@T63C3c0SARW5wItX4;h^up`Nb(d9JOU~h!Nc{n?WT@|
z$0KWqr9QqRx&SNfr%XgX2vwtK89+G?+n#F^r|YEY3)=|_x;P-{cWrng5Gd17YCh!6
zijOvso8Q<n31Ss6CD?S5W+ID1Gu5&>NUr>cFx81EJ25&5z0h)_bRn3pU8}f_mYyo+
z+{j{%a$VCj3B+L2jAv&nZj&OGJYFl|wd;-0;e->Dled3{{7&8d8XR3#bi*ep9yPR>
zlFux|9YYA_owVGmyd%UXwX5u2X<fT^^Cx(|cDAq()}(M~j;F2Cc=0tj@l|5DP>fKI
zZp3($e9A%a=#Q+J6{ANwA(c3|vUPAV0533v@vht&)9k2Sg6CT0#3@s+2+XCr+zY_W
zS20Zx$Eh`wUva2itB0{S)WsrYHWFl7CcYgC47PV;y$R*{5xwO;#S@^Pvsp?@N%<pY
zZB~eLBB5f;Dr*)qH}atI{rets2@o)m!c&hS@?APaRyFOL3?<Dsq+1S!yVgwTw-);!
zG1o&UPEF6W)-7_$0+x!KNC-16E2NjzOOph?W6ki0^t>0R*r_EeN=R+m+Jc5CQ5^K@
z800!dUp!XC!)Y<Os|#4FN)BbcwGVz^#Uf*hvM*~lzshj34|!u5IeC8#j;G)=#j2?r
z=SWFXn7K2jbNAU(n{Sb>@X*7sY7VXsSgMSrsPEGJZFAYE&cjPmEruL}skP70<F&tS
zW)5_5vf*TA!mefghe>;kiPh+Ivtyk8QTxjl#e$(O6Xmv)%Q>w8{V;6%ZK)s0YqREq
z%=dsWUm^}jI;m%K7bdOqFFDva%^SG#Wc+lVFe8bpGf3mIOPEtgSoC^4`{h)@e(|Sw
zl>K;Li6gJaPMqpj{4Q&CA2u-YBVADg2%7UF(Ml^;Q`$^IuZi0<4vz|%EY*sNJrBBh
zA)0UVCash$GIGZP&Wz&%_kgJOBLg}bkn-5D;NOAnlT{qoSwsb7jJ47r7!_l_m0O)r
zn8MPMHgZ-AgcNwvpK7;I{(41=XJd{;@5vMl7kkqlnaxRwrfaHSJzHrVz#E47{lzw>
zdAD`gNwGG`yM0t`twDD}Dr^2qGoH}nZ)dxQQ$JYn#haF)MzxTs0{%ftAxVilu{bd&
z8)y<%_~AH_V#3!Sm*NNc^;Du;gk~1Gt?TOCyc7~Un;H(GIHS8VKv|;lqXON{Qp9Hs
zYMw0##n6rA>_vTp%*iw?_pVqfdMnU9;5PK;;B}Y?&!O{mSJ1^E%8r$!#9G6sLw(o}
z)O+D~tvA+3Si<Fyl{mx5a;vYeTV_R)&2LweQdbbm%cZI?9;nc*vX2q@Ya)8lfmxo4
zQwG?(R-L(sDESy?LffpqWs^&Nu5?+7`|a%V7)QMCwX35t=Ph0H=f$`D%7NHhO|sf&
zXu_K=A{NbKhLa}ib$4e&YMgkr>s%3EeC&_lUx5`3?HQI@V3k|5PXxWhf@AFrubLys
zgpBcY4_H7Ik9M2$;8H=_Is@sPT(-t@6$L#xS4@sUUO_W1t#!1v0XwW|ko>Bj8u10I
zlD-%EXd0oi+M$qa95pkh;FBP#4+k=A;*qby%HBIWPR{o?$EWZ5yCGghe2PuSS9SI~
z$bYGdF;$gp^;DuzOVXg&rSH4HSLORPPbKjhBkxJe@RpPldEYsTeEa11Q0(SXV^XrB
zQpA8ji)v=P(juJVQMDX+=C`b<?&nkvAEPLDCLq!Vb6InovQho8H7bb1@>l$dX(ISk
z<_i%8W^ux;V17d#-W2$Ql1AhCiuP^X*q&jh?bz#KC1h~dPhEOi+;UHQm?*bM5hXiD
z*7{j126R8rye$<0$*S*K^pEyjf6cv%JB4I0*=-uw-};Tyej$M}#)Dcmgcmu4(b4mC
z&ligcvG_=}<Ocj>5s_XN`n5;xETSS%vun3X@302m@{yTql*m3SMVVO$s4d3f5Z@Hh
zMqf9`WF$0Ixpz|<nTWu(Ba1u_eRfiAON)76;o<F1m39)HB|Pi!%IHg;fw|k6+6tFg
z+)U-gr(|azUpxROAq#RjR*=;#k>2E$vr9YmmJKt5K0iInkszgJ#IB(}G_w9U^Bs48
z=;lQDHZz}12wF$R@^6|n2^VW$AQLPhbCF#yn`a=x(4F2<DH#XJO7vlG-n<ZX<BX1y
z!2UhM1UFQ%?SH<U@nLUa_QZ1%#_O}&5-mphYcwZEko-fi=x5o&rY31c+3br5EVNGN
z+3MmD&9g=<cHJ_jQ`iFP6^{wOEwkfVnk=sHV6mQ`F3p13$emO{UklZmZTiQj_RLDi
zq7ofvM#0E}Pb4tC3T|0ul~I{(KJQVtYL&8|C6W56To(AN%C;<18omf3TTwbqXGbrF
z`D?ua&F*81o1feZ5z%7Ta--myU@49yS63xNjhF18!nVXGMzV8QRfm}g$*}1O4THKh
zrfdF&L#Ctx?3Xk^xmo!VV)Nfb9afS_Kh+{Kog^9~r;GM9G|>wNY*A7jNf+T_=z1xl
zOfe?C3=$3zeX%>HJ0^AO;CU9c7>4))1sItCcyYZxQmA~FB<)>uF&wqvJ`{05ds49!
zAFU~`j6e?eC8fj%#^VYrBPX0ixm`Nf%%<>UzOqRB#Z%0)_XMl+<gEwU|A#OWYMR7Q
z7o{}VveLUyvXl~4b?sIbaC=rR>2pvd=X*-GA8V0rSDw2Fqq?sNFXyJl=_0UL<y7c!
z)T~d+v1U>_vFG)YtzVC{Ls2Z-LqARo8Kds%q<(*Ksy~yOQ@RH<A3>N(0>gwt26dz!
zecl6(dJCHI^5D7yl_bE%4NcAS#T5nTntF5k17lexi(<D8&%xIa!;6u-vq~nOD<N5;
z(FQNCSi5Rx^Hs{Gj%=~AYYZEHCW@A)kEJPZQmV$wzQ-~;PDUVM`BZA&bqgv+36O{V
zuTXKRW=kQ>!*0>!jpnJc{*6YZv^O-RJfYEoW3yQhxqOND3B1XM!Brh*X`Lf;55VFG
zfK%YA1xDtUbh~4_N^S2UCL44zw6%N4D%VL$+%x94#*S{Vyj#9^q{N0k=lQI{x5^@T
zh;cV2ZC$X%H^t3kb^FE=H6qR5>_MezC<G<;I~#@P{$qIE?(KVn*M1Mc@F@SWBRSJz
ziE4F3<Tt!cJ67{@LB&9K^~j1eVt4e@zw!%juh9$bDVLoD(h2Xpr9L3`afAj%aP==7
za$1b*NclXa^5_2Wk|ash1iH&v+wp7L)W;#&gtIrpgYpauGt3h=NSFbVQFZ&g`%rq}
zmK$TH?)m<nImziZK9|k2Mxt5rO9(PDsk7e`lHx_FACQz@L?&>krCrsla@0ghJz$Jx
z$OMuB*7u#i0@e7*_Y4pw_5c&@+nP^eFm`fiAC~j50OHlnF=ID1AIBCfrstXKnxf8c
zcSfL5$~@mw)4!(&lu88}(TlUa&HeS&$5Vm{S*TNcrM)+4aD#w(oSPnhyKQc_$+Zg2
zCB1N)$=hHHR7(<9*-Q|b=(wtR?uhKDxinzJ`QX1*XJolIYu}bm>g~@SvcqIBtsFGA
z`VLohb^oyS!u-9jz<@LnWeRq|vC4k);89u1m28hvOdXZcIcVL-ef=?TOhR~$Vc+!G
zISq<BwnRWrEd41!+f#;<a%MlLQsT#m9IY+_&onRQAZYjDCB^-p0_{7vi8K7%r~lrk
zx>T}&J>{ojd}Y^VGP^7&--$|@-Y3sf^La$jU!Py@&HPdz{=b<O51B2k+>2B(;oscU
zq&+}B-(Sl*Y0MnNAWn=~7RufS8Zio-t{VlEOP;+5obCy-Jcjr74EDbey$Q%wx!WI?
z{&sX6^v~}M)62d$-?fN-M7Guctw;Q!o+M{7s$L+^ubUiOsl&;)0%~^#hLr(}aN@tB
zC;ubbZh4%qPg=7+WEI@>C!hjVD+T46Yd@Td{9E743dz}=zYSljxzq!H!6@RG)a6Y|
zw^<QMdU`OowUjZ(RmI5>D#hKAyC#tK1qb#B`@oKguc4F!jQ{Y<N2l5~3ubGD?}#Tn
OOo#lbXRAtlzxZD#{NFGD

diff --git a/layout/html/tests/block/images/black_1pix.html b/layout/html/tests/block/images/black_1pix.html
deleted file mode 100644
index 71e5bb1939ab..000000000000
--- a/layout/html/tests/block/images/black_1pix.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<HEAD><META HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=ISO-8859-1"><TITLE>Not Found</TITLE></HEAD>
-<H1>Not Found</H1> The requested object does not exist on this server. The link you followed is either outdated, inaccurate, or the server has been instructed not to let you have it. 
\ No newline at end of file
diff --git a/layout/html/tests/block/images/continue.jpg b/layout/html/tests/block/images/continue.jpg
deleted file mode 100644
index ddae3d500f6def316daadd6d52c8a62bea02801f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/fig1s.jpg b/layout/html/tests/block/images/fig1s.jpg
deleted file mode 100644
index 0fdf1e245665e4181d1d19603f1f434f9c753344..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17624
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
O{6i=I0l~PQ{r>=)0byML

diff --git a/layout/html/tests/block/images/fig2s.jpg b/layout/html/tests/block/images/fig2s.jpg
deleted file mode 100644
index d676dc38dc1bf4b70bf9fc1b716aaa5f07b380ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16383
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
Ovy;%PmtD|r1pR*{PPq91

diff --git a/layout/html/tests/block/images/fig3s.jpg b/layout/html/tests/block/images/fig3s.jpg
deleted file mode 100644
index 395a6648bcf96ef0d5309dddb1925c98f554ce8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18126
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
SFc{_&?^AP?pSM?fX8sQ>EC!4K

diff --git a/layout/html/tests/block/images/filterrt_tn.JPG b/layout/html/tests/block/images/filterrt_tn.JPG
deleted file mode 100644
index db6c7268d12f484c98b68bee08ea84bd7edc781c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5654
zcmbVP2T)Vn);=LXXo3hxH%OHtN^e3a3W7q2B25$p6%de)6d@ErKp+&6CWIo=L_m7c
zV1Xc^C<LYVA|NI7K+4PYzW?4kZ|0xB>^<kqH|OlN_WJf-Yt35JA?g%x)Wp!(5CDMy
z07RPrbrdiFm>3x$j0{W=2!xrLiG_{(2pcOa8~-sb4sKxq=m}u~At4cQc_|T5IWZxj
zQ)<$3XBCu{m7!7^+Uknu<du{a|4;&AW@ct%W#c<?girCL&`HJr^Psi?oJ>F<&<O^K
z0(6`pFeixm8GzF4WB~mhz`qBG4ouI$2w`GoVWlmoI||T&z+gIhFarZUJ#BRe?LR=z
z$#CqXf*vCm;x<Ioi(4@~IiE>Pzxo5um2Vs3N)Fx;%q+)w`S=ASB&AMC%P6a;s;O&e
z8l1miXmruo<f_FrODk&|TgN+h?>RZU-1qVI^M4o+7!>(9D*8!GY+Op}v$W^w8JSrH
zg)fU<6_=Ejy{)OOt8Zv*YX11?b9)E2^GjF%0DkcMkD=j_>6zKN`Gv)wOUs1Kt?ixN
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
HfI9py2N^Zo

diff --git a/layout/html/tests/block/images/horiz_pixel_ruler.gif b/layout/html/tests/block/images/horiz_pixel_ruler.gif
deleted file mode 100644
index 26ee74b7d37479c94c20ed2b8a74984c73513836..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1943
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
Ay8r+H

diff --git a/layout/html/tests/block/images/icoAnimals.gif b/layout/html/tests/block/images/icoAnimals.gif
deleted file mode 100644
index 2d6154f4f8222d9a210c23d40b778991b8d26f9b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15816
zcmZ|0cTf}G8}^-EsG)ZWy$S(As*nKE(a=K?L$5+;(gZ`VLTJ)4RH+&|C}=1GA|e7(
z#1aq@ticAhZytU#&&>PIJM-?&+1WYg-m|mU{&DvH+}B!Ind|C#I|40$yDWgl@eVKn
z{O>3Q0H8E9LNzpeeSK?dYZn$4SQ@^yfaA8nI&J`s|7YZX;V3|DEx_0Jxcm6z_!^Dc
zTHl3*S{7@8#d_uLAY4}9-rbV4FkSoZ)!0HUz};FnDO8Vj_{u~BP?q7oP^;0Mp~RZD
zu1(TlE%>rtm37x9EsPz{0q`|J6!;3WrhVUyMYC!F3$@lQz5v#M$!ZdyEXjQ=S~%KT
zm{qH>P<wn&0BfOk!51*?4k$ALu*&pmeKnGf=Qlx_2m@HPzO@>F1z!!;z;Op4R0{FM
zL5k(85h@I*RYKGP0KNc#!~gr?0e}S!4R>MTS`7`BuWyo`-omjG8X9Hp?yO@ye0>*c
zYgr2mU%q^y)9J5Xy*d_XY;3H%yZd;spr9Z+I{G-=!NI}A#6(X|?^rD<DJc{Rg+L$x
z|NooRF9;9-2n4A9FXVsk1Pf=81JlwoGPAOCa`W;Ft`!zhic3n%%CA>cR#j)l#Tnl)
z#<*f|!8b69?TT$du0fbHid5senrn5#7(%Bpp@Cp++}<!eSTUmLHs*$l!x84Jt#L~O
z)A@Ch3bG24uQp|0s7uMOt`*l|sF;s^4MwiJ@7C*$MT~=RA~@Hk_C{Bu3*+R}$3^jR
zyHeId9GU7)s^TV-jo}hN(7hcc@r)1WV4Px!FZIx>jTnB_UcYhS0{-p{F=VW?Mx$9y
zjk*^FeJGW&fZDQ!{Akq(xaozxqIe0;oy8q%Wb{iP+O#)vE@ZV*Bii4tQ<XsX<Y9+#
z^s7c}kM@w>a*B1Xv6ddr(L&BC3W^f^@YyEm7ggi`oI49#BiwYw5X?NCHQ3)=ZXhZK
z&)g!tFp%w!eRI7k1Iedgl*CmbvIl=uVOrPQDVndoHnw`Uo9$F<Lt(^dxORHL<7yp=
zOOo$1d^9`WbetdY`dmG5XKo<##{OQe6Gif*%76I53oX_wRZHU-jmA-=pj>}?h0#AQ
zoNDy8FEDpJ?ca}&{^n24BUzvRef)L!+IgT`focwlazK+OH7YIbkzW<IGWcDBwlakS
z+P1R9FYigoue=0K@!CL48+ql_iZgPpWe*%keA{VsZvWJS^yHua@UO+gM&B|Fhsn5U
zVeLX^8DZaor#vhnpB$ih2KMsy6qog{MKiv0XoPP;-O5(QMM;0WBu<#0kErm^lgBn+
z&g<ZTkX_2tqWtmZ;MSPo6&zL~;xEZwB4+Wa0x*uw^IAL>t)K0I_gaMtMHP-ii~U>l
zT$-*kdM9}-J_0~Ul?xCPI3b>A`g&l<B9CZLL3?WDPk$n?O2m&G+#2-LaauqG`(8yr
zY<S~IzUM1%IuItF1n7Nu+5;}01+%u0SgEVxN1ct4b}{xJL&Ag@Q3u_%u8O~!PSy>t
zTEQe@P$0xW7G3GCESX^j7ZHCt)jj+?8`lkamiML-;zkP0lKLw4N@7L+BXhDXMX@Ih
zbtBY+H5G5}`e+&%`Qp{giENHi?Po4Y^Rp5+|7y%CClzqbsm`eO&YxVfJ@pu0687z}
zxMabHxl{1&UbNigi@pbZ3f<qAY<22rOLhGAQ=tT>kGU&G5i3Z9I2mA)W0!6B-QE~Y
zj!YWnKbRDEyO=d6(b?R%{(`5y^lWu+7wGbINNLO>cL-Q5R$Zt?uY95~W@!MP^ge+H
zs6i%`u4!5R_jxVH)aS>txSpz%T3B<jc~Mi}(=1?!2+5+zC`#5-;o#atVd$OtR5t5^
zlk#&mzqT~tf=2ueE8OE3d5&<8tmK@ZS*FKluPK?S>%qT7Eovi@OuQ`EB+01B`kUIf
zAF}MnY2^=ijVYBWf_N;>hZhUj+U8~${rdGjc+?vv7C!uRTI?Xz#eH4=Ucr7F7h;Mo
z;8Y^t(JUQZVCkVw!;;<bD48PPg|CW;akvIYDn$mz7DG*+r%)jJdjMpUg$Z9X<J4P4
z#zYC$ly`%frR<RVXO!<6S0aTo(Zoq?8v`GpOL5gs;x|uhO-`LGHVt$%<BQaOp!g6U
zMwo9DG#GlImUxg)<akqcTIj(e#x~ziD}HKoCRX1Mn0jcnovGgdxpCGG={D?hmFAGG
z+qT6OLP{5%$HE6C*zo5KOSz|d%{)0&iV_Xo6ijHToD5lrf+D-fED5AJN@R(t(?Pjk
zXVaAv7eUd~bg@}#)+_N603X0ff<w^i)GMj@8>m;zfQFJ!D-OK0O>6XPW>yzRluiiV
zRO~r1%fFge!j(LIxzWn*gwb-kvK23(7m!t3KtA=h!Akc$9W0CXh8ilqRX<gpNtgoZ
zg*K-{!($$24$qty+Aj<h9>$(XYmuZFE{D%EVA9h-t|<tk0p&g)P%TxJ{`ZZ(iamE~
zJe(b9?|P;#2XdkdfIMB9%IQJ_iIw#=$=fODKYMuN+>1|^ez;k)rvd}gSWW-J{xVyS
z#OzeIQ&r)*(!d|3vjtMh_VkUtNBV)S2HFE{Y)_XKiRKMsX9fa&Sv5*R`H@<+QO+k^
zo{6|T{dtO-`^;alro-jI?CRhh=Un{1B8S(?=A|03w=NVs=Phw)k%sKthV#@j!}h?V
zjgQ+emxnr^X{^3XrE>%m3oslX%m$!b6~c>H-bD+yM5itjdzn`dG=q#(#et0$>AdD1
z&*k`W$jl3!e0Kei%PS`}6}@q1@zQJpC#7!H?3sD_MM9lvrr~+1AH$vGJn~w>h>w<e
z&uL`f?nyzrdJ0TC4f_I3$3nCb5yoYdJmMA5?O|qWXfnQ2wr70IVUnIuV}SH*!^MbV
zag}@0ZnI7qy&on3{S0g?kfj1{^eFH)u$K-O#7TTJtY@ucthwds&Fg(!moQKzr=baG
zY7A#jj>UXGBd6e=t@y@z{2;Yl#Q%XwewACUsPjOtaG+=P!Mx@Cn-hP8LxzWEfodi;
zjOS4il1u9nZ4?6M!&EN$Ss+&w+FzW(fazg?5-C?SviyNSc%=&nr3?3ayalZLWCnVH
z$=3S*<Z2LNckc=v)`DGyk9s?c?mkB<e>Y`!Vwmt4Z415TpPyxGn3RaZr;8)J5vK9|
zsBlb%ILCM`<-~-<4*l&x?6&l)T>nWJ9{#L>5WO-^r*2RO+4me`Jc`{#2TNe_%+I#}
z$S{Fc3{-jky^VLHbKoaZws|LUPB$pEyqNWJPn58+;dqNAXz+FTn)cqx@E!VI9_o(%
zA8btHw{gQwAh9S204{$)ulQ>s?_Q4FEXK!3^FQ7{m*oE3CidVYBl%N9HvuQ1*;4}d
z`;sR1mw`AxJRx*T>d8sF!V}U>lV1*>$?JGB1n<9AyhYvIDV7#kOW;xe-NQ(<%#v2X
z0b#r{?0K`&nny;~S@t|^{3xQ_+;DoF{*?~}zox{h4yNIjrhE-oS_{la{Ig`hB6z%6
zlUyK9WgaW!@*|5=kPiBgvUpR+6L%6JA`>B5!p70&sjV9SLI~41dM$(<mf)R=u;mrO
zPjPCZU7?9z$b1b&uq-nLyYmw~X{<4I|9z*LJcHV=x$Bol_(D-;5iv$t>R}}gzWCha
zR}5P-gSElmZ=vC9J)hmr?C@W?XDYsmzs#|S6D~oH#69!&`b;K-4x{FD9=@sKrqj4^
z`w07^lWPV?6Kc$TC<jK`u6QTyG)K|B?^nC}Y9b?hJO--tlt+_4ZR%RbNyHaqo@SoO
zx@fE;&-!um$$vl3-{sSK5tiHB(0Ihh?wyTGzo<q^O@K{)%Zh}TPn@(AiX3V_WkHVk
zS>`r4f&TDS+4}71Ns#dmIK-L+wV}#?ZITv?M+vV--(E%{$N(e-Fdqew(@i6q2P{s&
zthCMRP-+)2>B9c9z9c9`la=ntkT<Z5nhHEG#eld*$<;OTe{0m0qCvd?WUbh6V5wV*
zh6-?*Z1^_ygd!~10qR~UpL!i~9h4>&1Ze+m4j}@NL;!>gP{sws5Eb*&uuw}h`&TIA
zE7TvTR-!3*0WXs@q;zgk$qA%xLQwf#0+gkyzX%M!EuBd;Q4s-HWdBV6&IG6al)sKp
zFsRIt{2rW@hDFF`!4`9umoOJV*(H_E&o#;VKTf`M$lm!XYrKy1W<Xu=`SWiuCYGS9
zmFjjB@=Z%8UFnlCSOC<~k10>u8#)^~?Cbwl6Bs0gNfTW-DtI=O;?+!^Bc%M?NqMn;
z?bXq>AU+;}a+YwOw|2fZj($ppfY$yXtouROP^iH^(C3U7AK1bfu0cF=A=<n3=$gBa
zOzSGoSpaOKQO;@x^UI0n6P71B8l^}yxK<3c=ShvjXuDzH5X=Rk)Z)BDWSGu{uaz+;
z03b;UNCRKuSz5Bvr|Sg<$?S7hM#~G$n(miEKBt@N#K8YyfXd!bxgq^OrLa&2EW9{D
znMX2WRo_sK6itztLrY%v_M9nB><4fQ@awuVb)PolKI!6qtjIwCASFzR3=*WjSfWV<
z%cH;=M3ARxk>_N_!dW9lhpS%$D^x%LTWJ_W8Wz5W3<J2S3Bxnm1;J&4a439zJ%YD_
zrNL`qUUXQ=?WkH(6$#JvvyxBo$}Cupm*0OEVH2$NDlmCXuKM?Bi&ha|#&C7lMs-1M
z9wnG;EM38VDl!{-tv;|y`!d`Hpr*6Mr;fL}|I6yN7MHiTpsGNcM1yrY1QG&(1OXta
zn!xb>tk<|2U|Z>Qsm+Oa9ZvaNLIW(C9)S805Q?&oL@Qb&T^&lx2iGLD+$c5=?T9#8
z-2*EH$_>5L8*d{)GL&;CoWn2e<SuWUL-bD)kK&C`##gj;CqcSYI`$DI`sO;)_(1?i
zxtLoqY_4Bm{yW}1wXP&ahusViMuCbl&#&dyNZ6lXRh`>~P<OxEOAI)u;922TAV>BL
zta?enFx}KYQb#a0`d^H_lt>yFYHuPSiCoUgI}LwW=5)W(`Q@%)axd?l{c86+Ek$tO
z;0I1^vyE<V_07_&SwEe8t6Rs<wyqwwtSPtzK2QFTp&WF_H|If1eD%%xpYG$!miA5j
zGQE{w;2OQ?Hde#w_at*8BDA`k`pMOiU0M6q1L-Ll!dVJGtvpdEo-KrIpdH8yJYJ(L
zq?6*{cca-vNvJs{p%qi^D2fw6f<sFA$H>52&KGVgpN+!;>O~=c0ZBj{XQEC^jI6c@
zjf%y>&NAF9s`*7QK_QOeq{&3L1L3krw%9mSq@`mpDI8)hkHN5rABdM1f$niMAeII^
zA1Nc$06b_R-+)=fGKtAsLL;%B?-`x_I_C>T<tjRWSh72o)MbNLd7>ZmRqkSbF8iM!
z%CJ9CH<_+-*=(@QOD#>nu2a#8-#R3CRCohuA6+OTY_`LTLW&HqgdoRix$p8*w2yM5
zm8<V?T=i;@K<-gQVs)SX-9E$3K3XE&uu3tSn1v(*a=w<HX}LP*4|}(2Jm3Pc&4&d5
zYGgJ~5U^0^Ca60dI=U<BgoO?TN=;1%=@B93*kI*I@UAR04h#P=-BO1EMAblhRt8t3
zL)a-fNDNE_1LS4`P;}TkJ$;w8ZoENg05Oo^!s?)7ppS4+>n*u)bJUV~*ur(NG9G*q
z>;EXr-;xwe$nuXP!n-z*eCUuC^PA3{opBibcK6U=JcMyN^xJpW*Mo76B<MYJ)V(bs
zF&az+F#74Idfg8{`Ngox&XKCkpzG#?Zo7jmce|||t1$T?D=K65KL#_gVTo)m?N%<%
z9?4SRdm*BI8w$RD(3(AizIPuAo_*+JirxQeaR0l<{hwmy0+Ug>TOFlVRdOncXYSnL
zG!e*8l~|MFJmq?8?39%rk5SwrU$R2me!2GuUXE>Ej&=x^s<5?P<8r0Lx_V(+7GhH&
z9S-AMyHN1ga>G7Aa+@3XBH3aS2e?CKS&WtSw&>TQ{zl(h<1_)@t|N}0i;Nc)?AZE%
zR3yU=sldK9uqxx+3YzUiSGRZ#*LfWSWqVwGB3nBte@#H_jvV`Y3hzTK`=*vitkZ<4
z5a<<vpRveissl0)1Wi_S?qdx<q6B*Fd7Qu!_lMQs#T_Z$v5J&f3>`)}7!P@R+up>h
zv4Z}YX}~<-9{g7E8OVFv=dvoE_dO$ur|024^z=Hem^+LQ)x~!slBa%rx`~I&#5G>v
zx99mD{*LPNuC!Zu72bsvF#!y*003CpkjG<R^l3Bi)RbW8L0XZHNIOb02`3~<@|<Au
zj1h0swkC!TWifbgCsnvnl_gM6Jke(noph6P_v4Lv+>B{pOj@AmRv-PzQ&GNtN>3zP
zU+QD+)0Tk@F)s}sKY(K(5dITaStpdn!t1bA3H>f(^QE$rHH42wYrMQ;@AXTtu$(s-
z7dG@S7V5=3$BM>$6p2NP)*sNZhxg9;O*~KSUPReBcz5h%^#|bv^+g1IY2q(HuuGH{
zAi-;BlD(^kE51QkgmOjOLilP|Vh{>`i3Yo!&9+Pwf8M|`C^Tqaaw6Ij)MyXC;}2?H
z_c0s*KKsEg1`vag!WU_BS&4+o{rhX|k(l_gx!^*)nZ(zpt3ugh0qz$qY<rzE3TTO%
z(a7o(TI(MTQZmL^^iOwBY1L@tU%PkprBBYks++k=FD*7oFHuyJ?(_Ano}1dBN<42o
z^PKR#vUlUY`uuX;H9~#&y`LFN>N3)M-;l9x(p3Ca+L%Qg8TQvzPLS!Y;{$XEnE~a<
zf(e4V+hg?-Q!9~j-H&PSem;{JCx5xF@qLY3Mze!|IQ2W+*sD$c8TLgS84wz&m~CQv
zAoaqqxBh~>Y?*_ScI9%pPqv|=<4B!Pjb?^pqq<uOMn~!rcMvV371$@O(i|@@qO01Z
zY|Jso&@#IkyTpCpc_M<T`#3GD$T91YNkH^snvtmV1)@^iaC*lP)K~;$M1O5T0j?~U
zd^`&hp=QuLSrb0cOs+rb4)H{%VY*ADkx(0OK5{?|71Vb|RW1-13jp}VtHQ`wWgwu>
z$ugf;(l6^;9WDFEx07a3=|m<p36X#JCi@%%Y(P9y+P94<%#l&?6s1lfV!{Pc@?Jhb
z2wElb+^DlBcW_#!Fhhl50%e<mB8@IO+rFJ~NXxmW3Zp<Xce0%Rdu9lQ=>CxZA)|I(
zO^t}!erq!4v<(&~Lu+|6ECBpci}_3wki=rXk?1?x*U-KabIZ@_KX5j??~$Zlpg$UR
z(F2ACDha=BYDOG?hQKP|Fu@awIlPL^>qUiCveIg5x{7KMn(3F1<o^-XiY#E>G^h)M
zrDQ+@+fme2)EMpewnNUnn92bbnPUD+lSxdbd<L)`*7?-$>1HhL{0PsxSocNpztx_g
znmRDZf~n*+ng7pAG9zuRd5rn9^+na==QRm6`vwQb(augPzF!trwWD2#$_EUO$fjHu
zy>v&_WoKggk~GUXth-h4YE9Qzgw&VhDCKYA)(0gk2hZAkPTcVEQa%WIe4r}Xx})QA
z=jAt(+b+Fw_cWe-CB64K`Gkp={NZ5yW4V)Qmf7EZ(x>CobKfaYxoqLL&xQyrZj5C3
zDabA8yzbZi=<i20UZs&9_elb-5cAF#C~ItFk;<Lel|g5#4vI&<ePLZyjQ@SyXADc5
z%2-;c(C~7Mzq+KG$P4;?r1s@2juSjIT>?1s6&6gh4O>+8E{|!acc$Jp7&--aB_BpJ
zx&P4~Nf97Afsa^P0xLTTc@;d2UxqKEMK>m|FPr{aECsEl>sg&)S8nXsPdBx~N{rJ>
zT~L?V#moMjD$D7_PnE#{09ZJ)G$jptfY+J*5j9f`y*xQvVGl{+6R__o+}kS@_Q$E@
zCoMLCU%UY=mzI3t1tZEpCy@w9Y%Dr1F7W>X+ng+8Yge~&H|t89YGY$7t7;o7<Lky*
zMK{~p1G6H71A@as!!Hp7!Xl!FV_G}L?j5gRZnbd)K|x_**XU>rOYw=K>XIU+CHwyR
zwJZYcW$al-t*dJ-VV7XMw?!D;xSs`){HlbOk`hP%5|>Q>_f_)OdrHtdwVDQllCl@b
zx4Dibs`ZAzDn!<!a&=d_r%Di$OO+6@J(X&zc}}gEw2RuAjVhMnNLMZR-BYkp6ryvZ
zJ1kduNdiPTM%Cbed11iYg%-!5vX|!dMI6thumDId{|Un@On?bIhg;t=1~3kk#HPx=
z|Ck~AqwuCJbz2_!RmPGchsP+5M+KkUG|RfxJOZKv#7iT%@;wc|GG5Q9_pImzl=5)|
zJ|P|@b0DSev^tr>&shAZ)uW!%3%$Fnu9Ye*>qD2vNq4a>^~me5T<-c^CS_k+HgzE_
zw={Bjwf-k8Y!-W8UzR)E>)hC#A0O8HLSHYulu&=W-s-3$ch5lPD<k=)&TA3jKXD&6
zt1CXANd9LENr)J_A$kAm&wno!&{q$<g{aA2>MSHv4+Sb2=_qr>{|~X<%0_1mS91%B
zo6U$TEHy|=guINj<uNYXV_f;JL@-OZY896)DlMX!Epm6S4OaL}q|rWMiRYAzpT4!w
z1iQK+QVyw5fCX`@Fqt53!#$n)m?tAW<~*SkAVf4|czheJvZ{eIHuDOc<t^7rm=T!p
z?~y&9)n=b98a-UxS{==?okb0(WF2Hxd=c3O3&%bWwiJBhw`E$}aVb5sOq~LFi-_|B
zPT!QOoP-JyVnzZB8<w`Fs{#Nx7*+9>UTS@3z`GzGqa!9**NAM|E;lS1Khu!g(eP1p
z{??YY7;fpnT&z-1Wc{`qzlLhhxXYvKQofX9^sHV>ymba|K9X9tTY>=@7@`|O;+SoO
zjB1qt93Y>MrYJ*RIuKRW#drZ_>>&I&tXxyP2Sw^(>q8E!&^GTZ(NMG6J+T0cbwnG%
zspE@qShJ~BkEEFM%J5#bfl0XxVLyD{=@uEndwQLLxzWH?ayB%!%QD-R^?9h1`{o7j
z1xyo%Z|+ig?P#<G&s~;=g?Mgp*$*+#^P5=@1Qp)*+={C<wOXF6Jfr<YW9U-LX87`D
zlTnp*^cN15u78-&P}rvk?Pml`&Z}2aW=!!ZuIQ+s^WOy8FQXI^54`6wzCJZZUR_K5
z8FAlv#Ll7@)|PyiXZ>Fio?|9CPWy>Oyg%5kjk|@1W<l-G>YcON*Q(bq)P6&e(R_36
z>4L)!kIIKEE9Eo(KH_#MhUM;QFD48!N&+O$T-&(V)@1YYYS+I*k>~sWv{|WyrmWW@
zPh^Sn62ce%NZ!3^{q76j-ufXTN`a+Jr=L&To1p@Jzf0W0asU3W>HcLDCG{98t(?%M
zf~U`?iBH_fIXycLyu-Skj^=1USXfT*Rx>mHyK6c`*=h3%MrEEkSpTgWgSyxvZ?#I6
z3gobd$N?H$b>_TiiBQPaC_bBUw=`1CS47yeLDb@}i!2c!a~aTpATXzR*Hg{pe_?ei
zkEHC%u%!&<`)mebqQ!_Xd>(M_)Y8-Zisn8DB)~d%h1dv7A(Or7Sa9$nKwQNSfqs#}
z=W08n&@nqLaUw%B(H?Z6j3lD_yx59QM4Bh5#a!|)DyM$bhkrAz>QPs!=yU^{2!hPF
zWe?=LA?)wb7MUrR<Be?lTNkOy$LS{cnd@v@mhf^hkiB_29p3(Ef}r&95hdN>u{f0N
z%7~~{#*!;*bO}pKA=zzvrdD?%&9!fl(;U6zPu-pOJsG(%I|l6)or~Yrs~ZOeS(<{E
z!vbyCem%4mJf-y8@RbAyR)F1!SJZFbiW8552vampJ$Tsg^g5uBqimeRUvW}EGtZv$
zJJXfn^rTRW3Jb!&X)b@!Vh9iJ=kNo7WmA=`0`wg@{Lq|Bi1xJ4v{bM0Z)`0O>9?<t
zfpr~$sAxJsw`827Wt&el7AdYE9I~>&zm@%b9(#76x<Hyp<~z%&_(YSOR#UCb>3_+`
zy8OFF&7JSvYO$d(Eyj|eSBbOWY?_@0nXl^adrc6#N@oAel%|>-`)=F&BSDqb=NhY5
z%#&DQM^g$L9iOAG%uX$ui~f;Y(429vK`s)%=r^$3F5lGl!LxoJw)|{6oy_07``gO{
z_vhK|!LCn@;ahzkJavOZbk19(Y?~L`mm_<p%NqleWZ?SiIE%~Fbn%kVE_vjH-hFMV
z#Ud%owHe460QmA#dPP>*b{yqI1^qf93pYSC!1UV2IT;2SQZLYOonf#<+lSfu$KwEa
z8#oVz%?3k``r%3wo)^5cD)bp}2rWx2@huo;v%mo?P!%}W0#$2X6W_1fO8-nuJKQBB
zw1a?LBx;&C+8beyO+$V+xbR<;nX>BK1fUlS4+mgD5$@Q_Qqus0Ar%-F4}h?is4y*>
z6!?;5IyapiCK&`64FdRx@{4t-jxMpa;-)={iwi!=n{dSmPvk{Yz~Zz7#L?IWYRB`n
z$lCh!n69OuJX1dYW7U(8VEZO=RVv+y4k9W}K(RAfW<pyNw<(^Y@|T=WG*UrV#?2Bd
zNE{qNjO7@+EMoA=u6P>(da^CGW-AG-J0x;1d{w>v+Y5gqRu>m=(Vk-d=b3^~DrYdh
z|F#x7SSjhS=Fz1`0<Bmj)#i%%&_z1TQ}n$bzy3x$_FIw%739=OexRJCUK2?T(cvEF
zimTTS(da~+nxV*x62W?En0@Ih)n?g#olo0{sUs<g;23DE=izUbL)?vqktgL&F>z8C
zVqbHgaFV(d%+32nWzpcZE3^D|K{~_0kL)H&nDp%aw^ZTou>y;@oh!KIx!=6Gg((`D
z4_^8FPbw(&#hb@JN&iXc=|$jp`Y$dHgmzVLj-H~`jmQ)h#vI{%7C&h)mT#(2->;sY
z)VYb?Kr4O+DgXOG<i5K;bM9wv&A*R9=kGpWTlhJ6_unVY+p1C`Hj{IOLQzo_l$XHO
z=2{wn)L&qJrU9|R9{^LR7zc@{%lP<Bpb@G^KsMdf^(Xj}60T22r8}v&xJR)k>@~-+
zv^uP$)6&iI(E{#S4ZjTLS9m%OEc)N8#jL0_=nl#JTuFM|K8p@ukETQPv($gdS&#PZ
zwY{@Faef*PO>Ou+{Re4D1gRvGe?Jo%Gc=1}F677@YVo|Xt5tl;FTIm{hSaOK&WyiH
zUl#Y|v-tHeKqP<)h6!W#zbqGXO_ct(bxS8<Iu(S&2{aM8a1{J?e?%QTvBpB|^H-n@
z5p?S3)%Hb`b~v~-oA0^?*G!p-F$GvG#L4mF%9BN~A}#(2Dq&(dGLDRlCS6T{xLj38
zFP(9?atOZadcHIps>;xX&k7-RuNo<EFDvM*S%^tulKI<`uLY`xYNyyZaawy@2_lSY
zX%<N_B2N@Jmr>$7I_D(d>8Ep`a57;5Pq=SEHY2buoH%rTXqNUA!-0-Q7G<X!#lidS
zL2^XywL@U?Q9{2|qMai5Oq|=T3ai#QK4T}s9$vJ-HFzAIP<%6e3Cp*T5&4h=jabZD
zHL(iQB^w@z=xV?r2>!?D+!G3y8h(P4n$w>#GM~_qU0NAzk(rhjAj!o9DN?dL8X>=!
zFNICEKFZD>)<HC+iVf%Ba7wL#rgkxWGwVG5vCtr<Mca395YhG$ma9%U<zR>$hvHno
zz>O&!7-HcwEV(re*^-leu>=S><PZfwWOVcQi4Ho72_N=yAB~gG_a@j{7Vr;eG{RF^
zD3Ir_qnP5=9U@omkj+gY2lzNB0KfuEzB40YVPQnz8zL|a3!{7mM>2{dh`{``d^#1f
z2+;K_w|GnjiPAw3vN8mde`ryx9)vJFiX)fu!^`n~y7}9~3FbM;{JJ^t_WZlEW!uB4
zg>C#c8kzTabBzLFBEB$V8Y~E-Kh9@(WjvQeE)gVa>-!__+)UaP=8TQyi#<;KnZY1}
zRp5SPk0K|A8TXcwij2*UkS(<R#T_A&2p%c33(isA5P3{V+(V^jn_anXU(Q??OKyba
z&{c!5$e~gm5g@Ga)OCei?Ul6rEQ&~aph&cKd{PY81L~D&i|RPyxd#>32$aM@3oH9r
z%hF$RSL2hHbwKylSs59G0ye#CNu`Cy5ar(xzcsk3<1izRzs55G=BcND5d#~3Q&mpl
z@LYy9A!}AJoEtgU%7y9`F|dz>nv#n19)U=+1_j4wDMU-5yZp)2Sopn!40$y7iYpv$
zm6}Da%niow6K>dQ=>z1>P5-hv#sr@2Jg!vW<KWYxWCD?){o3ku1u*ZS9ywtO)GO2|
zLailF`iC>9T-NYY_GvoaN#93o6n#(1VSS!ifaEZ#jjnJE5tNQkg=<miG~fd!cy}1M
zdz2$gH8>p@pg*Dg+K<0?2<FSQ^NfyLwXZJwUIJR@-^HY~Hq<)G6_QAB-)g?gQpkas
z)KlXujJ_Ml;JunW9VAC@dNAabJ_xk3ZjKxQ?k+}X_EPKo5s#Nt7lT!mbkDbaFTJaE
zrTM4=8-o4y(>%LOcdD^8i&n<BS9)D5a+4^o5ftV9qir_mW_m!}$LrCp9eK~Ajc&5V
z-TK`D5{UiS=avL&(=qQHjkUNDn>w;28McG9NmDY|viU9(D-zJ9)ZeME<Ix!6@re)D
z`0OI>N7o`-_j7GizNwf;*4?Xlo`Wr&!_XM~J9kfb7vP&)zg%Zw#;t8@kNrEHnUl9H
z-raiJA>NxAJ$<LEMZeoHyHjs1_Mdgk(_ACFiratZVgXLkL(ijUs@>rpvHc;P62MNe
z6;|?rb&qgOkLcYV@y(tSe|pd=m-Dqdo2|WgJvz+Sx<=ol74Fg|>~GZ4Al8k&TPxHX
zmw`eQaji`efpO@C#oqWe!@S_0PM(gfm`jg;i}3*=ygmK420RVeeqaVbcT+_W4-uq7
zH0|456X9pap+pRqIk5ji5@c@+Y=<7ueiy7(ex}~swHpqZIzU=8t*cuhF?S)hp*?Wi
z0G(GR<!nF%9p?9_Q><Nc!;Rl}u|sCnM0*8tjv@5<CvPm#k@_=O-5D;556In+b!8&2
zm~l<uhFr;j9qNz`In47<Q5G470Km$@ccV!hf)sWViCrl-P9=T#VpW}Q5)1A_hFzpX
zJ400s03$}EQ47Gxru*n>)CedWIExY4K1w#G_gB;V2V{qCJnFXs3~VX%spS9=B*4o>
zPS|C@1;@K2GP`p}2^`0NQLiB&8tV8Q>O<j~OoC2*7=1c2YKNjz?t*7NKrEBsKk>CE
zw4!8(M*QT*&iblq{xP_L8RF|X#_HpI#gO<%<69mU;6&7J=>O_=JE0TrZ0-SF^oDGP
zrBszJEJEL)2H%jB1;_8dA@kgKHU)fySTMl;JfJZX5N;IeMWvhb8AoYHMgO2*+8ilH
z8BRS#y7OBN$g(})F&q`@zr`c!$Rip@0?aRR&r?ba*g1}BSoeR{4D0=cTKJ^Ik&Z>3
zGy;Guh)}0uD0&eng6DpKY`(lrf5;4eNapbQ>9QT468{xkO@(ynUIGqzYl@|K*q)BS
z!vT0W3=4PS(RxKh2vT^5@rt19ch{rg7tr@T$#v_&JVpjw-4=AnN3awCRE`BD)dDSu
zgI1f=AZ+9_bJrR4{J9sAWu7({u~0G0eODS#OrFjCMdU#KLpL%&-u7NO08mvR-B`dL
zBGrGbW^U4h-%JBWWQSc~Lc?D~8lY#+p&t!+a*HfNEEa(hD0+9`$b{-x7(1T`RzMUZ
zlH@<XrNi~h1L{nibjCtmne*-+i!Sy)R4rivoN#yu1pst`8=AwFaC35-15e&hzkAVl
z(}cghmZu{T;!T45pf8=H1Ea1$2EypFw9(8zq<=4hWddhs(2JQL)AB~`UCBUC%%~5;
zTZDeU-Jp+b+p4HJ@h+73?$P6Ul5~3XvP~Qci<a>IF!!Egka%gy$D_gn1v}R>qxl&4
zT^#gnbo3l;=CF3KF%iYB>RKnSYn04UDkki7O!de>i#jhSjH?jvQFkDM#1Ow#d=K(K
z+P6#k<b-H$*Me3p&n*tvo4?Tgf(>Es`>`T0KNQS`_Gn-fEP|PF(U_54grJG^(_@or
znxw{Empa(^)x^0t%xDn@NtDil`e6BNl{a$i=F*9PXslx<XoDyn<dJPK?znN?j{p6~
z>Gy_{`c^Qn<B}`wr3+f=(DTXnu180I+tedDAPk2rTLIL^`|*e1egDbR98Znl3UH0q
zCz1D3WQgzsaqOpoFwaRd@5ylS!H5?F&&Qx16vEFCM0fIYUyUbGb~1yHA3~^WAMM;q
zwsFOE9mL)>aju$7>$tX%7AcSI_tP=5X6_@gJt2?oj8z*gvE6R^5p(iHC-QrDQqwJl
zb+nF}ja!@%+a~st`|SnmoeVyYWzk!Fojc#>c2N9hyoPq5D?3M%UFW=FU4`CC`|o(B
zynX-M<Zn8SSN4`p%3G)ZSUZ7UJ59>F7wV0HHM<v2(Dd)U@fYgu^xlrIf0uag-IZ7G
zQvQ2KKCzc(v?u+2OK9O#W_C}mS6_DFUcONzf{r9)KpB`T5L1jT&;fsiTb#uGi}{qz
z;If?q1c5SZgUVb_e`fHkbeYy(6s|=u6R2E3!m(GzO!9jd{BdF2(O7|Kra&gWD{j#+
zuog#8gd?yYE#X|pdG@NwIiDjlMH*1=fnyw+Qw-hQq2{nh28=gy!BJe!-&LHO8S$=y
zXcTzr3_^px|BE@(75VJJJt-A$S=mv4xHo{NVk&rK+4m5%QTXXrRYmqY4%z?Yu6$Q{
zOJ$n2V5Gh+etpc6{Q&@FN+SeWqQ4k3T9kupg*gV_-W#p4p*4cTNbIh@0E4wJ<8)9g
zCVrWoernjD!Q|Yp43uZqS(KpWS*i{6O)7**xnW=NiwR7_Ab5nH)N_H9Xa_%0AJtX4
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
E2X|bJod5s;

diff --git a/layout/html/tests/block/images/ifc-home.gif b/layout/html/tests/block/images/ifc-home.gif
deleted file mode 100644
index 3d41c47fc3d2ba3ba0a8ac7bd579fa6c49acc002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/logoweb_gif64_150_49.gif b/layout/html/tests/block/images/logoweb_gif64_150_49.gif
deleted file mode 100644
index c44840f7c3ccfe63f205195ccfe78002095f38bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1975
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
JxK9WI06Xa=2s8iy

diff --git a/layout/html/tests/block/images/mozilla-banner.gif b/layout/html/tests/block/images/mozilla-banner.gif
deleted file mode 100644
index 1640e73105e7a6496653c9999e8a04f55e876eb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/november.gif b/layout/html/tests/block/images/november.gif
deleted file mode 100644
index fcbccf5bdb32fb9ca6c2acdf688ff8323de8eb20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/images/tech-banner1.gif b/layout/html/tests/block/images/tech-banner1.gif
deleted file mode 100644
index f3316caafe3492f34db9ef1d7659df1f8bebe12b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15807
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
JM{+;_06TD?xETNd

diff --git a/layout/html/tests/block/images/tech-banner2.gif b/layout/html/tests/block/images/tech-banner2.gif
deleted file mode 100644
index 33a6c038f12fc93d6de264c328dce37cc0b061fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11865
zcmV-fE~e2(Nk%w1VU+=30QUd@U0qy(fq|%=kH}{;yn{lMf?uU&GW`7fk%)DIMIx1V
zJK*5pmNy$^Wo4|1Mb4#CN;@8+MIx!9mvu842L%E)D;CkezLI}gY*<UxrDF2(@^&c|
zb8~ZH004J7I>3iSY(*lZq@<-R7KLgxK{XrA&CQj8fTjTe^~GeOf<bp{R_yHTzrVlG
zeLti#8BswXg<M<N)XOk1FNiQ0av2S2U{kYtUvmKfnv{oS7z`E?2`?rSOaK5)J|C1U
z7Ewntv2{C>0RZ{=`HKMnf-4o4MIx=3ZN|pNe|vJ~yk}`96S1+eSQQJJ9S=Z2KYKzU
zJuw)ptgNVlU)<Z<RYW4v&c~9FkWc{u%*w^NwX4(8(P&ydv1MV6jg5g73b8mGd}A`7
zpPmj22A@MA_xJakJsyoX9CTeSX;dns7Yv#K09{HYT31lX!n3D_L#II@Y5)MhYg}70
z8E#lCjD2520RZOa<}?EV&b5NU!N7%eRJlSS9vKbF$HV5hT;|u)R0jidW=x1I79#-w
z@bK_kMkD*lWqovE-P+XMvR!|3S+%XCm||OM3<i=#BClgkk3Jt+3<g^P0l=VNV+I4H
zcVA0GGkgpN-=U$5Bod;FUw&^=Y;0_u3kFb6Ohz~yY6u5@0RUo8D3b^TM;Z<D^6>QY
z@l!$}i8LAy4-brCUB{t;y}Pz!IwI-j<IA<5b{-I*YhLQ<=*_8NOCb=tlZxcy<9#I(
zOa}yZ1_P~KT(Xs2FboEZN<4)w7n4FEg?L|IQa-9}HpRrljd3`QdR16WHdqr8*w@te
z#$$$sg`$dsZeT?9_4Hd12(+GWbZuUUE*E<{9j>UIxqm-K3kH!72vH9Rtq=%PMJjv_
z2bdBGDIpN|*_`Iek-w;WznM($(wATn3E#wxB_0v-@$gSSAj87Jv4cWrWL=h)m6&g0
z<=@j`AQA7sVTK$IXlQ52qJW%zKDK{fsHdkq4F_3DEsk?Pe{4jcnT~G}306fS|KOnj
z00960|NqQpA^8LV00000EC2ui0F?n?000R80Qc>qa;gW39el)4=*O_3!+tj+N}M?H
zp~Z_BGiuz(aU+k9AVZ2ANs@;~3S#)|AkpI#6@f5g!X#)Ap$-Z-`vK_4@Qx${K!XY$
zN>u28qXSMTUCOkn(jgS1M&wELq13ArbLG0^<=wkXV8e<X3$}?hYomq?3Bp#5Tc=7p
z$el~KuHCzKVPTrGz|IN{WDXqgr@@~<ng<gu)Ci}s<HwJyN}fzPW68^yKb}mvvgJ#e
zpb;Zf*l;J$K|G48UTpyB05xo5%hnYHw(U@mb2qNsZ=vtrz<pyKo=e+19}LDsSkAn;
z^9XO=h%lQr2<^9O;NsoR{Vt7KERJaZS@2iL;KGLsCML~TcW&PB<9EzVf8=JBEM0;Q
zt$y@kom8R5+JHtOCEJ14$p#y4?nNeFM#EvXl^2;XP=<2PJr~^@F8Dy*TGzd$U3VmM
zrw<olM8QG{<TZ1iVFUH2*hURP_TY^;_EX=Enq`C%exB_olV~$CWLif85=fwH2+oEe
zgEhjDqeT&3HDQGpW~e2H9-;+eZP{h#REcEXr4J*@s1wC7$jG9B5QM=<BzqY}>DZKb
zR>tFw_jRV9kTc0h=aC#GsU&MmHpv!k2SQn6o()wg)s+@vsAY4}xiFoV3A!cbm}Q14
z7bv}OpiCI7Xkkk^aH1DuO-0uK*#R80)=KNG9YCrpPkYwaXMUdn`s#ZB5xS9~hpLvS
zqKwMsXoI^-8Wp8kUdr5t9e&tpm?Mf>CMX^>fP^|rut-R&atit%Mr7{lu13Am_iK>C
z4(nfO0j8GhYD})xWV5k7>t3|dX2lhjmRbuPm)eH-X;a>Y3N8Q~SW)f*=f;^HtaP%A
z>&Ldn=fo0(__Kr)9a+J`$~(!hG7DBb<cZ2J*KG667UZn+&N{2Y<Gg<gOXN-Xo~G}<
zMY*=t(n0u}V54?Qsp}1J6dVz?30s?Km(_)M!oy2N{H+HRTWl`68xy-xyS#bg&)aYt
zdl3t82hfibaI?@5IVHgV?f2h+2QIijCe%@fuRd}HY`ymKanoXQXEaD1NGpq!T52`T
z)|XJ*NwC#7V6E`A9B$e*m|%x3c8L>Ld~wFE&bjVIY+E$P?YQTjyDWjzu?8Bt=N<#x
z0=xhW+*S0j&m7GR?)>wAn{bEW@+J;s(0~$T4ha>Iqk}>?0f5u^<d;vu9k^7U^yLWp
z3ou&(>-KrUT4_UJrK3X!UACNho%#u@V;$LCcQ%bRu4A+-5k`W?zyb(P1A+J*1LrWj
zx8;KbihvsyNMMddK<|Ukliu{IhmjxoDOf^#!6%@=4ae!=h3R;q3};9~9q{5B!pNZx
zcgVvY?$9-(2%-@Ghp3Ao2JsT0NTL##s6_KQ(R>PtB1*(S#VS%!D_G2;7PWGTt#IWy
z_{-nc8iqQ!05E{vX`R_HhPDIF&LXvY$OLugz_*ox6@Dv41c4X43i<;FP*8yeD*ypk
z_-zq5NMryO$;d`J(gf##+c``?$x52w2X`1@W`Ksm?5PI|JJ<m?MhT5kn(~yW<OVI;
z0fbh%@|CcJr7(anOJNM41xIPZHg?HNUUH$AyYzxK^g+yGUP2#@xI{9oNW~gD^O?@{
zf;6W|&1zQjE6AzV=*HMTFnz6CXvB*eU)RQ=J&}BrNT)j0S(gRQ5qEX;2NrhVLAaG-
z3!>no@ZbjjNI||03l;c;-*6Dh3P2%1CV-m>2EovV4kDA(yMja~O3^Ev6DK+##|ar1
zqZdHn6C@x36h;b+k(%_RD20L?CP0mry7Z+mZK*4%@yZt1v;|GbsZMtqhn?p19k2*0
zP+{Q(8qlDqMdgE1m%3DPIMu1C<c26iN!6-`k}O!ost>Z6HLaD7I*TeJIKyd|aTYLk
z>gnDKnaS2hfWobCO(HvUb&+?%Q-eFG03P9n2vOuycYf^WAO#9HXzTzApXk9w%U6el
zzHOlpo!;~ehYLVh_Oh6@>^YlBjta2k1*ZtDXh%!hQ@p?&J%E5}RZEA}x>mJ4h^=f}
zAq@im*!H%##qCQ85YwBsKm@?e>2!u0hu{KN1ev&na+j;zciaLN&LxK_t6G7)R^Yk@
zO=(EC%iZlV;Je@ruXx8>h6{CdOWX{ibv$Lp6Rh*S@Qts0*J)NZ8gL*U1!W7F%3q}#
z^}qiuW+Ny;SKHZj4)Fvi6taN`zfHlf`lKK~136ezz^xoeP=O-o;E4`<_`@{3#xfMj
zi+WV!8YoV&Ggcgl7Q6Vxk$~n4`M?c>e&V$_&T)=gi{l=c1GJ+BK>|KN<RTk6x4DI>
zZ;xx-<Jy49!1aM31VMx<Q<=)QNbW5Pirws*l)Im}@oHsjjxw9s%;in9n%B%`HIL!{
z&2WyhoX7BnGH6PdXc>hrI>F~YW8(za_%k+?2-ij!`p}3@w4xVXU)aIuRUqxMq`O?@
zN>}>1us|jy+-cVY2lN!8XfR**@z>i0mcsuGXcj=|Hw+i_I|{AGHFA&x02`IoIS_}g
zcg^em_E)OcO{uVlebSPmG^7wPN6>_9<Ypfk$+mUrlA+Ax;zC)<Q_l94wT<0lhcwJ$
zhCpn83}ly3;oRsx_ngx_Uh%g1-E4M2wsg76U#6iGfzG$Si&;!t`}^MjrvWS)-Ny8w
z_M_lVc*4zq3Whrz6{zsVEod-cPQTOBpD4r{L}6jLWr5UuJheaNNk~x`lGSkk%Lf!l
zaEn^NZ5gCsf)X~MT$<B7sJRx0Ghp0e8P8a$PYt@zhfZ{IKtt%jCIJLq5G-ap`{_ug
z25(zBZE6Ge$=9B;FSN~dL3nwjU=A~Eef$C-pIcbWd2@NcyVbV4{q1m%d)#-rjWom|
z4R}ujHuSD<Yydc@%C)rM2T%A)&w$|fJq$rYTlU5~zU+|rMdT+B2}q!V2(TFN8~br!
z1P^xOq6kFC-<E|!{8i+GEd(<}jdFkd;1fh}`P*RLjtvmO7r6IDl_#F-NM!c1Yz@8`
zz9;<R3qKvmPkuU}0gXe@fer<TegUK)g$!8#`q<CD_P3t_8+iZwHi(1&_pQxjA8ftr
z(MW&#wYy!hkNwA@Jv*Qxpd7U`zz3P|ivIV{|Ni@*|4r}?^yW)kzy)z|fC!j?jKB!7
z(15W}36%hT5;%br_<i$$c&-u}>9&FB<_I46fsP<~X5b5%MhTnOc^LOQXb^g(;5XAy
z2xx!?sF!LPCklmt0Ibl0tOiIMAbb8mdmG>jGcbfRpnK1i1HK0c6(v!N)r3x1KH@_@
z!^a1nMK4bGbj=2BFXdaB0%cv;h2?jCQ>K1o7!B<AZQ(X<<tBeZf+25qfB7d&+AxQ7
zSci6ahj^$Bmv9MZaTY?<XMF}}eRpWY1Perf3YGT@inxf3*ocn*sE9>?fse*fGEoGU
zc!@>e2#{a~n5PdWSXT#@g21zabnrI_V0tr1a-RTt`_Ka*MFO7yRj5<}$N)EePytHd
zgFq;RL}-LGAP&BF1tjq<4?!q6p*U7JWLTJmAE1TQz=dFFb=O9Qf>4G;cx)>Ni|(g}
zX4greL4WjD2KV<4Ua&>xc#h~83hJniYB5A2Vn*r&3i?0;w}6O{h>7@^kNPNyl(-+6
z_>Yc|iJM4*o_K<x_<4M^f(T%WYmkZnwTdw)3TrSBR8R<9CTY-Mi#yN`x=0GO$BRSg
zi@+$1!$^!p(-0=KIQwvg%UEPlH+9e`Z<-Q~)aC<asD4EMIE3B?i`w{pWfxj(*oMn7
z2I43P@1PC206Gy83c0Y3p@2F5;wk@gM(NZD^k|Rzn3Y<|kNsGQ0GWxJ$cZIrke!B*
zxPu03u#kQO3{@~;BUcJxCP8x$gTQkJ*{E=z&;}aGkuT?wL70;w83`n5A0}xe50R3|
z*pf%qj7dgyHzkuZDFTsMlhH5(WSEoJ_+?=?W@Oim^#YDWIgUuFluNmeQ0X-92r3;w
z307H;k*AfgiH}^_l`!#@0U4GA`H2QrmNY1rw}Y0eCOCj(4}XIQRS*NnnVd0ToK?`A
z&RGQ~_cm6*4SYF!ehHFANCXo%k|j}?hUpN9`6n#@shH3PlaC3Rl9`^7Ig>tsneM5R
zn%RD7*qK1-jWXeeMR}A-Nt(mqluwyCZNXlu$(mRBnz4DHk|=!&x}Xf&pbGkYhX4)8
z2LKdWp%khK7@DCPnxWr-JU_4ndQbox`V5-TmVpBeAj%G{=R7qK488CQ#Nz?I@CXT5
zqj6AxIGUqe&;>l&qdxkhKpLbxY6V1Eq((}lHISr9nhr3a0_y;MQZRkgSAB}<l8l*T
zF)5RhDR1hTp6&Ubn0ZoRH=pnal#BzK;^+hV$)8ve3OB%xP#GJk2{Cd(psx7~2a2Er
zv__6boAp8kD#SvM1B$$<ioSW4YY?1=WC>9JU=GYMdMoNTVW3gf`GbBL4G;%$MYx@U
z*_~5jIG`G;qDnoua1Amy0n(5Fs=BIG`fO1rbuBdkvO24@TC1`u2gD|9-34y%SEfNJ
zl;Ow#Mmd^ndKLbOIdUqXbh?_YiIsT@o3rVs`vIsc#0`VGn-^!6!DE90po9Jp20M@q
zBmi=X8maz}57LE;9r=+t84cR`i=A4MIWnsB8mgsws;RoF2>=4<-~a^RuK@e61b_|%
zTd)Ruumvjz3cIij+pr6pt2>E?+en}0cBb{0rfXWPQQ?%QnXK(K7k28b&zhBzSXw4q
zv40w<)|wO8I!9nY2Z|5~!2ksiaHwbhi3Wwx1A$Nj*cA-s@H?Wg580rkM4P06paRgq
z21>iMOIrb>bXXhU2#f#&7|;sW37GH7o$`t!_1d-fssyO2ulwo%WLvgo>i}+$wrZQU
zDbTiUD-S6ExAG8D5L>sp+Fd>AlksPt_c@gLNvs-65yuLksPjJ{+pGpUvirEF<P;}5
z_F6uMJ=3bP-(zv_gqE)O37{5Xx`UP~^lf_tJT~ZxA_aD^*b+ZrRjO-H5O8}Npaku}
z1nn?$*cq6EDH3?nwe|Y7VXLnoaJIm^wrZOKZs4}Y3%A^5w|0xS63dxoD!D>}rlPr@
zfh!Si3a7{#pdVYOh>NF+ySQcl)3}8(X_5wZi3PneL9K!cJ}o;(D>#uF$GO4tz5=lZ
z#Smd=SqK{#zjMG0*~q-GxOBPqx=Ju}w}-Wydb=T!ySh87yqmA9`n$kuw!%BS#{0Hy
zyIt9+yu>C_%*(5Ki?WnR1=~{rj<b32F+L8JNt5*v5+w=S5weN<y_hJ8zQ$D2by%OE
zY$*f*pyW7Igc3q524_&jMtsCbJeM(eJ4oEbXYiZAqX|t6#dJ9bX8;BxunFQOTU<<b
zE)kNtS7o?|nYQbx^V-0o`oLl<!4pij70k95jKSUYzZ`739-OHRU<P{ZZfQ1Wawaq-
ze8N+L6N5kj4aLGOd<ByK0K<48!`@57HO#nY<qyU;d>K`R=$jr8z&-orOknWIpd8Ag
zJj$e8%AdRorYy=MKnw~%2TaF-=_U|>ImYf;##?(MXq?8T3bqies%+fGXe+$L8^>^)
z0?fN|9IV0Hg$jAR$9oJ33;+pbAkDup21Nj8ph<s#%sqmPBjn>y57ojvpva7T7mf_c
zvMI^-RTxdE1NZ>}nJf^eU=EvnU8);OBaqMfywCjH&;I<+`Me7NozKKj(5x&E1;Dp5
z0j9N_wed=rXPnEFwadL5!N6R$Z(O`_9Jc`czaE^tAnnn5YzECt(%)5H(p+BE?8nNn
z%_dAVIYP*W%utB`98rrL!`+L{ksQ90yb&m&1KdEf@!V0F3&09+)JUDwO1;!f-PA`t
z2~NG#@_^6^9TN;q#tyB(Ai=;AT?cCHyBF=o6+Fxv4Zw8k!N}~vz_8YA-PXWRfi^G?
zaXk;KP}lKb*YS|odOZ&gDt&YS3=x_R7CP93UD$>lg)0nEhcnKKjMD}B$T}^FK0SPg
z1<zGYkpdt9_Rs@cAOHw3Zssu6qAd^45CfW^0HdASsy)@azz*MV)bgMSuka01JqfFw
z+HKGVqFn%#c-02r3Z@Xo32eq(+tpr8(Y-vjVV%(%ox!hY)^r?Fz+l!SFw)iyUTenE
z*zD5Xj3eUzQ^<$R!Zuybc5%)+ZHbb7A3<%|9Q8KS&;y&`56J_6=XMH<Pz8bDK{!Bm
zu-xAnBmiWWLCMntbYN~ASOtr43UAW`(@+HkjzS24-zdw_(O?1o@CO@^;Tr(2THPZN
zEzw^c!HiSijE7pWwOR_tlicO74toJCE(fh32aqX~c2-^+a^pC@A!ESZFnuEwfY^ym
zJ>z`Sjhxfx9f|7fXp^l2l|9rj0XK&rNLBC&!GHq@5D1E}1r3G+o6rWqK;@n-3RHmQ
zTOa|7aBhkq0a%XZ{vZH1W)1@W2`aD*2p|DlKm}!v1A!0-{(uObEdasLU{|gPr?3TC
zzH0mby#<N11++W^22cz0P<emwg9S`;@T!DMcm-Sy;uQS^PvE;FzIdi(;;E%t38&&K
zZmY8@4HHlaw94wz0P9~c>$G0$d+-H&kn6g>>$@HSJdVP=@!c~W&Wb(c<Xso$ectJ9
zJ?rh{0s%LsfCTd01K!%^Dd!J?a0q;54<`CH2p|A{Qw4&ga!M!QP~bPF00A9moEFsX
zecqN30Pf)aHd|l{_HGKjaKJVIH-8WdaMKR6y8*C}13UM7mQ~3JAAGp5@C@JZ4!`iG
zI=iU)=@H!D=_XobXW}RhZr{edE2ZkQ>guqLs;G(z6Hx0YKkK*7>nxw^JDxoy>^&_1
z`ydoh1B4vjiA>IpeWyo`<UGC3{;=dte%a6N4-()HEr<ouF7Ae841$gW{!jykbO?Hh
z18s=_({QeBY31_7=Qv<cBp^rt<qyrU1$GeiNG|~`>JP|Z32$QwwRi|v;15uc5B_in
ztA+qe;17#{N3~$U%@Ye2z6_IY0v@RZK}7>Ow_=RHVm|ly&cp<gKlzkj`I9g4s2b~<
z-wIva`Lg9&9FMmfjLakT@gU#owu%a}p7JV>>n-2%5n%C%p;qAYgiZ(mgCGVtKRwk@
zS(Y_ltT~T&3fYjn>?M>E%}(_D@HVvgPYWplP*95%F!wb8^)=9fJ+P2CF!y!;|3`EG
z13%yoeZU5P1Z*`RPu$=STEGo`;16t|4DGK0>E8$B@HXVo{y)(EP;m6s4-o#?^znzR
zPoHH>+QIVYPf0C*%PjcAKuRI3Td-i!;MlR_4v-;5jwD$Uq!N@VRjyn)!R1Sra!Aai
zS(7FdoH=n;;MvpX&kAxj3?({YsLM(lU@raQ;>%O0QK9akTGi^FF)y@k<!Y|SrwZKo
z=+Gg?>{+yF)uttzP6sbOym-~4Tdmr)Ymvl>Yt+}TUw!&$z#?J>5~N>=6)$GoIB^kB
z9sqE#vZTZULPGp$@Ym1tXVCp9h|#eF3WQTs_N`{!nsvhp#yIye)({#0Y%Kn2;LyFu
zpRI;9a#!Gu!?&$+{)Tz-*M$!sa%}t^;p0yWpJD!xl*>ZMpAO~Vzh}2Z&$@R@UHo}M
z;x9{<1;OqzIo?ptMETcpz}j%jzyJOMyu~I03pB8%r4m$7nwL;&=fQSp;buY#E40u;
zax&CVLkoA9kQSC!T1N?@ikg537eq)gMG?MeQ7RavV&D@RYqXI@5}>HS!wq}%@y8!k
zn2;1wXep8wS|Ds^FpZjYQlndl@Wl)&tF-b;EU$zlvdJpDEVIoz3oW$K_~7QW)Lc_@
zwJNIM2?;DD*a1#fSixck39twT&R{;t6ANf6$g=`CksyJUKBgJ}Mja>4fyXQz8dXP(
zbD|JKopaa-;han<os`o{&vAl}O*@4r4=2P>hEpp@si&Gqa#+Ly3oy7N9}8M}l?fXB
zBjQ(JgEePZVv9BQSY(HNVp(RJb(UFa7*wJiCaS%L30}z3c3W<{^;X;G!hOynCUPh@
z2Xxb22i*r#B1!~!<BhiodF!=T1VMoM38$HK^7mhW1BL>a9A}c_U^$dX7$#pDcKG2L
zB1R=*UxKyxVvMEak}}IM(~Pq*$t2A*)Kpv3wHH3osV5zM3fN_TcO<7Q3Tn3bW(u6Z
zdFP#V=6UBk?x+J7TzIG>XrzONHHRprjQHuNsgQbVs;jpD`f8~Y(0XgGyWaW<X_>f&
zXrc%C`Rt$7>XsL0BFPJ{w<B>z6=&)eC*22gNMmol`}X^9zuyseaOk+HfP_yVP<(O5
z8+ZJ1#e1Mbj#etSJX*}9vGOp^JEsyAUozUrBhpJR9hQx~^f=6rK`Zmjl23N+l&=zp
zz^0sRvN1;}X4+jxZfK^U^?p1dzIEe||4isQcrdz-ql1Qi=vWE!1#0YN*M57iyYCw8
z38*D{db5>3erL3}<pmc&$Zj8y_f>%(5V@JS8{KX4*S{0~`}hC<{$ZmNmsrbLbifDG
ze4+=ZU|<6s_&^9okbwm#L<K=`!3#1g0g%|BV-|D&7*r4e7J>Oo2~BvyMx?G|U;^3s
zMusMnZI22s7?xJN(gUw7t_M5hA+dT8Ib%UUWjo-57=}kYHkdCo$ul4HoaemhHE(*j
zsGifX_q6S0aZTRiVgkS?K3tGbiOR!S`pP1P^<CkKYjhqAcyI;yMM7?MbH+COHwrwC
zA_!{O;~v%UM?eNr4L3j=Y0mVC7f4Nui!1~M3xPopG;3>)pkxs&c}YzE0urdW1r1V2
z2~dVol%pgiC{_5SkBP|%0SEv&Tvw(YkRWzys=^`|Xfi6?GM5buL=_OA6$u9O1w9}^
z1uQWPD||)<PGF`JQqd0pgv<&oXk9eN1OOKQ$N)5K<filBSjFpIF=C4(=RUgVy)QB$
zjA9&P$c9%&NRg&2>+9wd-FSs7uy2la>%=zlh(|sKw2y)$C>)448XX)mk>$){BOm!l
zNIqeb38*9{EviXQ>Z1{q=s-t3`caUEw4<k79mtr|kUUTz4=F_`0!gsI7`DbARTx&9
zWTyy!2*4aKu&EZQV2)x+Cl8-tK|>nignlG(Ohv6`$O7OGq<*HJZ2abatSC-~YVn-i
zOXv8YH;8t&?wvL>qgm)VRX4sdj&!W!C_0fxJ_bRqa}_8-|7cLLQXrvFKx9m_swRg*
zG=t0H8YLZJ(ThT22Di{CM@9Nrk&=}Eg`Fv?6&m0P85~sy06>BzYG90DC}ImZpo7##
z8;F^HA{z*xLm(7E1w{m63$LXE4iJ#jPXGf4uT`Wd5P$&Jio&&{Rm3UGF<K7zW2l}1
zKp6b7fL6+Y9@^|jDgXe0R1}pQ9MI-6x7!8JSQoqfcq&r2>j`_Vqa7Y#uLpR*-eb_u
zs^P@yU$wVYuXQzwU=6D~Z)V1M77eXWTq_;z=+;rFL632r>p<<Q2E6)ruYI-e$s7s-
zh&~~b5}jm45o<|JE><6)a4cj^JW|PU43(^Nu0NK*24ys482M<3ck&?sqxu5}s5NR8
zdcYZ@n!_Ka@CPDrY}9<vxFMVWFh^>tkYg1*naKV?05EdAT+cYcAJlBIKdg|75;P<L
zMK!7uis~JIa2L&lAV+ym>W>&)10qJ1fIn8y3V)R27*w3EILBGxli~M!3<4uN`%9+(
zLW(SA6>vS%3P<{}wG-BOYaZ!(>44fb!egr0gck~E*911Ak({W9KOADlZuG>fmTW4k
z8wNC6q9H$M2sC_?WPeP9H&vL1dk*0bEVQQzDsY8AKGBeA9HJCdrZEm!;SUMqgGS~+
ztt(W}27g4^ANk0_wx5iH_F%amT4n(`{6UBicn1J3W@b?VumpdM*~?E20K5a>+%S}P
z0cnPJa@XVBd;25IUFbCb>^==@tqS^UgjVN%5A8b9BwC(}KC7b%9BDerk$&^TXU9GM
z@sFQRuL|`ms4pzo4Hwqbh(+~?OT6mGwwiUGXaEKFEggUC;5QY3hK^}mgBk$aH-~@%
zuz4c^C=90|IB5t3dX9q{u!6|YI1Nq_L4rC9M>oaE%_qz)ZgOjx5G7y%3!IzG>~@CU
zMP+8Z+0Gmml-E0{p!ai&7w^nA#FZmI&A}1QJ%wwntLv--e;@9dv5v-o+CpQayZPt>
z*G-O*m>(cOetD3K+|wlow5TztL9IE0qKEx3h!vaam%}`yG6$J=_RZ#o>;O2(ST+uL
z19V{DwiLI~Q$uq9<Btl!rUK8lMeUJMCo1#R9z?#4ZgR659Uo`kVBc~-2tf!~TOscy
zkT-eV4pl9)^113RuX8a2)i9qw0R1TH5+c4=2>AW)vJ1T68BX}ZA6_(wC+p%V?s#rW
zD;|hE$)h~@fg{XIz$?%^lAFKPIJpcOtPUf+(rY;qQ$5IHJ%0dzF3<w&NC!*M0xd8G
zXjlMQSOhJwJuNtdLx_PaFb1jX11(qtW0(e6&;l7W1}%sI&;o`kkOfvq!D(0kQ(%Q)
z2!@wJ09QbUMbMKx*^^*9lyXpqJV+*GVu56m0eE8p;{kvY&;n1GCTL;-0GK8jkbx42
zrT|y~?i)k@8At_KD*@xtLKd*Me%QCD(ko~H20EaF0{BBf3`9X3L_#b?K$HSROhiRo
zL`AHGN>~R~Pz4y6L>Q=n>$*ft%tTGx#B>0FbofM2{6rO?L{cn8Zz909(YOOtK+I!6
zzLGzLGelW5L^=QlX!yiU%tc*H1yAUb6>_zR69eej0iM{2eOVcO*_R6F9hFH&z8aQh
zJVu@%BAPj#sA{KcR3dn@j16Rt1>isUgGC2)jr#K<hN}jL)4z!8KSldLHL|!jq9VE3
zivl#jRb<7GJ1D-RuyHJazsn^EfPx*UMs?&xUtF;kYAIr*iBISkenA`@ama_{o!;>s
z2>1&BigZX>;;FCD3ET+_f<&JFVj?9XhcGC+^&7L~DY(Alym4fWavVHEd$`0?yoqzi
z0aGhLu$zoiMa#p-%+trsdr5ypIDmwL;4va~tgc>Ev62!Kgd&H-xkw!PAsyPGVc{Xh
z(aNjbDH^iM#_0i`$|bO*${i9Sfh?jU63MV4$)#k;_;bmZG^hI0ubHIDL@SGJX}ouQ
zyo;M7aj3`21Im2NtD)@2e>{bN97v@s$fi`C$wE9sdd6T9rU&9F2b!8-!X*a6Oa~gK
zVj7FJ3>j-`r_x+X(U{D*oXeAeB-eaRNNNQ+poMzig+aK@+k8uj;}*WmNl4>K!MsQR
z!o(+6<VOcAN>Dq>q#VtMGf1b5%+w4=xwJ3Cs!r>?PVB^}4WI#Wpae<yPVfv*RR~Y=
zEYI&8PxDOA?@T~Ipagw@g(-mq?3~Z*WX;x?A(dH9)Z9OKx=FG~qnsQ-IT8o^2~NxV
z$>A(caRfBv1hk`MOy)c^=Y&jGs~KS=8Nbua%G}V!pid8_B#aUveeh28L{IfBPZK>+
z6$MXF+K>4BP!F|F)|jDy)X)7)JOE?7njxOjRJ?9E3!K@{_iI4JG)l!p%8)#~RA7S!
zKmv96#W3+vmx8I)$fd93AuP>OEydE#L5yF3(d*PCGZ3L1=!;SUB}O<?HBD3hHEq*U
z>I)j!08}u8F9lQVl+h}Eff`Lx-Lz2u)6oe1jMEg-uwqH$oWBMIG{qzV2wh6+;s9j`
zgCInXRQdr+y;Mxi)Jx?GPVH1r{Zvp5RZ$&PQZ3a_)l^hXRaIS8R&7;ReN{{~23eg|
zW2m4txYacf1zi;dG}zTOs32esR$&!ZTrE~(JyvAR)m>dyW<`TJ0D}=A24YYEYOPjl
zy;f|^R&Cu@Zl%_HxCeX)1W;@MaxGVLJy&#X0C?a8BnSX?h=O5223gPm&1eWcxL175
zSAE6T5$IQc{a1huSb-f_f-P8sJy?WI*nZtthHY4feOQQ%Sc#ojh*ensi@jKk&De`2
z2932?d{6;s;DB~zC1ogClRa6KJ=rc$hcJi&7PyQRXodqYDkG>_o4r|_wOI$)S)T1#
zpZ!^&4O*ccTB0plqdnT4%~_>gTBdDUr+r$ejasKgTB@yDtG!yR&Dx`N15H2xD+q%y
zpob_JTe2-%vnAUlSOQjHfg{j@1y})ko!N%K1G=qSyS>}GeE_}PTfXgEzx`Xl4P3z;
zT*56}!_`~7O<cuYT*hr&$9-JLZQR41T*|Fn%e`F8J={rn1_79cC18PJz=9GOUD7RG
z(;ZzcKn7%306TzNGB^Oa^#^a5UD~Z(+ofGU$X(stUEb|o-~C<x;0<2k9bV!s-rT)i
z<V{}XU0&vGUgv#Y<~3gFonGp#UhBPH=}m-Ln1(E9+bLK8Td)K19bfV-Us;fa6<C3C
zXa*sG-5l!%_>Euro!|IP2K&8V{LNqe-CzFgU;q7I01jXQwqN=!U;{p21WsTDUSI}J
z-~oPM2##P0o?r@oU=&CKJa~mXa9j0l1~T|y5DsAx76KA(U-!*1en?>zUSSqi;eU8x
z7>;2Xo?#lUVH>_-9L`}K-r*N+VITfsAP!<79%3RcVj<>XBu-)_UScM0;v`N649<c+
zm;zal*&MrKEY9L9HewfcVlVz;FwS8v9%C{tV>3SDFivCtHC|&jhGBO|gl|{^EO^`3
z)nYrgV=``IJ>Fv+K4U*N<8b(fZ}{UO=3_%XWJG>pDE<aX)dE|f*E^2nEgoY%P6RN3
zf*v3ScSz(mCgdLuhfS~qIv58}=7(?aj8X<-PF`hJ{$fK&f?4PSdKiW&SOGGSWL)-#
zJZ58g2n{iK02>AaFh~R>mIp8Z2SiTg6%Ge601Z+m<WuekW%l7#u4ZfIVMB0-S#Z}N
zv;!;7<vZSGH3o;z5J=AugH5Jk&p>7#hJt<ogJhm&exL)-AOTAVhEk4Zd1m2j?q`3V
z;a8pn4(Ng?D1k?gU2x7~aZckN@C;!72V(FHVvq;_D42tPpy)a1<$l-!iiQF(C?a@%
z0G#*-k%oc?Xl6c`19xa>K3IcJmgh~VXFO2hP2hu#HUfSKhhPu`5<o&`;D?zof?&`D
zofbw-h~`ZY#+jDqe{O1j4roqL26{LG%s}Xbo@6d&V|Rvv81@Wd?gy?01F#lruO1V5
zAm@Jg2ed|OuwH|H5Q80nXExsFXs+jQU<S{y>3$f8U<eHo;0Msy1QPg+O{nX7-e;#y
z>}oayKiCC$2!KtQ0x-F1g{I^+cIO>%W3LwLum<Zykm%3e=!gbuv{q}+aEBe}hc$SB
zh9>QomgjHiYtKmPw;t?%i0QZ1gl7J0&#;95Z+HgJ*nx2v2c%AIX=ZB0PVPibhD6YW
z#}0#YknDP;Y^*k7Hl72|uxNL1=YDVivF3yA2J3%V=kZo;cd%(FK<fv<?zDF2kmhbN
zc<pJvfN`Mbez0#bkb#-dgx(H^)aLDe802WiXH!OHBS2;3R&E8~V-%PLV0i4vo^0wy
zVarzIL}=#F$ZWF4aF-_U&%p3GKx+)=gMV=Ee^>)^PV2db>2vmsaj*o>KtdUK2HVDP
z03T$2!0;U?Y*g0g1Yd9<Ph-a31r><usjlh?ukIpl;|I`d&wzqWP6Q|a<?=@6ybkV7
z=5EiBhZ2A1e=u&<mhV)??YI7EJaBUV5(o!881a6%@f7|B4Cira_VH;Bayt)WcbJ4?
zm<)n8XbrIH318?n28W4$Xcz_uL|5m20EY))=NE2ta7bqvP6TiuW-(9YK*n(u7UZSQ
z>2G-EPZs2T{^2_>^(HoiS-5~2XwoOu0&fO%>K1f=Chx=^bz8sn6gG8TM`A-r1XTxs
zs1AWVsO4KuathDt#HMwp#&u@@@m+s*8fNYSU<M|2Qp=!JV?TE5hW1r%c5g3bZV&eu
z&huhm116=6D2Q%bhV@vlaB(-}Z;y9Bes^x~bxqg=b8mow4gnT$bx6*3qmp%cUvYUa
zcw`^=JJ04s*abZ>cL0C~B(Q@25SY}=VE1-Ec!a-ngWq^k&v*qlgk;d>UAO=hr~x(r
z0DX5?dgymLw)l(Rc8@1`j-PpIj`^lm_*vKmO(=#<F!}3(2M!2;E(n7qI0r{2ggOTJ
z9J>IfZ+fSHdZ>?jsh@hPuX?M$daTcSt>1dC?|QHQdaw_Bu^)S~FNR{!14StLlSg@=
zM*?LS`Y2$95|{!zKzf&-@N~_4z2AGj?|Z-hd%zET!5@6WFMPv4e8f+D#b5lyhlh3L
z1d$B@Wv~Ku2m!Ulg4KoF_EmZ;W+l)6e9#Yl(I0)%FMZQLebi5V)n9$qZ++K)eb|qE
z*`IyduYJ%j*)E{`uvOdtVJLysl?9~Ve9ph(5Ga1*KYrv-e&t_&=5K!Ie}3qXe(9fn
z>aTw5zkck`e(m3W?(hEMrw8zlg0y9YJU9a1p8{I|e)hflY(E0`e}DLofBBz(`mcZc
zzkmGCfBoNo{s)L70tXT-Xz(DygbEijZ0PVI#E23nQcQ@YL<ud(rYx|tf{+F>LJs&V
zY4Rk>lqy#)XzB7L%$PD~(yVFoCeEBXck=A%^C!@tLWdG9`qGvyJF-4%XeMMN$(2&4
zPSs%bD%Px8w{q?3^()x0V#ks#YxXSKv})I~ZR<8`vt}X>(4}hkZc4g(_ww!Q_b=eU
zf(H{WZ1^zZ#EKU-Gj8noG33a8@lvjA`7-9rnm2Rq?D;e3(4t3^E^YcW>eQ-Nvu^GB
THSE~3XVb22`!?>-0RaFzG@X>+

diff --git a/layout/html/tests/block/images/vert_pixel_ruler.gif b/layout/html/tests/block/images/vert_pixel_ruler.gif
deleted file mode 100644
index 410b845f9906c5655497eb39c25630ca4b11a488..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/block/net/rtest.lst b/layout/html/tests/block/net/rtest.lst
deleted file mode 100644
index 18307855e9d2..000000000000
--- a/layout/html/tests/block/net/rtest.lst
+++ /dev/null
@@ -1,2541 +0,0 @@
-http://www.w3.org/Style/CSS/Test/CSS1/current/sec01.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/sec02.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/sec03.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/sec04.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test11.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test12.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test13.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test14.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test15.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test16.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test17.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test21.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test23.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test24.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test25.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test26.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test31.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test32.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test411.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test412.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test414.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test42.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test43.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test44.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test45.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test522.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test523.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test524.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test525.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test526.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test527.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test531.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test532.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test533.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test534.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test535.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test536.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test537.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test541.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test542.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test543.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test544.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test545.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test546.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test547.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test548.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5501.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5501b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5502.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5502b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5503.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5503b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5504.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5504b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5505.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5505b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5506.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5506b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5507.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5507b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5508.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5508b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5509.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5509b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5510.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5510b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5511.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5511b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5512.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5512b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5513.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5513b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5514.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5514b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5515.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5515b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5516.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5516b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5517.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5517b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5518.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5518b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5519.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5519b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5520.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5520b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5521.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5521b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5522.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5522b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5523.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5524.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5525.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5525b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5525c.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5525d.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5526.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5526b.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test5526c.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test561.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test562.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test563.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test564.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test565.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test566.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test61.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test62.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test63.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test64.htm
-http://www.w3.org/Style/CSS/Test/CSS1/current/test71.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/index.html
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/syntaxe/syntax14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select15.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select16.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select17.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select18.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select19.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select20.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select21.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/selecteurs/select22.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/cascade/casc1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/cascade/casc2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/cascade/casc3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/cascade/casc4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/media/media1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/media/media2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/boites/boites15.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm15.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm16.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm17.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm18.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm19.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm20.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm21.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/vfm/vfm22.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/visual/visual6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes15.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes16.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes17.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/listes/listes18.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/pages/pages13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/couleur/couleur12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/fontes/fontes14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/texte/texte9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/tables/tables11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/ihm/ihm1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/ihm/ihm2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/ihm/ihm3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss1.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss2.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss3.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss4.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss5.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss6.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss7.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss8.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss9.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss10.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss11.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss12.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss13.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss14.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss15.htm
-http://www.editions-eyrolles.com/auteurs/Glazman/tests/acss/acss16.htm
-http://www.hixie.ch/tests/adhoc/compat/fonts/001.html
-http://www.hixie.ch/tests/adhoc/compat/fonts/002.html
-http://www.hixie.ch/tests/adhoc/compat/fonts/003.html
-http://www.hixie.ch/tests/adhoc/compat/mozilla/001.cgi
-http://www.hixie.ch/tests/adhoc/compat/tables/001.html
-http://www.hixie.ch/tests/adhoc/compat/xml/001.xml
-http://www.hixie.ch/tests/adhoc/css/background/01.html
-http://www.hixie.ch/tests/adhoc/css/background/02.html
-http://www.hixie.ch/tests/adhoc/css/background/03.html
-http://www.hixie.ch/tests/adhoc/css/background/04.html
-http://www.hixie.ch/tests/adhoc/css/background/05.html
-http://www.hixie.ch/tests/adhoc/css/background/06.html
-http://www.hixie.ch/tests/adhoc/css/background/07.html
-http://www.hixie.ch/tests/adhoc/css/background/08.html
-http://www.hixie.ch/tests/adhoc/css/background/09.html
-http://www.hixie.ch/tests/adhoc/css/background/10.html
-http://www.hixie.ch/tests/adhoc/css/background/11.html
-http://www.hixie.ch/tests/adhoc/css/background/12.html
-http://www.hixie.ch/tests/adhoc/css/background/13.html
-http://www.hixie.ch/tests/adhoc/css/background/14.html
-http://www.hixie.ch/tests/adhoc/css/background/15.html
-http://www.hixie.ch/tests/adhoc/css/background/16.html
-http://www.hixie.ch/tests/adhoc/css/background/17.html
-http://www.hixie.ch/tests/adhoc/css/background/18.xml
-http://www.hixie.ch/tests/adhoc/css/background/19-alt.xml
-http://www.hixie.ch/tests/adhoc/css/background/19.xml
-http://www.hixie.ch/tests/adhoc/css/background/20.xml
-http://www.hixie.ch/tests/adhoc/css/background/21.xml
-http://www.hixie.ch/tests/adhoc/css/background/alpha/001.html
-http://www.hixie.ch/tests/adhoc/css/background/alpha/001.xml
-http://www.hixie.ch/tests/adhoc/css/background/alpha/002.html
-http://www.hixie.ch/tests/adhoc/css/background/alpha/002.xml
-http://www.hixie.ch/tests/adhoc/css/background/alpha/003.html
-http://www.hixie.ch/tests/adhoc/css/background/alpha/003.xml
-http://www.hixie.ch/tests/adhoc/css/background/alpha/004.html
-http://www.hixie.ch/tests/adhoc/css/background/alpha/004.xml
-http://www.hixie.ch/tests/adhoc/css/background/alpha/005.html
-http://www.hixie.ch/tests/adhoc/css/background/alpha/005.xml
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-1.html
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-2.html
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-3.html
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-4.html
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-5-bigger.html
-http://www.hixie.ch/tests/adhoc/css/background/bg-pos-5.html
-http://www.hixie.ch/tests/adhoc/css/background/bgafixed.html
-http://www.hixie.ch/tests/adhoc/css/background/block/001.html
-http://www.hixie.ch/tests/adhoc/css/background/block/002.html
-http://www.hixie.ch/tests/adhoc/css/background/block/003.html
-http://www.hixie.ch/tests/adhoc/css/background/block/004.html
-http://www.hixie.ch/tests/adhoc/css/background/iframes/001.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/bounding-box/001.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/bounding-box/002.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/bounding-box/003.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/bounding-box/004.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/bounding-box/005.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/001.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/002.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/003.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/004.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/005.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/006.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/007.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/008.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/009.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/010.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/011.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/012.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/013.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/014.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/015.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/continuous/016.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/each-box/001.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/each-box/002.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/each-box/003.html
-http://www.hixie.ch/tests/adhoc/css/background/inline/policy/fixed/001.html
-http://www.hixie.ch/tests/adhoc/css/background/position/001.html
-http://www.hixie.ch/tests/adhoc/css/border/color/001.html
-http://www.hixie.ch/tests/adhoc/css/border/color/002.html
-http://www.hixie.ch/tests/adhoc/css/border/color/003.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/absolute/002.xml
-http://www.hixie.ch/tests/adhoc/css/box/absolute/003.xml
-http://www.hixie.ch/tests/adhoc/css/box/absolute/004.xml
-http://www.hixie.ch/tests/adhoc/css/box/absolute/005-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/006-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/007.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/008.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/009.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/010.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/011.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/012.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/013.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/001.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/002.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/003.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/004.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/005.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/inline/006.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/001.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/002.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/003.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/004-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/004.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/005-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/005.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/006-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/006.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/007-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/007.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/008-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/008.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/009-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/009.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/010.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/011.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/overflow/012.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/001.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/002.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/003.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/004-compat-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/004-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/004.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/width/005-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/001.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/002.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/003.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/004.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/005.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/006.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/007.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/008.html
-http://www.hixie.ch/tests/adhoc/css/box/absolute/z-index/canvas/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/003.html
-http://www.hixie.ch/tests/adhoc/css/box/block/004.html
-http://www.hixie.ch/tests/adhoc/css/box/block/005.html
-http://www.hixie.ch/tests/adhoc/css/box/block/006.html
-http://www.hixie.ch/tests/adhoc/css/box/block/007.xml
-http://www.hixie.ch/tests/adhoc/css/box/block/008.xml
-http://www.hixie.ch/tests/adhoc/css/box/block/009.xml
-http://www.hixie.ch/tests/adhoc/css/box/block/010.html
-http://www.hixie.ch/tests/adhoc/css/box/block/011.html
-http://www.hixie.ch/tests/adhoc/css/box/block/012.html
-http://www.hixie.ch/tests/adhoc/css/box/block/013.html
-http://www.hixie.ch/tests/adhoc/css/box/block/014.html
-http://www.hixie.ch/tests/adhoc/css/box/block/015.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/003.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/004.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/005.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/006.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/007.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/008.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/009.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/010.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/011.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/012.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/013.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/014.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/015.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/016.html
-http://www.hixie.ch/tests/adhoc/css/box/block/first-line/compat/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/height/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/height/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/003.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/004.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/005.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/006.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/007.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/008.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/009.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/010.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/011.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/012.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/013.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/014.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/015.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/016.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/017.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/018.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/019.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/020.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/021.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/022.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/023.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/024.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/025.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/026.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/027.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/028.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/029.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/030.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/031.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/032.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/033.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/034.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/035.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/036.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/037.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/038.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/039.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/040.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/041.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/042.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/043.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/044.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/045.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/046.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/047.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/048.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/049.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/050.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/051.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/052-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/053-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/003.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/004.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/005.html
-http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/compat/006.html
-http://www.hixie.ch/tests/adhoc/css/box/block/mozilla/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/mozilla/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/001.html
-http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/002.html
-http://www.hixie.ch/tests/adhoc/css/box/block/text-indent/003.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/001.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/002.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/003.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/004.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/005.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/006.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/007.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/008.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/009.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/010.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/011.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/012.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/013.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/014.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/015.html
-http://www.hixie.ch/tests/adhoc/css/box/clipping/016.html
-http://www.hixie.ch/tests/adhoc/css/box/compact/001.html
-http://www.hixie.ch/tests/adhoc/css/box/compact/002.html
-http://www.hixie.ch/tests/adhoc/css/box/float/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/003-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/004.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/005.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/006.html
-http://www.hixie.ch/tests/adhoc/css/box/float/006.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/007.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/008.html
-http://www.hixie.ch/tests/adhoc/css/box/float/008.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/009.html
-http://www.hixie.ch/tests/adhoc/css/box/float/009.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/010.html
-http://www.hixie.ch/tests/adhoc/css/box/float/010.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/011.html
-http://www.hixie.ch/tests/adhoc/css/box/float/011.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/012.html
-http://www.hixie.ch/tests/adhoc/css/box/float/012.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/013.html
-http://www.hixie.ch/tests/adhoc/css/box/float/013.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/014.html
-http://www.hixie.ch/tests/adhoc/css/box/float/014.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/015.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/016.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/017.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/018.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/019.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/020.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/021.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/022.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/023.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/024.html
-http://www.hixie.ch/tests/adhoc/css/box/float/024.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/025.html
-http://www.hixie.ch/tests/adhoc/css/box/float/025.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/026.html
-http://www.hixie.ch/tests/adhoc/css/box/float/026.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/027.html
-http://www.hixie.ch/tests/adhoc/css/box/float/027.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/028.html
-http://www.hixie.ch/tests/adhoc/css/box/float/028.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/029.html
-http://www.hixie.ch/tests/adhoc/css/box/float/029.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/030.html
-http://www.hixie.ch/tests/adhoc/css/box/float/030.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/031.html
-http://www.hixie.ch/tests/adhoc/css/box/float/031.xml
-http://www.hixie.ch/tests/adhoc/css/box/float/032-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/032.html
-http://www.hixie.ch/tests/adhoc/css/box/float/033.html
-http://www.hixie.ch/tests/adhoc/css/box/float/034.html
-http://www.hixie.ch/tests/adhoc/css/box/float/035.html
-http://www.hixie.ch/tests/adhoc/css/box/float/036.html
-#http://www.hixie.ch/tests/adhoc/css/box/float/037.html
-http://www.hixie.ch/tests/adhoc/css/box/float/wrapping/001.html
-http://www.hixie.ch/tests/adhoc/css/box/float/038.html
-http://www.hixie.ch/tests/adhoc/css/box/float/039.html
-http://www.hixie.ch/tests/adhoc/css/box/float/040.html
-http://www.hixie.ch/tests/adhoc/css/box/float/041.html
-http://www.hixie.ch/tests/adhoc/css/box/float/042.html
-http://www.hixie.ch/tests/adhoc/css/box/float/043.html
-http://www.hixie.ch/tests/adhoc/css/box/float/clear/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/clear/002.html
-http://www.hixie.ch/tests/adhoc/css/box/float/clear/003-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/clear/004-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/float/stacking/001.html
-http://www.hixie.ch/tests/adhoc/css/box/float/stacking/002.html
-http://www.hixie.ch/tests/adhoc/css/box/float/stacking/003.html
-http://www.hixie.ch/tests/adhoc/css/box/float/stacking/004.html
-http://www.hixie.ch/tests/adhoc/css/box/float/wrapping/001.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/001-simple-1.xml
-http://www.hixie.ch/tests/adhoc/css/box/ib/001-simple-2.xml
-http://www.hixie.ch/tests/adhoc/css/box/ib/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/ib/002.xml
-http://www.hixie.ch/tests/adhoc/css/box/ib/003.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/004.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/005.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/006.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/007.html
-http://www.hixie.ch/tests/adhoc/css/box/ib/008.html
-http://www.hixie.ch/tests/adhoc/css/box/inline-block/001.html
-http://www.hixie.ch/tests/adhoc/css/box/inline-block/002.html
-http://www.hixie.ch/tests/adhoc/css/box/inline-block/003.html
-http://www.hixie.ch/tests/adhoc/css/box/inline-block/004.html
-http://www.hixie.ch/tests/adhoc/css/box/inline-block/005.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/001.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/002.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/003.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/004.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/005.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/006.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/007.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/007.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/008.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/008.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/009.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/009.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/010.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/010.xml
-http://www.hixie.ch/tests/adhoc/css/box/inline/011.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/012.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/013.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/014.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/015.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/001.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/002.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/003.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/004.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/005.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/006.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/007.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/008.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/009.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/010.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/bidi/011.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/border/bidi/001-demo-b.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/border/bidi/001-demo-c.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/border/bidi/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/compat/001.html
-http://www.hixie.ch/tests/adhoc/css/box/inline/mozilla/001.html
-http://www.hixie.ch/tests/adhoc/css/box/list/001.html
-http://www.hixie.ch/tests/adhoc/css/box/list/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/002.html
-http://www.hixie.ch/tests/adhoc/css/box/list/002.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/003.html
-http://www.hixie.ch/tests/adhoc/css/box/list/003.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/004.html
-http://www.hixie.ch/tests/adhoc/css/box/list/004.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/005.html
-http://www.hixie.ch/tests/adhoc/css/box/list/005.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-image/001.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-image/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/inside/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/inside/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/003-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/004-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/005-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-position/outside/006-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-type/001.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-type/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-type/002.html
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-type/002.xml
-http://www.hixie.ch/tests/adhoc/css/box/list/list-style-type/003.html
-http://www.hixie.ch/tests/adhoc/css/box/replaced/001.html
-http://www.hixie.ch/tests/adhoc/css/box/replaced/002.html
-http://www.hixie.ch/tests/adhoc/css/box/replaced/003.html
-http://www.hixie.ch/tests/adhoc/css/box/replaced/004.html
-http://www.hixie.ch/tests/adhoc/css/box/replaced/005.html
-http://www.hixie.ch/tests/adhoc/css/box/root/001.html
-http://www.hixie.ch/tests/adhoc/css/box/root/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/root/002.html
-http://www.hixie.ch/tests/adhoc/css/box/root/003.html
-http://www.hixie.ch/tests/adhoc/css/box/table/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/002.html
-http://www.hixie.ch/tests/adhoc/css/box/table/003.html
-http://www.hixie.ch/tests/adhoc/css/box/table/004.html
-http://www.hixie.ch/tests/adhoc/css/box/table/005.html
-http://www.hixie.ch/tests/adhoc/css/box/table/006.html
-http://www.hixie.ch/tests/adhoc/css/box/table/007.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/008.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/009.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/010.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/011.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/012.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/013.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/014.html
-http://www.hixie.ch/tests/adhoc/css/box/table/015.html
-http://www.hixie.ch/tests/adhoc/css/box/table/016.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/border-collapse/collapse/evil/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/caption/001.html
-http://www.hixie.ch/tests/adhoc/css/box/table/caption/002.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/003-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/004-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/005-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/006-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/007-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/008-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/009-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/010-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/011-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/012-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/floats/013-demo.html
-http://www.hixie.ch/tests/adhoc/css/box/table/generated-content/001.xml
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-auto-width-table.html
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-fixed-sizes.html
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-one-row.html
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-spanning.html
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-three-rows.html
-http://www.hixie.ch/tests/adhoc/css/box/table/inspection/inspection-two-rows.html
-http://www.hixie.ch/tests/adhoc/css/box/table/playground.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/alternates/001.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/alternates/002.html
-http://www.hixie.ch/tests/adhoc/css/cascade/alternates/003.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/001.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/002.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/001.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/001.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/002.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/002.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/003.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/003.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/004.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/004.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/005.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/005.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/006.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/006.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/control.html
-http://www.hixie.ch/tests/adhoc/css/cascade/import/dynamic/control.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/non-css/001.html
-http://www.hixie.ch/tests/adhoc/css/cascade/non-css/002.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/001.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/002.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/003.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/004.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/005.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/style/006.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/weight/001.xml
-http://www.hixie.ch/tests/adhoc/css/cascade/weight/002.html
-http://www.hixie.ch/tests/adhoc/css/color/001.html
-http://www.hixie.ch/tests/adhoc/css/color/002.html
-http://www.hixie.ch/tests/adhoc/css/color/003.html
-http://www.hixie.ch/tests/adhoc/css/color/004.html
-http://www.hixie.ch/tests/adhoc/css/color/005.html
-http://www.hixie.ch/tests/adhoc/css/color/006.html
-http://www.hixie.ch/tests/adhoc/css/color/007.html
-http://www.hixie.ch/tests/adhoc/css/color/007.xml
-http://www.hixie.ch/tests/adhoc/css/color/compat/001.html
-http://www.hixie.ch/tests/adhoc/css/color/compat/002.html
-http://www.hixie.ch/tests/adhoc/css/content/001.html
-http://www.hixie.ch/tests/adhoc/css/content/002.html
-http://www.hixie.ch/tests/adhoc/css/content/003.html
-http://www.hixie.ch/tests/adhoc/css/content/004.html
-http://www.hixie.ch/tests/adhoc/css/content/005.html
-http://www.hixie.ch/tests/adhoc/css/content/006-demo.html
-http://www.hixie.ch/tests/adhoc/css/content/attributes/001.html
-http://www.hixie.ch/tests/adhoc/css/content/dynamic/001.html
-http://www.hixie.ch/tests/adhoc/css/fonts/001.html
-http://www.hixie.ch/tests/adhoc/css/fonts/002.html
-http://www.hixie.ch/tests/adhoc/css/fonts/003.html
-http://www.hixie.ch/tests/adhoc/css/fonts/004.html
-http://www.hixie.ch/tests/adhoc/css/fonts/005.html
-http://www.hixie.ch/tests/adhoc/css/fonts/ahem/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/ahem/002.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/ahem/003.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/ahem/004.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/ahem/005.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/family/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/line-height/001.html
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/002.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/003.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/004.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/005.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/006.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/007.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/008.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size-adjust/009.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/002.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/003.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/004.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/minimum/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/size/minimum/002.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/variant/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/variant/demo.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/weight/001.html
-http://www.hixie.ch/tests/adhoc/css/fonts/weight/001.xml
-http://www.hixie.ch/tests/adhoc/css/fonts/weight/002.html
-http://www.hixie.ch/tests/adhoc/css/fonts/weight/002.xml
-http://www.hixie.ch/tests/adhoc/css/inheritance/001.html
-http://www.hixie.ch/tests/adhoc/css/inheritance/border-color/001.html
-http://www.hixie.ch/tests/adhoc/css/inheritance/border-color/001.xml
-http://www.hixie.ch/tests/adhoc/css/inheritance/compatability/001.html
-http://www.hixie.ch/tests/adhoc/css/inheritance/content/001.xml
-http://www.hixie.ch/tests/adhoc/css/inheritance/content/002.xml
-http://www.hixie.ch/tests/adhoc/css/media/001.xml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/001.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/002.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/003.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/004.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/005.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/006.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/007.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/008.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/009.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/010.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/011.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/012.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/013.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/014.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/015.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/016.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/017.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/018.xml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/019.xml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/020.xml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/021.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/022.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/023.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/024.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/025.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/026.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/027.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/028.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/029.chtml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/030.chtml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/031.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/032.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/033.chtml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/035.wml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/036.wml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/037.wml
-http://www.hixie.ch/tests/adhoc/css/media/handheld/038.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/039.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/040.html
-http://www.hixie.ch/tests/adhoc/css/media/handheld/047.html
-http://www.hixie.ch/tests/adhoc/css/media/queries/001.html
-http://www.hixie.ch/tests/adhoc/css/media/queries/002.html
-http://www.hixie.ch/tests/adhoc/css/media/queries/003.html
-http://www.hixie.ch/tests/adhoc/css/model/canvas/001.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/001.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/002.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/001.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/002.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/003.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/004.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/005.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/006.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/007.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/008.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/009.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/010.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/011.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/012.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/013.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/016.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/float-edge/020.html
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/001.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/002.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/003.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/004.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/005.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/006.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/opacity/007.xml
-http://www.hixie.ch/tests/adhoc/css/mozilla/text-align/001.html
-http://www.hixie.ch/tests/adhoc/css/overflow/001.html
-http://www.hixie.ch/tests/adhoc/css/overflow/box/001-demo.html
-http://www.hixie.ch/tests/adhoc/css/overflow/box/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/001.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/002.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/003.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/004.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/005.html
-http://www.hixie.ch/tests/adhoc/css/parsing/compatibility/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/compatibility/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/003.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/compat/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/compat/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/compat/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/compat/003.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/strings/investigation/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/core-syntax/strings/investigation/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/003.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/004.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/005.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/006.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/007.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/001.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/002.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/003.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/004.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/005.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/006.html
-http://www.hixie.ch/tests/adhoc/css/parsing/encoding/@charset/007.html
-http://www.hixie.ch/tests/adhoc/css/parsing/escaping/001.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/escaping/002.xml
-http://www.hixie.ch/tests/adhoc/css/parsing/escaping/003.html
-http://www.hixie.ch/tests/adhoc/css/parsing/escaping/004.html
-http://www.hixie.ch/tests/adhoc/css/quotes/001.xml
-http://www.hixie.ch/tests/adhoc/css/quotes/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/active/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/active/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/active/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/active/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/active/003.html
-http://www.hixie.ch/tests/adhoc/css/selectors/child/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/class/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/class/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/class/003.html
-http://www.hixie.ch/tests/adhoc/css/selectors/class/004.html
-http://www.hixie.ch/tests/adhoc/css/selectors/class/compatibility/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/class/compatibility/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/empty/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/empty/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/empty/003.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-letter/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/first-letter/002-demo.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-letter/003-demo.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/003.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/003.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/004.html
-http://www.hixie.ch/tests/adhoc/css/selectors/first-line/004.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/hover/001.html
-http://www.hixie.ch/tests/adhoc/css/selectors/hover/002.html
-http://www.hixie.ch/tests/adhoc/css/selectors/mozilla/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/003.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/004.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/005.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/namespace/006.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/003.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/004.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/005.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/006.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/007.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/008.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/009.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/not/010.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/parsing/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/003.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/004.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/005.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/006.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/001.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/002.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/003.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/004.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/005.xml
-http://www.hixie.ch/tests/adhoc/css/selectors/selection/mozilla/006.xml
-http://www.hixie.ch/tests/adhoc/css/text/align/001.html
-http://www.hixie.ch/tests/adhoc/css/text/align/002.html
-http://www.hixie.ch/tests/adhoc/css/text/align/003.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/001.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/002.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/003.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/004.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/005.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/006.html
-http://www.hixie.ch/tests/adhoc/css/text/decoration/007.html
-http://www.hixie.ch/tests/adhoc/css/text/letter-spacing/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/003.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/dynamic/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/003.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/004.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/005.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/006.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/007.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/008.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/009.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/bidi/003.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/none/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/collapsing/none/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/line-breaking/bidi/003.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/005.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/nowrap/006.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/001.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/002.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/005.html
-http://www.hixie.ch/tests/adhoc/css/text/white-space/pre/006.html
-http://www.hixie.ch/tests/adhoc/css/ui/cursor/001.html
-http://www.hixie.ch/tests/adhoc/css/units/001.html
-http://www.hixie.ch/tests/adhoc/css/units/002.html
-http://www.hixie.ch/tests/adhoc/css/units/003.html
-http://www.hixie.ch/tests/adhoc/css/units/004.html
-http://www.hixie.ch/tests/adhoc/css/units/005.html
-http://www.hixie.ch/tests/adhoc/css/units/006.html
-http://www.hixie.ch/tests/adhoc/css/units/007.html
-http://www.hixie.ch/tests/adhoc/css/units/008.html
-http://www.hixie.ch/tests/adhoc/css/units/009.html
-http://www.hixie.ch/tests/adhoc/css/units/010-detailed.html
-http://www.hixie.ch/tests/adhoc/css/units/010.html
-http://www.hixie.ch/tests/adhoc/css/widgets/001.html
-http://www.hixie.ch/tests/adhoc/data/001.html
-http://www.hixie.ch/tests/adhoc/data/002.html
-http://www.hixie.ch/tests/adhoc/data/003.html
-http://www.hixie.ch/tests/adhoc/data/004.html
-http://www.hixie.ch/tests/adhoc/data/005.html
-http://www.hixie.ch/tests/adhoc/data/006.html
-http://www.hixie.ch/tests/adhoc/data/007.html
-http://www.hixie.ch/tests/adhoc/data/008.txt
-http://www.hixie.ch/tests/adhoc/data/009.html
-http://www.hixie.ch/tests/adhoc/data/010.html
-http://www.hixie.ch/tests/adhoc/data/011.html
-http://www.hixie.ch/tests/adhoc/data/012.html
-http://www.hixie.ch/tests/adhoc/data/013.html
-http://www.hixie.ch/tests/adhoc/data/014.html
-http://www.hixie.ch/tests/adhoc/dom/compat/001.html
-http://www.hixie.ch/tests/adhoc/dom/core/001.xml
-http://www.hixie.ch/tests/adhoc/dom/core/002.xml
-http://www.hixie.ch/tests/adhoc/dom/core/003.xml
-http://www.hixie.ch/tests/adhoc/dom/core/004.html
-http://www.hixie.ch/tests/adhoc/dom/core/attr/001.html
-http://www.hixie.ch/tests/adhoc/dom/css/RGBColor/001.xml
-http://www.hixie.ch/tests/adhoc/dom/css/StyleSheet/001-demo.html
-http://www.hixie.ch/tests/adhoc/dom/css/canonicalization/001.html
-http://www.hixie.ch/tests/adhoc/dom/css/computed/001.xml
-http://www.hixie.ch/tests/adhoc/dom/css/computed/002.xml
-http://www.hixie.ch/tests/adhoc/dom/css/import/001.xml
-http://www.hixie.ch/tests/adhoc/dom/css/import/002.xml
-http://www.hixie.ch/tests/adhoc/dom/css/import/mozilla/001.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/001.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/002.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/003.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/004.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/005.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/006.html
-http://www.hixie.ch/tests/adhoc/dom/css/inline/007.html
-http://www.hixie.ch/tests/adhoc/dom/css/mozilla/001.html
-http://www.hixie.ch/tests/adhoc/dom/css/quotes/001.xml
-http://www.hixie.ch/tests/adhoc/dom/css/quotes/002.xml
-http://www.hixie.ch/tests/adhoc/dom/css/quotes/003.xml
-http://www.hixie.ch/tests/adhoc/dom/css/rematching/001.xml
-http://www.hixie.ch/tests/adhoc/dom/css/rematching/002.xml
-http://www.hixie.ch/tests/adhoc/dom/css/rematching/003.xml
-http://www.hixie.ch/tests/adhoc/dom/css/rematching/004.xml
-http://www.hixie.ch/tests/adhoc/dom/css/rules/001.xml
-http://www.hixie.ch/tests/adhoc/dom/html/attributes/001.xml
-http://www.hixie.ch/tests/adhoc/dom/html/attributes/002.xml
-http://www.hixie.ch/tests/adhoc/dom/html/attributes/compatibility/001.html
-http://www.hixie.ch/tests/adhoc/dom/html/events/001.html
-http://www.hixie.ch/tests/adhoc/dom/html/events/002.html
-http://www.hixie.ch/tests/adhoc/dom/level0/001.html
-http://www.hixie.ch/tests/adhoc/dom/level0/002.html
-http://www.hixie.ch/tests/adhoc/dom/level0/003.html
-http://www.hixie.ch/tests/adhoc/html/bidi/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/image-maps/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/002.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/003.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/004.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/compat/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/compat/002.html
-http://www.hixie.ch/tests/adhoc/html/flow/lists/compat/003.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/002.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/003.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/004.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/005.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/006.html
-http://www.hixie.ch/tests/adhoc/html/flow/object/007.html
-http://www.hixie.ch/tests/adhoc/html/flow/p/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/p/002.html
-http://www.hixie.ch/tests/adhoc/html/flow/p/003-demo.html
-http://www.hixie.ch/tests/adhoc/html/flow/p/003.html
-http://www.hixie.ch/tests/adhoc/html/flow/phrase/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/pre/001.html
-http://www.hixie.ch/tests/adhoc/html/flow/pre/002.html
-http://www.hixie.ch/tests/adhoc/html/flow/pre/003.html
-http://www.hixie.ch/tests/adhoc/html/flow/pre/004.html
-http://www.hixie.ch/tests/adhoc/html/flow/tables/001.html
-http://www.hixie.ch/tests/adhoc/html/forms/input/image/001.html
-http://www.hixie.ch/tests/adhoc/html/forms/input/submit/001.cgi
-http://www.hixie.ch/tests/adhoc/html/forms/input/submit/002.cgi
-http://www.hixie.ch/tests/adhoc/html/forms/input/submit/003.cgi
-http://www.hixie.ch/tests/adhoc/html/forms/input/submit/004.cgi
-http://www.hixie.ch/tests/adhoc/html/frames/001.html
-http://www.hixie.ch/tests/adhoc/html/frames/002.html
-http://www.hixie.ch/tests/adhoc/html/frames/compat/001.html
-http://www.hixie.ch/tests/adhoc/html/global-attributes/title/001.html
-http://www.hixie.ch/tests/adhoc/html/meta/base/001.html
-http://www.hixie.ch/tests/adhoc/html/meta/base/002.html
-http://www.hixie.ch/tests/adhoc/html/meta/base/compat/001.html
-http://www.hixie.ch/tests/adhoc/html/meta/content-type/001.html
-http://www.hixie.ch/tests/adhoc/html/meta/content-type/002.html
-http://www.hixie.ch/tests/adhoc/html/parsing/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/002.html
-http://www.hixie.ch/tests/adhoc/html/parsing/003.html
-http://www.hixie.ch/tests/adhoc/html/parsing/004.html
-http://www.hixie.ch/tests/adhoc/html/parsing/005.html
-http://www.hixie.ch/tests/adhoc/html/parsing/006.html
-http://www.hixie.ch/tests/adhoc/html/parsing/007.html
-http://www.hixie.ch/tests/adhoc/html/parsing/008.html
-http://www.hixie.ch/tests/adhoc/html/parsing/009.html
-http://www.hixie.ch/tests/adhoc/html/parsing/010.html
-http://www.hixie.ch/tests/adhoc/html/parsing/011.html
-http://www.hixie.ch/tests/adhoc/html/parsing/012.html
-http://www.hixie.ch/tests/adhoc/html/parsing/013.html
-http://www.hixie.ch/tests/adhoc/html/parsing/014.html
-http://www.hixie.ch/tests/adhoc/html/parsing/015.html
-http://www.hixie.ch/tests/adhoc/html/parsing/016.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/002.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/003.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/004.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/005.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/006.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/007.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/008.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/tables/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/tables/002.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/tables/003.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/viewer-internal.html
-http://www.hixie.ch/tests/adhoc/html/parsing/compat/viewer.html
-http://www.hixie.ch/tests/adhoc/html/parsing/implied-tags/head/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/normalisation-test-code
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/002.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/003.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/004.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/005.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/006.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/007.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/008.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/009.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/net/010.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/tagc-omission/001.html
-http://www.hixie.ch/tests/adhoc/html/parsing/shorttag/tagc-omission/002.html
-http://www.hixie.ch/tests/adhoc/http/link/001.html
-http://www.hixie.ch/tests/adhoc/http/link/002.xml
-http://www.hixie.ch/tests/adhoc/http/link/003.xml
-http://www.hixie.ch/tests/adhoc/http/link/004.txt
-http://www.hixie.ch/tests/adhoc/http/link/005.txt
-http://www.hixie.ch/tests/adhoc/http/link/006.html
-http://www.hixie.ch/tests/adhoc/js/arrays/001.html
-http://www.hixie.ch/tests/adhoc/js/dom-binding/001.html
-http://www.hixie.ch/tests/adhoc/js/objects/001.xml
-http://www.hixie.ch/tests/adhoc/png/001.xml
-http://www.hixie.ch/tests/adhoc/unicode/bidi/001.html
-http://www.hixie.ch/tests/adhoc/unicode/bidi/002.html
-http://www.hixie.ch/tests/adhoc/unicode/bidi/003.html
-http://www.hixie.ch/tests/adhoc/unicode/bidi/004.html
-http://www.hixie.ch/tests/adhoc/unicode/bidi/005.html
-http://www.hixie.ch/tests/adhoc/unicode/bidi/006.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/001.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/002.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/003.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/004.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/005.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/006.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/007.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-16/008.html
-http://www.hixie.ch/tests/adhoc/unicode/utf-8/malformed/001.txt
-http://www.hixie.ch/tests/adhoc/unicode/utf-8/malformed/002.txt
-http://www.hixie.ch/tests/adhoc/uri/001.html
-http://www.hixie.ch/tests/adhoc/uri/backslash/001.html
-http://www.hixie.ch/tests/adhoc/uri/backslash/002.html
-#http://www.hixie.ch/tests/adhoc/uri/backslash\001.html
-#http://www.hixie.ch/tests/adhoc/uri/backslash\002.html
-http://www.hixie.ch/tests/adhoc/uri/javascript/001.html
-http://www.hixie.ch/tests/adhoc/xbl/001.html
-http://www.hixie.ch/tests/adhoc/xbl/001.xml
-http://www.hixie.ch/tests/adhoc/xbl/002.html
-http://www.hixie.ch/tests/adhoc/xbl/002.xml
-http://www.hixie.ch/tests/adhoc/xbl/003.html
-http://www.hixie.ch/tests/adhoc/xbl/003.xml
-http://www.hixie.ch/tests/adhoc/xbl/004.html
-http://www.hixie.ch/tests/adhoc/xbl/004.xml
-http://www.hixie.ch/tests/adhoc/xbl/005.html
-http://www.hixie.ch/tests/adhoc/xbl/005.xml
-http://www.hixie.ch/tests/adhoc/xbl/006.html
-http://www.hixie.ch/tests/adhoc/xbl/006.xml
-http://www.hixie.ch/tests/adhoc/xbl/007.html
-http://www.hixie.ch/tests/adhoc/xbl/007.xml
-http://www.hixie.ch/tests/adhoc/xbl/008.html
-http://www.hixie.ch/tests/adhoc/xbl/008.xml
-http://www.hixie.ch/tests/adhoc/xbl/009.html
-http://www.hixie.ch/tests/adhoc/xbl/009.xml
-http://www.hixie.ch/tests/adhoc/xbl/010.html
-http://www.hixie.ch/tests/adhoc/xbl/010.xml
-http://www.hixie.ch/tests/adhoc/xbl/011.html
-http://www.hixie.ch/tests/adhoc/xbl/011.xml
-http://www.hixie.ch/tests/adhoc/xbl/012.html
-http://www.hixie.ch/tests/adhoc/xbl/012.xml
-http://www.hixie.ch/tests/adhoc/xbl/013.html
-http://www.hixie.ch/tests/adhoc/xbl/013.xml
-http://www.hixie.ch/tests/adhoc/xbl/014.html
-http://www.hixie.ch/tests/adhoc/xbl/014.xml
-http://www.hixie.ch/tests/adhoc/xbl/015.html
-http://www.hixie.ch/tests/adhoc/xbl/015.xml
-http://www.hixie.ch/tests/adhoc/xbl/016.html
-http://www.hixie.ch/tests/adhoc/xbl/016.xml
-http://www.hixie.ch/tests/adhoc/xbl/017.html
-http://www.hixie.ch/tests/adhoc/xbl/017.xml
-http://www.hixie.ch/tests/adhoc/xbl/018.html
-http://www.hixie.ch/tests/adhoc/xbl/018.xml
-http://www.hixie.ch/tests/adhoc/xbl/019.html
-http://www.hixie.ch/tests/adhoc/xbl/019.xml
-http://www.hixie.ch/tests/adhoc/xbl/demos/fader.html
-http://www.hixie.ch/tests/adhoc/xbl/demos/fader.xml
-http://www.hixie.ch/tests/adhoc/xbl/demos/fader2.xml
-http://www.hixie.ch/tests/adhoc/xbl/demos/simple-document.xml
-http://www.hixie.ch/tests/adhoc/xbl/demos/simple-driver.html
-http://www.hixie.ch/tests/adhoc/xbl/demos/simple-xbl.xml
-http://www.hixie.ch/tests/adhoc/xhtml-mp/001.xhtmlmp
-http://www.hixie.ch/tests/adhoc/xhtml-mp/002.xhtmlmp
-http://www.hixie.ch/tests/adhoc/xhtml-mp/003.xhtmlmp
-http://www.hixie.ch/tests/adhoc/xhtml-mp/004.xhtmlmp
-http://www.hixie.ch/tests/adhoc/xhtml/mime-type/001
-#http://www.hixie.ch/tests/adhoc/xhtml/tables/001.xml
-http://www.hixie.ch/tests/adhoc/xhtml/flow/tables/001.xml
-http://www.hixie.ch/tests/adhoc/xml/001.xml
-http://www.hixie.ch/tests/adhoc/xml/base/001.xml
-http://www.hixie.ch/tests/adhoc/xml/base/002.xml
-http://www.hixie.ch/tests/adhoc/xml/base/003.xml
-http://www.hixie.ch/tests/adhoc/xml/dynamic/001.xhtml
-http://www.hixie.ch/tests/adhoc/xml/parsing/001.xml
-http://www.hixie.ch/tests/adhoc/xml/parsing/002.xml
-http://www.hixie.ch/tests/adhoc/xml/rfc3023/001.xml
-http://www.hixie.ch/tests/adhoc/xml/rfc3023/002.xml
-http://www.hixie.ch/tests/adhoc/xml/rfc3023/003.xml
-http://www.hixie.ch/tests/adhoc/xml/styling/001
-http://www.hixie.ch/tests/adhoc/xml/styling/001.xml
-http://www.hixie.ch/tests/adhoc/xml/styling/002.xml
-http://www.hixie.ch/tests/adhoc/xml/styling/003.xml
-http://www.hixie.ch/tests/adhoc/xml/styling/004.xml
-http://www.hixie.ch/tests/adhoc/xml/styling/005.xml
-http://www.hixie.ch/tests/adhoc/xml/xhtml/001.xml
-http://www.hixie.ch/tests/adhoc/xml/xlink/001.xml
-http://www.hixie.ch/tests/adhoc/xml/xlink/002.xml
-http://www.hixie.ch/tests/adhoc/xslt/001.xml
-http://www.hixie.ch/tests/evil/css/import/extra/altandmedia.html
-http://www.hixie.ch/tests/evil/css/import/extra/alternate.html
-http://www.hixie.ch/tests/evil/css/import/extra/alternate.http.html
-http://www.hixie.ch/tests/evil/css/import/extra/charset.html
-http://www.hixie.ch/tests/evil/css/import/extra/charset.http.html
-http://www.hixie.ch/tests/evil/css/import/extra/defaultlanguage.http.html
-http://www.hixie.ch/tests/evil/css/import/extra/httpexoticmedia.html
-http://www.hixie.ch/tests/evil/css/import/extra/importafterimport.html
-http://www.hixie.ch/tests/evil/css/import/extra/importexoticmedia.html
-http://www.hixie.ch/tests/evil/css/import/extra/index.html
-http://www.hixie.ch/tests/evil/css/import/extra/linkcharset.html
-http://www.hixie.ch/tests/evil/css/import/extra/linklanguage.html
-http://www.hixie.ch/tests/evil/css/import/extra/loop-self.html
-http://www.hixie.ch/tests/evil/css/import/extra/loop.html
-http://www.hixie.ch/tests/evil/css/import/extra/mediaexoticmedia.html
-http://www.hixie.ch/tests/evil/css/import/extra/specialchars.html
-http://www.hixie.ch/tests/evil/css/import/extra/styleexoticmedia.html
-http://www.hixie.ch/tests/evil/css/import/main/alternate.html
-http://www.hixie.ch/tests/evil/css/import/main/basehreftest.html
-http://www.hixie.ch/tests/evil/css/import/main/contentbase.html
-http://www.hixie.ch/tests/evil/css/import/main/contentbase.http.html
-http://www.hixie.ch/tests/evil/css/import/main/defaultlanguage.html
-http://www.hixie.ch/tests/evil/css/import/main/exoticmedia.html
-http://www.hixie.ch/tests/evil/css/import/main/index.html
-http://www.hixie.ch/tests/evil/css/import/main/multiplealternate.html
-http://www.hixie.ch/tests/evil/css/import/main/preferred.html
-http://www.hixie.ch/tests/evil/css/import/main/stylesheetalternate.html
-http://www.hixie.ch/tests/evil/dom/css/001.cgi
-http://www.hixie.ch/tests/evil/html/fieldset/001.html
-http://www.hixie.ch/tests/evil/html/fieldset/002.html
-http://www.hixie.ch/tests/evil/html/fieldset/003.html
-http://www.hixie.ch/tests/evil/html/fieldset/004.html
-http://www.hixie.ch/tests/evil/html/fieldset/005.html
-http://www.hixie.ch/tests/evil/mixed/IMGalt.html
-http://www.hixie.ch/tests/evil/mixed/IMGalt2.html
-http://www.hixie.ch/tests/evil/mixed/IMGlongdesc.html
-http://www.hixie.ch/tests/evil/mixed/XYZ_desc.html
-http://www.hixie.ch/tests/evil/mixed/anchor1.html
-http://www.hixie.ch/tests/evil/mixed/anchor2.html
-http://www.hixie.ch/tests/evil/mixed/anchor3.html
-http://www.hixie.ch/tests/evil/mixed/attrlinewrap.html
-http://www.hixie.ch/tests/evil/mixed/backgroundimage-padding-padding.html
-http://www.hixie.ch/tests/evil/mixed/backgroundimage.html
-http://www.hixie.ch/tests/evil/mixed/bgafixed.html
-http://www.hixie.ch/tests/evil/mixed/bordercolor.html
-http://www.hixie.ch/tests/evil/mixed/cascade/acidlinkcascade.html
-http://www.hixie.ch/tests/evil/mixed/cascade/altcascade.html
-http://www.hixie.ch/tests/evil/mixed/cascade/easy.html
-http://www.hixie.ch/tests/evil/mixed/cascade/httplink.html
-http://www.hixie.ch/tests/evil/mixed/cascade/minialtcascade.html
-http://www.hixie.ch/tests/evil/mixed/cdocdc.html
-http://www.hixie.ch/tests/evil/mixed/collapse.html
-http://www.hixie.ch/tests/evil/mixed/collapsemargins.html
-http://www.hixie.ch/tests/evil/mixed/comments-evil.html
-http://www.hixie.ch/tests/evil/mixed/comments.html
-http://www.hixie.ch/tests/evil/mixed/content/1.html
-http://www.hixie.ch/tests/evil/mixed/content/3.html
-http://www.hixie.ch/tests/evil/mixed/content/4.html
-http://www.hixie.ch/tests/evil/mixed/content/5.html
-http://www.hixie.ch/tests/evil/mixed/crlf.html
-http://www.hixie.ch/tests/evil/mixed/csserrorhandling.html
-http://www.hixie.ch/tests/evil/mixed/display-runin.html
-http://www.hixie.ch/tests/evil/mixed/emptyinline.html
-http://www.hixie.ch/tests/evil/mixed/emptyspace-css.html
-http://www.hixie.ch/tests/evil/mixed/floatgrowth.html
-http://www.hixie.ch/tests/evil/mixed/gifstyle.html
-http://www.hixie.ch/tests/evil/mixed/glyphs.html
-http://www.hixie.ch/tests/evil/mixed/horizgrowth.html
-http://www.hixie.ch/tests/evil/mixed/hrbrstyles.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyheadrendering1.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyheadrendering2.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering1.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering2.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering3.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering4.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering5.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering6.html
-http://www.hixie.ch/tests/evil/mixed/htmlbodyrendering7.html
-http://www.hixie.ch/tests/evil/mixed/htmlheadrendering1.html
-http://www.hixie.ch/tests/evil/mixed/htmlheadrendering2.html
-http://www.hixie.ch/tests/evil/mixed/htmlheadrendering3.html
-http://www.hixie.ch/tests/evil/mixed/impliedelementsstyle.html
-http://www.hixie.ch/tests/evil/mixed/impliedendtags.html
-http://www.hixie.ch/tests/evil/mixed/impliedtags.html
-http://www.hixie.ch/tests/evil/mixed/impliedtagscontrol.html
-http://www.hixie.ch/tests/evil/mixed/lineheight1.html
-http://www.hixie.ch/tests/evil/mixed/lineheight2.html
-http://www.hixie.ch/tests/evil/mixed/lineheight3.html
-http://www.hixie.ch/tests/evil/mixed/lineheight4.html
-http://www.hixie.ch/tests/evil/mixed/lineheight5.html
-http://www.hixie.ch/tests/evil/mixed/lineheight6.html
-http://www.hixie.ch/tests/evil/mixed/lineheight7.html
-http://www.hixie.ch/tests/evil/mixed/link1.html
-http://www.hixie.ch/tests/evil/mixed/link2.html
-http://www.hixie.ch/tests/evil/mixed/link3.html
-http://www.hixie.ch/tests/evil/mixed/link4.html
-http://www.hixie.ch/tests/evil/mixed/link5.html
-http://www.hixie.ch/tests/evil/mixed/link6.html
-http://www.hixie.ch/tests/evil/mixed/metadata.html
-http://www.hixie.ch/tests/evil/mixed/multiclass.html
-http://www.hixie.ch/tests/evil/mixed/nestedlists.html
-http://www.hixie.ch/tests/evil/mixed/nestedphrases.html
-http://www.hixie.ch/tests/evil/mixed/outline.html
-http://www.hixie.ch/tests/evil/mixed/placeholder.html
-http://www.hixie.ch/tests/evil/mixed/position/absolute1.html
-http://www.hixie.ch/tests/evil/mixed/position/absolute2.html
-http://www.hixie.ch/tests/evil/mixed/position/fixed1.html
-http://www.hixie.ch/tests/evil/mixed/position/relative1.html
-http://www.hixie.ch/tests/evil/mixed/position/relative2.html
-http://www.hixie.ch/tests/evil/mixed/pseudoclasses1.html
-http://www.hixie.ch/tests/evil/mixed/pseudoelements1.html
-http://www.hixie.ch/tests/evil/mixed/pseudospecificity.html
-http://www.hixie.ch/tests/evil/mixed/refresh-submit.html
-http://www.hixie.ch/tests/evil/mixed/refresh1.html
-http://www.hixie.ch/tests/evil/mixed/refresh1.http.html
-http://www.hixie.ch/tests/evil/mixed/refresh2.html
-http://www.hixie.ch/tests/evil/mixed/refresh2.http.html
-http://www.hixie.ch/tests/evil/mixed/table/generic1.html
-http://www.hixie.ch/tests/evil/mixed/table/inherit.html
-http://www.hixie.ch/tests/evil/mixed/tablepadding.html
-http://www.hixie.ch/tests/evil/mixed/tables.html
-http://www.hixie.ch/tests/evil/mixed/tablesize.html
-http://www.hixie.ch/tests/evil/mixed/underline.html
-http://www.hixie.ch/tests/evil/mixed/vertgrowth.html
-http://www.hixie.ch/tests/evil/mixed/wrappingpre.html
-http://www.hixie.ch/tests/evil/mixed/wraptextarea.html
-http://www.hixie.ch/tests/evil/security/001.html
-http://www.hixie.ch/tests/evil/security/003.html
-http://www.hixie.ch/tests/evil/security/xbl/001.html
-http://www.hixie.ch/tests/evil/state/001.html
-http://www.hixie.ch/tests/evil/state/002.html
-http://www.hixie.ch/tests/evil/xml/002.xml
-http://www.hixie.ch/tests/evil/xml/002a.xml
-http://www.hixie.ch/tests/evil/xml/002b.xml
-http://www.hixie.ch/tests/evil/xml/003.html
-http://www.hixie.ch/tests/evil/xml/003a.html
-http://www.hixie.ch/tests/evil/xml/003b.xml
-http://www.hixie.ch/tests/evil/xml/004.html
-http://www.hixie.ch/tests/evil/xml/004b.xml
-http://www.hixie.ch/tests/evil/xml/005.xml
-http://www.hixie.ch/tests/evil/xml/006.xml
-http://www.hixie.ch/tests/evil/xml/007.xml
-http://www.hixie.ch/tests/evil/xml/008.xml
-http://www.hixie.ch/tests/evil/xml/009.xml
-http://www.hixie.ch/tests/evil/xml/010.xml
-http://www.hixie.ch/tests/evil/xml/010b.xml
-http://www.hixie.ch/tests/evil/xml/011.xml
-http://www.hixie.ch/tests/html40/test41-10.html
-http://www.hixie.ch/tests/html40/test41-11.html
-http://www.hixie.ch/tests/html40/test41-1a.html
-http://www.hixie.ch/tests/html40/test41-1b.html
-http://www.hixie.ch/tests/html40/test41-2.shtml
-http://www.hixie.ch/tests/html40/test41-3.html
-http://www.hixie.ch/tests/html40/test41-4.html
-http://www.hixie.ch/tests/html40/test41-5.html
-http://www.hixie.ch/tests/html40/test41-6.html
-http://www.hixie.ch/tests/html40/test41-7.html
-http://www.hixie.ch/tests/html40/test41-8.html
-http://www.hixie.ch/tests/html40/test41-9.html
-http://www.hixie.ch/tests/html40/test42-1.html
-http://www.hixie.ch/tests/html40/test42-2.html
-http://www.hixie.ch/tests/html40/test521-1.html
-http://dbaron.org/css/test/cachetest
-http://dbaron.org/css/test/lenunit
-http://dbaron.org/css/test/implied
-http://dbaron.org/css/test/formelem
-http://dbaron.org/css/test/sec010303
-http://dbaron.org/css/test/sec0302
-http://dbaron.org/css/test/sec0302_xml
-http://dbaron.org/css/test/parsing
-http://dbaron.org/css/test/parsing2
-http://dbaron.org/css/test/parsing4
-http://dbaron.org/css/test/parsing5
-http://dbaron.org/css/test/parsing6
-http://dbaron.org/css/test/sec040102
-http://dbaron.org/css/test/casesens
-http://dbaron.org/css/test/xmltypesel
-http://dbaron.org/css/test/unitless
-http://dbaron.org/css/test/exunit
-http://dbaron.org/css/test/emunit
-http://dbaron.org/css/test/sec040310
-http://dbaron.org/css/test/parsing3
-http://dbaron.org/css/test/selector_confusion
-http://dbaron.org/css/test/univsel
-http://dbaron.org/css/test/childsel
-http://dbaron.org/css/test/sibsel
-http://dbaron.org/css/test/attrsel
-http://dbaron.org/css/test/twoclass
-http://dbaron.org/css/test/xmlid
-http://dbaron.org/css/test/pseudos
-http://dbaron.org/css/test/pseudos2
-http://dbaron.org/css/test/pseudos3
-http://dbaron.org/css/test/firstchild
-http://dbaron.org/css/test/sec051103
-http://dbaron.org/css/test/sec051103b
-http://dbaron.org/css/test/order
-http://dbaron.org/css/test/inherit
-http://dbaron.org/css/test/sec060402
-http://dbaron.org/css/test/sec060403b
-http://dbaron.org/css/test/specific
-http://dbaron.org/css/test/noncss1
-http://dbaron.org/css/test/shortbox
-http://dbaron.org/css/test/shortbox2
-http://dbaron.org/css/test/rootbox
-http://dbaron.org/css/test/listbox
-http://dbaron.org/css/test/margtest
-http://dbaron.org/css/test/shortborder
-http://dbaron.org/css/test/shortborder2
-http://dbaron.org/css/test/sec0805
-http://dbaron.org/css/test/dborder
-http://dbaron.org/css/test/sec090102
-http://dbaron.org/css/test/sec090201
-http://dbaron.org/css/test/sec090203
-http://dbaron.org/css/test/sec090204
-http://dbaron.org/css/test/sec090205
-http://dbaron.org/css/test/sec090301
-http://dbaron.org/css/test/sec090302a
-http://dbaron.org/css/test/sec090302b
-http://dbaron.org/css/test/sec090302c
-http://dbaron.org/css/test/sec090302d
-http://dbaron.org/css/test/sec0905
-http://dbaron.org/css/test/sec414
-http://dbaron.org/css/test/floatpos
-http://dbaron.org/css/test/floatpos2
-http://dbaron.org/css/test/sec0907
-http://dbaron.org/css/test/sec0909
-http://dbaron.org/css/test/bidi
-http://dbaron.org/css/test/bidi2
-http://dbaron.org/css/test/sec1001a
-http://dbaron.org/css/test/sec1001b
-http://dbaron.org/css/test/sec1001c
-http://dbaron.org/css/test/sec1001d
-http://dbaron.org/css/test/sec1001e
-http://dbaron.org/css/test/sec100301
-http://dbaron.org/css/test/sec100302
-http://dbaron.org/css/test/sec100303
-http://dbaron.org/css/test/sec100304
-http://dbaron.org/css/test/sec100305
-http://dbaron.org/css/test/sec100307
-http://dbaron.org/css/test/sec1004
-http://dbaron.org/css/test/sec1004b
-http://dbaron.org/css/test/sec100604
-http://dbaron.org/css/test/sec1007
-http://dbaron.org/css/test/sec1007b
-http://dbaron.org/css/test/abspos_inherit
-http://dbaron.org/css/test/linebox1
-http://dbaron.org/css/test/linebox2
-http://dbaron.org/css/test/linebox3
-http://dbaron.org/css/test/linebox4
-http://dbaron.org/css/test/inlinetest
-http://dbaron.org/css/test/sec1101
-http://dbaron.org/css/test/sec110102
-http://dbaron.org/css/test/sec110102b
-http://dbaron.org/css/test/sec1102a
-http://dbaron.org/css/test/sec1102b
-http://dbaron.org/css/test/sec1201
-http://dbaron.org/css/test/sec1202
-http://dbaron.org/css/test/sec140201image
-http://dbaron.org/css/test/sec150203c
-http://dbaron.org/css/test/sec150203d
-http://dbaron.org/css/test/shadow
-http://dbaron.org/css/test/sec1702
-http://dbaron.org/css/test/sec170201
-http://dbaron.org/css/test/sec1704
-http://dbaron.org/css/test/sec1704b
-http://dbaron.org/css/test/sec170401
-http://dbaron.org/css/test/sec170501
-http://dbaron.org/css/test/sec170501a
-http://dbaron.org/css/test/sec170501b
-http://dbaron.org/css/test/sec170502
-http://dbaron.org/css/test/sec170503
-http://dbaron.org/css/test/sec170504
-http://dbaron.org/css/test/tborder1
-http://dbaron.org/css/test/tborder2
-http://dbaron.org/css/test/sec1706c
-http://dbaron.org/css/test/sec1801
-http://dbaron.org/css/test/sec1802
-http://dbaron.org/css/test/sec1803
-http://dbaron.org/css/test/outline
-http://dbaron.org/css/fonts/sizes/
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-1.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-2.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-4.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-5.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-6.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-7.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-7b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-8.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-9.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-10.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-11.html
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-12.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-13.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-14.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-14b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-14c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-14d.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-14e.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-15.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-15b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-16.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-17.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-18.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-18b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-19.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-20.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-21.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-21b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-21c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-22.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-23.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-24.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-25.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-27.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-28.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-28b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-29.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-29b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-30.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-31.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-32.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-33.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-34.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-35.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-36.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-37.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-38.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-39.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-39a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-39c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-39b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-40.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-41.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-42.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-43.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-43b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-44.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-44b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-44c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-44d.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-45.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-45b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-45c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-46.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-46b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-54.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-55.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-56.html
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-58.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-59.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-60.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-61.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-62.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-63.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-64.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-65.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-66.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-66b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-67.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-70.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-72.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-72b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-73.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-73b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-74.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-74b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-75.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-75b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-76.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-76b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-77.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-77b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-78.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-78b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-79.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-80.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-81.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-81b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-82.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-82b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-83.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-84.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-84b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-85.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-87.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-87b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-88.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-88b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-89.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-90.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-90b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-144.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-148.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-149.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-149b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-150.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-151.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-152.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-154.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-155.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-155a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-155b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-155c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-155d.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-156.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-156b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-156c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-157.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-158.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-159.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-160.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-161.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-162.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-163.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-164.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-165.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-166.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-166a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-167.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-167a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-168.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-168a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-169.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-169a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-170.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-170a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-170b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-170c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-170d.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-175a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-175b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-175c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-176.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-177a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-177b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-178.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d1.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d1b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d2.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d4.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5a.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5b.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5c.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5d.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/html/tests/css3-modsel-d5e.html
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-1.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-2.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-3.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-4.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-5.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-6.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-7.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-7b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-8.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-9.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-10.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-11.xml
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-12.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-13.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-14.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-14b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-14c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-14d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-14e.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-15.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-15b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-16.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-17.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-18.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-18b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-19.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-20.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-21.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-21b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-21c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-22.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-23.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-24.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-25.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-27.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-28.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-28b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-29.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-29b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-30.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-31.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-32.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-33.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-34.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-35.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-36.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-37.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-38.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-39.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-39a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-39c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-39b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-40.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-41.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-42.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-43.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-43b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-44.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-44b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-44c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-44d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-45.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-45b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-45c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-46.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-46b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-47.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-48.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-49.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-50.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-51.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-52.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-53.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-54.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-55.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-56.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-57.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-57b.xml
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-58.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-59.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-60.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-61.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-62.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-63.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-64.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-65.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-66.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-66b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-67.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-68.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-69.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-70.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-72.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-72b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-73.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-73b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-74.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-74b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-75.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-75b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-76.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-76b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-77.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-77b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-78.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-78b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-79.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-80.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-81.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-81b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-82.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-82b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-83.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-84.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-84b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-85.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-86.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-87.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-87b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-88.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-88b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-89.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-90.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-90b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-91.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-92.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-93.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-94.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-94b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-95.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-96.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-96b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-97.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-97b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-98.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-98b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-99.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-99b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-100.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-100b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-101.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-101b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-102.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-102b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-103.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-103b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-104.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-104b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-105.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-105b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-106.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-106b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-107.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-107b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-108.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-108b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-109.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-109b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-110.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-110b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-111.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-111b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-112.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-112b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-113.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-113b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-114.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-114b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-115.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-115b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-116.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-116b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-117.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-117b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-118.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-119.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-120.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-121.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-122.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-123.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-123b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-124.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-124b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-125.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-125b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-126.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-126b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-127.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-127b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-128.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-128b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-129.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-129b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-130.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-130b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-131.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-131b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-132.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-132b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-133.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-133b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-134.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-134b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-135.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-135b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-136.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-136b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-137.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-137b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-138.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-138b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-139.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-139b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-140.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-140b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-141.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-141b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-142.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-142b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-143.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-143b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-144.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-145a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-145b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-146a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-146b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-147a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-147b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-148.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-149.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-149b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-150.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-151.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-152.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-153.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-154.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-155.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-155a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-155b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-155c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-155d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-156.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-156b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-156c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-157.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-158.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-159.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-160.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-161.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-162.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-163.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-164.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-165.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-166.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-166a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-167.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-167a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-168.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-168a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-169.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-169a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-170.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-170a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-170b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-170c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-170d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-171.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-172a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-172b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-173a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-173b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-174a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-174b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-175a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-175b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-175c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-176.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-177a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-177b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-178.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d1.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d1b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d2.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d3.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d4.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xhtml/tests/css3-modsel-d5e.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-1.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-2.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-3.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-4.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-5.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-6.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-7.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-7b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-8.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-9.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-10.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-11.xml
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-12.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-13.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-14.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-14b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-14c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-14d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-14e.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-15.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-15b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-16.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-17.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-18.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-18b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-19.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-20.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-21.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-21b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-21c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-22.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-23.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-24.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-25.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-27.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-28.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-28b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-29.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-29b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-30.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-31.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-32.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-33.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-34.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-35.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-36.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-37.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-38.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-39.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-39a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-39c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-39b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-40.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-41.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-42.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-43.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-43b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-44.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-44b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-44c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-44d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-45.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-45b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-45c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-46.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-46b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-47.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-48.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-49.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-50.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-51.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-52.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-53.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-54.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-55.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-56.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-57.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-57b.xml
-#http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-58.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-59.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-60.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-61.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-62.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-63.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-64.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-65.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-66.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-66b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-67.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-68.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-69.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-70.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-72.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-72b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-73.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-73b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-74.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-74b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-75.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-75b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-76.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-76b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-77.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-77b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-78.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-78b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-79.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-80.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-81.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-81b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-82.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-82b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-83.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-84.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-84b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-85.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-86.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-87.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-87b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-88.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-88b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-89.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-90.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-90b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-91.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-92.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-93.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-94.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-94b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-95.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-96.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-96b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-97.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-97b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-98.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-98b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-99.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-99b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-100.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-100b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-101.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-101b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-102.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-102b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-103.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-103b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-104.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-104b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-105.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-105b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-106.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-106b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-107.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-107b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-108.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-108b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-109.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-109b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-110.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-110b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-111.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-111b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-112.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-112b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-113.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-113b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-114.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-114b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-115.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-115b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-116.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-116b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-117.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-117b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-118.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-119.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-120.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-121.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-122.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-123.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-123b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-124.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-124b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-125.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-125b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-126.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-126b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-127.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-127b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-128.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-128b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-129.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-129b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-130.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-130b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-131.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-131b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-132.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-132b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-133.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-133b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-134.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-134b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-135.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-135b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-136.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-136b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-137.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-137b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-138.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-138b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-139.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-139b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-140.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-140b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-141.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-141b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-142.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-142b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-143.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-143b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-144.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-145a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-145b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-146a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-146b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-147a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-147b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-148.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-149.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-149b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-150.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-151.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-152.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-153.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-154.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-155.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-155a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-155b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-155c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-155d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-156.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-156b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-156c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-157.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-158.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-159.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-160.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-161.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-162.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-163.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-164.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-165.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-166.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-166a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-167.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-167a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-168.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-168a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-169.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-169a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-170.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-170a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-170b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-170c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-170d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-171.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-172a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-172b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-173a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-173b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-174a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-174b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-175a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-175b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-175c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-176.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-177a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-177b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-178.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d1.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d1b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d2.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d3.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d4.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5a.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5b.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5c.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5d.xml
-http://www.w3.org/Style/CSS/Test/CSS3/Selectors/current/xml/tests/css3-modsel-d5e.xml
-http://dbaron.org/css/test/percentage-width/01-div-in-table-pref
-http://dbaron.org/css/test/percentage-width/02-div-in-table-min
-http://dbaron.org/css/test/z-index/01-basic/02
-http://dbaron.org/css/test/z-index/01-basic/03
-http://dbaron.org/css/test/z-index/01-basic/04
-http://dbaron.org/css/test/z-index/01-basic/05
-http://dbaron.org/css/test/z-index/01-basic/06
-http://dbaron.org/css/test/z-index/01-basic/07
-http://dbaron.org/css/test/z-index/01-basic/08
-http://dbaron.org/css/test/z-index/01-basic/01
-http://dbaron.org/css/test/z-index/05-root/03
-http://dbaron.org/css/test/z-index/05-root/02
-http://dbaron.org/css/test/z-index/05-root/04
-http://dbaron.org/css/test/z-index/05-root/05
-http://dbaron.org/css/test/z-index/05-root/06
-http://dbaron.org/css/test/z-index/05-root/01
-http://dbaron.org/css/test/z-index/proposed/01-basic/02
-http://dbaron.org/css/test/z-index/proposed/01-basic/03
-http://dbaron.org/css/test/z-index/proposed/01-basic/04
-http://dbaron.org/css/test/z-index/proposed/01-basic/05
-http://dbaron.org/css/test/z-index/proposed/01-basic/06
-http://dbaron.org/css/test/z-index/proposed/01-basic/07
-http://dbaron.org/css/test/z-index/proposed/01-basic/08
-http://dbaron.org/css/test/z-index/proposed/01-basic/01
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/04
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/05
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/06
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/01
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/02
-http://dbaron.org/css/test/z-index/proposed/02-auto-level/03
-http://dbaron.org/css/test/z-index/proposed/03-auto-interleave/03
-http://dbaron.org/css/test/z-index/proposed/03-auto-interleave/01
-http://dbaron.org/css/test/z-index/proposed/03-auto-interleave/02
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/08
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/09
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/02
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/03
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/04
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/05
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/06
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/07
-http://dbaron.org/css/test/z-index/proposed/04-auto-container/01
-http://dbaron.org/css/test/z-index/proposed/05-root/03
-http://dbaron.org/css/test/z-index/proposed/05-root/02
-http://dbaron.org/css/test/z-index/proposed/05-root/01
-http://dbaron.org/css/test/z-index/proposed/05-root/04
-http://dbaron.org/css/test/z-index/proposed/05-root/05
-http://dbaron.org/css/test/z-index/proposed/05-root/06
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/04
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/05
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/06
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/01
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/02
-http://dbaron.org/css/test/z-index/proposed/06-zero-level/03
-http://dbaron.org/css/test/z-index/proposed/07-zero-no-interleave/01
-http://dbaron.org/css/test/z-index/proposed/07-zero-no-interleave/03
-http://dbaron.org/css/test/z-index/proposed/07-zero-no-interleave/02
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/01
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/02
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/03
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/04
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/05
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/06
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/07
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/08
-http://dbaron.org/css/test/z-index/proposed/08-zero-container/09
-http://dbaron.org/css/test/z-index/04-auto-container/08
-http://dbaron.org/css/test/z-index/04-auto-container/09
-http://dbaron.org/css/test/z-index/04-auto-container/02
-http://dbaron.org/css/test/z-index/04-auto-container/03
-http://dbaron.org/css/test/z-index/04-auto-container/04
-http://dbaron.org/css/test/z-index/04-auto-container/05
-http://dbaron.org/css/test/z-index/04-auto-container/06
-http://dbaron.org/css/test/z-index/04-auto-container/07
-http://dbaron.org/css/test/z-index/04-auto-container/01
-http://dbaron.org/css/test/z-index/02-auto-level/02
-http://dbaron.org/css/test/z-index/02-auto-level/03
-http://dbaron.org/css/test/z-index/02-auto-level/04
-http://dbaron.org/css/test/z-index/02-auto-level/05
-http://dbaron.org/css/test/z-index/02-auto-level/06
-http://dbaron.org/css/test/z-index/02-auto-level/01
-http://dbaron.org/css/test/z-index/03-auto-interleave/03
-http://dbaron.org/css/test/z-index/03-auto-interleave/01
-http://dbaron.org/css/test/z-index/03-auto-interleave/02
-http://dbaron.org/css/test/z-index/06-zero-level/01
-http://dbaron.org/css/test/z-index/06-zero-level/02
-http://dbaron.org/css/test/z-index/06-zero-level/03
-http://dbaron.org/css/test/z-index/06-zero-level/04
-http://dbaron.org/css/test/z-index/06-zero-level/05
-http://dbaron.org/css/test/z-index/06-zero-level/06
-http://dbaron.org/css/test/z-index/07-zero-no-interleave/01
-http://dbaron.org/css/test/z-index/07-zero-no-interleave/03
-http://dbaron.org/css/test/z-index/07-zero-no-interleave/02
-http://dbaron.org/css/test/z-index/08-zero-container/01
-http://dbaron.org/css/test/z-index/08-zero-container/02
-http://dbaron.org/css/test/z-index/08-zero-container/03
-http://dbaron.org/css/test/z-index/08-zero-container/04
-http://dbaron.org/css/test/z-index/08-zero-container/05
-http://dbaron.org/css/test/z-index/08-zero-container/06
-http://dbaron.org/css/test/z-index/08-zero-container/07
-http://dbaron.org/css/test/z-index/08-zero-container/08
-http://dbaron.org/css/test/z-index/08-zero-container/09
-http://dbaron.org/css/test/z-index/results
-http://dbaron.org/css/test/2002/float-mc
-http://dbaron.org/css/test/2002/border-bidi
-http://dbaron.org/css/test/2002/fontsize
-http://dbaron.org/css/test/2002/abs-marg-col
-http://dbaron.org/css/test/2002/abs-marg-col2
-http://dbaron.org/css/test/2002/pre-wrap
-http://dbaron.org/css/test/2002/overflow-in-table
-http://dbaron.org/css/test/which-tree/01-overflow-body-inflow/01-visible
-http://dbaron.org/css/test/which-tree/01-overflow-body-inflow/02-hidden
-http://dbaron.org/css/test/which-tree/01-overflow-body-inflow/03-auto
-http://dbaron.org/css/test/which-tree/01-overflow-body-inflow/04-scroll
-http://dbaron.org/css/test/which-tree/03-overflow-general-baseline/02-hidden
-http://dbaron.org/css/test/which-tree/03-overflow-general-baseline/01-visible
-http://dbaron.org/css/test/which-tree/03-overflow-general-baseline/03-auto
-http://dbaron.org/css/test/which-tree/03-overflow-general-baseline/04-scroll
-http://dbaron.org/css/test/which-tree/02-overflow-body-outofflow/01-visible
-http://dbaron.org/css/test/which-tree/02-overflow-body-outofflow/02-hidden
-http://dbaron.org/css/test/which-tree/02-overflow-body-outofflow/03-auto
-http://dbaron.org/css/test/which-tree/02-overflow-body-outofflow/04-scroll
-http://dbaron.org/css/test/which-tree/04-overflow-general/01-visible
-http://dbaron.org/css/test/which-tree/04-overflow-general/02-hidden
-http://dbaron.org/css/test/which-tree/04-overflow-general/03-auto
-http://dbaron.org/css/test/which-tree/04-overflow-general/04-scroll
-http://dbaron.org/css/test/which-tree/04-overflow-general/02-hidden-mozilla.png
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/01-overflow-visible
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/02-overflow-hidden
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/03-overflow-auto
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/04-overflow-scroll
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/06-z-index
-http://dbaron.org/css/test/which-tree/05-fixed-fixed/05-clip
-http://dbaron.org/css/test/which-tree/06-overflow-rootcontainer/01-visible
-http://dbaron.org/css/test/which-tree/06-overflow-rootcontainer/02-hidden
-http://dbaron.org/css/test/which-tree/06-overflow-rootcontainer/03-auto
-http://dbaron.org/css/test/which-tree/06-overflow-rootcontainer/04-scroll
-http://dbaron.org/css/test/which-tree/07-overflow-general2/01-visible
-http://dbaron.org/css/test/which-tree/07-overflow-general2/02-hidden
-http://dbaron.org/css/test/which-tree/07-overflow-general2/03-auto
-http://dbaron.org/css/test/which-tree/07-overflow-general2/04-scroll
-http://dbaron.org/css/test/which-tree/results
-http://dbaron.org/css/test/experimental/shrink-wrap-middle
-http://dbaron.org/css/test/inline-block/002-auto-width/001
-http://dbaron.org/css/test/inline-block/002-auto-width/002
-http://dbaron.org/css/test/inline-block/002-auto-width/003
-http://dbaron.org/css/test/unbalanced-quotes/01-prereq
-http://dbaron.org/css/test/unbalanced-quotes/index
-http://dbaron.org/css/test/unbalanced-quotes/02-prereq
-http://dbaron.org/css/test/unbalanced-quotes/04-unbalanced
-http://dbaron.org/css/test/unbalanced-quotes/03-newline
-http://dbaron.org/css/test/unbalanced-quotes/05-unbalanced
-http://dbaron.org/css/test/2003/float-mew
-http://dbaron.org/css/test/2003/03-cambridge/block-in-inline
-http://dbaron.org/css/test/2003/03-cambridge/letter-spacing
-http://dbaron.org/css/test/2003/03-cambridge/fixed-table-overflow
-http://dbaron.org/css/test/2003/03-cambridge/scrolling-tbody
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing
-http://dbaron.org/css/test/2003/03-cambridge/clear-on-inlines
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing2
-http://dbaron.org/css/test/2003/03-cambridge/table-border-styles
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing3
-http://dbaron.org/css/test/2003/03-cambridge/bidi-override-block
-http://dbaron.org/css/test/2003/03-cambridge/negative-text-indent
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing6
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing7
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing4
-http://dbaron.org/css/test/2003/03-cambridge/block-parsing5
-http://dbaron.org/css/test/2003/03-cambridge/clear-line-matching
-http://dbaron.org/css/test/2003/03-cambridge/table-cell-overflow
-http://dbaron.org/css/test/2003/03-cambridge/word-spacing-mozilla-bug
-http://dbaron.org/css/test/2003/table-color
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-utf8-iso88591.utf8
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-iso88591-iso88591.iso88591
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-utf8-utf8.utf8
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-iso88592-iso88591.iso88592
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-iso88591-utf8.iso88591
-http://dbaron.org/css/test/2003/sheet-encoding/encoding-test-iso88592-utf8.iso88592
-http://dbaron.org/css/test/2003/table-padding
-http://dbaron.org/css/test/2003/clear-collapse
-http://dbaron.org/css/test/2003/table-padding2
-http://dbaron.org/css/test/2003/list-bullet-size
-http://dbaron.org/css/test/2003/table-padding3
-http://dbaron.org/css/test/2003/border-collapse-edge
-http://dbaron.org/css/test/2003/table-padding4
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-cell
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-float
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-abspos
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-overflow-scroll
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-overflow-auto
-http://dbaron.org/css/test/2003/float-based-intrinsic-sizing/in-overflow-hidden
-http://dbaron.org/css/test/2003/table-padding5
-http://dbaron.org/css/test/2003/margin-collapse-computed-zero
-http://dbaron.org/css/test/2003/float-and-overflow/inside-visible
-http://dbaron.org/css/test/2003/float-and-overflow/inside-auto
-http://dbaron.org/css/test/2003/float-and-overflow/inside-hidden
-http://dbaron.org/css/test/2003/float-and-overflow/inside-scroll
-http://dbaron.org/css/test/2003/float-and-overflow/outside-auto
-http://dbaron.org/css/test/2003/float-and-overflow/outside-hidden
-http://dbaron.org/css/test/2003/float-and-overflow/outside-scroll
-http://dbaron.org/css/test/2003/float-and-overflow/outside-visible
-http://dbaron.org/css/test/2003/list-bullet-size-quirks
-http://dbaron.org/css/test/2003/font-sizes-standards
-http://dbaron.org/css/test/2003/font-sizes-quirks
-http://dbaron.org/css/test/2003/bfcroot-around-floats/block-image
-http://dbaron.org/css/test/2003/bfcroot-around-floats/table
-http://dbaron.org/css/test/2003/bfcroot-around-floats/ian
-http://dbaron.org/css/test/2003/the-asa-method
-http://dbaron.org/css/test/2003/margin-collapse-through
-http://dbaron.org/css/test/2003/background-position-mixed
-http://dbaron.org/css/test/2003/abs-pos-intrinsic2
-http://dbaron.org/css/test/2003/abs-pos-intrinsic
-http://dbaron.org/css/test/2003/abs-pos-intrinsic3
-http://dbaron.org/css/test/2003/fixed-auto
-http://dbaron.org/css/test/2003/split-first-letter
-http://dbaron.org/css/test/2003/clear-margin
-http://dbaron.org/css/test/2003/mc-incremental2
-http://dbaron.org/css/test/2003/mc-incremental
-http://dbaron.org/css/test/2003/negative-clearance
-http://dbaron.org/css/test/2003/clear-after-mc
-http://dbaron.org/css/test/2003/inconsistent-min-size
-http://dbaron.org/css/test/2003/inconsistent-min-size2
-http://dbaron.org/css/test/2003/border-collapse-edge-2
-http://dbaron.org/css/test/2003/border-collapse-edge-2-quirks
-http://dbaron.org/css/test/2003/line-breaking/quirks/01-images
-http://dbaron.org/css/test/2003/line-breaking/quirks/02-images-with-spaces
-http://dbaron.org/css/test/2003/line-breaking/quirks/03-inputs
-http://dbaron.org/css/test/2003/line-breaking/quirks/04-images-text
-http://dbaron.org/css/test/2003/line-breaking/standards/01-images
-http://dbaron.org/css/test/2003/line-breaking/standards/02-images-with-spaces
-http://dbaron.org/css/test/2003/line-breaking/standards/03-inputs
-http://dbaron.org/css/test/2003/line-breaking/standards/04-images-text
diff --git a/layout/html/tests/block/printing/127145-1.html b/layout/html/tests/block/printing/127145-1.html
deleted file mode 100644
index bd53591a08b6..000000000000
--- a/layout/html/tests/block/printing/127145-1.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"><html><head>
-<style>
-table  {border:green  2px  solid;}
-td     {border:red    1px  dotted;}
-div    {border:blue    1px  dashed;}
-</style></head>
-
- 
-<body>
-
-<table>
- <tbody><tr>
-  <td>
-   <div style="height: 200px;">
-    TEST
-   </div>
-  </td>
- </tr>
-</tbody></table>
-   <div style="height: 2000px;">
-    TEST
-   </div>
-<table>
- <tbody><tr>
-  <td>
-   <div style="height: 2000px;">
-    TEST
-   </div>
-  </td>
- </tr>
-</tbody></table>
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/127145-2.html b/layout/html/tests/block/printing/127145-2.html
deleted file mode 100644
index db1cac4da303..000000000000
--- a/layout/html/tests/block/printing/127145-2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head></head><body><div style="border: 1px solid blue; width: 100px; height: 2000px; font-size: 50px;">
-FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>
-FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>
-FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>
-FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>FOO<br>
-</div>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/127145-3.html b/layout/html/tests/block/printing/127145-3.html
deleted file mode 100644
index 527e34f57fbc..000000000000
--- a/layout/html/tests/block/printing/127145-3.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head></head><body><div style="border: 50px solid blue; padding: 100px 0px 0px; width: 100px; height: 2950px; font-size: 50px;">
-L01<br>L02<br>L03<br>L04<br>L05<br>
-L06<br>L07<br>L08<br>L09<br>L10<br>
-L11<br>L12<br>L13<br>L14<br>L15<br>
-L16<br>L17<br>L18<br>L19<br>L20<br>
-L21<br>L22<br>L23<br>L24<br>L25<br>
-L26<br>L27<br>L28<br>L29<br>L30<br>
-L31<br>L32<br>L33<br>L34<br>L35<br>
-L36<br>L37<br>L38<br>L39<br>L40<br>
-L41<br>L42<br>L43<br>L44<br>L45<br>
-L46<br>L47<br>L48<br>L49<br>L50<br>
-</div>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/127286-1.html b/layout/html/tests/block/printing/127286-1.html
deleted file mode 100644
index d7d6c6093928..000000000000
--- a/layout/html/tests/block/printing/127286-1.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<link rel="stylesheet" type="text/css" href="./127286.css" title="Net4"> 
-
-<html>
-<head>
-<style>
-.text {FONT-FAMILY: verdana,sans-serif;FONT-SIZE: small;}
-</style>
-</head>
-
-<div style="width:100px; height: 600px">vertical filler</div>
-
-<table CELLPADDING="0" CELLSPACING="0" WIDTH="610" border="1">
- <tr>
-  <td class="text">
-   <table align="right" border="1" cellpadding="0" cellspacing="0" width="225">
-
-    <tr>
-     <td>
-      <p><b>Retirement accounts:</b> Tempted to take out loans from your 401(k) or withdraw contributions (the money you've deposited) from your Roth IRA penalty-free? Unless you are willing to develop a taste for cat food, don't shortchange your future. If you must, though, take the loan, because you can't replace borrowed Roth contributions. Don't even consider taking money out of a regular IRA unless you like donating around half of it to Uncle Sam in the form of taxes and penalties.</p>
-      <p><b>Collectibles such as coins and antiques:</b> If you need to raise funds from collectibles in a hurry, the sharks smell blood in the water, and you are less likely to get a good price for Great Aunt Betsy's Colonial-era sewing kit.</p>
-      <p><b>Long-term bonds:</b> When you buy a bond, you are guaranteed a set amount of interest plus the return of your principal on the maturity date. Before that, all bets are off. If you want your principal back before the maturity date, you have to sell the bond for the going price, which could be less than the face value. The longer the term, the more sensitive bond prices are to interest rate changes.</p>
-
-      <p><b>Your family:</b> Yeah, you've got a lot invested in those kids, and you might get a nice price for them on eBay, if they are polite and don't eat much. But we can't recommend liquidating this asset, tempting as it may be at times.</p>
-	 </td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-
diff --git a/layout/html/tests/block/printing/127286-2.html b/layout/html/tests/block/printing/127286-2.html
deleted file mode 100644
index d074d1b9d1c3..000000000000
--- a/layout/html/tests/block/printing/127286-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><head></head><body><div style="width: 100px; height: 750px;">vertical filler</div>
-
-<p>
- <table align="right" border="1">
-  <tbody><tr>
-   <td>foo<br>foo<br>foo<br>foo<br>foo<br>foo<br>foo<br>foo<br>foo<br></td>
-  </tr>
- </tbody></table>
-</p>
-   
-<p>
- should be on same page   
-</p>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/127286.css b/layout/html/tests/block/printing/127286.css
deleted file mode 100644
index 9c44016ae484..000000000000
--- a/layout/html/tests/block/printing/127286.css
+++ /dev/null
@@ -1,337 +0,0 @@
-/*NS4 win; US; JB 8/25/02*/
-
-#bigbox { margin-bottom:5px; }
-
-/*ed structure*/
-div#ed_align { text-align:left; }
-div.ed_container { 
-	width:776px;	
-	background-color:#fff;
-	border-bottom:1px #333 solid;
-}
-body.ed_body { 
-margin:0px; 
-background-color:#476685;
-}
-div#ed_topnav { 
-	border-right:1px #036 solid; 	
-	background-color:#fff;
-	width:776px;	
-}  
-
-div#ed_mid { 
-	margin-top:0px;
-	margin-bottom:0px;
-	width:776px; 
-	border-right:1px #036 solid; 
-	background-color:#fff;	
-}
-/*          div#ed_lnav { }                     */
-/*td.ed_lnav_td { 
-	background-color:#369; 
-	text-align:center; 
-} */
-div#ed_art_head { 
-	padding:none; 
-	padding-left:10px; 
-	padding-right:10px;
-}
-div#ed_art_content { 
-	padding:none; 
-	padding-left:10px; 
-	padding-right:10px;
-} 
-ed_art_content_02 { /* for port numbers */
-	padding:none; 
-	padding-left:10px; 
-	padding-right:10px;
-}	
-div#ed_art_bottom { 
-	padding-left:10px; 
-	padding-right:10px;
-}
-div#ed_rcol { background-color:#dedede; }
-div#ed_rcol_02 { background-color:#dedede; }
-td.ed_rcol_td { 
-	background-color:#dedede;
-	border-left:1px #ccc solid; 
-	border-top:1px #eee solid;
-}
-div.ed_footer { 
-	width:776px; 
-	border-right:1px #036 solid;
-}
-
-/* end structure */
-
-/*fr boards.css */
-
-.arrow { FONT-SIZE: 10pt; }
-.field { FONT-FAMILY: arial, geneva,sans-serif; FONT-SIZE: 11pt; TEXT-DECORATION: none; }
-.taboff { COLOR: #ffffcc; TEXT-DECORATION: none; }
-.tabon { COLOR: #ffcc33; }
-.l { FONT-SIZE: 10pt; TEXT-DECORATION: none; }
-
-/*Boards 2002*/
-
-.bt-on { 
-	text-align:center;
-	background-color: #369; 
-	color:#fc3;
-}
-.bt-off { 
-	text-align:center; 
-}
-.bt-off A { 
-	color:#039; 
-}
-.bt-off A:hover { 
-	color:#c30; 
-}
-#b-best-t { 
-border:none; 
-}
-#b-best-t td { 
-	padding-left:4px;
-	padding-right:4px;
-}
-#b-best-t td.text { 
-	padding-left:0px;
-	background-color:#ccc;
-	border-right:1px #eee solid;
-	BORDER-left:#999 1px solid;
-	border-bottom:1px #999 solid; 
-	font-family:tahoma,verdana,sans-serif;
-	font-size:12px;padding-left:4px;
-	color:#333;
-}
-#b-best-t td.text a { 
-	color:#333; 
-}
-
-#b-best-t td.text a:hover { 
-	color:#c30; 
-	text-decoration:none;
-}
-.btab { font-family:tahoma,verdana,sans-serif;font-size:70%; }
-.favbforms { font-family:tahoma,verdana,sans-serif;font-size:70%; }
-
-.bborder { border-left:1px #ccc solid;border-right:1px #ccc solid; }
-
-.btablerule { border-top:1px #efefef solid; }
-.bbevt { background-color:#999; }
-.bbevb { background-color:#fff; }
-
-/*transaction ctr*/
-.tctext { font: bold 70% verdana,sans-serif; color:#333; }
-.tcmods { background-color:#e5e5e5;border:1px solid #ccc; }
-.tchead { border:1px solid #ccc; }
-/*
-.tcsubmit { font-weight:bold; }
-*/
-
-/*Reg/MBC - Kurt 05-23-01*/
-.regtext { font-family: verdana,sans-serif; font-size: 65% }
-.regnav { font-family: verdana,sans-serif; font-size: 60% }
-
-ul.mfunds { margin-left:-18px; }
-
-/*MP*/
-.mplists { font: 9pt verdana,sans-serif; }
-.mpdir { font: 9pt verdana,sans-serif; }
-
-.mphead {
-	font: bold small arial, helvetica, sans-serif;	
-	color:#fff;
-	background-color:#369;
-	border-color: #369 #036 #036 #369; 
-	border-style: solid; 
-	border-width: 1px; 
-}
-.myhead {
-	font: bold small arial, helvetica, sans-serif;	
-	background-color:#393;
-	color:#fff;
-	border-color: #393 #060 #060 #393; 
-	border-style: solid; 
-	border-width: 1px; 
-}
-
-.mloff {
-	background:#eee; 
-	BORDER-BOTTOM: #ccc 1px solid; 
-	BORDER-RIGHT: #CCC 1px solid;		
-	PADDING-LEFT: 4px; 
-}
-.mlon {	
-	background:#ffc; 
-	BORDER-BOTTOM: #ccc9 1px solid; 
-	BORDER-RIGHT: #CCC 1px solid;	
-	PADDING-LEFT: 4px; 
-}
-.mylinks { font: 8.5pt verdana,sans-serif; TEXT-DECORATION: none;	}
-a:hover.mylinks { text-decoration: underline; }
-/*end*/
-
-/*ola nav - Kurt 03-01-01*/
-.olahead { font: bold medium arial, sans-serif;color:#036;}
-.olasubhead { font: bold small arial, sans-serif;color:#036;}
-.olanav { font: bold x-small verdana,sans-serif; }
-.olanav-sub { font: 9.5px verdana,sans-serif; color:#036;}
-.olanav-head { font: bold x-small verdana,sans-serif;color:#036; }
-.ola-intra-nav-head { font: bold x-small verdana,sans-serif; color:#fff; }
-A.olanav { text-decoration:none; }
-A.olanav:hover { text-decoration: underline; }
-
-/*l-nav 10-00*/
-.ln { font: bold x-small verdana,sans-serif; padding:1px; }
-.ln2 { font: x-small verdana,sans-serif; line-height:14px; padding-left:4px; }
-.ln3 { font: x-small verdana,sans-serif;padding-left:10px;padding-top:2px;padding-bottom:2px; }
-
-A.l-nav1 { text-decoration:none;padding-left:4px;color:#fff;font-weight:bold; }
-A.l-nav1:hover { 
-	text-decoration: underline; 
-	color:#fff;
-}
-
-A.l-nav2 { color:#333; text-decoration:none; font-weight:bold; }
-A.l-nav2:hover { color:#c30; text-decoration:underline; }
-
-A.l-nav3 { color:#333; text-decoration:none;}
-A.l-nav3:hover { color:#c30; text-decoration:underline; }
-
-.r-promo { FONT: x-small verdana, arial, sans-serif;border:2px #393 solid;border-top:none; }
-.r-promo-head { FONT: bold small arial, sans-serif; color:#fff; padding-left:4px; }
-.r-promo-box { FONT: x-small verdana, arial, sans-serif;border:2px #393 solid; }
-
-.rel-links-head { FONT: bold small arial, sans-serif; color:#333; }
-.intra-nav-head { FONT: bold small arial, sans-serif; color:#fff; }
-
-.intra-nav-links { font: x-small verdana, sans-serif;padding-left:2px;padding-top:4px;padding-bottom:4px; }
-
-.rel-links { font: x-small verdana, sans-serif;padding-bottom:1px; }
-.rel-links-box { background-color:#fc3; }
-.intra-nav-box { background-color:#369; }
-
-.arrow-ag-div  {
-  background: #fff url("http://www.fool.com/art/new/ui/ArrowBlue_div.gif") no-repeat;
-	margin-top:2px;	
-	padding-left:10px;
-	font: small verdana,arial,sans-serif;
-}	
-
-.arrow-ag-ul  {
-  list-style-image: url("http://www.fool.com/art/new/ui/ArrowBlue_ul2.gif");
-	margin-bottom:30px;
-	margin-right:10px;
-}	
-
-/*Global H ns6*/
-a:hover {COLOR: #C30;}
-
-/*text*/
-.text {FONT-FAMILY: verdana,sans-serif;FONT-SIZE: small;}
-.smalltext {FONT-FAMILY: verdana,sans-serif;FONT-SIZE: x-small;}
-
-/*GM Arrow, div*/
-.listarrow  {
-  margin-top: 4px;
-  padding-left: 12px;
-  background: #fff url("http://www.fool.com/art/new/butts/ArrowBlue.gif") no-repeat;
-	font-size:small;		 
-	font-family:verdana,sans-serif;
-}	
-
-/*Tabs2 B-Nav 08/00*/
-A.t2botnav { font-weight:bold; text-decoration: none; }
-
-
-/*MyF -- cull Fall 00 */
-.TblBorder { BORDER: 3px #ccc solid;}
-.HalfBorder { BORDER: 3px #ccc solid;}
-.BEIGE { COLOR: #f0f0df; TEXT-DECORATION: none; }
-.black { COLOR: #000; TEXT-DECORATION: none;}
-.link {COLOR:#369;TEXT-DECORATION:none;}
-A.link:hover {TEXT-DECORATION: underline;}
-.MFldata { font: small arial,sans-serif; }
-.MFrdata { font: small arial,sans-serif;text-align:right; }  
-.MFcdata { font: small arial,sans-serif;text-align:center;}
-.CELL {font:small VERDANA,sans-serif;}
-
-/*QFC FPN - GRM 5.26.00 */
-.bodytext {font-family:arial,helvetica,sans-serif;font-size:small;}
-.bodytextsmall {font-family:arial,helvetica,sans-serif;font-size:x-small;}
-
-/*Ags  5/2/00 jb*/
-.ag-heading { font: bold medium arial,sans-serif;color:#333; }
-.promohead {font-family:arial, sans-serif;font-size:small;font-weight:medium;}	
-.microfeature {font-family:verdana,arial, sans-serif;font-size:x-small;font-weight:bold;color:#333;}
-.datestamp {font-family:arial,sans-serif;font-size:x-small;}
-
-/*Article: 08/00*/
-.headline { font: bold 18pt arial,helvetica,sans-serif; }
-.subhead {font: bold medium arial,helvetica,sans-serif;}
-.articlesummary { font: bold arial,helvetica,sans-serif; color:#333; }
-b.PH {font: bold medium arial,sans-serif;}
-b.ph {font: bold medium arial,sans-serif;}
-H3 { font: bold medium arial,helvetica,sans-serif; margin-bottom:0px; }
-
-/*added 7/29/02 per Barry*/
-h1.headline { font-weight:bold;margin-top:0px; }
-h2.subhead { font-weight:bold;margin-top:-20px; }
-
-
-/*Boards 2002 - added by Kurt 08OCT02*/
-
-.pbmsg { 
-font-size:medium;
-}
-
-.pbnav {
-font: 11px verdana,arial,sans-serif;
-}
-.nolink {
-font: bold 11px verdana,arial,sans-serif; color:#888;
-}
-a.pbnavlink {
-font: 11px verdana,arial,sans-serif; color:#039; 
-}
-a.pbnavlink:hover {
-color:#c30; text-decoration:underline; 
-}
-a.pbnavlink:visited {
-color:#060; text-decoration:underline; 
-}
-.pbheaderlink {
-font: bold 11px verdana,arial,sans-serif;
-}
-.pipe {
-font: bold verdana 11px; color:#98AAB1;
-}
-td.pblist {
-border-bottom: 1px solid #eee;
-FONT: x-small verdana, sans-serif;
-}
-.pbnavtable {
-background-color:#DEE3E7;
-border-bottom: 1px solid #98AAB1;
-border-top: 1px solid #fff;
-}
-.pbnavtable td {
-padding-top: 2px;
-padding-bottom: 2px;
-padding-right: 4px;
-padding-left: 4px;
-}
-.pb_h_table {
-background-color:#e5e5e5;
-padding: 4px;
-}
-.pb_f_table {
-background-color:#efefef;
-padding-top: 8px;
-padding-bottom: 8px;
-padding-right: 4px;
-padding-left: 4px;
-}
-
diff --git a/layout/html/tests/block/printing/145305-1.html b/layout/html/tests/block/printing/145305-1.html
deleted file mode 100644
index 3e040089c5d0..000000000000
--- a/layout/html/tests/block/printing/145305-1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 1 - float left image, no text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:left">
-
-some text
-
diff --git a/layout/html/tests/block/printing/145305-10.html b/layout/html/tests/block/printing/145305-10.html
deleted file mode 100644
index 7fd26d77e945..000000000000
--- a/layout/html/tests/block/printing/145305-10.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 10 - float right image, text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=60 height=60 style="float:right">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-11.html b/layout/html/tests/block/printing/145305-11.html
deleted file mode 100644
index d1a6bfeffb40..000000000000
--- a/layout/html/tests/block/printing/145305-11.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 11 - float right table, text on page 2</div>
-<table border style="float:right">
- <tr>
-  <td>one<br>two<br></td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/145305-12.html b/layout/html/tests/block/printing/145305-12.html
deleted file mode 100644
index 8744f444279c..000000000000
--- a/layout/html/tests/block/printing/145305-12.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 12 - float left image, float right image, text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=60 height=60 style="float:left">
-
-<img src="../../table/images/raptor.jpg" width=60 height=60 style="float:right">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-13.html b/layout/html/tests/block/printing/145305-13.html
deleted file mode 100644
index 38c7d13c2957..000000000000
--- a/layout/html/tests/block/printing/145305-13.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 13 - float left table, float right table, text on page 2</div>
-<table border style="float:left">
- <tr>
-  <td>one<br>two</td>
- </tr>
-</table><table border style="float:right">
- <tr>
-  <td>1<br>2<br>3</td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/145305-14.html b/layout/html/tests/block/printing/145305-14.html
deleted file mode 100644
index f8445dd08f0e..000000000000
--- a/layout/html/tests/block/printing/145305-14.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 14 - float right button, float right image, text on page 2</div>
-
-<button style="float:right;">foo</button>
-
-<img src="../../table/images/raptor.jpg" width=150 height=150 style="float:right">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-15.html b/layout/html/tests/block/printing/145305-15.html
deleted file mode 100644
index 06e840d7b70a..000000000000
--- a/layout/html/tests/block/printing/145305-15.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 15 - float right button, float right image, float right button, float right image, text on page 2</div>
-
-<button style="float:right;">foo</button>
-
-<img src="../../table/images/raptor.jpg" width=150 height=150 style="float:right">
-
-<button style="float:right;">foo</button>
-
-<img src="../../table/images/raptor.jpg" width=150 height=150 style="float:right">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-16.html b/layout/html/tests/block/printing/145305-16.html
deleted file mode 100644
index 489b149b4cf3..000000000000
--- a/layout/html/tests/block/printing/145305-16.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 16 - float right image, float right button, put floaters on next page</div>
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:right">
-
-<button style="float:right; font-size:xx-large">foo<BR>foo<BR>foo</button>
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-17.html b/layout/html/tests/block/printing/145305-17.html
deleted file mode 100644
index c8ac637aecbf..000000000000
--- a/layout/html/tests/block/printing/145305-17.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 17 - float right button, float right table, put floaters on next page</div>
-<button style="float:right; font-size:xx-large">foo<BR>foo<BR>foo</button>
-<table border style="float:right">
- <tr>
-  <td>one<br>two<br>three</td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/145305-18.html b/layout/html/tests/block/printing/145305-18.html
deleted file mode 100644
index 744117ae0e70..000000000000
--- a/layout/html/tests/block/printing/145305-18.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div style="width:100px; height:850px; border:1px solid black">test 18 - Text to have floaters below current line, float right image, no text on page 2</div>
-
-Text to have floaters below current line<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:right">
-
diff --git a/layout/html/tests/block/printing/145305-19.html b/layout/html/tests/block/printing/145305-19.html
deleted file mode 100644
index 19db36e23f1a..000000000000
--- a/layout/html/tests/block/printing/145305-19.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div style="width:100px; height:850px; border:1px solid black">test 19 - Text to have floaters below current line, float right table, text on page 2</div>
-Text to have floaters below current line<table border style="float:right">
- <tr>
-  <td>one<br>two<br></td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/145305-2.html b/layout/html/tests/block/printing/145305-2.html
deleted file mode 100644
index b7a8134a8508..000000000000
--- a/layout/html/tests/block/printing/145305-2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 2 - float right image, no text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:right">
-
-some text
-
diff --git a/layout/html/tests/block/printing/145305-20.html b/layout/html/tests/block/printing/145305-20.html
deleted file mode 100644
index 3d774396c89f..000000000000
--- a/layout/html/tests/block/printing/145305-20.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<div style="width:100px; height:850px; border:1px solid black">test 20 - Text to have floaters below current line, float right button, float right image, text on page 2</div>
-
-Text to have floaters below current line<button style="float:right;">foo</button>
-
-<img src="../../table/images/raptor.jpg" width=150 height=150 style="float:right">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-21.html b/layout/html/tests/block/printing/145305-21.html
deleted file mode 100644
index f1163536c1dd..000000000000
--- a/layout/html/tests/block/printing/145305-21.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<div style="width:100px; height:850px; border:1px solid black">test 21 - Text to have floaters below current line, float right button, float right table, put floaters on next page</div>
-Text to have floaters below current line<button style="float:right; font-size:xx-large">foo<BR>foo<BR>foo</button>
-<table border style="float:right">
- <tr>
-  <td>one<br>two<br>three</td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/145305-3.html b/layout/html/tests/block/printing/145305-3.html
deleted file mode 100644
index e5d364f08ccb..000000000000
--- a/layout/html/tests/block/printing/145305-3.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 3 - float left table, no text on page 2</div>
-<table border style="float:left">
- <tr>
-  <td>one<br>two<br>three</td>
- </tr>
-</table>
-some text
diff --git a/layout/html/tests/block/printing/145305-4.html b/layout/html/tests/block/printing/145305-4.html
deleted file mode 100644
index 4252fc6da412..000000000000
--- a/layout/html/tests/block/printing/145305-4.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 4 - float right table, no text on page 2</div>
-<table border style="float:right">
- <tr>
-  <td>one<br>two<br>three</td>
- </tr>
-</table>
-some text
diff --git a/layout/html/tests/block/printing/145305-5.html b/layout/html/tests/block/printing/145305-5.html
deleted file mode 100644
index c231f5217d70..000000000000
--- a/layout/html/tests/block/printing/145305-5.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 5 - 2 float left images, no text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:left">
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:left">
-
-some text
-
diff --git a/layout/html/tests/block/printing/145305-6.html b/layout/html/tests/block/printing/145305-6.html
deleted file mode 100644
index 0abf0073a012..000000000000
--- a/layout/html/tests/block/printing/145305-6.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 6 - 2 float right images, no text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:right">
-
-<img src="../../table/images/raptor.jpg" width=200 height=200 style="float:right">
-
-some text
-
diff --git a/layout/html/tests/block/printing/145305-7.html b/layout/html/tests/block/printing/145305-7.html
deleted file mode 100644
index d31530659fd1..000000000000
--- a/layout/html/tests/block/printing/145305-7.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 7 - 2 float right tables, no text on page 2</div>
-<table border style="float:right">
- <tr>
-  <td>one<br>two</td>
- </tr>
-</table><table border style="float:right">
- <tr>
-  <td>1<br>2<br>3</td>
- </tr>
-</table>
-some text
diff --git a/layout/html/tests/block/printing/145305-8.html b/layout/html/tests/block/printing/145305-8.html
deleted file mode 100644
index d2280191f9bd..000000000000
--- a/layout/html/tests/block/printing/145305-8.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 8 - float left image, text on page 2</div>
-
-<img src="../../table/images/raptor.jpg" width=60 height=60 style="float:left">
-
-START some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text
-
-some text some text some text some text some text some text END
-
diff --git a/layout/html/tests/block/printing/145305-9.html b/layout/html/tests/block/printing/145305-9.html
deleted file mode 100644
index 69b3fdfcfdfb..000000000000
--- a/layout/html/tests/block/printing/145305-9.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div style="width:100px; height:870px; border:1px solid black">test 9 - float left table, text on page 2</div>
-<table border style="float:left">
- <tr>
-  <td>one<br>two<br></td>
- </tr>
-</table>
-START some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text
-some text some text some text some text some text some text END
diff --git a/layout/html/tests/block/printing/150652.html b/layout/html/tests/block/printing/150652.html
deleted file mode 100644
index fea4bb4dc329..000000000000
--- a/layout/html/tests/block/printing/150652.html
+++ /dev/null
@@ -1,467 +0,0 @@
-<html><!-- #BeginTemplate "/Templates/dvtech.dwt" -->
-<head>
-<!-- #BeginEditable "doctitle" --> 
-<title>abcdv.com | dvtech | mainconcept dv codec in premiere 6</title>
-<!-- #EndEditable --> 
-<meta name="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="keywords" content="DV, dv, DVCAM, dvcam, DVCPRO, dvcpro, digital 8, D8, digital video, desktop video, adobe, ulead, apple, firewire, premiere, premiere 6, canopus, pinnacle, matrox, global dvc, ieee1394, vx1000, vx2000, dsr200, dsr-pd250, dsr-pd150, dhr-1000, rt-2000, editing, personal video, sony, canon, jvc, panasonic">
-<meta name="description" content="abcdv.com is the site about DV for DV users. Pro-user or home-user: it doesn't matter. If you want to know about DV you have to visit our site. We have the most up to date news, scoops and reviews, user reports and tips and tricks. Very often, we have news and information others don't have. Try us!">
-<style type="text/css">
-<!--
-.links {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 9pt; font-style: normal; color: #FFFFFF; clip:   rect(   )}
--->
-</style>
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Expires" content="now">
-</head>
-<body bgcolor="#FFFFFF">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#FFFFFF"><a name="top"></a></font> 
-<table width="100%" border="0" height="100%" cellpadding="0" cellspacing="0">
-  <tr align="left" valign="top"> 
-    <td> 
-      <table border="0" width="100%" bgcolor="#FFFFFF" cellpadding="0">
-        <tr align="left" bgcolor="#000000"> 
-          <td valign="top"> 
-            <div align="right"> 
-              <table width="100%" border="0">
-                <tr> 
-                  <td align="left" valign="top" width="20%" rowspan="2"><a href="/index.html"><img src="../images/logoweb_gif64_150_49.gif" width="150" height="49" border="0"></a></td>
-                  <td bgcolor="#000000" rowspan="2">&nbsp;</td>
-                  <td bgcolor="#000000" align="right" valign="top" width="300"> 
-                    <div align="right"><font color="#FFFFFF" face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/index.html" class="links">home</a> 
-                      | <a href="/about/index.html" class="links">about us</a></font></div>
-                  </td>
-                </tr>
-                <tr> 
-                  <td bgcolor="#000000" align="right" valign="bottom" width="300"> 
-                    <div align="right"><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF" size="4"><!-- #BeginEditable "top_right_description" -->mainconcept 
-                      dv codec<!-- #EndEditable --></font></div>
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </td>
-        </tr>
-        <tr align="left" bgcolor="#FF3300"> 
-          <td width="100%" height="20"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><a href="/index.html"><span class="links">Frontpage</span></a><span class="links"> 
-            | <a href="/shooting/index.html" class="links">DV shooting</a> | 
-            <a href="/editing/index.html" class="links">DV editing</a> | <a href="/dvtech/index.html" class="links">DV 
-            technology</a> | <a href="/pctech/index.html" class="links">Computer 
-            technology</a></span></font></td>
-        </tr>
-      </table>
-      <table width="100%" border="0" cellpadding="0" cellspacing="0">
-        <tr> 
-          <td width="20%" align="right" valign="top" bgcolor="#FFFFFF"> 
-            <table width="100%" border="0" height="100%" bgcolor="#FFFFFF" cellpadding="0" cellspacing="0">
-              <tr bgcolor="#FFFFFF" valign="top"> 
-                <td width="150" nowrap> 
-                  <table border="0" width="100%">
-                    <tr bgcolor="#999900"> 
-                      <td> 
-                        <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>Capture 
-                          cards </b></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/dvraptor/index.html">Canopus 
-                        DVRaptor</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/dvraptorrt/index.html">Canopus 
-                        DVRaptorRT</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/dvstorm/index.html">Canopus 
-                        DVStorm</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/dvrex/index.html">Canopus 
-                        DVRexRT</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/dvrex/index.html">Canopus 
-                        DVRexM1</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/canopus/cws100/index.html">Canopus 
-                        CWS100</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/matrox/rtx100/index.html">Matrox 
-                        RT.X100</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/matrox/rt2000/index.html">Matrox 
-                        RT2000</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/matrox/digisuitelx/index.html">Matrox 
-                        Digisuite LX</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/pinnacle/dv500/index.html">Pinnacle 
-                        DV500</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/pinnacle/pro_one/index.html">Pinnacle 
-                        Pro-ONE</a></font></td>
-                    </tr>
-                  </table>
-                  <table width="100%" border="0" bgcolor="#FFFFFF">
-                    <tr bgcolor="#999900"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>DV 
-                        decks</b></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/jvc/srvs10_zenera_review.html">JVC 
-                        SR-VS10/HR-DVS1 </a> (S-VHS/DV deck)</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/dr7/index.html">Sony 
-                        WV-DR7</a> (S-VHS/DV deck)</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/dsr11.html">Sony 
-                        DSR-11</a> (small DVCAM deck)</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/dsr1500.html">Sony 
-                        DSR-1500</a> (small DVCAM deck</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/drs1600.html">Sony 
-                        DSR-1600</a> (DVCAM deck)</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/dsr1800.html">Sony 
-                        DSR-1800</a> (DVCAM deck)</font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/sony/decks/dsr2000.html">Sony 
-                        DSR -2000</a> (DVCAM deck)</font></td>
-                    </tr>
-                  </table>
-                  <table border="0" width="100%">
-                    <tr bgcolor="#999900"> 
-                      <td> 
-                        <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>Edit 
-                          hardware </b></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/dazzle/press_release.html">Dazzle 
-                        DV-Bridge </a></font></td>
-                    </tr>
-                  </table>
-                  <table width="100%" border="0" bgcolor="#FFFFFF">
-                    <tr bgcolor="#999900"> 
-                      <td> 
-                        <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>Editing 
-                          software </b></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/premiere/index.html">Adobe 
-                        Premiere</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/avidxpressdv/index.html">Avid 
-                        XpressDV</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td> 
-                        <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/ulead/msp/index.html">Ulead 
-                          Media Studio Pro</a></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/cinestream/index.html">Media 
-                        100 Cinestream (EditDV)</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/pinnacle/editiondv/index.html">Pinnacle 
-                        Edition.DV</a></font></td>
-                    </tr>
-                  </table>
-                  <table width="100%" border="0" bgcolor="#FFFFFF">
-                    <tr bgcolor="#999900"> 
-                      <td> 
-                        <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>Plugin 
-                          software </b></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/plugins/index.html">The 
-                        Consolidator</a></font></td>
-                    </tr>
-                    <tr bgcolor="#CCCCCC"> 
-                      <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/baobab/index.html">Baobab 
-                        DV Converter</a></font></td>
-                    </tr>
-                  </table>
-                  <table width="100%" border="0">
-                    <tr> 
-                      <td> 
-                        <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">We 
-                          received the 'Best of the Net' award from about.com. 
-                          Thanks, and we will go on like this! Thanks for the 
-                          support!</font></div>
-                      </td>
-                    </tr>
-                    <tr> 
-                      <td> 
-                        <div align="center"><a href="http://desktopvideo.about.com/cs/dvindvout/index.htm" target="_blank"><img src="../images/graphics/november.gif" width="87" height="63" border="0"></a></div>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-          </td>
-          <td align="left" valign="top"> <!-- #BeginEditable "content_center" --> 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr valign="top"> 
-                <td> 
-                  <table width="100%" border="0">
-                    <tr bgcolor="#9999FF" align="left"> 
-                      <td nowrap valign="top"><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>MainConcept 
-                        DV codec in Premiere 6</b></font></td>
-                      <td nowrap width="25%"> 
-                        <div align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#FFFFFF"><b><i>February 
-                          2, 2001</i></b></font></div>
-                      </td>
-                    </tr>
-                    <tr bgcolor="#FFFFFF" align="left"> 
-                      <td colspan="3" valign="top"> 
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Now 
-                          you've read all this, this is how to do it:</font></p>
-                        <ol>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2"> 
-                            Download the Main Concept Demo Codec from: <a href="http://www.mainconcept.com" target="_blank">www.mainconcept.com</a>. 
-                            If you like their latest version after testing this, 
-                            buy it.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Create 
-                            a Folder on your C drive named QCAP.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Move 
-                            the Qcap.dll from your System32 directory to the Qcap 
-                            folder you just created, then back up qcap.dll to 
-                            a floppy for safety.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Now, 
-                            do a search on your C drive for qcap.dll and make 
-                            sure it ONLY comes up in the QCAP folder you just 
-                            created. If it shows up anywhere else DELETE it. You 
-                            can always move it back to the system 32 directory 
-                            where it belongs if you decide you don't want this 
-                            fix enabled.<br>
-                            NOTE -- Win 2k users: Make sure you enabled the registry 
-                            tweak or qcap.dll will keep getting copied back to 
-                            your system32 directory automatically courtesy of 
-                            SFC and Microsoft.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Install 
-                            the Main Concept codec, you can test this with the 
-                            Demo off their site.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Copy 
-                            the presets from the zip file below into your Premiere 
-                            settings directory. We have supplied 4: NTSC/PAL Interlaced 
-                            and NTSC/PAL Progressive. They start with DVMC------</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Start 
-                            Premiere 6. Select one of the supplied presets.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Go 
-                            into settings. Make sure it says DV Playback.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Go 
-                            to video settings and there magically you will find 
-                            all the codecs. The Main Concept codec should be selected. 
-                            Although you can at this point select other codecs 
-                            they will most likely NOT work with the Premiere DV 
-                            module. All the other settings will match proper DV 
-                            settings.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Make 
-                            sure you NEVER check always recompress.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">In 
-                            the Video Settings hit the Configure tab for the MainConcept 
-                            codec and make sure all the radio buttons are DE-SELECTED 
-                            as selecting some of them have caused some output 
-                            issues. Deselecting them all gives the highest quality 
-                            compression anyway.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">Now 
-                            you can go into the Premiere capture settings and 
-                            set them up. Save the settings as you wish, preferably 
-                            some other name so you will always have a master template.<br>
-                            Note: If you try and adjust capture settings without 
-                            qcap.dll in the system32 directory, you will get the 
-                            cannot connect to Capture Device error message.</font></li>
-                          <li><font face="Verdana, Arial, Helvetica, sans-serif" size="2">You're 
-                            all done.</font></li>
-                        </ol>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><img src="../images/audio_mixer_22tracks_tn.JPG" width="250" height="93" align="left">At 
-                          this point you can capture with the MS codec as a wrapper. 
-                          You have to have the qcap.dll file in the original location 
-                          (Windows System folder) to be able to capture. Once 
-                          done, remove the qcap.dll file from the System folder 
-                          with Premiere 6 not running and restart Premiere 6 when 
-                          you've done that. Now you can edit clips and apply filters/transitions, 
-                          etc. when you reload your project with the Presets we 
-                          supplied you with. Premiere will use the MainConcept 
-                          codec to render previews with. You then set up your 
-                          export settings to use it to export the same way as 
-                          a Microsoft AVI using the MainConcept codec. Make sure 
-                          your settings match the project settings EXACTLY and 
-                          do not check 'always recompress'. To help you do all 
-                          this switching, Ross (<a href="http://www.geocities.com/aussie01au/" target="_blank">www.geocities.com/aussie01au/</a>) 
-                          did write two batch files to do all the switching and 
-                          moving of files for you.</font></p>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">This 
-                          is how to use these batch files: they are designed to 
-                          be used with a Windows 98 system, where the qcap.dll 
-                          file is in the Windows\System folder. If it is in another 
-                          folder (like on Windows 2000), you will have to modify 
-                          these batch files. Since you can load them in Notepad 
-                          to do that, it's really easy.</font></p>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">There 
-                          are two batch files: MS_DV and MC_DV. MS_DV does copy 
-                          the qcap.dll file back to the Windows\System folder. 
-                          You use this one, when Premiere 6 is not running, to 
-                          be able to use the MS DV codec in Premiere 6 (to capture) 
-                          and other software that needs this file in it's normal 
-                          place. The MC_DV file does move the qcap.dll file from 
-                          the Windows\System folder to the c:\qcap folder you 
-                          have created manually, and starts Premiere 6 automatically. 
-                          You can tweak the two files and especially the MS_DV 
-                          file, by making copies of it and adding a line to start 
-                          other software that needs to have the qcap.dll file 
-                          in the System folder. Think about it: use these batch 
-                          files to start your DV software instead of the normal 
-                          shortcuts. They move the qcap.dll file to the right 
-                          location (to or from the Ssystem folder) and start the 
-                          software in the automatically. Open them in Notepad, 
-                          study them a bit and try it. You'll see: all this switching 
-                          becomes easier than I can explain it!</font></p>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><img src="..images/filterrt_tn.JPG" width="200" height="121" align="left">If 
-                          you've followed these instructions precisely, all MainConcept 
-                          codec rendered previews will play out Firewire as will 
-                          all alt-scrub actions, trim mode actions, etc. In short, 
-                          you have all the benefits of the Adobe generic plugin 
-                          but with a professional grade codec. If you are testing 
-                          with the MainConcept demo codec the way to know this 
-                          is working is that you will see the MC demo watermark 
-                          on all rendered footage.</font></p>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">You 
-                          can download the presets, batch files and the registry 
-                          tweak for Windows 2000 <a href="/dvtech/files/mctools.zip" target="_blank">here</a>. 
-                          The MainConcept codec can be downloaded <a href="http://www.mainconcept.com" target="_blank">here</a> 
-                          (make sure you get the latest codec!). Remember: they 
-                          only work if you create the c:\qcap folder yourself 
-                          and the qcap.dll file is in the Windows\System folder. 
-                          If not, you have to edit these files in Notepad!</font></p>
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">This 
-                          information is provided by Alan. He prefers to remain 
-                          unknown. He cannot be contacted for support and additional 
-                          info. But the trick works and works well. Just make 
-                          sure you follow these instructions step by step and 
-                          to the letter!</font></p>
-                        <p align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><a href="#top">top</a></font></p>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-            </table>
-            <!-- #EndEditable --></td>
-          <td width="150" align="left" valign="top"> 
-            <div align="right"> 
-              <table width="100%" border="0">
-                <tr bgcolor="#660099"> 
-                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="2" color="#FFFFFF"><b>Quick 
-                    Links</b></font></td>
-                </tr>
-                <tr bgcolor="#CCCCCC"> 
-                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><b><font color="#FF0000">UPDATED</font></b><br>
-                    <a href="/dvtech/replace_msdv_by_mcdvcodec_1.html">replace 
-                    the MS DV codec in Premiere 6 by the MainConcept DV codec</a></font></td>
-                </tr>
-                <tr bgcolor="#CCCCCC"> 
-                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><a href="/editing/baobab/index.html">Baobab 
-                    DV Converter</a></font></td>
-                </tr>
-                <tr bgcolor="#CCCCCC"> 
-                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="1"><b><font color="#FF0000">UPDATED</font></b><br>
-                    <a href="/dvtech/dvd/how_to_create_dvd_1.html">How to create 
-                    a DVD from within Premiere?</a></font></td>
-                </tr>
-              </table>
-              <!-- #BeginEditable "content_right" --> 
-              <table width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr> 
-                  <td>&nbsp;</td>
-                </tr>
-              </table>
-              <!-- #EndEditable --></div>
-          </td>
-        </tr>
-      </table>
-      <table width="100%" border="0" bgcolor="#FFFFFF">
-        <tr bgcolor="#FFFFFF"> 
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-      <table width="100%" border="0">
-        <tr> 
-          <td align="left" valign="top" width="150" nowrap> 
-            <hr size="1">
-            <table width="100%" border="0">
-              <tr> 
-                <td> 
-                  <div align="center"> 
-                    <img border="0" width="100" height="30" alt="This Site Tracked by 
-
-WebTrendsLive." 
-
-src="notfound"></a></div>
-                </td>
-              </tr>
-              <tr> 
-                <td> 
-                  <div align="center"><!--WEBBOT bot="HTMLMarkup" startspan ALT="Site Meter" --> 
-                    <div align="center"> 
-                      <img src="notfound" alt="Site Meter" border=0></a> 
-                      </noscript> <!-- Copyright (c)2000 Site Meter --> <!--WEBBOT bot="HTMLMarkup" Endspan --> 
-                    </div>
-                  </div>
-                </td>
-              </tr>
-              <tr> 
-                <td> 
-                  <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">visitors 
-                    already since October 12, 2000. Thank you!</font></div>
-                </td>
-              </tr>
-            </table>
-          </td>
-          <td align="left" valign="top"> 
-            <hr size="1">
-            <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">last 
-              update: <!-- #BeginEditable "date_bottom" -->
-              <!-- #BeginDate format:Am1a -->November 26, 2001 6:20 PM<!-- #EndDate -->
-              <!-- #EndEditable --> 
-              </font><font face="Verdana, Arial, Helvetica, sans-serif" size="1">GMT</font> 
-            </div>
-            <p align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">e-mail: 
-              <a href="mailto:webmaster@abcdv.com%20?subject=Feedback%20abcdv.com">webmaster@abcdv.com</a><br>
-              this site is best viewed with <a href="http://www.microsoft.com/windows/ie/default.htm" target="_blank">Microsoft 
-              Internet Explorer 4</a> or higher, at 1024 x 768</font></p>
-            <hr size="1">
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="1">copyright 
-            2000 - 2001 <a href="/anyvision.be/index.html" target="_blank">Anyvision 
-            Media Services</a>. All rights reserved.<br>
-            </font><font face="Verdana, Arial, Helvetica, sans-serif" size="1">Nothing 
-            from this page can be copied or used otherwise without the written 
-            permission from <a href="/anyvision.be/index.html" target="_blank">Anyvision 
-            Media Services</a>.</font></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-<!-- #EndTemplate --></html>
diff --git a/layout/html/tests/block/printing/163614.html b/layout/html/tests/block/printing/163614.html
deleted file mode 100644
index 4d660ac1f035..000000000000
--- a/layout/html/tests/block/printing/163614.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head><!-- saved from url=(0058)http://www-i.nist.gov/admin/pba/kelly/divhome_template.htm -->
-		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-		<meta name="generator" content="Adobe GoLive 4">
-		<title>II. The Hall Effect</title></head>
-
-
-	<body bgcolor="white" leftmargin="0" topmargin="0" marginheight="0" marginwidth="0">
-		<table cellspacing="0" cellpadding="0" width="1005" align="center" border="0" hspace="0" vspace="0">
-			<tbody>
-				<tr>
-					<td width="1005"><img alt="Technical Activities" src="../images/tech-banner1.gif" border="0" usemap="#Navigation"><map name="Navigation"><area href="http://www.eeel.nist.gov/812/tech.html" coords="447,63,603,84" shape="rect" alt="Technical Activities"><area href="http://www.eeel.nist.gov/812/research.html" coords="220,63,446,84" shape="rect" alt="Research Projects / Facilities"><area href="http://www.eeel.nist.gov/812/about-sed.html" coords="97,63,217,84" shape="rect" alt="About SED"><area href="http://www.eeel.nist.gov/812/index.html" coords="3,63,95,84" shape="rect" alt="Home"></map><img alt="National Institute of Standards and Technology" src="../images/tech-banner2.gif" usemap="#NIST" border="0"><map name="NIST"><area href="http://www.eeel.nist.gov/812/search.html" coords="125,63,225,84" shape="rect" alt="Search"><area href="http://www.eeel.nist.gov/812/outputs.html" coords="18,63,123,84" shape="rect" alt="Outputs"><area href="http://www.eeel.nist.gov/812/tech.html" coords="2,63,16,84" shape="rect" alt="Technical Activities"><area href="http://www.nist.gov/" coords="2,4,138,60" shape="rect" alt="NIST home page"></map></td>
-				</tr>
-			</tbody>
-		</table>
-		<table cellspacing="0" cellpadding="0" align="center" border="0" width="98%">
-			<tbody>
-				<tr>
-					<td valign="top" width="1"><img height="5" src="../images/black_1pix.html" width="1" border="0"></td>
-					<td valign="top" width="1000">
-						<table cellspacing="0" cellpadding="0" width="95%" align="center" border="0">
-							<tbody>
-								<tr valign="top" align="left">
-									<td>
-										<div align="left">
-											<h1>II. The Hall Effect</h1>
-										</div>
-										<dir>
-											<p><a href="#evol">Evolution of Resistance Concepts</a><br>
-											<a href="#lore">The Hall Effect and the Lorentz Force</a><br>
-											<a href="#vand">The van der Pauw Technique</a></p>
-										</dir>
-										<h3><a name="evol"></a>Evolution of Resistance Concepts</h3>
-										<p><b>Electrical characterization</b> of materials evolved in three levels of understanding. In the early 1800s, the resistance <i>R</i> and conductance <i>G</i> were treated as measurable physical quantities obtainable from two-terminal <i>I-V</i> measurements (i.e., current <i>I</i>, voltage <i>V</i>).
-Later, it became obvious that the resistance alone was not comprehensive
-enough since different sample shapes gave different resistance values. This
-led to the understanding (second level) that an intrinsic material property
-like resistivity (or conductivity) is required that is not influenced by
-the particular geometry of the sample. For the first time, this allowed scientists
-to quantify the current-carrying capability of the material and carry out
-meaningful comparisons between different samples.</p>
-										<p>By the
-early 1900s, it was realized that resistivity was not a fundamental material
-parameter, since different materials can have the same resistivity. Also,
-a given material might exhibit different values of resistivity, depending
-upon how it was synthesized. This is especially true for semiconductors,
-where resistivity alone could not explain all observations. Theories of electrical
-conduction were constructed with varying degrees of success, but until the
-advent of quantum mechanics, no generally acceptable solution to the problem
-of electrical transport was developed. This led to the definitions of carrier
-density <i>n</i> and mobility <i>µ </i> (third level of understanding) which are capable of dealing with even the most complex electrical measurements today.<a href="http://www.eeel.nist.gov/812/fig1.htm"><img src="../images/fig1s.jpg" align="right" hspace="10" vspace="70" border="0" alt="Schematic of the Hall effect in a long, thin bar of semiconductor with four ohmic contacts. The direction of the magnetic field B is along the z-axis and the sample has a finite thickness d"></a></p>
-										<h3><a name="lore"></a>The Hall Effect and the Lorentz Force</h3>
-										<p>The
-basic physical principle underlying the Hall effect is the Lorentz force.
-When an electron moves along a direction perpendicular to an applied magnetic
-field, it experiences a force acting normal to both directions and moves
-in response to this force and the force effected by the internal electric
-field. For an <i>n</i>-type, bar-shaped semiconductor shown in <a href="http://www.eeel.nist.gov/812/fig1.htm">Fig.1</a>, the carriers are predominately electrons of bulk density <i>n</i>. We assume that a constant current <i>I</i>
-flows along the x-axis from left to right in the presence of a z-directed
-magnetic field. Electrons subject to the Lorentz force initially drift away
-from the current line toward the negative y-axis, resulting in an excess
-surface electrical charge on the side of the sample. This charge results
-in the Hall voltage, a potential drop across the two sides of the sample.
-(Note that the force on holes is toward the same side because of their opposite
-velocity and positive charge.) This transverse voltage is the Hall voltage
-<i>V</i><font size="2"><sub>H</sub></font> and its magnitude is equal to <i>IB/qnd</i>, where <i>I</i> is the current, <i>B</i> is the magnetic field, <i>d</i> is the sample thickness, and <i>q</i> (1.602 x 10<font size="2"><sup>-19</sup></font> C) is the elementary charge. In some cases, it is convenient to use layer or sheet density (<i>n</i><sub>s</sub> = <i>nd</i>) instead of bulk density. One then obtains the equation</p>
-										<p>
-										<table border="0" cellpadding="0" cellspacing="2">
-											<tbody><tr>
-												<td width="40"></td>
-												<td width="480"><i>n</i><sub>s</sub> = <i>IB</i>/<i>q</i>|<i>V</i><font size="2"><sub>H</sub></font>|.</td>
-												<td width="20"></td>
-												<td>(1)</td>
-											</tr>
-										</tbody></table>
-										</p>
-										<p>Thus, by measuring the Hall voltage <i>V</i><sub>H</sub> and from the known values of <i>I</i>, <i>B</i>, and <i>q</i>, one can determine the sheet density <i>n</i><sub>s</sub>
-of charge carriers in semiconductors. If the measurement apparatus is set
-up as described later in Section III, the Hall voltage is negative for <i>n</i>-type semiconductors and positive for <i>p</i>-type semiconductors. The sheet resistance <i>R</i><font size="2"><sub>S</sub></font>
-of the semiconductor can be conveniently determined by use of the van der
-Pauw resistivity measurement technique. Since sheet resistance involves both
-sheet density and mobility, one can determine the Hall mobility from the
-equation</p>
-										<p>
-										<table border="0" cellpadding="0" cellspacing="2" align="left">
-											<tbody><tr>
-												<td width="40"></td>
-												<td width="480"><font face="Symbol"><i> </i></font><i>µ </i> = |<i>V</i><font size="2"><sub>H</sub></font>|/<i>R</i><font size="2"><sub>S</sub></font><i>IB</i> = 1/(<i>qn</i><font size="2"><sub>S</sub></font><i>R</i><font size="2"><sub>S</sub></font>).</td>
-												<td width="20"></td>
-												<td>(2)</td>
-											</tr>
-										</tbody></table>
-										<br>
-										<br>
-										</p>
-										<p>If the conducting layer thickness <i>d</i> is known, one can determine the bulk resistivity (<font face="Symbol"><i>r</i></font> = <i>R</i><font size="2"><sub>S</sub></font><i>d</i>) and the bulk density (<i>n</i> = <i>n</i><font size="2"><sub>S</sub></font>/<i>d</i>). <a href="http://www.eeel.nist.gov/812/fig2.htm"><img src="../images/fig2s.jpg" align="right" hspace="10" vspace="70" border="0" alt="Schematic of a van der Pauw configuration used in the determination of the two characteristic resistances RA and RB"></a></p>
-										<h3><a name="vand"></a>The van der Pauw Technique</h3>
-										<p>In order to determine both the mobility <i>µ</i>   and the sheet density <i>n</i><sub>s</sub>, a combination of a <a href="http://www.eeel.nist.gov/812/meas.htm#resi">resistivity measurement</a> and a <a href="http://www.eeel.nist.gov/812/meas.htm#halm">Hall measurement</a>
-is needed. We discuss here the van der Pauw technique which, due to its convenience,
-is widely used in the semiconductor industry to determine the resistivity
-of uniform samples (References 3 and 4). As originally devised by van der
-Pauw, one uses an arbitrarily shaped (but simply connected, i.e., no holes
-or nonconducting islands or inclusions), thin-plate sample containing four
-very small ohmic contacts placed on the periphery (preferably in the corners)
-of the plate. A schematic of a rectangular van der Pauw configuration is
-shown in <a href="http://www.eeel.nist.gov/812/fig2.htm">Fig. 2</a>.</p>
-										<p>The objective of the <a href="http://www.eeel.nist.gov/812/meas.htm#resi">resistivity measurement</a> is to determine the sheet resistance <i>R</i><font size="2"><sub>S</sub></font>. Van der Pauw demonstrated that there are actually two characteristic resistances <i>R</i><font size="2"><sub>A</sub></font> and <i>R</i><font size="2"><sub>B</sub>,</font> associated with the corresponding terminals shown in <a href="http://www.eeel.nist.gov/812/fig2.htm">Fig. 2</a>. <i>R</i><font size="2"><sub>A</sub></font> and <i>R</i><font size="2"><sub>B</sub></font> are related to the sheet resistance <i>R</i><font size="2"><sub>S</sub></font> through the van der Pauw equation</p>
-										<p>
-										<table border="0" cellpadding="0" cellspacing="2">
-											<tbody><tr>
-												<td width="40"></td>
-												<td width="480">exp(-<font face="Symbol">p</font><i>R</i><font size="2"><sub>A</sub></font>/<i>R</i><font size="2"><sub>S</sub></font>) + exp(-<font face="Symbol">p</font><i>R</i><font size="2"><sub>B</sub></font>/<i>R</i><font size="2"><sub>S</sub></font>) = 1</td>
-												<td width="20"></td>
-												<td>(3)</td>
-											</tr>
-										</tbody></table>
-										</p>
-										<p>which can be solved numerically for <i>R</i><font size="2"><sub>S</sub></font>.</p>
-										<p>The bulk electrical resistivity <font face="Symbol"><i>r</i></font> can be calculated using</p>
-										<p>
-										<table border="0" cellpadding="0" cellspacing="2">
-											<tbody><tr>
-												<td width="40"></td>
-												<td width="480"><font face="Symbol"><i>r</i></font> = <i>R</i><font size="2"><sub>S</sub></font><i>d</i>.</td>
-												<td width="20"></td>
-												<td>(4)</td>
-											</tr>
-										</tbody></table>
-										</p>
-										<p>To obtain the two characteristic resistances, one applies a dc current <i>I</i> into contact 1 and out of contact 2 and measures the voltage <i>V</i><font size="2"><sub>43</sub></font> from contact 4 to contact 3 as shown in <a href="http://www.eeel.nist.gov/812/fig2.htm">Fig. 2</a>. Next, one applies the current <i>I</i> into contact 2 and out of contact 3 while measuring the voltage <i>V</i><font size="2"><sub>14</sub></font> from contact 1 to contact 4. <i>R</i><font size="2"><sub>A</sub></font> and <i>R</i><font size="2"><sub>B</sub></font> are calculated by means of the following expressions:</p>
-										<p>
-										<table border="0" cellpadding="0" cellspacing="2">
-											<tbody><tr>
-												<td width="40"></td>
-												<td width="480"><i>R</i><font size="2"><sub>A</sub></font> = <i>V</i><font size="2"><sub>43</sub></font>/<i>I</i><font size="2"><sub>12</sub></font> and <i>R</i><font size="2"><sub>B</sub></font> = <i>V</i><font size="2"><sub>14</sub></font>/<i>I</i><font size="2"><sub>23</sub></font>.</td>
-												<td width="20"></td>
-												<td>(5)</td>
-											</tr>
-										</tbody></table>
-										</p>
-										<p><a href="http://www.eeel.nist.gov/812/fig3.htm"><img src="../images/fig3s.jpg" align="right" hspace="10" vspace="70" border="0" alt="Schematic of a van der Pauw configuration used in the determination of the Hall voltage VH"></a>The objective of the <a href="http://www.eeel.nist.gov/812/meas.htm#halm">Hall measurement</a> in the van der Pauw technique is to determine the sheet carrier density <i>n</i><sub>s</sub> by measuring the Hall voltage <i>V</i><font size="2"><sub>H</sub></font>. The Hall voltage measurement consists of a series of voltage measurements with a constant current <i>I</i> and a constant magnetic field <i>B</i> applied perpendicular to the plane of the sample. Conveniently, the same sample, shown again in <a href="http://www.eeel.nist.gov/812/fig3.htm">Fig. 3</a>, can also be used for the Hall measurement. To measure the Hall voltage <i>V</i><font size="2"><sub>H</sub></font>, a current <i>I</i> is forced through the opposing pair of contacts 1 and 3 and the Hall voltage <i>V</i><font size="2"><sub>H</sub></font> (= <i>V</i><font size="2"><sub>24</sub></font>) is measured across the remaining pair of contacts 2 and 4. Once the Hall voltage <i>V</i><font size="2"><sub>H</sub></font> is acquired, the sheet carrier density <i>n</i><sub>s</sub> can be calculated via <i>n</i><sub>s</sub> = <i>IB</i>/<i>q</i>|<i>V</i><font size="2"><sub>H</sub></font>| from the known values of <i>I</i>, <i>B</i>, and <i>q</i>.</p>
-										<p>There
-are practical aspects which must be considered when carrying out Hall and
-resistivity measurements. Primary concerns are (1) ohmic contact quality
-and size, (2) sample uniformity and accurate thickness determination, (3)
-thermomagnetic effects due to nonuniform temperature, and (4) photoconductive
-and photovoltaic effects which can be minimized by measuring in a dark environment.
-Also, the sample lateral dimensions must be large compared to the size of
-the contacts and the sample thickness. Finally, one must accurately measure
-sample temperature, magnetic field intensity, electrical current, and voltage.</p>
-										<p><a href="http://www.eeel.nist.gov/812/meas.htm"><img src="../images/continue.jpg" alt="Click for Next Page"></a></p>
-										<center>
-											<p>
-											</p><hr>
-											<p></p>
-											<p><font size="2">|<a href="http://www.eeel.nist.gov/812/hall.html"> Main Page </a>| <a href="http://www.eeel.nist.gov/812/intr.htm">I. Introduction </a>| <a href="http://www.eeel.nist.gov/812/effe.htm">II. The Hall Effect </a>| <a href="#evol">evolution of resistance concepts </a>|<br>
-											| <a href="#lore">the Hall effect and the Lorentz force </a>| <a href="#vand">the van der Pauw technique </a>|<br>
-											| <a href="http://www.eeel.nist.gov/812/meas.htm">III. Resistivity and Hall Measurements </a>| <a href="http://www.eeel.nist.gov/812/meas.htm#geom">sample geometry </a>| <a href="http://www.eeel.nist.gov/812/meas.htm#defi">definitions for resistivity measurements</a> |<br>
-											|<a href="http://www.eeel.nist.gov/812/meas.htm#resi"> resistivity measurements </a>| <a href="http://www.eeel.nist.gov/812/meas.htm#calc">resistivity calculations </a>| <a href="http://www.eeel.nist.gov/812/meas.htm#defh">definitions for Hall measurements </a>|<br>
-											|<a href="http://www.eeel.nist.gov/812/meas.htm#halm"> Hall measurements </a>|<a href="http://www.eeel.nist.gov/812/meas.htm#halc"> Hall calculations </a>| <a href="http://www.eeel.nist.gov/812/work.htm">Sample Hall Worksheet </a>|<a href="http://www.eeel.nist.gov/812/work2.htm"> Worksheet with Typical Data </a>| <a href="http://www.eeel.nist.gov/812/samp.htm">IV. Algorithm </a>|<br>
-											|<a href="http://www.eeel.nist.gov/812/references.htm"> V. References </a>| VI.<a href="http://www.eeel.nist.gov/812/hallcom.htm"> Leave </a>or <a href="http://www.eeel.nist.gov/812/hallview.htm">View </a>Comments | <a href="http://www.eeel.nist.gov/812/fig1.htm">figure 1 </a>| <a href="http://www.eeel.nist.gov/812/fig2.htm">figure 2 </a>| |<a href="http://www.eeel.nist.gov/812/fig3.htm"> figure 3 </a>| <a href="http://www.eeel.nist.gov/812/fig4.htm">figure 4 </a>|<br>
-											</font></p>
-											<p>
-											</p><hr>
-											<p></p>
-										</center>
-										<p><font face="Arial,Helvetica,sans-serif" size="1">NIST is an agency of the <a href="http://www.doc.gov/">U.S. Commerce Department's</a> <a href="http://www.ta.doc.gov/">Technology Administration.</a></font></p>
-										<p><font face="Arial,Helvetica,sans-serif" size="1">Date created: 12/4/2000<br>
-										Last updated: 6/28/2001</font></p></td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-					<td valign="top" width="1" bgcolor="black"><img height="5" src="../images/black_1pix.html" width="1" border="0"></td>
-					<td valign="top" width="200" bgcolor="#ffcc66">
-						<table cellspacing="0" cellpadding="0" width="95%" border="0">
-							<tbody>
-								<tr>
-									<td width="200"><b> </b>
-										<p><a href="http://www.eeel.nist.gov/812/conf.htm"><b>Conferences/Workshops</b></a></p>
-										<p><a href="http://www.eeel.nist.gov/812/nano.html"><b>Nanotechnology</b></a></p>
-										<p><a href="http://www.eeel.nist.gov/812/inte.htm"><b>Electronic Interconnects/Packaging</b></a></p>
-										<p><a href="http://www.eeel.nist.gov/812/comp.htm"><b>Compound Semiconductors</b></a></p>
-										<p><a href="http://www.eeel.nist.gov/812/hall.html"><b>Hall Effect Measurements</b></a></p>
-										<p><a href="http://www.eeel.nist.gov/812/itrcs.html"><b>Compound Semiconductor Roadmap</b></a></p></td>
-								</tr>
-							</tbody>
-						</table>
-					</td>
-				</tr>
-			</tbody>
-		</table>
-	</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/179683-1.html b/layout/html/tests/block/printing/179683-1.html
deleted file mode 100644
index 6d6092efb92a..000000000000
--- a/layout/html/tests/block/printing/179683-1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-  <head>
-    <style type="text/css">
-      #main {
-        background-color:#dddddd;
-        position: fixed;
-        width: auto;
-        height: auto;
-        top: 50px;
-        right: 0;
-        bottom: 25px;
-        left: 0;
-	    overflow: auto;
-      }
-    </STYLE>
-  </head>
-  <body>
-    <div id="main">Some text</div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/block/printing/179683-2.html b/layout/html/tests/block/printing/179683-2.html
deleted file mode 100644
index 03bb809c9144..000000000000
--- a/layout/html/tests/block/printing/179683-2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-  <head>
-    <style type="text/css">
-      #header {
-        background-color:#dddddd;
-        position: fixed;
-        width: auto;
-        height: auto;
-        top: 50px;
-        right: 0;
-        bottom: 25px;
-        left: 0;
-	    overflow: auto;
-      }
-    </STYLE>
-  </head>
-  <body>
-    <table border id="header"><tr><td>should print on every page</td></tr></table>
-	<div style="font-size:100pt">hello<br>hello<br>hello<br>hello<br>hello<br>
-
-	hello<br>hello<br>hello<br>hello<br>hello<br>hello<br></div>
-  </body>
-</html>
diff --git a/layout/html/tests/block/printing/rtest.lst b/layout/html/tests/block/printing/rtest.lst
deleted file mode 100644
index 8364f972d85a..000000000000
--- a/layout/html/tests/block/printing/rtest.lst
+++ /dev/null
@@ -1,31 +0,0 @@
-127145-1.html
-127145-2.html
-127145-3.html
-127286-1.html
-127286-2.html
-145305-1.html
-145305-2.html
-145305-3.html
-145305-4.html
-145305-5.html
-145305-6.html
-145305-7.html
-145305-8.html
-145305-9.html
-145305-10.html
-145305-11.html
-145305-12.html
-145305-13.html
-145305-14.html
-145305-15.html
-145305-16.html
-145305-17.html
-145305-18.html
-145305-19.html
-145305-20.html
-145305-21.html
-150652.html
-163614.html
-179683-1.html
-179683-2.html
-
diff --git a/layout/html/tests/block/rtest.lst b/layout/html/tests/block/rtest.lst
deleted file mode 100644
index 68686f62805e..000000000000
--- a/layout/html/tests/block/rtest.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-base/rtest.lst
-bugs/rtest.lst
-printing/rtest.lst
-../table/core/rtest.lst
-../table/viewer_tests/rtest.lst
-../table/bugs/rtest.lst
-../table/marvin/rtest.lst
-../table/other/rtest.lst
-../table/dom/rtest.lst
-../table/printing/rtest.lst
-../formctls/base/rtest.lst
-../formctls/bugs/rtest.lst
-../style/bugs/rtest.lst
-../xbl/rtest.lst
-net/rtest.lst
diff --git a/layout/html/tests/css/IMPORTANT.css b/layout/html/tests/css/IMPORTANT.css
deleted file mode 100644
index 94fff1f1dce8..000000000000
--- a/layout/html/tests/css/IMPORTANT.css
+++ /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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-/* Combinatorics for !important */
-Important {
-  color: purple !important;
-  padding: 2px;
-}
-Important {
-  color: purple ! important ;
-  padding: 2px;
-}
-SomewhatImportant {
-  color: purple ! foo;
-  padding: 2px ! important;
-}
-NotImportant {
-  color: purple !foo
-}
-NotImportant {
-  color: purple ! foo
-}
diff --git a/layout/html/tests/css/INVALID.css b/layout/html/tests/css/INVALID.css
deleted file mode 100644
index 0bad08d9a09e..000000000000
--- a/layout/html/tests/css/INVALID.css
+++ /dev/null
@@ -1,410 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-/* Test of illegal CSS1 input.
-   Illegal @ rules */
-@ignored;
-P { color: purple }
-@ignored [ skip me ];
-P { color: purple }
-@ignored { skip me }
-P { color: purple }
-@ignored ( skip me too );
-P { color: purple }
-
-/* Handle dangling semi-colons. Outside the scope of the CSS1 document
-   but a reasonable parser should be able to eat them. */
-@extra-semicolon;;
-P { color: purple }
-
-/* These are all properties that have an extra keyword (fish) at the
-   end. CSS1 says that such properties are to be ignored. Because the
-   properties are all set in the BODY tag we can see if anything
-   happens to invalid.html when this sheet is loaded (there should be
-   no effect because the entire declaration block should be skipped). */
-BODY {
-  word-spacing: normal fish;
-  wOrd-spacing: 12.0em fish;
-  WoRd-Spacing: 12.0eX fish;
-  worD-Spacing: 12PX fish;
-  word-Spacing: 12.0In fish;
-  word-sPacing: 12.0cm fish;
-  word-spAcing: 12.0mm fish;
-  word-spaCing: 12.0pt fish;
-  word-spacIng: 12.0pc fish;
-  color: red fish;
-  color: rgb(0, 0, 0) fish;
-  color: rGb(110%, 23, 9123784328342834) fish;
-  color: #f00 fish;
-  color: #ff00ff fish;
-  background: red none repeat scroll 20% 30% fish;
-  background: none repeat scroll 20% 30% red fish;
-  background: repeat scroll 20% 30% red none fish;
-  background: scroll 20% 30% red none repeat fish;
-  background: 20% 30% red none repeat scroll fish;
-  background-color: blue fish;
-  background-color: rgb(0, 0, 0) fish;
-  background-color: rGb(110%, 23, 9123784328342834) fish;
-  BackGround-Color: Transparent fish;
-  background-image: none fish;
-  background-image: url(fowl.url) fish;
-  background-image: url( fowl.url ) fish;
-  background-image: url( "fowl.url" ) fish;
-  background-image: url( 'fowl.url' ) fish;
-  background-repeat: repeat fish;
-  background-repeat: repeat-x fish;
-  background-repeat: repeat-y fish;
-  background-repeat: no-repeat fish;
-  Background-Attachment: Scroll fish;
-  Background-Attachment: Fixed fish;
-  background-position: 73% fish;
-  background-position: -73% fish;
-  background-position: +3% fish;
-  background-position: +3.5% fish;
-  background-position: 10% 20% fish;
-  background-position: 10% 23in fish;
-  background-position: 23in fish;
-  background-position: 23in 10% fish;
-  Background-Position: 23IN 30CM fish;
-  Background-Position: top left fish;
-  Background-Position: left top fish;
-  Background-Position: top fish;
-  Background-Position: top center fish;
-  Background-Position: center top fish;
-  Background-Position: right top fish;
-  Background-Position: top right fish;
-  Background-Position: left fish;
-  Background-Position: left center fish;
-  Background-Position: center left fish;
-  Background-Position: right fish;
-  Background-Position: right center fish;
-  Background-Position: center right fish;
-  Background-Position: bottom fish;
-  Background-Position: bottom center fish;
-  Background-Position: center bottom fish;
-  Background-Position: bottom right fish;
-  Background-Position: right bottom fish;
-  font: italic small-caps bold 12pt helvetica
-  font: italic bold small-caps 12pt helvetica
-  font: small-caps bold italic 12pt helvetica
-  font: small-caps italic bold 12pt helvetica
-  font: bold italic small-caps 12pt helvetica
-  font: bold small-caps italic 12pt helvetica
-  font: bold 12pt helvetica
-  font: 12pt helvetica
-  font: 12pt/14pt sans-serif 27;
-  font: 80% sans-serif 27;
-  font: x-large/110% "new century schoolbook", serif 27;
-  font: bold italic large Palatino, serif 27;
-  font: normal small-caps 120%/120% fantasy 27;
-  font-family: gill, helvetica, times new roman, sans-serif 27;
-  font-style: normal fish;
-  font-style: italic fish;
-  font-style: oblique fish;
-  font-variant: normal fish;
-  font-variant: small-caps fish;
-  font-weight: normal fish;
-  font-weight: bold fish;
-  font-weight: bolder fish;
-  font-weight: lighter fish;
-  font-weight: 100 fish;
-  font-weight: 200 fish;
-  font-weight: 300 fish;
-  font-weight: 400 fish;
-  font-weight: 500 fish;
-  font-weight: 600 fish;
-  font-weight: 700 fish;
-  font-weight: 800 fish;
-  font-weight: 900 fish;
-  font-size: Xx-smAll fish;
-  font-size: x-Small fish;
-  font-size: Small fish;
-  font-size: Medium fish;
-  font-size: LaRgE fish;
-  font-size: x-LaRgE fish;
-  font-size: Xx-LaRgE fish;
-  font-size: LaRgEr fish;
-  font-size: smalLer fish;
-  font-size: 3.0in fish;
-  font-size: 120% fish;
-  letter-spacing: normal fish;
-  letter-spacing: 3.0in fish;
-  text-decoration: none fish;
-  text-decoration: underline fish;
-  text-decoration: overline underline fish;
-  text-decoration: line-through overline underline fish;
-  text-decoration: blink line-through overline underline fish;
-  vertical-align: baseline fish;
-  vertical-align: sub fish;
-  vertical-align: super fish;
-  vertical-align: top fish;
-  vertical-align: text-top fish;
-  vertical-align: middle fish;
-  vertical-align: bottom fish;
-  vertical-align: text-bottom fish;
-  vertical-align: 120% fish;
-  text-transform: capitalize fish;
-  text-transform: uppercase fish;
-  text-transform: lowercase fish;
-  text-transform: none fish;
-  text-align: left fish;
-  text-align: right fish;
-  text-align: center fish;
-  text-align: justify fish;
-  text-indent: 3.0in fish;
-  text-indent: 120% fish;
-  line-height: normal fish;
-  line-height: 17 fish;
-  line-height: 17.0in fish;
-  line-height: 17% fish;
-  margin-top: 17.0in fish;
-  margin-top: 120% fish;
-  margin-top: auto fish;
-  margin-right: 17.0in fish;
-  margin-right: 120% fish;
-  margin-right: auto fish;
-  margin-bottom: 17.0in fish;
-  margin-bottom: 120% fish;
-  margin-bottom: auto fish;
-  margin-left: 17.0in fish;
-  margin-left: 120% fish;
-  margin-left: auto fish;
-  margin: 17.0in fish;
-  margin: 120% fish;
-  margin: auto fish;
-  margin: 17.0in auto fish;
-  margin: 17.0in 120% fish;
-  margin: 17.0in 17.0in fish;
-  margin: 120% 17.0in fish;
-  margin: 120% auto fish;
-  margin: 120% 120% fish;
-  margin: auto 120% fish;
-  margin: auto 17.0in fish;
-  margin: auto auto fish;
-  margin: 17.0in 17.0in 17.0in fish;
-  margin: 17.0in 17.0in 120% fish;
-  margin: 17.0in 17.0in auto fish;
-  margin: 17.0in 120% 17.0in fish;
-  margin: 17.0in auto 17.0in fish;
-  margin: 17.0in 17.0in 17.0in 17.0in fish;
-  margin: 17.0in 120% 17.0in 17.0in fish;
-  margin: 120% 120% 17.0in 17.0in fish;
-  margin: 120% 120% 120% 17.0in fish;
-  margin: 120% 120% 120% 120% fish;
-  padding-top: 17.0in fish;
-  padding-top: 120% fish;
-  padding-right: 17.0in fish;
-  padding-right: 120% fish;
-  padding-bottom: 17.0in fish;
-  padding-bottom: 120% fish;
-  padding-left: 17.0in fish;
-  padding-left: 120% fish;
-  padding: 17.0in fish;
-  padding: 120% fish;
-  padding: 17.0in 120% fish;
-  padding: 17.0in 17.0in fish;
-  padding: 120% 17.0in fish;
-  padding: 120% 120% fish;
-  padding: 17.0in 17.0in 17.0in fish;
-  padding: 17.0in 17.0in 120% fish;
-  padding: 17.0in 120% 17.0in fish;
-  padding: 17.0in 17.0in 17.0in 17.0in fish;
-  padding: 17.0in 120% 17.0in 17.0in fish;
-  padding: 120% 120% 17.0in 17.0in fish;
-  padding: 120% 120% 120% 17.0in fish;
-  padding: 120% 120% 120% 120% fish;
-  border-top-width: thin fish;
-  border-top-width: medium fish;
-  border-top-width: thick fish;
-  border-top-width: 3.0in fish;
-  border-right-width: thin fish;
-  border-right-width: medium fish;
-  border-right-width: thick fish;
-  border-right-width: 3.0in fish;
-  border-bottom-width: thin fish;
-  border-bottom-width: medium fish;
-  border-bottom-width: thick fish;
-  border-bottom-width: 3.0in fish;
-  border-left-width: thin fish;
-  border-left-width: medium fish;
-  border-left-width: thick fish;
-  border-left-width: 3.0in fish;
-  border-width: thin fish;
-  border-width: 3.0in fish;
-  border-width: thick thick fish;
-  border-width: 3.0in thick fish;
-  border-width: thin 3.0in thick fish;
-  border-width: 3.0in thick thin fish;
-  border-width: 3.0in thick medium fish;
-  border-color: red fish;
-  border-color: red blue fish;
-  border-color: red blue rgb(0, 0, 0) fish;
-  border-color: red blue green yellow fish;
-  border-style: none fish;
-  border-style: dotted fish;
-  border-style: dashed fish;
-  border-style: solid fish;
-  border-style: double fish;
-  border-style: groove fish;
-  border-style: ridge fish;
-  border-style: inset fish;
-  border-style: outset fish;
-  border-style: dashed none fish;
-  border-style: dashed dotted none fish;
-  border-style: dashed dotted inset none fish;
-  border-top: 3.0in fish;
-  border-top: thin fish;
-  border-top: 3.0in dashed fish;
-  border-top: thin dotted fish;
-  border-top: 3.0in dashed red fish;
-  border-top: thin dotted green fish;
-  border-top: green thin dotted fish;
-  border-top: green dotted thin fish;
-  border-right: 3.0in fish;
-  border-right: thin fish;
-  border-right: 3.0in dashed fish;
-  border-right: thin dotted fish;
-  border-right: 3.0in dashed red fish;
-  border-right: thin dotted green fish;
-  border-right: green thin dotted fish;
-  border-right: green dotted thin fish;
-  border-bottom: 3.0in fish;
-  border-bottom: thin fish;
-  border-bottom: 3.0in dashed fish;
-  border-bottom: thin dotted fish;
-  border-bottom: 3.0in dashed red fish;
-  border-bottom: thin dotted green fish;
-  border-bottom: green thin dotted fish;
-  border-bottom: green dotted thin fish;
-  border-left: 3.0in fish;
-  border-left: thin fish;
-  border-left: 3.0in dashed fish;
-  border-left: thin dotted fish;
-  border-left: 3.0in dashed red fish;
-  border-left: thin dotted green fish;
-  border-left: green thin dotted fish;
-  border-left: green dotted thin fish;
-  border: 3.0in fish;
-  border: thin fish;
-  border: 3.0in dashed fish;
-  border: thin dotted fish;
-  border: 3.0in dashed red fish;
-  border: thin dotted green fish;
-  border: green thin dotted fish;
-  border: green dotted thin fish;
-  width: 3.0in fish;
-  width: 120% fish;
-  width: auto fish;
-  height: 3.0in fish;
-  height: auto fish;
-  float: left fish;
-  float: right fish;
-  float: none fish;
-  clear: none fish;
-  clear: left fish;
-  clear: right fish;
-  clear: both fish;
-  white-space: normal fish;
-  white-space: pre fish;
-  white-space: nowrap fish;
-  list-style-type: disc fish;
-  list-style-type: circle fish;
-  list-style-type: square fish;
-  list-style-type: decimal fish;
-  list-style-type: lower-roman fish;
-  list-style-type: upper-roman fish;
-  list-style-type: lower-alpha fish;
-  list-style-type: upper-alpha fish;
-  list-style-type: none fish;
-  list-style-image: none fish;
-  list-style-image: url(fowl.gif) fish;
-  list-style-position: inside fish;
-  list-style-position: outside fish;
-  list-style: disc fish;
-  list-style: disc inside fish;
-  list-style: inside disc fish;
-  list-style: inside disc url(fowl.gif) fish;
-  list-style: disc url(fowl.gif) inside fish;
-  list-style: url(fowl.gif) inside disc fish;
-}
-P { color: purple }
-
-/* Illegal color values */
-InvalidColor {
-  color: RGB(110;
-  color: RGB(110,;
-  color: RGB(110, 23;
-  color: RGB(110, 23,;
-  color: RGB(110, 23, 37;
-  color: RGB(110, 23, fowl;
-  color: RGB(110%, 23);
-  color: RGB(110%);
-  color: #7xy;
-  color: #777888999;
-  color:;
-  color:#;
-  color:#x;
-  color:#7;
-}
-P { color: purple }
-
-/* Illegal numeric values */
-InvalidNumber {
-  list-indent: 2..3;
-  list-indent: 17a;
-  list-indent: 1.0e25;
-  list-indent: 10quadloos;
-}
-P { color: purple }
-
-/* Illegal url values */
-InvalidURL {
-  background-image: url;
-  background-image: url(goaway;
-  background-image: url( this (is) some nonsense );
-}
-P { color: purple }
-
-/* Illegal rules */
-P[align], UL {
-  color: red;
-  font-size: large
-}
-P { color: purple }
-
-!27 32 hike! {
-  color: red;
-}
-P { color: purple }
diff --git a/layout/html/tests/css/SELECTORS.css b/layout/html/tests/css/SELECTORS.css
deleted file mode 100644
index 105cc02e1fcf..000000000000
--- a/layout/html/tests/css/SELECTORS.css
+++ /dev/null
@@ -1,51 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-/* Combinatorics for selectors */
-Tag { color: purple }
-Tag#Id { color: purple }
-Tag#Id.Class { color: purple }
-Tag#Id.Class:Pseudo { color: purple }
-Tag#Id:Pseudo { color: purple }
-Tag.Class { color: purple }
-Tag.Class:Pseudo { color: purple }
-Tag:Pseudo { color: purple }
-#Id { color: purple }
-#Id.Class { color: purple }
-#Id.Class:Pseudo { color: purple }
-#Id:Pseudo { color: purple }
-.Class { color: purple }
-.Class:Pseudo { color: purple }
-:Pseudo { color: purple }
diff --git a/layout/html/tests/css/azimuth.css b/layout/html/tests/css/azimuth.css
deleted file mode 100644
index c57b319eed00..000000000000
--- a/layout/html/tests/css/azimuth.css
+++ /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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-GOOD { azimuth: 30deg; }
-GOOD { azimuth: -10deg; }
-GOOD { azimuth: +10deg; }
-GOOD { azimuth: 100grad; }
-GOOD { azimuth: 1.570796326794897rad; }
-GOOD { azimuth: left-side; } 
-GOOD { azimuth: far-left; }
-GOOD { azimuth: left; }
-GOOD { azimuth: center-left; }
-GOOD { azimuth: center; }
-GOOD { azimuth: center-right; }
-GOOD { azimuth: right; }
-GOOD { azimuth: far-right; }
-GOOD { azimuth: right-side; }
-GOOD { azimuth: center-left behind; }
-GOOD { azimuth: behind left-side; } 
-GOOD { azimuth: leftwards; }
-GOOD { azimuth: rightwards; }
-GOOD { azimuth: inherit; } 
-BAD { azimuth: very-far-right; }
-BAD { azimuth: 19deg leftwards; }
-BAD { azimuth: left-side behind center; }
-BAD { azimuth: ardvark 1.3749171504rad; }
-BAD { azimuth: left-side inherit behind leftwards; }
-BAD { azimuth: behind right side; }
-BAD { azimuth: align center; }
-BAD { azimuth: -rightwards; }
-BAD { azimuth: rightward; }
-BAD { azimuth: right inherit; } 
\ No newline at end of file
diff --git a/layout/html/tests/css/background-attachment.css b/layout/html/tests/css/background-attachment.css
deleted file mode 100644
index ae5a91c05cfd..000000000000
--- a/layout/html/tests/css/background-attachment.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { Background-Attachment: Scroll; }
-GOOD { Background-Attachment: Fixed; }
-BAD { Background-Attachments: Fixed; }
-BAD { Background-Attachment: Scroll Fixed; }
-BAD { Background-Attachment: Fixed tiny; }
-BAD { Background-Attachment: tiny Scroll; }
-BAD { Background-Attachment: tiny Fixed; }
-BAD { Background-Attachment: medium; }
-BAD { Background-Attachment: 12pt; }
-BAD { Background-Attachment: red; }
-BAD { Background-Attachment: url("foo.html"); }
-BAD { Background-Attachment: smelly; }
diff --git a/layout/html/tests/css/background-color.css b/layout/html/tests/css/background-color.css
deleted file mode 100644
index 65731c7f6ac7..000000000000
--- a/layout/html/tests/css/background-color.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { background-color: blue; }
-GOOD { background-color: rgb(0, 0, 0); }
-GOOD { background-color: rGb(110%, 23, 9123784328342834); }
-GOOD { BackGround-Color: Transparent; }
-BAD { BackGround-Color: beeble; }
-BAD { BackGround-Color: 27; }
-BAD { BackGround-Color: #23; }
-BAD { BackGround-Color: url(fish; }
diff --git a/layout/html/tests/css/background-image.css b/layout/html/tests/css/background-image.css
deleted file mode 100644
index 0a2cecd159f7..000000000000
--- a/layout/html/tests/css/background-image.css
+++ /dev/null
@@ -1,42 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { background-image: none; }
-GOOD { background-image: url(fowl1.url); }
-GOOD { background-image: url( fowl2.url ); }
-GOOD { background-image: url( "fowl3.url" ); }
-GOOD { background-image: url( 'fowl4.url' ); }
-BAD { background-image: none url(fowl5.url); }
-BAD { background-image: url(fowl6.url) none; }
diff --git a/layout/html/tests/css/background-position.css b/layout/html/tests/css/background-position.css
deleted file mode 100644
index c5e94a8fdd92..000000000000
--- a/layout/html/tests/css/background-position.css
+++ /dev/null
@@ -1,62 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { background-position: 73%; }
-GOOD { background-position: -73%; }
-GOOD { background-position: +3%; }
-GOOD { background-position: +3.5%; }
-GOOD { background-position: 10% 20%; }
-GOOD { background-position: 10% 23in; }
-GOOD { background-position: 23in; }
-GOOD { background-position: 23in 10%; }
-GOOD { Background-Position: 23IN 30CM; }
-GOOD { Background-Position: top left; }
-GOOD { Background-Position: left top; }
-GOOD { Background-Position: top; }
-GOOD { Background-Position: top center; }
-GOOD { Background-Position: center top; }
-GOOD { Background-Position: right top; }
-GOOD { Background-Position: top right; }
-GOOD { Background-Position: left; }
-GOOD { Background-Position: left center; }
-GOOD { Background-Position: center left; }
-GOOD { Background-Position: right; }
-GOOD { Background-Position: right center; }
-GOOD { Background-Position: center right; }
-GOOD { Background-Position: bottom; }
-GOOD { Background-Position: bottom center; }
-GOOD { Background-Position: center bottom; }
-GOOD { Background-Position: bottom right; }
-GOOD { Background-Position: right bottom; }
diff --git a/layout/html/tests/css/background-repeat.css b/layout/html/tests/css/background-repeat.css
deleted file mode 100644
index 8192ac043e16..000000000000
--- a/layout/html/tests/css/background-repeat.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { background-repeat: repeat; }
-GOOD { background-repeat: repeat-x; }
-GOOD { background-repeat: repeat-y; }
-GOOD { background-repeat: no-repeat; }
-BAD { background-repeat: medium; }
-BAD { background-repeat: #23; }
-BAD { background-repeat: 23pt; }
-BAD { background-repeat: "foo"; }
-BAD { background-repeat: repeat-x repeat-y; }
diff --git a/layout/html/tests/css/background.css b/layout/html/tests/css/background.css
deleted file mode 100644
index ee90ff2d56ac..000000000000
--- a/layout/html/tests/css/background.css
+++ /dev/null
@@ -1,51 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { background: red; }
-GOOD { background: red repeat-x; }
-GOOD { background: red fixed; }
-GOOD { background: fixed 20% 30%; }
-GOOD { background: red none repeat scroll 20% 30%; }
-GOOD { background: none repeat scroll 20% 30% red; }
-GOOD { background: repeat scroll 20% 30% red none; }
-GOOD { background: scroll 20% 30% red none repeat; }
-GOOD { background: 20% 30% red none repeat scroll; }
-BAD { background: 20% 30% red none repeat scroll fish; }
-BAD { background: 20% 30% red none repeat fish scroll; }
-BAD { background: 20% 30% red none fish repeat scroll; }
-BAD { background: 20% 30% red fish none repeat scroll; }
-BAD { background: 20% 30% fish red none repeat scroll; }
-BAD { background: 20% fish 30% red none repeat scroll; }
-BAD { background: fish 20% 30% red none repeat scroll; }
diff --git a/layout/html/tests/css/border-bottom-color.css b/layout/html/tests/css/border-bottom-color.css
deleted file mode 100644
index 4b3d80267124..000000000000
--- a/layout/html/tests/css/border-bottom-color.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-bottom-color: inherit; } 
-GOOD { border-bottom-color: green; } 
-GOOD { border-bottom-color: #f00; } 
-GOOD { border-bottom-color: #0000ea; } 
-GOOD { border-bottom-color: rgb(50,50,50); } 
-BAD { border-bottom-color: bleu; }
-BAD { border-bottom-color: blue red; }
-BAD { border-bottom-color: #-f00; }
diff --git a/layout/html/tests/css/border-bottom-style.css b/layout/html/tests/css/border-bottom-style.css
deleted file mode 100644
index da84a84cd26b..000000000000
--- a/layout/html/tests/css/border-bottom-style.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-bottom-style: inherit; } 
-GOOD { border-bottom-style: solid; } 
-GOOD { border-bottom-style: double; } 
-GOOD { border-bottom-style: inset; } 
-BAD { border-bottom-style: far-right; }
-BAD { border-bottom-style: ridge dotted; }
-BAD { border-bottom-style: dashed outset; }
-BAD { border-bottom-style: null; }
-BAD { border-bottom-style: empty; }
diff --git a/layout/html/tests/css/border-bottom-width.css b/layout/html/tests/css/border-bottom-width.css
deleted file mode 100644
index 8846345bbd62..000000000000
--- a/layout/html/tests/css/border-bottom-width.css
+++ /dev/null
@@ -1,42 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-bottom-width: thin; }
-GOOD { border-bottom-width: medium; }
-GOOD { border-bottom-width: thick; }
-GOOD { border-bottom-width: 3.0in; }
-BAD { border-bottom-width: narrow; }
-BAD { border-bottom-width: "foo"; }
-BAD { border-bottom-width: center; }
diff --git a/layout/html/tests/css/border-bottom.css b/layout/html/tests/css/border-bottom.css
deleted file mode 100644
index c97b0524fc4d..000000000000
--- a/layout/html/tests/css/border-bottom.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-bottom: 3.0in; }
-GOOD { border-bottom: thin; }
-GOOD { border-bottom: 3.0in dashed; }
-GOOD { border-bottom: thin dotted; }
-GOOD { border-bottom: 3.0in dashed red; }
-GOOD { border-bottom: thin dotted green; }
-GOOD { border-bottom: green thin dotted; }
-GOOD { border-bottom: green dotted thin; }
diff --git a/layout/html/tests/css/border-collapse.css b/layout/html/tests/css/border-collapse.css
deleted file mode 100644
index 8d5b8bd867bf..000000000000
--- a/layout/html/tests/css/border-collapse.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { border-collapse: inherit; } 
-GOOD { border-collapse: collapse; } 
-GOOD { border-collapse: separate; } 
-BAD { border-collapse: inherited; }
-BAD { border-collapse: collapse separate; }
-BAD { border-collapse: eclectus; }
-
diff --git a/layout/html/tests/css/border-color.css b/layout/html/tests/css/border-color.css
deleted file mode 100644
index a19c9e1986bd..000000000000
--- a/layout/html/tests/css/border-color.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-color: red; }
-GOOD { border-color: red blue; }
-GOOD { border-color: red blue rgb(0, 0, 0); }
-GOOD { border-color: red blue green yellow; }
diff --git a/layout/html/tests/css/border-left-color.css b/layout/html/tests/css/border-left-color.css
deleted file mode 100644
index 7134087089e3..000000000000
--- a/layout/html/tests/css/border-left-color.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-left-color: inherit; } 
-GOOD { border-left-color: green; } 
-GOOD { border-left-color: #f00; } 
-GOOD { border-left-color: #0000ea; } 
-GOOD { border-left-color: rgb(50,50,50); } 
-BAD { border-left-color: bleu; }
-BAD { border-left-color: blue red; }
-BAD { border-left-color: #-f00; }
diff --git a/layout/html/tests/css/border-left-style.css b/layout/html/tests/css/border-left-style.css
deleted file mode 100644
index fd86021b2130..000000000000
--- a/layout/html/tests/css/border-left-style.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-left-style: inherit; } 
-GOOD { border-left-style: dotted; } 
-GOOD { border-left-style: dashed; } 
-GOOD { border-left-style: groove; } 
-GOOD { border-left-style: ridge; } 
-BAD { border-left-style: inherit inset; }
-BAD { border-left-style: groove double; }
-BAD { border-left-style: null; }
-BAD { border-left-style: empty; }
diff --git a/layout/html/tests/css/border-left-width.css b/layout/html/tests/css/border-left-width.css
deleted file mode 100644
index df51cab20a73..000000000000
--- a/layout/html/tests/css/border-left-width.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-left-width: thin; }
-GOOD { border-left-width: medium; }
-GOOD { border-left-width: thick; }
-GOOD { border-left-width: 3.0in; }
diff --git a/layout/html/tests/css/border-left.css b/layout/html/tests/css/border-left.css
deleted file mode 100644
index d09d5dffe192..000000000000
--- a/layout/html/tests/css/border-left.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-left: 3.0in; }
-GOOD { border-left: thin; }
-GOOD { border-left: 3.0in dashed; }
-GOOD { border-left: thin dotted; }
-GOOD { border-left: 3.0in dashed red; }
-GOOD { border-left: thin dotted green; }
-GOOD { border-left: green thin dotted; }
-GOOD { border-left: green dotted thin; }
diff --git a/layout/html/tests/css/border-right-color.css b/layout/html/tests/css/border-right-color.css
deleted file mode 100644
index 0b97e1442ce2..000000000000
--- a/layout/html/tests/css/border-right-color.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-right-color: inherit; } 
-GOOD { border-right-color: green; } 
-GOOD { border-right-color: #f00; } 
-GOOD { border-right-color: #0000ea; } 
-GOOD { border-right-color: rgb(50,50,50); } 
-BAD { border-right-color: bleu; }
-BAD { border-right-color: blue red; }
-BAD { border-right-color: #-f00; }
diff --git a/layout/html/tests/css/border-right-style.css b/layout/html/tests/css/border-right-style.css
deleted file mode 100644
index 712c9ecddfd5..000000000000
--- a/layout/html/tests/css/border-right-style.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-right-style: inherit; } 
-GOOD { border-right-style: none; } 
-GOOD { border-right-style: hidden; } 
-GOOD { border-right-style: outset; } 
-BAD { border-right-style: far-left; }
-BAD { border-right-style: ridge inset; }
-BAD { border-right-style: groove outset; }
-BAD { border-right-style: null; }
-BAD { border-right-style: empty; }
diff --git a/layout/html/tests/css/border-right-width.css b/layout/html/tests/css/border-right-width.css
deleted file mode 100644
index a469ffcb5ca1..000000000000
--- a/layout/html/tests/css/border-right-width.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-right-width: thin; }
-GOOD { border-right-width: medium; }
-GOOD { border-right-width: thick; }
-GOOD { border-right-width: 3.0in; }
diff --git a/layout/html/tests/css/border-right.css b/layout/html/tests/css/border-right.css
deleted file mode 100644
index 42edb0b68978..000000000000
--- a/layout/html/tests/css/border-right.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-right: 3.0in; }
-GOOD { border-right: thin; }
-GOOD { border-right: 3.0in dashed; }
-GOOD { border-right: thin dotted; }
-GOOD { border-right: 3.0in dashed red; }
-GOOD { border-right: thin dotted green; }
-GOOD { border-right: green thin dotted; }
-GOOD { border-right: green dotted thin; }
diff --git a/layout/html/tests/css/border-spacing.css b/layout/html/tests/css/border-spacing.css
deleted file mode 100644
index 0e2843ef0876..000000000000
--- a/layout/html/tests/css/border-spacing.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { border-spacing: inherit; } 
-GOOD { border-spacing: 15pt; } 
-GOOD { border-spacing: 5ex 2em; } 
-BAD { border-spacing: -3px; }
-BAD { border-spacing: 5; }
-BAD { border-spacing: 1in -5pc; }
diff --git a/layout/html/tests/css/border-style.css b/layout/html/tests/css/border-style.css
deleted file mode 100644
index 1a41293a76f1..000000000000
--- a/layout/html/tests/css/border-style.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-style: none; }
-GOOD { border-style: dotted; }
-GOOD { border-style: dashed; }
-GOOD { border-style: solid; }
-GOOD { border-style: double; }
-GOOD { border-style: groove; }
-GOOD { border-style: ridge; }
-GOOD { border-style: inset; }
-GOOD { border-style: outset; }
-GOOD { border-style: dashed none; }
-GOOD { border-style: dashed dotted none; }
-GOOD { border-style: dashed dotted inset none; }
diff --git a/layout/html/tests/css/border-top-color.css b/layout/html/tests/css/border-top-color.css
deleted file mode 100644
index 726300200bcb..000000000000
--- a/layout/html/tests/css/border-top-color.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-top-color: inherit; } 
-GOOD { border-top-color: green; } 
-GOOD { border-top-color: #f00; } 
-GOOD { border-top-color: #0000ea; } 
-GOOD { border-top-color: rgb(50,50,50); } 
-BAD { border-top-color: bleu; }
-BAD { border-top-color: blue red; }
-BAD { border-top-color: #-f00; }
diff --git a/layout/html/tests/css/border-top-style.css b/layout/html/tests/css/border-top-style.css
deleted file mode 100644
index 6940a23296df..000000000000
--- a/layout/html/tests/css/border-top-style.css
+++ /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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { border-top-style: inherit; } 
-GOOD { border-top-style: none; } 
-GOOD { border-top-style: hidden; } 
-GOOD { border-top-style: dotted; } 
-GOOD { border-top-style: dashed; } 
-GOOD { border-top-style: solid; } 
-GOOD { border-top-style: double; } 
-GOOD { border-top-style: groove; } 
-GOOD { border-top-style: ridge; } 
-GOOD { border-top-style: inset; } 
-GOOD { border-top-style: outset; } 
-BAD { border-top-style: very-far-right; }
-BAD { border-top-style: inherit dotted; }
-BAD { border-top-style: dashed solid; }
-BAD { border-top-style: null; }
-BAD { border-top-style: empty; }
diff --git a/layout/html/tests/css/border-top-width.css b/layout/html/tests/css/border-top-width.css
deleted file mode 100644
index a87990d82aa5..000000000000
--- a/layout/html/tests/css/border-top-width.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-top-width: thin; }
-GOOD { border-top-width: medium; }
-GOOD { border-top-width: thick; }
-GOOD { border-top-width: 3.0in; }
diff --git a/layout/html/tests/css/border-top.css b/layout/html/tests/css/border-top.css
deleted file mode 100644
index d7e1a5e0d100..000000000000
--- a/layout/html/tests/css/border-top.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-top: 3.0in; }
-GOOD { border-top: thin; }
-GOOD { border-top: 3.0in dashed; }
-GOOD { border-top: thin dotted; }
-GOOD { border-top: 3.0in dashed red; }
-GOOD { border-top: thin dotted green; }
-GOOD { border-top: green thin dotted; }
-GOOD { border-top: green dotted thin; }
diff --git a/layout/html/tests/css/border-width.css b/layout/html/tests/css/border-width.css
deleted file mode 100644
index 8563a79d06e6..000000000000
--- a/layout/html/tests/css/border-width.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border-width: thin; }
-GOOD { border-width: medium; }
-GOOD { border-width: thick; }
-GOOD { border-width: 3.0in; }
-GOOD { border-width: thin thin; }
-GOOD { border-width: 3.0in thin; }
-GOOD { border-width: thin 3.0in thin; }
-GOOD { border-width: 3.0in thin thin; }
-GOOD { border-width: 3.0in thin medium; }
diff --git a/layout/html/tests/css/border.css b/layout/html/tests/css/border.css
deleted file mode 100644
index b37b90f0b2f4..000000000000
--- a/layout/html/tests/css/border.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { border: 3.0in; }
-GOOD { border: thin; }
-GOOD { border: 3.0in dashed; }
-GOOD { border: thin dotted; }
-GOOD { border: 3.0in dashed red; }
-GOOD { border: thin dotted green; }
-GOOD { border: green thin dotted; }
-GOOD { border: green dotted thin; }
diff --git a/layout/html/tests/css/bottom.css b/layout/html/tests/css/bottom.css
deleted file mode 100644
index 8f1109e0024c..000000000000
--- a/layout/html/tests/css/bottom.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { bottom: inherit; } 
-GOOD { bottom: auto; } 
-GOOD { bottom: +130%; } 
-GOOD { bottom: 120%; } 
-GOOD { bottom: -110%; } 
-GOOD { bottom: 15pc; } 
-BAD { bottom: iridium; } 
-BAD { bottom: 15; } 
-BAD { bottom: 15px 30% }
\ No newline at end of file
diff --git a/layout/html/tests/css/bugs/bug01.css b/layout/html/tests/css/bugs/bug01.css
deleted file mode 100644
index d1dc9ee8ad7f..000000000000
--- a/layout/html/tests/css/bugs/bug01.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-/* 0 numbers were causing data to be eaten */
-DD { margin-top: 0; margin-left: .25in; }
-A:link { color: blue; text-decoration: underline }
diff --git a/layout/html/tests/css/bugs/bug02.css b/layout/html/tests/css/bugs/bug02.css
deleted file mode 100644
index b0a19c07f6d2..000000000000
--- a/layout/html/tests/css/bugs/bug02.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-/* This rule evaluates to just a margin-left value */
-DD { margin-top: 0pixels; margin-left: .25in; }
-/* This rule evaluates to just a margin-top value */
-DD { margin-top: 0; margin-left: .25parsecs; }
diff --git a/layout/html/tests/css/bugs/bug03.css b/layout/html/tests/css/bugs/bug03.css
deleted file mode 100644
index a39692566ed7..000000000000
--- a/layout/html/tests/css/bugs/bug03.css
+++ /dev/null
@@ -1,9 +0,0 @@
-H1 { color: red }
-<>
-H2 { color: red }
-<.>
-H3 { color: red }
-{.}
-H4 { color: red }
-.#(*&(#@*$&@(#*$&(@*#$&*(@#;)))))
-H5 { color: red }
diff --git a/layout/html/tests/css/bugs/bug04.css b/layout/html/tests/css/bugs/bug04.css
deleted file mode 100644
index dc15b6a99299..000000000000
--- a/layout/html/tests/css/bugs/bug04.css
+++ /dev/null
@@ -1 +0,0 @@
-.sprockets {background:url(/Icons/sprocket.gif) #000000 top left repeat-x}
diff --git a/layout/html/tests/css/caption-side.css b/layout/html/tests/css/caption-side.css
deleted file mode 100644
index 10966d1e6362..000000000000
--- a/layout/html/tests/css/caption-side.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { caption-side: inherit; } 
-GOOD { caption-side: top; } 
-GOOD { caption-side: bottom; } 
-GOOD { caption-side: left; } 
-GOOD { caption-side: right; } 
-BAD { caption-side: far-right; }
-BAD { caption-side: iguana; }
-BAD { caption-side: bottom-left; }
-BAD { caption-side: top inherit; }
diff --git a/layout/html/tests/css/clear.css b/layout/html/tests/css/clear.css
deleted file mode 100644
index 86807224b9ec..000000000000
--- a/layout/html/tests/css/clear.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { clear: none; }
-GOOD { clear: left; }
-GOOD { clear: right; }
-GOOD { clear: both; }
diff --git a/layout/html/tests/css/clip.css b/layout/html/tests/css/clip.css
deleted file mode 100644
index 2682ec447e8e..000000000000
--- a/layout/html/tests/css/clip.css
+++ /dev/null
@@ -1,72 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { clip: auto; }
-GOOD { clip: rect( auto auto auto auto ) }
-GOOD { clip: rect(auto auto auto auto) }
-GOOD { clip: rect( 12pt auto auto auto ) }
-
-GOOD { clip: rect( auto 12pt auto auto ) }
-GOOD { clip: rect( auto auto 12pt auto ) }
-GOOD { clip: rect( auto auto auto 12pt ) }
-GOOD { clip: rect( 12pt 13em auto auto ) }
-
-GOOD { clip: rect( 12pt 13em 14pc auto ) }
-GOOD { clip: rect( 12pt 13em 14pc 15in ) }
-GOOD { clip: rect ( 12pt 13em 14pc 15in ) }
-
-GOOD { clip: rect( auto, auto, auto, auto ) }
-GOOD { clip: rect(auto  , auto  , auto  ,   auto) }
-GOOD { clip: rect( 12pt, auto, auto, auto, ) }
-
-GOOD { clip: rect( auto, 12pt, auto, auto ) }
-GOOD { clip: rect( auto, auto, 12pt, auto ) }
-GOOD { clip: rect( auto, auto, auto, 12pt ) }
-GOOD { clip: rect( 12pt, 13em, auto, auto ) }
-
-GOOD { clip: rect( 12pt, 13em, 14pc, auto ) }
-GOOD { clip: rect( 12pt, 13em, 14pc, 15in ) }
-GOOD { clip: rect ( 12pt, 13em, 14pc, 15in ) }
-
-BAD { clip: rect( 1pt ) }
-BAD { clip: rect( 1pt 2pt ) }
-BAD { clip: rect( 1pt 2pt 3pt ) }
-BAD { clip: rect( 1 2 3 4 ) }
-BAD { clip: rect( auto ) }
-BAD { clip: rect( auto auto) }
-BAD { clip: rect( auto auto auto) }
-BAD { clip: rect( auto auto auto) }
-BAD { clip: rect( auto, auto, auto, auto, ) }
-BAD { clip: rect ( 12pt, 13em, 14pc, 15in, ) }
diff --git a/layout/html/tests/css/color.css b/layout/html/tests/css/color.css
deleted file mode 100644
index fa37fc88701b..000000000000
--- a/layout/html/tests/css/color.css
+++ /dev/null
@@ -1,41 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { color: red; }
-GOOD { color: rgb(0, 0, 0); }
-GOOD { color: rGb(110%, 23, 9123784328342834); }
-GOOD { color: #f00; }
-GOOD { color: #ff00ff; }
-GOOD { color: #fff000fff; }		/* Note: an extension */
diff --git a/layout/html/tests/css/content.css b/layout/html/tests/css/content.css
deleted file mode 100644
index b726879b5e14..000000000000
--- a/layout/html/tests/css/content.css
+++ /dev/null
@@ -1,67 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-GOOD:after  { content: inherit; } 
-GOOD:before { content: "Border Collie"; } 
-GOOD:after  { content: "Border 'Collie'"; } 
-GOOD:before { content: "Border \"Collie\""; } 
-GOOD:after  { content: 'Border "Collie"'; } 
-GOOD:before { content: 'Border \'Collie\''; } 
-GOOD:before { content: "Border\A Collie" }
-GOOD:after  { content: A[TITLE="splitting the str\
-ing in the middle"] {/*...*/}"; } 
-GOOD:before { content: A[TITLE="The Vatican Rag"]; } 
-GOOD:after  { content: url("http://www.rotten.com/today/"); } 
-GOOD:after  { content: url("beautiful-music.wav") }
-GOOD:before { content: counter(x, none); } 
-GOOD:after  { content: counter(y, 10); } 
-GOOD:before { content: counter(number, upper-roman)}
-GOOD:after  { content: attr(enigma) }
-GOOD:before { content: open-quote }
-GOOD:after  { content: close-quote }
-GOOD:before { content: no-open-quote }
-GOOD:after  { content: no-close-quote }
-GOOD:before { content: open-quote "Border\A Collie" close-quote } 
-GOOD:before { content: "a string of text" open-quote url("http://www.rotten.com/today/") no-open-quote counter(number, upper-roman) no-close-quote attr(enigma) close-quote } 
-BAD:after  { content: this is a string; }
-BAD:before { content: "this is a "string""; } 
-BAD:after  { content: "this is a "string'"; } 
-BAD:before { content: 'this is a "string""; } 
-BAD:after  { content: quote }
-BAD:before { content: url(beautiful-music.wav) }
-BAD:after  { content: counter(y, 10) inherit }
-BAD:before { content: open-quote "some kinda string' close-quote }
-  
\ No newline at end of file
diff --git a/layout/html/tests/css/counter-increment.css b/layout/html/tests/css/counter-increment.css
deleted file mode 100644
index a2a0fa0f1a41..000000000000
--- a/layout/html/tests/css/counter-increment.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { counter-increment: inherit } 
-GOOD { counter-increment: none; } 
-GOOD { counter-increment: rabbit; } 
-GOOD { counter-increment: rabbit 1; } 
-GOOD { counter-increment: rabbit 942 } 
-GOOD { counter-increment: rabbit -12; } 
-GOOD { counter-increment: rabbit 0 } 
-BAD { counter-increment: none to inherit }
-BAD { counter-increment: cooler 4 5 -1; }
diff --git a/layout/html/tests/css/counter-reset.css b/layout/html/tests/css/counter-reset.css
deleted file mode 100644
index 7b6f320b8cfd..000000000000
--- a/layout/html/tests/css/counter-reset.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { counter-reset: inherit } 
-GOOD { counter-reset: none; } 
-GOOD { counter-reset: rabbit; } 
-GOOD { counter-reset: rabbit 1; } 
-GOOD { counter-reset: rabbit 942 } 
-GOOD { counter-reset: rabbit -12; } 
-GOOD { counter-reset: rabbit 0 } 
-BAD { counter-reset: none to inherit }
-BAD { counter-reset: cooler 4 5 -1; }
diff --git a/layout/html/tests/css/cue-after.css b/layout/html/tests/css/cue-after.css
deleted file mode 100644
index b262e62451f6..000000000000
--- a/layout/html/tests/css/cue-after.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { cue-after: inherit } 
-GOOD { cue-after: url("pop.au") }
-GOOD { cue-after: none }
-BAD { cue-after: inherited }
-BAD { cue-after: url("zip.aiff") url("bang.wav") url("bang.wav") }
-
diff --git a/layout/html/tests/css/cue-before.css b/layout/html/tests/css/cue-before.css
deleted file mode 100644
index b0004231b71a..000000000000
--- a/layout/html/tests/css/cue-before.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { cue-before: inherit } 
-GOOD { cue-before: url("pop.au") }
-GOOD { cue-before: none }
-BAD { cue-before: inherited }
-BAD { cue-before: url("zip.aiff") url("bang.wav") url("bang.wav") }
-
diff --git a/layout/html/tests/css/cue.css b/layout/html/tests/css/cue.css
deleted file mode 100644
index d61e03ac9e41..000000000000
--- a/layout/html/tests/css/cue.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { cue: inherit } 
-GOOD { cue: url("pop.au") }
-GOOD { cue: url("zip.aiff") url("bang.wav") }
-GOOD { cue: none url("bang.wav") }
-GOOD { cue: none inherit }
-GOOD { cue: url("zip.aiff") url("bang.wav") }
-BAD { cue: inherited }
-BAD { cue: url("zip.aiff") url("bang.wav") url("bang.wav") }
-
diff --git a/layout/html/tests/css/cursor.css b/layout/html/tests/css/cursor.css
deleted file mode 100644
index b825f62f905c..000000000000
--- a/layout/html/tests/css/cursor.css
+++ /dev/null
@@ -1,42 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { cursor: arrow; }
-GOOD { cursor: hand; }
-GOOD { cursor: ibeam; }
-GOOD { cursor: inherit; }
-BAD { cursor: thin; }
-BAD { cursor: 3.0in; }
-BAD { cursor: thin dotted; }
diff --git a/layout/html/tests/css/direction.css b/layout/html/tests/css/direction.css
deleted file mode 100644
index 01ff6fb95cb7..000000000000
--- a/layout/html/tests/css/direction.css
+++ /dev/null
@@ -1,41 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { direction: ltr; }
-GOOD { direction: rtl; }
-GOOD { direction: inherit; }
-BAD { direction: thin; }
-BAD { direction: 3.0in; }
-BAD { direction: thin dotted; }
diff --git a/layout/html/tests/css/display.css b/layout/html/tests/css/display.css
deleted file mode 100644
index 42e16f173fb1..000000000000
--- a/layout/html/tests/css/display.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { display: none; }
-GOOD { display: block; }
-GOOD { display: inline; }
-GOOD { display: list-item; }
diff --git a/layout/html/tests/css/elevation.css b/layout/html/tests/css/elevation.css
deleted file mode 100644
index cf0c64e71a0d..000000000000
--- a/layout/html/tests/css/elevation.css
+++ /dev/null
@@ -1,55 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { elevation: -90deg } 
-GOOD { elevation: 90deg } 
-GOOD { elevation: 0deg } 
-GOOD { elevation: 16deg } 
-GOOD { elevation: inherit } 
-GOOD { elevation: below; }
-GOOD { elevation: level }
-GOOD { elevation: above; }
-GOOD { elevation: higher }
-GOOD { elevation: lower }
-BAD { elevation: inherited }
-BAD { elevation: above below; }
-BAD { elevation: duck below; }
-BAD { elevation: center; }
-BAD { elevation: align=right; }
-BAD { elevation: 90deg right; }
-
diff --git a/layout/html/tests/css/empty-cells.css b/layout/html/tests/css/empty-cells.css
deleted file mode 100644
index e8dd959eb36e..000000000000
--- a/layout/html/tests/css/empty-cells.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { empty-cells: show } 
-GOOD { empty-cells: hide } 
-GOOD { empty-cells: inherit } 
-BAD { empty-cells: inherited }
-BAD { empty-cells: show hide; }
-BAD { empty-cells: hidden; }
-BAD { empty-cells: none; }
\ No newline at end of file
diff --git a/layout/html/tests/css/float.css b/layout/html/tests/css/float.css
deleted file mode 100644
index 8eb6278b0e4d..000000000000
--- a/layout/html/tests/css/float.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { float: none; }
-GOOD { float: left; }
-GOOD { float: right; }
-BAD { float: medium; }
diff --git a/layout/html/tests/css/font-family.css b/layout/html/tests/css/font-family.css
deleted file mode 100644
index a912110d2915..000000000000
--- a/layout/html/tests/css/font-family.css
+++ /dev/null
@@ -1,36 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font-family: gill, helvetica, times new roman, sans-serif; }
diff --git a/layout/html/tests/css/font-size-adjust.css b/layout/html/tests/css/font-size-adjust.css
deleted file mode 100644
index 39e52d0b0128..000000000000
--- a/layout/html/tests/css/font-size-adjust.css
+++ /dev/null
@@ -1,53 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { font-size-adjust: 0 } 
-GOOD { font-size-adjust: 126 } 
-GOOD { font-size-adjust: .1 } 
-GOOD { font-size-adjust:  0.556} 
-GOOD { font-size-adjust:  57.0 } 
-GOOD { font-size-adjust:  +7 } 
-GOOD { font-size-adjust:  -126} 
-GOOD { font-size-adjust:  -.1} 
-GOOD { font-size-adjust:  -0.556} 
-GOOD { font-size-adjust:  -57.0 } 
-GOOD { font-size-adjust: none; } 
-GOOD { font-size-adjust: inherit; } 
-BAD { font-size-adjust: inherited }
-BAD { font-size-adjust: 12 none; }
-BAD { font-size-adjust: four; }
diff --git a/layout/html/tests/css/font-size.css b/layout/html/tests/css/font-size.css
deleted file mode 100644
index e1b3f50e20a5..000000000000
--- a/layout/html/tests/css/font-size.css
+++ /dev/null
@@ -1,48 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font-size: Xx-smAll; }
-GOOD { font-size: x-Small; }
-GOOD { font-size: Small; }
-GOOD { font-size: Medium; }
-GOOD { font-size: LaRgE; }
-GOOD { font-size: x-LaRgE; }
-GOOD { font-size: Xx-LaRgE; }
-GOOD { font-size: LaRgEr; }
-GOOD { font-size: smalLer; }
-GOOD { font-size: 3.0in; }
-GOOD { font-size: 120%; }
-BAD { font-size: green; }
-BAD { font-size: 120% 240%; }
diff --git a/layout/html/tests/css/font-stretch.css b/layout/html/tests/css/font-stretch.css
deleted file mode 100644
index 2fcf5e97ed9d..000000000000
--- a/layout/html/tests/css/font-stretch.css
+++ /dev/null
@@ -1,53 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-
-GOOD { font-stretch: normal } 
-GOOD { font-stretch: wider } 
-GOOD { font-stretch: narrower } 
-GOOD { font-stretch: ultra-condensed } 
-GOOD { font-stretch: extra-condensed } 
-GOOD { font-stretch: condensed } 
-GOOD { font-stretch: semi-condensed } 
-GOOD { font-stretch: semi-expanded } 
-GOOD { font-stretch: expanded } 
-GOOD { font-stretch: extra-expanded } 
-GOOD { font-stretch: ultra-expanded } 
-GOOD { font-stretch: inherit; } 
-BAD { font-stretch: none }
-BAD { font-stretch: widest; }
-BAD { font-stretch: ultra-condensed expanded; }
diff --git a/layout/html/tests/css/font-style.css b/layout/html/tests/css/font-style.css
deleted file mode 100644
index 7e9c92d96890..000000000000
--- a/layout/html/tests/css/font-style.css
+++ /dev/null
@@ -1,42 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font-style: normal; }
-GOOD { font-style: italic; }
-GOOD { font-style: oblique; }
-BAD { font-style: green; }
-BAD { font-style: 120% 240%; }
-BAD { font-style: medium; }
-BAD { font-style: "kanji"; }
diff --git a/layout/html/tests/css/font-variant.css b/layout/html/tests/css/font-variant.css
deleted file mode 100644
index 6867930360e6..000000000000
--- a/layout/html/tests/css/font-variant.css
+++ /dev/null
@@ -1,41 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font-variant: normal; }
-GOOD { font-variant: small-caps; }
-BAD { font-variant: green; }
-BAD { font-variant: 120% 240%; }
-BAD { font-variant: medium; }
-BAD { font-variant: "kanji"; }
diff --git a/layout/html/tests/css/font-weight.css b/layout/html/tests/css/font-weight.css
deleted file mode 100644
index 5104ee7ba5c1..000000000000
--- a/layout/html/tests/css/font-weight.css
+++ /dev/null
@@ -1,50 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font-weight: normal; }
-GOOD { font-weight: bold; }
-GOOD { font-weight: bolder; }
-GOOD { font-weight: lighter; }
-GOOD { font-weight: 100; }
-GOOD { font-weight: 200; }
-GOOD { font-weight: 300; }
-GOOD { font-weight: 400; }
-GOOD { font-weight: 500; }
-GOOD { font-weight: 600; }
-GOOD { font-weight: 700; }
-GOOD { font-weight: 800; }
-GOOD { font-weight: 900; }
-BAD { font-weight: heavy; }
-BAD { font-weight: 12.3em; }
diff --git a/layout/html/tests/css/font.css b/layout/html/tests/css/font.css
deleted file mode 100644
index d6af3cd2ca6b..000000000000
--- a/layout/html/tests/css/font.css
+++ /dev/null
@@ -1,48 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { font: italic small-caps bold 12pt helvetica }
-GOOD { font: italic bold small-caps 12pt helvetica }
-GOOD { font: small-caps bold italic 12pt helvetica }
-GOOD { font: small-caps italic bold 12pt helvetica }
-GOOD { font: bold italic small-caps 12pt helvetica }
-GOOD { font: bold small-caps italic 12pt helvetica }
-GOOD { font: bold 12pt helvetica }
-GOOD { font: 12pt helvetica }
-GOOD { font: 12pt/14pt sans-serif; }
-GOOD { font: 80% sans-serif; }
-GOOD { font: x-large/110% "new century schoolbook", serif; }
-GOOD { font: bold italic large Palatino, serif; }
-GOOD { font: normal small-caps 120%/120% fantasy; }
diff --git a/layout/html/tests/css/height.css b/layout/html/tests/css/height.css
deleted file mode 100644
index 5d4f99e81156..000000000000
--- a/layout/html/tests/css/height.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { height: 3.0in; }
-GOOD { height: auto; }
diff --git a/layout/html/tests/css/left.css b/layout/html/tests/css/left.css
deleted file mode 100644
index 9aff7791ff5e..000000000000
--- a/layout/html/tests/css/left.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { left: auto; }
-GOOD { left: 17.0in; }
-GOOD { left: 120%; }
diff --git a/layout/html/tests/css/letter-spacing.css b/layout/html/tests/css/letter-spacing.css
deleted file mode 100644
index 3661ab754005..000000000000
--- a/layout/html/tests/css/letter-spacing.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { letter-spacing: normal; }
-GOOD { letter-spacing: 3.0in; }
diff --git a/layout/html/tests/css/line-height.css b/layout/html/tests/css/line-height.css
deleted file mode 100644
index d6ab3506be69..000000000000
--- a/layout/html/tests/css/line-height.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { line-height: normal; }
-GOOD { line-height: 17; }
-GOOD { line-height: 17.0in; }
-GOOD { line-height: 17%; }
diff --git a/layout/html/tests/css/list-style-image.css b/layout/html/tests/css/list-style-image.css
deleted file mode 100644
index f505beb51eaa..000000000000
--- a/layout/html/tests/css/list-style-image.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { list-style-image: none; }
-GOOD { list-style-image: url(fowl.gif); }
diff --git a/layout/html/tests/css/list-style-position.css b/layout/html/tests/css/list-style-position.css
deleted file mode 100644
index 94af5150e7ca..000000000000
--- a/layout/html/tests/css/list-style-position.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { list-style-position: inside; }
-GOOD { list-style-position: outside; }
diff --git a/layout/html/tests/css/list-style-type.css b/layout/html/tests/css/list-style-type.css
deleted file mode 100644
index bf3cefa1e666..000000000000
--- a/layout/html/tests/css/list-style-type.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { list-style-type: none; }
-GOOD { list-style-type: disc; }
-GOOD { list-style-type: circle; }
-GOOD { list-style-type: square; }
-GOOD { list-style-type: decimal; }
-GOOD { list-style-type: lower-roman; }
-GOOD { list-style-type: upper-roman; }
-GOOD { list-style-type: lower-alpha; }
-GOOD { list-style-type: upper-alpha; }
diff --git a/layout/html/tests/css/list-style.css b/layout/html/tests/css/list-style.css
deleted file mode 100644
index 698aab4dc902..000000000000
--- a/layout/html/tests/css/list-style.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { list-style: disc; }
-GOOD { list-style: disc inside; }
-GOOD { list-style: inside disc; }
-GOOD { list-style: inside disc url(fowl.gif); }
-GOOD { list-style: disc url(fowl.gif) inside; }
-GOOD { list-style: url(fowl.gif) inside disc; }
-
-BAD { list-style: none inside disc; }
-BAD { list-style: inside disc none; }
-BAD { list-style: disc none inside; }
diff --git a/layout/html/tests/css/margin-bottom.css b/layout/html/tests/css/margin-bottom.css
deleted file mode 100644
index 501f7a1d4cfe..000000000000
--- a/layout/html/tests/css/margin-bottom.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { margin-bottom: 17.0in; }
-GOOD { margin-bottom: 120%; }
-GOOD { margin-bottom: auto; }
diff --git a/layout/html/tests/css/margin-left.css b/layout/html/tests/css/margin-left.css
deleted file mode 100644
index 2b907e85c64c..000000000000
--- a/layout/html/tests/css/margin-left.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { margin-left: 17.0in; }
-GOOD { margin-left: 120%; }
-GOOD { margin-left: auto; }
diff --git a/layout/html/tests/css/margin-right.css b/layout/html/tests/css/margin-right.css
deleted file mode 100644
index 101b6e98c036..000000000000
--- a/layout/html/tests/css/margin-right.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { margin-right: 17.0in; }
-GOOD { margin-right: 120%; }
-GOOD { margin-right: auto; }
diff --git a/layout/html/tests/css/margin-top.css b/layout/html/tests/css/margin-top.css
deleted file mode 100644
index 250f316dbd73..000000000000
--- a/layout/html/tests/css/margin-top.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { margin-top: 17.0in; }
-GOOD { margin-top: 120%; }
-GOOD { margin-top: auto; }
diff --git a/layout/html/tests/css/margin.css b/layout/html/tests/css/margin.css
deleted file mode 100644
index e558e6ce3a15..000000000000
--- a/layout/html/tests/css/margin.css
+++ /dev/null
@@ -1,57 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { margin: 17.0in; }
-GOOD { margin: 120%; }
-GOOD { margin: auto; }
-GOOD { margin: 17.0in auto; }
-GOOD { margin: 17.0in 120%; }
-GOOD { margin: 17.0in 17.0in; }
-GOOD { margin: 120% 17.0in; }
-GOOD { margin: 120% auto; }
-GOOD { margin: 120% 120%; }
-GOOD { margin: auto 120%; }
-GOOD { margin: auto 17.0in; }
-GOOD { margin: auto auto; }
-GOOD { margin: 17.0in 17.0in 17.0in; }
-GOOD { margin: 17.0in 17.0in 120%; }
-GOOD { margin: 17.0in 17.0in auto; }
-GOOD { margin: 17.0in 120% 17.0in; }
-GOOD { margin: 17.0in auto 17.0in; }
-GOOD { margin: 17.0in 17.0in 17.0in 17.0in; }
-GOOD { margin: 17.0in 120% 17.0in 17.0in; }
-GOOD { margin: 120% 120% 17.0in 17.0in; }
-GOOD { margin: 120% 120% 120% 17.0in; }
-GOOD { margin: 120% 120% 120% 120%; }
diff --git a/layout/html/tests/css/marker-offset.css b/layout/html/tests/css/marker-offset.css
deleted file mode 100644
index 62a82f7292a6..000000000000
--- a/layout/html/tests/css/marker-offset.css
+++ /dev/null
@@ -1,43 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD :before { marker-offset: 3em; } 
-GOOD :before { marker-offset: -12pt; } 
-GOOD :after  { marker-offset: auto } 
-GOOD :before { marker-offset: inherit; } 
-BAD { marker-offset: none }
-BAD { marker-offset: auto inherit; }
\ No newline at end of file
diff --git a/layout/html/tests/css/marks.css b/layout/html/tests/css/marks.css
deleted file mode 100644
index ca24811c4091..000000000000
--- a/layout/html/tests/css/marks.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD :before { marks: cross; } 
-GOOD :before { marks: crop; } 
-GOOD :after  { marks: cross crop } 
-GOOD :after  { marks: crop cross } 
-GOOD :before { marks: none; } 
-GOOD :before { marks: inherit; } 
-BAD { marks: babushka }
-BAD { marks: auto; }
diff --git a/layout/html/tests/css/max-height.css b/layout/html/tests/css/max-height.css
deleted file mode 100644
index 1721a98274c5..000000000000
--- a/layout/html/tests/css/max-height.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { max-height: 3em } 
-GOOD { max-height: 15%; } 
-GOOD { max-height: none } 
-GOOD { max-height: inherit; } 
-BAD { max-height: babushka }
-BAD { max-height: auto; }
-BAD { max-height: 4px 4px; }
diff --git a/layout/html/tests/css/max-width.css b/layout/html/tests/css/max-width.css
deleted file mode 100644
index 4448da8b304e..000000000000
--- a/layout/html/tests/css/max-width.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { max-width: 10px } 
-GOOD { max-width: 15%; } 
-GOOD { max-width: none } 
-GOOD { max-width: inherit; } 
-BAD { max-width: babushka }
-BAD { max-width: auto; }
-BAD { max-width: 1in 1in; }
-BAD { max-width: -3em; }
-BAD { max-width: -10%; }
\ No newline at end of file
diff --git a/layout/html/tests/css/min-height.css b/layout/html/tests/css/min-height.css
deleted file mode 100644
index 8aa9eab4dc89..000000000000
--- a/layout/html/tests/css/min-height.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { min-height: 5pc } 
-GOOD { min-height: 15%; } 
-GOOD { min-height: none } 
-GOOD { min-height: inherit; } 
-BAD { min-height: babushka }
-BAD { min-height: auto; }
-BAD { min-height: 4px 10mm; }
-BAD { min-height: -4pc; }
-BAD { min-height: -10%; }
diff --git a/layout/html/tests/css/min-width.css b/layout/html/tests/css/min-width.css
deleted file mode 100644
index 948aec6bf9db..000000000000
--- a/layout/html/tests/css/min-width.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { max-width: 5ex } 
-GOOD { max-width: 15%; } 
-GOOD { max-width: none } 
-GOOD { max-width: inherit; } 
-BAD { max-width: babushka }
-BAD { max-width: auto; }
-BAD { max-width: 5cm .5in; }
diff --git a/layout/html/tests/css/opacity.css b/layout/html/tests/css/opacity.css
deleted file mode 100644
index 565e53f9f2bc..000000000000
--- a/layout/html/tests/css/opacity.css
+++ /dev/null
@@ -1,40 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { opacity: inherit; }
-GOOD { opacity: .75; }
-GOOD { opacity: 25%; }
-BAD { opacity: blue; }
-BAD { opacity: 3.5em; }
diff --git a/layout/html/tests/css/orphans.css b/layout/html/tests/css/orphans.css
deleted file mode 100644
index 15e05c629a4b..000000000000
--- a/layout/html/tests/css/orphans.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { orphans: 5 } 
-GOOD { orphans: inherit; } 
-BAD { orphans: energy }
-BAD { orphans: auto; }
-BAD { orphans: none; }
-BAD { orphans: 5 2 }
-BAD { orphans: -5; }
-BAD { orphans: .5; }
diff --git a/layout/html/tests/css/outline-color.css b/layout/html/tests/css/outline-color.css
deleted file mode 100644
index da93aa1764b6..000000000000
--- a/layout/html/tests/css/outline-color.css
+++ /dev/null
@@ -1,47 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { outline-color: maroon; }
-GOOD { outline-color: rgb(255,50,50) } 
-GOOD { outline-color: rgb(0%, 100%, 0%) } 
-GOOD { outline-color: #0000ff }
-GOOD { outline-color: #f00 }  
-GOOD { outline-color: invert; } 
-GOOD { outline-color: inherit; } 
-BAD { outline-color: invert pink }
-BAD { outline-color: "red"; }
-BAD { outline-color: abigale; }
\ No newline at end of file
diff --git a/layout/html/tests/css/outline-style.css b/layout/html/tests/css/outline-style.css
deleted file mode 100644
index 0dbd808efcc1..000000000000
--- a/layout/html/tests/css/outline-style.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { outline-style: outset; }
-GOOD { outline-style: inset } 
-GOOD { outline-style: dashed } 
-GOOD { outline-style: hidden }
-GOOD { outline-style: none }  
-GOOD { outline-style: inherit; } 
-BAD { outline-style: invert }
-BAD { outline-style: inherit dotted }
-BAD { outline-style: 6em; }
\ No newline at end of file
diff --git a/layout/html/tests/css/outline-width.css b/layout/html/tests/css/outline-width.css
deleted file mode 100644
index 2ea6df67dce2..000000000000
--- a/layout/html/tests/css/outline-width.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { outline-width: thin; }
-GOOD { outline-width: thick } 
-GOOD { outline-width: medium } 
-GOOD { outline-width: 10ex }
-GOOD { outline-width: inherit; } 
-BAD { outline-width: invert }
-BAD { outline-width: inherit 6ex }
-BAD { outline-width: 6; }
\ No newline at end of file
diff --git a/layout/html/tests/css/outline.css b/layout/html/tests/css/outline.css
deleted file mode 100644
index b77ee75b33b6..000000000000
--- a/layout/html/tests/css/outline.css
+++ /dev/null
@@ -1,58 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-
-GOOD { outline: maroon; }
-GOOD { outline: outset; } 
-GOOD { outline: thick } 
-GOOD { outline: rgb(255,50,50) thin dashed } 
-GOOD { outline: rgb(0%, 100%, 0%) } 
-GOOD { outline: #0000ff }
-GOOD { outline: #f00 }  
-GOOD { outline: solid green; } 
-GOOD { outline: blue 1em } 
-GOOD { outline: medium outset; } 
-GOOD { outline: dotted purple 10px  } 
-GOOD { outline: groove invert; } 
-GOOD { outline: invert inherit inherit; } 
-GOOD { outline: invert; } 
-GOOD { outline: inherit; } 
-BAD { outline: invert blue }
-BAD { outline: dashed red 5%; }
-BAD { outline: neon; }
-BAD { outline: olive -10px }
-BAD { outline: "red" }
-BAD { outline: ; }
diff --git a/layout/html/tests/css/overflow.css b/layout/html/tests/css/overflow.css
deleted file mode 100644
index 3a5c2df644f3..000000000000
--- a/layout/html/tests/css/overflow.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { overflow: visible; }
-GOOD { overflow: hidden; }
-GOOD { overflow: scroll; }
-GOOD { overflow: auto; }
diff --git a/layout/html/tests/css/padding-bottom.css b/layout/html/tests/css/padding-bottom.css
deleted file mode 100644
index a004a0faa012..000000000000
--- a/layout/html/tests/css/padding-bottom.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { padding-bottom: 17.0in; }
-GOOD { padding-bottom: 120%; }
diff --git a/layout/html/tests/css/padding-left.css b/layout/html/tests/css/padding-left.css
deleted file mode 100644
index 09541f8df04d..000000000000
--- a/layout/html/tests/css/padding-left.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { padding-left: 17.0in; }
-GOOD { padding-left: 120%; }
diff --git a/layout/html/tests/css/padding-right.css b/layout/html/tests/css/padding-right.css
deleted file mode 100644
index d70f5dabdfcd..000000000000
--- a/layout/html/tests/css/padding-right.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { padding-right: 17.0in; }
-GOOD { padding-right: 120%; }
diff --git a/layout/html/tests/css/padding-top.css b/layout/html/tests/css/padding-top.css
deleted file mode 100644
index 0f8d87ef8518..000000000000
--- a/layout/html/tests/css/padding-top.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { padding-top: 17.0in; }
-GOOD { padding-top: 120%; }
diff --git a/layout/html/tests/css/padding.css b/layout/html/tests/css/padding.css
deleted file mode 100644
index f4c8de79a60a..000000000000
--- a/layout/html/tests/css/padding.css
+++ /dev/null
@@ -1,49 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { padding: 17.0in; }
-GOOD { padding: 120%; }
-GOOD { padding: 17.0in 120%; }
-GOOD { padding: 17.0in 17.0in; }
-GOOD { padding: 120% 17.0in; }
-GOOD { padding: 120% 120%; }
-GOOD { padding: 17.0in 17.0in 17.0in; }
-GOOD { padding: 17.0in 17.0in 120%; }
-GOOD { padding: 17.0in 120% 17.0in; }
-GOOD { padding: 17.0in 17.0in 17.0in 17.0in; }
-GOOD { padding: 17.0in 120% 17.0in 17.0in; }
-GOOD { padding: 120% 120% 17.0in 17.0in; }
-GOOD { padding: 120% 120% 120% 17.0in; }
-GOOD { padding: 120% 120% 120% 120%; }
diff --git a/layout/html/tests/css/pointer-events.css b/layout/html/tests/css/pointer-events.css
deleted file mode 100644
index 87e929fb2ccf..000000000000
--- a/layout/html/tests/css/pointer-events.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { pointer-events: visiblePainted; }
-GOOD { pointer-events: visibleFill; }
-GOOD { pointer-events: visibleStroke; }
-GOOD { pointer-events: visible; }
-GOOD { pointer-events: painted; }
-GOOD { pointer-events: fill; }
-GOOD { pointer-events: stroke; }
-GOOD { pointer-events: all; }
-GOOD { pointer-events: none; }
-GOOD { pointer-events: inherit; }
-GOOD { pointer-events: auto; }
diff --git a/layout/html/tests/css/position.css b/layout/html/tests/css/position.css
deleted file mode 100644
index acdb5a39d7b8..000000000000
--- a/layout/html/tests/css/position.css
+++ /dev/null
@@ -1,40 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { position: static; }
-GOOD { position: relative; }
-GOOD { position: absolute; }
-BAD { position: 12; }
-BAD { position: medium; }
diff --git a/layout/html/tests/css/text-align.css b/layout/html/tests/css/text-align.css
deleted file mode 100644
index 347ca69ab9a7..000000000000
--- a/layout/html/tests/css/text-align.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { text-align: left; }
-GOOD { text-align: right; }
-GOOD { text-align: center; }
-GOOD { text-align: justify; }
diff --git a/layout/html/tests/css/text-decoration.css b/layout/html/tests/css/text-decoration.css
deleted file mode 100644
index 55cdc5ca1074..000000000000
--- a/layout/html/tests/css/text-decoration.css
+++ /dev/null
@@ -1,45 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { text-decoration: none; }
-GOOD { text-decoration: underline; }
-GOOD { text-decoration: overline; }
-GOOD { text-decoration: line-through; }
-GOOD { text-decoration: blink; }
-GOOD { text-decoration: overline underline; }
-GOOD { text-decoration: line-through overline underline; }
-GOOD { text-decoration: blink line-through overline underline; }
-BAD { text-decoration: blink fish line-through overline underline; }
-BAD { text-decoration: none blink; }
diff --git a/layout/html/tests/css/text-indent.css b/layout/html/tests/css/text-indent.css
deleted file mode 100644
index 9e7762c8dce8..000000000000
--- a/layout/html/tests/css/text-indent.css
+++ /dev/null
@@ -1,37 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { text-indent: 3.0in; }
-GOOD { text-indent: 120%; }
diff --git a/layout/html/tests/css/text-transform.css b/layout/html/tests/css/text-transform.css
deleted file mode 100644
index 42c7bfbcc386..000000000000
--- a/layout/html/tests/css/text-transform.css
+++ /dev/null
@@ -1,40 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { text-transform: none; }
-GOOD { text-transform: capitalize; }
-GOOD { text-transform: lowercase; }
-GOOD { text-transform: uppercase; }
-BAD { text-transform: capitalize lowercase }
diff --git a/layout/html/tests/css/top.css b/layout/html/tests/css/top.css
deleted file mode 100644
index b98a6a9990e7..000000000000
--- a/layout/html/tests/css/top.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { top: auto; }
-GOOD { top: 17.0in; }
-GOOD { top: 120%; }
diff --git a/layout/html/tests/css/vertical-align.css b/layout/html/tests/css/vertical-align.css
deleted file mode 100644
index 218a26b8ddfe..000000000000
--- a/layout/html/tests/css/vertical-align.css
+++ /dev/null
@@ -1,46 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { vertical-align: baseline; }
-GOOD { vertical-align: sub; }
-GOOD { vertical-align: super; }
-GOOD { vertical-align: top; }
-GOOD { vertical-align: text-top; }
-GOOD { vertical-align: middle; }
-GOOD { vertical-align: text-bottom; }
-GOOD { vertical-align: bottom; }
-GOOD { vertical-align: 120%; }
-GOOD { vertical-align: 10mm; }
-GOOD { vertical-align: 1.5em; }
diff --git a/layout/html/tests/css/visibility.css b/layout/html/tests/css/visibility.css
deleted file mode 100644
index f2c4cf5ccc2a..000000000000
--- a/layout/html/tests/css/visibility.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { visibility: inherit; }
-GOOD { visibility: visible; }
-GOOD { visibility: hidden; }
diff --git a/layout/html/tests/css/white-space.css b/layout/html/tests/css/white-space.css
deleted file mode 100644
index 3a9e3c98afac..000000000000
--- a/layout/html/tests/css/white-space.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { white-space: normal; }
-GOOD { white-space: pre; }
-GOOD { white-space: nowrap; }
diff --git a/layout/html/tests/css/width.css b/layout/html/tests/css/width.css
deleted file mode 100644
index 86ea060cdfbd..000000000000
--- a/layout/html/tests/css/width.css
+++ /dev/null
@@ -1,38 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { width: 3.0in; }
-GOOD { width: 120%; }
-GOOD { width: auto; }
diff --git a/layout/html/tests/css/word-spacing.css b/layout/html/tests/css/word-spacing.css
deleted file mode 100644
index ccf07574aa32..000000000000
--- a/layout/html/tests/css/word-spacing.css
+++ /dev/null
@@ -1,44 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { word-spacing: normal; }
-GOOD { wOrd-spacing: 12.0em; }
-GOOD { WoRd-Spacing: 12.0eX; }
-GOOD { worD-Spacing: 12PX; }
-GOOD { word-Spacing: 12.0In; }
-GOOD { word-sPacing: 12.0cm; }
-GOOD { word-spAcing: 12.0mm; }
-GOOD { word-spaCing: 12.0pt; }
-GOOD { word-spacIng: 12.0pc; }
diff --git a/layout/html/tests/css/z-index.css b/layout/html/tests/css/z-index.css
deleted file mode 100644
index 9faf2c0de125..000000000000
--- a/layout/html/tests/css/z-index.css
+++ /dev/null
@@ -1,39 +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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-GOOD { z-index: auto }
-GOOD { z-index: 123456789 }
-BAD { z-index: 12.3pt }
-BAD { z-index: 12.3 }
diff --git a/layout/html/tests/formctls/base/button_button_strict.html b/layout/html/tests/formctls/base/button_button_strict.html
deleted file mode 100644
index 76d157a7cb75..000000000000
--- a/layout/html/tests/formctls/base/button_button_strict.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing button button strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><button type="button"></button></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><button type="button" >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</button></p>
-<p>fixed width</p>
-<p><button type="button" class="fixed"></button></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><button type="button"></button></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><button type="button"></button></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><button type="button" class="fixed"></button></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><button type="button" class="fixed"></button></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><button type="button" class="pct"></button></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><button type="button" class="pct"></button></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><button type="button" class="pct"></button></td></tr></table>
-
-
-<a href="button_reset_strict.html">previous:&nbsp;&nbsp;button type:reset</a>&nbsp;&nbsp;&nbsp;<a href="textarea_strict.html">next:&nbsp;&nbsp;textarea</a>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/button_css_sizing.html b/layout/html/tests/formctls/base/button_css_sizing.html
deleted file mode 100644
index b48595c34780..000000000000
--- a/layout/html/tests/formctls/base/button_css_sizing.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<body bgcolor="#c0d0f0">
-<form>
-This is a normal button with no CSS sizing, <br>
-on Windows this sizes to 66x27:<br>
-<input type="button" value="Press Me">
-<br>
-On Windows this should be sizing to 84x24<br>
-here is a div that emulates it:<br>
-<center>
-<div style="border:2px lightgray outset;background-color:#c0c0c0;width:80px;height:20px;">Press Me</div>
-</center>
-<br>
-<hr>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<input type="button" value="Press Me"style="width:200px;height:60px;">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;">100x21</div><br>
-This button should be 100x21<br>
-<input type="button" value="Press Me with Really long title"style="width:100px;height:21px">
-<br>
-<br>
-This button should be 100x21<br>
-<input type="button" value="Presssssssssssssssssssssssssss"style="width:100px;height:21px">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<button style="width:200px;height:60px;">Press Me</button>
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;"> 100x21</div><br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Press Me with Really long title</button>
-<br>
-<br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Presssssssssssssssssssssssssss</button>
-<br>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_min_max_widths.html b/layout/html/tests/formctls/base/button_min_max_widths.html
deleted file mode 100644
index 64378237662a..000000000000
--- a/layout/html/tests/formctls/base/button_min_max_widths.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<title>
-Tests HTML buttons and min/max-width, quirks mode
-</title>
-<body>
-<div>
-<button style="width: 200px">200px button</button>
-</div>
-<div>
-<button style="min-width: 200px">200px button</button>
-</div>
-<div>
-<button style="max-width: 200px"><div style="width: 300px">200px button</div></button>
-</div>
-<div>
-<button style="max-width: 200px">
-  <img src="http://www.mozilla.org/images/mozilla-banner.gif" style="width: 101px">
-  <img src="http://www.mozilla.org/images/mozilla-banner.gif" style="width: 101px"></button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_min_max_widths_strict.html b/layout/html/tests/formctls/base/button_min_max_widths_strict.html
deleted file mode 100644
index c26f81551388..000000000000
--- a/layout/html/tests/formctls/base/button_min_max_widths_strict.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<title>
-Tests HTML buttons and min/max-width, standards mode
-</title>
-<body>
-<div>
-<button style="width: 200px">200px button</button>
-</div>
-<div>
-<button style="min-width: 200px">200px button</button>
-</div>
-<div>
-<button style="max-width: 200px"><div style="width: 300px">200px button</div></button>
-</div>
-<div>
-<button style="max-width: 200px">
-  <img src="http://www.mozilla.org/images/mozilla-banner.gif" style="width: 101px">
-  <img src="http://www.mozilla.org/images/mozilla-banner.gif" style="width: 101px"></button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_no_margin.html b/layout/html/tests/formctls/base/button_no_margin.html
deleted file mode 100644
index 6cda53f8bcd3..000000000000
--- a/layout/html/tests/formctls/base/button_no_margin.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<title>
-Tests HTML buttons without margins, quirks mode
-</title>
-<body>
-<div>
-<button>This is text</button>
-</div>
-<div>
-<button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-<div>
-This is text <button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_no_margin_strict.html b/layout/html/tests/formctls/base/button_no_margin_strict.html
deleted file mode 100644
index 9800ab02f8c7..000000000000
--- a/layout/html/tests/formctls/base/button_no_margin_strict.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<title>
-Tests HTML buttons without margins, standards mode
-</title>
-<body>
-<div>
-<button>This is text</button>
-</div>
-<div>
-<button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-<div>
-This is text <button>asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_overconstrained.html b/layout/html/tests/formctls/base/button_overconstrained.html
deleted file mode 100644
index e731a0df2e25..000000000000
--- a/layout/html/tests/formctls/base/button_overconstrained.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-  <head>
-    <title>input problem</title>
-  </head>
-  <body>
-      <button style="">M</button><br>
-      <button style="width: 1.5em">M</button><br>
-      <button style="width: 1.5em;padding:0">M</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">M</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >M</button><br>
-      <hr>
-      <button style="">My Fair Button</button><br>
-      <button style="width: 1.5em">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">My Fair Button</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >My Fair Button</button><br>
-      <hr>
-      <button style="width: 40px">
-        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-             style="width: 29px; height: 20px">
-        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-             style="width: 13px; height: 20px">
-      </button><br>
-      <button style="width: 40px">
-         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-              style="width: 29px; height: 20px">
-         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-              style="width: 10px; height: 20px">
-      </button><br>
-  </body>
-</html>
-  
diff --git a/layout/html/tests/formctls/base/button_overconstrained_strict.html b/layout/html/tests/formctls/base/button_overconstrained_strict.html
deleted file mode 100644
index 45b4f6475f1e..000000000000
--- a/layout/html/tests/formctls/base/button_overconstrained_strict.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-  <head>
-    <title>input problem</title>
-  </head>
-  <body>
-      <button style="">M</button><br>
-      <button style="width: 1.5em">M</button><br>
-      <button style="width: 1.5em;padding:0">M</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">M</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >M</button><br>
-      <hr>
-      <button style="">My Fair Button</button><br>
-      <button style="width: 1.5em">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">My Fair Button</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >My Fair Button</button><br>
-      <hr>
-      <button style="width: 40px">
-        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-             style="width: 29px; height: 20px">
-        <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-             style="width: 13px; height: 20px">
-      </button><br>
-      <button style="width: 40px">
-         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-              style="width: 29px; height: 20px">
-         <img src="http://www.mozilla.org/images/mozilla-banner.gif"
-              style="width: 10px; height: 20px">
-      </button><br>
-  </body>
-</html>
-  
diff --git a/layout/html/tests/formctls/base/button_reset_strict.html b/layout/html/tests/formctls/base/button_reset_strict.html
deleted file mode 100644
index 5dc8947e3084..000000000000
--- a/layout/html/tests/formctls/base/button_reset_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing button reset strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><button type="reset"></button></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><button type="reset" >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</button></p>
-<p>fixed width</p>
-<p><button type="reset" class="fixed"></button></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><button type="reset"></button></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><button type="reset"></button></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><button type="reset" class="fixed"></button></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><button type="reset" class="fixed"></button></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><button type="reset" class="pct"></button></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><button type="reset" class="pct"></button></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><button type="reset" class="pct"></button></td></tr></table>
-
-
-<a href="button_submit_strict.html">previous:&nbsp;&nbsp;button type:submit</a>&nbsp;&nbsp;&nbsp;<a href="button_button_strict.html">next:&nbsp;&nbsp; button type:button</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/button_sizing_tests.html b/layout/html/tests/formctls/base/button_sizing_tests.html
deleted file mode 100644
index 7854563b8944..000000000000
--- a/layout/html/tests/formctls/base/button_sizing_tests.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-<title>
-Tests button sizes (for NavQuirks)
-</title>
-<body bgcolor="#c0d0f0" text="#000000">
-<form>
-&lt;input type=button value="Hello"><br>
-<input type=button value="Hello"><br>
-
-<br>
-&lt;input type=button value="This is a long button"><br>
-<input type=button value="This is a long button"><br>
-<br>
-&lt;input type=submit value="Submit"><br>
-<input type=submit value="Submit"><br>
-<br>
-&lt;input type=reset value="Reset"><br>
-<input type=reset value="Reset"><br>
-<br>
-&lt;input type=reset><br>
-<input type=reset><br>
-<br>
-&lt;input type=submit><br>
-<input type=submit><br>
-<br>
-vinput type=submit><br>
-<input type=submit><br>
-<br>
-&lt;input type=button><br>
-<input type=button><br>
-<br>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_small_avail_width.html b/layout/html/tests/formctls/base/button_small_avail_width.html
deleted file mode 100644
index 8ed59fa7a40f..000000000000
--- a/layout/html/tests/formctls/base/button_small_avail_width.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<title>
-Tests HTML buttons with small available width, quirks mode
-</title>
-<body>
-<div style="width: 0px">
-<button>Some Text</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_small_avail_width_strict.html b/layout/html/tests/formctls/base/button_small_avail_width_strict.html
deleted file mode 100644
index 69ae3caf9074..000000000000
--- a/layout/html/tests/formctls/base/button_small_avail_width_strict.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<title>
-Tests HTML buttons with small available width, standards mode
-</title>
-<body>
-<div style="width: 0px">
-<button>Some Text</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_submit_strict.html b/layout/html/tests/formctls/base/button_submit_strict.html
deleted file mode 100644
index 4f370bd5b02d..000000000000
--- a/layout/html/tests/formctls/base/button_submit_strict.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing button submit strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><button type="submit"></button></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><button type="submit" >xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</button></p>
-<p>fixed width</p>
-<p><button type="submit" class="fixed"></button></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><button type="submit"></button></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><button type="submit"></button></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><button type="submit" class="fixed"></button></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><button type="submit" class="fixed"></button></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><button type="submit" class="pct"></button></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><button type="submit" class="pct"></button></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><button type="submit" class="pct"></button></td></tr></table>
-
-
-<a href="input_button_strict.html">previous:&nbsp;&nbsp;input type:button</a>&nbsp;&nbsp;&nbsp;<a href="button_reset_strict.html">next:&nbsp;&nbsp; button type:reset</a>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/button_with_margin.html b/layout/html/tests/formctls/base/button_with_margin.html
deleted file mode 100644
index 93771a44f170..000000000000
--- a/layout/html/tests/formctls/base/button_with_margin.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<title>
-Tests HTML buttons with margins, quirks mode
-</title>
-<body>
-<div>
-<button style="margin: 200px">This is text</button>
-</div>
-<div>
-<button style="margin: 200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-<div>
-This is text <button style="margin:200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/button_with_margin_strict.html b/layout/html/tests/formctls/base/button_with_margin_strict.html
deleted file mode 100644
index b6aa853432f4..000000000000
--- a/layout/html/tests/formctls/base/button_with_margin_strict.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<title>
-Tests HTML buttons with margins, standards mode
-</title>
-<body>
-<div>
-<button style="margin: 200px">This is text</button>
-</div>
-<div>
-<button style="margin: 200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-<div>
-This is text <button style="margin:200px">asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf asdfasdf</button>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/fieldset_strict.html b/layout/html/tests/formctls/base/fieldset_strict.html
deleted file mode 100644
index 9b634bb68c49..000000000000
--- a/layout/html/tests/formctls/base/fieldset_strict.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing fieldset strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><fieldset></fieldset></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><fieldset>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</fieldset></p>
-<p>fixed width</p>
-<p><fieldset class="fixed"></fieldset></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><fieldset></fieldset></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><fieldset></fieldset></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><fieldset class="fixed"></fieldset></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><fieldset class="fixed"></fieldset></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><fieldset class="pct"></fieldset></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><fieldset class="pct"></fieldset></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><fieldset class="pct"></fieldset></td></tr></table>
-
-
-
-<a href="select_strict.html">previous:&nbsp;&nbsp;select</a>&nbsp;&nbsp;&nbsp;<a href="legend_strict.html">next:&nbsp;&nbsp;legend</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/fieldset_strict2.html b/layout/html/tests/formctls/base/fieldset_strict2.html
deleted file mode 100644
index da4f095a0942..000000000000
--- a/layout/html/tests/formctls/base/fieldset_strict2.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<body>
-<fieldset style="display: inline; width: 500px; height: 400px">
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset style="display: inline">
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset>
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset style="width: 5px">
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset style="width: 5px; float: left">
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset style="width: 5px; position: absolute">
-<legend>
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-
-<fieldset>
-<legend style="width: 200px; border: 2px solid red">
-  bbb
-</legend>
-aaaa
-</fieldset>
-
-<fieldset style="margin: auto; max-width: 600px">
-<legend style="width: 50px">This is a test of the fieldset centering code, I believe</legend> Some actual text goes here.
-</fieldset>
-
-<fieldset style="width: 5px; margin: auto">
-<legend style="width: 50px">This is a test of the fieldset centering code, I believe</legend> Some actual text goes here.
-</fieldset>
-
-<table border="1">
-<tr> <td>
-<fieldset style="width: 5px; margin: auto">
-<legend style="width: 50px">This is a test of the fieldset centering code, I believe</legend> Some actual text goes here.
-</fieldset>
-</td> </tr>
-</table>
-
-<table border="1">
-<tr> <td>
-<fieldset style="width: 5px;">
-<legend>Some long legend</legend> Some actual text goes here.
-</fieldset>
-</td> </tr>
-</table>
-
-<table border="1">
-<tr> <td>
-<fieldset style="margin: auto">
-<legend style="width: 50px">This is a test of the fieldset centering code, I believe</legend> Some actual text goes here.
-</fieldset>
-</td> </tr>
-</table>
-
-<fieldset style="width: 5px">
-<legend style="border: 2px solid red;">
-  Short
-</legend>
-LongLongLongLongLongLongLongLongLongLong
-</fieldset>
-
-<fieldset style="display: inline">
-<legend style="border: 2px solid red; margin: 0 200px;">
-  Short
-</legend>
-LongLongLongLongLongLongLongLongLongLong
-</fieldset>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/form_overview.html b/layout/html/tests/formctls/base/form_overview.html
deleted file mode 100644
index f7f6cdc69660..000000000000
--- a/layout/html/tests/formctls/base/form_overview.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Form control size parameter</title>
-</head>
-
-<body>
-<h1>Form control size parameter</h1>
-<p>The testcases below apply the same style information to various form controls.
-<ol>
- <li>intrinsic width
- <li>intrinsic width with a long nonbreakable text
- <li> a fixed width (20px)
-</ol>
-Then various widths scenarios are tested inside table cells. This tests the maxElementWidth computation.
-<ol start="4">
- <li>intrinsic width inside a auto width table
- <li>intrinsic width inside a fixed width table cell which might be smaller than the intrinsic width of the control
- <li>fixed width inside a auto width table
- <li>fixed width inside a fixed width table cell which might be smaller than the intrinsic width of the control
- <li>percentage width inside a auto width table
-  <li>percentage width inside a fixed width table cell which might be smaller than the intrinsic width of the control
-  <li>percentage width inside 100% wide table cell in a fixed width table.
-</ol>
-</p>
-<ul>
-<li>input
-<ul>
-	<li> <a href="input_text_strict.html">text</a>
-	<li> <a href="input_password_strict.html">password</a>
-	<li> <a href="input_checkbox_strict.html">checkbox</a>
-	<li> <a href="input_radio_strict.html">radio</a>
-	<li> <a href="input_submit_strict.html">submit</a>
-	<li> <a href="input_reset_strict.html">reset</a>
-	<li> <a href="input_file_strict.html">file</a>
-	<li> <a href="input_hidden_strict.html">hidden</a>
-	<li> <a href="input_image_strict.html">image</a>
-	<li> <a href="input_button_strict.html">button</a>
-</ul>
-
-<li>button 
-
-<ul>
-	<li> <a href="button_submit_strict.html">submit</a>
-	<li> <a href="button_reset_strict.html">reset</a>
-	<li> <a href="button_button_strict.html">button</a>
-</ul>
-
-
-	<li> <a href="textarea_strict.html">textarea</a>
-	<li> <a href="select_strict.html">select</a>
-	<li> <a href="fieldset_strict.html">fieldset</a> 
-	<li> <a href="legend_strict.html">legend</a>
-	<li> <a href="isindex_strict.html">isindex</a>
-</ul>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/index.html b/layout/html/tests/formctls/base/index.html
deleted file mode 100644
index ec1a48ab7fa0..000000000000
--- a/layout/html/tests/formctls/base/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.61 [en] (WinNT; U) [Netscape]">
-   <title>Form Control Tests</title>
-</head>
-<body bgcolor="#C0D0F0">
-
-<h2>
-Form Control Tests</h2>
-
-<ul>
-<li>
-<b>Selects</b></li>
-
-<ul>
-<li>
-<a href="select_js.html">Add &amp; Remove options in a select as a combobox</a></li>
-
-<li>
-<a href="select_js.html">Add &amp; Remove options in a select as a listbox</a></li>
-</ul>
-
-<li>
-<b>Text Areas</b></li>
-
-<ul>
-<li>
-<a href="textarea_tests.html">Tests: Cols, Rows and Style (height, width,
-padding, border)</a></li>
-
-<li>
-<a href="textarea_sizes.html">Tests: Font sizes and family</a></li>
-
-<li>
-<a href="textarea_wrap.html">Tests: wrap property</a></li>
-</ul>
-
-<li>
-<b>Input Text</b></li>
-
-<ul>
-<li>
-<a href="inputtext_tests.html">Tests: Cols, Rows and Style (height, width,
-padding, border)</a></li>
-
-<li>
-<a href="inputtext_sizes.html">Tests: Font sizes and family</a></li>
-</ul>
-
-<li>
-<b>Input Button</b></li>
-
-<ul>
-<li>
-<a href="button_css_sizing.html">Tests: CSS sizing of Input and HTML buttons</a></li>
-
-<li>
-<a href="button_sizing_tests.html">Tests: Submit, Reset, and basic input
-type=button</a></li>
-</ul>
-
-<li>
-<b>Optgroups</b></li>
-
-<ul>
-<li>
-<a href="optgroup_test1.html">Tests: Optgroups and option element sizing
-combinations</a></li>
-</ul>
-</ul>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/input_button_overconstrained.html b/layout/html/tests/formctls/base/input_button_overconstrained.html
deleted file mode 100644
index 19d8cd463f19..000000000000
--- a/layout/html/tests/formctls/base/input_button_overconstrained.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-  <head>
-    <title>input problem</title>
-  </head>
-  <body>
-      <input type="button" style="" value="M"><br>
-      <input type="button" style="width: 1.5em" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
-      <hr>
-      <input type="button" style="" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="My Fair Button"><br>
-  </body>
-</html>
-  
diff --git a/layout/html/tests/formctls/base/input_button_overconstrained_strict.html b/layout/html/tests/formctls/base/input_button_overconstrained_strict.html
deleted file mode 100644
index 4eac1f35984f..000000000000
--- a/layout/html/tests/formctls/base/input_button_overconstrained_strict.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-  <head>
-    <title>input problem</title>
-  </head>
-  <body>
-      <input type="button" style="" value="M"><br>
-      <input type="button" style="width: 1.5em" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
-      <hr>
-      <input type="button" style="" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="My Fair Button"><br>
-  </body>
-</html>
-  
diff --git a/layout/html/tests/formctls/base/input_button_strict.html b/layout/html/tests/formctls/base/input_button_strict.html
deleted file mode 100644
index 8f27fa42b024..000000000000
--- a/layout/html/tests/formctls/base/input_button_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input button strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="button"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="button" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="button" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="button"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="button"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="button" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="button" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="button" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="button" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="button" class="pct"></td></tr></table>
-
-<a href="input_image_strict.html">previous:&nbsp;&nbsp; input type:image</a>&nbsp;&nbsp;&nbsp;<a href="button_submit_strict.html">next:&nbsp;&nbsp; button type:submit</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_checkbox_strict.html b/layout/html/tests/formctls/base/input_checkbox_strict.html
deleted file mode 100644
index 2d06d3fb0c19..000000000000
--- a/layout/html/tests/formctls/base/input_checkbox_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input checkbox strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:1%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="checkbox"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="checkbox" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="checkbox" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="checkbox"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="checkbox"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="checkbox" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="checkbox" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="checkbox" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="checkbox" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="checkbox" class="pct"></td></tr></table>
-
-
-
-<a href="input_password_strict.html">previous:&nbsp;&nbsp; input type:password</a>&nbsp;&nbsp;&nbsp;<a href="input_radio_strict.html">next:&nbsp;&nbsp; input type:radio</a>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_file_strict.html b/layout/html/tests/formctls/base/input_file_strict.html
deleted file mode 100644
index 19303245902c..000000000000
--- a/layout/html/tests/formctls/base/input_file_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input file strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="file"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="file" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input type="file" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input type="file"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input type="file"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input type="file" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input type="file" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input type="file" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input type="file" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input type="file" class="pct"></td></tr></table>
-
-<a href="input_reset_strict.html">previous:&nbsp;&nbsp; input type:reset</a>&nbsp;&nbsp;&nbsp;<a href="input_hidden_strict.html">next:&nbsp;&nbsp; input type:hidden</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_file_strict2.html b/layout/html/tests/formctls/base/input_file_strict2.html
deleted file mode 100644
index a5f8b6c04455..000000000000
--- a/layout/html/tests/formctls/base/input_file_strict2.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<body>
-<div> a <input type="file"> b </div>
-
-<div> a <input type="file" style="height: 100px"> b </div>
-
-<div> a <input type="file" style="width: 100px"> b </div>
-
-<div> a <input type="file" style="width: 100%"> b </div>
-
-<div> a <input type="file" dir="rtl"> b </div>
-<div style="direction: rtl"> a <input type="file"> b </div>
-<div style="width: 100px; border: 1px solid green"> a <input type="file"> b </div>
-<div style="width: 100px; border: 1px solid green"> a <input type="file" style="width: 100%"> b </div>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/input_hidden_strict.html b/layout/html/tests/formctls/base/input_hidden_strict.html
deleted file mode 100644
index 6613139042c2..000000000000
--- a/layout/html/tests/formctls/base/input_hidden_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input hidden strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="hidden"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="hidden" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="hidden" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="hidden"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="hidden"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="hidden" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="hidden" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="hidden" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="hidden" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="hidden" class="pct"></td></tr></table>
-
-
-<a href="input_file_strict.html">previous:&nbsp;&nbsp; input type:file</a>&nbsp;&nbsp;&nbsp;<a href="input_image_strict.html">next:&nbsp;&nbsp; input type:image</a>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_image_strict.html b/layout/html/tests/formctls/base/input_image_strict.html
deleted file mode 100644
index 669585baaa90..000000000000
--- a/layout/html/tests/formctls/base/input_image_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input hidden strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="image" src="http://www.mozilla.org/images/mlogo.gif"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="image" src="http://www.mozilla.org/images/mlogo.gif" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="image" src="http://www.mozilla.org/images/mlogo.gif"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="image" src="http://www.mozilla.org/images/mlogo.gif"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="image" src="http://www.mozilla.org/images/mlogo.gif" class="pct"></td></tr></table>
-
-
-<a href="input_hidden_strict.html">previous:&nbsp;&nbsp; input type:hidden</a>&nbsp;&nbsp;&nbsp;<a href="input_button_strict.html">next:&nbsp;&nbsp; input type:button</a>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_password_strict.html b/layout/html/tests/formctls/base/input_password_strict.html
deleted file mode 100644
index 5fb1758eea3a..000000000000
--- a/layout/html/tests/formctls/base/input_password_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input password strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="password"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="password" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="password" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="password"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="password"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="password" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="password" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="password" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="password" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="password" class="pct"></td></tr></table>
-
-
-<a href="input_text_strict.html">previous:&nbsp;&nbsp; input type:text</a>&nbsp;&nbsp;&nbsp;<a href="input_checkbox_strict.html">next:&nbsp;&nbsp; input type:checkbox</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_radio_strict.html b/layout/html/tests/formctls/base/input_radio_strict.html
deleted file mode 100644
index bf5aa8a885bb..000000000000
--- a/layout/html/tests/formctls/base/input_radio_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input radio strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="radio"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="radio" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="radio" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="radio"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="radio"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="radio" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="radio" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="radio" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="radio" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="radio" class="pct"></td></tr></table>
-
-
-<a href="input_checkbox_strict.html">previous:&nbsp;&nbsp; input type:checkbox</a>&nbsp;&nbsp;&nbsp;<a href="input_submit_strict.html">next:&nbsp;&nbsp; input type:submit</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_reset_strict.html b/layout/html/tests/formctls/base/input_reset_strict.html
deleted file mode 100644
index 773d37280ce4..000000000000
--- a/layout/html/tests/formctls/base/input_reset_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input reset strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="reset"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="reset" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="reset" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="reset"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="reset"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="reset" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="reset" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="reset" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="reset" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="reset" class="pct"></td></tr></table>
-
-<a href="input_submit_strict.html">previous:&nbsp;&nbsp; input type:submit</a>&nbsp;&nbsp;&nbsp;<a href="input_file_strict.html">next:&nbsp;&nbsp; input type:file</a>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_submit_strict.html b/layout/html/tests/formctls/base/input_submit_strict.html
deleted file mode 100644
index 5f123439d855..000000000000
--- a/layout/html/tests/formctls/base/input_submit_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input submit strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="submit"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="submit" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="submit" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="submit"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="submit"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="submit" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="submit" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="submit" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="submit" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="submit" class="pct"></td></tr></table>
-
-<a href="input_radio_strict.html">previous:&nbsp;&nbsp; input type:radio</a>&nbsp;&nbsp;&nbsp;<a href="input_reset_strict.html">next:&nbsp;&nbsp; input type:reset</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/input_text_strict.html b/layout/html/tests/formctls/base/input_text_strict.html
deleted file mode 100644
index 79673bb8aa1f..000000000000
--- a/layout/html/tests/formctls/base/input_text_strict.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input text strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><input type="text"></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><input type="text" value="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><input  type="text" class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><input  type="text"></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><input  type="text"></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><input  type="text" class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><input  type="text" class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><input  type="text" class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><input  type="text" class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><input  type="text" class="pct"></td></tr></table>
-
-
-<hr>
-<a href="form overview.html">index</a> &nbsp;&nbsp;&nbsp;&nbsp;<a href="input_password_strict.html">next:&nbsp;&nbsp; input type:password</a>
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/inputtext_sizes.html b/layout/html/tests/formctls/base/inputtext_sizes.html
deleted file mode 100644
index 703a6de9044a..000000000000
--- a/layout/html/tests/formctls/base/inputtext_sizes.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<body bgcolor="#C0D0F0">
-<form>
-<font size=1><input type=text value="This is some text.">Size=1</font><br>
-<font size=2><input type=text value="This is some text.">Size=2</font><br>
-<font size=3><input type=text value="This is some text.">Size=3</font><br>
-<font size=4><input type=text value="This is some text.">Size=4</font><br>
-<font size=5><input type=text value="This is some text.">Size=5</font><br>
-<font size=6><input type=text value="This is some text.">Size=6</font><br>
-<font size=7><input type=text value="This is some text.">Size=7</font><br>
-<hr>
-<h3>Sans-serif</h3>
-<font size=1 face="sans-serif"><input type=text value="This is some text.">Size=1</font><br>
-<font size=2 face="sans-serif"><input type=text value="This is some text.">Size=2</font><br>
-<font size=3 face="sans-serif"><input type=text value="This is some text.">Size=3</font><br>
-<font size=4 face="sans-serif"><input type=text value="This is some text.">Size=4</font><br>
-<font size=5 face="sans-serif"><input type=text value="This is some text.">Size=5</font><br>
-<font size=6 face="sans-serif"><input type=text value="This is some text.">Size=6</font><br>
-<font size=7 face="sans-serif"><input type=text value="This is some text.">Size=7</font><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/base/inputtext_tests.html b/layout/html/tests/formctls/base/inputtext_tests.html
deleted file mode 100644
index 8337ad0b33e7..000000000000
--- a/layout/html/tests/formctls/base/inputtext_tests.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title></title>
-    
-</head>
- <body style="background-color: rgb(192,208,240);">
-     
-<form> Default Input text<br>
-   <input type="text" value=""> <br>
-   <br>
-   Default Input text with a value<br>
-   <input type="text" value="123456789 123456789 123456789 123456789 "> <br>
-   <br>
-   Size=50<br>
-   <input type="text" size="50"
- value="123456789 123456789 123456789 123456789 123456789 "> <br>
-   <br>
-   style="height:50px;" <br>
-   <input type="text" style="height: 50px;"
- value="123456789 123456789 123456789 123456789 "> <br>
-   <br>
-   style="width:200px;" <br>
-   <input type="text" style="width: 200px;"
- value="123456789 123456789 123456789 123456789 "> <br>
-         
-  <div style="color: yellow; background-color: blue; width: 200px;">This
-is 200px width</div>
-   Size=50 style="height:50px;"<br>
-   <input type="text" size="50" style="height: 50px;"
- value="123456789 123456789 123456789 123456789 123456789 "> <br>
-   <br>
-   style="width:200px;height:50px;" <br>
-   <input type="text" style="width: 200px; height: 50px;"
- value="123456789 123456789 123456789 123456789 ">       
-  <hr>       
-  <h3>Padding and Border Tests</h3>
-   <br>
-   5px solid blue<br>
-   <input type="text" style="border: 5px solid blue;" value="Hello"><br>
-    <br>
-   padding: 5px;<br>
-   <input type="text" style="padding: 5px;" value="Hello"><br>
-    <br>
-   5px solid blue;padding: 5px;<br>
-   <input type="text" style="border: 5px solid blue; padding: 5px;"
- value="Hello"><br>
-    <br>
-   <br>
-   5px solid blue;height:50px;<br>
-   <input type="text" style="border: 5px solid blue; height: 50px;"
- value="Hello"><br>
-    <br>
-   padding: 5px;height:50px;<br>
-   <input type="text" style="padding: 5px; height: 50px;" value="Hello"><br>
-    <br>
-   5px solid blue;padding: 5px;height:50px;<br>
-   <input type="text"
- style="border: 5px solid blue; padding: 5px; height: 50px;"
- value="Hello"><br>
-    <br>
-         
-  <hr> Textarea in a red div tag (shows top and bottom margin)<br>
-         
-  <div style="background-color: red;"> <input type="text"
- value="This is some text."> </div>
-   </form>
-     
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/isindex_strict.html b/layout/html/tests/formctls/base/isindex_strict.html
deleted file mode 100644
index 7278a070d2cb..000000000000
--- a/layout/html/tests/formctls/base/isindex_strict.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input checkbox strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><isindex></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><isindex prompt="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"></p>
-<p>fixed width</p>
-<p><isindex  class="fixed"></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><isindex></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><isindex></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><isindex class="fixed"></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><isindex class="fixed"></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><isindex class="pct"></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><isindex class="pct"></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><isindex class="pct"></td></tr></table>
-
-
-<a href="legend_strict.html">previous:&nbsp;&nbsp;legend</a>&nbsp;&nbsp;&nbsp;<a href="form_overview.html">next:&nbsp;&nbsp;overview</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/legend_strict.html b/layout/html/tests/formctls/base/legend_strict.html
deleted file mode 100644
index 4aab1f4e95c2..000000000000
--- a/layout/html/tests/formctls/base/legend_strict.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing legend strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><fieldset><legend></fieldset></legend</p>
-<p>intrinsic width long nonbreakable text</p>
-<p><fieldset><legend>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</legend></fieldset></p>
-<p>fixed width</p>
-<p><fieldset><legend class="fixed"></legend></fieldset></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><fieldset><legend></legend></fieldset></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><fieldset><legend></legend></fieldset></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><fieldset><legend class="fixed"></legend></fieldset></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><fieldset><legend class="fixed"></legend></fieldset></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><fieldset><legend class="pct"></legend></fieldset></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><fieldset><legend class="pct"></legend></fieldset></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><fieldset><legend class="pct"></legend></fieldset></td></tr></table>
-
-
-
-<a href="fieldset_strict.html">previous:&nbsp;&nbsp;fieldset</a>&nbsp;&nbsp;&nbsp;<a href="isindex_strict.html">next:&nbsp;&nbsp;isindex</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/optgroup_test1.html b/layout/html/tests/formctls/base/optgroup_test1.html
deleted file mode 100644
index ff23e171efda..000000000000
--- a/layout/html/tests/formctls/base/optgroup_test1.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<body bgcolor="#c0d0f0">
-<form>
-Should be 2 rows high<br>
-<SELECT multiple="multiple">
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION>This is sentence 1.</OPTION>
-    </OPTGROUP>
-</SELECT>
-<br>
-<br>
-Should be 2 rows high<br>
-<SELECT multiple="multiple">
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION label="This is sentence 1."></OPTION>
-    </OPTGROUP>
-</SELECT>
-<br>
-<br>
-Should be 4 rows high<br>
-<SELECT multiple="multiple">
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION label="This is sentence 1."></OPTION>
-    </OPTGROUP>
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION label="This is sentence 1."></OPTION>
-    </OPTGROUP>
-</SELECT>
-<br>
-<br>
-Should be 3 rows high<br>
-<SELECT size=3 multiple="multiple">
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION label="This is sentence 1."></OPTION>
-    </OPTGROUP>
-    <OPTGROUP label="This is sentence 2. ">
-      <OPTION label="This is sentence 1."></OPTION>
-    </OPTGROUP>
-</SELECT>
-<br>
-<br>
-Should be 3 rows high<br>
-<SELECT multiple="multiple">
-    <OPTION label="This is sentence 1. ">This is sentence 1.</OPTION>
-    <OPTGROUP label="This is sentence 2. ">
-       <OPTION label="This is sentence 3. ">This is sentence 3.</OPTION>
-    </OPTGROUP>
-</SELECT>
-<br>
-<br>
-OptGroup with optional &lt;/OPTION&gt; missing<br>
-Should look ok with 3 rows<br>
-<SELECT name="name">
-   <OPTION value="a">Option with no close tag
-   <OPTGROUP label="OptGroup">
-     <OPTION label="Option in OptGroup" value="b">Option in OptGroup</OPTION>
-   </OPTGROUP>
-</SELECT>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/radio_disabled.html b/layout/html/tests/formctls/base/radio_disabled.html
deleted file mode 100644
index ff46586ca3cc..000000000000
--- a/layout/html/tests/formctls/base/radio_disabled.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Radio Button Test 2 (Disabled)</TITLE>
-<SCRIPT SRC="radio.js"></SCRIPT>
-</HEAD>
-<BODY>
-<FORM NAME=mainform>
-<INPUT TYPE=reset>
-<FIELDSET>
-<LEGEND>1, 3, 4, 7 Disabled</LEGEND>
-<INPUT TYPE=radio DISABLED NAME=a VALUE=1>
-<INPUT TYPE=radio NAME=a VALUE=2>
-<INPUT TYPE=radio DISABLED NAME=a VALUE=3>
-<INPUT TYPE=radio DISABLED NAME=a VALUE=4>
-<INPUT TYPE=radio NAME=a VALUE=5>
-<INPUT TYPE=radio NAME=a VALUE=6>
-<INPUT TYPE=radio DISABLED NAME=a VALUE=7>
-<BR>
-<INPUT TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.a))">
-<INPUT TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.a[2].checked = true">
-<INPUT TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.a, true)">
-</FIELDSET>
-<FIELDSET>
-<LEGEND>All Disabled</LEGEND>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=1>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=2>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=3>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=4>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=5>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=6>
-<INPUT TYPE=radio DISABLED NAME=b VALUE=7>
-<BR>
-<INPUT TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.b))">
-<INPUT TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.b[2].checked = true">
-<INPUT TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.b, true)">
-</FIELDSET>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/radio_init.html b/layout/html/tests/formctls/base/radio_init.html
deleted file mode 100644
index db6d64dac2ac..000000000000
--- a/layout/html/tests/formctls/base/radio_init.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Radio Button Test 1 (Init)</TITLE>
-<SCRIPT SRC="radio.js"></SCRIPT>
-</HEAD>
-<BODY>
-<FORM NAME=mainform>
-<INPUT TYPE=reset> <INPUT TYPE=submit>
-<FIELDSET>
-<LEGEND>None Selected</LEGEND>
-<INPUT TYPE=radio NAME=a VALUE=1>
-<INPUT TYPE=radio NAME=a VALUE=2>
-<INPUT TYPE=radio NAME=a VALUE=3>
-<BR>
-<INPUT TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.a))">
-<INPUT TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.a[2].checked = true">
-<INPUT TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.a, true)">
-</FIELDSET>
-<FIELDSET>
-<LEGEND>One Selected</LEGEND>
-<INPUT TYPE=radio NAME=b VALUE=1>
-<INPUT TYPE=radio CHECKED NAME=b VALUE=2>
-<INPUT TYPE=radio NAME=b VALUE=3>
-<BR>
-<INPUT TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.b))">
-<INPUT TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.b[2].checked = true">
-<INPUT TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.b, true)">
-</FIELDSET>
-<FIELDSET>
-<LEGEND>All Selected</LEGEND>
-<INPUT TYPE=radio CHECKED NAME=c VALUE=1>
-<INPUT TYPE=radio CHECKED NAME=c VALUE=2>
-<INPUT TYPE=radio NAME=c VALUE=3 CHECKED>
-<BR>
-<INPUT TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.c))">
-<INPUT TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.c[2].checked = true">
-<INPUT TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.c, true)">
-</FIELDSET>
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/radio_jsadd.html b/layout/html/tests/formctls/base/radio_jsadd.html
deleted file mode 100644
index b1d23b846062..000000000000
--- a/layout/html/tests/formctls/base/radio_jsadd.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<title>Radio Button Test 3 (onChange)</title>
-<script SRC="radio.js"></SCRIPT>
-</head>
-<body>
-<form NAME=mainform>
-<input TYPE=reset> <input TYPE=submit>
-<fieldset>
-<legend>onChange test</legend>
-R1 <input TYPE=radio ID=R1 NAME=a VALUE=1">
-R2 <input TYPE=radio ID=R2 NAME=a VALUE=2">
-R3 <input TYPE=radio ID=R3 NAME=a VALUE=3">
-<br ID=addbeforeme>
-<input TYPE=button VALUE="Change type of R2 to checkbox" onClick="document.getElementById('R2').type = 'checkbox'">
-<input TYPE=button VALUE="Change type of R2 back to radio" onClick="document.getElementById('R2').type = 'radio'"><BR>
-<input TYPE=button VALUE="Change name of R2 to b" onClick="document.getElementById('R2').name = 'b'">
-<input TYPE=button VALUE="Change name of R2 back to a" onClick="document.getElementById('R2').name = 'a'"><BR>
-<input TYPE=button VALUE="Remove second radio in group a" onClick="document.mainform.a[1].parentNode.removeChild(document.mainform.a[1])"><BR>
-Add new radio buttons as checked: <input TYPE=checkbox NAME=addchecked><BR>
-Add new radio buttons with name: <input type=text NAME=addname VALUE="a"><BR>
-<input TYPE=button VALUE="Add New Radio" onClick="addNewRadio()"><BR>
-</fieldset>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/radio_onchange.html b/layout/html/tests/formctls/base/radio_onchange.html
deleted file mode 100644
index 7ef2d954efdd..000000000000
--- a/layout/html/tests/formctls/base/radio_onchange.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Radio Button Test 3 (onChange)</title>
-<script SRC="radio.js"></SCRIPT>
-</head>
-<body>
-<form NAME=mainform>
-<input TYPE=reset> <input TYPE=submit>
-<fieldset>
-<legend>onChange test</legend>
-<input TYPE=radio NAME=a VALUE=1 onChange="alert('1 changed')">
-<input TYPE=radio NAME=a VALUE=2 onChange="alert('2 changed')">
-<input TYPE=radio NAME=a VALUE=3 onChange="alert('3 changed')">
-<br>
-<input TYPE=button VALUE="Show all checked" onClick="alert(getRadioVal(document.mainform.a))">
-<input TYPE=button VALUE="Set .checked on #3" onClick="document.mainform.a[2].checked = true">
-<input TYPE=button VALUE="Set all .checked" onClick="setAllChecked(document.mainform.a, true)">
-</fieldset>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/rtest.lst b/layout/html/tests/formctls/base/rtest.lst
deleted file mode 100644
index 373cf8425edc..000000000000
--- a/layout/html/tests/formctls/base/rtest.lst
+++ /dev/null
@@ -1,56 +0,0 @@
-button_css_sizing.html
-button_sizing_tests.html
-inputtext_sizes.html
-inputtext_tests.html
-optgroup_test1.html
-select_js.html
-select_combobox_basics.html
-selectsize3_js.html
-select_listbox_sizing.html
-select_listbox_sizing_quirks.html
-select_small_sizes.html
-select_small_sizes2.html
-testarea_wrap.html
-textarea_sizes.html
-textarea_tests.html
-select_disabled.html
-select_init.html
-select1_js.html
-select_jsadd.html
-select_onchange.html
-radio_disabled.html
-radio_jsadd.html
-radio_onchange.html
-radio_init.html
-input_text_strict.html
-input_password_strict.html
-input_checkbox_strict.html
-input_radio_strict.html
-input_submit_strict.html
-input_reset_strict.html
-input_file_strict.html
-input_file_strict2.html
-input_hidden_strict.html
-input_image_strict.html
-input_button_strict.html
-button_submit_strict.html
-button_reset_strict.html
-button_button_strict.html
-textarea_strict.html
-select_strict.html
-fieldset_strict.html 
-fieldset_strict2.html 
-legend_strict.html
-isindex_strict.html
-button_no_margin.html
-button_no_margin_strict.html
-button_with_margin.html
-button_with_margin_strict.html
-button_min_max_widths.html
-button_min_max_widths_strict.html
-button_small_avail_width.html
-button_small_avail_width_strict.html
-button_overconstrained.html
-button_overconstrained_strict.html
-input_button_overconstrained.html
-input_button_overconstrained_strict.html
diff --git a/layout/html/tests/formctls/base/select1_js.html b/layout/html/tests/formctls/base/select1_js.html
deleted file mode 100644
index 1f5394b06b14..000000000000
--- a/layout/html/tests/formctls/base/select1_js.html
+++ /dev/null
@@ -1,258 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Select Tests: JavaScript</TITLE>
-<SCRIPT>
-function typeTest(sel) {
-	if(sel.multiple && sel.type != "select-multi") {
-		alert("sel.type is '" + sel.type + "' instead of select-multi!");
-	} else if(sel.type != "select-one") {
-		alert("sel.type is '" + sel.type + "' instead of select-one!");
-	}
-}
-function selIndTest(sel) {
-	alert(sel.selectedIndex);
-}
-function selIndTestW(sel) {
-	sel.selectedIndex = 2;
-}
-function valueTest(sel) {
-	alert(sel.value);
-}
-function valueTestW(sel) {
-	sel.value = 4;
-}
-function lengthTest(sel) {
-	alert(sel.length);
-}
-function lengthTestW(sel) {
-	if(sel.length == 20) {
-		sel.length = 5;
-	} else {
-		sel.length = 20;
-	}
-}
-function formTest(sel) {
-	if(sel.form == null || sel.form.elements == null) {
-		alert("Select's form doesn't appear to be a form!");
-	}
-}
-// options is tested adequately in other tests
-function disabledTest(sel) {
-	alert(sel.disabled);
-}
-function disabledTestW(sel) {
-	sel.disabled = !sel.disabled;
-}
-function multipleTest(sel) {
-	alert(sel.multiple);
-}
-function multipleTestW(sel) {
-	sel.multiple = !sel.multiple;
-}
-function nameTest(sel) {
-	alert(sel.name);
-}
-function nameTestW(sel) {
-	sel.name = sel.name + "x";
-}
-function sizeTest(sel) {
-	alert(sel.size);
-}
-function sizeTestW(sel) {
-	if(sel.size == 10) {
-		sel.size = -1;
-	} else if(sel.size == -1) {
-		sel.size = 0;
-	} else if(sel.size == 0) {
-		sel.size = 1;
-	} else {
-		sel.size = 10;
-	}
-}
-
-function hideTest(sel) {
-	sel.style.display = 'none';
-}
-function unhideTest(sel) {
-	sel.style.display = 'block';
-}
-
-</SCRIPT>
-<BODY>
-
-<H2>Select Tests: JavaScript</H2>
-<TABLE BORDER=1>
-<TR>
-<TH>display: none init</TH>
-<TD>
-<B>Steps:</B> Click the buttons to view and set things.  Start by viewing everything.<BR>
-<B>Verify:</B> That everything behaves the same before and after clicking Unhide.
-</TD>
-</TR>
-<TR>
-<TH>JavaScript</TH>
-<TD>
-<B>Steps:</B> Click Unhide to view the select.  Click the various buttons.<BR>
-<B>Verify:</B> That they do what you'd expect.
-</TD>
-</TR>
-<TR>
-<TH>display: none JavaScript</TH>
-<TD>
-<B>Steps:</B> Click hide and try various JavaScript.<BR>
-<B>Verify:</B> That they do what you'd expect, and unhide shows them properly.
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-
-<FORM NAME=mainform>
-
-<INPUT TYPE=reset><BR><BR>
-
-<TABLE BORDER=1>
-<TR>
-<TD><B>Dropdown</B><BR>
-<INPUT TYPE=button onClick="typeTest(document.mainform.blah)" VALUE="type">
-<INPUT TYPE=button onClick="formTest(document.mainform.blah)" VALUE="form"><BR>
-<INPUT TYPE=button onClick="selIndTest(document.mainform.blah)" VALUE="selectedIndex">
-<INPUT TYPE=button onClick="selIndTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="valueTest(document.mainform.blah)" VALUE="value">
-<INPUT TYPE=button onClick="valueTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="lengthTest(document.mainform.blah)" VALUE="length">
-<INPUT TYPE=button onClick="lengthTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="disabledTest(document.mainform.blah)" VALUE="disabled">
-<INPUT TYPE=button onClick="disabledTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="multipleTest(document.mainform.blah)" VALUE="multiple">
-<INPUT TYPE=button onClick="multipleTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="nameTest(document.mainform.blah)" VALUE="name">
-<INPUT TYPE=button onClick="nameTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="sizeTest(document.mainform.blah)" VALUE="size">
-<INPUT TYPE=button onClick="sizeTestW(document.mainform.blah)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="hideTest(document.mainform.blah)" VALUE="Hide">
-<INPUT TYPE=button onClick="unhideTest(document.mainform.blah)" VALUE="Unhide"><BR>
-<BR>
-<SELECT NAME=blah STYLE="display: none">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD><B>Single w/Size</B><BR>
-<INPUT TYPE=button onClick="typeTest(document.mainform.blah2)" VALUE="type">
-<INPUT TYPE=button onClick="formTest(document.mainform.blah2)" VALUE="form"><BR>
-<INPUT TYPE=button onClick="selIndTest(document.mainform.blah2)" VALUE="selectedIndex">
-<INPUT TYPE=button onClick="selIndTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="valueTest(document.mainform.blah2)" VALUE="value">
-<INPUT TYPE=button onClick="valueTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="lengthTest(document.mainform.blah2)" VALUE="length">
-<INPUT TYPE=button onClick="lengthTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="disabledTest(document.mainform.blah2)" VALUE="disabled">
-<INPUT TYPE=button onClick="disabledTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="multipleTest(document.mainform.blah2)" VALUE="multiple">
-<INPUT TYPE=button onClick="multipleTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="nameTest(document.mainform.blah2)" VALUE="name">
-<INPUT TYPE=button onClick="nameTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="sizeTest(document.mainform.blah2)" VALUE="size">
-<INPUT TYPE=button onClick="sizeTestW(document.mainform.blah2)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="hideTest(document.mainform.blah2)" VALUE="Hide">
-<INPUT TYPE=button onClick="unhideTest(document.mainform.blah2)" VALUE="Unhide"><BR>
-<BR>
-<SELECT NAME=blah2 SIZE=10 STYLE="display: none">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD><B>Multiple</B><BR>
-<INPUT TYPE=button onClick="typeTest(document.mainform.blah3)" VALUE="type">
-<INPUT TYPE=button onClick="formTest(document.mainform.blah3)" VALUE="form"><BR>
-<INPUT TYPE=button onClick="selIndTest(document.mainform.blah3)" VALUE="selectedIndex">
-<INPUT TYPE=button onClick="selIndTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="valueTest(document.mainform.blah3)" VALUE="value">
-<INPUT TYPE=button onClick="valueTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="lengthTest(document.mainform.blah3)" VALUE="length">
-<INPUT TYPE=button onClick="lengthTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="disabledTest(document.mainform.blah3)" VALUE="disabled">
-<INPUT TYPE=button onClick="disabledTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="multipleTest(document.mainform.blah3)" VALUE="multiple">
-<INPUT TYPE=button onClick="multipleTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="nameTest(document.mainform.blah3)" VALUE="name">
-<INPUT TYPE=button onClick="nameTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="sizeTest(document.mainform.blah3)" VALUE="size">
-<INPUT TYPE=button onClick="sizeTestW(document.mainform.blah3)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="hideTest(document.mainform.blah3)" VALUE="Hide">
-<INPUT TYPE=button onClick="unhideTest(document.mainform.blah3)" VALUE="Unhide"><BR>
-<BR>
-<SELECT NAME=blah3 MULTIPLE SIZE=10 STYLE="display: none">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD><B>Optgroup</B><BR>
-<INPUT TYPE=button onClick="typeTest(document.mainform.blah4)" VALUE="type">
-<INPUT TYPE=button onClick="formTest(document.mainform.blah4)" VALUE="form"><BR>
-<INPUT TYPE=button onClick="selIndTest(document.mainform.blah4)" VALUE="selectedIndex">
-<INPUT TYPE=button onClick="selIndTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="valueTest(document.mainform.blah4)" VALUE="value">
-<INPUT TYPE=button onClick="valueTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="lengthTest(document.mainform.blah4)" VALUE="length">
-<INPUT TYPE=button onClick="lengthTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="disabledTest(document.mainform.blah4)" VALUE="disabled">
-<INPUT TYPE=button onClick="disabledTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="multipleTest(document.mainform.blah4)" VALUE="multiple">
-<INPUT TYPE=button onClick="multipleTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="nameTest(document.mainform.blah4)" VALUE="name">
-<INPUT TYPE=button onClick="nameTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="sizeTest(document.mainform.blah4)" VALUE="size">
-<INPUT TYPE=button onClick="sizeTestW(document.mainform.blah4)" VALUE="(set)"><BR>
-<INPUT TYPE=button onClick="hideTest(document.mainform.blah4)" VALUE="Hide">
-<INPUT TYPE=button onClick="unhideTest(document.mainform.blah4)" VALUE="Unhide"><BR>
-<BR>
-<SELECT NAME=blah4 MULTIPLE SIZE=10 STYLE="display: none">
-<OPTGROUP label=first>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-</OPTGROUP>
-<OPTGROUP label=second>
-<OPTION SELECTED>9
-<OPTION>10
-</OPTGROUP>
-<OPTION>11
-</SELECT>
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/select_combobox_basics.html b/layout/html/tests/formctls/base/select_combobox_basics.html
deleted file mode 100644
index d0ac24782489..000000000000
--- a/layout/html/tests/formctls/base/select_combobox_basics.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-<h1>Combobox Tests</h1>
-<form>
-<select>
-<option>one</option>
-<option style="font-size: 2em">two</option>
-<option>three</option>
-</select>
-aaa
-
-<hr>
-
-<select style="direction: rtl">
-<option>one</option>
-<option style="font-size: 2em">two</option>
-<option>three</option>
-</select>
-
-<hr>
-
-
-<select style="width: 100px">
-<option>This is a rather long option and all that</option>
-</select>
-
-<hr>
-
-<select style="width: 300px">
-<option>Short option</option>
-</select>
-
-<hr>
-
-<select>
-<option style="font-size: 1px">one</option>
-</select>
-
-<hr>
-
-<select>
-</select>
-
-<hr>
-
-<select accesskey="c">
-<option>Accesskey is 'c'</option>
-</select>
-
-<hr>
-
-<select id="select8">
-<option selected>FAIL 1</option>
-<option selected>FAIL 2</option>
-<option selected>FAIL 3</option>
-<option selected>FAIL 4</option>
-<option selected>FAIL 5</option>
-<option selected>FAIL 6</option>
-<option selected>FAIL 7</option>
-<option selected>FAIL 8</option>
-<option selected>FAIL 9</option>
-<option selected>FAIL 10</option>
-<option selected>FAIL 11</option>
-<option selected>FAIL 12</option>
-<option selected>FAIL 13</option>
-<option selected>FAIL 14</option>
-<option selected>FAIL 15</option>
-<option selected>FAIL 16</option>
-<option selected>FAIL 17</option>
-<option selected>FAIL 18</option>
-<option selected>FAIL 19</option>
-<option selected>FAIL 20</option>
-<option selected>FAIL 21</option>
-<option selected>FAIL 22</option>
-<option selected>FAIL 23</option>
-<option selected>FAIL 24</option>
-<option selected>FAIL 25</option>
-<option selected>FAIL 26</option>
-<option selected>FAIL 27</option>
-<option selected>FAIL 28</option>
-<option selected>FAIL 29</option>
-<option selected>FAIL 30</option>
-<option selected>FAIL 31</option>
-<option selected>FAIL 32</option>
-<option selected>FAIL 33</option>
-<option selected>FAIL 34</option>
-<option selected>FAIL 35</option>
-<option selected>FAIL 36</option>
-<option selected>FAIL 37</option>
-<option selected>FAIL 38</option>
-<option selected>FAIL 39</option>
-<option selected>FAIL 40</option>
-<option selected>FAIL 41</option>
-<option selected>FAIL 42</option>
-<option selected>FAIL 43</option>
-<option selected>FAIL 44</option>
-<option selected>FAIL 45</option>
-<option selected>FAIL 46</option>
-<option selected>FAIL 47</option>
-<option selected>FAIL 48</option>
-<option selected>FAIL 49</option>
-<option selected>FAIL 50</option>
-<option selected>FAIL 51</option>
-<option selected>FAIL 52</option>
-<option selected>FAIL 53</option>
-<option selected>FAIL 54</option>
-<option selected>FAIL 55</option>
-<option selected>FAIL 56</option>
-<option selected>FAIL 57</option>
-<option selected>FAIL 58</option>
-<option selected>FAIL 59</option>
-<option selected>FAIL 60</option>
-<option selected>PASS</option>
-</select>
-
-<hr>
-
-<select id="select9">
-<option selected>FAIL 1</option>
-<option selected>FAIL 2</option>
-<option selected>FAIL 3</option>
-<option selected>FAIL 4</option>
-<option selected>FAIL 5</option>
-<option selected>FAIL 6</option>
-<option selected>FAIL 7</option>
-<option selected>FAIL 8</option>
-<option selected>FAIL 9</option>
-<option selected>FAIL 10</option>
-<option selected>FAIL 11</option>
-<option selected>FAIL 12</option>
-<option selected>FAIL 13</option>
-<option selected>FAIL 14</option>
-<option selected>FAIL 15</option>
-<option selected>FAIL 16</option>
-<option selected>FAIL 17</option>
-<option selected>FAIL 18</option>
-<option selected>FAIL 19</option>
-<option selected>FAIL 20</option>
-<option selected>FAIL 21</option>
-<option selected>FAIL 22</option>
-<option selected>FAIL 23</option>
-<option selected>FAIL 24</option>
-<option selected>FAIL 25</option>
-<option selected>FAIL 26</option>
-<option selected>FAIL 27</option>
-<option selected>FAIL 28</option>
-<option selected>FAIL 29</option>
-<option selected>FAIL 30</option>
-<option selected>FAIL 31</option>
-<option selected>FAIL 32</option>
-<option selected>FAIL 33</option>
-<option selected>FAIL 34</option>
-<option selected>FAIL 35</option>
-<option selected>FAIL 36</option>
-<option selected>FAIL 37</option>
-<option selected>FAIL 38</option>
-<option selected>FAIL 39</option>
-<option selected>FAIL 40</option>
-<option selected>FAIL 41</option>
-<option selected>FAIL 42</option>
-<option selected>FAIL 43</option>
-<option selected>FAIL 44</option>
-<option selected>FAIL 45</option>
-<option selected>FAIL 46</option>
-<option selected>FAIL 47</option>
-<option selected>FAIL 48</option>
-<option selected>FAIL 49</option>
-<option selected>FAIL 50</option>
-<option selected>FAIL 51</option>
-<option selected>FAIL 52</option>
-<option selected>FAIL 53</option>
-<option selected>FAIL 54</option>
-<option selected>FAIL 55</option>
-<option selected>FAIL 56</option>
-<option selected>FAIL 57</option>
-<option selected>FAIL 58</option>
-<option selected>FAIL 59</option>
-<option selected>FAIL 60</option>
-<option selected>PASS</option>
-</select>
-
-<hr>
-
-<select id="select10">
-<option selected>PASS</option>
-<option selected>FAIL 1</option>
-<option selected>FAIL 2</option>
-<option selected>FAIL 3</option>
-<option selected>FAIL 4</option>
-<option selected>FAIL 5</option>
-<option selected>FAIL 6</option>
-<option selected>FAIL 7</option>
-<option selected>FAIL 8</option>
-<option selected>FAIL 9</option>
-<option selected>FAIL 10</option>
-<option selected>FAIL 11</option>
-<option selected>FAIL 12</option>
-<option selected>FAIL 13</option>
-<option selected>FAIL 14</option>
-<option selected>FAIL 15</option>
-<option selected>FAIL 16</option>
-<option selected>FAIL 17</option>
-<option selected>FAIL 18</option>
-<option selected>FAIL 19</option>
-<option selected>FAIL 20</option>
-<option selected>FAIL 21</option>
-<option selected>FAIL 22</option>
-<option selected>FAIL 23</option>
-<option selected>FAIL 24</option>
-<option selected>FAIL 25</option>
-<option selected>FAIL 26</option>
-<option selected>FAIL 27</option>
-<option selected>FAIL 28</option>
-<option selected>FAIL 29</option>
-<option selected>FAIL 30</option>
-<option selected>FAIL 31</option>
-<option selected>FAIL 32</option>
-<option selected>FAIL 33</option>
-<option selected>FAIL 34</option>
-<option selected>FAIL 35</option>
-<option selected>FAIL 36</option>
-<option selected>FAIL 37</option>
-<option selected>FAIL 38</option>
-<option selected>FAIL 39</option>
-<option selected>FAIL 40</option>
-<option selected>FAIL 41</option>
-<option selected>FAIL 42</option>
-<option selected>FAIL 43</option>
-<option selected>FAIL 44</option>
-<option selected>FAIL 45</option>
-<option selected>FAIL 46</option>
-<option selected>FAIL 47</option>
-<option selected>FAIL 48</option>
-<option selected>FAIL 49</option>
-<option selected>FAIL 50</option>
-<option selected>FAIL 51</option>
-<option selected>FAIL 52</option>
-<option selected>FAIL 53</option>
-<option selected>FAIL 54</option>
-<option selected>FAIL 55</option>
-<option selected>FAIL 56</option>
-<option selected>FAIL 57</option>
-<option selected>FAIL 58</option>
-<option selected>FAIL 59</option>
-<option selected>FAIL 60</option>
-</select>
-
-<hr>
-
-<select style="height: 20px; font-size:40px">
-  <option>Test</option>
-</select>
-
-<hr>
-
-<select style="height: 70px; font-size:40px">
-  <option>Test</option>
-</select>
-
-<script>
- var o = document.getElementById("select9").getElementsByTagName('option');
- for (i=0; o[i]; ++i) {
-    o[i].selected='selected';
-    x = document.body.offsetHeight;
- }
-</script>
-
-<script>
- var o = document.getElementById("select10").getElementsByTagName('option');
- for (i=o.length-1; o[i]; --i) {
-    o[i].selected='selected';
-    x = document.body.offsetHeight;
- }
-</script>
-
-
-
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/select_disabled.html b/layout/html/tests/formctls/base/select_disabled.html
deleted file mode 100644
index 7a13388651e1..000000000000
--- a/layout/html/tests/formctls/base/select_disabled.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Select Tests: Disabled</TITLE>
-<SCRIPT>
-function selectDisabled1(control) {
-	for(i=0;i<control.options.length;i++) {
-		if(control.options[i].disabled) {
-			control.selectedIndex = i;
-		}
-	}
-}
-
-function selectDisabled2(control) {
-	for(i=0;i<control.options.length;i++) {
-		if(control.options[i].disabled) {
-			control.options[i].selected = true;
-		}
-	}
-}
-</SCRIPT>
-</HEAD>
-<BODY>
-
-<H2>Select Tests: Disabled</H2>
-<TABLE BORDER=1>
-<TR>
-<TH>Init</TH>
-<TD>
-<B>Steps:</B> Come to this page with caching off.<BR>
-<B>Verify:</B> Verify that the last two selects have "2" and nothing selected, respectively.
-</TD>
-<TR>
-<TH>Reset</TH>
-<TD>
-<B>Steps:</B> Change values and hit the reset button.<BR>
-<B>Verify:</B> That everything is the same as after Init.
-</TD>
-</TR>
-<TR>
-<TH>Normal Click</TH>
-<TD>
-<B>Steps:</B> Click and CTRL+Click on disabled options in all selects.<BR>
-<B>Verify:</B> That disabled ones don't get changed and non-disabled ones do.
-<I>Note:</I> For all these tests, note that the second optgroup is disabled and
-consequently none of its options should be selectable.
-</TD>
-</TR>
-<TR>
-<TH>Shift Click</TH>
-<TD>
-<B>Steps:</B> click 2 and SHIFT+click 9.<BR>
-<B>Verify:</B> That 3, 4 and 8 are not selected but that 2, 5-7 and 9 are.
-</TD>
-</TR>
-<TR>
-<TH>Drag</TH>
-<TD>
-<B>Steps:</B> Drag across the options.<BR>
-<B>Verify:</B> That it works like a normal drag except disabled options are not selected.
-</TD>
-</TR>
-<TR>
-<TH>Keyboard</TH>
-<TD>
-<B>Steps:</B> Use up, down, left, right, home, end, and SHIFT+these keys.<BR>
-<B>Verify:</B> That disabled ones are never selected but the next available non-disabled ones are.
-</TD>
-</TR>
-<TR>
-<TH>JavaScript Set Disabled</TH>
-<TD>
-<B>Steps:</B> Hit the JavaScript buttons.<BR>
-<B>Verify:</B> That all disabled buttons (and only disabled buttons) are selected.  (You have to hit Reset in between trying 1 and 2 for a particular control.)  For single selects only the last disabled one will be selected (11).  Ensure that the second optgroup in the multiple optgroup test has only disabled ones selected.
-</TD>
-</TR>
-<TR>
-<TH>Option Display</TH>
-<TD>
-<B>Steps:</B> Come to this page.<BR>
-<B>Verify:</B> That the disabled options <B>(currently)</B> look the <I>same</I> as other options.
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-
-<FORM NAME=mainform>
-
-<INPUT TYPE=reset><BR><BR>
-
-<TABLE BORDER=1>
-<TR>
-<TD VALIGN=top>
-<H3>1, 3, 4, 8, 10, 11 disabled</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah1)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah1)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah1 MULTIPLE SIZE=11>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>Select Disabled:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah2)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah2)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah2 MULTIPLE SIZE=11 DISABLED>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>All options disabled</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah3)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah3)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah3 MULTIPLE SIZE=11>
-<OPTION disabled>1
-<OPTION disabled>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION disabled>5
-<OPTION disabled>6
-<OPTION disabled>7
-<OPTION disabled>8
-<OPTION disabled>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<H3>Single Select With Size:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah4)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah4)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah4 SIZE=11>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>Dropdown With Disabled At Beginning:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah5)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah5)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah5>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>Dropdown With All Disabled:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah6)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah6)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah6>
-<OPTION disabled>1
-<OPTION disabled>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION disabled>5
-<OPTION disabled>6
-<OPTION disabled>7
-<OPTION disabled>8
-<OPTION disabled>9
-<OPTION disabled>10
-<OPTION disabled>11
-</SELECT>
-</TD>
-</TR>
-
-<TR>
-<TD VALIGN=top>
-<H3>Multiple Select With Optgroup:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah7)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah7)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah7 MULTIPLE SIZE=11>
-<OPTGROUP LABEL=enabled>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-</OPTGROUP>
-<OPTGROUP disabled LABEL=disabled>
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-</OPTGROUP>
-<OPTION disabled>11
-</SELECT>
-</TD>
-<TD VALIGN=top>
-<H3>Single Select With Optgroup:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah8)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah8)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah8 SIZE=11>
-<OPTGROUP LABEL=enabled>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-</OPTGROUP>
-<OPTGROUP disabled LABEL=disabled>
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-</OPTGROUP>
-<OPTION disabled>11
-</SELECT>
-</TD>
-<TD VALIGN=top>
-<H3>Dropdown With Optgroup:</H3>
-<INPUT TYPE=button onClick="selectDisabled1(document.mainform.blah9)" VALUE="JS: .selectedIndex"><BR>
-<INPUT TYPE=button onClick="selectDisabled2(document.mainform.blah9)" VALUE="JS: option.selected"><BR>
-<SELECT NAME=blah9>
-<OPTGROUP LABEL=enabled>
-<OPTION disabled>1
-<OPTION>2
-<OPTION disabled>3
-<OPTION disabled>4
-<OPTION>5
-<OPTION>6
-</OPTGROUP>
-<OPTGROUP disabled LABEL=disabled>
-<OPTION>7
-<OPTION disabled>8
-<OPTION>9
-<OPTION disabled>10
-</OPTGROUP>
-<OPTION disabled>11
-</SELECT>
-</TD>
-</TR>
-</TABLE>
-
-</TABLE>
-
-</FORM>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/select_init.html b/layout/html/tests/formctls/base/select_init.html
deleted file mode 100644
index 2db21867203d..000000000000
--- a/layout/html/tests/formctls/base/select_init.html
+++ /dev/null
@@ -1,298 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Select Tests: Init</TITLE>
-<BODY>
-
-<H2>Select Tests: Init</H2>
-<TABLE BORDER=1>
-<TR>
-<TH>Init</TH>
-<TD>
-<B>Steps:</B> Come to this page with caching off.<BR>
-<B>Verify:</B> Make sure the selects are initialized properly.  The only one with multiple values in it should be the bottom right.
-</TD>
-</TR>
-<TR>
-<TH>Reset</TH>
-<TD>
-<B>Steps:</B> Change some values in every box (deselect at least one, select at least one) and hit Reset.<BR>
-<B>Verify:</B> The values should be the same as they were at Init.
-</TD>
-</TR>
-<TR>
-<TH>Restore</TH>
-<TD>
-<B>Steps:</B> Change some values in every box (as above), go to <A HREF="http://www.google.com">Google</A>, and hit Back.<BR>
-<B>Verify:</B> The values should stay at how you changed them.
-</TD>
-</TR>
-<TR>
-<TH>No Restore</TH>
-<TD>
-<B>Steps:</B> Change some values in every box (as above), and hit shift+reload.<BR>
-<B>Verify:</B> The values should be reset.
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-
-<FORM NAME=mainform>
-
-<INPUT TYPE=reset><BR><BR>
-
-<TABLE BORDER=1>
-<TR><TH></TH><TH>Nothing</TH><TH>0 values</TH><TH>1 value</TH><TH>2 values</TH><TH>optgroups</TH><TH>doc.write</TH></TR>
-<TR>
-<TD><B>Dropdown</B></TD>
-<TD>
-<SELECT NAME=blah>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah2>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah3>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah4>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah5>
-<OPTGROUP LABEL=first>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-</OPTGROUP>
-<OPTGROUP LABEL=second>
-<OPTION SELECTED>9
-<OPTION>10
-</OPTGROUP>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah6>
-<SCRIPT>
-document.write("<OPTION>1");
-</SCRIPT>
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<SCRIPT>
-document.write("<OPTGROUP><OPTION>5<OPTION>6<OPTION SELECTED>7</OPTGROUP>");
-</SCRIPT>
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD><B>Single Select</B></TD>
-<TD>
-<SELECT NAME=blah7 SIZE=5>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah8 SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah9 SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah10 SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah11 SIZE=5>
-<OPTGROUP LABEL=first>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-</OPTGROUP>
-<OPTGROUP LABEL=second>
-<OPTION SELECTED>9
-<OPTION>10
-</OPTGROUP>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah12 SIZE=5>
-<SCRIPT>
-document.write("<OPTION>1");
-</SCRIPT>
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<SCRIPT>
-document.write("<OPTGROUP><OPTION>5<OPTION>6<OPTION SELECTED>7</OPTGROUP>");
-</SCRIPT>
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-</TR>
-<TR>
-<TD><B>Multiple Select</B></TD>
-<TD>
-<SELECT NAME=blah13 MULTIPLE SIZE=5>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah14 MULTIPLE SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah15 MULTIPLE SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah16 MULTIPLE SIZE=5>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah17 MULTIPLE SIZE=5>
-<OPTGROUP LABEL=first>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION SELECTED>7
-<OPTION>8
-</OPTGROUP>
-<OPTGROUP LABEL=second>
-<OPTION SELECTED>9
-<OPTION>10
-</OPTGROUP>
-</SELECT>
-</TD>
-<TD>
-<SELECT NAME=blah18 MULTIPLE SIZE=5>
-<SCRIPT>
-document.write("<OPTION>1");
-</SCRIPT>
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<SCRIPT>
-document.write("<OPTGROUP><OPTION>5<OPTION>6<OPTION SELECTED>7</OPTGROUP>");
-</SCRIPT>
-<OPTION>8
-<OPTION SELECTED>9
-<OPTION>10
-</SELECT>
-</TD>
-</TR>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/select_js.html b/layout/html/tests/formctls/base/select_js.html
deleted file mode 100644
index 379013732b30..000000000000
--- a/layout/html/tests/formctls/base/select_js.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<title>Adding and Removing Option Elements from a Select</title>
-<script>
-  var isHidden = true;
-  var isScroll = false;
-
-  function AddContent(aDoAdd)
-  {
-    var node = document.getElementById("mySelect");
-    var first = null;//document.getElementById("first");
-    if (aDoAdd == 1) {
-	    var notworks = false;
-	    var option;
-	    if (notworks) {
-        option = new HTMLOptionElement("Three", 3);
-        //option.label = "Three";
-        //option.value = "3";
-      } else {
-        option = new Option("Three", 3);
-	    }
-      node.add(option, first);
-    } else {
-      node.remove(0);
-    }
-  }
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<form>
-This is used to test adding and removing option elements from a select as a combobox.<br><br>
-<select id=mySelect size=1>
-<option id="first"> Two</option>
-</select>
-<input type=button id="button" value="Add Content" onclick="AddContent(1)">
-<input type=button id="button2" value="Remove Content" onclick="AddContent(0)">
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/base/select_jsadd.html b/layout/html/tests/formctls/base/select_jsadd.html
deleted file mode 100644
index cad4e34d5fa1..000000000000
--- a/layout/html/tests/formctls/base/select_jsadd.html
+++ /dev/null
@@ -1,352 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Select Tests: JavaScript Add/Remove</TITLE>
-<SCRIPT>
-var selNum = 0;
-
-function make_new(sel) {
-	var retval = document.createElement("OPTION");
-	if(document.mainform.addSelected.checked) {
-		retval.setAttribute("SELECTED", true);
-	}
-	retval.text = "new" + selNum;
-	retval.value = "new" + selNum;
-	selNum++;
-	return retval;
-}
-function addOptGroup(sel) {
-	var optgroup = document.createElement("OPTGROUP");
-	optgroup.label = "aGroup";
-	optgroup.appendChild(make_new(sel));
-	optgroup.appendChild(make_new(sel));
-	sel.insertBefore(optgroup, sel.options[1]);
-}
-function addOptGroup2(sel) {
-	var optgroup = document.createElement("OPTGROUP");
-	optgroup.label = "aGroup";
-	sel.insertBefore(optgroup, sel.options[1]);
-	optgroup.appendChild(make_new(sel));
-	optgroup.appendChild(make_new(sel));
-}
-function add1(sel) {
-	var elem = make_new(sel);
-	if(sel.length > 0) {
-		sel.add(elem, sel.options[0]);
-	} else {
-		sel.add(elem, null);
-	}
-}
-function add2(sel) {
-	var elem = make_new(sel);
-	if(sel.length > 1) {
-		sel.add(elem, sel.options[1]);
-	} else {
-		sel.add(elem, null);
-	}
-}
-function add3(sel) {
-	var elem = make_new(sel);
-	sel.add(elem, null);
-}
-function add4(sel) {
-	var elem = make_new(sel);
-	if(sel.length > 0) {
-		sel.insertBefore(elem, sel.options[0]);
-	} else {
-		sel.appendChild(elem);
-	}
-}
-function add5(sel) {
-	var elem = make_new(sel);
-	if(sel.length > 1) {
-		sel.replaceChild(elem, sel.options[1]);
-	}
-}
-function add6(sel) {
-	var elem = make_new(sel);
-	sel.appendChild(elem);
-}
-
-function remove1(sel) {
-	if(sel.length > 0) {
-		sel.remove(0);
-	}
-}
-function remove2(sel) {
-	if(sel.length > 1) {
-		sel.remove(1);
-	}
-}
-function remove3(sel) {
-	if(sel.length > 0) {
-		sel.remove(sel.length - 1);
-	}
-}
-function remove4(sel) {
-	if(sel.length > 0) {
-		sel.removeChild(sel.options[0]);
-	}
-}
-function setInner(sel) {
-	var newOne = "new" + selNum;
-	selNum++;
-	var newTwo = "new" + selNum;
-	selNum++;
-	sel.innerHTML = "<OPTION VALUE='" + newOne + "'>" + newOne + "</OPTION>"
-	+ "<OPTION VALUE='" + newTwo + "'>" + newTwo + "</OPTION>";
-}
-function showValues(sel) {
-	var myStr = "";
-	var firstTime = true;
-	for(var i=0;i<sel.length;i++) {
-		if(!sel.options[i].selected) {
-			continue;
-		}
-		if(firstTime) {
-			firstTime = false;
-		} else {
-			myStr += ", ";
-		}
-		myStr += sel.options[i].value;
-	}
-	alert(sel.name + ": " + myStr);
-}
-function showSelectedIndex(sel) {
-	alert(sel.selectedIndex);
-}
-
-</SCRIPT>
-</HEAD>
-<BODY>
-
-<H2>Select Tests: JavaScript Add/Remove</H2>
-<TABLE BORDER=1>
-<TR>
-<TH>Ignore Me</TH>
-<TD>
-<B>Steps:</B> Test instructions not here yet.<BR>
-<B>Verify:</B> Use your imagination.
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-
-<FORM NAME=mainform>
-
-<INPUT TYPE=checkbox NAME=addSelected SELECTED> Add options as selected<BR>
-<INPUT TYPE=reset><BR><BR>
-
-<H2>Add/Remove</H2>
-<TABLE BORDER=1
-<TR>
-<TH></TH><TH>Nothing To Start</TH><TH>Nonselected To Start</TH><TH>Selected To Start</TH>
-</TR>
-<TR>
-<TH>Multiple</TH>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah MULTIPLE SIZE=10>
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah2)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah2)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah2)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah2)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah2)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah2)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah2)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah2)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah2)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah2)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah2)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah2)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah2)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah2)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah2)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah2 MULTIPLE SIZE=10>
-<OPTION VALUE=1>1
-<OPTION VALUE=2>2
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah3)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah3)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah3)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah3)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah3)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah3)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah3)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah3)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah3)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah3)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah3)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah3)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah3)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah3)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah3)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah3 MULTIPLE SIZE=10>
-<OPTION VALUE=1>1
-<OPTION VALUE=2 SELECTED>2
-</SELECT>
-</TD>
-</TR>
-
-<TR>
-<TH>Single+Size</TH>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah4)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah4)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah4)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah4)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah4)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah4)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah4)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah4)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah4)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah4)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah4)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah4)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah4)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah4)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah4)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah4 SIZE=10>
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah5)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah5)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah5)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah5)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah5)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah5)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah5)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah5)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah5)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah5)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah5)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah5)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah5)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah5)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah5)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah5 SIZE=10>
-<OPTION VALUE=1>1
-<OPTION VALUE=2>2
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah6)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah6)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah6)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah6)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah6)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah6)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah6)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah6)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah6)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah6)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah6)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah6)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah6)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah6)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah6)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah6 SIZE=10>
-<OPTION VALUE=1>1
-<OPTION VALUE=2 SELECTED>2
-</SELECT>
-</TD>
-</TR>
-
-<TR>
-<TH>Dropdown</TH>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah7)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah7)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah7)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah7)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah7)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah7)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah7)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah7)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah7)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah7)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah7)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah7)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah7)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah7)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah7)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah7>
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah8)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah8)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah8)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah8)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah8)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah8)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah8)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah8)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah8)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah8)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah8)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah8)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah8)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah8)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah8)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah8>
-<OPTION VALUE=1>1
-<OPTION VALUE=2>2
-</SELECT>
-</TD>
-<TD>
-<INPUT TYPE=button onClick="add1(document.mainform.blah9)" VALUE="add(beginning)">
-<INPUT TYPE=button onClick="add2(document.mainform.blah9)" VALUE="add(second)">
-<INPUT TYPE=button onClick="add3(document.mainform.blah9)" VALUE="add(end)"><BR>
-<INPUT TYPE=button onClick="add4(document.mainform.blah9)" VALUE="insertBefore(beginning)">
-<INPUT TYPE=button onClick="add5(document.mainform.blah9)" VALUE="replaceChild(second)">
-<INPUT TYPE=button onClick="add6(document.mainform.blah9)" VALUE="appendChild()"><BR>
-<INPUT TYPE=button onClick="remove1(document.mainform.blah9)" VALUE="remove(beginning)">
-<INPUT TYPE=button onClick="remove2(document.mainform.blah9)" VALUE="remove(second)">
-<INPUT TYPE=button onClick="remove3(document.mainform.blah9)" VALUE="remove(end)"><BR>
-<INPUT TYPE=button onClick="remove4(document.mainform.blah9)" VALUE="removeChild(beginning)">
-<INPUT TYPE=button onClick="setInner(document.mainform.blah9)" VALUE="innerHTML = "><BR>
-<INPUT TYPE=button onClick="addOptGroup(document.mainform.blah9)" VALUE="add(optgroup)">
-<INPUT TYPE=button onClick="addOptGroup2(document.mainform.blah9)" VALUE="add(optgroup) 2"><BR>
-<INPUT TYPE=button onClick="showValues(document.mainform.blah9)" VALUE="Show Values">
-<INPUT TYPE=button onClick="showSelectedIndex(document.mainform.blah9)" VALUE="Show Selected Index"><BR><BR>
-
-<SELECT NAME=blah9>
-<OPTION VALUE=1>1
-<OPTION VALUE=2 SELECTED>2
-</SELECT>
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/select_listbox_sizing.html b/layout/html/tests/formctls/base/select_listbox_sizing.html
deleted file mode 100644
index a49471290962..000000000000
--- a/layout/html/tests/formctls/base/select_listbox_sizing.html
+++ /dev/null
@@ -1,558 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-
-select { font-size: 20px }
-
-div#test2 select {
-  width: 100px;
-}
-
-div#test3 select {
-  height: 75px;
-}
-
-div#test4 select#subtest1 option + option + option {
-  font-size: 40px;
-}
-
-div#test4 select#subtest2 option {
-  font-size: 40px;
-}
-
-div#test4 select#subtest2 option + option {
-  font-size: inherit;
-}
-
-div#test5 select {
-  max-height: 75px;
-}
-
-div#test6 select {
-  min-height: 75px;
-}
-
-div#test7 select {
-  max-width: 100px;
-}
-
-div#test8 select {
-  min-width: 500px;
-}
-
-</style>
-</head>
-<body>
-<h1>Listbox Tests</h1>
-<form>
-<div id="test1">
-<h2>Various sizes, auto width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test2">
-<h2>Various sizes, fixed width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test3">
-<h2>Various sizes, auto width, fixed height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test4">
-<h2>Options with different font sizes</h2>
-<select size="2" id="subtest1">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2" id="subtest2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-</div>
-
-<div id="test5">
-<h2>Various sizes, auto width, fixed max-height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test6">
-<h2>Various sizes, auto width, fixed min-height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test7">
-<h2>Various sizes, fixed max-width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test8">
-<h2>Various sizes, fixed min-width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test9">
-<h2>Dynamic changes</h2>
-<select size="2" id="subtest3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<script>
- // Flush layout
- var foo = document.body.offsetWidth;
-
- var opt = document.getElementById("subtest3").options[4];
- opt.style.fontSize = "40px";
-</script>
-
-<select size="2" id="subtest4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<script>
- // Flush layout
- var foo = document.body.offsetWidth;
-
- document.getElementById("subtest4").size = 3;
-</script>
-</div>
-
-<div id="test10">
-<h2>Selected options</h2>
-<select size="2" id="subtest5">
-<option>one</option>
-<option>two two</option>
-<option selected="selected">three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2" id="subtest6">
-<option>one</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>two two</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option selected="selected">three three three</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>four four four four</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>five five five five five</option>
-</select>
-
-<select style="width: 100%" size="3">
-<option selected>one</option>
-</select>
-
-</div>
-
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/select_listbox_sizing_quirks.html b/layout/html/tests/formctls/base/select_listbox_sizing_quirks.html
deleted file mode 100644
index dc406e171ceb..000000000000
--- a/layout/html/tests/formctls/base/select_listbox_sizing_quirks.html
+++ /dev/null
@@ -1,557 +0,0 @@
-<html>
-<head>
-<style>
-
-select { font-size: 20px }
-
-div#test2 select {
-  width: 100px;
-}
-
-div#test3 select {
-  height: 75px;
-}
-
-div#test4 select#subtest1 option + option + option {
-  font-size: 40px;
-}
-
-div#test4 select#subtest2 option {
-  font-size: 40px;
-}
-
-div#test4 select#subtest2 option + option {
-  font-size: inherit;
-}
-
-div#test5 select {
-  max-height: 75px;
-}
-
-div#test6 select {
-  min-height: 75px;
-}
-
-div#test7 select {
-  max-width: 100px;
-}
-
-div#test8 select {
-  min-width: 500px;
-}
-
-</style>
-</head>
-<body>
-<h1>Listbox Tests</h1>
-<form>
-<div id="test1">
-<h2>Various sizes, auto width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test2">
-<h2>Various sizes, fixed width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test3">
-<h2>Various sizes, auto width, fixed height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test4">
-<h2>Options with different font sizes</h2>
-<select size="2" id="subtest1">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2" id="subtest2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-</div>
-
-<div id="test5">
-<h2>Various sizes, auto width, fixed max-height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test6">
-<h2>Various sizes, auto width, fixed min-height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test7">
-<h2>Various sizes, fixed max-width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test8">
-<h2>Various sizes, fixed min-width, auto height:</h2>
-<select size="0" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="1" multiple="multiple">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="5">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="6">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-</div>
-
-<div id="test9">
-<h2>Dynamic changes</h2>
-<select size="2" id="subtest3">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<script>
- // Flush layout
- var foo = document.body.offsetWidth;
-
- var opt = document.getElementById("subtest3").options[4];
- opt.style.fontSize = "40px";
-</script>
-
-<select size="2" id="subtest4">
-<option>one</option>
-<option>two two</option>
-<option>three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<script>
- // Flush layout
- var foo = document.body.offsetWidth;
-
- document.getElementById("subtest4").size = 3;
-</script>
-</div>
-
-<div id="test10">
-<h2>Selected options</h2>
-<select size="2" id="subtest5">
-<option>one</option>
-<option>two two</option>
-<option selected="selected">three three three</option>
-<option>four four four four</option>
-<option>five five five five five</option>
-</select>
-
-<select size="2" id="subtest6">
-<option>one</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>two two</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option selected="selected">three three three</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>four four four four</option>
-<script>
-  // Flush layout
-  var foo = document.body.offsetWidth;
-</script>
-<option>five five five five five</option>
-</select>
-
-<select style="width: 100%" size="3">
-<option selected>one</option>
-</select>
-
-</div>
-
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/select_onchange.html b/layout/html/tests/formctls/base/select_onchange.html
deleted file mode 100644
index 40624edff517..000000000000
--- a/layout/html/tests/formctls/base/select_onchange.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Select Tests: OnChange</TITLE>
-<BODY>
-
-<H2>Select Tests: OnChange</H2>
-<TABLE BORDER=1>
-<TR>
-<TH>JavaScript</TH>
-<TD>
-<B>Steps:</B> Click each of the buttons in turn.<BR>
-<B>Verify:</B> Make sure an alert does not pop up.
-</TD>
-<TR>
-<TH>Click, Keyboard</TH>
-<TD>
-<B>Steps:</B> Click, hit left/right/up/down/home/end and use SHIFT and CTRL in combination.<BR>
-<B>Verify:</B> That an alert pops up each time you 
-</TD>
-</TR>
-<TR>
-<TH>Drag</TH>
-<TD>
-<B>Steps:</B> Drag the mouse across multiple options.<BR>
-<B>Verify:</B> That an alert pops up only when you finish dragging.
-</TD>
-</TR>
-<TR>
-<TH>Cancel Dropdown</TH>
-<TD>
-<B>Steps:</B> Click the dropdown, and then press ESC or click outside the combobox.<BR>
-<B>Verify:</B> onChange should not fire.
-</TD>
-</TR>
-<TR>
-<TH>Reset</TH>
-<TD>
-<B>Steps:</B> Change values in various selects, and hit Reset.<BR>
-<B>Verify:</B> onChange should not fire.
-</TD>
-</TR>
-</TABLE>
-
-<BR>
-
-<FORM NAME=mainform>
-
-<INPUT TYPE=button onClick="document.mainform.blah.value = 4" VALUE="Set select.value = 4"><BR>
-<INPUT TYPE=button onClick="document.mainform.blah.selectedIndex = 5" VALUE="Set select.selectedIndex = 5"><BR>
-<INPUT TYPE=button onClick="document.mainform.blah.options[6].selected = true" VALUE="Set options[6].selected"><BR>
-<INPUT TYPE=reset><BR><BR>
-
-<TABLE BORDER=1
-<TR>
-<TD VALIGN=top>
-<H3>Multiple select</H3>
-<SELECT NAME=blah MULTIPLE SIZE=10 onChange="alert('Multiselect changed to ' + document.mainform.blah.value)">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION VALUE=4>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>Single select</H3>
-<SELECT NAME=blah2 SIZE=10 onChange="alert('Single select changed to ' + document.mainform.blah2.value)">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-
-<TD VALIGN=top>
-<H3>Dropdown</H3>
-<SELECT NAME=blah3 onChange="alert('Dropdown changed to ' + document.mainform.blah3.value)">
-<OPTION>1
-<OPTION SELECTED>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-</SELECT>
-</TD>
-</TR>
-</TABLE>
-
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/base/select_small_sizes.html b/layout/html/tests/formctls/base/select_small_sizes.html
deleted file mode 100644
index b8743dd3619b..000000000000
--- a/layout/html/tests/formctls/base/select_small_sizes.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-0px: <select style="width: 0">
-<option>aaa</option>
-</select>
-
-<hr>
-
-1px: <select style="width: 1px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-2px: <select style="width: 2px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-3px: <select style="width: 3px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-4px: <select style="width: 4px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-5px: <select style="width: 5px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-6px: <select style="width: 6px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-7px: <select style="width: 7px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-10px: <select style="width: 10px">
-<option>aaa</option>
-</select>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/select_small_sizes2.html b/layout/html/tests/formctls/base/select_small_sizes2.html
deleted file mode 100644
index c43d725f3e7b..000000000000
--- a/layout/html/tests/formctls/base/select_small_sizes2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-10px: <select style="width: 10px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-17px: <select style="width: 17px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-18px: <select style="width: 18px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-19px: <select style="width: 19px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-20px: <select style="width: 20px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-21px: <select style="width: 21px">
-<option>aaa</option>
-</select>
-
-<hr>
-
-22px: <select style="width: 22px">
-<option>aaa</option>
-</select>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/base/select_strict.html b/layout/html/tests/formctls/base/select_strict.html
deleted file mode 100644
index 0c035257c44e..000000000000
--- a/layout/html/tests/formctls/base/select_strict.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing input file strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><select><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</p>
-<p>intrinsic width long nonbreakable text</p>
-<p><select>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx<OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</p>
-<p>fixed width</p>
-<p><select class="fixed"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><select><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><select><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><select class="fixed"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><select class="fixed"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><select class="pct"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><select class="pct"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><select class="pct"><OPTION selected label="none" value="none">None</OPTION>
-     <OPTGROUP label="PortMaster 3">
-       <OPTION label="3.7.1" value="pm3_3.7.1">PortMaster 3 with ComOS 3.7.1</OPTION>
-       <OPTION label="3.7" value="pm3_3.7">PortMaster 3 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm3_3.5">PortMaster 3 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="PortMaster 2">
-       <OPTION label="3.7" value="pm2_3.7">PortMaster 2 with ComOS 3.7</OPTION>
-       <OPTION label="3.5" value="pm2_3.5">PortMaster 2 with ComOS 3.5</OPTION>
-     </OPTGROUP>
-     <OPTGROUP label="IRX">
-       <OPTION label="3.7R" value="IRX_3.7R">IRX with ComOS 3.7R</OPTION>
-       <OPTION label="3.5R" value="IRX_3.5R">IRX with ComOS 3.5R</OPTION>
-     </OPTGROUP>
- </SELECT>
-</td></tr></table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/selectsize3_js.html b/layout/html/tests/formctls/base/selectsize3_js.html
deleted file mode 100644
index ad457ebc64b7..000000000000
--- a/layout/html/tests/formctls/base/selectsize3_js.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<title>Adding and Removing Option Elements from a Select</title>
-<script>
-  var isHidden = true;
-  var isScroll = false;
-
-  function AddContent(aDoAdd)
-  {
-    var node = document.getElementById("mySelect");
-    var first = null;//document.getElementById("first");
-    if (aDoAdd == 1) {
-	    var notworks = false;
-	    var option;
-	    if (notworks) {
-        option = new HTMLOptionElement("Three", 3);
-        //option.label = "Three";
-        //option.value = "3";
-      } else {
-        option = new Option("Three", 3);
-	    }
-      node.add(option, first);
-    } else {
-      node.remove(0);
-    }
-  }
-</script>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<form>
-This is used to test adding and removing option elements from a select as a combobox.<br><br>
-<select id=mySelect size=3>
-<option id="first"> Two</option>
-</select>
-<input type=button id="button" value="Add Content" onclick="AddContent(1)">
-<input type=button id="button2" value="Remove Content" onclick="AddContent(0)">
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/base/testarea_wrap.html b/layout/html/tests/formctls/base/testarea_wrap.html
deleted file mode 100644
index 6dfcc49aadfb..000000000000
--- a/layout/html/tests/formctls/base/testarea_wrap.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<body bgcolor="#C0D0F0">
-<form>
-<b>Soft</b><br>
-<textarea wrap="soft" cols=30 rows=3>This is some text.</textarea>
-<br>
-<br>
-<b>Hard</b><br>
-<textarea wrap="hard" cols=30 rows=3>This is some text.</textarea>
-<br>
-<br>
-<b>Off</b><br>
-<textarea wrap="off" cols=30 rows=3>This is some text.</textarea>
-<br>
-<br>
-<b>No wrap property</b><br>
-<textarea cols=30 rows=3>This is some text.</textarea>
-<br>
-<br>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/base/textarea_sizes.html b/layout/html/tests/formctls/base/textarea_sizes.html
deleted file mode 100644
index f372c94d856a..000000000000
--- a/layout/html/tests/formctls/base/textarea_sizes.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<body bgcolor="#C0D0F0">
-<form>
-<font size=1><textarea>This is some text.</textarea>Size=1</font><br>
-<font size=2><textarea>This is some text.</textarea>Size=2</font><br>
-<font size=3><textarea>This is some text.</textarea>Size=3</font><br>
-<font size=4><textarea>This is some text.</textarea>Size=4</font><br>
-<font size=5><textarea>This is some text.</textarea>Size=5</font><br>
-<font size=6><textarea>This is some text.</textarea>Size=6</font><br>
-<font size=7><textarea>This is some text.</textarea>Size=7</font><br>
-<hr>
-<h3>Sans-serif</h3>
-<font size=1 face="sans-serif"><textarea>This is some text.</textarea>Size=1</font><br>
-<font size=2 face="sans-serif"><textarea>This is some text.</textarea>Size=2</font><br>
-<font size=3 face="sans-serif"><textarea>This is some text.</textarea>Size=3</font><br>
-<font size=4 face="sans-serif"><textarea>This is some text.</textarea>Size=4</font><br>
-<font size=5 face="sans-serif"><textarea>This is some text.</textarea>Size=5</font><br>
-<font size=6 face="sans-serif"><textarea>This is some text.</textarea>Size=6</font><br>
-<font size=7 face="sans-serif"><textarea>This is some text.</textarea>Size=7</font><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/base/textarea_strict.html b/layout/html/tests/formctls/base/textarea_strict.html
deleted file mode 100644
index c207316c42d5..000000000000
--- a/layout/html/tests/formctls/base/textarea_strict.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-
-<title>form sizing textarea strict mode</title>
-<style type="text/css">
- .fixed {width:50px}
-.tight {width:20px}
-div {border:blue 1px solid}
-.pct {width:10%}
-.cellpct{width:100%}
-.wide {width:200px}
-</style>
-</head>
-<p>intrinsic width:</p>
-<p><textarea></textarea></p>
-<p>intrinsic width long nonbreakable text</p>
-<p><textarea>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</textarea></p>
-<p>fixed width</p>
-<p><textarea class="fixed"></textarea></p>
-<p>intrinsic width inside table</p>
-<table border><tr><td><textarea></textarea></td></tr></table>
-<p>intrinsic width inside tight table cell</p>
-<table border><tr><td class="tight"><textarea></textarea></td></tr></table>
-<p>fixed width inside table</p>
-<table border><tr><td><textarea class="fixed"></textarea></td></tr></table>
-<p>fixed width inside smaller table cell</p>
-<table border><tr><td class="tight"><textarea class="fixed"></textarea></td></tr></table>
-<p>pctwidth inside auto table</p>
-<table border><tr><td><textarea class="pct"></textarea></td></tr></table>
-<p>pct width inside fixed width table cell</p>
-<table border><tr><td class="tight"><textarea class="pct"></textarea></td></tr></table>
-<p>pct width inside pct width table cell</p>
-<table border class="wide"><tr><td class="cellpct"><textarea class="pct"></textarea></td></tr></table>
-
-
-
-<a href="button_button_strict.html">previous:&nbsp;&nbsp;button type:button</a>&nbsp;&nbsp;&nbsp;<a href="fieldset_strict.html">next:&nbsp;&nbsp;fieldset</a>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/formctls/base/textarea_tests.html b/layout/html/tests/formctls/base/textarea_tests.html
deleted file mode 100644
index ee5f3bcbae3a..000000000000
--- a/layout/html/tests/formctls/base/textarea_tests.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<body bgcolor="#C0D0F0">
-<form>
-Default Textarea<br>
-<textarea></textarea>
-<br>
-<br>
-Default Textarea<br>
-<textarea>123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-1 Rows Default Cols<br>
-<textarea rows=1>123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-2 Rows Default Cols<br>
-<textarea rows=2>123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-3 Rows Default Cols<br>
-<textarea rows=3>123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-50 Cols Default Rows<br>
-<textarea cols=50>123456789 123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-3 Rows 50 Cols<br>
-<textarea rows=3 cols=50>123456789 123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-style="height:50px;" (Default Rows & Cols)<br>
-<textarea style="height:50px;">123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-style="width:200px;" (Default Rows & Cols)<br>
-<textarea style="width:200px;">123456789 123456789 123456789 123456789 </textarea>
-<br>
-<div style="color: yellow;background-color:blue;width:200px;">This is 200px width</div>
-3 Rows style="width:200px;"<br>
-<textarea style="width:200px;">123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-50 cols style="height:50px;"<br>
-<textarea cols=50 style="height:50px;">123456789 123456789 123456789 123456789 123456789 </textarea>
-<br>
-<br>
-style="width:200px;height:200px;" (Default Rows & Cols)<br>
-<textarea style="width:200px;height:200px;">123456789 123456789 123456789 123456789 </textarea>
-<hr>
-<h3>Padding and Border Tests</h3>
-<br>
-5px solid blue<br>
-<textarea style="border:5px solid blue;"></textarea><br><br>
-padding: 5px;<br>
-<textarea style="padding: 5px;"></textarea><br><br>
-5px solid blue;padding: 5px;<br>
-<textarea style="border:5px solid blue;padding: 5px;"></textarea><br><br>
-<hr>
-Textarea in a red div tag (shows top and bottom margin)<br>
-<div style="background-color: red">
-<textarea> This is some text.</textarea>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug101122.html b/layout/html/tests/formctls/bugs/bug101122.html
deleted file mode 100644
index d36004af3116..000000000000
--- a/layout/html/tests/formctls/bugs/bug101122.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-<!--
-textarea {font-family: Times; font-size: 10pt; width: 397px;}
--->
-</style>
-</head>
-<body>
-<textarea name=message rows=12>
-1
-2
-3
-4
-5
-6
-7
-8
-9
-0
-A
-B
-C
-D
-Virginia ten, North Carolina five, South Carolina five, and Georgia three.
-</textarea>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug10410.html b/layout/html/tests/formctls/bugs/bug10410.html
deleted file mode 100644
index 0cd845959917..000000000000
--- a/layout/html/tests/formctls/bugs/bug10410.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-
-<form><table width="120"><tr><td>
-
-<font>
-<img src="http://www.google.com/images/logo.gif">
-<input type="Text">
-
-</td></tr></table></body></html>
diff --git a/layout/html/tests/formctls/bugs/bug108526.html b/layout/html/tests/formctls/bugs/bug108526.html
deleted file mode 100644
index c6db6142d118..000000000000
--- a/layout/html/tests/formctls/bugs/bug108526.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Checkbox test</title>
-   
-</head>
-<body>
-  
-<form action="dummy.cgi">  
-  <p>This should be checked <input type="checkbox" name="18895" value="1" checked="checked">
- </p>
-  <p>This should not be checked <input type="checkbox" name="108515" value="1">
- </p>
-  <p> <input type="submit" value="Submit"> <br>
- </p>
- </form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug109316.html b/layout/html/tests/formctls/bugs/bug109316.html
deleted file mode 100644
index dce97f68c77f..000000000000
--- a/layout/html/tests/formctls/bugs/bug109316.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head><title>Page</title></head>
-<body>
-
-<script type="application/x-javascript">
-
-function OKclicked(){
-    document.GUI.cases.value = "kkk" //document.GUI.choice1.value
-}
-
-</script>
-
-
-<form name="GUI" action="get">
-
-<fieldset>
-<legend>
-Questions
-</legend>
-
-<center>
-Something
-<select name="choice1">
-<option value="0">increased
-<option value="1">decreased
-<option value="2">same
-<option value="3">don't know
-</select><br>
-
-Something else
-<select name="choice2">
-<option value="0">increased
-<option value="1">decreased
-<option value="2">same
-<option value="3">don't know
-</select><br>
-
-And something else
-<select name="choice3">
-<option value="0">increased
-<option value="1">decreased
-<option value="2">same
-<option value="3">don't know
-</select><br>
-
-<br><input type="button" value="  OK  " onclick="OKclicked()"><br>
-
-</center>
-</fieldset>
-
-<h2>Cases</h2>
-
-<textarea name="cases" readonly rows=6 cols=60>
-Here you will see cases. Select "decreased", "increased" and "same" then click 
-OK.
-</textarea>
-
-</form>
-</body>
-</html>
-
-
-
diff --git a/layout/html/tests/formctls/bugs/bug109368.html b/layout/html/tests/formctls/bugs/bug109368.html
deleted file mode 100644
index 3fd6163c566c..000000000000
--- a/layout/html/tests/formctls/bugs/bug109368.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<style>
-.Bg
-{
-    BACKGROUND-COLOR: black;
-    FONT-SIZE: small
-}
-</style>
-</head>
-<body>
-<form>
-<span class=Bg>
-<select name="site">
-<option value="0">- Choose a Site -</option>
-<option value="1">Online Banking</option>
-</select>
-</span>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug113245.html b/layout/html/tests/formctls/bugs/bug113245.html
deleted file mode 100644
index 094374922b39..000000000000
--- a/layout/html/tests/formctls/bugs/bug113245.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
-<head>
-
-<!-- testcase: select_multipleselection_TABLE.html -->
-<!-- description: HTML 4.1 Form Control: Select (optgroup, option)  -->
-<!-- Author: Madhur Bhatia Date: 7/24/01 -->
-<!-- ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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 ***** -->
-<!-- Purpose: Testing the HTML Form Control - Select (optgroup, option) , to verify the control complies to the w3c standards -->
-<!-- Expected result: refer to the Test conditions in HTML Form Control matrix -->
-
-<title> HTML Form Control: Menu (select - Optgroup/Option) </title>
-</head>
-
-<body>
-
-<U>FORM WITHIN A TABLE TAG</U><BR>
-
-<table border="1" cellspacing="2" cellpadding="2">
-<form>
-<tr>
-<td>Multiple Item Selection:</td>
-<td><select name="fruits" multiple>
-	<option>banana</option>
-	<option>apple</option>
-	<option>orange</option>
-	<option>grapes</option>
-	<option>peach</option>
-	<option>guava</option>
-	</select>
-</td>
-</tr>
-<tr>
-<td>Multiple selection and size attribute &gt; 1  </td>
-<td><SELECT name="transport" size="5" multiple>
-		<OPTION selected label="none" value="none">None</OPTION>
-                <OPTGROUP label="air">
-                  <OPTION label="air1" value="aeroplane">Aeroplane</OPTION>
-                  <OPTION label="air2" value="helicopter">Helicopter</OPTION>
-                  <OPTION label="air3" value="hotairbaloon">Hot Air Baloon</OPTION>
-                </OPTGROUP>
-                <OPTGROUP label="water">
-                  <OPTION label="water1" value="ship">Ship</OPTION>
-                  <OPTION label="water2" value="submarine">Submarine</OPTION>
-                </OPTGROUP>
-                <OPTGROUP label="ground">
-                  <OPTION label="ground1" value="bus">Bus</OPTION>
-                  <OPTION label="ground2" value="car">Car</OPTION>
-                </OPTGROUP>
-	</SELECT>
-</td>
-</tr>
-</form>
-</table>
-<hr>
-<U>TABLE WITHIN A FORM TAG</U><BR>
-
-<form>
-<table border="1" cellspacing="2" cellpadding="2">
-<tr>
-<td>Multiple Item Selection:</td>
-<td><select name="fruits" multiple>
-	<option>banana</option>
-	<option>apple</option>
-	<option>orange</option>
-	<option>grapes</option>
-	<option>peach</option>
-	<option>guava</option>
-	</select>
-</td>
-</tr>
-<tr>
-<td>Multiple selection and size attribute &gt; 1  </td>
-<td><SELECT name="transport" size="5" multiple>
-		<OPTION selected label="none" value="none">None</OPTION>
-                <OPTGROUP label="air">
-                  <OPTION label="air1" value="aeroplane">Aeroplane</OPTION>
-                  <OPTION label="air2" value="helicopter">Helicopter</OPTION>
-                  <OPTION label="air3" value="hotairbaloon">Hot Air Baloon</OPTION>
-                </OPTGROUP>
-                <OPTGROUP label="water">
-                  <OPTION label="water1" value="ship">Ship</OPTION>
-                  <OPTION label="water2" value="submarine">Submarine</OPTION>
-                </OPTGROUP>
-                <OPTGROUP label="ground">
-                  <OPTION label="ground1" value="bus">Bus</OPTION>
-                  <OPTION label="ground2" value="car">Car</OPTION>
-                </OPTGROUP>
-	</SELECT>
-</td>
-</tr>
-</table>
-
-</form>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/formctls/bugs/bug117606.html b/layout/html/tests/formctls/bugs/bug117606.html
deleted file mode 100644
index 65d5bfc36c0d..000000000000
--- a/layout/html/tests/formctls/bugs/bug117606.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-	<title>Alphabet button test</title>
-</head>
-
-<body>
-<form action="">
-<input type="button" value="a">
-<input type="button" value="b">
-<input type="button" value="c">
-<input type="button" value="d">
-<input type="button" value="e">
-<input type="button" value="f">
-<input type="button" value="g">
-<input type="button" value="h">
-<input type="button" value="i">
-<input type="button" value="j">
-<input type="button" value="k">
-<input type="button" value="l">
-<input type="button" value="m">
-<input type="button" value="n">
-<input type="button" value="o">
-<input type="button" value="p">
-<input type="button" value="q">
-<input type="button" value="r">
-<input type="button" value="s">
-<input type="button" value="t">
-<input type="button" value="u">
-<input type="button" value="v">
-<input type="button" value="w">
-<input type="button" value="x">
-<input type="button" value="y">
-<input type="button" value="z">
-<input type="button" value="0">
-<input type="button" value="1">
-<input type="button" value="2">
-<input type="button" value="3">
-<input type="button" value="4">
-<input type="button" value="5">
-<input type="button" value="6">
-<input type="button" value="7">
-<input type="button" value="8">
-<input type="button" value="9">
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug138403-1.html b/layout/html/tests/formctls/bugs/bug138403-1.html
deleted file mode 100644
index bd7a162cd537..000000000000
--- a/layout/html/tests/formctls/bugs/bug138403-1.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<h1>Type = button</h1>
-
-<p><input type="button" style="text-align: left"
-          value="Left-aligned, auto width"></p>
-
-<p><input type="button" style="text-align: left;width: 75%"
-          value="Left-aligned, 75% width"></p>
-
-<p><input type="button" style="text-align: left;display: block"
-          value="Left-aligned, block display, auto width"></p>
-
-<p><input type="button" style="text-align: left;display: block;width: 75%"
-          value="Left-aligned, block display, 75% width"></p>
-
-<h1>Type = submit</h1>
-
-<p><input type="submit" style="text-align: left"
-          value="Left-aligned, auto width"></p>
-
-<p><input type="submit" style="text-align: left;width: 75%"
-          value="Left-aligned, 75% width"></p>
-
-<p><input type="submit" style="text-align: left;display: block"
-          value="Left-aligned, block display, auto width"></p>
-
-<p><input type="submit" style="text-align: left;display: block;width: 75%"
-          value="Left-aligned, block display, 75% width"></p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug138403-2.html b/layout/html/tests/formctls/bugs/bug138403-2.html
deleted file mode 100644
index 4cc089b0b378..000000000000
--- a/layout/html/tests/formctls/bugs/bug138403-2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head>
-<title>Testcase Bug 138403 -  text-align:left; for submit Button does not work</title>
-<style>
-input, button{width:300px;}
-</style>
-</head>
-<body>
-<div>text-align:left<br>
-<input value="text-align:left" style="text-align:left;" type="reset"><br>
-<input value="text-align:left" style="text-align:left;" type="submit"><br>
-<input value="text-align:left" style="text-align:left;" type="button"><br>
-<button style="text-align:left">text-align:left</button>
-</div>
-<div>text-align:right<br>
-<input value="text-align:right" style="text-align:right;" type="reset"><br>
-<input value="text-align:right" style="text-align:right;" type="submit"><br>
-<input value="text-align:right" style="text-align:right;" type="button"><br>
-<button style="text-align:right;">text-align:right</button>
-</div>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug167236-1.html b/layout/html/tests/formctls/bugs/bug167236-1.html
deleted file mode 100644
index 2cfec4e5c0af..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-1.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html><head><title>Testcase</title></head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with <input type="button" value="BuTtoNs"><button type="button">Buttttons</button> in it<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-<button type="button">Just a button<br>With text in it</button>
-</p>
-
-<p><button type="button" style="letter-spacing: 1em">Spacy text</button> <input type="button" style="letter-spacing: 1em" value="Spacy text"></p>
-
-<p><button type="button" style="letter-spacing: 1em">Spacy text</button> <input type="button" style="letter-spacing: 1em" value="Spacy text"></p>
-
-<p><input type="button"></p>
-<p><input type="reset"></p>
-<p><input type="submit"></p>
-
-<p><button type="button"></button></p>
-<p><button type="reset"></button></p>
-<p><button type="submit"></button></p>
-
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug167236-10.html b/layout/html/tests/formctls/bugs/bug167236-10.html
deleted file mode 100644
index ac9873733c14..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-10.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html401/strict.dtd">
-<html><head><title>Testcase</title></head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" value="InpuT" size="5"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" size="8"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" style="font-size: 2em" value="input" size="5"><input style="font-size: 2em" type="button" value="BuTtoN"><input style="font-size: 2em" type="submit" value="Submit"><input style="font-size: 2em" type="reset" value="reset"><input style="font-size: 2em" type="file"><select style="font-size: 2em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" style="font-size: 3em"  size="8"><input style="font-size: 3em" type="button" value="BuTtoN"><input style="font-size: 3em" type="submit" value="Submit"><input style="font-size: 3em" type="reset" value="reset"><input style="font-size: 3em" type="file"><select style="font-size: 3em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-11.html b/layout/html/tests/formctls/bugs/bug167236-11.html
deleted file mode 100644
index 8cad65600446..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-11.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html><head><title>Testcase</title></head><body onclick="document.body.style.fontSize = '150%'">
-
-Click anywhere on this page; the text size should increase.  Form
-controls should grow to accomodate it, and stay aligned correctly.
-
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" value="InpuT" size="5"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" size="8"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" style="font-size: 2em" value="input" size="5"><input style="font-size: 2em" type="button" value="BuTtoN"><input style="font-size: 2em" type="submit" value="Submit"><input style="font-size: 2em" type="reset" value="reset"><input style="font-size: 2em" type="file"><select style="font-size: 2em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" style="font-size: 3em"  size="8"><input style="font-size: 3em" type="button" value="BuTtoN"><input style="font-size: 3em" type="submit" value="Submit"><input style="font-size: 3em" type="reset" value="reset"><input style="font-size: 3em" type="file"><select style="font-size: 3em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-12.html b/layout/html/tests/formctls/bugs/bug167236-12.html
deleted file mode 100644
index e9cd1ea1d4cd..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-12.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html401/strict.dtd">
-<html><head><title>Testcase</title></head><body onclick="document.body.style.fontSize = '150%'">
-
-Click anywhere on this page; the text size should increase.  Form
-controls should grow to accomodate it, and stay aligned correctly.
-
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" value="InpuT" size="5"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" size="8"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" style="font-size: 2em" value="input" size="5"><input style="font-size: 2em" type="button" value="BuTtoN"><input style="font-size: 2em" type="submit" value="Submit"><input style="font-size: 2em" type="reset" value="reset"><input style="font-size: 2em" type="file"><select style="font-size: 2em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" style="font-size: 3em"  size="8"><input style="font-size: 3em" type="button" value="BuTtoN"><input style="font-size: 3em" type="submit" value="Submit"><input style="font-size: 3em" type="reset" value="reset"><input style="font-size: 3em" type="file"><select style="font-size: 3em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-13.html b/layout/html/tests/formctls/bugs/bug167236-13.html
deleted file mode 100644
index 6c5c91f4821e..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-13.html
+++ /dev/null
@@ -1,23 +0,0 @@
-  <html><head><title>Testcase</title>
-  <style>
-  * { font-family: serif }
-  </style>
-  </head><body>
-  <form>
-  <p> ___________ <input type="text" value="______" size="6"> __________
-  </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  5px; padding: 5px" size="6"> __________ </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  5px; padding: 5px; height: 50px" size="6"> __________ </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  10px; padding: 10px; height: 80px" size="6"> __________ </p>
-
-
-
-
-  </form>
-  </body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-14.html b/layout/html/tests/formctls/bugs/bug167236-14.html
deleted file mode 100644
index b4dee0121762..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-14.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN"
-  "http://www.w3.org/TR/html401/strict.dtd">
-  <html><head><title>Testcase</title>
-  <style>
-  * { font-family: serif }
-  </style>
-  </head><body>
-  <form>
-  <p> ___________ <input type="text" value="______" size="6"> __________
-  </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  5px; padding: 5px" size="6"> __________ </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  5px; padding: 5px; height: 50px" size="6"> __________ </p>
-
-  <p> ___________ <input type="text" value="______" style="border-width:
-  10px; padding: 10px; height: 80px" size="6"> __________ </p>
-
-
-
-
-  </form>
-  </body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-15.html b/layout/html/tests/formctls/bugs/bug167236-15.html
deleted file mode 100644
index 292effdc7acf..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-15.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head><title>Testcase</title>
-<style>
-* { font-family: serif }
-</style>
-</head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25">____textarea_____</textarea>____ inside.
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="vertical-align:baseline">____aligned textarea_____</textarea>____ inside.
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="font-size: 2em">____textarea_____</textarea>____ inside.
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="vertical-align:baseline; font-size: 2em">____aligned textarea_____</textarea>____ inside.
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-16.html b/layout/html/tests/formctls/bugs/bug167236-16.html
deleted file mode 100644
index 524e0b7ef67c..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-16.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html251/strict.dtd">
-<html><head><title>Testcase</title>
-<style>
-* { font-family: serif }
-</style>
-</head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25">____textarea_____</textarea>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="vertical-align:baseline">____aligned textarea_____</textarea>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="font-size: 2em">____textarea_____</textarea>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<textarea cols="25" style="vertical-align:baseline; font-size: 2em">____aligned textarea_____</textarea>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-2.html b/layout/html/tests/formctls/bugs/bug167236-2.html
deleted file mode 100644
index 84874f4fd803..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html401/strict.dtd">
-<html><head><title>Testcase</title></head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with <input type="button" value="BuTtoNs"><button type="button">Buttttons</button> in it<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-<button type="button">Just a button<br>With text in it</button>
-</p>
-
-<p><button type="button" style="letter-spacing: 1em">Spacy text</button> <input type="button" style="letter-spacing: 1em" value="Spacy text"></p>
-
-<p><button type="button" style="letter-spacing: 1em">Spacy text</button> <input type="button" style="letter-spacing: 1em" value="Spacy text"></p>
-
-<p><input type="button"></p>
-<p><input type="reset"></p>
-<p><input type="submit"></p>
-
-<p><button type="button"></button></p>
-<p><button type="reset"></button></p>
-<p><button type="submit"></button></p>
-
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug167236-3.html b/layout/html/tests/formctls/bugs/bug167236-3.html
deleted file mode 100644
index 2eb42cf04318..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-3.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><title>Testcase</title></head><body>
-<form>
-Text <select disabled>
-<option>foo
-</select>
-<select>
-</select>
-
-<input> Text
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug167236-4.html b/layout/html/tests/formctls/bugs/bug167236-4.html
deleted file mode 100644
index 69934d44c0aa..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-4.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html401/strict.dtd">
-<html><head><title>Testcase</title></head><body>
-<form>
-Text <select disabled>
-<option>foo
-</select>
-<select>
-</select>
-
-<input> Text
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug167236-5.html b/layout/html/tests/formctls/bugs/bug167236-5.html
deleted file mode 100644
index 10df468a5a33..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-5.html
+++ /dev/null
@@ -1,10 +0,0 @@
-  <html><head><title>Testcase</title></head><body>
-  <form>
-  <p>This is text: <input type="checkbox"> Check me!</p>
-
-  <p>This is text: <input type="radio"> Radio me!</p>
-
-
-
-  </form>
-  </body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-6.html b/layout/html/tests/formctls/bugs/bug167236-6.html
deleted file mode 100644
index 016f8e2faf8b..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-6.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN"
-  "http://www.w3.org/TR/html401/strict.dtd">
-  <html><head><title>Testcase</title></head><body>
-  <form>
-  <p>This is text: <input type="checkbox"> Check me!</p>
-
-  <p>This is text: <input type="radio"> Radio me!</p>
-
-
-
-  </form>
-  </body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-7.html b/layout/html/tests/formctls/bugs/bug167236-7.html
deleted file mode 100644
index 8a4081da5bdc..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-7.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html><head><title>Testcase</title>
-<style>
-* { font-family: serif }
-</style>
-</head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select><option>____select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5"><option>____sized select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="vertical-align: baseline"><option>____sized aligned select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select style="font-size: 2em"><option>____select_____</option></select>____ inside.
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="font-size: 2em"><option>____sized select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="vertical-align: baseline; font-size: 2em"><option>____sized aligned select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-8.html b/layout/html/tests/formctls/bugs/bug167236-8.html
deleted file mode 100644
index c0825c58212d..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-8.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html251/strict.dtd">
-<html><head><title>Testcase</title>
-<style>
-* { font-family: serif }
-</style>
-</head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select><option>____select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5"><option>____sized select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="vertical-align: baseline"><option>____sized aligned select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select style="font-size: 2em"><option>____select_____</option></select>____ inside.
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="font-size: 2em"><option>____sized select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a ___<select size="5" style="vertical-align: baseline; font-size: 2em"><option>____sized aligned select_____</option></select>____ inside.<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug167236-9.html b/layout/html/tests/formctls/bugs/bug167236-9.html
deleted file mode 100644
index 3e96191a5568..000000000000
--- a/layout/html/tests/formctls/bugs/bug167236-9.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html><head><title>Testcase</title></head><body>
-<form>
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" value="InpuT" size="5"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" size="8"><input type="button" value="BuTtoN"><input type="submit" value="Submit"><input type="reset" value="reset"><input type="file"><select><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>Same with big font</p>
-
-<p>This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with an <input value="input" style="font-size: 2em" value="input" size="5"><input style="font-size: 2em" type="button" value="BuTtoN"><input style="font-size: 2em" type="submit" value="Submit"><input style="font-size: 2em" type="reset" value="reset"><input style="font-size: 2em" type="file"><select style="font-size: 2em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-<p>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is a happy line of text with a <input type="password" value="password" style="font-size: 3em"  size="8"><input style="font-size: 3em" type="button" value="BuTtoN"><input style="font-size: 3em" type="submit" value="Submit"><input style="font-size: 3em" type="reset" value="reset"><input style="font-size: 3em" type="file"><select style="font-size: 3em"><option>Select</option><option>Select2</option></select>inside<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!<br>
-This is another happy line of text sorta just hanging out here so you can see the spacing.  More text!  More!
-</p>
-
-</form>
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug17450.html b/layout/html/tests/formctls/bugs/bug17450.html
deleted file mode 100644
index 397621572476..000000000000
--- a/layout/html/tests/formctls/bugs/bug17450.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML><HEAD><TITLE>CSIRO Australia - Scientific and Industrial Research</TITLE>
-</HEAD>
-<BODY>
-<div style="width:180px;background-color:yellow;">
-<FORM ACTION="/search/scripts/runFullSearch.asp" METHOD=POST TARGET="content">
-<select size="1">
-<option>Select Industry Sector</option>
-</select>
-<select size="1">
-<option>Select Business Unit</option>
-</select>
-</FORM>
-</div>
-</BODY></HTML>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug17474-1.html b/layout/html/tests/formctls/bugs/bug17474-1.html
deleted file mode 100644
index b00479dc6e90..000000000000
--- a/layout/html/tests/formctls/bugs/bug17474-1.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<body>
-<form>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<input type="button" value="Press Me"style="width:200px;height:60px;">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;">100x21</div><br>
-This button should be 100x21<br>
-<input type="button" value="Press Me with Really long title"style="width:100px;height:21px">
-<br>
-<br>
-This button should be 100x21<br>
-<input type="button" value="Presssssssssssssssssssssssssss"style="width:100px;height:21px">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<button style="width:200px;height:60px;">Press Me</button>
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;"> 100x21</div><br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Press Me with Really long title</button>
-<br>
-<br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Presssssssssssssssssssssssssss</button>
-<br>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug17474-2.html b/layout/html/tests/formctls/bugs/bug17474-2.html
deleted file mode 100644
index f1869743c9f0..000000000000
--- a/layout/html/tests/formctls/bugs/bug17474-2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-<body bgcolor="#c0d0f0">
-<form>
-This is a normal button with no CSS sizing, <br>
-on Windows this sizes to 66x27:<br>
-<input type="button" value="Press Me">
-<br>
-On Windows this should be sizing to 84x24<br>
-here is a div that emulates it:<br>
-<center>
-<div style="border:2px lightgray outset;background-color:#c0c0c0;width:80px;height:20px;">Press Me</div>
-</center>
-<br>
-<hr>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<input type="button" value="Press Me"style="width:200px;height:60px;">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;">100x21</div><br>
-This button should be 100x21<br>
-<input type="button" value="Press Me with Really long title"style="width:100px;height:21px">
-<br>
-<br>
-This button should be 100x21<br>
-<input type="button" value="Presssssssssssssssssssssssssss"style="width:100px;height:21px">
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:200px">200px wide</div><br>
-This button should be 200x60<br>
-<button style="width:200px;height:60px;">Press Me</button>
-<br>
-<br>
-<div style="background-color:blue;color:yellow;width:100px;height:21;"> 100x21</div><br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Press Me with Really long title</button>
-<br>
-<br>
-This button should be 100x21<br>
-<button style="width:100px;height:21px;">Presssssssssssssssssssssssssss</button>
-<br>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug17474-3.html b/layout/html/tests/formctls/bugs/bug17474-3.html
deleted file mode 100644
index f1e9bec87c19..000000000000
--- a/layout/html/tests/formctls/bugs/bug17474-3.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>CSS sizing of INPUT wrong if other attributes present</TITLE>
-<BODY>
-
-<H1>CSS sizing of INPUT wrong if other attributes present</H1>
-
-<P>This is an operational as well as a cosmentic defect: click in the yellow rectangles below
-and type in a "j" to see the descender cut off - it looks like the text inside the
-&lt;input&gt; is normal sized, but the &lt;input&gt; is too small.
-</P>
-
-<P>
-All of these coloured rectangles are &lt;input&gt; elements using the style attribute to set
-the background CSS property and their size.<BR>
-The &lt;input&gt; elements have a border in the table even though the table has border="0".<BR>
-The yellow &lt;input&gt; element is too small (type=text). The equivalent sized in px is okay.<BR>
-The green &lt;input&gt; elements are too large (size=1).
-</P>
-
-
-<TABLE border="0">
-<TR>
-<TD><INPUT style="width: 1em; height: 1em; background: red; margin-left: 0"> <SPAN STYLE="font-size: small;">1em by 1em; red; border 1px; margin 0</SPAN></TD>
-<TD><INPUT style="width: 16px; height: 16px; background: red; margin-left: 0"> <SPAN STYLE="font-size: small;">16px by 16px; red; border 1px; margin 0</SPAN></TD>
-</TR>
-<TR>
-<TD><INPUT style="width: 1em; height: 1em; background: yellow; margin-left: 0" type="text" size="1"> <SPAN STYLE="font-size: small;">1em by 1em; yellow; border 1px; margin 0 - type=text size=1</SPAN></TD>
-<TD><INPUT style="width: 16px; height: 16px; background: red; margin-left: 0" type="text" size="1"> <SPAN STYLE="font-size: small;">16px by 16px; red; border 1px; margin 0 - type=text size=1</SPAN></TD>
-</TR>
-<TR>
-<TD><INPUT style="width: 1em; height: 1em; background: yellow; margin-left: 0" type="text" value="j" size="1"> <SPAN STYLE="font-size: small;">1em by 1em; yellow; border 1px; margin 0 - type=text value="j" size=1</SPAN></TD>
-<TD><INPUT style="width: 16px; height: 16px; background: red; margin-left: 0" type="text" value="j" size="1"> <SPAN STYLE="font-size: small;">16px by 16px; red; border 1px; margin 0 - type=text value="j" size=1</SPAN></TD>
-</TR>
-<TR>
-<TD><INPUT style="width: 1em; height: 1em; background: green; margin-left: 0" size="1"> <SPAN STYLE="font-size: small;">1em by 1em; green; border 1px; margin 0 - size=1</SPAN></TD>
-<TD><INPUT style="width: 16px; height: 16px; background: green; margin-left: 0" size="1"> <SPAN STYLE="font-size: small;">16px by 16px; green; border 1px; margin 0 - size=1</SPAN></TD>
-</TR>
-</TABLE>
-
-
-<P>
-It seems not to matter whether the &lt;input&gt; elements appear in a &lt;table&gt; or not,
-or in a &lt;form&gt; or not.</P>
-
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug180085-1.html b/layout/html/tests/formctls/bugs/bug180085-1.html
deleted file mode 100644
index ceb577a4ea2a..000000000000
--- a/layout/html/tests/formctls/bugs/bug180085-1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-	<title>Untitled</title>
-<style type="text/css">
-<!--
-.from_button { font-family: Arial, Helvetica, sans-serif; font-size: 12px; color: #FFFFFF; background-color: #899EB3 }
--->
-</style></head>
-
-<body>
-<form>
-<input type="text"><input type="submit" style="width : 30px" value=" ok " class="frombutton">
-</form>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug180085-2.html b/layout/html/tests/formctls/bugs/bug180085-2.html
deleted file mode 100644
index 4d9ffab6fd52..000000000000
--- a/layout/html/tests/formctls/bugs/bug180085-2.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-	<title>Untitled</title>
-<style type="text/css">
-<!--
-.frombutton { font-family: Arial, Helvetica, sans-serif; font-size: 12px; color: #FFFFFF; background-color: #899EB3 }
--->
-</style></head>
-
-<body>
-<form>
-<input type="text"><input type="submit" style="width : 20px" value=" ok " class="frombutton">
-</form>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug180085-3.html b/layout/html/tests/formctls/bugs/bug180085-3.html
deleted file mode 100644
index dc29c357b3aa..000000000000
--- a/layout/html/tests/formctls/bugs/bug180085-3.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-	<head>
-		<title>input problem</title>
-	</head>
-	<body>
-		<form>
-			
-			<input type="button" style="" value="M"><br>
-			<input type="button" style="width: 1.5em" value="M"><br>
-			<input type="button" style="width: 1.5em;padding:0" value="M"><br>
-			<input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
-			<input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
-		</form>
-	</body>
-</html>
-	
diff --git a/layout/html/tests/formctls/bugs/bug180085-4.html b/layout/html/tests/formctls/bugs/bug180085-4.html
deleted file mode 100644
index 03ef7ecf09f7..000000000000
--- a/layout/html/tests/formctls/bugs/bug180085-4.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-  <head>
-    <title>input problem</title>
-  </head>
-  <body>
-    <form>
-      
-      <input type="button" style="" value="M"><br>
-      <input type="button" style="width: 1.5em" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="M"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="M"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="M"><br>
-      <hr>
-      <button style="">M</button><br>
-      <button style="width: 1.5em">M</button><br>
-      <button style="width: 1.5em;padding:0">M</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">M</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >M</button><br>
-      <hr>
-      <input type="button" style="" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em;padding:0;margin:0; font-weight: bold" value="My Fair Button"><br>
-      <input type="button" style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;"  value="My Fair Button"><br>
-      <hr>
-      <button style="">My Fair Button</button><br>
-      <button style="width: 1.5em">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0">My Fair Button</button><br>
-      <button style="width: 1.5em;padding:0;margin:0; font-weight: bold">My Fair Button</button><br>
-      <button style="width: 1.5em; padding:0.2em; margin:0;font-weight:bold;" >My Fair Button</button><br>
-    </form>
-  </body>
-</html>
-  
diff --git a/layout/html/tests/formctls/bugs/bug20322.html b/layout/html/tests/formctls/bugs/bug20322.html
deleted file mode 100644
index 956e85c721e1..000000000000
--- a/layout/html/tests/formctls/bugs/bug20322.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<input type="image" src="main4s-blk.gif" tabindex="1">
-<BR><BR>
-<input type="image" src="main4s-blk.gif" tabindex="2">
-<BR><BR>
-<input type="image" src="main4s-blk.gif" tabindex="3">
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug222864.html b/layout/html/tests/formctls/bugs/bug222864.html
deleted file mode 100644
index b91e17ad2ed5..000000000000
--- a/layout/html/tests/formctls/bugs/bug222864.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
- <body>
-  <script>
-    document.body.appendChild( document.createElement( "TEXTAREA" ) );
-  </script>
- </body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug22708.html b/layout/html/tests/formctls/bugs/bug22708.html
deleted file mode 100644
index 27a36cd32a85..000000000000
--- a/layout/html/tests/formctls/bugs/bug22708.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><title>Testcase for bug 22708</title></head>
-<body>
-
-<FORM>
-  <input type="text" style="text-align:center" size="60"
-         value="Bitte Namen der Geschichte eingeben">
-</FORM>
-
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug231574.html b/layout/html/tests/formctls/bugs/bug231574.html
deleted file mode 100644
index d1b158a6b077..000000000000
--- a/layout/html/tests/formctls/bugs/bug231574.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
- <head>
-  <title>Bug 231574 testcase</title>
- </head>
- <body>
-  <div noWrap style="height: 100px; width: 100%; border: 3px solid; white-space: nowrap;">
-   <button style="height: 100px; width: 100px; background-color: red;"></button>
-   <button style="height: 100px; width: 100px; background-color: green;"></button>
-   <button style="height: 100px; width: 100px; background-color: blue; font-size: 80px;">A</button>
-   <button style="height: 100px; background-color: yellow;">Jump out of the window</button></nobr>
-  </div>
- </body>
-</html>
-
diff --git a/layout/html/tests/formctls/bugs/bug26644.html b/layout/html/tests/formctls/bugs/bug26644.html
deleted file mode 100644
index 81c57b578c52..000000000000
--- a/layout/html/tests/formctls/bugs/bug26644.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<!-- testcase: button_hr_percent.html -->
-<!-- description: HTML 4.0 text markup BUTTON element --> 
-<!-- Author: Chris Petersen Date: 2/04/00 -->
-<!-- CONFIDENTIAL AND PROPRIETARY TEST SCRIPT OF NETSCAPE COMMUNICATIONS CORPORATION 
-Copyright © 1999 Netscape Communications Corporation. All rights reserved. Use of this test script is 
-subject to the terms of the applicable license agreement from Netscape Communications Corporation. -->
-<!-- Purpose: To test the button element with nested HR and P elements. -->
-<!-- Expected result: The HR element should be rendered at the 50 % of the button element. -->
-
-<TITLE>HTML Functional -- BUTTON - HR - PERCENT</TITLE>
-</head>
-<body>
-<form action="http://wetnap/cgi-bin/echo-form.cgi" method="post">
-	
-	<button>
-	<hr width=50% size="3">
-	<p>This P element ,which is nested in a button element, is inserted between two HR elements. These <br>
-	HR elements has been assigned a percentage value (50%) for the Width attribute. <br>
-	</p>
-	<hr width=50% size="3">
-	</button>
-	</form>
-	<p>This HR uses the same width percentage but is not nested in a Button element.</p>
-		<hr width=50% size="3">
-
-	
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug26650.html b/layout/html/tests/formctls/bugs/bug26650.html
deleted file mode 100644
index d33f53456bdd..000000000000
--- a/layout/html/tests/formctls/bugs/bug26650.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<!-- testcase: button_p_align.html -->
-<!-- description: HTML 4.0 text markup BUTTON element --> 
-<!-- Author: Chris Petersen Date: 2/04/00 -->
-<!-- CONFIDENTIAL AND PROPRIETARY TEST SCRIPT OF NETSCAPE COMMUNICATIONS CORPORATION 
-Copyright © 1999 Netscape Communications Corporation. All rights reserved. Use of this test script is 
-subject to the terms of the applicable license agreement from Netscape Communications Corporation. -->
-<!-- Purpose: To test the button element. -->
-<!-- Expected result: The nested P elements should use the assigned alignment value. -->
-
-<TITLE>HTML Functional -- BUTTON - P - ALIGN</TITLE>
-</head>
-<body>
-<form action="http://wetnap/cgi-bin/echo-form.cgi" method="post">
-	<button>
-		<p>A P element contained in a button element</p>
-		<p align="right">A second P (align=right)</p>
-        <p align="center">A second P (align=center)</p>
-	</button>
-	
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug28598.html b/layout/html/tests/formctls/bugs/bug28598.html
deleted file mode 100644
index 411ec76f12e9..000000000000
--- a/layout/html/tests/formctls/bugs/bug28598.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<HTML>
-<BODY onload="document.forms[0].area.value='line 1\rline 2'">
-<form>
-<textarea name=area rows=5 cols=10>
-</textarea>
-</form>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug297389.html b/layout/html/tests/formctls/bugs/bug297389.html
deleted file mode 100644
index b766de11d39e..000000000000
--- a/layout/html/tests/formctls/bugs/bug297389.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-   <head>
-      <title>Bug foobar</title>
-   </head>
-   <body>
-      <form>
-         <select>
-            <script>document.body.offsetHeight;</script>
-            <option value="XP Apps: GUI Features" selected>XP Apps: GUI Features
-            </option>
-         </select>
-      </form>
-   </body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug300474-1.html b/layout/html/tests/formctls/bugs/bug300474-1.html
deleted file mode 100644
index adb88e746ddb..000000000000
--- a/layout/html/tests/formctls/bugs/bug300474-1.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<body>
-<form>
-	The buggy display : Select's size attribute is not specified :
-	<select multiple="multiple">
-		<optgroup label="Label">
-			<option label="a">a</option>
-			<option label="a">a</option>
-			<option label="a">a</option>
-		</optgroup>
-	</select>
-	<br>
-	<br>
-	<br>
-
-	What should be displayed : Select's size attribute is forced to 4 :
-	<select multiple="multiple" size="4">
-		<optgroup label="Label">
-			<option label="a">a</option>
-			<option label="a">a</option>
-			<option label="a">a</option>
-		</optgroup>
-	</select>
-	<br>
-	<br>
-	<br>
-
-	The width of the widget is also not perfect.
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug300474-2.html b/layout/html/tests/formctls/bugs/bug300474-2.html
deleted file mode 100644
index b83ed7030e50..000000000000
--- a/layout/html/tests/formctls/bugs/bug300474-2.html
+++ /dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase for bug 300474</title>
-    <style type="text/css">
-
-        html,body {
-            color:black; background-color:white; font-size:12px; padding:0; margin:0;
-        }
-	p { font-weight: bold; color:blue; margin-top:0; }
-
-    </style>
-</head>
-<body>
-
-<p>unspecified size</p>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple>
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple>
-<option>o
-<option>o
-</select>
-<select multiple>
-<option>o
-</select>
-<select multiple>
-</select>
-
-
-<br>
-<hr>
-<br>
-<p>size=0</p>
-
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=0>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=0>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<option>o
-<option>o
-</select>
-<select multiple size=0>
-<option>o
-</select>
-<select multiple size=0>
-</select>
-
-<br>
-<hr>
-<br>
-<p>size=1</p>
-
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=1>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=1>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<option>o
-<option>o
-</select>
-<select multiple size=1>
-<option>o
-</select>
-<select multiple size=1>
-</select>
-
-
-<br>
-<hr>
-<br>
-<p>size=4</p>
-
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple size=4>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple size=4>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<option>o
-<option>o
-</select>
-<select multiple size=4>
-<option>o
-</select>
-<select multiple size=4>
-</select>
-
-
-<br>
-<hr>
-<br>
-
-<p>CSS height:300px</p>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-<option>o
-</select>
-<select multiple style="height:300px">
-<optgroup label="g"></optgroup>
-<optgroup label="g"></optgroup>
-</select>
-
-
-<select multiple style="height:300px">
-<option>o
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<option>o
-<option>o
-</select>
-<select multiple style="height:300px">
-<option>o
-</select>
-<select multiple style="height:300px">
-</select>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug305705.html b/layout/html/tests/formctls/bugs/bug305705.html
deleted file mode 100644
index 298267ee6ac3..000000000000
--- a/layout/html/tests/formctls/bugs/bug305705.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase #2 for bug 305705</title>
-    <style type="text/css">
-
-        html,body {
-            color:black; background-color:white; font-size:16px; padding:0; margin:0;
-        }
-	
-        option {
-            background-color:lime;
-        }
-
-    </style>
-</head>
-<body>
-
-
-</head>
-<body>
-
-<pre>Test1: SELECT has width:175px, OPTIONs are unconstrained</pre>
-    <select style="width:175px" size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test2: SELECT unconstrained, OPTIONs are unconstrained</pre>
-    <select size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test3: SELECT has width:175px, First OPTION has width:200px, rest of the OPTIONs are unconstrained</pre>
-    <select style="width:175px" size="1">
-        <option style="width:200px" value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test4: SELECT has width:175px, First OPTION has width:600px, rest of the OPTIONs are unconstrained</pre>
-    <select style="width:175px" size="1">
-        <option style="width:600px" value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test5: SELECT has width:175px, Second OPTION has width:600px, rest of the OPTIONs are unconstrained</pre>
-    <select style="width:175px" size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option style="width:600px" value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test6: SELECT is unconstrained, First OPTION has width:200px, rest of the OPTIONs are unconstrained</pre>
-    <select size="1">
-        <option style="width:200px" value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test7: SELECT is unconstrained, Second OPTION has width:600px, rest of the OPTIONs are unconstrained</pre>
-    <select size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option style="width:600px" value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test8: SELECT has width:600px, Second OPTION has width:200px, rest of the OPTIONs are unconstrained</pre>
-    <select style="width:600px" size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option style="width:200px" value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test9: same as Test6 but with min-width instead of width</pre>
-    <select size="1">
-        <option style="min-width:200px" value="1">All North America and Latin America Sites</option>
-        <option value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test10: same as Test7 but with min-width instead of width</pre>
-    <select size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option style="min-width:600px" value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-<pre>Test11: same as Test8 but with min-width instead of width</pre>
-    <select style="min-width:600px" size="1">
-        <option value="1">All North America and Latin America Sites</option>
-        <option style="min-width:200px" value="2">Chicago, IL, USA</option>
-        <option value="3">Grand Rapids, MI, USA</option>
-        <option value="4">Dallas, TX, USA</option>
-    </select>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug33327.html b/layout/html/tests/formctls/bugs/bug33327.html
deleted file mode 100644
index e026149f521c..000000000000
--- a/layout/html/tests/formctls/bugs/bug33327.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<p>some text</p>
-
-<p>
- <select size="3">
-  <option>single</option>
-  <option>select</option>
- </select>
-</p>
-
-<p>
- <select size="3" multiple>
-  <option>multi</option>
-  <option>select</option>
- </select>
-</p>
-
-<p>
- <select size="3">
-  <option>single</option>
-  <option>select</option>
-  <option>with</option>
-  <option>scrollbars</option>
- </select>
-</p>
-
-<p>
- <select size="3" multiple>
-  <option>multi</option>
-  <option>select</option>
-  <option>with</option>
-  <option>scrollbars</option>
- </select>
-</p>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug342531.html b/layout/html/tests/formctls/bugs/bug342531.html
deleted file mode 100644
index 1fa82f02bb29..000000000000
--- a/layout/html/tests/formctls/bugs/bug342531.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase #2 for bug 342531</title>
-    <style type="text/css">
-
-        html,body {
-            color:black; background-color: white; font-size:16px; padding:0; margin:0;
-        }
-
-	.float { float:left; clear:both; width:200px; border:solid red 2px; }
-	.block  { display:block; margin-left: 250px; background: yellow; border: solid blue 2px;}
-	.inline {display:inline; margin-left: 250px; background: yellow; border: solid blue 2px;}
-	.wrap {overflow:hidden;}
-    </style>
-</head>
-<body>
-
-<div class="wrap">
-    <div class="float">float</div>
-    <span class="block">non-replaced block</span>
-    <div class="float">float</div>
-    <span class="inline">non-replaced inline</span>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <input class="block" value="INPUT block">
-    <div class="float">float</div>
-    <input class="inline" value="INPUT inline">
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <textarea class="block">TEXTAREA block</textarea>
-    <div class="float">float</div>
-    <textarea class="inline">TEXTAREA inline</textarea>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <select size="1" class="block"><option>Combobox block</option></select>
-    <div class="float">float</div>
-    <select size="1" class="inline"><option>Combobox inline</option></select>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <select multiple class="block"><option>List block</option></select>
-    <div class="float">float</div>
-    <select multiple class="inline"><option>List inline</option></select>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <button class="block">BUTTON block</button>
-    <div class="float">float</div>
-    <button class="inline">BUTTON inline</button>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <fieldset class="block">FIELDSET block</fieldset>
-    <div class="float">float</div>
-    <fieldset class="inline">FIELDSET inline</fieldset>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <input type="radio" class="block">
-    <div class="float">float</div>
-    <input type="radio" class="inline">
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <input type="checkbox" class="block">
-    <div class="float">float</div>
-    <input type="checkbox" class="inline">
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <label type="checkbox" class="block">LABEL block</label>
-    <div class="float">float</div>
-    <label type="checkbox" class="inline">LABEL inline</label>
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <isindex class="block" prompt="ISINDEX block">
-    <div class="float">float</div>
-    <isindex class="inline" prompt="ISINDEX inline">
-</div>
-<div class="wrap">
-    <div class="float">float</div>
-    <img src="http://www.mozilla.org/images/hack.gif" class="block">
-    <div class="float">float</div>
-    <img src="http://www.mozilla.org/images/hack.gif" class="inline">
-</div>
-<div class="wrap">
-HR:
-    <div class="float">float</div>
-    <hr class="block">
-    <div class="float">float</div>
-    <hr class="inline">
-</div>
-
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug357449.html b/layout/html/tests/formctls/bugs/bug357449.html
deleted file mode 100644
index de240448e061..000000000000
--- a/layout/html/tests/formctls/bugs/bug357449.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase #1 for bug 357449</title>
-    <style type="text/css">
-        .s1 { font-size:72px; }
-        .s2 { font-size:144px; }
-        .s3 { font-size:192px; }
-
-select { height:60px; background-color:lime; margin-bottom: 10px; }
-
-    </style>
-</head>
- <body>
-
-  <select class="s1"><option>jMey</option></select><br>
-  <select class="s2"><option>jMey</option></select><br>
-  <select class="s3"><option>jMey</option></select><br>
-  <select class="s4"><option>jMey</option></select><br>
-
- </body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug358408.html b/layout/html/tests/formctls/bugs/bug358408.html
deleted file mode 100644
index 173eeff4a7f1..000000000000
--- a/layout/html/tests/formctls/bugs/bug358408.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<head>
-  <style>
-    option { background: green}
-  </style>
-</head>
-<body style="width: 600px; border: 1px solid green">
-The options in the first select should have a green background along their whole width. <br>
-<select style="width: 100px">
-<option style="background: green">This is longish option text going on and on and so forth</option>
-<option style="background: green">This is longish option text going on and on and so forth</option>
-</select>
-
-<hr>
-
-The first option in the second select should have a green background along a 200px width, not a 300px one.  For comparison, the green box around the tests is 600px wide, and the second select is 400px wide.<br>
-<select size="5" style="width: 400px"
-<option style="width: 50%">Text</option>
-<option>Text</option>
-<option>Text</option>
-<option>Text</option>
-</select>
diff --git a/layout/html/tests/formctls/bugs/bug35934.html b/layout/html/tests/formctls/bugs/bug35934.html
deleted file mode 100644
index 70bcc2fb26e5..000000000000
--- a/layout/html/tests/formctls/bugs/bug35934.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<select>
- <option value="foo">the following option has a value but no text</option>
- <option selected value="bar"></option>
-</select>
diff --git a/layout/html/tests/formctls/bugs/bug36130.html b/layout/html/tests/formctls/bugs/bug36130.html
deleted file mode 100644
index 505e9cf7234c..000000000000
--- a/layout/html/tests/formctls/bugs/bug36130.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-<form><textarea rows=5 cols=10 name="area">
-1
-2
-3
-4
-5
-6
-7
-8
-9
-scroll to here!
-</textarea><input type=button onclick="this.form.area.value='a\nb\nc\nd\ne\nf\ng'" value="go!"></form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug36364-1.html b/layout/html/tests/formctls/bugs/bug36364-1.html
deleted file mode 100644
index 0a2385e7eb17..000000000000
--- a/layout/html/tests/formctls/bugs/bug36364-1.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><body BGCOLOR="#FFFFFF">
-<form>
-<input TYPE="submit" NAME="Submit" VALUE="Submit">no style<br>
-<input style="letter-spacing:1px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=1px<br>
-<input style="letter-spacing:2px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=2px<br>
-<input style="letter-spacing:3px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=3px<br>
-<input style="letter-spacing:4px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=4px<br>
-<input style="letter-spacing:5px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=5px<br>
-<input style="letter-spacing:5px; width:100px;" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=5px; width=100px<br>
-</form>
-</body></html>
-
diff --git a/layout/html/tests/formctls/bugs/bug36364-2.html b/layout/html/tests/formctls/bugs/bug36364-2.html
deleted file mode 100644
index 0df76eb3997f..000000000000
--- a/layout/html/tests/formctls/bugs/bug36364-2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html><body BGCOLOR="#FFFFFF">
-<form>
-<input TYPE="submit" NAME="Submit" VALUE="Submit">no style<br>
-<input style="letter-spacing:1px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=1px<br>
-<input style="letter-spacing:2px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=2px<br>
-<input style="letter-spacing:3px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=3px<br>
-<input style="letter-spacing:4px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=4px<br>
-<input style="letter-spacing:5px" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=5px<br>
-<input style="letter-spacing:5px; width:100px;" TYPE="submit" NAME="Submit" VALUE="Submit"> ls=5px; width=100px<br>
-</form>
-</body></html>
-
diff --git a/layout/html/tests/formctls/bugs/bug36964.html b/layout/html/tests/formctls/bugs/bug36964.html
deleted file mode 100644
index e0025b33da53..000000000000
--- a/layout/html/tests/formctls/bugs/bug36964.html
+++ /dev/null
@@ -1 +0,0 @@
-<input type="file" style="border:0px">
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug37261.html b/layout/html/tests/formctls/bugs/bug37261.html
deleted file mode 100644
index d51362dfc046..000000000000
--- a/layout/html/tests/formctls/bugs/bug37261.html
+++ /dev/null
@@ -1 +0,0 @@
-<FONT><TABLE></TABLE><NOBR><FORM><INPUT TYPE="hidden" VALUE=""><SELECT></FORM>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug37459.html b/layout/html/tests/formctls/bugs/bug37459.html
deleted file mode 100644
index 66075befc81a..000000000000
--- a/layout/html/tests/formctls/bugs/bug37459.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Untitled</title>
-	
-	<STYLE TYPE="text/css">
-	.selHead {
-		color: #000066;
-		font-weight: bold;
-		text-decoration: underline;
-		}
-	</STYLE>
-</head>
-
-<body>
-
-	<FORM ACTION="myile.cgi" METHOD="GET">
-	<SELECT NAME="exselect" SIZE="1">
-			<OPTION VALUE="FAV" CLASS="selHead">Favorites:
-					<OPTION VALUE="3">Ben's Test Collection [3]
-					<OPTION VALUE="2003">St. Veronica [2003]
-					<OPTION VALUE="2002">Butterfly [2002]
-			<OPTION VALUE="MR" CLASS="selHead">Most Recent:
-					<OPTION VALUE="3">Ben's Test Collection [3]
-					<OPTION VALUE="36">Exhibit #36 [36]
-					<OPTION VALUE="2003">St. Veronica [2003]
-					<OPTION VALUE="2002">Butterfly [2002]
-	</SELECT>			
-	</FORM>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug39425.html b/layout/html/tests/formctls/bugs/bug39425.html
deleted file mode 100644
index ebe421dd8b02..000000000000
--- a/layout/html/tests/formctls/bugs/bug39425.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-<SCRIPT>
-function kill_dd()
-{
-  var x = document.forms[0].elements[0];
-
-   while (x.options.length != 0)
-   {
-     var a = x.options.length - 1;
-     x.options[a] = null;
-   }
-}
-</SCRIPT>
-</HEAD>
-
-<BODY onload="kill_dd();">
-
-text text text text
-
-<FORM>
-<table border="1"><tr><td>
-<SELECT style="width: 200px">
-<OPTION>1</option>
-<OPTION>2</option>
-</SELECT>
-</td></tr></table>
-</FORM>
-
-
-</BODY></HTML>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug4050.html b/layout/html/tests/formctls/bugs/bug4050.html
deleted file mode 100644
index 23f28b5b51d2..000000000000
--- a/layout/html/tests/formctls/bugs/bug4050.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD><TITLE>Test case for bug #4050</TITLE></HEAD>
-<BODY>
-<form>
-<select>
-  <option label="A">X
-  <option label="B">Y
-  <option label="C">Z
-</select>
-</form>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug40596-1.html b/layout/html/tests/formctls/bugs/bug40596-1.html
deleted file mode 100644
index 87bc6233fe12..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<HTML>
-	<BODY>
-		<FORM>
-			This is the way both tables should be laid out... <br>
-			<TABLE border="1" width="400">
-		          		<TR>
-                     				<TD style="width:80%">
-		                          		&nbsp;
-					</TD>
-					<TD style="width:20%">
-						&nbsp;
-					</TD>
-				</TR>
-			</TABLE>
-
-			<BR>
-			<BR>
-			This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-			Note that the width of the input box is not constrained by its container, as it should be<BR>
-			<TABLE border="1" width="400">
-		          		<TR>
-                     				<TD style="width:80%">
-		                          		&nbsp;
-					</TD>
-					<TD style="width:20%">
-						<INPUT type="text" style="width:100%">
-					</TD>
-				</TR>
-			</TABLE>
-
-		</FORM>
-	</BODY>
-</HTML>
-
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-2.html b/layout/html/tests/formctls/bugs/bug40596-2.html
deleted file mode 100644
index c59ffca2abbf..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-2.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN">
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <INPUT type="text" style="width: 100%"> 
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <INPUT type="text" style="width: auto"> 
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-3.html b/layout/html/tests/formctls/bugs/bug40596-3.html
deleted file mode 100644
index 3241b0af9559..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-3.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <INPUT type="text" style="width: 100%"> 
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <INPUT type="text" style="width: auto"> 
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-4.html b/layout/html/tests/formctls/bugs/bug40596-4.html
deleted file mode 100644
index 5f0523bfdfdd..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-4.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN">
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <select style="width: 100%">
-                                                  <option>This is pretty long text that goes in the select</option>
-                                                </select>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <select style="width: auto">
-                                                  <option>This is pretty long text that goes in the select</option>
-                                                </select>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-5.html b/layout/html/tests/formctls/bugs/bug40596-5.html
deleted file mode 100644
index 26faf136a1c6..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-5.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN">
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <input type="button" value="This is pretty long text that goes in the button" style="width: 100%">
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <input type="button" value="This is pretty long text that goes in the button" style="width: auto">
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-6.html b/layout/html/tests/formctls/bugs/bug40596-6.html
deleted file mode 100644
index 8a987de4b561..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-6.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN">
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <button type="button" style="width: 100%">
-                                                   This is prettylongtext that goes in the button
-                                                </button>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <button type="button" style="width: auto">
-                                                   This is prettylongtext that goes in the button
-                                                </button>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug40596-7.html b/layout/html/tests/formctls/bugs/bug40596-7.html
deleted file mode 100644
index 2533e884aa8d..000000000000
--- a/layout/html/tests/formctls/bugs/bug40596-7.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Strict//EN">
-<HTML>
-        <BODY>
-                <FORM>
-                        This is the way all the tables below should be laid out... <br>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                &nbsp;
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = 100% in the right-most cell<BR>
-                        Note that the width of the input box is not constrained by its container, as it should be<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <select style="width: 100%" size="2">
-                                                  <option>This is pretty long text that goes in the select</option>
-                                                </select>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                        <BR>
-                        <BR>
-                        This is the same table, only it has an input box with width = auto in the right-most cell<BR>
-                        Note that we get the same result as above.<BR>
-                        <TABLE border="1" width="400">
-                                        <TR>
-                                                <TD style="width:80%">
-                                                        &nbsp;
-                                        </TD>
-                                        <TD style="width:20%">
-                                                <select style="width: auto" size="2">
-                                                  <option>This is pretty long text that goes in the select</option>
-                                                </select>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-
-                </FORM>
-        </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug41049.html b/layout/html/tests/formctls/bugs/bug41049.html
deleted file mode 100644
index 3b8376831002..000000000000
--- a/layout/html/tests/formctls/bugs/bug41049.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<HEAD>
-<META NAME="GENERATOR" Content="Microsoft Visual Studio 6.0">
-<TITLE></TITLE>
-</HEAD>
-<BODY>
-W3C TEXTAREA sample:
-
-<FORM action="http://somesite.com/prog/text-read" method="post">
-   <P>
-   <TEXTAREA name="thetext" rows="20" cols="80">
-   First line of initial text.
-   Second line of initial text.
-   </TEXTAREA>
-   <INPUT type="submit" value="Send"><INPUT type="reset">
-   </P>
-</FORM>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug41050.html b/layout/html/tests/formctls/bugs/bug41050.html
deleted file mode 100644
index 825c2bf8245c..000000000000
--- a/layout/html/tests/formctls/bugs/bug41050.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<body>
-<form>
-<textarea id="ta1" cols=30 rows=14>
-</textarea>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug42481.html b/layout/html/tests/formctls/bugs/bug42481.html
deleted file mode 100644
index 6613b108dde9..000000000000
--- a/layout/html/tests/formctls/bugs/bug42481.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-	"http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<html lang="en">
-<head>
-<title>test case</title>
-<style type="text/css" media="screen">
-<!--
-body {
-	color: #0f0;
-	background-color: #000;
-	margin: 0;
-	padding: 1em;
-	}
-input[type="text"], select {
-	color: #0f0;
-	background-color: #000;
-	border-color: #06f;
-	border-width: 1px;
-	font-size: 2em;
-	line-height: 2em;
-	height: 5em;
-	width: 60%;
-	}
-.test {
-	font-family: sans-serif;
-	}
--->
-</style>
-</head>
-
-<body>
-
-<form>
-
-<table>
-
-<tr>
-<td>Test:</td>
-<td><input type="text" class="test" value="text and Number 123"></td>
-</tr>
-
-<tr>
-<td>Test:</td>
-<td><select class="test">
-<option>text and Number 123</option>
-<option>text and Number 123</option>
-<option>text and Number 123</option>
-</select></td>
-</tr>
-
-</table>
-
-
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug43771.html b/layout/html/tests/formctls/bugs/bug43771.html
deleted file mode 100644
index e365bcb23037..000000000000
--- a/layout/html/tests/formctls/bugs/bug43771.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<body>
-<div style="border:1px solid black;" align=right>
-<label>Align Right on container:</label><input type="text">
-</div>
-<br>
-<div style="border:1px solid black;">
-<label>No align on container:</label><input type="text">
-</div>
-</body>
diff --git a/layout/html/tests/formctls/bugs/bug44000.html b/layout/html/tests/formctls/bugs/bug44000.html
deleted file mode 100644
index 6e88ef9b2246..000000000000
--- a/layout/html/tests/formctls/bugs/bug44000.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-	"http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html lang="en">
-<head>
-<title>test case</title>
-<style type="text/css" media="screen">
-<!--
-body {
-	margin: 0;
-	padding: 5%;
-	background-color: #000;
-	color: #ff0;
-	}
-table {
-	table-layout: fixed;
-	}
-td {
-	color: #9cf;
-	background-color: #666;
-	font-weight: bold;
-	}
-p {
-	font-size: 16px;
-	font-family: "MS Sans Serif", verdana, sans-serif;
-	background-color: #333;
-	color: #ffc;
-	border: 1px solid #f90;
-	padding: .5em;
-	margin-bottom: 1em;
-	}
-input[type="text"], select[size="1"] {
-	font-size: 16px;
-	font-family: "MS Sans Serif", verdana, sans-serif;
-	background-color: #000;
-	color: #ff0;
-	border-color: #fc0;
-	width: 180px
-	}
-input[type="text"]:focus, select[size="1"]:focus {
-	background-color: #fc0;
-	color: #000;
-	border-color: #ff0;
-	}
-input[type="submit"] {
-	border-color: #fc0;
-	background-color: #fc0;
-	color: #006;
-	}
--->
-</style>
-</head>
-
-<body>
-
-<form action="http://gw.cnnfn.com/search/topSearch" method="post">
-
-<table border="1" cellpadding="5">
-<col width="100"><col width="200">
-
-<tr>
-<td align="center">Keyword:</td>
-<td><input type="text" name="search" maxlength="38"></td>
-</tr>
-
-<tr>
-<td align="center">Where:</td>
-<td>
-<select name="search_button" size="1">
-<option value="FN" selected>cnnfn</option>
-<option value="WEB">the web</option>
-</select>
-</td>
-</tr>
-
-<tr>
-<td>&nbsp;</td>
-<td align="center"><input type="submit" name="submit"></td>
-</tr>
-
-</table>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug45095.html b/layout/html/tests/formctls/bugs/bug45095.html
deleted file mode 100644
index 31210fe39e0c..000000000000
--- a/layout/html/tests/formctls/bugs/bug45095.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<BODY>
-<div style="position: absolute;top: 100px;left:100px;opacity:0.5;background-color:red;">
-<form>
-<input type="text">
-</form>
-</div>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug45152.html b/layout/html/tests/formctls/bugs/bug45152.html
deleted file mode 100644
index f07cf7fc9b68..000000000000
--- a/layout/html/tests/formctls/bugs/bug45152.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Untitled</title>
-</head>
-<body>
-<H1>Testcase to demonstrate line-height problem with horizontal scrollbar</H1>
-<P>
-	<TEXTAREA style="overflow:auto; line-height:31px;" CLASS="f2 std-subhdr-inp-area" COLS="20" ROWS="4"></TEXTAREA>
-	<TEXTAREA style="overflow:auto; line-height:31px;" CLASS="f2 std-subhdr-inp-area" COLS="20" ROWS="4">Please at least two lines, with the first line larger than the width of the textarea</TEXTAREA>
-</P>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug45562.html b/layout/html/tests/formctls/bugs/bug45562.html
deleted file mode 100644
index eac5817bcc60..000000000000
--- a/layout/html/tests/formctls/bugs/bug45562.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<table>
-<tr>
-<td><input value="">
-<input type=radio></td>
-</tr>
-</table>
-
diff --git a/layout/html/tests/formctls/bugs/bug45625.html b/layout/html/tests/formctls/bugs/bug45625.html
deleted file mode 100644
index 974dde9c1aeb..000000000000
--- a/layout/html/tests/formctls/bugs/bug45625.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-</head>
-<body>
-<input style="vertical-align:top" type="checkbox"><label style="white-space:nowrap">Make the window smaller than this label to see the problem (if it's not already visible). Ok this string must be very long. asssssssssssssssssssssssssssssssssssssssssssassssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss</LABEL>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug45670.html b/layout/html/tests/formctls/bugs/bug45670.html
deleted file mode 100644
index d1163efe6a79..000000000000
--- a/layout/html/tests/formctls/bugs/bug45670.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Bug 45670</TITLE>
-</HEAD>
-<BUTTON type="submit">
-<TABLE border="20">
-	<TR>
-		<TD>			CELL 1
-		</TD>
-	</TR>
-</TABLE></BUTTON>
-<BODY>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug46099.html b/layout/html/tests/formctls/bugs/bug46099.html
deleted file mode 100644
index 3ead393b52b9..000000000000
--- a/layout/html/tests/formctls/bugs/bug46099.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE></TITLE>
-<STYLE>
-*:focus::-moz-display-comboboxcontrol-frame {
-	background-color: #FFCC99 !important;
-}
-</STYLE>
-</HEAD>
-<BODY>
-<H3>Very strange effect when using *:focus::-moz-display-comboboxcontrol-frame</H3>
-<P>Move the pointer into and out of the table</P>
-<P>Move the pointer over the controls in the second table and compare. The only difference between both tables is, that the first one has "align=left"</P>
-	<TABLE border align="left">
-		<TR>
-			<TD>
-				<SELECT>
-					<OPTION VALUE="1">genau</OPTION>
-					<OPTION VALUE="2">annährend </OPTION>
-					<OPTION VALUE="3">so ungefähr</OPTION>
-				</SELECT>
-				<INPUT type="text" maxlength="60">
-			</TD>
-		</TR>
-	</TABLE><BR>
-	<TABLE border>
-		<TR>
-			<TD>
-				<SELECT>
-					<OPTION VALUE="1">genau</OPTION>
-					<OPTION VALUE="2">annährend </OPTION>
-					<OPTION VALUE="3">so ungefähr</OPTION>
-				</SELECT>
-				<INPUT type="text" maxlength="60">
-			</TD>
-		</TR>
-	</TABLE>
-<SELECT>
-	<OPTION VALUE="1">genau</OPTION>
-	<OPTION VALUE="2">annährend </OPTION>
-	<OPTION VALUE="3">so ungefähr</OPTION>
-</SELECT>
-<INPUT type="text" maxlength="60">
-<P>Please don't tell me, that I shouldn't use internal classes. I was just searchig for workarounds to ohter SELECT-related problems and thought, that this might be a bug.</P>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug46224.html b/layout/html/tests/formctls/bugs/bug46224.html
deleted file mode 100644
index 81ee905bcc0a..000000000000
--- a/layout/html/tests/formctls/bugs/bug46224.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html><head><title>Testcase for bug </title>
-<style>.ok{color:green} .err{color:red}</style>
-</head>
-<body bgcolor="#FFDD66" text="#000000">
-
-<FORM>
-<TABLE border=1>
-  <TR><TH>&nbsp;</TH><TH>SIZE<BR>attribute</TH><TH>INPUT TYPE="TEXT" of that SIZE</TH>
-      <TH>IE 5.00</TH><TH>NS 4.72</TH><TH>M17 (20000720)</TH></TR>
-  <TR><TD>1.</TD><TD>SIZE="20"   </TD><TD><INPUT TYPE="TEXT" SIZE="20"> </TD>
-      <TD>20</TD><TD>20</TD><TD class=ok>20</TD></TR>
-  <TR><TD>2.</TD><TD>SIZE="1"    </TD><TD><INPUT TYPE="TEXT" SIZE="1">  </TD>
-      <TD>1 </TD><TD>1 </TD><TD class=ok>1 </TD></TR>
-  <TR><TD>3.</TD><TD>SIZE="0"    </TD><TD><INPUT TYPE="TEXT" SIZE="0">  </TD>
-      <TD>20</TD><TD>1 </TD><TD class=ok>0 </TD></TR>
-  <TR><TD>4.</TD><TD>          </TD> <TD><INPUT TYPE="TEXT">           </TD>
-      <TD>20</TD><TD>20</TD><TD class=ok>20 </TD></TR>
-  <TR><TD>5.</TD><TD>SIZE="10XYZ"</TD><TD><INPUT TYPE="TEXT" SIZE="10XYZ"></TD>
-      <TD>20</TD><TD>10</TD><TD class=ok>10</TD></TR>
-  <TR><TD>6.</TD><TD>SIZE="10.99"</TD><TD><INPUT TYPE="TEXT" SIZE="10.99"></TD>
-      <TD>10</TD><TD>10</TD><TD class=ok>10</TD></TR>
-  <TR><TD>7.</TD><TD>SIZE="XYZ"</TD>  <TD><INPUT TYPE="TEXT" SIZE="XYZ"></TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>0 </TD></TR>
-  <TR><TD>8.</TD><TD>SIZE="NaN"</TD>  <TD><INPUT TYPE="TEXT" SIZE="NaN"></TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>&lt;0 ?!? </TD></TR>
-  <TR><TD>9.</TD><TD>SIZE=""   </TD>  <TD><INPUT TYPE="TEXT" SIZE="">   </TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>0 </TD></TR>
-  <TR><TD>10.</TD><TD>SIZE="#!$"</TD>  <TD><INPUT TYPE="TEXT" SIZE="#!$"></TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>0 </TD></TR>
-  <TR><TD>11.</TD><TD>SIZE      </TD> <TD><INPUT TYPE="TEXT" SIZE>      </TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>0 </TD></TR>
-  <TR><TD>12.</TD><TD>SIZE="-1" </TD> <TD><INPUT TYPE="TEXT" SIZE="-1"> </TD>
-      <TD>20</TD><TD>1 </TD><TD class=err>0 </TD></TR>
-</TABLE>
-</FORM>
-
-<P>Last three columns show equivalent SIZE number on Windows 98 SE. (ie SIZE="" results in a field
-as wide as a SIZE=20 in IE and as wide as a SIZE=1 field in NS. It does not reflect how many characters
-that actually fits.)
-<P>Notice how Mozilla (2000-07-20) treats "NaN" differently from other invalid values like "XYZ" for example.
-<P>I think Mozilla does the right thing in the first 6 cases,<BR>
-bug the rest should be treated as SIZE=20 (as IE5 does.)
-
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug48237.html b/layout/html/tests/formctls/bugs/bug48237.html
deleted file mode 100644
index e0f853ca7877..000000000000
--- a/layout/html/tests/formctls/bugs/bug48237.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
-<head>
-<title>Testcase, bug 48237</title>
-<style type="text/css">
-
-div {
-  float: right;
-  border: 1px solid red;
-  width: 40%;
-}
-
-</style>
-</head>
-
-<body>
-
-<div>This is a float:right div.</div>
-
-<select>
-    <option>one</option>
-    <option>two</option>
-    <option>three</option>
-</select>
-
-<hr clear="all">
-
-<div>This is a float:right div.</div>
-
-<select size=3>
-    <option>one</option>
-    <option>two</option>
-    <option>three</option>
-</select>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug50419.html b/layout/html/tests/formctls/bugs/bug50419.html
deleted file mode 100644
index 7acea857afe5..000000000000
--- a/layout/html/tests/formctls/bugs/bug50419.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<style>
-TABLE
-{
-	cursor: text;
-	border:	1px solid grey;
-	border-spacing:	0px;
-	border-collapse: collapse;
-	font-family : Tahoma;
-	font-size : 10pt;
-}
-TD
-{
-	border:	1px solid grey;
-	padding-left:3px;
-	width:130px;
-	height:24px;
-	text-align:center;
-}
-INPUT
-{
-	width:125px;
-	font-family : Tahoma;
-	font-size:10pt;
-	color:#0000ff;
-	height:19px;
-	padding-left:0px;
-	margin-top:1px;
-	text-align:center;
-	border-style:solid;
-}
-</style>
-<script>
-function insertField()
-{
-	var oTd = document.getElementById("td1");
-	var oTf = document.createElement("input");
-	var oText = oTd.firstChild;
-	oTf.value = "a really, really, really, really, really long string that will never fit in the textfield.";
-	oTd.replaceChild(oTf, oText);
-}
-</script>
-</head>
-
-<body>
-<table>
-<tr><td>some more filler here</td><td id="td1">this will be replaced</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-<tr><td>some more filler here</td><td>some more filler here</td></tr>
-</table>
-<br>
-<form>
-<input type="button" value="Isert textfield in upper table cell" onclick="insertField();"
-		style="width:200px;">
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug53259-1.html b/layout/html/tests/formctls/bugs/bug53259-1.html
deleted file mode 100644
index fb6d27d1041c..000000000000
--- a/layout/html/tests/formctls/bugs/bug53259-1.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div style="border: 1px solid blue; min-width: 200px;">
-
-  Div 1: min-width:200px
-
-</div>
-
-<br>
-
-<div style="border: 1px solid blue; width: 200px;">
-
-  Div 2: max-width:200px max-width:200px max-width:200px max-width:200px 
-max-width:200px
-
-</div>
-
-<br>
-
-<div style="border: 1px solid blue; max-width: 200px;">
-
-  Div 3: max-width:200px max-width:200px max-width:200px max-width:200px 
-max-width:200px
-
-</div>
-
-<br>
-<br>
-
-Div 4: min-width: 50px; max-width: 200px;
-<div style="border: 1px solid blue; min-width: 50px; max-width: 200px;">
-
-  Div 4: 
-
-</div>
-
-<br>
-<br>
-<form>
-&lt;input type=text style="min-width:200px;"><br>
-<input type=text style="min-width:200px;">
-</form>
diff --git a/layout/html/tests/formctls/bugs/bug53259-2.html b/layout/html/tests/formctls/bugs/bug53259-2.html
deleted file mode 100644
index feaa8b13d3bf..000000000000
--- a/layout/html/tests/formctls/bugs/bug53259-2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-<had>
-<style>
-input, select, label {
-  min-width: 100px;
-  max-width: 200px;
-}
-</style>
-<BODY>
-<form>
-<div style="width:100px;background-color:#8888FF">100 pixels width</div>
-<div style="width:200px;background-color:#88FF88">200 pixels width</div>
-<div style="min-width: 100px;max-width: 200px;background-color:#FF8888">Div with min/max</div>
-<input type=text><br>
-<input type=text size=50><br>
-<select>
-<option>One
-</select><br>
-<select size=5>
-<option>One
-</select><br>
-<label style="background-color:#88FF88">Label</label>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug53259-3.html b/layout/html/tests/formctls/bugs/bug53259-3.html
deleted file mode 100644
index 0b5044e5175d..000000000000
--- a/layout/html/tests/formctls/bugs/bug53259-3.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-  <title>min-width/max-width on label and inputs</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-	<style type="text/css">
-
-		label, input, textarea, select {
-			width: 100%;
-			min-width: 300px;
-			max-width: 500px;
-			display: block;
-		}
-
-		label {
-			border: 1px dashed red;
-		}
-
-	</style>
-</head>
-
-<body>
-
-	<p>All the lables (with the red and dashed border) and I should be at least 300px, at most 500px wide.</p>
-
-	<div style="width:300px;background:red;">This is fixed at 300px wide</div>
-	<div style="width:500px;background:green;">This is fixed at 500px wide</div>
-
-	<p>
-		<label for="a">Text:</label> <input id="a" type="text" />
-	</p>
-	<p>
-		<label for="b">Textarea:</label> <textarea id="b" rows="5" cols="2"></textarea>
-	</p>
-	<p>
-		<label for="c">Checkbox:</label> <input type="checkbox" id="c" />
-	</p>
-	<p>
-		<label for="d">Radio:</label> <input type="radio" id="d" />
-	</p>
-	<p>
-		<label for="e">Select:</label> <select id="e"><option>One</option><option>Two</option></select>
-	</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug55063.html b/layout/html/tests/formctls/bugs/bug55063.html
deleted file mode 100644
index 41dd91b01e13..000000000000
--- a/layout/html/tests/formctls/bugs/bug55063.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<BODY>
-<FORM>
-<SELECT SIZE="10">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-<OPTION>7
-<OPTION>8
-<OPTION>9
-<OPTION>10
-<OPTION>11
-<OPTION>12
-</SELECT>
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug58190.html b/layout/html/tests/formctls/bugs/bug58190.html
deleted file mode 100644
index b7e9b3b4f019..000000000000
--- a/layout/html/tests/formctls/bugs/bug58190.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<html>
-<style>
-body {background-color:white;}
-span {background-color:pink;}
-span.class1 {vertical-align:bottom; background-color:lightgray; color:blue;}
-p.correct {color: darkgreen;}
-p.buggy {color: red;}
-</style>
-<body>
-
-<h3>
-Simple text
-</h3>
-<p class=correct>Correct: the bottom of all the X's is aligned</p>
-<p>
-<span style="font-size: 9px">X9X</span>
-<span style="font-size:12px">X12X</span>
-<span style="font-size:16px">X16X</span>
-<span style="font-size:24px">X24X</span>
-<span style="font-size:36px">X36X</span>
-<span style="font-size:48px">X48X</span>
-</p>
-<hr>
-
-<h3>
-Simple text with "vertical-align:bottom"
-</h3>
-<p class=correct>Correct: the bottom of all the text boxes is aligned</p>
-<p>
-<span style="font-size: 9px; vertical-align:bottom;">X9X</span>
-<span style="font-size:12px; vertical-align:bottom;">X12X</span>
-<span style="font-size:16px; vertical-align:bottom;">X16X</span>
-<span style="font-size:24px; vertical-align:bottom;">X24X</span>
-<span style="font-size:36px; vertical-align:bottom;">X36X</span>
-<span style="font-size:48px; vertical-align:bottom;">X48X</span>
-</p>
-<hr>
-
-<h3>
-html4 buttons with "vertical-align:bottom"
-</h3>
-<p class=correct>Correct: the bottom of the X's from the normal text is aligned, and the bottom of the
-buttons is aligned with the bottom of the entire line box.</p>
-<p>
-<button style="font-size:9px; vertical-align:bottom;">X9X</button>
-<span style="font-size:12px">X12X</span>
-<button style="font-size:16px; vertical-align:bottom;">X16X</button>
-<span style="font-size:24px">X24X</span>
-<button style="font-size:36px; vertical-align:bottom;">X36X</button>
-<span style="font-size:48px">X48X</span>
-</p>
-<p>
-<span style="font-size:9px">X9X</span>
-<button style="font-size:12px; vertical-align:bottom;">X12X</button>
-<span style="font-size:16px">X16X</span>
-<button style="font-size:24px; vertical-align:bottom;">X24X</button>
-<span style="font-size:36px">X36X</span>
-<button style="font-size:48px; vertical-align:bottom;">X48X</button>
-</p>
-<p>
-<span style="font-size: 9px">X9X</span>
-<button style="font-size:9px; vertical-align:bottom;">X9X</button>
-<button style="font-size:12px; vertical-align:bottom;">X12X</button>
-<button style="font-size:16px; vertical-align:bottom;">X16X</button>
-<button style="font-size:24px; vertical-align:bottom;">X24X</button>
-<button style="font-size:36px; vertical-align:bottom;">X36X</button>
-<button style="font-size:48px; vertical-align:bottom;">X48X</button>
-<span style="font-size:48px">X48X</span>
-</p>
-<hr>
-
-
-<h3>
-Mixing text <span class=class1>with</span> and without <span class=class1>"vertical-align:bottom"</span>
-</h3>
-<p class=correct>Correct: the bottom of normal X's is aligned, and the bottom of the
-<span class=class1>styled boxes</span> is aligned with the bottom of the line box.</p>
-<p>
-<span style="font-size: 9px;" class=class1>X9X</span>
-<span style="font-size:12px">X12X</span>
-<span style="font-size:16px;" class=class1>X16X</span>
-<span style="font-size:24px">X24X</span>
-<span style="font-size:36px;" class=class1>X36X</span>
-<span style="font-size:48px">X48X</span>
-</p>
-<p>
-<span style="font-size: 9px">X9X</span>
-<span style="font-size:12px;" class=class1>X12X</span>
-<span style="font-size:16px">X16X</span>
-<span style="font-size:24px;" class=class1>X24X</span>
-<span style="font-size:36px">X36X</span>
-<span style="font-size:48px;" class=class1>X48X</span>
-</p>
-<p>
-<span style="font-size: 9px">X9X</span>
-<span style="font-size: 9px;" class=class1>X9X</span>
-<span style="font-size:12px;" class=class1>X12X</span>
-<span style="font-size:16px;" class=class1>X16X</span>
-<span style="font-size:24px;" class=class1>X24X</span>
-<span style="font-size:36px;" class=class1>X36X</span>
-<span style="font-size:48px;" class=class1>X48X</span>
-<span style="font-size:48px">X48X</span>
-</p>
-<hr>
-
-<h3>
-html4 buttons
-</h3>
-<p class=buggy>Bug: the bottom of the buttons is aligned with the baseline of the text.
-We should have instead the baseline of the buttons aligned with the baseline of the text.
-</p>
-<p>
-<button style="font-size:9px">X9X</button>
-<span style="font-size:12px">X12X</span>
-<button style="font-size:16px">X16X</button>
-<span style="font-size:24px">X24X</span>
-<button style="font-size:36px">X36X</button>
-<span style="font-size:48px">X48X</span>
-</p>
-<p>
-<span style="font-size:9px">X9X</span>
-<button style="font-size:12px">X12X</button>
-<span style="font-size:16px">X16X</span>
-<button style="font-size:24px">X24X</button>
-<span style="font-size:36px">X36X</span>
-<button style="font-size:48px">X48X</button>
-</p>
-<p>
-<button style="font-size:9px">X9X</button>
-<button style="font-size:12px">X12X</button>
-<button style="font-size:16px">X16X</button>
-<button style="font-size:24px">X24X</button>
-<button style="font-size:36px">X36X</button>
-<button style="font-size:48px">X48X</button>
-<span style="font-size:48px">X48X</span>
-</p>
-<hr>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug58220.html b/layout/html/tests/formctls/bugs/bug58220.html
deleted file mode 100644
index d955b95a0e83..000000000000
--- a/layout/html/tests/formctls/bugs/bug58220.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<HTML>
-   <BODY>
-      <FORM name="frm">
-         <SELECT name="slct" id="slct" size="3" style="width: 0px; height: 0px">
-         </SELECT>
-
-      </FORM>
-   </BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug58299.html b/layout/html/tests/formctls/bugs/bug58299.html
deleted file mode 100644
index d45ebe4eec64..000000000000
--- a/layout/html/tests/formctls/bugs/bug58299.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-<title>testcase</title>
-</head>
-<body>
-
-
-<form method=get action="search">
-<table>
-<tr>
-<td>
-<p>form outside table</p>
-<input type="text" value="text in here">
-<input type="submit">
-</td>
-</tr>
-</table>
-</form>
-
-<table>
-<tr>
-<td>
-<p>form nested inside table cell with the form controls</p>
-<form method=get action="search">
-<input type="text" value="text in here">
-<input type="submit">
-</form>
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug59294.html b/layout/html/tests/formctls/bugs/bug59294.html
deleted file mode 100644
index 596d9a72dd00..000000000000
--- a/layout/html/tests/formctls/bugs/bug59294.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<TITLE>Form Style Test</TITLE>
-<FORM>
-    <INPUT style="font: 12pt monospace">
-    <SELECT style="font: 12pt monospace">
-        <OPTION>An Option
-    </SELECT>
-    <BUTTON style="font: 12pt monospace">A Button</BUTTON>
-    <INPUT type="button" style="font: 12pt monospace" value="An Input">
-</FORM>
diff --git a/layout/html/tests/formctls/bugs/bug62568.html b/layout/html/tests/formctls/bugs/bug62568.html
deleted file mode 100644
index 316bc0266df9..000000000000
--- a/layout/html/tests/formctls/bugs/bug62568.html
+++ /dev/null
@@ -1,301 +0,0 @@
-<HTML>
-<head>
-<script>
-function ReplaceComponentSelect( aForm, anArray ) {
-    for ( var i = 0; i < anArray.length; i++ ) {
-        aForm.Component.options[i].text  = anArray[i];
-        aForm.Component.options[i].value = anArray[i];
-    }
-    if ( aForm.Component.length > anArray.length ) {
-        for ( ; i < aForm.Component.length; i++ ) {
-            aForm.Component.options[i].text = "";
-            aForm.Component.options[i].value = "";
-        }
-    }   
-}
-
-
-function UpdateComponentList(aForm) {
-
-   var product = aForm.Product.selectedIndex;
-    aForm.status.value = "working.....";
-    switch ( product ) {
-        case 0:
-        ReplaceComponentSelect( aForm, BrowserComponentArray );
-        break;
-        
-      case 1:
-        ReplaceComponentSelect( aForm, MailNewsComponentArray );
-        break;
-        
-        case 2:
-        ReplaceComponentSelect( aForm, DocumentationComponentArray );
-        break;
-        
-        case 3:
-        ReplaceComponentSelect( aForm, L10nComponentArray );
-        break;
-    }
-    aForm.status.value = "Done.";
-}
-
-var MailNewsComponentArray = [
-"Choose One...",
-"Account Manager", "Address Book", "Composition", "Filters",
-"Internationalization", "Localization", "Mail Back End",
-"Mail Database", "Mail Window Front End", "MIME", "Networking - General",
-"Networking - IMAP", "Networking - News", "Networking - POP", "Networking - SMTP",
-"Offline", "Printing", "Profile Migration", "Search", "Security: General", "Subscribe"
-];
-
-var BrowserComponentArray = [
-"Choose One...",
-"ActiveX Wrapper", "Bookmarks", "Browser-General", "Build Config",
-"chatzilla", "Compositor", "Cookies", "DOM Level 0", "DOM Level 1", "DOM Level 2",
-"DOM to Text Conversion", "DOM Viewer", "Editor", "Embedding APIs",
-"Embedding: Docshell", "Evangelism", "Event Handling", "Form Manager", "Form Submission", 
-"GTK Embedding Widget", "Help", "History: Global", "History: Session", "History: URLBar", 
-"HTML Element", "HTML Form Controls", "HTMLFrames",
-"HTMLTables", "Image Conversion Library", "ImageLib", "Installer",
-"Installer: XPI Packages", "Installer: XPInstall Engine",
-"Internationalization", "Java APIs for DOM", "Java APIs to WebShell",
-"Java to XPCOM Bridge", "Java-Implemented Plugins", "JavaScript Debugger",
-"Javascript Engine", "Keyboard Navigation", "Layout", "Live Connect", "Localization", 
-"MathML", "MozillaTranslator", "Networking", "Networking: Cache", 
-"Networking: File", "Networking: FTP", "Networking: HTTP", "OJI", "Parser",
-"Password Manager", "PICS", "Plug-ins", "Preferences", "Preferences: Backend", "Printing",
-"Profile Manager BackEnd", "Profile Manager FrontEnd", "Profile Migration",
-"RDF", "Search", "Security: CAPS", "Security: Crypto", "Security: General", 
-"Selection", "Sidebar", "Skinability", "Style System",
-"SVG", "Talkback", "Themes", "Threading", "User Interface: Design Feedback",
-"Viewer App", "Views", "XBL", "XML", "XP Apps", "XP Apps: Cmd-line Features",
-"XP Apps: GUI Features", "XP Miscellany", "XP Toolkit/Widgets",
-"XP Toolkit/Widgets: Menus", "XP Toolkit/Widgets: Trees", "XP Toolkit/Widgets: XUL", 
-"XP Utilities", "XPCOM", "XPCOM Registry",
-"XPConnect", "xpidl", "XSLT" ];
-
-var DocumentationComponentArray = [
-"Choose One...",
-"Mozilla Developer", "User", "Web Developer" ];
-
-var L10nComponentArray = [
-"Choose One...",
-"Bosnian/bs-BA", "Bulgarian/bg-BG", "Danish/da-DK", "Dutch/nl", "French/fr-FR", 
-"German-Austria/de-AT", "Italian/it-IT", "Norwegian/nno-no" ];
-</script>
-</head>
-
-<BODY>
-
-<form name=BugInfoForm>
-<select name="Product" onChange="UpdateComponentList(this.form)" size=3>
-    <option name="Browser" SELECTED value="Browser">
-    Browser or Editor (aka Composer)
-    <option name="MailNews" VALUE="MailNews">
-    Mail or News
-    <option name="Documentation" value="Documentation">
-    Documentation
-    <option name="Browser+Localizations" value="Browser+Localizations">
-    Language Packs or Localized Builds
-</select>
-<br>
-    <select name="Component" size=1 >
-    <option value="NOTSELECTED">
-    Choose One...
-    <OPTION VALUE="ActiveX Wrapper">
-    ActiveX Wrapper
-    <OPTION VALUE="Bookmarks">
-    Bookmarks
-    <OPTION VALUE="Browser-General">
-    Browser-General
-    <OPTION VALUE="Build Config">
-    Build Config
-    <OPTION VALUE="chatzilla">
-    chatzilla
-    <OPTION VALUE="Compositor">
-    Compositor
-    <OPTION VALUE="Cookies">
-    Cookies
-    <OPTION VALUE="DOM Level 0">
-    DOM Level 0
-    <OPTION VALUE="DOM Level 1">
-    DOM Level 1
-    <OPTION VALUE="DOM Level 2">
-    DOM Level 2
-    <OPTION VALUE="DOM to Text Conversion">
-    DOM to Text Conversion
-    <OPTION VALUE="DOM Viewer">
-    DOM Viewer
-    <OPTION VALUE="Editor">
-    Editor
-    <OPTION VALUE="Embedding APIs">
-    Embedding APIs
-    <OPTION VALUE="Embedding: Docshell">
-    Embedding: Docshell
-    <OPTION VALUE="Evangelism">
-    Evangelism
-    <OPTION VALUE="Event Handling">
-    Event Handling
-    <OPTION VALUE="Form Manager">
-    Form Manager
-    <OPTION VALUE="Form Submission">
-    Form Submission
-    <OPTION VALUE="GTK Embedding Widget">
-    GTK Embedding Widget
-    <OPTION VALUE="Help">
-    Help
-    <OPTION VALUE="History: Global">
-    History: Global
-    <OPTION VALUE="History: Session">
-    History: Session
-    <OPTION VALUE="History: URLBar">
-    History: URLBar
-    <OPTION VALUE="HTML Element">
-    HTML Element
-    <OPTION VALUE="HTML Form Controls">
-    HTML Form Controls
-    <OPTION VALUE="HTMLFrames">
-    HTMLFrames
-    <OPTION VALUE="HTMLTables">
-    HTMLTables
-    <OPTION VALUE="Image Conversion Library">
-    Image Conversion Library
-    <OPTION VALUE="ImageLib">
-    ImageLib
-    <OPTION VALUE="Installer">
-    Installer
-    <OPTION VALUE="Installer: XPI Packages">
-    Installer: XPI Packages
-    <OPTION VALUE="Installer: XPInstall Engine">
-    Installer: XPInstall Engine
-    <OPTION VALUE="Internationalization">
-    Internationalization
-    <OPTION VALUE="Java APIs for DOM">
-    Java APIs for DOM
-    <OPTION VALUE="Java APIs to WebShell">
-    Java APIs to WebShell
-    <OPTION VALUE="Java to XPCOM Bridge">
-    Java to XPCOM Bridge
-    <OPTION VALUE="Java-Implemented Plugins">
-    Java-Implemented Plugins
-    <OPTION VALUE="JavaScript Debugger">
-    JavaScript Debugger
-    <OPTION VALUE="Javascript Engine">
-    Javascript Engine
-    <OPTION VALUE="Keyboard Navigation">
-    Keyboard Navigation
-    <OPTION VALUE="Layout">
-    Layout
-    <OPTION VALUE="Live Connect">
-    Live Connect
-    <OPTION VALUE="Localization">
-    Localization
-    <OPTION VALUE="MathML">
-    MathML
-    <OPTION VALUE="MozillaTranslator">
-    MozillaTranslator
-    <OPTION VALUE="Networking">
-    Networking
-    <OPTION VALUE="Networking: Cache">
-    Networking: Cache
-    <OPTION VALUE="Networking: File">
-    Networking: File
-    <OPTION VALUE="Networking: FTP">
-    Networking: FTP
-    <OPTION VALUE="Networking: HTTP">
-    Networking: HTTP
-    <OPTION VALUE="OJI">
-    OJI
-    <OPTION VALUE="Parser">
-    Parser
-    <OPTION VALUE="Password Manager">
-    Password Manager
-    <OPTION VALUE="PICS">
-    PICS
-    <OPTION VALUE="Plug-ins">
-    Plug-ins
-    <OPTION VALUE="Preferences">
-    Preferences
-    <OPTION VALUE="Preferences: Backend">
-    Preferences: Backend
-    <OPTION VALUE="Printing">
-    Printing
-    <OPTION VALUE="Profile Manager BackEnd">
-    Profile Manager BackEnd
-    <OPTION VALUE="Profile Manager FrontEnd">
-    Profile Manager FrontEnd
-    <OPTION VALUE="Profile Migration">
-    Profile Migration
-    <OPTION VALUE="RDF">
-    RDF
-    <OPTION VALUE="Search">
-    Search
-    <OPTION VALUE="Security: CAPS">
-    Security: CAPS
-    <OPTION VALUE="Security: Crypto">
-    Security: Crypto
-    <OPTION VALUE="Security: General">
-    Security: General
-    <OPTION VALUE="Selection">
-    Selection
-    <OPTION VALUE="Sidebar">
-    Sidebar
-    <OPTION VALUE="Skinability">
-    Skinability
-    <OPTION VALUE="Style System">
-    Style System
-    <OPTION VALUE="SVG">
-    SVG
-    <OPTION VALUE="Talkback">
-    Talkback
-    <OPTION VALUE="Themes">
-    Themes
-    <OPTION VALUE="Threading">
-    Threading
-    <OPTION VALUE="User Interface: Design Feedback">
-    User Interface: Design Feedback
-    <OPTION VALUE="Viewer App">
-    Viewer App
-    <OPTION VALUE="Views">
-    Views
-    <OPTION VALUE="XBL">
-    XBL
-    <OPTION VALUE="XML">
-    XML
-    <OPTION VALUE="XP Apps">
-    XP Apps
-    <OPTION VALUE="XP Apps: Cmd-line Features">
-    XP Apps: Cmd-line Features
-    <OPTION VALUE="XP Apps: GUI Features">
-    XP Apps: GUI Features
-    <OPTION VALUE="XP Miscellany">
-    XP Miscellany
-    <OPTION VALUE="XP Toolkit/Widgets">
-    XP Toolkit/Widgets
-    <OPTION VALUE="XP Toolkit/Widgets: Menus">
-    XP Toolkit/Widgets: Menus
-    <OPTION VALUE="XP Toolkit/Widgets: Trees">
-    XP Toolkit/Widgets: Trees
-    <OPTION VALUE="XP Toolkit/Widgets: XUL">
-    XP Toolkit/Widgets: XUL
-    <OPTION VALUE="XP Utilities">
-    XP Utilities
-    <OPTION VALUE="XPCOM">
-    XPCOM
-    <OPTION VALUE="XPCOM Registry">
-    XPCOM Registry
-    <OPTION VALUE="XPConnect">
-    XPConnect
-    <OPTION VALUE="xpidl">
-    xpidl
-    <OPTION VALUE="XSLT">
-    XSLT
-</SELECT>
-<br>
-<input type=text name=status>
-</form>
-
-</BODY>
-</HTML>
-
-
diff --git a/layout/html/tests/formctls/bugs/bug62954.html b/layout/html/tests/formctls/bugs/bug62954.html
deleted file mode 100644
index 67afdf05a3f8..000000000000
--- a/layout/html/tests/formctls/bugs/bug62954.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-
-<body bgcolor=#c0d0f0>
-<FORM ACTION="http://pollmann.net/echo.cgi">
-<select size=1 name=combo>
-  <option>One</option>
-  <option disabled>Two</option>
-  <option>Three</option>
-  <option>Four</option>
-  <option>Five</option>
-  <option>Six</option>
-</select>
-
-<br><input type=submit>
-</form>
-<br>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug63309.html b/layout/html/tests/formctls/bugs/bug63309.html
deleted file mode 100644
index e7e80ce4c089..000000000000
--- a/layout/html/tests/formctls/bugs/bug63309.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Rechtsfragen - Rechtsfragen mit Pfiff</title>
-
-<style type="text/css">
-<!--
-form {
-	display: inline;
-	}
-// -->
-</style>
-</head>
-
-<body>
-
-<!-- outer table -->
-<table	border	= 1>
-<tr>
-
-<td> a </td>
-
-<td>
-<form	action	= "http://www.fake.net/submit1.php"
-	method	= POST>
-<!-- inner table -->
-<table	 border	= 1>
-
-<tr>
-<td>Name:</td>
-<td><input
-	type	= text
-	name	= Author
-	size	= 32
-	value	= ""
-	maxlength	= 32></td>
-</tr>
-
-<tr>
-<td colspan=2>Rechtsauskunft:<br>
-<textarea
-	name	= Content
-	rows	= 10
-	cols	= 50></textarea>
-<br><small>* HTML Tags werden nicht übersetzt.</small><br><small>* Deine Emailadresse wird nicht öffentlich.</small></td>
-</tr>
-
-<tr>
-<td	colspan	= 2
-	align	= center>
-<input	type	= submit
-	value	= "Catch me">
-</td>
-</tr>
-
-</table>
-<!-- inner table end -->
-</form>
-
-</td>
-</tr>
-
-</table>
-<!-- outer table end -->
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug65275.html b/layout/html/tests/formctls/bugs/bug65275.html
deleted file mode 100644
index f46f5d3ad96c..000000000000
--- a/layout/html/tests/formctls/bugs/bug65275.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Abbey National - register</TITLE>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY BGCOLOR="#940039" TEXT="#ffffff" LINK="#ffffff" VLINK="#ffffff" ALINK="#ffffff" LEFTMARGIN="0" RIGHTMARGIN="0" TOPMARGIN="0" BOTTOMMARGIN="0" MARGINHEIGHT="0" MARGINWIDTH="0" >
-
-<SCRIPT>
-function fillBIN(type)
-{
-    if (type == "multifunction")
-    {
-        document.loginForm.cardnumber.value="454742";
-    }
-    else
-    {
-        alert("Invalid argument");   
-    }
-}
-
-</SCRIPT>
-
-<INPUT TYPE="hidden" NAME="action" VALUE="authenticate">
-
-        <TABLE border="0" cellpadding="0" cellspacing="0">
-
-        <TR>
-
-                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD>
-                <TD><IMG border="0" height="20" src="trans.gif" width="1"></TD>
-                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD></TR>
-
-        <TR>
-
-                <TD><IMG border="0" height="1" src="trans.gif" width="27"></TD>
-        <TD><p><FONT color="white" face="arial, helvetica, swiss" size="2"><b>Please click on the card you would like to use for your e-banking session and then complete the details below.</b></FONT>
-                <center>
-                <TABLE border="0">
-        <tr>
-                        <td>
-                                <A href="javascript:fillBIN('multifunction')"><img src="card03.gif" border="0"></a>
-                        </td>
-                        <td>&nbsp;
-                        </td>
-        </tr>
-        <TR>
-
-                        <TD align="center"><FONT color="white" face="arial, helvetica, swiss" size="2" ><b><A href="javascript:fillBIN('multifunction')">Multifunction Card</A></b></FONT></TD>
-        </TR>
-
-                </TABLE>
-                </center>
-
-                </TD>
-
-                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD></TR>
-
-        <TR>
-
-                <TD colspan="3"><!--<IMG border="0" height="8" src="trans.gif" width="1">-->
-                        <TABLE BORDER="0" width="509" CELLPADDING="0" CELLSPACING="0">
-                        <TR>
-                                <TD COLSPAN="4"><IMG border="0" height="8" src="trans.gif" width="1"></TD></TR>
-                        <TR>
-                                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD>
-                                <TD ALIGN="right" VALIGN="bottom"><FONT FACE="Arial, Helvetica, Swiss" SIZE="2"><B>Card Number</B></FONT></TD>
-<!--Card Number Input Box-->
-                        <TD align="middle" VALIGN="bottom">
-                        
-                        <input name="cardnumber" maxlength="16">
-                        
-                        </TD>
-                                <TD><IMG border="0" height="8" src="trans.gif" width="5"></TD></TR>
-                        <TR>
-                                <TD COLSPAN="4"><IMG border="0" height="8" src="trans.gif" width="1"></TD></TR>
-                        <TR>
-                                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD>
-                                <TD ALIGN="right" VALIGN="bottom"><FONT FACE="Arial, Helvetica, Swiss" SIZE="2"><B>e-banking&nbsp;Passcode</B></FONT></TD>
-<!-- Passcode Input Box -->
-                                <TD align="middle" VALIGN="bottom">
-                                
-                                <input type="password" maxlength="16" name="password">
-                                
-                                </TD>
-                                <TD><IMG border="0" height="1" src="trans.gif" width="5"></TD></TR>
-
-                        <TR>
-
-                                <TD COLSPAN="4"><IMG border="0" height="8" src="trans.gif" width="1"></TD></TR>
-
-
-                        <TR>
-<!-- e-banking registration box -->
-                                <TD><IMG border="0" height="8" src="trans.gif" width="5"></TD>
-                                <TD ALIGN="right" VALIGN="bottom"><FONT FACE="Arial, Helvetica, Swiss" SIZE="2"><B>e-banking&nbsp;Registration&nbsp;Number</B></FONT></TD>
-                                <TD align="middle" VALIGN="bottom">
-                                
-                                <input type="password" name="irn" maxlength="5">
-                                
-                                </TD>
-                                <TD><IMG border="0" height="8" src="trans.gif" width="5"></TD></TR>
-
-                        <TR>
-
-                                <TD COLSPAN="4"><IMG border="0" height="8" src="trans.gif" width="1"></TD></TR>
-
-</TABLE>
-        </TD>
-</TR>
-</form>
-</TABLE>
-
-
-        </BODY>
-        </HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug67207.html b/layout/html/tests/formctls/bugs/bug67207.html
deleted file mode 100644
index a93da6531dc0..000000000000
--- a/layout/html/tests/formctls/bugs/bug67207.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-	"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>test file</title>
-</head>
-
-<body>
-<form>
-<input type="file">
-<input type="text">
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug68963.html b/layout/html/tests/formctls/bugs/bug68963.html
deleted file mode 100644
index 0b58c5c89817..000000000000
--- a/layout/html/tests/formctls/bugs/bug68963.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<html>
-<head>
-<title>Option comment sample</title>
-</head>
-
-
-<p>
-Select without comments, working normally.
-<p>
-Color   
-
-<select  NAME="1" >
-<option  NAME="1"  VALUE="22802" >
-Blue
-</option>
-<option  NAME="1"  VALUE="22803" >
-Red
-</option>
-<option  NAME="1"  VALUE="22804" >
-Purple
-</option>
-</select>
-
-<p>
-The second one has comments, so the items are invisible when selected.
-<p>
-
-Color   
-
-<select  NAME="1" >
-<option  NAME="1"  VALUE="22802" >
-<!-- Start custom HTML modifications -->
-<!-- START_OPTION_TEXT -->
-Blue
-    <!-- END_OPTION_TEXT -->
-<!-- End custom HTML modifications -->
-</option><option  NAME="1"  VALUE="22803" >
-<!-- Start custom HTML modifications -->
-<!-- START_OPTION_TEXT -->
-Red
-    <!-- END_OPTION_TEXT -->
-<!-- End custom HTML modifications -->
-</option><option  NAME="1"  VALUE="22804" >
-<!-- Start custom HTML modifications -->
-<!-- START_OPTION_TEXT -->
-Purple
-    <!-- END_OPTION_TEXT -->
-<!-- End custom HTML modifications -->
-</option>
-</select>
-
-</body></html>
diff --git a/layout/html/tests/formctls/bugs/bug69984.html b/layout/html/tests/formctls/bugs/bug69984.html
deleted file mode 100644
index 2c44b95c1d60..000000000000
--- a/layout/html/tests/formctls/bugs/bug69984.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<head> <title>SELECT with size > 1 within FONT is invisible.</title>
-<body bgcolor="silver">
-<center>
-      <h3>1. SELECT with size > 1 and within FONT is
-          <font color="red">  invisible</font>.<br>
-	  (2. FONT is <font color="blue"> not used </font>
-	      for OPTIONs even for size=1)</h3>
-
-<form>
-<table border="1">
-<tr>  <td></td>
-  <td>No font</td>
-  <td>
-    <font face="Courier, monospace">
-      with font
-    </font>
-  </td>
-</tr>
-<tr>  <td>size=1(default)</td>
- <td>
-  <select name="testNoFont1">
-    <option value="1">One</option>
-    <option value="2">Two</option>
-    <option value="3">Three</option>
-    <option value="-1">------------------------</option>
-  </select>
- </td>
- <td bgcolor="blue">
-  <font face="Courier, monospace">
-    <select name="testInFont1">
-    <option value="1">One</option>
-    <option value="2">Two</option>
-    <option value="3">Three</option>
-    <option value="-1">------------------------</option>
-    </select>
-  </font>
- </td>
-</tr>
-<tr>  <td>size > 1</td>
- <td>
-  <select name="testNoFont2" size="8">
-    <option value="1">One</option>
-    <option value="2">Two</option>
-    <option value="3">Three</option>
-    <option value="-1">------------------------</option>
-  </select>
- </td>
- <td bgcolor="red">
-  <font face="Courier, monospace">
-   <select name="testNoFont2" size="8">
-    <option value="1">One</option>
-    <option value="2">Two</option>
-    <option value="3">Three</option>
-    <option value="-1">------------------------</option>
-   </select>
-  </font>
- </td>
-</tr>
-</table>
-</form>
-<img src="SELECTwithinFONT.jpeg">
-</center>
-</body>
-</html>
-
diff --git a/layout/html/tests/formctls/bugs/bug7025-1.html b/layout/html/tests/formctls/bugs/bug7025-1.html
deleted file mode 100644
index a3fd519f4671..000000000000
--- a/layout/html/tests/formctls/bugs/bug7025-1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<HTML>
-<HEAD><TITLE>Test case for bug #7025</TITLE></HEAD>
-<BODY ONLOAD="document.forms[0].elements[0].selectedIndex=4;document.forms[0].elements[1].selectedIndex=4">
-<FORM>
-<TABLE><TR><TD>
-Multiple: 
-<SELECT SIZE="2" MULTIPLE>
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-</SELECT>
-</TD><TD>
-Not Multiple: 
-<SELECT SIZE="2">
-<OPTION>1
-<OPTION>2
-<OPTION>3
-<OPTION>4
-<OPTION>5
-<OPTION>6
-</SELECT>
-</TD></TR></TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug7025-2.html b/layout/html/tests/formctls/bugs/bug7025-2.html
deleted file mode 100644
index 4f3ef19eff9f..000000000000
--- a/layout/html/tests/formctls/bugs/bug7025-2.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD>
-<script>
-function selectitem()
-{
-  var node = document.getElementById("list1");
-  node.selectedIndex = 5;
-
-  node = document.getElementById("list2");
-  node.selectedIndex = 5;
-
-}
-</script>
-
-</HEAD>
-
-<BODY>
-
-
-<table>
-<tr>
-<td>
-<select id=list1>
-<option>Lime0</option>
-<option>Lime1</option>
-<option>Lime2</option>
-<option>Lime3</option>
-<option>Lime4</option>
-<option>Lime5</option>
-<option>Lime6</option>
-<option>Lime7</option>
-<option>Lime0</option>
-<option>Lime1</option>
-<option>Lime2</option>
-<option>Lime3</option>
-<option>Lime4</option>
-<option>Lime5</option>
-<option>Lime6</option>
-<option>Lime7</option>
-<option>Lime0</option>
-<option>Lime1</option>
-<option>Lime2</option>
-<option>Lime3</option>
-<option>Lime4</option>
-<option>Lime5</option>
-<option>Lime6</option>
-<option>Lime7</option>
-<option>Lime0</option>
-<option>Lime1</option>
-<option>Lime2</option>
-<option>Lime3</option>
-<option>Lime4</option>
-<option>Lime5</option>
-<option>Lime6</option>
-<option>Lime7</option>
-<option selected>Strawberry</option>
-</select>
-</td>
-<td>
-<select size=3 id=list2>
-<option>Lime0</option>
-<option>Lime1</option>
-<option>Lime2</option>
-<option>Lime3</option>
-<option>Lime4</option>
-<option>Lime5</option>
-<option>Lime6</option>
-<option>Lime</option>
-<option selected>Strawberry</option>
-</select>
-</td>
-</tr>
-</table>
-
-<input type=button value="Select Item 5" onclick="selectitem()">
-</body>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug70251-1.html b/layout/html/tests/formctls/bugs/bug70251-1.html
deleted file mode 100644
index 1d9e5a68034d..000000000000
--- a/layout/html/tests/formctls/bugs/bug70251-1.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-
-
-<STYLE type="text/css">
-    input, button {
-        font-family: monospace;
-        font-size: 12pt;
-    }   
-</STYLE>
-<TITLE>Mozilla Bug 70251</TITLE>
-<FORM action="">
-    <P>
-        <INPUT type="text" size="25" value="MWmwxxx">
-        <BUTTON>MWmwxxx</BUTTON>
-</FORM>
diff --git a/layout/html/tests/formctls/bugs/bug70251-2.html b/layout/html/tests/formctls/bugs/bug70251-2.html
deleted file mode 100644
index fe729101958d..000000000000
--- a/layout/html/tests/formctls/bugs/bug70251-2.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-
-<html lang="en">
-<head>
-<title>Testcase</title>
-</head>
-
-<body>
-
-<form style="border-bottom: 1px solid #000; background-color: #ccc;">
-<input type="text" ><input type="checkbox"><input type="radio"><input type="password"><input type="file"><input type="submit"><input type="reset"><input type="button" value="TypeButton"><button>Button</button>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug70251-3.html b/layout/html/tests/formctls/bugs/bug70251-3.html
deleted file mode 100644
index 3af8043f89d1..000000000000
--- a/layout/html/tests/formctls/bugs/bug70251-3.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html lang="en">
-<head>
-<title>Testcase</title>
-</head>
-
-<body>
-<p>Quirks Mode Testcase</p>
-<form style="border-bottom: 1px solid #000; background-color: #ccc;">
-<input type="text" ><input type="checkbox"><input type="radio"><input type="password"><input type="file"><input type="submit"><input type="reset"><input type="button" value="TypeButton"><button>Button</button>
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug70251-4.html b/layout/html/tests/formctls/bugs/bug70251-4.html
deleted file mode 100644
index 0f12af9fbc9f..000000000000
--- a/layout/html/tests/formctls/bugs/bug70251-4.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<body>
-<form>
-<table>
-  <tr>
-    <td align="right"><u>Not aligned to baseline:</u></td>
-    <td><input value="foo"></td>
-  </tr>
-  <tr>
-    <td valign="baseline" align="right"><u>Aligned to baseline:</u></td>
-    <td valign="baseline"><input value="foo"></td>
-  </tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug73081.html b/layout/html/tests/formctls/bugs/bug73081.html
deleted file mode 100644
index 312d68503086..000000000000
--- a/layout/html/tests/formctls/bugs/bug73081.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<title>Testcase</title>
-</head>
-<body>
- <table border="0" cellspacing="0" cellpadding="0" width="426">
- <tr>
- <td>
- <form method="get" action="http://jobsearch.monster.com/jobsearch.asp">
-<input type=hidden name="cy" value="US">
- </td>
-              <td> <font face="Verdana,Arial,Helvetica,Sans-serif" size="2"> Search over <b>436,376</b> 
-                U.S. jobs.<br>
-<p> <font color="#CC6600">Location Search:</font><br>
-<SELECT NAME="lid" multiple size="5">
-<OPTION VALUE=""> ------- Select all -------- </OPTION>
-<OPTION VALUE="323">Blah Blah</OPTION>
-<OPTION VALUE="324">Blah blah 2</OPTION>
-</SELECT>
-<input type="reset" value="Clear">
- <input type="submit" value="Search Jobs">
-  </form></td>
- <td></td>
- </tr>
- </table>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug74069.html b/layout/html/tests/formctls/bugs/bug74069.html
deleted file mode 100644
index e85161b6dccd..000000000000
--- a/layout/html/tests/formctls/bugs/bug74069.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>
-test
-</title>
-</head>
-<body>
-<form action="get">
-<fieldset>
-<legend>hi</legend>
-<select>
-<option>one</option>
-<option>two</option>
-<option>three</option>
-<option>four</option>
-</select>
-</fieldset>
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug7543.html b/layout/html/tests/formctls/bugs/bug7543.html
deleted file mode 100644
index 4b45c598ffca..000000000000
--- a/layout/html/tests/formctls/bugs/bug7543.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<TITLE>INPUT size test</TITLE>
-
-<P>All of the following <code>INPUT</code> fields have a <code>size</code> of 14:</P>
-
-<FORM ACTION="#">
- <P>
-  <strong>1)</strong> Browser default font:<BR>
-  <INPUT TYPE=TEXT SIZE=14 value="12345678901234567890">
- </P>
- <P>
-  <strong>2)</strong> Times New Roman (default in M7 Apprunner/Windows) or other serif font:<BR>
-  <INPUT TYPE=TEXT SIZE=14 value="12345678901234567890" STYLE="font-family: 'Times New Roman', serif;">
- </P>
- <P>
-  <strong>3)</strong> MS Sans Serif (default in IE4.x/Windows) or other sans-serif font:<BR>
-  <INPUT TYPE=TEXT SIZE=14 value="12345678901234567890" STYLE="font-family: 'MS Sans Serif', sans-serif;">
- </P>
- <P>
-  <strong>4)</strong> Arial or other sans-serif font:<BR>
-  <INPUT TYPE=TEXT SIZE=14 value="12345678901234567890" STYLE="font-family: Arial, sans-serif;">
- </P>
- <P>
-  <strong>5)</strong> Monospace font (default in Navigator 4.x):<br>
-  <INPUT TYPE=TEXT SIZE=14 value="12345678901234567890" STYLE="font-family: monospace;">
- </P>
-</FORM>
-
-<P>
- Since the <code>INPUT</code> field in test 5 is using monospace font, it should fit exactly 14 characters (eg. the visible string should be "12345678901234", no more, no less).
-</P>
-<P>    
- However, when an <code>INPUT</code> field uses a proportional font - as tests 2-4 do - the specified number of visible characters is always an <em>average</em>, not an accurate value.  Try filling the field with lowercase 'l' letters or uppercase 'W':s to get the point.
-</P>
-
-<HR>
-
-<ADDRESS>Antti.Nayha@oulu.fi</ADDRESS>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug7549.html b/layout/html/tests/formctls/bugs/bug7549.html
deleted file mode 100644
index 57e837432145..000000000000
--- a/layout/html/tests/formctls/bugs/bug7549.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <head>
-    <title> select disable test </title>
-  </head>
-
-  <body>
-    <form>
-                          <select name="hrule.alignType" disabled>
-                            <optgroup label="alignment" value="centered">
-                                    <option>left alignment</option>
-                                    <option>center alignment</option>
-                                    <option selected>right alignment</option>
-                            </optgroup>
-                          </select>
-    </form>
-  </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug77068.html b/layout/html/tests/formctls/bugs/bug77068.html
deleted file mode 100644
index c745dc0f2909..000000000000
--- a/layout/html/tests/formctls/bugs/bug77068.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head><title>Bug #77068: Multiple select inside a &lt;font&gt; tag</title></head>
-<body>
-
-<form>
-<font>
-<select multiple>
-<option>1</option>
-</select>
-</font>
-</form>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug79863.html b/layout/html/tests/formctls/bugs/bug79863.html
deleted file mode 100644
index e0a015aa8323..000000000000
--- a/layout/html/tests/formctls/bugs/bug79863.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>INPUT linebreak testcase</TITLE>
-<META NAME="copyright" CONTENT="©2001 Skewer Web Design. All rights reserved.">
-<META NAME="content-type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-<FORM><INPUT TYPE="submit" VALUE="Submit button:
-This button's value
-is broken into
-multiple lines.">
-<INPUT TYPE="reset" VALUE="Reset button:
-This button's value
-is broken into
-multiple lines.">
-<INPUT TYPE="button" VALUE="Default button:
-This button's value
-is broken into
-multiple lines.">
-<BUTTON>HTML 4 button:
-This button's value
-is broken into
-multiple lines.</BUTTON></FORM></BODY>
diff --git a/layout/html/tests/formctls/bugs/bug79927-1.html b/layout/html/tests/formctls/bugs/bug79927-1.html
deleted file mode 100644
index 96bc796f4b57..000000000000
--- a/layout/html/tests/formctls/bugs/bug79927-1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Button sizing testcase</title>
-<style>
-/* input, button {font-family: monospace} */
-</style>
-</head>
-<body>
-<input type="submit" value="l">
-<input type="submit" value="aaaaaaaaaaaaaaaaaaaa">
-<p>
-<input type="reset" value="l">
-<input type="reset" value="aaaaaaaaaaaaaaaaaaaa">
-<p>
-<input type="button" value="l">
-<input type="button" value="aaaaaaaaaaaaaaaaaaaa">
-<p>
-<button>l</button>
-<button>aaaaaaaaaaaaaaaaaaaa</button>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug79927-2.html b/layout/html/tests/formctls/bugs/bug79927-2.html
deleted file mode 100644
index db23dd88929c..000000000000
--- a/layout/html/tests/formctls/bugs/bug79927-2.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title>Button sizing testcase -- strict</title>
-</head>
-<body>
-<p>
-<input type="submit" value="l">
-<input type="submit" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<input type="reset" value="l">
-<input type="reset" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<input type="button" value="l">
-<input type="button" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<button>l</button>
-<button>aaaaaaaaaaaaaaaaaaaa</button>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug79927-3.html b/layout/html/tests/formctls/bugs/bug79927-3.html
deleted file mode 100644
index a1379ee02706..000000000000
--- a/layout/html/tests/formctls/bugs/bug79927-3.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title>Button sizing testcase -- strict</title>
-</head>
-<body>
-<p>
-<input type="submit" value="l" disabled><select /><input type="file"><input type="submit" value="l">
-<input type="submit" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<input type="reset" value="l">
-<input type="reset" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<input type="button" value="l">
-<input type="button" value="aaaaaaaaaaaaaaaaaaaa">
-</p>
-<p>
-<button>l</button>
-<button>aaaaaaaaaaaaaaaaaaaa</button>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug81448.html b/layout/html/tests/formctls/bugs/bug81448.html
deleted file mode 100644
index 3c9ec48f92af..000000000000
--- a/layout/html/tests/formctls/bugs/bug81448.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html lang="en">
-<head>
-<title>Testcase</title>
-</head>
-<body>
-
-<form>
-
-<input type="text" size="50" value="input_type_text"><br>
-<input type="password" size="50" value="input_type_password"><br>
-<input type="checkbox" size="50"><br>
-<input type="radio" size="50"><br>
-
-<select size="1">
-<option SELECTED>Select box</option>
-<option>2</option>
-<option>3</option>
-</select><br>
-
-<select size="3">
-<option SELECTED>Select box</option>
-<option>2</option>
-<option>3</option>
-</select><br>
-
-<textarea>THis is a text area.</textarea><br>
-
-</form>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug8665.html b/layout/html/tests/formctls/bugs/bug8665.html
deleted file mode 100644
index 4d291e5afa9e..000000000000
--- a/layout/html/tests/formctls/bugs/bug8665.html
+++ /dev/null
@@ -1 +0,0 @@
-<HTML>
<p>First instance - SkyMiles¨ - does not use character entity<br>
Second instance - SkyMiles&reg; - uses character entity<br>
<FORM METHOD="POST" ACTION="/cgi-bin/quiknav.pl" TARGET="_top" ONSUBMIT="foo">
<SELECT NAME="section" SIZE="1">
<OPTION VALUE="/skymile/index.html">SkyMiles¨
<OPTION VALUE="/skymile/index.html">SkyMiles&reg;
</SELECT>
</FORM>
</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/bug88849.html b/layout/html/tests/formctls/bugs/bug88849.html
deleted file mode 100644
index b2d8b8cca35e..000000000000
--- a/layout/html/tests/formctls/bugs/bug88849.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<BODY>
-<FORM>
-<TABLE>
-<TR>
-  <TD>
-    <INPUT NAME="LoginID" TYPE=text>
-  </TD>
-</TR>
-</FORM>
-<FORM>
-</SCRIPT>
-
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/formctls/bugs/bug91789.html b/layout/html/tests/formctls/bugs/bug91789.html
deleted file mode 100644
index d1be6f5a4f1a..000000000000
--- a/layout/html/tests/formctls/bugs/bug91789.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<head>
-<style>
-input, textarea {
-    color: white;
-    background-image: url(http://www.mozilla.org/images/mozilla-banner.gif);
-}
-</style>
-</head>
-<body>
-<form>
-<input type="text" size="30" value="textfield"><br>
-<input type="password" size="30" value="password"><br>
-<textarea cols=30 rows=10>textarea</textarea>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug92647.html b/layout/html/tests/formctls/bugs/bug92647.html
deleted file mode 100644
index d779b712940a..000000000000
--- a/layout/html/tests/formctls/bugs/bug92647.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-<BODY>
- <form> 
-<TABLE border="1">
- <TR>
-  <TD>
-   <TABLE border="2">
-    <TR>
-     <TD WIDTH="30%">
-       Member Number:
-     </TD>
-	 <TD WIDTH="70%">
-      <INPUT NAME="EchoUser" TYPE="TEXT">
-	 </TD>
-    </TR>
-    <TR>
-     <TD>
-      PIN:
-     </TD>
-     <TD>
-      <INPUT TYPE="password">
-	 </TD>
-     <TD>
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
-</Form>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug94268.html b/layout/html/tests/formctls/bugs/bug94268.html
deleted file mode 100644
index 2a6609cd8275..000000000000
--- a/layout/html/tests/formctls/bugs/bug94268.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-			"http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<style type="text/css">
-label {color: black; background: yellow; overflow: visible;}
-label font {color: maroon; border: 1px solid gray; overflow: visible;}
-</style> 
-<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-<title>Bugzilla #94268 testcase</title> 
-</head>
-
-<body>
-
-<form action="script.pl" method="POST">
-
-	<table border="0" cellspacing="0">
-		<tr>
-			<td valign="middle" align="right">
-				<label for="ID-namefield-1C0D701DEF4E60">Name:</label> <input type="text" name="namefield" size="25" value="Enter name here" maxlength="50" id="ID-namefield-1C0D701DEF4E60">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle" align="right">
-				<label for="districtfield">District:</label> <input type="text" name="districtfield" size="25" value="Enter district here" maxlength="50" id="districtfield">
-			</td>
-		</tr>
-		<tr>
-			<td align="right">
-				<label for="ID-schoolfield-1C0D70117C1F460">School:</label> <input type="text" name="schoolfield" size="25" value="Enter school name here" maxlength="50" id="ID-schoolfield-1C0D70117C1F460">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle" align="center">
-				<label for="ID-addressfield-1C0D7011CDDA200">Address:</label> <input type="text" name="addressfield" size="25" value="Enter address here" maxlength="50" id="ID-addressfield-1C0D7011CDDA200">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle" align="center">
-				<label for="phonefield">Phone#:</label> <input type="text" name="phonefield" size="25" value="Enter phone# here" maxlength="50" id="phonefield">
-			</td>
-		</tr>
-		<tr>
-			<td  align="center">
-				<label for="ID-emailfield-1C0D70126858E80">E-mail:</label> <input type="text" name="emailfield" size="25" value="Enter E-mail address here" maxlength="50" id="ID-emailfield-1C0D70126858E80">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle" align="left">
-				<label for="ID-workshopnamefield-1C0D7012A69F4A0">Workshop Title:</label> <input type="text" name="workshopnamefield" size="25" value="Enter workshop title here" maxlength="50" id="ID-workshopnamefield-1C0D7012A69F4A0">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle" align="left">
-				<label for="workshopcostfield">Cost of Workshop:</label> <input type="text" name="workshopcostfield" size="25" value="Enter cost of workshop here" maxlength="50" id="workshopcostfield">
-			</td>
-		</tr>
-		<tr>
-			<td valign="middle">
-				<label for="ID-workshopdatefield-1C0D70131FA4BC0">Dates of Workshop:</label> <input type="text" name="workshopdatefield" size="25" value="Enter date(s) of workshop here" maxlength="50" id="ID-workshopdatefield-1C0D70131FA4BC0">
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label for="ID-p.o.field-1C0D701366E20A0">P.O. #:</label> <input type="text" name="p.o.field" size="25" value="Enter P.O.# here" maxlength="50" id="ID-p.o.field-1C0D701366E20A0">
-			</td>
-		</tr>
-	</table>
-
-</form>
-
-</body>
-</html>
diff --git a/layout/html/tests/formctls/bugs/bug95703.html b/layout/html/tests/formctls/bugs/bug95703.html
deleted file mode 100644
index a504e07e502f..000000000000
--- a/layout/html/tests/formctls/bugs/bug95703.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>Option garbage CSS testcase</TITLE>
-</HEAD>
-<BODY BGCOLOR="#FF0000">
-Expected behavior for below pull-down list: Garbage is not displayed.<BR><BR>
-M5 actual behavior: Garbage from other parts of the page or other windows appears.<BR><BR>
-<FORM><SELECT NAME="testsel" SIZE="5">
-<OPTION VALUE="a">A
-<OPTION VALUE="b">B
-</SELECT></FORM><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-This text is here to create a scrollbar.<BR><BR>
-</BODY></HTML>
diff --git a/layout/html/tests/formctls/bugs/bug95937.html b/layout/html/tests/formctls/bugs/bug95937.html
deleted file mode 100644
index 6c739caee45a..000000000000
--- a/layout/html/tests/formctls/bugs/bug95937.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<head>
-<style>
-div.row {
-  clear: both;
-  padding-top: 10px;
-  }
-
-div.row span.label {
-  float: left;
-  width: 100px;
-  text-align: right;
-  }
-
-div.row span.formw {
-  float: right;
-  width: 335px;
-  text-align: left;
-  } 
-div.spacer {
-  clear: both;
-  }
-
-
-</style>
-
-</head>
-<body>
-
-<form>
-<div style="width: 85%; background-color: #cc9;
-border: 1px dotted #333; padding: 5px;
-margin: 0px auto";>
-
-<div class="row">
-<span class="label">Name:</span><span
-class="formw"><input type="text" size="25" /></span>
-</div>
-<div class="row">
-<span class="label">Age:</span><span
-class="formw"><input type="text" size="25" /></span>
-</div>
-<div class="row">
-<span class="label">Shoe size:</span><span
-class="formw"><input type="text" size="25" /></span>
-</div>
-<div class="row">
-<span class="label">Comments:</span><span
-class="formw">
-<textarea cols="25" rows="8">
-Go ahead - write something...
-        </textarea>
-</span>
-</div>
-<div class="spacer">
-&nbsp;
-  </div>
-
-</div>
-<input type="text">
-</form>
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/formctls/bugs/bug96506.html b/layout/html/tests/formctls/bugs/bug96506.html
deleted file mode 100644
index b26d1ac98bd4..000000000000
--- a/layout/html/tests/formctls/bugs/bug96506.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head><title>Site Search</title></head>
-<body  bgcolor="#FFFFFF">
-
-<table width="600" border="0" cellspacing="0" cellpadding="5">
-  <tr> 
-    <td> 
-      <form>
-          <fieldset style="width:500px; height:95px">
-            <legend for="advanced_uspto_search">LEGEND</legend> 
-          <table cellpadding="0" cellspacing="0">
-            <tr> 
-              <td>
-                Locate 
-                <select name="mt0">
-                  <option value="all">All Words 
-                </select>
-                <select name="ms0">
-                  <option value="should">Should 
-                </select>
-                appear in the results.
-                <br>
-                <br />
-                Look in these pages: 
-                <select name="domain">
-                  <option value="www.uspto.gov">USPTO Web Pages</option>
-                </select>
-                <br />
-                <br />
-                Look for these 
-                words:<label for="label_for_mw0">
-                <input type="text" name="mw0" value="" id="label_for_mw0" size="35" maxlength="256">
-                </label> 
-                <br />
-                Give a 
-                <input type="radio" name="de" value="detailed" checked>
-                Detailed 
-                <input type="radio" name="de" value="brief">
-                Brief description of each page and
-                Limit to: 
-                <select name="nr">
-                  <option value="10">10 
-                </select>
-                pages
-                <br />
-                <label for="label_for_act.search">
-                <input type="submit" value="Search via FirstGov Now" id="label_for_act.search">
-                </label></td>
-            </tr>
-          </table>
-          </fieldset> 
-      </form>
-    </td>   
-  </tr>   
-</table>   
-
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/formctls/bugs/bug96604.html b/layout/html/tests/formctls/bugs/bug96604.html
deleted file mode 100644
index b48695c20c5b..000000000000
--- a/layout/html/tests/formctls/bugs/bug96604.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Test<input type=text value="value"></body></html>
-
-
diff --git a/layout/html/tests/formctls/bugs/bug98918.html b/layout/html/tests/formctls/bugs/bug98918.html
deleted file mode 100644
index 49859ac3a32e..000000000000
--- a/layout/html/tests/formctls/bugs/bug98918.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD><TITLE>Testcase</TITLE></HEAD>
-<BODY>
-<FORM>
-rows=1
-<TEXTAREA ROWS=1 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=2
-<TEXTAREA ROWS=2 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=3
-<TEXTAREA ROWS=3 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=4
-<TEXTAREA ROWS=4 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=5
-<TEXTAREA ROWS=5 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=6
-<TEXTAREA ROWS=6 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-<hr>
-rows=7
-<TEXTAREA ROWS=7 COLS=19>
-1
-2
-3
-4
-5
-6
-</TEXTAREA>
-</FORM>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/formctls/bugs/rtest.lst b/layout/html/tests/formctls/bugs/rtest.lst
deleted file mode 100644
index 53c9c674ff89..000000000000
--- a/layout/html/tests/formctls/bugs/rtest.lst
+++ /dev/null
@@ -1,119 +0,0 @@
-bug101122.html
-bug10410.html
-bug108526.html
-bug109316.html
-bug109368.html
-bug113245.html
-bug117606.html
-bug138403-1.html
-bug138403-2.html
-bug167236-1.html
-bug167236-2.html
-bug167236-3.html
-bug167236-4.html
-bug167236-5.html
-bug167236-6.html
-bug167236-7.html
-bug167236-8.html
-bug167236-9.html
-bug167236-10.html
-bug167236-11.html
-bug167236-12.html
-bug167236-13.html
-bug167236-14.html
-bug167236-15.html
-bug167236-16.html
-bug17450.html
-bug17474-1.html
-bug17474-2.html
-bug17474-3.html
-bug180085-1.html
-bug180085-2.html
-bug180085-3.html
-bug180085-4.html
-bug20322.html
-bug222864.html
-bug22708.html
-bug231574.html
-bug26644.html
-bug26650.html
-bug28598.html
-bug297389.html
-bug300474-1.html
-bug300474-2.html
-bug305705.html
-bug33327.html
-bug358408.html
-bug35934.html
-bug36130.html
-bug36364-1.html
-bug36364-2.html   
-bug36964.html
-bug37261.html
-bug37459.html
-bug39425.html
-bug4050.html
-bug40596-1.html
-bug40596-2.html
-bug40596-3.html
-bug40596-4.html
-bug40596-5.html
-bug40596-6.html
-bug40596-7.html
-bug41049.html
-bug41050.html
-bug42481.html
-bug43771.html
-bug44000.html
-bug45095.html
-bug45152.html
-bug45562.html
-bug45625.html
-bug45670.html
-bug46099.html
-bug46224.html
-bug48237.html
-bug50419.html
-bug53259-1.html
-bug53259-2.html
-bug53259-3.html
-bug55063.html
-bug58190.html
-bug58220.html
-bug58299.html
-bug59294.html
-bug62568.html
-bug62954.html
-bug63309.html
-bug65275.html
-bug67207.html
-bug68963.html
-bug69984.html
-bug7025-1.html
-bug7025-2.html
-bug70251-1.html
-bug70251-2.html
-bug70251-3.html
-bug70251-4.html
-bug73081.html
-bug74069.html
-bug7543.html
-bug7549.html
-bug77068.html
-bug79863.html
-bug79927-1.html
-bug79927-2.html
-bug79927-3.html
-bug81448.html
-bug8665.html
-bug88849.html
-bug91789.html
-bug92647.html
-bug94268.html
-bug95703.html
-bug95937.html
-bug96506.html
-bug96604.html
-bug98918.html
-bug342531.html
-bug357449.html
diff --git a/layout/html/tests/images/polarBears.jpg b/layout/html/tests/images/polarBears.jpg
deleted file mode 100644
index 8b5d918807f4bc76cfb87181f1330551c6436b5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16219
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
RZ+;SYTC!*70{oum{x>%1j0^w(

diff --git a/layout/html/tests/printer/CSSPage/frameset1/simple_main.html b/layout/html/tests/printer/CSSPage/frameset1/simple_main.html
deleted file mode 100644
index 39dcf9583521..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset1/simple_main.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Main Document of FrameSet</TITLE>
-<style>
-@page {size: landscape}
-</style>
-</HEAD>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/frameset1/simple_sub1.html b/layout/html/tests/printer/CSSPage/frameset1/simple_sub1.html
deleted file mode 100644
index 3a8726e8dc4d..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset1/simple_sub1.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-<style>
-@page {size: landscape}
-</style>
-</HEAD>
-<BODY>
-Print in Lanscape<br>
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/frameset1/simple_sub2.html b/layout/html/tests/printer/CSSPage/frameset1/simple_sub2.html
deleted file mode 100644
index 99a14ccd206f..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset1/simple_sub2.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-<style>
-@page { margin: 10% }
-</style>
-</HEAD>
-<BODY>
-Should have 10% margin<br>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/CSSPage/frameset2/simple_main.html b/layout/html/tests/printer/CSSPage/frameset2/simple_main.html
deleted file mode 100644
index 39dcf9583521..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset2/simple_main.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Main Document of FrameSet</TITLE>
-<style>
-@page {size: landscape}
-</style>
-</HEAD>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/frameset2/simple_sub1.html b/layout/html/tests/printer/CSSPage/frameset2/simple_sub1.html
deleted file mode 100644
index 3a8726e8dc4d..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset2/simple_sub1.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-<style>
-@page {size: landscape}
-</style>
-</HEAD>
-<BODY>
-Print in Lanscape<br>
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/frameset2/simple_sub2.html b/layout/html/tests/printer/CSSPage/frameset2/simple_sub2.html
deleted file mode 100644
index a41f64114125..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset2/simple_sub2.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-<style>
-@page { margin: 10% }
-</style>
-</HEAD>
-<BODY>
-Should have 10% margin<br>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/CSSPage/frameset2/sub_iframe.html b/layout/html/tests/printer/CSSPage/frameset2/sub_iframe.html
deleted file mode 100644
index 155db95cbd64..000000000000
--- a/layout/html/tests/printer/CSSPage/frameset2/sub_iframe.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/printer/CSSPage/landscape.html b/layout/html/tests/printer/CSSPage/landscape.html
deleted file mode 100644
index 42bcdc41806b..000000000000
--- a/layout/html/tests/printer/CSSPage/landscape.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<title>
-Landscape
-</title>
-<style>
-@page {size: landscape}
-</style>
-</head>
-<body>
-In Page Setup, set the orientation to portrait and see if it prints landscape.<br>
-<pre>@page {size: landscape}</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/margin10percent.html b/layout/html/tests/printer/CSSPage/margin10percent.html
deleted file mode 100644
index 3d80d48226ff..000000000000
--- a/layout/html/tests/printer/CSSPage/margin10percent.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-Margin: 10%
-</title>
-<style>
-@page { margin: 10% }
-</style>
-</head>
-<body>
-<pre>@page { margin: 10% }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/marginauto.html b/layout/html/tests/printer/CSSPage/marginauto.html
deleted file mode 100644
index 131880510c15..000000000000
--- a/layout/html/tests/printer/CSSPage/marginauto.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-Margin: auto
-</title>
-<style>
-@page { margin: auto }
-</style>
-</head>
-<body>
-<pre>@page { margin: auto }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/marginleftautoright1in.html b/layout/html/tests/printer/CSSPage/marginleftautoright1in.html
deleted file mode 100644
index aa2105c0e6f3..000000000000
--- a/layout/html/tests/printer/CSSPage/marginleftautoright1in.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-margin-left: auto; margin-right:1in;
-</title>
-<style>
-@page { margin-left: auto; margin-right:1in; }
-</style>
-</head>
-<body>
-<pre>@page { margin-left: auto; margin-right:1in; }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/page8x11margin10percent.html b/layout/html/tests/printer/CSSPage/page8x11margin10percent.html
deleted file mode 100644
index 909be331afa6..000000000000
--- a/layout/html/tests/printer/CSSPage/page8x11margin10percent.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-8.5x11 Margin: 10%
-</title>
-<style>
-@page { size 8.5in 11in; margin: 10% }
-</style>
-</head>
-<body>
-<pre>@page { size 8.5in 11in; margin: 10% }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/page8x11margin254cm.html b/layout/html/tests/printer/CSSPage/page8x11margin254cm.html
deleted file mode 100644
index 7d037efc205a..000000000000
--- a/layout/html/tests/printer/CSSPage/page8x11margin254cm.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-8.5x11 Margin: 254cm
-</title>
-<style>
-@page { size 8.5in 11in; margin: 2.54cm }
-</style>
-</head>
-<body>
-<h3>Page Size:8 1/2 x 11 Margin: 2.54cm</h3>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/page8x11marginhalfin.html b/layout/html/tests/printer/CSSPage/page8x11marginhalfin.html
deleted file mode 100644
index 713942e1b94e..000000000000
--- a/layout/html/tests/printer/CSSPage/page8x11marginhalfin.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-8.5x11 Margin: 0.5in
-</title>
-<style>
-@page { size 8.5in 11in; margin: 0.5in }
-</style>
-</head>
-<body>
-<pre>@page { size 8.5in 11in; margin: 0.5in }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/pagesizeauto.html b/layout/html/tests/printer/CSSPage/pagesizeauto.html
deleted file mode 100644
index ba714ae6e019..000000000000
--- a/layout/html/tests/printer/CSSPage/pagesizeauto.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>
-Size: auto
-</title>
-<style>
-@page { size: auto }
-</style>
-</head>
-<body>
-<pre>@page { size: auto }</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/portrait.html b/layout/html/tests/printer/CSSPage/portrait.html
deleted file mode 100644
index 3af9f4544ffb..000000000000
--- a/layout/html/tests/printer/CSSPage/portrait.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<title>
-Portrait
-</title>
-<style>
-@page {size: portrait}
-</style>
-</head>
-<body>
-In Page Setup, set the orientation to landscape and see if it prints portrait.<br>
-<pre>@page {size: portrait}</pre>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/CSSPage/right.html b/layout/html/tests/printer/CSSPage/right.html
deleted file mode 100644
index b3e8162d8929..000000000000
--- a/layout/html/tests/printer/CSSPage/right.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-<head>
-<title>
-:first
-</title>
-<style>
-@page :first {
-  margin: 2in    /* Top margin on first page 10cm */
-}
-@page :left {
-  margin-left: 4cm;
-  margin-right: 3cm;
-}
-
-@page :right {
-  margin-left: 3cm;
-  margin-right: 4cm;
-}
-</style>
-</head>
-<body>
-<pre>
-@page :first {
-  margin: 2in    /* Top margin on first page 10cm */
-}
-@page :left {
-  margin-left: 4cm;
-  margin-right: 3cm;
-}
-
-@page :right {
-  margin-left: 3cm;
-  margin-right: 4cm;
-}
-</pre>
-This should do nothing, we don't support :first or :right or :left <br>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset1/simple_main.html b/layout/html/tests/printer/frameset/frameset1/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/printer/frameset/frameset1/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset1/simple_sub1.html b/layout/html/tests/printer/frameset/frameset1/simple_sub1.html
deleted file mode 100644
index aee134942748..000000000000
--- a/layout/html/tests/printer/frameset/frameset1/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../../general/raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset1/simple_sub2.html b/layout/html/tests/printer/frameset/frameset1/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/printer/frameset/frameset1/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/frameset/frameset2/simple_main.html b/layout/html/tests/printer/frameset/frameset2/simple_main.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/printer/frameset/frameset2/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset2/simple_sub1.html b/layout/html/tests/printer/frameset/frameset2/simple_sub1.html
deleted file mode 100644
index 9c58b0339ee0..000000000000
--- a/layout/html/tests/printer/frameset/frameset2/simple_sub1.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-<iframe src=sub_iframe.html></iframe>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../../general/raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset2/simple_sub2.html b/layout/html/tests/printer/frameset/frameset2/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/printer/frameset/frameset2/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/frameset/frameset2/sub_iframe.html b/layout/html/tests/printer/frameset/frameset2/sub_iframe.html
deleted file mode 100644
index 155db95cbd64..000000000000
--- a/layout/html/tests/printer/frameset/frameset2/sub_iframe.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/printer/frameset/frameset3/frame1.html b/layout/html/tests/printer/frameset/frameset3/frame1.html
deleted file mode 100644
index d54532941882..000000000000
--- a/layout/html/tests/printer/frameset/frameset3/frame1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>First frame Document</title>
-</head>
-<body>
-<B> Frame 1 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset3/frame2.html b/layout/html/tests/printer/frameset/frameset3/frame2.html
deleted file mode 100644
index 88b9b0a2bd0b..000000000000
--- a/layout/html/tests/printer/frameset/frameset3/frame2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Second frame Document</title>
-</head>
-<body>
-<B> Frame 2 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset3/frame3.html b/layout/html/tests/printer/frameset/frameset3/frame3.html
deleted file mode 100644
index 03b6978f1284..000000000000
--- a/layout/html/tests/printer/frameset/frameset3/frame3.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Third frame Document</title>
-</head>
-<body>
-<B> Frame 3 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset3/root.html b/layout/html/tests/printer/frameset/frameset3/root.html
deleted file mode 100644
index 93848bced20b..000000000000
--- a/layout/html/tests/printer/frameset/frameset3/root.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Help</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset rows='88,100%'>
-   <frame src="frame1.html" frameborder="yes" scrolling="no" name="frame1" noresize="" bgcolor="#cad9e2">
-  <frame src="subroot.html" name='bsscright' scrolling='yes'>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset3/subroot.html b/layout/html/tests/printer/frameset/frameset3/subroot.html
deleted file mode 100644
index d0ee7bc28a59..000000000000
--- a/layout/html/tests/printer/frameset/frameset3/subroot.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Center</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset cols='260,100%'>
-  <frame src='frame2.html' name='bsscright' scrolling='yes'>
-  <frame src='frame3.html' name='bsscleft'  scrolling='yes'>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset4/frame1.html b/layout/html/tests/printer/frameset/frameset4/frame1.html
deleted file mode 100644
index d54532941882..000000000000
--- a/layout/html/tests/printer/frameset/frameset4/frame1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>First frame Document</title>
-</head>
-<body>
-<B> Frame 1 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset4/frame2.html b/layout/html/tests/printer/frameset/frameset4/frame2.html
deleted file mode 100644
index 88b9b0a2bd0b..000000000000
--- a/layout/html/tests/printer/frameset/frameset4/frame2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Second frame Document</title>
-</head>
-<body>
-<B> Frame 2 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset4/frame3.html b/layout/html/tests/printer/frameset/frameset4/frame3.html
deleted file mode 100644
index 03b6978f1284..000000000000
--- a/layout/html/tests/printer/frameset/frameset4/frame3.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Third frame Document</title>
-</head>
-<body>
-<B> Frame 3 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset4/root.html b/layout/html/tests/printer/frameset/frameset4/root.html
deleted file mode 100644
index 83d2544e60d1..000000000000
--- a/layout/html/tests/printer/frameset/frameset4/root.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title>Help</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset rows='88,100%'>
-  <frame src="frame1.html" frameborder="yes" scrolling="no" name="frame1" noresize="" bgcolor="#cad9e2">
-  <frameset cols='260,100%'>
-    <frame src='frame2.html' name='bsscright' scrolling='yes'>
-    <frame src='frame3.html' name='bsscleft'  scrolling='yes'>
-  </frameset>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset5/frame1.html b/layout/html/tests/printer/frameset/frameset5/frame1.html
deleted file mode 100644
index d54532941882..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/frame1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>First frame Document</title>
-</head>
-<body>
-<B> Frame 1 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset5/frame2.html b/layout/html/tests/printer/frameset/frameset5/frame2.html
deleted file mode 100644
index 88b9b0a2bd0b..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/frame2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Second frame Document</title>
-</head>
-<body>
-<B> Frame 2 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset5/frame3.html b/layout/html/tests/printer/frameset/frameset5/frame3.html
deleted file mode 100644
index 56bc7dffb54b..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/frame3.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>Third frame Document</title>
-</head>
-<body>
-<B> Frame 3 </B>
-<iframe src=the_iframe.html></iframe>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset5/root.html b/layout/html/tests/printer/frameset/frameset5/root.html
deleted file mode 100644
index 93848bced20b..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/root.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Help</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset rows='88,100%'>
-   <frame src="frame1.html" frameborder="yes" scrolling="no" name="frame1" noresize="" bgcolor="#cad9e2">
-  <frame src="subroot.html" name='bsscright' scrolling='yes'>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset5/subroot.html b/layout/html/tests/printer/frameset/frameset5/subroot.html
deleted file mode 100644
index d0ee7bc28a59..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/subroot.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Center</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset cols='260,100%'>
-  <frame src='frame2.html' name='bsscright' scrolling='yes'>
-  <frame src='frame3.html' name='bsscleft'  scrolling='yes'>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset5/the_iframe.html b/layout/html/tests/printer/frameset/frameset5/the_iframe.html
deleted file mode 100644
index 6e84a74af982..000000000000
--- a/layout/html/tests/printer/frameset/frameset5/the_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/frameset/frameset6/frame1.html b/layout/html/tests/printer/frameset/frameset6/frame1.html
deleted file mode 100644
index d54532941882..000000000000
--- a/layout/html/tests/printer/frameset/frameset6/frame1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>First frame Document</title>
-</head>
-<body>
-<B> Frame 1 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset6/frame2.html b/layout/html/tests/printer/frameset/frameset6/frame2.html
deleted file mode 100644
index 88b9b0a2bd0b..000000000000
--- a/layout/html/tests/printer/frameset/frameset6/frame2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-<head>
-<title>Second frame Document</title>
-</head>
-<body>
-<B> Frame 2 </B>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset6/frame3.html b/layout/html/tests/printer/frameset/frameset6/frame3.html
deleted file mode 100644
index 56bc7dffb54b..000000000000
--- a/layout/html/tests/printer/frameset/frameset6/frame3.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<title>Third frame Document</title>
-</head>
-<body>
-<B> Frame 3 </B>
-<iframe src=the_iframe.html></iframe>
-</body>
-</html>
diff --git a/layout/html/tests/printer/frameset/frameset6/root.html b/layout/html/tests/printer/frameset/frameset6/root.html
deleted file mode 100644
index 83d2544e60d1..000000000000
--- a/layout/html/tests/printer/frameset/frameset6/root.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title>Help</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-
-<frameset rows='88,100%'>
-  <frame src="frame1.html" frameborder="yes" scrolling="no" name="frame1" noresize="" bgcolor="#cad9e2">
-  <frameset cols='260,100%'>
-    <frame src='frame2.html' name='bsscright' scrolling='yes'>
-    <frame src='frame3.html' name='bsscleft'  scrolling='yes'>
-  </frameset>
-</frameset>
-
-<noframes><body bgcolor="#cad9e2">
-</body></noframes></html>
diff --git a/layout/html/tests/printer/frameset/frameset6/the_iframe.html b/layout/html/tests/printer/frameset/frameset6/the_iframe.html
deleted file mode 100644
index 6e84a74af982..000000000000
--- a/layout/html/tests/printer/frameset/frameset6/the_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/frameset/frameset7/index.html b/layout/html/tests/printer/frameset/frameset7/index.html
deleted file mode 100644
index 45670b6a5570..000000000000
--- a/layout/html/tests/printer/frameset/frameset7/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="simple_sub2.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset7/simple_sub1.html b/layout/html/tests/printer/frameset/frameset7/simple_sub1.html
deleted file mode 100644
index aee134942748..000000000000
--- a/layout/html/tests/printer/frameset/frameset7/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../../general/raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset7/simple_sub2.html b/layout/html/tests/printer/frameset/frameset7/simple_sub2.html
deleted file mode 100644
index 9abc461a4978..000000000000
--- a/layout/html/tests/printer/frameset/frameset7/simple_sub2.html
+++ /dev/null
@@ -1,877 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>8 Pages</TITLE>
-</HEAD>
-<BODY>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br><br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-<br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-
-
-</BODY>
diff --git a/layout/html/tests/printer/frameset/frameset8/index.html b/layout/html/tests/printer/frameset/frameset8/index.html
deleted file mode 100644
index 0b52bf87c79f..000000000000
--- a/layout/html/tests/printer/frameset/frameset8/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-  <FRAME id="frmContent" name="display" src="js_pp_timer.html">
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/frameset/frameset8/js_pp_timer.html b/layout/html/tests/printer/frameset/frameset8/js_pp_timer.html
deleted file mode 100644
index 5770e0485be9..000000000000
--- a/layout/html/tests/printer/frameset/frameset8/js_pp_timer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>JS Test 1</TITLE>
-<script>
-  var gCounter = 0;
-
-  function doLoad()
-  {
-    setTimeout("counter()", 1000);
-  }
-
-  function counter()
-  {
-    document.getElementById("status").value = gCounter++;
-    setTimeout("counter()", 1000);
-  }
-</script>
-</HEAD>
-<BODY onload="doLoad()">
-
-<input type=text id=status>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/printer/frameset/frameset8/simple_sub1.html b/layout/html/tests/printer/frameset/frameset8/simple_sub1.html
deleted file mode 100644
index aee134942748..000000000000
--- a/layout/html/tests/printer/frameset/frameset8/simple_sub1.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-<a href=link.html>Link</a>
-<a href=link.html>Link</a>
-This is Sub Frame #1 x  x  x  x  x  x  x  x  x  x  x  x  x  
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x 
-x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x  x <br>
-<img src="../../general/raptor.jpg" width=50 height=50>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/general/Anieyes.gif b/layout/html/tests/printer/general/Anieyes.gif
deleted file mode 100644
index de488ba16c8e57f7f481df641e7b92ae1d143891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13539
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
V6z}gT-rrNazo&Tr7ftc*`7ej#UPk}`

diff --git a/layout/html/tests/printer/general/raptor.jpg b/layout/html/tests/printer/general/raptor.jpg
deleted file mode 100644
index 243ba9e2d43e0073bd2b8d35f570ea4522b4e408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/printer/general/test0.html b/layout/html/tests/printer/general/test0.html
deleted file mode 100644
index bc7b7050968c..000000000000
--- a/layout/html/tests/printer/general/test0.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<html>
-<head>
-<title>Example 0</title>
-<style>
- a#id.foo:visited:first-line { color: red; }
- a#id.foo:first-line { color: red; }
- a#id.foo:visited { color: red; }
- a#id:first-line { color: red; }
- a#id:visited { color: red; }
- a:first-line { color: red; }
- a:visited { color: red; }
- a:visited:first-line { color: red; }
- a:visited:visited { color: red; }
- a:first-line:visited { color: red; }
- :first-letter { color: green; }
- #line:first-line { font-size: 200%; letter-spacing: -.25em; }
- #letter:first-letter { font-size: 48pt; font-weight: bold; float: left; }
-</style>
-<meta name="crc" content=3268488385">
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-
-<!-- GOOFY Comment tests... -->
-<!-- xx -- yy -- zz -->
-<!-- also interesting --!>
-<!--------------------->
-<!-- ####################################################################
-     #                                                                  #
-     #   * Here's another interesting comment problem we encountered    #
-     #     this came from mozilla.org of all places! "!-- * --"         #
-     ####################################################################
- -->
-
-
-
-<h1>Example 0: Basic HTML Text Styles</h1>
-
-<P><br></p>
-
-<h2>Formatted Text</h2>
-
-<p>
- This is a basic paragraph with <b>bold</b>, <i>italic</i> and
- <i><b>bold</b></i><b><i>-italic </i></b>
- text. It also includes <font color="#FF0000">red</font>,
- <font color="#00FF00">green</font> 
- and <font color="#0000FF">blue</font> text.
- It has <s>strikethru</s> and <u>underline</u>.
- <u> </u>
-</p>
-
-<p>
-  Text decoration color test:
-	<span style="color: red">
-	  red 
-	  <span style="text-decoration: underline">
-		underline
-		<span style="color: cyan">
-		  cyan 
-		  <span style="text-decoration: line-through">
-			line-through
-			<span style="color: blue">
-			  blue 
-			  <span style="text-decoration: overline">
-				overline
-				<span style="color: black">
-				  black 
-				</span>
-				overline
-			  </span>
-			   blue
-			</span>
-			line-through
-		  </span>
-		   cyan
-		</span>
-		underline
-	  </span>
-	  red
-	</span>
-</p>
-
-<p>This is a paragraph with font variations: <b><font face="Arial, Helvetica, sans-serif">Bold Arial,</font></b><font face="Arial, Helvetica, sans-serif"> 
-  <i><font face="Verdana, Arial, Helvetica, sans-serif">Italic Verdana</font>,</i> <font face="courier">COURIER, 
-  <font face="Times New Roman, Times, serif">Times New Roman.</font></font></font></p>
-<p><font size=7>Font size=7, </font><font size=6>Font size=6, </font><font size=5>Font 
-  size=5, </font><font size=4>Font size=4, </font><font size=3>Font size=3, </font><font size=2>Font 
-  size=2, </font><font size=1>Font size=1, </font><font point-size=24 font-weight=700>Font 
-  point-size=24 font-weight=700</font><BR>
- <SPAN style="font-family: Verdana Bold, Times; font-weight: bold; font-size: 18pt; font-variant: small-caps;">This Text Is Small-caps</SPAN>
-</P>
-
-<h2>Text styles</h2>
-
-<P>
- <SPAN style="text-transform: capitalize;">
-  this text was capitalized &aring; &egrave;
- </SPAN>
- <BR>
- <SPAN style="text-transform: lowercase;">
-  THIS TEXT WAS LOWERCASED &Aring; &Egrave;
- </SPAN>
- <BR>
- <SPAN style="text-transform: uppercase;">
-  this text was uppercased &aring; &egrave;
- </SPAN>
- <BR>
- <SPAN style="letter-spacing: 2em;">
-  Letter spacing set to 2em's.
- </SPAN>
- <BR>
- <SPAN style="word-spacing: 2em;">
-  Word spacing set to 2em's.
- </SPAN>
- <BR>
- <SPAN style="text-transform: capitalize; letter-spacing: 1em; word-spacing: 5em; font-variant: small-caps;">
-  this text is capitalized small-caps with letter spacing set to 1em and
-  the word spacing set to 5em's. enjoy!
- </SPAN>
-</P>
-
-<H2>Pseudo-element tests</H2>
-
-<P ID=line>
- This paragraph demonstrates the :first-line pseudo
- element. The first line of text should use a font twice the size and
- have the letter spacing set so that the text is jammed together in an
- unpleasant fashion.
-</P>
-
-<P ID=letter>
- First letter style is really cool. The facility is very powerful because it
- takes an innocuous looking content model and spices it up dramatically while
- allowing a backwards compatible answer for older browsers.
-</P>
-
-<h2><br>
-</h2>
-<h2>Listings</h2>
-<h3>Bulleted List </h3>
-<ul>
-  <li>One</li>
-  <li>Two
-    <ul>
-      <li>Apples</li>
-      <li>Oranges</li>
-      <li>Bananas</li>
-    </ul>
-  </li>
-  <li>Three</li>
-</ul>
-<br>
-<h3>Numbered List </h3>
-<ol>
-  <li>One</li>
-  <li>Two 
-    <ol>
-      <li>Apples</li>
-      <li>Oranges</li>
-      <li>Bananas</li>
-    </ol>
-  </li>
-  <li>Three</li>
-</ol>
-
-<h2>Justified Text</h2>
-
-<p align=left>
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
- This paragraph is aligned <b>left</b>.
-</p>
-
-<p align=center>
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
- This paragraph is aligned <b>center</b>.
-</p>
-
-<p align=right>
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
- This paragraph is aligned <b>right</b>.
-</p>
-
-<p align=justify>
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
- This paragraph is <B>justified</B>.
-</p>
-
-</body>
-</html>
diff --git a/layout/html/tests/printer/general/test1.html b/layout/html/tests/printer/general/test1.html
deleted file mode 100644
index 261725bdf7da..000000000000
--- a/layout/html/tests/printer/general/test1.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<title>Example 1</title>
-<style>
-H1{ color: rgb(128,0,128) }
-PRE { background-color: rgb(200,200,200) }
-B {
-  background-color: rgb(128, 128, 255);
-  font-size: large;
-}
-I {
-  font-size: larger;
-}
-B I {
-  font-size: smaller;
-}
-LI B {
-  font-size: .25in;
-}
-UL LI {
-  color: green;
-  list-style: square outside url(resource:/res/samples/gear1.gif);	//none;
-}
-UL UL LI {
-  color: red;
-}
-H4 {
-  color: yelow;
-  background-image: url(gear1.gif);
-  background-repeat: repeat;
-  font-size: 150%;
-}
-</style>
-<meta name="crc" content=48969488>
-
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Example 1: CSS HTML Text Styles</h1>
-<p><br></p>
-<p>Note -- This document contains the following CSS declarations:</p>
-<pre>H1     { color: rgb(128,0,128) }
-PRE    { background-color: rgb(200,200,200); }
-B      { background-color: rgb(128, 128, 255); 
-         font-size: large; } 
-I      { font-size: larger; } 
-B I    { font-size: smaller; } 
-LI B   { font-size: .25in; } 
-UL LI  { color:    green; 
-        list-style: square outside url(resource:/res/gear1.gif); 
-        //none; } 
-UL UL LI { color: red; } 
-H4     { color: yellow;
-      	  background-image: url(gear1.gif); 
-         background-repeat: repeat; 
-         font-size:    150%; } 
-</pre>
-<p><br></p>
-<p>Here is an example of <b>bold</b>, <i>italic</i> and <b><i>bold-italic</i></b></p>
-<p><br></p>
-<p>Some links to test pseudo-classes</p>
-<p><a href="http://link">link</a></p>
-<p><a href="http://visited">visited</a></p>
-<p><a href="http://active">active</a></p>
-<p><a href="http://hover">hover</a></p>
-<h2>Bulleted List </h2>
-<ul>
-  <li>One</li>
-  <li>Two
-    <ul>
-      <li>Apples</li>
-      <li>Oranges</li>
-      <li>Bananas</li>
-    </ul>
-  </li>
-  <li>Three <b>Bold Text</b></li>
-</ul>
-<p><br></p>
-<h4>H3 -- A headline style, with a background image repeated and a font size increase 
-  by 150%. H3 -- A headline style, with a background image repeated and a font 
-  size increase by 150%. H3 -- A headline style, with a background image repeated 
-  and a font size increase by 150%. </h4>
-</body>
-</html>
diff --git a/layout/html/tests/printer/general/test2.html b/layout/html/tests/printer/general/test2.html
deleted file mode 100644
index b0f208492781..000000000000
--- a/layout/html/tests/printer/general/test2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<title>Example 2</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-PRE {
-      	  background-image: url(gear1.gif); 
-         background-repeat: repeat; 
-     }
-
-</style>
-<meta name="crc" content=2304870356>
-
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Example 2: HTML Images</h1>
-<h2>Images</h2>
-<h3>JPEGs:</h3>
-<p><img src="raptor.jpg" align=left>This is some text to show how a paragraph 
-  would flow around an image. This is some text to show how a paragraph would 
-  flow around an image. This is some text to show how a paragraph would flow around 
-  an image. </p>
-<p>This is some text to show how a paragraph would flow around an image. This 
-  is some text to show how a paragraph would flow around an image. This is some 
-  text to show how a paragraph would flow around an image. This is some text to 
-  show how a paragraph would flow around an image. This is some text to show how 
-  a paragraph would flow around an image. </p>
-<h3>Animated GIFs:</h3>
-<h3><img src="Anieyes.gif" width="72" height="37"></h3>
-<h3>Background Images:</h3>
-<pre>This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-</pre>
-
-</body>
-</html>
diff --git a/layout/html/tests/printer/general/test3.html b/layout/html/tests/printer/general/test3.html
deleted file mode 100644
index f09a21f51c00..000000000000
--- a/layout/html/tests/printer/general/test3.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<html>
-<head>
-<title>Example 3</title>
-<meta name="crc" content=2849229639>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Example 3: Basic Tables</h1>
-<h2>Simple table, 75% width, border=1</h2>
-<table border="1" width="75%">
-  <tr>
-    <td bgcolor=blue>cell bg</td>
-    <td>Two</td>
-    <td>Three</td>
-  </tr>
-  <tr>
-    <td align=left>left</td>
-    <td align=center>center</td>
-    <td align=right>right</td>
-  </tr>
-  <tr bgcolor=yellow>
-    <td height=50>row bg</td>
-    <td valign=top>top</td>
-    <td valign=bottom>bottom</td>
-  </tr>
-</table>
-<h2>Row Span, auto width table, border=5</h2>
-<table border=5>
-  <tr> 
-    <td rowspan=2 >c0r[0-1] Data 1 span=2 rows</td>
-    <td >c0r0</td>
-    <td >c1r0</td>
-  </tr>
-  <tr> 
-    <td >c0r1</td>
-    <td >c1r1</td>
-  </tr>
-  <tr> 
-    <td rowspan=5 background=bg.jpg>c0r[2-6],Data 2 span=5 rows</td>
-    <td >c0r2</td>
-    <td >c1r2</td>
-  </tr>
-  <tr> 
-    <td >c0r3</td>
-    <td >c1r3</td>
-  </tr>
-  <tr> 
-    <td >c0r4</td>
-    <td >c1r4</td>
-  </tr>
-  <tr> 
-    <td >c0r5</td>
-    <td >c1r5</td>
-  </tr>
-  <tr> 
-    <td >c0r6</td>
-    <td >c1r6</td>
-  </tr>
-  <tr> 
-    <td rowspan=3  >c0r[7-9] span=3 rows</td>
-    <td >c0r7</td>
-    <td >c1r7</td>
-  </tr>
-  <tr> 
-    <td >c0r8</td>
-    <td >c1r8</td>
-  </tr>
-  <tr> 
-    <td >c0r9</td>
-    <td >c1r9</td>
-  </tr>
-</table>
-<h2>Col Span auto width table</h2>
-<table border >
-  <tr> 
-    <td colspan=8>r0c[0-7], span=8</td>
-    <td colspan=10>r0col[8-17], span=10 cols</td>
-  </tr>
-  <tr> 
-    <td colspan=3>r1c[0-2], span=3</td>
-    <td colspan=5>r1c[3-7], span=5</td>
-    <td colspan=7>r1c[8-14], span=7</td>
-    <td colspan=3>r1c[15-17], span=3</td>
-  </tr>
-  <tr> 
-    <td >r2c0</td>
-    <td >r2c1</td>
-    <td >r2c3</td>
-    <td >r2c4</td>
-    <td >r2c5</td>
-    <td >r2c6</td>
-    <td >r2c7</td>
-    <td >r2c8</td>
-    <td >r2c9</td>
-    <td >r2c10</td>
-    <td >r2c11</td>
-    <td >r2c12</td>
-    <td >r2c13</td>
-    <td >r2c14</td>
-    <td >r2c15</td>
-    <td >r2c16</td>
-    <td >r2c17</td>
-    <td >r2c18</td>
-  </tr>
-</table>
-<h2>Row and Col Span</h2>
-<table border >
-  <tr> 
-    <td colspan=2 rowspan=2>r[0-2]c[0-1]</td>
-    <td>r0c2</td>
-    <td>r0c3</td>
-  </tr>
-  <tr> 
-    <td>r1c2</td>
-    <td>r1c3</td>
-  </tr>
-  <tr> 
-    <td>r2c0</td>
-    <td>r2c1</td>
-    <td>r2c2</td>
-    <td>r2c3</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/layout/html/tests/printer/general/test4.html b/layout/html/tests/printer/general/test4.html
deleted file mode 100644
index 134f160c7ca1..000000000000
--- a/layout/html/tests/printer/general/test4.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<title>Test 4</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-	div{
-		width:500px;
-		height:100px;
-		background-image:url("ck.gif");
-		background-repeat:no-repeat;
-    background-color:green;
-		background-position:center;
-	}
-</style>
-
-</head>
-
-
-<body bgcolor="#FF00FF" background="bg.gif" text="#000000">
-<h1>Test 4: Background Image Tests</h1>
-
-	<DIV> <BR>
-
-</body>
-</html>
diff --git a/layout/html/tests/printer/general/test5.html b/layout/html/tests/printer/general/test5.html
deleted file mode 100644
index 9b6e12ccb060..000000000000
--- a/layout/html/tests/printer/general/test5.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<title>Test 5</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-
-</head>
-
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Test 5: Input Printing Tests</h1>
-
-
-<form name="passwordform" action="xx" method="yy">  <br>       
-  PASSWORD <input type="password" name="passwd" value="goober"><br>
-  TEXT <input type="text" name="text" value="something"><br>
-  BUTTON <input type="button" Value="button"><br>
-  CHECKBOX <input type="checkbox" Value="checkbox"><br>
-  RADIO <input type="radio" Value="radio"><br>
-  RESET <input type="reset" Value="reset"><br>
-</form>
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/printer/general/test6.html b/layout/html/tests/printer/general/test6.html
deleted file mode 100644
index 936b9e1f9dfb..000000000000
--- a/layout/html/tests/printer/general/test6.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<title>Test 6</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-
-</head>
-
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Test 6: Select Printing Tests</h1>
-
-<input type = text>
-<input type = password>
-
-
-<h2> select Item </h2>
-<Select Name="chapters">
-  <option value="chap1.html"> Chapter 1
-  <option value="chap2.html"> Chapter 2
-  <option value="chap3.html"> Chapter 3
-  <option value="chap4.html"> Chapter 4
-</Select>
-<br>
-
-<h2> scroll select Item </h2>
-<Select size=3 Name="chapters">
-  <option value="chap1.html"> Chapter 10
-  <option value="chap2.html"> Chapter 20
-  <option value="chap3.html"> Chapter 30
-  <option value="chap4.html"> Chapter 40
-</Select>
-
-
-<h2> scroll select Item </h2>
-<Select size=4 Name="chapters">
-  <option value="chap1.html"> Chapter 10
-  <option value="chap2.html"> Chapter 20
-  <option value="chap3.html"> Chapter 30
-  <option value="chap4.html"> Chapter 40
-</Select>
-
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/printer/hidden_iframe/index.html b/layout/html/tests/printer/hidden_iframe/index.html
deleted file mode 100644
index 3a8ad3249d7e..000000000000
--- a/layout/html/tests/printer/hidden_iframe/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<HTML>
-<HEAD>
-<style>
-@media print {
- 
-  iframe.hide {
-    display: none;
-  }
-
-}
-</style>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-You should see 2 iframes when in the Browser<br>
-You should see 1 iframe for Printing and Print Preview<br>
-<iframe src=the_iframe1.html></iframe><br>
-<iframe class=hide src=the_iframe2.html></iframe><br>
-<iframe src=the_iframe3.html style="visibility:hidden;"></iframe><br>
-<iframe src=the_iframe3.html style="display:none;"></iframe><br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/hidden_iframe/the_iframe.html b/layout/html/tests/printer/hidden_iframe/the_iframe.html
deleted file mode 100644
index 6e84a74af982..000000000000
--- a/layout/html/tests/printer/hidden_iframe/the_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/hidden_iframe/the_iframe1.html b/layout/html/tests/printer/hidden_iframe/the_iframe1.html
deleted file mode 100644
index 6e84a74af982..000000000000
--- a/layout/html/tests/printer/hidden_iframe/the_iframe1.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/hidden_iframe/the_iframe2.html b/layout/html/tests/printer/hidden_iframe/the_iframe2.html
deleted file mode 100644
index ac468426600a..000000000000
--- a/layout/html/tests/printer/hidden_iframe/the_iframe2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This IFrame should be hidden when printined or Print Previewed
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/hidden_iframe/the_iframe3.html b/layout/html/tests/printer/hidden_iframe/the_iframe3.html
deleted file mode 100644
index 33776e55fe8b..000000000000
--- a/layout/html/tests/printer/hidden_iframe/the_iframe3.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This IFrame should always be hidden.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/iframe_2nd_page/iframe_example.html b/layout/html/tests/printer/iframe_2nd_page/iframe_example.html
deleted file mode 100644
index 678bdef3e698..000000000000
--- a/layout/html/tests/printer/iframe_2nd_page/iframe_example.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-<iframe src=the_iframe.html></iframe>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/iframe_2nd_page/index.html b/layout/html/tests/printer/iframe_2nd_page/index.html
deleted file mode 100644
index 6a7b5413b280..000000000000
--- a/layout/html/tests/printer/iframe_2nd_page/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-<hr>
-<iframe src=the_iframe.html></iframe>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/iframe_2nd_page/the_iframe.html b/layout/html/tests/printer/iframe_2nd_page/the_iframe.html
deleted file mode 100644
index 6e84a74af982..000000000000
--- a/layout/html/tests/printer/iframe_2nd_page/the_iframe.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text.
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/images/Anieyes.gif b/layout/html/tests/printer/images/Anieyes.gif
deleted file mode 100644
index de488ba16c8e57f7f481df641e7b92ae1d143891..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13539
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
V6z}gT-rrNazo&Tr7ftc*`7ej#UPk}`

diff --git a/layout/html/tests/printer/images/animatedgif.html b/layout/html/tests/printer/images/animatedgif.html
deleted file mode 100644
index 24bee9240e36..000000000000
--- a/layout/html/tests/printer/images/animatedgif.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<img src="Anieyes.gif">
-Animated GIF
-</body>
-</html>
-
diff --git a/layout/html/tests/printer/images/imagegif.html b/layout/html/tests/printer/images/imagegif.html
deleted file mode 100644
index 64d2746aee30..000000000000
--- a/layout/html/tests/printer/images/imagegif.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<img src="raptor.gif">
-GIF
-</body>
-</html>
-
diff --git a/layout/html/tests/printer/images/imagejpg.html b/layout/html/tests/printer/images/imagejpg.html
deleted file mode 100644
index 8ef34ee40a0d..000000000000
--- a/layout/html/tests/printer/images/imagejpg.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<img src="raptor.jpg">
-JPG
-</body>
-</html>
-
diff --git a/layout/html/tests/printer/images/raptor.GIF b/layout/html/tests/printer/images/raptor.GIF
deleted file mode 100644
index 483b5bf11c4b7d82d764722278ac39ea02373977..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12341
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
S<Id8bzdQzgi;YNt_x}KKk5bzJ

diff --git a/layout/html/tests/printer/images/raptor.jpg b/layout/html/tests/printer/images/raptor.jpg
deleted file mode 100644
index 7c79e065d7ef953d23f90e6cc575377f32e109f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49619
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
V|JGTL?@j>x_geq&j;KGG{{T9&d)xp3

diff --git a/layout/html/tests/printer/images/test2.html b/layout/html/tests/printer/images/test2.html
deleted file mode 100644
index b0f208492781..000000000000
--- a/layout/html/tests/printer/images/test2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<title>Example 2</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<style>
-PRE {
-      	  background-image: url(gear1.gif); 
-         background-repeat: repeat; 
-     }
-
-</style>
-<meta name="crc" content=2304870356>
-
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Example 2: HTML Images</h1>
-<h2>Images</h2>
-<h3>JPEGs:</h3>
-<p><img src="raptor.jpg" align=left>This is some text to show how a paragraph 
-  would flow around an image. This is some text to show how a paragraph would 
-  flow around an image. This is some text to show how a paragraph would flow around 
-  an image. </p>
-<p>This is some text to show how a paragraph would flow around an image. This 
-  is some text to show how a paragraph would flow around an image. This is some 
-  text to show how a paragraph would flow around an image. This is some text to 
-  show how a paragraph would flow around an image. This is some text to show how 
-  a paragraph would flow around an image. </p>
-<h3>Animated GIFs:</h3>
-<h3><img src="Anieyes.gif" width="72" height="37"></h3>
-<h3>Background Images:</h3>
-<pre>This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-This is a preformatted paragraph with a animated background image. 
-</pre>
-
-</body>
-</html>
diff --git a/layout/html/tests/printer/index.html b/layout/html/tests/printer/index.html
deleted file mode 100644
index 1e3915f21c59..000000000000
--- a/layout/html/tests/printer/index.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Index of Printing Tests</title>
-                                                                        
-        
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-                                             
-  <meta name="author" content="Rod Spears">
-</head>
-  <body>
-                   
-<h1>Index of Printing and Print Preview Tests</h1>
-          <a href="printing_checklist.html">Printing &amp; Print Preview
-Check   List</a><br>
-         <br>
-                   
-<ul>
-            <li>CSS @page</li>
-       
-  <ul>
-      <li><a href="CSSPage/portrait.html">Portrait</a></li>
-      <li><a href="CSSPage/landscape.html">Landscape</a></li>
-      <li><a href="CSSPage/margin10percent.html">Margin 10%</a></li>
-      <li><a href="CSSPage/page8x11margin10percent.html">8.5x11 Margin: 10%</a></li>
-      <li><a href="CSSPage/page8x11margin254cm.html">8.5x11 Margin: 254cm 
-(Margin 1")</a></li>
-      <li><a href="CSSPage/page8x11marginhalfin.html">8.5x11 Margin: 0.5in</a></li>
-      <li><a href="CSSPage/marginauto.html">Margin "auto"</a></li>
-      <li><a href="CSSPage/pagesizeauto.html">Page Size auto</a></li>
-      <li><a href="CSSPage/marginleftautoright1in.html">Margin - left:auto
- right:1in</a></li>
-      <li><a href="CSSPage/frameset1/simple_main.html">Frameset</a><br>
-      </li>
-      <li><a href="CSSPage/frameset2/simple_main.html">Frameset with IFrames</a><br>
-      </li>
-       
-  </ul>
-    <li>Long Pages</li>
-                                             
-  <ul>
-              <li><a href="long_pages/2_pages.html">2 Pages</a></li>
-              <li><a href="long_pages/8_pages.html">8 Pages</a></li>
-              <li><a href="long_pages/105_pages.html">105 Pages</a></li>
-                                             
-  </ul>
-            <li>Misc</li>
-                                             
-  <ul>
-              <li><a href="misc/scaled_scrollbars.html">Scaled Scrollbars</a></li>
-              <li><a href="misc/embed_obj_tag.html">Embed &amp; Object Tag</a></li>
-              <li><a href="misc/abs_pos.html">Absolutely positioned DIVs</a>(Turn 
-    off Shrink To Fit)</li>
-              <li><a href="misc/abs_pos.html">Absolutely positioned DIVs
-(Two  Pages)</a>   (Turn off Shrink To Fit)</li>
-                         <li><a href="misc/page_with_long_title.html">Page
- With Long Title</a></li>
-            <li><a href="misc/font_size_scaling.html">Font Size Specification 
- (with  scaling)</a></li>
-     <li><a href="misc/js_pp_timer.html">DHTML after PrintPreview (no frameset)</a></li>
-     <li><a href="frameset/frameset8/index.html">DHTML after PrintPreview 
-(with frameset)</a></li>
-                                             
-  </ul>
-     <li>Script Related</li>
-           
-  <ul>
-       <li><a href="js/print_from_js.html">Print  From JS</a></li>
-       <li><a href="js/print_from_onload.html">Print from onLoad handler</a></li>
-       <li><a href="js/print_from_script.html">Print from script half way 
- down page</a></li>
-    <li><a href="js/load_print_reload.html">Click link, load page, print,
-back</a></li>
-    <li><a href="js/load_print_close.html">Click link, load page, print,
-close (doesn't work)</a></li>
-    <li><a href="js/load_new_site_from_js.html">Click link, load page, print,
-load different URL (doesn't work)</a></li>
-    <li><a href="js/change_while_in_printdialog.html">Load different page
-while in Print Dialog</a></li>
-    <li><a href="js/js_pp_timer.html">Timer should run before and after PP</a><br>
-    </li>
-           
-  </ul>
-            <li>IFrames&nbsp;(Printing &amp; PP)</li>
-                                             
-  <ul>
-              <li><a href="iframe_2nd_page/index.html">IFrame on 2nd Page</a> 
- (You   should see an iframe only on the second page)</li>
-              <li><a href="zeropos_iframes/index.html">Zero Positioned IFrame</a>&nbsp;</li>
-          <li><a
- href="file:///N:/mozilla/layout/html/tests/printer/hidden_iframe/index.html">Hidden 
-  IFrame in a page</a></li>
-        <li><a href="more_iframes/iframe_in_iframe/index.html">IFrame nested 
- in an IFrame</a><br>
-         </li>
-                                             
-  </ul>
-            <li>FrameSets (Printing &amp; PP)</li>
-                                             
-  <ul>
-              <li><a href="frameset/frameset1/simple_main.html">Simple FrameSet</a></li>
-              <li><a href="frameset/frameset2/simple_main.html">Simple FrameSet 
-  with  IFrame</a></li>
-              <li><a href="noframes/simple_main.html">&lt;noframes&gt; Test</a></li>
-           <li><a href="frameset/frameset3/root.html">FrameSet-Frame containing 
-  a FrameSet</a></li>
-           <li><a href="frameset/frameset4/root.html">Simple Frameset containing 
-  a FrameSet</a></li>
-        <li><a
- href="file:///Q:/mozilla/layout/html/tests/printer/frameset/frameset5/root.html">FrameSet-Frame 
- containing  a FrameSet that contains an IFrame</a></li>
-        <li><a
- href="file:///Q:/mozilla/layout/html/tests/printer/frameset/frameset6/root.html">Simple 
- Frameset containing  a FrameSet that contains an IFrame</a></li>
-       <li><a href="frameset/frameset7/index.html">SimpleFrameSet Child is
- long document</a> (Print child as selected frame and then try to go Forwward
- or Back)<br>
-       </li>
-                                             
-  </ul>
-            <li>Shrink To Fit (Printing and PP)</li>
-                                             
-  <ul>
-              <li><a href="shrink_to_fit/test1/simple_main.html">Test1 -
-Left  Frame   is wide</a></li>
-              <li><a href="shrink_to_fit/test2/simple_main.html">Test2 -
-Right   Frame  is wide</a></li>
-              <li><a href="shrink_to_fit/test3/simple_main.html">Test3 -
-Missing    Frames in Frameset</a></li>
-              <li><a href="shrink_to_fit/test4/index.html">Test4 - Wide Document</a></li>
-              <li><a href="shrink_to_fit/test5/simple_main.html">Test5 -
-Wide  Right   /w IFrames</a></li>
-              <li><a href="shrink_to_fit/test6/index.html">Test6 - Wide Doc
- /w  IFrame</a></li>
-              <li><a href="shrink_to_fit/test7/simple_main.html">Test7 -
-3  Piece   FrameSet</a><br>
-              </li>
-                                             
-  </ul>
-                   
-</ul>
-          <br>
-         <br>
-        <br>
-       <br>
-      <br>
-     <br>
-    <br>
-   <br>
-  <br>
- <br>
-</body>
-</html>
diff --git a/layout/html/tests/printer/js/change_while_in_printdialog.html b/layout/html/tests/printer/js/change_while_in_printdialog.html
deleted file mode 100644
index cd569f873cd9..000000000000
--- a/layout/html/tests/printer/js/change_while_in_printdialog.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head>
-<title>Second Page</title>
-<script language="JavaScript">
-function doLoad()
-{
-  window.setTimeout("loadNewPage()", 5000);
-  window.print();
-}
-
-function loadNewPage()
-{
-  window.location.href = "http://www.mozilla.org";
-}
-</script>
-</head>
-<body bgcolor="#ffffff" onload="doLoad();">
-This will print this page and then 5 seconds later it will change the URL of this page while Print Dialog up.
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/js_pp_timer.html b/layout/html/tests/printer/js/js_pp_timer.html
deleted file mode 100644
index 5770e0485be9..000000000000
--- a/layout/html/tests/printer/js/js_pp_timer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" content="text/html; charset=iso-8859-1">
-<TITLE>JS Test 1</TITLE>
-<script>
-  var gCounter = 0;
-
-  function doLoad()
-  {
-    setTimeout("counter()", 1000);
-  }
-
-  function counter()
-  {
-    document.getElementById("status").value = gCounter++;
-    setTimeout("counter()", 1000);
-  }
-</script>
-</HEAD>
-<BODY onload="doLoad()">
-
-<input type=text id=status>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/printer/js/load_new_site_from_js.html b/layout/html/tests/printer/js/load_new_site_from_js.html
deleted file mode 100644
index 85dc816d9199..000000000000
--- a/layout/html/tests/printer/js/load_new_site_from_js.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head>
-
-<title>Second Page</title>
-<script language="JavaScript">
-var origURL = "http://www.mozilla.org"
-</script></head>
-<body bgcolor="#ffffff" onload="window.print();window.location.href = 'http://www.mozilla.org'">
-This is the page that should be printed
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/load_print_close.html b/layout/html/tests/printer/js/load_print_close.html
deleted file mode 100644
index 2cea93cf136b..000000000000
--- a/layout/html/tests/printer/js/load_print_close.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<body bgcolor="#c0d0f0">
-<a onclick="window.open('load_print_close_page2.html', 0);">Click here to to print the second page</a>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/load_print_close_page2.html b/layout/html/tests/printer/js/load_print_close_page2.html
deleted file mode 100644
index 311937e6c4ab..000000000000
--- a/layout/html/tests/printer/js/load_print_close_page2.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<title>close second page</title>
-</head>
-<body bgcolor="#ffffff" onload="window.print();window.close();">
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-This is the close second page
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/load_print_reload.html b/layout/html/tests/printer/js/load_print_reload.html
deleted file mode 100644
index 5b58600b5f57..000000000000
--- a/layout/html/tests/printer/js/load_print_reload.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<body bgcolor="#c0d0f0">
-<a href="load_print_reload_page2.html">Click here to to print the second page</a>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/load_print_reload_page2.html b/layout/html/tests/printer/js/load_print_reload_page2.html
deleted file mode 100644
index b4a429fb150c..000000000000
--- a/layout/html/tests/printer/js/load_print_reload_page2.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<html><head>
-
-<title>Second Page</title>
-<script language="JavaScript">
-var origURL = "load_print_reload.html"
-</script></head>
-<body bgcolor="#ffffff" onload="window.print(); window.location.href = origURL">
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-This is the second page
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/js/print_from_js.html b/layout/html/tests/printer/js/print_from_js.html
deleted file mode 100644
index f3f9d424c74c..000000000000
--- a/layout/html/tests/printer/js/print_from_js.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Print from JS</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-<hr>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-<input type=button value="Print this Page" onclick="window.print();">
-</body>
diff --git a/layout/html/tests/printer/js/print_from_onload.html b/layout/html/tests/printer/js/print_from_onload.html
deleted file mode 100644
index 5b09217a31c9..000000000000
--- a/layout/html/tests/printer/js/print_from_onload.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Print from onLoad handler</title>
-<script>
-function myload()
-{
-  window.print();
-}
-</script>
-</head>
-<body onload="myload()">
-<a href=link.html>Link</a>
-This is some body text.
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-<hr>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</body>
diff --git a/layout/html/tests/printer/js/print_from_script.html b/layout/html/tests/printer/js/print_from_script.html
deleted file mode 100644
index 3bcfab6da45f..000000000000
--- a/layout/html/tests/printer/js/print_from_script.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Print half way down page</title>
-</head>
-<body>
-Print half way down page<br>
-<a href=link.html>Link</a>
-This is some body text.
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-<hr>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-<script>
-  window.print();
-</script>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</body>
diff --git a/layout/html/tests/printer/long_pages/105_pages.html b/layout/html/tests/printer/long_pages/105_pages.html
deleted file mode 100644
index ba9b7b3595ed..000000000000
--- a/layout/html/tests/printer/long_pages/105_pages.html
+++ /dev/null
@@ -1,5633 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>105 Pages</TITLE>
-</HEAD>
-<BODY>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br><br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-<br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-
-
-</BODY>
diff --git a/layout/html/tests/printer/long_pages/2_pages.html b/layout/html/tests/printer/long_pages/2_pages.html
deleted file mode 100644
index da00736a01c1..000000000000
--- a/layout/html/tests/printer/long_pages/2_pages.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>2 Pages</TITLE>
-</HEAD>
-<BODY>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-
-
-</BODY>
diff --git a/layout/html/tests/printer/long_pages/8_pages.html b/layout/html/tests/printer/long_pages/8_pages.html
deleted file mode 100644
index 9abc461a4978..000000000000
--- a/layout/html/tests/printer/long_pages/8_pages.html
+++ /dev/null
@@ -1,877 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>8 Pages</TITLE>
-</HEAD>
-<BODY>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br><br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-<br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-
-
-</BODY>
diff --git a/layout/html/tests/printer/misc/abs_pos.html b/layout/html/tests/printer/misc/abs_pos.html
deleted file mode 100644
index 4adbcb891c7a..000000000000
--- a/layout/html/tests/printer/misc/abs_pos.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Absolutely Positioned Element</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<div style="background-color:lightgray;position:absolute;top:-50px;left:-50px;width:500px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;position:absolute;top:850px;left:300px;width:500px;height:300px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-<hr>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-</div>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-
-</body>
diff --git a/layout/html/tests/printer/misc/abs_pos2.html b/layout/html/tests/printer/misc/abs_pos2.html
deleted file mode 100644
index b06589d13cd0..000000000000
--- a/layout/html/tests/printer/misc/abs_pos2.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Absolutely Positioned Element</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line v1<br>
-line v2<br>
-line v3<br>
-line v4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line w1<br>
-line w2<br>
-line w3<br>
-line w4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line x1<br>
-line x2<br>
-line x3<br>
-line x4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line y1<br>
-line y2<br>
-line y3<br>
-line y4<br>
-</div>
-<div style="background-color:lightgray;width:900px;height:100px;border: 2px inset grey;">
-line z1<br>
-line z2<br>
-line z3<br>
-line z4<br>
-</div>
-line a<br>
-line b<br>
-line c<br>
-line d<br>
-line e<br>
-line f<br>
-line g<br>
-line h<br>
-line i<br>
-line j<br>
-line k<br>
-
-</body>
diff --git a/layout/html/tests/printer/misc/embed_obj_tag.html b/layout/html/tests/printer/misc/embed_obj_tag.html
deleted file mode 100644
index c28007cb5078..000000000000
--- a/layout/html/tests/printer/misc/embed_obj_tag.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><title>Embed & Object Tag</title></head>
-<body>
-<embed src="http://www.macromedia.com/shockwave/download/triggerpages/flash.swf" pluginspage="/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" type="application/x-shockwave-flash" width="300" height="120" loop="true" quality="best" bgcolor="#000000"></embed>
-                                 
-
-<hr>
-<object data="http://www.macromedia.com/shockwave/download/triggerpages/flash.swf" pluginspage="/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" type="application/x-shockwave-flash" width="300" height="120" loop="true" quality="best" bgcolor="#000000"></object>
-                                 
-
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/printer/misc/font_size_scaling.html b/layout/html/tests/printer/misc/font_size_scaling.html
deleted file mode 100644
index f1d96aed11b3..000000000000
--- a/layout/html/tests/printer/misc/font_size_scaling.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html><body>Some Regular Text
-<span style="font-family:arial; font-size: 12pt;">123456789e123456789B123456789C123456789D123456789E123456789F123456789G123456789H123456789I123456789JxxxxxxxxxKxxxxxxxxxM123456789N123456789O</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: medium;">
-font-size: medium; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 12pt;">
-font-size: 12pt; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 16px;">
-font-size: 16px; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 1em;">
-font-size: 1em; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 0.42cm;">
-font-size: 0.42cm; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 4.2mm;">
-font-size: 4.2mm; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-
-<br>
-<span style="font-family:arial; font-size: 1pc;">
-font-size: 1pc; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 2.25ex;">
-font-size: 5ex; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-<br>
-<br>
-<span style="font-family:arial; font-size: 2.25ex;">
-<span style="font-family:arial; font-size: smaller;">
-<span style="font-family:arial; font-size: larger;">
-font-size: 5ex; - So far, the greatest level of legal compliance activity comes in the area of crackdown on pirates and hackers.
-The BSA said in Europe last year it issued 4,400 notice and "takedown" requests, mainly to ISPs suspected of hosting a site trafficking elicit copies of copyrighted software.
-</span>
-</span>
-
-</span>
-
-</body></html>
diff --git a/layout/html/tests/printer/misc/page_with_long_title.html b/layout/html/tests/printer/misc/page_with_long_title.html
deleted file mode 100644
index ed385f8bec32..000000000000
--- a/layout/html/tests/printer/misc/page_with_long_title.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>
-Long Title - This is a very really very very really very very really very very really very very really very very really very very really very very really very very really very very really very very really very very really very long title
-</title>
-</head>
-<body>
-Line 1<br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/misc/scaled_scrollbars.html b/layout/html/tests/printer/misc/scaled_scrollbars.html
deleted file mode 100644
index d5df47e58fdb..000000000000
--- a/layout/html/tests/printer/misc/scaled_scrollbars.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Scaled Scrollbars</title>
-</head>
-<body>
-Directions: Set the scaling to 50% and the go into PrintPreview<br><br>
-
-<a href=link.html>Link</a>
-This is some body text.
-<div style="background-color:lightgray;overflow:scroll;width:100px;height:100px;border: 2px inset grey;">
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-</div>
-<select size=5>
-<option>one
-<option>one
-<option>one
-<option>one
-<option>one
-<option>one
-line 1<br>
-</select>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-
-</body>
diff --git a/layout/html/tests/printer/more_iframes/iframe_in_iframe/index.html b/layout/html/tests/printer/more_iframes/iframe_in_iframe/index.html
deleted file mode 100644
index c4318ae1d546..000000000000
--- a/layout/html/tests/printer/more_iframes/iframe_in_iframe/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-Line 4<br>
-Line 5<br>
-Line 6<br>
-Line 7<br>
-Line 8<br>
-Line 9<br>
-Line 10<br>
-Line 11<br>
-Line 12<br>
-Line 13<br>
-Line 14<br>
-Line 15<br>
-Line 16<br>
-Line 17<br>
-Line 18<br>
-Line 19<br>
-Line 20<br>
-Line 21<br>
-Line 22<br>
-Line 23<br>
-Line 24<br>
-Line 25<br>
-Line 26<br>
-Line 27<br>
-Line 28<br>
-Line 29<br>
-Line 30<br>
-Line 31<br>
-Line 32<br>
-Line 33<br>
-Line 34<br>
-Line 35<br>
-Line 36<br>
-<iframe src=the_iframe.html></iframe><br>
-Line 37<br>
-Line 38<br>
-Line 39<br>
-Line 40<br>
-Line 41<br>
-Line 42<br>
-Line 43<br>
-Line 44<br>
-Line 45<br>
-Line 46<br>
-Line 47<br>
-Line 48<br>
-Line 49<br>
-Line 50<br>
-Line 51<br>
-Line 52<br>
-Line 53<br>
-Line 54<br>
-Line 55<br>
-Line 56<br>
-Line 57<br>
-Line 58<br>
-Line 59<br>
-<hr>
-<iframe src=the_iframe.html></iframe><br>
-Line 1<br>
-Line 2<br>
-Line 3<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe.html b/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe.html
deleted file mode 100644
index 32d25127b76a..000000000000
--- a/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-This is some body text  IFRAME #1.
-<hr>
-<iframe src=the_iframe2.html style="height:30px"></iframe><br>
-</form>
-</body>
diff --git a/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe2.html b/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe2.html
deleted file mode 100644
index 6755fb302a0a..000000000000
--- a/layout/html/tests/printer/more_iframes/iframe_in_iframe/the_iframe2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This is some body text IFRAME #2
-<hr>
-</form>
-</body>
diff --git a/layout/html/tests/printer/noframes/simple_main.html b/layout/html/tests/printer/noframes/simple_main.html
deleted file mode 100644
index 9dc499f90195..000000000000
--- a/layout/html/tests/printer/noframes/simple_main.html
+++ /dev/null
@@ -1,1272 +0,0 @@
-<HTML>
-<head>
-<title>FrameSet</title>
-</head>
-<FRAMESET border="1" rows="1*,1*" cols="*"> 
-  <FRAME id="frmFooter" name="header" scrolling="auto" src="simple_sub1.html">
-</FRAMESET>
-<noframes>
-Hello, This should not be displaying in Print Preview
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-line<br>
-vv</noframes>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/noframes/simple_sub1.html b/layout/html/tests/printer/noframes/simple_sub1.html
deleted file mode 100644
index 1873f1ad0bf0..000000000000
--- a/layout/html/tests/printer/noframes/simple_sub1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-Some text before
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/printing_checklist.html b/layout/html/tests/printer/printing_checklist.html
deleted file mode 100644
index 0b289c5bf476..000000000000
--- a/layout/html/tests/printer/printing_checklist.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Printing &amp; Print Preview Check List</title>
-  <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
-  <meta name="author" content="Rod Spears">
-</head>
-<body>
-<h1>Printing &amp; Print Preview Check List</h1>
-<br>
-<ul>
-  <li>Printing</li>
-  <ul>
-    <li>Print a page</li>
-    <li>Print Frameset "AsIs"</li>
-    <li>Print Framset "each separately"</li>
-    <li>Click on frame and print selected frame</li>
-    <li>Selection</li>
-    <ul>
-      <li>Click on an image print "Selection" (should print just the image)</li>
-    </ul>
-    <ul>
-      <li>Click on IFrame and print the Selection (should print IFrame as
-it's own document)</li>
-    </ul>
-    <ul>
-      <li>Select some text in Document, Print selection</li>
-      <li>Select text in a FrameSet Frame, Print Selection</li>
-      <li>Select text in an IFrame in a FrameSet Frame, Print Selection</li>
-    </ul>
-    <li>MailNews</li>
-    <ul>
-      <li>Print a Mail message</li>
-    </ul>
-    <ul>
-      <li>Print multiple mail messages</li>
-    </ul>
-    <ul>
-      <li>Print Address Book Card</li>
-    </ul>
-    <ul>
-      <li>Print Address Book</li>
-    </ul>
-    <li>Editor</li>
-    <ul>
-      <li>Open Editor, Print<br>
-      </li>
-    </ul>
-  </ul>
-  <li>Open Page Setup</li>
-  <ul>
-    <li>Change various settings, print page again</li>
-    <li>Test margins, etc.<br>
-    </li>
-  </ul>
-  <li>Print Preview</li>
-  <ul>
-    <li>Go into PP</li>
-    <li>Test #1</li>
-    <ul>
-      <li>Print page</li>
-    </ul>
-    <li>Test #2 - Tests Page Setup from PP</li>
-    <ul>
-      <li>Open Page Setup</li>
-    </ul>
-    <ul>
-      <ul>
-        <li>Change Orientation, press OK (PP should change)</li>
-      </ul>
-      <li>Print</li>
-      <li>Open Page Setup</li>
-      <ul>
-        <li>Change Orientation, Cancel (PP Orientation should not change)</li>
-      </ul>
-      <li>Print (Orientation should not change)</li>
-    </ul>
-    <li>Test 3 - Tests Shrink To Fit (STF) and Scaling from PP</li>
-    <ul>
-      <li>If you start with it on STF</li>
-      <li>Select 50% (should scale)</li>
-      <li>Select Custom, enter 75%, press OK (should scale to 75%)</li>
-      <li>Select 100%</li>
-      <li>Select Custom, change the value to 50%, press Cancel (nothing should
-happen and the combobox should show 100%)</li>
-      <li>Select STF</li>
-      <li>Select Custom, change the value to 50%, press Cancel (nothing should
-happen and the combobox should show STF)</li>
-      <li>Open Page Setup, STF should be checked, close it</li>
-      <li>Select 100%</li>
-      <li>Open Page Setup, scale should be 100% and STF unchecked</li>
-      <li>Select Custom and enter 91%</li>
-      <li>Open Page Setup,&nbsp;scale should be 91% and STF unchecked</li>
-      <li>When Scaling changes make sure the number of Pages in the PP toolbar
-changes<br>
-      </li>
-    </ul>
-    <li>Test 4 - Orientation</li>
-    <ul>
-      <li>Change Orientation and then Open Page Setup to see if it is updated</li>
-      <li>Change it in the Page Setup and see if the toolbar gets updated.</li>
-    </ul>
-    <li>Test 5 - Test PP Page Navigation<br>
-    </li>
-  </ul>
-</ul>
-<br>
-</body>
-</html>
diff --git a/layout/html/tests/printer/shrink_to_fit/test1/simple_main.html b/layout/html/tests/printer/shrink_to_fit/test1/simple_main.html
deleted file mode 100644
index b58c446f8a1e..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test1/simple_main.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="*" cols="110,1*"> 
-  <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub1.html"  noresize>
-  <FRAME id="frmContent" name="display" src="simple_sub2.html" noresize>
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test1/simple_sub1.html b/layout/html/tests/printer/shrink_to_fit/test1/simple_sub1.html
deleted file mode 100644
index 1dc9211606b4..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test1/simple_sub1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-<div style="width:800px;border: 1px solid black;">
-div text
-</div>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test1/simple_sub2.html b/layout/html/tests/printer/shrink_to_fit/test1/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test1/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test2/simple_main.html b/layout/html/tests/printer/shrink_to_fit/test2/simple_main.html
deleted file mode 100644
index 7e35821cfed8..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test2/simple_main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="*" cols="100,1*"> 
-  <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub1.html"  noresize>
-  <FRAMESET border="1" rows="1*,1*" cols="*"> 
-    <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub2.html"  noresize>
-    <FRAME id="frmContent" name="display" src="simple_sub3.html" scrolling=no>
-  </FRAMESET>
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub1.html b/layout/html/tests/printer/shrink_to_fit/test2/simple_sub1.html
deleted file mode 100644
index 7d692594c182..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub1.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-<div style="width:800px;border: 1px solid black;">
-div text
-</div><br>
-<div style="width:100px;border: 1px solid black;background-color:gray;">
-div text
-</div><br>
-<div style="width:90px;border: 1px solid black;background-color:blue;">
-div text
-</div>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub2.html b/layout/html/tests/printer/shrink_to_fit/test2/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub3.html b/layout/html/tests/printer/shrink_to_fit/test2/simple_sub3.html
deleted file mode 100644
index 650f6b474245..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test2/simple_sub3.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 3</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY bgcolor=#c0d0f0>
-Some text
-<div style="width:1200px;border: 1px solid black;">
-<pre>1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p.z.x.c.v.b.n.m.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p</pre>
-</div>
-Some text Before >>>>>>>> 
-</BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test3/simple_main.html b/layout/html/tests/printer/shrink_to_fit/test3/simple_main.html
deleted file mode 100644
index 66861d805226..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test3/simple_main.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="*" cols="110,1*"> 
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test4/index.html b/layout/html/tests/printer/shrink_to_fit/test4/index.html
deleted file mode 100644
index f1f6047b0ee9..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test4/index.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 3</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<div style="width:1200px;border: 1px solid black;">
-<pre>1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p.z.x.c.v.b.n.m.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p</pre>
-</div>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test5/simple_main.html b/layout/html/tests/printer/shrink_to_fit/test5/simple_main.html
deleted file mode 100644
index 915a9eb1c55f..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test5/simple_main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="*" cols="110,1*"> 
-  <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub1.html"  noresize>
-  <FRAMESET border="1" rows="1*,1*" cols="*"> 
-    <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub2.html"  noresize>
-    <FRAME id="frmContent" name="display" src="simple_sub3.html" scrolling=no>
-  </FRAMESET>
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub1.html b/layout/html/tests/printer/shrink_to_fit/test5/simple_sub1.html
deleted file mode 100644
index 00d6b7146723..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub1.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-<div style="width:800px;border: 1px solid black;">
-div text
-</div>
-<iframe src=sub_iframe.html></iframe>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub2.html b/layout/html/tests/printer/shrink_to_fit/test5/simple_sub2.html
deleted file mode 100644
index 146fbbca8b64..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub2.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub3.html b/layout/html/tests/printer/shrink_to_fit/test5/simple_sub3.html
deleted file mode 100644
index cc2d52164a38..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test5/simple_sub3.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 3</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<div style="width:1200px;border: 1px solid black;">
-<pre>1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p.z.x.c.v.b.n.m.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p</pre>
-</div>
-<iframe src=sub_iframe.html></iframe>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test5/sub_iframe.html b/layout/html/tests/printer/shrink_to_fit/test5/sub_iframe.html
deleted file mode 100644
index 1e878a97a3dc..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test5/sub_iframe.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-<img src="../../general/raptor.jpg" width=50 height=50>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/printer/shrink_to_fit/test6/index.html b/layout/html/tests/printer/shrink_to_fit/test6/index.html
deleted file mode 100644
index ad022c1388a3..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test6/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 3</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<iframe src=sub_iframe.html></iframe><br>
-<div style="width:1200px;border: 1px solid black;">
-<pre>1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p.z.x.c.v.b.n.m.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p</pre>
-</div>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test6/sub_iframe.html b/layout/html/tests/printer/shrink_to_fit/test6/sub_iframe.html
deleted file mode 100644
index 1e878a97a3dc..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test6/sub_iframe.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-<img src="../../general/raptor.jpg" width=50 height=50>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/printer/shrink_to_fit/test7/simple_main.html b/layout/html/tests/printer/shrink_to_fit/test7/simple_main.html
deleted file mode 100644
index 7e35821cfed8..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test7/simple_main.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<HTML>
-<FRAMESET border="1" rows="*" cols="100,1*"> 
-  <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub1.html"  noresize>
-  <FRAMESET border="1" rows="1*,1*" cols="*"> 
-    <FRAME id="frmFooter" name="header" scrolling="no" src="simple_sub2.html"  noresize>
-    <FRAME id="frmContent" name="display" src="simple_sub3.html" scrolling=no>
-  </FRAMESET>
-</FRAMESET>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub1.html b/layout/html/tests/printer/shrink_to_fit/test7/simple_sub1.html
deleted file mode 100644
index 7d692594c182..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub1.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-<div style="width:800px;border: 1px solid black;">
-div text
-</div><br>
-<div style="width:100px;border: 1px solid black;background-color:gray;">
-div text
-</div><br>
-<div style="width:90px;border: 1px solid black;background-color:blue;">
-div text
-</div>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub2.html b/layout/html/tests/printer/shrink_to_fit/test7/simple_sub2.html
deleted file mode 100644
index 29b403130636..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub2.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 2</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub3.html b/layout/html/tests/printer/shrink_to_fit/test7/simple_sub3.html
deleted file mode 100644
index a4d763b9fda6..000000000000
--- a/layout/html/tests/printer/shrink_to_fit/test7/simple_sub3.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 3</TITLE>
-<BASE target="display">
-</HEAD>
-<BODY bgcolor=#c0d0f0>
-<div style="width:1200px;border: 1px solid black;visibility:hidden;">
-<pre>1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p.z.x.c.v.b.n.m.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9.0.a.s.d.f.g.h.j.k.l.q.w.e.r.t.y.u.i.o.p</pre>
-</div>
-<a href=link.html>Link</a>
-Some text Before >>>>>>>> 
-<a href=link.html>Link</a>
-This is "display" of the frame set (Sub Doc 2)<br>
-o  o  o  o  o  o  o  o  o  o  o  o  o  
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o 
-o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o  o <br>
-2Line 1<br>
-2Line 2<br>
-2Line 3<br>
-2Line 4<br>
-2Line 5<br>
-2Line 6<br>
-2Line 7<br>
-2Line 8<br>
-2Line 9<br>
-2Line 10<br>
-2Line 11<br>
-2Line 12<br>
-2Line 13<br>
-2Line 14<br>
-2Line 15<br>
-2Line 16<br>
-2Line 17<br>
-2Line 18<br>
-2Line 19<br>
-2Line 20<br>
-2Line 21<br>
-2Line 22<br>
-2Line 23<br>
-2Line 24<br>
-2Line 25<br>
-2Line 26<br>
-2Line 27<br>
-2Line 28<br>
-2Line 29<br>
-2Line 30<br>
-2Line 31<br>
-2Line 32<br>
-2Line 33<br>
-2Line 34<br>
-2Line 35<br>
-2Line 36<br>
-2Line 37<br>
-2Line 38<br>
-2Line 39<br>
-2Line 40<br>
-2Line 41<br>
-2Line 42<br>
-2Line 43<br>
-2Line 44<br>
-2Line 45<br>
-2Line 46<br>
-2Line 47<br>
-2Line 48<br>
-2Line 49<br>
-2Line 50<br>
-2Line 51<br>
-2Line 52<br>
-2Line 53<br>
-2Line 54<br>
-2Line 55<br>
-2Line 56<br>
-2Line 57<br>
-2Line 58<br>
-2Line 59<br></BODY>
diff --git a/layout/html/tests/printer/table/table1.html b/layout/html/tests/printer/table/table1.html
deleted file mode 100644
index 981528e09ce5..000000000000
--- a/layout/html/tests/printer/table/table1.html
+++ /dev/null
@@ -1,2125 +0,0 @@
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF">
-<table width="75%" border="1">
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>dfgd</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td height="29">&nbsp;</td>
-    <td height="29">e</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">fdsf</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-    <td height="29">&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>afsd</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>dsfgd</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-    <td height="25">&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>e</td>
-  </tr>
-  <tr> 
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<table width="75%" border="1">
-  <tr> 
-    <td>Colunm 1</td>
-    <td>1</td>
-    <td>2</td>
-    <td>3</td>
-    <td>4</td>
-    <td>5</td>
-    <td>6</td>
-    <td>7</td>
-    <td>8</td>
-    <td>98</td>
-    <td>8</td>
-    <td>8</td>
-    <td>6</td>
-    <td>6</td>
-    <td>5</td>
-    <td>5</td>
-    <td>4</td>
-    <td>4</td>
-    <td>3</td>
-    <td>2</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/printer/table/table2.html b/layout/html/tests/printer/table/table2.html
deleted file mode 100644
index d8422f335f83..000000000000
--- a/layout/html/tests/printer/table/table2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body bgcolor="#99FFFF">
-<p>Table background Color..</p>
-<table width="75%" border="1" bgcolor="#FF3333" bordercolor="#CC33CC">
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/printer/zeropos_iframes/index.html b/layout/html/tests/printer/zeropos_iframes/index.html
deleted file mode 100644
index 9590d04ecc41..000000000000
--- a/layout/html/tests/printer/zeropos_iframes/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Sub Doc 1</TITLE>
-<BASE target="header">
-</HEAD>
-<BODY>
-<iframe src=sub_iframe.html style="position:absolute;left:0px;top:0px;"></iframe>
-Line 1<br>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/printer/zeropos_iframes/sub_iframe.html b/layout/html/tests/printer/zeropos_iframes/sub_iframe.html
deleted file mode 100644
index f394fe242093..000000000000
--- a/layout/html/tests/printer/zeropos_iframes/sub_iframe.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Page with a form and a popup menu to test in an iframe</title>
-</head>
-<body>
-<a href=link.html>Link</a>
-This is some body text.
-<form method="post" action="/cgi-bin/parrot.cgi" enctype="application/x-www-form-urlencoded">
-
-<p>
-<select name="test_popup">
-<option selected value="success">Store Success Result</option>
-<option  value="failed">Store Failed Result</option>
-<option  value="getnote">Get Notes for Month</option>
-<option  value="addnote">Just Add Note</option>
-</select>
-<input type="submit" name="submit_button" value="Go!">
-<img src="../general/raptor.jpg" width=50 height=50>
-line 1<br>
-line 2<br>
-line 3<br>
-line 4<br>
-line 5<br>
-line 6<br>
-line 7<br>
-line 8<br>
-line 9<br>
-line 10<br>
-line 11<br>
-line 12<br>
-line 13<br>
-line 14<br>
-line 15<br>
-</form>
-
-</body>
diff --git a/layout/html/tests/style/bugs/bug224188.html b/layout/html/tests/style/bugs/bug224188.html
deleted file mode 100644
index 7abacc1ba9eb..000000000000
--- a/layout/html/tests/style/bugs/bug224188.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<title>Bug</title>
-<style type="text/css">
-html* { color: red; }
-* { color: green; }
-</style>
-<p>This line should be green.</p>
diff --git a/layout/html/tests/style/bugs/bug224737.html b/layout/html/tests/style/bugs/bug224737.html
deleted file mode 100644
index b5508482e0d2..000000000000
--- a/layout/html/tests/style/bugs/bug224737.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head><base href="http://browse.deviantart.com/">
-	<title>deviantART: Browse deviantART</title>
-	
-<style>
-html>body div.thumbnails {
-	display:table;
-	width:100%;
-border:3px dashed blue;
-}
-
-div.thumbnails div.row {
-	display:table-row
-}
-
-div.thumbnails div.row a.thumbnail {
-	display:table-cell;
-}
-
-</style>
-</head>
-<body>
-
-<div id="main">
-
-<div class="thumbnails">
-	<div class="row">
-		<a class="thumbnail"><img src="http://www.mozilla.org/images/hack.gif"></a>
-		<a class="thumbnail"><img src="http://www.mozilla.org/images/hack.gif"></a>
-	</div>
-</div>
-
-</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug273719.html b/layout/html/tests/style/bugs/bug273719.html
deleted file mode 100644
index d20ab27135cc..000000000000
--- a/layout/html/tests/style/bugs/bug273719.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-<title>Generated Content Test Page</title>
-<style type="text/css">
-#generated div {
-	color: blue;
-}
-#generated div:before {
-	content: "Generated ";
-}
-#generated div.normal {
-	color: red;
-}
-#generated div.normal:before {
-	content: normal;
-}
-</style>
-</head>
-<body>
-<div id="generated">
-<div>Static</div>
-<div class="normal">Static</div>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-1.html b/layout/html/tests/style/bugs/bug302186-1.html
deleted file mode 100644
index 52ae32702407..000000000000
--- a/layout/html/tests/style/bugs/bug302186-1.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body>
-<form>
-<div>
-  <input type="image"><span>There should be no red.</span>
-</div>
-<div>
-  <input type="image"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-10.html b/layout/html/tests/style/bugs/bug302186-10.html
deleted file mode 100644
index 3aa9d4df517b..000000000000
--- a/layout/html/tests/style/bugs/bug302186-10.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div1 = document.getElementById("div1");
-              var inputs = div1.getElementsByTagName("input");
-              var firstElement = div1.removeChild(inputs[0]);
-              var div2 = document.getElementById("div2");
-              inputs = div2.getElementsByTagName("input");
-              var secondElement = div2.removeChild(inputs[0]);
-              div1.insertBefore(secondElement, div1.firstChild);
-              div2.insertBefore(firstElement, div2.firstChild);
-'>
-<form>
-<div id="div1">
-  <input type="submit" id="foo1"><span>There should be no red.</span>
-</div>
-<div id="div2">
-  <input type="submit" id="foo2"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-11.html b/layout/html/tests/style/bugs/bug302186-11.html
deleted file mode 100644
index dc0201708863..000000000000
--- a/layout/html/tests/style/bugs/bug302186-11.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div1 = document.getElementById("div1");
-              var inputs = div1.getElementsByTagName("input");
-              var firstElement = div1.removeChild(inputs[0]);
-              var div2 = document.getElementById("div2");
-              inputs = div2.getElementsByTagName("input");
-              var secondElement = div2.removeChild(inputs[0]);
-              div1.insertBefore(secondElement, div1.firstChild);
-              div2.insertBefore(firstElement, div2.firstChild);
-'>
-<form>
-<div id="div1">
-  <input type="image" id="foo1"><span>There should be no red.</span>
-</div>
-<div id="div2">
-  <input type="image" id="foo2"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-12.html b/layout/html/tests/style/bugs/bug302186-12.html
deleted file mode 100644
index 8b4fd5de23d4..000000000000
--- a/layout/html/tests/style/bugs/bug302186-12.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").setAttribute("type", "button");'>
-<form>
-<div>
-  <input type="image" checked="checked" id="foo"></button>
-  <span class="reverse">There should be no red.</span>
-</div>
-<div>
-  <input type="image"></button><span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-13.html b/layout/html/tests/style/bugs/bug302186-13.html
deleted file mode 100644
index aec5884ab0a7..000000000000
--- a/layout/html/tests/style/bugs/bug302186-13.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-button { display: none }
-</style>
-
-<body onload='document.getElementById("foo").setAttribute("type", "submit");'>
-<form>
-<div>
-  <button type="button" id="foo"></button>
-  <span>There should be no red.</span>
-</div>
-<div>
-  <button type="submit"></button><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-14.html b/layout/html/tests/style/bugs/bug302186-14.html
deleted file mode 100644
index 972dde8e4e75..000000000000
--- a/layout/html/tests/style/bugs/bug302186-14.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").setAttribute("type", "submit");'>
-<form>
-<div>
-  <input type="button" id="foo"></button>
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input type="submit"></button><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-15.html b/layout/html/tests/style/bugs/bug302186-15.html
deleted file mode 100644
index b9626afc6f82..000000000000
--- a/layout/html/tests/style/bugs/bug302186-15.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body onload='var newSubmit = document.createElement("input");
-              newSubmit.setAttribute("type", "submit");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(newSubmit, div1.firstChild);'>
-<form>
-<div id="div1">
-  <span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-16.html b/layout/html/tests/style/bugs/bug302186-16.html
deleted file mode 100644
index c2dc7e9d9c03..000000000000
--- a/layout/html/tests/style/bugs/bug302186-16.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body onload='var newSubmit = document.createElement("input");
-              newSubmit.setAttribute("type", "image");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(newSubmit, div1.firstChild);'>
-<form>
-<div id="div1">
-  <span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-2.html b/layout/html/tests/style/bugs/bug302186-2.html
deleted file mode 100644
index d3def2584c9a..000000000000
--- a/layout/html/tests/style/bugs/bug302186-2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-<body onload='var but = document.createElement("input");
-              but.setAttribute("type", "submit");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(but, div1.firstChild);'>
-<form>
-<div id="div1">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-3.html b/layout/html/tests/style/bugs/bug302186-3.html
deleted file mode 100644
index c592d4571548..000000000000
--- a/layout/html/tests/style/bugs/bug302186-3.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-<body onload='var but = document.createElement("input");
-              but.setAttribute("type", "submit");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(but, div1.firstChild);'>
-<form>
-<div>
-  <input type="submit"><span>There should be no red.</span>
-</div>
-<div id="div1">
-  <span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-4.html b/layout/html/tests/style/bugs/bug302186-4.html
deleted file mode 100644
index e3d6cce68878..000000000000
--- a/layout/html/tests/style/bugs/bug302186-4.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var but = document.createElement("input");
-              but.setAttribute("type", "image");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(but, div1.firstChild);'>
-<form>
-<div id="div1">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input type="image" id="foo"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-5.html b/layout/html/tests/style/bugs/bug302186-5.html
deleted file mode 100644
index c0012fc30a98..000000000000
--- a/layout/html/tests/style/bugs/bug302186-5.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var but = document.createElement("input");
-              but.setAttribute("type", "image");
-              var div1 = document.getElementById("div1");
-              div1.insertBefore(but, div1.firstChild);'>
-<form>
-<div>
-  <input type="image"><span>There should be no red.</span>
-</div>
-<div id="div1">
-  <span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-6.html b/layout/html/tests/style/bugs/bug302186-6.html
deleted file mode 100644
index 92c83ecb6a22..000000000000
--- a/layout/html/tests/style/bugs/bug302186-6.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div1 = document.getElementById("div1");
-              var inputs = div1.getElementsByTagName("input");
-              div1.removeChild(inputs[0]);'>
-<form>
-<div id="div1">
-  <input type="submit"><span class="reverse">There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-7.html b/layout/html/tests/style/bugs/bug302186-7.html
deleted file mode 100644
index 88eb55efbed0..000000000000
--- a/layout/html/tests/style/bugs/bug302186-7.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div2 = document.getElementById("div2");
-              var inputs = div2.getElementsByTagName("input");
-              div2.removeChild(inputs[0]);'>
-<form>
-<div id="div1">
-  <input type="submit"><span>There should be no red.</span>
-</div>
-<div id="div2">
-  <input type="submit"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-8.html b/layout/html/tests/style/bugs/bug302186-8.html
deleted file mode 100644
index 3381908ffdbc..000000000000
--- a/layout/html/tests/style/bugs/bug302186-8.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div1 = document.getElementById("div1");
-              var inputs = div1.getElementsByTagName("input");
-              div1.removeChild(inputs[0]);'>
-<form>
-<div id="div1">
-  <input type="image"><span class="reverse">There should be no red.</span>
-</div>
-<div>
-  <input type="image"><span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug302186-9.html b/layout/html/tests/style/bugs/bug302186-9.html
deleted file mode 100644
index f37a0955311c..000000000000
--- a/layout/html/tests/style/bugs/bug302186-9.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-</head>
-
-<body onload='var div2 = document.getElementById("div2");
-              var inputs = div2.getElementsByTagName("input");
-              div2.removeChild(inputs[0]);'>
-<form>
-<div id="div1">
-  <input type="image"><span>There should be no red.</span>
-</div>
-<div id="div2">
-  <input type="image"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-1.html b/layout/html/tests/style/bugs/bug348809-1.html
deleted file mode 100644
index 4a151edf3056..000000000000
--- a/layout/html/tests/style/bugs/bug348809-1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:checked + span { color: red }
-input { display: none }
-</style>
-
-<body>
-<input checked="checked" id="foo"><span>There should be no red</span>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-10.html b/layout/html/tests/style/bugs/bug348809-10.html
deleted file mode 100644
index 2ca0f7b360b6..000000000000
--- a/layout/html/tests/style/bugs/bug348809-10.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default + span { color: red }
-span.reverse { color: red }
-:default + span.reverse { color: green }
-button { display: none }
-</style>
-
-<body onload='document.getElementById("foo").setAttribute("type", "button");'>
-<form>
-<div>
-  <button type="submit" checked="checked" id="foo"></button>
-  <span>There should be no red.</span>
-</div>
-<div>
-  <button type="submit"></button><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-11.html b/layout/html/tests/style/bugs/bug348809-11.html
deleted file mode 100644
index e6cb0101a515..000000000000
--- a/layout/html/tests/style/bugs/bug348809-11.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default + span { color: red }
-span.reverse { color: red }
-:default + span.reverse { color: green }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").removeAttribute("type"); document.getElementById("bar").setAttribute("type", "checkbox");'>
-<form>
-<div>
-  <input type="checkbox" checked="checked" id="foo">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input checked="checked" id="bar">
-  <span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-12.html b/layout/html/tests/style/bugs/bug348809-12.html
deleted file mode 100644
index 8abda6d0d4c3..000000000000
--- a/layout/html/tests/style/bugs/bug348809-12.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default + span { color: red }
-span.reverse { color: red }
-:default + span.reverse { color: green }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").removeAttribute("type"); document.getElementById("bar").setAttribute("type", "radio");'>
-<form>
-<div>
-  <input type="radio" checked="checked" id="foo">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input checked="checked" id="bar">
-  <span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-13.html b/layout/html/tests/style/bugs/bug348809-13.html
deleted file mode 100644
index d14090b03ad3..000000000000
--- a/layout/html/tests/style/bugs/bug348809-13.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default:checked + span { color: red }
-input { display: none }
-</style>
-
-<body onload='dump("aaa"); document.getElementById("foo").setAttribute("type", "submit");'>
-<form>
-<div>
-  <input type="submit">
-  <input type="radio" checked="checked" id="foo">
-  <span>There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-14.html b/layout/html/tests/style/bugs/bug348809-14.html
deleted file mode 100644
index fdb2b19220fe..000000000000
--- a/layout/html/tests/style/bugs/bug348809-14.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default:checked + span { color: red }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").removeAttribute("checked");'>
-<input type="checkbox" checked="checked" id="foo"><span>There should be no red</span>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-2.html b/layout/html/tests/style/bugs/bug348809-2.html
deleted file mode 100644
index 16f023bd7c87..000000000000
--- a/layout/html/tests/style/bugs/bug348809-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:checked + span { color: green }
-input { display: none }
-</style>
-
-<body>
-<input type="checkbox" checked="checked" id="foo"><span>There should be no red</span>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-3.html b/layout/html/tests/style/bugs/bug348809-3.html
deleted file mode 100644
index e9555808c8ac..000000000000
--- a/layout/html/tests/style/bugs/bug348809-3.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body>
-<form>
-<div>
-  <input type="submit" checked="checked" id="foo"><span>There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-4.html b/layout/html/tests/style/bugs/bug348809-4.html
deleted file mode 100644
index 305807391b6d..000000000000
--- a/layout/html/tests/style/bugs/bug348809-4.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-button { display: none }
-</style>
-
-<body>
-<form>
-<div>
-  <button type="submit" checked="checked" id="foo"></button>
-  <span>There should be no red.</span>
-</div>
-<div>
-  <button type="submit"></button><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-5.html b/layout/html/tests/style/bugs/bug348809-5.html
deleted file mode 100644
index e21074b3abd5..000000000000
--- a/layout/html/tests/style/bugs/bug348809-5.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body>
-<form>
-<div>
-  <input type="checkbox" checked="checked" id="foo">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input checked="checked"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-6.html b/layout/html/tests/style/bugs/bug348809-6.html
deleted file mode 100644
index c26f64fbf3c5..000000000000
--- a/layout/html/tests/style/bugs/bug348809-6.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:default + span { color: green }
-span.reverse { color: green }
-:default + span.reverse { color: red }
-input { display: none }
-</style>
-
-<body>
-<form>
-<div>
-  <input type="radio" checked="checked" id="foo">
-  <span>There should be no red.</span>
-</div>
-<div>
-  <input checked="checked"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-7.html b/layout/html/tests/style/bugs/bug348809-7.html
deleted file mode 100644
index 6a3c59d7152f..000000000000
--- a/layout/html/tests/style/bugs/bug348809-7.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:checked + span { color: red }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").removeAttribute("type");'>
-<input type="checkbox" checked="checked" id="foo"><span>There should be no red</span>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-8.html b/layout/html/tests/style/bugs/bug348809-8.html
deleted file mode 100644
index b765e9aa7893..000000000000
--- a/layout/html/tests/style/bugs/bug348809-8.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: red }
-:checked + span { color: green }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").setAttribute("type", "checkbox");'>
-<input checked="checked" id="foo"><span>There should be no red</span>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug348809-9.html b/layout/html/tests/style/bugs/bug348809-9.html
deleted file mode 100644
index 5b5f574f808a..000000000000
--- a/layout/html/tests/style/bugs/bug348809-9.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-span { color: green }
-:default + span { color: red }
-span.reverse { color: red }
-:default + span.reverse { color: green }
-input { display: none }
-</style>
-
-<body onload='document.getElementById("foo").removeAttribute("type");'>
-<form>
-<div>
-  <input type="submit" checked="checked" id="foo"><span>There should be no red.</span>
-</div>
-<div>
-  <input type="submit"><span class="reverse">There should be no red.</span>
-</div>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/style/bugs/bug84400-1.html b/layout/html/tests/style/bugs/bug84400-1.html
deleted file mode 100644
index cefde500f578..000000000000
--- a/layout/html/tests/style/bugs/bug84400-1.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Testing controls that should match :enabled/:disabled</title>
-    <link rel="help" href="http://www.w3.org/TR/css3-selectors/#enableddisabled"/>
-    <link rel="help" href="http://whatwg.org/specs/web-forms/current-work/#relation"/>
-    <style type="text/css">
-      input, textarea, button, *.hideme { display: none; }
-      div { margin-bottom: 1em; }
-
-      span, option, optgroup { background-color: red; }
-      *:enabled + span.true, option.true:enabled, optgroup.true:enabled { color: lime; background-color: lime; }
-      *:disabled + span.false, option.false:disabled, optgroup.false:disabled { color: lime; background-color: lime; }
-
-      #test + span { background-color: red; }
-      #test:enabled + span { color: lime; background-color: lime; }
-    </style>
-    <script type="text/javascript">
-      // Runs through i1, i2, .... in and toggles the |disabled| attribute
-      function onLoad() {
-        var i = 1;
-	var el = document.getElementById("i1");
-	while (el) {
-	  if (el.hasAttribute("disabled")) {
-	    el.removeAttribute("disabled");
-	  } else {
-	    el.setAttribute("disabled", "disabled");
-	  }
-	  ++i;
-	  el = document.getElementById("i" + i);
-	}
-	if (i != 31) {
-	  alert("onLoad() handler failed!");
-	}
-      }
-
-      window.addEventListener("load", onLoad, false);
-    </script>
-  </head>
-  <body>
-    <div>
-      There should be no red in the following (note: form styling should be enabled).
-    </div>
-
-    <form method="get" action=".">
-      <div>
-	input:
-	<input/> <span class="true">FAIL</span>
-	<input disabled="disabled"/> <span class="false">FAIL</span>
-	<input id="i1"/> <span class="false">FAIL</span>
-	<input id="i2" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	password:
-	<input type="password"/> <span class="true">FAIL</span>
-	<input type="password" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="password" id="i3"/> <span class="false">FAIL</span>
-	<input type="password" id="i4" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	checkbox:
-	<input type="checkbox"/> <span class="true">FAIL</span>
-	<input type="checkbox" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="checkbox" id="i5"/> <span class="false">FAIL</span>
-	<input type="checkbox" id="i6" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	radio:
-	<input type="radio"/> <span class="true">FAIL</span>
-	<input type="radio" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="radio" id="i7"/> <span class="false">FAIL</span>
-	<input type="radio" id="i8" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	submit:
-	<input type="submit"/> <span class="true">FAIL</span>
-	<input type="submit" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="submit" id="i9"/> <span class="false">FAIL</span>
-	<input type="submit" id="i10" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	reset:
-	<input type="reset"/> <span class="true">FAIL</span>
-	<input type="reset" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="reset" id="i11"/> <span class="false">FAIL</span>
-	<input type="reset" id="i12" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	file:
-	<input type="file"/> <span class="true">FAIL</span>
-	<input type="file" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="file" id="i13"/> <span class="false">FAIL</span>
-	<input type="file" id="i14" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	hidden:
-	<input type="hidden"/> <span class="true">FAIL</span>
-	<input type="hidden" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="hidden" id="i15"/> <span class="false">FAIL</span>
-	<input type="hidden" id="i16" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	image:
-	<input type="image"/> <span class="true">FAIL</span>
-	<input type="image" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="image" id="i17"/> <span class="false">FAIL</span>
-	<input type="image" id="i18" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	button (input):
-	<input type="button"/> <span class="true">FAIL</span>
-	<input type="button" disabled="disabled"/> <span class="false">FAIL</span>
-	<input type="button" id="i19"/> <span class="false">FAIL</span>
-	<input type="button" id="i20" disabled="disabled"/> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	textarea:
-	<textarea cols="5" rows="5"></textarea> <span class="true">FAIL</span>
-	<textarea cols="5" rows="5" disabled="disabled"></textarea> <span class="false">FAIL</span>
-	<textarea cols="5" rows="5" id="i21"></textarea> <span class="false">FAIL</span>
-	<textarea cols="5" rows="5" id="i22" disabled="disabled"></textarea> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	button:
-	<button>bogus</button> <span class="true">FAIL</span>
-	<button disabled="disabled">bogus</button> <span class="false">FAIL</span>
-	<button id="i23">bogus</button> <span class="false">FAIL</span>
-	<button id="i24" disabled="disabled">bogus</button> <span class="true">FAIL</span>
-      </div>
-
-      <div>
-	select:
-	<select class="hideme"><option>bogus</option></select> <span class="true">FAIL</span>
-	<select class="hideme" disabled="disabled"><option>bogus</option></select> <span class="false">FAIL</span>
-	<select class="hideme" id="i25"><option>bogus</option></select> <span class="false">FAIL</span>
-	<select class="hideme" id="i26" disabled="disabled"><option>bogus</option></select> <span class="true">FAIL</span>
-
-      </div>
-
-      <div>
-	option:
-	<select size="4">
-	  <option class="true">FAIL</option>
-	  <option class="false" disabled="disabled">FAIL</option>
-	  <option class="false" id="i27">FAIL</option>
-	  <option class="true" id="i28" disabled="disabled">FAIL</option>
-	</select>
-      </div>
-
-      <div>
-	optgroup:
-	<select size="4">
-	  <optgroup class="true" label="FAIL">
-	    <option class="hideme">bogus</option>
-	  </optgroup>
-	  <optgroup class="false" disabled="disabled" label="FAIL">
-	    <option class="hideme">bogus</option>
-	  </optgroup>
-	  <optgroup class="false" id="i29" label="FAIL">
-	    <option class="hideme">bogus</option>
-	  </optgroup>
-	  <optgroup class="true" disabled="disabled" id="i30" label="FAIL">
-	    <option class="hideme">bogus</option>
-	  </optgroup>
-	</select>
-      </div>
-
-    </form>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/style/bugs/bug84400-2.html b/layout/html/tests/style/bugs/bug84400-2.html
deleted file mode 100644
index ec8077fb14d6..000000000000
--- a/layout/html/tests/style/bugs/bug84400-2.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-                      "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Testing controls that should not match :enabled/:disabled</title>
-    <link rel="help" href="http://www.w3.org/TR/css3-selectors/#enableddisabled"/>
-    <link rel="help" href="http://whatwg.org/specs/web-forms/current-work/#relation"/>
-    <style type="text/css">
-      input, label, object, *.hideme { display: none; }
-      div { margin-bottom: 1em; }
-
-      span, legend { color: lime; background-color: lime; }
-      *:enabled + span, legend:enabled { background-color: red; }
-      *:disabled + span, legend:disabled { background-color: red; }
-
-      #test + span { background-color: red; }
-      #test:enabled + span { color: lime; background-color: lime; }
-    </style>
-  </head>
-  <body>
-    <div>
-      There should be no red in the following (note: form styling should be enabled).
-    </div>
-
-    <form method="get" action=".">
-      <div>
-	Make sure that :default is actually implemented:
-	<input id="test"/> <span>FAIL</span>
-      </div>
-
-      <div>
-	label:
-	<label>bogus</label> <span>FAIL</span>
-	<label disabled="disabled">bogus</label> <span>FAIL</span>
-      </div>      
-
-      <div>
-	fieldset:
-	<fieldset class="hideme"><legend>bogus</legend></fieldset> <span>FAIL</span>
-	<fieldset class="hideme" disabled="disabled"><legend>bogus</legend></fieldset> <span>FAIL</span>
-	<fieldset class="hideme"><legend disabled="disabled">bogus</legend></fieldset> <span>FAIL</span>
-      </div>
-
-      <div>
-	legend:
-	<fieldset><legend>FAIL</legend></fieldset>
-	<fieldset><legend disabled="disabled">FAIL</legend></fieldset>
-	<fieldset disabled="disabled"><legend>FAIL</legend></fieldset>
-      </div>
-
-      <div>
-	div (inside form):
-	<div class="hideme">bogus</div> <span>FAIL</span>
-	<div class="hideme" disabled="disabled">bogus</div> <span>FAIL</span>
-      </div>
-
-    </form>
-
-    <div>
-      div (outside form):
-      <div class="hideme">bogus</div> <span>FAIL</span>
-      <div class="hideme" disabled="disabled">bogus</div> <span>FAIL</span>
-    </div>
-
-    <div>
-      object:
-      <object>bogus</object> <span>FAIL</span>
-      <object disabled="disabled">bogus</object> <span>FAIL</span>
-    </div>
-
-    <div>
-      form:
-      <form class="hideme" method="get" action="."><p><input/></p></form> <span>FAIL</span>
-      <form class="hideme" method="get" action="." disabled="disabled"><p><input/></p></form> <span>FAIL</span>
-    </div>
-  </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/style/bugs/bug84400-3.html b/layout/html/tests/style/bugs/bug84400-3.html
deleted file mode 100644
index 90197d9b3094..000000000000
--- a/layout/html/tests/style/bugs/bug84400-3.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<title>testing :disabled and :enabled</title>
-<style>
- input{ background:red }
- #i1:enabled { background:lime }
- #i2:disabled { background:lime }
- #i3:enabled { background:lime }
- #i4:disabled { background:lime }
- #i5:disabled { background:lime }
- #i6:enabled { background:lime }
-</style>
-<script>
- window.addEventListener("load",enabledDisabled,false);
- function enabledDisabled(){
-  document.getElementById('i3').removeAttribute('disabled');
-  document.getElementById('i4').disabled = true;
-  document.getElementById('i5').setAttribute('disabled','disabled');
-  document.getElementById('i6').disabled = false;
- }
-</script>
-<p>Note: form styling should be enabled.
-<p>There should be no red:
-<p><input id="i1">
-<p><input disabled="disabled" id="i2">
-<p><input disabled="disabled" id="i3">
-<p><input id="i4">
-<p><input id="i5">
-<p><input disabled="disabled" id="i6">
\ No newline at end of file
diff --git a/layout/html/tests/style/bugs/rtest.lst b/layout/html/tests/style/bugs/rtest.lst
deleted file mode 100644
index 0bd870d94b39..000000000000
--- a/layout/html/tests/style/bugs/rtest.lst
+++ /dev/null
@@ -1,36 +0,0 @@
-bug224188.html
-bug224737.html
-bug273719.html
-bug84400-1.html
-bug84400-2.html
-bug84400-3.html
-bug302186-1.html
-bug302186-2.html
-bug302186-3.html
-bug302186-4.html
-bug302186-5.html
-bug302186-6.html
-bug302186-7.html
-bug302186-8.html
-bug302186-9.html
-bug302186-10.html
-bug302186-11.html
-bug302186-12.html
-bug302186-13.html
-bug302186-14.html
-bug302186-15.html
-bug302186-16.html
-bug348809-1.html
-bug348809-2.html
-bug348809-3.html
-bug348809-4.html
-bug348809-5.html
-bug348809-6.html
-bug348809-7.html
-bug348809-8.html
-bug348809-9.html
-bug348809-10.html
-bug348809-11.html
-bug348809-12.html
-bug348809-13.html
-bug348809-14.html
diff --git a/layout/html/tests/table/bugs/45621.html b/layout/html/tests/table/bugs/45621.html
deleted file mode 100644
index f8606cd5bc89..000000000000
--- a/layout/html/tests/table/bugs/45621.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled</title>
-</head>
-<body>
-<pre>
-table width=50%
-  td nowrap 
-    input width=100% 
-</pre>
-<table border style="background: silver; width:50%;">
- <tr>
-  <td border style="white-space: nowrap; background:#AABBFF;padding:8px;">
-      <input type="text" value=""  style="width:100%;"></input>
-  </td>
- </tr>
-</table>
-
-<br>
-<!--
-<pre>
-div width=50%, nowrap, border is outset/12px
-  input width=100% 
-  (must be as wide as its parent area inside the border)
-</pre>
-<div style="width:50%;
-            white-space:normal;
-            border:12px outset;">
- <input type="text" value="" style="width:100%;"></input>
-</div>
--->
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/97619.html b/layout/html/tests/table/bugs/97619.html
deleted file mode 100644
index ff617b88dfee..000000000000
--- a/layout/html/tests/table/bugs/97619.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<title>Testcase bug 32191</title>
-<body>
-
-<table border="1" width="100%" summary="faulty line-break">
-<tr>
-<td>check for handling of whitespace <img src="../images/detach.gif" alt="" width="20"> around the image</td>
-<td width="100%">X</td>
-</tr>
-</table>
-
-<hr width="75px" align="left">
-
-<table border="1" width="100%" summary="faulty line-break">
-<tr>
-<td>aa bb cc dd <img src="../images/detach.gif" alt="" width="20"> ee ff gg</td>
-<td width="100%">X</td>
-</tr>
-</table>
-
-<hr width="75px" align="left">
-
-<table border="1" width="100%" summary="faulty line-break">
-<tr>
-<td>checkforhandlingofnowhitespace <img src="../images/detach.gif" alt="" width="20"> aroundtheimage</td>
-<td width="100%">X</td>
-</tr>
-</table>
-
-<hr width="75px" align="left">
-
-<table border="1" width="100%" summary="faulty line-break">
-<tr>
-<td>checkforhandlingofnowhitespace<img src="../images/detach.gif" alt="" width="20">aroundtheimage</td>
-<td width="100%">X</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/adforce_imgis_com.html b/layout/html/tests/table/bugs/adforce_imgis_com.html
deleted file mode 100644
index 8c98241a5b69..000000000000
--- a/layout/html/tests/table/bugs/adforce_imgis_com.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
-<META HTTP-EQUIV="cache-control" CONTENT="no-cache">
-</head>
-<body>
-<base target=_top>
-<a href="http://adforce.imgis.com/?adlink|2|7221|1|1|misc=953308791;AdId=169638;BnId=2;IMGIS;loc=500;">
-<IMG SRC="../images/Ad169638St1Sz1Sq1Id2.gif" NAME=imgisad BORDER=0 ALT='Click for GetSmart.com`s MortgageFinder' WIDTH=468 HEIGHT=60></a>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug10009.html b/layout/html/tests/table/bugs/bug10009.html
deleted file mode 100644
index a4adaaaa8cd4..000000000000
--- a/layout/html/tests/table/bugs/bug10009.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<body bgcolor="#c0c0c0">
-
-<table width="100%" border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-<br>
-
-<table border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug100334.html b/layout/html/tests/table/bugs/bug100334.html
deleted file mode 100644
index 1533e32ef8d4..000000000000
--- a/layout/html/tests/table/bugs/bug100334.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>bug 100334</title>
-</head>
-<body>
-
-<table width=150 bgcolor=#FFCCCC border=0 cellspacing=0 cellpadding=0>
-<col width=43*>
-<col width=163*>
-<tr><td colspan=2>Correct Display</td></tr>
-<tr><td></td><td></td></tr>
-</table>
-
-<p></p>
-
-<table width=150 bgcolor=#FFCCCC border=0 cellspacing=0 cellpadding=0>
-<col width=43*>
-<col width=163*>
-<tr><td colspan=2>Incorrect Display</td></tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug10036.html b/layout/html/tests/table/bugs/bug10036.html
deleted file mode 100644
index 2a9151e6d8f2..000000000000
--- a/layout/html/tests/table/bugs/bug10036.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<BODY>
-the lower left cell should be colored
-<TABLE BORDER=1>
-
-<TR>
-<TD BGCOLOR="#FFFF00">a</TD>
-<TD BGCOLOR="#00FFFF">b</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="#FF00FF"><BR></TD>
-<TD BGCOLOR="#088880">c</TD>
-</TR>
-
-</TABLE>
-</BODY>
diff --git a/layout/html/tests/table/bugs/bug10039.html b/layout/html/tests/table/bugs/bug10039.html
deleted file mode 100644
index 94aeb006c770..000000000000
--- a/layout/html/tests/table/bugs/bug10039.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<table border="1" width="100%">
-<tr><td colspan="2" width="100%">D</td></tr>
-<tr><td>X</td><td>X</td></tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug1010.html b/layout/html/tests/table/bugs/bug1010.html
deleted file mode 100644
index 82fbe99a1f69..000000000000
--- a/layout/html/tests/table/bugs/bug1010.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<TABLE BORDER=1 WIDTH="100%">
-<tr>
-<TD VALIGN=TOP rowspan=2>
-<ul>
-<li><A href="500in1ul.html">500 list items in a single UL</a></li>
-<li><a href="500in25uls.html">500 list items in 25 top-level ULs</a></li>
-<li><a href="500in25nesteduls.html">500 list items in a 25-level nested 
-UL</a></li>
-<li><a href="300textfields.html">300 text input form fields</a></li>
-<li><a href="test6.html">Massively nested tables</a></li>
-<li><a href="12nesteddivs.html">Massively nested DIVs with padding and 
-borders</a></li>
-<li><a href="select.html">1000 OPTIONs in a single SELECT form element</a></li>
-<li><a href="wbtbltxt.html">10,000 cell table with text in each cell</a></li>
-<li><a href="wbtblclr.html">10,000 cell table with text and color in each 
-cell</a></li>
-<li><a href="wblnks.html">A 713k HTML document packed full of links</a></li>
-<li><a href="wbbightm.html">Extraordinarily long HTML doc (approx 1 
-Meg)</a></li>
-<li><a href="wbclrtxt.html">Another large HTML doc, with colored text</a></li>
-<li><a href="wbhtmmix.html">A relatively large (150k) document with an average 
-mix of HTML
-content</a></li>
-</ul>
-</TD>
-<td>foo 1</td>
-<td>foo 2</td>
-</TR>
-<TR>
-<td>Foo 3</td>
-<td>Foo 4</td>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug101201.html b/layout/html/tests/table/bugs/bug101201.html
deleted file mode 100644
index 4079f049c5a5..000000000000
--- a/layout/html/tests/table/bugs/bug101201.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>dom test - editor inspired - border width dropped during reflow</title>
-<script>
-function domfunc(){
-var td1= document.getElementById("stretch");
- var text = document.createTextNode("100000");
-td1.appendChild(text);
-}
-</script>
-<style>
-td  {border:solid 5px green}
-</style>
-</head>
-<body onload="domfunc()">
-dom access
-<table  border="1" cellspacing="1" >
-<tr>
-	<td id="stretch"></td>
-</tr>
-</table>
-reference
-<table   border="1" cellspacing="1" >
-<tr>
-	<td>100000</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug10140.html b/layout/html/tests/table/bugs/bug10140.html
deleted file mode 100644
index c3d01e639edf..000000000000
--- a/layout/html/tests/table/bugs/bug10140.html
+++ /dev/null
@@ -1,241 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<!-- Work done for Netscape.  License unknown. -->
-
-<html lang="en-US">
-<head>
-<title>Tables and captions</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-
-table { border: 10px solid green; }
-caption {
-        border: medium solid purple;
-        caption-side: top;
-        }
-
-table.one { width: 300px; }
-table.one caption { width: 300px; }
-
-table.two { width: 300px; }
-table.two caption { width: 600px; }
-
-table.three { width: 600px; }
-table.three caption { width: 300px; }
-
-table.four { margin-top: 20px; }
-table.four caption { margin-bottom: 0; }
-
-table.five { margin-top: 0; }
-table.five caption { margin-bottom: 20px; }
-
-table.six { margin-top: 15px; }
-table.six caption { margin-bottom: 20px; }
-
-table.seven { margin-top: 20px; }
-table.seven caption { margin-bottom: 15px; }
-
-table.eight { margin-right: 20px; }
-table.eight caption { margin-left: 0; caption-side: right; }
-
-table.nine { margin-right: 0; }
-table.nine caption { margin-left: 20px; caption-side: right; }
-
-table.ten { margin-right: 15px; }
-table.ten caption { margin-left: 20px; caption-side: right; }
-
-table.eleven { margin-right: 20px; }
-table.eleven caption { margin-left: 15px; caption-side: right; }
-
-table.twelve { margin-bottom: 20px; }
-table.twelve caption { margin-top: 0; caption-side: bottom; }
-
-table.thirteen { margin-bottom: 0; }
-table.thirteen caption { margin-top: 20px; caption-side: bottom; }
-
-table.fourteen { margin-bottom: 15px; }
-table.fourteen caption { margin-top: 20px; caption-side: bottom; }
-
-table.fifteen { margin-bottom: 20px; }
-table.fifteen caption { margin-top: 15px; caption-side: bottom; }
-
-table.sixteen { margin-left: 20px; }
-table.sixteen caption { margin-right: 0; caption-side: left; }
-
-table.seventeen { margin-left: 0; }
-table.seventeen caption { margin-right: 20px; caption-side: left; }
-
-table.eighteen { margin-left: 15px; }
-table.eighteen caption { margin-right: 20px; caption-side: left; }
-
-table.nineteen { margin-left: 20px; }
-table.nineteen caption { margin-right: 15px; caption-side: left; }
-
-</style>
-</head>
-<body>
-<h1>Tables and captions</h1>
-
-<p>
-        The table should have width 300px, as should the caption (entirely
-        above the table):
-</p>
-
-<table class="one">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The table should have width 300px, and the caption should have
-        width 600px.
-</p>
-
-<table class="two">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The table should have width 600px, and the caption should have
-        width 300px.
-</p>
-
-<table class="three">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The next four tables should have their caption on the top,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="four">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="five">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="six">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="seven">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the right,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="eight">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="nine">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="ten">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="eleven">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the bottom,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="twelve">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="thirteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="fourteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="fifteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the left,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="sixteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="seventeen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="eighteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="nineteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<hr title="Beginning of Footer">
-<p><a href="http://validator.w3.org/check/referer" title="W3C HTML Validator"><img src="../../images/vh40" alt="Valid HTML 4.0!" height="31" width="88"></a></p>
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug101674.html b/layout/html/tests/table/bugs/bug101674.html
deleted file mode 100644
index 858d523e3580..000000000000
--- a/layout/html/tests/table/bugs/bug101674.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>Untitled</title>
-	<style>table,td { border: 1px solid black;</style>
-</head>
-
-<body>
-
-<table><tr>
-<td><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Nothing between images</td></tr></table>
-
-<table><tr>
-<td><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"> <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"> <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"> <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"> <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Spaces between images</td></tr></table>
-
-<table><tr>
-<td><img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">
-<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">
-<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">
-<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">
-<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Newlines between images</td></tr></table>
-
-<table><tr>
-<td>One<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Two<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Three<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Four<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Five<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Text between images</td></tr></table>
-
-<table><tr>
-<td>One <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Two <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Three <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Four <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Five <img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Text with spaces between images</td></tr></table>
-
-<table><tr>
-<td>One A<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Two b<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Three c<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Four d<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88">Five e<img src="../images/couverture.jpg" alt="Valid HTML 4.0!" width="88"></td>
-<td width="100%">Text with spaces and more text between images</td></tr></table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug101759.html b/layout/html/tests/table/bugs/bug101759.html
deleted file mode 100644
index 8d37b4fd3fbf..000000000000
--- a/layout/html/tests/table/bugs/bug101759.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<table cellspacing="0" cellpadding="0">
- <tr>
-  <td width="1%" bgcolor=blue>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td bgcolor=green>
-   <table border="0" cellspacing="0" cellpadding="0" bgcolor="yellow">
-   </table>
-  </td>
- </tr>
-</table>
-
-<BR>
-
-<table border cellspacing="0" cellpadding="0">
- <tr>
-  <td width="1%" bgcolor=blue>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td bgcolor=green>
-   <table border="0" cellspacing="0" cellpadding="0" bgcolor="yellow">
-   </table>
-  </td>
- </tr>
-</table>
-
-<BR>
-<table border cellspacing="0" cellpadding="1">
- <tr>
-  <td width="1%" bgcolor=blue>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td bgcolor=green>
-   <table border="0" cellspacing="0" cellpadding="0" bgcolor="yellow">
-   </table>
-  </td>
- </tr>
-</table>
-
-<BR>
-<table border="0" cellspacing="0" cellpadding="0">
- <tr>
-  <td width="1%" bgcolor=blue>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td width="1%" bgcolor=orange>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td bgcolor=green>
-   <table border="0" cellspacing="0" cellpadding="0" bgcolor="yellow">
-   </table>
-  </td>
- </tr>
-</table>
-
-<BR>
-<table borderx="1" cellspacing="0" cellpadding="0">
- <tr>
-  <td width="1%" bgcolor=blue>
-   XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX XXXX
-  </td>
-  <td bgcolor=green>
-   x
-  </td>
- </tr>
-</table>
--->
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug102145-1.html b/layout/html/tests/table/bugs/bug102145-1.html
deleted file mode 100644
index b45d7a057086..000000000000
--- a/layout/html/tests/table/bugs/bug102145-1.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Test Page dom test bug 102145</title>
-<script language="JavaScript">
-
-function setElementSize (elementId) {
-                                myElement = document.getElementById(elementId);
-                                myElement.style.height =200;
-                                myElement.style.width = 200;}
-                
-
-</script>
-</head>
-<body onload="setElementSize('mytable')">
-
-<table id="mytable" width="100%"><tr><td style="background-color:green">
-I should be 200px x 200px
-</td></tr></table>
- </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug102145-2.html b/layout/html/tests/table/bugs/bug102145-2.html
deleted file mode 100644
index bd58d55ff93b..000000000000
--- a/layout/html/tests/table/bugs/bug102145-2.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Test Page dom test bug 102145a</title>
-<script language="JavaScript">
-
-function setElementSize (elementId) {
-                                myElement = document.getElementById(elementId);
-                                myElement.style.height =200;
-                                myElement.width = 200;}
-                
-
-</script>
-</head>
-<body onload="setElementSize('mytable')">
-
-<table id="mytable" width="100%"><tr><td style="background-color:green">
-I should be 200px x 200px
-</td></tr></table>
- </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug102145-3.html b/layout/html/tests/table/bugs/bug102145-3.html
deleted file mode 100644
index 1791ef3f3aed..000000000000
--- a/layout/html/tests/table/bugs/bug102145-3.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Test Page dom test bug 102145</title>
-<script language="JavaScript">
-
-function setElementSize (elementId) {
-                                myElement = document.getElementById(elementId);
-                                myElement.style.height =200;
-                                myElement.style.width = 200;}
-                
-
-</script>
-</head>
-<body onload="setElementSize('mytable')">
-
-<table id="mytable" style="width:100%"><tr><td style="background-color:green">
-I should be 200px x 200px
-</td></tr></table>
- </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug102145-4.html b/layout/html/tests/table/bugs/bug102145-4.html
deleted file mode 100644
index e7147ab10f60..000000000000
--- a/layout/html/tests/table/bugs/bug102145-4.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Test Page dom test bug 102145</title>
-<script language="JavaScript">
-
-function foo(elementId) {
-                                myElement = document.getElementById(elementId);
-                                myElement.setAttribute("style","height:200;width:200");
-                        }
-                
-
-</script>
-</head>
-<body onLoad="foo('mytable')">
-<table id="mytable" style="width:100%"><tr><td style="background-color:green">
-I should be 200px x 200px
-</td></tr></table>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug10216.html b/layout/html/tests/table/bugs/bug10216.html
deleted file mode 100644
index e1f4c1153655..000000000000
--- a/layout/html/tests/table/bugs/bug10216.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-        <title>caption element: align attribute</title>
-</head>
-<body>
-<h1>caption element: align attribute</h1>
-
-<table border>
-        <caption>The table's caption, with no align.  Default is "top".</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table border>
-        <caption align="top">The table's caption, with align="top".</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table border>
-        <caption align="bottom">The table's caption, with align="bottom".</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table border>
-        <caption align="left">The table's caption, with align="left".</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table border>
-        <caption align="right">The table's caption, with align="right".</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug10269-1.html b/layout/html/tests/table/bugs/bug10269-1.html
deleted file mode 100644
index b8cbbc7eb5ad..000000000000
--- a/layout/html/tests/table/bugs/bug10269-1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<title>table-layout: fixed</title>
-
-<table style="table-layout: fixed">
-        <tr>
-                <td>One</td>
-                <td>Two</td>
-                <td>Three</td>
-        </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug10269-2.html b/layout/html/tests/table/bugs/bug10269-2.html
deleted file mode 100644
index 259bd9211a3e..000000000000
--- a/layout/html/tests/table/bugs/bug10269-2.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<!-- Work done for Netscape.  License unknown. -->
-
-<html lang="en-US">
-<head>
-<title>table-layout: fixed</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-
-table { table-layout: fixed; }
-
-table td { border: thin solid; }
-
-.full { width: 100%; }
-
-.half { width: 50%; }
-
-</style>
-</head>
-<body>
-<h1>table-layout: fixed</h1>
-
-<p>The following tables should be laid out in the traditional manner
-because their widths are <code>auto</code>:</p>
-
-<table>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-
-<p>All the columns in the following three tables should divide
-equally the available space (100% of the width of the page):</p>
-
-<table class="full">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<table class="full">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-</table>
-
-<table class="full">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-
-<p>All the columns in the following three tables should divide
-equally the available space (50% of the width of the page):</p>
-
-<table class="half">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<table class="half">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-</table>
-
-<table class="half">
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                        Lots and lots and lots of data.  Lots and lots and lots of data.
-                </td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-
-<p>This test is still being written... </p>
-
-<hr title="Beginning of Footer">
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug10296-1.html b/layout/html/tests/table/bugs/bug10296-1.html
deleted file mode 100644
index 4a2afe074918..000000000000
--- a/layout/html/tests/table/bugs/bug10296-1.html
+++ /dev/null
@@ -1,459 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<!-- ***** 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
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- 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 ***** -->
-
-<html lang="en-US">
-<head>
-<title>Vertical alignment and table height</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-
-/* XXX Should really remove black */
-table td { border: thin solid black; }
-
-table.one { height: auto; }
-table.two { height: 30px; }
-table.three { height: 500px; }
-table.four, table.five { height: 50%; }
-div.five { height: 600px; border: medium solid purple; }
-
-tr.auto { height: auto; }
-tr.small { height: 2px; }
-tr.big { height: 200px; }
-
-table.baseline td { vertical-align: baseline; }
-table.middle td { vertical-align: middle; }
-table.top td { vertical-align: top; }
-table.bottom td { vertical-align: bottom; }
-
-span.big { font-size: 400%; }
-
-table.cellsmall td { height: 2px; }
-table.cellauto td { height: auto; }
-
-td.baselinea { vertical-align: baseline; }
-td.baselineb { vertical-align: text-bottom; }
-td.baselinec { vertical-align: text-top; }
-td.baselined { vertical-align: super; }
-td.baselinee { vertical-align: sub; }
-td.baselinef { vertical-align: -12px; } /* probably correct */
-td.baselineg { vertical-align: 40%; } /* probably correct */
-td.top { vertical-align: top; }
-td.middle { vertical-align: middle; }
-td.bottom { vertical-align: bottom; }
-
-td.big { font-size: 300%; }
-td.biggest { font-size: 600%; }
-
-</style>
-</head>
-<body>
-<h1>Vertical alignment and table height</h1>
-
-<p>The following three tables have heights of <code>auto</code>,
-<code>30px</code>, and <code>500px</code>.  The first one should have
-the height of the sum of its rows.  The second and third can be handled
-however the browser wants, but there just here to make sure it does
-something reasonable.</p>
-
-<table class="one">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="two">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="three">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>These tables test percentage heights.  The first should be its
-natural height; the second should be 50% of the height of the div
-(600px), which is 300px.</p>
-
-<table class="four">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<div class="five">
-<table class="five">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-</div>
-
-<p>The following tests test <code>height</code> on table rows.
-A value of <code>auto</code> requires the minimum height needed by
-the cells.  In a simple case, this is just the height of the tallest
-cell (excluding the increased padding, of course, since with the padding
-the cells have the same height):</p>
-
-<table>
-        <tr class="auto"><td>Data</td><td>Data<br>Data</td><td>Data</td></tr>
-</table>
-
-<p>However, vertical-align values of <code>baseline</code> (the default,
-but could be overridden in a UA stylesheet)
-can make it taller than that:</p>
-
-<table class="baseline">
-        <tr class="auto">
-                <td>Data</td>
-                <td><span class="big">Data</span><br>Data</td>
-                <td>Data<br><span class="big">Data</span></td>
-        </tr>
-</table>
-
-<p>The exact same thing should happen when the given height for the
-row is too small:</p>
-
-<table class="baseline">
-        <tr class="small">
-                <td>Data</td>
-                <td><span class="big">Data</span><br>Data</td>
-                <td>Data<br><span class="big">Data</span></td>
-        </tr>
-</table>
-
-<p>Padding should also be able to increase the height (here the
-first cell has 20px padding-top and the second has 20px of padding-bottom):</p>
-
-<table>
-        <tr>
-                <td style="padding-top: 20px;">Data</td>
-                <td style="padding-bottom: 20px">Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<table>
-        <tr class="small">
-                <td style="padding-top: 20px;">Data</td>
-                <td style="padding-bottom: 20px">Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<p>These two tables should be 200px tall, because of a height on the table
-row.  The second one should have its second and third cell's contents
-offset from the middle by 10px (bottom, then top):</p>
-
-<table class="baseline">
-        <tr class="big">
-                <td>Data</td>
-                <td><span class="big">Data</span><br>Data</td>
-                <td>Data<br><span class="big">Data</span></td>
-        </tr>
-</table>
-
-<table class="middle">
-        <tr class="big">
-                <td style="padding-top: 20px;">Data</td>
-                <td style="padding-bottom: 20px">Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<p>The behavior of percentage heights on table-row or table-row-group
-is undefined.  However, I think they should be ignored, so these tables
-should look normal:</p>
-
-<table>
-        <tr style="height: 200%"><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<table>
-        <tr style="height: 40%"><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<table>
-        <thead style="height: 40%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </thead>
-        <tfoot style="height: 40%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </tfoot>
-        <tbody style="height: 40%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </tbody>
-</table>
-
-<table>
-        <thead style="height: 150%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </thead>
-        <tfoot style="height: 150%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </tfoot>
-        <tbody style="height: 150%">
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-                <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-        </tbody>
-</table>
-
-<p>The following table should look normal, since very small heights
-get ignored:</p>
-
-<table class="cellsmall">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>So should this one, for auto cell heights:</p>
-
-<table class="cellauto">
-        <tr><td>Data</td><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>These tables should look the same - all cells should be 100px tall
-with the text at the top of the cells:</p>
-
-<table class="baseline">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 100px">Data</td>
-                <td style="height: 100px">Data</td>
-        </tr>
-</table>
-
-<table class="middle">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 100px">Data</td>
-                <td style="height: 100px">Data</td>
-        </tr>
-</table>
-
-<table class="top">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px">Data</td>
-                <td style="height: 20px">Data</td>
-        </tr>
-</table>
-
-<table class="baseline">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px">Data</td>
-                <td style="height: 20px">Data</td>
-        </tr>
-</table>
-
-<p>In these four tables, the text should be 20px lower each cell, but should
-otherwise look like the above three tables:</p>
-
-<table class="top">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px; padding: 20px 0;">Data</td>
-                <td style="height: 20px; padding: 40px 0;">Data</td>
-        </tr>
-</table>
-
-<table class="top">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px; padding: 20px 0 0 0;">Data</td>
-                <td style="height: 20px; padding: 40px 0 0 0;">Data</td>
-        </tr>
-</table>
-
-<table class="middle">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px; padding: 20px 0;">Data</td>
-                <td style="height: 20px; padding: 40px 0;">Data</td>
-        </tr>
-</table>
-
-<table class="middle">
-        <tr>
-                <td style="height: 100px">Data</td>
-                <td style="height: 60px;">Data</td>
-                <td style="height: 20px;">Data</td>
-        </tr>
-</table>
-
-<p>These should have the text 40px from the top in every cell:</p>
-
-<table class="baseline">
-        <tr>
-                <td style="height: 60px">Data</td>
-                <td style="padding: 20px 0;">Data</td>
-                <td style="padding: 40px 0;">Data</td>
-        </tr>
-</table>
-
-<table class="baseline">
-        <tr>
-                <td style="height: 37px">Data</td>
-                <td style="height: 53px; padding: 20px 0 0 0;">Data</td>
-                <td style="height: 60px; padding: 40px 0 0 0;">Data</td>
-        </tr>
-</table>
-
-<table class="middle">
-        <tr>
-                <td style="height: 20px">Data</td>
-                <td style="height: 20px; padding: 20px 0;">Data</td>
-                <td style="height: 20px; padding: 40px 0;">Data</td>
-        </tr>
-</table>
-
-<table class="bottom">
-        <tr>
-                <td style="height: 60px">Data</td>
-                <td style="height: 40px; padding: 20px 0;">Data</td>
-                <td style="height: 20px; padding: 40px 0;">Data</td>
-        </tr>
-</table>
-
-<table class="bottom">
-        <tr>
-                <td style="height: 60px">Data</td>
-                <td style="height: 40px; padding: 0 0 20px 0;">Data</td>
-                <td style="height: 20px; padding: 0 0 40px 0;">Data</td>
-        </tr>
-</table>
-
-
-<p>In each of the following tables, three of the cells should have
-the same baseline of the first line, and the three so marked should be
-aligned top, middle, and bottom:</p>
-
-<table>
-        <tr>
-                <td class="baselinea">Data</td>
-                <td class="baselineb big">Data</td>
-                <td class="baselinec biggest">Data</td>
-                <td class="top">Top</td>
-                <td class="middle">Middle</td>
-                <td class="bottom">Bottom</td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td class="top">Top</td>
-                <td class="middle">Middle</td>
-                <td class="bottom">Bottom</td>
-                <td class="baselined biggest">Data</td>
-                <td class="baselinee">Data</td>
-                <td class="baselinef big">Data</td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td class="baselineg biggest">Data</td>
-                <td class="top">Top</td>
-                <td class="middle">Middle</td>
-                <td class="baselinea">Data</td>
-                <td class="bottom">Bottom</td>
-                <td class="baselineb big">Data</td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td class="top">Top</td>
-                <td class="baselinec">Data</td>
-                <td class="baselinee big">Data</td>
-                <td class="middle">Middle</td>
-                <td class="bottom">Bottom</td>
-                <td class="baselined biggest">Data</td>
-        </tr>
-</table>
-
-<table>
-        <tr>
-                <td class="top">Top</td>
-                <td class="baselineg big">Data</td>
-                <td class="bottom">Bottom</td>
-                <td class="baselinef">Data</td>
-                <td class="baselinea biggest">Data</td>
-                <td class="middle">Middle</td>
-        </tr>
-</table>
-
-<hr title="Beginning of Footer">
-<p><a href="http://validator.w3.org/check/referer" title="W3C HTML Validator"><img src="../images/vh40" alt="Valid HTML 4.0!" height="31" width="88"></a></p>
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug10296-2.html b/layout/html/tests/table/bugs/bug10296-2.html
deleted file mode 100644
index 7a143c0d6e85..000000000000
--- a/layout/html/tests/table/bugs/bug10296-2.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html lang="en-US">
-<head>
-<title>Vertical alignment and table height</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-
-td.baselinef { vertical-align: -12px; } /* probably correct */
-td.baselineg { vertical-align: 40%; } /* probably correct */
-
-</style>
-</head>
-<body>
-
-<table>
-        <tr>
-                <td class="baselinef">Data</td>
-                <td class="baselineg">Data</td>
-        </tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug103533.html b/layout/html/tests/table/bugs/bug103533.html
deleted file mode 100644
index fb2da0848cd1..000000000000
--- a/layout/html/tests/table/bugs/bug103533.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<head>
-<title></title>
-<style type="text/css">
-<!--
-#a
-{
-        background-color:background;
-}
--->
-</style>
-</head>
-
-<body>
-<table id="a">
-<tr>
-        <td>This table should NOT be visible</td>
-</tr>
-</table>
-
-<table id="b" style="background-color:background;">
-<tr>
-        <td>This table should NOT be visible</td>
-</tr>
-</table>
-
-
-<script language="JavaScript" type="text/javascript">
-
-<!--
-document.getElementById("a").style.visibility = "hidden";
-document.getElementById("b").style.visibility = "hidden";
-//-->
-
-</script>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug104898.html b/layout/html/tests/table/bugs/bug104898.html
deleted file mode 100644
index 5c230efe3d1d..000000000000
--- a/layout/html/tests/table/bugs/bug104898.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">
-<head>
-   <title>Test</title>
-</head>
-<body>
-<style type="text/css">
-p {
-  border: medium solid purple;
-  }
-p.center {
-  text-align: center;
-}
-p.mozcenter {
-  text-align: -moz-center;
-}
-table.center {
-  margin-left: auto;
-  margin-right: auto;
-}
-table {
-  border: medium solid green;
-  padding-right: 2em;
-  padding-left: 2em;
-}
-caption.center { margin-left: auto;
-  margin-right: auto;
-}
-caption { border: medium solid orange;
-  padding-right: 1em;
-  padding-left: 1em;
-}
-</style>
-<p align="center"><table><caption>cap</caption><tr><td>Centered<br>OK</td></tr></table></p>
-
-<p><table class="center"><caption class="center">cap</caption><tr><td>Centered<br>SHIFT</td></tr></table></p>
-
-<p class="mozcenter"><table><caption>cap</caption><tr><td>Centered<br>NOSTD</td></tr></table></p>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1055-1.html b/layout/html/tests/table/bugs/bug1055-1.html
deleted file mode 100644
index 22b1044a4f43..000000000000
--- a/layout/html/tests/table/bugs/bug1055-1.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-<TITLE>CSS1 Test Suite: 5.5.1n border-*</TITLE>
-<META http-equiv="Content-Style-Type" content="text/css">
-</HEAD>
-
-<BODY>
-<br>
-<hr>
-<h3>border-top</h3>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-top: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5" border>
-<TR>
-<TD style="border-top: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green top border.
-</TD>
-</TR>
-<TR>
-<TD style="border-top: green 10px solid;">Cell one</TD><TD style="border-top: green 10px solid;">Cell two
-<TABLE border><TR><TD style="border-top: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has *no* <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-top: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5">
-<TR>
-<TD style="border-top: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green top border.
-</TD>
-</TR>
-<TR>
-<TD style="border-top: green 10px solid;">Cell one</TD><TD style="border-top: green 10px solid;">Cell two
-<TABLE><TR><TD style="border-top: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<hr>
-<h3>border-right</h3>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-right: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5" border>
-<TR>
-<TD style="border-right: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green right border.
-</TD>
-</TR>
-<TR>
-<TD style="border-right: green 10px solid;">Cell one</TD><TD style="border-right: green 10px solid;">Cell two
-<TABLE border><TR><TD style="border-right: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-right: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5">
-<TR>
-<TD style="border-right: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green right border.
-</TD>
-</TR>
-<TR>
-<TD style="border-right: green 10px solid;">Cell one</TD><TD style="border-right: green 10px solid;">Cell two
-<TABLE><TR><TD style="border-right: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<hr>
-<h3>border-bottom</h3>
-
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-bottom: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5" border>
-<TR>
-<TD style="border-bottom: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green bottom border.
-</TD>
-</TR>
-<TR>
-<TD style="border-bottom: green 10px solid;">Cell one</TD><TD style="border-bottom: green 10px solid;">Cell two
-<TABLE border><TR><TD style="border-bottom: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has *no* <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-bottom: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5">
-<TR>
-<TD style="border-bottom: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green bottom border.
-</TD>
-</TR>
-<TR>
-<TD style="border-bottom: green 10px solid;">Cell one</TD><TD style="border-bottom: green 10px solid;">Cell two
-<TABLE><TR><TD style="border-bottom: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<hr>
-<h3>border-left</h3>
-
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-left: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5" border>
-<TR>
-<TD style="border-left: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green left border.
-</TD>
-</TR>
-<TR>
-<TD style="border-left: green 10px solid;">Cell one</TD><TD style="border-left: green 10px solid;">Cell two
-<TABLE border><TR><TD style="border-left: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has *no* <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border-left: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5">
-<TR>
-<TD style="border-left: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green left border.
-</TD>
-</TR>
-<TR>
-<TD style="border-left: green 10px solid;">Cell one</TD><TD style="border-left: green 10px solid;">Cell two
-<TABLE><TR><TD style="border-left: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<hr>
-<h3>border</h3>
-
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5" border>
-<TR>
-<TD style="border: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green border.
-</TD>
-</TR>
-<TR>
-<TD style="border: green 10px solid;">Cell one</TD><TD style="border: green 10px solid;">Cell two
-<TABLE border><TR><TD style="border: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-<br>
-<p style="font-weight: bold;"><code>&lt;table&gt;</code> has *no* <code>border</code> attribute;
-<code>&lt;td&gt;</code> have <code>style="border: green 10px solid;"</code>.</p>
-
-<TABLE cellspacing="5">
-<TR>
-<TD style="border: green 10px solid;" colspan="2">Every cell in this table should have a 10-pixel solid green border.
-</TD>
-</TR>
-<TR>
-<TD style="border: green 10px solid;">Cell one</TD><TD style="border: green 10px solid;">Cell two
-<TABLE><TR><TD style="border: green 10px solid;">Nested single-cell table!</TD></TR></TABLE>
-</TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug1055-2.html b/layout/html/tests/table/bugs/bug1055-2.html
deleted file mode 100644
index ab3697852a7d..000000000000
--- a/layout/html/tests/table/bugs/bug1055-2.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<html>
-<head>
-<title>Cadres de tableaux</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-.t0 { border-width : 10pt ; border-color : yellow ; border-style : double }
-.t1 { border-color : black ; border-style : double ; border-width : 5pt }
-.t2 { border-color : red ; border-style : solid ; border-width : 5pt  }
-.t3 { border-color : lime ; border-style : groove ; border-width : 5pt  }
-.t4 { border-color : blue ; border-style : inset ; border-width : 5pt  }
-.t00 { border-width : 10pt ; border-color : yellow ; border-style : double ;
-        border-collapse : collapse }
--->
-</style><link rel="stylesheet" href="../testsCSS2.css"></head>
-
-<body BGCOLOR=#ffffff>
-<h1 class="titre">Tests de conformit&eacute; CSS 2</h1>
-<h3 class="sstire">Tableaux, test 13.8</h3>
-<h6 class="sstire">&copy; &Eacute;ditions Eyrolles 1998</h6>
-<table border="0" width="75%" align="right">
-  <tr align="center"> 
-    <td colspan="3"> 
-      <hr width="100%" noshade>
-    </td>
-  </tr>
-  <tr> 
-    <td width="25%" align="left"><a href="tables7.htm">test pr&eacute;c&eacute;dent</a></td>
-    <td width="50%" align="center"><b>Cadres de tableaux</b></td>
-    <td align="right" width="25%"><a href="tables9.htm">test suivant</a></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>Ce test v&eacute;rifie que les cadres s'appliquent bien aux tableaux.</p>
-<pre>.firsttable { border-width : 10pt ; border-color : yellow ;
-                border-style : double }
-.t1 { border-color : black ; border-style : double ;
-                border-width : 5pt }
-.t2 { border-color : red ; border-style : solid ;
-                border-width : 5pt  }
-.t3 { border-color : lime ; border-style : groove ;
-                border-width : 5pt  }
-.t4 { border-color : blue ; border-style : inset ; border-width : 5pt  }
-.secondtable { border-width : 10pt ; border-color : yellow ;
-                border-style : double ;
-                border-collapse : collapse }</pre>
-<table border="1" width="75%" align="center" class="t0">
-  <tr> 
-    <td class="t1">1</td>
-    <td class="t2">2</td>
-    <td class="t3">3</td>
-  </tr>
-  <tr> 
-    <td class="t4">4</td>
-    <td class="t1">5</td>
-    <td class="t2">6</td>
-  </tr>
-  <tr> 
-    <td class="t3">7</td>
-    <td class="t4">8</td>
-    <td class="t1">9</td>
-  </tr>
-</table>
-<br>
-<table border="1" width="75%" align="center" class="t00">
-  <tr> 
-    <td class="t1">1</td>
-    <td class="t2">2</td>
-    <td class="t3">3</td>
-  </tr>
-  <tr> 
-    <td class="t4">4</td>
-    <td class="t1">5</td>
-    <td class="t2">6</td>
-  </tr>
-  <tr> 
-    <td class="t3">7</td>
-    <td class="t4">8</td>
-    <td class="t1">9</td>
-  </tr>
-</table>
-<p class="valeur">Si toutes les conditions exprim&eacute;es par les r&egrave;gles 
-  CSS ci-dessus se retrouvent dans le formatage des tableaux ci-dessus, la valeur 
-  de ce test est 2 et 0 sinon.</p>
-<table border="0" width="75%" align="right">
-  <tr align="center"> 
-    <td colspan="3">
-      <hr width="100%" noshade>
-    </td>
-  </tr>
-  <tr> 
-    <td width="25%" align="left">test pr&eacute;c&eacute;dent</td>
-    <td width="50%" align="center"><b>Cadres de tableaux</b></td>
-    <td width="25%" align="right"><a href="tables9.htm">test suivant</a></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<P>Auteur : Daniel Glazman.</P>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug10565.html b/layout/html/tests/table/bugs/bug10565.html
deleted file mode 100644
index 4bbc1950f99f..000000000000
--- a/layout/html/tests/table/bugs/bug10565.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>simplified "image/spacer image/image" table row testcase</title>
-</head>
-
-<body>
-
-<p>Using a 10px wide transparent gif with td width="10" in the middle column...</p>
-
-<table border="1" cellpadding="0" cellspacing="0">
-<tr>
-<td><a target="_top" href="http://bugzilla.mozilla.com"><img border="0" width="329" height="220" alt="" src="../images/ant.jpg"></a></td>
-<td width="10"><img src="../images/w.gif" width="10" height="1"></td>
-<td><a target="_top" href="http://bugzilla.mozilla.com"><img border="0" width="329" height="220" alt="" src="../images/ant.jpg"></a></td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug106158-1.html b/layout/html/tests/table/bugs/bug106158-1.html
deleted file mode 100644
index bd5b9327f2be..000000000000
--- a/layout/html/tests/table/bugs/bug106158-1.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>tipofday</TITLE>
-<style>
-div { width: 450px; border: 1px solid green;}
-table { border: 1px solid black; }
-table[align] { border: 1px solid red; }
-</style>
-</HEAD>
-
-<BODY>
-<table width="450"><tr><td>
-  <table align=right width="100%">
-   <tr><td>test</td></tr>
-  </table>
-  <table width="99%">
-   <TR><td>
-    <table>
-     <tr><td><img src="../images/bullet.gif"> Shop Till You Drop<BR>
-      From Regina Lewis, AOL's Online Advisor<BR>
-          <img src="../images/bullet.gif"> Forget Dates? Don't Worry We'll Remind You<BR></td>
-     </tr></table>
-        </td></TR></table>
-</td></tr></table>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug106158-2.html b/layout/html/tests/table/bugs/bug106158-2.html
deleted file mode 100644
index 5d4448a0b4e9..000000000000
--- a/layout/html/tests/table/bugs/bug106158-2.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<body>
- <table width="450">
-  <tr>
-   <td>
-    <table bgcolor="#ffff00" align="right" cellpadding="2" cellspacing="0" border="0" width="100%">
-     <tr>
-      <td>
-       <font face="arial" size="2">In </font>
-      </td>
-     </tr>
-    </table>
-
-    <br>
-
-    <table bgcolor="#ff00ff" width="99%">
-     <tr>
-      <td>
-       Shop Till You Drop
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
- </table>
-</body>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug10633.html b/layout/html/tests/table/bugs/bug10633.html
deleted file mode 100644
index 8a627dedc5c7..000000000000
--- a/layout/html/tests/table/bugs/bug10633.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<body bgcolor="#ffffff">
-
-  <table width="468" border="0" cellpadding="0" cellspacing="0">
-
-  <tr>
-    <td width="18" colspan="3"></td>
-    <td width="187"><img src="../images/pixel_none.gif" width="187" height="1" border="0" alt=""></td>
-    <td width="20"><img src="../images/pixel_none.gif" width="20" height="1" border="0" alt=""></td>
-    <td width="18"><img src="../images/pixel_none.gif" width="18" height="1" border="0" alt=""></td>
-    <td width="18" colspan="3"></td>
-    <td width="187"><img src="../images/pixel_none.gif" width="187" height="1" border="0" alt=""></td>
-    <td width="20"><img src="../images/pixel_none.gif" width="20" height="1" border="0" alt=""></td>
-  </tr>
-
-  <tr> 
-    <td colspan="3"><img src="../images/bar_yellow_left.gif" width="18" height="22" align="absmiddle"></td>
-    <td bgcolor="#FFCC00" background="../images/bkgd_yellow.gif" align="center"> 
-      <a href="http://yp9.superpages.com/ypform.phtml?SRC=&STYPE=&PG=&C=&N=&E=&T=&K=&S=&Z=&A=&X=&P=&R=" onclick='this.href="http://yp9.superpages.com/ypform.phtml"+buildURL("");'><b><font size="3" face="Geneva, Arial, helvetica">Detailed Search</font></b></a>
-    </td>
-    <td><img src="../images/bar_yellow_right.gif" width="20" height="22"></td>
-    <td>&nbsp;</td>
-    <td colspan="3"><img src="../images/bar_yellow_left.gif" width="18" height="22" align="absmiddle"></td>
-    <td bgcolor="#FFCC00" background="../images/bkgd_yellow.gif" align="center"> 
-      <a href="http://yp9.superpages.com/dsearch.phtml?SRC=&STYPE=D&R=D&PG=L&C=&N=&RR=&RE=&RT=&K=&RS=&RZ=&RL0=&RLT=" onclick='this.href="http://yp9.superpages.com/dsearch.phtml"+buildURL("D");'><b><font size="3" face="Geneva, Arial,helvetica">Search By Distance</font></b></a>
-    </td>
-    <td><img src="../images/bar_yellow_right.gif" width="20" height="22"></td>
-  </tr>
-
-  <tr> 
-    <td>&nbsp;</td>
-    <td bgcolor="#EBEBE4">&nbsp;</td>
-    <td bgcolor="#EBEBE4" colspan="3" valign="top"> 
-      <p><img src="../images/pixel_none.gif" width="1" height="5" border="0" alt=""><br>
-      <font face="geneva, Arial,Helvetica" size="-1">Search using almost 
-      any combination of business name, category, street address, city, 
-      state, ZIP, or phone number.</font><font face="geneva, Arial,Helvetica" size="-1"><br>&nbsp; </font></p>
-    </td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td bgcolor="#EBEBE4">&nbsp;</td>
-    <td bgcolor="#EBEBE4" colspan="3" valign="top"><font face="geneva, Arial,Helvetica" size="-1"><img src="../images/pixel_none.gif" width="1" height="5" border="0" alt=""><br>
-      Search for businesses within a certain distance from a location you specify.</font></td>
-  </tr>
-
-</table>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug106336.html b/layout/html/tests/table/bugs/bug106336.html
deleted file mode 100644
index 76164ed2204d..000000000000
--- a/layout/html/tests/table/bugs/bug106336.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<table cellspacing=40% cellpadding=20% border>
- <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug1067-1.html b/layout/html/tests/table/bugs/bug1067-1.html
deleted file mode 100644
index 2a46e3efd7ee..000000000000
--- a/layout/html/tests/table/bugs/bug1067-1.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-        <TITLE>Sony Computer Entertainment America Inc.</TITLE>
-</HEAD>
-<body bgcolor = "#FFFFFF" background="../images/ruler.gif" LINK="#0000FF" ALINK="#FF3300" 
-VLINK="#FF0000">
-
-<TABLE CELLSPACING=0 CELLPADDING=10 BORDER=0 WIDTH=0>
-<TABLE>
-<TR>
-        <TD VALIGN="TOP" width="110">
-
-<TABLE CELLSPACING=0 CELLPADDING=4 BORDER=0 >
-<TR>
-        <TD> </TD>
-</TR>
-
-
-</TABLE>
-
-</TD>
-
-<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>
-
-<TD VALIGN="TOP" width="500">bull
-</TD>
-</TR>
-</TABLE></TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug1067-2.html b/layout/html/tests/table/bugs/bug1067-2.html
deleted file mode 100644
index 505cf424b59e..000000000000
--- a/layout/html/tests/table/bugs/bug1067-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<body bgcolor = "#FFFFFF" LINK="#0000FF" ALINK="#FF3300" VLINK="#FF0000">
-<hr align=left width=110>
-<TABLE CELLSPACING=0 CELLPADDING=20 BORDER=0>
-<TR>
-  <TD VALIGN="TOP" width="110" bgcolor=yellow>x</TD>
-  <TD VALIGN="TOP" width="100" bgcolor=grey>bull</TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug106795.html b/layout/html/tests/table/bugs/bug106795.html
deleted file mode 100644
index 9955bfb4d79d..000000000000
--- a/layout/html/tests/table/bugs/bug106795.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<title>bugscape 6107</title>
-</head>
-
-<body>
-
-<table border="1" cellpadding="0" cellspacing="0" height="82">
- <tr><td><br></td></tr>
- <tr><td height="3"><img border="0" src="../images/TopRule.gif" width="779" height="3"></td></tr>
- <tr><td bgcolor="#CC0000"><br></td></tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug106816.html b/layout/html/tests/table/bugs/bug106816.html
deleted file mode 100644
index cab34a207a4f..000000000000
--- a/layout/html/tests/table/bugs/bug106816.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Strict//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>1 2 3 4</title>
-<style type="text/css">
-td{
- text-align: center;
- vertical-align: middle;
-} 
-</style>
-</head>
-<body>
- <h4>table 1</h4>
- <table border="1">
- <tr>
-  <td>1.1</td><td rowspan="2">1.2</td><td>1.3</td><td>1.4</td>
-        <td rowspan="2">1.5</td><td rowspan="2">1.6</td>
- </tr>
- <tr>
-  <td colspan="5">2.1</td>
- </tr>
- <tr>
-  <td>3.1</td><td>3.2</td><td>3.3</td><td>3.4</td><td>3.5</td><td>3.6</td>
- </tr>
- </table>
- <p>
-  cell 1.5 has rowspan="2"
- </p>
- <h4>table 2</h4>
- <table border="1">
- <tr>
-  <td>1.1</td>
-        <td rowspan="2">1.2</td><td>1.3</td><td>1.4</td>
-        <td colspan="2" rowspan="2">1.5</td>
- </tr>
- <tr>
-  <td colspan="5">2.1</td>
- </tr>
- <tr>
-  <td>3.1</td><td>3.2</td><td>3.3</td><td>3.4</td><td>3.5</td><td>3.6</td>
- </tr>
- </table>
- <p>
-  cell 1.5 has colspan="2" rowspan="2"
- </p>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug106966.html b/layout/html/tests/table/bugs/bug106966.html
deleted file mode 100644
index 8e0ac6fe5bf1..000000000000
--- a/layout/html/tests/table/bugs/bug106966.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>table overflow </title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-<style type="text/css">
-table {
-table-layout : fixed; 
-border : 10px solid blue; 
-background-color: orange;
-width:200px;
-padding: 15px;
-}
-
-td {
-background-color:yellow;
-}
-*|* :table-outer {
-overflow:hidden; 
-}
-col.c2 { 
-background-color:red;
-overflow:hidden;
-}
-colgroup.cg2 { 
-background-color:red;
-overflow:hidden;
-}
-*.clipme {
-overflow:hidden
-}
-
-</style>
-</head>
-<body>
-
-<table cellspacing="15px">
-<caption>
-clip at table-outer</caption>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr></table>
-<br>
-<table class="clipme" cellspacing="15px">
-<caption>
-clip at table</caption>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr></table>
-
-<table cellspacing="15px">
-<caption>
-clip at tr</caption>
-<tr class="clipme"><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</table>
-
-<table cellspacing="15px">
-<colgroup>
-<col>
-<col class="clipme">
-</colgroup>
-<caption>
-clip column</caption>
-<tr ><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</table>
-
-<table cellspacing="15px">
-<colgroup>
-<col >
-</colgroup>
-<colgroup class="clipme">
-<col>
-</colgroup>
-<caption>
-clip columngroup</caption>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</table>
-
-<table cellspacing="15px">
-<caption>
-clip thead</caption>
-<thead class="clipme">
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</thead>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</table>
-
-<table cellspacing="15px">
-<caption>
-clip tbody</caption>
-<thead>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</thead>
-<tbody class="clipme">
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</tbody>
-</table>
-
-<table cellspacing="15px">
-<caption>
-clip tfoot</caption>
-<tbody>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</tbody>
-<tfoot class="clipme">
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</tfoot>
-</table>
-
-<table cellspacing="15px">
-<caption>
-clip td</caption>
-<tbody>
-<tr><td>cell1</td>
-<td>contentwithoutspace
-</td></tr>
-</tbody>
-<tfoot class="clipme">
-<tr><td>cell1</td>
-<td class="clipme">contentwithoutspace
-</td></tr>
-</tfoot>
-</table>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug108340.html b/layout/html/tests/table/bugs/bug108340.html
deleted file mode 100644
index e82fabb5990d..000000000000
--- a/layout/html/tests/table/bugs/bug108340.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title> reflow style changed -  target: outertable frame </title>
-<script type="text/javascript">
-
-function buildTable_dom_html() {
-
-var d1 = document.getElementsByTagName("table")[0];
-d1.setAttribute("style", "font-size:30pt;"); 
-}
-</script>
-</head>
-<body onload="buildTable_dom_html()" >
-<div>
-<table border="1">
-<tr>
-<td>
-aaaaa
-</td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug109043.html b/layout/html/tests/table/bugs/bug109043.html
deleted file mode 100644
index 5690593e56ef..000000000000
--- a/layout/html/tests/table/bugs/bug109043.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-<title>test</title>
-</head>
-
-<body>
-<table cellspacing=0 cellpading=10 border=1 width=100% bgcolor=yellow>
- <tr>
-  <td width=70 bgcolor=red align=center>xxx</td>
-  <td>
-      <table cellspacing=0 cellpading=0 border=1 width=100% height=100% bgcolor=lime>
-         <tr>
-           <th>IceWM, The Window Manager Cool As Ice</th>
-         </tr>
-      </table>
-
-      <p>IceWM is a small, but powerful window manager for the <a href="http://www.xfree8 6.org">X11 Window System</a> whose main goals are the following:</p>
-  </td>
-
-  <td width=70 bgcolor=blue align=center>yyy</td>
- </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug11026.html b/layout/html/tests/table/bugs/bug11026.html
deleted file mode 100644
index 830c5e73a29a..000000000000
--- a/layout/html/tests/table/bugs/bug11026.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<HTML>
-
-<BODY BGCOLOR="#FFFFFF" MARGINWIDTH="0" MARGINHEIGHT="0" LEFTMARGIN="0" TOPMARGIN="0" TEXT="#000000" LINK="#CC6633"
-VLINK="#669933">
-The bug showed horizontal scroll bars when resized
-<BR>
-<TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0">
-        <TR>
-                <TD HEIGHT="90" BGCOLOR="#FFFFFF"><IMG BORDER="0" SRC="../images/aboutHeader.gif" WIDTH="194" HEIGHT="90" ALIGN="LEFT"><IMG BORDER="0" SRC="../images/ant.jpg" WIDTH="133" HEIGHT="90" ALIGN="RIGHT"></TD>
-        </TR>
-</TABLE>
-                                                                                                                        
-                      
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug110566.html b/layout/html/tests/table/bugs/bug110566.html
deleted file mode 100644
index f25cc1e8e2c0..000000000000
--- a/layout/html/tests/table/bugs/bug110566.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<HTML>
-<HEAD></HEAD>
-<BODY><table border=1 cellspacing=0 style="height: 100%">
-   <tr style="height: 70%">
-      <td>height: 70%</td>
-   </tr>
-   <tr style="height: 30%">
-           <td>height: 30%</td>
-   </tr>
-</table></BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug1128.html b/layout/html/tests/table/bugs/bug1128.html
deleted file mode 100644
index 6244b76aab88..000000000000
--- a/layout/html/tests/table/bugs/bug1128.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-<title>Table Column Proportional Width Contraints</title>
-</head>
-<body>
-<h2>HTML 4.0 Table Column Proportional Width Constraints</h2>
-<p>
-The table below is 350 pixels wide. The columns are assigned proportional widths using COLs
-as follows:
-</p>
-<tt>
-&lt;col width=50&gt;<br>
-&lt;col width=2*&gt;<br>
-&lt;col width=1*&gt;<Br>
-&lt;col width=3*&gt;
-</tt>
-<p>
-This means the first column should be 50 pixels wide. The remaining width should be divided
-among the three remaining columns according to the proportional width statements into six
-(2+1+3)
-parts. Since the Table is 350 pixels wide, and the remaining width is 300 pixels (350-50),
-the remaining columns should be 100 (2*50), 50 (1*50) and 150 (3*50) pixels wide, 
-respectively.
-</p>
-<table border=1 width=350>
-<colgroup>
-<col width=50>
-<col width=2*>
-<col width=1*>
-<col width=3*>
-</colgroup>
-<tr>
-<th>One
-<th>Two
-<th>Three
-<th>Four
-</tr>
-<tr>
-<td>Red
-<td>Green
-<td>Blue
-<td>Green
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug11321.html b/layout/html/tests/table/bugs/bug11321.html
deleted file mode 100644
index 2808123c220f..000000000000
--- a/layout/html/tests/table/bugs/bug11321.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<BODY onload="run()">
-<SCRIPT>
-<!--
-function run(){
-        var tbl = document.body.appendChild(document.createElement("TABLE"));
-                //alert("Appending TR to TABLE");
-        var tr = tbl.appendChild(document.createElement("TR"));
-        var tmp_td = document.createElement("TD")
-        var td1 = tr.appendChild(tmp_td);   // <-- Causes Crash
-        var td1_text = td1.appendChild(document.createTextNode("testing"));
-}
-//-->
-</SCRIPT>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug113235-1.html b/layout/html/tests/table/bugs/bug113235-1.html
deleted file mode 100644
index 56f922e1fd47..000000000000
--- a/layout/html/tests/table/bugs/bug113235-1.html
+++ /dev/null
@@ -1,744 +0,0 @@
-<html>
-<body>
-<table border>
-  <tr valign="top">
-    <td>x</td>
-    <td>
-      <!-- this font, and the malformed table below trigger the bug -->
-      <font face="Arial, sans-serif" size="-1">
-      <table border>
-        <tr>
-          <td width="10">&nbsp;</td>
-          <td width="443" valign="top" align="left">
-        <tr>
-          <td>Search again...</td>  
-        </tr>
-        <table>
-          <tr>
-            This text node only exists once in the original document!
-            If it were a large collection of inlines, the page would 
-            hang forever.
-
-<A NAME="Top_Of_Page"></A>
-<H2><A NAME="ToC">Table of Contents</A></H2>
-<P><B><A NAME="ToC_1" HREF="whatever.html">Introduction</A></B><BR>
-<BR><A NAME="ToC_2" HREF="whatever.html">Who Should Use This Book</A>
-<BR><A NAME="ToC_3" HREF="whatever.html">How To Use This Book</A>
-<BR><A NAME="ToC_4" HREF="whatever.html">How This Book is Structured</A>
-<BR><A NAME="ToC_5" HREF="whatever.html">How to Read the Syntax Diagrams</A>
-<BR><A NAME="ToC_6" HREF="whatever.html">Conventions Used in This Manual</A>
-<BR><A NAME="ToC_7" HREF="whatever.html">Error Conditions</A>
-<BR><A NAME="ToC_8" HREF="whatever.html">Highlighting Conventions</A>
-<BR><A NAME="ToC_9" HREF="whatever.html">Related Documentation for This Book</A>
-<P><B><A NAME="ToC_10" HREF="whatever.html">Concepts</A></B><BR>
-<BR><A NAME="ToC_11" HREF="whatever.html">Relational Database</A>
-<BR><A NAME="ToC_12" HREF="whatever.html">Structured Query Language (SQL)</A>
-<BR><A NAME="ToC_13" HREF="whatever.html">Embedded SQL</A>
-<BR><A NAME="ToC_14" HREF="whatever.html">Static SQL</A>
-<BR><A NAME="ToC_15" HREF="whatever.html">Dynamic SQL</A>
-<BR><A NAME="ToC_16" HREF="whatever.html">DB2 Call Level Interface (CLI) &amp; Open Database Connectivity (ODBC)</A>
-<BR><A NAME="ToC_17" HREF="whatever.html">Java Database Connectivity (JDBC) and Embedded SQL for Java (SQLJ) Programs</A>
-<BR><A NAME="ToC_18" HREF="whatever.html">Interactive SQL</A>
-<BR><A NAME="ToC_19" HREF="whatever.html">Schemas</A>
-<BR><A NAME="ToC_20" HREF="whatever.html">Controlling Use of Schemas</A>
-<BR><A NAME="ToC_21" HREF="whatever.html">Tables</A>
-<BR><A NAME="ToC_22" HREF="whatever.html">Views</A>
-<BR><A NAME="ToC_23" HREF="whatever.html">Aliases</A>
-<BR><A NAME="ToC_24" HREF="whatever.html">Indexes</A>
-<BR><A NAME="ToC_25" HREF="whatever.html">Keys</A>
-<BR><A NAME="ToC_26" HREF="whatever.html">Unique Keys</A>
-<BR><A NAME="ToC_27" HREF="whatever.html">Primary Keys</A>
-<BR><A NAME="ToC_28" HREF="whatever.html">Foreign Keys</A>
-<BR><A NAME="ToC_29" HREF="whatever.html">Partitioning Keys</A>
-<BR><A NAME="ToC_30" HREF="whatever.html">Constraints</A>
-<BR><A NAME="ToC_31" HREF="whatever.html">Unique Constraints</A>
-<BR><A NAME="ToC_32" HREF="whatever.html">Referential Constraints</A>
-<BR><A NAME="ToC_36" HREF="whatever.html">Table Check Constraints</A>
-<BR><A NAME="ToC_37" HREF="whatever.html">Triggers</A>
-<BR><A NAME="ToC_38" HREF="whatever.html">Event Monitors</A>
-<BR><A NAME="ToC_39" HREF="whatever.html">Queries</A>
-<BR><A NAME="ToC_40" HREF="whatever.html">Table Expressions</A>
-<BR><A NAME="ToC_41" HREF="whatever.html">Common Table Expressions</A>
-<BR><A NAME="ToC_42" HREF="whatever.html">Packages</A>
-<BR><A NAME="ToC_43" HREF="whatever.html">Catalog Views</A>
-<BR><A NAME="ToC_44" HREF="whatever.html">Application Processes, Concurrency, and Recovery</A>
-<BR><A NAME="ToC_45" HREF="whatever.html">Isolation Level</A>
-<BR><A NAME="ToC_46" HREF="whatever.html">Repeatable Read (RR)</A>
-<BR><A NAME="ToC_47" HREF="whatever.html">Read Stability (RS)</A>
-<BR><A NAME="ToC_48" HREF="whatever.html">Cursor Stability (CS)</A>
-<BR><A NAME="ToC_49" HREF="whatever.html">Uncommitted Read (UR)</A>
-<BR><A NAME="ToC_50" HREF="whatever.html">Comparison of Isolation Levels</A>
-<BR><A NAME="ToC_51" HREF="whatever.html">Distributed Relational Database</A>
-<BR><A NAME="ToC_52" HREF="whatever.html">Application Servers</A>
-<BR><A NAME="ToC_53" HREF="whatever.html">CONNECT (Type 1) and CONNECT (Type 2)</A>
-<BR><A NAME="ToC_54" HREF="whatever.html">Remote Unit of Work</A>
-<BR><A NAME="ToC_56" HREF="whatever.html">Application-Directed Distributed Unit of Work</A>
-<BR><A NAME="ToC_64" HREF="whatever.html">Data Representation Considerations</A>
-<BR><A NAME="ToC_65" HREF="whatever.html">DB2 Federated Systems</A>
-<BR><A NAME="ToC_66" HREF="whatever.html">The Federated Server, Federated Database, and Data Sources</A>
-<BR><A NAME="ToC_67" HREF="whatever.html">Tasks to Perform in a DB2 Federated System</A>
-<BR><A NAME="ToC_68" HREF="whatever.html">Wrappers and Wrapper Modules</A>
-<BR><A NAME="ToC_69" HREF="whatever.html">Server Definitions and Server Options</A>
-<BR><A NAME="ToC_73" HREF="whatever.html">User Mappings and User Options</A>
-<BR><A NAME="ToC_74" HREF="whatever.html">Data Type Mappings</A>
-<BR><A NAME="ToC_75" HREF="whatever.html">Function Mappings, Function Templates, and Function Mapping Options</A>
-<BR><A NAME="ToC_76" HREF="whatever.html">Nicknames and Column Options</A>
-<BR><A NAME="ToC_77" HREF="whatever.html">Index Specifications</A>
-<BR><A NAME="ToC_78" HREF="whatever.html">Distributed Requests</A>
-<BR><A NAME="ToC_81" HREF="whatever.html">Compensation</A>
-<BR><A NAME="ToC_82" HREF="whatever.html">Pass-Through</A>
-<BR><A NAME="ToC_83" HREF="whatever.html">Character Conversion</A>
-<BR><A NAME="ToC_84" HREF="whatever.html">Character Sets and Code Pages</A>
-<BR><A NAME="ToC_85" HREF="whatever.html">Code Page Attributes</A>
-<BR><A NAME="ToC_87" HREF="whatever.html">Authorization and Privileges</A>
-<BR><A NAME="ToC_88" HREF="whatever.html">Table Spaces and Other Storage Structures</A>
-<BR><A NAME="ToC_89" HREF="whatever.html">Data Partitioning Across Multiple Partitions</A>
-<BR><A NAME="ToC_90" HREF="whatever.html">Partitioning Maps</A>
-<BR><A NAME="ToC_91" HREF="whatever.html">Table Collocation</A>
-<P><B><A NAME="ToC_92" HREF="whatever.html">Language Elements</A></B><BR>
-<BR><A NAME="ToC_93" HREF="whatever.html">Characters</A>
-<BR><A NAME="ToC_94" HREF="whatever.html">MBCS Considerations</A>
-<BR><A NAME="ToC_95" HREF="whatever.html">Tokens</A>
-<BR><A NAME="ToC_96" HREF="whatever.html">MBCS Considerations</A>
-<BR><A NAME="ToC_97" HREF="whatever.html">Identifiers</A>
-<BR><A NAME="ToC_98" HREF="whatever.html">SQL Identifiers</A>
-<BR><A NAME="ToC_99" HREF="whatever.html">Host Identifiers</A>
-<BR><A NAME="ToC_100" HREF="whatever.html">Naming Conventions and Implicit Object Name Qualifications</A>
-<BR><A NAME="ToC_101" HREF="whatever.html">Aliases</A>
-<BR><A NAME="ToC_102" HREF="whatever.html">Authorization IDs and authorization-names</A>
-<BR><A NAME="ToC_103" HREF="whatever.html">Dynamic SQL Characteristics at run-time</A>
-<BR><A NAME="ToC_104" HREF="whatever.html">Authorization IDs and Statement Preparation</A>
-<BR><A NAME="ToC_105" HREF="whatever.html">Data Types</A>
-<BR><A NAME="ToC_106" HREF="whatever.html">Nulls</A>
-<BR><A NAME="ToC_107" HREF="whatever.html">Large Objects (LOBs)</A>
-<BR><A NAME="ToC_112" HREF="whatever.html">Character Strings</A>
-<BR><A NAME="ToC_119" HREF="whatever.html">Graphic Strings</A>
-<BR><A NAME="ToC_123" HREF="whatever.html">Binary String</A>
-<BR><A NAME="ToC_124" HREF="whatever.html">Numbers</A>
-<BR><A NAME="ToC_131" HREF="whatever.html">Datetime Values</A>
-<BR><A NAME="ToC_140" HREF="whatever.html">DATALINK Values</A>
-<BR><A NAME="ToC_141" HREF="whatever.html">User Defined Types</A>
-<BR><A NAME="ToC_145" HREF="whatever.html">Promotion of Data Types</A>
-<BR><A NAME="ToC_146" HREF="whatever.html">Casting Between Data Types</A>
-<BR><A NAME="ToC_147" HREF="whatever.html">Assignments and Comparisons</A>
-<BR><A NAME="ToC_148" HREF="whatever.html">Numeric Assignments</A>
-<BR><A NAME="ToC_154" HREF="whatever.html">String Assignments</A>
-<BR><A NAME="ToC_160" HREF="whatever.html">Datetime Assignments</A>
-<BR><A NAME="ToC_161" HREF="whatever.html">DATALINK Assignments</A>
-<BR><A NAME="ToC_162" HREF="whatever.html">User-defined Type Assignments</A>
-<BR><A NAME="ToC_163" HREF="whatever.html">Reference Type Assignments</A>
-<BR><A NAME="ToC_164" HREF="whatever.html">Numeric Comparisons</A>
-<BR><A NAME="ToC_165" HREF="whatever.html">String Comparisons</A>
-<BR><A NAME="ToC_169" HREF="whatever.html">Datetime Comparisons</A>
-<BR><A NAME="ToC_170" HREF="whatever.html">User-defined Type Comparisons</A>
-<BR><A NAME="ToC_171" HREF="whatever.html">Reference Type Comparisons</A>
-<BR><A NAME="ToC_172" HREF="whatever.html">Rules for Result Data Types</A>
-<BR><A NAME="ToC_173" HREF="whatever.html">Character Strings</A>
-<BR><A NAME="ToC_174" HREF="whatever.html">Graphic Strings</A>
-<BR><A NAME="ToC_175" HREF="whatever.html">Binary Large Object (BLOB)</A>
-<BR><A NAME="ToC_176" HREF="whatever.html">Numeric</A>
-<BR><A NAME="ToC_177" HREF="whatever.html">DATE</A>
-<BR><A NAME="ToC_178" HREF="whatever.html">TIME</A>
-<BR><A NAME="ToC_179" HREF="whatever.html">TIMESTAMP</A>
-<BR><A NAME="ToC_180" HREF="whatever.html">DATALINK</A>
-<BR><A NAME="ToC_181" HREF="whatever.html">User-defined Types</A>
-<BR><A NAME="ToC_185" HREF="whatever.html">Nullable Attribute of Result</A>
-<BR><A NAME="ToC_186" HREF="whatever.html">Rules for String Conversions</A>
-<BR><A NAME="ToC_187" HREF="whatever.html">Partition Compatibility</A>
-<BR><A NAME="ToC_188" HREF="whatever.html">Constants</A>
-<BR><A NAME="ToC_189" HREF="whatever.html">Integer Constants</A>
-<BR><A NAME="ToC_190" HREF="whatever.html">Floating-Point Constants</A>
-<BR><A NAME="ToC_191" HREF="whatever.html">Decimal Constants</A>
-<BR><A NAME="ToC_192" HREF="whatever.html">Character String Constants</A>
-<BR><A NAME="ToC_194" HREF="whatever.html">Hexadecimal Constants</A>
-<BR><A NAME="ToC_195" HREF="whatever.html">Graphic String Constants</A>
-<BR><A NAME="ToC_197" HREF="whatever.html">Using Constants with User-defined Types</A>
-<BR><A NAME="ToC_198" HREF="whatever.html">Special Registers</A>
-<BR><A NAME="ToC_199" HREF="whatever.html">CURRENT DATE</A>
-<BR><A NAME="ToC_201" HREF="whatever.html">CURRENT DEFAULT TRANSFORM GROUP</A>
-<BR><A NAME="ToC_203" HREF="whatever.html">CURRENT DEGREE</A>
-<BR><A NAME="ToC_204" HREF="whatever.html">CURRENT EXPLAIN MODE</A>
-<BR><A NAME="ToC_205" HREF="whatever.html">CURRENT EXPLAIN SNAPSHOT</A>
-<BR><A NAME="ToC_207" HREF="whatever.html">CURRENT NODE</A>
-<BR><A NAME="ToC_209" HREF="whatever.html">CURRENT PATH</A>
-<BR><A NAME="ToC_211" HREF="whatever.html">CURRENT QUERY OPTIMIZATION</A>
-<BR><A NAME="ToC_213" HREF="whatever.html">CURRENT REFRESH AGE</A>
-<BR><A NAME="ToC_214" HREF="whatever.html">CURRENT SCHEMA</A>
-<BR><A NAME="ToC_216" HREF="whatever.html">CURRENT SERVER</A>
-<BR><A NAME="ToC_218" HREF="whatever.html">CURRENT TIME</A>
-<BR><A NAME="ToC_220" HREF="whatever.html">CURRENT TIMESTAMP</A>
-<BR><A NAME="ToC_222" HREF="whatever.html">CURRENT TIMEZONE</A>
-<BR><A NAME="ToC_224" HREF="whatever.html">USER</A>
-<BR><A NAME="ToC_226" HREF="whatever.html">Column Names</A>
-<BR><A NAME="ToC_227" HREF="whatever.html">Qualified Column Names</A>
-<BR><A NAME="ToC_228" HREF="whatever.html">Correlation Names</A>
-<BR><A NAME="ToC_229" HREF="whatever.html">Column Name Qualifiers to Avoid Ambiguity</A>
-<BR><A NAME="ToC_232" HREF="whatever.html">Column Name Qualifiers in Correlated References</A>
-<BR><A NAME="ToC_233" HREF="whatever.html">References to Host Variables</A>
-<BR><A NAME="ToC_234" HREF="whatever.html">Host Variables in Dynamic SQL</A>
-<BR><A NAME="ToC_236" HREF="whatever.html">References to BLOB, CLOB, and DBCLOB Host Variables</A>
-<BR><A NAME="ToC_237" HREF="whatever.html">References to Locator Variables</A>
-<BR><A NAME="ToC_238" HREF="whatever.html">References to BLOB, CLOB, and DBCLOB File Reference Variables</A>
-<BR><A NAME="ToC_241" HREF="whatever.html">References to Structured Type Host Variables</A>
-<BR><A NAME="ToC_243" HREF="whatever.html">Functions</A>
-<BR><A NAME="ToC_244" HREF="whatever.html">External, SQL and Sourced User-Defined Functions</A>
-<BR><A NAME="ToC_245" HREF="whatever.html">Scalar, Column, Row and Table User-Defined Functions</A>
-<BR><A NAME="ToC_246" HREF="whatever.html">Function signatures</A>
-<BR><A NAME="ToC_247" HREF="whatever.html">SQL Path</A>
-<BR><A NAME="ToC_248" HREF="whatever.html">Function Resolution</A>
-<BR><A NAME="ToC_252" HREF="whatever.html">Function Invocation</A>
-<BR><A NAME="ToC_253" HREF="whatever.html">Methods</A>
-<BR><A NAME="ToC_254" HREF="whatever.html">External and SQL User-Defined Methods</A>
-<BR><A NAME="ToC_255" HREF="whatever.html">Method Signatures</A>
-<BR><A NAME="ToC_256" HREF="whatever.html">Method Invocation</A>
-<BR><A NAME="ToC_257" HREF="whatever.html">Method Resolution</A>
-<BR><A NAME="ToC_258" HREF="whatever.html">Method of Choosing the Best Fit</A>
-<BR><A NAME="ToC_259" HREF="whatever.html">Example of Method Resolution</A>
-<BR><A NAME="ToC_260" HREF="whatever.html">Method Invocation</A>
-<BR><A NAME="ToC_261" HREF="whatever.html">Conservative Binding Semantics</A>
-<BR><A NAME="ToC_262" HREF="whatever.html">Expressions</A>
-<BR><A NAME="ToC_263" HREF="whatever.html">Without Operators</A>
-<BR><A NAME="ToC_264" HREF="whatever.html">With the Concatenation Operator</A>
-<BR><A NAME="ToC_266" HREF="whatever.html">With Arithmetic Operators</A>
-<BR><A NAME="ToC_268" HREF="whatever.html">Two Integer Operands</A>
-<BR><A NAME="ToC_269" HREF="whatever.html">Integer and Decimal Operands</A>
-<BR><A NAME="ToC_270" HREF="whatever.html">Two Decimal Operands</A>
-<BR><A NAME="ToC_271" HREF="whatever.html">Decimal Arithmetic in SQL</A>
-<BR><A NAME="ToC_275" HREF="whatever.html">Floating-Point Operands</A>
-<BR><A NAME="ToC_276" HREF="whatever.html">User-defined Types as Operands</A>
-<BR><A NAME="ToC_277" HREF="whatever.html">Scalar Fullselect</A>
-<BR><A NAME="ToC_278" HREF="whatever.html">Datetime Operations and Durations</A>
-<BR><A NAME="ToC_283" HREF="whatever.html">Datetime Arithmetic in SQL</A>
-<BR><A NAME="ToC_293" HREF="whatever.html">Precedence of Operations</A>
-<BR><A NAME="ToC_294" HREF="whatever.html">CASE Expressions</A>
-<BR><A NAME="ToC_296" HREF="whatever.html">CAST Specifications</A>
-<BR><A NAME="ToC_298" HREF="whatever.html">Dereference Operations</A>
-<BR><A NAME="ToC_300" HREF="whatever.html">OLAP Functions</A>
-<BR><A NAME="ToC_302" HREF="whatever.html">Method Invocation</A>
-<BR><A NAME="ToC_304" HREF="whatever.html">Subtype Treatment</A>
-<BR><A NAME="ToC_306" HREF="whatever.html">Predicates</A>
-<BR><A NAME="ToC_307" HREF="whatever.html">Basic Predicate</A>
-<BR><A NAME="ToC_308" HREF="whatever.html">Quantified Predicate</A>
-<BR><A NAME="ToC_309" HREF="whatever.html">BETWEEN Predicate</A>
-<BR><A NAME="ToC_310" HREF="whatever.html">EXISTS Predicate</A>
-<BR><A NAME="ToC_311" HREF="whatever.html">IN Predicate</A>
-<BR><A NAME="ToC_312" HREF="whatever.html">LIKE Predicate</A>
-<BR><A NAME="ToC_314" HREF="whatever.html">NULL Predicate</A>
-<BR><A NAME="ToC_315" HREF="whatever.html">TYPE Predicate</A>
-<BR><A NAME="ToC_316" HREF="whatever.html">Search Conditions</A>
-<BR><A NAME="ToC_317" HREF="whatever.html">Examples</A>
-<P><B><A NAME="ToC_318" HREF="whatever.html">Functions</A></B><BR>
-<BR><A NAME="ToC_319" HREF="whatever.html">Column Functions</A>
-<BR><A NAME="ToC_320" HREF="whatever.html">AVG</A>
-<BR><A NAME="ToC_321" HREF="whatever.html">CORRELATION</A>
-<BR><A NAME="ToC_322" HREF="whatever.html">COUNT</A>
-<BR><A NAME="ToC_323" HREF="whatever.html">COUNT_BIG</A>
-<BR><A NAME="ToC_324" HREF="whatever.html">COVARIANCE</A>
-<BR><A NAME="ToC_325" HREF="whatever.html">GROUPING</A>
-<BR><A NAME="ToC_326" HREF="whatever.html">MAX</A>
-<BR><A NAME="ToC_327" HREF="whatever.html">MIN</A>
-<BR><A NAME="ToC_328" HREF="whatever.html">REGRESSION Functions</A>
-<BR><A NAME="ToC_329" HREF="whatever.html">STDDEV</A>
-<BR><A NAME="ToC_330" HREF="whatever.html">SUM</A>
-<BR><A NAME="ToC_331" HREF="whatever.html">VARIANCE</A>
-<BR><A NAME="ToC_332" HREF="whatever.html">Scalar Functions</A>
-<BR><A NAME="ToC_333" HREF="whatever.html">ABS or ABSVAL</A>
-<BR><A NAME="ToC_334" HREF="whatever.html">ACOS</A>
-<BR><A NAME="ToC_335" HREF="whatever.html">ASCII</A>
-<BR><A NAME="ToC_336" HREF="whatever.html">ASIN</A>
-<BR><A NAME="ToC_337" HREF="whatever.html">ATAN</A>
-<BR><A NAME="ToC_338" HREF="whatever.html">ATAN2</A>
-<BR><A NAME="ToC_339" HREF="whatever.html">BIGINT</A>
-<BR><A NAME="ToC_340" HREF="whatever.html">BLOB</A>
-<BR><A NAME="ToC_341" HREF="whatever.html">CEILING or CEIL</A>
-<BR><A NAME="ToC_342" HREF="whatever.html">CHAR</A>
-<BR><A NAME="ToC_343" HREF="whatever.html">CHR</A>
-<BR><A NAME="ToC_344" HREF="whatever.html">CLOB</A>
-<BR><A NAME="ToC_345" HREF="whatever.html">COALESCE</A>
-<BR><A NAME="ToC_346" HREF="whatever.html">CONCAT</A>
-<BR><A NAME="ToC_347" HREF="whatever.html">COS</A>
-<BR><A NAME="ToC_348" HREF="whatever.html">COT</A>
-<BR><A NAME="ToC_349" HREF="whatever.html">DATE</A>
-<BR><A NAME="ToC_350" HREF="whatever.html">DAY</A>
-<BR><A NAME="ToC_351" HREF="whatever.html">DAYNAME</A>
-<BR><A NAME="ToC_352" HREF="whatever.html">DAYOFWEEK</A>
-<BR><A NAME="ToC_353" HREF="whatever.html">DAYOFWEEK_ISO</A>
-<BR><A NAME="ToC_354" HREF="whatever.html">DAYOFYEAR</A>
-<BR><A NAME="ToC_355" HREF="whatever.html">DAYS</A>
-<BR><A NAME="ToC_356" HREF="whatever.html">DBCLOB</A>
-<BR><A NAME="ToC_357" HREF="whatever.html">DECIMAL</A>
-<BR><A NAME="ToC_358" HREF="whatever.html">DEGREES</A>
-<BR><A NAME="ToC_359" HREF="whatever.html">DEREF</A>
-<BR><A NAME="ToC_360" HREF="whatever.html">DIFFERENCE</A>
-<BR><A NAME="ToC_361" HREF="whatever.html">DIGITS</A>
-<BR><A NAME="ToC_362" HREF="whatever.html">DLCOMMENT</A>
-<BR><A NAME="ToC_363" HREF="whatever.html">DLLINKTYPE</A>
-<BR><A NAME="ToC_364" HREF="whatever.html">DLURLCOMPLETE</A>
-<BR><A NAME="ToC_365" HREF="whatever.html">DLURLPATH</A>
-<BR><A NAME="ToC_366" HREF="whatever.html">DLURLPATHONLY</A>
-<BR><A NAME="ToC_367" HREF="whatever.html">DLURLSCHEME</A>
-<BR><A NAME="ToC_368" HREF="whatever.html">DLURLSERVER</A>
-<BR><A NAME="ToC_369" HREF="whatever.html">DLVALUE</A>
-<BR><A NAME="ToC_370" HREF="whatever.html">DOUBLE</A>
-<BR><A NAME="ToC_371" HREF="whatever.html">EVENT_MON_STATE</A>
-<BR><A NAME="ToC_372" HREF="whatever.html">EXP</A>
-<BR><A NAME="ToC_373" HREF="whatever.html">FLOAT</A>
-<BR><A NAME="ToC_374" HREF="whatever.html">FLOOR</A>
-<BR><A NAME="ToC_375" HREF="whatever.html">GENERATE_UNIQUE</A>
-<BR><A NAME="ToC_376" HREF="whatever.html">GRAPHIC</A>
-<BR><A NAME="ToC_377" HREF="whatever.html">HEX</A>
-<BR><A NAME="ToC_378" HREF="whatever.html">HOUR</A>
-<BR><A NAME="ToC_379" HREF="whatever.html">INSERT</A>
-<BR><A NAME="ToC_380" HREF="whatever.html">INTEGER</A>
-<BR><A NAME="ToC_381" HREF="whatever.html">JULIAN_DAY</A>
-<BR><A NAME="ToC_382" HREF="whatever.html">LCASE or LOWER</A>
-<BR><A NAME="ToC_383" HREF="whatever.html">LCASE (SYSFUN schema)</A>
-<BR><A NAME="ToC_384" HREF="whatever.html">LEFT</A>
-<BR><A NAME="ToC_385" HREF="whatever.html">LENGTH</A>
-<BR><A NAME="ToC_386" HREF="whatever.html">LN</A>
-<BR><A NAME="ToC_387" HREF="whatever.html">LOCATE</A>
-<BR><A NAME="ToC_388" HREF="whatever.html">LOG</A>
-<BR><A NAME="ToC_389" HREF="whatever.html">LOG10</A>
-<BR><A NAME="ToC_390" HREF="whatever.html">LONG_VARCHAR</A>
-<BR><A NAME="ToC_391" HREF="whatever.html">LONG_VARGRAPHIC</A>
-<BR><A NAME="ToC_392" HREF="whatever.html">LTRIM</A>
-<BR><A NAME="ToC_393" HREF="whatever.html">LTRIM (SYSFUN schema)</A>
-<BR><A NAME="ToC_394" HREF="whatever.html">MICROSECOND</A>
-<BR><A NAME="ToC_395" HREF="whatever.html">MIDNIGHT_SECONDS</A>
-<BR><A NAME="ToC_396" HREF="whatever.html">MINUTE</A>
-<BR><A NAME="ToC_397" HREF="whatever.html">MOD</A>
-<BR><A NAME="ToC_398" HREF="whatever.html">MONTH</A>
-<BR><A NAME="ToC_399" HREF="whatever.html">MONTHNAME</A>
-<BR><A NAME="ToC_400" HREF="whatever.html">NODENUMBER</A>
-<BR><A NAME="ToC_401" HREF="whatever.html">NULLIF</A>
-<BR><A NAME="ToC_402" HREF="whatever.html">PARTITION</A>
-<BR><A NAME="ToC_403" HREF="whatever.html">POSSTR</A>
-<BR><A NAME="ToC_404" HREF="whatever.html">POWER</A>
-<BR><A NAME="ToC_405" HREF="whatever.html">QUARTER</A>
-<BR><A NAME="ToC_406" HREF="whatever.html">RADIANS</A>
-<BR><A NAME="ToC_407" HREF="whatever.html">RAISE_ERROR</A>
-<BR><A NAME="ToC_408" HREF="whatever.html">RAND</A>
-<BR><A NAME="ToC_409" HREF="whatever.html">REAL</A>
-<BR><A NAME="ToC_410" HREF="whatever.html">REPEAT</A>
-<BR><A NAME="ToC_411" HREF="whatever.html">REPLACE</A>
-<BR><A NAME="ToC_412" HREF="whatever.html">RIGHT</A>
-<BR><A NAME="ToC_413" HREF="whatever.html">ROUND</A>
-<BR><A NAME="ToC_414" HREF="whatever.html">RTRIM</A>
-<BR><A NAME="ToC_415" HREF="whatever.html">RTRIM (SYSFUN schema)</A>
-<BR><A NAME="ToC_416" HREF="whatever.html">SECOND</A>
-<BR><A NAME="ToC_417" HREF="whatever.html">SIGN</A>
-<BR><A NAME="ToC_418" HREF="whatever.html">SIN</A>
-<BR><A NAME="ToC_419" HREF="whatever.html">SMALLINT</A>
-<BR><A NAME="ToC_420" HREF="whatever.html">SOUNDEX</A>
-<BR><A NAME="ToC_421" HREF="whatever.html">SPACE</A>
-<BR><A NAME="ToC_422" HREF="whatever.html">SQRT</A>
-<BR><A NAME="ToC_423" HREF="whatever.html">SUBSTR</A>
-<BR><A NAME="ToC_424" HREF="whatever.html">TABLE_NAME</A>
-<BR><A NAME="ToC_425" HREF="whatever.html">TABLE_SCHEMA</A>
-<BR><A NAME="ToC_426" HREF="whatever.html">TAN</A>
-<BR><A NAME="ToC_427" HREF="whatever.html">TIME</A>
-<BR><A NAME="ToC_428" HREF="whatever.html">TIMESTAMP</A>
-<BR><A NAME="ToC_429" HREF="whatever.html">TIMESTAMP_ISO</A>
-<BR><A NAME="ToC_430" HREF="whatever.html">TIMESTAMPDIFF</A>
-<BR><A NAME="ToC_431" HREF="whatever.html">TRANSLATE</A>
-<BR><A NAME="ToC_432" HREF="whatever.html">TRUNCATE or TRUNC</A>
-<BR><A NAME="ToC_433" HREF="whatever.html">TYPE_ID</A>
-<BR><A NAME="ToC_434" HREF="whatever.html">TYPE_NAME</A>
-<BR><A NAME="ToC_435" HREF="whatever.html">TYPE_SCHEMA</A>
-<BR><A NAME="ToC_436" HREF="whatever.html">UCASE or UPPER</A>
-<BR><A NAME="ToC_437" HREF="whatever.html">VALUE</A>
-<BR><A NAME="ToC_438" HREF="whatever.html">VARCHAR</A>
-<BR><A NAME="ToC_439" HREF="whatever.html">VARGRAPHIC</A>
-<BR><A NAME="ToC_440" HREF="whatever.html">WEEK</A>
-<BR><A NAME="ToC_441" HREF="whatever.html">WEEK_ISO</A>
-<BR><A NAME="ToC_442" HREF="whatever.html">YEAR</A>
-<BR><A NAME="ToC_443" HREF="whatever.html">Table Functions</A>
-<BR><A NAME="ToC_444" HREF="whatever.html">SQLCACHE_SNAPSHOT</A>
-<BR><A NAME="ToC_445" HREF="whatever.html">User-Defined Functions</A>
-<P><B><A NAME="ToC_446" HREF="whatever.html">Queries</A></B><BR>
-<BR><A NAME="ToC_447" HREF="whatever.html">subselect</A>
-<BR><A NAME="ToC_448" HREF="whatever.html">select-clause</A>
-<BR><A NAME="ToC_457" HREF="whatever.html">from-clause</A>
-<BR><A NAME="ToC_458" HREF="whatever.html">table-reference</A>
-<BR><A NAME="ToC_461" HREF="whatever.html">joined-table</A>
-<BR><A NAME="ToC_463" HREF="whatever.html">where-clause</A>
-<BR><A NAME="ToC_464" HREF="whatever.html">group-by-clause</A>
-<BR><A NAME="ToC_468" HREF="whatever.html">having-clause</A>
-<BR><A NAME="ToC_469" HREF="whatever.html">Examples of subselects</A>
-<BR><A NAME="ToC_470" HREF="whatever.html">Examples of Joins</A>
-<BR><A NAME="ToC_471" HREF="whatever.html">Examples of Grouping Sets, Cube, and Rollup</A>
-<BR><A NAME="ToC_472" HREF="whatever.html">fullselect</A>
-<BR><A NAME="ToC_473" HREF="whatever.html">Examples of a fullselect</A>
-<BR><A NAME="ToC_474" HREF="whatever.html">select-statement</A>
-<BR><A NAME="ToC_475" HREF="whatever.html">common-table-expression</A>
-<BR><A NAME="ToC_476" HREF="whatever.html">order-by-clause</A>
-<BR><A NAME="ToC_478" HREF="whatever.html">update-clause</A>
-<BR><A NAME="ToC_479" HREF="whatever.html">read-only-clause</A>
-<BR><A NAME="ToC_480" HREF="whatever.html">fetch-first-clause</A>
-<BR><A NAME="ToC_481" HREF="whatever.html">optimize-for-clause</A>
-<BR><A NAME="ToC_482" HREF="whatever.html">Examples of a select-statement</A>
-<P><B><A NAME="ToC_483" HREF="whatever.html">SQL Statements</A></B><BR>
-<BR><A NAME="ToC_484" HREF="whatever.html">How SQL Statements Are Invoked</A>
-<BR><A NAME="ToC_485" HREF="whatever.html">Embedding a Statement in an Application Program</A>
-<BR><A NAME="ToC_489" HREF="whatever.html">Dynamic Preparation and Execution</A>
-<BR><A NAME="ToC_490" HREF="whatever.html">Static Invocation of a select-statement</A>
-<BR><A NAME="ToC_491" HREF="whatever.html">Dynamic Invocation of a select-statement</A>
-<BR><A NAME="ToC_492" HREF="whatever.html">Interactive Invocation</A>
-<BR><A NAME="ToC_493" HREF="whatever.html">SQL Return Codes</A>
-<BR><A NAME="ToC_494" HREF="whatever.html">SQLCODE</A>
-<BR><A NAME="ToC_495" HREF="whatever.html">SQLSTATE</A>
-<BR><A NAME="ToC_496" HREF="whatever.html">SQL Comments</A>
-<BR><A NAME="ToC_497" HREF="whatever.html">ALTER BUFFERPOOL</A>
-<BR><A NAME="ToC_498" HREF="whatever.html">ALTER NICKNAME</A>
-<BR><A NAME="ToC_499" HREF="whatever.html">ALTER NODEGROUP</A>
-<BR><A NAME="ToC_500" HREF="whatever.html">ALTER SERVER</A>
-<BR><A NAME="ToC_501" HREF="whatever.html">ALTER TABLE</A>
-<BR><A NAME="ToC_504" HREF="whatever.html">ALTER TABLESPACE</A>
-<BR><A NAME="ToC_505" HREF="whatever.html">ALTER TYPE (Structured)</A>
-<BR><A NAME="ToC_507" HREF="whatever.html">ALTER USER MAPPING</A>
-<BR><A NAME="ToC_508" HREF="whatever.html">ALTER VIEW</A>
-<BR><A NAME="ToC_509" HREF="whatever.html">BEGIN DECLARE SECTION</A>
-<BR><A NAME="ToC_511" HREF="whatever.html">CALL</A>
-<BR><A NAME="ToC_513" HREF="whatever.html">CLOSE</A>
-<BR><A NAME="ToC_514" HREF="whatever.html">COMMENT ON</A>
-<BR><A NAME="ToC_515" HREF="whatever.html">COMMIT</A>
-<BR><A NAME="ToC_517" HREF="whatever.html">Compound SQL (Embedded)</A>
-<BR><A NAME="ToC_519" HREF="whatever.html">CONNECT (Type 1)</A>
-<BR><A NAME="ToC_524" HREF="whatever.html">CONNECT (Type 2)</A>
-<BR><A NAME="ToC_525" HREF="whatever.html">CREATE ALIAS</A>
-<BR><A NAME="ToC_526" HREF="whatever.html">CREATE BUFFERPOOL</A>
-<BR><A NAME="ToC_527" HREF="whatever.html">CREATE DISTINCT TYPE</A>
-<BR><A NAME="ToC_528" HREF="whatever.html">CREATE EVENT MONITOR</A>
-<BR><A NAME="ToC_529" HREF="whatever.html">CREATE FUNCTION</A>
-<BR><A NAME="ToC_530" HREF="whatever.html">CREATE FUNCTION (External Scalar)</A>
-<BR><A NAME="ToC_531" HREF="whatever.html">CREATE FUNCTION (External Table)</A>
-<BR><A NAME="ToC_532" HREF="whatever.html">CREATE FUNCTION (OLE DB External Table)</A>
-<BR><A NAME="ToC_533" HREF="whatever.html">CREATE FUNCTION (Source or Template)</A>
-<BR><A NAME="ToC_534" HREF="whatever.html">CREATE FUNCTION (SQL Scalar, Table or Row)</A>
-<BR><A NAME="ToC_535" HREF="whatever.html">CREATE FUNCTION MAPPING</A>
-<BR><A NAME="ToC_537" HREF="whatever.html">CREATE INDEX</A>
-<BR><A NAME="ToC_538" HREF="whatever.html">CREATE INDEX EXTENSION</A>
-<BR><A NAME="ToC_539" HREF="whatever.html">CREATE METHOD</A>
-<BR><A NAME="ToC_540" HREF="whatever.html">CREATE NICKNAME</A>
-<BR><A NAME="ToC_541" HREF="whatever.html">CREATE NODEGROUP</A>
-<BR><A NAME="ToC_542" HREF="whatever.html">CREATE PROCEDURE</A>
-<BR><A NAME="ToC_543" HREF="whatever.html">CREATE SCHEMA</A>
-<BR><A NAME="ToC_544" HREF="whatever.html">CREATE SERVER</A>
-<BR><A NAME="ToC_546" HREF="whatever.html">CREATE TABLE</A>
-<BR><A NAME="ToC_549" HREF="whatever.html">CREATE TABLESPACE</A>
-<BR><A NAME="ToC_550" HREF="whatever.html">CREATE TRANSFORM</A>
-<BR><A NAME="ToC_551" HREF="whatever.html">CREATE TRIGGER</A>
-<BR><A NAME="ToC_552" HREF="whatever.html">CREATE TYPE (Structured)</A>
-<BR><A NAME="ToC_553" HREF="whatever.html">CREATE TYPE MAPPING</A>
-<BR><A NAME="ToC_554" HREF="whatever.html">CREATE USER MAPPING</A>
-<BR><A NAME="ToC_555" HREF="whatever.html">CREATE VIEW</A>
-<BR><A NAME="ToC_557" HREF="whatever.html">CREATE WRAPPER</A>
-<BR><A NAME="ToC_558" HREF="whatever.html">DECLARE CURSOR</A>
-<BR><A NAME="ToC_560" HREF="whatever.html">DECLARE GLOBAL TEMPORARY TABLE</A>
-<BR><A NAME="ToC_561" HREF="whatever.html">DELETE</A>
-<BR><A NAME="ToC_562" HREF="whatever.html">DESCRIBE</A>
-<BR><A NAME="ToC_563" HREF="whatever.html">DISCONNECT</A>
-<BR><A NAME="ToC_564" HREF="whatever.html">DROP</A>
-<BR><A NAME="ToC_566" HREF="whatever.html">END DECLARE SECTION</A>
-<BR><A NAME="ToC_567" HREF="whatever.html">EXECUTE</A>
-<BR><A NAME="ToC_569" HREF="whatever.html">EXECUTE IMMEDIATE</A>
-<BR><A NAME="ToC_570" HREF="whatever.html">EXPLAIN</A>
-<BR><A NAME="ToC_571" HREF="whatever.html">FETCH</A>
-<BR><A NAME="ToC_572" HREF="whatever.html">FLUSH EVENT MONITOR</A>
-<BR><A NAME="ToC_573" HREF="whatever.html">FREE LOCATOR</A>
-<BR><A NAME="ToC_574" HREF="whatever.html">GRANT (Database Authorities)</A>
-<BR><A NAME="ToC_575" HREF="whatever.html">GRANT (Index Privileges)</A>
-<BR><A NAME="ToC_576" HREF="whatever.html">GRANT (Package Privileges)</A>
-<BR><A NAME="ToC_577" HREF="whatever.html">GRANT (Schema Privileges)</A>
-<BR><A NAME="ToC_578" HREF="whatever.html">GRANT (Server Privileges)</A>
-<BR><A NAME="ToC_579" HREF="whatever.html">GRANT (Table, View, or Nickname Privileges)</A>
-<BR><A NAME="ToC_580" HREF="whatever.html">GRANT (Table Space Privileges)</A>
-<BR><A NAME="ToC_581" HREF="whatever.html">INCLUDE</A>
-<BR><A NAME="ToC_582" HREF="whatever.html">INSERT</A>
-<BR><A NAME="ToC_584" HREF="whatever.html">LOCK TABLE</A>
-<BR><A NAME="ToC_585" HREF="whatever.html">OPEN</A>
-<BR><A NAME="ToC_587" HREF="whatever.html">PREPARE</A>
-<BR><A NAME="ToC_589" HREF="whatever.html">REFRESH TABLE</A>
-<BR><A NAME="ToC_590" HREF="whatever.html">RELEASE (Connection)</A>
-<BR><A NAME="ToC_591" HREF="whatever.html">RELEASE SAVEPOINT</A>
-<BR><A NAME="ToC_592" HREF="whatever.html">RENAME TABLE</A>
-<BR><A NAME="ToC_593" HREF="whatever.html">RENAME TABLESPACE</A>
-<BR><A NAME="ToC_594" HREF="whatever.html">REVOKE (Database Authorities)</A>
-<BR><A NAME="ToC_595" HREF="whatever.html">REVOKE (Index Privileges)</A>
-<BR><A NAME="ToC_596" HREF="whatever.html">REVOKE (Package Privileges)</A>
-<BR><A NAME="ToC_597" HREF="whatever.html">REVOKE (Schema Privileges)</A>
-<BR><A NAME="ToC_598" HREF="whatever.html">REVOKE (Server Privileges)</A>
-<BR><A NAME="ToC_599" HREF="whatever.html">REVOKE (Table, View, or Nickname Privileges)</A>
-<BR><A NAME="ToC_600" HREF="whatever.html">REVOKE (Table Space Privileges)</A>
-<BR><A NAME="ToC_601" HREF="whatever.html">ROLLBACK</A>
-<BR><A NAME="ToC_602" HREF="whatever.html">SAVEPOINT</A>
-<BR><A NAME="ToC_603" HREF="whatever.html">SELECT</A>
-<BR><A NAME="ToC_604" HREF="whatever.html">SELECT INTO</A>
-<BR><A NAME="ToC_605" HREF="whatever.html">SET CONNECTION</A>
-<BR><A NAME="ToC_606" HREF="whatever.html">SET CURRENT DEFAULT TRANSFORM GROUP</A>
-<BR><A NAME="ToC_607" HREF="whatever.html">SET CURRENT DEGREE</A>
-<BR><A NAME="ToC_608" HREF="whatever.html">SET CURRENT EXPLAIN MODE</A>
-<BR><A NAME="ToC_609" HREF="whatever.html">SET CURRENT EXPLAIN SNAPSHOT</A>
-<BR><A NAME="ToC_610" HREF="whatever.html">SET CURRENT PACKAGESET</A>
-<BR><A NAME="ToC_611" HREF="whatever.html">SET CURRENT QUERY OPTIMIZATION</A>
-<BR><A NAME="ToC_612" HREF="whatever.html">SET CURRENT REFRESH AGE</A>
-<BR><A NAME="ToC_613" HREF="whatever.html">SET EVENT MONITOR STATE</A>
-<BR><A NAME="ToC_614" HREF="whatever.html">SET INTEGRITY</A>
-<BR><A NAME="ToC_616" HREF="whatever.html">SET PASSTHRU</A>
-<BR><A NAME="ToC_617" HREF="whatever.html">SET PATH</A>
-<BR><A NAME="ToC_618" HREF="whatever.html">SET SCHEMA</A>
-<BR><A NAME="ToC_619" HREF="whatever.html">SET SERVER OPTION</A>
-<BR><A NAME="ToC_620" HREF="whatever.html">SET transition-variable</A>
-<BR><A NAME="ToC_621" HREF="whatever.html">SIGNAL SQLSTATE</A>
-<BR><A NAME="ToC_622" HREF="whatever.html">UPDATE</A>
-<BR><A NAME="ToC_623" HREF="whatever.html">VALUES</A>
-<BR><A NAME="ToC_624" HREF="whatever.html">VALUES INTO</A>
-<BR><A NAME="ToC_625" HREF="whatever.html">WHENEVER</A>
-<P><B><A NAME="ToC_626" HREF="whatever.html">SQL Procedures</A></B><BR>
-<BR><A NAME="ToC_627" HREF="whatever.html">SQL Procedure Statement</A>
-<BR><A NAME="ToC_628" HREF="whatever.html">ALLOCATE CURSOR Statement</A>
-<BR><A NAME="ToC_629" HREF="whatever.html">Assignment Statement</A>
-<BR><A NAME="ToC_630" HREF="whatever.html">ASSOCIATE LOCATORS Statement</A>
-<BR><A NAME="ToC_631" HREF="whatever.html">CASE Statement</A>
-<BR><A NAME="ToC_632" HREF="whatever.html">Compound Statement</A>
-<BR><A NAME="ToC_633" HREF="whatever.html">FOR Statement</A>
-<BR><A NAME="ToC_634" HREF="whatever.html">GET DIAGNOSTICS Statement</A>
-<BR><A NAME="ToC_635" HREF="whatever.html">GOTO Statement</A>
-<BR><A NAME="ToC_636" HREF="whatever.html">IF Statement</A>
-<BR><A NAME="ToC_637" HREF="whatever.html">ITERATE Statement</A>
-<BR><A NAME="ToC_638" HREF="whatever.html">LEAVE Statement</A>
-<BR><A NAME="ToC_639" HREF="whatever.html">LOOP Statement</A>
-<BR><A NAME="ToC_640" HREF="whatever.html">REPEAT Statement</A>
-<BR><A NAME="ToC_641" HREF="whatever.html">RESIGNAL Statement</A>
-<BR><A NAME="ToC_642" HREF="whatever.html">RETURN Statement</A>
-<BR><A NAME="ToC_643" HREF="whatever.html">SIGNAL Statement</A>
-<BR><A NAME="ToC_644" HREF="whatever.html">WHILE Statement</A>
-<P><B><A NAME="ToC_645" HREF="whatever.html">Appendix A. SQL Limits</A></B><BR>
-<P><B><A NAME="ToC_646" HREF="whatever.html">Appendix B. SQL Communications (SQLCA)</A></B><BR>
-<BR><A NAME="ToC_647" HREF="whatever.html">Viewing the SQLCA Interactively</A>
-<BR><A NAME="ToC_648" HREF="whatever.html">SQLCA Field Descriptions</A>
-<BR><A NAME="ToC_649" HREF="whatever.html">Order of Error Reporting</A>
-<BR><A NAME="ToC_650" HREF="whatever.html">DB2 Enterprise - Extended Edition Usage of the SQLCA</A>
-<P><B><A NAME="ToC_651" HREF="whatever.html">Appendix C. SQL Descriptor Area (SQLDA)</A></B><BR>
-<BR><A NAME="ToC_652" HREF="whatever.html">Field Descriptions</A>
-<BR><A NAME="ToC_653" HREF="whatever.html">Fields in the SQLDA Header</A>
-<BR><A NAME="ToC_654" HREF="whatever.html">Fields in an Occurrence of a Base SQLVAR</A>
-<BR><A NAME="ToC_655" HREF="whatever.html">Fields in an Occurrence of a Secondary SQLVAR</A>
-<BR><A NAME="ToC_656" HREF="whatever.html">Effect of DESCRIBE on the SQLDA</A>
-<BR><A NAME="ToC_657" HREF="whatever.html">SQLTYPE and SQLLEN</A>
-<BR><A NAME="ToC_658" HREF="whatever.html">Unrecognized and Unsupported SQLTYPES</A>
-<BR><A NAME="ToC_659" HREF="whatever.html">Packed Decimal Numbers</A>
-<BR><A NAME="ToC_660" HREF="whatever.html">SQLLEN Field for Decimal</A>
-<P><B><A NAME="ToC_661" HREF="whatever.html">Appendix D. Catalog Views</A></B><BR>
-<BR><A NAME="ToC_662" HREF="whatever.html">Updatable Catalog Views</A>
-<BR><A NAME="ToC_663" HREF="whatever.html">'Roadmap' to Catalog Views</A>
-<BR><A NAME="ToC_664" HREF="whatever.html">'Roadmap' to Updatable Catalog Views</A>
-<BR><A NAME="ToC_665" HREF="whatever.html">SYSIBM.SYSDUMMY1</A>
-<BR><A NAME="ToC_666" HREF="whatever.html">SYSCAT.ATTRIBUTES</A>
-<BR><A NAME="ToC_667" HREF="whatever.html">SYSCAT.BUFFERPOOLNODES</A>
-<BR><A NAME="ToC_668" HREF="whatever.html">SYSCAT.BUFFERPOOLS</A>
-<BR><A NAME="ToC_669" HREF="whatever.html">SYSCAT.CASTFUNCTIONS</A>
-<BR><A NAME="ToC_670" HREF="whatever.html">SYSCAT.CHECKS</A>
-<BR><A NAME="ToC_671" HREF="whatever.html">SYSCAT.COLAUTH</A>
-<BR><A NAME="ToC_672" HREF="whatever.html">SYSCAT.COLCHECKS</A>
-<BR><A NAME="ToC_673" HREF="whatever.html">SYSCAT.COLDIST</A>
-<BR><A NAME="ToC_674" HREF="whatever.html">SYSCAT.COLOPTIONS</A>
-<BR><A NAME="ToC_675" HREF="whatever.html">SYSCAT.COLUMNS</A>
-<BR><A NAME="ToC_676" HREF="whatever.html">SYSCAT.CONSTDEP</A>
-<BR><A NAME="ToC_677" HREF="whatever.html">SYSCAT.DATATYPES</A>
-<BR><A NAME="ToC_678" HREF="whatever.html">SYSCAT.DBAUTH</A>
-<BR><A NAME="ToC_679" HREF="whatever.html">SYSCAT.EVENTMONITORS</A>
-<BR><A NAME="ToC_680" HREF="whatever.html">SYSCAT.EVENTS</A>
-<BR><A NAME="ToC_681" HREF="whatever.html">SYSCAT.FULLHIERARCHIES</A>
-<BR><A NAME="ToC_682" HREF="whatever.html">SYSCAT.FUNCDEP</A>
-<BR><A NAME="ToC_683" HREF="whatever.html">SYSCAT.FUNCMAPOPTIONS</A>
-<BR><A NAME="ToC_684" HREF="whatever.html">SYSCAT.FUNCMAPPARMOPTIONS</A>
-<BR><A NAME="ToC_685" HREF="whatever.html">SYSCAT.FUNCMAPPINGS</A>
-<BR><A NAME="ToC_686" HREF="whatever.html">SYSCAT.FUNCPARMS</A>
-<BR><A NAME="ToC_687" HREF="whatever.html">SYSCAT.FUNCTIONS</A>
-<BR><A NAME="ToC_688" HREF="whatever.html">SYSCAT.HIERARCHIES</A>
-<BR><A NAME="ToC_689" HREF="whatever.html">SYSCAT.INDEXAUTH</A>
-<BR><A NAME="ToC_690" HREF="whatever.html">SYSCAT.INDEXCOLUSE</A>
-<BR><A NAME="ToC_691" HREF="whatever.html">SYSCAT.INDEXDEP</A>
-<BR><A NAME="ToC_692" HREF="whatever.html">SYSCAT.INDEXES</A>
-<BR><A NAME="ToC_693" HREF="whatever.html">SYSCAT.INDEXOPTIONS</A>
-<BR><A NAME="ToC_694" HREF="whatever.html">SYSCAT.KEYCOLUSE</A>
-<BR><A NAME="ToC_695" HREF="whatever.html">SYSCAT.NAMEMAPPINGS</A>
-<BR><A NAME="ToC_696" HREF="whatever.html">SYSCAT.NODEGROUPDEF</A>
-<BR><A NAME="ToC_697" HREF="whatever.html">SYSCAT.NODEGROUPS</A>
-<BR><A NAME="ToC_698" HREF="whatever.html">SYSCAT.PACKAGEAUTH</A>
-<BR><A NAME="ToC_699" HREF="whatever.html">SYSCAT.PACKAGEDEP</A>
-<BR><A NAME="ToC_700" HREF="whatever.html">SYSCAT.PACKAGES</A>
-<BR><A NAME="ToC_701" HREF="whatever.html">SYSCAT.PARTITIONMAPS</A>
-<BR><A NAME="ToC_702" HREF="whatever.html">SYSCAT.PASSTHRUAUTH</A>
-<BR><A NAME="ToC_703" HREF="whatever.html">SYSCAT.PROCEDURES</A>
-<BR><A NAME="ToC_704" HREF="whatever.html">SYSCAT.PROCOPTIONS</A>
-<BR><A NAME="ToC_705" HREF="whatever.html">SYSCAT.PROCPARMOPTIONS</A>
-<BR><A NAME="ToC_706" HREF="whatever.html">SYSCAT.PROCPARMS</A>
-<BR><A NAME="ToC_707" HREF="whatever.html">SYSCAT.REFERENCES</A>
-<BR><A NAME="ToC_708" HREF="whatever.html">SYSCAT.REVTYPEMAPPINGS</A>
-<BR><A NAME="ToC_709" HREF="whatever.html">SYSCAT.SCHEMAAUTH</A>
-<BR><A NAME="ToC_710" HREF="whatever.html">SYSCAT.SCHEMATA</A>
-<BR><A NAME="ToC_711" HREF="whatever.html">SYSCAT.SERVEROPTIONS</A>
-<BR><A NAME="ToC_712" HREF="whatever.html">SYSCAT.SERVERS</A>
-<BR><A NAME="ToC_713" HREF="whatever.html">SYSCAT.STATEMENTS</A>
-<BR><A NAME="ToC_714" HREF="whatever.html">SYSCAT.TABAUTH</A>
-<BR><A NAME="ToC_715" HREF="whatever.html">SYSCAT.TABCONST</A>
-<BR><A NAME="ToC_716" HREF="whatever.html">SYSCAT.TABLES</A>
-<BR><A NAME="ToC_717" HREF="whatever.html">SYSCAT.TABLESPACES</A>
-<BR><A NAME="ToC_718" HREF="whatever.html">SYSCAT.TABOPTIONS</A>
-<BR><A NAME="ToC_719" HREF="whatever.html">SYSCAT.TBSPACEAUTH</A>
-<BR><A NAME="ToC_720" HREF="whatever.html">SYSCAT.TRIGDEP</A>
-<BR><A NAME="ToC_721" HREF="whatever.html">SYSCAT.TRIGGERS</A>
-<BR><A NAME="ToC_722" HREF="whatever.html">SYSCAT.TYPEMAPPINGS</A>
-<BR><A NAME="ToC_723" HREF="whatever.html">SYSCAT.USEROPTIONS</A>
-<BR><A NAME="ToC_724" HREF="whatever.html">SYSCAT.VIEWDEP</A>
-<BR><A NAME="ToC_725" HREF="whatever.html">SYSCAT.VIEWS</A>
-<BR><A NAME="ToC_726" HREF="whatever.html">SYSCAT.WRAPOPTIONS</A>
-<BR><A NAME="ToC_727" HREF="whatever.html">SYSCAT.WRAPPERS</A>
-<BR><A NAME="ToC_728" HREF="whatever.html">SYSSTAT.COLDIST</A>
-<BR><A NAME="ToC_729" HREF="whatever.html">SYSSTAT.COLUMNS</A>
-<BR><A NAME="ToC_730" HREF="whatever.html">SYSSTAT.FUNCTIONS</A>
-<BR><A NAME="ToC_731" HREF="whatever.html">SYSSTAT.INDEXES</A>
-<BR><A NAME="ToC_732" HREF="whatever.html">SYSSTAT.TABLES</A>
-<P><B><A NAME="ToC_733" HREF="whatever.html">Appendix E. Catalog Views For Use With Structured Types</A></B><BR>
-<BR><A NAME="ToC_734" HREF="whatever.html">'Roadmap' to Catalog Views</A>
-<BR><A NAME="ToC_735" HREF="whatever.html">OBJCAT.INDEXES</A>
-<BR><A NAME="ToC_736" HREF="whatever.html">OBJCAT.INDEXEXPLOITRULES</A>
-<BR><A NAME="ToC_737" HREF="whatever.html">OBJCAT.INDEXEXTENSIONDEP</A>
-<BR><A NAME="ToC_738" HREF="whatever.html">OBJCAT.INDEXEXTENSIONMETHODS</A>
-<BR><A NAME="ToC_739" HREF="whatever.html">OBJCAT.INDEXEXTENSIONPARMS</A>
-<BR><A NAME="ToC_740" HREF="whatever.html">OBJCAT.INDEXEXTENSIONS</A>
-<BR><A NAME="ToC_741" HREF="whatever.html">OBJCAT.PREDICATESPECS</A>
-<BR><A NAME="ToC_742" HREF="whatever.html">OBJCAT.TRANSFORMS</A>
-<P><B><A NAME="ToC_743" HREF="whatever.html">Appendix F. Federated Systems</A></B><BR>
-<BR><A NAME="ToC_744" HREF="whatever.html">Server Types</A>
-<BR><A NAME="ToC_745" HREF="whatever.html">SQL Options for Federated Systems</A>
-<BR><A NAME="ToC_746" HREF="whatever.html">Column Options</A>
-<BR><A NAME="ToC_747" HREF="whatever.html">Function Mapping Options</A>
-<BR><A NAME="ToC_748" HREF="whatever.html">Server Options</A>
-<BR><A NAME="ToC_749" HREF="whatever.html">User Options</A>
-<BR><A NAME="ToC_750" HREF="whatever.html">Default Data Type Mappings</A>
-<BR><A NAME="ToC_751" HREF="whatever.html">Default Type Mappings between DB2 and DB2 Universal Database for OS/390 (and DB2 for MVS/ESA) Data Sources</A>
-<BR><A NAME="ToC_752" HREF="whatever.html">Default Type Mappings between DB2 and 2 Universal Database for AS/400 (and DB2 for OS/400) Data Sources</A>
-<BR><A NAME="ToC_753" HREF="whatever.html">Default Type Mappings between DB2 and Oracle Data Sources</A>
-<BR><A NAME="ToC_754" HREF="whatever.html">Default Type Mappings between DB2 and DB2 for VM and VSE (and SQL/DS) Data Sources</A>
-<BR><A NAME="ToC_755" HREF="whatever.html">Pass-Through Facility Processing</A>
-<BR><A NAME="ToC_756" HREF="whatever.html">SQL Processing in Pass-Through Sessions</A>
-<BR><A NAME="ToC_757" HREF="whatever.html">Considerations and Restrictions</A>
-<P><B><A NAME="ToC_760" HREF="whatever.html">Appendix G. Sample Database Tables</A></B><BR>
-<BR><A NAME="ToC_761" HREF="whatever.html">The Sample Database</A>
-<BR><A NAME="ToC_762" HREF="whatever.html">To Create the Sample Database</A>
-<BR><A NAME="ToC_763" HREF="whatever.html">To Erase the Sample Database</A>
-<BR><A NAME="ToC_764" HREF="whatever.html">CL_SCHED Table</A>
-<BR><A NAME="ToC_765" HREF="whatever.html">DEPARTMENT Table</A>
-<BR><A NAME="ToC_766" HREF="whatever.html">EMPLOYEE Table</A>
-<BR><A NAME="ToC_767" HREF="whatever.html">EMP_ACT Table</A>
-<BR><A NAME="ToC_768" HREF="whatever.html">EMP_PHOTO Table</A>
-<BR><A NAME="ToC_769" HREF="whatever.html">EMP_RESUME Table</A>
-<BR><A NAME="ToC_770" HREF="whatever.html">IN_TRAY Table</A>
-<BR><A NAME="ToC_771" HREF="whatever.html">ORG Table</A>
-<BR><A NAME="ToC_772" HREF="whatever.html">PROJECT Table</A>
-<BR><A NAME="ToC_773" HREF="whatever.html">SALES Table</A>
-<BR><A NAME="ToC_774" HREF="whatever.html">STAFF Table</A>
-<BR><A NAME="ToC_775" HREF="whatever.html">STAFFG Table</A>
-<BR><A NAME="ToC_776" HREF="whatever.html">Sample Files with BLOB and CLOB Data Type</A>
-<BR><A NAME="ToC_777" HREF="whatever.html">Quintana Photo</A>
-<BR><A NAME="ToC_778" HREF="whatever.html">Quintana Resume</A>
-<BR><A NAME="ToC_779" HREF="whatever.html">Nicholls Photo</A>
-<BR><A NAME="ToC_780" HREF="whatever.html">Nicholls Resume</A>
-<BR><A NAME="ToC_781" HREF="whatever.html">Adamson Photo</A>
-<BR><A NAME="ToC_782" HREF="whatever.html">Adamson Resume</A>
-<BR><A NAME="ToC_783" HREF="whatever.html">Walker Photo</A>
-<BR><A NAME="ToC_784" HREF="whatever.html">Walker Resume</A>
-<P><B><A NAME="ToC_785" HREF="whatever.html">Appendix H. Reserved Schema Names and Reserved Words</A></B><BR>
-<BR><A NAME="ToC_786" HREF="whatever.html">Reserved Schemas</A>
-<BR><A NAME="ToC_787" HREF="whatever.html">Reserved Words</A>
-<BR><A NAME="ToC_788" HREF="whatever.html">IBM SQL Reserved Words</A>
-<BR><A NAME="ToC_789" HREF="whatever.html">ISO/ANS SQL92 Reserved Words</A>
-<P><B><A NAME="ToC_790" HREF="whatever.html">Appendix I. Comparison of Isolation Levels</A></B><BR>
-<P><B><A NAME="ToC_791" HREF="whatever.html">Appendix J. Interaction of Triggers and Constraints</A></B><BR>
-<P><B><A NAME="ToC_792" HREF="whatever.html">Appendix K. Explain Tables and Definitions</A></B><BR>
-<BR><A NAME="ToC_793" HREF="whatever.html">EXPLAIN_ARGUMENT Table</A>
-<BR><A NAME="ToC_794" HREF="whatever.html">EXPLAIN_INSTANCE Table</A>
-<BR><A NAME="ToC_795" HREF="whatever.html">EXPLAIN_OBJECT Table</A>
-<BR><A NAME="ToC_796" HREF="whatever.html">EXPLAIN_OPERATOR Table</A>
-<BR><A NAME="ToC_797" HREF="whatever.html">EXPLAIN_PREDICATE Table</A>
-<BR><A NAME="ToC_798" HREF="whatever.html">EXPLAIN_STATEMENT Table</A>
-<BR><A NAME="ToC_799" HREF="whatever.html">EXPLAIN_STREAM Table</A>
-<BR><A NAME="ToC_800" HREF="whatever.html">ADVISE_INDEX Table</A>
-<BR><A NAME="ToC_801" HREF="whatever.html">ADVISE_WORKLOAD Table</A>
-<BR><A NAME="ToC_802" HREF="whatever.html">Table Definitions for Explain Tables</A>
-<BR><A NAME="ToC_803" HREF="whatever.html">EXPLAIN_ARGUMENT Table Definition</A>
-<BR><A NAME="ToC_804" HREF="whatever.html">EXPLAIN_INSTANCE Table Definition</A>
-<BR><A NAME="ToC_805" HREF="whatever.html">EXPLAIN_OBJECT Table Definition</A>
-<BR><A NAME="ToC_806" HREF="whatever.html">EXPLAIN_OPERATOR Table Definition</A>
-<BR><A NAME="ToC_807" HREF="whatever.html">EXPLAIN_PREDICATE Table Definition</A>
-<BR><A NAME="ToC_808" HREF="whatever.html">EXPLAIN_STATEMENT Table Definition</A>
-<BR><A NAME="ToC_809" HREF="whatever.html">EXPLAIN_STREAM Table Definition</A>
-<BR><A NAME="ToC_810" HREF="whatever.html">ADVISE_INDEX Table Definition</A>
-<BR><A NAME="ToC_811" HREF="whatever.html">ADVISE_WORKLOAD Table Definition</A>
-<P><B><A NAME="ToC_812" HREF="whatever.html">Appendix L. Explain Register Values</A></B><BR>
-<P><B><A NAME="ToC_813" HREF="whatever.html">Appendix M. Recursion Example: Bill of Materials</A></B><BR>
-<BR><A NAME="ToC_814" HREF="whatever.html">Example 1: Single Level Explosion</A>
-<BR><A NAME="ToC_815" HREF="whatever.html">Example 2: Summarized Explosion</A>
-<BR><A NAME="ToC_816" HREF="whatever.html">Example 3: Controlling Depth</A>
-<P><B><A NAME="ToC_817" HREF="whatever.html">Appendix N. Exception Tables</A></B><BR>
-<BR><A NAME="ToC_818" HREF="whatever.html">Rules for Creating an Exception Table</A>
-<BR><A NAME="ToC_819" HREF="whatever.html">Handling Rows in the Exception Tables</A>
-<BR><A NAME="ToC_820" HREF="whatever.html">Querying the Exception Tables</A>
-<P><B><A NAME="ToC_821" HREF="whatever.html">Appendix O. Japanese and Traditional-Chinese EUC Considerations</A></B><BR>
-<BR><A NAME="ToC_822" HREF="whatever.html">Language Elements</A>
-<BR><A NAME="ToC_823" HREF="whatever.html">Characters</A>
-<BR><A NAME="ToC_824" HREF="whatever.html">Tokens</A>
-<BR><A NAME="ToC_825" HREF="whatever.html">Identifiers</A>
-<BR><A NAME="ToC_827" HREF="whatever.html">Data Types</A>
-<BR><A NAME="ToC_830" HREF="whatever.html">Assignments and Comparisons</A>
-<BR><A NAME="ToC_833" HREF="whatever.html">Rules for Result Data Types</A>
-<BR><A NAME="ToC_834" HREF="whatever.html">Rules for String Conversions</A>
-<BR><A NAME="ToC_835" HREF="whatever.html">Constants</A>
-<BR><A NAME="ToC_837" HREF="whatever.html">Functions</A>
-<BR><A NAME="ToC_838" HREF="whatever.html">Expressions</A>
-<BR><A NAME="ToC_840" HREF="whatever.html">Predicates</A>
-<BR><A NAME="ToC_842" HREF="whatever.html">Functions</A>
-<BR><A NAME="ToC_843" HREF="whatever.html">LENGTH</A>
-<BR><A NAME="ToC_844" HREF="whatever.html">SUBSTR</A>
-<BR><A NAME="ToC_845" HREF="whatever.html">TRANSLATE</A>
-<BR><A NAME="ToC_846" HREF="whatever.html">VARGRAPHIC</A>
-<BR><A NAME="ToC_847" HREF="whatever.html">Statements</A>
-<BR><A NAME="ToC_848" HREF="whatever.html">CONNECT</A>
-<BR><A NAME="ToC_849" HREF="whatever.html">PREPARE</A>
-<P><B><A NAME="ToC_850" HREF="whatever.html">Appendix P. BNF Specifications for DATALINKs</A></B><BR>
-<P><B><A NAME="ToC_851" HREF="whatever.html">Appendix Q. Using the DB2 Library</A></B><BR>
-<BR><A NAME="ToC_852" HREF="whatever.html">DB2 PDF Files and Printed Books</A>
-<BR><A NAME="ToC_853" HREF="whatever.html">DB2 Information</A>
-<BR><A NAME="ToC_854" HREF="whatever.html">Printing the PDF Books</A>
-<BR><A NAME="ToC_855" HREF="whatever.html">Ordering the Printed Books</A>
-<BR><A NAME="ToC_856" HREF="whatever.html">DB2 Online Documentation</A>
-<BR><A NAME="ToC_857" HREF="whatever.html">Accessing Online Help</A>
-<BR><A NAME="ToC_858" HREF="whatever.html">Viewing Information Online</A>
-<BR><A NAME="ToC_861" HREF="whatever.html">Using DB2 Wizards</A>
-<BR><A NAME="ToC_862" HREF="whatever.html">Setting Up a Document Server</A>
-<BR><A NAME="ToC_863" HREF="whatever.html">Searching Information Online</A>
-<P><B><A NAME="ToC_864" HREF="whatever.html">Appendix R. Notices</A></B><BR>
-<BR><A NAME="ToC_865" HREF="whatever.html">Trademarks</A>
-<P><B><A NAME="ToC_866" HREF="whatever.html">Index</A></B><BR>
-<P><B><A NAME="ToC_867" HREF="whatever.html">Contacting IBM</A></B><BR>
-<BR><A NAME="ToC_868" HREF="whatever.html">Product Information</A>
- 
-<A NAME="Bot_Of_Page"></A>
-
-          </tr>
-          <td>x</td>
-          <td>x</td>
-          </tr>
-        </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug113235-2.html b/layout/html/tests/table/bugs/bug113235-2.html
deleted file mode 100644
index 18214140cf1d..000000000000
--- a/layout/html/tests/table/bugs/bug113235-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<body>
- <font face="Arial, sans-serif" size="-1">
-  <table>
-   <tr>
-   <!-- add <td> and </td> inside the <tr> and nsCSSFrameConstructor::ReframeContainingBlock is
-        not called. As the amount of tags inside here increases, the calls really slow things down -->
-            This text node only exists once in the original document!
-            If it were a large collection of inlines, the page would 
-            hang forever.
-
-<A NAME="Top_Of_Page"></A>
-<H2><A NAME="ToC">Table of Contents</A></H2>
-  </tr>
-</table>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug113235-3.html b/layout/html/tests/table/bugs/bug113235-3.html
deleted file mode 100644
index 8f825f5b7ac2..000000000000
--- a/layout/html/tests/table/bugs/bug113235-3.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HEAD>
-<SCRIPT>
-function doIt() {
-  var font = document.getElementById("font1");
-  var anchor = document.getElementById("anchor1a");
-  var text = document.createTextNode("same line as X ");
-  font.insertBefore(text, anchor);
-
-  font = document.getElementById("font2");
-  var table = document.getElementById("table2");
-  text = document.createTextNode(" same line as X");
-  font.insertBefore(text, table);
-
-  font = document.getElementById("font3");
-  anchor = document.getElementById("anchor3b");
-  text = document.createTextNode("same line as Z ");
-  font.insertBefore(text, anchor);
-
-  font = document.getElementById("font4");
-  table = document.getElementById("table4");
-  text = document.createTextNode("line before table");
-  font.insertBefore(text, table);
-
-  font = document.getElementById("font5");
-  anchor = document.getElementById("anchor5b");
-  text = document.createTextNode("line after table ");
-  font.insertBefore(text, anchor);
-
-  font = document.getElementById("font6");
-  table = document.getElementById("table6");
-  text = document.createTextNode("line before table");
-  font.insertBefore(text, table);
-
-  font = document.getElementById("font7");
-  anchor = document.getElementById("anchor7a");
-  var div = document.createElement("DIV", null);
-  text = document.createTextNode("div before X");
-  div.appendChild(text);
-  font.insertBefore(div, anchor);
-
-  font = document.getElementById("font8");
-  table = document.getElementById("table8");
-  div = document.createElement("DIV", null);
-  text = document.createTextNode("div before table");
-  div.appendChild(text);
-  font.insertBefore(div, table);
-
-  font = document.getElementById("font9");
-  anchor = document.getElementById("anchor9b");
-  div = document.createElement("DIV", null);
-  text = document.createTextNode("div after table");
-  div.appendChild(text);
-  font.insertBefore(div, anchor);
-
-  font = document.getElementById("font10");
-  table = document.getElementById("table10");
-  div = document.createElement("DIV", null);
-  text = document.createTextNode("div before table");
-  div.appendChild(text);
-  font.insertBefore(div, table);
-
-  font = document.getElementById("font11");
-  anchor = document.getElementById("anchor11b");
-  div = document.createElement("DIV", null);
-  text = document.createTextNode("div after table");
-  div.appendChild(text);
-  font.insertBefore(div, anchor);
-
-  font = document.getElementById("font12");
-  table = document.getElementById("table12");
-  div = document.createElement("DIV", null);
-  text = document.createTextNode("div before table");
-  div.appendChild(text);
-  font.insertBefore(div, table);
-
-}
-</SCRIPT>  
-</HEAD>
-
-<BODY onload="doIt()">
-
-<font id=font1><a id=anchor1a>X</a><table id=table1 border><tr><td>table-1</td></tr></table><a id=anchor1b>Z</a><font>
-<HR>
-<font id=font2><a id=anchor2a>X</a><table id=table2 border><tr><td>table-2</td></tr></table><a id=anchor2b>Z</a><font>
-<HR>
-<font id=font3><a id=anchor3a>X</a><table id=table3 border><tr><td>table-3</td></tr></table><a id=anchor3b>Z</a><font>
-<HR>
-<font id=font4><table id=table4 border><tr><td>table-4</td></tr></table><a id=anchor4b>Z</a><font>
-<HR>
-<font id=font5><table id=table5 border><tr><td>table-5</td></tr></table><a id=anchor5b>Z</a><font>
-<HR>
-<font id=font6><table id=table6 border><tr><td>table-6</td></tr></table><font>
-
-<HR>
-<font id=font7><a id=anchor7a>X</a><table id=table7 border><tr><td>table-7</td></tr></table><a id=anchor7b>Z</a><font>
-<HR>
-<font id=font8><a id=anchor8a>X</a><table id=table8 border><tr><td>table-8</td></tr></table><a id=anchor8b>Z</a><font>
-<HR>
-<font id=font9><a id=anchor9a>X</a><table id=table9 border><tr><td>table-9</td></tr></table><a id=anchor9b>Z</a><font>
-<HR>
-<font id=font10><table id=table10 border><tr><td>table-10</td></tr></table><a id=anchor10b>Z</a><font>
-<HR>
-<font id=font11><table id=table11 border><tr><td>table-11</td></tr></table><a id=anchor11b>Z</a><font>
-<HR>
-<font id=font12><table id=table12 border><tr><td>table-12</td></tr></table><font>
diff --git a/layout/html/tests/table/bugs/bug11331.html b/layout/html/tests/table/bugs/bug11331.html
deleted file mode 100644
index d49caf0b56a8..000000000000
--- a/layout/html/tests/table/bugs/bug11331.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head><title>Testcase for bug 11331</title></head>
-<body>
-<P>In the yellow table the "W" is clipped on its left edge.<BR>
-The only difference is that:<BR>
-  yellow table has CELLPADDING="0"<BR>
-  grey table has CELLPADDING="1".
-
-<TABLE WIDTH="40" CELLPADDING="0" BGCOLOR="yellow">
-  <TR>
-    <TD><FONT FACE="MS Sans Serif, Geneva, sans-serif" SIZE="-2">Online Web-Store</TD>
-  </TR>
-</TABLE>
-
-<TABLE WIDTH="40" CELLPADDING="1" BGCOLOR="#EEEEEE">
-  <TR>
-    <TD><FONT FACE="MS Sans Serif, Geneva, sans-serif" SIZE="-2">Online Web-Store</TD>
-  </TR>
-</TABLE>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug113424.html b/layout/html/tests/table/bugs/bug113424.html
deleted file mode 100644
index f1932d9f7e23..000000000000
--- a/layout/html/tests/table/bugs/bug113424.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<table width="600" cellspacing="0" cellpadding="0" border="0">
- <tr>
-  <td width="100%" align="center" valign="top">
-   <br><br><br><script></script>
-   <table width="600" cellpadding="0" cellspacing="0" border="1" height=100%>
-    <tr>
-         <td width=50% align=left valign=top>
-          <table cellpadding="3" cellspacing="1" border=0 width=100% height=100%>
-       <tr bgcolor="#cd9944">
-        <td><font face="geneva,arial" size="1" color="white">Funktion</font></td>
-       </tr>
-           <tr bgcolor=#e7e7ad>
-        <td><font face="geneva,arial" size="1" color="00000">Umlaufrendite</font></td>
-       </tr>
-           <tr bgcolor=#e7dea5>
-        <td><font face="geneva,arial" size="1" color="00000">10&nbsp;Jahre&nbsp;US&nbsp;%</font></td>
-        <td><font face="geneva,arial" size="1" color="00000">  4,75</td>                        
-        <td align="center"><img src="../images/pfeil2.gif" height="11" width="11"></td>
-        <td><font face="geneva,arial" size="1" color="#000000"> -0.02</font></td>
-        <td><font face="geneva,arial" size="1" color="00000">03.12.</font></td>
-        <td align="center"><font face="geneva,arial" size="1"><a href="/hypo/charts/chart.html?symm=Y_10YUS.TGT&lang=de&hist=6"><img src="../images/iconchart.gif" border=0></a></font></td>
-       </tr>
-          </table>
-     </td>
-         <td width=50% align=right valign=top>
-          <table border=0 cellpadding="3" cellspacing="1" width=100% height=100%>
-       <tr bgcolor="#cd9944">
-        <td><font face="geneva,arial" size="1" color="white">Rohstoffe</font></td>
-       </tr>
-           <tr bgcolor=#e7e7ad>
-        <td align="center"><img src="../images/pfeil1.gif" height="11" width="11"></td>
-        <td align="center"><font face="geneva,arial" size="1"><a href="/hypo/charts/chart.html?symm=GCG2.CMX&lang=de&hist=6"><img src="../images/iconchart.gif" border=0></a></font></td>
-       </tr>
-           <tr bgcolor=#e7dea5>
-        <td align="center"><img src="../images/pfeil2.gif" height="11" width="11"></td>
-        <td align="center"><font face="geneva,arial" size="1"><a href="/hypo/charts/chart.html?symm=CLG2.NYM&lang=de&hist=6"><img src="../images/iconchart.gif" border=0></a></font></td>
-       </tr>
-          </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table></body></html>
diff --git a/layout/html/tests/table/bugs/bug11384q.html b/layout/html/tests/table/bugs/bug11384q.html
deleted file mode 100644
index e10a2f821a44..000000000000
--- a/layout/html/tests/table/bugs/bug11384q.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-
-<HEAD>
-<TITLE>text-align: center</TITLE>
-</HEAD>
-
-<BODY style="text-align: center">
-
-<H1>&lt;BODY style=&quot;text-align: center&quot;&gt;</H1>
-
-<TABLE width=80% border=1>
-  <TR>
-    <TD>The table should be center-aligned not the text</TD>
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug11384s.html b/layout/html/tests/table/bugs/bug11384s.html
deleted file mode 100644
index 78675f72883a..000000000000
--- a/layout/html/tests/table/bugs/bug11384s.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML>
-
-<HEAD>
-<TITLE>text-align: center</TITLE>
-</HEAD>
-
-<BODY style="text-align: center">
-
-<H1>&lt;BODY style=&quot;text-align: center&quot;&gt;</H1>
-
-<TABLE width=80% border=1>
-  <TR>
-    <TD>The text should be center-aligned not the table</TD>
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug1163-1.html b/layout/html/tests/table/bugs/bug1163-1.html
deleted file mode 100644
index 4bc07a709884..000000000000
--- a/layout/html/tests/table/bugs/bug1163-1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<body>
-&nbsp;
-<table border="3" BORDERCOLOR="#RRGGBB">
-<caption>Testing BORDERCOLOR tag the border shood be blue.</caption>
-
-<tr>
-<td>mike</td>
-
-<td>was</td>
-
-<td>here</td>
-
-<td>mike</td>
-
-<td>was</td>
-
-<td>here</td>
-</tr>
-
-<tr>
-<td>mike</td>
-
-<td>was</td>
-
-<td>here</td>
-
-<td>mike</td>
-
-<td>was</td>
-
-<td>here</td>
-</tr>
-</table>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug1164.html b/layout/html/tests/table/bugs/bug1164.html
deleted file mode 100644
index 0bc40db71c50..000000000000
--- a/layout/html/tests/table/bugs/bug1164.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<head>
-<!-- testcase: table_abs.htm --> 
-<!-- Author: Michael Cobbley, Date: 10/19/98 --> 
-<!-- ***** 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 table tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
- 
-<!-- Purpose: HTML 3.2 and HTML 4.0 To test the alignment of objects. --> 
-<!-- Expected result: The ABS middle tag should center the nested table in the 
-middle of cell one.  This tag will not work in IE 4--> 
-
-   <meta name="Author" content="Mike Cobbley">
-   <meta name="GENERATOR" content="Mozilla/4.5 [en]C-NSCP  (WinNT; I) 
-[Netscape]">
-</head>
-<body>
-&nbsp;
-<table BORDER COLS=2 WIDTH="50%" >
-<tr>
-<td><table ALIGN="ABSMIDDLE" BORDER COLS=2 WIDTH="5%" >
-<tr>
-<td>hello</td>
-
-<td>hello</td>
-</tr>
-
-<tr>
-<td>hello</td>
-
-<td>hello</td>
-</tr>
-</table></td>
-
-<td>hello</td>
-</tr>
-
-<tr>
-<td>hello</td>
-
-<td>hello</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1188.html b/layout/html/tests/table/bugs/bug1188.html
deleted file mode 100644
index 473d19510429..000000000000
--- a/layout/html/tests/table/bugs/bug1188.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<form>
-<hr align=left width=600>
-<TABLE WIDTH=600>
-<TR>
-        <TD COLSPAN=3 ALIGN=CENTER>
-                <IMG 
-SRC="../images/ns_netcenter_bar_new.gif" WIDTH=579 
-HEIGHT=42 BORDER=0 ALT=Netcenter>
-        </TD>
-</TR>
-<TR>
-        <TD COLSPAN=3 ALIGN=CENTER HEIGHT=55 BGCOLOR="#99cccc">
-                <FONT FACE=Arial SIZE=-1><B>Search the Web with</B></FONT> 
-                <SELECT NAME=cp>
-                <OPTION VALUE="Netscape">Netscape
-                </SELECT><INPUT SIZE=30 NAME=searchstring> <INPUT TYPE=submit 
-VALUE=Search><BR>
-                <small><A 
-HREF="http://info.netscape.com/fwd/hom10scla/http://exciteclassifieds.netscape.c
-om/cgi-cls/display.exe?partner=netcenter&path=class&template=none&">Classifieds<
-/A> &nbsp; <A HREF="/escapes/search/netsearchv0.html?cp=hom10snet">Net 
-Search</A> &nbsp; <A HREF="/directory/index.html?cp=hom10sdir">Find Web 
-Sites</A> 
-                &nbsp; <A HREF="/netcenter/cool.html?cp=hom10scul">What's 
-Cool</A> &nbsp; <A HREF="/netcenter/new.html?cp=hom10snew">What's New</A> &nbsp; 
-<A HREF="/netcenter/whitepages.html?cp=hom10swhp">People Finder</A> &nbsp; <A 
-HREF="/netcenter/yellowpages.html?cp=hom10sylp">Yellow Pages</A>
-                </small>
-        </TD>
-</TR>
-<TR>
-        <TD ALIGN=CENTER WIDTH=135><A 
-HREF="/computing/download/index.html?cp=hom10prt1"><FONT SIZE=2 FACE=Arial 
-COLOR="#CC0033">Download Netscape Communicator 4.5</FONT></A><!-- Kipp, this is 
-the spot --></TD><TD ALIGN=CENTER WIDTH=230>
-        <A 
-HREF="/event.ng/Type=click&RunID=6029&ProfileID=857&AdID=5212&GroupID=335&Family
-ID=1&TagValues=888.895.909&Redirect=http:%2F%2Fwww.consumerinfo.com%2Fn-cgi%2Fin
-dex.pl%3F00620001"><!-- MID-T11 --><IMG 
-SRC="../images/raptor.jpg" ALT="[Click Here]" WIDTH=230 
-HEIGHT=33 BORDER=1><BR><FONT SIZE=1>Click Here!</FONT></A><!-- END-T11 --><BR>
-        </TD><TD ALIGN=CENTER WIDTH=135><A 
-HREF="/download/su1.html?cp=hom10prt2"><FONT SIZE=2 FACE=Arial 
-COLOR="#0066FF">Hassle-Free Upgrades</FONT></A>
-        </TD>
-</TR>
-<TR>
-        <TD COLSPAN=3 ALIGN=CENTER>
-                <A 
-HREF="http://info.netscape.com/fwd/hom10ycon/http://contact.netscape.com/contact
-/"><FONT SIZE=2 COLOR="#0066FF" 
-FACE=Arial><B>Contact</B></A></FONT>&nbsp;:&nbsp;<small><A 
-HREF="http://info.netscape.com/fwd/hom10yadb/http://contact.netscape.com/contact
-/">Address Book</A> - <A 
-HREF="http://form.netscape.com/directory/cgi-bin/community.cgi?cp=hom10ydis&SRC=
-PROCOM">Discussions</A> - <A 
-HREF=http://info.netscape.com/fwd/hom10yaim/http://www.newaol.com/aim/netscape/a
-db00.html>Instant Messenger</A> - <A 
-HREF="/qwest/long_distance/index.html?cp=hom10yqst">Long Distance</A> - <A 
-HREF="http://info.netscape.com/fwd/hom10ymem/http://form.netscape.com/members/in
-dex.html">Members</A> - <A 
-HREF=http://info.netscape.com/fwd/hom10ymal/http://webmail.netscape.com>WebMail<
-/A></small>
-        </TD>
-</TR>
-<TR><TD COLSPAN=4 BGCOLOR="#99cccc">
-<table BORDER=0 cellspacing=0 cellpadding=0><tr><td height=1></td></tr>
-</table>
-</TD></TR> 
-</TABLE>
-</form>
diff --git a/layout/html/tests/table/bugs/bug11944.html b/layout/html/tests/table/bugs/bug11944.html
deleted file mode 100644
index 710bb09489aa..000000000000
--- a/layout/html/tests/table/bugs/bug11944.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0>
-  <table border=20 cellspacing=10 height=150>
-                <tr>
-                        <td>cell content</td>
-    </tr>
-  </table>
-
-        <p>The following two tables demostrates the bug with TD and TABLE both having height specified.</p>
-
-  <table border=20 cellspacing=10 height=210>
-                <tr>
-                        <td height=150>height=210 (150+2*10+2*20)</td>
-    </tr>
-  </table>
-
-  <table border=20 cellspacing=10 height=211>
-                <tr>
-                        <td height=150>height=211 (150+2*10+2*20+1)</td>
-    </tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug11945.html b/layout/html/tests/table/bugs/bug11945.html
deleted file mode 100644
index 12a191e256af..000000000000
--- a/layout/html/tests/table/bugs/bug11945.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0>
-  <table border=10 cellspacing=10>
-                <tr>
-                        <td rowspan=2>cell1</td>
-                        <td>cell2</td>
-    </tr>
-                <tr>
-                </tr>
-  </table>
-
-        <p>See the behaviour when there is one more row:</p>
-
-  <table border=10 cellspacing=10>
-                <tr>
-                        <td rowspan=2>cell1</td>
-                        <td>cell2</td>
-    </tr>
-                <tr>
-                </tr>
-                <tr>
-                        <td>cell3</td><td>cell4</td>
-                </tr>
-  </table>
-
-        <p>Now move the rowspan to cell2 to have even more fun:</p>
-
-        <table border=10 cellspacing=10>
-                <tr>
-                        <td>cell1</td>
-                        <td rowspan=2>cell2</td>
-    </tr>
-                <tr>
-                </tr>
-                <tr>
-                        <td>cell3</td><td>cell4</td>
-                </tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug119786.html b/layout/html/tests/table/bugs/bug119786.html
deleted file mode 100644
index 10738fc03b25..000000000000
--- a/layout/html/tests/table/bugs/bug119786.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html><head>
-
-<title>table creation</title><style type="text/css">
-caption { color: green; background-color: lightyellow; }
-</style>
-<script type="text/javascript">
-function createTable (caption) {
-  var table = document.createElement('table');
-  table.border = 1;
-  document.body.appendChild(table);
-  if (caption) {
-    table.createCaption();
-    table.caption.appendChild(document.createTextNode(caption));
-  }
-  table.createTHead();
-  var row = table.tHead.insertRow(table.tHead.rows.length);
-  row.insertCell(0).appendChild(document.createTextNode('Header'));
-
-  table.appendChild(document.createElement('tbody'));
-  row = table.tBodies[0].insertRow(table.tBodies[0].rows.length);
-  row.insertCell(0).appendChild(document.createTextNode('Kibology'));
-}
-function createTable1 (caption) {
-  var table = document.createElement('table');
-  table.border = 1;
-  if (caption) {
-    table.createCaption();
-    table.caption.appendChild(document.createTextNode(caption));
-  }
-  table.createTHead();
-  var row = table.tHead.insertRow(table.tHead.rows.length);
-  row.insertCell(0).appendChild(document.createTextNode('Header'));
-
-  table.appendChild(document.createElement('tbody'));
-  row = table.tBodies[0].insertRow(table.tBodies[0].rows.length);
-  row.insertCell(0).appendChild(document.createTextNode('Kibology'));
-  document.body.appendChild(table);
-
-}</script></head>
-<body>
-<script type="text/javascript">
-createTable('Where is the table?');
-document.body.appendChild(document.createElement('hr'));
-createTable();
-document.body.appendChild(document.createElement('hr'));
-createTable1('Here is the table');
-</script><table border="1"><thead><tr><td>Header</td></tr></thead><caption>Where is the table?</caption><tbody><tr><td>Kibology</td></tr></tbody></table><hr><table border="1"><thead><tr><td>Header</td></tr></thead><tbody><tr><td>Kibology</td></tr></tbody></table><hr><table border="1"><thead><tr><td>Header</td></tr></thead><caption>Here is the table</caption><tbody><tr><td>Kibology</td></tr></tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug12008.html b/layout/html/tests/table/bugs/bug12008.html
deleted file mode 100644
index acfd326a6b62..000000000000
--- a/layout/html/tests/table/bugs/bug12008.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<style>
-body
-{
-        background-color: white; 
-}
-td.gurk
-{
-        background: url("../images/rock_gra.gif") top left repeat-x fixed;
-}
-</style>
-<body>
-<table border width="100%" height="100%">
-<tr><td>Hurz</td><td class="gurk">very long text that forces the browser window 
-to be scrolled</td></tr>
-</body>
diff --git a/layout/html/tests/table/bugs/bug120107.html b/layout/html/tests/table/bugs/bug120107.html
deleted file mode 100644
index c2c8c0c96593..000000000000
--- a/layout/html/tests/table/bugs/bug120107.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><head>
-  <title>Untitled</title>
- </head><body><table style="width: 360px;">
-   <tbody>
-    <tr>
-     <td style="border: 1px solid black;"><table style="border: 1px solid black;">
-       <tbody>
-        <tr>
-         <td><table style="float: left;">
-           <tbody>
-            <tr style="background-color: orange;">
-             <td><img src="../images/bug120107.cgi?id=67311&action=view"></td>
-            </tr>
-           </tbody>
-          </table></td>
-        </tr>
-       </tbody>
-      </table></td>
-    </tr>    
-   </tbody>
-  </table></body></html>
diff --git a/layout/html/tests/table/bugs/bug12012.css b/layout/html/tests/table/bugs/bug12012.css
deleted file mode 100644
index 12bdbb50a125..000000000000
--- a/layout/html/tests/table/bugs/bug12012.css
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-/*
- * WINDOWS
- */
-
-window {
-	background: #FF9; /* pale yellow */
-	color: black;
-	}
-
-/* only does anything for calendar */
-table { width: 100%; }
-
-box#tabs { padding: 1px; }
-/*  crash in 
-#0  0x40b20926 in nsSelectControlFrame::SetProperty ()
-#1  0x40ade441 in nsHTMLSelectElement::SetSelectedIndex ()
-#2  0x403d30cf in NS_NewScriptHTMLScriptElement ()
-#3  0x40446433 in js_SetProperty ()
-box#main { overflow: scroll; }
-
-box#main { overflow: auto; }
-*/
-
-/* XXX Interesting... */
-/* window { overflow: scroll; } */
-
-window[debug] { background: yellow; }
-window[debug] box { background: red; }
-window[debug] div { background: green; }
-
-/* XXX: Bug: Problems - increases height; should center the table  - happens
-if any margin is auto */
-table {
-	/* margin: 0 auto; */
-	}
-
-td, th {
-	line-height: 1;
-	padding: 0;
-	}
-
-/* XXX Doesn't work: */
-box#outer { overflow: scroll; }
-
-/*
- * BUTTONS AND TABS: Used in schedule and pick windows.
- */
-
-/*
-#ApptTable { overflow: scroll; }
-*/
-
-button, td[class~="button"], td[class~="tab"] {
-	text-align: center;
-	vertical-align: middle;
-	cursor: pointer;
-	border: 1px outset #FF9;
-	padding: 1px;
-	color: black;
-	background: #FF9;
-	}
-
-td[class~="button"]:active, td[class~="tab"]:active {
-	border-style: inset;
-	padding: 2px 0px 0px 2px;
-	background: #fc3;
-	}
-
-td[class~="tab"][class~="disable"] {
-	color: #888;
-	}
-
-td[class~="tab"][class~="disable"]:active {
-	/* back to default */
-	background: #FF9;
-	}
-
-td[id="DateOutput"], td[id="MonthOutput"] {
-	vertical-align: middle;
-	text-align: center;
-	font-weight: bold;
-	}
-
-/*
- * SCHEDULE LIST
- */
-
-/* XXX XUL Bug?? tr[id] without the tbody matches the row in the thead too */
-table[class~="data"] tbody[id="ApptTable"] tr {
-	cursor: pointer;
-	}
-
-/* Problem with bug 5693
-table[class~="data"] tbody#ApptTable tr:hover {
-	background: #ff0;
-	text-decoration: underline; /* really a nonstandard use */
-	}
-*/
-
-table[class~="data"] th, table[class~="data"] td {
-	text-align: left;
-	vertical-align: baseline;
-	}
-
-/*
- * EVENT ADDER
- */
-
-table#add th {
-	text-align: right;
-	font-weight: bold;
-	}
-
-table#add th:after {
-	content: ":";
-	}
-
-/*
- * DATE PICKER
- */
-
-/* the numbers in the calendar, including those below */
-
-td[class~="caldate"] {
-	cursor: pointer;
-	text-align: center;
-	border: 1px solid transparent;
-	}
-
-/* the number in the calendar for the date now being shown (overrides above) */
-
-td[class~="caldate"][class~="nowshowing"] {
-	background: #f90;
-	color: black;
-	}
-
-/* the number in the calendar for today's date (overrides above) */
-
-td[class~="caldate"][class~="today"] {
-	border: 1px solid black;
-	/* font-weight: bold; */
-	}
diff --git a/layout/html/tests/table/bugs/bug12012.js b/layout/html/tests/table/bugs/bug12012.js
deleted file mode 100644
index d3fa9eda8715..000000000000
--- a/layout/html/tests/table/bugs/bug12012.js
+++ /dev/null
@@ -1,948 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-// FOR TESTING XXX
-
-function StartCodeTime ( ) {
-	CodeTimeInitial = new Date();
-	}
-
-function EndCodeTime ( str ) {
-	var CodeTimeFinal = new Date();
-	var diff = CodeTimeFinal.getTime() - CodeTimeInitial.getTime();
-	dump("Timing " + str + " took " + diff + " milliseconds.\n");
-	}
-
-// ************************************************************
-// Initialize stuff
-// ************************************************************
-
-haveRead = false;
-currentTime = new Date(); // a new Date object with the current time
-monthShowing = new Date();
-nowShowing = new Date();
-
-month_names_internal = new Array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
-
-
-// the namespace of the RDF literals
-rdf_ns="http://when.com/1999/07/03-appts-rdf#";
-
-// find the location of the appointments data - relative URLs don't work (now, anyway)
-
-// the filename within the directory of the XUL document
-var RDFRelFileName = 'bug12012.rdf';
-
-dump("Getting window.location.href...\n");
-// to get the directory, start with the filename of the XUL document
-var baseURL = window.location.href;
-dump("...done.\n");
-
-// XXX Needs three slashes because of file:// URL parsing bug (see Bug 9236)
-//if ((baseURL.indexOf("file:/") != -1) && (baseURL.indexOf("file:///") == -1)) {
-	//baseURL = "file:///" + baseURL.substring(6);
-//}
-if (baseURL.indexOf("file:") == 0) {
-	baseURL = baseURL.substring(5);
-	while (baseURL.charAt(0) == '/') {
-		baseURL = baseURL.substring(1);
-	}
-	baseURL = "file:///" + baseURL;
-}
-
-// and take off whatever is after the last "/"
-baseURL = baseURL.substring(0, baseURL.lastIndexOf("/") + 1);
-
-// combine these to get the filename for the RDF
-RDFFileName = baseURL + RDFRelFileName;
-appts_resourcename = RDFFileName + "#WhenComAppointmentsRoot";
-
-// the rdf service
-RDFService = Components.classes['@mozilla.org/rdf/rdf-service;1'].getService();
-RDFService = RDFService.QueryInterface(Components.interfaces.nsIRDFService);
-
-// ************************************************************
-// Event handler for Edit code
-// ************************************************************
-
-function ascendToTR (node) {
-	var rv = node;
-	while ( rv.nodeName.toLowerCase() != "tr" ) {
-		rv = rv.parentNode;
-	}
-	return rv;
-}
-
-function handleRClick ( event ) {
-	// XXX event.type and event.currentNode and event.button are broken
-	var currentNode = ascendToTR(event.target);
-	EditApptById(currentNode.getAttribute("id"));
-}
-
-// ************************************************************
-// Functions for event handlers (e.g., onclick)
-// ************************************************************
-
-function gotoURL( url ) {
-	window.content.location = url;
-	}
-
-function getAddDiv() {
-	return document.documentElement.firstChild.nextSibling.nextSibling.firstChild.firstChild;
-	}
-
-function getScheduleDiv() {
-	return document.documentElement.firstChild.nextSibling.nextSibling.firstChild.firstChild.nextSibling;
-	}
-
-function getPickDiv() {
-	return document.documentElement.firstChild.nextSibling.nextSibling.firstChild.firstChild.nextSibling.nextSibling;
-	}
-
-function buttonDisabled ( number ) {
-	// 0 for AddEvent
-	// 1 for Schedule
-	// 2 for Go To Date
-
-	var tabTR = document.getElementById("tabsTR");
-	tabTR.childNodes.item(0).className = "tab";
-	tabTR.childNodes.item(1).className = "tab";
-	tabTR.childNodes.item(2).className = "tab";
-	tabTR.childNodes.item(number).className = "tab disable";
-
-	// XXX BUG These two lines cause failure to display
-	// setting is on an XULElement
-	//tabTR.parentNode.parentNode.style.border="medium solid black";
-	//tabTR.parentNode.parentNode.style.border="none";
-
-	// XXX BUG These two lines cover up most of a shifting bug...
-	// Setting is on a table
-	tabTR.parentNode.style.border="medium solid black";
-	tabTR.parentNode.style.border="none";
-	
-}
-
-function divActive( number ) {
-	// 0 for AddEvent
-	// 1 for Schedule
-	// 2 for Go To Date
-
-	buttonDisabled(number)
-
-	// for speed:
-	var AddDiv = getAddDiv();
-	var ScheduleDiv = getScheduleDiv();
-	var PickDiv = getPickDiv()
-
-	if ( number == 0 ) {
-		ScheduleDiv.style.display = "none";
-		PickDiv.style.display = "none";
-		AddDiv.style.display = "block";
-	} else if ( number == 1 ) {
-		AddDiv.style.display = "none";
-		PickDiv.style.display = "none";
-		ScheduleDiv.style.display = "block";
-		ShowSchedule();
-	} else if ( number == 2 ) {
-		AddDiv.style.display = "none";
-		ScheduleDiv.style.display = "none";
-		PickDiv.style.display = "block";
-		ShowPick();
-	}
-}
-
-function editButtonsActive( number ) {
-	// 0 for addbuttons
-	// 1 for editbuttons
-
-	var adddiv = getAddDiv();
-	var addbdiv = GetElementWithIdIn("addbuttons", adddiv);
-	var edbdiv = GetElementWithIdIn("editbuttons", adddiv);
-
-	if (number == 0) {
-		edbdiv.style.display = "none";
-		addbdiv.style.display = "block";
-	} else if (number == 1) {
-		addbdiv.style.display = "none";
-		edbdiv.style.display = "block";
-	}
-
-}
-
-function nextDay() {
-	nowShowing.setDate(nowShowing.getDate() + 1);
-	ShowSchedule();
-}
-
-function nextWeek() {
-	nowShowing.setDate(nowShowing.getDate() + 7);
-	ShowSchedule();
-}
-
-function prevDay() {
-	nowShowing.setDate(nowShowing.getDate() - 1);
-	ShowSchedule();
-}
-
-function prevWeek() {
-	nowShowing.setDate(nowShowing.getDate() - 7);
-	ShowSchedule();
-}
-
-function today() {
-	nowShowing = new Date();
-	ShowSchedule();
-	}
-
-/* Date Picker */
-
-function nextMonth() {
-	monthShowing.setMonth(monthShowing.getMonth() + 1);
-	ShowPick();
-}
-
-function prevMonth() {
-	monthShowing.setMonth(monthShowing.getMonth() - 1);
-	ShowPick();
-}
-
-function nextYear() {
-	monthShowing.setFullYear(monthShowing.getFullYear() + 1);
-	ShowPick();
-}
-
-function prevYear() {
-	monthShowing.setFullYear(monthShowing.getFullYear() - 1);
-	ShowPick();
-}
-
-function thisMonth() {
-	monthShowing = new Date();
-	ShowPick();
-	}
-
-function pickDate( year, month, date ) {
-	// the month is 1..12
-	nowShowing = new Date(year, month - 1, date);
-	divActive(1); // calls ShowSchedule
-}
-
-
-// ************************************************************
-// Utility functions
-// ************************************************************
-
-// XXX Should this be needed?
-
-function GetElementWithIdIn ( id, ancestor ) {
-// recursive search for an element with a given id
-	if ( ancestor.getAttribute("id") == id ) {
-		return ancestor;
-	} else {  // else shows logic, not really needed because of return
-		for (var i = 0; i < ancestor.childNodes.length ; i++ ) {
-			// This isn't an official way to use named constants, but
-			// Mozilla supports it
-			if ( ancestor.childNodes.item(i).nodeType == Node.ELEMENT_NODE ) {
-				var rv = GetElementWithIdIn(id, ancestor.childNodes.item(i));
-				if (rv != null) {
-					return rv; // exits the function here, since we found the target
-				}
-			}
-		}
-		return null;
-	}
-}
-
-// ************************************************************
-// The Appointment type
-// ************************************************************
-
-function ApptToString () {
-	return "[" + String(this.date) + "," + this.title + "]";
-}
-
-Appointment.prototype.toString = ApptToString;
-
-function Appointment ( date, title, desc, dur, id ) { // used as a constructor
-	this.date = date; // date
-	this.title = title; // title
-	this.desc = desc; // description
-	this.dur = dur; // duration (minutes)
-	this.id = id; // id (in the RDF and in the table row)
-
-// A useful debugging function:
-// XXX If error in string, get silent error:
-	//this.toString = new Function('return "[" + String(this.date) + "," + this.title + "]"');
-	}
-
-function compareAppt ( x , y ) { // for passing to Array::sort
-	// should return negative if x<y, 0 if x=y, and positive if x>y
-	// Date::getTime returns milliseconds since Jan 1, 1970, so
-	return x.date.getTime() - y.date.getTime();
-}
-
-// ************************************************************
-// Code used for showing the schedule
-// ************************************************************
-
-function getOutputTBody() {
-	// get the TBody element for output
-	// XXX a hack, since getElementById doesn't work with mixed XUL/HTML, it
-	// seems.
-
-	//return document.documentElement.childNodes.item(2).childNodes.item(1);
-
-	// hack within a hack, to get around bug 8044
-	// for thead:
-	return getScheduleDiv().firstChild.nextSibling.firstChild.nextSibling;
-	// for no thead:
-	// return getScheduleDiv().firstChild.nextSibling.firstChild;
-}
-
-function getOutputForDate() {
- // 2, 1, 3
-	return getScheduleDiv().firstChild.firstChild.firstChild.nextSibling.nextSibling;
-}
-
-function timeString( date ) {
-	var minutes = date.getMinutes();
-	if (minutes < 10 ) {
-		minutes = "0" + minutes;
-	}
-	var hours = date.getHours();
-	if (hours < 12) {
-		var suffix = "A";
-	} else {
-		var suffix = "P";
-	}
-	if (hours == 0) {
-		hours = 12;
-	} else if (hours > 12) {
-		hours -= 12;
-	}
-	return hours + ":" + minutes + suffix;
-}
-
-function dateString( date ) {
-// month is 0..11
-	// ISO-8601 version:
-	// return date.getFullYear() + "-" + ( date.getMonth() + 1) + "-" + date.getDate();
-
-	return month_names_internal[date.getMonth()] +  // both 0-based
-		" " + date.getDate() + ", " + date.getFullYear();
-}
-
-function getAttr(rdf_datasource,service,attr_name) {
-	var attr = rdf_datasource.GetTarget(service,
-					 RDFService.GetResource(rdf_ns + attr_name),
-					 true);
-	if (attr)
-		attr = attr.QueryInterface(
-					Components.interfaces.nsIRDFLiteral);
-	if (attr)
-			attr = attr.Value;
-	return attr;
-}
-
-function ReadAndSort () {
-	if ( ! haveRead ) {
-		// enumerate all of the flash datasources.
-		var enumerator = appts_container.GetElements();
-
-		// put all the appointments into an array
-		allAppts = new Array();
-	
-		try {
-			while (enumerator.hasMoreElements()) {
-				var service = enumerator.getNext().QueryInterface(
-												Components.interfaces.nsIRDFResource);
-		
-				// get the title text
-				var title = getAttr(rdf_datasource, service, 'title');
-		
-				// get the description text
-				var descrip = getAttr(rdf_datasource, service, 'notes');
-		
-				// get the date, and see if it's for us
-				var year = getAttr(rdf_datasource, service, 'year');
-				var month = getAttr(rdf_datasource, service, 'month');
-				var date = getAttr(rdf_datasource, service, 'date');
-				var hour = getAttr(rdf_datasource, service, 'hour');
-				var minute = getAttr(rdf_datasource, service, 'minute');
-
-				// get the full resource URL:
-				var theid = service.Value;
-				// and use only the fragment identifier:
-				theid = theid.substring(theid.lastIndexOf("#") + 1);
-
-				var duration = getAttr(rdf_datasource, service, 'duration');
-				// month is 0..11
-				var apptDate = new Date(year, month - 1, date, hour, minute);
-
-				allAppts[allAppts.length] = new Appointment( apptDate, title, descrip, duration, theid );
-		}
-		} catch (ex) {
-			window.alert("Caught exception [[" + ex + "]]\n");
-		}
-	haveRead = true;
-	}
-
-	var todaysAppts = new Array();
-
-	for ( var i = 0 ; i < allAppts.length ; i++ ) {
-		var appt = allAppts[i];
-		if ( (appt.date.getFullYear() == nowShowing.getFullYear())
-			&& (appt.date.getMonth() == nowShowing.getMonth())
-			&& (appt.date.getDate() == nowShowing.getDate()) ) {
-
-		todaysAppts[todaysAppts.length] = appt;
-		}
-	}
-
-	// sort todaysAppts using the JavaScript builtin Array::sort(), by
-	// providing a sort function
-	todaysAppts.sort( compareAppt );
-
-	return todaysAppts;
-	}
-
-function ShowSchedule() {
-	// Get the nodes where we will output
-	var outTB = getOutputTBody();
-	var outDate = getOutputForDate();
-
-	// Remove all its existing children, since we'll rewrite them
-	while (outTB.hasChildNodes() ) {
-		outTB.removeChild(outTB.firstChild);
-	}
-	while (outDate.hasChildNodes() ) {
-		outDate.removeChild(outDate.firstChild);
-	}
-
-	// Write the date at the top
-	outDate.appendChild(document.createTextNode(dateString(nowShowing)));
-
-	// and write the appointments to the table...
-
-	// XXX Hack: get around insertRow() bug.
-	var newrow = outTB.insertRow(outTB.rows.length);
-
-	// Get the appointments for today, already sorted, from some kind of input
-	// this is an Array of Appointment
-
-	var todaysAppts = ReadAndSort();
-
-	for ( var i = 0 ; i < todaysAppts.length ; i++ ) {
-		var appt = todaysAppts[i];
-
-		// add the appointment to the list:
-
-		var newrow = outTB.insertRow(outTB.rows.length);
-
-		// set up event handling
-		newrow.setAttribute("id", appt.id);
-		// XXX extra param shouldn't be needed
-		newrow.addEventListener("click", handleRClick, false, false);
-
-		// XXX Hack: get around insertCell() bug by switching order.
-		var titlecell = newrow.insertCell(1);
-		var timecell = newrow.insertCell(0);
-		timecell.appendChild(document.createTextNode(timeString(appt.date)));
-		titlecell.appendChild(document.createTextNode(appt.title));
-	}
-}
-
-// ************************************************************
-// Code used for the Goto date function
-// ************************************************************
-
-// monthShowing holds Year and Month for current Calendar
-
-function monthString( date ) {
-	// ISO-8601 format
-	// return date.getFullYear() + "-" + ( date.getMonth() + 1);
-	return month_names_internal[date.getMonth()] +  // both 0-based
-		" " + date.getFullYear();
-}
-
-function ShowPick() {
-	var pickDiv = getPickDiv(); // for speed
-// StartCodeTime();
-	var outCal = GetElementWithIdIn("calendar", pickDiv);
-	var outDate = GetElementWithIdIn("MonthOutput", pickDiv);
-// EndCodeTime("two runs of GetElementWithIdIn");
-
-// StartCodeTime();
-	// Remove all existing children, since we'll rewrite them
-	while (outCal.hasChildNodes() ) {
-		outCal.removeChild(outCal.firstChild);
-	}
-	while (outDate.hasChildNodes() ) {
-		outDate.removeChild(outDate.firstChild);
-	}
-// EndCodeTime("removing existing children");
-
-// StartCodeTime();
-	// Write the month at the top
-	outDate.appendChild(document.createTextNode(monthString(monthShowing)));
-// EndCodeTime("initial stuff");
-
-	// and write the calendar to the table...
-
-// StartCodeTime();
-	// XXX Hack: get around insertRow() bug.
-	var myrow = outCal.insertRow(0);
-// EndCodeTime("initial stuff");
-
-	// make room before the first day, which starts on a strange day of the week
-	// note that getDay(), 0=Sunday and 6=Saturday
-
-// StartCodeTime();
-	var curDay = new Date(monthShowing); // get the month we want to show
-	curDay.setDate(1); // start with the first day of the month
-// EndCodeTime("setting curDay");
-
-// StartCodeTime();
-	myrow = outCal.insertRow(outCal.rows.length);
-	var junkcell = myrow.insertCell(0); // XXX Bug in insertCell
-	for (var i = 0 ; i < curDay.getDay() ; i++ ) {
-		myrow.insertCell(myrow.cells.length);
-		}
-// EndCodeTime("writing extra cells");
-
-// StartCodeTime();
-	var mycell;
-	var targMonth = monthShowing.getMonth(); // for speed - saves 30ms
-	// for speed:
-	var testNowShowing = (
-		( monthShowing.getFullYear() == nowShowing.getFullYear()) &&
-		( monthShowing.getMonth() == nowShowing.getMonth()) );
-	var testCurrentTime = (
-		( monthShowing.getFullYear() == currentTime.getFullYear()) &&
-		( monthShowing.getMonth() == currentTime.getMonth()) );
-
-	while ( curDay.getMonth() == targMonth ) {
-		if ( ( curDay.getDay() == 0) && (curDay.getDate() != 1) ) {
-			// if it's Sunday, and not the 1st of the month
-			// then add a new row
-			myrow = outCal.insertRow(outCal.rows.length);
-			junkcell = myrow.insertCell(0); // XXX Bug in insertCell
-		}
-		mycell = myrow.insertCell( myrow.cells.length );
-		// put the number of the current date in the cell
-		mycell.appendChild( document.createTextNode( curDay.getDate() ) );
-		// and set the onClick handler
-		mycell.setAttribute("onclick", "pickDate(" + curDay.getFullYear()
-		                               + "," + (curDay.getMonth() + 1)
-									   + "," + curDay.getDate()
-									   + ")");
-		// and set the class
-		var classNm = "caldate";
-		if ( testNowShowing && ( curDay.getDate() == nowShowing.getDate())) {
-			classNm += " nowshowing";
-			}
-		if ( testCurrentTime && ( curDay.getDate() == currentTime.getDate())) {
-			classNm += " today";
-			}
-		mycell.setAttribute("class", classNm);
-		// and loop...
-		curDay.setDate(curDay.getDate() + 1);
-	}
-// EndCodeTime("writing the days");
-}
-
-
-// ************************************************************
-// Code used for Adding to the data
-// ************************************************************
-
-function makeAssert ( source, data, name ) {
-	var target = RDFService.GetLiteral(data);
-	var arc = RDFService.GetResource(rdf_ns + name);
-	rdf_datasource.Assert(source, arc, target, true);
-}
-
-function SendBackToSource( appt ) {
-
-	// make a resource for the new appointment
-
-	// These four all write, but only first appt works
-	// var sourceNode = RDFService.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#Description");
-	// var sourceNode = RDFService.GetResource("");
-	// var sourceNode = RDFService.GetResource("aoeuidhtns");
-	// var sourceNode = RDFService.GetResource("http://when.com/aoeuidhtns#");
-
-	// milliseconds since 1970-01-01 00:00 should be a good enough
-	// unique identifier (creation time of appt)
-	var sourceNode
-		= RDFService.GetResource(RDFFileName +"#" + appt.id);
-
-	// create literals and assert a relationship to the new appointment
-	// for each piece of data
-
-	makeAssert( sourceNode, appt.date.getFullYear(), 'year');
-	makeAssert( sourceNode, appt.date.getMonth() + 1, 'month'); // month is 0..1 in the date structure
-	makeAssert( sourceNode, appt.date.getDate(), 'date');
-	makeAssert( sourceNode, appt.date.getHours(), 'hour');
-	makeAssert( sourceNode, appt.date.getMinutes(), 'minute');
-	makeAssert( sourceNode, appt.title, 'title');
-	makeAssert( sourceNode, appt.desc, 'notes');
-	makeAssert( sourceNode, appt.dur, 'duration');
-
-	// connect the new appointment to the datasource 
-
-	appts_container.AppendElement( sourceNode );
-
-	// write the datasource back to disk
-
-	try {
-		rdf_remote_datasource.Flush(); // must be a RemoteDataSource, after 1999-06-23
-	} catch (ex) {
-		window.alert("Caught exception [[" + ex + "]] in Flush().\n");
-	}
-
-}
-
-function Add( appt ) {
-
-	// Add it to our internal data	-- note that we don't show it!
-	allAppts[allAppts.length] = appt;
-
-	// and add it to the external data
-	SendBackToSource( appt );
-
-}
-
-function ResetAddFormTo( year, month, date, hrs, min, durhrs, durmin, title, notes) {
-	var addDiv = getAddDiv(); // for speed
-
-	var yearselect = GetElementWithIdIn("addyear", addDiv );
-	var monthselect = GetElementWithIdIn("addmonth", addDiv );
-	var dayselect = GetElementWithIdIn("addday", addDiv );
-	var hourselect = GetElementWithIdIn("addtimehrs", addDiv );
-	var minselect = GetElementWithIdIn("addtimemin", addDiv );
-	var durhourselect = GetElementWithIdIn("adddurhrs", addDiv );
-	var durminselect = GetElementWithIdIn("adddurmin", addDiv );
-
-	var titleInput = GetElementWithIdIn("addtitle", addDiv );
-	var notesInput = GetElementWithIdIn("addnotes", addDiv );
-
-	if (yearselect != null) {  // "if (yearselect)" works too
-		// Subtract the value of the first year in the list to set
-		// selectedIndex.  JavaScript converts the string value to a number.
-		yearselect.selectedIndex =
-			year - yearselect.options.item(0).value;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (monthselect != null) {
-		// selectedIndex 0 based, so subtract one
-    	monthselect.selectedIndex = month - 1;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (dayselect != null) {
-		// selectedIndex 0 based, so subtract one
-		dayselect.selectedIndex = date - 1;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (hourselect != null) {
-		// both 0 based
-		hourselect.selectedIndex = hrs ;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (minselect != null) {
-		minselect.selectedIndex = Math.round(min / 5);
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (durhourselect != null) {
-		durhourselect.selectedIndex = durhrs;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (durminselect != null) {
-		durminselect.selectedIndex = Math.round(durmin / 5);
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (titleInput != null) {
-		if ( title == null) {
-			title = "";
-		}
-		titleInput.value = title;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-	if (notesInput != null) {
-		if ( notes == null) {
-			notes = "";
-		}
-		notesInput.value = notes;
-	} else {
-		window.alert("Hit a null.");
-	}
-
-}
-
-function ResetAddForm() {
-	editButtonsActive(0);
-	ResetAddFormTo( nowShowing.getFullYear(),
-	                nowShowing.getMonth() + 1,
-                    nowShowing.getDate(),
-					nowShowing.getHours() + 1, // upcoming hour
-					0, // minutes
-					0, // duration hours
-					0, // duration minutes
-					"", // title
-					""); // notes
-}
-
-function SubmitAddForm() {
-	var addDiv = getAddDiv(); // for speed
-
-	var title = GetElementWithIdIn("addtitle", addDiv );
-	var years = GetElementWithIdIn("addyear", addDiv );
-	var months = GetElementWithIdIn("addmonth", addDiv );
-	var days = GetElementWithIdIn("addday", addDiv );
-	var timehrs = GetElementWithIdIn("addtimehrs", addDiv );
-	var timemin = GetElementWithIdIn("addtimemin", addDiv );
-	var durhrs = GetElementWithIdIn("adddurhrs", addDiv );
-	var durmin = GetElementWithIdIn("adddurmin", addDiv );
-	var notes = GetElementWithIdIn("addnotes", addDiv );
-
-	if ( ( title == null ) ||
-		( years == null ) ||
-		( months == null ) ||
-		( days == null ) ||
-		( timehrs == null ) ||
-		( timemin == null ) ||
-		( durhrs == null ) ||
-		( durmin == null ) ||
-		( notes == null ) ) {
-		window.alert("Something is null.  Addition failed.\n");
-	} else {
-		// months go 0..11 
-		var apptid = "appt" + (new Date().getTime());
-		Add( new Appointment( new Date ( years.value, months.value - 1,
-		                                 days.value, timehrs.value,
-										 timemin.value ),
-		                      title.value,
-							  notes.value,
-							  (durhrs.value * 60) + (durmin.value * 1),
-							  apptid));
-		// ResetAddForm();
-		divActive(1);
-	}
-}
-
-// ************************************************************
-// Edit code, which uses add form
-// ************************************************************
-
-function getApptById( id ) {
-	for (var i = 0 ; i < allAppts.length ; i++ ) {
-		if ( allAppts[i].id == id ) {
-			return allAppts[i];
-		}
-	}
-	return null;
-}
-
-function removeApptById ( id ) {
-	for (var i = 0 ; i < allAppts.length ; i++ ) {
-		if ( allAppts[i].id == id ) {
-			// Remove from list
-			allAppts[i] = allAppts[allAppts.length - 1];
-			allAppts[allAppts.length - 1] = null;
-			allAppts.length -= 1;
-			return;
-		}
-	}
-}
-
-function EditApptById( theid ) {
-	idEditing = theid; // global variable
-
-	var apptEditing = getApptById( idEditing );
-	if ( apptEditing == null) {
-		window.alert("Null appointment.  Something's wrong.\n");
-		return;
-		}
-	divActive(0); // XXX This should come later, but...
-	editButtonsActive(1);
-	ResetAddFormTo( apptEditing.date.getFullYear(),
-	                apptEditing.date.getMonth() + 1,
-					apptEditing.date.getDate(),
-					apptEditing.date.getHours(),
-					apptEditing.date.getMinutes(),
-					Math.floor(apptEditing.dur / 60),
-					apptEditing.dur % 60,
-					apptEditing.title,
-					apptEditing.desc );
-}
-
-function getAttrLiteral(rdf_datasource,service,attr_name) {
-	var attr = rdf_datasource.GetTarget(service,
-					 RDFService.GetResource(rdf_ns + attr_name),
-					 true);
-	if (attr)
-		attr = attr.QueryInterface(
-					Components.interfaces.nsIRDFLiteral);
-	return attr;
-}
-
-function makeUnAssert ( rdf_datasource, resource, name ) {
-	var target = getAttrLiteral(rdf_datasource, resource, name);
-	var data = getAttr(rdf_datasource, resource, name); // function above
-	var arc = RDFService.GetResource(rdf_ns + name);
-	rdf_datasource.Unassert(resource, arc, target);
-}
-
-function DeleteEditing() {
-	// delete from our list:
-	removeApptById(idEditing);
-
-	// delete from the data source
-	var sourceNode = RDFService.GetResource(RDFFileName +"#" + idEditing);
-	appts_container.RemoveElement( sourceNode, true );
-
-	// Need to unassert all of sourceNode's relationships
-	makeUnAssert(rdf_datasource, sourceNode, 'year');
-	makeUnAssert(rdf_datasource, sourceNode, 'month');
-	makeUnAssert(rdf_datasource, sourceNode, 'date');
-	makeUnAssert(rdf_datasource, sourceNode, 'hour');
-	makeUnAssert(rdf_datasource, sourceNode, 'minute');
-	makeUnAssert(rdf_datasource, sourceNode, 'title');
-	makeUnAssert(rdf_datasource, sourceNode, 'notes');
-	makeUnAssert(rdf_datasource, sourceNode, 'duration');
-
-	try {
-		rdf_remote_datasource.Flush(); // must be a RemoteDataSource, after 1999-06-23
-	} catch (ex) {
-		window.alert("Caught exception [[" + ex + "]] in Flush().\n");
-	}
-
-}
-
-function EditFormSubmit() {
-	DeleteEditing();
-	SubmitAddForm();
-	divActive(1);
-}
-
-function EditFormDelete() {
-	DeleteEditing();
-	divActive(1);
-}
-
-function EditFormCancel() {
-	divActive(1);
-}
-
-// ************************************************************
-// Startup Code
-// ************************************************************
-
-function Init()
-{
-	// Initialize the Sidebar
-
-	// Install all the datasources named in the Flash Registry into
-	// the tree control. Datasources are listed as members of the
-	// NC:FlashDataSources sequence, and are loaded in the order that
-	// they appear in that sequence.
-	try {
-		// First try to construct a new one and load it
-		// synchronously. nsIRDFService::GetDataSource() loads RDF/XML
-		// asynchronously by default.
-		rdf_datasource = Components.classes['@mozilla.org/rdf/datasource;1?name=xml-datasource'].createInstance();
-		rdf_datasource = rdf_datasource.QueryInterface(Components.interfaces.nsIRDFDataSource);
-
-		rdf_remote_datasource = rdf_datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
-		rdf_remote_datasource.Init(RDFFileName); // this will throw if it's already been opened and registered.
-
-		dump("Reading datasource synchronously.\n");
-		// read it in synchronously.
-		rdf_remote_datasource.Refresh(true);
-	}
-	catch (ex) {
-		// if we get here, then the RDF/XML has been opened and read
-		// once. We just need to grab the datasource.
-		dump("Datasource already read.  Grabbing.\n");
-		rdf_datasource = RDFService.GetDataSource(RDFFileName);
-	}
-
-	// Create a 'container' wrapper around the appts_resourcename
-	// resource so we can use some utility routines that make access a
-	// bit easier.
-	// NOT var, so it's global
-	appts_container = Components.classes['@mozilla.org/rdf/container;1'].createInstance();
-	appts_container = appts_container.QueryInterface(Components.interfaces.nsIRDFContainer);
-
-	appts_resource = RDFService.GetResource(appts_resourcename);
-	appts_container.Init(rdf_datasource, appts_resource);
-}
-
-function Boot() {
-
-	if (document.getElementById("ApptsWindow")) {
-dump("Calling init:\n");
-		Init();
-
-		// XXX Bug 9136 - this doesn't work when form is hidden.
-		// ResetAddForm();
-
-		// ShowSchedule();
-dump("Calling divActive(1):\n");
-		divActive(1);
-dump("Done initializing.\n");
-		// and let events take things from there...
-	} else {
-		setTimeout("Boot()", 0);
-	}
-}
diff --git a/layout/html/tests/table/bugs/bug12012.rdf b/layout/html/tests/table/bugs/bug12012.rdf
deleted file mode 100644
index b6b94e9e413a..000000000000
--- a/layout/html/tests/table/bugs/bug12012.rdf
+++ /dev/null
@@ -1,1921 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF
-     xmlns:appts="http://when.com/1999/07/03-appts-rdf#"
-     xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description about="#940451434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944236834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>3</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934480834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>12</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936201634628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>1</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940969834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>26</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943808434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>28</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933868834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>5</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945466234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934119034628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942681634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935776834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>27</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945095434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939760234628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>12</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943565434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>25</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942442234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>12</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933798634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>4</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937341034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946141234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>25</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939303034628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>7</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942010234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>7</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936897334628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>9</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944849734628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>10</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934912834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938876434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945898234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>22</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933427834628">
-    <appts:year>1999</appts:year>
-    <appts:month>7</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938620834628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942854434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933696034628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>3</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941725834628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>4</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936374434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>3</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944323234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>4</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940521634628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946483234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936284434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941295634628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941036434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>27</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940080634628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>16</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934551034628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943907434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933357634628">
-    <appts:year>1999</appts:year>
-    <appts:month>7</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945536434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>18</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935342134628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>22</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939830434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937402234628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946243834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>26</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936025234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939402934628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943200034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942080434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936986434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>10</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944928034628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944672434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934560034628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938957434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>3</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945984634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>23</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938714434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945705634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935155834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942940834628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>18</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935604034628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>25</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936630034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941817634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>5</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936451834628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>4</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940615234628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>22</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944429434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>5</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938279734628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>25</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946564234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941393734628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945104434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942685234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937600234628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941130934628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>28</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943988434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>30</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940172434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945619234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938012434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>22</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939916834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933622234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937926034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946310434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>27</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936106234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943306234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>22</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939475834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>9</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942171334628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>9</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937062034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935263834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944775034628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>9</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933519634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>1</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934637434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939057334628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>4</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934124434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946045834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935958634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945808234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943035334628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935699434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>26</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941898634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936563434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>5</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935514934628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934230634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>9</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936288034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Bag ID="WhenComAppointmentsRoot">
-    <RDF:li resource="#933357634628"/>
-    <RDF:li resource="#933427834628"/>
-    <RDF:li resource="#933433234628"/>
-    <RDF:li resource="#933519634628"/>
-    <RDF:li resource="#933622234628"/>
-    <RDF:li resource="#933696034628"/>
-    <RDF:li resource="#933798634628"/>
-    <RDF:li resource="#933868834628"/>
-    <RDF:li resource="#933971434628"/>
-    <RDF:li resource="#934057834628"/>
-    <RDF:li resource="#934119034628"/>
-    <RDF:li resource="#934124434628"/>
-    <RDF:li resource="#934230634628"/>
-    <RDF:li resource="#934297234628"/>
-    <RDF:li resource="#934378234628"/>
-    <RDF:li resource="#934480834628"/>
-    <RDF:li resource="#934551034628"/>
-    <RDF:li resource="#934560034628"/>
-    <RDF:li resource="#934637434628"/>
-    <RDF:li resource="#934646434628"/>
-    <RDF:li resource="#934737334628"/>
-    <RDF:li resource="#934826434628"/>
-    <RDF:li resource="#934912834628"/>
-    <RDF:li resource="#935008234628"/>
-    <RDF:li resource="#935085634628"/>
-    <RDF:li resource="#935155834628"/>
-    <RDF:li resource="#935263834628"/>
-    <RDF:li resource="#935342134628"/>
-    <RDF:li resource="#935420434628"/>
-    <RDF:li resource="#935514934628"/>
-    <RDF:li resource="#935604034628"/>
-    <RDF:li resource="#935699434628"/>
-    <RDF:li resource="#935776834628"/>
-    <RDF:li resource="#935863234628"/>
-    <RDF:li resource="#935958634628"/>
-    <RDF:li resource="#936025234628"/>
-    <RDF:li resource="#936106234628"/>
-    <RDF:li resource="#936111634628"/>
-    <RDF:li resource="#936201634628"/>
-    <RDF:li resource="#936284434628"/>
-    <RDF:li resource="#936288034628"/>
-    <RDF:li resource="#936374434628"/>
-    <RDF:li resource="#936451834628"/>
-    <RDF:li resource="#936563434628"/>
-    <RDF:li resource="#936630034628"/>
-    <RDF:li resource="#936724534628"/>
-    <RDF:li resource="#936813634628"/>
-    <RDF:li resource="#936897334628"/>
-    <RDF:li resource="#936986434628"/>
-    <RDF:li resource="#937062034628"/>
-    <RDF:li resource="#937148434628"/>
-    <RDF:li resource="#937238434628"/>
-    <RDF:li resource="#937341034628"/>
-    <RDF:li resource="#937402234628"/>
-    <RDF:li resource="#937411234628"/>
-    <RDF:li resource="#937494034628"/>
-    <RDF:li resource="#937600234628"/>
-    <RDF:li resource="#937666834628"/>
-    <RDF:li resource="#937761334628"/>
-    <RDF:li resource="#937843234628"/>
-    <RDF:li resource="#937926034628"/>
-    <RDF:li resource="#938012434628"/>
-    <RDF:li resource="#938102434628"/>
-    <RDF:li resource="#938185234628"/>
-    <RDF:li resource="#938279734628"/>
-    <RDF:li resource="#938377834628"/>
-    <RDF:li resource="#938452534628"/>
-    <RDF:li resource="#938547034628"/>
-    <RDF:li resource="#938620834628"/>
-    <RDF:li resource="#938714434628"/>
-    <RDF:li resource="#938809834628"/>
-    <RDF:li resource="#938876434628"/>
-    <RDF:li resource="#938957434628"/>
-    <RDF:li resource="#939057334628"/>
-    <RDF:li resource="#939143734628"/>
-    <RDF:li resource="#939241834628"/>
-    <RDF:li resource="#939303034628"/>
-    <RDF:li resource="#939402934628"/>
-    <RDF:li resource="#939475834628"/>
-    <RDF:li resource="#939578434628"/>
-    <RDF:li resource="#939670234628"/>
-    <RDF:li resource="#939760234628"/>
-    <RDF:li resource="#939830434628"/>
-    <RDF:li resource="#939916834628"/>
-    <RDF:li resource="#940007734628"/>
-    <RDF:li resource="#940080634628"/>
-    <RDF:li resource="#940172434628"/>
-    <RDF:li resource="#940278634628"/>
-    <RDF:li resource="#940339834628"/>
-    <RDF:li resource="#940451434628"/>
-    <RDF:li resource="#940521634628"/>
-    <RDF:li resource="#940615234628"/>
-    <RDF:li resource="#940710634628"/>
-    <RDF:li resource="#940771834628"/>
-    <RDF:li resource="#940777234628"/>
-    <RDF:li resource="#940874434628"/>
-    <RDF:li resource="#940969834628"/>
-    <RDF:li resource="#941036434628"/>
-    <RDF:li resource="#941130934628"/>
-    <RDF:li resource="#941209234628"/>
-    <RDF:li resource="#941295634628"/>
-    <RDF:li resource="#941393734628"/>
-    <RDF:li resource="#941472034628"/>
-    <RDF:li resource="#941553034628"/>
-    <RDF:li resource="#941664634628"/>
-    <RDF:li resource="#941725834628"/>
-    <RDF:li resource="#941817634628"/>
-    <RDF:li resource="#941898634628"/>
-    <RDF:li resource="#941904034628"/>
-    <RDF:li resource="#942010234628"/>
-    <RDF:li resource="#942080434628"/>
-    <RDF:li resource="#942171334628"/>
-    <RDF:li resource="#942253234628"/>
-    <RDF:li resource="#942330634628"/>
-    <RDF:li resource="#942442234628"/>
-    <RDF:li resource="#942528634628"/>
-    <RDF:li resource="#942598834628"/>
-    <RDF:li resource="#942681634628"/>
-    <RDF:li resource="#942685234628"/>
-    <RDF:li resource="#942771634628"/>
-    <RDF:li resource="#942849034628"/>
-    <RDF:li resource="#942854434628"/>
-    <RDF:li resource="#942940834628"/>
-    <RDF:li resource="#943035334628"/>
-    <RDF:li resource="#943129834628"/>
-    <RDF:li resource="#943194634628"/>
-    <RDF:li resource="#943200034628"/>
-    <RDF:li resource="#943306234628"/>
-    <RDF:li resource="#943367434628"/>
-    <RDF:li resource="#943479034628"/>
-    <RDF:li resource="#943565434628"/>
-    <RDF:li resource="#943632034628"/>
-    <RDF:li resource="#943738234628"/>
-    <RDF:li resource="#943808434628"/>
-    <RDF:li resource="#943907434628"/>
-    <RDF:li resource="#943988434628"/>
-    <RDF:li resource="#944080234628"/>
-    <RDF:li resource="#944158534628"/>
-    <RDF:li resource="#944236834628"/>
-    <RDF:li resource="#944323234628"/>
-    <RDF:li resource="#944429434628"/>
-    <RDF:li resource="#944515834628"/>
-    <RDF:li resource="#944586034628"/>
-    <RDF:li resource="#944663434628"/>
-    <RDF:li resource="#944672434628"/>
-    <RDF:li resource="#944775034628"/>
-    <RDF:li resource="#944849734628"/>
-    <RDF:li resource="#944928034628"/>
-    <RDF:li resource="#944931634628"/>
-    <RDF:li resource="#945030634628"/>
-    <RDF:li resource="#945095434628"/>
-    <RDF:li resource="#945104434628"/>
-    <RDF:li resource="#945181834628"/>
-    <RDF:li resource="#945289834628"/>
-    <RDF:li resource="#945354634628"/>
-    <RDF:li resource="#945466234628"/>
-    <RDF:li resource="#945536434628"/>
-    <RDF:li resource="#945619234628"/>
-    <RDF:li resource="#945622834628"/>
-    <RDF:li resource="#945700234628"/>
-    <RDF:li resource="#945705634628"/>
-    <RDF:li resource="#945808234628"/>
-    <RDF:li resource="#945898234628"/>
-    <RDF:li resource="#945984634628"/>
-    <RDF:li resource="#946045834628"/>
-    <RDF:li resource="#946051234628"/>
-    <RDF:li resource="#946141234628"/>
-    <RDF:li resource="#946243834628"/>
-    <RDF:li resource="#946310434628"/>
-    <RDF:li resource="#946416634628"/>
-    <RDF:li resource="#946477834628"/>
-    <RDF:li resource="#946483234628"/>
-    <RDF:li resource="#946564234628"/>
-    <RDF:li resource="#946666834628"/>
-  </RDF:Bag>
-  <RDF:Description about="#940710634628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>23</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944515834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938377834628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>26</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946666834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941472034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>1</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945181834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942771634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>16</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941209234628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937666834628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>18</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935085634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940278634628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>18</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944080234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>1</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937411234628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938102434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>23</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940007734628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946416634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>28</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943632034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>26</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945289834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944931634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942528634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939578434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>10</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943367434628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>23</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934057834628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>7</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940777234628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942253234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>10</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937148434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>12</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939143734628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>5</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936724534628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>7</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943129834628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934646434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934378234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940771834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944586034628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>7</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938452534628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>27</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933971434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941553034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935863234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>28</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945622834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942849034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>17</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937761334628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944158534628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>2</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940339834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>19</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938185234628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937494034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>16</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936111634628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937843234628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#940874434628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>25</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946477834628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>29</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943738234628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>27</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945354634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>16</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945030634628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>12</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942598834628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>14</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943479034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939670234628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935008234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>18</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#942330634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>11</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#937238434628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>13</appts:date>
-    <appts:hour>12</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Meeting (Lunch)</appts:title>
-    <appts:notes>with *everyone*</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#946051234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>24</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#939241834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941904034628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>6</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#936813634628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#933433234628">
-    <appts:year>1999</appts:year>
-    <appts:month>7</appts:month>
-    <appts:date>31</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#943194634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>21</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934737334628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>15</appts:date>
-    <appts:hour>13</appts:hour>
-    <appts:minute>15</appts:minute>
-    <appts:title>Browse the web</appts:title>
-    <appts:notes>Testing, of course</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934826434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>16</appts:date>
-    <appts:hour>14</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Architecture Meeting</appts:title>
-    <appts:notes>Lots to discuss</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938809834628">
-    <appts:year>1999</appts:year>
-    <appts:month>10</appts:month>
-    <appts:date>1</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#944663434628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>8</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#938547034628">
-    <appts:year>1999</appts:year>
-    <appts:month>9</appts:month>
-    <appts:date>28</appts:date>
-    <appts:hour>15</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Talk to David</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#934297234628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>10</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#941664634628">
-    <appts:year>1999</appts:year>
-    <appts:month>11</appts:month>
-    <appts:date>3</appts:date>
-    <appts:hour>16</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>Plan Demos</appts:title>
-    <appts:notes>Of the sidebar</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#935420434628">
-    <appts:year>1999</appts:year>
-    <appts:month>8</appts:month>
-    <appts:date>23</appts:date>
-    <appts:hour>11</appts:hour>
-    <appts:minute>0</appts:minute>
-    <appts:title>Talk to John</appts:title>
-    <appts:notes>About sidebar issues</appts:notes>
-    <appts:duration>60</appts:duration>
-  </RDF:Description>
-  <RDF:Description about="#945700234628">
-    <appts:year>1999</appts:year>
-    <appts:month>12</appts:month>
-    <appts:date>20</appts:date>
-    <appts:hour>9</appts:hour>
-    <appts:minute>30</appts:minute>
-    <appts:title>UI Design Meeting</appts:title>
-    <appts:notes>About the sidebar demo</appts:notes>
-    <appts:duration>30</appts:duration>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/layout/html/tests/table/bugs/bug12012.xul b/layout/html/tests/table/bugs/bug12012.xul
deleted file mode 100644
index bb45e99e1393..000000000000
--- a/layout/html/tests/table/bugs/bug12012.xul
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-<!--
-
- ***** 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
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- 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 ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="bug12012.css" type="text/css"?>
-
-<!DOCTYPE window
-[
-
-<!ENTITY text_to_be_replaced "Loading.  Please wait.">
-
-<!-- set up selectors for the date in the adder.  Using entities makes
-  it much easier to change the format of the date.  Right now, it is
-  "Month Day, Year" -->
-
-<!ENTITY add.day.selector.year "
-	<html:select id='addyear'>
-		<html:option value='1998'>1998</html:option>
-		<html:option value='1999'>1999</html:option>
-		<html:option value='2000'>2000</html:option>
-		<html:option value='2001'>2001</html:option>
-		<html:option value='2002'>2002</html:option>
-		<html:option value='2003'>2003</html:option>
-		<html:option value='2004'>2004</html:option>
-		<html:option value='2005'>2005</html:option>
-		<html:option value='2006'>2006</html:option>
-		<html:option value='2007'>2007</html:option>
-		<html:option value='2008'>2008</html:option>
-		<html:option value='2009'>2009</html:option>
-	</html:select>
-">
-
-<!ENTITY add.month.1 "Jan">
-<!ENTITY add.month.2 "Feb">
-<!ENTITY add.month.3 "Mar">
-<!ENTITY add.month.4 "Apr">
-<!ENTITY add.month.5 "May">
-<!ENTITY add.month.6 "Jun">
-<!ENTITY add.month.7 "Jul">
-<!ENTITY add.month.8 "Aug">
-<!ENTITY add.month.9 "Sep">
-<!ENTITY add.month.10 "Oct">
-<!ENTITY add.month.11 "Nov">
-<!ENTITY add.month.12 "Dec">
-
-<!ENTITY add.day.selector.month "
-	<html:select id='addmonth'>
-		<html:option value='1'>&add.month.1;</html:option>
-		<html:option value='2'>&add.month.2;</html:option>
-		<html:option value='3'>&add.month.3;</html:option>
-		<html:option value='4'>&add.month.4;</html:option>
-		<html:option value='5'>&add.month.5;</html:option>
-		<html:option value='6'>&add.month.6;</html:option>
-		<html:option value='7'>&add.month.7;</html:option>
-		<html:option value='8'>&add.month.8;</html:option>
-		<html:option value='9'>&add.month.9;</html:option>
-		<html:option value='10'>&add.month.10;</html:option>
-		<html:option value='11'>&add.month.11;</html:option>
-		<html:option value='12'>&add.month.12;</html:option>
-	</html:select>
-">
-
-<!ENTITY add.day.selector.day "
-	<html:select id='addday'>
-		<html:option value='1'>1</html:option>
-		<html:option value='2'>2</html:option>
-		<html:option value='3'>3</html:option>
-		<html:option value='4'>4</html:option>
-		<html:option value='5'>5</html:option>
-		<html:option value='6'>6</html:option>
-		<html:option value='7'>7</html:option>
-		<html:option value='8'>8</html:option>
-		<html:option value='9'>9</html:option>
-		<html:option value='10'>10</html:option>
-		<html:option value='11'>11</html:option>
-		<html:option value='12'>12</html:option>
-		<html:option value='13'>13</html:option>
-		<html:option value='14'>14</html:option>
-		<html:option value='15'>15</html:option>
-		<html:option value='16'>16</html:option>
-		<html:option value='17'>17</html:option>
-		<html:option value='18'>18</html:option>
-		<html:option value='19'>19</html:option>
-		<html:option value='20'>20</html:option>
-		<html:option value='21'>21</html:option>
-		<html:option value='22'>22</html:option>
-		<html:option value='23'>23</html:option>
-		<html:option value='24'>24</html:option>
-		<html:option value='25'>25</html:option>
-		<html:option value='26'>26</html:option>
-		<html:option value='27'>27</html:option>
-		<html:option value='28'>28</html:option>
-		<html:option value='29'>29</html:option>
-		<html:option value='30'>30</html:option>
-		<html:option value='31'>31</html:option>
-	</html:select>
-">
-
-<!--
-	This controls the date format and is used in the document below
-	We escape the ampersands here so that the entities are not expanded
-	here, but in the text.  This ought to save memory, I would think...
--->
-
-<!ENTITY add.day.selectors
-	"&#38;add.day.selector.month; &#38;add.day.selector.day;, &#38;add.day.selector.year;">
-
-<!ENTITY add.time.selector.hours "
-	<html:select id='addtimehrs'>
-		<html:option value='0'>12 AM</html:option>
-		<html:option value='1'>1 AM</html:option>
-		<html:option value='2'>2 AM</html:option>
-		<html:option value='3'>3 AM</html:option>
-		<html:option value='4'>4 AM</html:option>
-		<html:option value='5'>5 AM</html:option>
-		<html:option value='6'>6 AM</html:option>
-		<html:option value='7'>7 AM</html:option>
-		<html:option value='8'>8 AM</html:option>
-		<html:option value='9'>9 AM</html:option>
-		<html:option value='10'>10 AM</html:option>
-		<html:option value='11'>11 AM</html:option>
-		<html:option value='12'>12 PM</html:option>
-		<html:option value='13'>1 PM</html:option>
-		<html:option value='14'>2 PM</html:option>
-		<html:option value='15'>3 PM</html:option>
-		<html:option value='16'>4 PM</html:option>
-		<html:option value='17'>5 PM</html:option>
-		<html:option value='18'>6 PM</html:option>
-		<html:option value='19'>7 PM</html:option>
-		<html:option value='20'>8 PM</html:option>
-		<html:option value='21'>9 PM</html:option>
-		<html:option value='22'>10 PM</html:option>
-		<html:option value='23'>11 PM</html:option>
-	</html:select>
-">
-
-<!ENTITY add.time.selector.minutes "
-	<html:select id='addtimemin'>
-		<html:option value='00'>:00</html:option>
-		<html:option value='05'>:05</html:option>
-		<html:option value='10'>:10</html:option>
-		<html:option value='15'>:15</html:option>
-		<html:option value='20'>:20</html:option>
-		<html:option value='25'>:25</html:option>
-		<html:option value='30'>:30</html:option>
-		<html:option value='35'>:35</html:option>
-		<html:option value='40'>:40</html:option>
-		<html:option value='45'>:45</html:option>
-		<html:option value='50'>:50</html:option>
-		<html:option value='55'>:55</html:option>
-	</html:select>
-">
-
-<!ENTITY add.time.selectors
-	"&#38;add.time.selector.hours; &#38;add.time.selector.minutes;">
-
-<!ENTITY add.duration.selector.hours "
-	<html:select id='adddurhrs'>
-		<html:option value='0'>0</html:option>
-		<html:option value='1'>1</html:option>
-		<html:option value='2'>2</html:option>
-		<html:option value='3'>3</html:option>
-		<html:option value='4'>4</html:option>
-		<html:option value='5'>5</html:option>
-		<html:option value='6'>6</html:option>
-		<html:option value='7'>7</html:option>
-		<html:option value='8'>8</html:option>
-		<html:option value='9'>9</html:option>
-		<html:option value='10'>10</html:option>
-		<html:option value='11'>11</html:option>
-		<html:option value='12'>12</html:option>
-	</html:select>
-">
-
-<!ENTITY add.duration.selector.minutes "
-	<html:select id='adddurmin'>
-		<html:option value='00'>:00</html:option>
-		<html:option value='05'>:05</html:option>
-		<html:option value='10'>:10</html:option>
-		<html:option value='15'>:15</html:option>
-		<html:option value='20'>:20</html:option>
-		<html:option value='25'>:25</html:option>
-		<html:option value='30'>:30</html:option>
-		<html:option value='35'>:35</html:option>
-		<html:option value='40'>:40</html:option>
-		<html:option value='45'>:45</html:option>
-		<html:option value='50'>:50</html:option>
-		<html:option value='55'>:55</html:option>
-	</html:select>
-">
-
-<!ENTITY add.duration.selectors
-	"&#38;add.duration.selector.hours; &#38;add.duration.selector.minutes;">
-
-<!ENTITY schedule.header.button.weekbefore.label "&lt;&lt;">
-<!ENTITY schedule.header.button.daybefore.label "&lt;">
-<!ENTITY schedule.header.button.daylater.label "&gt;">
-<!ENTITY schedule.header.button.weeklater.label "&gt;&gt;">
-<!ENTITY schedule.header.button.today.label "Now">
-
-<!ENTITY schedule.header.button.weekbefore.title "One week earlier">
-<!ENTITY schedule.header.button.daybefore.title "One day earlier">
-<!ENTITY schedule.header.button.daylater.title "One day later">
-<!ENTITY schedule.header.button.weeklater.title "One week later">
-<!ENTITY schedule.header.button.today.title "Today">
-
-<!ENTITY pick.header.button.yearbefore.label "&lt;&lt;">
-<!ENTITY pick.header.button.monthbefore.label "&lt;">
-<!ENTITY pick.header.button.monthlater.label "&gt;">
-<!ENTITY pick.header.button.yearlater.label "&gt;&gt;">
-<!ENTITY pick.header.button.thismonth.label "Now">
-
-<!ENTITY pick.header.button.yearbefore.title "One year earlier">
-<!ENTITY pick.header.button.monthbefore.title "One month earlier">
-<!ENTITY pick.header.button.monthlater.title "One month later">
-<!ENTITY pick.header.button.yearlater.title "One year later">
-<!ENTITY pick.header.button.thismonth.title "This Month">
-
-<!ENTITY pick.calendar.header.day.1 "S">
-<!ENTITY pick.calendar.header.day.2 "M">
-<!ENTITY pick.calendar.header.day.3 "T">
-<!ENTITY pick.calendar.header.day.4 "W">
-<!ENTITY pick.calendar.header.day.5 "T">
-<!ENTITY pick.calendar.header.day.6 "F">
-<!ENTITY pick.calendar.header.day.7 "S">
-
-
-<!ENTITY footer.tab.add.label "Add">
-<!ENTITY footer.tab.sched.label "List">
-<!ENTITY footer.tab.goto.label "Date">
-<!ENTITY footer.button.whencom.label "Calendar">
-<!ENTITY footer.button.whencom.url "http://when.com/">
-]>
-
-<window
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	onload="Boot()"
-	id="ApptsWindow"
-	orient="horizontal">
-
-	<html:script src="bug12012.js" />
-
-	<spacer flex="1"/>
-	<vbox> <!-- fill all horizontal space -->
-		<hbox flex="1" id="main"> <!-- fill all vertical space -->
-
-			<html:div class="add" style="display: none">
-
-				<html:table id="add">
-					<html:col class="addtitle" />
-					<html:col class="addbody" />
-					<html:tbody>
-						<html:tr>
-							<html:th>
-								Title
-							</html:th>
-							<html:td>
-								<html:input type="text" id="addtitle" />
-							</html:td>
-						</html:tr>
-						<html:tr>
-							<html:th>
-								Day
-							</html:th>
-							<html:td>
-								&add.day.selectors;
-							</html:td>
-						</html:tr>
-						<html:tr>
-							<html:th>
-								Time
-							</html:th>
-							<html:td>
-								&add.time.selectors;
-							</html:td>
-						</html:tr>
-						<html:tr>
-							<html:th>
-								Length
-							</html:th>
-							<html:td>
-								&add.duration.selectors;
-							</html:td>
-						</html:tr>
-						<html:tr>
-							<html:th>
-								Notes
-							</html:th>
-							<html:td>
-								<html:input type="text" id="addnotes" />
-							</html:td>
-						</html:tr>
-					</html:tbody>
-				</html:table>
-
-				<html:div id="addbuttons">
-					<html:input type="button" value="Add" onclick="SubmitAddForm()" />
-					<html:input type="button" value="Clear" onclick="ResetAddForm()" />
-				</html:div>
-
-				<html:div id="editbuttons" style="display: none;">
-					<html:input type="button" value="Change" onclick="EditFormSubmit()" />
-					<html:input type="button" value="Delete" onclick="EditFormDelete()" />
-					<html:input type="button" value="Cancel" onclick="EditFormCancel()" />
-				</html:div>
-
-			</html:div>
-
-			<html:div class="schedule">
-
-				<html:table>
-					<html:tr>
-						<html:td class="button" onclick="prevWeek()" title="&schedule.header.button.weekbefore.title;">
-							&schedule.header.button.weekbefore.label;
-						</html:td>
-						<html:td class="button" onclick="prevDay()" title="&schedule.header.button.daybefore.title;">
-							&schedule.header.button.daybefore.label;
-						</html:td>
-
-						<html:td id="DateOutput">
-						</html:td>
-
-						<html:td class="button" onclick="nextDay()" title="&schedule.header.button.daylater.title;">
-							&schedule.header.button.daylater.label;
-						</html:td>
-						<html:td class="button" onclick="nextWeek()" title="&schedule.header.button.weeklater.title;">
-							&schedule.header.button.weeklater.label;
-						</html:td>
-						<html:td class="button" onclick="today()" title="&schedule.header.button.today.title;">
-							&schedule.header.button.today.label;
-						</html:td>
-					</html:tr>
-				</html:table>
-
-				<html:table width="100%" class="data">
-
-				 <!-- XXX Bug: if we take out this thead while border-collapse on
-					the parent is collapse XXX WHICH IT SHOULD BE BY DEFAULT (?)
-					((and/and not) make the corresponding
-					removal of a .nextSibling to the JS), we crash, even without
-					the script element entirely -->
-
-					<html:thead> 
-						<html:tr>
-							<html:th>
-								Time
-							</html:th>
-							<html:th>
-								Title
-							</html:th>
-						</html:tr>
-					</html:thead>
-
-					<html:tbody id="ApptTable">
-						<html:tr>
-							<html:td colspan="2">
-								&text_to_be_replaced;
-							</html:td>
-						</html:tr>
-					</html:tbody>
-
-				</html:table>
-
-			</html:div>
-
-			<html:div class="pick" style="display: none">
-
-				<html:table>
-					<html:tr>
-						<html:td class="button" onclick="prevYear()" title="&pick.header.button.yearbefore.title;">
-							&pick.header.button.yearbefore.label;
-						</html:td>
-						<html:td class="button" onclick="prevMonth()" title="&pick.header.button.monthbefore.title;">
-							&pick.header.button.monthbefore.label;
-						</html:td>
-
-						<html:td id="MonthOutput">
-						</html:td>
-
-						<html:td class="button" onclick="nextMonth()" title="&pick.header.button.monthlater.title;">
-							&pick.header.button.monthlater.label;
-						</html:td>
-						<html:td class="button" onclick="nextYear()" title="&pick.header.button.yearlater.title;">
-							&pick.header.button.yearlater.label;
-						</html:td>
-						<html:td class="button" onclick="thisMonth()" title="&pick.header.button.thismonth.title;">
-							&pick.header.button.thismonth.label;
-						</html:td>
-					</html:tr>
-				</html:table>
-
-				<html:table> 
-
-					<html:thead>
-						<html:tr>
-							<html:th>
-								&pick.calendar.header.day.1;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.2;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.3;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.4;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.5;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.6;
-							</html:th>
-							<html:th>
-								&pick.calendar.header.day.7;
-							</html:th>
-						</html:tr>
-					</html:thead>
-
-					<html:tbody id="calendar">
-						<html:tr>
-							<html:td colspan="7">
-								&text_to_be_replaced;
-							</html:td>
-						</html:tr>
-					</html:tbody>
-
-				</html:table>
-
-			</html:div>
-
-		</hbox>
-
-		<hbox id="tabs">
-			<spacer flex="1"/>
-			<html:table>
-				<html:tr id="tabsTR">
-					<html:td class="tab" onclick="if (this.className != 'tab disable') { divActive(0); ResetAddForm() }"> <!-- XXX need to reset due to bug 9136 -->
-						&footer.tab.add.label;
-					</html:td>
-					<html:td class="tab" onclick="if (this.className != 'tab disable') { divActive(1) }">
-						&footer.tab.sched.label;
-					</html:td>
-					<html:td class="tab" onclick="if (this.className != 'tab disable') { divActive(2) }">
-						&footer.tab.goto.label;
-					</html:td>
-					<html:td>
-						<html:a href="#" onclick="gotoURL('&footer.button.whencom.url;');return false;">&footer.button.whencom.label;</html:a>
-					</html:td>
-				</html:tr>
-			</html:table>
-			<spacer flex="1"/>
-		</hbox> <!-- id="tabs" -->
-	</vbox>
-	<spacer flex="1"/>
-</window>
diff --git a/layout/html/tests/table/bugs/bug120364.html b/layout/html/tests/table/bugs/bug120364.html
deleted file mode 100644
index ee630cf4c649..000000000000
--- a/layout/html/tests/table/bugs/bug120364.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-<title>New Page 1</title>
-</head>
-
-foo
-<table height="1820" align="right">
-  <tr>
-    <td valign="top" align="left" height="125" width="110">
-      <br>Create a cool home page with the 
-    </td>
-  </tr>
-  <tr>
-    <td valign="top" align="left" height="100" width="110">
-      <br>Get organized online with the
-    </td>
-  </tr>
-
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1220.html b/layout/html/tests/table/bugs/bug1220.html
deleted file mode 100644
index 771e515dbc6f..000000000000
--- a/layout/html/tests/table/bugs/bug1220.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML><BODY>
-
-<TABLE CELLPADDING=0 CELLSPACING=0 WIDTH=602 BORDER=1>
-<TR>
-        <TD COLSPAN="2" ROWSPAN=2 VALIGN=TOP BGCOLOR="#FFFFFF">
-        <IMG 
-src="../images/wiz438sidebar.gif" 
-ALT="" BORDER=0>
-        </TD>
-</TR>
-
-<!-- RICK: this is a parser problem Remove the script tag and the content 
-doesn't get ejected from the table. -->
-<SCRIPT LANGUAGE=javascript>
-<!--
-        function handleTrigger()
-        {
-                if (event.ctrlKey == true && event.shiftKey == true)
-                        document.all("E").value = "1";
-        }
-        document.onclick = handleTrigger;
-//-->
-</SCRIPT>
-
-<TR>
-        <TD COLSPAN=6 HEIGHT="45" ALIGN=RIGHT>xxx</TD>
-</TR>
-
-</TABLE>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug1224.html b/layout/html/tests/table/bugs/bug1224.html
deleted file mode 100644
index 0e2f19a6ea65..000000000000
--- a/layout/html/tests/table/bugs/bug1224.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<HEAD> and the page works.)
-
-<html><head></head><body>
-<table border="1">
-  <tr>
-    <td>img-cap</td>
-    <td rowspan="2">
-         img-features<br>
-<!-- HEAD breaks the table -->
-     <HEAD>
-           img-holidays<br>
-  </td></tr>
-  <tr><td> img-projo.com </td></tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug12268.html b/layout/html/tests/table/bugs/bug12268.html
deleted file mode 100644
index 5989a89fbea1..000000000000
--- a/layout/html/tests/table/bugs/bug12268.html
+++ /dev/null
@@ -1,7 +0,0 @@
-If bug 12268 is not fixed, then the table is too narrow
-
-<table border>
- <tr>
-  <td><img src=raptorx.jpg width=600 height=100></td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug12287.xul b/layout/html/tests/table/bugs/bug12287.xul
deleted file mode 100644
index 0d35027e4a89..000000000000
--- a/layout/html/tests/table/bugs/bug12287.xul
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml" orient="vertical"
-  style="width: 300px">
-<vbox style="height:300px; border: 3px solid blue">
-<html:table flex="1" style="height:100px; border: 5px solid red; padding:3px">
-     <html:tr><html:td>Row 1 of 3</html:td></html:tr> 
-         <html:tr><html:td>Row 2 of 3</html:td></html:tr> 
-         <html:tr><html:td>Row 3 of 3</html:td></html:tr> 
-</html:table>
-</vbox>
-</window>
-
diff --git a/layout/html/tests/table/bugs/bug12384.html b/layout/html/tests/table/bugs/bug12384.html
deleted file mode 100644
index 6b5513f1ba9a..000000000000
--- a/layout/html/tests/table/bugs/bug12384.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<HTML>
-<BODY>
- <FORM action="/search/client.cgi" method="GET">
-  <TABLE border="1" cellpadding="0" cellspacing="0" bgcolor="#ffe030">
-   <TR valign="top">
-    <TD>
-     <nobr><INPUT type="text" size="30" name="npa"> - <INPUT type="text" size="30" name="nxx"> - <INPUT type="text" size="30" name="number"></nobr>
-    </TD>
-   <TR>
-  </TABLE>
- </FORM>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug123862.html b/layout/html/tests/table/bugs/bug123862.html
deleted file mode 100644
index bef051d22aba..000000000000
--- a/layout/html/tests/table/bugs/bug123862.html
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
			"http://www.w3.org/TR/REC-html40/strict.dtd">
<html>
<head>
<title>Cols and colspan</title>
<style type="text/css">
<!--
table {margin: 1em 0; width: 200px; border: 2px solid black;}
td {border: 1px solid gray; background: #EFE;}
-->
</style>
</head>
<body>

<table>
<tr>
<td>no cols or colspans</td>
</tr>
</table>

<table cols="4">
<tr>
<td>cols=4</td>
</tr>
</table>

<table>
<tr>
<td colspan="4">colspan=4</td>
</tr>
</table>

<table cols="4">
<tr>
<td colspan="4">cols=4, colspan=4</td>
</tr>
</table>

<table cols="4">
<tr>
<td colspan="4">see previous</td>
</tr>
</table>

</body>
</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug1261.html b/layout/html/tests/table/bugs/bug1261.html
deleted file mode 100644
index 27fbfeb54b48..000000000000
--- a/layout/html/tests/table/bugs/bug1261.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html> 
-<body>
-
-<table border=5 bgcolor="#000000" cellpadding=1 cellspacing=0 hspace=2 vspace=2 
-width=200 align=right>
-<tr><td>
-        <table border=5 cellpadding=1 cellspacing=0 xwidth="100%">
-                <tr align=center>
-                <td bgcolor="#ffffcc">
-                  
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxQ
-                </td>
-                </tr>
-        </table>
-</td></tr></table>
-
-</body> 
-</html
diff --git a/layout/html/tests/table/bugs/bug1262.html b/layout/html/tests/table/bugs/bug1262.html
deleted file mode 100644
index f69f524434b7..000000000000
--- a/layout/html/tests/table/bugs/bug1262.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html> <body>
- 1 
-<table border=1 width="100%"> 
-<tr><td></td></tr> 
-</table> 
-2 
-<br> 
-3 
-<table border=1 width="100%"> 
-<tr></tr> 
-</table> 
-4 
-</body> </html>
diff --git a/layout/html/tests/table/bugs/bug126742.html b/layout/html/tests/table/bugs/bug126742.html
deleted file mode 100644
index 582c4d803075..000000000000
--- a/layout/html/tests/table/bugs/bug126742.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD><TITLE></TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-</HEAD>
-<BODY>
-<CENTER>
-<TABLE height="380" cellSpacing=0 cellPadding=0 width="100%" border=0>
-  <TBODY>
-  <TR>
-    <TD width="100%" height=37>
-      <H2 align=center><FONT face="Comic Sans MS">EET 304</FONT></H2></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=15>
-      <P><FONT face="Comic Sans MS" size=2><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/eet_304.htm">Home</A></FONT></P></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/course%20Info/coursedescription.htm"><FONT 
-      face="Comic Sans MS" size=2>Course Information</FONT></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Lecture/lecture.htm"><FONT 
-      face="Comic Sans MS" size=2>Lecture</FONT></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Lecture/lecture.htm"><FONT 
-      face="Comic Sans MS"></FONT></A><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Homework/hw.html"><FONT 
-      face="Comic Sans MS" size=2>Homework</FONT></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Quizzes/Quizzes.htm"><FONT 
-      face="Comic Sans MS" size=2>Quizzes</FONT></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><FONT face="Comic Sans MS" 
-      color=#0000ff size=2><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Exams/exams.htm">Exams</A></FONT></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Homework/hw.html"><FONT 
-      face="Comic Sans MS"></FONT></A><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/lab/lab%20exp.htm"><FONT 
-      face="Comic Sans MS" size=2>Lab<U>oratory</U></FONT></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Grading/grades.htm"><U><FONT 
-      face="Comic Sans MS" size=2>Grades</FONT></U></A></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><FONT face="Comic Sans MS" 
-      size=2><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Filter%20Design/start.htm">Filter 
-      Design</A></FONT></TD></TR>
-  <TR>
-    <TD align=middle width="100%" height=25><FONT face="Comic Sans MS" 
-      size=2><U><A 
-      href="http://www.tech.purdue.edu/eet/courses/eet304/Schedule/Schedule.htm">Office 
-      Hours</A></U></FONT></TD></TR></TBODY></TABLE></CENTER>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug12709.html b/layout/html/tests/table/bugs/bug12709.html
deleted file mode 100644
index bd7fced9b59a..000000000000
--- a/layout/html/tests/table/bugs/bug12709.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE BORDER="1" WIDTH="334">
-  <TR>
-    <TD>
-        This section will provide you with all the information you 
-        may need to use any of your Internet software.
-    </TD>
-    <TD>
-      <IMG SRC="../images/support.gif" ALIGN="RIGHT">
-    </TD>
-  </TR>
-</table>
diff --git a/layout/html/tests/table/bugs/bug1271.html b/layout/html/tests/table/bugs/bug1271.html
deleted file mode 100644
index 5078e4a9c702..000000000000
--- a/layout/html/tests/table/bugs/bug1271.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<body><table CELLSPACING=0 CELLPADDING=0 WIDTH="100%" HEIGHT="100%" >
-<tr>
-<td WIDTH="160"><img SRC="../images/corner.JPG" height=80 width=160></td>
-<td WIDTH="100%" BACKGROUND="../images/160x80.JPG"></td>
-<td><img SRC="../images/40x80.JPG" height=80 width=40></td>
-</tr>
-<tr>
-<td WIDTH="160" HEIGHT="80%" BACKGROUND="../images/160x160.JPG"></td>
-<td COLSPAN="2" ROWSPAN="2"></td>
-</tr>
-<tr>
-<td><img SRC="../images/160x40.JPG" height=40 width=160></td>
-</tr>
-</table>
-</body>
diff --git a/layout/html/tests/table/bugs/bug127267.html b/layout/html/tests/table/bugs/bug127267.html
deleted file mode 100644
index dba0f9d2560f..000000000000
--- a/layout/html/tests/table/bugs/bug127267.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-
-<html>
-
-<head>
-<title>caption dir test</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-<style>
-.rtl {direction:rtl}
-</style>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table>
-<caption class="rtl" style="border:solid; width:500px ">
-is the question mark on the left side with style?
-</caption>
-	<tr>
-		<td>
-			table cell
-		</td>
-	</tr>
-</table>
-<table>
-<caption dir="rtl" style="border:solid; width:500px ">
-is the question mark on the left side without style?
-</caption>
-	<tr>
-		<td>
-			table cell
-		</td>
-	</tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug128229.html b/layout/html/tests/table/bugs/bug128229.html
deleted file mode 100644
index a51a5ed73a44..000000000000
--- a/layout/html/tests/table/bugs/bug128229.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/cd/DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>Testcase</title>
-                         
-  <script>
-function font_res() {
-  var td1 = document.getElementById('mycell');
-  td1.setAttribute("style","font-size:24pt");
-}
-  </script><base
- href="http://bugzilla.mozilla.org/attachment.cgi?id=71855&amp;action=view">
-</head>
-    <body onload="font_res()" id="mycell">
-          
-<table width="90%" border="1" style="table-layout: fixed;">
-     	<tbody>
-        <tr>
-     		<td><a href="http://www.distrowatch.com/xandros.php">Xandros</a> 
-  in the news. text text text text text text text text text text text text 
- text text text text text text text text text text text text text text text 
- text text text text text text text text text text text text text text text 
- text text text text text text text text text text text text text text. 		</td>
-     	</tr>
-                    
-  </tbody>    
-</table>
-          
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug128876.html b/layout/html/tests/table/bugs/bug128876.html
deleted file mode 100644
index 49469146a8f2..000000000000
--- a/layout/html/tests/table/bugs/bug128876.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<BASE HREF="http://bugzilla.mozilla.org/">
-<html><head><title>Testcase for bug 128876</title></head><body>
-
-<table style='border-collapse:collapse'>
- <tr>
-  <td width=755 colspan=3></td>
- </tr>
- <tr>
-  <td width=168></td>
-  <td width=383></td>
-  <td width=204><span>
-       <head><title>on the web</title></head>
-       <script src="notfound"120">
-
-<TR><TD><A href="notfound">::A Geek In Korea::</A><BR><FONT class=adtext>Annyonghaseyo?</FONT></TD></TR><TR><TD align="right"><A href="http://blogsnob.idya.net"><IMG src="http://blogsnob.idya.net/ad.gif" border="0" alt="Ads by BlogSnob"></A></TD></TR></TABLE>
-  </SPAN>
-  </TD>
- </TR>
-</TABLE>
-
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug12908-1.html b/layout/html/tests/table/bugs/bug12908-1.html
deleted file mode 100644
index 1385d5e73766..000000000000
--- a/layout/html/tests/table/bugs/bug12908-1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<BODY BGCOLOR="#C0C0C0">
-
-<P>Border enabled version</P>
-
-<TABLE CELLSPACING="0" CELLPADDING="0" BORDER="1">
-  <TR>
-    <TD WIDTH="29"></TD>
-    <TD WIDTH="300"></TD>
-  </TR>
-  <TR>
-    <TD WIDTH="329" COLSPAN="2"><IMG SRC="../images/ant.jpg" WIDTH="329" HEIGHT="220"></TD>
-  </TR>
-</TABLE>
-
-<P>Cellspanned cell's bgcolor is red</P>
-
-<TABLE CELLSPACING="0" CELLPADDING="0">
-  <TR>
-    <TD WIDTH="29"></TD>
-    <TD WIDTH="300"></TD>
-  </TR>
-  <TR>
-    <TD WIDTH="329" COLSPAN="2" BGCOLOR="red"><IMG SRC="../images/ant.jpg" WIDTH="329" HEIGHT="220"></TD>
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug12908-2.html b/layout/html/tests/table/bugs/bug12908-2.html
deleted file mode 100644
index 4250a4fe4e3d..000000000000
--- a/layout/html/tests/table/bugs/bug12908-2.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<TABLE CELLSPACING="0" CELLPADDING="0">
-  <TR>
-    <TD WIDTH="52" HEIGHT="20"></TD>
-    <TD WIDTH="300" HEIGHT="20"></TD>
-  </TR>
-  <TR>
-    <TD WIDTH="352" HEIGHT="30" COLSPAN="2"><IMG 
-      SRC="../images/alpha-2.jpg" WIDTH="352" HEIGHT="30"></TD>
-  </TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug12910-2.html b/layout/html/tests/table/bugs/bug12910-2.html
deleted file mode 100644
index cf0d78300893..000000000000
--- a/layout/html/tests/table/bugs/bug12910-2.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Star Trek:  TOS TrekMUSE</TITLE>
-</HEAD>
-<BODY BGCOLOR="#000000" MARGINWIDTH=0 MARGINHEIGHT=0 TOPMARGIN=0 LEFTMARGIN=0>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" FRAME WIDTH="100%">
-  <TR> 
-    <TD ALIGN=RIGHT><IMG WIDTH="4" SRC="../images/ll-tall.gif"></TD>
-    <TD WIDTH="100%" VALIGN="BOTTOM"><IMG HEIGHT="14" WIDTH="100%" SRC="../images/horiz-tall.gif"></TD>
-    <TD NOWRAP WIDTH=105><IMG SRC="../images/tos1.gif"><IMG SRC="../images/tos1.gif"><IMG SRC="../images/tos3.gif"><IMG SRC="../images/tos4.gif"><IMG SRC="../images/tos9.gif"><IMG SRC="../images/tosdot.gif"><IMG SRC="../images/tos3.gif"><IMG SRC="../images/tos9.gif">
-</TD>
-    <TD WIDTH="15" VALIGN="BOTTOM"><IMG HEIGHT="14" WIDTH="15" SRC="../images/horiz-tall.gif"></TD>
-    <TD><IMG HEIGHT="20" WIDTH="4" SRC="../images/lr-tall.gif"></TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug12910.html b/layout/html/tests/table/bugs/bug12910.html
deleted file mode 100644
index 81fae172fc48..000000000000
--- a/layout/html/tests/table/bugs/bug12910.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0 marginwidth=0>
-<table border width=100% align=left>
-  <tr><td>text</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1296.html b/layout/html/tests/table/bugs/bug1296.html
deleted file mode 100644
index 4abcc96f8e21..000000000000
--- a/layout/html/tests/table/bugs/bug1296.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<BODY>
-<TABLE>
-  <TR>
-    <td>Let's put some space in here!</td>
-    <TD>
-      <TABLE>
-        <TR>
-          <TD>
-            <TABLE>
-              <TR 
-BACKGROUND="../images/raptor.jpg">
-                <TD><IMG SRC=../images/raptor.jpg WIDTH=4 
-HEIGHT=1><IMG 
-SRC=../images/raptor.jpg
-../images/raptor.jpg USEMAP="#toolbar" WIDTH=436 HEIGHT=35 ALT="button 
-palette" BORDER=0 VSPACE=5 ISMAP>
-
-<MAP NAME="toolbar">
-<AREA SHAPE=RECT COORDS="0,0,41,35" HREF="mailto:">
-<AREA SHAPE=RECT COORDS="41,0,124,35"  
-HREF=../images/raptor.jpg 
-onClick="open_wname('http://my.netscape.com/mys/contact/comingsoon.html','search'); return false;">
-
-<AREA SHAPE=RECT COORDS="124,0,164,35" 
-HREF="/setup_frameset.tmpl?services=addressbook&mn=NO&dest=/contact/index.tmpl">
-<AREA SHAPE=RECT COORDS="164,0,222,35" 
-HREF="http://form.netscape.com/directory/html/no_javascript.html" 
-onClick="open_wname('http://form.netscape.com/directory/lookup/html/search_frameset.html','mdsearch'); return false;">
-<AREA SHAPE=RECT COORDS="309,0,352,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/login/login?U2_SOURCE=ADDRESSBOOK&U2_E
-NDURL=http://home.netscape.com&U2_EXITURL=http://home.netscape.com&U2_BROWSER_OK
-=true&U2_LOGOUT=true">
-<AREA SHAPE=RECT COORDS="352,0,411,35" 
-HREF="/setup_frameset.tmpl?services=addressbook&mn=NO&dest=/contact/index.tmpl">
-
-<AREA SHAPE=RECT COORDS="309,0,352,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/login/login?U2_SOURCE=ADDRESSBOOK&U2_E
-NDURL=http://contact.netscape.com/contact/&U2_EXITURL=http://home.netscape.com&U
-2_BROWSER_OK=true">
-<AREA SHAPE=RECT COORDS="352,0,411,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/entrypoint/dispatch?U2_SOURCE=ADDRESSB
-OOK&U2_NEW_ENDURL=http://contact.netscape.com/setup_frameset.tmpl//&services=add
-ressbook//&mn=NO//&dest=/contact/index.tmpl&U2_EXITURL=http://home.netscape.com&
-U2_BROWSER_OK=true">
-<AREA SHAPE=RECT COORDS="411,0,436,35" 
-HREF="http://my.netscape.com/mys/contact/help.html">
-</MAP>
-
-
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>     
-</body> 
diff --git a/layout/html/tests/table/bugs/bug1302.html b/layout/html/tests/table/bugs/bug1302.html
deleted file mode 100644
index 216404ff8f14..000000000000
--- a/layout/html/tests/table/bugs/bug1302.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<html><body>
-
-<div align=center>
-<hr>
-<p><b>Tables I, II, III, IV (cellpadding=0 cellspacing=5)</b></p>
-
-<table border cellpadding=5 bgcolor=ffcc00>
-<tr><td valign=top> 
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table I</nobr></caption>
-  <tr>
-    <td>1,1</td><td>1,2</td><td>1,3</td><td>1,4</td><td>1,5</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td>2,2</td><td>2,3</td><td>2,4</td><td>2,5</td>
-  </tr>
-  <tr>
-    <td>3,1</td><td bgcolor=ffff66>3,2</td><td bgcolor=ffff66>3,3</td><td bgcolor=ffff66>3,4</td><td>3,5</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table II</nobr></caption>
-  <tr>
-    <td>1,1</td><td colspan=2>1,2</td><td>1,4</td><td>1,5</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td>2,2</td><td colspan=2>2,3</td><td>2,5</td>
-  </tr>
-  <tr>
-    <td>3,1</td><td bgcolor=ffff66>3,2</td><td bgcolor=ffff66>3,3</td><td bgcolor=ffff66>3,4</td><td>3,5</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table III</nobr></caption>
-  <tr>
-    <td>1,1</td><td colspan=2>1,2</td><td>1,4</td><td>1,5</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td>2,2</td><td colspan=2>2,3</td><td>2,5</td>
-  </tr>
-  <tr>
-    <td>3,1</td><td bgcolor=ffff66></td><td bgcolor=ffff66></td><td bgcolor=ffff66></td><td>3,5</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table IV</nobr></caption>
-  <tr>
-    <td>1,1</td><td colspan=2>1,2</td><td>1,4</td><td>1,5</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td>2,2</td><td colspan=2>2,3</td><td>2,5</td>
-  </tr>
-</table>
-
-</td></tr></table>
-</div>
-
-<BR>
-<p>
-This is a table colspan counting problem (IMHO). 
-The oversize &lt;TABLE> has two rows: one has *two* &lt;TD>
-"requesting" total of 3 columns to span; second row has *one* &lt;TD>
-"requesting" total of 3 columns to span. In other words, it's asking
-for one more column than the max number of 'real' elements in a row.
-
-Here's the simple case (first one shows the problem; the other adjusts the 
-colspan values and it works) (Dec 19 Nightly Win 95): All the elements in 
-the two tables below are width=auto (i.e., no width attribute specified).
-</p><br>
-
-<TABLE CELLPADDING="3" CELLSPACING="0" border="1">
-  <TR> 
-    <TD colspan="2"><P><b>This is colspan=2</b></P></TD>
-    <TD>Blah Blah Blah Blah Blah Blah</TD>
-  </TR>
-  <TR>
-    <TD colspan="3">
-      <p><b>This is colspan=3</b> blah blah blah blah blah
-         --- why doesn't this cell span the table (5.0 win95 jun17)?
-      </p>
-    </TD>
- </TR>
-</TABLE>
-<br><br>
-<TABLE CELLPADDING="3" CELLSPACING="0" border="1">
-  <TR> 
-    <TD colspan="1"><P><b>This is colspan=1</b></P></TD>
-    <TD>Blah Blah Blah Blah Blah Blah</TD>
-  </TR>
-  <TR>
-    <TD colspan="2">
-      <p><b>This is colspan=2</b> blah blah blah blah blah
-         --- this cell spans the table correctly.
-      </p>
-    </TD>
- </TR>
-</TABLE>
-
-<br><p>
-
- Here's the test case from bug #2645. 
-</p><p>
-This test case (below) is derived from home.netscape.com (although
-not much is left).  [This was the table structure for "Autos ... Local
-..." and the right-hand column ("ABCNews.com..."); added an extra column
-to differentiate this example a bit more from the one above]. 
-</p><p>
- The basic problem is "competing colspan requests". The table has two rows, 
-both of which have COLSPAN requests. They are both asking for one more column 
-than the max number of 'real' elements in either row (i.e., both ask for total
-of 5 but the maximum number of TD in either row is 4). This seems to confuse the 
-algorithm. ;) (Note: all the column elements in these two tables are width=fixed
-except the TD with colspan=(4|3)).
-</p>
-
-<TABLE WIDTH=680 border>
-
-  <TR>
-<td width=80>x</td>
-    <TD WIDTH=400 COLSPAN=2>         this (colspan=2)</TD>
-    <TD WIDTH=2   BGCOLOR="#99cccc"> blue </TD>
-    <TD WIDTH=198>                   that </TD>
-  </TR>
-  <TR>
-<td width=80>x</td>
-    <TD COLSPAN=4 BGCOLOR="#99cccc"> blue (colspan=4) --- doesn't span (5.0 win95 jun17)</TD>
-  </TR></TABLE>
-<br><p>
-Here's the same table but the 'colspan' values have been normalized.
-</p>
-<TABLE WIDTH=680 border>
-
-  <TR>
-<td width=80>x</td>
-    <TD WIDTH=400 COLSPAN=1>         this (colspan=1)</TD>
-    <TD WIDTH=2   BGCOLOR="#99cccc"> blue </TD>
-    <TD WIDTH=198>                   that </TD>
-  </TR>
-  <TR>
-<td width=80>x</td>
-    <TD COLSPAN=3 BGCOLOR="#99cccc"> blue (colspan=3) --- spans correctly</TD>
-  </TR></TABLE>
-
-
-<BR>
-
-
-
-
-</body></html>
-
diff --git a/layout/html/tests/table/bugs/bug131020-2.html b/layout/html/tests/table/bugs/bug131020-2.html
deleted file mode 100644
index 086d5cf9da78..000000000000
--- a/layout/html/tests/table/bugs/bug131020-2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-<title>Testcase for bug 131020</title>
-</head>
-<body>
-<table style="width:600px; height:400px" border="1">
-  <tr style="height:100%"> 
-    <td style="height:100%"> 
-      <table style="width:100%; height:100%" border="1">
-        <tr style="height:100%"> 
-          <td style="height:100%">
-           <div style="width:100%; height:100%; border:5px solid blue">
-           </div>
-         </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug131020-3.html b/layout/html/tests/table/bugs/bug131020-3.html
deleted file mode 100644
index d0db2ec5364b..000000000000
--- a/layout/html/tests/table/bugs/bug131020-3.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<html>
-<head>
-<title>Mozilla 0.9.6 (since 0.9.5) - bug</title>
-</head>
-<body bgcolor="#19BCD2">
-
-<table align="center" border="1" width="100%" height="200" cellspacing="0" cellpadding="0" bgcolor="orange">
-<tbody>
- <tr height=30>
-  <td height=80% valign=top>80% of table 200px table</td>
- </tr>
- <tr>
-  <td height=20% valign=top>20% of table 200px table</td>
- </tr>
-</table>
-<BR>
-<table align="center" border="1" width="100%" cellspacing="0" cellpadding="0" bgcolor="orange">
-<tbody style="height:200px">
- <tr>
-  <td height=80% valign=top>80% of 200px tbody</td>
- </tr>
- <tr>
-  <td height=20% valign=top>20% of 200px tbody</td>
- </tr>
-</table>
-<BR>
-<table align="center" border="1" width="100%" cellspacing="0" cellpadding="0" bgcolor="orange">
-<tbody style="height:200px">
- <tr height=30>
-  <td height=80% valign=top>80% of 200px tbody</td>
- </tr>
- <tr>
-  <td height=20% valign=top>20% of 200px tbody</td>
- </tr>
-</table>
-<BR>
-<table align="center" border="1" width="100%" height=200 cellspacing="0" cellpadding="0" bgcolor="orange">
-<tbody>
- <tr style="height: 80%">
-  <td valign=top>row 80% of 200px table</td>
- </tr>
- <tr style="height: 20%">
-  <td height=20% valign=top>row 20% of 200px table</td>
- </tr>
-</table>
-<BR>
-<table align="center" border="1" width="100%" cellspacing="0" cellpadding="0" bgcolor="orange">
-<tbody style="height:200px">
- <tr style="height: 80%">
-  <td valign=top>row 80% of 200px tbody</td>
- </tr>
- <tr style="height: 20%">
-  <td height=20% valign=top>row 20% of 200px tbody</td>
- </tr>
-</table>
-<BR>
-<table align="center" border="1" width="100%" height="380" cellspacing="0" cellpadding="0" bgcolor="orange">
- <tr>
-  <td height=100% valign=top>
-   <table align="center" border="0" width="100%" height="100%" cellspacing="0" cellpadding="0" bgcolor="yellow">
-    <tr>
-     <td width=136 height=100>&nbsp;x</td>
-    </tr>
-   </table>
-   <table align="center" border="0" width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-     <td width=134 height=100 valign="top" bgcolor="#e0ffff">yuiyututuyu  fesfe<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<BR>
-
-<table style="width:600px; height:400px" border="1">
-  <tr style="height:100%"> 
-    <td style="height:100%"> 
-      <table style="width:100%; height:100%" border="1">
-        <tr style="height:100%"> 
-          <td style="height:100%">
-<table style="width:100%; height:100%" border="1">
-        <tr style="height:100%"> 
-          <td style="height:100%">foo
-      </td>
-        </tr>
-      </table>
-
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-<BR>
-
-<table cellpadding="0" cellspacing="0" summary="" border>
- <tr>
-  <td rowspan="2">blah blah</td>
- </tr>
- <tr height="25%"></tr>
-</table>
-
-<BR>
-
-<TABLE CELLPADDING=0 CELLSPACING=0 WIDTH=602 BORDER=1>
- <TR>
-  <TD COLSPAN="2" ROWSPAN=2 VALIGN=TOP BGCOLOR="#FFFFFF">
-   <IMG src="../images/wiz438sidebar.gif" ALT="" BORDER=0></TD></TR>
- <TR>
-   <TD COLSPAN=6 HEIGHTx="45" ALIGN=RIGHT>xxx</TD></TR>
-</TABLE>
-
-<BR>
-
-<table align="center" border="0" width="748" cellspacing="4" cellpadding="3"
-bgcolor="grey" bordercolor="#036D7F">
-<tr>
-<td valign=top>
-
-<table align="center" border="1" width="100%" height="380" cellspacing="0"
-cellpadding="0" bgcolor="orange">
-<tr>
-<td valign=top>
-<table align="center" border="0"
-width="100%" height="100%" cellspacing="0" cellpadding="0" bgcolor="yellow">x
-<tr>
-<td width=136 height=100>&nbsp;</td>
-</tr>
-</table>
-
-
-<table alig n="center" border="0" width="100%" cellspacing="0" cellpadding="0">
-<tr>
-<td width=134 height=100 valign="top" bgcolor="#e0ffff">
-yuiyututuyu  fesf
-e<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;<br>&nbsp;
-</td>
-</tr>
-</table>
-
-</td>
-</tr>
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug131020.html b/layout/html/tests/table/bugs/bug131020.html
deleted file mode 100644
index 70e64f7724d5..000000000000
--- a/layout/html/tests/table/bugs/bug131020.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><head><title>Testcase for bug 131020</title></head>
-<body>
-
-
-<table width="800" height="100%" border="1">
-  <tr> 
-    <td> 
-      <table width="100%" height="100%" border="1">
-        <tr> 
-          <td><iframe width="100%" height="100%" 
-                      src="bug131020_iframe.html"
-                      style="border:5px solid blue">
-              </iframe></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug131020_iframe.html b/layout/html/tests/table/bugs/bug131020_iframe.html
deleted file mode 100644
index 13da5ee62d7d..000000000000
--- a/layout/html/tests/table/bugs/bug131020_iframe.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<html>
-<head>
-<title>Start</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<link rel="stylesheet" href="css/styles.css" type="text/css">
-</head>
-
-<body bgcolor="#53799F" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" text="#000000">
-<center>
-  <br>
-  <table width="95%" border="1" cellspacing="0" cellpadding="0" bordercolor="#000000">
-    <tr> 
-      <td align="center" class="kopftext" bgcolor="#3F5694">News</td>
-    </tr>
-    <tr>
-      <td align="center" class="schrift"><b>11. M&auml;rz 2002</b><br>
-        nun gibt es auch eine kommerzielle Version vom PopUp-Manager, mehr Info 
-        unter komerz. Scripte </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift"><b>09.M&auml;rz 2002<br>
-        </b>neues Script ist online, PopUp-Manager, mehr Info unter Scripte</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">17. November 2001<br>
-        Endlich wieder Online! :-)</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">23. Oktober 2001 (21:00 Uhr)<br>
-        Es ist vollbracht! <br>
-        Ich habe nun den .htaccess-BUG bei den Scripten:<br>
-        The Real Topsites, Sponsor Manager, Download Manager und Password Manager<br>
-        abgeschafft, brauchte 2 Tage daf&uuml;r, dabei lag der Fehler vor meiner 
-        Nase ! :-)<br>
-        F&uuml;r Euch hei&szlig;t es, wenn Ihr eines der Scripte benutzt, ladet 
-        Euch die admin.cgi runter und vereinbart unbedingt ein neues Password! 
-        Au&szlig;erdem wurde bei der Toplist die Sache mit dem Button Load/Klick 
-        um programmiert, f&uuml;r die Leute die den Button Load/Klick Modus haben, 
-        Ihr m&uuml;st Euch auch die topsites.cgi laden und im Admin Bereich unter 
-        Modus unten die URL zu Eurem Button angeben!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">22. Oktober 2001<br>
-        Download-Bereich ist vorrerst geschlo&szlig;en, kommen Sie bitte sp&auml;ter 
-        wieder.</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">21. Oktober 2001 (22:45 Uhr)<br>
-        OK, sorry f&uuml;r die Unannehmlichkeiten, aber Ihr m&uuml;sst Euch nun 
-        noch mal die Scripte runter laden und die admin.cgi erneuern, hier kommt 
-        noch das Password-Manager-Script dazu, sollte jetzt alles sicher sein! 
-        <br>
-      </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">21. Oktober 2001 (20:50 Uhr)<br>
-        An alle Leute die follgende Scripte von G5-Scripts benutzen:<br>
-        The Real Topsites, Download Counter, Sponsor Manager<br>
-        bitte noch ein mal runter laden und die admin.cgi erneuern, beim Sponsor 
-        Manager kommt noch eine Datei<br>
-        'variable.pl' dazu!!<br>
-        Der Grund : man hat festgestellt das .htaccess Password Schutz doch nicht 
-        das sicherste ist!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift"> 
-        <p>13. Oktober 2001<br>
-          Ich habe es nun endlich geschafft das Gateway bei der Toplist mit IP-Sperre 
-          zu versehen,<br>
-          dabei war der Fehler den ich vorher nicht verstand eine simple Sache, 
-          h&auml;tte ich doch ein wenig mehr nachgedacht!<br>
-          Des weiteren habe ich noch die Datensicherung umgeschrieben, f&uuml;r 
-          alle die Listen deren Hits ab und zu mal auf 0 gesetzt werden, sollte 
-          jetzt nicht mehr passieren und ich habe noch den Mail Versand aus dem 
-          Admin-Bereich umgeschrieben und zwar wurde fr&uuml;her der Text immer 
-          zusammen gequetscht, die Enters wurden so zu sagen ignoriert, jetzt 
-          nicht mehr!</p>
-        <p>&gt;&gt; F&uuml;r alle die das Script vor dem 11.10.01 runter geladen 
-          haben, Ihr solltet es Euch noch mal runter laden und die folgenden Dateien 
-          durch die neuen ersetzen: topsites.cgi und admin.cgi . </p>
-      </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">11. Oktober 2001<br>
-        neues Script ist online, .htaccess-Password-Manager, mehr Info unter Scripte</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">08. September 2001<br>
-        Eine neu Version des Download Counters ist online!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">11. August 2001<br>
-        Ich habe so eben eine random.cgi f&uuml;r den Topsites Script geschrieben. 
-        Die random.cgi f&uuml;hrt den Besucher<br>
-        auf eine zuf&auml;llig ausgew&auml;hlte Seite.</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">08. August 2001<br>
-        Ich schreibe gerade eine neue Version von dem Download Counter, bitte 
-        schreibt mir<br>
-        ins Forum was Ihr da alles haben wollt, wer das benutzt!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">09. Juli 2001<br>
-        eine kleiner Bug in der Topsites.cgi wurde behoben! Wer m&ouml;chte kann 
-        sich die jetzige Zip runter laden und die topsites.cgi auktualisieren, 
-        mu&szlig; aber nicht unbedingt sein!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">01. Juli 2001<br>
-        Jetzt haben wir einen Support Forum, postet Eure Fragen da rein und versuche 
-        Sie alle zu<br>
-        beantworten! Au&szlig;erdem k&ouml;nnt Ihr dort auch Eure Vorschl&auml;ge 
-        zu den einzelnen Scripten abgeben!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">01. Juli 2001<br>
-        Und wieder eine neue Version von The Real Topsites ist online, die Version 
-        3.4!<br>
-        Es gibt einige neue Funktionen und es wurde auch einiges verbessert!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">20. Juni 2001<br>
-        unser Hoster hat ein paar kleine Probleme also sollte irgend was an der 
-        Seite<br>
-        nicht gehen, einfach wieder versuchen!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">09. Juni 2001<br>
-        Die neue Version (3.3) von The Real Topsites ist online, es gibt einige 
-        neue Funktionen <br>
-        und es wurde auch einiges ver&auml;ndert!<br>
-        Mehr Info unter &quot;Perl Scripte&quot; im Men&uuml;. <br>
-        P.S. den Umstieg auf die Version3.3 kann ich Euch nur empfehlen!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">04. Juni 2001<br>
-        Ein kleiner Bug bei Topsites Script wurde gefunden und sofort behoben!<br>
-        Bug: es wurde immer wieder die selbe Site Of The Moment angezeigt!<br>
-        Ladet Euch die jetzige Version runter und ersetzt nur die topsites.cgi 
-        !</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">01. Juni 2001<br>
-        Ein neues Script ist online! G5-ICQ Newsletter. <br>
-        Mehr Info unter &quot;Perl Scripte&quot; im Men&uuml;. </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">31. Mai 2001<br>
-        Ich habe einen ICQ-Newsletter Script installiert, unter dem Men&uuml;.<br>
-        Tragt Euch ein, dann seit Ihr immer auf dem neusten Stand!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">26. Mai 2001<br>
-        The Real Topsites v3.0 ist online!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">25. Mai 2001<br>
-        Ein neues Script ist online! G5-Download Counter.<br>
-        Mehr Info unter &quot;Perl Scripte&quot; im Men&uuml;. </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">24. Mai 2001<br>
-        Ich habe es mir sehr lange &uuml;berlegt, die Entscheidung war wirklich 
-        nicht leicht!<br>
-        Ich habe mich entschieden den Script &quot;The Real Topsites&quot; zum 
-        Download freizugeben.<br>
-        Ihr k&ouml;nnt es Euch jetzt kostenlos runter laden!<br>
-        Viel Spa&szlig; damit!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">13. Mai 2001<br>
-        Es gab nur eine kleine Ver&auml;nderung bei G5-Sponsor-Manager, man kann 
-        den Script jetzt auch via Java aufrufen, so das Euer Server jetzt nicht 
-        unbedingt SSI unterst&uuml;tzen mu&szlig; um den Script ausf&uuml;hren 
-        zu k&ouml;nnen!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">22. April 2001<br>
-        Ein neues Script ist online! G5-Sponsor-Manager.<br>
-        Mehr Info unter &quot;Perl Scripte&quot; im Men&uuml;.</td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">20. April 2001<br>
-        Auf einige Anfragen habe ich eine Demonstration von <br>
-        &quot;The Real Topsites&quot; (Toplist Script) ver&ouml;ffentlicht!<br>
-        Mehr Info unter &quot;Perl Scripte&quot; im Men&uuml;. </td>
-    </tr>
-    <tr> 
-      <td align="center" class="schrift">13. M&auml;rz 2001<br>
-        An diesem Tag ging die G5-Script.de online!</td>
-    </tr>
-    <tr> 
-      <td align="center" class="kopftext">&nbsp;</td>
-    </tr>
-  </table>
-<br>
-</center>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug13105.html b/layout/html/tests/table/bugs/bug13105.html
deleted file mode 100644
index 17cd4682f8c5..000000000000
--- a/layout/html/tests/table/bugs/bug13105.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head><title>Testcase for bug 13105</title></head>
-<body>
-<P><code>&lt;TABLE border="0" frame="void"></code>
-<TABLE border="0" frame="void">
-<tr>
-  <td>Left</td>
-  <td>Right</td>
-</tr>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug13118.html b/layout/html/tests/table/bugs/bug13118.html
deleted file mode 100644
index 46b94775174f..000000000000
--- a/layout/html/tests/table/bugs/bug13118.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html><head><title>Testcase for bug 13118</title></head><body bgcolor="white">
-
-<H4>TBODY is not correctly positioned when TFOOT is present but THEAD is not:</H4>
-<TABLE BORDER="1">
-<TFOOT><TR><TD>TFOOT</TD></TR></TFOOT>
-<TBODY><TR><TD>TBODY</TD></TR></TBODY>
-</TABLE>
-<BR>
-<TABLE BORDER="1">
-<THEAD><TR><TH>THEAD</TH></TR></THEAD>
-<TFOOT><TR><TD>TFOOT</TD></TR></TFOOT>
-<TBODY><TR><TD>TBODY</TD></TR></TBODY>
-</TABLE>
-
-<P>Same as above but with <code>CELLSPACING="10"</code>:
-<TABLE BORDER="1" CELLSPACING="10">
-<TFOOT><TR><TD>TFOOT</TD></TR></TFOOT>
-<TBODY><TR><TD>TBODY</TD></TR></TBODY>
-</TABLE>
-<BR>
-<TABLE BORDER="1" CELLSPACING="10">
-<THEAD><TR><TH>THEAD</TH></TR></THEAD>
-<TFOOT><TR><TD>TFOOT</TD></TR></TFOOT>
-<TBODY><TR><TD>TBODY</TD></TR></TBODY>
-</TABLE>
-
-</body></html> 
diff --git a/layout/html/tests/table/bugs/bug13169.html b/layout/html/tests/table/bugs/bug13169.html
deleted file mode 100644
index 4f6711bb84f1..000000000000
--- a/layout/html/tests/table/bugs/bug13169.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0>
-
-<table cellspacing=0 border=3>
-        <tr>
-                <td></td><td rowspan=2><img src="../images/ant.jpg"></td>
-        </tr><tr>
-                <td rowspan=2><img src="../images/ant.jpg"></td>
-        </tr><tr>
-                <td></td>
-        </tr>
-</table>
-
-<table cellspacing=1 border=3>
-        <tr>
-                <td></td><td rowspan=2><img src="../images/ant.jpg"></td>
-        </tr><tr>
-                <td rowspan=2><img src="../images/ant.jpg"></td>
-        </tr><tr>
-                <td></td>
-        </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1318.html b/layout/html/tests/table/bugs/bug1318.html
deleted file mode 100644
index bb31685e3637..000000000000
--- a/layout/html/tests/table/bugs/bug1318.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<TABLE BORDER=0 ALIGN=CENTER CELLPADDING=1 CELLSPACING=0>
-<FORM METHOD=POST ACTION="http://poll.cnn.com/poll?53061">
-<INPUT TYPE=HIDDEN NAME="Poll" VALUE="5306">
-<!-- Question 1 -->
-<TR>
-<TD ALIGN=CENTER COLSPAN=4>
-<INPUT TYPE=HIDDEN NAME="Question" VALUE="1"><BR>
-<FONT FACE="arial,helvetica,sans-serif" SIZE="3">The Supreme Court says 
-Wisconsin can continue using tuition vouchers to help poor parents send their 
-children to church-run schools.  What's your stand? <BR><BR></FONT>
-</TD>
-</TR>
-<TR>
-<TD align=right ><FONT FACE="arial,helvetica,sans-serif" SIZE="2">
-I agree with the program</FONT>
-</TD>
-<TD align=left ><INPUT TYPE=RADIO NAME="Answer5307" VALUE=1></TD></TR><TR><TD 
-align=right ><FONT FACE="arial,helvetica,sans-serif" SIZE="2">
-I think vouchers are wrong</FONT>
-</TD>
-<TD align=left ><INPUT TYPE=RADIO NAME="Answer5307" VALUE=2></TD>
-</TR>
-<!-- /end Question 1 -->
-<TR>
-<TD ALIGN=CENTER COLSPAN=2>
-<A HREF="http://poll.cnn.com/poll?53061"><FONT FACE="arial,helvetica,sans-serif" 
-SIZE="-1">View Results</A>
-</TD>
-<TD ALIGN=CENTER COLSPAN=2>
-<INPUT TYPE=SUBMIT VALUE="vote">
-</TD>
-</FORM>
-</TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug13196.html b/layout/html/tests/table/bugs/bug13196.html
deleted file mode 100644
index e0ff91bd62d0..000000000000
--- a/layout/html/tests/table/bugs/bug13196.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><title>Testcase for bug 13196</title></head><body bgcolor="white">
-
-<TABLE WIDTH="100%"border=1><TR><TD>
-
-  <TABLE WIDTH="100%" ALIGN="right" border=1>
-    <TR><TD>WINGs is a small widget set with the N*XTSTEP look and feel. It's API is inspired in OpenStep and it's implementation borrows some ideas from Tk.
-    </TD></TR>
-  </TABLE>
-
-</TD></TR></TABLE>
-
-</body></html> 
diff --git a/layout/html/tests/table/bugs/bug133756-1.html b/layout/html/tests/table/bugs/bug133756-1.html
deleted file mode 100644
index d882dacfd93f..000000000000
--- a/layout/html/tests/table/bugs/bug133756-1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-<title>das Leben</title>
-</head>
-  <body>
-                <table cellpadding="0" cellspacing="0" summary="">
-      <tbody>
-                          <tr>
-          <td rowspan="4">
-                                  <p>blah blah</p>
-          </td>
-        </tr>
-        <tr height="25%">
-<!--            <td></td> -->
-        </tr>
-                                <tr height="25%">
-<!--            <td></td> -->
-        </tr>
-                                <tr height="25%">
-<!--            <td></td> -->
-        </tr>
-      </tbody>
-    </table>
-                <p>text at the bottom</p>
-  </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug133756-2.html b/layout/html/tests/table/bugs/bug133756-2.html
deleted file mode 100644
index de2eea55016a..000000000000
--- a/layout/html/tests/table/bugs/bug133756-2.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-<title>Testcase for bug 133756</title>
-</head>
-  <body>
-
-
-Table 1: border=1 cellspacing=0 cellpadding=0
-    <table border=1 cellspacing=0 cellpadding=0>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr height="50%"></tr>
-    </table>
-
-Table 2: border=1 cellspacing=1 cellpadding=0
-    <table border=1 cellspacing=1 cellpadding=0>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr height="50%"></tr>
-    </table>
-
-Table 3: border=1 cellspacing=0 cellpadding=1
-    <table border=1 cellspacing=0 cellpadding=1>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr height="50%"></tr>
-    </table>
-
-Table 4: border=1 cellspacing=1 cellpadding=1
-    <table border=1 cellspacing=1 cellpadding=1>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr height="50%"></tr>
-    </table>
-
-
-<br><br>Same tables as above but removing height="50%" from the second row:<br><br>
-
-Table 5: border=1 cellspacing=0 cellpadding=0
-    <table border=1 cellspacing=0 cellpadding=0>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr></tr>
-    </table>
-
-Table 6: border=1 cellspacing=1 cellpadding=0
-    <table border=1 cellspacing=1 cellpadding=0>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr></tr>
-    </table>
-
-Table 7: border=1 cellspacing=0 cellpadding=1
-    <table border=1 cellspacing=0 cellpadding=1>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr></tr>
-    </table>
-
-Table 8: border=1 cellspacing=1 cellpadding=1
-    <table border=1 cellspacing=1 cellpadding=1>
-        <tr><td rowspan="2">First Row</td></tr>
-        <tr></tr>
-    </table>
-
-
-  </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug133948.html b/layout/html/tests/table/bugs/bug133948.html
deleted file mode 100644
index 37aa865db19f..000000000000
--- a/layout/html/tests/table/bugs/bug133948.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-
-<head>
-<title>yet another 100% problem</title>
-</head>
-
-<body>
-
-<table bgcolor="black" height=100% width=100% summary="test1" border=1 cellpadding=10 cellspacing=0>
-  <tr>
-    <td>
-
-    <table bgcolor="orange" height=100% width=100% summary="test2" border=1 cellpadding=10 cellspacing=0>
-      <tr>
-        <td>
-
-          <table bgcolor="red" height=100% width=100% summary="test3" border=1 cellpadding=10 cellspacing=0>
-            <tr>
-              <td>
-                &nbsp;
-              </td>
-            </tr>
-          </table>
-
-        </td>
-      </tr>
-    </table>
-
-    </td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug13484.html b/layout/html/tests/table/bugs/bug13484.html
deleted file mode 100644
index 7bcd7ffca116..000000000000
--- a/layout/html/tests/table/bugs/bug13484.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<table bgcolor="#E2BF81" border="1">
-  <tr>
-    <td>&lt;td></td>
-    <td width="100%">&lt;td width="100%"></td>
-    <td width="100%">&lt;td width="100%"></td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug13526.html b/layout/html/tests/table/bugs/bug13526.html
deleted file mode 100644
index a76a7bb1b629..000000000000
--- a/layout/html/tests/table/bugs/bug13526.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML><HEAD><TITLE>test</TITLE></HEAD><BODY> 
-
-   <TABLE cellPadding="10%"> 
-       <TR><TD>cell data</TD></TR> 
-       <TR><TD>cell data</TD></TR> 
-   </TABLE> 
-
-   <SCRIPT TYPE="text/javascript">
-
- 
-       var oList=document.firstChild.childNodes[1].childNodes[1]; 
-       document.write(oList.cellPadding); 
-
-   
-
-</SCRIPT></BODY></HTML> 
diff --git a/layout/html/tests/table/bugs/bug137388-1.html b/layout/html/tests/table/bugs/bug137388-1.html
deleted file mode 100644
index 74df9c35ceb6..000000000000
--- a/layout/html/tests/table/bugs/bug137388-1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-      <table>
-        <tr>
-
-          <td>
-            <iframe src="helloWorld.html" width=100% height=100%
-
-name="iframe"></iframe>
-          </td>
-
-        </tr>
-      </table>
diff --git a/layout/html/tests/table/bugs/bug137388-2.html b/layout/html/tests/table/bugs/bug137388-2.html
deleted file mode 100644
index 371f42124406..000000000000
--- a/layout/html/tests/table/bugs/bug137388-2.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<table><tr><td  height="300">
-<iframe src="helloWorld.html" width=100% height=100%></iframe>
-</td></tr></table>
-
-<table><tr><td  height="300">
-<image src="../images/mozilla-banner.gif" width=100% height=100%>
-</td></tr></table>
-
-
-<table><tr><td>
-<iframe src="helloWorld.html" width=100% height=100%></iframe>
-</td></tr></table>
-
-<table><tr><td>
-<image src="../images/mozilla-banner.gif" width=100% height=100%>
-</td></tr></table>
diff --git a/layout/html/tests/table/bugs/bug137388-3.html b/layout/html/tests/table/bugs/bug137388-3.html
deleted file mode 100644
index 4325e136ea5b..000000000000
--- a/layout/html/tests/table/bugs/bug137388-3.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<table>
-        <tr> 
-          <td height="210" width="200"> 
-          <div>
-            <iframe src="" width=100% height=100%
-
-name="iframe"></iframe>
-          </div>
-          </td>
-        </tr>
-      </table>
diff --git a/layout/html/tests/table/bugs/bug138725.html b/layout/html/tests/table/bugs/bug138725.html
deleted file mode 100644
index 8fe5721cca95..000000000000
--- a/layout/html/tests/table/bugs/bug138725.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-   <body>
-      <table>
-         <tr>
-            <td>
-               <span>
-                  <span>
-                     <head>
-                        <title></title>
-                     </head>
-                     <table>
-                        <tr>
-                           <td>
-                              <table align="left">
-                                 <tr>
-                                    <td>
-                                       <form>
-                                          <input type="submit" value="ApplyForThisPosition">
-                                       </form>
-                                    </td>
-                                 </tr>
-                              </table>
-                           </td>
-                        </tr>
-                     </table>
-                  </span>
-               </span>
-            </td>
-         </tr>
-      </table>
-   </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug139524-1.html b/layout/html/tests/table/bugs/bug139524-1.html
deleted file mode 100644
index e6fd6d5380cc..000000000000
--- a/layout/html/tests/table/bugs/bug139524-1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>testcase: col with multilength width and span</TITLE>
-</HEAD>
-<BODY>
-<TABLE width="100%" summary="Navigation">
- <COL span="3" width="*">
- <TBODY>
-  <TR>
-   <TD bgcolor="#00FFFF">06</TD>
-   <TD bgcolor="#FFFF00">05</TD>
-   <TD bgcolor="#FF00FF">04</TD>
-  </TR>
- </TBODY>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug139524-2.html b/layout/html/tests/table/bugs/bug139524-2.html
deleted file mode 100644
index 314acc370dc6..000000000000
--- a/layout/html/tests/table/bugs/bug139524-2.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-             "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<title>SPAN attribute in COL element being ignored.</title>
-
-<style type="text/css">
-pre {font:1em monospace; margin-left:15px; color:#000066;}
-
-td {border:thin solid black;}
-
-.aside {font-style:italic;}
-
-</style>
-</head>
-
-<body>
-<h3>SPAN attribute of COL element being ignored in Mozilla 1.0 rc1</h3>
-
-<p class="aside">(Note: this is a regression bug - I don't know when it appeared, but I remember the SPAN attribute on COL elements worked fine sometime before Mozilla 0.9.6)</p>
-
-<p>The following TABLE has a COLGROUP structure of:</p>
-<pre>&lt;colgroup&gt;
- &lt;col width="100" span="2"&gt;
- &lt;col width="200"&gt;
-&lt;/colgroup&gt;
-</pre>
-
-<p>So the first two colums should both be 100px wide, and the third should be 200px wide.</p>
-<p>However, the first column is 100px, the second is 200px, and the third is the default width.</p>
-<p>So it would appear that the SPAN attribute is being ignored.</p>
-    
-<table>
-
-<colgroup>
- <col width="100" span="2">
- <col width="200">
-</colgroup>
-
-<tr>
- <td>col 1</td>
- <td>col 2</td>
- <td>col 3</td>
-</tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug139524-3.html b/layout/html/tests/table/bugs/bug139524-3.html
deleted file mode 100644
index 9f1ee1262023..000000000000
--- a/layout/html/tests/table/bugs/bug139524-3.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>testcase: col with multilength width and span</TITLE>
-</HEAD>
-<BODY>
-<TABLE width="100%" summary="Navigation">
-<colgroup>
- <COL span="3" width="*">
-</colgroup>
- <TBODY>
-  <TR>
-   <TD bgcolor="#00FFFF">06</TD>
-   <TD bgcolor="#FFFF00">05</TD>
-   <TD bgcolor="#FF00FF">04</TD>
-  </TR>
- </TBODY>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug139524-4.html b/layout/html/tests/table/bugs/bug139524-4.html
deleted file mode 100644
index a3ac86d302c9..000000000000
--- a/layout/html/tests/table/bugs/bug139524-4.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head>
-        <title>Table col span test</title></head>
-
-<body>
-
-
-<table border="1">
-        <col width="50" span="2">
-        <col width="100" span="2">
-        <tbody><tr>
-                <td>1</td>
-                <td>2</td>
-                <td>3</td>
-                <td>4</td>
-        </tr>
-</tbody></table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug139843.html b/layout/html/tests/table/bugs/bug139843.html
deleted file mode 100644
index 660ec80ca1ff..000000000000
--- a/layout/html/tests/table/bugs/bug139843.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body>
-<div style='overflow:auto; height:100px; width:80%'>
-	<table border=0 cellpadding=0 cellspacing=0 width='100%'>
-		<tr><td class='subTableHdr'>
-			blah
-		</td></tr>
-	</table>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug14007-1.html b/layout/html/tests/table/bugs/bug14007-1.html
deleted file mode 100644
index 14479553280c..000000000000
--- a/layout/html/tests/table/bugs/bug14007-1.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<html><head>
-<style type="text/css">
-
-tbody.scroll1   {overflow: auto;height: 80px;}
-tbody.scroll2   {overflow: auto;height: 80px;width: 50px;}
-table scroll2   {width: 50px;}
-
-</style></head>
-
-<body>
-<table border=0 cellpadding=0 cellspacing=0><tr valign=top><td>
-
-<table border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 1/1</th></tr></thead>
-
-        <tbody class=scroll1><tr><td>
-        1 2 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-        </td></tr></tbody>
-</table>
-
-</td><td>
-
-<table border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 2/1</th></tr></thead>
-
-        <tbody class=scroll1><tr><td>
-        1 2 3 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-        # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-        </td></tr></tbody>
-</table>
-
-</td><td>
-
-<table border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 3/1</th></tr></thead>
-
-        <tbody class=scroll1><tr><td>
-        1 2 3 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-        ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-        </td></tr></tbody>
-</table>
-
-<td></tr><tr><td>
-
-<table class=scroll2 border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 1/2</th></tr></thead>
-
-        <tbody class=scroll2><tr><td>
-        1 2 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 
-        </td></tr></tbody>
-</table>
-
-</td><td>
-
-<table class=scroll2 border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 2/2</th></tr></thead>
-
-        <tbody class=scroll2><tr><td>
-        1 2 3 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-        # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
-        </td></tr></tbody>
-</table>
-
-</td><td>
-
-<table class=scroll2 border=0 cellpadding=0 cellspacing=0>
-<thead><tr><th>Header 3/2</th></tr></thead>
-
-        <tbody class=scroll2><tr><td>
-        1 2 3 ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-        ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! 
-        </td></tr></tbody>
-</table>
-
-</td></tr></table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug14007-2.html b/layout/html/tests/table/bugs/bug14007-2.html
deleted file mode 100644
index 6f1eddb9b160..000000000000
--- a/layout/html/tests/table/bugs/bug14007-2.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<html><head><title>Bug example 2</title>
-<style type="text/css">
-tr      {vertical-align: top;}
-td      {width: 80px;font-size: 12pt;text-align: left;background-color: #404080;color: white;}
-td.d    {color: yellow;width: auto;font-size: 16pt;font-weight: 600}
-tbody.a {background-color:yellow;height: 80px;overflow: auto;}
-table   {border-spacing: 0px;}
-</style></head>
-
-<body>
-<center>Build 1999/10/27/08 Win95 - Daily Build<br><table border=10>
-<caption>January 2000</caption>
-<tr>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td><table><tr><td class=d>1.</td><td><table><tbody class=a><tr><td>
-                <p>Test mozilla one last time.
-                <p>New Years day.
-                <p>Y2K!!!
-                <p>Find Abacus from attic
-                <p>Eat Ice Cream before it melts
-                <p>Lock doors & hide
-        </td></tr></tbody></table></td></tr></table><br></td>
-</tr><tr>
-        <td><table><tr><td class=d>2.</td><td><table><tbody class=a><tr><td>
-                <p>Look for Y2K survivers.
-                <p>Build outhouse
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table><br></td>
-        <td><table><tr><td class=d>3.</td><td><table><tbody class=a><tr><td>
-                <p>Write letter to electric company
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>4.</td><td><table><tbody class=a><tr><td>
-                <p>Send the snail mail
-                <p>Go to work and stare at dead monitor
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>5.</td><td><table><tbody class=a><tr><td>
-                <p>Go to work and stare at dead monitor
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>6.</td><td><table><tbody class=a><tr><td>
-                <p>Go to work and stare at dead monitor
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>7.</td><td><table><tbody class=a><tr><td>
-                <p>Go internet exploring for food.
-                <p>Internet exploring doesn't work.
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>8.</td><td><table><tbody class=a><tr><td>
-                <p>Go internet exploring for food again.
-                <p>Internet exploring doesn't work again.
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table></td>
-</tr><tr>
-        <td><table><tr><td class=d>9.</td><td><table><tbody class=a><tr><td>
-                <p>Go internet exploring for food.
-                <p>Internet exploring still doesn't work.
-                <p>Give up internet exploring for food.
-                <p>Eat reserve food
-        </td></tr></tbody></table></td></tr></table><br></td>
-        <td><table><tr><td class=d>10.</td><td><table><tbody class=a><tr><td>
-                <p>Power comes back on.
-                <p>Put trusty abacus back in attic
-                <p>Grab latest mozilla
-                <p>Test it
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>11.</td><td><table><tbody class=a><tr><td>
-                <p>Grab latest mozilla
-                <p>Test it
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>12.</td><td><table><tbody class=a><tr><td>
-                <p>Grab latest mozilla
-                <p>Test it
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>13.</td><td><table><tbody class=a><tr><td>
-                <p>Grab latest mozilla
-                <p>Test it
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>14.</td><td><table><tbody class=a><tr><td>
-                <p>Grab latest mozilla
-                <p>Test it
-        </td></tr></tbody></table></td></tr></table></td>
-        <td><table><tr><td class=d>15.</td><td><table><tbody class=a><tr><td>
-                <p>Grab latest mozilla
-                <p>Test it
-                <p>Mozilla removes Y2K Warning from FTP site
-                <p>This bug is fixed
-        </td></tr></tbody></table></td></tr></table></td>
-</tr><tr>
-        <td><table><tr><td class=d>16.</td><td><table><tbody class=a><tr><td>
-                ?
-        </td></tr></tbody></table></td></tr></table></td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-</tr><tr>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-        <td>-</td>
-</tr>
-</table><br>
-Notice the scrollbars,
-they are rendered outside of the table columns, and the yellow day numbers are hidden under them.
-
-<p>This is probably another bug already covered, or fixed, but
-day 3 & 16 should have no scrollbar, but the area where the other scrollbars are drawn is drawn funny.
-They are not rendered.  They seem to be whatever was drawn there before, or drawn somewhere else.
-Day 16 (contaings only the letter "?") has a region below the ? mark that is never rendered.
-Resize the window so the window can scroll down and scroll the page up & down.</center>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug14159-1.html b/layout/html/tests/table/bugs/bug14159-1.html
deleted file mode 100644
index 9e34d7cb67dc..000000000000
--- a/layout/html/tests/table/bugs/bug14159-1.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<TABLE>
-<TR>
-    <TD WIDTH=1></TD>
-</TR>
-<TR>
-    <TD>
-BlaBlaBla Bla BlaBla BlaBlaBlaBla Bla Bla Bla BlaBlaBla BlaBla Bla BlaBla BlaBlaBlaBla BlaBla Bla BlaBla BlaBla Bla</P>
-    </TD>
-</TR>
-</table>
-
-<BR>
-
-<TABLE>
-<TR>
-    <TD>
-BlaBlaBla Bla BlaBla BlaBlaBlaBla Bla Bla Bla BlaBlaBla BlaBla Bla BlaBla BlaBlaBlaBla BlaBla Bla BlaBla BlaBla Bla</P>
-    </TD>
-</TR>
-<TR>
-    <TD WIDTH=1></TD>
-</TR>
-</table>
diff --git a/layout/html/tests/table/bugs/bug14159-2.html b/layout/html/tests/table/bugs/bug14159-2.html
deleted file mode 100644
index 1f8755012b5f..000000000000
--- a/layout/html/tests/table/bugs/bug14159-2.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<table>
-  <tr>
-    <td nowrap>
-        <table>
-      <tr>
-        <td width="8%">news</td>
-
-        <td width="10%">archives</td>
-
-        <td width="11%">hardware</td>
-
-        <td width="7%">shots</td>
-
-        <td width="7%">games</td>
-
-        <td width="7%">files</td>
-
-        <td width="9%">reviewseek</td>
-
-        <td width="9%">forums</td>
-
-        <td width="10%">interviews</td>
-
-        <td width="7%">about</td>
-
-        <td width="6%">links</td>
-
-        <td width="9%">advertise</td>
-      </tr>
-    </table></td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug14159-3.html b/layout/html/tests/table/bugs/bug14159-3.html
deleted file mode 100644
index 9bd9d266e4a4..000000000000
--- a/layout/html/tests/table/bugs/bug14159-3.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE>
-        <TR>
-                <TD> 
-                        Really sorry about the server yesterday 
-                </TD>
-        </TR>
-        <TR>
-                <TD WIDTH=1>
-                </TD>
-        </TR>
-</table>
diff --git a/layout/html/tests/table/bugs/bug141818.html b/layout/html/tests/table/bugs/bug141818.html
deleted file mode 100644
index 09e244b0cc55..000000000000
--- a/layout/html/tests/table/bugs/bug141818.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-<html>
-<body>
-
-<table class="DataBg" border="0" cellpadding="0" cellspacing="1" >
-
- <td align="center" class="DataHeader" width="2"
-rowspan="9999999">&nbsp;</td>
-    <td align="center" class="DataHeader" colspan="3"><div
-class="margin3">Allocation Probability (%)</div></td>
-  </tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug1430.html b/layout/html/tests/table/bugs/bug1430.html
deleted file mode 100644
index d7a79c5bfeac..000000000000
--- a/layout/html/tests/table/bugs/bug1430.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<BODY>
-Here's the HTML test case, extracted from the Netcenter Address Book page. At 
-the top of the address book is a "tool bar" with options like "New," 
-"Directory," "Sign-out," "Customize," etc. These are areas in a client side 
-image map. You should be able to click on these areas of the map, including the 
-areas on the right side of the map. However, in NGLayout, the right side of the 
-map isn't "clickable" -- the cursor doesn't change and the link cannot be 
-"activated."
-
-I think somewhere we're miscalculating where the imagemap's areas are, because 
-the areas on the left still work, although clicking on them sometimes crashes. 
-It's as though NGLayout thinks the Imagemap areas are located a few 
-hundred pixels to the left. 
-<BR>
-<TABLE>
-  <TR>
-    <td>Let's put some space in here!</td>
-    <TD>
-      <TABLE>
-        <TR>
-          <TD>
-            <TABLE>
-              <TR 
-BACKGROUND=../images/raptor.jpg>
-                <TD><IMG SRC=../images/raptor.jpg WIDTH=4 
-HEIGHT=1><IMG 
-SRC=../images/raptor.jpg 
-../images/raptor.jpg USEMAP="#toolbar" WIDTH=436 HEIGHT=35 ALT="button 
-palette" BORDER=0 VSPACE=5 ISMAP>
-
-<MAP NAME="toolbar">
-<AREA SHAPE=RECT COORDS="0,0,41,35" HREF="mailto:">
-<AREA SHAPE=RECT COORDS="41,0,124,35"  
-HREF="http://form.netscape.com/directory/html/no_javascript.html" 
-onClick="open_wname('http://my.netscape.com/mys/contact/comingsoon.html','search'); return false;">
-
-<AREA SHAPE=RECT COORDS="124,0,164,35" 
-HREF="/setup_frameset.tmpl?services=addressbook&mn=NO&dest=/contact/index.tmpl">
-<AREA SHAPE=RECT COORDS="164,0,222,35" 
-HREF="http://form.netscape.com/directory/html/no_javascript.html" 
-onClick="open_wname('http://form.netscape.com/directory/lookup/html/search_frameset.html','mdsearch'); return false;">
-<AREA SHAPE=RECT COORDS="309,0,352,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/login/login?U2_SOURCE=ADDRESSBOOK&U2_E
-NDURL=http://home.netscape.com&U2_EXITURL=http://home.netscape.com&U2_BROWSER_OK
-=true&U2_LOGOUT=true">
-<AREA SHAPE=RECT COORDS="352,0,411,35" 
-HREF="/setup_frameset.tmpl?services=addressbook&mn=NO&dest=/contact/index.tmpl">
-
-<AREA SHAPE=RECT COORDS="309,0,352,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/login/login?U2_SOURCE=ADDRESSBOOK&U2_E
-NDURL=http://contact.netscape.com/contact/&U2_EXITURL=http://home.netscape.com&U
-2_BROWSER_OK=true">
-<AREA SHAPE=RECT COORDS="352,0,411,35" 
-HREF="http://ureg.netscape.com/iiop/UReg2/entrypoint/dispatch?U2_SOURCE=ADDRESSB
-OOK&U2_NEW_ENDURL=http://contact.netscape.com/setup_frameset.tmpl//&services=add
-ressbook//&mn=NO//&dest=/contact/index.tmpl&U2_EXITURL=http://home.netscape.com&
-U2_BROWSER_OK=true">
-<AREA SHAPE=RECT COORDS="411,0,436,35" 
-HREF="http://my.netscape.com/mys/contact/help.html">
-</MAP>
-
-
-</td></tr></table>
-</td></tr></table>
-</td></tr></table>     
-</body> 
diff --git a/layout/html/tests/table/bugs/bug14323.html b/layout/html/tests/table/bugs/bug14323.html
deleted file mode 100644
index f908c5d570f7..000000000000
--- a/layout/html/tests/table/bugs/bug14323.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HTML>
-<BODY BGCOLOR="#FFFFFF">
-
-<hr align=left style="width:150px;">
-<table BGCOLOR="#F7D68C" width=150 BORDER=1 CELLPADDING=0 CELLSPACING=0>
- <tr>
-  <td>xxxxxxxxxxxxxxxxx xxxxxx xxxxxx</td>
-  <TD><IMG SRC="../images/b_pre2.gif" WIDTH="21" HEIGHT="45"><IMG
-           SRC="../images/b_sui2.gif" WIDTH="21" HEIGHT="45"></TD>
- </tr>
-</table>
-<BR>
-
-
-<TABLE BGCOLOR="#F7D68C" WIDTH=468 BORDER=0 CELLPADDING=0 CELLSPACING=0>
-<TR VALIGN=TOP>
-  <TD><FONT SIZE=4><B>&nbsp;25 offres d'emploi des entreprises</B></FONT></TD>
-  <TD BGCOLOR="#EE9E02" ALIGN=RIGHT>
-      <IMG SRC="../images/trans.gif" WIDTH="20" HEIGHT="1">page
-      <FONT SIZE=4><B>12 /     13 </B></FONT></TD>
-  <TD ROWSPAN=2>
-      <IMG SRC="../images/b_pre2.gif" WIDTH="21" HEIGHT="45"><IMG
-
-           SRC="../images/b_sui2.gif" WIDTH="21" HEIGHT="45"></TD>
-</TR>
-<TR>
-  <TD><IMG SRC="../images/trans.gif" WIDTH="326" HEIGHT="30"></TD>
-  <TD><IMG SRC="../images/trans.gif" WIDTH="100" HEIGHT="30"></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug14489.html b/layout/html/tests/table/bugs/bug14489.html
deleted file mode 100644
index c7b270387aec..000000000000
--- a/layout/html/tests/table/bugs/bug14489.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html><body bgcolor="#c0c0c0">
-
-<table border="3">
-	<tr>
-		<td>
-
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-<br>
-
-<table border="3">
-	<tr>
-		<td>
-			blah blah
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-<br>
-
-<table border="3">
-	<tr>
-		<td>
-			blah blah
-			<p>
-			<table border="3" align="left" width=50%>
-				<tr>
-					<td>
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-						blah blah blah blah blah blah blah blah blah blah blah blah blah
-					</td>
-				</tr>
-			</table>
-
-    </td>
-  </tr>
-</table>
-
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug145572.html b/layout/html/tests/table/bugs/bug145572.html
deleted file mode 100644
index 34bc1cc94a04..000000000000
--- a/layout/html/tests/table/bugs/bug145572.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<style>
-div {border:solid green; position:absolute; top:150px;right:150px;width:60%}
-table {border:solid blue; width:60%}
-table.ab {position:absolute; top:200px;right:200px}
-</style>
-</head>
-<body>
-<table class="ab">
-  <tbody>
-    <tr>
-      <td>foo</td>
-    </tr>
-  </tbody>
-</table>
-<table>
-  <tbody>
-    <tr>
-      <td>foo</td>
-    </tr>
-  </tbody>
-</table>
-<div>div</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1474.html b/layout/html/tests/table/bugs/bug1474.html
deleted file mode 100644
index 299822660503..000000000000
--- a/layout/html/tests/table/bugs/bug1474.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>
-<TABLE WIDTH="80%" BORDER=1>
-<TR><td>one</td><td>two</td><td>three</td><td>four!</td></TR>
-</TABLE>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug149275-1.html b/layout/html/tests/table/bugs/bug149275-1.html
deleted file mode 100644
index d1bdddaed54d..000000000000
--- a/layout/html/tests/table/bugs/bug149275-1.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<body>
-        <table border='1' width='100%' height='100%'>
-                <tr>
-                        <td height='50px' valign=top>
-                                <center>abcdef
-                        </td>
-                </tr>
-                <tr>
-                        <td>
-                                <div id=dvFundos style='height:100%;width:750px;overflow:auto;border-style:solid;'>
-                                        <center>
-                                        <table width=900px>
-                                                <tr>
-                                                        <td>
-                                                                Line 1<br>
-                                                                Line 2<br>
-                                                                Line 3<br>
-                                                                Line 4<br>
-                                                                Line 5<br>
-                                                                Line 6<br>
-                                                                Line 7<br>
-                                                                Line 8<br>
-                                        </table>
-                                </div>
-                        </td>
-                </tr>
-        </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug149275-2.html b/layout/html/tests/table/bugs/bug149275-2.html
deleted file mode 100644
index 9828b080562e..000000000000
--- a/layout/html/tests/table/bugs/bug149275-2.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-        <table border='1' height='100'>         
-                <tr>
-                        <td>
-                                <div id=dvFundos style='height:80%;overflow:auto;border-style:solid;'>                                  
-                                        Text
-                                </div>
-                        </td>
-                </tr>
-        </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug14929.html b/layout/html/tests/table/bugs/bug14929.html
deleted file mode 100644
index 8181ca4ccb4b..000000000000
--- a/layout/html/tests/table/bugs/bug14929.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-
-<head>
-<title>testcase for bug14929</title>
-</head>
-
-<body>
-
-The simplified original testcase<p>
-<table border="1" width="640">
- <tr>
-  <td colspan="2"><img src="../images/mozilla-banner.gif"></td>
- </tr>
- <tr>
-  <td width="20%">MC&nbsp;Visa</td>
-  <td width="80%">SLmail</td>
- </tr>
-</table>
-<hr width="128" align="left">
-
-The simplified original testcase with image size reduced to190px<p>
-<table border="1" width="640">
- <tr>
-  <td colspan="2"><img src="../images/mozilla-banner.gif" width="190"></td>
- </tr>
- <tr>
-  <td width="20%">MC&nbsp;Visa</td>
-  <td width="80%">SLmail</td>
- </tr>
-</table>
-<hr width="128" align="left">
-
- Testcase without image<p>
-<table border="1" width="640">
- <tr>
-  <td colspan="2">text text text text text text text text text text text text text text text text text text text text text text text text text text text text text </td>
- </tr>
- <tr>
-  <td width="20%">MC&nbsp;Visa</td>
-  <td width="80%">SLmail</td>
- </tr>
-</table>
-<hr width="128" align="left">
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug15247.html b/layout/html/tests/table/bugs/bug15247.html
deleted file mode 100644
index aa0ea8ade2eb..000000000000
--- a/layout/html/tests/table/bugs/bug15247.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<table border=1>
- <tr>
-  <td>
-   some normal text before the nested table
-   <table style="margin-left: 50px; width: 90%" border=1>
-    <td >selection of words to pad table cell
-	<td>selection of words to pad table cell
-	<td>selection of words to pad table cell</td>
-   </table>
-   some normal text after the nested table
-  <td>contents of table cell to right</td>
- </tr>
-</table>
-
-<table border=1>
- <tr>
-  <td>
-   some normal text before the nested table
-   <table style="margin-left: 50px;" border=1>
-    <td >selection of words to pad table cell
-	<td>selection of words to pad table cell
-	<td>selection of words to pad table cell</td>
-   </table>
-   some normal text after the nested table
-  <td>contents of table cell to right</td>
- </tr>
-</table>
-
-<table border=1>
- <tr>
-  <td>
-   some normal text before the nested table
-   <table style="margin-left: 50px; border:10px solid black; padding:5px" border=1>
-    <td >selection of words to pad table cell
-	<td>selection of words to pad table cell
-	<td>selection of words to pad table cell</td>
-   </table>
-   some normal text after the nested table
-  <td>contents of table cell to right</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug154780.html b/layout/html/tests/table/bugs/bug154780.html
deleted file mode 100644
index 002fc767c44d..000000000000
--- a/layout/html/tests/table/bugs/bug154780.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<style>
-#o-content-overflow {
-        width: 100px;
-        overflow: hidden;
-        text-align: left;
-}
-</style>
-<body>
-<table width="100%">
-<tr>
-<td align="center">
-<div id="o-content-overflow">
-ddddddd
-</div>
-</td>
-<td>test</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug15544.html b/layout/html/tests/table/bugs/bug15544.html
deleted file mode 100644
index 028ffd6ac252..000000000000
--- a/layout/html/tests/table/bugs/bug15544.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<table border="0" cellspacing="0" cellpadding="0" width="80">
-<!-- notice below   width="31" for an img with  width="30" --> 
-<tr><td rowspan="3" width="31" height="93"><img width="30" height="93" src="../images/leftbit.jpg"></td>
-    <td width="50" height="28"><img width="25" src="../images/1.jpg"><img width="25" src="../images/2.jpg"></td></tr>
-<tr><td width="50" height="25"><img width="25" src="../images/5.jpg"><img width="25" src="../images/6.jpg"></td></tr>
-<tr><td width="50" height="40"><img width="25" src="../images/9empty.jpg"><img width="25" src="../images/10empty.jpg"></td></tr>
-</table>
-
-Here's the same table without the off-by-one error.
-
-<table border="0" cellspacing="0" cellpadding="0" width="80"> 
-<!-- and here       width="30" correctly. -->
-<tr><td rowspan="3" width="30" height="93"><img width="30" height="93" src="../images/leftbit.jpg"></td>
-    <td width="50" height="28"><img width="25" src="../images/1.jpg"><img width="25" src="../images/2.jpg"></td></tr>
-<tr><td width="50" height="25"><img width="25" src="../images/5.jpg"><img width="25" src="../images/6.jpg"></td></tr>
-<tr><td width="50" height="40"><img width="25" src="../images/9empty.jpg"><img width="25" src="../images/10empty.jpg"></td></tr>
-</table>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug157890.html b/layout/html/tests/table/bugs/bug157890.html
deleted file mode 100644
index cd5383e838bd..000000000000
--- a/layout/html/tests/table/bugs/bug157890.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<style>
-</style>
-<script>
-function dumpsizes(tblid) {
-  var view = document.defaultView;
-  var table = document.getElementById(tblid);
-  var target = document.getElementById("target");
-  var tablewidth = view.getComputedStyle(table, "").getPropertyValue("width");
-  target.appendChild(document.createTextNode("Specified table width: " + table.style.width + "\n"));
-  target.appendChild(document.createTextNode("Actual table width:    "+tablewidth+"\n"));
-  var tds = table.getElementsByTagName("td");
-  target.appendChild(document.createTextNode("Specified TD widths: "));
-  for (var i = 0 ; i < tds.length; ++i) {
-    target.appendChild(document.createTextNode(tds[i].style.width + " "));
-  }
-  target.appendChild(document.createTextNode("\n"));
-  
-  target.appendChild(document.createTextNode("Actual TD widths:    "));
-  for (var i = 0 ; i < tds.length; ++i) {
-    target.appendChild(document.createTextNode(view.getComputedStyle(tds[i], "").getPropertyValue("width") + " "));
-  }
-  target.appendChild(document.createTextNode("\n\n"));
-  
-}
-</script>
-</head>
-<body onload="dumpsizes('table1'); dumpsizes('table2'); dumpsizes('table3'); dumpsizes('table4'); dumpsizes('table5'); dumpsizes('table6');">
-<table style="table-layout: fixed; width: 25px" border="0" cellspacing="0" cellpadding="0" id="table1">
-<tr>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 8px"></td>
-</tr>
-</table>
-
-<table style="table-layout: fixed; width: 12px" border="0" cellspacing="0" cellpadding="0" id="table2">
-<tr>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 8px"></td>
-</tr>
-</table>
-
-<table style="table-layout: fixed; width: 13px" border="0" cellspacing="0" cellpadding="0" id="table3">
-<tr>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 8px"></td>
-</tr>
-</table>
-
-<table style="table-layout: fixed; width: 24px" border="0" cellspacing="0" cellpadding="0" id="table4">
-<tr>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 8px"></td>
-</tr>
-</table>
-
-<table style="table-layout: fixed; width: 25px" border="0" cellspacing="0" cellpadding="0" id="table5">
-<tr>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 1px"></td>
-<td style="width: 8px"></td>
-</tr>
-</table>
-
-
-<table style="table-layout: fixed; width: 17px" border="0" cellspacing="0" cellpadding="0" id="table6">
-<tr>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-<td style="width: 10%"></td>
-</tr>
-</table>
-
-<pre id="target">
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug159108.html b/layout/html/tests/table/bugs/bug159108.html
deleted file mode 100644
index 4e5a006c9ee7..000000000000
--- a/layout/html/tests/table/bugs/bug159108.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-  <title>test</title>
-<style><!--
-
-#menu {
-  position: absolute;
-  left: 1cm;
-  top: 1cm;
-  border: 20px solid #000060;
-  border-collapse: collapse;
-}
-
---></style>
-</head>
-<body>
-
-<table id="menu">
-<tr><td>line 1</td></tr>
-<tr><td>line 2</td></tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug15933.html b/layout/html/tests/table/bugs/bug15933.html
deleted file mode 100644
index 1ff59b98144a..000000000000
--- a/layout/html/tests/table/bugs/bug15933.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<body>
- <table cellspacing=0 cellpadding=0 border=1>
-  <tr>
-   <td style="line-height: 0"><img src="../images/showattachment.cgi" width=1 height=1></td>
-  </tr>
-</table>
-<BR>
- <table cellspacing=0 cellpadding=0 border=1>
-  <tr>
-   <td style="line-height: 0"></td>
-  </tr>
-</table>
-<BR>
-<table cellspacing=0 cellpadding=0 border=1>
-  <tr>
-   <td style="line-height: 0"><img src="../images/showattachment.cgi" width=1 height=1></td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug16012.html b/layout/html/tests/table/bugs/bug16012.html
deleted file mode 100644
index 4609f1e55794..000000000000
--- a/layout/html/tests/table/bugs/bug16012.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML><HEAD>
-  <TITLE>Testcase for bug 16012</TITLE>
-</HEAD>
-
-Tables: both lines should be 1 pixel thick.<BR>
-<BR>
-<TABLE CELLPADDING=0>
-  <TR VALIGN=TOP ALIGN=LEFT>
-    <TD BGCOLOR=RED><IMG SRC="../images/clearpixel.gif" WIDTH=30 HEIGHT=1 BORDER=0></TD>
-    <TD></TD>
-  </TR>
-</TABLE>
-<BR>
-
-<TABLE CELLPADDING=0>
-  <TR VALIGN=TOP ALIGN=LEFT>
-    <TD BGCOLOR=RED><IMG SRC="../images/clearpixel.gif" WIDTH=30 HEIGHT=1 BORDER=0></TD>
-  </TR>
-</TABLE>
-<BR>
-<BR>
-<BR>2 texts, FACE="Arial, Helvetica",   1st at size=0, 2nd at size=-4<BR>
-<BR>
-<FONT FACE="Arial,Helvetica" SIZE=0>Detonator 3.53 Drivers<BR>Available NOW!&nbsp;</FONT><BR>
-<BR>
-
-<FONT FACE="Arial,Helvetica" SIZE=-4>Detonator 3.53 Drivers<BR>Available NOW!&nbsp;</FONT><BR>
-<BR>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug16252.html b/layout/html/tests/table/bugs/bug16252.html
deleted file mode 100644
index df9b01595a83..000000000000
--- a/layout/html/tests/table/bugs/bug16252.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<html>
-<head>
-<TITLE>Wilt Chamberlain, Basketball Legend, Dead at 63</TITLE>
-</head>
-<body>
-<table border=0 cellpadding=0 cellspacing=0>
-<tr><td align=left width=600 valign=top>
-<img src="../images/bar.gif" border=0 WIDTH=600 HEIGHT=1>
-<BLOCKQUOTE><BLOCKQUOTE>
-
-<table align="right" border="0" cellpadding="2" cellspacing="0" width=260>
-<tr><td bgcolor="#ffffff" width=10><br></td><td bgcolor="#ccccdd"><font size=-1 face="ariel,helvetica"><b>CHAMBERLAIN'S CAREER
-STATISTICS</b></font></td></tr>
-<tr><td bgcolor="#ffffff"><br></td><td>
-
- <table cellspacing="0" cellpadding=2 border=0 width=250><tr bgcolor=#eeeeee>
-<td align=left valign=top><font face="ariel,helvetica"
-size=-2>Year</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Team</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>GP</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>Reb</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>RPG</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>Pts</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>PPG</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>59-60</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>72</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1941</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>27.0</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2707</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>37.6</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>60-61</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>79</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2149</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>27.2</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>3033</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>38.4</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>61-62</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>80</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2052</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>25.7</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>4029</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>50.4</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>62-63</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>San Francisco</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 80</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1946</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>24.3</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>3806</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>44.8</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>63-64</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>San Francisco</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 80</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1787</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>22.3</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2948</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>36.9</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>64-65</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>S.F.-Phila</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>73</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1673</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>22.9</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2534</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>34.7</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>65-66</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>79</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1943</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>24.6</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>2649</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>33.5</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>66-67</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>81</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1957</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>24.2</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1956</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>24.1</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>67-68</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>Philadelphia</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>82</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1952</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>23.8</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1992</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>24.3</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>68-69</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>L.A. Lakers</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 81</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1712</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>21.1</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1664</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>20.5</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>69-70</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>L.A. Lakers</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 12</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>221</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>18.4</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>328</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>27.3</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>70-71</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>L.A. Lakers</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>82</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1493</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>18.2</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1696</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>20.7</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>71-72</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>L.A. Lakers</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 82</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1572</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>19.2</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1213</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>14.8</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top><font
-face="ariel,helvetica" size=-2>72-73</td><td align=left valign=top><font face="ariel,helvetica"
-size=-2>L.A. Lakers</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2> 82</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1526</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>18.6</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1084</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>13.2</td></tr>
-<tr bgcolor=#ffffff><td align=left valign=top colspan=2><font
-face="ariel,helvetica" size=-2>Totals</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>1045</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>23924</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>22.9</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>31419</td><td align=right valign=top><font face="ariel,helvetica"
-size=-2>30.1</td></tr>
-
-</table><hr size=1></td></tr></table>
-
-    Known as ``Wilt the Stilt'' and ``The Big Dipper,'' the 7-foot-1 Chamberlain dominated the NBA from 1959 through 1973, when he played for the Philadelphia (later the San Francisco) Warriors, the 76ers and the Lakers. He scored 31,419 points during his career, averaging 30.1 points for his career.<p>
-    He also led the league in career rebounding with 23,924.<p>
-    One of only two men named MVP and rookie of the year in the same season (1959), he was also MVP in 1966 through 1968. He led the NBA in scoring seven straight seasons, 1960 to 1966, and led the league in rebounding 11 of his 14 seasons.<p>
-    One of his most famous records is the 100 points he scored in a single game in the Philadelphia Warriors' 169-147 defeat of the New York Knicks on March 2, 1962, in Hershey, Pa.
-
-</BLOCKQUOTE></BLOCKQUOTE>
-</td></tr></table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1647.html b/layout/html/tests/table/bugs/bug1647.html
deleted file mode 100644
index c599c00eef0d..000000000000
--- a/layout/html/tests/table/bugs/bug1647.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML><BODY BGCOLOR="#ffffff" LINK="#000099" VLINK="#660099" ALINK="#CC0033" TEXT="#000000">
- <TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0>
-  <TR VALIGN="TOP">
-   <TD ROWSPAN=2 bgcolor="#CCCC9C">xxxxxxxxxxxx<BR></TD>
-   <TD bgcolor=lightgrey WIDTH="1" HEIGHT="227"><hr WIDTH="1" HEIGHT="227" ALT="" BORDER="0"><BR></TD>
-   <TD bgcolor=orange WIDTH="89" HEIGHT="234"><hr WIDTH="89" HEIGHT="68" ALT="" BORDER="0">
-    <BR><hr WIDTH="89" HEIGHT="90" ALT="" BORDER="0"><BR><hr WIDTH="89" HEIGHT="68" ALT="" BORDER="0"><BR></TD>
-  </TR>
-  <TR>
-   <TD colspan=5 valign=top><IMG src="../images/sell_text1a.gif"; 
-    WIDTH="446" HEIGHT="56" ALT="" BORDER="0"><BR></TD>
-  </TR>
-  <TR>
-   <TD rowspan=2 valign=top><IMG src="../images/sell_side.gif"; 
-     WIDTH="152" HEIGHT="291" ALT="" BORDER="0"><BR></TD><TD colspan=5>
-	  <IMG src="../images/sell_text2.gif"; WIDTH="446" 
-	    HEIGHT="118" ALT="" BORDER="0"><BR></TD>
-  </TR>
-  <TR>
-   <TD colspan=5><IMG src="../images/sell_text3.gif"; 
-     WIDTH="446" HEIGHT="173" ALT="" BORDER="0"><BR></TD>
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug17130-1.html b/layout/html/tests/table/bugs/bug17130-1.html
deleted file mode 100644
index a23db24549b0..000000000000
--- a/layout/html/tests/table/bugs/bug17130-1.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html><head><title>Testcase for bug 17130, Vertical Alignment error</title></head>
-<body bgcolor="#FFFFFF">
-<H4>Testcase distilled from <a href="http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new">http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new</a></H4>
-<H4>Resize the width of the window and watch the Buy and Pick columns below.</H4>
-
-<table width="100%">
-<tr bgcolor="#CCCCCC">
-  <td>Re-sort by Title</td>
-  <td><SPAN>Buy</SPAN>&nbsp;</td>
-  <td>&nbsp;<SPAN>Pick</SPAN>&nbsp;</td>
-</tr>
-<tr>
-  <td>Norton AntiVirus Definitions Update 10/21/99 Update your NAV for
-      Windows 95/98/NT, Lotus Notes, or Exchange with the latest virus definitions.</td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-</table>
-
-<BR>
-<H4>This is the same table as above but with all &lt;SPAN> elements removed.</H4>
-<table width="100%">
-<tr bgcolor="#CCCCCC">
-  <td>Re-sort by Title</td>
-  <td>Buy&nbsp;</td>
-  <td>&nbsp;Pick&nbsp;</td>
-</tr>
-<tr>
-  <td>Norton AntiVirus Definitions Update 10/21/99 Update your NAV for
-      Windows 95/98/NT, Lotus Notes, or Exchange with the latest virus definitions.</td>
-  <td>&nbsp;</td>
-  <td>&nbsp;</td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug17130-2.html b/layout/html/tests/table/bugs/bug17130-2.html
deleted file mode 100644
index 03af7e41e7ad..000000000000
--- a/layout/html/tests/table/bugs/bug17130-2.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><title>Testcase for bug 17130, Line break Error</title></head>
-<body bgcolor="#FFFFFF">
-<H4>Testcase distilled from <a href="http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new">http://www.download.com/pc/list/0,339,0-b-0-0-a-1,00.html?st.dl.fd.ag.new</a></H4>
-<H4>Minimize the window and then open it again.</H4>
-
-<table width="100%">
-<tr bgcolor="#006633">
-  <td><font color="#ffcc00" size="3">&nbsp;&nbsp;<SPAN>CNET</SPAN> : <SPAN>Downloads</SPAN> : </font></td>
-</tr>
-</table>
-
-<BR>
-<H4>This is the same table as above but with all &lt;SPAN> elements removed.</H4>
-<table width="100%">
-<tr bgcolor="#006633">
-  <td><font color="#ffcc00" size="3">&nbsp;&nbsp;CNET : Downloads : </font></td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug17138.html b/layout/html/tests/table/bugs/bug17138.html
deleted file mode 100644
index 9dbe39a41405..000000000000
--- a/layout/html/tests/table/bugs/bug17138.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html><head><title>Testcase for bug 17138</title></head>
-<body bgcolor="#FFFFFF">
-<h4>Testcase distilled from <a href="http://www.weather.com">http://www.weather.com</a></h4>
-<TABLE WIDTH="450" BORDER="0" CELLSPACING="0" CELLPADDING="0">
-  <TR>
-    <TD COLSPAN=3 VALIGN="TOP"><IMG SRC="../images/breaking_weather_314_anim.gif"
-                                WIDTH=318 HEIGHT=17></TD>
-    <TD ROWSPAN=2>
-       <TABLE BGCOLOR="E0EBF5" HEIGHT=125 WIDTH=125 CELLSPACING=0 CELLPADDING=0 BORDER=0>
-         <TR>
-           <TD><img src="../images/125_ncbug.gif"><BR>
-               Jose moving out to sea<BR><BR><BR><BR><BR><BR><BR><BR>
-           </TD>
-         </TR>
-       </TABLE>
-    </TD>
-  </TR>
-  <TR>
-     <TD VALIGN="TOP"><IMG SRC="../images/fall_167x105.jpg"
-                         HEIGHT=105 WIDTH=167 ALT="Fall">
-     </TD>
-     <TD>&nbsp;</TD>
-     <TD VALIGN="TOP"><FONT FACE="ARIAL,HELVETICA" SIZE=2><B>Chilly time</B><BR>
-       Though the calendar disagrees, the feel of winter is in the air across much of the East.</FONT>
-     </TD>
-  </TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug17168.html b/layout/html/tests/table/bugs/bug17168.html
deleted file mode 100644
index 9ee9808ecf68..000000000000
--- a/layout/html/tests/table/bugs/bug17168.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<body bgcolor=#c0c0c0>
-
-<table border=5 width=400>
-  <tr>
-    <td width=50% colspan=2>50%</td><td>foo</td>
-        </tr>
-        <tr>
-                <td width=25%>25%</td><td>bar</td>
-        </tr>
-</table>
-
-<br>
-
-<table border=5 width=400>
-  <tr>
-    <td colspan=2>foo</td><td width=50%>50%</td>
-        </tr>
-        <tr>
-                <td width=25%>25%</td><td>bar</td>
-        </tr>
-</table>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug1725.html b/layout/html/tests/table/bugs/bug1725.html
deleted file mode 100644
index a1fc0a7047e3..000000000000
--- a/layout/html/tests/table/bugs/bug1725.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html><body>
-<TABLE  Border=0 Cellpadding=0 Cellspacing=0 bgcolor=pink>
-    <TR>
-        <TD  COLSPAN=3 Width=600 Align=Left VAlign=Top bgcolor=yellow>1</TD>
-    </TR>
-    <TR>
-        <TD ALIGN=LEFT Width=600 COLSPAN=3 bgcolor=red>2</TD>
-    </TR>
-    <TR>
-        <TD Width=150 ROWSPAN=40 COLSPAN=1 Align=LEFT VAlign=TOP 
-bgcolor=aqua>3</TD>
-    </TR>
-    <FORM action=/cyberhomes/templates/summary.cfm method="GET">
-    <TR>
-      <TD WIDTH=430 bgcolor=orange>
-        <TABLE BORDER=0>
-            <TR>
-                <TD WIDTH=215><input type=submit VALUE="Submit Criteria"></TD>
-                <TD align=left WIDTH=215>4</TD>
-            </TR>
-        </table>
-      </TD>
-    </TR>
-    </FORM>
-    <TR>
-        <TD ALIGN=LEFT WIDTH=430 bgcolor=red>5</TD>
-    </TR>
-    <TR>
-        <TD ALIGN=LEFT WIDTH=430 bgcolor=yellow>
-          If you have entered your feature criteria,
-          press the "Submit Criteria" button above.
-        </TD>
-    </TR>
-    <TR>
-        <TD ALIGN=LEFT WIDTH=430 bgcolor=lightgrey>6</TD>
-    </TR>
-    <TR>
-        <TD ALIGN=LEFT WIDTH=430>
-          If you want to do a radius search instead,
-          press the "Radius Search" button.
-          This will allow you to select a starting point
-          and enter a radius with new feature criteria.
-        </TD>
-    </TR>
-    <TR>
-        <TD ALIGN=LEFT WIDTH=430>
-          &nbsp;
-        </TD>
-    </TR>
-    <tr>
-        <TD ALIGN=LEFT WIDTH=430>
-All information provided is deemed reliable but is not guaranteed and should be 
-independently verified. The price shown may represent the top or bottom of a 
-price range listing and not necessarily a fixed price offer.
-        </TD>
-    </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug174470.html b/layout/html/tests/table/bugs/bug174470.html
deleted file mode 100644
index a3fb5fc339f1..000000000000
--- a/layout/html/tests/table/bugs/bug174470.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML Transitional 4.01//EN">
-<html>
-<head>
-<style type="text/css">
-body {
-   direction: rtl;
-}
-
-table {
-	border-collapse: collapse;
-}
-
-td + td {
-	border-left: 2px solid black;
-
-/* from this point on, the stlye is just for visual emphasis
-   of the cells, it has nothing to do with the bug
-   manifestation
-*/
-	background-color: cyan;
-}
-
-td {
-   background-color: magenta;
-}
-
-</style>
-</head>
-<body>
-<p dir="ltr">the second table cell (td 2) should have a left border.</p>
-<table>
-<tr>
-<td>row 1 td 1</td>
-<td>row 1 td 2</td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug175455-4.html b/layout/html/tests/table/bugs/bug175455-4.html
deleted file mode 100644
index 11baa04f0e34..000000000000
--- a/layout/html/tests/table/bugs/bug175455-4.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-
-<html>
-
-<head>
-<title>testcase 2</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table border>
- <tr>
- <td width="300">
-
-  <div style="width:30%; border: solid purple">
-  <div style="width:200%; border:solid blue">
-   foo
-  </div>
- </div>
-</td></tr></table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug17548.html b/layout/html/tests/table/bugs/bug17548.html
deleted file mode 100644
index b00502b3727c..000000000000
--- a/layout/html/tests/table/bugs/bug17548.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-  <title>Testcase for bug 17548</title>
-</head>
-<body BGCOLOR="#FFFFFF">
-
-<table border="1" width="100%">
-  <tr>
-    <td rowspan="2"><img src="../images/logo2.gif" WIDTH="194" HEIGHT="45"></td>
-    <td width="80%"></td>
-  </tr>
-  <tr>
-    <td width="80%">
-      Information <img src="../images/dot.gif" WIDTH="4" HEIGHT="7">
-      Student Life</td>
-  </tr>
-  <tr>
-    <td width="100%" colspan="2"><hr size=1></td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug17587.html b/layout/html/tests/table/bugs/bug17587.html
deleted file mode 100644
index e3223a19306f..000000000000
--- a/layout/html/tests/table/bugs/bug17587.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html><head><title>Testcase for bug 17587</title></head>
-<BODY BGCOLOR="#FFFFFF" BACKGROUND="../images/img/g_back.gif">
-<TABLE WIDTH="600" BORDER="1" CELLSPACING="0" CELLPADDING="0">
-<TR>
-<!-- Begin Left Column -->
-  <TD WIDTH="112" ROWSPAN="3" VALIGN="top"><IMG
-    SRC="../images/l_logo.gif" WIDTH=112 HEIGHT=134></TD>
-<!-- End Left Column -->
-
-<!-- Begin Top Banner -->
-  <TD WIDTH="488" COLSPAN="2" ALIGN="right"><img
-     src="../images/Params.richmedia=yes&network=ign&size=468x60&site=dailyradar"
-     width=468 height=60></TD>
-<!-- End Top Banner -->
-</TR>
-
-<!-- Begin Top Nav Bar -->
-<TR><TD COLSPAN="2">
-  <TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="488">
-    <TR><TD WIDTH="488">Top Nav Bar</TD></TR>
-  </TABLE>
-</TD></TR>
-<!-- End Top Nav Bar -->
-
-<TR>
-<!-- Begin Main column -->
-  <TD WIDTH="337"></TD>
-<!-- End Main column -->
-
-<!-- Begin Right Column -->
-  <TD WIDTH="151">
-     <B>"Freakish animal-things, all sporting maniacal smiles, 
-         race around a series of ice-themed tracks, showing their malformed
-         asses to the entire world. "</B>
-  </TD>
-<!-- End Right Column -->
-</TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug17826.html b/layout/html/tests/table/bugs/bug17826.html
deleted file mode 100644
index eba912e9c2c1..000000000000
--- a/layout/html/tests/table/bugs/bug17826.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HTML>
-<HEAD>
-<style>
-table, td {border: 1px solid red;}
-</style>
-</HEAD>
-<BODY>
-
-
-<TABLE BORDER=1 WIDTH=100% BGCOLOR=CCCCCC>
-<TR VALIGN=TOP>
-  <TD ROWSPAN=2 WIDTH=10%>&nbsp;</TD>
-  <TD COLSPAN=6 WIDTH=70%>&nbsp;</TD>
-  <TD           WIDTH=10%>&nbsp;</TD>
-  <TD ROWSPAN=2 WIDTH=10%>&nbsp;</TD>
-</TR>
-<TR VALIGN=TOP>
-  <TD COLSPAN=3 WIDTH=10%>Find&nbsp;a&nbsp;Business</TD>
-  <TD COLSPAN=3 WIDTH=10%>What's&nbsp;New</TD>
-  <TD COLSPAN=1 WIDTH=10%>Search&nbsp;Tips</TD>
-</TR>
-<TR>
-  <TD COLSPAN=9 HEIGHT=8>&nbsp;</TD>
-</TR>
-</TABLE>
-
-
-<p>
-bug #17826 : Drag the right edge of the window and either widen or
-narrow the window; the column widths should oscillate as you resize
-the window (tested 1999122008 WinNT)
-</p>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug178739.html b/layout/html/tests/table/bugs/bug178739.html
deleted file mode 100644
index ebd9875ba83b..000000000000
--- a/layout/html/tests/table/bugs/bug178739.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-	<title>titre</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<style type="text/css">
-	
-	div{background: lawngreen; border: 11px solid orange;}
-	
-	body{ background: moccasin }
-	table {  background: papayawhip ; display: inline-table}
-	table, td { border: 1px solid darkred; }
-	tr { background: orange }
-	td { color: black; background-color: beige; width: 100%}
-	
-	#tableA{display: block}
-	
-	#tableB{position: absolute; }
-	
-	#tableC{position: absolute; top: auto;  }
-	
-	#tableD{position: absolute; top: auto;  }
-	
-	</style>
-	
-	</head>
-	<body>
-	
-	
-	<!-- table A -->
-	<div style="position: absolute; left: 250px;top:10px">
-		<table style=''>
-		  <tr><td>Table A, the first row</td></tr>
-		  <tr><td>table style='display: block'</td></tr>
-		</table>
-	</div>
-	
-	
-	<!-- table B -->
-	<table>
-	  <tr><td>Table B, the first row</td></tr>
-	  <tr><td>just a plain old table style=''</td></tr>
-	</table>
-	
-	
-	<!-- table C -->
-	<div style="position: absolute;left: 2px;top: 30px;width: auto;">
-		<table id='tableC'>
-		  <tr><td>Table C, the first row</td></tr>
-		  <tr><td>This table is inside an absolutely positioned div. 
-		  table style='position: absolute;'</td></tr>
-		  <tr><td>The absolutely positioned div has 'width: auto;'</td></tr>
-		  <tr><td>&there4;</td></tr>
-		  <tr><td>The width of</td></tr>
-		  <tr><td>Table rows</td></tr>
-		  <tr><td>becomes 'auto'</td></tr>
-		  <tr><td>&iquest;Que?</td></tr>
-		</table>
-	</div>
-	
-	
-	<!-- table d -->
-	<div style="position: absolute;left: 2px;top:130px;width: 540px">
-		<table id='tableD'>
-		  <tr><td>Table D, the first row</td></tr>
-		  <tr><td>This table is inside an absolutely positioned div. 
-		  table style='position: absolute;'</td></tr>
-		  <tr><td>The absolutely positioned div has 'width: 540px;'</td></tr>
-		  <tr><td>&there4;</td></tr>
-		  <tr><td>The width of</td></tr>
-		  <tr><td>Table rows</td></tr>
-		  <tr><td>becomes 'auto'</td></tr>
-		  <tr><td>&iquest;Que?</td></tr>
-		</table>
-	</div>
-	
-	
-	
-	</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug178762.html b/layout/html/tests/table/bugs/bug178762.html
deleted file mode 100644
index 929924a0f84e..000000000000
--- a/layout/html/tests/table/bugs/bug178762.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head>
-<title>Testcase Bug 178762 - Percentage height ignored for child inside table with table-layout:fixed</title>
-<style>
-table { width: 100%; height: 100%; border:1px solid red;
-table-layout: fixed; position:relative; }
-div{width:100%;height:100%;background-color:green;}
- </style>
-   </head>
-   <body>
-<table><tr><td>
-<div>
-The viewport should be filled directly with a green square. A resize of the window seems to fix the bug.
-</div>
-</td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug178855.xml b/layout/html/tests/table/bugs/bug178855.xml
deleted file mode 100644
index abdc52bbf65c..000000000000
--- a/layout/html/tests/table/bugs/bug178855.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<table style="position: absolute;" xmlns="http://www.w3.org/1999/xhtml">
- <tr>
-  <td>a test</td>
- </tr>
-</table>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug1800.html b/layout/html/tests/table/bugs/bug1800.html
deleted file mode 100644
index d9cdaaa71408..000000000000
--- a/layout/html/tests/table/bugs/bug1800.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<table border>
- <tr>
-  <td>
-   cell of outer table</td></tr>
- <tr>
-  <td>
-   <table border=5>
-    <tr>
-     <td> cell of nested table</td></tr>
-   </table>
- </tr>
-</table>
-<BR>
-<hr align=left style="width:200px;">
-nested table width includes border
-<table cellspacing=0 cellpadding=0 border>
- <tr>
-  <td>
-   <table width=200 border=10>
-    <tr>
-     <td>200 nested table</td></tr>
-   </table></td></tr>
-</table>
-<BR>
-nested table width includes border
-<table cellspacing=0 cellpadding=0 border>
- <tr>
-  <td>
-   <table border=10>
-    <tr>
-     <td>auto nested table</td></tr>
-   </table></td></tr>
-</table>
-<BR>
-nested table width includes border
-<table width=100% cellspacing=0 cellpadding=0 border=5>
- <tr>
-  <td>100% width table</td></tr>
-</table>
-<BR>
-nested table width includes border
-<table cellspacing=0 cellpadding=0 border>
- <tr>
-  <td>
-   <table width=100% border=10>
-    <tr>
-     <td>100% nested table</td></tr>
-   </table></td></tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug1802.html b/layout/html/tests/table/bugs/bug1802.html
deleted file mode 100644
index a014cef1aaa3..000000000000
--- a/layout/html/tests/table/bugs/bug1802.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<table width=200 border=1>
- <tr><td>AAA<td>BBB
- <tr align=center><td>A<td>B
- <tr align=right><td>A<td>B
-</table>
-
-<BR>
-
-<table width="100%" border>
- <tr>
-  <td align="left">&lt;tr&gt;</td>
-   <th>th: Center</th>
-   <td>td: Left</td>
-  </tr>
- <tr align="left">
-  <td align="left">&lt;tr align="left"&gt;</td>
-  <th>th: Left</th>
-  <td>td: Left</td>
- </tr>
- <tr align="center">
- <td align="left">&lt;tr align="center"&gt;</td>
-  <th>th: Center</th>
-  <td>td: Center</td>
- </tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/bugs/bug1802s.html b/layout/html/tests/table/bugs/bug1802s.html
deleted file mode 100644
index 12ada790c3bd..000000000000
--- a/layout/html/tests/table/bugs/bug1802s.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<table width=200 border=1>
- <tr><td>AAA<td>BBB
- <tr align=center><td>A<td>B
- <tr align=right><td>A<td>B
-</table>
-
-<BR>
-
-<table width="100%" border>
- <tr>
-  <td align="left">&lt;tr&gt;</td>
-   <th>th: Center</th>
-   <td>td: Left</td>
-  </tr>
- <tr align="left">
-  <td align="left">&lt;tr align="left"&gt;</td>
-  <th>th: Left</th>
-  <td>td: Left</td>
- </tr>
- <tr align="center">
- <td align="left">&lt;tr align="center"&gt;</td>
-  <th>th: Center</th>
-  <td>td: Center</td>
- </tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/bugs/bug1809.html b/layout/html/tests/table/bugs/bug1809.html
deleted file mode 100644
index a4adaaaa8cd4..000000000000
--- a/layout/html/tests/table/bugs/bug1809.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<body bgcolor="#c0c0c0">
-
-<table width="100%" border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-<br>
-
-<table border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1818-1.html b/layout/html/tests/table/bugs/bug1818-1.html
deleted file mode 100644
index b07f20ce3234..000000000000
--- a/layout/html/tests/table/bugs/bug1818-1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<TABLE BORDER=2 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" height="50">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC">&nbsp;
-
-<TD WIDTH=6 BGCOLOR="#00CC00">&nbsp;
-
-<TD BGCOLOR="#CC0000">&nbsp;
-
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1818-2.html b/layout/html/tests/table/bugs/bug1818-2.html
deleted file mode 100644
index 2455df183938..000000000000
--- a/layout/html/tests/table/bugs/bug1818-2.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<TABLE BORDER=2 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" height="50">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC">&nbsp;</TD>
-
-<TD WIDTH=6 BGCOLOR="#00CC00">&nbsp;</TD>
-
-<TD BGCOLOR="#CC0000">&nbsp;</TD>
-
-</TR>
-
-</TABLE>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug1818-3.html b/layout/html/tests/table/bugs/bug1818-3.html
deleted file mode 100644
index 663f4837a4dd..000000000000
--- a/layout/html/tests/table/bugs/bug1818-3.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<TABLE BORDER=2 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" height="50">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC">
-
-<TD WIDTH=6 BGCOLOR="#00CC00">
-
-<TD BGCOLOR="#CC0000">
-
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1818-4.html b/layout/html/tests/table/bugs/bug1818-4.html
deleted file mode 100644
index b07f20ce3234..000000000000
--- a/layout/html/tests/table/bugs/bug1818-4.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<head>
-</head>
-<body>
-
-<TABLE BORDER=2 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" height="50">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC">&nbsp;
-
-<TD WIDTH=6 BGCOLOR="#00CC00">&nbsp;
-
-<TD BGCOLOR="#CC0000">&nbsp;
-
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug1818-5.html b/layout/html/tests/table/bugs/bug1818-5.html
deleted file mode 100644
index a8be306172f4..000000000000
--- a/layout/html/tests/table/bugs/bug1818-5.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC">&nbsp;</TD>
-
-<TD WIDTH=6 BGCOLOR="#00CC00">&nbsp;</TD>
-
-<TD BGCOLOR="#CC0000">&nbsp;</TD>
-</TR>
-
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug1818-6.html b/layout/html/tests/table/bugs/bug1818-6.html
deleted file mode 100644
index 9ecb611768dd..000000000000
--- a/layout/html/tests/table/bugs/bug1818-6.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
-
-<TR>
-<TD WIDTH=400 BGCOLOR="#0000CC"></TD>
-
-<TD WIDTH=6 BGCOLOR="#00CC00"></TD>
-
-<TD BGCOLOR="#CC0000"></TD>
-</TR>
-
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug1828.html b/layout/html/tests/table/bugs/bug1828.html
deleted file mode 100644
index df60f97ed503..000000000000
--- a/layout/html/tests/table/bugs/bug1828.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<TABLE CELLSPACING=0 CELLPADDING=0 border>
-        <TR ALIGN=LEFT VALIGN=TOP >
-                <TD>
-                        <DT>
-                                Richard Pizzarro&lt;rhp@netscape.com&gt;
-                        </DT>
-                </TD>
-                </TR>
-                <TR>
-                        <TD>
-                                Architect Rich's Home Page
-                        </TD>
-        </TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug18359.html b/layout/html/tests/table/bugs/bug18359.html
deleted file mode 100644
index 8b338fa297d6..000000000000
--- a/layout/html/tests/table/bugs/bug18359.html
+++ /dev/null
@@ -1,253 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>XPInstall Test</TITLE>
-<H2>SeaMonkey XPInstall Trigger Page</H2>
-<HR>
-
-<SCRIPT LANGUAGE=JAVASCRIPT>
-
-<!--
-
-function triggerURL(url)
-{
-        if (!InstallTrigger.UpdateEnabled())
-        {
-                return false;
-        }
-        else
-        {
-                InstallTrigger.StartSoftwareUpdate(url);
-        }
-	return true;
-}
-
-function runAll()
-{
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_abortinstall.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddelcomp.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddelfile.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddirectory_4.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddirectory_5_installversion_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddirectory_5_string_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddirectory_full_installversion_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adddirectory_full_string_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_1.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_1_subdir.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_4.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_5_iver_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_5_string_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_full_iver_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_addsubcomp_full_string_ver.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_adduninstall.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_delcomp.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_delfile.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_diskspaceavailable.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_execute.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_execute_parameter.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getcomponentfolder.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getcomponentfolder_2.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_1_userpick.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_chrome.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_chrome_nosubdir.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_components.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_components_nosubdir.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_currentuser.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_fileurl.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_installfolder.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_plugins.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_preferences.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_1_maccontrolpanel.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_1_macextension.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_1_macshutdown.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_1_macsystem.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macapplemenu.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macdesktop.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macdocuments.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macfonts.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macpreferences.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_macstartup.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getfolder_2_mactrash.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_getlasterror_reseterror.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_setpackagefolder.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_uninstall.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winprofile_getstring.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winprofile_writestring.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_createkey.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_createkey_setrootkey.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_deletekey.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_deletevalue.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_getvalue_setvalue.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_getvaluestring.jar");
-InstallTrigger.StartSoftwareUpdate( "http://jimbob/jars/a_winreg_setvaluestring.jar");
-}
-
-//-->
-
-
-</SCRIPT>
-</HEAD>
-
-<form method=post name="triggerWhatForm">
-<table>
-
-<!--
-<tr>
-<td><b>Run all acceptance tests:</b></td>
-<td><input type=button value="Trigger all" onclick="runAll();"></td>
-</tr>
-//-->
-
-<tr>
-<td><b>Trigger URL:</b></td>
-<td><input type=text name="url" value="http://jimbob/jars/" size=65></td>
-<td><input type=button value="Trigger" onclick="triggerURL(this.form.url.value);"></td>
-</tr>
-
-<tr>
-<td><b>Run Test Case: </b></td> 
-<td> 
-<SELECT NAME="filename">
-<OPTION VALUE="http://jimbob/jars/a_abortinstall.jar">a_abortinstall</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddelcomp.jar">a_adddelcomp</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddelfile.jar">a_adddelfile</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_4.jar">a_adddirectory_4</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_5_iver_ver.jar">a_adddirectory_5_iver_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_5_string_ver.jar">a_adddirectory_5_string_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_full_iver_ver.jar">a_adddirectory_full_iver_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_full_string_ver.jar">a_adddirectory_full_string_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adddirectory_tostring_iver_ver.jar">a_adddirectory_tostring_iver_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addmacpatch.jar">a_addmacpatch</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_1.jar">a_addsubcomp_1</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_1_subdir.jar">a_addsubcomp_1_subdir</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_4.jar">a_addsubcomp_4</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_5_iver_ver.jar">a_addsubcomp_5_iver_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_5_string_ver.jar">a_addsubcomp_5_string_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_full_iver_ver.jar">a_addsubcomp_full_iver_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addsubcomp_full_string_ver.jar">a_addsubcomp_full_string_ver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_adduninstall.jar">a_adduninstall</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_addwinpatch.jar">a_addwinpatch</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_compareto_iver.jar">a_compareto_iver</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_compareversion_2_string.jar">a_compareversion_2_string</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_delcomp.jar">a_delcomp</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_delfile.jar">a_delfile</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_diskspaceavailable.jar">a_diskspaceavailable</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_execute.jar">a_execute</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_execute_mac.jar">a_execute_mac</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_execute_parameter.jar">a_execute_parameter</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_execute_unix.jar">a_execute_unix</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_execute_unix_parameter.jar">a_execute_unix_parameter</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_filemacalias.xpi">a_filemacalias</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_dircreate.xpi">a_fileop_dircreate</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_dirgetparent.xpi">a_fileop_dirgetparent</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_dirremove.xpi">a_fileop_dirremove</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_dirrename.xpi">a_fileop_dirrename</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filecopy.xpi">a_fileop_filecopy</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filedelete.xpi">a_fileop_filedelete</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexecute_mac.xpi">a_fileop_fileexecute_mac</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexecute_parameter_mac.xpi">a_fileop_fileexecute_parameter_mac</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexecute_parameter_unix.xpi">a_fileop_fileexecute_parameter_unix</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexecute_parameter_win.xpi">a_fileop_fileexecute_parameter_win</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexecute_unix.xpi">a_fileop_fileexecute_unix</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileexists.xpi">a_fileop_fileexists</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filegetdiskspacea.xpi">a_fileop_filegetdiskspacea</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filegetsize.xpi">a_fileop_filegetsize</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileisdirectory.xpi">a_fileop_fileisdirectory</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_fileisfile.xpi">a_fileop_fileisfile</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filemoddatechanged.xpi">a_fileop_filemoddatechanged</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filemove.xpi">a_fileop_filemove</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_fileop_filerename.xpi">a_fileop_filerename</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getcomponentfolder.jar">a_getcomponentfolder</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getcomponentfolder_2.jar">a_getcomponentfolder_2</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_userpick.jar">a_getfolder_1_userpick</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_chrome.jar">a_getfolder_2_chrome</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_chrome_nosubdir.jar">a_getfolder_2_chrome_nosubdir</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_components.jar">a_getfolder_2_components</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_components_nosubdir.jar">a_getfolder_2_components_nosubdir</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_currentuser.jar">a_getfolder_2_currentuser</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_fileurl.jar">a_getfolder_2_fileurl</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_win_fileurl.jar">a_getfolder_win_fileurl</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_installfolder.jar">a_getfolder_2_installfolder</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_plugins.jar">a_getfolder_2_plugins</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_preferences.jar">a_getfolder_2_preferences</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_maccontrolpanel.jar">a_getfolder_1_maccontrolpanel</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_macextension.jar">a_getfolder_1_macextension</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_macshutdown.jar">a_getfolder_1_macshutdown</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_macsystem.jar">a_getfolder_1_macsystem</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macapplemenu.jar">a_getfolder_2_macapplemenu</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macdesktop.jar">a_getfolder_2_macdesktop</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macdocuments.jar">a_getfolder_2_macdocuments</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macfonts.jar">a_getfolder_2_macfonts</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macpreferences.jar">a_getfolder_2_macpreferences</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_macstartup.jar">a_getfolder_2_macstartup</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_mactrash.jar">a_getfolder_2_mactrash</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_1_unixlocal.jar">a_getfolder_1_unixlocal</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_2_unixlib.jar">a_getfolder_2_unixlib</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getfolder_unix_fileurl.jar">a_getfolder_unix_fileurl</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_getlasterror_reseterror.jar">a_getlasterror_reseterror</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_loadresources.jar">a_loadresources</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_mac_gestalt.jar">a_mac_gestalt</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_macpatch.jar">a_macpatch</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_setpackagefolder.jar">a_setpackagefolder</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_uninstall.jar">a_uninstall</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winpatch.jar">a_winpatch</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winprofile_getstring.jar">a_winprofile_getstring</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winprofile_writestring.jar">a_winprofile_writestring</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_createkey.jar">a_winreg_createkey</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_createkey_setrootkey.jar">a_winreg_createkey_setrootkey</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_setvaluestring.jar">a_winreg_setvaluestring</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_getvaluestring.jar">a_winreg_getvaluestring</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_getvaluenumber_setvaluenumber.jar">a_winreg_getvaluenumber_setvaluenumber</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_deletevalue.jar">a_winreg_deletevalue</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_deletekey.jar">a_winreg_deletekey</OPTION>
-<OPTION VALUE="http://jimbob/jars/a_winreg_getvalue_setvalue.jar">a_winreg_getvalue_setvalue</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_jarsrc_blank.jar">f_adddirectory_jarsrc_blank</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_jarsrc_nullname.jar">f_adddirectory_jarsrc_nullname</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_regname_absolute.jar">f_adddirectory_regname_absolute</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_regname_comm.jar">f_adddirectory_regname_comm</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_regname_null.jar">f_adddirectory_regname_null</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_regname_user.jar">f_adddirectory_regname_user</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_tgtsubdir_blank.jar">f_adddirectory_tgtsubdir_blank</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_adddirectory_tgtsubdir_null.jar">f_adddirectory_tgtsubdir_blank_null</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_4_setpkgfldr.jar">f_addsubcomp_4_setpkgfldr</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_bigfile.jar">f_addsubcomp_bigfile</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_blankobject.jar">f_addsubcomp_blankobject</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_full_setpkgfldr.jar">f_addsubcomp_full_setpkgfldr</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_longfilename.jar">f_addsubcomp_longfilename</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_macsmpltxt.jar">f_addsubcomp_macsmpltxt</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_macsmpltxt_inus.jar">f_addsubcomp_macsmpltxt_inus</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_notepad.jar">f_addsubcomp_notepad</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_notepad_inuse.jar">f_addsubcomp_notepad_inuse</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_regname_absolute.jar">f_addsubcomp_regname_absolute</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_regname_comm.jar">f_addsubcomp_regname_comm</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_regname_null.jar">f_addsubcomp_regname_null</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_regname_user.jar">f_addsubcomp_regname_user</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_target_empty.jar">f_addsubcomp_target_empty</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_target_null.jar">f_addsubcomp_target_null</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_unixpermissions.jar">f_addsubcomp_unixpermissions</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp.jar">f_addsubcomp</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_vi_yes_update.jar">f_addsubcomp_vi_yes_update</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_vi_force_update.jar">f_addsubcomp_vi_force_update</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addsubcomp_vi_no_update.jar">f_addsubcomp_vi_no_update</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_dircreate_nested.xpi">f_fileop_dircreate_nested</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_dirrename_wfiles.xpi">f_fileop_dirrename_wfiles</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filecopy_unknowndir.xpi">f_fileop_filecopy_unknowndir</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filedelete_only.xpi">f_fileop_filedelete_only</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_fileexecute_unknown.xpi">f_fileop_fileexecute_unknown</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_fileexists_false.xpi">f_fileop_fileexists_false</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filegetsize_zero.xpi">f_fileop_filegetsize_zero</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filerename_blank.xpi">f_fileop_filerename_blank</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filerename_nosource.xpi">f_fileop_filerename_nosource</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_fileop_filerename_readonly.xpi">f_fileop_filerename_readonly</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_getfolder_1_macdesktop.jar">f_getfolder_1_macdesktop</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_getfolder_2subdirs_macdesktop.jar">f_getfolder_2subdirs_macdesktop</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_jarsrc_casesensitive.jar">f_jarsrc_casesensitive</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addmacpatch_exe.jar">f_addmacpatch_exe</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_macpatch_exe.jar">f_macpatch_exe</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_addwinpatch_exe.jar">f_addwinpatch_exe</OPTION>
-<OPTION VALUE="http://jimbob/jars/f_winpatch_exe.jar">f_winpatch_exe</OPTION>
-</SELECT>
-</td>
-<td><input type=button value="Trigger case" onclick="triggerURL(this.form.filename.value);"></td>
-</tr>
-</table>
-</form>
diff --git a/layout/html/tests/table/bugs/bug18440.html b/layout/html/tests/table/bugs/bug18440.html
deleted file mode 100644
index febc6c0bb1ab..000000000000
--- a/layout/html/tests/table/bugs/bug18440.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body><table border height=100%><tr><td><table border height=50%><tr><Td>x</td></tr></table></td></tr></table>
diff --git a/layout/html/tests/table/bugs/bug18558.html b/layout/html/tests/table/bugs/bug18558.html
deleted file mode 100644
index 6f684c10d252..000000000000
--- a/layout/html/tests/table/bugs/bug18558.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body bgcolor="#c0c0c0">
-
-<script>
-document.write('<table border=4><tr><td width="100%"><table border=5><tr><td>This is');
-</script>
-<script>
-document.write('cell 1</td></tr></table></td><td>Hello world! Hello world!</td></tr></table>');
-</script>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug18664.html b/layout/html/tests/table/bugs/bug18664.html
deleted file mode 100644
index fb73279062b7..000000000000
--- a/layout/html/tests/table/bugs/bug18664.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<HTML>
-<HEAD>
-   <TITLE>Mozilla Test: Table + DHTML Problem in Mozilla</TITLE>
-   <META name="author" content="Antti Huotari">
-   
-   <SCRIPT type="text/javascript" language="javascript">
-
-   <!-- ===== hide
- 
-     // window.onerror = null;
-
-     var agt = navigator.userAgent.toLowerCase ();
-
-     var is_major = parseInt (navigator.appVersion);
-     var is_minor = parseFloat (navigator.appVersion);
-
-     var is_nav = ((agt.indexOf('mozilla') != -1)
-                && (agt.indexOf('spoofer') == -1)
-                && (agt.indexOf('compatible') == -1)
-                && (agt.indexOf('opera') == -1)
-                && (agt.indexOf('webtv') == -1));
-
-     var is_nav5 = (is_nav && (is_major == 5));
-     var is_ie = (agt.indexOf("msie") != -1);
-     var is_ie5 = (is_ie && (is_major == 4) && (agt.indexOf("msie 5.0") != -1)); 
-
-     function moveTestdiv ()
-     {
-       document.getElementById('testDiv').style.left = 200 + 'px';
-       document.getElementById('testDiv').style.top = 200 + 'px';        
-     }
-         
-     function init ()
-     {
-       if (is_nav5 || is_ie5)
-       {
-         setTimeout ("moveTestdiv ()", 700)
-       }
-     }
-
-   // ===== hiding ends ===== -->
-   
-
-</SCRIPT>
-
-</HEAD>
-
-<BODY style="background: #999999; color: #000000;" onLoad="init()">
-
-<div id="testDiv" style="position: absolute; left: 70px; top: 70px;">
-<TABLE border="0" width="173" bgcolor="#CC6600" cellspacing="0" cellpadding="0">
-<TR>
-<TD><P align="center"><B>Testing</B></P></TD>
-</TR>
-</TABLE>
-<TABLE border="0" width="173" cellspacing="0" cellpadding="0">
-<TR>
-<TD width="9" bgcolor="#666666">&nbsp;</TD>
-<TD width="123" bgcolor="#FF9900">Test, test and test...</TD>
-<TD width="9" bgcolor="#666666">&nbsp;</TD>
-</TR>
-</TABLE>
-<TABLE border="0" width="173" bgcolor="#CC6600" cellspacing="0" cellpadding="0">
-<TR>
-<TD>&nbsp;</TD>
-<TD>&nbsp;</TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-</DIV>
-
-<P>Problem: Tables inside a DIV get border=1 after moving the DIV. 
-If you <A href="test2.html"><B>remove the border</B></A>
-attribute from the tables, the border doesn't show up.</P>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug18770.html b/layout/html/tests/table/bugs/bug18770.html
deleted file mode 100644
index 491775dd2d56..000000000000
--- a/layout/html/tests/table/bugs/bug18770.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html><head><title>Testcase for bug 18770</title></head>
-<body bgcolor="#FFFFFF">
-
-<TABLE WIDTH=600 CELLPADDING=0 CELLSPACING=0 BORDER=0>
-<TR>
-
-<TD>
-    <TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0>
-    <TR>
-      <TD COLSPAN=2 WIDTH="100%">R1C1, COLSPAN=2 WIDTH="100%"</TD>
-    </TR>
-    <TR>
-      <TD>R2C1</TD>
-      <TD>R2C2</TD>
-    </TR>
-    </TABLE>
-</TD>
-
-<TD>
-    Quotes delayed by 20 minutes.<BR>To ensure that your
-    portfolios and other personalized content can't be viewed
-    by others using this computer, sign out of Netcenter when
-    you are finished. When you want to view your personalized
-    content again, all you have to do is sign in to Netcenter.
-</TD>
-
-</TR>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug18955.html b/layout/html/tests/table/bugs/bug18955.html
deleted file mode 100644
index d17d332c5588..000000000000
--- a/layout/html/tests/table/bugs/bug18955.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<HTML> <BODY>
-
-<p><b>original page, stripped down to the problem table (pattern: auto
-width table with first row has specified width and colspan=2, second
-row has two specified width columns)</b></p>
-
-<TABLE BORDER="1">
-  <TR> 
-    <TD WIDTH=490 COLSPAN=2 VALIGN=TOP>
- Cons For Pokemon "They're Pokemon card sharks out there. This is
- worse than the Cabbage Patch Kid craze because now it's the kids who
- are actually fighting each other instead of just the parents." 
- -- Children are doing anything, including breaking the law, to get
- their grubby hands on some trading cards, observe police.
-    </TD>
-  </TR>
-
-  <TR>
-    <TD VALIGN=TOP WIDTH=268> ASDF </TD> 
-    <TD VALIGN=TOP WIDTH=222>  
-     Sat.,   Dec 11, 1999 
-     Gay Union Kibosh Hawaii Supreme Court slams the
-           door on same-sex marriages. All eyes look to Vermont.  
-    </TD>
-  </TR>
-</TABLE> 
- 
-<br>
-<p><b>same table, but less content (text) in the first cell ...</b></p>
-
-<TABLE BORDER="1">
-  <TR> 
-    <TD WIDTH=490 COLSPAN=2 VALIGN=TOP>
- Cons For Pokemon "They're Pokemon card sharks out there. This is
-    </TD>
-  </TR>
-
-  <TR>
-    <TD VALIGN=TOP WIDTH=268> ASDF </TD> 
-    <TD VALIGN=TOP WIDTH=222>  
-     Sat.,   Dec 11, 1999 
-     Gay Union Kibosh Hawaii Supreme Court slams the
-           door on same-sex marriages. All eyes look to Vermont.  
-    </TD>
-  </TR>
-</TABLE> 
-
-</BODY> 
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug19061-1.html b/layout/html/tests/table/bugs/bug19061-1.html
deleted file mode 100644
index 7cc35cd2887d..000000000000
--- a/layout/html/tests/table/bugs/bug19061-1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<title> Test of Table Problems </title>
-</head>
-<body>
-
-<h3>Thead/Tfoot/Tbody </h3>
-<pre><font size="-1"> 
-<b>thead</b> Row 1;      
-      background-color: cyan;     text-align: center;<br />
-<b>tbody</b> Rows 2,3,4; 
-      background-color: #9999ff;  text-align: right;<br />
-<b>tfoot</b> Rows 5, 6;  
-      background-color: #ff99ff;  text-align: center;
-</font></pre>
-<table border="1" width="100%" cellpadding="5" cellspacing="4">
-
-<thead style="background-color: cyan">
-<tr>
-  <td> R1C1 </td>  <td> R1C2 </td>
-  <td> R1C3 </td> <td rowspan="2"> R1-2C4 </td> <td> R1C5 </td>
-</tr>
-</thead>
-
-<tbody style="background-color: #9999ff">
-<tr>
-  <td> R2C1 </td>  <td>R2C3 </td>  <td>R2C3 </td>  
-  <td> R2C5 </td>
-</tr>
-
-<tr>
-  <td> R3C1 </td>  <td>R3C2</td> <td colspan="3">R3C3-5 </td>  
-</tr>
-
-<tr>
-  <td colspan="3"> R4C1-3 </td>  <td rowspan="3" >R4-6C4 </td>  
-  <td>R4C5</td>
-</tr>
-</tbody>
-
-<tfoot style="background-color: #ff99ff">
-<tr>
-  <td> R5C1 </td>  <td>R5C2 </td>   <td rowspan="2">R5-6C3</td>
-  <td>R5C5</td>
-</tr>
-
-<tr>
-  <td> R6C1 </td>  <td> R6C2 </td>  
-  <td>R6C5</td>
-</tr>
-</tfoot>
-</table>
diff --git a/layout/html/tests/table/bugs/bug19061-2.html b/layout/html/tests/table/bugs/bug19061-2.html
deleted file mode 100644
index 283a9eb4f6e4..000000000000
--- a/layout/html/tests/table/bugs/bug19061-2.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title> Test of Table Problems </title>
-</head>
-<body>
-
-<h3>Thead/Tfoot/Tbody </h3>
-<pre><font size="-1"> 
-<b>thead</b> Row 1;      
-      background-color: cyan;     text-align: center;<br />
-<b>tbody</b> Rows 2,3,4; 
-      background-color: #9999ff;  text-align: right;<br />
-<b>tfoot</b> Rows 5, 6;  
-      background-color: #ff99ff;  text-align: center;
-</font></pre>
-<table border="1" width="100%" cellpadding="5" cellspacing="4">
-
-<thead style="background-color: cyan">
-<tr>
-  <td> R1C1 </td>  <td> R1C2 </td>
-  <td> R1C3 </td> <td rowspan="2"> R1-2C4 </td> <td> R1C5 </td>
-</tr>
-</thead>
-<tfoot style="background-color: #ff99ff">
-<tr>
-  <td> R5C1 </td>  <td>R5C2 </td>   
-       <td rowspan="2">R5-6C3</td>
-       <td rowspan="2">R5-6C4</td>
-  <td>R5C5</td>
-</tr>
-
-<tr>
-  <td> R6C1 </td>  <td> R6C2 </td>  
-  <td>R6C5</td>
-</tr>
-</tfoot>
-
-<tbody style="background-color: #9999ff">
-<tr>
-  <td> R2C1 </td>  <td>R2C3 </td>  <td>R2C3 </td>  
-  <td> R2C5 </td>
-</tr>
-
-<tr>
-  <td> R3C1 </td>  <td>R3C2</td> <td colspan="3">R3C3-5 </td>  
-</tr>
-
-<tr>
-  <td colspan="3"> R4C1-3 </td>  <td rowspan="1" >R4C4 </td>  
-  <td>R4C5</td>
-</tr>
-</tbody>
-
-</table>
diff --git a/layout/html/tests/table/bugs/bug19356.html b/layout/html/tests/table/bugs/bug19356.html
deleted file mode 100644
index 6da405fa7815..000000000000
--- a/layout/html/tests/table/bugs/bug19356.html
+++ /dev/null
@@ -1,485 +0,0 @@
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<!-- comment -->
-<html><head>
-  <title>Testcase for bug 19356</title>
-</head>
-<body>
-
-<table border=1 cellpadding=3 cellspacing=4 width="100%">
-<tr>
-  <td width="1%">&nbsp;</td>
-  <td>Top Story</td>
-  <td width="1%">Full Coverage</td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug194024.html b/layout/html/tests/table/bugs/bug194024.html
deleted file mode 100644
index 9dbd15d69879..000000000000
--- a/layout/html/tests/table/bugs/bug194024.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<html>
-<head><title>Test</title></head>
-<body>
- border="0" cellspacing="0" cellpadding="0"
-	<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="#dddd33">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
- cellspacing="0" cellpadding="0"
-	<table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ccccff">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
- cellpadding="0"
-	<table cellpadding="0" width="100%" bgcolor="#ff9999">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
- border="0" cellpadding="0"
-	<table border="0" cellpadding="0" width="100%" bgcolor="#aaeebb">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-<font color="blue">right</font> border="0"
-	<table border="0" width="100%" bgcolor="#ffccee">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-<font color="blue">right</font> cellpadding="1"
-	<table cellpadding="1" width="100%" bgcolor="#66ddff">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-<font color="blue">right</font> border="1" cellspacing="0" cellpadding="0"
-	<table border="1" cellspacing="0" cellpadding="0" width="100%" bgcolor="#eeeeee">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-<font color="blue">right</font> border="1" cellspacing="0"
-	<table border="1" cellspacing="0" width="100%" bgcolor="#ffcc66">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-<font color="blue">right</font> border="1"
-	<table border="1" width="100%" bgcolor="#ccff33">
-	<tr>
-		<td width="12"></td>
-		<td><textarea style="width: 100%;">test</textarea></td>
-		<td width="12"></td>
-	</tr>
-	</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug19526.html b/layout/html/tests/table/bugs/bug19526.html
deleted file mode 100644
index 391f1478d523..000000000000
--- a/layout/html/tests/table/bugs/bug19526.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-<head>
-<title>Testing the use of table height</title>
-</head>
-
-<body>
-
-<P> 100 percent height table inside 100 percent height table:</P>
-<!-- This works -->
-<table border=1 width="100%" height="100%" bgcolor=grey>
-<td width="50%">
-        <!-- This does not work -->
-        <table width="100%" height="100%" border=1 bgcolor=yellow>
-        <td width="50%">&nbsp;Inner Table (yellow)</td><td width="50%">&nbsp;</td></tr>
-        </table>
-</td>
-<td width="50%">
-        &nbsp;Outer Table (grey)
-</td>
-</table>
-
-
-<P> 50 percent height table inside 100 percent height table:</P>
-<!-- This works -->
-<table border=1 width="100%" height="100%" bgcolor=grey>
-<td width="50%">
-        <!-- This does not work -->
-        <table width="100%" height="50%" border=1 bgcolor=yellow>
-        <td width="50%">&nbsp;Inner Table (yellow)</td><td width="50%">&nbsp;</td></tr>
-        </table>
-</td>
-<td width="50%">
-        &nbsp;Outer Table (grey)
-</td>
-</table>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug19599.html b/layout/html/tests/table/bugs/bug19599.html
deleted file mode 100644
index 1d680826d6bd..000000000000
--- a/layout/html/tests/table/bugs/bug19599.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>  
-<HEAD>
-
- <TITLE>INPUT=IMAGE in a Table </TITLE>
-
-
-
-</head>
-<body>
-
-
-<p>The INPUT element using the IMAGE attribute is used to load the image in the table. This image flows outside the 
-<br>the table after the window has been resized.</p>
-<table WIDTH="200" align="center" bgcolor="red">
-<tr>
-<td>
-<input type="image" src="../images/button_go_nav.gif" alt="button">
-
-</td>
-</tr>
-</table>
-
-
-
-<p>This test case is identicate to one above except the table is assigned a border of 2 pixels</p>
-<table WIDTH="200" align="center" bgcolor="red" border=2>
-<tr>
-<td>
-<input type="image" src="../images/button_go_nav.gif" alt="button">
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug196870.html b/layout/html/tests/table/bugs/bug196870.html
deleted file mode 100644
index 639497cdd109..000000000000
--- a/layout/html/tests/table/bugs/bug196870.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title>Testcase, bug 196870</title>
-<style type="text/css">
-div { width: 25px; height: 25px; }
-</style>
-</head>
-<body>
-
-<table width="130">
-<tr>
-<td width="130" align="right">
-<div><img src="../images/test77.jpg" width="77" height="77" alt="a"></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2050.html b/layout/html/tests/table/bugs/bug2050.html
deleted file mode 100644
index 1b4eff19ffed..000000000000
--- a/layout/html/tests/table/bugs/bug2050.html
+++ /dev/null
@@ -1,19 +0,0 @@
-   <html><head></head><body>
-   If the text is too low, then it is probably Bug 6920.
-     <!-- the BGCOLOR attribute is just to make the table breakage clear -->
-   <table border="1" BGCOLOR="#ffcc00"><tr><td>
-     <dl>
-   
-       <FONT>    <dt>Baz</dt>    </FONT>
-       <DD>foo foo foo foo foo foo foo foo foo</DD>
-
-        <!-- if either 1) the FONT tag, or 
-                       2) the /FONT tag, or
-                       3) the DD tag 
-             is removed ... no problem ... i.e., no table breakage 
-        -->
-   
-     </dl>
-   
-   </td></tr></table>
-   </body></html>
diff --git a/layout/html/tests/table/bugs/bug20579.html b/layout/html/tests/table/bugs/bug20579.html
deleted file mode 100644
index 18bbd9bbfb5d..000000000000
--- a/layout/html/tests/table/bugs/bug20579.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-  <title>Testcase for bug 20579</title>
-</head>
-<body bgcolor="#FFFFFF">
-<p><b>Testcase distilled from <a href="http://www.linuxplanet.com/linuxplanet/">http://www.linuxplanet.com/linuxplanet/</a><br>First cell is coded as: </b><code>
-&lt;TD>&lt;form>Weekly Poll&lt;P>&lt;/form>&lt;/TD>
-</code></p>
-
-<TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0 BORDER=0><TR>
-<TD>
-    <form>
-        Weekly Poll<P> <!-- ATTENTION: unmatched P start tag here -->
-    </form>
-</TD>
-
-<TD WIDTH=1>
-  <IMG HEIGHT=50 WIDTH=1 SRC="../images/gray2.gif"></TD>
-
-<TD WIDTH="100%"><BR></TD>
-</TR></TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2065.html b/layout/html/tests/table/bugs/bug2065.html
deleted file mode 100644
index 8300e3bc5fc9..000000000000
--- a/layout/html/tests/table/bugs/bug2065.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-<BODY>
-<TABLE BORDER WIDTH="100%">
-  <TR>
-  <TD WIDTH="50%">
-    One
-  </TD>
-  <TD WIDTH="50%">
-    <TABLE BORDER WIDTH="100%">
-    <TR>
-    <TD WIDTH="50%">
-      Two
-    </TD>
-    <TD WIDTH="50%">
-      Three
-    </TD>
-    </TR>
-    </TABLE>
-  </TD>
-  </TR>
-</TABLE>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug20804.html b/layout/html/tests/table/bugs/bug20804.html
deleted file mode 100644
index 362e203ac4f1..000000000000
--- a/layout/html/tests/table/bugs/bug20804.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<head>
-  <title>Testcase for bug 20804</title>
-</head>
-<body bgcolor="#FFFFFF">
-<p>Testcase distilled from <a href="http://www.microsoft.com">http://www.microsoft.com</a><br>
-The problem seems to be that the last cell in each row have an "excessive" COLSPAN value.<br>
-I have added BORDER=1 to make the cell boundaries visible.
-</p>
-
-<TABLE WIDTH="100%" CELLPADDING=0 CELLSPACING=0 BORDER=1 BGCOLOR="#FFFFFF">
-<TR>
-        <TD VALIGN="TOP" HEIGHT=60 ROWSPAN=2><IMG SRC="../images/bnr_all.gif" WIDTH=250 HEIGHT=60></TD>
-        <TD VALIGN="TOP" HEIGHT=20 ALIGN="RIGHT"><IMG SRC="../images/curve.gif" WIDTH=18 HEIGHT=20></TD>
-        <TD BGCOLOR="#000000" HEIGHT=20 VALIGN="MIDDLE" ALIGN="RIGHT" NOWRAP COLSPAN=2>
-                &nbsp;&nbsp;All Products&nbsp;&nbsp;|&nbsp;&nbsp;Support&nbsp;&nbsp;|
-                &nbsp;&nbsp;Search&nbsp;&nbsp;|&nbsp;&nbsp;microsoft.com Home&nbsp;&nbsp;</TD>
-</TR>
-<TR>
-        <TD VALIGN="TOP" HEIGHT=40 WIDTH=19><IMG SRC="../images/1ptrans.gif" WIDTH=19 HEIGHT=40></TD>
-        <TD VALIGN="TOP" HEIGHT=40 ALIGN="RIGHT" NOWRAP COLSPAN=2><IMG 
-              SRC="../images/banner_bizinternet.gif"><IMG
-
-              SRC="../images/mslogo.gif" WIDTH=112 HEIGHT=40>
-        </TD>
-</TR>
-<TR>
-        <TD BGCOLOR="#6699CC" HEIGHT=20 VALIGN="MIDDLE" NOWRAP COLSPAN=4>
-                        &nbsp;&nbsp;Home&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Events/Training&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Subscribe&nbsp;&nbsp;|
-                        &nbsp;&nbsp;About Microsoft&nbsp;&nbsp;|
-                        &nbsp;&nbsp;US/Worldwide&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Downloads&nbsp;&nbsp;|
-                        &nbsp;&nbsp;MSN.com&nbsp;&nbsp;|
-        </TD>
-</TR>
-</TABLE>
-
-<p>The following table is exactly as above, but I have removed COLSPAN for the last cell in row 1 and 2,<br>
-and changed COLSPAN=4 to COLSPAN=3 in the last row.</p>
-
-<TABLE WIDTH="100%" CELLPADDING=0 CELLSPACING=0 BORDER=1 BGCOLOR="#FFFFFF">
-<TR>
-        <TD VALIGN="TOP" HEIGHT=60 ROWSPAN=2><IMG SRC="../images/bnr_all.gif" WIDTH=250 HEIGHT=60></TD>
-        <TD VALIGN="TOP" HEIGHT=20 ALIGN="RIGHT"><IMG SRC="../images/curve.gif" WIDTH=18 HEIGHT=20></TD>
-        <TD BGCOLOR="#000000" HEIGHT=20 VALIGN="MIDDLE" ALIGN="RIGHT" NOWRAP>
-                &nbsp;&nbsp;All Products&nbsp;&nbsp;|&nbsp;&nbsp;Support&nbsp;&nbsp;|
-                &nbsp;&nbsp;Search&nbsp;&nbsp;|&nbsp;&nbsp;microsoft.com Home&nbsp;&nbsp;</TD>
-</TR>
-<TR>
-        <TD VALIGN="TOP" HEIGHT=40 WIDTH=19><IMG SRC="../images/1ptrans.gif" WIDTH=19 HEIGHT=40></TD>
-        <TD VALIGN="TOP" HEIGHT=40 ALIGN="RIGHT" NOWRAP><IMG 
-              SRC="../images/banner_bizinternet.gif"><IMG
-
-              SRC="../images/mslogo.gif" WIDTH=112 HEIGHT=40>
-        </TD>
-</TR>
-<TR>
-        <TD BGCOLOR="#6699CC" HEIGHT=20 VALIGN="MIDDLE" NOWRAP COLSPAN=3>
-                        &nbsp;&nbsp;Home&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Events/Training&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Subscribe&nbsp;&nbsp;|
-                        &nbsp;&nbsp;About Microsoft&nbsp;&nbsp;|
-                        &nbsp;&nbsp;US/Worldwide&nbsp;&nbsp;|
-                        &nbsp;&nbsp;Downloads&nbsp;&nbsp;|
-                        &nbsp;&nbsp;MSN.com&nbsp;&nbsp;|
-        </TD>
-</TR>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2123.html b/layout/html/tests/table/bugs/bug2123.html
deleted file mode 100644
index 99b4643772bf..000000000000
--- a/layout/html/tests/table/bugs/bug2123.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><BODY BGCOLOR="#FFFFFF" TEXT="#000000" LINK="#0000ff" VLINK="#ff0000" 
-ALINK="#0000FF">
-  <table width="475" border="0" cellspacing="0" bgcolor="black">
-  <tr>
-  <td width="475" valign="top">
-          <table width="475" cellspacing="0" cellpadding="4" border="0" 
-bgcolor="#959595" style="table-layout:fixed">
-                  <tr><td bgcolor="#6666cc" valign="middle" align="center" 
-width="470"><font color="white" face="ARIAL,HELVETICA"><b>BrowserWatch Headline 
-News</b></font></td></tr>
-                  <tr valign="top">
-                    <td bgcolor="#d4d4d4" width="470">xxx</td></tr>
-          </table>
-  </td>
-  </tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug21299.html b/layout/html/tests/table/bugs/bug21299.html
deleted file mode 100644
index 3e53667a054b..000000000000
--- a/layout/html/tests/table/bugs/bug21299.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" >
-<html>
-<head>
-<title>col_span</title>
-</head>
-
-<body>
-<p>The background color should span all columns</p>
-<table border>
-<colgroup>
-<col span="4" style="background-color: lime">
-</colgroup>
-<tr>
-<td>Column 1, row 1
-</td>
-<td>Column 2, row 1
-</td>
-<td>Column 3, row 1
-</td>
-<td>Column 4, row 1
-</td>
-</tr>
-
-</table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug21518.html b/layout/html/tests/table/bugs/bug21518.html
deleted file mode 100644
index a57670fbbd38..000000000000
--- a/layout/html/tests/table/bugs/bug21518.html
+++ /dev/null
@@ -1,75 +0,0 @@
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-                     "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML>
-<HEAD>
-
-<TITLE>Tables w/ COLGROUP width</TITLE>
-</HEAD>
-<BODY>
-
-<HR>
-
-<H3>Table 1</H3>
-
-<pre>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="3*"&gt;
-</pre>
-
-<TABLE width="500" border=1>
-<COLGROUP width="1*">
-<COLGROUP width="1*">
-<COLGROUP width="3*">
-<TR>
-        <TD>Cell A</TD>
-        <TD>Cell B</TD>
-        <TD>Cell C</TD>
-</TR>
-<TR>
-        <TD>Cell D</TD>
-        <TD>Cell E</TD>
-        <TD>Cell F</TD>
-</TR>
-<TR>
-        <TD>Cell G</TD>
-        <TD>Cell H</TD>
-        <TD>Cell I</TD>
-</TR>
-</TABLE>
-
-<HR>
-
-<H3>Table 2</H3>
-
-<pre>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP span=2 width="1*"&gt;
-&lt;COLGROUP width="3*"&gt;
-</pre>
-
-<TABLE width="500" border=1>
-<COLGROUP span=2 width="1*">
-<COLGROUP width="3*">
-<TR>
-        <TD>Cell A</TD>
-        <TD>Cell B</TD>
-        <TD>Cell C</TD>
-</TR>
-<TR>
-        <TD>Cell D</TD>
-        <TD>Cell E</TD>
-        <TD>Cell F</TD>
-</TR>
-<TR>
-        <TD>Cell G</TD>
-        <TD>Cell H</TD>
-        <TD>Cell I</TD>
-</TR>
-</TABLE>
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug215629.html b/layout/html/tests/table/bugs/bug215629.html
deleted file mode 100644
index 3b2e94dee79a..000000000000
--- a/layout/html/tests/table/bugs/bug215629.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html><head><title>Testcase for bug 215629</title></head>
-
-<body>
-
-<p>Image URLs intentionally broken</p>
-
-<table>
-  <tr>
-    <td width="100%"><img src="a01x.gif" width="167" height="51"><img src="a02x.gif" width="181" height="51"><img src="a03.gif" width="205" height="51"><img src="a04.gif" width="173" height="51"></td>
-  </tr>
-</table>              
-
-<p>Identical to the above except that width="100%" was removed from TD</p>
-<table>
-  <tr>
-    <td><img src="a01x.gif" width="167" height="51"><img src="a02x.gif" width="181" height="51"><img src="a03.gif" width="205" height="51"><img src="a04.gif" width="173" height="51"></td>
-  </tr>
-</table>              
-
-
-</body>              
-</html>              
diff --git a/layout/html/tests/table/bugs/bug217527.html b/layout/html/tests/table/bugs/bug217527.html
deleted file mode 100644
index 675344067c65..000000000000
--- a/layout/html/tests/table/bugs/bug217527.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<HTML><HEAD>
-<title>Testcase, bug 217527</title>
-</HEAD>
-<BODY>
-
-<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0">
-  <TR>
-    <TD width="1" bgcolor="yellow">
-      <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" ALIGN="LEFT">
-        <TR>
-          <TD>
-            xxx
-<script type="text/javascript">var foo = document.body.offsetHeight;</script>
-            zzzzzzzz
-          </TD>
-          <TD></TD>
-        </TR>
-      </TABLE>
-    </TD>
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug21918.html b/layout/html/tests/table/bugs/bug21918.html
deleted file mode 100644
index 59a914c7fa47..000000000000
--- a/layout/html/tests/table/bugs/bug21918.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<TABLE border>
- <SCRIPT>
-  function bar()
-  {}
- </SCRIPT>
- <TR> 
-  <TD>foo</TD>
- </TR>
-</TABLE>
-<BR>
-
-<TABLE border>
- <SCRIPT>
-  function test()
-  {
-  }
-  </SCRIPT>
- <TR>
-  <TD>
-
-<SCRIPT>
-document.write('blah');
-</SCRIPT>
-
-  </TD>
-  </TR>
- </TABLE>
-
diff --git a/layout/html/tests/table/bugs/bug219693-1.html b/layout/html/tests/table/bugs/bug219693-1.html
deleted file mode 100644
index 67b50b37b01b..000000000000
--- a/layout/html/tests/table/bugs/bug219693-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-   <head>
-      <title>bug 219693</title>
-   </head>
-   <body style="overflow:hidden;">
-      <table border="1" height="100%"><tr><td>&nbsp;</td></tr></table>
-   </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug219693-2.html b/layout/html/tests/table/bugs/bug219693-2.html
deleted file mode 100644
index a30d61a17fb4..000000000000
--- a/layout/html/tests/table/bugs/bug219693-2.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-   <head>
-      <title>bug 219693</title>
-   </head>
-   <body style="overflow: auto;">
-      <table border="1" height="100%"><tr><td>&nbsp;</td></tr></table>
-   </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22019.html b/layout/html/tests/table/bugs/bug22019.html
deleted file mode 100644
index b763f121d1f5..000000000000
--- a/layout/html/tests/table/bugs/bug22019.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html><head>
-<style>
-table {
-  width: 600px;
-  border: 1px solid red; 
-  empty-cells: show;
-}
-td {
-  border: 1px solid green; 
-}                            
-table.inner {margin: 20px; width: 600px;}
-</style><head>
-<body>
-
-<pre>These tables below all have the HTML + CSS ...
-
-&lt;TABLE>&lt;tr>                                          table {
-  &lt;td>&lt;TABLE style='margin: 20px; padding: 19px;'>     width: 600px;
-       &lt;tr>&lt;td>&lt;/td>&lt;/tr>                              border: 1px solid red;
-       &lt;/TABLE>&lt;/td>                                   empty-cells: show;}
-&lt;/tr>&lt;/TABLE>                                        td {
-                                                       border: 1px solid green;}
-                                                     table.inner {margin: 20px;}  
-
-... and differ only in the value of 'padding:'. From top table to
-bottom: 0px, 10px, 19px, 20px, 25px. Note that for a <u><i>table over-constrained 
-within another table</i></u>, <i><u>when (padding >=margin)</u></i>, the margin is <i><u>all allocated 
-to the right hand side</u></i> of the table (and to the left if 'direction: rtl;'.</pre>
-
-<TABLE style='width: 600px; border: 1px dotted blue;'><tr>
-  <td>600px table for width comparison</td>
-</tr></TABLE>
-
-<TABLE><tr>
-  <td><TABLE class='inner' style='padding: 0px;'>
-       <tr><td></td></tr>
-       </TABLE></td>
-</tr></TABLE>
-
-
-<TABLE><tr>
-  <td><TABLE class='inner' style='padding: 10px;'>
-       <tr><td></td></tr>
-       </TABLE></td>
-</tr></TABLE>
-
-
-<TABLE><tr>
-  <td><TABLE class='inner' style='padding: 19px;'>
-       <tr><td></td></tr>
-       </TABLE></td>
-</tr></TABLE>
-
-
-<TABLE><tr>
-  <td><TABLE class='inner' style='padding: 20px;'>
-       <tr><td></td></tr>
-       </TABLE></td>
-</tr></TABLE>
-
-<TABLE><tr>
-  <td><TABLE class='inner' style='padding: 25px;'>
-       <tr><td></td></tr>
-       </TABLE></td>
-</tr></TABLE>
-
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug220536.html b/layout/html/tests/table/bugs/bug220536.html
deleted file mode 100644
index fdd2c269cf7d..000000000000
--- a/layout/html/tests/table/bugs/bug220536.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Essai</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<script type="text/javascript" language="javascript">
-function remove_col2() {
-var colp = document.getElementById("colp");
-var c4= document.getElementById("c4");
-
-colp.colSpan=0;
-colp.style.display="none";
-c4.style.display="none";
-
-
-
-}
-function remove_col() {
-var tr1 = document.getElementById("tr1");
-var tr2 = document.getElementById("tr2");
-var tr3 = document.getElementById("tr3");
-var colp = document.getElementById("colp");
-var c1 = document.getElementById("c1");
-var c2 = document.getElementById("c2");
-var c3 = document.getElementById("c3");
-var c4= document.getElementById("c4");
-
-c1.style.display="none";
-colp.colSpan=1;
-c3.style.display="none";
-c2.style.display="none";
-remove_col2();
-}
-
-</script>
-</head>
-<body onload="remove_col()">
-<table border="1" id="t_0">
-  <thead>
-    <tr id="tr1">
-      <th rowspan="2">aaaa</th>
-      <th rowspan="2">bbbb</th>
-      <th colspan="2" id ="colp">cccc</th>
-      <th rowspan="2">dddd</th>
-    </tr>
-    <tr id="tr2">
-      <th id="c1">eeee</th>
-      <th id="c2">ffff</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr  id="tr3">
-      <td>1111</td>
-      <td>2222</td>
-      <td id="c3">3333</td>
-      <td id="c4">4444</td>
-      <td>5555</td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug220653.html b/layout/html/tests/table/bugs/bug220653.html
deleted file mode 100644
index 9d05f92b2fac..000000000000
--- a/layout/html/tests/table/bugs/bug220653.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>table-layout</title>
-</head>
-<body>
-<table style="table-layout: fixed;" width="800" cellpadding="4"
- cellspacing="3" border="1">
-  <tbody>
-    <tr>
-      <td colspan="10"> A </td>
-      <td colspan="50"> B </td>
-      <td colspan="120"> C </td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22122.html b/layout/html/tests/table/bugs/bug22122.html
deleted file mode 100644
index 30a35d48fc74..000000000000
--- a/layout/html/tests/table/bugs/bug22122.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<HTML>
-<HEAD>
-
-<TITLE>Colgroup Width 0* Test</TITLE>
-</HEAD>
-<BODY>
-
-
-<HR>
-
-<H3>
-Table 1
-</H3>
-
-<PRE>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP&gt;
-&lt;COLGROUP&gt;
-&lt;COLGROUP width="0*"&gt;
-</PRE>
-
-        <TABLE width="500" border=1>
-        <COLGROUP>
-        <COLGROUP>
-        <COLGROUP width="0*">
-        <TR>
-                <TD>Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-        </TR>
-        <TR>
-                <TD>Cell D</TD>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-                </TR>
-        <TR>    
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-                <TD>Cell I</TD>
-        </TR>
-        </TABLE>
-
-<HR>
-
-<H3>
-Table 2.1
-</H3>
-
-<PRE>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="0*"&gt;
-</PRE>
-
-        <TABLE width="500" border=1>
-        <COLGROUP width="1*">
-        <COLGROUP width="1*">
-        <COLGROUP width="0*">
-        <TR>
-                <TD>Cell A</TD>
-                <TD>Cell_ B</TD>
-                <TD>Cell C</TD>
-        </TR>
-        <TR>
-                <TD>Cell D</TD>
-                <TD>Cell_ E</TD>
-                <TD>Cell F</TD>
-        </TR>
-        <TR>
-                <TD>Cell G</TD>
-                <TD>Cell_ H</TD>
-                <TD>Cell I</TD>
-        </TR>
-        </TABLE>
-
-<H3>
-Table 2.2
-</H3>
-
-<PRE>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="2*"&gt;
-&lt;COLGROUP width="0*"&gt;
-</PRE>
-
-        <TABLE width="500" border=1>
-        <COLGROUP width="1*">
-        <COLGROUP width="2*">
-        <COLGROUP width="0*">
-        <TR>
-                <TD>Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-        </TR>
-        <TR>
-                <TD>Cell D</TD>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-        </TR>
-        <TR>
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-                <TD>Cell I</TD>
-        </TR>
-        </TABLE>
-
-<H3>
-Table 3.1
-</H3>
-
-<PRE>
-&lt;TABLE width="500" border=1&gt;
-&lt;COLGROUP width="1*"&gt;
-&lt;COLGROUP width="100"&gt;
-&lt;COLGROUP width="0*"&gt;
-</PRE>
-
-        <TABLE width="500" border=1>
-        <COLGROUP width="1*">
-        <COLGROUP width="100">
-        <COLGROUP width="0*">
-        <TR>
-                <TD>Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-        </TR>
-        <TR>
-                <TD>Cell D</TD>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-        </TR>
-        <TR>
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-                <TD>Cell I</TD>
-        </TR>
-        </TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug221784-1.html b/layout/html/tests/table/bugs/bug221784-1.html
deleted file mode 100644
index b98f46083215..000000000000
--- a/layout/html/tests/table/bugs/bug221784-1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-<div style="position:absolute;">
-<table height="100%" border>
-<tr><td>test</td></tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug221784-2.html b/layout/html/tests/table/bugs/bug221784-2.html
deleted file mode 100644
index ea5da5f6c899..000000000000
--- a/layout/html/tests/table/bugs/bug221784-2.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body>
-<div style="position:absolute;height:100px">
-<div>
-<table height="100%" border>
-<tr><td>test</td></tr>
-</table>
-</div>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug222336.html b/layout/html/tests/table/bugs/bug222336.html
deleted file mode 100644
index d730769b9db9..000000000000
--- a/layout/html/tests/table/bugs/bug222336.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <title>lunarstorm testcase</title>
-</head>
-
-<body>
-<table CELLSPACING=0 CELLPADDING=0>
-  <tr>
-    <td>
-      <table CELLSPACING=0 CELLPADDING=0>
-        <tr>
-          <td>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22246-2.html b/layout/html/tests/table/bugs/bug22246-2.html
deleted file mode 100644
index d03c7c528a38..000000000000
--- a/layout/html/tests/table/bugs/bug22246-2.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<body onload="document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
-&nbsp;
-
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr>
-<td>1</td>
-<td COLSPAN="2">colspan 2 rowspan 2</td>
-<td >3</td>
-</tr>
-<tr>
-<td>4</td>
-<td>5</td>
-<td>6</td>
-<td>7</td>
-<td>8</td>
-</tr>
-<tr>
-<td>9</td>
-<td>10</td>
-<td>11</td>
-<td>12</td>
-<td>13</td>
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22246-2a.html b/layout/html/tests/table/bugs/bug22246-2a.html
deleted file mode 100644
index f25a8658dde0..000000000000
--- a/layout/html/tests/table/bugs/bug22246-2a.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<body onload="document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
-&nbsp;
-
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr>
-<td>1</td>
-<td COLSPAN="2">colspan 2 rowspan 2</td>
-<td >3</td>
-</tr>
-<tr>
-<td>4</td>
-<td>5</td>
-<td>6</td>
-<td>7</td>
-<td>8</td>
-</tr>
-<tr>
-<td>9</td>
-<td>10</td>
-<td>11</td>
-<td>12</td>
-<td>13</td>
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22246-3.html b/layout/html/tests/table/bugs/bug22246-3.html
deleted file mode 100644
index e006d7554a32..000000000000
--- a/layout/html/tests/table/bugs/bug22246-3.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<body onload=
- "document.getElementsByTagName('td')[1].setAttribute('COLSPAN','3');
-  document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
-&nbsp;
-
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr>
-<td>1</td>
-<td COLSPAN="2">colspan 3 rowspan 2</td>
-<td >3</td>
-</tr>
-<tr>
-<td>4</td>
-<td>5</td>
-<td>6</td>
-<td>7</td>
-<td>8</td>
-</tr>
-<tr>
-<td>9</td>
-<td>10</td>
-<td>11</td>
-<td>12</td>
-<td>13</td>
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug22246-3a.html b/layout/html/tests/table/bugs/bug22246-3a.html
deleted file mode 100644
index 5f0e5dd781df..000000000000
--- a/layout/html/tests/table/bugs/bug22246-3a.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<body onload=
- "document.getElementsByTagName('td')[1].setAttribute('COLSPAN','3');
-  document.getElementsByTagName('td')[1].setAttribute('ROWSPAN','2');">
-&nbsp;
-
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr>
-<td>1</td>
-<td COLSPAN="2">colspan 3 rowspan 2</td>
-<td >3</td>
-</tr>
-<tr>
-<td>4</td>
-<td>5</td>
-<td>6</td>
-<td>7</td>
-<td>8</td>
-</tr>
-<tr>
-<td>9</td>
-<td>10</td>
-<td>11</td>
-<td>12</td>
-<td>13</td>
-</tr>
-</tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug222467.html b/layout/html/tests/table/bugs/bug222467.html
deleted file mode 100644
index a2474f437a60..000000000000
--- a/layout/html/tests/table/bugs/bug222467.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Test Document</title>
-<script language="JavaScript">
-function changeWidth()
-{
-    var table = document.getElementById('test_table');
-
-    table.style.width = 400;
-
-    return false;
-}
-</script>
-</head>
-<body onload="changeWidth()">
-
-<table id="test_table" width="200" style="border: 1px solid blue;">
-<tr>
-<td>
-</td>
-</tr>
-</table>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug222846.html b/layout/html/tests/table/bugs/bug222846.html
deleted file mode 100644
index 263eac513ad5..000000000000
--- a/layout/html/tests/table/bugs/bug222846.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>table dom test</title>
-<style type="text/css">
-  table {width:200px}
-table[summary="summ"] {font-size:24pt}
-</style>
-<script type="text/javascript">
-function dom(){
-var t = document.getElementById('t2');
-t.summary="summ";
-}
-</script>
-</head>
-
-<body onload="dom()">
-
-Both tables should look identical
-
-<table id="t2" border><caption>caption</caption><tbody><tr><td>cell1</td></tr></tbody></table>
-
-<table id="t2" summary="summ" border><caption>caption</caption><tbody><tr><td>cell1</td></tr></tbody></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug22513.html b/layout/html/tests/table/bugs/bug22513.html
deleted file mode 100644
index 3659d7bce4bd..000000000000
--- a/layout/html/tests/table/bugs/bug22513.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<body bgcolor=#999999>
-
-<table width="130" cellspacing="0" cellpadding="0" border="0">
-<tr>
-<td   width="15"  height="15" bgcolor="#FFcc00"><img src="../images/c-tl.gif" width=15 height=15 border=0></td>
-<td   width="90%" height="15" bgcolor="#FFcc00" align="center"><b><font face="Verdana" size="1">Downloads</font></b></td>
-<td   width="15"  height="15" bgcolor="#FFcc00"><img src="../images/c-tr.gif" width=15 height=15 border=0></td>
-</tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2267.html b/layout/html/tests/table/bugs/bug2267.html
deleted file mode 100644
index d8a5b8c7d727..000000000000
--- a/layout/html/tests/table/bugs/bug2267.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html><head></head><body>
-<table border cellspacing=5>
- <tr>
-   <td>Click name to see 
-   <td rowspan=2 bgcolor=00ff00>Mac Clbr Opt
- </tr>
- <tr>
-   <B>           <!-- these bold tags break the table -->
-   <td>Guilty
-   </B>
- </tr>
- <tr>
-   <td>&nbsp;
-   <td  bgcolor=yellow>L C
- </tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-   <td>foo 
-   <td>bar
- </tr>
- <tr>
-   <td>Click name to see 
-   <td rowspan=2 bgcolor=00ff00>Mac Clbr Opt
- </tr>
- <tr>
-   <B>           <!-- these bold tags break the table -->
-   <td>Guilty
-   </B>
- </tr>
- <tr>
-   <td>&nbsp;
-   <td  bgcolor=yellow>L C
- </tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-   <td>Click name to see 
-   <td rowspan=3 bgcolor=00ff00>Mac Clbr Opt
- </tr>
- <tr>
-   <B>           <!-- these bold tags break the table -->
-   <td>Guilty
-   </B>
- </tr>
- <tr>
-   <td>&nbsp;
-   <td  bgcolor=yellow>L C
- </tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-   <td>foo 
-   <td>bar
- </tr>
- <tr>
-   <td>Click name to see 
-   <td rowspan=3 bgcolor=00ff00>Mac Clbr Opt
- </tr>
- <tr>
-   <B>           <!-- these bold tags break the table -->
-   <td>Guilty
-   </B>
- </tr>
- <tr>
-   <td>&nbsp;
-   <td  bgcolor=yellow>L C
- </tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug227123.xml b/layout/html/tests/table/bugs/bug227123.xml
deleted file mode 100644
index 85412ff85a13..000000000000
--- a/layout/html/tests/table/bugs/bug227123.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS Tables: Empty Tables</title>
-  <style type="text/css">
-    table { display: table; height: 5em; width: 5em; background: green; }
-  </style>
- </head>
- <body>
-  <p>There should be a green block under this paragraph.</p>
-  <table xmlns="http://www.example.org/"/>
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug2296.html b/layout/html/tests/table/bugs/bug2296.html
deleted file mode 100644
index 6403f818005d..000000000000
--- a/layout/html/tests/table/bugs/bug2296.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-  <BODY BGCOLOR="white">
-    <TABLE WIDTH=600 CELLPADDING="0" CELLSPACING="0" BORDER="1">
-      <TR>
-        <TD COLSPAN="3">
-          <TABLE BORDER="1" WIDTH="600" CELLSPACING="0" CELLPADDING="0">
-            <TR>
-              <TD WIDTH="120">
-                <table width="100%" cellpadding=0 cellspacing=0 border=1>
-                  <tr bgcolor=red>
-                    <td>
-                      cell data
-                      <SCRIPT language="javascript"></SCRIPT>
-                    </TD>
-                  </tr>
-                </table>
-              </TD>
-            </TR>
-          </TABLE>
-        </TD>
-      </TR>
-      <TR>
-        <TD>
-          cell data 2
-        </td>
-
-      <!-- notice the missing close tags here: </TR></TABLE> -->
-
-  </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug23072.html b/layout/html/tests/table/bugs/bug23072.html
deleted file mode 100644
index 23e15f87334f..000000000000
--- a/layout/html/tests/table/bugs/bug23072.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<BODY>
-
-<table style="border-collapse: collapse">
-<tr><td style="display: none">Hmm</td></tr>
-<tr><td>Hmm2</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug23151.html b/layout/html/tests/table/bugs/bug23151.html
deleted file mode 100644
index 696e732b5162..000000000000
--- a/layout/html/tests/table/bugs/bug23151.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<TABLE BGCOLOR=White CELLPADDING=0 CELLSPACING=0 WIDTH="100%" COLS=2>
- <TR>
-  <TD><PRE><FONT FACE='Lucida Console' SIZE=-1>/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-  
-  <TD><PRE><FONT FACE='Lucida Console' SIZE=-1>/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-   
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug23235.html b/layout/html/tests/table/bugs/bug23235.html
deleted file mode 100644
index ebf4fe5e509d..000000000000
--- a/layout/html/tests/table/bugs/bug23235.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<html>
-<head>
-    <title>Testcase for bug 23235</title>
-</head>
-<body bgcolor="#FFFFFF">
-
-<p>Testcase distilled from <a href="http://webdeveloper.com/xml/">http://webdeveloper.com/xml</a></p>
-
-<table width="602" border="1" cellpadding=0 cellspacing=0>
-<tr>
-  <td width=468>
-      <ul>
-        <li>The XML Files Resources List
-            <SCRIPT></SCRIPT>
-            <img src="../images/icom-logo-micro.gif" height=60 width=468>
-        </li>
-      </ul>
-  </td>
-  <td width="130">
-      <TABLE BORDER="1" CELLPADDING="2">
-      <TR>
-        <TD align="center">
-            <IMG SRC="../images/browsecathead.gif" WIDTH="118" HEIGHT="25"><br>
-            [<I> Site Map </I>]
-        </TD>
-      </TR>
-      </TABLE>
-  </td>
-</tr>
-</table>
-
-
-<p>Same as above, but removed <code>&lt;SCRIPT&gt;&lt;/SCRIPT&gt;</code></p>
-
-<table width="602" border="1" cellpadding=0 cellspacing=0>
-<tr>
-  <td width=468>
-      <ul>
-        <li>The XML Files Resources List
-            <img src="../images/icom-logo-micro.gif" height=60 width=468>
-        </li>
-      </ul>
-  </td>
-  <td width="130">
-      <TABLE BORDER="1" CELLPADDING="2">
-      <TR>
-        <TD align="center">
-            <IMG SRC="../images/browsecathead.gif" WIDTH="118" HEIGHT="25"><br>
-            [<I> Site Map </I>]
-        </TD>
-      </TR>
-      </TABLE>
-  </td>
-</tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug23299.html b/layout/html/tests/table/bugs/bug23299.html
deleted file mode 100644
index 539592a3da1e..000000000000
--- a/layout/html/tests/table/bugs/bug23299.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- Vignette StoryServer 4 Thu Jan 06 20:04:02 2000 -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-        <title>Mozilla Table Test</title>
-</head>
-
-<BODY MARGINHEIGHT="0" TOPMARGIN="0" MARGINWIDTH="0" LEFTMARGIN="0">
-
-<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100" ALIGN="LEFT" BGCOLOR="BLUE">
-<TR><TD>
-Left Table<BR>
-ALIGN="LEFT"<BR>
-</TD></TR>
-</TABLE>
-<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100" ALIGN="LEFT" BGCOLOR="BLUE">
-<TR><TD>
-Center Table<BR>
-ALIGN="LEFT"<BR>
-</TD></TR>
-</TABLE>
-<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0" WIDTH="100" ALIGN="LEFT" BGCOLOR="BLUE">
-<TR><TD>
-Right Table<BR>
-ALIGN="LEFT"<BR>
-</TD></TR>
-</TABLE>
-<BR CLEAR="ALL">
-<BR CLEAR="ALL">
-The three tables above should abut each other. (in NN3/4 and IE4/5 they do).
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug234593.html b/layout/html/tests/table/bugs/bug234593.html
deleted file mode 100644
index 0250a2b053e8..000000000000
--- a/layout/html/tests/table/bugs/bug234593.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><head>
-<style>
-table { width: 100%; }
-td{border:1px solid red;}
-TD#leftcolumn,TD#rightcolumn {width: 180px;}
-div.box {  
-	overflow: hidden; 
-  width: 170px;}
-div.cbox-title {  overflow: hidden;}
-</style>
-</head>
-<body>
-<table><tbody><tr><td id="leftcolumn">
-	<div class="box">online user bug 234593</div>
-</td>
-<td id="centercolumn">
-	<div class="cbox-title">SOAP </div>
-	<script>var x=document.body.offsetHeight;</script>		
-</td>
-<td id="rightcolumn">
-	<div class="box">Last wiki comments</div>
-</td></tr></tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug23847.html b/layout/html/tests/table/bugs/bug23847.html
deleted file mode 100644
index adafa12c2c76..000000000000
--- a/layout/html/tests/table/bugs/bug23847.html
+++ /dev/null
@@ -1,12 +0,0 @@
- <table border>
-  <tr> 
-   <td colspan=2 rowspan=2> <img src="img/teq1_02.gif" width=122 height=35></td>
-   <td> <img src="img/teq1_03.gif" width=195 height=5></td>
-   <td rowspan=4> <img src="img/teq1_04.gif" width=6 height=113></td>
-  </tr>
-  <tr> 
-   <td> <a href="http://2000.chinatimes.com.tw/"> 
-        <img name="voteq1_05_1" src="img/voteq1_05-2.gif" width=195 height=30 border=0></a></td>
-  </tr>
- </table>
-
diff --git a/layout/html/tests/table/bugs/bug23994.html b/layout/html/tests/table/bugs/bug23994.html
deleted file mode 100644
index d099f4e8c3e9..000000000000
--- a/layout/html/tests/table/bugs/bug23994.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<table <!-- Comment --> >
-<caption></caption>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug240248.html b/layout/html/tests/table/bugs/bug240248.html
deleted file mode 100644
index 4261be70d79a..000000000000
--- a/layout/html/tests/table/bugs/bug240248.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<body>
-
-<div style="height:auto; overflow:auto; background-color:red;">
-
-	<table>
-	<tr>
-	<td>
-<script language="JavaScript">
-	time1 = new Date()
-	document.write('<img src="http://www.mozilla.org/images/mozilla-banner.gif?' +time1.getTime()+'">');
-//	document.write("<img src='http://myweb.cableone.net/performance/perftest/gfx/test.jpg?"+time1.getTime()+"'>")
-</script>
-	</td>
-	</tr>
-	</table>
-
-</div>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug24200.html b/layout/html/tests/table/bugs/bug24200.html
deleted file mode 100644
index e7b678be363f..000000000000
--- a/layout/html/tests/table/bugs/bug24200.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<html>
-<head>
-<title>plane</title>
-<style stype="text/css">
-.one { border: solid red }
-.two { border: solid lime }
-.three { border: solid yellow }
-.four { border: solid fuchsia }
-.five { border: solid blue }
-
-</style>
-</head>
-
-<body>
-
-<center>
-<!-- table 1 begins -->
-<table border=1 rules="all" class="one" width="620">
-<tr>
-<td colspan="3" width="620" height="11">parent table, 1st row, 1st col</td>
-</tr>
-<tr valign="top">
-<td width="131" valign="top">
-
-
-        <!-- table 2 begins -->
-        <form name="sidenav" method="get" action="http://search.planetrx.com/search/servlet/results.html">
-        <table border=5 rules="all" class="two" width="131">                    
-        <tr>
-        <td width="131">text</td>
-        </tr>
-        <tr>
-        <td>
-
-                <!-- table 3 begins -->
-                <table border=1 rules="all" class="three" width="131">
-                <tr> 
-                <td align="left" valign="middle">
-                <input type="text" name="q" size="11">
-                </td>
-                <td align="center" valign="middle">
-                <input type="image" src="../images/button_go_nav.gif" width="19" height="18" vspace="4" alt="go" border="0">
-                </td>
-                </tr>
-                </table>
-                <!-- table 3 ends -->
-
-
-        </td>
-        </tr>
-        <tr>
-        <td width="131">text</td>
-        </tr>
-        <tr>
-        <td width="131">
-
-                <!-- table 4 begins -->
-                <table border=1 rules="all" class="four" width="131">
-                <tr>
-                        <td width="113">problem
-                </td>
-                </tr>
-
-<!-- PROBLEM -->
-                <font face="Arial,Helvetica,sans-serif" size="2"></font>
-                
-                <tr>
-                <td>problem
-                </td>
-                </tr>
-
-                </table>
-                <!-- table 4 ends -->
-
-        </td>
-        </tr>
-        <tr>
-        <td width="131">text
-        </td>
-        </tr>
-        </table>
-        </form>
-        <!-- table 2 ends -->
-
-</td>
-<td width="481" valign="top" align="left">
-
-        <!-- table 5 begins -->
-        <table border=5 rules="all" class="five" width="481">
-        <tr valign="top">
-        <td width="318" valign="top">overlap
-        </td>
-        </tr>
-        </table>
-        <!--table 5 ends -->
-
-</td>
-</tr>
-</table>
-<!-- table 1 ends -->
-
-</center>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug24503.html b/layout/html/tests/table/bugs/bug24503.html
deleted file mode 100644
index 8fd329e0e15a..000000000000
--- a/layout/html/tests/table/bugs/bug24503.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><head><title>Testcase for bug 24503</title></head>
-<body bgcolor="#CCCCCC">
-
-<TABLE border=1>
-<TR>
-<TD BGCOLOR="#FFFFFF">appName</TD>
-<TD BGCOLOR="#FFFFFF">
-<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">
-
-<!--
-(navigator.appName) ? document.writeln(navigator.appName) 
-                    : document.writeln("Property not supported!");
-// -->
-
-</SCRIPT>
-rules!!!
-</TD>
-</TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug24627.html b/layout/html/tests/table/bugs/bug24627.html
deleted file mode 100644
index c79eaecd74e7..000000000000
--- a/layout/html/tests/table/bugs/bug24627.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html><head><title>Testcase for bug 24627</title></head>
-<body bgcolor="#FFFFFF">
-
-<table border=1 width=90%>
- <th><td>Host name</td><td>Architecture</td><td>Access</td></th>
- <tr><td>debussy.debian.org</td><td>ARM</td><td>all</td></tr>
- <tr><td>faure.debian.org</td><td>alpha</td><td>all</td></tr>
-</table>
-
-<p>Table nested in table</p>
-<table>
-<tr>
-<td>
-<table border=1 width=90%>
- <th><td>Host name</td><td>Architecture</td><td>Access</td></th>
- <tr><td>debussy.debian.org</td><td>ARM</td><td>all</td></tr>
- <tr><td>faure.debian.org</td><td>alpha</td><td>all</td></tr>
-</table>
-</td>
-</tr>
-</table>
-
-<br>
-
-<p>Table - no nesting</p>
-<table border=1 width=90%>
- <th><td>Host name</td><td>Architecture</td><td>Access</td></th>
- <tr><td>debussy.debian.org</td><td>ARM</td><td>all</td></tr>
- <tr><td>faure.debian.org</td><td>alpha</td><td>all</td></tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug24661.html b/layout/html/tests/table/bugs/bug24661.html
deleted file mode 100644
index e79abef1485b..000000000000
--- a/layout/html/tests/table/bugs/bug24661.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<table width=100% border=2>
- <tr>
-  <td>
-   <table cellspacing=0 cellpadding=0 width=224 border=1 align=right>
-    <tr>
-     <td>this doesn't show until a window resize</td>
-    </tr>
-    <tr>
-     <td height=8><img src="dontFind.jpg" width=1 height=8 alt=""></td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug2469.html b/layout/html/tests/table/bugs/bug2469.html
deleted file mode 100644
index a902d60d8aa1..000000000000
--- a/layout/html/tests/table/bugs/bug2469.html
+++ /dev/null
@@ -1,6 +0,0 @@
-  <font face = "Helvetica, Arial">
-  Blah, blah in Helvetica
-  <table>
-  <tr><td>Text here is in times, not Helvetica</td></tr>
-  </table>
-  </font>
diff --git a/layout/html/tests/table/bugs/bug2479-1.html b/layout/html/tests/table/bugs/bug2479-1.html
deleted file mode 100644
index 2be0067d49a4..000000000000
--- a/layout/html/tests/table/bugs/bug2479-1.html
+++ /dev/null
@@ -1,175 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html lang="en-US">
-<head>
-<title>Anonymous table objects</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-div { margin: 1em 0; }
-
-.table, .inlineTable, .tableRow, .tableRowGroup, .tableHeaderGroup,
-.tableFooterGroup, .tableColumn, .tableColumnGroup, .tableCell,
-.tableCaption {
-        background: aqua;
-        color: black;
-        }
-
-.table { display: table; }
-.inlineTable { display: inline-table; }
-.tableRow { display: table-row; }
-.tableRowGroup { display: table-row-group; }
-.tableHeaderGroup { display: table-header-group; }
-.tableFooterGroup { display: table-footer-group; }
-.tableColumn { display: table-column; }
-.tableColumnGroup { display: table-column-group; }
-.tableCell { display: table-cell; }
-.tableCaption { display: table-caption; }
-
-.block { display: block; }
-.inline { display: inline; }
-</style>
-</head>
-<body>
-<h1>Anonymous table objects</h1>
-
-<p>
-        See the <a
-        href="http://www.w3.org/TR/REC-CSS2/tables.html#anonymous-boxes">relevant
-        section of CSS2</a> for an explanation.  <strong>This test does not
-        test inline-tables at all.</strong>
-</p>
-
-<h2>Rule 1</h2>
-
-<div class="table">
-Table 1, Cell 1, Row 1
-</div>
-
-<h2>Rule 2</h2>
-
-<div>
-<span class="tableCell">Table 1, Row 1, Cell 1</span>
-<span class="tableCell">Table 1, Row 1, Cell 2</span>
-<span class="tableCell">Table 1, Row 1, Cell 3</span>
-<span class="tableCell">Table 1, Row 1, Cell 4</span>
-</div>
-
-<div>
-<span class="tableCell">Table 2, Row 1, Cell 1</span>
-<span class="tableCell">Table 2, Row 1, Cell 2</span>
-<span class="tableCell">Table 2, Row 1, Cell 3</span>
-<span class="tableCell">Table 2, Row 1, Cell 4</span>
-<span class="tableRow">
-<span class="tableCell">Table 2, Row 2, Cell 1</span>
-<span class="tableCell">Table 2, Row 2, Cell 2</span>
-<span class="tableCell">Table 2, Row 2, Cell 3</span>
-<span class="tableCell">Table 2, Row 2, Cell 4</span>
-</span>
-<span class="tableCell">Table 2, Row 3, Cell 1</span>
-<span class="tableCell">Table 2, Row 3, Cell 2</span>
-<span class="tableCell">Table 2, Row 3, Cell 3</span>
-<span class="tableCell">Table 2, Row 3, Cell 4</span>
-</div>
-
-<h2>Rules 3 and 4</h2>
-
-<p>
-        This section does not test the behavior of columns, column groups,
-        or captions.
-</p>
-
-<div>
-<span class="tableRow">
-<span class="tableCell">Table 1, Row 1, Cell 1</span>
-<span class="tableCell">Table 1, Row 1, Cell 2</span>
-<span class="tableCell">Table 1, Row 1, Cell 3</span>
-<span class="tableCell">Table 1, Row 1, Cell 4</span>
-</span>
-<span class="tableRow">
-<span class="tableCell">T 1, R 2, C 1</span>
-<span class="tableCell">Table 1, Row 2, Cell 2</span>
-<span class="tableCell">Table 1, Row 2, Cell 3</span>
-<span class="tableCell">Table 1, Row 2, Cell 4</span>
-</span>
-<span class="tableRow">
-<span class="tableCell">Table 1, Row 3, Cell 1</span>
-<span class="tableCell">Table 1, Row 3, Cell 2</span>
-<span class="tableCell">T 1, R 3, C 3</span>
-<span class="tableCell">Table 1, Row 3, Cell 4</span>
-</span>
-</div>
-
-
-<p>Note: table-header-group and table-footer-group are tested only
-in their HTML order, and they only appear once.</p>
-
-<div>
-<span class="tableHeaderGroup">
-<span class="tableCell">Table 2, Row 1, Cell 1</span>
-<span class="tableCell">Table 2, Row 1, Cell 2</span>
-<span class="tableCell">Table 2, Row 1, Cell 3</span>
-<span class="tableCell">Table 2, Row 1, Cell 4</span>
-</span>
-<span class="tableFooterGroup">
-<span class="tableCell">Table 2, Row 5, Cell 1</span>
-<span class="tableCell">Table 2, Row 5, Cell 2</span>
-<span class="tableCell">T 2, R 5, C 5</span>
-<span class="tableCell">Table 2, Row 5, Cell 4</span>
-</span>
-<span class="tableRow">
-<span class="tableCell">T 2, R 2, C 1</span>
-<span class="tableCell">Table 2, Row 2, Cell 2</span>
-<span class="tableCell">Table 2, Row 2, Cell 3</span>
-<span class="tableCell">Table 2, Row 2, Cell 4</span>
-</span>
-<span class="tableRowGroup">
-<span class="tableCell">T 2, R 3, C 1</span>
-<span class="tableCell">Table 2, Row 3, Cell x</span>
-<span class="tableCell">Table 2, Row 3, Cell 3</span>
-<span class="tableCell">Table 2, Row 3, Cell 4</span>
-</span>
-<span class="tableRowGroup">
-<span class="tableRow">
-<span class="tableCell">T 2, R 4, C 1</span>
-<span class="tableCell">Table 2, Row 4, Cell x</span>
-<span class="tableCell">Table 2, Row 4, Cell 3</span>
-<span class="tableCell">Table 2, Row 4, Cell 4</span>
-</span>
-</span>
-</div>
-
-<h2>Rule 5</h2>
-
-<div class="table">
-<span class="tableRow">
-<span class="tableCell">Table 2, Row 1, Cell 1</span>
-<span class="tableCell">Table 2, Row 1, Cell 2</span>
-<span class="tableCell">Table 2, Row 1, Cell 3</span>
-<span class="tableCell">Table 2, Row 1, Cell 4</span>
-</span>
-<span class="tableRow">
-<span class="block">Table 2, Row 2, Cell 1</span>
-<span class="tableCell">Table 2, Row 2, Cell 2</span>
-<span class="block">Table 2, Row 2, Cell 3</span>
-<span class="block">also Table 2, Row 2, Cell 3</span>
-also Table 2, Row 2, Cell 3
-<span class="tableCell">Table 2, Row 2, Cell 4</span>
-</span>
-<span class="tableRow">
-<span>Table 2, Row 3, Cell 1</span>
-<span class="tableCell">Table 2, Row 3, Cell 2</span>
-<span class="table">Table 2, Row 3, Cell 3 (a nested table)</span>
-<span class="tableCell">Table 2, Row 3, Cell 4</span>
-</span>
-</div>
-
-<hr title="Beginning of Footer">
-<p><a href="http://validator.w3.org/check/referer" title="W3C HTML Validator"><img src="../../images/vh40" alt="Valid HTML 4.0!" height="31" width="88"></a></p>
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug2479-2.html b/layout/html/tests/table/bugs/bug2479-2.html
deleted file mode 100644
index 0319dfa5e68a..000000000000
--- a/layout/html/tests/table/bugs/bug2479-2.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"
-    "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<HTML> 
-<HEAD>
-
-<title>Miscellaneous NGLayout Tests</title>
-
-<STYLE TYPE="text/css">
-<!--
-HTML { background: #0F9; color: black;}
-
-BODY {
-  background: #9fc;
-  font-family: verdana, arial, geneva, sans-serif;
-  border: medium solid black;
-  width: 85%;
-  margin: 4em auto;
-  padding: 0;
-  }
-
-UL.top {
-  background: #0c9;
-  margin: 0;
-  padding: 0.3em;
-  }
-
-UL.top { display: table-row; margin: 0; padding: 0; }
-
-UL.top LI { margin: 0; padding: 0; display: table-cell; width: 25%; text-align: center; }
-
-DIV.main {
-  margin: 0;
-  padding: 1em;
-  }
-
-FORM {
-  margin-left: 5em;
-  }
-
-P {
-  margin: 0;
-  padding: 0;
-  font: 1.0em/2.0 verdana, arial, geneva, sans-serif;
-  }
-
-.label { font-family: arial, helvetica, sans-serif; font-size: 0.9em; }
-
-SPAN.formgroup { display: inline-table; }
-
-SPAN.formgroup > * { display: table-row; }
-
--->
-</STYLE>
-
-</HEAD>
-
-<body>
-
-  <p>These links are in an element with display table-row, and the li elements
-  have display: table-cell.  They disappear:</p>
-
-  <ul class="top"> 
-    <li><a href="people.html">people</a></li>
-    <li><a href="places.html">places</a></li>
-    <li><a href="members.html">members</a></li>
-    <li><a href="links.html">links</a></li>
-  </ul>
-
-  <div class="main">
-
-  This text is not in the form.  The form should be indented 40px.
-
-        <form method="post" action="">
-          <p>  This is text in the form.  It should be indented 40px.
-          The form itself has the same table-row/table-cell problem as
-          above.</p>
-
-          <p>
-            <span class="formgroup"><span class="label">First Name (required)</span>
-              <input type="text" name="fname" size="16">
-            </span>
-            <span class="formgroup"> <span class="label">Last Name (required)</span>
-              <input type="text" name="lname" size="16">
-            </span>
-          </p>
-          <p> 
-            <span class="formgroup"><span class="label">Email Address</span>
-              <input type="text" name="iemail" size="40">
-            </span>
-          </p>
-          <p> 
-             <span class="formgroup"><span class="label">Company Name</span>
-               <input type="text" name="coname" size="16">
-             </span>
-             <span class="formgroup"><span class="label">Title</span>
-               <input type="text" name="title" size="16">
-             </span>
-          </p>
-          <p>
-            <input type="Submit" name="submit" value="Submit!">
-            <input type="reset" value="Clear Form" name="reset">
-          </p>
-        </form>
-
-</div> <!-- main -->
-
-</BODY>
-</HTML> 
-
diff --git a/layout/html/tests/table/bugs/bug2479-3.html b/layout/html/tests/table/bugs/bug2479-3.html
deleted file mode 100644
index 35fdc1dc15b5..000000000000
--- a/layout/html/tests/table/bugs/bug2479-3.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML lang="en">
-
-<HEAD>
-  <META name="author" content="Ian Hickson">
-  <META name="copyright" content="&copy; copyright 1999 Ian Hickson">
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <META http-equiv="Content-Style-Type" content="text/css">
-  <TITLE>Evil Tests: Generic Table Tests 1</TITLE>
-
-  <STYLE TYPE="text/css">
- 
-    .table { display: table; border: none; }
-    .cell { display: table-cell; border: none; }
-    .row { display: table-row; border: none; }
-
-    .full { width: 100%; }
-    .indented { margin-left: 5em; margin-right: 5em; }
-    .outdented { margin-left: -5em; margin-right: -5em; }
-
-    .gray { background: silver; color: black; } 
-
-    .left { text-align: left; }
-    .right { text-align: right; }
-
-    .hide.this { display: none; } .note { border: double thick red;
-    padding: 0.5em; }
-    
-  </STYLE>
-
-</HEAD>
-
-<BODY>
-
-<H1>Generic Table Tests - 1</H1>
-
-<p>If you have any comments to make regarding this test, e-mail <a
-href="mailto:py8ieh=eviltests-table@bath.ac.uk">py8ieh=eviltests@bath.ac.uk</a>.</p>
-
-<dl>
- <dt>Prerequisites</dt>
- <dd>Browsers that are subjected to this test should support CSS1 and the CSS2 table model, and multiple classes.</dd>
-</dl>
-
-<P class=note>If this paragraph breaks the line here: <SPAN
-class=table>and here:</SPAN> then your browser <em>does support</em>
-table values on 'display'. <strong>If this paragraphs flows without
-any undue breaks, then you should mark your browser as not supporting
-table values!</strong></P>
-
-
-<!--
-<P class="hide this">Multiple classes are not supported in this browser!</P>
-<P><em>Every</em> example on this entire page should look the same.</P>
--->
-
-<h2>1. Table -&gt; Table Cell</h2>
-
-<P>Below there should be a gray bar, spanning the width of the BODY,
-with the text "Left" to the left and the text "Right", on the same
-line, flush to the right.</P>
-
-   <DIV class="full gray table">
-      <DIV class="left cell">Left</DIV>
-      <DIV class="right cell">Right</DIV>
-   </DIV>
-
-
-<!-- INVALID TESTS
-<h2>2. Auto Width</h2>
-
-<p><strong>David, this test and the next one are those for which
-NGLayout is not following Section 10.</strong></p>
-
-<P>Below there should be the same gray bar as in test 1.</P>
-
-   <DIV class="gray table">
-      <DIV class="left cell">Left</DIV>
-      <DIV class="right cell">Right</DIV>
-   </DIV>
-
-<P>This is because since the table has <code>width:auto</code> (which
-is implied) and the margins are also <code>auto</code> (which is also
-implied), and the padding is zero (more implication...), the margins
-should be set to 0, and the width should be set to the containing
-block's content width (the BODY's width). This is exactly the same as
-setting <code>width</code> to 100% as is done in the first test.</P>
-
-<h2>3. Negative Margins</h2>
-
-<P>Below there should be the same gray bar as in test 1. Again.</P>
-
-   <DIV class="indented">
-      <DIV class="outdented gray table">
-         <DIV class="left cell">Left</DIV>
-         <DIV class="right cell">Right</DIV>
-      </DIV>
-   </DIV>
-
-
-<h2>4. Table Row -> Table Cell</h2>
-
-<P><strong>NGLayout is simply not doing anything with the table
-elements here!</strong></P>
-
-<P>This example should, once more, be exactly the same as the gray bar
-in test 1.</P>
-
-   <DIV class="gray row">
-      <DIV class="left cell">Left</DIV>
-      <DIV class="right cell">Right</DIV>
-   </DIV>
-
-
-<h2>4. Lone Cells</h2>
-
-<P>Guess what! This example should look the same as that in part 1 of
-this page!</P>
-
-   <DIV class="gray cell on left">Left</DIV>
-   <DIV class="gray cell on right">Right</DIV>
-
-
-<h2>4. Table Row -> Non Tabular Content & Cells</h2>
-
-<P>This should, once more, look the same as the first example...</P>
-
-   <DIV class="gray table">
-      <DIV class="left">Left</DIV>
-      <DIV class="right cell">Right</DIV>
-   </DIV>
-
--->
-
-
-<h2>Submit Results</h2>
-
-    <FORM action="/%7Epy8ieh/cgi/newresult.pl" method="POST" class="resultsubmission">
-      <P>How does your browser fare on this test?
-        <SELECT NAME="result">
-           <OPTION VALUE="Y"> The test renders correctly. </OPTION>
-           <OPTION VALUE="B"> The test renders incorrectly. </OPTION>
-           <OPTION VALUE="N"> Table values for 'display' not supported. </OPTION>
-<!--           <OPTION VALUE="U"> Untestable: Multiple classes not supported. </OPTION>-->
-           <OPTION VALUE="U"> Untestable: CSS not supported. </OPTION>
-        </SELECT>
-        <LABEL>Comment: <INPUT TYPE="text" NAME="comment"></LABEL>
-        <INPUT TYPE="submit" VALUE="Submit">
-      </P>
-    </FORM>
-
-
-<HR title="Footer">
-<p>Up to the <a href="home.html">Table Tests</A>.</p>
-<p>Up to the <a href="../home.html">Evil Tests Page</A>.</p>
-<!--<P>Bugzilla: <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=1959">Bug 1959</A></P>-->
-<p>This page is maintained by <a class=External HREF="http://www.bath.ac.uk/%7Epy8ieh/">Ian Hickson</A> (<a class=Mail HREF="mailto:py8ieh=website@bath.ac.uk">py8ieh@bath.ac.uk</A>).</p>
-<p>Last updated in March 1999.</p>
-
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/bugs/bug2479-4.html b/layout/html/tests/table/bugs/bug2479-4.html
deleted file mode 100644
index 532c3c9e6f06..000000000000
--- a/layout/html/tests/table/bugs/bug2479-4.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML lang="en">
-
-<HEAD>
-  <META name="author" content="Ian Hickson">
-  <META name="copyright" content="&copy; copyright 1999 Ian Hickson">
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <META http-equiv="Content-Style-Type" content="text/css">
-  <TITLE>Evil Tests: Inheritance Set Through Tables</TITLE>
-
-  <STYLE TYPE="text/css">
-
-     BODY   { color: black; background: white; font: 1em serif; }
-     .fancy { color: white; background: black; font: bold 2em sans-serif; }
-
-     .table { display: table; } 
-     .row   { display: table-row; } 
-     .cell  { display: table-cell; } 
-
-    
-  </STYLE>
-
-</HEAD>
-
-<BODY>
-
-<H1>Table Inheritance Tests - 1</H1>
-
-<p>If you have any comments to make regarding this test, e-mail <a
-href="mailto:py8ieh=eviltests-table@bath.ac.uk">py8ieh=eviltests@bath.ac.uk</a>.</p>
-
-<dl>
- <dt>Prerequisites</dt>
- <dd>Browsers that are subjected to this test should support CSS1 and the CSS2 table model.</dd>
-</dl>
-
-<H2>0. Control</H2>
-
-<P>The following four tests should look identical, namely, like this:</P>
-
-<DIV class="fancy">This text should be white on black, bold, twice the
-size of normal text, and sans serif.</DIV>
-
-<P>There are some minor exceptions, however. The x.1 tests should fill
-the viewport width, the other tests need not. Also, browsers
-attempting to have backwards compatability with the buggy behaviour of
-legacy browsers may omit to inherit the color and font-size in 1.1,
-which will make 1.1 (but only 1.1) unreadable. That is the problem
-with not following the specs.</P>
-
-<H2>1. HTML Tables</H2>
-
-<H3>1.1 Inheritance through a DIV</H3>
-<DIV class=fancy><TABLE><TR><TD> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</TD></TR></TABLE></DIV>
-
-
-<H3>1.2 Styles set directly on TABLE</H3>
-<TABLE class=fancy><TR><TD> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</TD></TR></TABLE>
-
-
-<H2>2. Explicit CSS Tables</H2>
-
-<H3>2.1 Inheritance through a DIV</H3>
-<DIV class=fancy><DIV class=table><DIV class=row><DIV class=cell> This
-text should be white on black, bold, twice the size of normal text,
-and sans serif. </DIV></DIV></DIV></DIV>
-
-<H3>2.2 Styles set directly on TABLE</H3>
-<DIV class="fancy table"><DIV class=row><DIV class=cell> This text
-should be white on black, bold, twice the size of normal text, and
-sans serif. </DIV></DIV></DIV>
-
-<H3>2.3 Styles set directly on ROW</H3>
-<DIV class=table><DIV class="fancy row"><DIV class=cell> This text
-should be white on black, bold, twice the size of normal text, and
-sans serif. </DIV></DIV></DIV>
-
-<H3>2.4 Styles set directly on CELL</H3>
-<DIV class=table><DIV class=row><DIV class="fancy cell"> This text
-should be white on black, bold, twice the size of normal text, and
-sans serif. </DIV></DIV></DIV>
-
-
-<H2>3. Implicit CSS Tables (table explicit)</H2>
-
-<H3>3.1 Inheritance through a DIV</H3>
-<DIV class=fancy><DIV class=table> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV></DIV>
-
-<H3>3.2 Styles set directly on TABLE</H3>
-<DIV class="fancy table"> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV>
-
-
-<H2>4. Implicit CSS Tables (row explicit)</H2>
-
-<H3>4.1 Inheritance through a DIV</H3>
-<DIV class=fancy><DIV class=row> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV></DIV>
-
-<H3>4.2 Styles set directly on ROW</H3>
-<DIV class="fancy row"> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<H2>5. Implicit CSS Tables (cell explicit)</H2>
-
-<H3>5.1 Inheritance through a DIV</H3>
-<DIV class=fancy><DIV class=cell> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV></DIV>
-
-<H3>5.2 Styles set directly on CELL</H3>
-<DIV class="fancy cell"> This text should be white on black,
-bold, twice the size of normal text, and sans serif.
-</DIV>
-
-
-
-<h2>Submit Results</h2>
-
-    <FORM action="/%7Epy8ieh/cgi/newresult.pl" method="POST" class="resultsubmission">
-      <P>How does your browser fare on this test?
-        <SELECT NAME="result">
-           <OPTION VALUE="M"> The tests all render identically, and this browser may or may not grok CSS2 tables. </OPTION>
-           <OPTION VALUE="Y"> The tests all render identically, and this browser does grok CSS2 tables. </OPTION>
-           <OPTION VALUE="N"> The tests all render identically, but this browser does not grok CSS2 tables. </OPTION>
-           <OPTION VALUE="B"> The tests do not render all the same. </OPTION>
-           <OPTION VALUE="D"> Any of the tests render black-on-black. </OPTION>
-           <OPTION VALUE="U"> Untestable: CSS not supported. </OPTION>
-        </SELECT>
-        <LABEL>Comment: <INPUT TYPE="text" NAME="comment"></LABEL>
-        <INPUT TYPE="submit" VALUE="Submit">
-      </P>
-    </FORM>
-
-
-<HR title="Footer">
-<p>Up to the <a href="home.html">Table Tests</A>.</p>
-<p>Up to the <a href="../home.html">Evil Tests Page</A>.</p>
-<P>Bugzilla: <a href="http://bugzilla.mozilla.org/show_bug.cgi?id=1959">Bug 1044</A></P>
-<p>This page is maintained by <a class=External HREF="http://www.bath.ac.uk/%7Epy8ieh/">Ian Hickson</A> (<a class=Mail HREF="mailto:py8ieh=website@bath.ac.uk">py8ieh@bath.ac.uk</A>).</p>
-<p>Last updated in March 1999.</p>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug2479-5.html b/layout/html/tests/table/bugs/bug2479-5.html
deleted file mode 100644
index 30daa09d855c..000000000000
--- a/layout/html/tests/table/bugs/bug2479-5.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML lang="en">
-
-<HEAD>
-  <META name="author" content="Ian Hickson">
-  <META name="copyright" content="&copy; copyright 1999 Ian Hickson">
-  <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  <META http-equiv="Content-Style-Type" content="text/css">
-  <TITLE>Evil Tests: Rendering BODY and HEAD as children of HTML - 2</TITLE>
-  <STYLE TYPE="text/css">
-
-  /* Layout */
-    HTML { display: block; border: 1em lime solid; margin: 8px; }
-    HEAD, BODY { display: table-cell; border: solid thick; 
-                 padding: 1em; margin: 1em; }
-    HEAD > *, BODY > * { display: block; border: thin dotted; margin: 1em 0; } 
-
-  /* Formatting */
-    HTML { color: black; background: green; }
-    HEAD { color: white; background: red; }
-    BODY { color: yellow; background: teal; }
-
-
-  </STYLE>
-
-  <style type="text/css">
-     /* Remove these other style blocks */
-     style + style { display: none; }
-  </style>
-
-  <style type="text/css" title="Default Rendering">
-  </style>
-
-  <style type="text/css" title="Show META contents">
-     META[name]:before { content: "name=" attr(name) ", content=" attr(content); }
-     META[http-equiv]:before { content: "http-equiv=" attr(http-equiv) ", content=" attr(content); }
-     META[name][http-equiv]:before { content: "name=" attr(name) ", http-equiv=" attr(http-equiv) ", content=" attr(content); }
-  </style>
-
-
-</HEAD>
-
-<BODY>
-
-<H1>Rendering <code>BODY</code> and <code>HEAD</code> as children of <code>HTML</code> - 2</H1>
-
-<p>If you have any comments to make regarding this test, e-mail <a
-href="mailto:py8ieh=eviltests-htmlbodyheadrendering@bath.ac.uk">py8ieh=eviltests@bath.ac.uk</a>.</p>
-
-<dl>
- <dt>Prerequisites</dt>
- <dd>Browsers that are subjected to this test should support the
-the background, padding, margin, border and color properties of CSS, and in
-addition the <code>overflow</code> property and fixed position stuff from CSS2.</dd>
-</dl>
-
-<h2>1. Making the BODY and the HEAD into a table</h2>
-
-<P>This is really evil, but completely valid...</P>
-
-<P>This document should have two cells, side by side: one on the left,
-the other on the right. The one on the left should be red with white
-writing and a thick white border. It should contain four dotted lines
-separated by a blank line, followed by a dotted bordered box
-containing the document title, and another dotted bordered box
-containing the stylesheet, also shown below:</P>
-
-<PRE>
-  ...
-</PRE>
-
-<P>The dotted borders and lines and the text in the left cell should
-be white.</P>
-
-<P>The right cell should be teal, with yellow text. This paragraph you
-are reading now should be in this right cell.</P>
-
-<P>The width of the two cells is left up to the user agent to decide,
-I think.</P>
-
-<P>The right cell should look similar to the left cell in formatting
--- each box of text should have a yellow dotted border, and there
-should be a blank line between each such box. No box should be nested
--- the dotted boxes should always be distinct from each other.</P>
-
-<P>The cells should be the same height, and they should have grown
-vertically to accommodate this text.</P>
-
-<P>Around the whole setup should be two borders, dark green and light
-green. The cells should be separated from each other and from these
-outer borders by 1em of dark green.</P>
-
-<P>There should also be some alternate stylesheets set up to allow you
-to display the &lt;META&gt; content. This may help with diagnosis.</P>
-
-<h2>Submit Results</h2>
-
-    <FORM action="/%7Epy8ieh/cgi/newresult.pl" method="POST" class="resultsubmission">
-      <P>How does your browser fare on this test?
-        <SELECT NAME="result">
-           <OPTION VALUE="Y"> Document renders exactly as described. </OPTION>
-           <OPTION VALUE="N"> TITLE, HEAD and HTML styles are ignored, and/or 'display' on BODY is ignored. </OPTION>
-           <OPTION VALUE="B"> There are some serious layout errors on the page. </OPTION>
-           <OPTION VALUE="D"> Page is not displayed at all. </OPTION>
-           <OPTION VALUE="U"> Untestable: CSS not supported. </OPTION>
-        </SELECT>
-        <LABEL>Comment: <INPUT TYPE="text" NAME="comment"></LABEL>
-        <INPUT TYPE="submit" VALUE="Submit">
-      </P>
-    </FORM>
-
-<HR title="Footer">
-<p><a href="home.html">Up to the Evil Tests Page</A>.</p>
-<p>This page is maintained by <a class=External HREF="http://www.bath.ac.uk/%7Epy8ieh/">Ian Hickson</A> (<a class=Mail HREF="mailto:py8ieh=website@bath.ac.uk">py8ieh@bath.ac.uk</A>).</p>
-<p>Last updated in June 1999.</p>
-
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/bugs/bug24880-1.html b/layout/html/tests/table/bugs/bug24880-1.html
deleted file mode 100644
index 15243da60996..000000000000
--- a/layout/html/tests/table/bugs/bug24880-1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-   <title>Table Test</title>
-</head>
-<body>
-&nbsp;
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr VALIGN=TOP>
-<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 2</td>
-<td VALIGN=TOP>Cell 3</td>
-<td VALIGN=TOP>Cell 4</td>
-</tr>
-</tbody>
-</table>
-<BR>
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 2</td>
-<td VALIGN=TOP>Cell 3</td>
-<td VALIGN=TOP>Cell 4</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 5</td>
-<td VALIGN=TOP>Cell 6</td>
-<td VALIGN=TOP>Cell 7</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug24880.html b/layout/html/tests/table/bugs/bug24880.html
deleted file mode 100644
index 05ee1abfbef8..000000000000
--- a/layout/html/tests/table/bugs/bug24880.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-   <title>Table Test</title>
-</head>
-<body>
-&nbsp;
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr VALIGN=TOP>
-<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 2</td>
-<td VALIGN=TOP>Cell 3</td>
-<td VALIGN=TOP>Cell 4</td>
-</tr>
-</tbody>
-</table>
-<BR>
-<table BORDER CELLSPACING=2 CELLPADDING=2 >
-<tbody>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 2</td>
-<td VALIGN=TOP>Cell 3</td>
-<td VALIGN=TOP>Cell 4</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP COLSPAN="0">Colspan=0</td>
-</tr>
-<tr VALIGN=TOP>
-<td VALIGN=TOP>Cell 5</td>
-<td VALIGN=TOP>Cell 6</td>
-<td VALIGN=TOP>Cell 7</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug25004.html b/layout/html/tests/table/bugs/bug25004.html
deleted file mode 100644
index a4adaaaa8cd4..000000000000
--- a/layout/html/tests/table/bugs/bug25004.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<body bgcolor="#c0c0c0">
-
-<table width="100%" border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-<br>
-
-<table border="5">
-  <tr>
-    <td>
-                        <table border="3">
-        <tr>
-                                        <td width="1000">&nbsp;</td>
-        </tr>
-      </table>
-                </td>
-    <td>This is some text</td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug25074.html b/layout/html/tests/table/bugs/bug25074.html
deleted file mode 100644
index fdec2b8779a9..000000000000
--- a/layout/html/tests/table/bugs/bug25074.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-</head>
-<body bgcolor=#FFFFFF>
-<table border=0 cellspacing=0 cellpadding=0 bgcolor=#00FF00>
-<tr>
-<td><img src="../images/tab_left.gif"></td>
-<td>Home</td>
-<td><img src="../images/tab_right.gif"></td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug25086.html b/layout/html/tests/table/bugs/bug25086.html
deleted file mode 100644
index 5302bd626044..000000000000
--- a/layout/html/tests/table/bugs/bug25086.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-<title>Test Case: text in cell appears to left of left margin created by cellpadding</title>
-
-<style>
-.someClass { font-weight: bold; }
-</style>
-
-</head>
-<body>
-
-<p>this table is regular html and the cell has a class attribute:</p>
-
-<table id="test" border="2" cellpadding="25">
-        <tr>
-                <td class="someClass">padding?</td>
-        </tr>
-        <tr>
-        </tr>
-</table>
-
-<p>this table is partly created by javascript code and the cell has a class attribute.  this is where the text appears to the left of the left margin created by the cellpadding:</p>
-
-<table id="test2" border="2" cellpadding="25">
-        <tr>
-        </tr>
-</table>
-
-<p>this table is partly created by javascript code and the cell has no class attribute.  here the text obeys the cellpadding value, although there is another problem with this table that i'm filing under a separate bug report:</p>
-
-<table id="test3" border="2" cellpadding="25">
-        <tr>
-        </tr>
-</table>
-
-<script type="text/javascript">
-
-
-        var table = document.getElementById('test2');
-        var row = table.insertRow(0);
-        var cell = row.insertCell(0);
-        cell.setAttribute('class', 'someClass');
-        cell.appendChild(document.createTextNode('padding?'));
-
-        table = document.getElementById('test3');
-        row = table.insertRow(0);
-        cell = row.insertCell(0);
-//      cell.setAttribute('class', 'someClass');
-        cell.appendChild(document.createTextNode('padding?'));
-
-
-
-</script>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2509.html b/layout/html/tests/table/bugs/bug2509.html
deleted file mode 100644
index e21b6f847242..000000000000
--- a/layout/html/tests/table/bugs/bug2509.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><style>
-TABLE     {table-layout:fixed; border: solid red 1px; width: 400}
-TD        {border: solid green 1px;}
-TD.one    {border: solid blue  1px; width: 300}
-TD.two    {border: solid blue  1px;}
-</style></head><body>
-
-<!-- this table should derive the width of the second column from what's 
-left over from the table width after subtracting the first column width -->
-
-<TABLE><TR>
-   <TD class="one">What's New on WebDeveloper.com</TD>
-   <TD class="two">umm</TD>
- </TR><TR>
-   <TD>blah blah blah blah blah blah blah blah blah blah blah blah</TD>
-   <TD>blah blah blah blah blah blah blah blah blah blah blah blah</TD>
-</TR></TABLE>
-
-</body></html>
-
diff --git a/layout/html/tests/table/bugs/bug2516.html b/layout/html/tests/table/bugs/bug2516.html
deleted file mode 100644
index 301e9bb30b91..000000000000
--- a/layout/html/tests/table/bugs/bug2516.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <body>
-    <table border=1>
-      <tr>
-        <td valign=top>
-          <table bgcolor=#ffcc99 border=0>
-            <form action="http://www.dejanews.com/qs.xp" method="get">
-            <tr align=left>
-              <td bgcolor=#ff6600 nowrap>Find</td>
-              <td>rick was here</td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug25367.html b/layout/html/tests/table/bugs/bug25367.html
deleted file mode 100644
index fb19b0265de1..000000000000
--- a/layout/html/tests/table/bugs/bug25367.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
- <STYLE TYPE="text/css">
-  table {table-layout:fixed}
- </STYLE>
-</HEAD>
-<BODY>
- <TABLE>
-  <col width="20%">
-  <TR><TD colspan=2>A</TD></TR>
-  <TR><TD>B</TD><TD>C</TD></TR>
- </TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug253781.html b/layout/html/tests/table/bugs/bug253781.html
deleted file mode 100644
index f92f2adec0f9..000000000000
--- a/layout/html/tests/table/bugs/bug253781.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Testcase for bug 253781</title>
-    <style>
-                  * {margin:0;padding:0;}
-    </style>
-</head>
-<body>
-
-
-<table width="100%" id="mytable" style="visibility: hidden">
-	<caption>table caption</caption>
-	<tr>
-		<td>cell data</td>
-	</tr>
-</table>
-
-<script>
-setTimeout("document.getElementById('mytable').style.visibility='visible'",5);
-</script>
-
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug25663.html b/layout/html/tests/table/bugs/bug25663.html
deleted file mode 100644
index cad0946293df..000000000000
--- a/layout/html/tests/table/bugs/bug25663.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><head><title>Testcase for bug 25663</title></head>
-<body bgcolor="#FFFFFF">
-
-<TABLE BORDER=1 WIDTH=610>
-<TR><TD>
-    <table align=left width=475 bgcolor="#BBBBBB">
-    <tr><td>
-        <SCRIPT></SCRIPT>
-    </td>
-    <td>
-        Welcome to the new DaveCentral!<BR>I have a new
-        Linux software archive as well as the Windows archive
-        you have come to know and love. 
-    </td></tr>
-    </table>
-</TD>
-<TD bgcolor="#99CCCC">
-        ANDOVER.NET<BR>E-COMMERCE<BR>
-        Buy some smart stuff from Andover.Net
-</TD></TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug25707.html b/layout/html/tests/table/bugs/bug25707.html
deleted file mode 100644
index b33931b44641..000000000000
--- a/layout/html/tests/table/bugs/bug25707.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-<title>Bug 25707</title>
-</head>
-<body>
-
-<p>The table below should be sized so that each word of text wraps to its own line,
-and if the font size is not too large, then the table will not be wider than the screen.</p>
-
-<p>
-Previously, the table would be incredibly wide, wide enough so that the entire paragraph of text
-was on one line. That was because the "maxElementSize" of the cell was including margins calculated
-from the desired size of the text (in this case, 19x the desired width of the paragraph). The fix
-was to calculate the margin for the "maxElementSize" of the cell using the "maxElementSize" of the
-contained block itself, which in this case is the maximum width of a word.
-</p>
-
-  <table border="1">
-    <tr><td>
-      <p style="margin-left: 95%;">This is some text. This is some text.</p> 
-    </td></tr>
-  </table>
-  
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2585.html b/layout/html/tests/table/bugs/bug2585.html
deleted file mode 100644
index 0bc4edf68d5a..000000000000
--- a/layout/html/tests/table/bugs/bug2585.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<body>
-<table align=left border=2>
-<tr><td>
-Testing 123
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug26178.html b/layout/html/tests/table/bugs/bug26178.html
deleted file mode 100644
index be8da16c0abb..000000000000
--- a/layout/html/tests/table/bugs/bug26178.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<HEAD>
-<SCRIPT>
-function insertRow() {
-  tb = document.getElementById("tb");
-  fr = tb.childNodes[0];
-  nr = document.createElement("TR");
-  nc = document.createElement("TD");
-  nc.appendChild(document.createTextNode("second row"));
-  nr.appendChild(nc);
-  tb.insertBefore(nr,fr);
-}
-</SCRIPT>
-</HEAD>
-<BODY>
-<TABLE>
-<THEAD>
-<TR>
-  <TD>The head</TD>
-</TR>
-</THEAD>
-<TBODY ID="tb">
-<TR>
-  <TD>First row</TD>
-</TR>
-</TBODY>
-</TABLE>
-<FORM>
-<INPUT type=button value="insert" onclick="insertRow();">
-</FORM>
-</BODY>
diff --git a/layout/html/tests/table/bugs/bug263050.html b/layout/html/tests/table/bugs/bug263050.html
deleted file mode 100644
index ff81b0a8edf6..000000000000
--- a/layout/html/tests/table/bugs/bug263050.html
+++ /dev/null
@@ -1,10 +0,0 @@
-  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-  <html>
-  <head>
-  <title>Foo</title>
-  </head>
-  <body>
-  <table><tr>
-  <td bgcolor="#00ff00"><iframe></iframe></td>
-  <td bgcolor="#ff0000">la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la la </td></tr></table>
-  </body></html>
diff --git a/layout/html/tests/table/bugs/bug26553.html b/layout/html/tests/table/bugs/bug26553.html
deleted file mode 100644
index 825e53bc3fe3..000000000000
--- a/layout/html/tests/table/bugs/bug26553.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-<style>
-img.rborder {border: 1px solid red;}
-</style>
-<body>
-
-<BODY>
-<TABLE BORDER=1 WIDTH=100% CELLPADDING=0 CELLSPACING=2>
- <TR>
-    <TD><A HREF=""><IMG SRC="../images/header-bolt.gif" ALIGN=LEFT 
-          WIDTH=61 HEIGHT=62 ALT="foo"><IMG SRC="../images/header-logotext.gif" 
-            WIDTH=181 HEIGHT=62 ALT="bar"></A></TD>
-    <TD WIDTH=100% ALIGN="CENTER"><IMG SRC="../images/header-highfidelity.gif"  
-          ALIGN=CENTER WIDTH=186 HEIGHT=62 ALT=""></TD>
-    <TD><A href=""><IMG SRC="../images/header-getwinamp.gif" ALIGN=RIGHT 
-          WIDTH=133 HEIGHT=62 ALT="baz"></A></TD>
- </TR>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug2684.html b/layout/html/tests/table/bugs/bug2684.html
deleted file mode 100644
index 3ed7b58c4655..000000000000
--- a/layout/html/tests/table/bugs/bug2684.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML><HEAD></HEAD>
-<BODY>
-
-<p><b>(1) Colspanning TD has fixed width equal to table width</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=340 COLSPAN=2>width=340 (same as table)</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(2) Colspanning TD has auto width</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD COLSPAN=2>no width attribute</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(3) Colspanning TD has width=100px</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=100 COLSPAN=2>width=100px</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(4) Colspanning TD has width=200px</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=200 COLSPAN=2>width=200px</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(5) Colspanning TD has width=100%</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=100% COLSPAN=2>width=100%</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-</center>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug269566.html b/layout/html/tests/table/bugs/bug269566.html
deleted file mode 100644
index b0a9458500c8..000000000000
--- a/layout/html/tests/table/bugs/bug269566.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head>
-
-
-</head>
-
-<body style="display:table">
-
-<img src="../images/animated.gif" style="float: left">
-
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug27038-1.html b/layout/html/tests/table/bugs/bug27038-1.html
deleted file mode 100644
index d337714b0ddc..000000000000
--- a/layout/html/tests/table/bugs/bug27038-1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-<title>tfoot css</title>
-<style type="text/css">
-<!-- 
-table{height:100%;}
-thead{font-weight:bold}
-tfoot{font-weight:bold}
--->
-</style>
-</head>
-<body>
-<table summary="tfoot test">
-<thead>
-<tr>
-<td>THEAD</td>
-</tr>
-</thead>
-<tfoot>
-<tr>
-<td>TFOOT</td>
-</tr>
-</tfoot>
-<tbody>
-<tr>
-<td>TBODY</td>
-</tr>
-</tbody>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug27038-2.html b/layout/html/tests/table/bugs/bug27038-2.html
deleted file mode 100644
index 642956564d2b..000000000000
--- a/layout/html/tests/table/bugs/bug27038-2.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<title>test a bug</title>
-</head>
-<body>
-
-<p>TABLE 1 - without 'height' style on TABLE</p>
-<table style="border: solid">
-<thead>
-<tr>
-<td>THEAD</td>
-</tr>
-</thead>
-<tfoot>
-<tr>
-<td>TFOOT</td>
-</tr>
-</tfoot>
-<tbody>
-<tr>
-<td>TBODY</td>
-</tr>
-</tbody>
-</table>
-
-<hr>
-<p>TABLE 2 - with 'height' style on TABLE</p>
-<table style="border: solid; height: 100%">
-<thead>
-<tr>
-<td>THEAD</td>
-</tr>
-</thead>
-<tfoot>
-<tr>
-<td>TFOOT</td>
-</tr>
-</tfoot>
-<tbody>
-<tr>
-<td>TBODY</td>
-</tr>
-</tbody>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug27038-3.html b/layout/html/tests/table/bugs/bug27038-3.html
deleted file mode 100644
index ee66c79a9162..000000000000
--- a/layout/html/tests/table/bugs/bug27038-3.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>tfoot test</title>
-<style type="text/css">
-<!--
-body{background-color:rgb(104, 168, 232);}
-table{width:100%;}
-table.test >thead{background-color:red;font-weight:bold;}
-table.test >tbody{background-color:yellow;font-style:italic;}
-table.test >tfoot{background-color:blue;}
-#h1{height:24mm;}
-#h2{height:25mm;}
-#main{background-color:green;}
-div{text-align:center;background-color:#d0d0d0;font-size:6mm}
-td{ vertical-align:top;text-align:center;font-size:6mm;}
-td.format{width:50%;}
--->
-</style>
-</head>
-<body>
-<div>Font Size:6mm</div>
-<table id="main">
-<tr>
-<td class="format">
-<div>Table height at 24mm</div>
-<table summary="tfoot test with table height at 24mm" id="h1" class="test">
-<thead><tr><td>THEAD</td></tr></thead>
-<tfoot><tr><td>TFOOT</td></tr></tfoot>
-<tbody><tr><td>TBODY</td></tr></tbody>
-</table>
-</td>
-<td class="format">
-<div>Table height at 25mm</div>
-<table summary="tfoot test with table height at 25mm" id="h2" class="test">
-<thead><tr><td>THEAD</td></tr></thead>
-<tfoot><tr><td>TFOOT</td></tr></tfoot>
-<tbody><tr><td>TBODY</td></tr></tbody>
-</table>
-</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug275625.html b/layout/html/tests/table/bugs/bug275625.html
deleted file mode 100644
index 87ee9ca26e7b..000000000000
--- a/layout/html/tests/table/bugs/bug275625.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><title>Testcase bug 275625 - Crash with a:hover, a:hover+br{display:table-row;}</title>
-<style>
-a, a + br{display:inline;}
-</style>
-</head>
-<body onload="document.styleSheets[0].cssRules[0].style.display = 'table-row'">
-<a href="#">This should not crash</a><br>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug2757.html b/layout/html/tests/table/bugs/bug2757.html
deleted file mode 100644
index 8d7dd3979cea..000000000000
--- a/layout/html/tests/table/bugs/bug2757.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head></head><body>
-<table border cellspacing=2>
- <tr>
-   <td>Click name to see 
-   <td rowspan=2 bgcolor=00ff00>Mac Clbr Opt
- </tr>
- <tr>
-   <B>           <!-- these bold tags break the table -->
-   <td>Guilty
-   </B>
- </tr>
- <tr>
-   <td>&nbsp;
-   <td  bgcolor=yellow>L C
- </tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug2763.html b/layout/html/tests/table/bugs/bug2763.html
deleted file mode 100644
index 774ca8b582e4..000000000000
--- a/layout/html/tests/table/bugs/bug2763.html
+++ /dev/null
@@ -1,10 +0,0 @@
-two and words should be on the same line
-<table border=0 cellspacing=0 cellpadding=0 width=600>
-  <tr>
-    <td width=150>two words</td>
-    <td width=450>blah</td>
-  </tr>
-  <tr>
-    <td width=600 colspan=2>blah</td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug277062.html b/layout/html/tests/table/bugs/bug277062.html
deleted file mode 100644
index 59ca0ace57f9..000000000000
--- a/layout/html/tests/table/bugs/bug277062.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body>
-
-<TABLE><bla><TD><TD><COLGROUP></COLGROUP><COLGROUP></COLGROUP>
diff --git a/layout/html/tests/table/bugs/bug2773.html b/layout/html/tests/table/bugs/bug2773.html
deleted file mode 100644
index 3ed7b58c4655..000000000000
--- a/layout/html/tests/table/bugs/bug2773.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML><HEAD></HEAD>
-<BODY>
-
-<p><b>(1) Colspanning TD has fixed width equal to table width</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=340 COLSPAN=2>width=340 (same as table)</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(2) Colspanning TD has auto width</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD COLSPAN=2>no width attribute</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(3) Colspanning TD has width=100px</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=100 COLSPAN=2>width=100px</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(4) Colspanning TD has width=200px</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=200 COLSPAN=2>width=200px</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-<p><b>(5) Colspanning TD has width=100%</b></p>
-
-<TABLE BORDER=1 BGCOLOR=#ffffcc WIDTH=340 cellpadding=0 cellspacing=0>
-  <TR>
-    <TD WIDTH=100% COLSPAN=2>width=100%</TD>
-  </TR>
-  <TR>
-    <TD>Search for:</TD>
-    <TD>foo bar baz foo bar baz foo bar baz</TD>
-  </TR>
-</TABLE>
-
-</center>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug278266.html b/layout/html/tests/table/bugs/bug278266.html
deleted file mode 100644
index 8b3c7e43cb7d..000000000000
--- a/layout/html/tests/table/bugs/bug278266.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body onload="document.getElementById('foo').appendChild(document.createTextNode('Second line of text'))">
-There should be text below this line:
-<div style="display: table-row" id="foo">
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug278385.html b/layout/html/tests/table/bugs/bug278385.html
deleted file mode 100644
index c82a3a70cdb3..000000000000
--- a/layout/html/tests/table/bugs/bug278385.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-		<title>Firefox Test</title>
-	</head>
-	<body>
-		<table border=1>
-			<tr>
-				<th>
-					<td>
-						<p>TWO</p>
-					</td>
-						<title>Firefox Test</title>
-			</tr>
-			<col>
-				<tr>
-					<td>
-						<p>ONE</p>
-					</td>
-				</tr>
-			<col>
-		</table>
-	</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug27993-1.html b/layout/html/tests/table/bugs/bug27993-1.html
deleted file mode 100644
index 5ce335e916a1..000000000000
--- a/layout/html/tests/table/bugs/bug27993-1.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head><title>Testcase for bug 27993</title></head>
-<body bgcolor="#FFFFFF">
-
-<TABLE width="748" border="1">
-  <TR>
-    <TD width="174" colspan="0">R1C1 colspan=0</TD>
-    <TD width="398" colspan="0">R1C2 colspan=0</TD>
-  </TR>
-  
-  <TR>
-    <TD width="748" colspan="2">R2C1 colspan=2</TD>
-  </TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug27993-2.html b/layout/html/tests/table/bugs/bug27993-2.html
deleted file mode 100644
index d587fb58a5cd..000000000000
--- a/layout/html/tests/table/bugs/bug27993-2.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html><head><title>Testcase for bug 27993</title></head>
-<body bgcolor="#FFFFFF">
-
-<TABLE width="748" border="1">
-  <TR>
-    <TD width="174" colspan="0">R1C1 colspan=0</TD>
-    <TD width="398" colspan="0">R1C2 colspan=0</TD>
-  </TR>
-  
-  <TR>
-    <TD width="748" colspan="2">R2C1 colspan=2</TD>
-  </TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug280009.html b/layout/html/tests/table/bugs/bug280009.html
deleted file mode 100644
index 7ff7e8e09517..000000000000
--- a/layout/html/tests/table/bugs/bug280009.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><title>double caption</title>
-<style>
-tr{display:table-caption; background-color: lime; width:100px; height:100px;}
-td{display:table-caption;border:solid 5px green; width:50px; height:50px}
-</style></head><body>
-there should be a thick green line visible on a lime background
-<table><tbody><tr><td></td></tr></tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug280217.html b/layout/html/tests/table/bugs/bug280217.html
deleted file mode 100644
index 08f0942292ff..000000000000
--- a/layout/html/tests/table/bugs/bug280217.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><head>
-<title>Testcase bug 280217 - Crash on changing display type to table-row on hidden inputs</title>
-<style>
-body:hover input{display:table-row;}
-</style>
-</head>
-<body>
-Hovering over this text should not crash Mozilla
-<input type="hidden"><input type="hidden">
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug282172.html b/layout/html/tests/table/bugs/bug282172.html
deleted file mode 100644
index 11ef25edf12b..000000000000
--- a/layout/html/tests/table/bugs/bug282172.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>bug 282172</title>
-  </head>
-  <body>
-    <table>
-      <tbody>
-        <tr style="display: table-column-group">
-          <td>
-            <div style="float:left">
-              <table id="table2">
-                <tbody><tr><td>Distance: 1237.12 miles </td></tr></tbody>
-              </table>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-  <script type="text/javascript">
-    document.body.offsetHeight;
-    document.getElementById("table2").style.display = "none";
-    document.body.offsetHeight;
-  </script>
-</html>
diff --git a/layout/html/tests/table/bugs/bug28341.html b/layout/html/tests/table/bugs/bug28341.html
deleted file mode 100644
index c9709f51edcb..000000000000
--- a/layout/html/tests/table/bugs/bug28341.html
+++ /dev/null
@@ -1,8 +0,0 @@
-The bug causes a crash when the page is destroyed
-<BR>
-<TABLE>
-<CAPTION>
-<IMG SRC="../images/animated.gif">
-</CAPTION>
-<TR><TD>foo</TD></TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug286137.html b/layout/html/tests/table/bugs/bug286137.html
deleted file mode 100644
index 985c6885f974..000000000000
--- a/layout/html/tests/table/bugs/bug286137.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head>
-<title>Testcase2 bug 286137 -vanishing content</title>
-<script>
-function doe(){
-document.getElementsByTagName('tbody')[0].style.display='table-caption';
-}
-</script>
-</head>
-<body onload="doe()">
-<table><tbody><tr><td>foo</td></tr></tbody></table>
- </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug28856.xul b/layout/html/tests/table/bugs/bug28856.xul
deleted file mode 100644
index c79c5463dab9..000000000000
--- a/layout/html/tests/table/bugs/bug28856.xul
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-orient="vertical" style="width:100%;height:100%">
-<tree flex="1">
-  <treecolgroup>
-    <treecol flex="1"/>
-  </treecolgroup>
-
-  <treechildren flex="1">
-    <treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	   <treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-
-	<treeitem>
-      <treerow>
-      <treecell label="I'm so happy being a XUL tree!"/>
-	  </treerow>
-	</treeitem>
-  </treechildren>
-  </tree>
-</window>
-
diff --git a/layout/html/tests/table/bugs/bug2886-2.css b/layout/html/tests/table/bugs/bug2886-2.css
deleted file mode 100644
index 18a7e340c659..000000000000
--- a/layout/html/tests/table/bugs/bug2886-2.css
+++ /dev/null
@@ -1,816 +0,0 @@
-/* The W3C Core Styles Copyright (c) 1998 W3C (MIT, INRIA, Keio), All Rights
-Reserved. W3C liability, trademark, document use and software licensing rules
-apply. See http://www.w3.org/Consortium/Legal/ipr-notice.html
-
-This stylesheet has been served in a form to avoid known bugs in your user
-agent's CSS implementation. Copying and serving this stylesheet to other
-agents may lead to unexpected results. Please refer to its address rather than
-copy it. */
-
-
-
-
-
-	/* begin body type */	/* 1 - humanist sans a */
-
-BODY	{	
-	font-size:	1em;
-	font-weight:	normal;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	font-family:	Verdana, Myriad Web, Syntax, sans-serif;
-	font-size-adjust:	.58;
-	}	
-
-P, BLOCKQUOTE, UL, OL, DL, DD, LI, DIR, MENU	{	
-	/* inherit from body */	
-	}	
-
-SMALL	{	
-	font-size:	.92em;
-	}	
-
-BIG	{	
-	font-size:	1.17em;
-	}	
-
-PRE	{	
-	font-family:	'Monotype.com', Courier New, monospace;
-	}	
-
-OL LI	{	
-	list-style-type:	decimal;
-	}	
-
-OL OL LI	{	
-	list-style-type:	lower-alpha;
-	}	
-
-OL OL OL LI	{	
-	list-style-type:	lower-roman;
-	}	
-
-TABLE, TBODY, TR, TD	{	
-	font-size:	1em;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	font-family:	Verdana, Myriad Web, Syntax, sans-serif;
-	font-size-adjust:	.58;
-	}	
-
-	/* end body type */	
-
-
-
-
-	/* begin header type */	/* 2 - serif a */
-		
-H1	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	2.0em;
-	font-weight:	600;
-	font-style:	normal;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	}	
-		
-H2	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	1.75em;
-	font-weight:	500;
-	font-style:	normal;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	}	
-		
-H3	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	1.58em;
-	font-weight:	600;
-	font-style:	italic;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	}	
-		
-H4	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	1.33em;
-	font-weight:	600;
-	font-style:	normal;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	}	
-		
-H5, DT	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	1.17em;
-	font-weight:	600;
-	font-style:	italic;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	}	
-		
-H6	{	
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	font-size:	1em;
-	font-weight:	700;
-	font-style:	normal;
-	text-decoration:	none;
-	word-spacing:	normal;
-	letter-spacing:	.1em;
-	text-transform:	small-caps
-	}	
-		
-TFOOT, THEAD	{	
-	font-size:	1em;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	}	
-		
-TH	{	
-	vertical-align:	baseline;
-	font-size:	1em;
-	font-weight:	bold;
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	font-family:	Georgia, Minion Web, Palatino, Book Antiqua, Utopia, Times New Roman, serif;
-	font-size-adjust:	.4;
-	}	
-		
-HR	{	
-	visibility:	visible;
-	}	
-		
-	/* end header type */	
-
-
-
-
-	/* begin affordances */	/* 7 - rubric */
-		
-A, ADDRESS, BLOCKQUOTE, BODY, CITE, CODE, DD, DEL, DFN,		
-DIV, DL, DT, EM, FORM, H1, H2, H3, H4, H5, H6, IFRAME, IMG, KBD,		
-LI, OBJECT, OL, P, Q, SAMP, SMALL, SPAN, STRONG, SUB, SUP, UL, VAR, 		
-APPLET, BIG, CENTER, DIR, FONT, HR, MENU, PRE,		
-ABBR, ACRONYM, BDO, BUTTON, FIELDSET, INS, LABEL	{	
-	word-spacing:	normal;
-	letter-spacing:	normal;
-	text-transform:	none;
-	text-decoration:	none;
-	border-color:	#999;
-	border-style:	none;
-	}	
-		
-BODY	{	
-	color:	black;
-	background:	#FFFFF5;
-	}	
-		
-EM	{	
-	font-style:	normal;
-	font-weight:	bold;
-	color:	black;
-	background:	#FFFFF5;
-	}	
-		
-STRONG	{	
-	font-style:	italic;
-	background:	#FFFFF5;
-	font-weight:	bold;
-	color:	black;
-	}	
-		
-EM STRONG, STRONG EM	{	
-	text-transform:	uppercase;
-	font-style:	normal;
-	font-weight:	bolder;
-	background:	#FFFFF5;
-	color:	black;
-	}	
-		
-B	{
-	font-weight:	bold;
-	}
-	
-I	{
-	font-style:	italic;
-	}
-		
-.warning	{	
-	text-transform:	none;
-	font-style:	normal;
-	font-weight:	bolder;
-	background:	#FF0;
-	color:	red;
-	}	
-		
-DEL	{	
-	text-decoration:	line-through;
-	background:	#FC6;
-	}	
-		
-INS	{	
-	text-decoration:	none;
-	background:	9F3;
-	}	
-		
-VAR, CITE, DFN, .note	{	
-	font-style:	italic;
-	}	
-		
-ADDRESS	{	
-	font-style:	normal;
-	letter-spacing:	.1em;
-	}	
-		
-ACRONYM	{	
-	font-variant:	small-caps;
-	letter-spacing:	0.1em;
-	}	
-		
-H1, H2, H3, H4, H5, H6, DT, TH, THEAD, TFOOT	{	
-	color:	#C00;
-	background:	#FFFFF5;
-	}	
-		
-HR	{	
-	color:	black;
-	}	
-		
-#colophon	{	
-	display:	none;
-	}	
-		
-COL, COLGROUP, TABLE, TBODY, TD, TR	{	
-	color:	black;
-	text-decoration:	none;
-	border-color:	black;
-	border-style:	none;
-	background:	#FFFFF5;
-	}	
-		
-A:link	{	
-	text-decoration:	none;
-	font-weight:	bold; 
-	color:	#33F;
-	background:	#FFFFF5;
-	}	
-		
-A:visited	{	
-	text-decoration:	none;
-	font-weight:	bold;
-	color:	#93C;
-	background:	#FFFFF5;
-	}	
-		
-A:active	{	
-	text-decoration:	none;
-	font-weight:	bold;
-	color:	black;
-	background:	#CCF;
-	}	
-		
-A:hover	{	
-	text-decoration:	none;
-	color:	#FFFFF5;
-	background:	#33F;
-	}	
-		
-A.offsite	{	
-	text-decoration:	none;
-	font-weight:	normal;
-	color:	#33F;
-	background:	#FFFFF5;
-	}	
-		
-	/* end affordances */	
-
-
-
-
-	/* begin vertical */	/* 1 - pentatonic a */
-		
-A, ADDRESS, BLOCKQUOTE, CITE, CODE, DD, DEL, DFN,		
-DIV, DL, DT, EM, FORM, H1, H2, H3, H4, H5, H6, IFRAME, IMG, KBD,		
-LI, OBJECT, OL, P, Q, SAMP, SMALL, SPAN, STRONG, SUB, SUP, UL, VAR, 		
-APPLET, B, BIG, CENTER, DIR, FONT, HR, I, MENU, PRE, S, STRIKE, TT,		
-U, ABBR, ACRONYM, BDO, BUTTON, FIELDSET, INS, LABEL	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	vertical-align:	baseline;
-	}	
-		
-BODY	{	
-	line-height:	1.58em;
-	}	
-		
-DIV > P:first-child, BODY > P:first-child, TD > P:first-child	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H1 + P, H2 + P, H3 + P, H4 + P, H5 + P, H6 + P, DIV + P, P.initial	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H1, H2, H3, H4, H5, H6	{	
-	line-height:	1.33em;
-	}	
-		
-H1	{	
-	margin-top:	1.33em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H2	{	
-	margin-top:	1.75em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H3	{	
-	margin-top:	1.58em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H4	{	
-	margin-top:	1.33em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H5	{	
-	margin-top:	1.17em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-H6	{	
-	margin-top:	1em;
-	margin-bottom:	.33em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-P	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-BLOCKQUOTE, FIELDSET, FORM, UL, OL, DL, DIR, MENU	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-DT	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-DD	{	
-	margin-top:	0;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-UL UL, OL OL, LI ADDRESS, LI DL, LI OL, LI P, LI UL, LI DIR, LI HR, LI MENU, LI PRE, LI H1, LI H2, LI H3, LI H4, LI H5, LI H6, DD ADDRESS, DD DL, DD OL, DD P, DD UL, DD DIR, DD HR, DD MENU, DD PRE, DD H1, DD H2, DD H3, DD H4, DD H5, DD H6	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-LI	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-ADDRESS	{	
-	margin-top:	1.58em;
-	margin-bottom:	1.58em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-PRE	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	line-height:	1.25em;
-	}	
-		
-HR	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	height:	1px;
-	}	
-		
-DIV, CENTER	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-.subhead	{	
-	margin-top:	.75em;
-	margin-bottom:	.75em;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-.stb	{	
-	margin-top:	2.17em;
-	margin-bottom:	.75em;
-	padding-top:	2.17em;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	border-style:	solid
-	}	
-		
-.mtb	{	
-	margin-top:	3.08em;
-	margin-bottom:	.75em;
-	padding-top:	3.08em;
-	padding-bottom:	0;
-	border-top:	.1em;
-	border-bottom:	0;
-	border-style:	solid
-	}	
-		
-.ltb	{	
-	margin-top:	4.34em;
-	margin-bottom:	.75em;
-	padding-top:	4.34em;
-	padding-bottom:	0;
-	border-top:	.25em;
-	border-bottom:	0;
-	border-style:	solid
-	}	
-		
-COL, COLGROUP, TABLE, TBODY, TD, TFOOT, TH, THEAD, TR	{	
-	margin-top:	0;
-	margin-bottom:	0;
-	padding-top:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-bottom:	0;
-	}	
-		
-TD, TH	{	
-	line-height:	1.33em;
-	}	
-		
-	/* end vertical */	
-
-
-
-
-	/* begin horizontal */	/* 1 - compact */
-		
-A, ADDRESS, BLOCKQUOTE, CITE, CODE, DD, DEL, DFN,		
-DIV, DL, DT, EM, FORM, H1, H2, H3, H4, H5, H6, IFRAME, IMG, KBD,		
-LI, OBJECT, OL, P, Q, SAMP, SMALL, SPAN, STRONG, SUB, SUP, UL, VAR, 		
-APPLET, B, BIG, CENTER, DIR, FONT, HR, I, MENU, PRE, S, STRIKE, TT,		
-U, ABBR, ACRONYM, BDO, BUTTON, FIELDSET, INS, LABEL	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	float:	none;
-	clear:	none;
-	list-style-position:	outside;
-	}	
-		
-ADDRESS, BLOCKQUOTE, DL, FIELDSET, FORM, OL, 		
-P, UL,  DIR, HR, MENU, PRE	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-DIV > P:first-child, BODY > P:first-child, TD > P:first-child	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	text-indent:	0;
-	}	
-		
-H1 + P, H2 + P, H3 + P, H4 + P, H5 + P, H6 + P, DIV + P, P.initial	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	text-indent:	0;
-	}	
-		
-H1	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-H2	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-H3	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-H4	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-H5	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-H6	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-P	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-indent:	0;
-	}	
-		
-BLOCKQUOTE	{	
-	margin-left:	1.58em;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-ADDRESS	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-PRE	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-LI	{	
-	margin-left:	3.16em;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-DT	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-DD	{	
-	margin-left:	1.58em;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}	
-		
-UL UL, OL OL, LI ADDRESS, LI DL, LI OL, LI P, LI UL, LI DIR, LI HR, LI MENU, LI PRE, LI H1, LI H2, LI H3, LI H4, LI H5, LI H6, DD ADDRESS, DD DL, DD OL, DD P, DD UL, DD DIR, DD HR, DD MENU, DD PRE, DD H1, DD H2, DD H3, DD H4, DD H5, DD H6	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	}
-			
-HR	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	width:	100%;
-	}	
-		
-CENTER	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	text-align:	left;
-	}	
-		
-COL, COLGROUP, TABLE, TBODY, TD, TFOOT, TH, THEAD, TR	{	
-	margin-left:	0;
-	margin-right:	0;
-	padding-left:	0;
-	padding-right:	0;
-	border-left:	0;
-	border-right:	0;
-	float:	none;
-	clear:	none;
-	}	
-		
-TABLE	{	
-	text-align:	left;
-	}	
-		
-TD	{	
-	text-align:	left;
-	}	
-		
-TH	{	
-	text-align:	left;
-	}	
-		
-CAPTION	{	
-	text-align:	left;
-	}	
-		
-	/* end horizontal */	
-
-
-
-
-	/* begin body box */	/* 5 - 'ninths symmetric' */
-
-BODY	{
-	margin-top:	1.58em;
-	margin-left:	11%;
-	margin-right:	8%;
-	margin-bottom:	1.58em;
-	padding-top:	0;
-	padding-left:	0;
-	padding-right:	0;
-	padding-bottom:	0;
-	border-top:	0;
-	border-left:	0;
-	border-bottom:	0;
-	border-right:	0;
-	width:	auto;
-	}
-	/* end body box */
-
-
-
-
diff --git a/layout/html/tests/table/bugs/bug2886-2.html b/layout/html/tests/table/bugs/bug2886-2.html
deleted file mode 100644
index 63ba8a594f96..000000000000
--- a/layout/html/tests/table/bugs/bug2886-2.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML><HEAD>
-<title>Results of my CSS tests</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<LINK REL="copyright" HREF="/~dbaron/legal.html">
-<LINK REL="stylesheet" HREF="bug2886-2.css" TITLE="Oldstyle" TYPE="text/css">
-<style type="text/css">
-.U { background-color: #CCC; color: #000; } /* untested */
-.Y { background-color: #090; color: #FFF; } /* yes */
-.N { background-color: #009; color: #FFF; } /* no support */
-.P { background-color: #066; color: #FFF; } /* partial support */
-.B { background-color: #C00; color: #FF0; } /* buggy */
-.D { background-color: #F60; color: #066; } /* destroys */
-.M { background-color: #900; color: #FFF; } /* maybe */
-.C { background-color: #000; color: #FF0; font-weight: bold; } /* maybe */
-#res TH { text-align: right; }
-TR.gap TD, TR.gap TH { border-top: 0.75em solid #FFFFF5; }
-</style>
-</HEAD>
-<body>
-
-<table id="res">
-  <tr>
-    <th>17.6 <a href="tborder2">Table Border Test 2</a></th>
-    <td class="B">B</td> <!-- NGLay -->
-    <td class="N">N</td> <!-- Opera 3.51 -->
-    <td class="N">N</td> <!-- Opera 3.60b3 -->
-    <td class="N">N</td> <!-- MSIE5 -->
-    <td class="N">N</td> <!-- NN 4.5 -->
-        <td class="U">U</td> <!-- WebTV 1.1 -->
-        <td class="spec">CSS2</td>
-  </tr>
-  <tr class="gap">
-    <th>Tests Y (+1)</th>
-    <td class="Y">31</td> <!-- NGLay -->
-    <td class="Y">&nbsp;</td> <!-- Opera 3.51 -->
-    <td class="Y">16</td> <!-- Opera 3.60b3 -->
-    <td class="Y">16</td> <!-- MSIE5 -->
-    <td class="Y">2</td> <!-- NN 4.5 -->
-        <td class="Y">U</td> <!-- WebTV 1.1 -->
-        <td></td>
-  </tr>
-  <tr>
-    <th>Tests N (0)</th>
-    <td class="N">4</td> <!-- NGLay -->
-    <td class="N">&nbsp;</td> <!-- Opera 3.51 -->
-    <td class="N">21</td> <!-- Opera 3.60b3 -->
-    <td class="N">14</td> <!-- MSIE5 -->
-    <td class="N">18</td> <!-- NN 4.5 -->
-        <td class="N">U</td> <!-- WebTV 1.1 -->
-        <td></td>
-  </tr>
-</table>
-
-
-<hr title="Beginning of Footer">
-<p><a href="http://validator.w3.org/check?uri=http://dbaron.org/css/test/" TITLE="W3C HTML Validator"><img src="../images/vh40" ALT="Valid HTML 4.0!" height="31" width="88"></a></p>
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" TITLE="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</BODY></HTML> 
diff --git a/layout/html/tests/table/bugs/bug2886.html b/layout/html/tests/table/bugs/bug2886.html
deleted file mode 100644
index 6c4b31585483..000000000000
--- a/layout/html/tests/table/bugs/bug2886.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html><head>
-<style>
-.foo {border: 1px dashed red;}
-</style>
-</head>
-<body>
-<p>Tests of padding in table cells. </p>
-
-<table border=0 cellpadding=10><tr><td valign=top>
-
-<p><b>1) padding: 20px</b></p>
-<table border=1>
- <tr><td style="padding:20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
-</td><td valign=top>
-
-<p><b>2) padding: 10px 25px 30px 45px;</b></p>
-<table border=1>
- <tr><td style="padding: 10px 25px 30px 45px;"><div class="foo">FOO</div></td></tr>
-</table>
-
-</td></tr></table>
-
-<br>
-<table border=0 cellpadding=10><tr><td valign=top>
-
-<p><b>3) padding-left: 20px</b></p>
-<table border=1>
- <tr><td style="padding-left:20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
- </td><td valign=top>
-
-<p><b>4) padding-right: 20px</b></p>
-<table border=1>
- <tr><td style="padding-right:20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
- </td><td valign=top>
-
-<p><b>5) padding-top: 20px</b></p>
-<table border=1>
- <tr><td style="padding-top:20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
- </td><td valign=top>
-
-<p><b>6) padding-bottom: 20px</b></p>
-<table border=1>
- <tr><td style="padding-bottom: 20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
- </td></tr></table>
-
-<br>
-<p><b>misc) padding: 20px 10px 40px 0px</b></p>
-<table border=1>
- <tr><td style="padding: 20px 10px 40px 0px;"><div class="foo">FOO</div></td></tr>
-</table>
-
-<p><b>misc) padding-top: 10px; padding-bottom: 20px;</b></p>
-<table border=1>
- <tr><td style="padding-top: 10px; padding-bottom: 20px;"><div class="foo">FOO</div></td></tr>
-</table>
-
-
-</body></html>
-
diff --git a/layout/html/tests/table/bugs/bug28928.html b/layout/html/tests/table/bugs/bug28928.html
deleted file mode 100644
index 9bc2e4ade2a8..000000000000
--- a/layout/html/tests/table/bugs/bug28928.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<html><body>
-
-<h3>With long hidden values</h3>
-<table width=0  style="border: thin solid red;">
-<tr><td>
-<form METHOD=GET ACTION="http://cgi.netscape.com/cgi-bin/redirector.cgi">
-<input type=hidden name=redirect_cgi value="http://websearch.web.aol.com:80/plweb-cgi/fastweb">
-<input type=hidden name=redirect_cp value=hom02w>
-<input type=hidden name=TemplateName value=prehit.tmpl>
-<input type=hidden name=view value=weather_netscape>
-<input type=hidden name=dbname value=weather_netscape>
-<input type=hidden name=query_rule value="($query)">
-<input type=hidden name=operator value=AND>
-<input type=hidden name=numresults value=20>
-<input type=hidden name=sorting value="BYFIELD:+city_long,+country_long,+state_long">
-<input type="Text" name="query" value="" size=13 maxlength=20> 
-<input type="Submit" name="Submit" value=" Go ">
-<br>
-Enter City Name or Zip Code
-</form>
-</td><tr>
-</table>
-
-<hr>
-
-<h3>With short hidden values</h3>
-<table width=0  style="border: thin solid red;">
-<tr><td>
-<form METHOD=GET ACTION="http://cgi.netscape.com/cgi-bin/redirector.cgi">
-<input type=hidden name=redirect_cgi value="">
-<input type=hidden name=redirect_cp value="">
-<input type=hidden name=TemplateName value="">
-<input type=hidden name=view value="">
-<input type=hidden name=dbname value="">
-<input type=hidden name=query_rule value="">
-<input type=hidden name=operator value="">
-<input type=hidden name=numresults value="">
-<input type=hidden name=sorting value="">
-<input type="Text" name="query" value="" size=13 maxlength=20> 
-<input type="Submit" name="Submit" value=" Go ">
-<br>
-Enter City Name or Zip Code
-</form>
-</td><tr>
-</table>
-
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug28933.html b/layout/html/tests/table/bugs/bug28933.html
deleted file mode 100644
index 46bfa6a383b0..000000000000
--- a/layout/html/tests/table/bugs/bug28933.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<title>test</title>
-
-<table style='border-collapse:collapse;'>
-  <tr>
-    <td rowspan=2></td>
-  </tr>
-  <tr>
-    <td></td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug29058-1.html b/layout/html/tests/table/bugs/bug29058-1.html
deleted file mode 100644
index 487aa7e246e6..000000000000
--- a/layout/html/tests/table/bugs/bug29058-1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html>
-<body>
-
-<table width="100%" border="1">
-<colgroup>
-<col width="25">
-<col width="10%">
-<col width="1*">
-</colgroup>
-<tr>
-  <td>Test</td>
-  <td>Test</td>
-  <td>Test</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug29058-2.html b/layout/html/tests/table/bugs/bug29058-2.html
deleted file mode 100644
index 547f141242e7..000000000000
--- a/layout/html/tests/table/bugs/bug29058-2.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<!-- Created with GoldED 4.7.3 (23.6.97) -->
-<HEAD>
-   <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <META name="description" lang="fr" content="Test sur les tables">
-   <META name="author"                content="S&eacute;bastien Desvignes">
-   <META name="generator"             content="WWW publishing extensions for GoldED">
-   <TITLE>Table width test</TITLE>
-   <STYLE type="text/css">
-      BODY
-      {
-         color: #000;
-         background-color: #999;
-      }
-
-      H1
-      {
-         text-align: center;
-      }
-
-      TABLE
-      {
-         border: outset 1px grey;
-      }
-
-      TD
-      {
-         border: inset 1px grey;
-      }
-
-      IMG
-      {
-         border: solid 1px white;
-      }
-   </STYLE>
-</HEAD>
-
-<BODY>
-   <TABLE>
-      <CAPTION>Table with no width attribute</CAPTION>
-      <COL width="50px">
-      <COL width="1*">
-      <COL width="50px">
-      <COL width="3*">
-      <TR>
-         <TD>50px</TD>
-         <TD>1*</TD>
-         <TD>50px</TD>
-         <TD>3*</TD>
-      </TR>
-   </TABLE>
-   <P>correct
-
-   <TABLE width="500px">
-      <CAPTION>Table with fixed width attribute =500px</CAPTION>
-      <COL width="50px">
-      <COL width="1*">
-      <COL width="50px">
-      <COL width="3*">
-      <TR>
-         <TD>50px</TD>
-         <TD>1*</TD>
-         <TD>50px</TD>
-         <TD>3*</TD>
-      </TR>
-   </TABLE>
-   <P>incorrect: it seems that the * columns start with the same width than the previous
-   example, and then all the columnss are expanded proportionally to occupy the extra space.
-   The * columns should use all the space unused by other columns, so no expand are needed
-   for other columns.
-
-   <TABLE width="100%">
-      <CAPTION>Table with width attribute =100%</CAPTION>
-      <COL width="50px">
-      <COL width="1*">
-      <COL width="50px">
-      <COL width="3*">
-      <TR>
-         <TD>50px</TD>
-         <TD>1*</TD>
-         <TD>50px</TD>
-         <TD>3*</TD>
-      </TR>
-   </TABLE>
-   <P>incorrect: same as above.
-
-   <TABLE width="500">
-      <CAPTION>Table with width attribute =500px</CAPTION>
-      <COL width="1*">
-      <COL width="2*">
-      <COL width="1*">
-      <COL width="6*">
-      <TR>
-         <TD>1*</TD>
-         <TD>2*</TD>
-         <TD>1*</TD>
-         <TD>6*</TD>
-      </TR>
-   </TABLE>
-   <P>correct
-
-   <TABLE width="100%">
-      <CAPTION>Table with width attribute =100%</CAPTION>
-      <COL width="1*">
-      <COL width="2*">
-      <COL width="1*">
-      <COL width="6*">
-      <TR>
-         <TD>1*</TD>
-         <TD>2*</TD>
-         <TD>1*</TD>
-         <TD>6*</TD>
-      </TR>
-   </TABLE>
-   <P>correct
-</BODY>
-
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug29058-3.html b/layout/html/tests/table/bugs/bug29058-3.html
deleted file mode 100644
index b4a3659d9352..000000000000
--- a/layout/html/tests/table/bugs/bug29058-3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <title>
-      Testcase
-    </title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  </head>
-  <body>
-            <table border="1" cellspacing="0" cellpadding="0" width="400">
-      <caption>
-         Table is 400 px width, set with table width=400.
-      </caption>
-      <col width="50">
-      <col width="*">
-      <col width="50">
-      <tbody>
-               <tr>
-          <td colspan="3">
-                          table Cols 1 - 3. There must be a lot of text here
-              in order to see the bug. table Cols 1 - 3. There
-              must be a lot of text here in order to see the bug.
-              table Cols 1 - 3. There must be a lot of text here
-              in order to see the bug. table Cols 1 - 3. There
-              must be a lot of text here in order to see the bug.
-              table Cols 1 - 3. There must be a lot of text here
-              in order to see the bug. table Cols 1 - 3. There
-              must be a lot of text here in order to see the bug.
-              table Cols 1 - 3. There must be a lot of text here
-              in order to see the bug. table Cols 1 - 3. There
-              must be a lot of text here in order to see the bug.
-                      </td>
-        </tr>
-      </tbody>
-    </table>
-      </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug29157.html b/layout/html/tests/table/bugs/bug29157.html
deleted file mode 100644
index c1c47d398017..000000000000
--- a/layout/html/tests/table/bugs/bug29157.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>test</TITLE>
-</HEAD>
-<BODY>
-<TABLE BORDER=1 ID="TABLE1">
-    <TR><TD>cell data</TD><TD>cell data</TD></TR>
-    <TR><TD>cell data</TD><TD>cell data</TD></TR>
-    <TR><TD>cell data</TD><TD>cell data</TD></TR>
-</TABLE>
-
-<SCRIPT TYPE="text/javascript">
-
-
-var t=document.getElementById("TABLE1");
-document.write("[object HTMLTableElement]");
-
-t.createCaption();
-
-
-</SCRIPT>
-</BODY>
-</HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/bugs/bug29314.html b/layout/html/tests/table/bugs/bug29314.html
deleted file mode 100644
index 24e9ebb586dc..000000000000
--- a/layout/html/tests/table/bugs/bug29314.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-        <head>
-        </head>
-        <body>
-                <table width="600" >
-                        <tr>
-                                <td ><img src="../images/ant.jpg"></td>
-                                <td width="55"><img src="../images/ant.jpg"></td>
-                                <td ><img src="../images/ant.jpg"></td> 
-                        </tr>
-                </table>
-        </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug29326.html b/layout/html/tests/table/bugs/bug29326.html
deleted file mode 100644
index 59e462144c4d..000000000000
--- a/layout/html/tests/table/bugs/bug29326.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-
-<body>
-<table width=400  border="1" align="center">
-  <tr> 
-    <td width=300> 
-             <form>
-              <select>
-              <option>Test</option>
-              </select>
-             </form>
-    </td>
-  </tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug29429.html b/layout/html/tests/table/bugs/bug29429.html
deleted file mode 100644
index b040b8534824..000000000000
--- a/layout/html/tests/table/bugs/bug29429.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<body  onload="doIt()">
-<SCRIPT>
-function doIt() {
-  var row = document.getElementById("foo");
-  row.deleteCell(0);
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode("yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy yyy ");
-  cell.appendChild(text);
-  row.appendChild(cell);
-}
-</SCRIPT>
-<TABLE BORDER=1>
- <TR>
-  <TD>
-   <TABLE BORDER=1 WIDTH="100%">
-    <TR ID="foo">
-     <TD>
-text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
-  <TD>
-text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug2947.html b/layout/html/tests/table/bugs/bug2947.html
deleted file mode 100644
index 8c8c093d261f..000000000000
--- a/layout/html/tests/table/bugs/bug2947.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<TITLE>Mozilla Tests: Table Sizing Problems</TITLE>
-
-<STYLE type="text/css">
-   TD { border: solid green 1px; }
-   TABLE { border: dotted navy 1px; }
-   DIV { width: 608px; border: solid 1px red; margin: 1em 0; }
-</STYLE>
- 
-   <p>The table below should have the same width as the red DIV
-   below this paragraph. The inner image should just fit. The
-   image <em>should not</em> overrun the borders. </div>
-
-   <div></div>
- 
-   <table width="608">
- 
-    <tr> 
-       <td width="25%">a</td>
-       <td width="25%">b</td>
-       <td width="25%">c</td>
-       <td width="25%">d</td>
-    </tr>
-
-    <tr>
-      <td colspan="2" width="50%"> eee </td>
-      <td colspan="2" width="50%"> f </td>
-    </tr>
-  
-    <tr>
-      <td colspan="4"> <img src="../images/wsp600bot.gif"> </td>
-    </tr>
-
-   </table>
-
-   <div></div>
-
-   <p>Mozilla makes the table way too small for no apparent reason.</p>
-
-   <p>Here is the same table, one pixel wider:</p>
- 
-   <table width="609">
- 
-    <tr> 
-       <td width="25%">a</td>
-       <td width="25%">b</td>
-       <td width="25%">c</td>
-       <td width="25%">d</td>
-    </tr>
-
-    <tr>
-      <td colspan="2" width="50%"> eee </td>
-      <td colspan="2" width="50%"> f </td>
-    </tr>
-  
-    <tr>
-      <td colspan="4"> <img src="../images/wsp600bot.gif"> </td>
-    </tr>
-
-   </table>
-
-   <p>Observations: Fiddle about with the content of the "eee" cell and everything changes.
-   Remove any of the three rows and things change. Remove any of the four columns and
-   things change. Remove the image and things change.</p>
-
-   <p>(Note: If the image has disappeared from the server, replace it with any 593px
-   image you like.)</p>
-
-   <p>See also <a href="tablewidth.html">tablewidth.html</a>.</p>
-
-   <hr>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug294823.html b/layout/html/tests/table/bugs/bug294823.html
deleted file mode 100644
index 9c976b06b843..000000000000
--- a/layout/html/tests/table/bugs/bug294823.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html><head>
-<title>Testcase bug 294823 - ASSERTION: max element width exceeded desired width: 'PR_FALSE'</title>
-</head>
-<body>
-<table><tbody>
-<tr>
-<td></td>
-<td>
-<select>
-<option><script>var x=document.body.offsetHeight;</script></option>
-</select>
-</td>
-</tr>
-<tr>
-<td>text</td>
-<td></td>
-</tr>
-</tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug2954.html b/layout/html/tests/table/bugs/bug2954.html
deleted file mode 100644
index 86f261a68b09..000000000000
--- a/layout/html/tests/table/bugs/bug2954.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<TABLE BORDER="0" WIDTH="600" CELLPADDING="0" CELLSPACING="0">
-<TR>
-    <TD WIDTH=80 VALIGN=BOTTOM><IMG SRC="../images/rnsite_logo.gif" ALT="real.com home" WIDTH="80" HEIGHT="70" BORDER="0"></TD>
-    <TD WIDTH=520 VALIGN=BOTTOM><IMG SRC="../images/navtop_products.gif" ALT="Products" WIDTH="104" HEIGHT="20" BORDER="0" NAME="products"><IMG SRC="../images/navtop_devzone.gif" ALT="Showcase" WIDTH="104" HEIGHT="20" BORDER="0" NAME="showcase"><IMG SRC="../images/navtop_devzone.gif" ALT="Solutions" WIDTH="104"
-HEIGHT="20" BORDER="0" NAME="solutions"><IMG SRC="../images/navtop_devzone.gif" ALT="DevZone" WIDTH="104" HEIGHT="20" BORDER="0" NAME="devzone"><IMG SRC="../images/navtop_devzone.gif" ALT="Company" WIDTH="104" HEIGHT="20" BORDER="0" NAME="company"></TD>
-</TR>
-<TR>
-    <TD BGCOLOR="#CCCC99" VALIGN="TOP" WIDTH="600" COLSPAN=2><IMG SRC="../images/home_beige_top.gif" WIDTH="600" HEIGHT="24" BORDER="0"></TD>
-</TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug2962.html b/layout/html/tests/table/bugs/bug2962.html
deleted file mode 100644
index 08fd94ae2041..000000000000
--- a/layout/html/tests/table/bugs/bug2962.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table border="2" width="300" cellpadding="2" cellspacing="0"><tr>
-<td align="center" bgcolor="#FFFF00"><center>
-<a 
-href="/event.ng/Type=click&ProfileID=1749&RunID=5792&AdID=2503&GroupID=315&Famil
-yID=345&TagValues=199.273.2191&Redirect=http:%2f%2fwww.acmecity.com" 
-target="_new"><img 
-src="../images/acmeicon-35.gif" 
-border=0 align=left></a>
-<a 
-href="/event.ng/Type=click&ProfileID=1749&RunID=5792&AdID=2503&GroupID=315&Famil
-yID=345&TagValues=199.273.2191&Redirect=http:%2f%2fwww.acmecity.com" 
-target="_new"><FONT COLOR="#000000">Free Homepage!  Free Email!<BR>It's all 
-yours at ACMEcity!</font></A></center></TD>
-</tr></table>
-
diff --git a/layout/html/tests/table/bugs/bug2973.html b/layout/html/tests/table/bugs/bug2973.html
deleted file mode 100644
index e04573961711..000000000000
--- a/layout/html/tests/table/bugs/bug2973.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<table>
- <tr>
-  <td>
-   <table>
-    <tr>
-     <td>inside of table<img src="../images/mozilla-banner.gif" border=0 alt=""></td>
-    </tr>
-   </table>
-  </td>
-  <td>2nd row of outside table</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug2981-1.html b/layout/html/tests/table/bugs/bug2981-1.html
deleted file mode 100644
index 61311f60ca19..000000000000
--- a/layout/html/tests/table/bugs/bug2981-1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body>
-
-<table width="100%" cellpadding=0 cellspacing=0 border=0>
- <tr>
-  <td bgcolor="#dddddd">
-   <table width="135" border="0" cellpadding="0" cellspacing="0" 
-bgcolor="#dddddd">
-    <tr>
-     <td>should be 135 pixels-</td></tr></table></td>  
-  <td>
-    Spain stretched their unbeaten streak to six games as they beat Croatia 3-1 
-    in a friendly at Seville's new Olympic stadium which was inaugurated on 
-Wednesday.</td></tr></table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug2981-2.html b/layout/html/tests/table/bugs/bug2981-2.html
deleted file mode 100644
index f3cafaa57a2a..000000000000
--- a/layout/html/tests/table/bugs/bug2981-2.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-
-<body  bgcolor="#FFFFFF" 
-topmargin="0" leftmargin="0" marginwidth="0" marginheight="0">
-<img src="../images/raptor.jpg" width="100" height="100" border="1">
-
-<table width=100% cellpadding=0 cellspacing=0 border=2>
- <tr valign=top>
-  <td rowspan=2 bgcolor="#dddddd">
-   <table style="margin:0px;" width="100" border="1" cellpadding="0" 
-cellspacing="0" bgcolor="#dddddd">
-    <tr valign="top"><td>
-     <img src="../images/raptor.jpg" width="100" height="100" border="0" hspace="4" 
-vspace="0" alt="">
-         HELLO</td></tr>
-   </table>
-  </td>
- </tr>
- <tr>
-  <td width=325>
-   The Zurich football team known as FC Blue Stars is one of the city's 
-oldest-established clubs, 
-   and it is thanks mainly to its annual junior tournament which has been 
-running for 60 years 
-   (traditionally played on Ascension Day and the day before) that it now also 
-has an international   </td>
-  <td bgcolor="#e6e8fa">hello hello hello hello hello hello hello hello hello 
-hello hello </td></tr>
-</table>
-
-</body>
-</html>
-
-
-
diff --git a/layout/html/tests/table/bugs/bug2997.html b/layout/html/tests/table/bugs/bug2997.html
deleted file mode 100644
index 899d646a851c..000000000000
--- a/layout/html/tests/table/bugs/bug2997.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html>
-<head>
-<title>Bug 2997</title>
-</head>
-<body>
-
-<p>Here's the original case.  All of the cells have images that fill to
-their given widths except the ones marked "Empty".</p>
-
-
-<table width="566" bgcolor="#00FFFF" cellpadding="0" cellspacing="0">
-  <tr>
-    <td bgcolor="#FF0000" width="222"><img height="40" width="222" border="0" alt="Hometown AOL"></td>
-    <td bgcolor="#666600" width="145"><img border=0 width=145 height=40 alt="Quick Start Link"></td>
-    <td bgcolor="#009999" width="199">Empty</td></tr>
-  <tr>
-    <td bgcolor="#0000ff" width="367" colspan="2"><img height="20" width="367" alt=" Welcome"></td>
-    <td bgcolor="#990099" width="199">Empty</td></tr>
-</tr></table>
-
-<p>If we fill either empty out with text, the problem goes away.</p>
-
-<table width="566" bgcolor="#00FFFF" cellpadding="0" cellspacing="0">
-  <tr>
-    <td bgcolor="#FF0000" width="222"><img height="40" width="222" border="0" alt="Hometown AOL"></td>
-    <td bgcolor="#666600" width="145"><img border=0 width=145 height=40 alt="Quick Start Link"></td>
-    <td bgcolor="#009999" width="199">Empty - lots of text here now - and more and more and more text in it</td></tr>
-  <tr>
-    <td bgcolor="#0000ff" width="367" colspan="2"><img height="20" width="367" alt=" Welcome"></td>
-    <td bgcolor="#990099" width="199">Empty</td></tr>
-</tr></table>
-
-<p>&nbsp;</p>
-
-<table width="566" bgcolor="#00FFFF" cellpadding="0" cellspacing="0">
-  <tr>
-    <td bgcolor="#FF0000" width="222"><img height="40" width="222" border="0" alt="Hometown AOL"></td>
-    <td bgcolor="#666600" width="145"><img border=0 width=145 height=40 alt="Quick Start Link"></td>
-    <td bgcolor="#009999" width="199">Empty</td></tr>
-  <tr>
-    <td bgcolor="#0000ff" width="367" colspan="2"><img height="20" width="367" alt=" Welcome"></td>
-    <td bgcolor="#990099" width="199">Empty - this has lots and lots and lots of text in it</td></tr>
-</tr></table>
-
-
-<p>Taking away either the cellpadding=0 or cellspacing=0 fixes the problem.</p>
-
-
-<table width="566" bgcolor="#00FFFF">
-  <tr>
-    <td bgcolor="#FF0000" width="222"><img height="40" width="222" border="0" alt="Hometown AOL"></td>
-    <td bgcolor="#666600" width="145"><img border=0 width=145 height=40 alt="Quick Start Link"></td>
-    <td bgcolor="#009999" width="199">Empty</td></tr>
-  <tr>
-    <td bgcolor="#0000ff" width="367" colspan="2"><img height="20" width="367" alt=" Welcome"></td>
-    <td bgcolor="#990099" width="199">Empty</td></tr>
-</tr></table>
-
-<p>As does removing the explicit width on the table...</p>
-
-<table bgcolor="#00FFFF" cellpadding="0" cellspacing="0">
-  <tr>
-    <td bgcolor="#FF0000" width="222"><img height="40" width="222" border="0" alt="Hometown AOL"></td>
-    <td bgcolor="#666600" width="145"><img border=0 width=145 height=40 alt="Quick Start Link"></td>
-    <td bgcolor="#009999" width="199">Empty</td></tr>
-  <tr>
-    <td bgcolor="#0000ff" width="367" colspan="2"><img height="20" width="367" alt=" Welcome"></td>
-    <td bgcolor="#990099" width="199">Empty</td></tr>
-</tr></table>
-
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug299723.html b/layout/html/tests/table/bugs/bug299723.html
deleted file mode 100644
index 5b05d5b2c1b4..000000000000
--- a/layout/html/tests/table/bugs/bug299723.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head>
-<title>Testcase bug 299723 - Table attribute RULES doesn't seem to recognize "none" and other values work strangely</title></head>
-<body>
-<table border="10" cellspacing="0" frame="void" rules="none" width="750">
-<tbody><tr>
-<td>You should see</td>
-<td>no borders here</td>
-</tr></tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug30273.html b/layout/html/tests/table/bugs/bug30273.html
deleted file mode 100644
index b41e9324678a..000000000000
--- a/layout/html/tests/table/bugs/bug30273.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<body>
-
-<table border=1>
- <tr>
-  <td>Test</td>
-  <td rowspan=3>Test</td>
- </tr>
- <tr>
-  <td>
-   <span>This cell should be visible
-    <table>
-     <tr>
-      <td>This table should be visible</td>
-     </tr>
-     <input type="hidden">
-    </table>
-   </span>
-  </td>
- </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug30332-1.html b/layout/html/tests/table/bugs/bug30332-1.html
deleted file mode 100644
index c1f53e7827d9..000000000000
--- a/layout/html/tests/table/bugs/bug30332-1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.72 [en] (Win98; I) [Netscape]">
-   <title>ROWSPAN = "0" Test Case</title>
-</head>
-
-<body>
-
-BAD:<br><br>
-  <center>
-    <table BORDER = "5" COLS=1 WIDTH="100%" >
-      <tr>
-        <td ROWSPAN = "0">One</td>
-      </tr>
-
-      <tr>
-        <td>Two</td>
-      </tr>
-    </table>
-  </center>
-
-<br>
-<br>
-
-GOOD:<br><br>
-  <center>
-    <table BORDER = "5"COLS=1 WIDTH="100%" >
-      <tr>
-        <td>One</td>
-      </tr>
-
-      <tr>
-        <td>Two</td>
-      </tr>
-    </table>
-  </center>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug30332-2.html b/layout/html/tests/table/bugs/bug30332-2.html
deleted file mode 100644
index 444d64906a5c..000000000000
--- a/layout/html/tests/table/bugs/bug30332-2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.72 [en] (Win98; I) [Netscape]">
-   <title>ROWSPAN = "0" Test Case</title>
-</head>
-
-<body>
-
-BAD:<br><br>
-  <center>
-    <table BORDER = "5" COLS=1 WIDTH="100%" >
-      <tr>
-        <td ROWSPAN = "0">One</td>
-      </tr>
-
-      <tr>
-        <td>Two</td>
-      </tr>
-    </table>
-  </center>
-
-<br>
-<br>
-
-GOOD:<br><br>
-  <center>
-    <table BORDER = "5"COLS=1 WIDTH="100%" >
-      <tr>
-        <td>One</td>
-      </tr>
-
-      <tr>
-        <td>Two</td>
-      </tr>
-    </table>
-  </center>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3037-1.html b/layout/html/tests/table/bugs/bug3037-1.html
deleted file mode 100644
index 8cd40d893ebe..000000000000
--- a/layout/html/tests/table/bugs/bug3037-1.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?> 
-<window xmlns:html="http://www.w3.org/1999/xhtml">
-<window xmlns:xul 
-="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-<!DOCTYPE window> 
-
-<window>
-  <xul:toolbox>
-    <xul:toolbar>
-          <html:span style="display: table-cell">
-          <html:button cmd="nsCmd:BrowserBack" 
-style="background-color:rgb(192,192,192);">
-                          <html:img 
-src="../images/raptor.jpg"/><html:BR/>Back
-          </html:button>
-          </html:span>
-          <html:span style="display: table-cell">
-                  <html:input style="width:325px;"></html:input>   
-          </html:span>
-    </xul:toolbar>        
-  </xul:toolbox>
-</window>
diff --git a/layout/html/tests/table/bugs/bug3037-2.html b/layout/html/tests/table/bugs/bug3037-2.html
deleted file mode 100644
index 785964193ed3..000000000000
--- a/layout/html/tests/table/bugs/bug3037-2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-<span style="display: table-cell">foo</span>
-<span style="display: table-cell">bar</span>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug30418.html b/layout/html/tests/table/bugs/bug30418.html
deleted file mode 100644
index 31308ac0ef79..000000000000
--- a/layout/html/tests/table/bugs/bug30418.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN style http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<script>
-window.onload = createTable;
-
-function createTable()
-{
-        var oTable = document.createElement("table");
-        document.body.appendChild(oTable);
-        oTable.appendChild(document.createElement("tbody"));
-        
-        // THead creation block
-        var oTHead = oTable.createTHead();
-        var oRow = oTHead.insertRow(0); 
-        for( var col=0;col<8;col++)
-        {
-                var oCell = oRow.insertCell(col);
-                var cellValue = document.createTextNode("h" + col);
-                oCell.appendChild(cellValue);
-        }
-        
-        
-        // TFoot creation block
-        var oTFoot = oTable.createTFoot();
-        oRow = oTFoot.insertRow(0); // create table footer row
-        for(col=0;col<8;col++)
-        {
-                 oCell = oRow.insertCell(col);
-                 cellValue = document.createTextNode("f" + col);
-                oCell.appendChild(cellValue);
-        } 
-        
-        for(var row=0;row<1;row++) // ask for just 1 row
-        {
-               oRow = oTable.tBodies[0].insertRow(row);
-                for(col=0;col<8;col++)
-                {
-                         oCell = oRow.insertCell(col);                       
-                        var newValue2 = document.createTextNode("r" + row + "c" 
-+ col);
-                        oCell.appendChild(newValue2);
-                }
-        }       
-                
-        oTable.border = 4;
-                
-        var str = "";
-        str += ".rows.length: " + oTable.rows.length + "\n";
-        //str += ".tHead.rows.length: " + oTable.tHead.rows.length + "\n";
-        //str += ".tFoot.rows.length: " + oTable.tFoot.rows.length + "\n";
-        str += ".tBodies.length: " + oTable.tBodies.length + "\n";
-        str += ".tBodies[0].rows.length: " + oTable.tBodies[0].rows.length 
-+ "\n";
-        
-        //alert(str);
-}
-</script>
-</head>
-<body>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug30559.html b/layout/html/tests/table/bugs/bug30559.html
deleted file mode 100644
index ee0e72d0b5de..000000000000
--- a/layout/html/tests/table/bugs/bug30559.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<HEAD>
-<SCRIPT>
-
-function doIt() {
-  var textarea = document.getElementsByTagName("TEXTAREA")[0];
-  textarea.value = "bar";
-}
-</SCRIPT>  
-<BODY BGCOLOR=#FFFFFF onload="doIt()">
-The bug causes the nested table containing the textarea to be positioned away from the left edge of the outer table
-<BR>
-
-<TABLE WIDTH=300 BORDER=1 ALIGN=CENTER>
- <TR>
-  <TD WIDTH=150>
-   <TABLE border=1>
-    <FORM>
-    <TR>
-     <TD>
-      <TEXTAREA row=2 cols=5>foo</TEXTAREA>
-     </TD>
-    </TR>
-        </FORM>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug30692.html b/layout/html/tests/table/bugs/bug30692.html
deleted file mode 100644
index 9f4cdfadb49e..000000000000
--- a/layout/html/tests/table/bugs/bug30692.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<body>
-BUG: Inside a cell, "height:x%" is ignored. It looks like 'auto' is used instead.<br>
-<li>Absolute units work correctly (eg. 50px).
-<li>"width:x%" works correctly.
-
-<hr>
-<table style="height:100px;width:100%">
-<tr>
-<td style="height:100%;width:100%;background: red;" >
-<textarea style="width:80%;height:80%">BUG: the height of the textarea is not 80%</textarea>
-</td>
-</tr>
-</table>
-
-<hr>
-<table style="height:100px;width:100%">
-<tr>
-<td style="height:100%;width:100%;background: red;" >
-<textarea style="width:80%;height:80px">OK: the height of the textarea is 80 pixels</textarea>
-</td>
-</tr>
-</table>
-
-<hr>
-<table style="height:100px;width:100%">
-<tr>
-<td style="height:100%;width:100%;background: red;" >
-<p style="width:80%;height:80%;background:lightyellow;">BUG: the height of the P is not 80%</p>
-</td>
-</tr>
-</table>
-
-<hr>
-<table style="height:100px;width:100%">
-<tr>
-<td style="height:100%;width:100%;background: red;" >
-<p style="width:80%;height:80px;background:lightyellow;">OK: the height of the P is 80 pixels</p>
-</td>
-</tr>
-</table>
-
-
-</body>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug30985.html b/layout/html/tests/table/bugs/bug30985.html
deleted file mode 100644
index 04fc3f1e3f19..000000000000
--- a/layout/html/tests/table/bugs/bug30985.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-        <title>Bug 30985</title>
-</head>
-<body>
-
-This is the first of two lines on this page.
-
-<table style="display: block">
-        <tbody>
-                <tr style="display: block">
-                        <td style="display: block">
-                                This is the second of two lines on this page.
-                        </td>
-                </tr>
-        </tbody>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3103.html b/layout/html/tests/table/bugs/bug3103.html
deleted file mode 100644
index 6ef667e33d36..000000000000
--- a/layout/html/tests/table/bugs/bug3103.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<table border=4 height=400>
-<tr>
-        <td rowspan=2 width=200 >
-        1 Some sample text for the first column. Notice its formatting.
-        </td>
-        <td  width=400>
-        2 Here is some sample text to demonstrate the problem. Is there some
-setting in Navigator that will make this work correctly ? If so I
-haven't found it. Is this a bug ?
-        </td>
-</tr>
-<tr>
-        <td  width=400>
-        3 Here is some sample text to demonstrate the problem. Is there some
-setting in Navigator that will make this work correctly ? If so I
-haven't found it. Is this a bug ?
-        </td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug3105.html b/layout/html/tests/table/bugs/bug3105.html
deleted file mode 100644
index 19414356cafa..000000000000
--- a/layout/html/tests/table/bugs/bug3105.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<head>
-
-</head>
-<body>
-&nbsp;
-<table BORDER COLS=2 WIDTH="50%" >
-<tr>
-<td><table ALIGN="MIDDLE" BORDER COLS=2 WIDTH="5%" >
-<tr>
-<td>hello</td>
-
-<td>hello</td>
-</tr>
-
-<tr>
-<td>hello</td>
-
-<td>hello</td>
-</tr>
-</table></td>
-
-<td>hello</td>
-</tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug312770.html b/layout/html/tests/table/bugs/bug312770.html
deleted file mode 100644
index d4a1c21c8def..000000000000
--- a/layout/html/tests/table/bugs/bug312770.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>Testcase bug 312770 - Table too wide because of marquee</title>
-</head>
-<body>
-<TABLE border="1"><TBODY>
-<TR>
-<TD>
-The table should not get wider than this text
-</TD>
-</TR>
-<TR>
-<TD>
-<MARQUEE>
-Hello
-</MARQUEE>
-</TD>
-</TR>
-</TBODY></TABLE>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-1.html b/layout/html/tests/table/bugs/bug3166-1.html
deleted file mode 100644
index 18085fe573b4..000000000000
--- a/layout/html/tests/table/bugs/bug3166-1.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 1</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style="width:200px; border:solid green" >
-<caption style="width:50px; margin-left:0px;border:solid orange; caption-side:right">
-cap</caption>
-<tr><td>table</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-10.html b/layout/html/tests/table/bugs/bug3166-10.html
deleted file mode 100644
index c1dff5727fe2..000000000000
--- a/layout/html/tests/table/bugs/bug3166-10.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 10</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style=" border:solid green; width:200px" align="center" >
-<caption style="border:solid orange; width:100px" align="left">
-caption</caption>
-<tr><td>table</td></tr></table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-11.html b/layout/html/tests/table/bugs/bug3166-11.html
deleted file mode 100644
index b6dbebff7c40..000000000000
--- a/layout/html/tests/table/bugs/bug3166-11.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 11</title>
-
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-
-<table>
-<caption align="left" style="width:50%">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-12.html b/layout/html/tests/table/bugs/bug3166-12.html
deleted file mode 100644
index 37f724c6ea4c..000000000000
--- a/layout/html/tests/table/bugs/bug3166-12.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 12</title>
-
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-<table><tr><td>
-<table>
-<caption align="left" style="width:50%">cap</caption>
-<tr><td>table cell foo and bar</td></tr>
-</table></td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-13.html b/layout/html/tests/table/bugs/bug3166-13.html
deleted file mode 100644
index 6f32c7ec34db..000000000000
--- a/layout/html/tests/table/bugs/bug3166-13.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 13</title>
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-
-<table align="center">
-<caption align="left" style="width:20%">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-14.html b/layout/html/tests/table/bugs/bug3166-14.html
deleted file mode 100644
index f97a7ccf391d..000000000000
--- a/layout/html/tests/table/bugs/bug3166-14.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 14</title>
-
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-<div style="height:200px; border:solid blue">
-<table align="center" style="height:80%">
-<caption align="left" style="width:20%; height:50%; vertical-align:bottom">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-</div>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-15.html b/layout/html/tests/table/bugs/bug3166-15.html
deleted file mode 100644
index aa11c5c0aba9..000000000000
--- a/layout/html/tests/table/bugs/bug3166-15.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 15</title>
-
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-
-<table align="center">
-<caption align="top" style="width:400px">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-16.html b/layout/html/tests/table/bugs/bug3166-16.html
deleted file mode 100644
index f1d5d1b85d21..000000000000
--- a/layout/html/tests/table/bugs/bug3166-16.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 16</title>
-
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange; caption-side:left; margin:auto}
-</style>
-</head>
-
-<body >
-
-<table align="center">
-<caption style="width:20%">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-17.html b/layout/html/tests/table/bugs/bug3166-17.html
deleted file mode 100644
index 3053df9f9403..000000000000
--- a/layout/html/tests/table/bugs/bug3166-17.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 17</title>
-<style type="text/css">
-table {border:solid green}
-caption{border: solid orange}
-</style>
-</head>
-
-<body >
-<div style="height:200px; border:solid blue">
-<table align="center" style="height:30%">
-<caption align="left" style="width:20%; height:50%; vertical-align:middle">cap</caption>
-<tr><td>table cell</td></tr>
-</table>
-</div>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-18.html b/layout/html/tests/table/bugs/bug3166-18.html
deleted file mode 100644
index 09a8284eb8c7..000000000000
--- a/layout/html/tests/table/bugs/bug3166-18.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 18 - css2</title>
-
-<style type="text/css">
-
-BODY {
-    margin-left: 8em
-}
-TABLE {
-    margin-left: auto;
-    margin-right: auto
-}
-CAPTION {
-    caption-side: left;
-    margin-left: -8em;
-    width: 8em;
-    text-align: right;
-    vertical-align: bottom
-}
-</style>
-</head>
-
-<body>
-
-<p>
-text text text previous paragraph text text above the table more text text text normal paragraph etc. etc.</p>
-<table>
-<caption>This is the caption. It is right aligned.Also aligned at the bottom</caption>
-<tr><th>header</th><th>header</th><th> header</th></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-<tr><td>cell</td><td>cell</td><td>cell</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-2.html b/layout/html/tests/table/bugs/bug3166-2.html
deleted file mode 100644
index 3cd5a7955b84..000000000000
--- a/layout/html/tests/table/bugs/bug3166-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 2 </title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style="border:solid green" >
-<caption style="width:50px;border:solid orange; caption-side:left">
-cap</caption>
-<tr><td>table</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-3.html b/layout/html/tests/table/bugs/bug3166-3.html
deleted file mode 100644
index 68b816628f45..000000000000
--- a/layout/html/tests/table/bugs/bug3166-3.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 3 </title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style="width:200px; border:solid green" >
-<caption style="border:solid orange; caption-side:left">
-cap</caption>
-<tr><td>table</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-4.html b/layout/html/tests/table/bugs/bug3166-4.html
deleted file mode 100644
index 8b6a3b829e07..000000000000
--- a/layout/html/tests/table/bugs/bug3166-4.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 4</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style="width:200px; border:solid green" >
-<caption style="border:solid orange; caption-side:left">
-caption text</caption>
-<tr><td>table</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-5.html b/layout/html/tests/table/bugs/bug3166-5.html
deleted file mode 100644
index 459a3a141838..000000000000
--- a/layout/html/tests/table/bugs/bug3166-5.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 5</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style=" border:solid green" >
-<caption style="border:solid orange; caption-side:left">
-caption text</caption>
-<tr><td>table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap </td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-6.html b/layout/html/tests/table/bugs/bug3166-6.html
deleted file mode 100644
index 5eab52549aca..000000000000
--- a/layout/html/tests/table/bugs/bug3166-6.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 6</title>
-</head>
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style=" border:solid green" >
-<caption style="border:solid orange; caption-side:left">
-caption text caption text caption text </caption>
-<tr><td>table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wraptable text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-7.html b/layout/html/tests/table/bugs/bug3166-7.html
deleted file mode 100644
index 190e9db49dc2..000000000000
--- a/layout/html/tests/table/bugs/bug3166-7.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 7</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style=" border:solid green" >
-<caption style="border:solid orange; caption-side:left; width:400px">
-caption text caption text caption text </caption>
-<tr><td>table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wraptable text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-8.html b/layout/html/tests/table/bugs/bug3166-8.html
deleted file mode 100644
index 12b48a0b17b6..000000000000
--- a/layout/html/tests/table/bugs/bug3166-8.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 8</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table border><tr><td>
-<table style=" border:solid green" >
-<caption style="border:solid orange; caption-side:left; width:400px">
-caption text caption text caption text </caption>
-<tr><td>table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wraptable text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap</td></tr></table></td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3166-9.html b/layout/html/tests/table/bugs/bug3166-9.html
deleted file mode 100644
index 2ebeeb2ade0a..000000000000
--- a/layout/html/tests/table/bugs/bug3166-9.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>caption side static - 9</title>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style=" border:solid green" >
-<caption style="border:solid orange; caption-side:left; width:50%">
-caption text caption text caption text </caption>
-<tr><td>table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wraptable text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap table text which should wrap</td></tr></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug3191.html b/layout/html/tests/table/bugs/bug3191.html
deleted file mode 100644
index c191419b2930..000000000000
--- a/layout/html/tests/table/bugs/bug3191.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<table border>
-  <tr>
-    <td width="%">
-      <ul>
-        <li>blah blah blah blah blah blah blah
-      </ul>
-    </td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug32205-1.html b/layout/html/tests/table/bugs/bug32205-1.html
deleted file mode 100644
index 5dc394193aec..000000000000
--- a/layout/html/tests/table/bugs/bug32205-1.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-<head>
-<title>BUG</title>
-<style>
-.sized {
-  height:100%;
-}
-</style>
-</head>
-<body>
-
-The following three examples are 2 nested tables.<BR>
-The inner table has a height of 100%, the outer table has a height set
-of 200px, on the &lt;table>, &lt;tr> and &lt;td> respectively.<BR><BR>
-In all examples the inner table should completely fill the outer table.
-(with respect of the padding and border ofcourse)<BR><BR>
-
-<table style="height:200px" border=1>
-<tr><td>
-
-<table class="sized" border=1>
-<tr><td>outer table has height:200px on &lt;table></td></tr>
-</table>
-
-</td></tr>
-</table>
-
-<BR>
-
-<table border=1>
-<tr style="height:200px"><td>
-
-<table class="sized" border=1>
-<tr><td>outer table has height:200px on &lt;tr></td></tr>
-</table>
-
-</td></tr>
-</table>
-
-<BR>
-
-<table border=1>
-<tr><td style="height:200px">
-
-<table class="sized" border=1>
-<tr><td>outer table has height:200px on &lt;td></td></tr>
-</table>
-
-</td></tr>
-</table>
-
-<BR>
-
-<table border=1>
-<tr><td>
-
-<table style="height:50%" border=1>
-<tr><td>outer table has no height set, inner table has a height of 50%.<BR>
-Here the height should be set to auto, because the height of the outer td depends
-on the content.</td></tr>
-</table>
-
-</td></tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug32205-2.html b/layout/html/tests/table/bugs/bug32205-2.html
deleted file mode 100644
index e285a348d52e..000000000000
--- a/layout/html/tests/table/bugs/bug32205-2.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<html>
-<head>
-<title>Bug Example for Bug 32205</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>This is a simple example of table height problems with only a single table. 
-</p>
-<p>The indention here is to specify a table with two rows. The table has a fixed 
-  overall width (200 for the example) and two rows. The first row 'just high enough' 
-  for a title line, and the second contains the rest. Creating such a table is 
-  hamperd by a number of bugs</p>
-<ol>
-  <li>If a height is specified for only one row (not both) then it will be ignored 
-  </li>
-  <li> If specified heights are insufficient (because the content is too large) 
-    then the entire table will be expanded. </li>
-  <li>Percentage heights appear to simply be translated into pixel heights prior 
-    to other processing, so offer no additional solutions </li>
-</ol>
-<p>This following table ought to give the desired results (small title line, large 
-  body)</p>
-<p>It is specifiable as </p>
-<blockquote>
-  <p>Table height: 200 <br>
-    First Row : 1 or 1% <i>(i.e. expand to minimum required)</i><br>
-    Second Row : unspecified <i> (i.e. table height - height of other rows+borders) 
-    </i> </p>
-</blockquote>
-<table height=200 border=1>
-<tr>
-   <td height=20>  title line</td>
-</tr>
-<tr>
-  <td>  rest of space</td>
-</tr>
-</table>
-
-<p>This doesn't work because of the 1st bug above. </p>
-<p>A second attempt is to specify heights that do add up to the total.</p>
-<p> Table height: 200 <br>
-  First Row : 1 <br>
-  Second Row : 199 </p>
-<table height=200 border=1>
-<tr>
-   <td height=1>  title line</td>
-</tr>
-<tr>
-  <td height=199>  rest of space</td>
-</tr>
-</table>
-
-<p>This appears ok, but close inspection will show that the table is now >200 
-  pixels high (2rd bug). </p>
-<p>A third attempt using 1% and 99% gives identical results (3rd bug).</p>
-<p> A related bug is the the height of a row that is not specified explicitly 
-  cannot be used by its children. </p>
-<p>This example is a table of height 200 with a single row of unspecified height. 
-  This contains a DIV whose style is height:100%. It ought to fill the entire 
-  table. </p>
-<table height=200 border=1>
-<tr>
-<td>
-<div style="height:100%;background-color:red">A 100% div inside a row of unspecified height</div>
-</td>
-</tr>
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug32205-3.html b/layout/html/tests/table/bugs/bug32205-3.html
deleted file mode 100644
index 52554c0d5268..000000000000
--- a/layout/html/tests/table/bugs/bug32205-3.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title> New Document </title>
-<meta name="Generator" content="EditPlus">
-<meta name="Author" content="">
-<meta name="Keywords" content="">
-<meta name="Description" content="">
-</head>
-<body>
-  <table border="1" width="100%" height="100%">
-    <tr>
-      <td>
-        Outer Table:<br>
-        &lt;table border="1" width="100%" height="100%"&gt;
-      </td>
-      <td>
-        <table border="1" width="100%" height="100%">
-          <tr>
-            <td height="100%">
-              Nested Table:<br>
-              &lt;table border="1" width="100%" height="100%"&gt;<br>
-              &lt;td height="100%"&gt;
-            </td>
-            <td height="100%">
-              asdf
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug32205-4.html b/layout/html/tests/table/bugs/bug32205-4.html
deleted file mode 100644
index 492be6d52723..000000000000
--- a/layout/html/tests/table/bugs/bug32205-4.html
+++ /dev/null
@@ -1,12 +0,0 @@
-This page shows a difference between IE and Netscape 6 rendering of tables / cells with heights expressed in percentages.
-<p>
-The table A below has two cells.  Cell A1 contains an invisible image to make the cell fairly tall.  Cell A2 has a height attribute of 100%, and contains another table, table B.
-<p>
-Table B has two cells, B1 and B2.  B1 has a fixed pixel height of 30 pixels.  B2 has a height of 100%.  In IE, this causes B2 to stretch to fill the entire height of cell A2, while in Netscape 6 / Gecko, it seems to have no impact on the height of cell A2.
-<p>
-<table border=1 cellpadding=0 cellspacing=0>
-<tr>
-<td><img src="../images/notfound.gif" HEIGHT=200 WIDTH=10>Cell A1</td>
-<td height=100%><table height=100% border=2><tr><td BGDOLOR=#cc00cc HEIGHT=30>Cell B1</td></tr><tr><td bgcolor=#99cc99>Cell B2</td></tr></table></td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug32205-5.html b/layout/html/tests/table/bugs/bug32205-5.html
deleted file mode 100644
index 507e2dfb2755..000000000000
--- a/layout/html/tests/table/bugs/bug32205-5.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<table style="height:200px" border=1>
- <tr>
-  <td>
-   <table height=100% class="sized" border=1>
-    <tr>
-         <td height=30%>
-      <table height=100% class="sized" border=1>
-       <tr>
-            <td height=30%>30%</td>
-           </tr>
-       <tr>
-            <td height=70%>70%</td>
-           </tr>
-      </table>
-         </td>
-        </tr>
-    <tr>
-         <td height=70%>70%</td>
-        </tr>
-   </table>
-  </td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug32447.html b/layout/html/tests/table/bugs/bug32447.html
deleted file mode 100644
index e33a3007b73e..000000000000
--- a/layout/html/tests/table/bugs/bug32447.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-
-<TABLE STYLE="position: absolute;">
-<FORM>
-<TR>
-<TD> Test
-</TR>
-</TABLE>
-</FORM>
-
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug3260.html b/layout/html/tests/table/bugs/bug3260.html
deleted file mode 100644
index 718bcc7a824d..000000000000
--- a/layout/html/tests/table/bugs/bug3260.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html>
-<body>
-<table border=1 width=300>
-<tr align=center>
-<td>One</td>
-<td>Two</td>
-</tr>
-</table>
-<table border=1 width=300>
-<tr align=right>
-<td>One</td>
-<td>Two</td>
-</tr>
-</table>
-<table border=1>
-<tr align=center>
-<td>One</td>
-<td>Two</td>
-</tr>
-<tr>
-<td>----------Long One------------</td>
-<td>----------Long Two------------</td>
-</tr>
-</table>
-<table border=1 width=100%>
-<tr align=center>
-<td>One</td>
-<td>Two</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3263.html b/layout/html/tests/table/bugs/bug3263.html
deleted file mode 100644
index 12f6ea339666..000000000000
--- a/layout/html/tests/table/bugs/bug3263.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<body>
-
-<TABLE border=1>
-<THEAD>
-<TR><TH>thead cell
-<tbody>
-<TR><TD>tbody cell
-</TABLE> 
- 
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug32841.html b/layout/html/tests/table/bugs/bug32841.html
deleted file mode 100644
index 0e02349cc505..000000000000
--- a/layout/html/tests/table/bugs/bug32841.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head><title>Testcase for bug 32841</title></head>
-<body>
-<TABLE BORDER=1 CELLSPACING=0 WIDTH="490" BGCOLOR="#FF0000">
-    <colgroup>
-        <col width=335>
-        <col width=155>
-    </colgroup>
-  <tr>
-         
-		<td colspan="2">thelefttablecellis335pixwidewhiletherightoneisonly155pixwidehblahlahblahblahb</td>
-
-  </tr>
-<tr><td>&nbsp;</td><td>&nbsp;</td>
-</TABLE>
-
-<hr width="490" align="left">
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug3309-1.html b/layout/html/tests/table/bugs/bug3309-1.html
deleted file mode 100644
index d5ec04a5aa59..000000000000
--- a/layout/html/tests/table/bugs/bug3309-1.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body><div align="center"><center><table BGCOLOR="#000000" 
-CELLSPACING="5" width="80%" cellpadding="5"><TBODY>
-<tr><td width="30" BGCOLOR="#FFCC33" align="right">1<td BGCOLOR="#FFCC33"><a 
-href="../SOUNDTRACK - LOLA RENNT - 01 - BELIEVE.MP3">Believe</a><td 
-BGCOLOR="#FFCC33" width="41" align="right">4:53</tr>
-</TBODY></table></font><div align="right"><br><br><A HREF="../index.html"><font 
-SIZE="3" FACE="Arial" COLOR="#FFCC33">Back to the 
-index...</font></A></div></center></div></body></html>
diff --git a/layout/html/tests/table/bugs/bug3309-2.html b/layout/html/tests/table/bugs/bug3309-2.html
deleted file mode 100644
index d45c777e91f3..000000000000
--- a/layout/html/tests/table/bugs/bug3309-2.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<center>
-<table border=1><tr><td>foo</tr></table>
-</center>
-</body>
diff --git a/layout/html/tests/table/bugs/bug33137.html b/layout/html/tests/table/bugs/bug33137.html
deleted file mode 100644
index beb8d63e91bb..000000000000
--- a/layout/html/tests/table/bugs/bug33137.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<body>
-
-<table border=1>
-<tr>
-  <td width=75><hr width=70></td>
-</tr>
-<tr>
-  <td width=75>this should wrap within this TD</td>
-</tr>
-
-</table>
-
-<BR>
-
-<table border=1>
-<tr>
-  <td width=75><hr width=80></td>
-</tr>
-<tr>
-  <td width=75>this should wrap within this TD</td>
-</tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug33784.html b/layout/html/tests/table/bugs/bug33784.html
deleted file mode 100644
index c196a1246550..000000000000
--- a/layout/html/tests/table/bugs/bug33784.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>Gecko's Realm</title>
-<style type="text/css">
-.section {
- color: white;
-}
-</style>
-</head>
-
-<body>
-<table border="0" cellpadding="0" cellspacing="0" width="600">
-  <tr>
-    <td bgcolor="black"><div class="section"><p>fooobar</p></div></td>
-  </tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug33855.html b/layout/html/tests/table/bugs/bug33855.html
deleted file mode 100644
index 1df5f6687699..000000000000
--- a/layout/html/tests/table/bugs/bug33855.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- dejaMon:success --> 
-<html>
-<head>
-<title>My Deja Email</title>
-</head> 
-<body bgcolor=ffffff>
-<form name=gmm_form method=get action="">
-<table>
-<tr valign=bottom bgcolor="FFFFFF">
-<td align=center><input type="submit" name="/gmmselectall.femail" value="Select&nbsp;all"></td>
-<td align=center><input type="submit" name="/gmm_delete.femail" value=Delete></td>
-<td align=center><input type="submit" name="/mf_emptytrash.femail" value="Empty trash"></td>
-<td width=100%>&nbsp;</td>
-<td align=center><input type="submit" name="/gmm_domovemesg_top.femail" value="Move to:"></td>
-<td align=center>
-<SELECT name="folder_top">
-<OPTION VALUE="">Choose folder&nbsp;
-<OPTION VALUE="foo:zzz:!5sent-mail:F:0">Sent-Mail
-<OPTION VALUE="foo:zzz:~6trash:F:5">Trash
-</SELECT>
-</form>
-</html>
diff --git a/layout/html/tests/table/bugs/bug34176.html b/layout/html/tests/table/bugs/bug34176.html
deleted file mode 100644
index fe0e9264f678..000000000000
--- a/layout/html/tests/table/bugs/bug34176.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<table border=1>
-<tr><td>
-
-<table width="100%" style="table-layout:fixed" border=1>
-<tr><td width="200">cell 1
-<td width="500">cell 2
-</td>
-</tr>
-</table>
-
-</td></tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug34538.html b/layout/html/tests/table/bugs/bug34538.html
deleted file mode 100644
index e33a3007b73e..000000000000
--- a/layout/html/tests/table/bugs/bug34538.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-
-<TABLE STYLE="position: absolute;">
-<FORM>
-<TR>
-<TD> Test
-</TR>
-</TABLE>
-</FORM>
-
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug3454.html b/layout/html/tests/table/bugs/bug3454.html
deleted file mode 100644
index 399defb2aadc..000000000000
--- a/layout/html/tests/table/bugs/bug3454.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html><head>
-<style type="text/css">
-TABLE   { margin: 1em; width: auto; }
-</style>
-</head>
-<body>
-
-<table border class="two">
- <tr>
-  <th>Header One</th>
-  <th>Header Two</th>
-  <th>Header Three</th>
- </tr>
- <tr>
-  <td>
-   This table uses the separated borders model.
-  </td>
-  <td>
-   This means that elements within the cell have border-spacing of 1em.
-  </td>
-  <td>
-   The borders on the header cells,
-   on all sides, should be medium solid purple.
-  </td>
- </tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug3517.html b/layout/html/tests/table/bugs/bug3517.html
deleted file mode 100644
index e9825cb8746d..000000000000
--- a/layout/html/tests/table/bugs/bug3517.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<title>Test</title>
-<style type="text/css">
-table { 
-        border-collapse: collapse; 
-        border: 1px solid black;
-}
-tr {
-  border-top: 4 px solid red;
-}
-</style>
-
-<body>
-
-<table>
-<tbody id="mytable">
-</tbody>
-</table>
-
-<script type="text/javascript">
-
-
-
-var mytable = document.getElementById("mytable");
-
-dump("before\n");
-var newrow = mytable.insertRow(0);
-dump("after row insert\n");
-var newcell = newrow.insertCell(0);
-dump("after cell insert\n");
-var text = document.createTextNode("here is content in the cell from the script appendRowGroupWithContent\n");
-newcell.appendChild(text);
-
-
-
-</script>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug35662.html b/layout/html/tests/table/bugs/bug35662.html
deleted file mode 100644
index 5a71d8ca949a..000000000000
--- a/layout/html/tests/table/bugs/bug35662.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-        <title>Testcase</title>
-</head>
-
-<body>
-
-<table border=1> 
-        <tr> 
-                <td>Left side</td>
-                <td width=20%>Mid</td> 
-                <td>Right side</td> 
-        </tr> 
-</table>  
-
-<table border=1>
-        <tr> 
-                <td>Left side</td>
-                <td width=20%>Mid</td>
-                <td>Right side</td>
-        </tr>
-        <tr> 
-                <td>Left side</td>
-                <td width=20%>Mid</td>
-                <td>Right side</td> 
-        </tr> 
-</table>
-
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3681-1.html b/layout/html/tests/table/bugs/bug3681-1.html
deleted file mode 100644
index f7d8364e7e65..000000000000
--- a/layout/html/tests/table/bugs/bug3681-1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-<script>
-    function hide() {
-        var cell2 = document.getElementById("cell2");
-        cell2.setAttribute("style", "border:2px solid green;display:none;width:0%;");
-    }
-    function show() {
-        var cell2 = document.getElementById("cell2");
-        cell2.setAttribute("style", "border:2px solid green;display:normal;width:33%;");
-    }
-</script>
-</head>
-<body onload="show()">
-<table width="80%">
-    <tr>
-        <td width="33%" style="border: 2px solid red;">
-            Cell 1 (width=33%).
-        </td>
-        <td id="cell2" style="border:2px solid green;display:none;width:0%;">
-            Cell 2 (width=33%).
-        </td>
-        <td width="*" style="border: 2px solid blue;">
-            Cell 3 (width=*) - should be 67% when cell 2 is hidden, 33% when cell 2 is visible.
-        </td>
-    </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3681-2.html b/layout/html/tests/table/bugs/bug3681-2.html
deleted file mode 100644
index c7330b7a9723..000000000000
--- a/layout/html/tests/table/bugs/bug3681-2.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-<script>
-    function hide() {
-        var cell2 = document.getElementById("cell2");
-        cell2.setAttribute("style", "border:2px solid green;display:none;width:0%;");
-    }
-    function show() {
-        var cell2 = document.getElementById("cell2");
-        cell2.setAttribute("style", "border:2px solid green;display:normal;width:33%;");
-    }
-</script>
-</head>
-<body onload="hide()">
-<table width="80%">
-    <tr>
-        <td width="33%" style="border: 2px solid red;">
-            Cell 1 (width=33%).
-        </td>
-        <td id="cell2" style="border:2px solid green;width:33%;">
-            Cell 2 (width=33%).
-        </td>
-        <td width="*" style="border: 2px solid blue;">
-            Cell 3 (width=*) - should be 67% when cell 2 is hidden, 33% when cell 2 is visible.
-        </td>
-    </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug3718.html b/layout/html/tests/table/bugs/bug3718.html
deleted file mode 100644
index 6c48ae41e384..000000000000
--- a/layout/html/tests/table/bugs/bug3718.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>
-<table border=3 cellspacing=0 cellpadding=0>
- <tr>
-  <td>
-   <table border=1 cellspacing=0 cellpadding=0>
-    Family Essentials
-    <tr>
-     <td>foo</td></tr></table></td></tr></table>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug38916.html b/layout/html/tests/table/bugs/bug38916.html
deleted file mode 100644
index 056ece314669..000000000000
--- a/layout/html/tests/table/bugs/bug38916.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<BODY>
-<p>IFRAME inside TFOOT</p>
-<TABLE border>
-
-  <THEAD>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">THEAD blah blah blah blah blah blah THEAD</span> 
-    </TD><TD>A Cell</TD>
-  </TR>
-  </THEAD>
-
-  <TFOOT>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <IFRAME SRC="about:blank" HEIGHT="150" 
-            WIDTH="125" style="border:5px solid red;margin:10px;padding:10px;"></IFRAME>
-    </TD><TD>A Cell</TD>   
-  </TR>
-  </TFOOT>
-
-  <TBODY>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">TBODY blah blah blah blah blah blah TBODY </span>
-    </TD><TD>A Cell</TD>
-  </TR>
-  </TBODY>
-
-</TABLE>
-
-<p>IFRAME inside TBODY</p>
-<TABLE border>
-
-  <THEAD>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">THEAD blah blah blah blah blah blah THEAD </span>
-    </TD><TD>A Cell</TD>
-  </TR>
-  </THEAD>
-
-  <TFOOT>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">TFOOT blah blah blah blah blah blah TFOOT </span>
-    </TD><TD>A Cell</TD>   
-  </TR>
-  </TFOOT>
-
-  <TBODY>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <IFRAME SRC="about:blank" HEIGHT="150" 
-            WIDTH="125" style="border:5px solid red;margin:10px;padding:10px;"></IFRAME>
-    </TD><TD>A Cell</TD>
-  </TR>
-  </TBODY>
-
-</TABLE>
-
-<p>IFRAME inside THEAD</p>
-<TABLE border>
-
-  <THEAD>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <IFRAME SRC="about:blank" HEIGHT="150" 
-            WIDTH="125" style="border:5px solid red;margin:10px;padding:10px;"></IFRAME>
-    </TD><TD>A Cell</TD>
-  </TR>
-  </THEAD>
-
-  <TFOOT>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">TFOOT blah blah blah blah blah blah TFOOT </span>
-    </TD><TD>A Cell</TD>   
-  </TR>
-  </TFOOT>
-
-  <TBODY>
-  <TR>
-    <TD>A Cell</TD><TD>
-      <span style="font-size: 40px;">TBODY blah blah blah blah blah blah TBODY </span>
-    </TD><TD>A Cell</TD>
-  </TR>
-  </TBODY>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug39209.html b/layout/html/tests/table/bugs/bug39209.html
deleted file mode 100644
index 92eb8ca6ca14..000000000000
--- a/layout/html/tests/table/bugs/bug39209.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
-    <HEAD>
-        <TITLE>Moz Bug</TITLE>
-    </HEAD>
-    <BODY>
-        <TABLE border=1>
-            <TR> 
-                <TD>
-                    Blah
-                <TD>
-                    <TABLE align="center" border=1> 
-                        <TR>
-                            <TD>
-                                <FORM> 
-                                    <INPUT type="submit"> 
-                                </FORM>
-                    </TABLE>
-            <TR>
-                <TD colspan=2>
-                    This line is only here to separate the two columns in the row above
-        </TABLE>
-    </BODY>
-</HTML>  
diff --git a/layout/html/tests/table/bugs/bug3977.html b/layout/html/tests/table/bugs/bug3977.html
deleted file mode 100644
index 41fefb008cb8..000000000000
--- a/layout/html/tests/table/bugs/bug3977.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<html>
-</head>
-<BODY>
-
-<TABLE border=1 width=590>
-
-<TR>
-<TD colspan=3>
-<img width=590 height=73 src="/devexchange/graphics/devex_h.gif">
-</TD>
-</TR>
-
-<TR>
-
-<TD VALIGN="TOP" width=110 bgcolor=#94BD73>
-LH column image</TD>
-
-<TD VALIGN="TOP" width=10>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-
-<TD VALIGN="TOP" width=470>
-   <p>
-   HP Peripherals Developer Program
-   <p>
-   PROGRAM SERVICES
-   <p>
-   etc., etc. ...
-</TD>
-</TR>
-
-
-<TR><td colspan=3 height=33>
-<img width=589 height=33 src="/devexchange/graphics/devex_f.gif">
-</TD></TR>
-
-<TR>
-<TD>
-<img width=110 height=39 src="/devexchange/graphics/fnav.gif">
-</TD>
-<TH colspan=2>
-text links
-</TH>
-</TR>
-
-</TABLE>
-
-<hr>
-<p><b>Now, nuke the IMG (two of which are colspan=3) -- the table lines up.</b></p>
-
-<TABLE border=1 width=590>
-
-<TR>
-<TD colspan=3>
-IMG in a colspan=3
-</TD>
-</TR>
-
-<TR>
-
-<TD VALIGN="TOP" width=110 bgcolor=#94BD73>
-LH column image</TD>
-
-<TD VALIGN="TOP" width=10>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-
-<TD VALIGN="TOP" width=470>
-   <p>
-   HP Peripherals Developer Program
-   <p>
-   PROGRAM SERVICES
-   <p>
-   etc., etc. ...
-</TD>
-</TR>
-
-
-<TR><td colspan=3 height=33>
-IMG in a colspan=3
-</TD></TR>
-
-<TR>
-<TD>
-just an IMG
-</TD>
-<TH colspan=2>
-text links
-</TH>
-</TR>
-
-</TABLE>
-
-<hr>
-<p><b>Simpler comparison -- two rows, first is IMG in colspan=3 -- tables not OK</b></p>
-
-<TABLE border=1 width=590>
-
-<TR>
-<TD colspan=3>
-<img width=590 height=73 src="/devexchange/graphics/devex_h.gif">
-</TD>
-</TR>
-
-<TR>
-
-<TD VALIGN="TOP" width=110 bgcolor=#94BD73>
-LH column image</TD>
-
-<TD VALIGN="TOP" width=10>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-
-<TD VALIGN="TOP" width=470>
-   <p>
-   HP Peripherals Developer Program
-   <p>
-   PROGRAM SERVICES
-   <p>
-   etc., etc. ...
-</TD>
-</TR>
-
-</TABLE>
-
-<hr>
-<p><b>Simpler comparison -- nuke the IMG (replace with text) -- tables line up now.</b></p>
-
-
-<TABLE border=1 width=590>
-
-<TR>
-<TD colspan=3>
-text instead of IMG in colspan=3
-</TD>
-</TR>
-
-<TR>
-
-<TD VALIGN="TOP" width=110 bgcolor=#94BD73>
-LH column image</TD>
-
-<TD VALIGN="TOP" width=10>&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-
-<TD VALIGN="TOP" width=470>
-   <p>
-   HP Peripherals Developer Program
-   <p>
-   PROGRAM SERVICES
-   <p>
-   etc., etc. ...
-</TD>
-</TR>
-
-</TABLE>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug40828.html b/layout/html/tests/table/bugs/bug40828.html
deleted file mode 100644
index b6e501af8026..000000000000
--- a/layout/html/tests/table/bugs/bug40828.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>from bug 51037...</TITLE>
-
-<script>
-
-function showp()
-{
-        document.getElementById("popup").style.visibility="visible"; 
-
-        /* if bug 34240's fixed kills this testcase, try adding the following:
-         * document.getElementById("popup").style.backgroundColor = "lightgreen";
-         */
-}
-
-</script>
-
-</HEAD>
-<BODY onload="showp()">
-The cell padding should not disappear
-<table style="position:absolute;left:120px;top:120px;" id="popup" border="1" cellpadding="10">
-<tr>
-        <td>S&eacute;lection</td>
-</tr>
-<tr>
-        <td>Suppression</td>
-</tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug4093.html b/layout/html/tests/table/bugs/bug4093.html
deleted file mode 100644
index 7b29d5f8b12f..000000000000
--- a/layout/html/tests/table/bugs/bug4093.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<body>
-<table width=100% border=2>
-<tr><td>
-Y
-<table cellspacing=0 cellpadding=0 width=224 border=0 align=right>
-        <tr>
-                <td rowspan=4 width=10><img src="../images/raptor.jpg" width=10 height=1></td>
-                <td width=214><img src="../images/raptor.jpg" width=214 height=163 border=0 alt="screen
-shot"></td>
-        </tr>
-
-        <tr>
-                <td height=8><img src="../images/raptor.jpg" width=1 height=8 alt=""></td>
-        </tr>
-
-        <tr>
-                <td><font size=-2 face="MS Sans Serif, Helvetica" color="#666600">CleanSweep
-Deluxe tracks the files you use most often, then recommends rarely used ones for
-you to delete.<br></font></td>
-        </tr>
-        
-        <tr>
-                <td height=8><img src="../images/raptor.jpg" width=1 height=8 alt=""></td>
-        </tr>
-</table>
-<p>X</td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug41890.html b/layout/html/tests/table/bugs/bug41890.html
deleted file mode 100644
index 45daf0b6c1ba..000000000000
--- a/layout/html/tests/table/bugs/bug41890.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<table border=1 width=80% cols=2>
-
-<tr>
-<td colspan=2>
-This is some text, this is some text, this is some text, this is some text 
-This is some text, this is some text, this is some text, this is some text 
-</td>
-</tr>
-
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug42043.html b/layout/html/tests/table/bugs/bug42043.html
deleted file mode 100644
index 67ff5cfc4a48..000000000000
--- a/layout/html/tests/table/bugs/bug42043.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-<body>
-<p>(1) Table with 2 columns. Relative width value for first column is "1*" and for column 2 is "3*". Table width is 100%. The first column should span 1/4 of the window width and the second column should span 3/4 of the window width. <b>5.0 renders this correctly.</b></p>
- 
-<table width="100%" border="1">
-<colgroup>
-<col width="1*">
-<col width="3*">
-</colgroup>
-<tr>
-  <td>Test</td>
-  <td>Test</td>
-</tr>
-</table>
-<br><br>
-<p>(2) Table with 1 column. Relative width value for column is "0*" with table width of 100%. The column should span the minimum width necessary to hold the column's contents. <b>Problem.</b></p>
-
-<table width="100%" border="1">
-<colgroup>
-<col width="0*">
-</colgroup>
-<tr>
-  <td>Test</td>
-</tr>
-</table>
-
-<br><br>
-<p>(3) Table with 2 columns. Relative width value for first column is "0*" and for column 2 is "3*". Table width is 100%. The first column should span the minimum width necessary to hold the column's contents. The second column should ????<b>The first column is rendered properly, but there seems to be a problem with the width of the second column.</b></p>
-
-<table width="100%" border="1">
-<colgroup>
-<col width="0*">
-<col width="3*">
-</colgroup>
-<tr>
-  <td>Test</td>
-  <td>Test</td>
-</tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug42187.html b/layout/html/tests/table/bugs/bug42187.html
deleted file mode 100644
index 9a8bac5755db..000000000000
--- a/layout/html/tests/table/bugs/bug42187.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<HTML>
-<HEAD><TITLE>Testcase for bug 42187 reduced</TITLE>
-</HEAD>
-<BODY>
-<H4>Try resizing the window horizantally - the red cell should be 195 pixels at all times.</H4>
-
-
- <table border="1" cellpadding="0" cellspacing="0" bgcolor=yellow>
-        <tr> 
-          <td width="200"> </td>
-          <td width="100"></td>
-          <td>xxxxxxxxxxxx</td>
-        </tr>
-        <tr> 
-          <td width="200"> &nbsp;</td>
-          <td colspan="2" valign="top" width="180" bgcolor=red> 
-            
-              
-              Now you can vote forTLJ as game of the year
-              at Game Rankings.
-            </td>
-        </tr>
-      </table>
-<hr width="202" align="left">
-<hr width="383" align="left">
-
-200*150 =3000twips
-100*150=1500twips
-180*150=1200twips
-sum: 5700 twips
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug42443.html b/layout/html/tests/table/bugs/bug42443.html
deleted file mode 100644
index 9e0df60dbaa4..000000000000
--- a/layout/html/tests/table/bugs/bug42443.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<body>
-  <table border=1>
-    <tr>
-      <td width="20%">1</td>
-      <td width="60%">HelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHelloHello</td>
-    </tr>
-    <tr>
-      <td colspan=3 width="100%">3</td>
-    </tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug4284.html b/layout/html/tests/table/bugs/bug4284.html
deleted file mode 100644
index 740ed463b235..000000000000
--- a/layout/html/tests/table/bugs/bug4284.html
+++ /dev/null
@@ -1,15 +0,0 @@
-this table should be center aligned
-<BR>
-<table align=center border=1>
- <tr><td>foo</td></tr>
-</table>
-
-this div should be center aligned with an image and a table centered in it
-<BR>
-<DIV ALIGN=CENTER>
-<IMG width=50 height=50 SRC="../images/raptor.jpg">
-<TABLE border=1 WIDTH=600>
-<TR><TD>foo</TD></TR>
-</TABLE>
-</DIV>
-
diff --git a/layout/html/tests/table/bugs/bug4294.css b/layout/html/tests/table/bugs/bug4294.css
deleted file mode 100644
index 9750811ca16c..000000000000
--- a/layout/html/tests/table/bugs/bug4294.css
+++ /dev/null
@@ -1 +0,0 @@
-p {font-weight: bold;}
diff --git a/layout/html/tests/table/bugs/bug4294.html b/layout/html/tests/table/bugs/bug4294.html
deleted file mode 100644
index 38d6f03e64b3..000000000000
--- a/layout/html/tests/table/bugs/bug4294.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<title>test</title>
-<link rel=stylesheet href="bug4294.css" media=screen type="text/css">
-</head>
-<body>
-<p>A paragraph of text</p>
-<table border=1>
-<thead>
-<tr><th>column 1<th>column 2<th>column 3<th>column 4
-</thead>
-<tbody style="overflow: auto; height: 200px;">
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-<tr><td>one<td>two<td>three<td>four
-</tbody>
-</table>
diff --git a/layout/html/tests/table/bugs/bug43039.html b/layout/html/tests/table/bugs/bug43039.html
deleted file mode 100644
index 6dfbeac7434c..000000000000
--- a/layout/html/tests/table/bugs/bug43039.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<html>
- <body>
- <table border=0 cellpadding=0 cellspacing=0 width=1742 style='border-collapse:
-
- collapse;table-layout:fixed;width:1308pt'>
-
- <col class=xl34 width=54 span=2 style='mso-width-source:userset;mso-width-alt:
-
- 1974;width:41pt'>
-
- <col class=xl34 width=71 style='mso-width-source:userset;mso-width-alt:2596;
-
- width:53pt'>
-
- <col class=xl34 width=68 style='mso-width-source:userset;mso-width-alt:2486;
-
- width:51pt'>
-
- <col class=xl36 width=70 style='mso-width-source:userset;mso-width-alt:2560;
-
- width:53pt'>
-
- <col class=xl34 width=92 style='mso-width-source:userset;mso-width-alt:3364;
-
- width:69pt'>
-
- <col class=xl34 width=123 style='mso-width-source:userset;mso-width-alt:4498;
-
- width:92pt'>
-
- <col class=xl34 width=58 style='mso-width-source:userset;mso-width-alt:2121;
-
- width:44pt'>
-
- <col class=xl30 width=64 span=248 style='mso-width-source:userset;mso-width-alt:
-
- 2340;width:48pt'>
-
- <tr class=xl47 height=17 style='height:12.75pt'>
-
-  <td colspan=8 height=17 class=xl53 width=590 style='height:12.75pt;
-
-  width:444pt'>PRODUCT SPECIFICATIONS DAY CONTRACTS</td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
-  <td class=xl30 width=64 style='width:48pt'></td>
-
- </tr>
-
- <tr class=xl32 height=15 style='height:11.25pt'>
-
-  <td height=15 class=xl33 style='height:11.25pt'>Product</td>
-
-  <td class=xl33>Contract</td>
-
-  <td class=xl33>Belongs</td>
-
-  <td class=xl33>First day of</td>
-
-  <td class=xl35 x:str="Last day of ">Last day of </td>
-
-  <td class=xl33 x:str="Date of ">Date of </td>
-
-  <td class=xl33>Settlement against</td>
-
-  <td class=xl33>Quoted</td>
-
-  <td colspan=18 class=xl30 style='mso-ignore:colspan'></td>
-
- </tr>
-
- <tr class=xl32 height=15 style='height:11.25pt'>
-
-  <td height=15 class=xl33 style='height:11.25pt'>series</td>
-
-  <td class=xl33>hours</td>
-
-  <td class=xl33>to</td>
-
-  <td class=xl33>trading</td>
-
-  <td class=xl35>trading</td>
-
-  <td class=xl33>settlement</td>
-
-  <td class=xl32>&nbsp;</td>
-
-  <td class=xl33>currency</td>
-
-  <td colspan=18 class=xl30 style='mso-ignore:colspan'></td>
-
- </tr>
-
- <tr height=15 style='height:11.25pt'>
-
-  <td height=15 class=xl34 style='height:11.25pt'>D0101-00</td>
-
-  <td class=xl34 x:num>24</td>
-
-  <td class=xl34>Week 52-99</td>
-
-  <td class=xl36 x:num="36517">12/23/99</td>
-
-  <td class=xl36 x:num="36524">12/30/99</td>
-
-  <td class=xl36 x:num="36526">1/1/00</td>
-
-  <td class=xl34>System Price Elspot</td>
-
-  <td class=xl34>NOK</td>
-
-  <td colspan=18 class=xl30 style='mso-ignore:colspan'></td>
-
- </tr>
-
-</table>
-
-
-
-</body>
-
-
-
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug43204.html b/layout/html/tests/table/bugs/bug43204.html
deleted file mode 100644
index f13c472ad90f..000000000000
--- a/layout/html/tests/table/bugs/bug43204.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<html>
-
-<head>
-
-<title>Nomad Jedi Homeworld</title>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-
-
-<style type="text/css">
-
-<!--
-
-.NewsBody
-
-{
-
-    FONT-FAMILY: Arial, Helvetica, sans-serif;
-
-    FONT-SIZE: 10pt;
-
-    BACKGROUND: #C0C0C0;
-
-}
-
-
-
-.NewsHead
-
-{
-
-
-
-    COLOR: #ffffff;
-
-    BACKGROUND: #455166;
-
-    PADDING-RIGHT: 12px;
-
-    PADDING-LEFT: 12px;
-
-    font-weight: bold;
-
-    FONT-family: Arial, Helvetica, sans-serif;
-
-    FONT-size: 12pt;
-
-
-
-}
-
--->
-
-</style>
-
-</head>
-
-
-
-<body bgcolor="#ffffff" text="#000000">
-
-<div align="center"> 
-
-
-
-
-
-<table width=99% border=0 cellspacing=0>
-
-    <tr class='NewsHead'> 
-
-      <td align=right class='NewsHead'>This column seems to finish early</td>
-
-    </tr>
-
-    <tr> 
-
-      <td class='NewsBody'>&nbsp;</td>
-
-    </tr>
-
-  </table>
-
-
-
-
-
-
-
-  <p>&nbsp;</p>
-
-
-
-
-
-<table width=99% border=0 cellspacing=0>
-
-    <tr> 
-
-      <td align=right class='NewsHead'>This one is OK</td>
-
-    </tr>
-
-    <tr> 
-
-      <td class='NewsBody'>&nbsp;</td>
-
-    </tr>
-
-  </table>
-
-
-
-</div>
-
-
-
-</body>
-
-
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/bugs/bug4382.html b/layout/html/tests/table/bugs/bug4382.html
deleted file mode 100644
index d3d9da12ef87..000000000000
--- a/layout/html/tests/table/bugs/bug4382.html
+++ /dev/null
@@ -1,27 +0,0 @@
-The select should not contain blank items
-<BR>
-<FORM NAME="SearchForm" ACTION="http://www.att.net/cgi-bin/srchall" 
-METHOD="GET">
-<B>Search</B>
-<INPUT TYPE="text" SIZE="18" NAME="string" MAXLENGTH="40">
-<SELECT NAME="engine">
-<OPTION VALUE="EX" SELECTED>Excite
-<OPTION VALUE="IS"><!-- (#) -->Infoseek
-<OPTION VALUE="LY"><!-- (#) -->Lycos
-</SELECT>
-</form>
-
-<BR>
-The select should not contain blank items
-<BR>
-<form>
-<SELECT NAME="target" ONCHANGE="GoUrl(this)">
-<OPTION VALUE="/goto-sony" selected>Quick Link</OPTION>
-<OPTION 
-VALUE="/goto-sony">.........................................................</OP
-TION>
-<OPTION VALUE="/goto-sca">Sony Corporation of America</OPTION>
-<OPTION VALUE="/goto-press"> -- Press Releases</OPTION>
-<OPTION VALUE="/goto-jobs"> -- Jobs</OPTION>
-<OPTION VALUE="/goto-ads"> -- How to Advertise@Sony</OPTION>
-</form>
diff --git a/layout/html/tests/table/bugs/bug4385.html b/layout/html/tests/table/bugs/bug4385.html
deleted file mode 100644
index 341a430d6ba9..000000000000
--- a/layout/html/tests/table/bugs/bug4385.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<TABLE BORDER="1" WIDTH=100%>
-
-<!-- As long as there is a width of the table, the problem exists, but the problem is not dependent upon a specific table width -->
-
-<TR>
-<TD COLSPAN="2" WIDTH=100%>A</TD>
-</TR>
-
-<!-- The problem appears to be that Mozilla renders the following cells as if there is no COLSPAN=2 tag above.  Mozilla DOES render the top correctly but does not realize that the top TD covers 2 cells instead of 1. -->
-
-<TR>
-<TD></TD>
-<TD>This text is invariably wrapped</TD>
-</TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug43854-1.html b/layout/html/tests/table/bugs/bug43854-1.html
deleted file mode 100644
index 9ae6447f5247..000000000000
--- a/layout/html/tests/table/bugs/bug43854-1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<html lang="en">
-<head>
-<title>test case</title>
-<style type="text/css" media="screen">
-<!--
-body {
-        margin: 0;
-        padding: 5%;
-        background-color: #000;
-        color: #ff0;
-        font-family: "MS Sans Serif", sans-serif;
-        }
-td {
-        color: #0f0;
-        background-color: #000;
-        }
-table {
-        table-layout: fixed;
-        }
--->
-</style>
-</head>
-
-<body>
-
-<p><b>All cell borders should look the same.</b></p>
-
-<table border="1" cellspacing="0" cellpadding="0" width="900">
-<col width="300" span="3">
-
-<tr>
-<td colspan="3" align="center"><p>look at cell borders...</p></td>
-</tr>
-
-<tr valign="bottom">
-<td width="300" align="center"><p>border<br>bottom?</p></td>
-<td width="300" align="center"><p>this cell<br>border<br> fine<br>this cell<br>border<br> fine<br>this cell<br>border<br> fine</p></td>
-<td width="300" align="center"><p>this cell<br>border<br> fine<br>this cell<br>border<br> fine<br>this cell<br>border<br> fine</p></td>
-</tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug43854-2.html b/layout/html/tests/table/bugs/bug43854-2.html
deleted file mode 100644
index be7aa69a2a9a..000000000000
--- a/layout/html/tests/table/bugs/bug43854-2.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-<head>
-<title>Calendar</title>
-<style type="text/css"><!--
-table
-{
-        width: 100%;
-        table-layout: fixed;
-        border-collapse: collapse;
-}
-th,td
-{
-        border: solid;
-        border-width: 1;
-        border-color: rgb(0,90,140);
-}
-td
-{
-        vertical-align: top;
-}
-</style>
-</head>
-<body>
-<table>
-  <tr>
-    <th>Sun</th>
-    <th>Mon</th>
-    <th>Tue</th>
-    <th>Wed</th>
-    <th>Thu</th>
-    <th>Fri</th>
-    <th>Sat</th>
-  </tr>
-  <tr>
-    <td colspan=5></td>
-    <td><div>1</div><div class=sunset>7:50</div></td>
-    <td><div>2</div>Althea Halliday<br></td>
-  </tr>
-  <tr>
-    <td><div>3</div>CHORTle<br>Avondale graduation</td>
-    <td><div>4</div><br></td>
-    <td><div>5</div>SAC Speech night</td>
-    <td><div>6</div>Management committee</td>
-    <td><div>7</div>Castle Hill and Mountain View Speech nights</td>
-    <td><div>8</div><div class=sunset>7:56</div></td>
-    <td><div>9</div>Reconciliation</td>
-  </tr>
-  <tr>
-    <td><div>10</div>Christmas party<br></td>
-    <td><div>11</div><br></td>
-    <td><div>12</div><br></td>
-    <td><div>13</div>Community Ministries committee</td>
-    <td><div>14</div><br></td>
-    <td><div>15</div><div class=sunset>8:02</div></td>
-    <td><div>16</div>Paul Goltz<br></td>
-  </tr>
-  <tr>
-    <td><div>17</div><br></td>
-    <td><div>18</div><br></td>
-    <td><div>19</div>End school term 4</td>
-    <td><div>20</div><br></td>
-    <td><div>21</div><br></td>
-    <td><div>22</div><div class=sunset>8:06</div></td>
-    <td><div>23</div>Christmas programme<br></td>
-  </tr>
-  <tr>
-    <td><div>24</div><br></td>
-    <td><div>25</div>Christmas day<br></td>
-    <td><div>26</div>Boxing day<br></td>
-    <td><div>27</div><br></td>
-    <td><div>28</div><br></td>
-    <td><div>29</div><div class=sunset>8:09</div></td>
-    <td><div>30</div>David Holman<br></td>
-  </tr>
-  <tr>
-    <td><div>31</div><br></td>
-    <td colspan=6></td>
-  </tr>
-</table>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug4427.html b/layout/html/tests/table/bugs/bug4427.html
deleted file mode 100644
index e265c0c3f00b..000000000000
--- a/layout/html/tests/table/bugs/bug4427.html
+++ /dev/null
@@ -1,103 +0,0 @@
-the following is not the bug but is related. Nav put's the images in the 2nd cell
-on the same line. Border widths of cells are suspect here.
-<table border width=26 cellspacing=0 cellpadding=0>
- <tr> 
-  <td><img src="../images/pxl_white.gif" width=2 height=2></td>
-  <td><img src="../images/pxl_white.gif" width=10 height=2><img src="../images/0.gif" width=10 height=2></td>
- </tr>
-</table>
-<BR>
-the following is related to the bug. Nav put's the images in the last cell of the last
-table on the same line.
-<table border=0 cellspacing=0 cellpadding=0 valign=TOP>
- <tr>
-  <td valign=TOP>
-   <table width="175" border="0" cellspacing="0" cellpadding="0">
-    <tr valign=TOP>
-     <td><img src="../images/0.gif" width=7 height=2></td>
-    </tr>
-    <tr valign=TOP>
-     <td colspan=8 valign=top><a href="../buy/index.htm"><img src="../images/nav_buy_checklist.gif" alt="Buy a home checklist" width=156 height=29 border=0></a><img src="../images/nav_top_left_frag_2.gif" width=19 height=29 alt=""></td>
-    </tr>
-    <tr>
-     <td colspan=3 valign=bottom><img src="../images/pxl_df9f3b.gif" width=156 height=1></td>
-    </tr>
-   </table></td>
-  <td valign="top">
-   <table width=525 border=0 cellspacing=0 cellpadding=0>
-    <tr> 
-     <td bgcolor=White><img src="../images/0.gif" width=20 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=20 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=20 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=20 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=67 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=81 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=77 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=63 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=20 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=19 height=2></td>
-          <td bgcolor=White><img src="../images/0.gif" width=101 height=2></td>
-          <td><img src="../images/pxl_white.gif" width=15 height=2><img src="../images/0.gif" width=2 height=2></td>
-        </tr>
-        <tr> 
-          <td colspan=12><img src="../images/navtop_buy_pr.gif" width=525 height=18 border=0 alt="" usemap="#topnav" ismap><br>
-<img src="../images/dot_black.gif" width=525 height=1><br>
-<img src="../images/pxl_df9f3b.gif" width=525 height=2></td>
-        </tr>
-        </table>
-        </td>
-        </tr>
-        </table>
-<BR>
-<TABLE WIDTH="420" BORDER="1" CELLSPACING="1" CELLPADDING="1" BGCOLOR="#cccccc">
-
-<!-- af2_results_elbat.htm - 11/17/98 - 11:12:13 AM -->
-<TR valign="TOP">
-        <td width="20" align="RIGHT">
-        1.&nbsp;</TD>
-        <td width="232">
-        Some One<BR>
-        Joe Banker<br>
-        4633 Ocean Avenue<BR>
-        San Francisco,&nbsp;
-        CA&nbsp;
-        94132  <BR>
-        
-        </TD>
-        <td width="20"><IMG 
-SRC="../images/raptor.jpg" WIDTH =20 HEIGHT=1 BORDER=0></TD>
-        <td width="148" align="RIGHT"><IMG 
-src="../images/raptor.jpg" border="0" alt="" width="38" height="34"><IMG 
-SRC="../images/raptor.jpg" WIDTH =12 HEIGHT=1 BORDER=0><IMG 
-src="../images/raptor.jpg" width="38" height="34" border="0" alt=""><IMG 
-SRC="../images/raptor.jpg" WIDTH =12 HEIGHT=1 BORDER=0><IMG 
-src="../images/raptor.jpg" width="38" height="34" border="0" alt=""></TD>
-</TR>
-
-<TR><td></td>
-        <TD colspan="3"><IMG 
-src="../images/raptor.jpg" width="398" height="1" border="0" alt=""><br>&nbsp;</TD>
-</TR>
-
-<!-- af2_results_elbat.htm - 11/17/98 - 11:12:13 AM -->
-<TR valign="TOP">
-        <td width="20" align="RIGHT">
-        2.&nbsp;</TD>
-        <td width="232">
-        FORECLOSURES AAA HOMES UP TO 50% OFF<BR>
-        Real Estate Services<br>
-        CA&nbsp;
-        00000  <BR>
-        (000) 000-0000
-        </TD>
-        <td width="20"><IMG 
-SRC="../images/raptor.jpg" WIDTH =20 HEIGHT=1 BORDER=0></TD>
-        <td width="148" align="RIGHT"><IMG 
-src="../images/raptor.jpg" border="0" alt="" width="38" height="34"><IMG 
-SRC="../images/raptor.jpg" WIDTH =12 HEIGHT=1 BORDER=0><IMG 
-src="../images/raptor.jpg" width="38" height="34" border="0" alt=""><IMG 
-SRC="../images/raptor.jpg" WIDTH =12 HEIGHT=1 BORDER=0><IMG 
-src="../images/raptor.jpg" width="38" height="34" border="0" alt=""></TD>
-</TR>
-
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug4429.html b/layout/html/tests/table/bugs/bug4429.html
deleted file mode 100644
index d8600e04f6a6..000000000000
--- a/layout/html/tests/table/bugs/bug4429.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<FORM METHOD="GET" ACTION="http://search.yahoo.com/bin/search" NAME="searchform">
-<TABLE border=1>
- <TR>
-  <td> <INPUT TYPE=HIDDEN NAME="zip2" VALUE = "">foo</td></tr>
-</table>
-<input type=submit name=submit>
-</form>
diff --git a/layout/html/tests/table/bugs/bug44505.html b/layout/html/tests/table/bugs/bug44505.html
deleted file mode 100644
index 0374afa5a4bc..000000000000
--- a/layout/html/tests/table/bugs/bug44505.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-
-<html>
-
-<head>
-<title>layout-fix column space-  don't even think to break these regression tests</title>
-<style>
-td {overflow:hidden; background-color:blue}
-</style>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table style="table-layout:fixed;" border="1" width="300">
-<colgroup>
-<col width="200">
-<col width="100">
-</colgroup>
- <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed;" border="1" width="300">
-<colgroup>
-<col width="200">
-<col width="100">
-</colgroup>
- <tr><td width="80%">&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed;" border="1" width="300">
- <tr><td width="80%">&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed;" border="1" width="300">
- <tr><td width="150">&nbsp;</td><td>&nbsp;</td></tr>
-<tr><td width="250">&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed;" border="1" width="300">
- <tr><td width="150"><form><button style="width:200px">button</button></form></td><td>&nbsp;</td></tr>
-<tr><td width="250">&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table  border="1" width="300">
- <tr><td ><form><button style="width:200px">button</button></form></td><td>&nbsp;</td></tr>
-<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed;" border="1" width="300" cellpadding="10">
- <tr><td width="150"><div style="width:200px; border:solid">div</div></td><td>&nbsp;</td></tr>
-<tr><td width="250">&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-<table style="table-layout:fixed; overflow:hidden" border="1" width="300">
- <tr><td width="150"><p style="width:200px; border:solid">para</p></td><td>&nbsp;</td></tr>
-<tr><td width="250">&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-<table  border="1" width="300">
- <tr><td width="150"><p style="width:200px; border:solid">para</p></td><td>&nbsp;</td></tr>
-<tr><td width="250">&nbsp;</td><td>&nbsp;</td></tr>
-</table>
-
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug44523.html b/layout/html/tests/table/bugs/bug44523.html
deleted file mode 100644
index f507c4a55696..000000000000
--- a/layout/html/tests/table/bugs/bug44523.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<HTML>
-<HEAD>
-<TITLE>CANOE </TITLE>
-</HEAD>
-<BODY>
- <TABLE border>
-   <TR>
-    <TD rowSpan=2 >
-          Canada climbs up FIFA rankings         
-    </TD>
-   </TR>
-   <P>           
-   <TR>
-    <BR>
-    <TD >
-      drink more german beer.
-    </TD>
-   </TR>
-  </TABLE>
-              
- </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug4501.html b/layout/html/tests/table/bugs/bug4501.html
deleted file mode 100644
index e89368be2bb1..000000000000
--- a/layout/html/tests/table/bugs/bug4501.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- 
-  Basic scenario is a table with width=100%, with two fixed width
-TD elements. It's clearly ambiguous about how to distribute the 
-excess width to the columns, but Nav appears to dump it all in the 
-RH column.
--->
-<BODY>
-
-<TABLE WIDTH="100%" BORDER="1" CELLSPACING="0" CELLPADDING="0" bgcolor="#ffcc00">
-
- <TR>
-   <TD WIDTH="111" VALIGN="TOP" ALIGN="left">
-     <IMG SRC="../images/1.gif" WIDTH="111" HEIGHT="197" hspace="0" vspace="0">
-   </TD>
-   <TD WIDTH="389" VALIGN="TOP">
-     <IMG SRC="../images/2.gif" WIDTH="381" HEIGHT="98" hspace="0" vspace="0">
-   </TD>
- </TR>
-
- <TR>
-   <TD WIDTH="111" VALIGN="TOP" ALIGN="left">
-     something else
-   </TD>
-   <TD WIDTH="100%" VALIGN="TOP">
-     <table border="0" cellspacing="0" cellpadding="0">
-       <tr><td>Sunday April 11, 1999, 07:34 PM</td></tr>
-     </table>
-   </TD>
- </TR>
-
-</TABLE>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug45055-2.html b/layout/html/tests/table/bugs/bug45055-2.html
deleted file mode 100644
index 8710fa16bfdc..000000000000
--- a/layout/html/tests/table/bugs/bug45055-2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head><title>Testcase: row gaps</title>
-<style type="text/css">
-  td { background-image : url(red_transparent.gif); }
-  body { background-color : #ffffff; color : #000000; }
-  table { float : left; border-spacing : 0;}
-</style>
-</head>
-<body>
-  <table summary="entrybar" style="height : 105px;">
-    <caption>height="105"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-  <table summary="entrybar" style="height : 106px;">
-    <caption>height="106"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-  <table summary="entrybar" style="height : 107px;">
-    <caption>height="107"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-  <table summary="entrybar" style="height : 108px;">
-    <caption>height="108"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-  <table summary="entrybar" style="height : 109px;">
-    <caption>height="109"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-  <table summary="entrybar" style="height : 110px;">
-    <caption>height="110"</caption>
-    <tr><td>Entry #01</td></tr>
-    <tr><td>Entry #02</td></tr>
-    <tr><td>Entry #03</td></tr>
-    <tr><td>Entry #04</td></tr>
-    <tr><td>Entry #05</td></tr>
-  </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug45055.html b/layout/html/tests/table/bugs/bug45055.html
deleted file mode 100644
index 81a4f1098644..000000000000
--- a/layout/html/tests/table/bugs/bug45055.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>Bug 45055 - testcase cellspacing="1"</title>
-<style type="text/css">
-  td { background-color : #cccccc; color : #0000ff; }
-  body { background-color : #ffffff; color : #000000; }
-</style>
-</head>
-<body>
-<table border="0" cellspacing="1" summary="navbar">
-<tr><td>Line 1</td></tr>
-<tr><td>Line 2</td></tr>
-<tr><td>Line 3</td></tr>
-<tr><td>Line 4</td></tr>
-<tr><td>Line 5</td></tr>
-<tr><td>Line 6</td></tr>
-<tr><td>Line 7</td></tr>
-<tr><td>Line 8</td></tr>
-<tr><td>Line 9</td></tr>
-<tr><td>Line 10</td></tr>
-<tr><td>Line 11</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug4520.html b/layout/html/tests/table/bugs/bug4520.html
deleted file mode 100644
index 6f1afff7ce53..000000000000
--- a/layout/html/tests/table/bugs/bug4520.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<TABLE BORDER=5>
-<TR>
-  <TD>
-    <TABLE BORDER=3 ALIGN=RIGHT>
-    <TR><TD> 
-    Inner Right
-    </TD></TR>
-    </TABLE>
-  </TD>
-</TR>
-</TABLE>
-
-<TABLE BORDER=5>
-<TR>
-  <TD>
-    <TABLE BORDER=3 ALIGN=LEFT>
-    <TR><TD> 
-    Inner Left
-    </TD></TR>
-    </TABLE>
-  </TD>
-</TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug4523.html b/layout/html/tests/table/bugs/bug4523.html
deleted file mode 100644
index 5e2c6edce7b5..000000000000
--- a/layout/html/tests/table/bugs/bug4523.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<BODY>
-
- <TABLE width="99%" cellpadding=0 cellspacing=0 border=1>
- <TR><TD background="../images/sbs.gif">
- </TD>
- <TD width=4><IMG src="../images/slr.gif" width=4 alt="" 
-height=4></TD>
- </TR>
- </TABLE>
- <BR>
-
-<TABLE width="45%" cellpadding=0 cellspacing=0 border=0>
-<TR>
-<TD valign=top bgcolor="#006666"><IMG src="../images/slc.gif" width=13 height=16 alt="" align=top><FONT size=4 color="#ffffff" face="arial,helvetica"><B>Rugged Laptops</B></FONT></TD>
-<TD valign=bottom width=4><IMG align=bottom src="../images/srs.gif" width=4 height=18 alt=""></TD>
-</TR>
-<TR>
-<TD background="../images/sbs.gif"><IMG src="../images/sbs.gif" width="1" height=4 alt=""></TD>
-<TD width=4><IMG src="../images/slr.gif" width=4 alt="" height=4></TD>
-</TR></TABLE>
-<BR>
-<TABLE width="45%" cellpadding=0 cellspacing=0 border=0>
-<TR>
-<TD valign=top bgcolor="#006666"><IMG src="../images/slc.gif" width=13 height=16 alt="" align=top><FONT size=4 color="#ffffff" face="arial,helvetica"><B>Rugged Laptops</B></FONT></TD>
-<TD valign=bottom width=4><IMG align=bottom src="../images/srs.gif" width=4 height=18 alt=""></TD>
-</TR>
-<TR>
-<TD background="../images/sbs.gif"><IMG src="../images/sbs.gif" width="1" height=4 alt=""><b>foo</b></TD>
-<TD width=4><IMG src="../images/slr.gif" width=4 alt="" height=4></TD>
-</TR></TABLE>
diff --git a/layout/html/tests/table/bugs/bug4527.html b/layout/html/tests/table/bugs/bug4527.html
deleted file mode 100644
index 643ded1c483c..000000000000
--- a/layout/html/tests/table/bugs/bug4527.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<HTML>
-        <HEAD>
-                
-                <TITLE>
-                        EarthLink Homepage
-                </TITLE>
-        </HEAD>
-        <BODY BGCOLOR="#000066">
-        <BASEFONT NAME="Helvetica, Arial" SIZE="-1">
-               <TABLE BORDER=0 CELLPADDING=0 CELLSPACING=0 WIDTH="613">
-        <TR>
-                <TD WIDTH="126" ALIGNx=CENTER VALIGNx=TOP ROWSPAN=2>
-                        <A HREF="/"><IMG SRC="../images/logo.gif" WIDTH="126" HEIGHT="85" BORDER="0"></A>
-                </TD>
-                <TD ALIGN=LEFT WIDTH="487" COLSPAN="3"><nobr><iframe align=left width=468 height=60 noresize scrolling=no frameborder=0 marginheight=0 marginwidth=0 
-				 src="adforce_imgis_com.html"> <A href="http://adforce.imgis.com/?adlink|2|7221|1|1|misc=923531718;AdId=57669;BnId=1;IMGIS;loc=400;" TARGET=_top><IMG SRC="../images/Ad57669St1Sz1Sq1Id1.gif" NAME=imgisad BORDER=0 ALT='An online greeting for your secretary' WIDTH=468 HEIGHT=60></A>  </iframe><A HREF="/advertise/"><IMG SRC="../images/ad_info.gif" WIDTH="19" HEIGHT="60" BORDER="0"></A></NOBR><BR clear=all>
-<IMG SRC="../images/blue_1x1.gif" WIDTH="470" HEIGHT="10" BORDER="0"><BR></TD>
-        </TR>
-        <FORM method=get action="http://start.earthlink.net/AL/TrackForm"><INPUT type="hidden" name="cobrand" value="earthlink"><INPUT type="hidden" name="_v" value="2"><INPUT type="hidden" name="RD" value="DM"><INPUT type="hidden" name="OPs" value="R">
-<INPUT type="hidden" name="url" value="http://redirect.hotbot.com/redir/723/http://www.hotbot.com/">
-<INPUT type="hidden" name="vars" value="MT,domain,cobrand,_v,OPs,RD">
-<TR>
-        <TD align=left valign=middle bgcolor="#CCCCCC"><IMG src="../images/join.gif" width="232" height="25" border="0" usemap="#join_earthlink"></TD>
-        <TD align=center valign=middle bgcolor="#CCCCCC"><INPUT type="text" name="MT" size="10" maxlength=50><INPUT type=image src="../images/go_earthlink.gif" name="IMAGE" value="Submit Search" width="25" height="18" align="ABSMIDDLE" border="0"></TD>
-        <TD alignx=right valignx=middle bgcolor="#CCCCCC"><INPUT type="radio" name="domain" value="" checked><IMG src="../images/the_web.gif" alt="The Web" width="40" height="25" border="0" align="ABSMIDDLE"><INPUT type="radio" name="domain" value="www.earthlink.net help.earthlink.net">
-		<IMG src="../images/search_eln.gif" alt="EarthLink" width="46" height="25" border="0" align="ABSMIDDLE"></TD>
-</TR></FORM>
-</TABLE>
-        </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug45350.html b/layout/html/tests/table/bugs/bug45350.html
deleted file mode 100644
index 9a705bf60591..000000000000
--- a/layout/html/tests/table/bugs/bug45350.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<table>
-        <tr>
-                <td bgcolor=green>a</td>
-                <td rowspan=2 bgcolor=orange><img src="../images/star.gif" border=0></td>
-        </tr>
-        <tr align=center>
-                <td align=right bgcolor=blue>x</td>
-        </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug45486.html b/layout/html/tests/table/bugs/bug45486.html
deleted file mode 100644
index 239994a037dc..000000000000
--- a/layout/html/tests/table/bugs/bug45486.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-
-<html>
-
-<head>
-<title>45486d</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<TABLE BORDER="1" WIDTH="100%">
-<TR>
-    <TD WIDTH="10%" ALIGN="LEFT" VALIGN="TOP">10%</TD>
-    <TD WIDTH="90%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="5">90% colspan 5</TD>
-</TR>
-<TR>
-    <TD WIDTH="30%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="2">30% colspan 2</TD>
-    <TD WIDTH="50%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="3">50% colspan 3</TD>
-    <TD WIDTH="20%" ALIGN="LEFT" VALIGN="TOP">20%</TD>
-</TR>
-<TR>
-    <TD WIDTH="40%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="3">40% colspan 3</TD>
-    <TD WIDTH="40%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="2">40% colspan 2</TD>
-    <TD WIDTH="20%" ALIGN="LEFT" VALIGN="TOP">20%</TD>
-</TR>
-<TR>
-    <TD WIDTH="70%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="4">70% colspan 4</TD>
-    <TD WIDTH="10%" ALIGN="LEFT" VALIGN="TOP">10%</TD>
-    <TD WIDTH="20%" ALIGN="LEFT" VALIGN="TOP">20%</TD>
-</TR>
-<TR>
-    <TD WIDTH="80%" ALIGN="LEFT" VALIGN="TOP" COLSPAN="5">80% colspan 5</TD>
-    <TD WIDTH="20%" ALIGN="LEFT" VALIGN="TOP">20%</TD>
-</TR>
-</TABLE>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug45621.html b/layout/html/tests/table/bugs/bug45621.html
deleted file mode 100644
index e1ec42b78df8..000000000000
--- a/layout/html/tests/table/bugs/bug45621.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Untitled</title>
-</head>
-
-<body>
-
- <table style="width:50%;
-               background-color: silver;
-                           border: 0px solid red;
-                           border-spacing:0px;
-                           border-collapse:collapse;">
-  <tr>
-   <td style="white-space:nowrap;
-              background-color: gray;
-                          padding: 0px;
-                          border: 0px solid black;">
-    <input type="text"
-               style="width:100%;
-                          background-color:pink;
-                                  border: 0px solid green;">
-   </td>
-  </tr>
-  <tr>
-   <td style="white-space:nowrap;
-              background-color: gray;
-                          padding: 0px;
-                          border: 0px solid black;">
-    <img style="width:100%;
-                    height:40px;
-                        background-color:cyan;
-                                border: 0px solid green;">
-   </td>
-  </tr>
- </table>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug4576.html b/layout/html/tests/table/bugs/bug4576.html
deleted file mode 100644
index f149f0f9ed12..000000000000
--- a/layout/html/tests/table/bugs/bug4576.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<TABLE width=600>
-<TR>
-
-<TD width=160></TD>
-
-<TD width=30><IMG height=440 src="" width=30></TD>
-
-<TD width=440>
-<TABLE width=440>
-<TR>
-<TD width=250>
-<TABLE width=250>
-<TR>
-<TD width=245>
-<IMG align=left src="../images/N.gif">
-Text text, text: text text text; text. Text, text text....
-</TD>
-</TR>
-</TABLE>
-</TD>
-
-<TD width=200>
-<TABLE width=200 border=10>
-<TR>
-<TD height=200 width=200></TD>
-</TR>
-</TABLE>
-</TD>
-
-</TR>
-</TABLE>
-<BR>
-This is bug 2904
-<TABLE border=1>
-  <TBODY>
-  <TR>
-    <TD>
-      <TABLE border=1>
-        <TBODY>
-        <TR>
-          <TD>x </TD></TR></TBODY></TABLE></TD>
-    <TD>
-      <DIV 
-      style="BORDER-BOTTOM: green 10px groove; BORDER-LEFT: green 10px groove; 
-	  BORDER-RIGHT: green 10px groove; BORDER-TOP: green 10px groove; 
-	  WIDTH: 100%">x</DIV></TD></TR></TBODY></TABLE>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug46268-1.html b/layout/html/tests/table/bugs/bug46268-1.html
deleted file mode 100644
index d9d7fe73cc0e..000000000000
--- a/layout/html/tests/table/bugs/bug46268-1.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<HTML>
-<HEAD>
-<TITLE>
-Table Background Demonstration
-</TITLE>
-</HEAD>
-<BODY>
-
-        <TABLE border=1 cellspacing=5 bgcolor="red">
-        <TR bgcolor="blue">
-                <TD bgcolor="green">Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-                <TD>Cell D</TD>
-        </TR>
-        <TR>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-        </TR>
-        <TR>
-                <TD>Cell I</TD>
-                <TD>Cell J</TD>
-                <TD>Cell K</TD>
-                <TD>Cell L</TD>
-        </TR>
-        </TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46268-2.html b/layout/html/tests/table/bugs/bug46268-2.html
deleted file mode 100644
index f9e4d41ce9bd..000000000000
--- a/layout/html/tests/table/bugs/bug46268-2.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Table Background Demonstration
-</TITLE>
-</HEAD>
-<BODY>
-
-        <TABLE border=1 cellspacing=5 bgcolor="red">
-        <TR bgcolor="blue">
-                <TD bgcolor="green">Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-                <TD>Cell D</TD>
-        </TR>
-        <TR>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-        </TR>
-        <TR>
-                <TD>Cell I</TD>
-                <TD>Cell J</TD>
-                <TD>Cell K</TD>
-                <TD>Cell L</TD>
-        </TR>
-        </TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46268-3.html b/layout/html/tests/table/bugs/bug46268-3.html
deleted file mode 100644
index ee5b686d2031..000000000000
--- a/layout/html/tests/table/bugs/bug46268-3.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-
-<html>
-
-<head>
-<title>testcase colouring snippet from tests/table/core/backgrounds</title>
-</head>
-
-<body >
-
-table - color, tbodies color, row color
-<table style="padding:40px" cellspacing="40" bgcolor="orange" border>
- <tbody style="background-color:red">
-  <tr bgcolor="yellow">
-   <td>foo</td></tr>
-  <tr>
-   <td>foo</td></tr>
- </tbody>
- <tbody  style="background-color:green">
- <tr bgcolor="green">
-  <td>foo</td>
-  </tr>
-  </tbody>
-</table>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug46268-4.html b/layout/html/tests/table/bugs/bug46268-4.html
deleted file mode 100644
index 7e80b097bd42..000000000000
--- a/layout/html/tests/table/bugs/bug46268-4.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-<title>testcase colouring snippet from tests/table/core/backgrounds</title>
-</head>
-<body >
-
- <h5>table - color, tbodies color, row color</h5>
-<table style="padding:40px; background-color:orange" cellspacing="40" border>
- <tbody style="background-color:red">
-  <tr style="background-color:yellow">
-   <td>foo</td></tr>
-  <tr>
-   <td>foo</td></tr>
- </tbody>
- <tbody  style="background-color:green">
- <tr style="background-color:green">
-  <td>foo</td>
-  </tr>
-  </tbody>
-</table>
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug46268-5.html b/layout/html/tests/table/bugs/bug46268-5.html
deleted file mode 100644
index 7aa02c9af5a7..000000000000
--- a/layout/html/tests/table/bugs/bug46268-5.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Table Background Testcase
-</TITLE>
-</HEAD>
-<BODY>
-
-        <TABLE border=1 cellspacing=5 bgcolor="red">
-        <colgroup style="background-color: yellow">
-                <col style="background-color: silver">
-                <col>
-        </colgroup>
-        <colgroup span=2>
-        </colgroup>
-        <tbody style="background-color: aqua">
-        <TR bgcolor="blue">
-                <TD bgcolor="green">Cell A</TD>
-                <TD style="background: transparent">Cell B</TD>
-                <TH>Cell C</TH>
-                <TD>Cell D</TD>
-        </TR>
-        <TR>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-                <TD>Cell G</TD>
-                <TD>Cell H</TD>
-        </TR>
-        </tbody>
-        <tbody>
-        <TR>
-                <TD>Cell I</TD>
-                <TD>Cell J</TD>
-                <TD>Cell K</TD>
-                <TD>Cell L</TD>
-        </TR>
-        </tbody>
-        </TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46268.html b/layout/html/tests/table/bugs/bug46268.html
deleted file mode 100644
index 16754c1cd820..000000000000
--- a/layout/html/tests/table/bugs/bug46268.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Table Background Testcase
-</TITLE>
-</HEAD>
-<BODY>
-
-	<TABLE border=1 cellspacing=5 bgcolor="red">
-	<colgroup style="background-color: yellow">
-		<col style="background-color: silver">
-		<col>
-	</colgroup>
-	<colgroup span=2>
-	</colgroup>
-	<tbody style="background-color: aqua">
-	<TR bgcolor="blue">
-		<TD bgcolor="green">Cell A</TD>
-		<TD style="background: transparent">Cell B</TD>
-		<TH>Cell C</TH>
-		<TD>Cell D</TD>
-	</TR>
-	<TR>
-		<TD>Cell E</TD>
-		<TD>Cell F</TD>
-		<TD>Cell G</TD>
-		<TD>Cell H</TD>
-	</TR>
-	</tbody>
-	<tbody>
-	<TR>
-		<TD>Cell I</TD>
-		<TD>Cell J</TD>
-		<TD>Cell K</TD>
-		<TD>Cell L</TD>
-	</TR>
-	</tbody>
-	</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46368-1.html b/layout/html/tests/table/bugs/bug46368-1.html
deleted file mode 100644
index 4945d5e0f455..000000000000
--- a/layout/html/tests/table/bugs/bug46368-1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>mozilla.org: Bug 46368</TITLE>
-<STYLE>#myWord { color: blue; }</STYLE>
-</HEAD>
-<BODY onLoad="doClick()">
-<TABLE border="1" width="100%" bgcolor="Aqua">
-        <TR>
-                <TD>
-                        <TABLE  border="1" bgcolor="Fuchsia">
-                                <TR>
-                                        <TD>Mozilla To Be Dually-Licensed<BR>Plans are underway to make the <FONT id="myWord">Mozilla</FONT> code available under a
- dual MPL/GPL license.  See the for more info. We're gathering contributor input now, in the newsgroup.<BR>
-                                        </TD>
-                                </TR>
-                        </TABLE>
-                </TD>
-                <TD>This status update contains information on MailNews, XML/DOM, XPToolkit, Architecture, Bidi, Necko/Imglib, and more...
-                </TD>
-        </TR>
-</TABLE>
-<SCRIPT language="JavaScript1.2">
-
-function doClick() {
-var myFont=document.getElementById("myWord");
-var myText=document.getElementById("txtFontSize");
-myFont.size=myText.value;
-}
-
-</SCRIPT><BR>
-<INPUT onClick="javascript:document.location.reload()" type="submit" name="btnReload" value="Reload">&nbsp;
-<INPUT onClick="javascript:doClick()" type="submit" name="btnChange" value="Change Font">&nbsp;
-<INPUT name="txtFontSize" id="txtFontSize" value="6">
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46368-2.html b/layout/html/tests/table/bugs/bug46368-2.html
deleted file mode 100644
index 02276570db9c..000000000000
--- a/layout/html/tests/table/bugs/bug46368-2.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>mozilla.org: Bug 46368</TITLE>
-<STYLE>#myWord { color: blue; }</STYLE>
-</HEAD>
-<BODY onLoad="doClick()">
-<TABLE border="1" width="100%" bgcolor="Aqua">
- <TR>
-  <TD width=300><FONT id="myWord">Mozilla</FONT> code available under a
-      dual MPL/GPL license.  See the for more info.<BR>
-  </TD>
-  <TD> foo bar foo bar foo bar foo bar foo bar </td>
- </TR>
-</TABLE>
-
-<SCRIPT language="JavaScript1.2">
-
-function doClick() {
-var myFont=document.getElementById("myWord");
-var myText=document.getElementById("txtFontSize");
-myFont.size=myText.value;
-}
-
-</SCRIPT><BR>
-<INPUT onClick="javascript:document.location.reload()" type="submit" name="btnReload" value="Reload">&nbsp;
-<INPUT onClick="javascript:doClick()" type="submit" name="btnChange" value="Change Font">&nbsp;
-<INPUT name="txtFontSize" id="txtFontSize" value="6">
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46480-1.html b/layout/html/tests/table/bugs/bug46480-1.html
deleted file mode 100644
index 3e46fb40a729..000000000000
--- a/layout/html/tests/table/bugs/bug46480-1.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Table 'color' Inheritance Test ---quirk --- bug 46480
-</TITLE>
-
-<STYLE type="text/css">
-TABLE, TD, TH {border: 10px solid}
-body {background: white}
-</STYLE>
-
-</HEAD>
-<BODY>
-
-<H2>Test A</H2>
-
-<DIV style="color: green">
-<TABLE>
-  <TR style="color: blue">
-   <TD>Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-</DIV>
-
-<H2>Test B</H2>
-
-<TABLE>
-  <TR style="color: blue">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test C</H2>
-
-<TABLE style="color: blue">
-  <TR>
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test D</H2>
-
-<TABLE style="color: blue">
-  <TR style="color: inherit">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test E</H2>
-
-<TABLE style="color: blue">
- <TBODY style="color: inherit">
-  <TR style="color: inherit">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
- </TBODY>
-</TABLE>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug46480-2.html b/layout/html/tests/table/bugs/bug46480-2.html
deleted file mode 100644
index 408fcf424e35..000000000000
--- a/layout/html/tests/table/bugs/bug46480-2.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-<HEAD>
-<TITLE>
-Table 'color' Inheritance Test ---strict --- bug 46480
-</TITLE>
-
-<STYLE type="text/css">
-TABLE, TD, TH {border: 10px solid}
-body {background: white}
-</STYLE>
-
-</HEAD>
-<BODY>
-
-<H2>Test A</H2>
-
-<DIV style="color: green">
-<TABLE>
-  <TR style="color: blue">
-   <TD>Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-</DIV>
-
-<H2>Test B</H2>
-
-<TABLE>
-  <TR style="color: blue">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test C</H2>
-
-<TABLE style="color: blue">
-  <TR>
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test D</H2>
-
-<TABLE style="color: blue">
-  <TR style="color: inherit">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
-</TABLE>
-
-<H2>Test E</H2>
-
-<TABLE style="color: blue">
- <TBODY style="color: inherit">
-  <TR style="color: inherit">
-   <TD style="color: inherit">Field</TD>
-   <TD>Records for Cropping Years</TD>
-  </TR>
- </TBODY>
-</TABLE>
-
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug46623-1.html b/layout/html/tests/table/bugs/bug46623-1.html
deleted file mode 100644
index 0ced8b37b667..000000000000
--- a/layout/html/tests/table/bugs/bug46623-1.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html><head><title>Testcase for bug 46623</title></head>
-<body bgcolor="#FFFFFF">
-
-<table BORDER=1>
-<tr>
-  <td WIDTH="350">
-
-     <table BORDER=1 COLS=2 WIDTH="100%" BGCOLOR="#FFCC99">
-     <tr>
-       <td COLSPAN="2">
-         <b>Contact MPG:</b>
-         <br><font size=-1><b><a href="">Click
-         here to email full list</a></b>, or copy this <a href="">list
-         of addresses</a>.&nbsp; View <a href="">Who is in MPG</a>.</font>
-       </td>
-       <td>
-         <b>MPG Rules:</b>
-         <br>Not at all serious bylaws.
-       </td>
-     </tr>
-   </table>
-
-  </td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug46623-2.html b/layout/html/tests/table/bugs/bug46623-2.html
deleted file mode 100644
index 9fe303f1d866..000000000000
--- a/layout/html/tests/table/bugs/bug46623-2.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html><head><title>http://www.plandepot.com/vpc/</title></head>
-<body>
-
-<table border="1" width="640">
-<tr>
-  <td width="320" valign="top">
-    <table border="1" cols="2" width="300">
-    <tr>
-      <td colspan="2">
-         Welcome to PlanDepot.com, the fastest growing resource for 
-         Construction Data on the Internet! We offer an extensive database 
-         of construction bid opportunities, currently covering 
-         13 states!
-      </td>
-    </tr>
-    </table>
-  </td>
-  <td width="320" valign="top">
-    Expanded Geographic Coverage
-  </td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug46924.html b/layout/html/tests/table/bugs/bug46924.html
deleted file mode 100644
index cc46dceed402..000000000000
--- a/layout/html/tests/table/bugs/bug46924.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 //EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<HEAD>
-<STYLE TYPE="text/css">
-.w1 {width:100%}
-.a-div {width:50%;position:relative; text-align:right; background-color:red;margin:0px;}
-</STYLE>
-</HEAD>
-<BODY>
-        <DIV>Buggy example: This table has a tfoot and a tbody</DIV>
-        <TABLE border class="w1 fs-11-13">
-                <TFOOT><TR style="background-color:olive"><TD align="right">This is the footer</TD></TR></TFOOT>
-                <TBODY><TR style="background-color:silver" valign="top"><TD><DIV class="a-div">This row should be in the (grey) table body</DIV></TD></TR></TBODY>
-        </TABLE><BR>
-        <DIV>For comparison: The same table without a tfoot</DIV>
-        <TABLE border class="w1 fs-11-13">
-<!--<TFOOT><TR style="background-color:olive"><TD align="right">This is the footer</TD></TR></TFOOT> -->
-                <TBODY><TR style="background-color:silver" valign="top"><TD><DIV class="a-div">This row should be in the (grey) table body</DIV></TD></TR></TBODY>
-        </TABLE>
-        <DIV>ILLEGAL example: TFOOT after TBODY -- THIS IS PROHIBITED BY HTML 4.01 STRICT AND SHOULD NOT WORK IN STRICT MODE. Please fix or reenable transitional mode.</DIV>
-        <TABLE border class="w1 fs-11-13">
-                <TBODY><TR style="background-color:silver" valign="top"><TD><DIV class="a-div">This row should be in the (grey) table body</DIV></TD></TR></TBODY>
-                <TFOOT><TR style="background-color:olive"><TD align="right">This is the footer</TD></TR></TFOOT>
-        </TABLE><BR>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug46944.html b/layout/html/tests/table/bugs/bug46944.html
deleted file mode 100644
index 506d84e494c0..000000000000
--- a/layout/html/tests/table/bugs/bug46944.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title>Testcase for bug 46944</title></head>
-<body bgcolor="#FFFFFF">
-
-<table border="1" width="100%">
-    <tr>
-        <td colspan="8" width="20%">&nbsp;</td>
-    </tr>
-    <tr>
-        <td width="20%">Old</td>
-        <td colspan="7">Check</td>
-    </tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug47163.html b/layout/html/tests/table/bugs/bug47163.html
deleted file mode 100644
index 4e06bb9a518b..000000000000
--- a/layout/html/tests/table/bugs/bug47163.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 //EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<HEAD>
-<TITLE></TITLE>
-</HEAD>
-<BODY>
-        <TABLE style="width:100%" cellspacing="0" cellpadding="0">
-                <COL width="26"><COL width="17"><COL width="10*"><COL width="8*"><COL width="26">
-                        <TR>
-                                <TD></TD>
-                                <TD COLSPAN="2"><P>Nach der Pruefung der Daten, (Normalerweise benoetigen wir für die Pruefung nur wenige Minuten, aber wenn einmal besonders viel los ist, kann es auch ein wenig laenger dauern.)</P></TD>
-                        </TR>
-                </TBODY>
-        </TABLE>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug4739.html b/layout/html/tests/table/bugs/bug4739.html
deleted file mode 100644
index 270c5bef2f75..000000000000
--- a/layout/html/tests/table/bugs/bug4739.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<table width="100%" border=1 bgcolor="#993300">
-    <tr>
-    <td width="600">This is a sample cell.</td>
-    <td width="100%">&nbsp;</td>
-    </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug47432.html b/layout/html/tests/table/bugs/bug47432.html
deleted file mode 100644
index a79765a1bac2..000000000000
--- a/layout/html/tests/table/bugs/bug47432.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>bug47432</title>
-</head>
-<body>
-<table width="700" border>
-	<tr>
-		<td colspan="3">lots of text goes here even more and more and more and more and more and more and more</td>
-	</tr>
-	<tr>
-		<td valign="top" colspan="2">
-			aaaaaaaaaaaa bbbbbbbbbbbbbbb cccccccccccccccccccccccccc dddddddddddddd
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<p>
-<table width="700" border>
-	<tr>
-		<td colspan="3">lots of text goes here even mo</td>
-	</tr>
-	<tr>
-		<td valign="top" colspan="2">
-			aaaaaaaaaaaa bbbbbbbbbbbbbbb cccccccccccccccccccccccccc dddddddddddddd
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<p>
-<table width="700" border>
-	<tr>
-		<td colspan="3">lots of text goes here even m</td>
-	</tr>
-	<tr>
-		<td valign="top" colspan="2">
-			aaaaaaaaaaaa bbbbbbbbbbbbbbb cccccccccccccccccccccccccc dddddddddddddd
-		</td>
-		<td>&nbsp;</td>
-	</tr>
-</table>
-<hr width="180" align="left">
-<hr width="518" align="left">
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug48028-1.html b/layout/html/tests/table/bugs/bug48028-1.html
deleted file mode 100644
index e040d7cc4415..000000000000
--- a/layout/html/tests/table/bugs/bug48028-1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<body>
-
-<TABLE border>
-<FONT><CAPTION>TEST1</CAPTION></FONT>
-<TR>
-<TD>TABLE TEXT1</TD>
-</TR>
-</TABLE>
-
-<TABLE border>
-<FONT>TEST2</FONT>
-<TR>
-<TD>TABLE TEXT2</TD>
-</TR>
-</TABLE>
-
-<TABLE border>
-<CAPTION>TEST3</CAPTION>
-<TR>
-<TD>TABLE TEXT3</TD>
-</TR>
-</TABLE>
-
-</body>
-</html>
- 
diff --git a/layout/html/tests/table/bugs/bug48028-2.html b/layout/html/tests/table/bugs/bug48028-2.html
deleted file mode 100644
index dc616f7a796b..000000000000
--- a/layout/html/tests/table/bugs/bug48028-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>48028</title>
-</head>
-<body>
-
-<TABLE BORDER=1 BGCOLOR=#ffffff CELLSPACING=0>
-<FONT size="5"><CAPTION>Complete Price List</CAPTION></FONT>
-
-<TR VALIGN=TOP>
-<TD BORDERCOLOR=#c0c0c0 ><FONT SIZE=2 FACE="Arial" COLOR=#000000>Apple Store</FONT></TD>
-<TD BORDERCOLOR=#c0c0c0 ><FONT SIZE=2 FACE="Arial" COLOR=#000000>14415</FONT></TD>
-<TD BORDERCOLOR=#c0c0c0 ><FONT SIZE=2 FACE="Arial" COLOR=#000000>PB G3 &quot;FireWire&quot;-[256MB] 222</FONT></TD>
-<TD BORDERCOLOR=#c0c0c0 ><FONT SIZE=2 FACE="Arial" COLOR=#000000>$264.00</FONT></TD>
-</TABLE>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug4803.html b/layout/html/tests/table/bugs/bug4803.html
deleted file mode 100644
index be47cd7abea1..000000000000
--- a/layout/html/tests/table/bugs/bug4803.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<body>
-The vertical grey bar should be 1 pixel wide
-<table cellpadding=0 cellspacing=0 border=0>
-<tr>
-<td width="1" bgcolor="#999999">
-        <img src="../images/transpix.gif" width=1 height=2 border=0>
-</td>
-<td width="139" bgcolor="#ffffcc">&nbsp;D A I LY&nbsp;&nbsp;C H E C K</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug4849-2.html b/layout/html/tests/table/bugs/bug4849-2.html
deleted file mode 100644
index 601bd2fc65ff..000000000000
--- a/layout/html/tests/table/bugs/bug4849-2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<HTML>
-
-<HEAD>
-<title>www.fortunecity.com</title>
-</HEAD>
-<BODY  bgcolor=fffccc>
-<center>
-<TABLE  BORDER=0 cellpadding=0 cellspacing=0 width=540 >
-<tr>
-<TD width=150 valign=top>
-<CENTER>
-<IFRAMEx WIDTH=100 HEIGHT=100 NORESIZE SCROLLING=No FRAMEBORDER=0 MARGINHEIGHT=0 MARGINWIDTH=0 SRC=../images/gray.gif">
-</IFRAME><BR><BR>
-</CENTER>
-</TD>
-<td valign=top bgcolor=ffffff>
-<img src=../images/gray.gif width=1 height=1>
-</td>
-<td valign=top>
-<table cellpadding=2>
-<tr>
-<td>
-<P>IMPROVE YOUR SITE
-<BR>
-In this week's Home Improvements you can find an article on how to spice up your page by using imagemaps.
-<P></table>
-<table width=100%><tr>
-<td align=right>
-<A HREF=xyz>MORE<IMG SRC="../images/trout.gif" BORDER=0 ></A>
-</td>
-</tr>
-</table>
-</TD>
-</TR>
-<td colspan=3 align=center >
-<img src=../images/gray.gif width=600 height=1><p>
-</font><BR>
-</TABLE >
-</td></TR>
-</TABLE>
-</TD></TR>
-</TABLE>
-</center>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug4849.html b/layout/html/tests/table/bugs/bug4849.html
deleted file mode 100644
index 616025932199..000000000000
--- a/layout/html/tests/table/bugs/bug4849.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML>
- <BODY>
-  <TABLE BORDER=0 cellpadding=0 cellspacing=0 width=600>
-   <TR>
-    <TD WIDTH=150 BGCOLOR=00EEEE>
-      150 pixels wide
-    </TD>
-    <TD WIDTH=1 BGCOLOR=FF0000>
-     <IMG SRC=../images/gray.gif WIDTH=1>
-    </TD>
-    <TD WIDTH=449 BGCOLOR=EEEE00>
-     449 pixels wide
-    </TD>
-   </TR>
-   <TR>
-    <TD WIDTH=600 BGCOLOR=00FF00 COLSPAN=3>
-     Bottom cell, 600 pixels wide
-     <IMG SRC=../images/gray.gif WIDTH=600 HEIGHT=10>
-    </TD>
-   </TR>
-  </TABLE>
- </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug48827.html b/layout/html/tests/table/bugs/bug48827.html
deleted file mode 100644
index 3a7346e19b28..000000000000
--- a/layout/html/tests/table/bugs/bug48827.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-<head><title>Border Test</title></head>
-<body bgcolor=white>
-
-<p>A 101 pixel wide table</p>
-<table width=101 border=0 cellpadding=0 cellspacing=1>
-<tr>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-</tr>
-</table>
-
-<p>A 102 pixel wide table</p>
-<table width=102 border=0 cellpadding=0 cellspacing=1>
-<tr>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-</tr>
-</table>
-
-<p>A 103 pixel wide table</p>
-<table width=103 border=0 cellpadding=0 cellspacing=1>
-<tr>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-</tr>
-</table>
-
-<p>A 104 pixel wide table</p>
-<table width=104 border=0 cellpadding=0 cellspacing=1>
-<tr>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-<td bgcolor=black width="25%">&nbsp;</td>
-</tr>
-<tr>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-<td colspan=2 bgcolor=black>&nbsp;</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug50695-1.html b/layout/html/tests/table/bugs/bug50695-1.html
deleted file mode 100644
index 6037eb8671ec..000000000000
--- a/layout/html/tests/table/bugs/bug50695-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML><BODY>
-<FORM>
-<TABLE WIDTH="100%" HEIGHT="100%" BORDER=1><TR><TD VALIGN=CENTER ALIGN=CENTER>
-This should be in the center of the page.
-</TD></TR></TABLE>
-</FORM>
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug50695-2.html b/layout/html/tests/table/bugs/bug50695-2.html
deleted file mode 100644
index 83a1e41a0cb1..000000000000
--- a/layout/html/tests/table/bugs/bug50695-2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
- <body>
-  <form>
-   <iframe src="../images/raptor.jpg" height=50%></iframe>
-  </form>
- </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug51000.html b/layout/html/tests/table/bugs/bug51000.html
deleted file mode 100644
index 5c249676c9eb..000000000000
--- a/layout/html/tests/table/bugs/bug51000.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<head>
-<title>height</title>
-<style type="text/css">
-thead {
-height: 300px
-}
-tbody {
-height: 300px
- }
-tfoot {
-height: 300px
- }
-</style>
-</head>
-<body>
-
-<p>300xp height value set on THEAD, TBODY, and TFOOT</p>
-
-<table border>
-<thead>
-<tr>
-<th>This THEAD should be 300px high</td>
-</tr>
-</thead>
-
-<tfoot>
-<tr>
-<td>This TFOOT should be 300px high</td>
-</tr>
-</tfoot>
-
-<tbody>
-<tr>
-<td>This TBODY should be 300px hight</td>
-</tr>
-</tbody>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug51037.html b/layout/html/tests/table/bugs/bug51037.html
deleted file mode 100644
index 63975a5fe757..000000000000
--- a/layout/html/tests/table/bugs/bug51037.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Bug positionning table</TITLE>
-
-<script language="javascript">
-
-
-function movep1()
-{
-        var popup = document.getElementById("popup");
-
-        var l = document.getElementById("field1").value;
-        var t = document.getElementById("field2").value;
-        
-        popup.style.left = l;
-        popup.style.top = t;
-}
-
-function movep2()
-{
-        var popup = document.getElementById("popup");
-        popup.style.left = 0;
-}
-function movep3()
-{
-        var popup = document.getElementById("popup");
-        popup.style.left = 250;
-}
-
-</script>
-
-</HEAD>
-<BODY onLoad="movep2();movep3()">
-The tables left position should be 250.
-<p>Left: <input type="text" name="fieldt" id="field1" value="120px"></p>
-<p>Top:  <input type="text" name="fieldl" id="field2" value="120px"></p>
-<p><input type="button" value="Move" onclick="movep1()"></p>
-
-<!-- cellpadding=0 to avoid hitting another bug; not necessary for testcase -->
-
-<table style="position:absolute;left:120px;top:120px" id="popup" border="1" cellpadding="0">
-<tr><td>foo</td></tr>
-<tr><td>bar</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug51140.html b/layout/html/tests/table/bugs/bug51140.html
deleted file mode 100644
index 1f3fcba45010..000000000000
--- a/layout/html/tests/table/bugs/bug51140.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<body>
-
-<script>
-
-function note() {
-    var l = document.createElement("div");
-
-    l.innerHTML="<s>jmd</s> jtr was here.";
-    l.setAttribute("id", "popup");
-    l.style.position = "absolute";
-
-    // afaict only 'tr' causes a crash.  
-    // 'td', 'table', 'a1' don't.
-    document.getElementById('tr').appendChild(l); 
-}
-
-function closepopup() {
-  var p = document.getElementById("popup");
-  if (p && p.parentNode) {
-    // crashes on following line
-    p.parentNode.removeChild(p); 
-  }
-}
-
-</script>
-
-<a id='a1' href='' onclick="              note(); return false;">note</a>
-<a id='a2' href='' onclick="closepopup();         return false;">closepopup</a>
-
-<table id='table' border='1'>
- <tr id='tr'>
-   <!-- this div is just here to demonstrate that the crash
-        only happens with a dhtml-generated div -->
-  <div id="popup" style="position:absolute;">
-   div
-  </div>
-  <td id='td'>
-   table
-  </td>
- </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug51727.html b/layout/html/tests/table/bugs/bug51727.html
deleted file mode 100644
index 761d0de37885..000000000000
--- a/layout/html/tests/table/bugs/bug51727.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<style>
-TD
-{
-        border: 1px solid;
-        width:75px;
-}
-</style>
-<script>
-window.onload = windowLoad;
-
-function windowLoad()
-{
-        var newTable = document.createElement("table");
-        newTable.id = "newTable";
-        
-        for(var y=0;y<1;y++)
-
-        {
-                var newRow = newTable.insertRow(y);
-
-                                
-                for( var x=0;x<1;x++)
-
-                {
-                        var newCell = newRow.insertCell(x);
-
-                        newCell.appendChild(document.createTextNode("r" + y + "c" + x));
-                }
-        }
-        document.body.appendChild(newTable);
-		modify();
-		insert();
-}
-
-function modify()
-{
-        var t = document.getElementById("newTable");
-
-        var cell = t.rows[0].cells[0];
-
-        cell.firstChild.nodeValue = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-}
-
-function insert()
-{
-        var t = document.getElementById("newTable");
-
-        var cell = t.rows[0].cells[0];
-
-        cell.firstChild.nodeValue = "aa";
-}
-</script>
-</head>
-<body>
-
-<form>
-<input type="button" onclick="modify();" value="(1) Fill cell with long string"><br>
-<input type="button" onclick="insert();" value="(2) Fill cell with short string"><br>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug5188.html b/layout/html/tests/table/bugs/bug5188.html
deleted file mode 100644
index a83180777285..000000000000
--- a/layout/html/tests/table/bugs/bug5188.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html>
-  <body >
-    <table border="0" width="550" cellpadding="0">
-      <tr>
-        <td valign="top" align="center" rowspan="2"><img 
-src="../images/spacer.gif"></TD>
-        <TD valign="top" align="center" colspan="2"><img 
-src="../images/banner.gif"
-border="0" align="center"></TD>
-      </TR>
-      <TR>
-        <TD valign="top" align="center" width="300">
-          <TABLE border="0" cellpadding="3" cellspacing="0">
-          <TR>
-            <TD width="300" colspan="2">
-              <img src="../images/bar.gif">
-            </TD>
-          </TR>
-          <TR>
-            <TD valign="top" width="50%">New WidgetMasters every Week! </TD>
-            <TD valign="top" width="50%">WidgetMaster can build your company a 
-custom WidgetMaster!</TD>
-          </TR>
-        </TABLE>
-        </TD>
-        <TD valign="top" width="170">
-          <TABLE border="1" cellpadding="0" cellspacing="0">
-            <TR>
-              <td>cell</td>
-            </TR>
-          </TABLE>
-        </TD>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug52505.html b/layout/html/tests/table/bugs/bug52505.html
deleted file mode 100644
index 4b612e14951f..000000000000
--- a/layout/html/tests/table/bugs/bug52505.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<style>
-TD
-{
-        border: 2px solid;
-}
-</style>
-<script>
-function longTD()
-{
-        var td = document.getElementById("td1");
-        td.style.width = "60px";
-}
-
-function shortTD()
-{
-        var td = document.getElementById("td1");
-        td.style.width = "20px";
-}
-</script>
-</head>
-<body>
-<form>
-<input style="display:block;" type="button" onclick="longTD();" value="[Step 1] Set cell width to 60px (nothing seen)">
-<input style="display:block;" type="button" onclick="shortTD();" value="[Step 2] Set cell width to 20px (garbage seen)">
-</form>
-<table>
-        <tr><td id="td1">1</td><td>2</td></tr>
-        <tr><td id="td2">2</td><td>2</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug52506.html b/layout/html/tests/table/bugs/bug52506.html
deleted file mode 100644
index 68328969a2e8..000000000000
--- a/layout/html/tests/table/bugs/bug52506.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<style>
-TD
-{
-        border: 4px solid;
-}
-</style>
-<script>
-function longTD()
-{
-        var td = document.getElementById("td2");
-        td.style.height = "60px";
-}
-
-function shortTD()
-{
-        var td = document.getElementById("td2");
-        td.style.height = "20px";
-}
-</script>
-</head>
-<body>
-<form>
-<input style="display:block;" type="button" onclick="longTD();" value="[Step 1] Set cell height to 60px">
-<input style="display:block;" type="button" onclick="shortTD();" value="[Step 2] Set cell height to 20px">
-</form>
-<table>
-        <tr><td id="td1">1</td><td>2</td></tr>
-        <tr><td id="td2">2</td><td>2</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug53663.html b/layout/html/tests/table/bugs/bug53663.html
deleted file mode 100644
index 81f1f5928ccc..000000000000
--- a/layout/html/tests/table/bugs/bug53663.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<title>15265</title>
-</head>
-<body>
-<p style="color: green">This is a green paragraph</p>
-
-<table style="position: absolute; border: solid thin black">
-<tr>
-<td>This is a table with 'position: absolute' but no box offsets</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug53690-1.html b/layout/html/tests/table/bugs/bug53690-1.html
deleted file mode 100644
index 2057b58b2b73..000000000000
--- a/layout/html/tests/table/bugs/bug53690-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML><BODY><TABLE><TR><TD>
- <TABLE border=1><TR><TD><SCRIPT language=JavaScript>
-
-document.write('<form method=post name = "DominoForm1" action="' + document.forms[1].action + '">');
-
-</SCRIPT>
-</TD></TR></TABLE></TD><TD>X</TD></TR></TABLE>
diff --git a/layout/html/tests/table/bugs/bug53690-2.html b/layout/html/tests/table/bugs/bug53690-2.html
deleted file mode 100644
index 2a72fe682fd2..000000000000
--- a/layout/html/tests/table/bugs/bug53690-2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML><BODY><form action="1"></form><form action="2"></form><TABLE border=1><TR><TD>
- <SCRIPT language=JavaScript>
-
-document.write('<form action="' + document.forms[1].action + '">');
-
-</SCRIPT>
-</TD><TD>X</TD></TR></TABLE>
diff --git a/layout/html/tests/table/bugs/bug53891.html b/layout/html/tests/table/bugs/bug53891.html
deleted file mode 100644
index ec5ec99a90b6..000000000000
--- a/layout/html/tests/table/bugs/bug53891.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-<title>bug</title>
-</head>
-<body>
-
-<table border>
- <tr>
-  <td>
-   <table border="10" width="200">
-    <tr>
-     <td><img src="../images/lime.gif" height="40" width="40" alt="image"></td>
-     <td>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx</td>
-    </tr>
-   </table>
-  </td>
-  <td>row2, cell2</td>
- </tr>
-</table>
-
-</body>
-</html>
-
-
-
diff --git a/layout/html/tests/table/bugs/bug54450.html b/layout/html/tests/table/bugs/bug54450.html
deleted file mode 100644
index b323bb9dce6a..000000000000
--- a/layout/html/tests/table/bugs/bug54450.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<head>
-<title>bug</title>
-</head>
-<body>
-
-<table border width=100%?>
-<tr>
-<td>xxx xxx xxx xxx xxx xxx xxx xxx</td>
-<td>xxx xxx xxx xxx xxx xxx xxx xxx</td>
-</tr>
-</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug5538.html b/layout/html/tests/table/bugs/bug5538.html
deleted file mode 100644
index fc3e235891a1..000000000000
--- a/layout/html/tests/table/bugs/bug5538.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html>
-<head><title>Testcase for bug 5538 - distilled from www.fool.com</title></head>
-<body bgcolor='#ffffff'>
-<H3>Testcase for bug 5538 - distilled from <a href="http://www.fool.com">www.fool.com</a></H3>
-
-<TABLE WIDTH="600" CELLPADDING="0" CELLSPACING="0" BORDER="0">
-<TR>
-  <TD WIDTH="128" HEIGHT="89" BGCOLOR="#336699" VALIGN="bottom"><A HREF="HTTP://www.fool.com/index.htm"><img src="../images/logosummer.gif" WIDTH="128" HEIGHT="89" BORDER="0"></a></TD>
-  <TD WIDTH="472" VALIGN="MIDDLE"></TD>
-</TR>
-</TABLE>
-
-<TABLE WIDTH="600" CELLPADDING="0" CELLSPACING="0" BORDER="0">  
-<TR>
-<TD HEIGHT="18" WIDTH="497"><IMG SRC="../images/topnavfeatures.gif" WIDTH=348 HEIGHT=18 BORDER=0><MAP></MAP><IMG SRC="../images/topnavregister2.gif" WIDTH=88 HEIGHT=18 BORDER=0><IMG SRC="../images/topnavlogin.gif" HEIGHT=18 WIDTH=55 BORDER=0></TD>
-</TR>
-</TABLE>
-
-<P>When removing &lt;A HREF="..."> surrounding logo image in first row and<br>
-removing &lt;MAP> element in second row it looks OK to me:<BR><BR>
-
-<TABLE WIDTH="600" CELLPADDING="0" CELLSPACING="0" BORDER="0">
-<TR>
-  <TD WIDTH="128" HEIGHT="89" BGCOLOR="#336699" VALIGN="bottom"><img src="../images/logosummer.gif" WIDTH="128" HEIGHT="89" BORDER="0"></TD>
-  <TD WIDTH="472" VALIGN="MIDDLE"></TD>
-</TR>
-</TABLE>
-
-<TABLE WIDTH="600" CELLPADDING="0" CELLSPACING="0" BORDER="0">  
-<TR>
-<TD HEIGHT="18" WIDTH="497"><IMG SRC="../images/topnavfeatures.gif" WIDTH=348 HEIGHT=18 BORDER=0><IMG SRC="../images/topnavregister2.gif" WIDTH=88 HEIGHT=18 BORDER=0><IMG SRC="../images/topnav/topnavlogin.gif" HEIGHT=18 WIDTH=55 BORDER=0></TD>
-</TR>
-</TABLE>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug55527.html b/layout/html/tests/table/bugs/bug55527.html
deleted file mode 100644
index e2ae9327d9f0..000000000000
--- a/layout/html/tests/table/bugs/bug55527.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-    "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-    <HEAD>
-        <TITLE>Mozilla Bug 55527</TITLE>
-        <META http-equiv="Content-type" content="text/html; charset=ISO-8851-1">
-        <META http-equiv="Content-Script-Type" content="text/javascript">
-        <STYLE type="text/css">
-            BODY {
-                background: white;
-            }
-            TH, TD {
-                padding: 1ex 1ex 1ex 1ex;
-                margin; 0px 0px 0px 0px;
-                border: thin solid black;
-            }
-
-            TABLE {
-                margin: 0 0 0 0;
-            }
-        </STYLE>
-    </HEAD>
-    <BODY>
-        <TABLE cellspacing="0">
-            <TBODY>
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                <TR>
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-                    <TD>blah
-            </TBODY>
-        </TABLE>
-    </BODY>
-</HTML>
-                
diff --git a/layout/html/tests/table/bugs/bug55545.html b/layout/html/tests/table/bugs/bug55545.html
deleted file mode 100644
index 7a06360cf3aa..000000000000
--- a/layout/html/tests/table/bugs/bug55545.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML>
-<BODY>
-
-<TABLE>
-<TR>
-<TD>
-
-<TABLE >
-
-<INPUT TYPE="hidden" NAME="ticket" VALUE="Auth">
-
-<TR>
-<TH>User ID:</TH>
-<TD>
-<INPUT TYPE="text"VALUE="" SIZE="40">
-</TD>
-</TR>
-</TABLE>
-
-</TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug55694.html b/layout/html/tests/table/bugs/bug55694.html
deleted file mode 100644
index 3d7fef0b8a11..000000000000
--- a/layout/html/tests/table/bugs/bug55694.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html><head><title>Collapsing Table Bug in Mozilla bug 55694</title></head>
-<body bgcolor="#FFFFFF">
-
-<p>The table below is inside a div tag with <b>absolute</b> positioning for top and 
-left but not for width. 
-The table should push it out to 100% but it doesn't. Instead the layer collapses </p>
-
-<div style="position:absolute; top: 70; background-color: #CCFFCC;"> 
-  <table width="100%" border=1>
-	<tr> 
-	  <td>Table width = 100%</td>
-	</tr>
-  </table>
-</div>
-
-<P><BR><BR><BR><BR></p>
-
-<p>The next table is inside a div tag set with <b>relative</b> positioning. <br>No width has been set </p>
-<div style="position:relative; background-color: #CC0066;">
-  <table width="100%" border=1>
-	<tr> 
-	  <td>Table width = 100%</td>
-	</tr>
-  </table>
-</div>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug55789.html b/layout/html/tests/table/bugs/bug55789.html
deleted file mode 100644
index 5749d587f7fb..000000000000
--- a/layout/html/tests/table/bugs/bug55789.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<table><tr><td>
- 4659
-</td></tr></td>
-
-<CAPTION> 
-</caption>
-
-25016
-
-<TH>  
- <colgroup> 
- </COLGROUP>  
-</th>
diff --git a/layout/html/tests/table/bugs/bug56024.html b/layout/html/tests/table/bugs/bug56024.html
deleted file mode 100644
index e598c67ed2d6..000000000000
--- a/layout/html/tests/table/bugs/bug56024.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"><HTML><HEAD><TITLE>Netscape.com</TITLE>
-<TABLE WIDTH=400 CELLSPACING=0 CELLPADDING=0 BORDER=1>
- <TR>
-  <TD COLSPAN=2>
-   <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=0 WIDTH=300>
-        <TR>
-     <TD VALIGN=TOP>
-      Presidential candidates George W. Bush and Al Gore are expected to show a kinder, gentler side Wednesday in the second of three nationally televised debates. <BR>
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
-  <TD>
-   <FONT COLOR=#CC3333>Avon.com: Fall makeup sale. Save up to 47%.
-   <FORM METHOD=GET ACTION="http://cgi.netscape.com/cgi-bin/redirector.cgi">
-   </FORM>
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug56201.html b/layout/html/tests/table/bugs/bug56201.html
deleted file mode 100644
index 0a7ac8761837..000000000000
--- a/layout/html/tests/table/bugs/bug56201.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
- <head>
-  <title>Bug 56201</title>
- </head>
- <body>
-  <table border="1">
-   <tr>
-    <td>
-     <table border="1">
-      <tr>
-       <td>
-        <img src="../images/logo_small.gif" alt="">
-       </td>
-       <td>
-        <img src="../images/logo_small.gif" alt="">
-       </td>
-      </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug56405.html b/layout/html/tests/table/bugs/bug56405.html
deleted file mode 100644
index 8540e766a8c1..000000000000
--- a/layout/html/tests/table/bugs/bug56405.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Test</title>
-</head>
-<body>
-<table height="1078">
-<!-- There should be a <TR><TD> here -->
-  <table>
-    <tr>
-      <td>
-        I'm down here!
-      </td>
-    </tr>
-  </table>
-<!-- There should be a </TR></TD> here -->
-</table>
-The end.
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug56563.html b/layout/html/tests/table/bugs/bug56563.html
deleted file mode 100644
index ae99bce90fc1..000000000000
--- a/layout/html/tests/table/bugs/bug56563.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML>
-<table border>
-<P>  
-<Sh><Sh>
-<P>M
-<p>
-<img SRC="../images/raptor.jpg" height=40 width=126>
diff --git a/layout/html/tests/table/bugs/bug57300.html b/layout/html/tests/table/bugs/bug57300.html
deleted file mode 100644
index f7924cb0b856..000000000000
--- a/layout/html/tests/table/bugs/bug57300.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head>
-        <title>Percentage heights on table cells</title>
-</head>
-<body>
-
-<table border height="200">
-        <tr><td>This is the first cell in a 200 pixel high table.</td></tr>
-        <tr><td height="50%">This is the second cell, with <b>cell</b> height 50%.</td></tr>
-        <tr><td>This is the third cell.</td></tr>
-</table>
-
-<table border>
-        <tr><td>This is the first cell in an auto-height table.</td></tr>
-        <tr><td height="50%">This is the second cell, with <b>cell</b> height 50%.</td></tr>
-        <tr><td>This is the third cell.</td></tr>
-</table>
-
-<table border height="200">
-        <tr><td>This is the first cell in a 200 pixel high table.</td></tr>
-        <tr height="50%"><td>This is the second cell, with <b>row</b> height 50%.</td></tr>
-        <tr><td>This is the third cell.</td></tr>
-</table>
-
-<table border>
-        <tr><td>This is the first cell in an auto-height table.</td></tr>
-        <tr height="50%"><td>This is the second cell, with <b>row</b> height 50%.</td></tr>
-        <tr><td>This is the third cell.</td></tr>
-</table>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug57378.html b/layout/html/tests/table/bugs/bug57378.html
deleted file mode 100644
index 0c8a88438d1e..000000000000
--- a/layout/html/tests/table/bugs/bug57378.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<table border=1>
- <thead>
-  <tr>
-   <th>inside thead
- </thead>
- <tr>
-  <td>inside tbody</td>
- </tr>
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug57828-2.html b/layout/html/tests/table/bugs/bug57828-2.html
deleted file mode 100644
index 0df7222c0571..000000000000
--- a/layout/html/tests/table/bugs/bug57828-2.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html>
-<head>
-<title>test case</title>
-</head>
-
-<body>
-
-<p>The table below takes out the nowrap with the cell of 1% width.</p>
-
-<table border=0 cellpadding=2 cellspacing=0 width="675">
-        <tr bgcolor="#9999cc">
-                <td>
-                <font face="arial,helvetica" size=4><b>Technology News</b></font><font face="arial,helvetica" size=2> - updated  12:15 PM ET Oct 24</font>
-                </td>
-
-                <td width="1%">
-                        <table cellpadding=3 cellspacing=0>
-                                <tr>
-                                        <td bgcolor="#ccccff">
-                                                <IMG src="../images/my16.gif" width=16 height=16 border=0 align=left alt="My">
-                                                <FONT face=arial size="-2"><a href="http://rd.yahoo.com/addtomy/*http://edit.yahoo.com/config/set_news?.add=zdnt">Add to My Yahoo!</a></font>
-                                        </td>
-                                </tr>
-                        </table>
-                </td>
-        </tr>
-</table>
-
-<p>The table below leaves in the nowrap but take out the 1% width in the cell.</p>
-
-<table border=0 cellpadding=2 cellspacing=0 width="675">
-        <tr bgcolor="#9999cc">
-                <td>
-                <font face="arial,helvetica" size=4><b>Technology News</b></font><font face="arial,helvetica" size=2> - updated  12:15 PM ET Oct 24</font>
-                </td>
-
-                <td>
-                        <table cellpadding=3 cellspacing=0>
-                                <tr>
-                                        <td bgcolor="#ccccff" nowrap>
-                                                <IMG src="../images/my16.gif" width=16 height=16 border=0 align=left alt="My">
-                                                <FONT face=arial size="-2"><a href="http://rd.yahoo.com/addtomy/*http://edit.yahoo.com/config/set_news?.add=zdnt">Add to My Yahoo!</a></font>
-                                        </td>
-                                </tr>
-                        </table>
-                </td>
-        </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug57828.html b/layout/html/tests/table/bugs/bug57828.html
deleted file mode 100644
index d3f44091c48f..000000000000
--- a/layout/html/tests/table/bugs/bug57828.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<table border=3 width=1>
-  <tr>
-   <td nowrap><img width=40 height=40 align=left>NOWRAP cell, no width on cell</td>
-  </tr>
-</table>
-<BR>
-<table border=3 width=1>
-  <tr>
-   <td nowrap><img width=40 height=40 align=left>NOWRAP cell, no width on cell</td>
-  </tr>
-</table>
-<BR>
-<table border=3 width=1>
-  <tr>
-   <td width=100 nowrap><img width=40 height=40 align=left>NOWRAP cell, width=100</td>
-  </tr>
-</table>
-<BR>
-<table border=3 width=1>
-  <tr>
-   <td width=300 nowrap><img width=40 height=40 align=left>NOWRAP cell, width=300</td>
-  </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug5797.html b/layout/html/tests/table/bugs/bug5797.html
deleted file mode 100644
index 73f2f2046c14..000000000000
--- a/layout/html/tests/table/bugs/bug5797.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<table border>
-  <tr>
-    <td width=2000>x</td>
-    <td width=4000>y</td>
-  </tr>
-</table>
-<BR>
-<table border=1 width=100%>
-  <tr>
-    <td width="400">x</td>
-    <td width="400">y</td>
-  </tr>
-</table>
-<BR>
-<table border=1 width=100%>
-  <tr>
-    <td width="500"><img src="../images/raccoon21.jpg"></td>
-    <td width="300">can't we all just get along?</td>
-  </tr>
-</table>
-<br>
-<table border=1 width=100%>
-<tr>
-<td width="1200">Hello how are you</td>
-<td width="500">I'am fine, and you?</td>
-<td width="2000">I great, thank you</td>
-
-</tr></table>
-<BR>
-<table width=100% border=1>
-<tr>
-<td width=1500><../images/pikajumpr.gif"></td>
-<td width=2500><img src="../images/next.gif"></td>
-<td width=30>This is a test to see if this will work on 5.0</td>
-</tr></table>
diff --git a/layout/html/tests/table/bugs/bug5798.html b/layout/html/tests/table/bugs/bug5798.html
deleted file mode 100644
index 27cd529f261b..000000000000
--- a/layout/html/tests/table/bugs/bug5798.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body bgcolor=#c0c0c0>
-
-<table border=5 height=100%>
-  <tr>
-    <td>This table is set to a height of 100%. It should just fit the page.</td>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug5799.html b/layout/html/tests/table/bugs/bug5799.html
deleted file mode 100644
index d4c2256f1fb8..000000000000
--- a/layout/html/tests/table/bugs/bug5799.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table border=5>
-  <tr>
-    <td width=50%>almaalmaalmaalmaalma</td><td>x</td>
-</table>
-<BR>
-<table border=5>
-  <tr>
-    <td>almaalmaalmaalmaalma</td><td width=50%>x</td>
-</table>
-<BR>
-<p>
-In this table, the second and the third cell are given 40%<br>
-The cells are competing with each other.<br>
-</p>
-<table border=5>
-  <tr>
-    <td>some text</td><td width=40%>x</td><td width=40%>x</td>
-        </tr>
-</table>
-
-<p>
-In this table, the second and the third cell are given 50%<br>
-The cells are competing again but their percentage can not be satisfied.<br>
-The table grows as large as it can and the first cell gets to its minimal width.
-</p>
-<table border=5>
-  <tr>
-    <td>some text</td><td width=50%>x</td><td width=50%>x</td>
-        </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug5835.html b/layout/html/tests/table/bugs/bug5835.html
deleted file mode 100644
index cfa4fdc7e38a..000000000000
--- a/layout/html/tests/table/bugs/bug5835.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<HTML>
-<BODY>
-
-<p>This first table is the simple test case. Colspan confuses the width 
-allocation when there is an image in the colspanned row. </p>
-
- <TABLE BORDER WIDTH="620">
-<TR>
- <TD WIDTH=420>
-  foo
- </td>
- <td WIDTH=200>
-  bar
- </td>
-</tr>
-<TR>
- <TD COLSPAN=2>
-  <img src="../images/rle.cgi?1865?111335577" 
-  alt="Russian LinkExchange Banner Network" border="0" height="60" 
-  width="468">
- </TD>
-</TR>
-
-</table>
-
-<p>This second table is the same as the first, minus the second 
-'colspan=2' row. Widths are now correct.</p>
-
-<TABLE BORDER WIDTH="620">
-<TR>
- <TD WIDTH=420>
-  foo
- </td>
- <td WIDTH=200>
-  bar
- </td>
-</tr>
-</table>
-
- <p>An observation: Note that as the image-width approaches 
-the table-width, the two columns approach equal width (error increases). 
-Conversely, below some threshold image-width (which is about 390px or 30px less than the TD WIDTH=420), the error is (apparently) zero.
-</p>
-
-<p>Here the &lt;img width=600&gt;</p>
-
- <TABLE BORDER WIDTH="620">
-<TR>
- <TD WIDTH=420>
-  foo
- </td>
- <td WIDTH=200>
-  bar
- </td>
-</tr>
-<TR>
- <TD COLSPAN=2>
-  <img src="../images/rle.cgi?1865?111335577" 
-  alt="Russian LinkExchange Banner Network" border="0" height="60" 
-  width="600">
- </TD>
-</TR>
-
-</table>
-
-<p>Here the &lt;img width=400&gt; (error is almost zero).</p>
-
-<TABLE BORDER WIDTH="620" bgcolor="#dddddd">
-<TR>
- <TD WIDTH=420>
-  foo (single row table)
- </td>
- <td WIDTH=200>
-  bar (single row table)
- </td>
-</tr>
-</table>
-<TABLE BORDER WIDTH="620">
-<TR>
- <TD WIDTH=420>
-  foo
- </td>
- <td WIDTH=200>
-  bar
- </td>
-</tr>
-<TR>
- <TD COLSPAN=2>
-  <img src="../images/rle.cgi?1865?111335577" 
-  alt="Russian LinkExchange Banner Network" border="0" height="60" 
-  width="400">
- </TD>
-</TR>
-
-</table>
-
-<p>I tested the above with M4 and May01 build for win95. (The above
-examples assume that images load normally -- N.B. for May01 the images
-initially load, and the width error is visually apparent, but then the
-images get replaced by their ALT text, and the width error is no
-longer present -- this is, of course, a different issue/bug.)
-
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/bugs/bug5838.html b/layout/html/tests/table/bugs/bug5838.html
deleted file mode 100644
index 3860cbb31fdc..000000000000
--- a/layout/html/tests/table/bugs/bug5838.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<table dir="rtl" border="1">
-<caption><em>A test table with merged cells</em></caption>
-<tr><th rowspan="2"></th>
-    <th colspan="2">Average</th>
-    <th rowspan="2">Red<br>eyes</th></tr>
-<tr><th>height</th>
-    <th>weight</th></tr>
-<tr><th>Males</th>
-    <td>1.9</td>
-        <td>0.003</td>
-        <td>40%</td></tr>
-<tr><th>Females
-    <td>1.7</td>
-        <td>0.002</td>
-        <td>43%</td></tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug58402-1.html b/layout/html/tests/table/bugs/bug58402-1.html
deleted file mode 100644
index 0b830617a528..000000000000
--- a/layout/html/tests/table/bugs/bug58402-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-<body>
-<table height="100%" cellspacing="0" cellpadding="0" border="1">
-<tr>
-<td>Table cell without height restriction</td>
-</tr><tr>
-<td valign="middle" height=5 border=1>
-This table cell should be 5 pixels high
-</td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug58402-2.html b/layout/html/tests/table/bugs/bug58402-2.html
deleted file mode 100644
index 51af2e931087..000000000000
--- a/layout/html/tests/table/bugs/bug58402-2.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-  <head>
-    <style>
-      div {
-        width: 200px;
-        height: 200px;
-        border: 3px solid red;
-        text-align: center;
-        float: left;
-      }
-    </style>
-    <script>
-      a = "200px"
-      function f()
-      {
-        a = a=="200px" ? "350px" : "200px";
-        document.getElementById("d").style.width=a;
-        document.getElementById("d").style.height=a;
-      }
-
-      function t()
-      {
-        s = "";
-        s += "col 1: " + document.getElementById("c1").offsetWidth + "\n";
-        s += "col 2: " + document.getElementById("c2").offsetWidth + "\n";
-        s += "col 3: " + document.getElementById("c3").offsetWidth + "\n";
-        s += "row 1: " + document.getElementById("r1").offsetHeight + "\n";
-        s += "row 2: " + document.getElementById("r2").offsetHeight + "\n";
-        s += "row 3: " + document.getElementById("r3").offsetHeight + "\n";
-        alert(s);
-      }
-    </script>
-  </head>
-  <body>
-    <table border="1">
-      <tr>
-        <td></td>
-        <td id="c1">col 1</td>
-        <td width="50" id="c2">col 2</td>
-        <td id="c3">col 3</td>
-      </tr>
-      <tr>
-        <td id="r1">row 1</td>
-        <td rowspan=3 colspan=3>
-          <div id="d">tjosan</div>
-        </td>
-      </tr>
-      <tr>
-        <td height="50" id="r2">row 2</td>
-      </tr>
-      <tr>
-        <td id="r3">row 3</td>
-      </tr>
-    </table>
-    <input type="button" onClick="f();" value="expand">
-    <input type="button" onClick="t();" value="sizes">
-  </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug59252.html b/layout/html/tests/table/bugs/bug59252.html
deleted file mode 100644
index bd3d1189ff48..000000000000
--- a/layout/html/tests/table/bugs/bug59252.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<table border="3">
- <tr>
-  <td>
-   <table width="500" cellpadding=10 border="2" style="table-layout:fixed">
-    <TR>
-     <TD width=400>
-      <TABLE BORDER="1">
-       <TR>
-        <TD>Have a tip or rumor to share? Just click on the icon and if you get a BrowserWatch net.fame be sure and display the icon on your own home page for all to see!</TD>
-       </TR>
-      </TABLE>
-     </TD>
-         <td>foo</td>
-    </TR>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug59354.html b/layout/html/tests/table/bugs/bug59354.html
deleted file mode 100644
index 7a308ad39182..000000000000
--- a/layout/html/tests/table/bugs/bug59354.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
- <title>Preferences for Simon King</title>
-</head>
-<body>
- <table width="0" border=1 cellpadding=0 cellspacing=0>
-  <tr>
-   <td class=border align=center>
-    <table width="100%" cellpadding=4 cellspacing=1 border=1>
-     <tr>
-      <td>General Preferences</td>
-      <td><a href="/cc_web/user_prefs.php">Groups / Permissions</a></td>
-      <td><a href="/cc_web/user_prefs.php">Password</a></td>
-      <td><a href="/cc_web/user_prefs.php">Email</a></td>
-      <td>Views</td>
-     </tr>
-     <tr>
-      <td colspan=5 align=center><br>
-       <table>
-        <tr>
-         <td>
-          <form action="to_update_user_prefs.php" name="theform">
-           <table width="0" border=1 cellpadding=0 cellspacing=0>
-            <tr>
-             <td align=center>
-              User Preferences
-              <table width="100%" cellpadding=4 cellspacing=1 border=1>
-               <input type="hidden">
-               <tr>
-                <th align=right><nobr>Email Address :</nobr></th>
-                <td>
-                 <input type=text name="email" value="simon.king@pipinghotnetworks.com" >
-                </td>
-               </tr>
-              </table>
-             </td>
-            </tr>
-           </table>
-          </form>
-         </td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
-  </tr>
- </table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug60013.html b/layout/html/tests/table/bugs/bug60013.html
deleted file mode 100644
index 0d9ce5b261ed..000000000000
--- a/layout/html/tests/table/bugs/bug60013.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>testcase</title>
-</head>
-<body>
-
-<table width="0%" border="1">
-<tr bgcolor="#CCFFFF">
-<td>THis table has zero % width declared</td>
-</tr>
-</table>
-
-<table border="1">
-<tr bgcolor="#CCFFFF">
-<td>THis table has no width declared</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug60749.html b/layout/html/tests/table/bugs/bug60749.html
deleted file mode 100644
index c526350dd5e2..000000000000
--- a/layout/html/tests/table/bugs/bug60749.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<title>This is a title</title>
-<script type="text/javascript">
-
-function test1() {
-    var e1 = document.getElementById("myTd");
-    e1.style.width = 300;
-    var e2 = document.getElementById("table");
-}
-function test2() {
-    var e1 = document.getElementById("myTd");
-    e1.style.width = 300;
-    var e2 = document.getElementById("table");
-    e2.style.display = 'none';
-    e2.style.display = '';
-}
-
-</script>
-</head>
-<body onload=test1()>
-<table id="table" cellspacing=0 border=3>
-<tr>
-  <td>fieldLabel</td>
-  <td id="myTd">&nbsp;&nbsp;&nbsp;InspectionText</td>
-</tr>
-</table>
-<form action="">
-<input type="button" value="change width" onclick="test1()">
-<input type="button" value="change width with table reflow"
-onclick="test2()">
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug60804.html b/layout/html/tests/table/bugs/bug60804.html
deleted file mode 100644
index 6c67b5cddeb2..000000000000
--- a/layout/html/tests/table/bugs/bug60804.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html><head><title>Testcase for bug 60807</title></head>
-<body bgcolor="#FFCC00">
-
-<TABLE WIDTH="600" CELLSPACING="0" CELLPADDING="0" BORDER="1">
-   <TR>
-        <TD WIDTH="120" ALIGN="LEFT"><b>MERCHANT</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="278" ALIGN="CENTER"><b>DESCRIPTION</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="70" ALIGN="RIGHT"><b>PRICE</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="60" ALIGN="CENTER"><b>INFO</b></TD>
-    </TR>
-</TABLE>
-    
-    
-<TABLE WIDTH="600" CELLSPACING="0" CELLPADDING="0" BORDER="1">
-   <TR>
-       <TD WIDTH="120"><FONT size="-1">American Starlex</font></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD WIDTH="278"><FONT size="-1">Digital_Cameras DC200 New|In stock; Kodak</FONT></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD WIDTH="70" ALIGN="RIGHT"><FONT size="-1">$270.00</FONT></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD ALIGN="CENTER" WIDTH="60">More</TD>
-   </TR>
-   <TR>
-       <TD HEIGHT="1" BGCOLOR="#000000" COLSPAN="8"><IMG SRC="" WIDTH=1 HEIGHT=1></TD>
-   </TR>
-</TABLE>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug60807.html b/layout/html/tests/table/bugs/bug60807.html
deleted file mode 100644
index 6c67b5cddeb2..000000000000
--- a/layout/html/tests/table/bugs/bug60807.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html><head><title>Testcase for bug 60807</title></head>
-<body bgcolor="#FFCC00">
-
-<TABLE WIDTH="600" CELLSPACING="0" CELLPADDING="0" BORDER="1">
-   <TR>
-        <TD WIDTH="120" ALIGN="LEFT"><b>MERCHANT</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="278" ALIGN="CENTER"><b>DESCRIPTION</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="70" ALIGN="RIGHT"><b>PRICE</b></TD>
-        <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-        <TD WIDTH="60" ALIGN="CENTER"><b>INFO</b></TD>
-    </TR>
-</TABLE>
-    
-    
-<TABLE WIDTH="600" CELLSPACING="0" CELLPADDING="0" BORDER="1">
-   <TR>
-       <TD WIDTH="120"><FONT size="-1">American Starlex</font></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD WIDTH="278"><FONT size="-1">Digital_Cameras DC200 New|In stock; Kodak</FONT></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD WIDTH="70" ALIGN="RIGHT"><FONT size="-1">$270.00</FONT></TD>
-       <TD WIDTH="3"><IMG src="" width=1 height=1></TD>
-       <TD ALIGN="CENTER" WIDTH="60">More</TD>
-   </TR>
-   <TR>
-       <TD HEIGHT="1" BGCOLOR="#000000" COLSPAN="8"><IMG SRC="" WIDTH=1 HEIGHT=1></TD>
-   </TR>
-</TABLE>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug60992.html b/layout/html/tests/table/bugs/bug60992.html
deleted file mode 100644
index 31741cb40baa..000000000000
--- a/layout/html/tests/table/bugs/bug60992.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
- <title>Mozilla Test Case - Bug 60992</title>
-</head>
-<body>
-<table><tr><td nowrap>
-This cell has the nowrap parameter
-<br><br>
-&lt;hr&gt;
-<hr>
-<br>
-&lt;hr width=30&gt;
-<hr width=30>
-</td></tr><tr><td bgcolor=#cccccc>
-&nbsp;
-</td></tr><tr><td>
-This cell doesn't
-<br><br>
-&lt;hr&gt;
-<hr>
-<br>
-&lt;hr width=30&gt;
-<hr width=30>
-</td></tr></table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug61042-1.html b/layout/html/tests/table/bugs/bug61042-1.html
deleted file mode 100644
index 074be8839f48..000000000000
--- a/layout/html/tests/table/bugs/bug61042-1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>
-Testing table cols="foo"
-</title>
-</head>
-<body>
-<DIV ALIGN="CENTER">
-<TABLE BORDER=1 WIDTH="80%" BGCOLOR="blue">
- <TR>
-  <TD>
-before
-   <TABLE BORDER=1 COLS=2 BGCOLOR="red">
-    <TR>
-     <TD>This is some text.
-This is some text.
-Cell 1</TD>
-     <TD>This is some text.
-Cell 2</TD>
-    </TR>
-    <TR>
-     <TD colspan="2">
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-     </TD>
-    </TR>
-   </TABLE>
-after
-  </TD>
- </TR>
-</TABLE>
-
-</DIV>
- 
-  
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug61042-2.html b/layout/html/tests/table/bugs/bug61042-2.html
deleted file mode 100644
index 73b5e9a58ee3..000000000000
--- a/layout/html/tests/table/bugs/bug61042-2.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html40/loose.dtd">
-<html>
-<head>
-<title>
-Testing table cols="foo"
-</title>
-</head>
-<body>
-<DIV ALIGN="CENTER">
-<TABLE BORDER=1 WIDTH="80%" BGCOLOR="blue">
- <TR>
-  <TD>
-before
-   <TABLE BORDER=1 COLS=2 BGCOLOR="red">
-    <TR>
-     <TD>This is some text.
-This is some text.
-Cell 1</TD>
-     <TD>This is some text.
-Cell 2</TD>
-    </TR>
-    <TR>
-     <TD colspan="2">
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-This is some text.
-     </TD>
-    </TR>
-   </TABLE>
-after
-  </TD>
- </TR>
-</TABLE>
-
-</DIV>
- 
-  
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug6184.html b/layout/html/tests/table/bugs/bug6184.html
deleted file mode 100644
index 12458b6fbb4a..000000000000
--- a/layout/html/tests/table/bugs/bug6184.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<TABLE BORDER=1 CELLPADDING=1 CELLSPACING=0>
- <TR>
-  <TD COLSPAN=2>
-   The Supreme Court says 
-   Wisconsin can continue using tuition vouchers to help poor parents send their 
-   children to church-run schools.  What's your stand?</TD></TR>
- <TR>
-  <TD>hello</TD>
-  <TD align=left >hello</TD></TR>
-</TABLE>
-<BR>
-<TABLE BORDER=1 CELLPADDING=1 CELLSPACING=0 width=600>
- <TR>
-  <TD>hello</TD>
-  <TD>
-   The Supreme Court says 
-   Wisconsin can continue using tuition vouchers to help poor parents send their 
-   children to church-run schools.  What's your stand?</TD>
- <TR>
-</TABLE>
-<BR>
diff --git a/layout/html/tests/table/bugs/bug625.html b/layout/html/tests/table/bugs/bug625.html
deleted file mode 100644
index 8e767e8d3c46..000000000000
--- a/layout/html/tests/table/bugs/bug625.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<hr style="border: 2px solid black; width:1000px" align=left>
-<BR>
-<TABLE width="640" cellpadding="0" cellspacing="0">
- <TR>
-  <TD COLSPAN="3" WIDTH="640">
-   <IMG SRC="../images/raptor.jpg" WIDTH="640" HEIGHT="25" BORDER="1" ALT="EarthWeb"></td>
- <TR>
-  <TD WIDTH="150"><IMG SRC="../images/raptor.jpg" WIDTH="100" HEIGHT="78" BORDER="1" 
-   ALT="programmers resources at developer.com">
-  <TD><img src="../images/raptor.jpg" WIDTH="40" HEIGHT="1"></TD>
-  <TD>
-   <img src=../images/raptor.jpg ALT="Click Here!" BORDER="1" ><BR>
-   Click Here!
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug6304.html b/layout/html/tests/table/bugs/bug6304.html
deleted file mode 100644
index db47df315827..000000000000
--- a/layout/html/tests/table/bugs/bug6304.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<html><body>
-
-<div align=center>
-<p style="font-weight: bold">Tables I, II, III, IV (cellpadding=0 cellspacing=5)</p>
-
-<table border cellpadding=5 bgcolor=ffcc00>
-<tr><td valign=top> 
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table I</nobr></caption>
-  <tr>
-    <td>1,1</td><td>1,2</td><td>1,3</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td>2,2</td><td bgcolor=ffff66>2,3</td>
-  </tr>
-  <tr>
-    <td>3,1</td><td>3,2</td><td bgcolor=ffff66>3,3</td>
-  </tr>
-  <tr>
-    <td>4,1</td><td>4,2</td><td bgcolor=ffff66>4,3</td>
-  </tr>
-  <tr>
-    <td>5,1</td><td>5,2</td><td>5,3</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table II</nobr></caption>
-  <tr>
-    <td>1,1</td><td>1,2</td><td>1,3</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td rowspan=2>2,2</td><td bgcolor=ffff66>2,3</td>
-  </tr>
-  <tr>
-    <td rowspan=2>3,1</td>            <td bgcolor=ffff66>3,3</td>
-  </tr>
-  <tr>
-                           <td>4,2</td><td bgcolor=ffff66>4,3</td>
-  </tr>
-  <tr>
-    <td>5,1</td><td>5,2</td><td>5,3</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table III</nobr></caption>
-  <tr>
-    <td>1,1</td><td>1,2</td><td>1,3</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td rowspan=2>2,2</td><td bgcolor=ffff66></td>
-  </tr>
-  <tr>
-    <td rowspan=2>3,1</td>            <td bgcolor=ffff66></td>
-  </tr>
-  <tr>
-                          <td>4,2</td><td bgcolor=ffff66></td>
-  </tr>
-  <tr>
-    <td>5,1</td><td>5,2</td><td>5,3</td>
-  </tr>
-</table>
-
-</td><td valign=top>
-
-<table border cellpadding=0 cellspacing=5  bgcolor=ffffff>
-  <caption><nobr>Table IV</nobr></caption>
-  <tr>
-    <td>1,1</td><td>1,2</td>
-  </tr>  
-  <tr>
-    <td>2,1</td><td rowspan=2>2,2</td>
-  </tr>
-  <tr>
-    <td rowspan=2>3,1</td>            
-  </tr>
-  <tr>
-                           <td>4,2</td>
-  </tr>
-  <tr>
-    <td>5,1</td><td>5,2</td>
-  </tr>
-</table>
-
-</td></tr></table>
-</div>
-
-<hr>
-
-<p align="center"><b>This demonstrates a problem with "overlapping
-rowspan cells" (look at Table IV).</b></p>
-
-<p><b>Table I:</b> a regular 5x3 table</p>
-
-<p><b>Table II:</b> introduces rowspan=2 for cells (2,2) and (3,1),
-which 'overlap'.</p>
-
-<p><b>Table III:</b> is Table II, but cells (2,3),(3,3) and (4,3) now
-have 'empty' contents; the resulting table is still OK. Note that the
-height of (2,3) and (4,3) is determined by cells (2,1) and (4,2)
-respectively, whereas (3,3) has ~0 height since no 'effective' cell in
-the row has any definite height requirement (except for border,
-margin, padding if applicable).</p>
-
-<p><b>Table IV:</b> is Table III, but column 3 has been removed (cells
-(1,3),(2,3),(3,3),(4,3),(5,3)). This should mirror the first two
-columns of Table III (but currently does not). </p>
-
-<p>Note that cells (2,2) and (3,1) are still in the correct position,
-with the same size as Table III, but that their cellspacing with (5,1)
-and (4,2) is absent.</p>
-
-<p>Tested with Apr25, M4 and 1999051109 (win95, opt.) Dated: May 11 1999</p>
-
-</body></html>
-
diff --git a/layout/html/tests/table/bugs/bug63785.html b/layout/html/tests/table/bugs/bug63785.html
deleted file mode 100644
index 6ca803bc86c8..000000000000
--- a/layout/html/tests/table/bugs/bug63785.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>Bug 63785</title>
-</head>
-
-<body>
-<table>
-  <tr> 
-     <td> 
-      <div> 
-        <p>Paragraph one</p>
-        <p>Paragraph two</p>
-      </div>
-    </td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug6404.html b/layout/html/tests/table/bugs/bug6404.html
deleted file mode 100644
index 4326d7ad01a4..000000000000
--- a/layout/html/tests/table/bugs/bug6404.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<HTML><HEAD></HEAD>
-
-<BODY>
-<img src="../images/raptor.jpg" width=220 height=100>
-<BR>
-<TABLE BORDER=0 WIDTH="100%">
-
-<TR>
-<TD BGCOLOR="#ff0000">X</TD>
-<TD BGCOLOR="#DDDDDD">X</TD>
-<TD BGCOLOR="#00ff00">X</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="#DDDD00" COLSPAN=2 valign=top>
-this_word_has_no_breakable_spaces 
-... if this bug is still active and the window is >250px wide, you can't see that the 
-word above is 33 characters long. (I could have used a table instead 
-but this is simpler).
-</TD>
-
-<TD BGCOLOR="#9999ff" VALIGN=TOP>
-Try shrinking this table to ~250px wide. The left hand (gold) column will
-suddenly expand in width.<br><br>
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-mozilla qa smoke tests smoke qa mozilla 
-
-</TD>
-</TR>
-
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug641-1.html b/layout/html/tests/table/bugs/bug641-1.html
deleted file mode 100644
index 51f80b80ceac..000000000000
--- a/layout/html/tests/table/bugs/bug641-1.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<table bgcolor=red height=300 width=100%><tr><td>
-Foo
-</td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug641-2.html b/layout/html/tests/table/bugs/bug641-2.html
deleted file mode 100644
index 29ba9d1e93af..000000000000
--- a/layout/html/tests/table/bugs/bug641-2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body>
-<table bgcolor=red height=100% width=100%><tr><td>
-Foo
-</td></tr></table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug647.html b/layout/html/tests/table/bugs/bug647.html
deleted file mode 100644
index 18a85737af00..000000000000
--- a/layout/html/tests/table/bugs/bug647.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<HTML><BODY>
-If the font size is too big for the inside table, it is probably bug 6925.
-<table border>
- <tr>
-  <td valign=top>
-   <center>
-    <TABLE BORDER=1 WIDTH=100>
-     <TR>
-      <TD>
-       <font size = "-2">
-        <center>
-         inside 
-       </font>
-        </center>
-      </td>
-     </tr>
-    </table>
-    outside table
-   </center>
-  </td>
- </tr>
-</table>
-</BODY></HTML>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug650.html b/layout/html/tests/table/bugs/bug650.html
deleted file mode 100644
index f8773c7f2d7e..000000000000
--- a/layout/html/tests/table/bugs/bug650.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-
- <head>
-
- </head>
-
- <body>
-
-<table><tr>
-<td width="99%">This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. </td>
-<td width="1%">This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell. This is some text to fill a table cell.</td>
-</tr></table>
-
- </body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug65372.html b/layout/html/tests/table/bugs/bug65372.html
deleted file mode 100644
index 167e8ca04b46..000000000000
--- a/layout/html/tests/table/bugs/bug65372.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html><head><title>Testcase for bug 65372</title></head>
-<body>
-
-<table border=1>
-    <tr><td rowspan="2">First row</td></tr>
-    <tr>&nbsp;</tr> <!-- missing TD, spanned -->
-    <tr><td>Last row</td></tr>
-</table>
-
-<table border=1>
-    <tr><td rowspan="3">First row</td></tr>
-    <tr>&nbsp;</tr> <!-- missing TDs, spanned -->
-    <tr>&nbsp;</tr> <!-- missing TDs, spanned -->
-    <tr><td>Last row</td></tr>
-</table>
-
-<table border=1>
-    <tr><td rowspan="4">First row</td></tr>
-    <tr>&nbsp;</tr> <!-- missing TDs, spanned -->
-    <tr>&nbsp;</tr> <!-- missing TDs, spanned -->
-    <tr>&nbsp;</tr> <!-- missing TDs, spanned -->
-    <tr><td>Last row</td></tr>
-</table>
-
-<BR>
-an additional test
-<table border>
-<tr><td rowspan=2>1</td></tr>
-<tr></tr>
-<tr><td>abc</td></tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug6674.html b/layout/html/tests/table/bugs/bug6674.html
deleted file mode 100644
index c81949a664ae..000000000000
--- a/layout/html/tests/table/bugs/bug6674.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-
-<title>Overflow in Tables</Title>
-
-<meta http-equiv="Content-Style-Type" content="text/css">
-
-<style type="text/css">
-   div { border: dotted lime; }
-</style>
-
-<table border=1 width=1>
- <tr>
-  <td>
-   <div style="width:80px;">
-     Truncated?&nbsp;It&nbsp;should&nbsp;not&nbsp;be!
-   </div>
-  </td>
- </tr>
-</table>
-
-<p>According to the rules of CSS, the text above should spill right out of the 
-table, as it does in the table-less case below:</p>
-
-   <div style="width:80px;">
-     Truncated?&nbsp;It&nbsp;should&nbsp;not&nbsp;be!
-   </div>
diff --git a/layout/html/tests/table/bugs/bug67864.html b/layout/html/tests/table/bugs/bug67864.html
deleted file mode 100644
index 31ca4dd3c0b5..000000000000
--- a/layout/html/tests/table/bugs/bug67864.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head><title>Bug 67864</title></head>
-<body>
-<table>
-  <caption>
-    <table><tr><td>Another table inside the caption</td></tr></table>
-  </caption>
-  <tr><td>First row</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug67915-1.html b/layout/html/tests/table/bugs/bug67915-1.html
deleted file mode 100644
index 4f5e5556ae20..000000000000
--- a/layout/html/tests/table/bugs/bug67915-1.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<html>
-<body>
-
-<table align="center" cellpadding="10" border="1">
-
-<tr align="center" valign="center">
-<td>A</td>
-<td><img src="../images/ex22.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>B</td>
-<td><img src="../images/ex23.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>C</td>
-<td><img src="../images/ex24.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>D</td>
-<td><img src="../images/ex25.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>E</td>
-<td><img src="../images/ex26.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>F</td>
-<td><img src="../images/ex27.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>G</td>
-<td><img src="../images/ex29.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>H</td>
-<td><img src="../images/ex3.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>I</td>
-<td><img src="../images/ex30.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-
-<tr align="center" valign="center">
-<td>J</td>
-<td><img src="../images/ex31.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>K</td>
-<td><img src="../images/ex34.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-
-<tr align="center" valign="center">
-<td>K</td>
-<td><img src="../images/ex41.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>L</td>
-<td><img src="../images/ex43.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>M</td>
-<td><img src="../images/ex44.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>N</td>
-<td><img src="../images/ex5.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>O</td>
-
-<td><img src="../images/ex51.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>P</td>
-<td><img src="../images/ex52.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>Q</td>
-<td><img src="../images/ex53.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-<tr align="center" valign="center">
-<td>R</td>
-<td><img src="../images/ex54.gif" /></td>
-<td>
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-test test test test test test test test test test test test test test test 
-</td></tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug67915-2.html b/layout/html/tests/table/bugs/bug67915-2.html
deleted file mode 100644
index 11b530396d9d..000000000000
--- a/layout/html/tests/table/bugs/bug67915-2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<table width=120% border>
- <tr>
-  <td>foo</td>
- </tr>
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug68912.html b/layout/html/tests/table/bugs/bug68912.html
deleted file mode 100644
index 584e97c60779..000000000000
--- a/layout/html/tests/table/bugs/bug68912.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-<title>Crash TR.cells = null</title>
-<script language="javascript">
-
-function crashme()
-{
-        var elm = document.createElement('tr');
-
-        elm.cells = null;
-        alert('No Crash');
-}
-
-
-</script>
-</head>
-<body>
-
-<p>
-This test case creates a TR element then tries to assign to the cells property
-</p>
-<p>
-Crash
-<button onclick="crashme()">TR.cells = null</button> 
-</p>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug68998.html b/layout/html/tests/table/bugs/bug68998.html
deleted file mode 100644
index 39a1e6bad7ac..000000000000
--- a/layout/html/tests/table/bugs/bug68998.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-   <head>
-      <title>
-      </title>
-   </head>
-   <body>
-      <table cellspacing="0" cellpadding="0" border="1">
-         <tr>
-            <td bgcolor="#CCCCCC" rowspan="3">
-               &nbsp;
-            </td>
-            <td>
-               This row has two cells with rowspans and a middle cell.
-            </td>
-            <td bgcolor="#CCCCCC" rowspan="3">
-               &nbsp;
-            </td>
-         </tr>
-         <tr>
-            <td bgcolor="#0000FF">
-               This cell is coloured blue.
-            </td>
-         </tr>
-         <tr bgcolor="#FF0000">
-            <td>
-               This row is coloured red.
-            </td>
-         </tr>
-      </table>
-   </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug69187.html b/layout/html/tests/table/bugs/bug69187.html
deleted file mode 100644
index b381c99c0052..000000000000
--- a/layout/html/tests/table/bugs/bug69187.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<html>
-   <head>
-      <title>
-         African American People
-      </title>
-   </head>
-   <body>
-      <table border="1">
-         <tr>
-            <td colspan="2">
-               <h2>
-                  Personal Friends
-               </h2>
-            </td>
-         </tr>
-         <tr>
-            <td>
-               <font face="sans-serif"></font>
-               <p>
-                  Alisha - Password-Protected
-               </p>
-               <p>
-                  Arlesia
-               </p>
-               <p>
-                  Asale
-               </p>
-            </td>
-            <td>
-               <p>
-                  Ernie
-               </p>
-               <p>
-                  Melanie
-               </p>
-               <p>
-                  Tamara
-               </p>
-            </td>
-         </tr>
-      </table>
-   </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug6933.html b/layout/html/tests/table/bugs/bug6933.html
deleted file mode 100644
index 72f05437852e..000000000000
--- a/layout/html/tests/table/bugs/bug6933.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><body>
-
-<table border=1 cellspacing=20 bgcolor=red>
- <TR>
-  <TD>Cell</TD>
-  <TD ROWSPAN=2>
-   <img src=../images/raptor.jpg width=100 height=200>
-  </TD></TR>
- <TR>
-  <TD>Cell</TD></TR>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug69382-1.html b/layout/html/tests/table/bugs/bug69382-1.html
deleted file mode 100644
index 3a74868284f2..000000000000
--- a/layout/html/tests/table/bugs/bug69382-1.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>WebVoyage Titles</TITLE>
-</HEAD>
-<BODY>
-                
-<FORM>
-
-<TABLE BORDER=1 WIDTH="100%">
-                
-<TR>
-        <TH>#</TH>
-        <TH> Relevance </TH>
-        <TH> Title Long </TH>
-        <TH> Author </TH>
-        <TH> Date </TH>
-</TR>
-
-<TR>
-        <!-- hiden input outside of <td> -->
-        <INPUT TYPE=HIDDEN NAME=HID VALUE=619402>
-        <TD ROWSPAN=2 nowrap>
-                &nbsp;1&nbsp;
-        </TD>
-        <TD ROWSPAN=2 nowrap>**</TD>
-        <TD>UNIX and Windows 2000 integration toolkit : a complete guide for systems administrators / Rawn Shah.</TD>
-        <TD >Shah, Rawn.</TD>
-        <TD >2000</TD>
-
-<!-- NOTE: missing </tr> -->    
-
-<TR>
-        <TD COLSPAN=4>
-                <TABLE WIDTH=100%>
-                        <TR>
-                                <TD>Title has multiple holdings</TD>
-                        </TR>
-                </TABLE>
-        </TD>
-</TR>
-
-<TR>
-        <!-- hiden input outside of <td> -->
-        <INPUT TYPE=HIDDEN NAME=HID VALUE=619394>
-        <TD ROWSPAN=2 nowrap>
-                &nbsp;2&nbsp;
-        </TD>
-        <TD ROWSPAN=2 nowrap>**</TD>
-        <TD>Learning Red Hat Linux / Bill McCarty.</TD>
-        <TD >McCarty, Bill, 1953-</TD>
-        <TD >1999</TD>
-        
-<!-- NOTE: missing </tr> -->    
-
-<TR>
-        <TD COLSPAN=4>
-                <TABLE WIDTH=100%>
-                        <TR>
-                                <TD>Title has multiple holdings</TD>
-                        </TR>
-                </TABLE>
-        </TD>
-</TR>
-
-<TR>
-        <!-- hiden input outside of <td> -->
-        <INPUT TYPE=HIDDEN NAME=HID VALUE=619393>
-        <TD ROWSPAN=2 nowrap>
-                        &nbsp;3&nbsp;
-        </TD>
-        <TD ROWSPAN=2 nowrap>**</TD>
-        <TD>Learning Debian GNU/Linux / Bill Mccarty.</TD>
-        <TD >McCarty, Bill, 1953-</TD>
-        <TD >1999</TD>
-        
-<!-- NOTE: missing </tr> -->    
-        
-<TR>
-        <TD COLSPAN=4>
-                <TABLE WIDTH=100%>
-                        <TR>
-                                <TD>Title has multiple holdings</TD>
-                        </TR>
-                </TABLE>
-        </TD>
-</TR>
-
-<TR>
-        <!-- hiden input outside of <td> -->
-        <INPUT TYPE=HIDDEN NAME=HID VALUE=619216>
-        <TD ROWSPAN=2 nowrap>
-                        &nbsp;4&nbsp;
-        </TD>
-        <TD ROWSPAN=2 nowrap>**</TD>
-        <TD>Advanced Java networking / Dick Steflik, Prashant Sridharan.</TD>
-        <TD >Steflik, Dick.</TD>
-        <TD >2000</TD>
-
-<!-- NOTE: missing </tr> -->    
-
-<TR>
-        <TD COLSPAN=4>
-                <TABLE WIDTH=100%>
-                        <TR>
-                                <TD>Title has multiple holdings</TD>
-                        </TR>
-                </TABLE>
-        </TD>
-</TR>
-
-</TABLE>
-
-</FORM>
-
-</BODY>
-
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug69382-2.html b/layout/html/tests/table/bugs/bug69382-2.html
deleted file mode 100644
index 27c74bdff8d2..000000000000
--- a/layout/html/tests/table/bugs/bug69382-2.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head></head>
-<body>
-<form>
-<table border="1">
-<tr>
-        <input type="hidden"><!-- these fields are breaking the table -->
-        <td rowspan="2">5</td>
-        <td rowspan="2">**</td>
-        <td>Text text text</td>
-        <td>&nbsp;</td>
-        <td>1970</td>
-</tr>
-<tr>
-        <td colspan="4">No Holdings Available</td>
-</tr>
-<tr>
-        <input type="hidden"><!-- these fields are breaking the table -->
-        <td rowspan="2">6</td>
-        <td rowspan="2">**</td>
-        <td>Text text text</td>
-        <td>&nbsp;</td>
-        <td>1970</td>
-</tr>
-<tr>
-        <td colspan="4">No Holdings Available</td>
-</tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug709.html b/layout/html/tests/table/bugs/bug709.html
deleted file mode 100644
index 9e4e5facbd21..000000000000
--- a/layout/html/tests/table/bugs/bug709.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<table>
-<tr align="center">
-<td>The quick brown fox jumped over the lazy dog.</td>
-<td>Now is the time for all good men to come to the aid of their country.</td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug7112-1.html b/layout/html/tests/table/bugs/bug7112-1.html
deleted file mode 100644
index 2965402b05a2..000000000000
--- a/layout/html/tests/table/bugs/bug7112-1.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<p>This is a table with a <code>td align=center</code> that has a p, a table,
-and a p.</p>
-<table border width="30%">
- <tr>
-  <td align=center>  
-   <p>text</p>
-   <table width=80% border>
-    <tr>
-     <td>text 3</td>
-    </tr>
-   </table>
-   <p>text</p>
-  </td>
- </tr>
-</table>
-
-<p>This time the inner table has <code>width="100%"</code>, so you can see
-that the CSS spec isn't quite being followed.  The CSS spec says that
-the align=center carries down as text-align and never acts to move blocks.
-You're not moving the block for the table (above), but you're not doing
-the text-align inside it either.  In quirks mode you should do the former,
-in standard mode, the latter.</p>
-
-<table border width="30%">
- <tr>
-  <td align=center>  
-   <p>text</p>
-   <table border width="100%">
-    <tr>
-     <td>text 3</td>
-    </tr>
-   </table>
-   <p>text</p>
-  </td>
- </tr>
-</table>
-<BR>
-<table width=300 border align="center">
-<tr><td>Data of Table 1!</td></tr>
-</table>
-
-<BR>
-
-<table width=300 border style="text-align: center">
-<tr><td>Data of Table 2!</td></tr>
-</table>
-
-<BR>
-
-<div style="border: 1px solid black" align="center">
-<table>
-<tr><td>Data of Table 3!</td></tr>
-</table>
-</div>
-
-<BR>
-
-<div style="text-align: center; border: 1px solid black;">
-<table>
-<tr><td>Data of Table 4!</td></tr>
-</table>
-</div>
-
-<BR>
-
-<table width=100%>
- <tr>
-  <td align=center>
-   Text, followed by
-   <table>
-    <tr>
-     <td>
-      A table.
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>...should look identical to the first one below:</p>
-
-<table width=100%>
- <tr>
-  <td>
-   <div align=center>Text, followed by</div>
-   <table width=100%>
-    <tr>
-     <td>
-      <div align=center>A table.</div>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>However, in standard mode, the first table should look like this:
-
-<table width=100%>
- <tr>
-  <td>
-   <div align=center>Text, followed by</div>
-   <table width=100%>
-    <tr>
-     <td>
-      A table.
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>For reference, the second table has its text all centered, the third table has the "A table." line
-aligned left.</p>
-
-<hr>
-
-<p> See also: <a href="tablealign.strict.html">Strict Mode Version</a> </p>
--->
-
diff --git a/layout/html/tests/table/bugs/bug7112-2.html b/layout/html/tests/table/bugs/bug7112-2.html
deleted file mode 100644
index b8728d484646..000000000000
--- a/layout/html/tests/table/bugs/bug7112-2.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<p>This is a table with a <code>td align=center</code> that has a p, a table,
-and a p.</p>
-<table border width="30%">
- <tr>
-  <td align=center>  
-   <p>text</p>
-   <table width=80% border>
-    <tr>
-     <td>text 3</td>
-    </tr>
-   </table>
-   <p>text</p>
-  </td>
- </tr>
-</table>
-
-<p>This time the inner table has <code>width="100%"</code>, so you can see
-that the CSS spec isn't quite being followed.  The CSS spec says that
-the align=center carries down as text-align and never acts to move blocks.
-You're not moving the block for the table (above), but you're not doing
-the text-align inside it either.  In quirks mode you should do the former,
-in standard mode, the latter.</p>
-
-<table border width="30%">
- <tr>
-  <td align=center>  
-   <p>text</p>
-   <table border width="100%">
-    <tr>
-     <td>text 3</td>
-    </tr>
-   </table>
-   <p>text</p>
-  </td>
- </tr>
-</table>
-<BR>
-<table width=300 border align="center">
-<tr><td>Data of Table 1!</td></tr>
-</table>
-
-<BR>
-
-<table width=300 border style="text-align: center">
-<tr><td>Data of Table 2!</td></tr>
-</table>
-
-<BR>
-
-<div style="border: 1px solid black" align="center">
-<table>
-<tr><td>Data of Table 3!</td></tr>
-</table>
-</div>
-
-<BR>
-
-<div style="text-align: center; border: 1px solid black;">
-<table>
-<tr><td>Data of Table 4!</td></tr>
-</table>
-</div>
-
-<BR>
-
-<table width=100%>
- <tr>
-  <td align=center>
-   Text, followed by
-   <table>
-    <tr>
-     <td>
-      A table.
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>...should look identical to the first one below:</p>
-
-<table width=100%>
- <tr>
-  <td>
-   <div align=center>Text, followed by</div>
-   <table width=100%>
-    <tr>
-     <td>
-      <div align=center>A table.</div>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>However, in standard mode, the first table should look like this:
-
-<table width=100%>
- <tr>
-  <td>
-   <div align=center>Text, followed by</div>
-   <table width=100%>
-    <tr>
-     <td>
-      A table.
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<p>For reference, the second table has its text all centered, the third table has the "A table." line
-aligned left.</p>
-
-<hr>
-
-<p> See also: <a href="tablealign.strict.html">Strict Mode Version</a> </p>
--->
-
diff --git a/layout/html/tests/table/bugs/bug7113.html b/layout/html/tests/table/bugs/bug7113.html
deleted file mode 100644
index b3f471735eff..000000000000
--- a/layout/html/tests/table/bugs/bug7113.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<table border=1>
-        <tr>
-                <td colspan=4 width="100%">
-<img align=right border=0 height=15 width=18 src="../images/x.gif" alt="x">
-<img align=right border=0 height=15 width=28 src="../images/edit2.gif" alt="edit">
-<img align=right src="../images/detach.gif" border=0 height=15 width=18 alt="minimize">
-<b><b>Portfolios</b></b>
-                </td>
-        </tr>
-</table>                
-<BR>
-<table border=1 cellpadding=4 cellspacing=0 width="100%" bgcolor="#eeeeee"><tr bgcolor="#ccccff">
-
-<td width="100%"><a href="http://edit.yahoo.com/config/del_left?.p=p1&.m=weather&.done=http://my.yahoo.com/p/d.html?v">
- <img align=right border=0 height=15 width=18 src="../images/x.gif" alt="Remove"></a>
-
-<a href="http://edit.yahoo.com/config/set_wni?.page=p1&.done=http://my.yahoo.com/p/d.html?v">
- <img align=right border=0 height=15 width=28 src="../images/edit2.gif" alt="edit">
-
-</a>
-
-Some text
-
-</a>
-</td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug7121-1.html b/layout/html/tests/table/bugs/bug7121-1.html
deleted file mode 100644
index e262b56aa930..000000000000
--- a/layout/html/tests/table/bugs/bug7121-1.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<HTML>
-<BODY>
-
-<p>In this table (modeled after mozilla.org template) the cells in
-column two are requesting colspans of (2,3,2,6) respectively. Notice
-that they all want to span more than one column (which means, in the case of
-this table, all rows are requesting to span more columns than the
-number of 'real' <code>&lt;TD&gt;</code> in any single rows [i.e., all rows in the top
-table want to
-span 9 cells, but the maximum number of <code>&lt;TD&gt;</code> in any row is
-8].</p><p>This condition leads to the 'white gap' (in builds of 5.0 for jun04 and before).</p>
-
-<TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
-
-<!-- 8 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=2>2</TD>
-<TD BGCOLOR="#DDDDDD">4</TD>
-<TD BGCOLOR="#999999">5</TD>
-<TD >6</TD>
-<TD >7</TD>
-<TD >8</TD>
-<TD BGCOLOR="#999999">9</TD>
-</TR>
-
-<!-- 7 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=3>2</TD>
-<TD BGCOLOR="#999999">5</TD>
-<TD >6</TD>          
-<TD >7</TD>          
-<TD >8</TD>          
-<TD BGCOLOR="#999999">9</TD>
-</TR>
-
-<!-- 7 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=2>2</TD>
-<TD BGCOLOR="#DDDDDD">4</TD>
-<TD BGCOLOR="#999999">5</TD>
-<TD COLSPAN=2>6</TD>
-<TD >8</TD>
-<TD BGCOLOR="#999999">9</TD>
-</TR>
-
-<!-- 3 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999" COLSPAN=6>1</TD>
-<TD BGCOLOR="#999999">7</TD>
-<TD BGCOLOR="#999999" COLSPAN=2>8</TD>
-</TR>
-
-</TABLE>
-
-<p>This is the same table as above, but instead the cells in column two 
-are requesting colspans of (1,2,1,5) respectively (i.e., excess requests have
-been 'normalized' away). There is no more 'white gap'.</p>
-
-<TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 WIDTH="100%">
-
-<!-- 8 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=1>2</TD>
-<TD BGCOLOR="#DDDDDD">3</TD>
-<TD BGCOLOR="#999999">4</TD>
-<TD >5</TD>
-<TD >6</TD>
-<TD >7</TD>
-<TD BGCOLOR="#999999">8</TD>
-</TR>
-
-<!-- 7 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=2>2</TD>
-<TD BGCOLOR="#999999">4</TD>
-<TD >5</TD>          
-<TD >6</TD>          
-<TD >7</TD>          
-<TD BGCOLOR="#999999">8</TD>
-</TR>
-
-<!-- 7 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999">1</TD>
-<TD BGCOLOR="#DDDDDD" COLSPAN=1>2</TD>
-<TD BGCOLOR="#DDDDDD">3</TD>
-<TD BGCOLOR="#999999">4</TD>
-<TD COLSPAN=2>5</TD>
-<TD >7</TD>
-<TD BGCOLOR="#999999">8</TD>
-</TR>
-
-<!-- 3 'real',  9 'requested' -->
-<TR>
-<TD BGCOLOR="#999999" COLSPAN=5>1</TD>
-<TD BGCOLOR="#999999">6</TD>
-<TD BGCOLOR="#999999" COLSPAN=2>7</TD>
-</TR>
-
-
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug7121-2.html b/layout/html/tests/table/bugs/bug7121-2.html
deleted file mode 100644
index e3136252a8a0..000000000000
--- a/layout/html/tests/table/bugs/bug7121-2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<TABLE>
-<TR>
-  <TD BGCOLOR="#000000" COLSPAN=15>
-   <BR>
-  </TD>
-  <TD BGCOLOR="#000000" VALIGN=TOP>
-   <FONT COLOR="#AAAAAA" SIZE="-1">
-     Copyright &copy; 1998-1999 The Mozilla Organization.
-   </FONT>
-  </TD>
-  <TD BGCOLOR="#000000" COLSPAN=15>
-   <BR>
-  </TD>
-</TR>
-</TABLE>
diff --git a/layout/html/tests/table/bugs/bug72359.xml b/layout/html/tests/table/bugs/bug72359.xml
deleted file mode 100644
index 3be6fba2bee6..000000000000
--- a/layout/html/tests/table/bugs/bug72359.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
-  <title>CSS table model: initial table spacing</title>
-  <style type="text/css">
-   float { float: left; background: red; }
-   table { display: table; }
-   row { display: table-row; }
-   cell { display: table-cell; background: green; color: white; text-align: center; }
-  </style>
- </head>
- <body>
-  <float xmlns="http://www.example.org/">
-   <cell>THERE</cell>
-   <row>
-    <table> 
-     <cell>SHOULD B</cell>
-     <cell>E N</cell>
-     <cell>O RED</cell>
-    </table>
-   </row>
-   <cell>ANYWHERE</cell>
-  </float>
- </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug72393.html b/layout/html/tests/table/bugs/bug72393.html
deleted file mode 100644
index 107687d7de83..000000000000
--- a/layout/html/tests/table/bugs/bug72393.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-<body>
-
-<table width="100%" border=3 cellpadding="0" cellspacing="0">
- <tr> 
-  <td></td>
-  <td height="141" width="3"></td>
-  <td width="100%"> 
-   <table width="100%" bgcolor=yellow cellpadding="0" cellspacing="0">
-    <tr> 
-     <td height="229"></td>
-     <td>
-       <h1>Detonator Comparison In 3DMark 2001</h1>
-     <td></td>
-    </tr>
-   </table>
-  </td>
-  <td width="3"></td>
-  <td width="132"> 
-   <table width="100%" bgcolor=orange border="1" cellpadding="0" cellspacing="0">
-    <tr> 
-     <td width="112"> 
-      <table width="100%" bgcolor=red border="0" cellpadding="0" cellspacing="0">
-       <tr> 
-        <td width="112" height="111" valign="top"><a href="sponsor.htm"><img src="../images/Ad-1.GIF" width="112" height="111" border="0" alt="Place Your Advertisement Here For Free"></a></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
- <tr> 
-  <td height="184"></td>
- </tr>
- <tr> 
-  <td height="1"><img height="1" width="132" src="../images/main-horizontal-scroll.gif"></td>
-  <td><img height="1" width="3" src="../images/main-horizontal-scroll.gif"></td>
-  <td></td>
-  <td><img height="1" width="3" src="../images/main-horizontal-scroll.gif"></td>
-  <td><img height="1" width="132" src="../images/main-horizontal-scroll.gif"></td>
- </tr>
-</table>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug7243.html b/layout/html/tests/table/bugs/bug7243.html
deleted file mode 100644
index 1d420cdb9f1e..000000000000
--- a/layout/html/tests/table/bugs/bug7243.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<html><body>
- 
-<table style="table-layout:fixed;" cellspacing=10 border=1>
-  <col width=100>
-  <col width=200>
-  <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-<table style="table-layout:fixed;" width=400 cellspacing=0 border=1>
-  <col width=100>
-  <col width=200>
-  <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-<table style="table-layout:fixed;" width=200 cellspacing=0 border=1>
-  <col width=100>
-  <col width=200>
-  <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-<table style="table-layout:fixed;" cellspacing=10 border=1>
-  <col width=100>
-  <tr>
-  <td>foo</td>
-  <td width=200>bar</td>
- </tr>
-</table>
-<BR>
-
-<table style="table-layout:fixed;" cellspacing=1 border=1>
-  <tr>
-  <td width=100>foo</td>
-  <td width=200>bar</td>
- </tr>
-</table>
-<BR>
-
-<table cellspacing=20 style="table-layout:fixed;" width=100% border=1>
- <tr>
-  <td width=40% colspan=2>foo</td>
-  <td width=60%>bar</td>
- </tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-<table cellpadding=20 cellspacing=10 style="table-layout:fixed;" width=100% 
-border=1>
- <col width=40%>
- <col width=60%>
- <tr>
-  <td style="border: 10px solid black;">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-<table cellspacing=10 style="table-layout:fixed;" width=100 border=1>
- <col width=40%>
- <col width=60%>
- <tr>
-  <td width=20>foo</td>
-  <td width=20>foo</td>
-  <td width=20>foo</td>
- </tr>
-</table>
-<br>
-
-<table style="table-layout:fixed;" width=200 cellspacing=0 border=1>
-  <col width=100>
-  <col width=200>
-  <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug727.html b/layout/html/tests/table/bugs/bug727.html
deleted file mode 100644
index e23e0474dcf6..000000000000
--- a/layout/html/tests/table/bugs/bug727.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<HTML>
-<BODY>
-<HR style="width:190px;">
-<TABLE border=1 WIDTH=350>
-  <TR>
-    <TD COLSPAN="2">
-      MozillaZine.org Is Now Active!</TD></TR>
-  <TR>
-    <TD WIDTH="190">&nbsp;</TD>
-    <TD BGCOLOR="FF9900">
-      Thursday September 17th, 1998></TD></TR>
-</TABLE></TD></TR>
-</BODY>
-</html>
diff --git a/layout/html/tests/table/bugs/bug73321.html b/layout/html/tests/table/bugs/bug73321.html
deleted file mode 100644
index 7e5f9207b9b4..000000000000
--- a/layout/html/tests/table/bugs/bug73321.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Linux.com - A Mozilla Testcase</title>
-<style type="text/css">
- body {
-    background-color: #555;
-    color: #000000;
-    padding: 1em;
-    font-family: arial,sans-serif,helvetica;
- }
- h1 {
-    text-align: center;
-    color: #000;
-    background-color: #ccc;
-    padding: 1em;
-        font-size: xx-large;
- }
- h2 {
-    font-size: medium;
- }
- p {
-    font-size: small;
- }
- td {
-    background-color: #fff;
- }
-</style>
-  </head>
-
-  <body>
-    <h1>Simplified <a href="http://linux.com/">Linux.com</a> Table Testcase</h1>
-
-    <table summary="" cellpadding="5" cellspacing="2">
-      <tr valign="top">
-        <td rowspan="2" width="125">
-          <h2>Weekly Feature</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Contribute</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Newsforge</h2>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-
-          <h2>Resources</h2>
-
-          <p>blah blah blah blah blah blah blah blah</p>
-        </td>
-
-        <td rowspan="2">
-          <h2>The Latest of Linux.com!</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Linux.com Live!</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Tuneup</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Poll</h2>
-
-          <p>This stuff is cropped off in Mozilla for whatever reason</p>
-        </td>
-
-        <td width="125">
-          <h2>OSDN</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>POTD</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-
-          <h2>Log In</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-        </td>
-      </tr>
-
-      <tr valign="bottom">
-        <td width="125">
-          <h2>Community Banner</h2>
-
-          <p>blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah</p>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug7342.html b/layout/html/tests/table/bugs/bug7342.html
deleted file mode 100644
index 5456f3a58a14..000000000000
--- a/layout/html/tests/table/bugs/bug7342.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<HTML>
-<BODY BGCOLOR=#FFFFFF TEXT=#000000 LINK=#000099 VLINK=#660099 ALINK=#CC0033>
-
-<p>Click on a link on the left hand column. Also note the overlap of the 
-text box with the submit button. (And, removing the font tag that is wrapped 
-around the text box clears up layout).</p>
-<br>
-
-<FORM ACTION="this" NAME="searchform" METHOD="GET">   
-
-<CENTER>
-<TABLE WIDTH=600 BORDER=1 CELLPADDING=3 CELLSPACING=3 BGCOLOR=#eeeeee>
- <TR>
-  <TD WIDTH=120 valign=top>
-   <TABLE WIDTH=100% HEIGHT=120 BORDER=1 CELLPADDING=2 CELLSPACING=2 BGCOLOR=#ffffff>
-    <TR>
-     <TD HEIGHT=25% BGCOLOR=#CCCCCC>
-      <a href=""><B>Netscape</B></A>
-     </TD>
-    </TR>
-    <TR>
-     <TD HEIGHT=25% BGCOLOR=#ffffff>
-      <a href=""><B>Infoseek</B></A>
-     </TD>
-    </TR>
-    <TR>
-     <TD HEIGHT=25% BGCOLOR=#ffffff>
-      <a href=""><B>LookSmart</B></A>
-     </TD>
-    </TR>
-    <TR>
-     <TD HEIGHT=25% BGCOLOR=#ffffff>
-      <a href=""><B>Directory</B></A>
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
-  <TD WIDTH=472 HEIGHT=120 BGCOLOR=#CCCCCC VALIGN="MIDDLE">
-
-   <TABLE WIDTH=100% BORDER=1 CELLSPACING=4 CELLPADDING=4>
-
-    <TR>
-     <TD COLSPAN=3 WIDTH=354 VALIGN="TOP">
-      <FONT FACE="sans-serif" SIZE=2>
-       <INPUT TYPE="TEXT" NAME="search" SIZE=41 MAXLENGTH=80>
-      </FONT>
-     </TD>
-     <TD WIDTH=118 VALIGN="TOP">
-      <INPUT TYPE="submit" VALUE="Search">
-     </TD>
-    </TR>
-
-    <TR>
-     <TD WIDTH=118 VALIGN="TOP">asdf     </TD>
-     <TD WIDTH=118 VALIGN="TOP">asdf     </TD>
-     <TD WIDTH=118 VALIGN="TOP">asdf     </TD>                 
-     <TD WIDTH=118 VALIGN="TOP">asdf     </TD>
-    </TR>
-   </TABLE>
-
-  </TD>
- </TR>
-</TABLE>
-
-</CENTER>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug73629.html b/layout/html/tests/table/bugs/bug73629.html
deleted file mode 100644
index 50210723e2ac..000000000000
--- a/layout/html/tests/table/bugs/bug73629.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<table border=1>
- <tr>
-  <td>
-   some normal text before the nested table
-   <table style="margin-left: 50px; width: 95%" border=1>
-    <tr>
-     <td >selection of words to pad table cell</td>
-	</tr>
-   </table>
-   some normal text after the nested table
-  <td>contents of table cell to right</td>
- </tr>
-</table>
-
-<table border>
- <tr>
-  <td>
-   <table style="width: 120%" border=1>
-    <tr>
-     <td>
-      foo
-     </td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug7471.html b/layout/html/tests/table/bugs/bug7471.html
deleted file mode 100644
index e1f675df3ee8..000000000000
--- a/layout/html/tests/table/bugs/bug7471.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<title>Bug 7471 testcase</title>
-</head>
-<body>
-
-<p>No col or colgroup:</p>
-
-<table width="90%" border>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<p>col elements with align=center on second col:</p>
-
-<table width="90%" border>
-        <col>
-        <col align="center">
-        <col>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<p>colgroup and col elements, with align on colgroup so 2nd and 3rd columns centered:</p>
-
-<table width="90%" border>
-        <colgroup>
-                <col>
-        </colgroup>
-        <colgroup align="center">
-                <col>
-                <col>
-        </colgroup>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-<p>colgroup and col elements, with align on col so 2nd column centered:</p>
-
-<table width="90%" border>
-        <colgroup>
-                <col>
-        </colgroup>
-        <colgroup>
-                <col align="center">
-                <col>
-        </colgroup>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-        <tr>
-                <td>Data</td>
-                <td>Data</td>
-                <td>Data</td>
-        </tr>
-</table>
-
-
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug75250.html b/layout/html/tests/table/bugs/bug75250.html
deleted file mode 100644
index f16d7e2e462e..000000000000
--- a/layout/html/tests/table/bugs/bug75250.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<title>testcase for bug 75250</title>
-</head>
-<body>
-<table width="">
-<tr><td>this is a simple test and should not wrap.</td></tr>
-</table>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug7714.html b/layout/html/tests/table/bugs/bug7714.html
deleted file mode 100644
index 28edb2885558..000000000000
--- a/layout/html/tests/table/bugs/bug7714.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<BODY>
-
-<p>The table below should have two columns and a total of 7 cells,
-arranged in an alternating/overlapping fashion. The cellspacing=0 for
-this table. In Nav4.5, this example can be viewed. In 5.0 (jun08
-win95), this example displays (apparently) as a simple 2x2 table
-(i.e., some elements are not displayed at all). (The numbers are the
-position of each TD in the HTML source).</p>
-
-<table border="1" cellspacing="0" cellpadding="0">
-<tr>
-    <td rowspan="2" height="40">1</td>
-    <td height="20">2</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">3</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">4</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">5</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">6</td>
-  </tr>
-<tr>
-    <td height="20">7</td>
-  </tr>
-</table>
-
-<p>This is the same table as above, but cellspacing=5 in this case. For 5.0,
-(jun08 win95) notice the odd cellspacing overlaps. See also bug #6304.</p>
-
-<table border="1" cellspacing="5" cellpadding="0">
-<tr>
-    <td rowspan="2" height="40">1</td>
-    <td height="20">2</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">3</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">4</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">5</td>
-  </tr>
-<tr>
-    <td rowspan="2" height="40">6</td>
-  </tr>
-<tr>
-    <td height="20">7</td>
-  </tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug78162.html b/layout/html/tests/table/bugs/bug78162.html
deleted file mode 100644
index c3f281016d58..000000000000
--- a/layout/html/tests/table/bugs/bug78162.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html><head><title>Testcase for bug 78162</title></head>
-<body bgcolor="#FFFFFF">
-
-<table border=1 width="620">
-  <tr> 
-    <td> 
-      <table width="120">
-        <tr> 
-          <form>
-            <input type="hidden">
-            <td></td>
-          </form>
-        </tr>
-      </table>
-    </td>
-
-    <td width="510" nowrap>
-      <table border=1>
-        <tr>
-          <td>
-              <table cellpadding=0 cellspacing=10 width=100%>
-                <tr>
-                  <td><A href=http://servedby.advertising.com/click/site=0000006977/mnum=0000007395/bnum=89805666 target=_top><IMG src="../images/bnum.gif" border=0 width=468 height=60 alt='Click to learn more...'></A></TD>
-                </TR>
-              </TABLE>
-
-              Your donation to protect our wildlife was paid
-              for by the sponsors on this page, so it's free. 
-              100% of each donation is distributed through organizations
-              working hard to protect our wildlife. You can view live
-              donation totals in support of this cause by clicking. 
-          </TD>
-        </TR>
-      </TABLE>
-    </TD>
-
-  </TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug8032-1.html b/layout/html/tests/table/bugs/bug8032-1.html
deleted file mode 100644
index fcc427a64fed..000000000000
--- a/layout/html/tests/table/bugs/bug8032-1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html lang="en-US">
-<head>
-<title>CSS2 table display types</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-.t { display: table; }
-.trow { display: table-row; }
-.tcol { display: table-column; }
-.tcg { display: table-column-group; }
-.tcell { display: table-cell; }
-</style>
-</head>
-<body>
-
-<h2>table-column-group</h2>
-
-<div class="t">
-        <div class="tcg">
-                <div class="tcol"></div>
-                <div class="tcol"></div>
-        </div>
-        <div class="trow">
-                <div class="tcell">white</div>
-                <div class="tcell">white</div>
-        </div>
-</div>
diff --git a/layout/html/tests/table/bugs/bug8032-2.html b/layout/html/tests/table/bugs/bug8032-2.html
deleted file mode 100644
index 7c778a435cdf..000000000000
--- a/layout/html/tests/table/bugs/bug8032-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-
- <head>
-
-  <style>
-
-   .t { displayx: table-column-group; }
-
-  </style>
-
- </head>
-
- <body>
-
-  <p class="t">
-
- </body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug80762-1.html b/layout/html/tests/table/bugs/bug80762-1.html
deleted file mode 100644
index 5d4921b71c01..000000000000
--- a/layout/html/tests/table/bugs/bug80762-1.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>Bug 80762</title>
-</head><body>
-
-<table>
-  <tr>
-    <td>
-
-      <table width="100%">
-        <tr>
-          <td>text below can't break out of this table</td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-  <tr>
-    <td>
-
-      <table>
-        <tr>
-          <td width="100%">
-            Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text
-            Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text Text
-          </td>
-        </tr>
-      </table>
-
-    </td>
-  </tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug80762-2.html b/layout/html/tests/table/bugs/bug80762-2.html
deleted file mode 100644
index 6a9d8a426e6a..000000000000
--- a/layout/html/tests/table/bugs/bug80762-2.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<table cellpadding="0" cellspacing="0" border="1">
- <tr>
-  <td width="54">foo</td>
-  <td width="100%">bar</td>
- </tr>
- <tr>
-  <td width="100%" colspan="2">
-   <table border>
-    <tr>
-     <td>
-When the Whiten house burned down in Renfrew Ontario, the insurer denied liability, asserting that the Plaintiff Daphne Whiten was the cause of the fire herself and had committed arson.<br><br>
-
-The insurance company had not only refused to pay, but had received opinions from its adjuster, its expert engineer and an investigative agency that the fire was accidental. Its own adjuster had recommended the claim be paid. The defendant's counsel, as the court found, had pressured experts to provide opinions supporting an arson defence and withheld relevant information from the experts and gave them misleading information to buttress the arson defence.<br><br>
-
-After the fire the Plaintiff and her husband, Keith Whiten needed welfare assistance to support them.<br><br>
-
-The jury, however, in a 4 week trial, disagreed with the position of the insurance company. It awarded not only the policy sum against the insurer, but also was sufficiently annoyed with the conduct of the company to award a further punitive damage award of $1 million.<br><br>
-
-The company appealed. At the time of the appeal, the company acknowledged that the fire was accidental. The Ontario Court of Appeal reversed the jury award and in a 2-1 decision determined that there should be a cap on punitive damages of $100,000.<br><br>
-
-Lawyers became hard pressed to reconcile this decision with a prior case, Hill vs. Church of Scientology. Hill, a Crown Attorney, had sued the Church for libel due to statements made accusing him of breaching a judge's order.  He succeeded. The jury at trial, aside from awarding compensatory damages, also awarded a punitive damage sum of $800,000. The decision was appealed without success to the Ontario Court of Appeal and again to the Supreme Court of Canada. The award of punitive damages was sustained at both appellate levels.<br><br>
-
-In the Whiten case, the insurance industry is mounting all its ammunition to maintain the notion of a cap on punitive damages. It is expected that the Court of Appeal decision will receive a rough ride in the Supreme Court, given the Hill decision a few years prior.<br><br>
-
-The concept of punitive damages is designed to act as civil penalty imposed on a wrong doer, which has conducted itself in a vindictive manner, which offends one's sense of propriety - high handed shocking behaviour. Traditionally the financial abilities of the wrong doer are a factor - the deeper the pockets the more substantial the sum to be awarded.<br><br>
-
-Canadian courts have been reluctant to embrace the concept - awards such as Hill are rare. It is worthy of note that the dissenting reasons of Justice Laskin in Whiten were much in favour of maintaining the trial award - a lucid and powerful dissent written by a much respected jurist. Much attention will be given to this decision. Oral argument is set for the week of December 11th. A decision will likely be forthcoming in March to June time period. This decision will be no doubt a much quoted decision for many years, regardless of the outcome.<br><br>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug81934.html b/layout/html/tests/table/bugs/bug81934.html
deleted file mode 100644
index 8934d625b01b..000000000000
--- a/layout/html/tests/table/bugs/bug81934.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-
-<html>
-
-<head>
-<title>testcase</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<table width=100% border=1 cellspacing=0><tr>
-<th width="15%">c1</th>
-<th width="15%">c2</th>
-<th>c4</th>
-</tr><tr>
-<td rowspan=4 valign=top>r1c2</td>
-<td rowspan=2 valign=top>r1c3</td>
-<td>r1c4</td>
-</tr><tr>
-<td>r2c4</td>
-</tr><tr>
-<td rowspan=2>r3c3</td>
-<td>r3c4</td>
-</tr><tr>
-<td>r4c4</td>
-</tr>
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug82946-1.html b/layout/html/tests/table/bugs/bug82946-1.html
deleted file mode 100644
index aab898da8b58..000000000000
--- a/layout/html/tests/table/bugs/bug82946-1.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html> 
-<head> 
-<title>The XML Cover Pages - Home Page</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-</head> 
-<body> 
-<p>The image below has a width of 459px. When the table below it has a width of 459px or greater,
-the bottom row overlaps the top row</p>
-Table with width=459<br>
-<table border="1"> 
-  <tr>  
-    <td rowspan="2">sidebar</td>
-    <td>  
-      <img src="../images/rclogo460.gif" alt="The XML Cover Pages">
-      <table width="459" border="1"><tr><td>THIS IS A TABLE</td></tr></table>
-    </td> 
-  </tr> 
-  <tr>  
-    <td>  
-      The XML Cover Pages is a comprehensive online reference work for the Extensible Markup  
-        Language (XML) and its parent, the Standard Generalized Markup Language  
-        (SGML). The reference collection features extensive documentation on the  
-        application of the open, interoperable "markup language" standards, including  
-        XSL, XSLT, XPath, XQuery, XLink, XPointer, XHTML, HyTime, DSSSL, CSS, SPDL, SVG, CGM, ISO-HTML,  
-        and others.
-    </td> 
-  </tr> 
-</table> 
-
-</body> 
-</html>
diff --git a/layout/html/tests/table/bugs/bug82946-2.html b/layout/html/tests/table/bugs/bug82946-2.html
deleted file mode 100644
index c984882a4689..000000000000
--- a/layout/html/tests/table/bugs/bug82946-2.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-  <head>
-    <meta name="generator" content="HTML Tidy, see www.w3.org">
-
-    <title></title>
-  </head>
-
-  <body>
-    <table width="768">
-      <tbody>
-        <tr>
-          <td>
-            <table width="506">
-              <tbody>
-                <tr>
-                  <td>
-                          <img src=
-                          "../images/24pipe.7.jpg"
-                           border="0">
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-
-          <td rowspan="2"><br>
-           </td>
-        </tr>
-
-        <tr>
-          <td colspan="2">
-            <table width="468" border="0">
-              <tbody>
-                <tr>
-                  <td width="84"> </td>
-
-                  <td width="381">
-                    <p align="Left">&nbsp;<font color="#000000">to
-                    Receive 50% Off Home Delivery of The New York
-                    Times Newspaper.</font></p>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug8361.html b/layout/html/tests/table/bugs/bug8361.html
deleted file mode 100644
index 079091fc85ca..000000000000
--- a/layout/html/tests/table/bugs/bug8361.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
- <body bgcolor=white>   
-  <table frame=void>                          
-   <tr><td>Foo</td></tr>           
-  </table>   
- </body>     
-</html>      
diff --git a/layout/html/tests/table/bugs/bug83786.html b/layout/html/tests/table/bugs/bug83786.html
deleted file mode 100644
index 5efba89a8d81..000000000000
--- a/layout/html/tests/table/bugs/bug83786.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
- <head>
-  <title>CSS Tables: Margins</title>
-  <style type="text/css">
-   * {
-     margin: 0;
-     padding: 0;
-     border: 0;
-     border-spacing: 0;
-   }
-   table {
-     margin-left: 1em;
-     margin-right: 19em;
-   }
-   div {
-     border: green solid;
-     width: 20em;
-     height: 10em;
-     font: 1em/1em monospace;
-     overflow: hidden;
-   }
-   span {
-     background: red;
-     color: yellow;
-     font-size: 0.9em;
-   }
-  </style>
- </head>
- <body>
-    <div> <table> <tr> <td>
-      This____
-      text____
-      should__
-      be______
-      wrapped,
-      one_____
-      word____
-      to______
-      a_______
-      line.___
-<span>_FAIL!__</span>
-    </td> </tr> </table> </div>
- </body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug8381.html b/layout/html/tests/table/bugs/bug8381.html
deleted file mode 100644
index 55b33c0b2dea..000000000000
--- a/layout/html/tests/table/bugs/bug8381.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<Head>
-<Title>The Teeming Inheritors</Title>
-</Head>
-
-<Body Text="#000000" BGColor="#3333FF" Link="#000000" VLink="#000000" ALink="#FF0000">
-<Center>
-
-<Table Border=2 Cellspacing=2 BGColor="#FFFFFF">
-<Caption>
-<B><Font Face="Arial" Color="#C0C0C0" Size=+1>
-Future Bugzilla
-</Font></B>
-</Caption>
-
-<TR>
-
-<TD BGColor="#009900"><Div Align=Right><B><Font Face="Arial CE" Size=-1>
-Credit
-</Font></B></Div></TD>
-
-<TD BGColor="#009900"><B><Font Face="Arial CE" Size=-1>
-Bug
-</Font></B></TD>
-
-<TD BGColor="#009900"><B><Font Face="Arial CE" Size=-1>
-Summary
-</Font></B></TD>
-
-<TD BGColor="#009900"><B><Font Face="Arial CE" Size=-1>
-Status
-</Font></B></TD>
-
-<TD BGColor="#009900"><B><Font Face="Arial CE" Size=-1>
-Resolution
-</Font></B></TD>
-
-<TD BGColor="#009900"><B><Font Face="Arial CE" Size=-1>
-Date (-8/-7)
-</Font></B></TD>
-
-</TR>
-
-<TR>
-
-<TD BGColor="#FF0000"><B><Font Face="Arial CE" Color="#000000" Size=-1>
-1
-</Font></B></TD>
-
-<TD BGColor="#FF0000"><B><Font Face="Arial CE" Color="#000000" Size=-1>
-<A HRef="http://bugzilla.mozilla.org/show_bug.cgi?id=10000">10000</a>
-</Font></B></TD>
-
-<TD BGColor="#FF0000"><B><Font Face="Arial CE" Color="#000000" Size=-1>
-JWZ returns to Mozilla
-</Font></B></TD>
-
-<TD BGColor="#FF0000"><B><Font Face="Arial CE" Color="#000000" Size=-1>
-Resolved
-</Font></B></TD>
-
-<TD BGColor="#FF0000"><B><Font Face="Arial CE" Color="#000000" Size=-1>
-Duplicate
-</Font></B></TD>
-
-<td BGCOLOR="#FF0000"><b><font face="Arial CE" Color="#000000" Size=-1>
-July 1
-</Font></B></TD>
-
-</TR>
-
-</Table>
-</Center>
-
-</Body>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug8411.css b/layout/html/tests/table/bugs/bug8411.css
deleted file mode 100644
index 9fba2e61d884..000000000000
--- a/layout/html/tests/table/bugs/bug8411.css
+++ /dev/null
@@ -1,14 +0,0 @@
-doc {
-  display: block;
-  margin: 5px;
-}
-
-p {
-  display: block;
-}
-
-captionelement {
-  display: table-caption;
-  text-align: center;
-  color: red;
-}
diff --git a/layout/html/tests/table/bugs/bug8411.xml b/layout/html/tests/table/bugs/bug8411.xml
deleted file mode 100644
index 5c2a5a34dd38..000000000000
--- a/layout/html/tests/table/bugs/bug8411.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="bug8411.css" type="text/css"?>
-<doc>
-<p>The following text is in a caption element whose style is set to display:table-caption. The element is not inside a table.</p>
-<captionelement>This is a caption element.</captionelement>
-<p>If there's no red text between this text and the previous text the caption is not displayed.</p>
-</doc>
diff --git a/layout/html/tests/table/bugs/bug8499.html b/layout/html/tests/table/bugs/bug8499.html
deleted file mode 100644
index 61f8d0fb5185..000000000000
--- a/layout/html/tests/table/bugs/bug8499.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<HTML>
-<body>
-<p>This table contains an &lt;applet&gt; that will not load -- you can see
-the space get allocated and then reflow. Notice that the final table is clipped
-on the right hand side -- try shrinking the window and notice how the clipping 
-increases. (I couldn't really simplify this further without losing some of the 
-original 'flavour'.)</p>
-<br>
-
-<!-- Start of exterior table --> 
-<TABLE WIDTH=90% BORDER=1>
-
-<tr><TD>
-
-<!-- Start of interior table --> 
-<TABLE align=center WIDTH=100% BORDER=1>
-
-<!-- First row of interior table --> 
-<tr><td>
-  <table border=2 align=center><tr><td>
-   <applet code="nosuchTextScrollerApplet.class" width=440 height=27>
-    <param foo="bar">
-   </applet>
-  </td></tr></table>
-  <p>The Porto Elounda Mare is built on the sea front, on a 110,000 m2
- plot of land with a 150 meter long private sandy beach. The view from
- decorated with antique and contemporary furniture and rugs.</p>
-</td></tr>
-
-<!-- Second row of interior table --> 
-<tr><td>
-  <table align="center" cellspacing=0 cellpadding=5 border=1>
-  <tr> 
-  <td nowrap>99 Rates in Drahmas  Per Person on H/B  Basis</td>
-  <td nowrap>27/03 - 30/04 <br>16/10 - 31/10 </td>
-  <td nowrap>01/5- 21/5 & 2/10 - 15/10</td>
-  <td nowrap>22/5 - 16/07<br>28/8 - 01/10</td>
-  <td nowrap>17/07 - 27/8</td>
-  </tr>
-  </table>
-</td></tr>
-
-<!-- End of interior table --> 
-</table>
-
-<!-- End of exterior table --> 
-</td></tr>
-</table>
-
-<br>
-<p>This table repeats the previous table, but removes the 'bad applet'. 
-Table lays out OK.</p>
-<br>
-
-<!-- Start of exterior table --> 
-<TABLE WIDTH=90% BORDER=1>
-
-<tr><TD>
-
-<!-- Start of interior table --> 
-<TABLE align=center WIDTH=100% BORDER=1>
-
-<!-- First row of interior table --> 
-<tr><td>
-  <table border=2 align=center><tr><td>
- applet was here
-  </td></tr></table>
-  <p>The Porto Elounda Mare is built on the sea front, on a 110,000 m2
- plot of land with a 150 meter long private sandy beach. The view from
- decorated with antique and contemporary furniture and rugs.</p>
-</td></tr>
-
-<!-- Second row of interior table --> 
-<tr><td>
-  <table align="center" cellspacing=0 cellpadding=5 border=1>
-  <tr> 
-  <td nowrap>99 Rates in Drahmas  Per Person on H/B  Basis</td>
-  <td nowrap>27/03 - 30/04 <br>16/10 - 31/10 </td>
-  <td nowrap>01/5- 21/5 & 2/10 - 15/10</td>
-  <td nowrap>22/5 - 16/07<br>28/8 - 01/10</td>
-  <td nowrap>17/07 - 27/8</td>
-  </tr>
-  </table>
-</td></tr>
-
-<!-- End of interior table --> 
-</table>
-
-<!-- End of exterior table --> 
-</td></tr>
-</table>
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug85016.html b/layout/html/tests/table/bugs/bug85016.html
deleted file mode 100644
index 0d892d7b1a5a..000000000000
--- a/layout/html/tests/table/bugs/bug85016.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>percentage heights</title>
-	<style> 
-		body { margin: 2em; }
-		div {margin: 2em; } 
-	</style>
-</head>
-
-<body>
-<p style="display:none;">percentage height images in DIV with no height (red)</p>
-<div style="border: 1px solid green;">
-<div style="border: 1px solid red;">
-  <img height="100%" width="100%" src="../images/raptor.jpg">
-</div>
-</div>
-<p>percentage height images in DIV with no height (red) in a DIV with no height (green)</p>
-<div style="border: 3px dotted green;">
- <div style="border: 1px solid red;">
-  <img height="100%" src="../images/raptor.jpg">
- </div>
-</div>
-<p>percentage height image in table cell (red), in a DIV with no height (green)</p>
-
-<div>
-<table style="border: 1px solid red;" height="100%">
-<tr>
-<td style="border: 1px solid red;"><img src="../images/raptor.jpg"></td>
-</tr>
-</table>
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug86220.html b/layout/html/tests/table/bugs/bug86220.html
deleted file mode 100644
index 7d4b8529b663..000000000000
--- a/layout/html/tests/table/bugs/bug86220.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>row color strict</title>
-</head>
-<body>
-<table style="width: 200px; background-color:green" cellspacing="60">
- <tr style="background-color:red">
-  <td>foo</td>
- </tr>
-</table>
-<div style="width:260px; border: solid thin">
-260px
-</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug86708.html b/layout/html/tests/table/bugs/bug86708.html
deleted file mode 100644
index 7198a3a82817..000000000000
--- a/layout/html/tests/table/bugs/bug86708.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>Title</title>
-</head> <body> 
-<table BORDER=2 WIDTH=750 CELLPADDING=0 CELLSPACING=0>
-<tr>
-<td valign="top"  bgcolor="red">
-<a HREF="/quebec/cinema/cinema.asp?Id=17044"><img SRC="../images/couverture.jpg"  width="286" ></a></td>
-<td ROWSPAN=2 VALIGN="top" bgcolor="yellow"> ROWSPAN =2 in this cell</td>
-</tr>
-<tr>
-  <td valign="top" BGCOLOR="#FFFFFF">
-     <p>Hello, this text may appear on the image above</p>
-</td>
-</tr>
-</table>
-</html>
-
-
diff --git a/layout/html/tests/table/bugs/bug88035-1.html b/layout/html/tests/table/bugs/bug88035-1.html
deleted file mode 100644
index 674d7ac1d2a4..000000000000
--- a/layout/html/tests/table/bugs/bug88035-1.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<HTML>
- <BODY>
-   <TABLE BORDER=1 HEIGHT=100% WIDTH=100%>
-    <TR>
-     <TD ALIGN=CENTER>
-      This table is not wrapped in a &lt;CENTER&gt; tag, with HEIGHT=100%
-     </TD>
-    </TR>
-    <TR>
-     <TD ALIGN=CENTER>
-      <A HREF="test2.html">This one is</A>
-     </TD>
-    </TR>
-   </TABLE>
- </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug88035-2.html b/layout/html/tests/table/bugs/bug88035-2.html
deleted file mode 100644
index c7ae4cb7f8c0..000000000000
--- a/layout/html/tests/table/bugs/bug88035-2.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML>
- <BODY>
-  <CENTER>
-   <TABLE BORDER=1 HEIGHT=100% WIDTH=100%>
-    <TR>
-     <TD ALIGN=CENTER>
-      This table is wrapped in a &lt;CENTER&gt; tag with HEIGHT=100%
-     </TD>
-    </TR>
-    <TR>
-     <TD ALIGN=CENTER>
-      <A HREF="test1.html">This one is not</A>
-     </TD>
-    </TR>
-   </TABLE>
-  </CENTER>
- </BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug88524.html b/layout/html/tests/table/bugs/bug88524.html
deleted file mode 100644
index 62aba189f946..000000000000
--- a/layout/html/tests/table/bugs/bug88524.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Centered Text</TITLE>
-</HEAD>
-<BODY>
-<TABLE WIDTH="100%" HEIGHT="100%">
-<TR>
-<TD ALIGN=CENTER VALIGN=MIDDLE>Centered</TD>
-</TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug8858.html b/layout/html/tests/table/bugs/bug8858.html
deleted file mode 100644
index bcc2638df573..000000000000
--- a/layout/html/tests/table/bugs/bug8858.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>
-<HEAD></HEAD>
-<BODY>
-<p> there's a table below this line with cellspacing=1 and border=2 and 
-several lines<br> of content beginning 'Pacific Shore Properties ...'.
-Can you see it?</p>
-
-<TABLE WIDTH="99%" BORDER="2" CELLSPACING="1" CELLPADDING="4" HEIGHT="529">
-<TR>
-<TD WIDTH="100%" HEIGHT="53" ROWSPAN="4" COLSPAN="2" VALIGN="TOP" BGCOLOR=
-"#ffffff"><P><FONT COLOR="#e91c05" SIZE=+2>W</FONT><B><FONT COLOR="#e91c05">elcome
-to Pacific Shore Properties<BR>
-</FONT></B><FONT SIZE=-1 FACE="arial">Pacific Shore Properties is situated
-on beautiful Mayne Island.</FONT></P>
-
-<P><FONT SIZE=-1 FACE="arial">Mayne Island is one of the southern Gulf Islands,
-off the coast of British Columbia, Canada, between Vancouver and Vancouver
-Island.<BR>
-(See map: left)</FONT></P>
-
-<P><FONT SIZE=-1 FACE="arial">Pacific Shore Properties specializes in the
-diverse properties of the Southern Gulf Islands; which include Beach, Business,
-View, Acreage, Home, Retirement and Recreation.<BR>
-<BR>
-In business for over 35 years, and the oldest real estate company on Mayne
-Island, Pacific Shore Properties knowledge and expertise on the Gulf Islands
-is unmatched.</FONT></P>
-
-<P>
-</TD></TR>
-<TR></TR>
-<TR></TR>
-<TR></TR>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug89315.html b/layout/html/tests/table/bugs/bug89315.html
deleted file mode 100644
index f57f42a4ef70..000000000000
--- a/layout/html/tests/table/bugs/bug89315.html
+++ /dev/null
@@ -1,2227 +0,0 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=FrontPage.Editor.Document>
-<meta name=Generator content="Microsoft FrontPage 4.0">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List href="./radio_channels_files/filelist.xml">
-<title>Bayside RC Club</title>
-<style>
-<!--
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-        {mso-style-parent:"";
-        margin:0in;
-        margin-bottom:.0001pt;
-        mso-pagination:widow-orphan;
-        font-size:10.0pt;
-        font-family:"Times New Roman";
-        mso-fareast-font-family:"Times New Roman";}
-h1
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        page-break-after:avoid;
-        mso-outline-level:1;
-        font-size:16.0pt;
-        font-family:Arial;
-        mso-font-kerning:16.0pt;}
-h2
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        page-break-after:avoid;
-        mso-outline-level:2;
-        font-size:14.0pt;
-        font-family:Arial;
-        font-style:italic;}
-h3
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        page-break-after:avoid;
-        mso-outline-level:3;
-        font-size:13.0pt;
-        font-family:Arial;}
-h4
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        page-break-after:avoid;
-        mso-outline-level:4;
-        font-size:14.0pt;
-        font-family:"Times New Roman";}
-h5
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        mso-outline-level:5;
-        font-size:13.0pt;
-        font-family:"Times New Roman";
-        font-style:italic;}
-h6
-        {mso-style-next:Normal;
-        margin-top:12.0pt;
-        margin-right:0in;
-        margin-bottom:3.0pt;
-        margin-left:0in;
-        mso-pagination:widow-orphan;
-        mso-outline-level:6;
-        font-size:11.0pt;
-        font-family:"Times New Roman";}
-p.MsoTitle, li.MsoTitle, div.MsoTitle
-        {margin:0in;
-        margin-bottom:.0001pt;
-        text-align:center;
-        mso-pagination:widow-orphan;
-        font-size:14.0pt;
-        mso-bidi-font-size:10.0pt;
-        font-family:"Times New Roman";
-        mso-fareast-font-family:"Times New Roman";}
-a:link, span.MsoHyperlink
-        {color:blue;
-        text-decoration:underline;
-        text-underline:single;}
-a:visited, span.MsoHyperlinkFollowed
-        {color:purple;
-        text-decoration:underline;
-        text-underline:single;}
-@page Section1
-        {size:8.5in 11.0in;
-        margin:1.0in 1.25in 1.0in 1.25in;
-        mso-header-margin:.5in;
-        mso-footer-margin:.5in;
-        mso-paper-source:0;}
-div.Section1
-        {page:Section1;}
--->
-</style>
-<!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="1027"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
-  <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-<base target="_self">
-</head>
-
-<body BACKGROUND="images/paper.jpg">
-
-<div class=Section1>
-
-&nbsp;
-
-<table border=1 cellspacing=0 cellpadding=0 style='border-collapse: collapse; mso-border-alt: solid black .5pt; mso-padding-alt: 0in 5.4pt 0in 5.4pt; border-style: none; border-width: medium; margin-left: .7in' width="473">
- <tr>
-  <td width=457 valign=top style='border: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' colspan="4">
-  <p class=MsoNormal align=center><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></b></p>
-  <p class=MsoNormal align=center><b><span
-
-  style='mso-bidi-font-size: 10.0pt'><font size="4" color="#008080">Radio Channel usage at
-  Bayside.&nbsp;&nbsp;&nbsp; Rev date 6-25-01</font></span></b></p>
-  <p class=MsoNormal align=center style='text-align:center'><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></b></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='border: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>Channel number</span></b>
-  </td>
-  <td width=155 valign=top style='mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top: .5pt solid black; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>Member name</span></b>
-  </td>
-  <td width=84 valign=top style='mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top: .5pt solid black; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <p class=MsoNormal align=center style='text-align:center'><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>Proper<span
-
-  style='color:black'><o:p></o:p></span></span></b></p>
-  <p class=MsoNormal align=center style='text-align:center'><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>Plane</span></b></p>
-  </td>
-  <td width=90 valign=top style='mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top: .5pt solid black; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <p class=MsoNormal align=center style='text-align:center'><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>Helicopter<span
-
-  style='color:black'><o:p></o:p></span></span></b></p>
-  <p class=MsoNormal align=center style='text-align:center'><b><span
-
-  style='font-size:11.0pt;mso-bidi-font-size:10.0pt'>thingy.-</span></b></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>00<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Paul Scott</p>
-  <p class=MsoNormal>Donald Carvalho<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>01<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Paul Scott<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  <p align="center"><font face="Times New Roman" size="2">02</font>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  <font face="Times New Roman" size="2">Don Coon</font>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  &nbsp;
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  &nbsp;
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <font face="Times New Roman" size="2">05</font>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  <p class=MsoNormal><font face="Times New Roman" size="2">Paul Scott</font></p>
-  <p class=MsoNormal><font face="Times New Roman" size="2">Bill Hunt<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></font></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <p class=MsoNormal align=center style='text-align:center'><font face="Times New Roman" size="2">No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></font></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <p class=MsoNormal align=center style='text-align:center'><font face="Times New Roman" size="2">Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></font></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <font face="Times New Roman" size="2">06</font>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="left">
-  <font face="Times New Roman" size="2">Gene Pheiffer&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-  Alberto Lanzas</font>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in' align="center">
-  <span style="mso-bidi-font-size: 12.0pt; color: black"><font face="Times New Roman" size="2">No</font></span>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p align="center"><font face="Times New Roman" size="2">07</font>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <font face="Times New Roman" size="2">Phil Cole</font>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p align="center"><font face="Times New Roman" size="2">Yes</font>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p align="center"><font face="Times New Roman" size="2">Yes</font>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>08<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Paul Scott</p>
-  <p class=MsoNormal>Gene Pheiffer<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Programmable<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Richard Pevehouse<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Gary Heath</p>
-  <p class=MsoNormal>Scott Hersh<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>11<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>George Cowan<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Rick Klement<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>John Mathews</p>
-  <p class=MsoNormal>Ed Cypret</p>
-  <p class=MsoNormal>John Chamorro</p>
-  <p class=MsoNormal>John Yearwood</p>
-  <p class=MsoNormal>Jason Anderson<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>12<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Rick Klement</p>
-  <p class=MsoNormal>George Coward</p>
-  <p class=MsoNormal>Gerald Cardinal</p>
-  <p class=MsoNormal>Brock Brown</p>
-  <p class=MsoNormal>Ellsworth Crowell</p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>13<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Oliver Baer</p>
-  <p class=MsoNormal>Joe Araujo</p>
-  <p class=MsoNormal>Jim Mirowski</p>
-  <p class=MsoNormal>Scott Hersh<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>14<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Joe Araujo</p>
-  <p class=MsoNormal>Steve Gilbert</p>
-  <p class=MsoNormal>Gary Williams<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>15<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Oliver Baer</p>
-  <p class=MsoNormal>Joe Smith</p>
-  <p class=MsoNormal>John Paye</p>
-  <p class=MsoNormal>John Yearwood</p>
-  <p class=MsoNormal>Harald Close<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>16<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;James Haladus</p>
-  <p class=MsoNormal>Joe Smith<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>17<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Doug Field<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Dave Neves</p>
-  <p class=MsoNormal>Oliver Baer</p>
-  <p class=MsoNormal>John Todd</p>
-  <p class=MsoNormal>Dave Christiansen<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>18<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Robert Barnett</p>
-  <p class=MsoNormal>Jim Mahoney</p>
-  <p class=MsoNormal>Dave Marshall</p>
-  <p class=MsoNormal>Gerald Cardinal</p>
-  <p class=MsoNormal>Dan &amp; Will Sievert</p>
-  <p class=MsoNormal>Ellsworth Crowell</p>
-  <p class=MsoNormal>Jim Colvin<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>19<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><span style='mso-bidi-font-size:12.0pt;color:black'>Noriya
-  Kato</span></p>
-  <p class=MsoNormal>John Todd</p>
-  <p class=MsoNormal>James Brown</p>
-  <p class=MsoNormal>Mike Anderson<span style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'>Yes</span></p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'><span style="mso-bidi-font-size: 12.0pt; color: black">Yes</span></p>
-  <p class=MsoNormal align=center style='text-align:center'><span style="mso-bidi-font-size: 12.0pt; color: black">Yes</span><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'>No</span></p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'><span style="mso-bidi-font-size: 12.0pt; color: black">No</span></p>
-  <p class=MsoNormal align=center style='text-align:center'><span style="mso-bidi-font-size: 12.0pt; color: black">No</span><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>20<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>Dominic Bayani</p>
-  <p class=MsoNormal>Rick Latham<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>21<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Simon Tam<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>22<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dave Neves<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Grant Sanderson<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Maurice Burton</p>
-  <p class=MsoNormal>Mike Gilmartin ?????</p>
-  <p class=MsoNormal>Chris Walsh<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>23<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dave Neves<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Maurice Burton</p>
-  <p class=MsoNormal>Oliver Baer</p>
-  <p class=MsoNormal>John Todd</p>
-  <p class=MsoNormal>Rich Saunef<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>24<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Dan Sievert</p>
-  <p class=MsoNormal>Jerry Davis</p>
-  <p class=MsoNormal>Scott Hersh</p>
-  <p class=MsoNormal>Rick Bell</p>
-  <p class=MsoNormal>Eric Shum<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>25<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>James Davey</p>
-  <p class=MsoNormal>Ruenjoe (Joe) Lu<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>26<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Alan Littlewood<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Darren Braun<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Simon Tam</p>
-  <p class=MsoNormal>Chuck Pringle</p>
-  <p class=MsoNormal>Gary Pendergras</p>
-  <p class=MsoNormal>Peter Mazanec</p>
-  <p class=MsoNormal>Harry Imamura</p>
-  <p class=MsoNormal>Joe Araujo</p>
-  <p class=MsoNormal>Gary Williams</p>
-  <p class=MsoNormal>Jack Goodfriend<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>27<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Darren Braun<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Ian + Brad Carter<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Pete Peterson</p>
-  <p class=MsoNormal>John Chamorro</p>
-  <p class=MsoNormal>Ali Erdengiz</p>
-  <p class=MsoNormal>Saibal Sen<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>28<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Zak + Mike West<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Dave Neves<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Richard Green<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Javier Flores</p>
-  <p class=MsoNormal>Gerald Cardinal</p>
-  <p class=MsoNormal>Dan Sievert</p>
-  <p class=MsoNormal>Ali Erdengiz</p>
-  <p class=MsoNormal>Paul Walter</p>
-  <p class=MsoNormal>Jerry Davis<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>29<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Javier Flores<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>John Todd<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>30<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Alan Littlewood<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>George Coward<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Maurice Burton</p>
-  <p class=MsoNormal>Dan Sievert</p>
-  <p class=MsoNormal>Michael DeGiovanni</p>
-  <p class=MsoNormal>Jack Goodfriend</p>
-  <p class=MsoNormal>Richard Sanchez<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>31<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dave Neves</p>
-  <p class=MsoNormal>James Haladus</p>
-  <p class=MsoNormal>Randy Reid<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>32<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Oliver Baer</p>
-  <p class=MsoNormal>Dale Barnett</p>
-  <p class=MsoNormal>John Todd</p>
-  <p class=MsoNormal>Dominic Bayani<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>33<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Tom Wagner<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Gene Langley</p>
-  <p class=MsoNormal>James Haladus</p>
-  <p class=MsoNormal>Daniel Buckley</p>
-  <p class=MsoNormal>Chris Larsen</p>
-  <p class=MsoNormal>Mike Chansu</p>
-  <p class=MsoNormal>James Brown</p>
-  <p class=MsoNormal>Will Sievert</p>
-  <p class=MsoNormal>Terry Chong<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Gyro wannabe</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>34<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Jay Ribera</p>
-  <p class=MsoNormal>Gerald Cardinal</p>
-  <p class=MsoNormal>Dale Barnett</p>
-  <p class=MsoNormal>Paul Walter</p>
-  <p class=MsoNormal>Dominic Bayani</p>
-  <p class=MsoNormal>Donald Carvalho</p>
-  <p class=MsoNormal>Jack Peterson</p>
-  <p class=MsoNormal>Scott Hersh<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>35<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>&nbsp;Richard Green</p>
-  <p class=MsoNormal>David Allen</p>
-  <p class=MsoNormal>Jim Colvin</p>
-  <p class=MsoNormal>Harald Close</p>
-  <p class=MsoNormal>Oliver Baer<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>36<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Jason Beehm</p>
-  <p class=MsoNormal>Darrell Carpenter</p>
-  <p class=MsoNormal>Stefan Kiritzov</p>
-  <p class=MsoNormal>Dale Barnett</p>
-  <p class=MsoNormal>Dan Sievert<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>37<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dominic Civiletti</p>
-  <p class=MsoNormal>John Chamorro</p>
-  <p class=MsoNormal>Jim Mirowski</p>
-  <p class=MsoNormal>Soohong&nbsp; Kim<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>38<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Karl Allmendinger<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>John Bernal<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Gene Langley</p>
-  <p class=MsoNormal>Chuck Pringle</p>
-  <p class=MsoNormal>Jimmy Lei</p>
-  <p class=MsoNormal>Ruenjoe (Joe) Lu<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Gyro wannabe</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>39<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Tom Wagner</p>
-  <p class=MsoNormal>Oliver Baer</p>
-  <p class=MsoNormal>Will Sievert<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>40<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Alberto Lanzas<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Zak + Mike West<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Javier Flores<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Bill Johnson<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Gene Langley</p>
-  <p class=MsoNormal>Rich Burnett</p>
-  <p class=MsoNormal>Jack Goodfriend</p>
-  <p class=MsoNormal>Harald Close<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Glider</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>41<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dominic Civiletti<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Corbin Christensen<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Hal Hirsch<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Richard Sanchez</p>
-  <p class=MsoNormal>John Bernal</p>
-  <p class=MsoNormal>Rich Burnett</p>
-  <p class=MsoNormal>Brock Brown</p>
-  <p class=MsoNormal>John Paye<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>42<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Tony Yu<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Jason Miller<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Maurice Burton</p>
-  <p class=MsoNormal>Dan Sievert</p>
-  <p class=MsoNormal>Jerry Davis</p>
-  <p class=MsoNormal>John Paye</p>
-  <p class=MsoNormal>Gordon Frost</p>
-  <p class=MsoNormal>Chris Walsh<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>43<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Dominic Civiletti<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Ken Gullion<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Will Sievert</p>
-  <p class=MsoNormal>Jim Mahoney</p>
-  <p class=MsoNormal>Ken Manuel</p>
-  <p class=MsoNormal>John Todd</p>
-  <p class=MsoNormal>Rick Rasmussen<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Someday</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>44<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Gary Heath<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Quinn Chuong</p>
-  <p class=MsoNormal>Dan Sievert</p>
-  <p class=MsoNormal>Alexander Wert<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>45<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>James Holaduz</p>
-  <p class=MsoNormal><font face="Times New Roman" size="2">Don Coon</font></p>
-  <p class=MsoNormal>John Yearwood<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>46<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Zak West<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Karl Allmendinger</p>
-  <p class=MsoNormal>John Espectzde</p>
-  <p class=MsoNormal>Gene Pheiffer</p>
-  <p class=MsoNormal>Harold Todd</p>
-  <p class=MsoNormal>Gerald Cardinal</p>
-  <p class=MsoNormal>Ali Erdengiz</p>
-  <p class=MsoNormal>Jason Anderson<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>47<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>James Holaduz<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Tony Yu<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Quang Nguyen<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Rick Klement<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Mark Glanville<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Michael Chansu</p>
-  <p class=MsoNormal>Harold Todd</p>
-  <p class=MsoNormal><font face="Times New Roman" size="2">Don Coon</font></p>
-  <p class=MsoNormal>John Paye</p>
-  <p class=MsoNormal>David Allen</p>
-  <p class=MsoNormal>Raymund Leonardo<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>48<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Mark Glanville<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Ian + Brad Carter</p>
-  <p class=MsoNormal>Stefan Kiritzov</p>
-  <p class=MsoNormal>Joe Araujo</p>
-  <p class=MsoNormal>Harold Todd</p>
-  <p class=MsoNormal>Steve Gilbert</p>
-  <p class=MsoNormal>Mark Diel</p>
-  <p class=MsoNormal>Jack Goodfriend</p>
-  <p class=MsoNormal>Ruenjoe (Joe) Lu<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>49<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal><![if !supportEmptyParas]>Ali Erdengiz</p>
-  <p class=MsoNormal>David Allen</p>
-  <p class=MsoNormal><![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p>Narayen Raju</span></p>
-  <p class=MsoNormal><span style="mso-bidi-font-size: 12.0pt; color: black">Jason
-  Anderson</span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><![if !supportEmptyParas]>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<![endif]><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>50<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Zak West<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Rick Klement<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Jim Bernal</p>
-  <p class=MsoNormal>Alan Littlewood</p>
-  <p class=MsoNormal>Jerry Davis</p>
-  <p class=MsoNormal>Lauren Bussard</p>
-  <p class=MsoNormal>John Yearwood</p>
-  <p class=MsoNormal>Narayan Raju</p>
-  <p class=MsoNormal>Ken Manuel<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>51<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Robert Barnett</p>
-  <p class=MsoNormal>Jim Mahoney</p>
-  <p class=MsoNormal>Jason Anderson<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'>No<o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'>Yes</span></p>
-  <p class=MsoNormal align=center style='text-align:center'><span style="mso-bidi-font-size: 12.0pt; color: black">No</span><span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>52<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Mike West<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Robert Frogner</p>
-  <p class=MsoNormal>Chris McDowell</p>
-  <p class=MsoNormal>Ed Cypret</p>
-  <p class=MsoNormal>Dale Barnett<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>53<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Alberto Lanzas<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>Al Wert</p>
-  <p class=MsoNormal>Dale Barnett</p>
-  <p class=MsoNormal>Ramin Khoshnevis<span style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>54<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Gene Langley</p>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>Mark Diel</p>
-  <p class=MsoNormal>Jerry Davis</p>
-  <p class=MsoNormal>Peter Starr</p>
-  <p class=MsoNormal>John Yearwood</p>
-  <p class=MsoNormal>Scott Hersh<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Gyro wannabe</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>&nbsp;</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>55<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Alberto Lanzas<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Bob Roger</p>
-  <p class=MsoNormal>Randy StClair<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>56<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Mark Glanville</p>
-  <p class=MsoNormal>Steve Gilbert</p>
-  <p class=MsoNormal>Jerry Davis</p>
-  <p class=MsoNormal>Rich Saunef</p>
-  <p class=MsoNormal>Harald Close<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>57<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Bob Roger</p>
-  <p class=MsoNormal>Rich Burnett</p>
-  <p class=MsoNormal>David Dunn<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>58<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Ian + Brad Carter<span style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>Chuck Pringle</p>
-  <p class=MsoNormal>David Dunn<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='color:black'><o:p></o:p></span></p>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>59<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Bob Roger</p>
-  <p class=MsoNormal>Rich Burnett<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
- <tr>
-  <td width=83 valign=top style='mso-border-top-alt: solid black .5pt; border-left: .5pt solid black; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>60<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=155 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal>Bill Johnson</p>
-  <p class=MsoNormal>Vladimir Dvorkin</p>
-  <p class=MsoNormal>Ken Price</p>
-  <p class=MsoNormal>Rick Rasmussen<span style='mso-bidi-font-size:12.0pt;
-
-  color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=84 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>Yes</p>
-  <p class=MsoNormal align=center style='text-align:center'>No<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
-  <td width=90 valign=top style='mso-border-top-alt: solid black .5pt; mso-border-left-alt: solid black .5pt; border-left-style: none; border-left-width: medium; border-right: .5pt solid black; border-top-style: none; border-top-width: medium; border-bottom: .5pt solid black; padding-left: 5.4pt; padding-right: 5.4pt; padding-top: 0in; padding-bottom: 0in'>
-  <p class=MsoNormal align=center style='text-align:center'>No</p>
-  <p class=MsoNormal align=center style='text-align:center'>Yes<span
-
-  style='mso-bidi-font-size:12.0pt;color:black'><o:p></o:p></span></p>
-  </td>
- </tr>
-</table>
-
-<p class=MsoNormal><span style='color:black'><![if !supportEmptyParas]>&nbsp;</span></p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-<p class=MsoNormal>&nbsp;</p>
-
-</div>
-
-<p class="MsoNormal" align="center">&nbsp;</p>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug8950.html b/layout/html/tests/table/bugs/bug8950.html
deleted file mode 100644
index 2d0f9f07c1bc..000000000000
--- a/layout/html/tests/table/bugs/bug8950.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<HEAD>
-<STYLE TYPE="text/css">
-<!--
-a:hover       {color: red;}
--->
-</STYLE>
-</head>
-<body>
-
-<table border=1 width=653>
- <tr>
-  <td colspan=6 width=653>
-   <table border=1 width=620>
-    <tr>
-     <td width=620 height=4> foo </td>
-    </tr>
-    <tr>
-     <td valign=top>
-      <table border=1 width=39>
-       <tr>
-        <td width=39 height=47 valign=top> bar </tD>
-        <td valign=middle align=center> baz </tD>
-       </tr>
-       <tr>
-        <td width=5 valign=top> faz </td>
-        <td valign=top>
-         <table border=1 width=581>
-          <TR>
-           <td colspan=2 width=581>
-            <table border=1 width=581 border=0>
-             <tr>
-              <td valign=top align=left width=120> frip </td>
-              <td align=center valign=top width=480>
-               Feel free to browse ...
-               <P>
-               <CENTER>
-               <TABLE BORDER=1 WIDTH="273">
-                <TR>
-                 <TD><a href="">Holiday</A></TD>
-                 <TD><a href="">Cars</A></TD>
-                </TR>
-                <TR>
-                 <TD><a href="">Sports</A></TD>
-                 <TD><a href="">Animals</A></TD>
-                </TR>
-                <TR>
-                 <TD><a href="">Computers</A></TD>
-                 <TD><a href="">Cartoons</A></TD>
-                </TR>
-               </TABLE>
-               </CENTER>
-              </td>
-             </tr>
-            </TABLE>
-           </td>
-          </tr>
-         </TABLE>
-        </td>
-       </tr>
-      </TABLE>
-     </td>
-    </tr>
-   </TABLE>
-  </td>
- </tr>
-</TABLE>
-<BR>
-
-<p>The second (nested) table below has fixed widths 300px, 500px, 200px (outer to inner).<br>
-When the <code>a:hover</code> for 'Holiday' gets <code>'onMouseOver'</code>,
-the outer table reflows to 300px,<br>
-clipping the middle (500px) table in the process.</p>
-
-<table border=1 width=300>
- <TR>
-  <td>
-300px wide for comparison
-  </td>
- </tr>
-</TABLE>
-
-<br>
-   
-<table border=1 width=300>
- <TR>
-  <td>
-   <table border=1 width=500>
-    <tr>
-     <td>
-      <TABLE BORDER=1 WIDTH=200>
-       <TR>
-        <TD><a href="">Holiday</A></TD>
-       </TR>
-      </TABLE>
-     </td>
-    </tr>
-   </TABLE>
-  </td>
- </tr>
-</TABLE>
-</body></html>
diff --git a/layout/html/tests/table/bugs/bug9024.html b/layout/html/tests/table/bugs/bug9024.html
deleted file mode 100644
index 072a95a35dad..000000000000
--- a/layout/html/tests/table/bugs/bug9024.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<title>Test</title>
-<style type="text/css">
-table { border-collapse: collapse; }
-</style>
-
-<body>
-
-<table border>
-<tbody id="mytable">
-</tbody>
-</table>
-
-<script type="text/javascript">
-
-
-var mytable = document.getElementById("mytable");
-
-dump("before\n");
-var newrow = mytable.insertRow(0);
-dump("after\n");
-
-
-</script>
-
-</body>
diff --git a/layout/html/tests/table/bugs/bug9072.html b/layout/html/tests/table/bugs/bug9072.html
deleted file mode 100644
index 8579dd122819..000000000000
--- a/layout/html/tests/table/bugs/bug9072.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<title>cell where width=1</title>
-<body bgcolor="#ffffff">
-
-<table border=0 cellspacing=5 cellpadding=0 bgcolor="#ffffff">
-<tr>  <td>Blah</td>  <td width=1 bgcolor="#000000"><spacer type=block width=1></td>  <td>Blah</td>  </tr>
-</table>
-<br>
diff --git a/layout/html/tests/table/bugs/bug91057.html b/layout/html/tests/table/bugs/bug91057.html
deleted file mode 100644
index c0442abeea77..000000000000
--- a/layout/html/tests/table/bugs/bug91057.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title> Caption Margin Test  bug 91057</title>
-<style type="text/css">
-* {border: 1px solid}
-.one {
-	margin-left: 50px;
-}
-.two {
-	margin-right: 50px;
-}
-.three {
-	margin: 50px;
-}
-.four {
-	margin-left: 5%;
-}
-.five {
-	margin-right: 5%;
-}
-.six {
-	margin: 5%;
-}
-</style>
-</head>
-<body bgcolor="#FFFFFF">
-
-<h1>Caption Margin Test</h1>
-
-<div style="border: 1px solid green; width: 100px">
-100px
-</div>
-<div style="border: 1px solid red; width: 50px">
-50px
-</div>
-
-<h2>Control</h2>
-
-<table>
-<caption>TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption>TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 1 - "margin-left: 50px"</h2>
-
-<table>
-<caption class="one">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="one">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 2 - "margin-right: 50px"</h2>
-
-<table>
-<caption class="two">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="two">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 3 - "margin: 50px"</h2>
-
-<table>
-<caption class="three">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="three">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="three">TC</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 4 - "margin-left: 5%"</h2>
-
-<table>
-<caption class="four">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="four">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 5 - "margin-right: 5%"</h2>
-
-<table>
-<caption class="five">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="five">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<h2>Test 6 - "margin: 5%"</h2>
-
-<table>
-<caption class="six">TA</caption>
-<tr>
-  <td>Table Cell 1</td>
-  <td>Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="six">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-<table>
-<caption class="six">TB</caption>
-<tr>
-  <td>Table Cell 1 Table Cell 1 Table Cell 1</td>
-  <td>Table Cell 2 Table Cell 2 Table Cell 2</td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug9123-1.html b/layout/html/tests/table/bugs/bug9123-1.html
deleted file mode 100644
index 0afd0925aae1..000000000000
--- a/layout/html/tests/table/bugs/bug9123-1.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<html>
-
-<body topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
-
-
-<p style='padding-left:20px;padding-right:20px'>
-Here's the structure of the problem table (which usually begins with 
-'N E W S   H E A D L I N E S'). <br>
-This table is width 100%; two rows; three columns;<br>
-The first row: widths 15, 125, 15 ... The second row: widths 15, 100%, 15
-</p>
-
-<table border=1 width=100% cellpadding=0 cellspacing=0>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-<td width=125><img src="images/left_menu_bottom2.gif" width=110 height=15></td>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-</tr>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-<td width=100%>
-that
-</td>
-
-<td width=15 bgcolor="#666666"><img src=".//images/15.gif" width=15 height=1></td>
-
-</tr>
-
-</table>
-
-<p style='padding-left:20px;padding-right:20px'>
-Here's the first row in a table on its own. 
-This table is width 100%; one rows; three columns;
-This row: widths 15, 125, 15
-</p>
-
-<table border=1 width=100% cellpadding=0 cellspacing=0>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src=".//images/15.gif" width=15 height=1></td>
-<td width=125><img src=".//images/left_menu_bottom2.gif" width=110 height=15></td>
-<td width=15 bgcolor="#666666"><img src=".//images/15.gif" width=15 height=1></td>
-</tr>
-
-</table>
-
-<p style='padding-left:20px;padding-right:20px'>
-Here's the second row in a table on its own. 
-This table is width 100%; one rows; three columns;
-This row: widths 15, 100%, 15
-</p>
-
-<table border=1 width=100% cellpadding=0 cellspacing=0>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-<td width=100%>
-that
-</td>
-
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-</tr>
-
-</table>
-
-<p style='padding-left:20px;padding-right:20px'>
-Note that in Nav4.x, the middle column gets the width of the maximum width cell in the column; 
-on 5.0, the middle column gets the opposite treatment.
-</p>
-
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug9123-2.html b/layout/html/tests/table/bugs/bug9123-2.html
deleted file mode 100644
index 5786574de889..000000000000
--- a/layout/html/tests/table/bugs/bug9123-2.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-
-<body topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
-
-
-<p style='padding-left:20px;padding-right:20px'>
-Here's the same two row table, but the second instance reverses the order of 
-the rows: note that it is the first row that defines the width (which would 
-be right if this were table-layout: fixed ;-)
-</p>
-
-<table border=1 width=100% cellpadding=0 cellspacing=0>
-
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-<td width=125><img src="../images/left_menu_bottom2.gif" width=110 height=15></td>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-</tr>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-<td width=100%>
-that
-</td>
-
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-</tr>
-
-</table>
-<br>
-<table border=1 width=100% cellpadding=0 cellspacing=0>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-<td width=100%>
-that
-</td>
-
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-
-</tr>
-
-<tr>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-<td width=125><img src="../images/left_menu_bottom2.gif" width=110 height=15></td>
-<td width=15 bgcolor="#666666"><img src="../images/15.gif" width=15 height=1></td>
-</tr>
-
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug92143.html b/layout/html/tests/table/bugs/bug92143.html
deleted file mode 100644
index e16898d8a6d1..000000000000
--- a/layout/html/tests/table/bugs/bug92143.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><br>
-
-<html><head><title>Testcase for bug 92143</title>
-</head>
-
-<body> <!--background="http://216.32.242.251/bkgdhome2.gif"-->
-
-
-<table border=1	cellpadding=0 cellspacing=0>
- <tr>
-  <td width="320" nowrap>
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-  </td>
- </tr>
-</table>
-<br><br>
-the next table must overrun the visible part of the view
-(width=2400) 
-<br><br>
-<table border=1	cellpadding=0 cellspacing=0>
- <tr>
-  <td width="2400" nowrap>
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-   Hotmail's Junk Mail spreading effort just got better! 
-   Now you can choose from 3 levels of junk mail!
-  </td>
- </tr>
-</table>
-
-</body></html>
-
diff --git a/layout/html/tests/table/bugs/bug92647-1.html b/layout/html/tests/table/bugs/bug92647-1.html
deleted file mode 100644
index 57a8b0f88bf8..000000000000
--- a/layout/html/tests/table/bugs/bug92647-1.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<HTML>
-<BODY>
- <form> 
-<TABLE border="1">
- <TR>
-  <TD>
-   <TABLE border="2">
-    <TR>
-     <TD WIDTH="30%">
-       Member Number:
-     </TD>
-         <TD WIDTH="70%">
-      <INPUT NAME="EchoUser" TYPE="TEXT">
-         </TD>
-    </TR>
-    <TR>
-     <TD>
-      PIN:
-     </TD>
-     <TD>
-      <INPUT TYPE="password">
-         </TD>
-     <TD>
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
-</Form>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug92647-2.html b/layout/html/tests/table/bugs/bug92647-2.html
deleted file mode 100644
index e412246a1a25..000000000000
--- a/layout/html/tests/table/bugs/bug92647-2.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML>
- <BODY>
-  <TABLE border="1">
-   <TR>
-    <TD>
-     <TABLE border="1">
-      <TR>
-       <TD WIDTH="30%"></TD>
-       <TD WIDTH="70%"><INPUT TYPE=button></TD>
-       <TD></TD>
-      </TR>
-     </TABLE>
-    </TD>
-   </TR>
-  </TABLE>
- </BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug9271-1.html b/layout/html/tests/table/bugs/bug9271-1.html
deleted file mode 100644
index f550a4ad4261..000000000000
--- a/layout/html/tests/table/bugs/bug9271-1.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-        <title>Table element insertion bugs - insertRow()</title>
-</head>
-<body>
-
-<h1>insertRow() bugs, 0 based</h1>
-
-<table border>
-        <tbody id="touse">
-                <tr>
-                        <td>
-                                This is just dummy text.
-                        </td>
-                </tr>
-        </tbody>
-</table>
-
-<script type="text/javascript">
-
-
-var touse = document.getElementById("touse");
-
-while (touse.hasChildNodes() ) {
-        touse.removeChild(touse.firstChild);
-}
-
-/* i could be 0 or 1 - whatever is first ends up at the end */
-for ( var i = 0 ; i < 6; i++ ) {
-        var newrow = touse.insertRow(i);
-        var newcell = newrow.insertCell(0);
-        newcell.appendChild(
-                document.createTextNode("This is row number " + i + ".")
-                )
-}
-
-
-</script>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug9271-2.html b/layout/html/tests/table/bugs/bug9271-2.html
deleted file mode 100644
index f6fe693d4cf9..000000000000
--- a/layout/html/tests/table/bugs/bug9271-2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<html>
-<head>
-        <title>Table element insertion bugs - insertCell()</title>
-</head>
-<body>
-
-<h1>insertCell() bugs, 0 based</h1>
-
-<table border>
-        <tbody>
-                <tr id="touse">
-                        <td>
-                                This is just dummy text.
-                        </td>
-                </tr>
-        </tbody>
-</table>
-
-<script type="text/javascript">
-
-
-var touse = document.getElementById("touse");
-
-while (touse.hasChildNodes() ) {
-        touse.removeChild(touse.firstChild);
-}
-
-/* i could be 0 or 1 - whatever is first ends up at the end */
-for ( var i = 0 ; i < 6; i++ ) {
-      var  newcell = touse.insertCell(i);
-        newcell.appendChild(
-                document.createTextNode("This is cell number " + i + ".")
-                )
-}
-
-
-</script>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/bugs/bug92868.html b/layout/html/tests/table/bugs/bug92868.html
deleted file mode 100644
index d6755c1e13c9..000000000000
--- a/layout/html/tests/table/bugs/bug92868.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<title>CSS Display Attribute / Reflow Test </title>
-</head>
-
-<body bgcolor="#FFFFFF" onLoad="enable('blueSpan','hidden');enable('blueSpan','visible');enable('blueSpan','hidden');">
-<a href="javascript:enable('blueSpan', 'hidden');">Hide Blue</a>&nbsp;&nbsp;
-<a href="javascript:enable('blueSpan', 'visible');">Show Blue</a>&nbsp;&nbsp;
-
-<BR>Should not see the blue table<BR>  
-   
-<table id="blueSpan" bgcolor="blue">
-<tr><td>
-Blue table
-</td></tr>
-</table>
-<br> 
-
-</body>
-</html>
-
-<script>
-
-function enable(spanID, displayState) {
-    var element = document.getElementById(spanID);
-
-    if (displayState == 'hidden') {
-        element.style.display = 'none';
-    } else {
-        element.style.display = '';
-    }
-}
-
-</script>
-
-
-
-
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug92868_1.html b/layout/html/tests/table/bugs/bug92868_1.html
deleted file mode 100644
index 419fbdadeaaa..000000000000
--- a/layout/html/tests/table/bugs/bug92868_1.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!doctype html public '-//W3C//DTD HTML 4.01//EN'
-  'http://www.w3.org/TR/html4/strict.dtd'>
-<html>
-
-<head>
-<title>style sheet reload</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-<link rel="stylesheet"   title="Default" href="bug92868_1_test1.css">
-<link rel="alternate stylesheet"   title="test2" href="bug92868_1_test2.css">
-<script>
-function change_sheet() {
-document.styleSheets[0].disabled = true;
-document.styleSheets[1].disabled = false;
-}
-</script>
-
-</head>
-
-<body onload="change_sheet()">
-
-the text should be courier 24pt
-<table><tr><td>inside a cell</td></tr></table>
-<div>inside a div</div>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug92868_1_test1.css b/layout/html/tests/table/bugs/bug92868_1_test1.css
deleted file mode 100644
index 0dd89c7fca0b..000000000000
--- a/layout/html/tests/table/bugs/bug92868_1_test1.css
+++ /dev/null
@@ -1,2 +0,0 @@
-body {font-family:roman;
-font-size: 8pt;}
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug92868_1_test2.css b/layout/html/tests/table/bugs/bug92868_1_test2.css
deleted file mode 100644
index 0d3b7b513fe7..000000000000
--- a/layout/html/tests/table/bugs/bug92868_1_test2.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body { font-family:courier;
-font-size: 24pt;
-}
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/bug93363.html b/layout/html/tests/table/bugs/bug93363.html
deleted file mode 100644
index 36448a572cf6..000000000000
--- a/layout/html/tests/table/bugs/bug93363.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-<head>
-<title>regression test bug 93363</title>
-
-<style>
-table                { border: 4px solid blue; } 
-table             td { border: 1px solid blue; }
-table table          { border: 4px solid green; }
-table table       td { border: 1px solid green; }
-table table table    { border: 4px solid red; }
-table table table td { border: 1px solid red; }
-p.nowrp              { white-space: nowrap; } 
-</style>
-
-</head>
-<body>
-
-<table>
- <tr>
-  <td VALIGN=top>
-   <table>
-    <tr>
-     <td>
-      this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. 
-      this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. this is a bunch of text. 
-     </td>
-    </tr>
-   </table>
-  </td>
-
-  <td VALIGN=top>
-   <table>
-    <tr>
-     <td nowrap>
-      this cell is nowrap.
-      <table>
-       <tr>
-        <td>
-         this text is in a cell of a table, contained in a <p class="nowrp"><b>cell with NOWRAP</b></p> but this text should wrap!
-         only the bold text should not wrap be cause is contained in a P that's nowrap.
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-
-<br>
-Tables have a thick border, cells have a thin border.
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/bug963.html b/layout/html/tests/table/bugs/bug963.html
deleted file mode 100644
index f734bc4e64fc..000000000000
--- a/layout/html/tests/table/bugs/bug963.html
+++ /dev/null
@@ -1,16 +0,0 @@
-The window needs to be resized smaller to see the bug
-<BR>
-
-<table>
-<tr>
-<td>Back</td>
-<td>Forward</td>
-<td>Reload</td>
-<td>Home</td>
-<td>Search</td>
-<td>My Netscape</td>
-<td>Print</td>
-<td>Security</td>
-<td>Stop</td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/bugs/bug96334.html b/layout/html/tests/table/bugs/bug96334.html
deleted file mode 100644
index bcefb5ded26c..000000000000
--- a/layout/html/tests/table/bugs/bug96334.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<BASE HREF="http://bugzilla.mozilla.org/">
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>MapBlast Problem</title>
-<style>
-table                { border: 2px solid blue;} 
-table             td { border: 1px solid silver;  }
-table table          { border: 2px solid green; }
-table table       td { border: 1px solid silver;  }
-table table table    { border: 2px solid red;  }
-table table table td { border: 1px solid silver;  }
-</style>
-</head>
-
-<body>
-
-  <table width="782" >
-   <tr>
-    <td valign="top"> 
-
-     <table width="100%" >
-      <form> 
-      <tr>
-       <td nowrap>
-
-        <table>
-         <tr> 
-          <td >
-           <input type="text" value="THIS NEEDS THIS VALUE">
-          </td>
-         </tr>
-        </table>
-
-        <table width="100%">
-         <tr>
-          <td>
-           THIS TABLE NEEDS TO BE HERE
-          </td>
-         </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr> 
-       <td>
-
-        <table width="100%" >
-         <tr>
-          <td>
-           <select>
-            <option>
-            USE THIS JAVASCRIPT HERE
-           </SELECT>
-          </TD>
-         </TR>
-        </TABLE>
-
-       </TD>
-      </TR>
-     </TABLE>
-
-    </FORM> 
-   </TD>
-   <TD VALIGN="top">
-    KEEPoTHEoTEXToHEREoASoLONGoASoPOSSIBLEooKEEPoTHEoTEXToHEREoASoLONGoASoPOSSIBLE
-    THIS SIMULATES THE PROBLEM ON THE WWW.MAPBLAST.COM/ "CREATE MAP"
-   </TD>
-  </TR>
- </TABLE>
-
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/bugs/bug96343.html b/layout/html/tests/table/bugs/bug96343.html
deleted file mode 100644
index 7c0a181292c1..000000000000
--- a/layout/html/tests/table/bugs/bug96343.html
+++ /dev/null
@@ -1,369 +0,0 @@
-<HTML>
-<HEAD> 
-<TITLE>FARK.com Testcase</TITLE>
-</HEAD>
-<BODY>
-
-<TABLE>
-  <tr><td>Occasional height/width on images</td></tr>
-<FORM>
-<TR>
-<TD><IMG src="../images/google.gif"></TD> 
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD><IMG src="../images/cnn.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/canoe.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/canoe.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/washingtonpost.gif" WIDTH=31 HEIGHT=29 ALT="[Washington Post]"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/sun.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/yahoo.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/abc.gif" WIDTH=42 HEIGHT=26></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/latimes.gif" WIDTH=84 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-        
-        
-</TR>
-</FORM>
-<FORM>
-<TR>
-<TD> <IMG src="../images/howstuffworks.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/sfgate.gif" WIDTH=83 HEIGHT=19></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/usatoday.gif" WIDTH=54 HEIGHT=31></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/excite.gif" WIDTH=56 HEIGHT=25></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/espn.gif"></TD>
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/washingtonpost.gif" WIDTH=31 HEIGHT=29></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/espn.gif"></TD>
-</TR>
-</FORM>
-</TABLE>
-
-<TABLE> 
-  <tr><td>Images with height/width never specified</td></tr>
-<FORM>
-<TR>
-<TD><IMG src="../images/google.gif"></TD> 
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD><IMG src="../images/cnn.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/canoe.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/canoe.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/washingtonpost.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/sun.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/yahoo.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/abc.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/latimes.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif"></TD>
-        
-        
-</TR>
-</FORM>
-<FORM>
-<TR>
-<TD><IMG src="../images/howstuffworks.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/ananova.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/sfgate.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/usatoday.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/excite.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/espn.gif"></TD>
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/washingtonpost.gif"></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/espn.gif"></TD>
-</TR>
-</FORM>
-
-</TABLE>
-
-<TABLE>
-  <tr><td>Images with height/width always specified</td></tr>
-<FORM>
-<TR>
-<TD><IMG src="../images/google.gif" width=75 height=32></TD>      
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD><IMG src="../images/cnn.gif" width=44 height=22></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/canoe.gif" width=89 height=13></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/canoe.gif" width=89 height=13></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/washingtonpost.gif" WIDTH=31 HEIGHT=29></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/sun.gif" width=62 height=21></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/yahoo.gif" width=70 height=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/abc.gif" WIDTH=42 HEIGHT=26></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/latimes.gif" WIDTH=84 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-        
-        
-</TR>
-</FORM>
-<FORM>
-<TR>
-<TD> <IMG src="../images/howstuffworks.gif" width=59 height=32 ></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/ananova.gif" WIDTH=90 HEIGHT=15></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/sfgate.gif" WIDTH=83 HEIGHT=19></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD><IMG src="../images/usatoday.gif" WIDTH=54 HEIGHT=31></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG src="../images/excite.gif" WIDTH=56 HEIGHT=25></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG SRC="../images/espn.gif" width=53 height=15></TD>
-</TR>
-</FORM>
-
-
-<FORM>
-<TR>
-<TD> <IMG SRC="../images/washingtonpost.gif" WIDTH=31 HEIGHT=29></TD>
-</TR>
-</FORM>
-
-<FORM>
-<TR>
-<TD> <IMG SRC="../images/espn.gif" width=53 height=15></TD>
-</TR>
-</FORM>
-
-</TABLE>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/bugs/bug965.html b/layout/html/tests/table/bugs/bug965.html
deleted file mode 100644
index d426e8011547..000000000000
--- a/layout/html/tests/table/bugs/bug965.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html> 
-<head> 
-<title>965</title> 
-</head> 
-<body> 
-
-<table style="border: thin solid red"> 
-<tr> 
-<td style="border: thin solid green">one</td> 
-<td style="border: thin solid red">two</td> 
-<td style="border: thin solid blue">three</td> 
-</tr> 
-<tr> 
-<td style="border: thin solid green">four</td> 
-<td style="border: thin solid yellow">five</td> 
-<td style="border: thin solid orange">six</td></tr> 
-</table> 
-
-<br> 
-
-<table border=2 style="border: thin solid red"> 
-<tr> 
-<td style="border: thin solid green">one</td> 
-<td style="border: thin solid red">two</td> 
-<td style="border: thin solid blue">three</td> 
-</tr> 
-<tr> 
-<td style="border: thin solid green">four</td> 
-<td style="border: thin solid yellow">five</td> 
-<td style="border: thin solid orange">six</td> 
-</tr> 
-</table> 
-
-<br>
-
-should be 2px solid red around table
-<table style="border: 2px solid red" border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-
-<br>
-
-should be medium solid red around table
-<table style="border:solid red" border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-</body></html>
-
-</body> 
-</html> 
diff --git a/layout/html/tests/table/bugs/bug97138.html b/layout/html/tests/table/bugs/bug97138.html
deleted file mode 100644
index 930320b3e62f..000000000000
--- a/layout/html/tests/table/bugs/bug97138.html
+++ /dev/null
@@ -1,161 +0,0 @@
-table height=200
-<table height=200 border=1>
- <tr style="height:80%">
-  <td>80% height row</td>
- </tr>
- <tr style="height:80%">
-  <td>80% height row</td>
- </tr>
-</table>
-<BR>
-table height=200
-<table height=200 border=1>
- <tr style="height:300">
-  <td>400 height row</td>
- </tr>
-</table>
-
-<!--
-<table border=1 cellpadding=0 cellspacing=0>
-<tr>
-<td><img src="http://home.netscape.com/images/x.gif" HEIGHT=200 WIDTH=10>Cell
-A1</td>
-<td height=100%><table height=100% border=2><tr><td BGDOLOR=#cc00cc
-HEIGHT=30>Cell B1</td></tr><tr><td bgcolor=#99cc99>Cell B2</td></tr></table></td>
-</tr>
-</table>
-<table height=100% bgcolor=blue border>
- <tr>
-  <td height=20%>20%</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue border>
- <tr height=50>
-  <td>row 50</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table width=5 bgcolor=blue border>
- <tr>
-  <td height=5>5 5 5</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<table bgcolor=blue height=100 border>
- <tr>
-  <td height=200>200</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue border>
- <tr>
-  <td height=200>200</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange width=20 border>
- <tr>
-  <td height=100 rowspan=2>100</td>
-  <td height=100>100</td>
- </tr>
- <tr>
-  <td height=100>100 100 100</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=yellow border>
- <tr>
-  <td height=100%>100%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange height=100% border>
- <tr>
-  <td height=20%>20%</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=gray border>
- <tr>
-  <td height=5%>5%</td>
-  <td height=200>200</td>
- </tr>
-</table>
-<BR>
-<table height=200 bgcolor=orange border>
- <tr>
-  <td height=50%>50%</td>
-  <td height=20>20</td>
- </tr>
-</table>
-<BR>
-<table height=100% border>
- <tr>
-  <td height=500>500</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=red height=100% border>
- <tr>
-  <td height=500 rowspan=2>500</td>
-  <td>auto</td>
- </tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
- </tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td height=400><table bgcolor=blue height=100%><tr><td>100%</td></tr></table></td>
- </tr>
-</table>
-
-
-
-<table border>
- <tr>
-  <td height=300 rowspan=2>300</td>
-  <td height=30>30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 </td>
- </tr>
- <tr>
-  <td height=100>100</td>
- </tr>
-</table>
-
-<table height=200 border>
- <tr>
-  <td height=50>50</td>
-  <td height=75%>75%</td>
- </tr>
- <tr>
-  <td height=25%>25%</td>
- </tr>
-</table>
--->
diff --git a/layout/html/tests/table/bugs/bug97383.html b/layout/html/tests/table/bugs/bug97383.html
deleted file mode 100644
index d08f84150e47..000000000000
--- a/layout/html/tests/table/bugs/bug97383.html
+++ /dev/null
@@ -1 +0,0 @@
-<head><html><title>Testcase for bug 97383</title></head><body><table><tr><td width="160"><div style="width: 15px; height: 100px; background-color: blue; float: left">&nbsp</div><img src="../images/mozilla-banner.gif" width="125" height="125"></td><td width="100%">&nbsp;</td></tr></table></body></html>
diff --git a/layout/html/tests/table/bugs/bug98196.html b/layout/html/tests/table/bugs/bug98196.html
deleted file mode 100644
index cb6fa2c8605b..000000000000
--- a/layout/html/tests/table/bugs/bug98196.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-<BODY>
-
-<table border=1 width=100% height=100%>
-  <tr>
-    <td>top</td>
-  </tr><tr>
-    <td>bottom</td>
-  </tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/bugs/bug9879-1.html b/layout/html/tests/table/bugs/bug9879-1.html
deleted file mode 100644
index e83b7766f92a..000000000000
--- a/layout/html/tests/table/bugs/bug9879-1.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<TABLE BORDER=1>
- <TR>
-  <TD ROWSPAN=0>rowspan 0</TD>
-  <TD COLSPAN=0>colspan 0</TD>
- </TR>
- <TR>
-  <TD>5</TD>
-  <TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-
-<TABLE BORDER=1>
- <TR>
-  <TD COLSPAN=0>colspan 0</TD>
-  <TD>3</TD>
- </TR>
- <TR>
-  <TD>4</TD><TD>5</TD><TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-  
-<TABLE BORDER=1>
- <TR>
-  <TD>1</TD>
-  <TD ROWSPAN=2 COLSPAN=0>rowspan 0 colspan 0</TD>
- </TR>
- <TR>
-  <TD>4</TD><TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-
-<TABLE BORDER=1>
- <TR>
-  <TD>1</TD>
-  <TD ROWSPAN=2>2</TD>
- </TR>
- <TR>
-  <TD ALIGN=center COLSPAN=0>3</TD>
- </TR>
-</TABLE>  
-
-<BR>
-
-<table border>
-<tr>
- <td>auto</td>
- <td rowspan=0>rowspan 0</td>
- <td>auto</td>
-</tr>
-<tr>
- <td>auto</td>
- <td>auto</td>
- <td>auto</td>
-</tr>
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug9879.html b/layout/html/tests/table/bugs/bug9879.html
deleted file mode 100644
index 26da14ed2870..000000000000
--- a/layout/html/tests/table/bugs/bug9879.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<TABLE BORDER=1>
- <TR>
-  <TD ROWSPAN=0>rowspan 0</TD>
-  <TD COLSPAN=0>colspan 0</TD>
- </TR>
- <TR>
-  <TD>5</TD>
-  <TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-
-<TABLE BORDER=1>
- <TR>
-  <TD COLSPAN=0>colspan 0</TD>
-  <TD>3</TD>
- </TR>
- <TR>
-  <TD>4</TD><TD>5</TD><TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-  
-<TABLE BORDER=1>
- <TR>
-  <TD>1</TD>
-  <TD ROWSPAN=2 COLSPAN=0>rowspan 0 colspan 0</TD>
- </TR>
- <TR>
-  <TD>4</TD><TD>6</TD>
- </TR>
-</TABLE>
-
-<BR>
-
-<TABLE BORDER=1>
- <TR>
-  <TD>1</TD>
-  <TD ROWSPAN=2>2</TD>
- </TR>
- <TR>
-  <TD ALIGN=center COLSPAN=0>3</TD>
- </TR>
-</TABLE>  
-
-<BR>
-
-<table border>
-<tr>
- <td>auto</td>
- <td rowspan=0>rowspan 0</td>
- <td>auto</td>
-</tr>
-<tr>
- <td>auto</td>
- <td>auto</td>
- <td>auto</td>
-</tr>
-</table>
-
diff --git a/layout/html/tests/table/bugs/bug99923.html b/layout/html/tests/table/bugs/bug99923.html
deleted file mode 100644
index dd7effa1d64d..000000000000
--- a/layout/html/tests/table/bugs/bug99923.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//Dtd HTML 4.0 Transitional//EN">
-
-
-
-<html>
-
-<head>
-<title>testcase for dtd standard mode</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-<script>
-
-function buildTable_dom_html() {
-
-var t2 = document.getElementsByTagName("TABLE")[1];
-t2.cellPadding="10";
-}
-</script>
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000" onload="buildTable_dom_html()">
-both tables should look identical
-
-<table border="1" cellpadding="10">
-<tr><td> cell </td></tr></table>
-
-<table border="1" >
-<tr><td> cell</td></tr></table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/bugs/bug99948.html b/layout/html/tests/table/bugs/bug99948.html
deleted file mode 100644
index 86f1adfcb50e..000000000000
--- a/layout/html/tests/table/bugs/bug99948.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-<head>
-<title>!</title>
-<style>
-td{ background-color: #CCDDFF;
-    border: 1px solid black;
-    margin: 1px;
-    padding: 1px;}
-img{  background-color: silver;
-      width: 120px;
-      height: 20px;
-      border: 1px solid black;
-      margin: 2px;
-      padding: 2px;}
-input{background-color: #CCAAFF;
-      margin: 1px;
-      padding: 1px;} 
-</style>
-</head>
-<body bgcolor=white>
-
-the purple text input control must be in the same line with the grey image
-
-<table>
- <tr>
-  <td><input type=text name=keyword><img></td>
- </tr>
-</table>
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/bugs/helloWorld.html b/layout/html/tests/table/bugs/helloWorld.html
deleted file mode 100644
index 95d09f2b1015..000000000000
--- a/layout/html/tests/table/bugs/helloWorld.html
+++ /dev/null
@@ -1 +0,0 @@
-hello world
\ No newline at end of file
diff --git a/layout/html/tests/table/bugs/rtest.lst b/layout/html/tests/table/bugs/rtest.lst
deleted file mode 100644
index 31ff08fed3b3..000000000000
--- a/layout/html/tests/table/bugs/rtest.lst
+++ /dev/null
@@ -1,494 +0,0 @@
-bug10009.html
-bug100334.html
-bug106336.html
-bug106816.html
-bug1010.html
-bug101201.html
-bug101759.html
-bug10140.html
-bug120107.html
-bug102145-1.html
-bug102145-2.html
-bug102145-3.html
-bug102145-4.html
-bug10216.html
-bug10269-1.html
-bug10269-2.html
-bug10296-1.html
-bug10296-2.html
-bug103533.html
-bug104898.html
-bug1055-1.html
-bug1055-2.html
-bug10036.html
-bug10039.html
-bug10565.html
-bug10633.html
-bug1067-1.html
-bug1067-2.html
-bug106966.html
-bug108340.html
-bug109043.html
-bug11026.html
-bug110566.html
-bug1128.html
-bug11321.html
-bug11331.html
-bug113235-1.html
-bug113235-2.html
-bug113235-3.html
-bug113424.html
-bug11384q.html
-bug11384s.html
-bug1163-1.html
-bug1164.html
-bug1188.html
-bug11944.html
-bug11945.html
-bug119786.html
-bug13196.html
-bug12008.html
-bug120364.html
-bug1220.html
-bug12287.xul
-bug1224.html
-bug12268.html
-bug12384.html
-bug123862.html
-bug1261.html
-bug126742.html
-bug1262.html
-bug12709.html
-bug127267.html
-bug1271.html
-bug128229.html
-bug128876.html
-bug12908-1.html
-bug12908-2.html
-bug12012.xul
-bug12910.html
-bug12910-2.html
-bug1296.html
-bug1302.html
-bug13105.html
-bug131020.html
-bug131020.html
-bug131020-2.html
-bug131020-3.html
-bug13118.html
-bug1318.html
-bug13169.html
-bug13169.html
-bug133756-1.html
-bug133756-2.html
-bug133948.html
-bug13526.html
-bug137388-1.html
-bug137388-2.html
-bug137388-3.html
-bug138725.html
-bug139524-1.html
-bug139524-2.html
-bug139524-3.html
-bug139524-4.html
-bug139843.html
-bug14007-1.html
-bug14007-2.html
-bug14159-1.html
-bug14159-2.html
-bug14159-3.html
-bug141818.html
-bug1430.html
-bug14323.html
-bug149275-1.html
-bug149275-2.html
-bug14929.html
-bug154780.html
-bug15544.html
-bug14489.html
-bug1474.html
-bug145572.html
-bug15247.html
-bug15933.html
-bug159108.html
-bug16012.html
-bug16252.html
-bug1647.html
-bug17130-1.html
-bug17130-2.html
-bug17138.html
-bug1725.html
-bug17548.html
-bug17168.html
-bug174470.html
-bug175455-4.html
-bug17587.html
-bug17826.html
-bug178739.html
-bug178762.html
-bug178855.xml
-bug1800.html
-bug1802.html
-bug1802s.html
-bug1809.html
-bug1818-1.html
-bug1818-2.html
-bug1818-3.html
-bug1818-4.html
-bug1818-5.html
-bug1818-6.html
-bug1828.html
-bug18359.html
-bug18440.html
-bug18558.html
-bug18664.html
-bug18770.html
-bug18955.html
-bug19061-1.html
-bug19061-2.html
-bug19356.html
-bug194024.html
-bug19526.html
-bug19599.html
-bug196870.html
-bug2050.html
-bug20579.html
-bug2065.html
-bug20804.html
-bug2123.html
-bug21299.html
-bug21518.html
-bug215629.html
-bug217527.html
-bug21918.html
-bug219693-1.html
-bug219693-2.html
-bug22019.html
-bug220536.html
-bug220653.html
-bug22122.html
-bug221784-1.html
-bug221784-2.html
-bug22246-2.html
-bug22246-2a.html
-bug22246-3.html
-bug22246-3a.html
-bug222336.html
-bug222467.html
-bug222846.html
-bug2267.html
-bug22513.html
-bug227123.xml
-bug2296.html
-bug23072.html
-bug23151.html
-bug23235.html
-bug23299.html
-bug234593.html
-bug23847.html
-bug23994.html
-bug240248.html
-bug24200.html
-bug24627.html
-bug24503.html
-bug24503.html
-bug24661.html
-bug2479-1.html
-bug2479-2.html
-bug2479-3.html
-bug2479-4.html
-bug2479-5.html
-bug24880.html
-bug24880-1.html
-bug25004.html
-bug25074.html
-bug25086.html
-bug2509.html
-bug2516.html
-bug25367.html
-bug253781.html
-bug25663.html
-bug25707.html
-bug2585.html
-bug26178.html
-bug263050.html
-bug26553.html
-bug2684.html
-bug269566.html
-bug27038-1.html
-bug27038-2.html
-bug27038-3.html
-bug275625.html
-bug2757.html
-bug2763.html
-bug2773.html
-bug277062.html
-bug278266.html
-bug278385.html
-bug27993-1.html
-bug27993-2.html
-bug280009.html
-bug280217.html
-bug282172.html
-bug28341.html
-bug286137.html
-bug28856.xul
-bug2886.html
-bug2886-2.html
-bug28928.html
-bug29058-1.html
-bug29058-2.html
-bug29058-3.html
-bug29157.html
-bug29314.html
-bug29326.html
-bug29429.html
-bug2947.html
-bug294823.html
-bug2954.html
-bug2962.html
-bug2973.html
-bug2981-1.html
-bug2981-2.html
-bug299723.html
-bug28933.html
-bug2997.html
-bug30273.html
-bug30332-1.html
-bug30332-2.html
-bug3037-1.html
-bug3037-2.html
-bug30418.html
-bug30559.html
-bug30985.html
-bug30692.html
-bug3103.html
-bug3105.html
-bug312770.html
-bug3166-1.html
-bug3166-2.html
-bug3166-3.html
-bug3166-4.html
-bug3166-5.html
-bug3166-6.html
-bug3166-7.html
-bug3166-8.html
-bug3166-9.html
-bug3166-10.html
-bug3166-11.html
-bug3166-12.html
-bug3166-13.html
-bug3166-14.html
-bug3166-15.html
-bug3166-16.html
-bug3166-17.html
-bug3166-18.html
-bug3191.html
-bug32205-1.html
-bug32205-2.html
-bug32205-3.html
-bug32205-4.html
-bug32205-5.html
-bug3260.html
-bug32447.html
-bug3263.html
-bug32841.html
-bug3309-1.html
-bug3309-2.html
-bug33137.html
-bug33784.html
-bug33855.html
-bug34176.html
-bug3454.html
-bug34538.html
-bug3517.html
-bug35662.html
-bug3681-1.html
-bug3681-2.html
-bug3718.html
-bug38916.html
-bug3977.html
-bug39209.html
-bug40828.html
-bug4093.html
-bug41890.html
-bug42043.html
-bug42187.html
-bug4284.html
-bug4294.html
-bug42443.html
-bug43039.html
-bug43204.html
-bug4382.html
-bug4385.html
-bug43854-1.html
-bug43854-2.html
-bug44505.html
-bug4427.html
-bug4429.html
-bug44523.html
-bug46268-1.html
-bug46268-2.html
-bug46268-3.html
-bug46268-4.html
-bug46268-5.html
-bug4501.html
-bug45055.html
-bug45055-2.html
-bug4520.html
-bug4523.html
-bug4527.html
-bug4527.html
-bug45350.html
-bug45486.html
-bug45621.html
-bug4576.html
-bug46268.html
-bug46368-1.html
-bug46368-2.html
-bug46480-1.html
-bug46480-2.html
-bug46623-1.html
-bug46623-2.html
-bug46924.html
-bug46944.html
-bug47163.html
-bug4739.html
-bug47432.html
-bug48028-1.html
-bug48028-2.html
-bug4803.html
-bug4849.html
-bug4849-2.html
-bug48827.html
-bug50695-1.html
-bug50695-2.html
-bug51000.html
-bug51037.html
-bug51140.html
-bug51727.html
-bug5188.html
-bug52505.html
-bug52506.html
-bug53663.html
-bug53690-1.html
-bug53690-2.html
-bug53891.html
-bug54450.html
-bug5538.html
-bug55527.html
-bug55545.html
-bug55694.html
-bug55789.html
-bug56024.html
-bug56024.html
-bug56201.html
-bug56563.html
-bug57300.html
-bug57378.html
-bug57828.html
-bug57828.html
-bug57828-2.html
-bug5797.html
-bug5798.html
-bug5799.html
-bug5835.html
-bug5838.html
-bug58402-1.html
-bug58402-2.html
-bug59252.html
-bug59354.html
-bug60013.html
-bug60749.html
-bug60804.html
-bug60807.html
-bug60992.html
-bug61042-1.html
-bug61042-2.html
-bug6184.html
-bug625.html
-bug6304.html
-bug63785.html
-bug641-1.html
-bug641-2.html
-bug6404.html
-bug647.html
-bug650.html
-bug65372.html
-bug6674.html
-bug6674.html
-bug67915-1.html
-bug67915-2.html
-bug67864.html
-bug68912.html
-bug68998.html
-bug69187.html
-bug69382-1.html
-bug69382-2.html
-bug709.html
-bug7112-1.html
-bug7112-2.html
-bug7113.html
-bug7121-1.html
-bug7121-2.html
-bug72393.html
-bug7243.html
-bug72359.xml
-bug727.html
-bug73321.html
-bug7342.html
-bug73629.html
-bug7471.html
-bug75250.html
-bug7714.html
-bug78162.html
-bug8032-1.html
-bug8032-2.html
-bug80762-1.html
-bug80762-2.html
-bug81934.html
-bug82946-1.html
-bug82946-2.html
-bug8361.html
-bug8381.html
-bug8411.xml
-bug83786.html
-bug8499.html
-bug86220.html
-bug86708.html
-bug88035-1.html
-bug88035-2.html
-bug88524.html
-bug8858.html
-bug89315.html
-bug8950.html
-bug9024.html
-bug9072.html
-bug91057.html
-bug9123-1.html
-bug9123-2.html
-bug92143.html
-bug92647-1.html
-bug92647-2.html
-bug92868.html
-bug92868_1.html
-bug93363.html
-bug963.html
-bug9271-1.html
-bug9271-2.html
-bug96334.html
-bug96343.html
-bug965.html
-bug97383.html
-bug98196.html
-bug9879.html
-bug9879-1.html
-97619.html
-bug85016.html
-bug99923.html
-bug99948.html
-bug97138.html
-bug101674.html
-# bug 141021 below does not fail as a local file
-# http://bugzilla.mozilla.org/attachment.cgi?id=81602&action=view
-bug157890.html
diff --git a/layout/html/tests/table/collapsing_borders/bug127040.html b/layout/html/tests/table/collapsing_borders/bug127040.html
deleted file mode 100644
index 46bd9a1ed6d2..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug127040.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html public "-//w3c//dtd html 3.2//en">
-
-<html>
-
-<head>
-<title>testcase for bug 127040</title>
-<meta name="GENERATOR" content="Arachnophilia 4.0">
-<meta name="FORMATTER" content="Arachnophilia 4.0">
-</head>
-
-<body bgcolor="#ffffff" text="#000000" link="#0000ff" vlink="#800080" alink="#ff0000">
-
-<TABLE style="background-color: green; border-collapse: collapse; border-color:
-blue; border-style: solid; border-width: 2px; ">
-<TR>
-<TD style="background-color: red; border-color: blue; border-width: 2px;
-border-style: solid; ">asdf</TD>
-<TD style="border-color: blue; border-width: 2px; border-style: solid; ">qwer</TD>
-</TR>
-<TR>
-<TD style="background-color: red; border-color: blue; border-width: 2px;
-border-style: solid; ">fdsa</TD>
-<TD style="background-color: red; border-color: blue; border-width: 2px;
-border-style: solid; ">rewq</TD>
-</TR>
-<TR>
-<TD style="border-color: blue; border-width: 2px; border-style: solid; ">zxcv</TD>
-<TD style="border-color: blue; border-width: 2px; border-style: solid; ">uiop</TD>
-</TR>
-</TABLE>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-1.html b/layout/html/tests/table/collapsing_borders/bug41262-1.html
deleted file mode 100644
index 7b9d5a0cbae7..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-1.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=13065&action=view -->
-<HTML><HEAD><TITLE>Untitled</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<STYLE>TD {
-	FONT-SIZE: 30px
-}
-</STYLE>
-
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<TABLE id=table1 
-style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid; BORDER-COLLAPSE: collapse">
-  <TBODY>
-  <TR>
-    <TD>foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR>
-  <TR>
-    <TD 
-    style="BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none">foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR></TBODY></TABLE>
-<P>
-<TABLE id=table2 
-style="BORDER-RIGHT: 25px solid; BORDER-TOP: 25px solid; BORDER-LEFT: 25px solid; BORDER-BOTTOM: 25px solid; BORDER-COLLAPSE: collapse">
-  <TBODY>
-  <TR>
-    <TD>foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR>
-  <TR>
-    <TD 
-    style="BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none">foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR></TBODY></TABLE>
-<P>
-<TABLE id=table3 
-style="BORDER-RIGHT: 50px solid; BORDER-TOP: 50px solid; BORDER-LEFT: 50px solid; BORDER-BOTTOM: 50px solid; BORDER-COLLAPSE: collapse">
-  <TBODY>
-  <TR>
-    <TD>foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR>
-  <TR>
-    <TD 
-    style="BORDER-RIGHT: medium none; BORDER-TOP: medium none; BORDER-LEFT: medium none; BORDER-BOTTOM: medium none">foo</TD>
-    <TD 
-    style="BORDER-RIGHT: solid; BORDER-TOP: solid; BORDER-LEFT: solid; BORDER-BOTTOM: solid">bar</TD></TR></TBODY></TABLE></P></BODY></HTML>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-2.html b/layout/html/tests/table/collapsing_borders/bug41262-2.html
deleted file mode 100644
index 1f4ee028bc1e..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-2.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=63256&action=view -->
-<HTML><HEAD><TITLE>border-collapse testfiles</TITLE>
-<META content="MSHTML 6.00.2600.0" name=GENERATOR>
-<META content="Arachnophilia 4.0" name=FORMATTER>
-<META http-equiv=Content-Type content="text/html; charset=utf-8"></HEAD>
-<BODY>
-<H3>border-collapse testfiles</H3>
-<UL>
-  <LI><A 
-  href="http://msdn.microsoft.com/workshop/samples/author/dhtml/refs/borderCollapse.htm">the 
-  microsoft example border-collapse</A> 
-  <LI><A 
-  href="http://msdn.microsoft.com/workshop/samples/author/dhtml/refs/rules.htm">the 
-  microsoft example rules</A> 
-  <LI><A 
-  href="http://msdn.microsoft.com/workshop/samples/author/dhtml/refs/table_rules_border.htm">the 
-  microsoft example rules-border</A> 
-  <LI><A 
-  href="http://msdn.microsoft.com/workshop/samples/author/dhtml/refs/tables3.htm">the 
-  microsoft example fixed-layout</A> 
-  <LI><A 
-  href="http://www.netzwelt.com/selfhtml/css/eigenschaften/anzeige/border_collapse.htm">netzwelt.de 
-  border collapse</A> 
-  <LI><A 
-  href="http://www.netzwelt.com/selfhtml/html/tabellen/anzeige/table_rules.htm">netzwelt.de 
-  rules</A> 
-  <LI><A 
-  href="http://dbaron.org/css/test/tborder1">dbaron 
-  tborder1</A> 
-  <LI><A 
-  href="http://dbaron.org/css/test/tborder2">dbaron 
-  tborder2</A> 
-  <LI><A 
-  href="http://www.mbdavis.com/weav/htmlsig010423/properties/border-example.html">border 
-  spacing</A> 
-  <LI><A 
-  href="http://www.richinstyle.com/test/tables/collapsingborders.php">rich in 
-  style collapsing borders</A> 
-  <LI><A href="http://www.richinstyle.com/test/tables/borderspacing.php">rcih in 
-  style borderspacing</A> 
-  <LI><A href="http://www.xs4all.nl/~ppk/css2tests/tables.html">fun with 
-  tables</A> 
-  <LI><A 
-  href="http://www.chem.uni-potsdam.de/inet_kurs/css/css-examples/ex51.html">another 
-  example</A> 
-  <LI><A 
-  href="http://www.editions-eyrolles.com/livres/glazman/tests/tables/tables5.htm">glazou5</A> 
-
-  <LI><A 
-  href="http://www.editions-eyrolles.com/livres/glazman/tests/tables/tables6.htm">glazou6</A> 
-
-  <LI><A 
-  href="http://www.editions-eyrolles.com/livres/glazman/tests/tables/tables7.htm">glazou7</A> 
-
-  <LI><A 
-  href="http://www.editions-eyrolles.com/livres/glazman/tests/tables/tables8.htm">glazou8</A> 
-
-  <LI><A 
-  href="http://www.editions-eyrolles.com/livres/glazman/exemples/ex142.htm">example 
-  142</A> 
-  <LI><A href="http://www.robinlionheart.com/stds/html4/tables.html">robin table 
-  4</A> 
-  <LI><A 
-  href="http://www.bath.ac.uk/~py8ieh/internet/projects/mozilla/table-separated-row-borders.html">Hixie1</A> 
-
-  <LI><A 
-  href="http://www.bath.ac.uk/~py8ieh/internet/projects/mozilla/table-collapsed-border-col.html">Hixie2</A> 
-
-  <LI><A href="http://blib.win.tue.nl/~tinus/saved.html">tinus</A> 
-</LI></UL>quirks mode 
-<UL>
-  <LI><A 
-  href="http://mozilla.org/quality/browser/standards/html/table_rules_none.html">table_rules_none</A> 
-
-  <LI><A 
-  href="http://mozilla.org/quality/browser/standards/html/table_rules_groups.html">table_rules_groups</A> 
-
-  <LI><A 
-  href="http://mozilla.org/quality/browser/standards/html/table_rules_cols.html">table_rules_cols</A> 
-
-  <LI><A 
-  href="http://mozilla.org/quality/browser/standards/html/table_rules_all_2.html">table_rules_all_2</A> 
-  </LI></UL>bugzilla testcases 
-<UL>
-  <LI><A 
-  href="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=1388">bug12462</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=7539">bug 
-  2068</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=2510&amp;action=view">bug 
-  2130</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=12720&amp;action=view">bug 
-  2130</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=717&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=720&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=721&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=810&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=951&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=966&amp;action=view">bug 
-  2436</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=11135">bug 
-  3000</A> 
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=668&amp;action=view">bug9191</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=3298&amp;action=view">bug21076</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=4030&amp;action=view">bug21076</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=9574&amp;action=view">bug21076</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=3919&amp;action=view">bug22897</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=24992&amp;action=view">bug24113</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=41726&amp;action=view">bug24113</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=11180&amp;action=view">bug43039</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=13065&amp;action=view">bug41262</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=12732&amp;action=view">bug48538</A> 
-
-  <LI><A 
-  href="http://bugzilla.mozilla.org/attachment.cgi?id=12734&amp;action=view">bug48538</A> 
-  </LI></UL>worth reading 
-<UL>
-  <LI><A 
-  href="http://lists.w3.org/Archives/Public/www-style/1999Jul/0077.html">dbaron0799</A> 
-
-  <LI><A 
-  href="http://lists.w3.org/Archives/Public/www-style/1999Jul/0083.html">bert 
-  bos reply</A> 
-  <LI><A 
-  href="http://lists.w3.org/Archives/Public/www-style/2000Jul/0011.html">fantasai 
-  + replies</A> </LI></UL></BODY></HTML>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-3.html b/layout/html/tests/table/collapsing_borders/bug41262-3.html
deleted file mode 100644
index c6ca52daa994..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-3.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=69028&action=view -->
-<HTML><HEAD><TITLE>Collapsing Border Test Case</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-15">
-<STYLE type=text/css>TABLE {
-	MARGIN-TOP: 1em; MARGIN-BOTTOM: 1em
-}
-TABLE.test1 {
-	BORDER-RIGHT: red 5px solid; BORDER-TOP: red 5px solid; BORDER-LEFT: red 5px solid; BORDER-BOTTOM: red 5px solid; BORDER-COLLAPSE: collapse; border-spacing: 5px
-}
-TABLE.test1 TD {
-	BORDER-RIGHT: green 4px solid; BORDER-TOP: green 4px solid; BORDER-LEFT: green 4px solid; BORDER-BOTTOM: green 4px solid
-}
-TABLE.test1 TD.cell3 {
-	BORDER-RIGHT: blue 6px solid; BORDER-TOP: blue 6px solid; BORDER-LEFT: blue 6px solid; BORDER-BOTTOM: blue 6px solid
-}
-TABLE.test2 #col1 {
-	BORDER-RIGHT: black 3px solid; BORDER-TOP: black 3px solid; BORDER-LEFT: black 3px solid; BORDER-BOTTOM: black 3px solid
-}
-TABLE.test2 TD {
-	BORDER-RIGHT: red 1px solid; PADDING-RIGHT: 1em; BORDER-TOP: red 1px solid; PADDING-LEFT: 1em; PADDING-BOTTOM: 1em; BORDER-LEFT: red 1px solid; PADDING-TOP: 1em; BORDER-BOTTOM: red 1px solid
-}
-TABLE.test2 TD.solid-blue {
-	BORDER-RIGHT: blue 5px dashed; BORDER-TOP: blue 5px dashed; BORDER-LEFT: blue 5px dashed; BORDER-BOTTOM: blue 5px dashed
-}
-TABLE.test2 TD.solid-green {
-	BORDER-RIGHT: green 5px solid; BORDER-TOP: green 5px solid; BORDER-LEFT: green 5px solid; BORDER-BOTTOM: green 5px solid
-}
-TABLE.test2 {
-	BORDER-RIGHT: yellow 5px solid; BORDER-TOP: yellow 5px solid; BORDER-LEFT: yellow 5px solid; BORDER-BOTTOM: yellow 5px solid; BORDER-COLLAPSE: collapse
-}
-TABLE.test3 {
-	BORDER-COLLAPSE: collapse
-}
-TABLE.test3 TR {
-	BORDER-TOP: black 2px solid
-}
-TABLE.test3 TR:unknown {
-	BORDER-TOP-STYLE: none
-}
-TABLE.test3 TD {
-	FONT-WEIGHT: bolder; WIDTH: 3em; TEXT-ALIGN: center
-}
-</STYLE>
-
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<P>Following table should have 6px solid blue border around cell 3, red 5px 
-solid border around the rest of table and green 4px solid border between cell 1 
-and cell 2. The red border should override the green border around the cells 
-because it's thicker and the blue border should override the red border for the 
-same reason. </P>
-<TABLE class=test1>
-  <TBODY>
-  <TR>
-    <TD>Cell #1</TD>
-    <TD>Cell #2</TD>
-    <TD class=cell3>Cell #3</TD></TR></TBODY></TABLE>
-<P>See <A 
-href="http://www.w3.org/TR/REC-CSS2/tables.html#collapsing-borders">17.6.2 The 
-collapsing border model</A> for following tests: </P>
-<TABLE class=test2>
-  <COLGROUP>
-  <COL id=col1>
-  <COL id=col2>
-  <COL id=col3>
-  <TBODY>
-  <TR id=row1>
-    <TD>1</TD>
-    <TD>2</TD>
-    <TD>3</TD></TR>
-  <TR id=row2>
-    <TD>4</TD>
-    <TD class=solid-blue>5</TD>
-    <TD class=solid-green>6</TD></TR>
-  <TR id=row3>
-    <TD>7</TD>
-    <TD>8</TD>
-    <TD>9</TD></TR>
-  <TR id=row4>
-    <TD>10</TD>
-    <TD>11</TD>
-    <TD>12</TD></TR>
-  <TR id=row5>
-    <TD>13</TD>
-    <TD>14</TD>
-    <TD>15</TD></TR></TBODY></TABLE>
-<P>This is an example rendering for the previous table from <A 
-href="../images/tbl-border-conflict.gif">http://www.w3.org/TR/REC-CSS2/images/tbl-border-conflict.gif</A>: 
-<BR><IMG alt="[Example rendering from w3.org]" 
-src="./images/tbl-border-conflict.gif"> </P>
-<P>Following table should have 2px solid black line between rows. There should 
-be a total of two lines. There will be three lines if user agent doesn't support 
-<CODE>tr:first-child</CODE>. </P>
-<TABLE class=test3>
-  <TBODY>
-  <TR>
-    <TD>a</TD>
-    <TD>b</TD>
-    <TD>c</TD></TR>
-  <TR>
-    <TD>3</TD>
-    <TD>4</TD>
-    <TD>5</TD></TR>
-  <TR>
-    <TD>5</TD>
-    <TD>12</TD>
-    <TD>13</TD></TR></TBODY></TABLE></BODY></HTML>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-4.html b/layout/html/tests/table/collapsing_borders/bug41262-4.html
deleted file mode 100644
index 36a67f0f8495..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-4.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=70097&action=view -->
-<HTML><HEAD><TITLE>borderCollapse</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<STYLE>TD {
-	BORDER-RIGHT: blue thick groove; BORDER-TOP: blue thick groove; BORDER-LEFT: blue thick groove; BORDER-BOTTOM: blue thick groove
-}
-</STYLE>
-
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<BLOCKQUOTE class=body>
-  <CENTER>
-  <TABLE id=oID_1 style="BORDER-COLLAPSE: collapse">
-    <TBODY>
-    <TR>
-      <TD>EST</TD>
-      <TD>9:00 a.m.</TD></TR>
-    <TR>
-      <TD>CST</TD>
-      <TD>8:00 a.m.</TD></TR>
-    <TR>
-      <TD>PST</TD>
-      <TD>6:00 a.m.</TD></TR></TBODY></TABLE>
-  <P><INPUT onclick="document.getElementById('oID_1').setAttribute('style', 'borderCollapse:separate' ) " type=button value=separate> 
-<INPUT onclick="document.getElementById('oID_1').setAttribute('style', 'borderCollapse:collapse' ) " type=button value=collapse></P></CENTER></BLOCKQUOTE></BODY></HTML>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-5.html b/layout/html/tests/table/collapsing_borders/bug41262-5.html
deleted file mode 100644
index 4500b9c6b182..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-5.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=70106&action=view -->
-<HTML><HEAD><TITLE>rules Property</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<CENTER>
-<TABLE id=oID_1 rules=cols>
-  <THEAD>
-  <TR>
-    <TD>EST</TD>
-    <TD>1am</TD>
-    <TD>8pm</TD></TR></THEAD>
-  <TBODY>
-  <TR>
-    <TD>CST</TD>
-    <TD>2am</TD>
-    <TD>9pm</TD></TR>
-  <TR>
-    <TD>MST</TD>
-    <TD>3am</TD>
-    <TD>10pm</TD></TR></TBODY>
-  <TFOOT>
-  <TR>
-    <TD>PST</TD>
-    <TD>4am</TD>
-    <TD>11pm</TD></TR></TFOOT></TABLE>
-<P><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:')">No 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:none')">Exterior 
-border</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style','rules:all')">All 
-borders</BUTTON><BR><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:cols')">Column 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:groups')">Groups 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:rows')">Table 
-row borders</BUTTON> </P></CENTER></BODY></HTML>
diff --git a/layout/html/tests/table/collapsing_borders/bug41262-6.html b/layout/html/tests/table/collapsing_borders/bug41262-6.html
deleted file mode 100644
index 8ed79a7dbb43..000000000000
--- a/layout/html/tests/table/collapsing_borders/bug41262-6.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0063)http://bugzilla.mozilla.org/attachment.cgi?id=70107&action=view -->
-<HTML><HEAD><TITLE>RULES with BORDER property</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<CENTER>
-<TABLE id=oID_1 rules=cols border=1>
-  <THEAD>
-  <TR>
-    <TD>EST</TD>
-    <TD>1am</TD>
-    <TD>8pm</TD></TR></THEAD>
-  <TBODY>
-  <TR>
-    <TD>CST</TD>
-    <TD>2am</TD>
-    <TD>9pm</TD></TR>
-  <TR>
-    <TD>MST</TD>
-    <TD>3am</TD>
-    <TD>10pm</TD></TR></TBODY>
-  <TFOOT>
-  <TR>
-    <TD>PST</TD>
-    <TD>4am</TD>
-    <TD>11pm</TD></TR></TFOOT></TABLE>
-<P><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:')">No 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:none')">Exterior 
-border</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style','rules:all')">All 
-borders</BUTTON><BR><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:cols')">Column 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:groups')">Groups 
-borders</BUTTON><BUTTON 
-onclick="document.getElementById('oID_1').setAttribute('style', 'rules:rows')">Table 
-row borders</BUTTON> </P></CENTER></BODY></HTML>
diff --git a/layout/html/tests/table/core/backgrounds.html b/layout/html/tests/table/core/backgrounds.html
deleted file mode 100644
index 2f97cf6a7d43..000000000000
--- a/layout/html/tests/table/core/backgrounds.html
+++ /dev/null
@@ -1,280 +0,0 @@
-<html><body>
-<BR>
-table - color
-<table cellspacing=6 bgcolor=orange border>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color, image
-<table cellspacing=6 background="../images/box1.gif" bgcolor=orange border>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-cell - color
-<table cellspacing=6 border>
- <tr>
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-cell - image
-<table cellspacing=6 border>
- <tr>
-  <td background="../images/box2.gif">foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-cell - color, image
-<table cellspacing=6 border>
- <tr>
-  <td background="../images/box2.gif" bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color; cell - color
-<table cellspacing=6 bgcolor=orange border>
- <tr>
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image; cell - color
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr>
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image; cell - image
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr>
-  <td background="../images/box2.gif">foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-row group color
-<table cellspacing=6 border>
- <tbody style="background-color: red;">
-  <tr>
-   <td>foo</td>
-   <td>bar</td></tr>
- </tbody>
-</table>
-<BR>
-
-row group color
-<table cellspacing=6 border>
- <tbody style="background-color: red;">
-  <tr>
-   <td>foo</td>
-   <td>bar</td></tr>
- </tbody>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-row color
-<table cellspacing=6 border>
- <tr bgcolor=red>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-row color
-<table cellspacing=6 border>
- <tr bgcolor=red>
-  <td>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-row image
-<table cellspacing=6 border>
- <tr background="..\images\box3.gif">
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color, row color
-<table cellspacing=6 bgcolor=orange border>
- <tr bgcolor=red>
-  <td>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image, row color
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr bgcolor=red>
-  <td>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color; row image
-<table cellspacing=6 bgcolor=orange border>
- <tr background="..\images\box3.gif">
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image, row image
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr background="../images/box3.gif">
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color; row color; cell color
-<table cellspacing=6 bgcolor=orange border>
- <tr bgcolor=red>
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - image; row color; cell color
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr bgcolor=red>
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color; row image; cell color
-<table cellspacing=6 bgcolor=orange border>
- <tr background="..\images\box3.gif">
-  <td bgcolor=#FF55DD>foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-table - color; row color; cell image
-<table cellspacing=6 bgcolor=orange border>
- <tr bgcolor=red>
-  <td background="../images/box2.gif">foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-
-col group color
-<table cellspacing=6 border>
- <colgroup style="background-color: red;">
-  <col>
- </colgroup>
- <tr>
-  <td>foo</td></tr>
-</table>
-<BR>
-
-col color
-<table cellspacing=6 border>
- <col style="background-color: red;">
- <tr>
-  <td>foo</td></tr>
-</table>
-<BR>
-
-table - image; row image; cell image
-<table cellspacing=6 background="../images/box1.gif" border>
- <tr background="../images/box3.gif">
-  <td background="../images/box2.gif">foo</td>
-  <td>bar</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td></tr>
-</table>
-
-<BR>
-table - color, tbodies color, row color
-<table style="padding:6px;" cellspacing=4 bgcolor=orange border>
- <tbody bgcolor=red>
-  <tr bgcolor=yellow>
-   <td>foo</td></tr>
-  <tr>
-   <td>foo</td></tr>
- </tbody>
- <tbody bgcolor=green>
- <tr bgcolorx=green>
-  <td>foo</td>
-  </tr>
-  </tbody>
-</table>
-
-<BR>
-col image
-<table style="padding:6px;" cellspacing=4 border>
-  <col style="background-image: url(../images/box1.gif); background-color:red">
-  <tr>
-   <td>foo</td><td>bar</td></tr>
-  <tr>
-   <td>foo</td><td>bar</td></tr>
-</table>
-
-<BR>
-table color; col group color; col color; row color; cell color
-<table bgcolor=orange cellspacing=4 border>
- <colgroup style="background-color: #FF0000">
-  <col style="background-color: #FF9999;">
-  <col>
- </colgroup>
- <colgroup style="background-color: #0000FF">
-  <col>
-  <col style="background-color: #9999FF;">
- </colgroup>
-  <tr style="background-color: yellow;">
-   <td>foo</td><td style="background-color: orange;">bar</td><td>foo</td><td>bar</td></tr>
-  <tr>
-   <td>foo</td><td>bar</td><td>foo</td><td>bar</td></tr>
-  <tr>
-   <td>foo</td><td>bar</td><td>foo</td><td>bar</td></tr>
-</table>
--->
-</body></html>
diff --git a/layout/html/tests/table/core/bloomberg.html b/layout/html/tests/table/core/bloomberg.html
deleted file mode 100644
index 7e2bdbd0d5b8..000000000000
--- a/layout/html/tests/table/core/bloomberg.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<BODY text="#333333" link="#333333" vlink="#000000" alink="#c0c0c0" bgcolor="#ffffff">
-
-
-<TABLE cellspacing="0" cellpadding="3" border="1" width="630">
-<TR>
-<TD width="143" rowspan="6" bgcolor="#660000" ALIGN="LEFT" VALIGN="TOP">
-<B><A CLASS="navhead" HREF="/markets/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">MARKETS</font><BR></A></B>
-<A CLASS="nav" HREF="/bbn/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">News</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/most_composite.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Stocks</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/techstocks.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Tech Stocks</FONT><BR></A>
-<A CLASS="nav" HREF="/pfc/investing/pfcmovers1.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Stocks on the Move</FONT><BR></A>
-<A CLASS="nav" HREF="XXhttp://quote.bloomberg.com/markets/ipocenter.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">IPO Center</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/wei.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">World Indices</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/C13.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1"><NOBR>Rates &amp; Bonds</NOBR></FONT><BR></A>
-<A CLASS="nav" HREF="/markets/C13.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">U.S. Treasuries</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/currency.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Currencies</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/currency/currcalc.cgi?sidenav=front&T=markets_curr99.ht"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Currency Calculator</FONT><BR></A>
-<A CLASS="nav" HREF="/markets/crb.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Commodities</FONT><BR></A>
-<BR>
-<!-- Non-AOL users -->
-<B><A CLASS="navhead" HREF="/pfc/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">MONEY</FONT><BR></A></B>
-<A CLASS="nav" HREF="/money/mutual/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Mutual Funds</FONT><BR></A>
-<A CLASS="nav" HREF="XXhttp://quote.bloomberg.com/mag/mag1/portfolio.cgi?sidenav=front&view=Current_Summary&version=bloomberg_registered&port_id=1&uuid=0"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Portfolio</FONT><BR></A>
-<A CLASS="nav" HREF="/money/loan/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Loan Center</FONT><BR></A>
-<A CLASS="nav" HREF="/cgi-bin/ilpc.cgi?sidenav=front&T=loan_mort_calc.ht"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Mortgage Calculator</FONT><BR></A>
-<A CLASS="nav" HREF="/personal/feature_new99.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Investing</FONT><BR></A>
-<A CLASS="nav" HREF="/pwealth/new_retire.cgi?sidenav=front&template=money_calcr99.ht"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Retirement</FONT><BR></A>
-<A CLASS="nav" HREF="/negocios/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Negocios Bloomberg</FONT><BR></A>
-<BR>
-<B><A CLASS="navhead" HREF="/products/prod3.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">MAGAZINES</FONT><BR></A></B>
-<A CLASS="nav" HREF="/personal/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Personal Finance</FONT><BR></A>
-<A CLASS="nav" HREF="XXhttp://www.bloomberg.com/wealth/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Wealth Manager</FONT><BR></A>
-<BR>
-<FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1"><B>BUSINESS CENTER</B><BR></FONT>
-<A CLASS="nav" HREF="/smallbiz/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Small Business</FONT><BR></A>
-<BR>
-<B><A CLASS="navhead" HREF="/careers/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">CAREERS</FONT><BR></A></B>
-<BR>
-<B><A CLASS="navhead" HREF="/products/life.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">LIFE</FONT><BR></A></B>
-<A CLASS="nav" HREF="/finer/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">The Finer Things</FONT><BR></A>
-<A CLASS="nav" HREF="XXhttp://quote.bloomberg.com/pgcgi.cgi?sidenav=front&T=life99_topsport.ht"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Sports</FONT><BR></A>
-<A CLASS="nav" HREF="/products/crose.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">Charlie Rose</FONT><BR></A>
-<A CLASS="nav" HREF="/life/bcommerce/index.html?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">B-Commerce</FONT><BR></A><BR>
-<IMG SRC="../images/raptor.jpg" border=0 width=140 height=1><BR>
-<A CLASS="nav" HREF="XXhttp://www.bloomberg.com/cgi-bin/media_register.cgi?sidenav=front"><FONT COLOR="#FFFFFF" FACE="ms sans serif, helvetica" SIZE="-1">To Advertise</FONT><BR></A><BR></TD>
-
-<TD colspan="3" align="center" valign="top" bgcolor="#660000"><IMG alt="" border="0" height="16" src="../images/raptor.jpg" width="465"></TD>
-</TR>
-
-<TR>
-<TD align="CENTER" valign="TOP" width="120"><!--OAS TAG--> <A HREF="XXhttp://ads.bloomberg.com/RealMedia/ads/click_lx.ads/www.bloomberg.com/welcome.html/8228/Middle1/letr-loancntrpromo-front-04-99/letr-compete-120-g.gif/63636233663063623337396466656530" target="_top">
-<IMG SRC="../images/raptor.jpg"  WIDTH=120 HEIGHT=60 ALT="The Loan Center brought to you by Lending Tree"  BORDER="0"></A>
-<!--OAS AD="Middle1"-->
-<IMG SRC="../images/raptor.jpg" WIDTH="120" HEIGHT="1"></TD>
-<td align="RIGHT" valign="TOP" ><!--OAS TAG--> <A HREF="XXhttp://ads.bloomberg.com/RealMedia/ads/click_lx.ads/www.bloomberg.com/welcome.html/19281/Middle2/house-bbmarketmonitor-03-99/house-monitora2-167-g.gif/63636233663063623337396466656530" target="_top">
-<IMG SRC="../images/raptor.jpg"  ALT="Market Monitor" height=60 width=167 BORDER="0"></A>
-<!--OAS AD="Middle2"-->
-<IMG SRC="../images/raptor.jpg" WIDTH="167" HEIGHT="1"></TD>
-<td align="CENTER" valign="TOP" bgcolor="#CCCC99" ROWSPAN="6">
-<FONT COLOR="#333333" SIZE="-3"><FONT FACE="ms sans serif, geneva, arial"><SPAN CLASS="subdes">Tue, 27 Jul 1999, 2:47pm EDT<BR></SPAN></FONT></FONT>
-<FONT SIZE="-1" FACE="ms sans serif, geneva, arial" COLOR="black"><B><SPAN CLASS="headln">Market Snapshot<BR></SPAN></B></FONT>
-<CENTER><A HREF="/markets/index.html"><IMG BORDER="0" SRC="../images/raptor.jpg" WIDTH="175" HEIGHT="270"></A>
-<!--OAS TAG--> <A HREF="XXhttp://ads.bloomberg.com/RealMedia/ads/click_lx.ads/www.bloomberg.com/welcome.html/19787/Right/visa-smallbiz3-front-02-99/bbvani.gif/63636233663063623337396466656530" target="_top">
-<IMG SRC="../images/raptor.jpg"  ALT="Visa Small Business" height=30 width=161 BORDER="0"></A>
-<!--OAS AD="Right"-->
-<FONT SIZE="-1" FACE="ms sans serif, geneva, arial" COLOR="black"><B><SPAN CLASS="headln">Financial Market Update<BR></SPAN></B></FONT>
-<FONT SIZE="-2" FACE="ms sans serif, geneva, arial"><A CLASS="story" HREF="/cgi-bin/MediaPref.cgi?page=front_fin_r">AUDIO</A>&nbsp; | &nbsp; <A CLASS="story" HREF="/cgi-bin/MediaPref.cgi?page=front_fin_v">VIDEO</A>
-</FONT>
-<BR>
-<BR>
-
-<BR>
-<!--OAS TAG--> <A HREF="XXhttp://ads.bloomberg.com/RealMedia/ads/click_lx.ads/www.bloomberg.com/welcome.html/24240/BottomRight/letr-ros_links_to_letr-04-99/letr-ad1-125-g.gif/63636233663063623337396466656530" target="_top">
-<IMG SRC="../images/raptor.jpg"  WIDTH=125 HEIGHT=125 ALT="Apply for a loan with Lending Tree"  BORDER="0"></A>
-<!--OAS AD="BottomRight"-->
-</CENTER></TD>
-</TR>
-
-<TR>
-<td colspan="2" align="LEFT" valign="TOP" bgcolor="#FFFFFF">
-<A HREF="feature.html"><IMG SRC="../images/raptor.jpg" BORDER="0" HEIGHT="26" WIDTH="288" ALT="Today's Feature" ALIGN="left"></A><BR><BR>
-<A HREF="feature.html"><SPAN CLASS="story">Looking for a new approach to investing? How about a portfolio where every holding has a word for its stock symbol? 
-</SPAN></A><BR>
-<SPAN CLASS="story3"><A HREF="feature.html">More...</A></SPAN>
-</TD>
-</TR>
-<TR>
-<td colspan="2" align="LEFT" valign="TOP" bgcolor="#C0C0C0"><IMG SRC="../images/raptor.jpg" BORDER="0" HEIGHT="35" WIDTH="290" ALT="What's New"><BR>
-
-<A HREF="/careers/index.html"><FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subhead"><STRON
-G><U>Use BLOOMBERG.com to Find a New Job</U></STRONG></SPAN></FONT></A><BR>
-<FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subdes">Whether you know what you're looking for or just know you're looking, the new career page offers better searches, news, and calculators than ever before.</SPAN></FONT><BR>
-
-<A HREF="rocketjump.html"><FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subhead"><STRONG><U>Bloomberg News on Rocket eBook</U></STRONG></SPAN></FONT></A><BR>
-<FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subdes">Bloomberg's Top Financial News is now available for download on your Rocket eBook. Get tomorrow's news today with Bloomberg's summary of the day's top stories. Bloomberg daily RocketEditions are FREE until September 1.</SPAN></FONT><BR>
-
-<A HREF="emailjump.html"><FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subhead"><STRONG><U>Bloomberg News to Go</U></STRONG></SPAN></FONT></A><BR>
-<FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subdes">Get tomorrow's news today.  FREE weekday email report of the top stories in business & finance from BLOOMBERG NEWS at 5pm EST.</SPAN></FONT><BR>
-
-<A HREF="/products/specs.html"><FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subhead"><STRONG><U>Bloomberg Year 2000 Letters</U></STRONG></SPAN></FONT></A><BR>
-<FONT FACE="ms sans serif, geneva, arial" SIZE="-1"><SPAN CLASS="subdes">For Y2K information on BLOOMBERG, download our customer letters now.</SPAN></FONT><BR>
-
-
-</TD>
-</TR>
-</TABLE>
-<P>
-<font face="sans-serif, arial" size=-2>&copy;1999 Bloomberg L.P. All rights reserved. <a href="XXhttp://www.bloomberg.com/tos.html">Terms of Service</a>, <A HREF="XXhttp://www.bloomberg.com/privacy.html">Privacy Policy</A> and <A HREF="XXhttp://www.bloomberg.com/trademarks.html">Trademarks</A>.</font>
-
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/core/borders.html b/layout/html/tests/table/core/borders.html
deleted file mode 100644
index 75335518c5bf..000000000000
--- a/layout/html/tests/table/core/borders.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<table style="border: 2px solid red" border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-<br>
-<table style="border:solid red" border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-
-
-<table border> 
-<tr> 
-<td>one</td> 
-<td>two</td> 
-</tr> 
-</table> 
-
-<br>
-
-<table> 
-<tr> 
-<td>no</td> 
-<td>border</td> 
-</tr> 
-</table> 
-
-This table:
-<table style="border: thin solid red" border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-
-<BR>
-
-Should look just like this one:
-<table border=2>
-<tr><td>One</td><td>Two</td></tr>
-</table>
-
-<br>
-
-<table style="border: thin solid red"> 
-<tr> 
-<td style="border: thin solid green">one</td> 
-<td style="border: thin solid red">two</td> 
-</tr> 
-</table> 
-
-<br>
-
-<table style="border: thin solid red"> 
-<tr> 
-<td style="border: thin solid green">one</td> 
-<td style="border: thin solid red">two</td> 
-<td style="border: thin solid blue">three</td> 
-</tr> 
-<tr> 
-<td style="border: thin solid green">four</td> 
-<td style="border: thin solid yellow">five</td> 
-<td style="border: thin solid orange">six</td></tr> 
-</table> 
-
-<br> 
-
-<table border=2 style="border: thin solid red"> 
-<tr> 
-<td style="border: thin solid green">one</td> 
-<td style="border: thin solid red">two</td> 
-<td style="border: thin solid blue">three</td> 
-</tr> 
-<tr> 
-<td style="border: thin solid green">four</td> 
-<td style="border: thin solid yellow">five</td> 
-<td style="border: thin solid orange">six</td> 
-</tr> 
-</table> 
-
-<br>
-
-<table border=5>
- <tr>
-  <td>foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-<BR>
-
-<table border=5>
- <tr>
-  <td style="border:2px solid red">foo</td>
-  <td style="border:2px solid red">bar</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/core/box_sizing.html b/layout/html/tests/table/core/box_sizing.html
deleted file mode 100644
index cb4cb0165757..000000000000
--- a/layout/html/tests/table/core/box_sizing.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<table bgcolor=blue width=100 style="-moz-box-sizing:content-box; border: 20px solid black; padding:10px;" border>
- <tr>
-  <td>foo</td>
- </tr>
- <tr>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue width=100 style="-moz-box-sizing:padding-box; border: 20px solid black; padding:10px;" border>
- <tr>
-  <td>foo</td>
- </tr>
- <tr>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue width=100 style="-moz-box-sizing:border-box; border: 20px solid black; padding:10px;" border>
- <tr>
-  <td>foo</td>
- </tr>
- <tr>
-  <td>bar</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/core/captions.html b/layout/html/tests/table/core/captions.html
deleted file mode 100644
index 293474ed79fd..000000000000
--- a/layout/html/tests/table/core/captions.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<table width=100% height=100% border stylex="border:10px solid black;padding:10px">
- <caption>
-  <nobr>caption is considered part of % width, not so in Nav4.6, 
-        caption is not considered part of %height
-  </nobr>
- </caption>
- <tr><td style="padding:10px;">FOO</td></tr>
-</table>
-<BR>
-<table border>
- <caption align=top>top center</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption align=top style="text-align:right">top right</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption align=bottom>bottom center</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption align=bottom style="text-align:left">bottom left</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption style="caption-side:top">top center</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption style="caption-side:bottom">bottom center</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
-<table border>
- <caption style="vertical-align:bottom">top center</caption>
- <tr>
-  <td>FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO FOO</td>
- </tr>
-</table>
-<br>
diff --git a/layout/html/tests/table/core/captions1.html b/layout/html/tests/table/core/captions1.html
deleted file mode 100644
index feb4cd6484ad..000000000000
--- a/layout/html/tests/table/core/captions1.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<head>
-
-<Script>
-function doIt() {
-  var caption = document.getElementById("caption1");
-  var text = document.createTextNode("foo foo");
-  caption.appendChild(text);
-
-  var caption = document.getElementById("caption2");
-  var text = document.createTextNode("very_large_very_large");
-  caption.appendChild(text);
-
-  var caption = document.getElementById("caption3");
-  var input = document.getElementById("input3");
-  caption.removeChild(input);
-
-  var cell = document.getElementById("td17");
-  var text = document.createTextNode("foo foo");
-  cell.appendChild(text);
-
-  var rg = document.getElementById("tbody6");
-  var row = document.createElement("tr", null);
-  var cell = document.createElement("td", null);
-  var text = document.createTextNode("foo foo");
-  cell.appendChild(text);
-  row.appendChild(cell);
-  rg.appendChild(row);
-
-  var table = document.getElementById("table7");
-  var cap = document.createElement("CAPTION", null);
-  var text = document.createTextNode("new cap");
-  cap.appendChild(text);
-  table.appendChild(cap);
-
-  var table = document.getElementById("table8");
-  var cap = document.getElementsById("caption8");
-  table.removeChild(cap);
-
-
-}
-</SCRIPT>  
-<style type="text/css">
-table { border: 10px solid green; }
-caption {
-        border: medium solid purple;
-        caption-side: bottom;
-        }
-
-table.one { margin-left:5px; margin-top:10px; margin-bottom:5px}
-table.one caption { margin-left:10px; margin-top: 2px; }
-</style>
-</head>
-<body onload="doIt()">
-<center>bottom caption tests</center>
-table 1 - original
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 2 - caption gains content
-<table class="one">
-        <caption id="caption1">caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 3 - caption gains content extending its max element size
-<table class="one">
-        <caption id="caption2">caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 4 - caption loses content
-<table class="one">
-        <caption id="caption3">caption<input  id="input3" type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 5 - table gets wider
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td id="td17">Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 6 - table gets taller
-<table class="one">
- <tbody id="tbody6">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
- </tbody>
-</table>
-table 7 - insert caption
-<table id="table7" class="one">
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 8 - remove caption
-<table  id="table8" class="one">
-        <caption id="caption8">caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/core/captions2.html b/layout/html/tests/table/core/captions2.html
deleted file mode 100644
index b3f72e133bd2..000000000000
--- a/layout/html/tests/table/core/captions2.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-<head>
-
-<Script>
-function doIt() {
-  var caption = document.getElementsByTagName("CAPTION")[1];
-  var text = document.createTextNode("foo foo");
-  caption.appendChild(text);
-
-  var caption = document.getElementsByTagName("CAPTION")[2];
-  var text = document.createTextNode("very_large_very_large");
-  caption.appendChild(text);
-
-  var caption = document.getElementsByTagName("CAPTION")[3];
-  var input = document.getElementsByTagName("INPUT")[3];
-  caption.removeChild(input);
-
-  var cell = document.getElementsByTagName("TD")[17];
-  var text = document.createTextNode("foo foo");
-  cell.appendChild(text);
-
-  var rg = document.getElementsByTagName("TBODY")[5];
-  var row = document.createElement("tr", null);
-  var cell = document.createElement("td", null);
-  var text = document.createTextNode("foo foo");
-  cell.appendChild(text);
-  row.appendChild(cell);
-  rg.appendChild(row);
-
-  var table = document.getElementsByTagName("TABLE")[6];
-  var cap = document.createElement("CAPTION", null);
-  var text = document.createTextNode("new cap");
-  cap.appendChild(text);
-  table.appendChild(cap);
-
-  var table = document.getElementsByTagName("TABLE")[7];
-  var cap = document.getElementsByTagName("CAPTION")[7];
-  table.removeChild(cap);
-
-
-}
-</SCRIPT>  
-<style type="text/css">
-table { border: 10px solid green; }
-caption {
-        border: medium solid purple;
-        caption-side: top;
-        }
-
-table.one { margin-left:5px; margin-top:10px; margin-bottom:5px}
-table.one caption { margin-left:10px; margin-top: 2px; }
-</style>
-</head>
-<body onload="doIt()">
-<center>bottom caption tests</center>
-table 1 - original
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 2 - caption gains content
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 3 - caption gains content extending its max element size
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 4 - caption loses content
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 5 - table gets wider
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 6 - table gets taller
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 7 - insert caption
-<table class="one">
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-table 8 - remove caption
-<table class="one">
-        <caption>caption<input type=radio></caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/table/core/captions3.html b/layout/html/tests/table/core/captions3.html
deleted file mode 100644
index 49a412cf6b3e..000000000000
--- a/layout/html/tests/table/core/captions3.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
-
-<!-- Work done for Netscape.  License unknown. -->
-
-<html lang="en-US">
-<head>
-<title>Tables and captions</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="copyright" href="/~dbaron/legal.html">
-<style type="text/css">
-
-table { border: 10px solid green; }
-caption {
-        border: medium solid purple;
-        caption-side: top;
-        }
-
-table.one { width: 300px; }
-table.one caption { width: 300px; }
-
-table.two { width: 300px; }
-table.two caption { width: 600px; }
-
-table.three { width: 600px; }
-table.three caption { width: 300px; }
-
-table.four { margin-top: 20px; }
-table.four caption { margin-bottom: 0; }
-
-table.five { margin-top: 0; }
-table.five caption { margin-bottom: 20px; }
-
-table.six { margin-top: 15px; }
-table.six caption { margin-bottom: 20px; }
-
-table.seven { margin-top: 20px; }
-table.seven caption { margin-bottom: 15px; }
-
-table.eight { margin-right: 20px; }
-table.eight caption { margin-left: 0; caption-side: right; }
-
-table.nine { margin-right: 0; }
-table.nine caption { margin-left: 20px; caption-side: right; }
-
-table.ten { margin-right: 15px; }
-table.ten caption { margin-left: 20px; caption-side: right; }
-
-table.eleven { margin-right: 20px; }
-table.eleven caption { margin-left: 15px; caption-side: right; }
-
-table.twelve { margin-bottom: 20px; }
-table.twelve caption { margin-top: 0; caption-side: bottom; }
-
-table.thirteen { margin-bottom: 0; }
-table.thirteen caption { margin-top: 20px; caption-side: bottom; }
-
-table.fourteen { margin-bottom: 15px; }
-table.fourteen caption { margin-top: 20px; caption-side: bottom; }
-
-table.fifteen { margin-bottom: 20px; }
-table.fifteen caption { margin-top: 15px; caption-side: bottom; }
-
-table.sixteen { margin-left: 20px; }
-table.sixteen caption { margin-right: 0; caption-side: left; }
-
-table.seventeen { margin-left: 0; }
-table.seventeen caption { margin-right: 20px; caption-side: left; }
-
-table.eighteen { margin-left: 15px; }
-table.eighteen caption { margin-right: 20px; caption-side: left; }
-
-table.nineteen { margin-left: 20px; }
-table.nineteen caption { margin-right: 15px; caption-side: left; }
-
-</style>
-</head>
-<body>
-<h1>Tables and captions</h1>
-
-<p>
-        The table should have width 300px, as should the caption (entirely
-        above the table):
-</p>
-
-<table class="one">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The table should have width 300px, and the caption should have
-        width 600px.
-</p>
-
-<table class="two">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The table should have width 600px, and the caption should have
-        width 300px.
-</p>
-
-<table class="three">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<p>
-        The next four tables should have their caption on the top,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="four">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="five">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="six">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="seven">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the right,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="eight">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="nine">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="ten">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="eleven">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the bottom,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="twelve">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="thirteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="fourteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="fifteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-
-<p>
-        The next four tables should have their caption on the left,
-        with a 20px gap between the table and the caption.
-</p>
-
-<table class="sixteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="seventeen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="eighteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<table class="nineteen">
-        <caption>The table's caption.</caption>
-        <tr><td>Data</td><td>Data</td></tr>
-        <tr><td>Data</td><td>Data</td></tr>
-</table>
-
-<hr title="Beginning of Footer">
-<p>(Back to
-<a href="./">CSS Testing Information</a>,
-<a href="../../">David Baron</a>)</p>
-<p><a href="/~dbaron/" title="David Baron's Homepage">LDB</a>,
-<a rev="made" href="mailto:dbaron@dbaron.org" TITLE="Send e-mail to David Baron">dbaron@dbaron.org</a></p>
-
-</body></html>
diff --git a/layout/html/tests/table/core/cell_heights.html b/layout/html/tests/table/core/cell_heights.html
deleted file mode 100644
index 028de99e3b50..000000000000
--- a/layout/html/tests/table/core/cell_heights.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<table height=100% bgcolor=blue border>
- <tr>
-  <td height=20%>20%</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue border>
- <tr height=50>
-  <td>row 50</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table width=5 bgcolor=blue border>
- <tr>
-  <td height=5>5 5 5</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<table bgcolor=blue height=100 border>
- <tr>
-  <td height=200>200</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue border>
- <tr>
-  <td height=200>200</td>
- </tr>
- <tr>
-  <td height=50>50</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange width=20 border>
- <tr>
-  <td height=100 rowspan=2>100</td>
-  <td height=100>100</td>
- </tr>
- <tr>
-  <td height=100>100 100 100</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=yellow border>
- <tr>
-  <td height=100%>100%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange height=100% border>
- <tr>
-  <td height=20%>20%</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=gray border>
- <tr>
-  <td height=5%>5%</td>
-  <td height=200>200</td>
- </tr>
-</table>
-<BR>
-<table height=200 bgcolor=orange border>
- <tr>
-  <td height=50%>50%</td>
-  <td height=20>20</td>
- </tr>
-</table>
-<BR>
-<table height=100% border>
- <tr>
-  <td height=500>500</td>
- </tr>
- <tr>
-  <td height=80%>80%</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=red height=100% border>
- <tr>
-  <td height=500 rowspan=2>500</td>
-  <td>auto</td>
- </tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
- </tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td height=400><table bgcolor=blue height=100%><tr><td>100%</td></tr></table></td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/core/col_span.html b/layout/html/tests/table/core/col_span.html
deleted file mode 100644
index d9ffbbe58cd1..000000000000
--- a/layout/html/tests/table/core/col_span.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<table border> 
- <tr> 
-  <td width=100>100</td> 
-  <td width=30%>30% width</td></tr> 
-</table> 
-<BR>
-<table border> 
- <tr> 
-  <td width=100>100 100 100 100 100 100</td> 
-  <td width=50%>50% width</td></tr> 
-</table> 
-<BR>
-<table border> 
- <tr> 
-  <td width=100>100</td> 
-  <td>no width given</td> 
-  <td width=30%>30% width</td></tr> 
- <tr> 
-  <td width=500 colspan=3>500 colspan=3</td></tr> 
-</table> 
-<BR>
-<table border> 
- <tr> 
-  <td width=100>foo</td> 
-  <td>no width given</td> 
-  <td width=30%>30% width</td></tr> 
- <tr> 
-  <td width=200 colspan=2>200 spans col 1-2</td><td>last cell</td></tr> 
- <tr> 
-  <td>first cell</td>
-  <td width=300 colspan=2>300 spans col 2-3</td></tr> 
-</table> 
-<BR>
-<table width=700 border>
- <tr>
-  <td width=100>fooooo oooooo oooooo oooooo oooooo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-<TABLE CELLPADDING="3" CELLSPACING="0" border="1" width="400">
-  <TR> 
-    <TD colspan="2"><P><b>This is colspan=2</b></P></TD>
-    <TD>Blah Blah Blah Blah Blah Blah Blah Blah Blah</TD>
-  </TR>
-  <TR>
-    <TD colspan="3">
-      <p><b>This is colspan=3</b> blah blah blah blah blah
-         blah blah blah blah blah blah blah blah blah blah
-      </p>
-    </TD>
- </TR>
-</TABLE>
-<BR>
-<br>
-<TABLE CELLPADDING="3" CELLSPACING="0" border="1" width="400">
-  <TR> 
-    <TD><P><b>no colspan declared</b></P></TD>
-    <TD>Blah Blah Blah Blah Blah Blah</TD>
-  </TR>
-  <TR>
-    <TD colspan="2">
-      <p><b>This is colspan=2</b> blah blah blah blah blah
-         blah blah blah blah blah blah blah blah blah blah
-      </p>
-    </TD>
- </TR>
-</TABLE>
-
-<!--and also consider cases where there is a width attribute on the table element itself.-->
diff --git a/layout/html/tests/table/core/col_span2.html b/layout/html/tests/table/core/col_span2.html
deleted file mode 100644
index 1dd1b593d204..000000000000
--- a/layout/html/tests/table/core/col_span2.html
+++ /dev/null
@@ -1,616 +0,0 @@
-this fixes a bug - 5.0 allocates colspans from right to left - Nav4.6 goes left to right
-<table width=100 border>
- <tr>
-  <td colspan=3>xxxxxxxxxxxx</td>
-  <td>y</td></tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td>x</td>
-  <td>y</td>
- </tr>
- <tr>
-  <td>x</td>
-  <td colspan=3>yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy</td>
- </tr>
-</table>
-<BR>
-this is like the previous one except the relative sizes of the colspan content is reversed
-<table bgcolor=lime width=100 border>
- <tr>
-  <td colspan=3>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</td>
-  <td>y</td></tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td>x</td>
-  <td>y</td>
- </tr>
- <tr>
-  <td>x</td>
-  <td colspan=3>yyyyyyyyyyyyy</td>
- </tr>
-</table>
-<BR>
-<table width=10 border>
- <tr>
-  <td colspan=2>xxxxxxxxxx</td></tr>
- <tr>
-  <td>xx</td>
-  <td>xx</td></tr>
-</table>
-<BR>
-<table bgcolor=red widthx=100 border>
- <tr>
-  <td colspan=3>xxxxxx</td>
-  <td>y</td></tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td>x</td>
-  <td>y</td>
- </tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td colspan=2>yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy</td>
- </tr>
-</table>
-<BR>
-<table widthx=100 border>
- <tr>
-  <td colspan=3>xxxxxx</td>
-  <td>y</td></tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td>x</td>
-  <td>y</td>
- </tr>
- <tr>
-  <td>x</td>
-  <td colspan=3>yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange width=100 border>
- <tr>
-  <td colspan=3>yyyyyyyyyyyyyyyyy</td>
-  <td>y</td></tr>
- <tr>
-  <td>x</td>
-  <td>x</td>
-  <td>x</td>
-  <td>y</td>
- </tr>
- <tr>
-  <td>x</td>
-  <td colspan=3>yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=yellow border>
- <tr>
-  <td colspan=3>xxxxxxxxxxxxxxxxx</td></tr>
- <tr>
-  <td width=100>foo</td>
-  <td>bar</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-<table width=400 border>
- <tr>
-  <td colspan=3>xxxxxxxxxxxxxxxxx</td></tr>
- <tr>
-  <td width=100>foo</td>
-  <td>bar</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=blue border>
- <tr>
-  <td colspan=3>xxxxxxxxxxxxxxxxx</td></tr>
- <tr>
-  <td>foo</td>
-  <td>bar</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-<hr align=left style="width:200;">
-<table border>
- <tr>
-  <td width=50>50</td>
-  <td width=50>50</td>
-  <td>auto</td></tr>
- <tr>
-  <td colspan=3 width=200>200CS3</td></tr>
-</table>
-<BR>
-<hr align=left style="width:200;">
-<table border>
- <tr>
-  <td width=50>50</td>
-  <td>auto</td></tr>
- <tr>
-  <td colspan=2 width=200>200CS2</td></tr>
-</table>
-<BR>
-<table bgcolor=lime border>
- <tr>
-  <td width=50>foo</td>
-  <td width=50>foo</td></tr>
- <tr>
-  <td colspan=2 width=200>foo</td></tr>
-</table>
-<BR>
-<table bgcolor=violet border>
- <tr>
-  <td colspan=3><img src=../images/raptor.jpg width=600 height=100></td>
- <tr>
-  <td width=100>100
-  <td width=100>100
-  <td width=400>400</tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td colspan=3 width=600>600</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto
-  <td>auto
-  <td>auto
-  <td>auto</tr>
-</table>
-fixed table - spanned cols based on fix widths
-<BR>
-<hr align=left style="width:400px;">
-<table bgcolor=orange border cellspacing=5>
- <tr>
-  <td colspan=2 width=400>400CS2</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td width=300>300</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table bgcolor=gray border cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table bgcolor=lime border cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table bgoolor=orange border cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100 100 100 100</td>
-  <td>auto auto auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table border width=270 cellspacing=5>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100 100 100 100</td>
-  <td>auto auto auto auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table bgcolor=brown width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=80%>80% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=80%>80% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td width=300>300</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table bgcolor=gray width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=80%>80% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=33%>33%</td>
-  <td width=66%>66%</td>
-  <td>auto</tr>
-</table>
-<table bgcolor=yellow width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=30%>30% 30% 30% 30% 30% 30%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=33%>33% 33% 33% 33% 33% 33% 33%</td>
-  <td width=66%>66%</td>
-  <td>auto</tr>
-</table>
-<BR>
-PERCENT COLSPANS
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=10%>10%</td>
-  <td width=66%>66%</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=33%>33% 33% 33% 33% 33% 33% 33%</td>
-  <td width=66%>66%</td>
-  <td>auto</tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=66%>66%</td>
-  <td width=66%>66% 66% 66% 66% 66% 66% </td>
-  <td>auto</tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=3 width=90%>90% 90% 90% </td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% </td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td colspan=2 width=90%>90% 90% 90% </td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% </td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td width=60%>60%</td></tr>
- <tr>
-  <td>auto</td>
-  <td colspan=2 width=90%>90% 90% 90% </td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% </td>
-  <td width=60%>60%</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td colspan=2 width=90%>90% 90% 90% </td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=66%>66%</td>
-  <td width=66%>66% 66% 66% 66% 66% 66% </td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 80% 80% 80% 80% 80%</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto auto</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% 90% 90% 90%</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% 90% 90% 90%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=60%>60%</td>
-  <td>auto-auto</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% 90% 90% 90%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=5%>5% 5% 5%</td>
-  <td>auto-auto</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% 90% 90% 90%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=5%>5%</td>
-  <td width=10%>10%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 90% 90% 90% 90% 90%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=10>10</td>
-  <td width=20>20</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=50%>50% 50% 50% 50% 50%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=80%>80%</td>
-  <td>auto auto</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-<table width=500 border cellspacing=5>
- <tr>
-  <td colspan=2 width=90%>90% 50% 50% 50% 50%</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<BR>
-<hr align=left style="width:600px;">
-<table border cellspacing=5>
- <tr>
-  <td colspan=3><img src=../images/raptor.jpg width=600 height=100></td>
-  <td>foo</td></tr>
- <tr>
-  <td width=100>foo
-  <td width=100>bar
-  <td>foo
-  <td>bar</tr>
-</table>
-<BR>
-
-1st cell with colspan=3 fixed at 600, 1st 2 cells in 2nd row fixed at 100, 2nd not
-<table border>
- <tr>
-  <td width=600 colspan=3>foo</td>
-  <td>foo</td></tr>
- <tr>
-  <td width=100>foo
-  <td width=100>bar
-  <td>foo
-  <td>bar</tr>
-</table>
-<BR>
-
-<table cellspacing=0 cellpadding=0 border>
- <col style="background-color:red">
- <col style="background-color:blue">
- <tr>
-  <td colspan=2>foo</td></tr>
-</table>
-<BR>
-
-<table border>
- <tr>
-  <td colspan=3>foo<td>bar</tr>
- <tr>
-  <td colspan=2>foo<td>bar</tr>
-</table>
-
-<BR>
-<table border=1 cellpadding=4 cellspacing=0 width="100%" >
- <tr bgcolor="#ccccff">
-  <td align=right colspan=3>edit</td></tr>
- <tr>
-  <td bgcolor="#dcdcdc" colspan=2 nowrap>Top Stories from Reuters&nbsp;</td>
-  <td bgcolor="#dcdcdc" align=right>Jun 11 12:30pm&nbsp;</td></tr>
-</table>
-<BR>
-<table bgcolor=yellow border width=200>
- <tr>
-  <td>foo</td>
-  <td>
-   <table widthx=100 bgcolor=orange>
-    <tr>
-	 <td>bar</td></tr>
-   </table></td></tr>
-</table>
-</body>
-</html>
-<BR>
-<table border cellspacing=5>
- <tr>
-  <td colspan=3>auto</td>
-  <td>auto</td></tr>
-</table>
-min colspan is based on min with no fix involved - IE uses max(min,des)
-<table width=50 border>
- <tr>
-  <td colspan=2>xxxxxxxxxxxxxxxxxxx</td></tr>
- <tr>
-  <td>x x x x</td>
-  <td>xxx</td></tr>
-</table>
-<BR>
-adj min is based on min with no fix involved
-<table width=50 border>
- <tr>
-  <td colspan=2>xxxxxxxxxxxxxxxxxxxyyyyyyy</td></tr>
- <tr>
-  <td>x x x x x x x</td>
-  <td>xxxxxxxxxxxxxxxxxx</td></tr>
-</table>
-<BR>
-adj min is based on max(min, fix) differs from Nav4.6 which differs from IE5
-<table bgcolor=lime width=50 border>
- <tr>
-  <td colspan=2>xxxxxxxcolspan2xxxxxxxxx</td></tr>
- <tr>
-  <td>x x x</td>
-  <td width=100>100</td></tr>
-</table>
-<BR>
-<table bgcolor=lime width=50 border>
- <tr>
-  <td colspan=2>xxxxxxxcolspan2xxxxxxxxx</td></tr>
- <tr>
-  <td>x x x</td>
-  <td width=100>100 100 100</td></tr>
-</table>
-<BR>
-<table bgcolor=lime width=50 border>
- <tr>
-  <td colspan=2>xxxxxxxcolspan2xxxxxxxxx</td></tr>
- <tr>
-  <td>xxx xxx xxx</td>
-  <td width=100>100</td></tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td width=300 colspan=2>xx</td></tr>
- <tr>
-  <td width=100>x x x</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td width=300 colspan=2>300</td></tr>
- <tr>
-  <td width=300>400 400</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<table  border>
- <tr>
-  <td width=300 colspan=2>300 300</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-<table  border>
- <tr>
-  <td width=300 colspan=2>300 300 300 300 300 300 300 300 300 300 300 300 300 300 300300 300 300 300 300</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto auto auto auto auto auto auto auto auto auto</td></tr>
-</table>
-<BR>
-<table  border>
- <tr>
-  <td width=300 colspan=2>300</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td colspan=2>auto auto auto auto auto auto auto</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto</td></tr>
-</table>
-fixed table looks more like IE than Nav
-<BR>
-<table width=150 border>
- <tr>
-  <td width=100>100</td>
-  <td>auto auto auto auto auto auto auto auto auto auto auto auto</td></tr>
-</table>
diff --git a/layout/html/tests/table/core/col_widths_auto_auto.html b/layout/html/tests/table/core/col_widths_auto_auto.html
deleted file mode 100644
index 03fe8b556693..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_auto.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<table border>
- <tr>
-  <td>auto auto auto</td>
-  <td>auto</td></tr>
-</table>
-
-
diff --git a/layout/html/tests/table/core/col_widths_auto_autoFix.html b/layout/html/tests/table/core/col_widths_auto_autoFix.html
deleted file mode 100644
index acf5e913ca8e..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_autoFix.html
+++ /dev/null
@@ -1,39 +0,0 @@
-auto table 
-<table border>
- <tr>
-  <td width=0>0 0 0 0</td>
-  <td>auto</td></td></tr>
-</table>
-<BR>
-auto table - fixed cells honored 
-<table border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-COLSPANS
-<BR>
-<table border>
- <tr>
-  <td colspan=3><img src=../images/raptor.jpg width=600 height=100></td>
-  <td>foo</td></tr>
- <tr>
-  <td width=10>foo
-  <td width=10>bar
-  <td>foo
-  <td>bar</tr>
-</table>
-<BR>
-<table border cellspacing=5>
- <tr>
-  <td colspan=2>auto</td>
-  <td width=100>100</td></tr>
- <tr>
-  <td width=100>100</td>
-  <td width=300>300</td>
-  <td>auto</tr>
-</table>
-
-
-
diff --git a/layout/html/tests/table/core/col_widths_auto_autoFixPer.html b/layout/html/tests/table/core/col_widths_auto_autoFixPer.html
deleted file mode 100644
index 46c3a9be8127..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_autoFixPer.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<table border=1>
- <tr>
-  <td bgcolor=red width=200>fooooooooo
-  <td bgcolor=green width=200>fooooooooo
-  <td bgcolor=orange colspan=2 width=50%>foo foo foo foo
-  <td bgcolor=blue width=50%>foo foo foo foo</tr> 
- <tr>
-  <td bgcolor=red>fooooooooo
-  <td bgcolor=green>fooooooooo
-  <td bgcolor=orange>foo foo foo foo
-  <td bgcolor=orange>foo foo foo foo
-  <td bgcolor=blue>foo foo foo foo 
-</table>
-<BR>
-<table border>
- <tr>
-  <td width=100>foo</td>
-  <td width=10%>bar</td>
-  <td width=10%>zap</td>
- </tr>
-</table>
-
diff --git a/layout/html/tests/table/core/col_widths_auto_autoPer.html b/layout/html/tests/table/core/col_widths_auto_autoPer.html
deleted file mode 100644
index 5d837426a687..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_autoPer.html
+++ /dev/null
@@ -1,28 +0,0 @@
-auto table 
-<table border>
- <tr>
-  <td width=0%>0% 0% 0% 0%</td>
-  <td>auto</td></td></tr>
-</table>
-<BR>
-auto table - % width cell increases table width based on % cell
-<table cellspacing=10 cellpadding=10 border>
- <tr>
-  <td width=10%>10% 10%</td>
-  <td>auto</td></tr>
-</table>
-auto table - % width cell increases table width based on % cell
-<table cellspacing=10 border>
- <tr>
-  <td width=10%>10%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-auto table - % width cell increases table width based on % cell which makes it largest
-<table cellspacing=10 border>
- <tr>
-  <td width=10%>10%</td>
-  <td width=1%>1%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/col_widths_auto_fix.html b/layout/html/tests/table/core/col_widths_auto_fix.html
deleted file mode 100644
index b12c7ce13a46..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_fix.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<table border bgcolor=lime width=150>
- <tr>
-  <td width=200>200</td>
-  <td width=100>one_hund</td></tr>
-</table>
-<BR>
-<table width=500 border=1>
- <tr>
-  <td bgcolor=red width=300>fooooooooo
-  <td bgcolor=green width=300>fooooooooo
-  <td bgcolor=orange width=300>foo foo foo foo
-</table>
-<BR>
-fixed table - fixed cells are increased based on fixed width
-<table width=400 border>
- <tr>
-  <td width=200>foo</td>
-  <td width=100>foo foo foo foo foo foo foo foo</td></tr>
-</table>
-<BR>
-<BR>
-excess above min allocated based on fixed widths (not min)
-<table width=100 border>
- <tr>
-  <td width=100>foo foo</td>
-  <td width=300>foo</td></tr>
-</table>
-<BR>
-excess above min allocated based on fixed widths (not min)
-<table width=100 border>
- <tr>
-  <td width=10>foo foo</td>
-  <td width=300>foo</td></tr>
-</table>
-<BR>
-<table width=600 border>
- <tr>
-  <td width=5>foo</td>
-  <td>foo</td></tr>
-</table>
-<BR>
-<table width=40 border>
- <tr>
-  <td width=200>foo</td></tr>
-</table>
-<BR>
-auto table - fixed width cell does not exceed viewport
-<table border>
- <tr>
-  <td width=1000>foo</td></tr>
-</table>
-<BR>
-auto table - fixed cells cannot exceed viewport
-<table border>
- <tr>
-  <td width=200>200px</td>
-  <td width=200>200px</td>
-  <td width=200>200px</td>
-  <td width=200>200px</td>
-  <td width=200>200px</td>
-  </tr>
-</table>
-<BR>
-auto table - cell width does not include padding
-<table border cellpadding=20>
- <tr>
-  <td width=100>cell=100px</td></tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td width=100>cell=100px</td></tr>
-</table>
-
diff --git a/layout/html/tests/table/core/col_widths_auto_fixPer.html b/layout/html/tests/table/core/col_widths_auto_fixPer.html
deleted file mode 100644
index acca2114ebac..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_fixPer.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<table border=1>
- <tr>
-  <td bgcolor=red width=200>fooooooooo
-  <td bgcolor=green width=200>fooooooooo
-  <td bgcolor=orange width=50%>foo foo foo foo
-  <td bgcolor=blue width=50%>foo foo foo foo</tr> 
-</table>
-<BR>
-<table border=1>
- <tr>
-  <td bgcolor=red width=200>foo foo foo foo
-  <td bgcolor=orange width=20%>foo foo foo foo
-  <td bgcolor=blue width=20%>foo foo foo foo 
-  <td align=right bgcolor=green width=100%>foo foo foo foo
-  <td bgcolor=red width=200>foo foo foo foo</tr>
-</table>
-<BR>
-auto table - % width cell increases table width based on % cell which makes it largest
-<table cellspacing=10 border>
- <tr>
-  <td width=1%>1%</td>
-  <td width=10%>10%</td>
-  <td width=20>20px</td></tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/col_widths_auto_per.html b/layout/html/tests/table/core/col_widths_auto_per.html
deleted file mode 100644
index ae217b4af3cd..000000000000
--- a/layout/html/tests/table/core/col_widths_auto_per.html
+++ /dev/null
@@ -1,14 +0,0 @@
-auto table - % width single cell has no effect (not so in IE5)
-<table cellspacing=10 border>
- <tr>
-  <td width=10%>10% 10%</td></tr>
-</table>
-<BR>
-auto table - % width cell increases table width based on % cell which makes it largest.
-Nav4.x does not increase the table too much if the only cells are % 
-<table cellspacing=10 border>
- <tr>
-  <td width=1%>1%</td>
-  <td width=10%>10%</td></tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/col_widths_fix_auto.html b/layout/html/tests/table/core/col_widths_fix_auto.html
deleted file mode 100644
index cf2162950b0b..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_auto.html
+++ /dev/null
@@ -1,5 +0,0 @@
-table with no cells doesn't show up BEFORE
-<table border width=100>
- <tr></tr></table>
-after
-<BR>
diff --git a/layout/html/tests/table/core/col_widths_fix_autoFix.html b/layout/html/tests/table/core/col_widths_fix_autoFix.html
deleted file mode 100644
index de7985aea67b..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_autoFix.html
+++ /dev/null
@@ -1,48 +0,0 @@
-fixed table - fixed cells get expanded in Quirks mode, not in Standard
-<table width=200 border>
- <tr>
-  <td width=100>100px 100px 100px</td>
-  <td>auto auto</td></tr>
-</table>
-<BR>
-<hr align=left style="width:100px;">
-table fixed at 600, 1st 2 cells fixed at 100, 2nd not
-<table width=600 border>
- <tr>
-  <td width=100>foo
-  <td width=100>bar
-  <td>foo</td></tr>
-</table>
-<BR>
-table fixed at 600, 1st 2 cells fixed at 100, 2nd not
-<table width=600 border>
- <tr>
-  <td width=100>foo
-  <td width=100>bar
-  <td>foo</td></tr>
-</table>
-<BR>
-table fixed at 600, 1st 2 cells fixed at 50, 2nd not
-<table width=600 border>
- <tr>
-  <td width=50>foo
-  <td width=50>bar
-  <td>foo</td></tr>
-</table>
-<BR>
-table fixed at 600, 1st 2 cells fixed at 1000, 2nd not
-<table width=600 border>
- <tr>
-  <td width=1000>foo
-  <td width=1000>bar
-  <td>foo</td></tr>
-</table>
-<BR>
-table fixed at 600, 1st 2 cells fixed at 5, 2nd not
-<table width=600 border>
- <tr>
-  <td width=5>foo
-  <td width=5>bar
-  <td>foo</td></tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/col_widths_fix_autoFixPer.html b/layout/html/tests/table/core/col_widths_fix_autoFixPer.html
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/layout/html/tests/table/core/col_widths_fix_autoPer.html b/layout/html/tests/table/core/col_widths_fix_autoPer.html
deleted file mode 100644
index 9982b5c2669a..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_autoPer.html
+++ /dev/null
@@ -1,43 +0,0 @@
-fixed table - 0 percentage width cell is not honored to min
-<table width=300 border>
- <tr>
-  <td width=0%>foo</td>
-  <td>foo</td></tr>
-</table>
-<BR>
-fixed table - too small a percentage width cell is honored to min
-<table width=300 border>
- <tr>
-  <td width=2%>foo</td>
-  <td>foo</td></tr>
-</table>
-<BR>
-fixed table - percentage cell width includes padding
-<table border width=300 cellpadding=20>
- <tr>
-  <td width=50%>cell=50%</td>
-  <td>cell=auto</td></tr>
-</table>
-<BR>
-<table border width=300>
- <tr>
-  <td width=50%>cell=50%</td>
-  <td>cell=auto</td></tr>
-</table>
-<BR>
-fixed table - % cells don't get expanded
-<table width=200 border>
- <tr>
-  <td width=25%>25%</td>
-  <td width=25%>25%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - % cells are honored
-<table width=200 border>
- <tr>
-  <td width=50%>50% 50% 50%</td>
-  <td>auto</td></tr>
-</table>
-
-
diff --git a/layout/html/tests/table/core/col_widths_fix_fix.html b/layout/html/tests/table/core/col_widths_fix_fix.html
deleted file mode 100644
index d6efbb03638e..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_fix.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<table border bgcolor=lime width=150>
- <tr>
-  <td width=200>200</td>
-  <td width=100>one_hund</td></tr>
-</table>
-<BR>
-<table width=500 border=1>
- <tr>
-  <td bgcolor=red width=300>fooooooooo
-  <td bgcolor=green width=300>fooooooooo
-  <td bgcolor=orange width=300>foo foo foo foo
-</table>
-<BR>
-<hr align=left style="width:400px">
-fixed table - fixed cells are increased based on fixed width
-<table width=400 border>
- <tr>
-  <td width=200>foo</td>
-  <td width=100>foo foo foo foo foo foo foo foo</td></tr>
-</table>
-<BR>
-<BR>
-excess above min allocated based on fixed widths (not min)
-<table width=100 border>
- <tr>
-  <td width=100>foo foo</td>
-  <td width=300>foo</td></tr>
-</table>
-<BR>
-excess above min allocated based on fixed widths (not min)
-<table width=100 border>
- <tr>
-  <td width=10>foo foo</td>
-  <td width=300>foo</td></tr>
-</table>
-<BR>
-<table width=600 border>
- <tr>
-  <td width=5>foo</td>
-  <td>foo</td></tr>
-</table>
-<BR>
-<table width=40 border>
- <tr>
-  <td width=200>foo</td></tr>
-</table>
-
diff --git a/layout/html/tests/table/core/col_widths_fix_fixPer.html b/layout/html/tests/table/core/col_widths_fix_fixPer.html
deleted file mode 100644
index 346c42761f3b..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_fixPer.html
+++ /dev/null
@@ -1,93 +0,0 @@
-fixed table - percentage width cell honored to min
-<table width=300 border>
- <tr>
-  <td width=3%>foo</td>
-  <td width=100>foo</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to rigth first
-<table width=300 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=50%>50%</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to rigth first
-allocated from left to right
-<table width=300 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=95%>95%</td>
-  <td width=95%>95%</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to rigth first
-<table width=200 cellspacing=10 cellpaddingx=5 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=50%>50%</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to right first
-<table width=200 cellspacing=10 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=50%>50% 50% 50%</td>
-  <td width=50%>50% 50% 50%</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to right first
-<table width=400 cellspacing=10 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=100>100px 100px</td>
-  <td width=50%>50% 50% 50%</td>
-  <td width=50%>50% 50% 50%</td></tr>
-</table>
-<BR>
-fixed table - percentage cells allocated left to right first
-<table width=400 cellspacing=10 border>
- <tr>
-  <td width=100>100px 100px</td>
-  <td width=100>100px 100px</td>
-  <td width=50%>50% 50% 50%</td>
-  <td width=50%>50% 50% 50%</td>
-  <td width=50%>50% 50% 50%</td></tr>
-</table>
-<BR>
-<table width=200 border>
- <tr>
-  <td width=100>foo</td>
-  <td width=50%>bar</td>
-  <td width=50%>zap</td>
- </tr>
-</table>
-<BR>
-PERCENTAGE WIDTH TABLES
-<table width=100% border=1>
- <tr>
-  <td bgcolor=orange width=20%>foo foo foo foo
-  <td bgcolor=blue width=20%>foo foo foo foo 
-  <td align=right bgcolor=green width=100%>foo foo foo foo
-  <td bgcolor=red width=200>foo foo foo foo</tr>
-</table>
-<BR>
-<table width=100% border=1>
- <tr>
-  <td bgcolor=red width=200>foo foo foo foo
-  <td bgcolor=orange width=20%>foo foo foo foo
-  <td bgcolor=blue width=20%>foo foo foo foo 
-  <td align=right bgcolor=green width=100%>foo foo foo foo
-  <td bgcolor=red width=200>foo foo foo foo</tr>
-</table>
-<BR>
-<table width=100% border=1>
- <tr>
-  <td bgcolor=red width=200>foo foo foo foo
-  <td bgcolor=orange width=20%>foo foo foo foo
-  <td bgcolor=blue width=20%>foo foo foo foo 
-  <td align=right bgcolor=green width=20%>foo foo foo foo
-  <td bgcolor=red width=200>foo foo foo foo</tr>
-</table>
-
diff --git a/layout/html/tests/table/core/col_widths_fix_per.html b/layout/html/tests/table/core/col_widths_fix_per.html
deleted file mode 100644
index 200ceef03c03..000000000000
--- a/layout/html/tests/table/core/col_widths_fix_per.html
+++ /dev/null
@@ -1,28 +0,0 @@
-fixed table - percentage width cell is honored to min
-<table width=300 border>
- <tr>
-  <td width=3%>foo</td>
-  <td width=3%>foo</td></tr>
-</table>
-<BR>
-<table width=500 border=1>
- <tr>
-  <td bgcolor=red width=10%>fooooooooo
-  <td bgcolor=green width=10%>fooooooooo
-  <td bgcolor=orange width=10%>foo foo foo foo
-</table>
-<BR>
-<table width=500 border=1>
- <tr>
-  <td bgcolor=red width=50%>fooooooooo
-  <td bgcolor=green width=50%>fooooooooo
-  <td bgcolor=orange width=50%>foo foo foo foo
-</table>
-<BR>
-<table width=100% border=1>
- <tr>
-  <td bgcolor=orange width=20%>foo foo foo foo
-  <td bgcolor=blue width=20%>foo foo foo foo 
-  <td align=right bgcolor=green width=100%>foo foo foo foo</tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/cols1.html b/layout/html/tests/table/core/cols1.html
deleted file mode 100644
index a2857fd9ab52..000000000000
--- a/layout/html/tests/table/core/cols1.html
+++ /dev/null
@@ -1,26 +0,0 @@
-Both columns should be 200px
-<table bgcolor=orange border>
- <colgroup span=2 width=200></colgroup>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-Both columns should be 200px
-<table bgcolor=orange border>
- <colgroup width=200>
-   <col span=2>
- </colgroup>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-Both columns should be 200px
-<table bgcolor=orange border>
- <col width=200 span=2>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
diff --git a/layout/html/tests/table/core/columns.html b/layout/html/tests/table/core/columns.html
deleted file mode 100644
index a7e543b02fb7..000000000000
--- a/layout/html/tests/table/core/columns.html
+++ /dev/null
@@ -1,120 +0,0 @@
-auto table cols=2
-<table border cols=2>
- <tr>
-  <td>auto auto auto auto auto auto auto auto </td>
-  <td>auto-auto auto auto auto </td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table cols=2
-<table border cols=2>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table 2 cols with 1*,1*
-<table border>
- <col width=1*>
- <col width=1*>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table 2 cols with 2*,1*
-<table border>
- <col width=2*>
- <col width=1*>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-fixed table cols=2
-<table width=400 border cols=2>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table cols=3
-<table border cols=3>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-fixed table cols=3
-<table width=400 border cols=3>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table cols=3
-<table border cols=3>
- <tr>
-  <td width=200>200</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-fixed table cols=3
-<table width=400 border cols=3>
- <tr>
-  <td width=200>200</td>
-  <td>auto-auto</td>
-  <td>auto auto auto</td></tr>
-</table>
-<BR>
-auto table cols=2
-<table border cols=2>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td width=200>200</td></tr>
-</table>
-<BR>
-fixed table cols=2
-<table width=400 border cols=2>
- <tr>
-  <td>auto</td>
-  <td>auto-auto</td>
-  <td width=200>200</td></tr>
-</table>
-auto table 
-<table border>
- <tr>
-  <td width=0>0 0 0 0</td>
-  <td>auto</td></td></tr>
-</table>
-<BR>
-auto table 
-<table border>
- <tr>
-  <td width=0%>0% 0% 0% 0%</td>
-  <td>auto</td></td></tr>
-</table>
-<BR>
-auto table 
-<table border>
- <col width=0*>
- <tr>
-  <td>0* col</td>
-  <td>auto</td></td></tr>
-</table>
-<BR>
-fixed table 
-<table width=200 border>
- <col width=0*>
- <tr>
-  <td>0* col</td>
-  <td>auto</td></td></tr>
-</table>
diff --git a/layout/html/tests/table/core/conflicts.html b/layout/html/tests/table/core/conflicts.html
deleted file mode 100644
index 61740b796d5a..000000000000
--- a/layout/html/tests/table/core/conflicts.html
+++ /dev/null
@@ -1,151 +0,0 @@
-fixed table - width on td overriden
-<table border=10 cellspacing=3 cellpadding=5 width=400 border>
- <tr>
-  <td width=100%>foo</td>
-  <td width=100>foo</td></tr>
-</table>
-<hr align=left style="width:400px; alignx:left">
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=500 border>
- <tr>
-  <td width=20>20px</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=50%>50%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=300 border>
- <tr>
-  <td width=100>100</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=10%>10%</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=500 border>
- <col width=50%>
- <tr>
-  <td width=20%>50%Col,20%Cell</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=500 border>
- <col width=20%>
- <tr>
-  <td width=50%>20%Col,50%Cell</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=500 border>
- <col width=50%>
- <tr>
-  <td width=100>50PerCol,100Cell</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - percent cell wins over fix cell (and in IE5)
-<table width=500 border>
- <col width=20%>
- <tr>
-  <td width=300>20PerCol,300Cell</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - % wins over fixed even on colspan
-<table width=300 border>
- <tr>
-  <td width=50 colspan=2>50CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=50% colspan=2>50%CS2</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-fixed table - % wins over fixed even on colspan
-<table width=300 border>
- <tr>
-  <td width=200 colspan=2>100CS2</td>
-  <td>bar</td></tr>
- <tr>
-  <td width=30% colspan=2>30%CS2</td>
-  <td>bar</td></tr>
-</table>
-<BR>
-auto table - percent colspan wins over fixed colspan XXX
-<table border>
- <tr>
-  <td width=500 colspan=2>500CS2</td>
-  <td>atuo</td></tr>
- <tr>
-  <td width=10% colspan=2>10%CS2</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-auto table - percent colspan wins over fixed colspan
-<table border>
- <tr>
-  <td width=500 colspan=2>500CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=20% colspan=2>20%CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-auto table - percent colspan wins over fixed colspan
-<table border>
- <tr>
-  <td width=200 colspan=2>200CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=20% colspan=2>20%CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-auto table - percent colspan wins over fixed colspan
-<table border>
- <tr>
-  <td width=1000 colspan=2>1000CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td width=20% colspan=2>20%CS2</td>
-  <td>auto</td></tr>
- <tr>
-  <td>auto</td>
-  <td>auto</td>
-  <td>auto</td></tr>
-</table>
-<BR>
-percent cell/col percentage conflict goes to cell (and in IE5)
-<table width=500 border cellspacing=5>
- <col width=80%>
- <tr>
-  <td width=30%>30%-80%col</td>
-  <td>auto</td></tr>
-</table>
diff --git a/layout/html/tests/table/core/margins.html b/layout/html/tests/table/core/margins.html
deleted file mode 100644
index 1d9b6887f284..000000000000
--- a/layout/html/tests/table/core/margins.html
+++ /dev/null
@@ -1,90 +0,0 @@
-outer width=400 align=center
-<table width=400  border="1" align="center">
- <tr> 
-  <td width=300> 
-   <form>
-    <select>
-     <option>Test</option>
-    </select>
-   </form>
-  </td>
- </tr>
-</table>
-outer width=400 inner width=200 align=center
-<table border=2  width=400>
- <tr>
-  <td>
-   <table border width=200 align="center">
-    <tr>
-	 <td>foo</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-outer auto inner align=center
-<table border=2>
- <tr>
-  <td>
-   <table border align="center">
-    <tr>
-	 <td>foo</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-outer width=50 inner align=center
-<table width=20 border=2>
- <tr>
-  <td>
-   <table border align="center">
-    <tr>
-	 <td>foo</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-outer width=50 inner margin-left:50
-<table width=20 border=2>
- <tr>
-  <td>
-   <table border style="margin-left:50px">
-    <tr>
-	 <td>foo</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-outer width=400 inner align=center
-<table width=400 border=2>
- <tr>
-  <td>
-   <table border align="center">
-    <tr>
-	 <td>foo</td>
-	</tr>
-   </table>
-  </td>
-  <td>x x x x x x x</td>
- </tr>
-</table>
-outer width=400 inner align=center
-<table width=400 border=2>
- <tr>
-  <td>
-   <table border align="center">
-    <tr>
-	 <td width=50>50</td>
-	</tr>
-   </table>
-  </td>
-  <td>x x x x x x x</td>
- </tr>
-</table>
--->
-
-
-
diff --git a/layout/html/tests/table/core/misc.html b/layout/html/tests/table/core/misc.html
deleted file mode 100644
index a4051bfc526d..000000000000
--- a/layout/html/tests/table/core/misc.html
+++ /dev/null
@@ -1,26 +0,0 @@
-cell split with color (standard mode)
-<table border>
- <col style="background-color:red;">
- <col style="background-color:blue;">
- <tr>
-  <td colspan=2>foo</td></tr>
-</table>
-<BR>
-<hr align=left width=600>
-<TABLE WIDTH=600>
- <TR>
-  <TD COLSPAN=3 ALIGN=CENTER>
-   <IMG SRC="../images/ns_netcenter_bar_new.gif" WIDTH=579 widthx=600
-    HEIGHT=42 BORDER=0</TD>
- </TR>
- <TR>
-  <TD WIDTH=230>
-   <IMG SRC="../images/raptor.jpg" ALT="[Click Here]" WIDTH=230 
-    HEIGHT=33 BORDER=1></TD>
-  <TD ALIGN=CENTER WIDTH=135>Hassle-Free Upgrades</TD>
-</TR>
-<TR><TD COLSPAN=4 BGCOLOR="#99cccc">x</td></tr>
-</form>
-<BR>
-
-
diff --git a/layout/html/tests/table/core/nested1.html b/layout/html/tests/table/core/nested1.html
deleted file mode 100644
index 6ac12daa6fd0..000000000000
--- a/layout/html/tests/table/core/nested1.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<table border>
- <tr>
-  <td>
-   <table bgcolor=orange width=100%>
-    <tr>
-	 <td>nested in auto, width=100%</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-<BR>
-<table border width=200>
- <tr>
-  <td>
-   <table bgcolor=lime width=100%>
-    <tr>
-	 <td>nested in fixed, width=100%</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-<BR>
-<table border width=800>
- <tr>
-  <td>
-   <table bgcolor=lime width=100%>
-    <tr>
-	 <td>nested in fixed, width=100%</td>
-	</tr>
-   </table>
-  </td>
- </tr>
-</table>
-<BR>
-<table border>
- <tr>
-  <td>
-   <table orange width=100%>
-    <tr>
-	 <td>nested in auto, width=100%</td>
-	</tr>
-   </table>
-  </td>
-  <td>auto</td>
- </tr>
-</table>
-<BR>
-<table border width=100%>
- <tr>
-  <td>
-   <table bgcolor=lime width=50%>
-    <tr>
-	 <td>nested in 100%, width=50%</td>
-	</tr>
-   </table>
-  </td>
-  <td>foo</td>
- </tr>
-</table>
-<BR>
-<table border width=100%>
- <tr>
-  <td>
-   <table bgcolor=lime width=50%>
-    <tr>
-	 <td>
-	  <table bgcolor=red width=50%>
-	   <tr>
-	    <td>2n50%</td>
-	   </tr>
-	  </table>
-	 </td>
-	</tr>
-   </table>
-  </td>
-  <td>foo</td>
- </tr>
-</table>
-
-
diff --git a/layout/html/tests/table/core/one_row.html b/layout/html/tests/table/core/one_row.html
deleted file mode 100644
index f2bd8b7455b3..000000000000
--- a/layout/html/tests/table/core/one_row.html
+++ /dev/null
@@ -1,102 +0,0 @@
-Table auto, no cells fixed
-<table border>
- <tr>
-  <td>fooooooooooooooooooooooooooooo</td>
-  <td>barrrrrrrrr</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, no cells fixed
-<table width=500 border>
- <tr>
-  <td>fooooooooooooooooooooooooooooo</td>
-  <td>barrrrrrrrr</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, no cells fixed
-<table width=200 border>
- <tr>
-  <td>fo oo oo oo oo oo oo oo oo oo oo oo oo oo oo</td>
-  <td>barr rrrr rrrr</td>
-  <td>zap</td>
- </tr>
-</table>
-<BR>
-
-Table auto, 1st cell fixed
-<table border>
- <tr>
-  <td width=100>fooooo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, 1st cell fixed
-<table width=500 border>
- <tr>
-  <td width=100>fooooo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-Table auto, 1st cell fixed too small
-<table border>
- <tr>
-  <td width=100>fooooooooooooooooooooooooooooo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, 1st cell fixed too small
-<table width=500 border>
- <tr>
-  <td width=100>fooooooooooooooooooooooooooooo</td>
-  <td>bar</td>
- </tr>
-</table>
-<BR>
-
-Table auto, both cells fixed
-<table border>
- <tr>
-  <td width=100>foooo</td>
-  <td width=100>bar</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, both cells fixed
-<table width=500 border>
- <tr>
-  <td width=100>foooo</td>
-  <td width=100>bar</td>
- </tr>
-</table>
-<BR>
-
-Table auto, both cells fixed, 1st one too small
-<table border>
- <tr>
-  <td width=100>fooooooooooooooooooooooooooooo</td>
-  <td width=100>bar</td>
- </tr>
-</table>
-<BR>
-
-Table fixed, both cells fixed, 1st cell fixed too small
-<table width=500 border>
- <tr>
-  <td width=100>fooooooooooooooooooooooooooooo</td>
-  <td width=100>bar</td>
- </tr>
-</table>
-<BR>
-
diff --git a/layout/html/tests/table/core/row_span.html b/layout/html/tests/table/core/row_span.html
deleted file mode 100644
index 102456fea07b..000000000000
--- a/layout/html/tests/table/core/row_span.html
+++ /dev/null
@@ -1,89 +0,0 @@
-ROWSPANS
-<table border=5>
-  <tr> 
-    <td rowspan=2>auto1</td>
-    <td >auto2</td>
-  </tr>
-  <tr> 
-    <td >auto3</td>
-    <td >auto4</td>
-  </tr>
-</table>
-
-<table border>
-  <tr> 
-    <td rowspan=3 background=../images/bg.jpg>c0r[2-6],Data 2 span=3 rows</td>
-    <td >c0r2</td>
-    <td >c1r2</td>
-  </tr>
-  <tr> 
-    <td >c0r3</td>
-    <td >c1r3</td>
-  </tr>
-  <tr> 
-    <td >c0r4</td>
-    <td >c1r4</td>
-  </tr>
-</table>
-<BR>
-<table border>
-  <tr> 
-    <td rowspan=5 background=../images/bg.jpg>c0r[2-6],Data 2 span=5 rows</td>
-    <td >c0r2</td>
-    <td >c1r2</td>
-  </tr>
-  <tr> 
-    <td >c0r3</td>
-    <td >c1r3</td>
-  </tr>
-  <tr> 
-    <td >c0r4</td>
-    <td >c1r4</td>
-  </tr>
-  <tr> 
-    <td >c0r5</td>
-    <td >c1r5</td>
-  </tr>
-  <tr> 
-    <td >c0r6</td>
-    <td >c1r6</td>
-  </tr>
-  <tr> 
-    <td rowspan=3  >c0r[7-9] span=3 rows</td>
-    <td >c0r7</td>
-    <td >c1r7</td>
-  </tr>
-  <tr> 
-    <td >c0r8</td>
-    <td >c1r8</td>
-  </tr>
-  <tr> 
-    <td >c0r9</td>
-    <td >c1r9</td>
-  </tr>
-</table>
-<BR>
-<table border>
-<tr>
- <td>one</td>
- <td rowspan=2>two</td></tr>
-<tr>
- <td align=center colspan=2>three</td></tr>
-</table>
-
-<table border>
- <tr>
-  <td rowspan=2>foo</td></tr>
- <tr>
-  <td rowspan=2>bar</td></tr>
-</table>
-<BR>
-
-<TABLE CELLPADDING=0 CELLSPACING=0 WIDTH=602 BORDER=1>
- <TR>
-  <TD COLSPAN="2" ROWSPAN=2 VALIGN=TOP BGCOLOR="#FFFFFF">
-   <IMG src="../images/wiz438sidebar.gif" ALT="" BORDER=0></TD></TR>
- <TR>
-   <TD COLSPAN=6 HEIGHT="45" ALIGN=RIGHT>xxx</TD></TR>
-</TABLE>
-
diff --git a/layout/html/tests/table/core/rtest.lst b/layout/html/tests/table/core/rtest.lst
deleted file mode 100644
index 263923b15196..000000000000
--- a/layout/html/tests/table/core/rtest.lst
+++ /dev/null
@@ -1,38 +0,0 @@
-backgrounds.html
-bloomberg.html
-borders.html
-box_sizing.html
-captions.html
-captions1.html
-captions2.html
-captions3.html
-cell_heights.html
-columns.html
-col_span.html
-col_span2.html
-col_widths_fix_auto.html
-col_widths_fix_autoFix.html
-col_widths_fix_autoFixPer.html
-col_widths_fix_autoPer.html
-col_widths_fix_fix.html
-col_widths_fix_fixPer.html
-col_widths_auto_per.html
-col_widths_auto_auto.html
-col_widths_auto_autoFix.html
-col_widths_auto_autoFixPer.html
-col_widths_auto_autoPer.html
-col_widths_auto_fix.html
-col_widths_auto_fixPer.html
-col_widths_auto_per.html
-cols1.html
-conflicts.html
-margins.html
-misc.html
-nested1.html
-one_row.html
-row_span.html
-standards1.html
-table_frame.html
-table_heights.html
-table_rules.html
-table_widths.html
diff --git a/layout/html/tests/table/core/standards1.html b/layout/html/tests/table/core/standards1.html
deleted file mode 100644
index 01ea6d1d8055..000000000000
--- a/layout/html/tests/table/core/standards1.html
+++ /dev/null
@@ -1,627 +0,0 @@
-<!DOCTYPE HTML PUBLIC "NavQuirks">
-
-<TITLE>Mozilla Tests: Colspan &amp; Width</TITLE>
-
-<STYLE>
-   TABLE, TR, TD { border: none; }
-   #a  { background: lime; }
-   #b  { background: yellow; }
-   #c  { background: fuchsia; }
-   DIV { border: solid red; width: 400px; }
-</STYLE>
-
-<h1>Problems with COLSPAN and WIDTH</h1>
-
-<p>Each block of tables should be identical.</p>
-
-<h2>Sized Tables</h2>
-
-<P>The following tables have width=400, which should make them the
-same width as the red lines which are caused by DIVs:</P>
-
-<h3>260/140</h3>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b WIDTH=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b width=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b width=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="65%">
-                        width=65%
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b width="35%">
-                        width=35%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="65%">
-                        width=65%
-                </TD>
-                <TD id=b width="35%">
-                        width=35%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<h3>140/260</h3>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b WIDTH=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b width=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b width=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="35%">
-                        width=35%
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b width="65%">
-                        width=65%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="35%">
-                        width=35%
-                </TD>
-                <TD id=b width="65%">
-                        width=65%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<h3>50%</h3>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="50%">
-                        width=50%
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b width="50%">
-                        width=50%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a width="50%">
-                        width=50%
-                </TD>
-                <TD id=b width="50%">
-                        width=50%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE WIDTH=400>
-        <TR>
-                <TD id=a WIDTH=200>
-                        width=200
-                </TD>
-                <TD id=b WIDTH=200>
-                        width=200
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<h2>Tables Without Width</h2>
-
-<P>The following tables have no width. They should still be the same
-size, by virtue of them having a 400 pixel cell and no
-padding/margin/borders.</P>
-
-<h3>260/140</h3>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b WIDTH=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b width=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=260>
-                        width=260
-                </TD>
-                <TD id=b width=140>
-                        width=140
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<h3>140/260</h3>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b WIDTH=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b width=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width=140>
-                        width=140
-                </TD>
-                <TD id=b width=260>
-                        width=260
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<h3>50%</h3>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width="50%">
-                        width=50%
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b width="50%">
-                        width=50%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a width="50%">
-                        width=50%
-                </TD>
-                <TD id=b width="50%">
-                        width=50%
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a>
-                        plain
-                </TD>
-                <TD id=b>
-                        plain
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2 WIDTH=400>
-                        colspan=2 width=400
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
-<TABLE>
-        <TR>
-                <TD id=a WIDTH=200>
-                        width=200
-                </TD>
-                <TD id=b WIDTH=200>
-                        width=200
-                </TD>
-        </TR>   
-        <TR>
-                <TD id=c COLSPAN=2>
-                        colspan=2
-                </TD>
-        </TR>
-</TABLE>
-
-<DIV></DIV>
-
diff --git a/layout/html/tests/table/core/table_frame.html b/layout/html/tests/table/core/table_frame.html
deleted file mode 100644
index 007180f6aad7..000000000000
--- a/layout/html/tests/table/core/table_frame.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<table border frame=void>
-<tr><td>frame</td><td>void</td></tr>
-</table>
-
-<br>
-
-<table border frame=above>
-<tr><td>frame</td><td>above</td></tr>
-</table>
-
-<br>
-
-<table border frame=below>
-<tr><td>frame</td><td>below</td></tr>
-</table>
-
-<br>
-
-<table border frame=hsides>
-<tr><td>frame</td><td>hsides</td></tr>
-</table>
-
-<br>
-
-<table border frame=vsides>
-<tr><td>frame</td><td>vsides</td></tr>
-</table>
-
-<br>
-
-<table border frame=rhs>
-<tr><td>frame</td><td>rhs</td></tr>
-</table>
-
-<br>
-
-<table border frame=lhs>
-<tr><td>frame</td><td>lhs</td></tr>
-</table>
-
-<br>
-
-<table border frame=box>
-<tr><td>frame</td><td>box</td></tr>
-</table>
-<br>
-
-<table border frame=border>
-<tr><td>frame</td><td>border</td></tr>
-</table>
-
-<br>
diff --git a/layout/html/tests/table/core/table_heights.html b/layout/html/tests/table/core/table_heights.html
deleted file mode 100644
index 9c967ba14e62..000000000000
--- a/layout/html/tests/table/core/table_heights.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<style>
-html {
- marginx:10px; padding:10px; border:2px solid red;
- }
-body
-{
-  margin:10px; paddingx:10px; 
-}
-</style>
-<body>
- <table border width="100%" height="100%">
-  <tr>
-   <td>FOO</td>
-   <td>BAR</td></tr>
- </table>
-</body>
-
-
diff --git a/layout/html/tests/table/core/table_rules.html b/layout/html/tests/table/core/table_rules.html
deleted file mode 100644
index 94e3101705d6..000000000000
--- a/layout/html/tests/table/core/table_rules.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<table border rules=none>
- <tr><td>rules</td><td>none</td></tr>
- <tr><td>rules</td><td>none</td></tr>
-</table>
-
-<br>
-
-<table border rules=group>
- <tbody>
-  <tr><td>rules</td><td>row group 1</td></tr>
-  <tr><td>rules</td><td>row group 1</td></tr>
- </tbody>
- <tbody>
-  <tr><td>rules</td><td>row group 2</td></tr>
-  <tr><td>rules</td><td>row group 2</td></tr>
- </tbody>
-</table>
-
-<br>
-
-<table border rules=group>
- <colgroup><col><col></colgroup>
- <colgroup><col><col></colgroup>
- <tr><td>rules</td><td>col group 1</td><td>rules</td><td>col group 2</td></tr>
- <tr><td>rules</td><td>col group 1</td><td>rules</td><td>col group 2</td></tr>
- </tbody>
-</table>
-
-<br>
-
-<table border rules=rows>
-<tr><td>rules</td><td>rows</td></tr>
-<tr><td>rules</td><td>rows</td></tr>
-</table>
-
-<br>
-
-<table border rules=cols>
-<tr><td>rules</td><td>cols</td></tr>
-<tr><td>rules</td><td>cols</td></tr>
-</table>
-
-<br>
-
-<table border rules=all>
-<tr><td>rules</td><td>all</td></tr>
-<tr><td>rules</td><td>all</td></tr>
-</table>
-
-<br>
diff --git a/layout/html/tests/table/core/table_widths.html b/layout/html/tests/table/core/table_widths.html
deleted file mode 100644
index bf070294c18f..000000000000
--- a/layout/html/tests/table/core/table_widths.html
+++ /dev/null
@@ -1,29 +0,0 @@
-table width includes border
-<hr align=left style="width: 200px;">
-<table width=200 border=10>
- <tr>
-  <td>200 table</td></tr>
-</table>
-<BR>
-
-nested table width includes border
-<table cellspacing=0 cellpadding=0 border>
- <tr>
-  <td>
-   <table width=200 border=10>
-    <tr>
-     <td>200 nested table</td></tr>
-   </table></td></tr>
-</table>
-
-nested table width includes border
-<table cellspacing=0 cellpadding=0 border>
- <tr>
-  <td>
-   <table width=100% border=10>
-    <tr>
-     <td>100% nested table</td></tr>
-   </table></td></tr>
-</table>
-
-
diff --git a/layout/html/tests/table/dom/appendCells1.html b/layout/html/tests/table/dom/appendCells1.html
deleted file mode 100644
index cd3a4a67174b..000000000000
--- a/layout/html/tests/table/dom/appendCells1.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  appendCellAt(0, 1, 1);
-
-  appendCellAt(2, 1, 1);
-  appendCellAt(2, 1, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td>X1</td>
- </tr>
-</table>
-<BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td>X2</td><td>X3</td>
- </tr>
-</table>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendCellsRebuild1.html b/layout/html/tests/table/dom/appendCellsRebuild1.html
deleted file mode 100644
index 738f9be4d279..000000000000
--- a/layout/html/tests/table/dom/appendCellsRebuild1.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  appendCellAt(0, 2, 1);
-
-  appendCellAt(4, 2, 1);
-  appendCellAt(4, 2, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
- <tr>
-  <td>c11</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
- <tr>
-  <td>c11</td><td rowspan=2>X1</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- </tbody>
-</table>
-<BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
- <tr>
-  <td>c11</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
- <tr>
-  <td>c11</td><td rowspan=2>X2</td><td rowspan=2>X3</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- </tbody>
-</table>
-
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendCol1.html b/layout/html/tests/table/dom/appendCol1.html
deleted file mode 100644
index a30140ddd55e..000000000000
--- a/layout/html/tests/table/dom/appendCol1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.createElement("COL", null);
-  col.width = 200;
-  table.appendChild(col);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <col>
- <col width=200>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendCol2.html b/layout/html/tests/table/dom/appendCol2.html
deleted file mode 100644
index 3bfdabdff044..000000000000
--- a/layout/html/tests/table/dom/appendCol2.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var cg = document.getElementsByTagName("COLGROUP")[0];
-  var col = document.createElement("COL", null);
-  col.width = 200;
-  cg.appendChild(col);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col>
- </colgroup>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col>
-  <col width=200>
- </colgroup>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendColGroup1.html b/layout/html/tests/table/dom/appendColGroup1.html
deleted file mode 100644
index 7d06acbf70f9..000000000000
--- a/layout/html/tests/table/dom/appendColGroup1.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var cg = document.createElement("COLGROUP", null);
-  cg.width=200
-  var col = document.createElement("COL", null);
-  cg.appendChild(col);
-  col = document.createElement("COL", null);
-  cg.appendChild(col);
-  table.appendChild(cg);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
- </colgroup>
- <tr>
-  <td>col-100</td><td>cg-200</td><td>cg-200</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
- </colgroup>
- <colgroup width=200>
-  <col>
-  <col>
- </colgroup>
- <tr>
-  <td>col-100</td><td>cg-200</td><td>cg-200</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendRowsExpand1.html b/layout/html/tests/table/dom/appendRowsExpand1.html
deleted file mode 100644
index 429da5d71fe4..000000000000
--- a/layout/html/tests/table/dom/appendRowsExpand1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var tbody = document.getElementsByTagName("TBODY")[0];
-  var row = document.createElement("TR", null);
-  appendCell(row, 1, 1);
-  appendCell(row, 1, 1);
-  tbody.appendChild(row);
-  row = document.createElement("TR", null);
-  appendCell(row, 1, 1);
-  appendCell(row, 1, 1);
-  tbody.appendChild(row);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>X1</td><td>X2</td>
- </tr>
- <tr>
-  <td>X3</td><td>X4</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/appendTbodyExpand1.html b/layout/html/tests/table/dom/appendTbodyExpand1.html
deleted file mode 100644
index b115682195c6..000000000000
--- a/layout/html/tests/table/dom/appendTbodyExpand1.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var rg = document.createElement("TBODY", null);
-  var row = document.createElement("TR");
-  appendCell(row, 1, 1);
-  appendCell(row, 1, 1);
-  rg.appendChild(row);
-  table.appendChild(rg);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-   <tr>
-    <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-   <tr>
-    <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
- <tbody>
-   <tr>
-    <td>X1</td><td>X2</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCellsRebuild1.html b/layout/html/tests/table/dom/deleteCellsRebuild1.html
deleted file mode 100644
index 7878c3432637..000000000000
--- a/layout/html/tests/table/dom/deleteCellsRebuild1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteCellAt(0, 0);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td rowspan=2>c12</td><td>c13</td>
- </tr>
- <tr>
-  <td>c12</td><td>c22</td><td>c23</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>c12</td><td>c13</td>
- </tr>
- <tr>
-  <td>c12</td><td>c22</td><td>c23</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCellsShrink1.html b/layout/html/tests/table/dom/deleteCellsShrink1.html
deleted file mode 100644
index 4164464f40f0..000000000000
--- a/layout/html/tests/table/dom/deleteCellsShrink1.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteCellAt(0, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td>c13</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c13</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCellsShrink2.html b/layout/html/tests/table/dom/deleteCellsShrink2.html
deleted file mode 100644
index 5da9324c96c9..000000000000
--- a/layout/html/tests/table/dom/deleteCellsShrink2.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteCellAt(0, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12 c12 c12 c12 c12</td><td>c13</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td><td>c23</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c13</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td><td>c23</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCol1.html b/layout/html/tests/table/dom/deleteCol1.html
deleted file mode 100644
index 3cee9ac5e9bf..000000000000
--- a/layout/html/tests/table/dom/deleteCol1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.getElementsByTagName("COL")[0];
-  table.removeChild(col);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <col width=300>
- <tr>
-  <td>200</td><td>300</td><td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <col width=200>
- <col width=300>
- <tr>
-  <td>200</td><td>300</td><td>auto</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCol2.html b/layout/html/tests/table/dom/deleteCol2.html
deleted file mode 100644
index 37f767b4e887..000000000000
--- a/layout/html/tests/table/dom/deleteCol2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.getElementsByTagName("COL")[1];
-  table.removeChild(col);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <col width=300>
- <tr>
-  <td>100</td><td>300</td><td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <col width=100>
- <col width=300>
- <tr>
-  <td>100</td><td>300</td><td>auto</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteCol3.html b/layout/html/tests/table/dom/deleteCol3.html
deleted file mode 100644
index 7a6ab9268890..000000000000
--- a/layout/html/tests/table/dom/deleteCol3.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.getElementsByTagName("COL")[2];
-  table.removeChild(col);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <col width=300>
- <tr>
-  <td>100</td><td>200</td><td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <tr>
-  <td>100</td><td>200</td><td>auto</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteColGroup1.html b/layout/html/tests/table/dom/deleteColGroup1.html
deleted file mode 100644
index e90c16a40a1b..000000000000
--- a/layout/html/tests/table/dom/deleteColGroup1.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var colgroup = document.getElementsByTagName("COLGROUP")[0];
-  table.removeChild(colgroup);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup span=2 width=100></colgroup>
- <colgroup span=2 width=200></colgroup>
- <tr>
-  <td>200</td><td>200</td><td>auto</td><td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup span=2 width=200></colgroup>
- <tr>
-  <td>200</td><td>200</td><td>auto</td><td>auto</td>
- </tr>
-</table>
-<BR>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteColGroup2.html b/layout/html/tests/table/dom/deleteColGroup2.html
deleted file mode 100644
index ccc4160da06e..000000000000
--- a/layout/html/tests/table/dom/deleteColGroup2.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var colgroup = document.getElementsByTagName("COLGROUP")[1];
-  table.removeChild(colgroup);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup span=2 width=100></colgroup>
- <colgroup span=2 width=200></colgroup>
- <tr>
-  <td>100</td><td>100</td><td>auto</td><td>auto</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup span=2 width=100></colgroup>
- <tr>
-  <td>100</td><td>100</td><td>auto</td><td>auto</td>
- </tr>
-</table>
-<BR>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteRowsRebuild1.html b/layout/html/tests/table/dom/deleteRowsRebuild1.html
deleted file mode 100644
index 9b681f47e08f..000000000000
--- a/layout/html/tests/table/dom/deleteRowsRebuild1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteRowAt(0, 0);
-  deleteRowAt(2, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>c11</td><td>c12</td>
- </tr>
-</table>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteRowsShrink1.html b/layout/html/tests/table/dom/deleteRowsShrink1.html
deleted file mode 100644
index 7b58392ea866..000000000000
--- a/layout/html/tests/table/dom/deleteRowsShrink1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteRowAt(0, 0);
-  deleteRowAt(2, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteTbodyExpand1.html b/layout/html/tests/table/dom/deleteTbodyExpand1.html
deleted file mode 100644
index 7f37aa1d81b3..000000000000
--- a/layout/html/tests/table/dom/deleteTbodyExpand1.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteTbodyAt(0, 0);
-  deleteTbodyAt(2, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
-  <tr>
-   <td>c21</td><td>c22</td>
-  </tr>
- </tbody>
- <tbody>
-  <tr>
-   <td>c31</td><td>c32</td>
-  </tr>
-  <tr>
-   <td>c41</td><td>c42</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c31</td><td>c32</td>
-  </tr>
-  <tr>
-   <td>c41</td><td>c42</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
-  <tr>
-   <td>c21</td><td>c22</td>
-  </tr>
- </tbody>
- <tbody>
-  <tr>
-   <td>c31</td><td>c32</td>
-  </tr>
-  <tr>
-   <td>c41</td><td>c42</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
-  <tr>
-   <td>c21</td><td>c22</td>
-  </tr>
- </tbody>
-</table>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/deleteTbodyRebuild1.html b/layout/html/tests/table/dom/deleteTbodyRebuild1.html
deleted file mode 100644
index a04514734b30..000000000000
--- a/layout/html/tests/table/dom/deleteTbodyRebuild1.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  deleteTbodyAt(0, 0);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-It should never be the case that deleting a tbody causes a rebuild
-of the cell map since cells cannot span out of tbodies. However, this is a bug.
-<BR><BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
-  <tr>
-   <td rowspan=2>c21</td><td>c22</td>
-  </tr>
- </tbody>
- <tbody>
-  <tr>
-   <td>c31</td><td>c32</td>
-  </tr>
-  <tr>
-   <td>c41</td><td>c42</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c31</td><td>c32</td>
-  </tr>
-  <tr>
-   <td>c41</td><td>c42</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertCellsExpand1.html b/layout/html/tests/table/dom/insertCellsExpand1.html
deleted file mode 100644
index 1d54db0842e8..000000000000
--- a/layout/html/tests/table/dom/insertCellsExpand1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  insertCellAt(0, 1, 1, 1);
-  insertCellAt(0, 1, 1, 1);
-  insertCellAt(1, 1, 1, 1);
-  insertCellAt(1, 1, 1, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>X2</td><td>X1</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>X4</td><td>X3</td><td>c22</td>
- </tr>
-</table>
-
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertCellsExpand2.html b/layout/html/tests/table/dom/insertCellsExpand2.html
deleted file mode 100644
index 2fb4b184a5f4..000000000000
--- a/layout/html/tests/table/dom/insertCellsExpand2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  insertCellAt(0, 1, 2, 2);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td><td>c34</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td rowspan=2 colspan=2>X1</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td><td>c34</td>
- </tr>
-</table>
-
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertCellsRebuild1.html b/layout/html/tests/table/dom/insertCellsRebuild1.html
deleted file mode 100644
index aa90c572b605..000000000000
--- a/layout/html/tests/table/dom/insertCellsRebuild1.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  insertCellAt(0, 1, 2, 2);
-  insertCellAt(7, 1, 1, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
- <tr>
-  <td colspan=2>c21</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td><td>c34</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td rowspan=2 colspan=2>X1</td><td>c12</td>
- </tr>
- <tr>
-  <td colspan=2>c21</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td><td>c34</td>
- </tr>
-</table>
-
-<BR>
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td rowspan=2>c13</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td rowspan=2>c13</td>
- </tr>
- <tr>
-  <td>c21</td><td>X1</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td><td>c33</td>
- </tr>
-</table>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertCellsRebuild2.html b/layout/html/tests/table/dom/insertCellsRebuild2.html
deleted file mode 100644
index 5562ecbeef89..000000000000
--- a/layout/html/tests/table/dom/insertCellsRebuild2.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  insertCellAt(1, 1, 1, 1);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td rowspan=2>c22</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td><td>c12</td>
- </tr>
- <tr>
-  <td>c21</td><td>X1</td><td rowspan=2>c22</td><td>c22</td>
- </tr>
- <tr>
-  <td>c31</td><td>c32</td>
- </tr>
-</table>
-
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertColGroups1.html b/layout/html/tests/table/dom/insertColGroups1.html
deleted file mode 100644
index 141997ec9767..000000000000
--- a/layout/html/tests/table/dom/insertColGroups1.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCg = document.getElementsByTagName("COLGROUP")[0];
-  var cg = document.createElement("COLGROUP", null);
-  var col = document.createElement("COL", null);
-  col.width = 100;
-  cg.appendChild(col);
-  col = document.createElement("COL", null);
-  col.width = 200;
-  cg.appendChild(col);  
-  table.insertBefore(cg, refCg);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
-  <col width=200>
- </colgroup>
- <colgroup>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertColGroups2.html b/layout/html/tests/table/dom/insertColGroups2.html
deleted file mode 100644
index e30f1bc82e93..000000000000
--- a/layout/html/tests/table/dom/insertColGroups2.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCg = document.getElementsByTagName("COLGROUP")[1];
-  var cg = document.createElement("COLGROUP", null);
-  var col = document.createElement("COL", null);
-  col.width = 100;
-  cg.appendChild(col);
-  col = document.createElement("COL", null);
-  col.width = 150;
-  cg.appendChild(col);  
-  table.insertBefore(cg, refCg);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col width=50>
- </colgroup>
- <colgroup>
-  <col width=200>
- </colgroup>
- <tr>
-  <td>50</td><td>100</td><td>150</td><td>200</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col width=50>
- </colgroup>
- <colgroup>
-  <col width=100>
-  <col width=150>
- </colgroup>
- <colgroup>
-  <col width=200>
- </colgroup>
- <tr>
-  <td>50</td><td>100</td><td>150</td><td>200</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertCols1.html b/layout/html/tests/table/dom/insertCols1.html
deleted file mode 100644
index aea07e9c4bb4..000000000000
--- a/layout/html/tests/table/dom/insertCols1.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCol = document.getElementsByTagName("COL")[0];
-  var col = document.createElement("COL", null);
-  col.width = 100;
-  table.insertBefore(col, refCol);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=200>
- <col width=300>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <col width=300>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertCols2.html b/layout/html/tests/table/dom/insertCols2.html
deleted file mode 100644
index 9b3cbe55b22e..000000000000
--- a/layout/html/tests/table/dom/insertCols2.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCol = document.getElementsByTagName("COL")[1];
-  var col = document.createElement("COL", null);
-  col.width = 200;
-  table.insertBefore(col, refCol);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=100>
- <col width=300>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-
-<BR>
-<table bgcolor=orange border>
- <col width=100>
- <col width=200>
- <col width=300>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertCols3.html b/layout/html/tests/table/dom/insertCols3.html
deleted file mode 100644
index 6244e96ba0bb..000000000000
--- a/layout/html/tests/table/dom/insertCols3.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCol = document.getElementsByTagName("COL")[2];
-  var col = document.createElement("COL", null);
-  col.width = 150;
-  table.insertBefore(col, refCol);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <col width=50>
- <col width=100>
- <col width=200>
- <tr>
-  <td>50</td><td>100</td><td>150</td><td>200</td>
- </tr>
-</table>
-
-<BR>
-<table bgcolor=orange border>
- <col width=50>
- <col width=100>
- <col width=150>
- <col width=200>
- <tr>
-  <td>50</td><td>100</td><td>150</td><td>200</td>
- </tr>
-</table>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertCols4.html b/layout/html/tests/table/dom/insertCols4.html
deleted file mode 100644
index 22cacdbfa366..000000000000
--- a/layout/html/tests/table/dom/insertCols4.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var cg = document.getElementsByTagName("COLGROUP")[0];
-  var refCol = document.getElementsByTagName("COL")[0];
-  var col = document.createElement("COL", null);
-  col.width = 100;
-  cg.insertBefore(col, refCol);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col width=200>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
-  <col width=200>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertCols5.html b/layout/html/tests/table/dom/insertCols5.html
deleted file mode 100644
index 1994e8e0c71c..000000000000
--- a/layout/html/tests/table/dom/insertCols5.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var cg = document.getElementsByTagName("COLGROUP")[0];
-  var refCol = document.getElementsByTagName("COL")[1];
-  var col = document.createElement("COL", null);
-  col.width = 200;
-  cg.insertBefore(col, refCol);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <colgroup>
-  <col width=100>
-  <col width=200>
-  <col width=300>
- </colgroup>
- <tr>
-  <td>100</td><td>200</td><td>300</td>
- </tr>
-</table>
-</BODY></HTML>
-
diff --git a/layout/html/tests/table/dom/insertRowsExpand1.html b/layout/html/tests/table/dom/insertRowsExpand1.html
deleted file mode 100644
index a5f13518707e..000000000000
--- a/layout/html/tests/table/dom/insertRowsExpand1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var tbody = document.getElementsByTagName("TBODY")[0];
-  var row = document.createElement("TR", null);
-  appendCell(row, 1, 1);
-  appendCell(row, 1, 1);
-  var refRow = document.getElementsByTagName("TR")[0];
-  tbody.insertBefore(row, refRow);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td>X1</td><td>X2</td>
- </tr>
- <tr>
-  <td>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertRowsRebuild1.html b/layout/html/tests/table/dom/insertRowsRebuild1.html
deleted file mode 100644
index 1896d08b2afa..000000000000
--- a/layout/html/tests/table/dom/insertRowsRebuild1.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var tbody = document.getElementsByTagName("TBODY")[0];
-  var row = document.createElement("TR", null);
-  appendCell(row, 2, 1);
-  appendCell(row, 1, 1);
-  var refRow = document.getElementsByTagName("TR")[0];
-  tbody.insertBefore(row, refRow);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tr>
-  <td rowspan=2>X1</td><td>X2</td>
- </tr>
- <tr>
-  <td rowspan=2>c11</td><td>c12</td>
- </tr>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertTbodyExpand1.html b/layout/html/tests/table/dom/insertTbodyExpand1.html
deleted file mode 100644
index 048b9f6b6f52..000000000000
--- a/layout/html/tests/table/dom/insertTbodyExpand1.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var tbody = document.createElement("TBODY", null);
-  var row = document.createElement("TR", null);
-  appendCell(row, 1, 1);
-  appendCell(row, 1, 1);
-  tbody.appendChild(row);
-  var refTbody = document.getElementsByTagName("TBODY")[0];
-  table.insertBefore(tbody, refTbody);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>X1</td><td>X2</td>
-  </tr>
- </tbody>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
-</table>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/insertTbodyRebuild1.html b/layout/html/tests/table/dom/insertTbodyRebuild1.html
deleted file mode 100644
index 88b6f07e287f..000000000000
--- a/layout/html/tests/table/dom/insertTbodyRebuild1.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<HEAD>
-<SCRIPT src=tableDom.js>
-</SCRIPT>
-<SCRIPT>
-
-function doIt() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var tbody = document.createElement("TBODY", null);
-  var row = document.createElement("TR", null);
-  appendCell(row, 2, 1);
-  appendCell(row, 1, 1);
-  tbody.appendChild(row);
-  var refTbody = document.getElementsByTagName("TBODY")[0];
-  table.insertBefore(tbody, refTbody);
-}
-</SCRIPT>  
-</HEAD>
-<BODY onload="doIt()">
-The 2 tables should look the same
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
-</table>
-<BR>
-<table bgcolor=orange border>
- <tbody>
-  <tr>
-   <td rowspan=2>X1</td><td>X2</td>
-  </tr>
- </tbody>
- <tbody>
-  <tr>
-   <td>c11</td><td>c12</td>
-  </tr>
- </tbody>
-</table>
-</table>
-<BR>
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/rtest.lst b/layout/html/tests/table/dom/rtest.lst
deleted file mode 100644
index beafd5964e5f..000000000000
--- a/layout/html/tests/table/dom/rtest.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-appendCells1.html
-appendCellsRebuild1.html
-appendCol1.html
-appendCol2.html
-appendColGroup1.html
-appendRowsExpand1.html
-appendTbodyExpand1.html
-deleteCellsRebuild1.html
-deleteCellsShrink1.html
-deleteCellsShrink2.html
-deleteCol1.html
-deleteCol2.html
-deleteCol3.html
-deleteColGroup1.html
-deleteColGroup2.html
-deleteRowsRebuild1.html
-deleteRowsShrink1.html
-deleteTbodyExpand1.html
-deleteTbodyRebuild1.html
-insertCellsExpand1.html
-insertCellsExpand2.html
-insertCellsRebuild1.html
-insertCellsRebuild2.html
-insertColGroups1.html
-insertColGroups2.html
-insertCols1.html
-insertCols2.html
-insertCols3.html
-insertCols4.html
-insertCols5.html
-insertRowsExpand1.html
-insertRowsRebuild1.html
-insertTbodyExpand1.html
-insertTbodyRebuild1.html
-
diff --git a/layout/html/tests/table/dom/tableDom.html b/layout/html/tests/table/dom/tableDom.html
deleted file mode 100644
index 60bf90a50320..000000000000
--- a/layout/html/tests/table/dom/tableDom.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<HEAD>
-<SCRIPT src=dom.js>
-</SCRIPT>
-<SCRIPT>
-
-var count = 1;
-function genName(prefix) {
-  return "X" + count++ + "\n";
-}
-
-function doIt() {
-  var rgInput = document.getElementsByTagName("INPUT")[0];
-  var rgIndex = rgInput.value;
-  var rowInput = document.getElementsByTagName("INPUT")[1];
-  var rowIndex = rowInput.value;
-  var colInput = document.getElementsByTagName("INPUT")[2];
-  var colIndex = colInput.value;
-  var rowSpanInput = document.getElementsByTagName("INPUT")[3];
-  var rowSpan = rowSpanInput.value;
-  var colSpanInput = document.getElementsByTagName("INPUT")[4];
-  var colSpan = colSpanInput.value;
-  var select = document.getElementsByTagName("SELECT")[0];
-  var actionIndex = select.selectedIndex;
-
-  var table = document.getElementsByTagName("TABLE")[0];
-  var tbodies = table.tBodies;
-  var tbody = tbodies.item(rgIndex);
-
-
-  if (0 == actionIndex) {
-    var rows = tbody.rows;
-    var row = rows.item(rowIndex);
-    //appendCell(rowIndex, rowSpan, colSpan);
-    appendCell(row, 1, 1);
-  } 
-  else if (1 == actionIndex) {
-    var rows = tbody.rows;
-    var row = rows.item(rowIndex);
-    //insertCell(rowIndex, colIndex, rowSpan, colSpan);
-    insertCell(row, colIndex, 1, 1);
-  } 
-  else if (2 == actionIndex) {
-    var rows = tbody.rows;
-    var row = rows.item(rowIndex);
-    deleteCell(row, colIndex);
-  } 
-  else if (3 == actionIndex) {
-    appendRow(tbody);
-  } 
-  else if (4 == actionIndex) {
-    insertRow(tbody, rowIndex);
-  } 
-  else if (5 == actionIndex) {
-    deleteRow(tbody, rowIndex);
-  } 
-  else if (6 == actionIndex) {
-    buildTable(rowIndex, colIndex);
-  } 
-}
-
-function appendCellx(aRowIndex, aRowSpan, aColSpan) {
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  var cell = document.createElement("TD", null);
-  cell.rowSpan = 2;
-  cell.colSpan = aColSpan;
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  row.appendChild(cell);
-}
-
-function insertCell(aRowIndex, aColIndex, aRowSpan, aColSpan) {
-dump(aRowSpan); dump(aColSpan);
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  //var refCell = document.getElementsByTagName("TD")[0];
-  var cells = row.cells;
-  var refCell = cells.item(aColIndex);
-  var newCell = document.createElement("TD", null);
-  newCell.rowSpan = aRowSpan;
-  newCell.colSpan = aColSpan;
-  var text = document.createTextNode(genName());
-  newCell.appendChild(text);
-  row.insertBefore(newCell, refCell);
-  //dump("SCRIPT: inserted  CELL as first cell in first row\n");
-}
-
-function deleteCell(aRowIndex, aColIndex) {
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  row.deleteCell(aColIndex);
-}
-
-function appendRow(aRowGroupIndex) {
-  var rg = document.getElementsByTagName("TBODY")[aRowGroupIndex];
-  var row = document.createElement("TR", null);
-  rg.appendChild(row);
-  appendCell(row.rowIndex, 1, 1);
-}
-
-function insertRow(aRowGroupIndex, aRowIndex) {
-  var rg = document.getElementsByTagName("TBODY")[aRowGroupIndex];
-  var refRow = document.getElementsByTagName("TR")[aRowIndex];
-  var row = document.createElement("TR", null);
-  rg.insertBefore(row, refRow);
-}
-
-function buildTable(aNumRows, aNumCols) {
-  var table = document.getElementsByTagName("TABLE")[0];
-  for (rowX = 0; rowX < aNumRows; rowX++) {
-    var row = document.createElement("TR", null);
-	for (colX = 0; colX < aNumCols; colX++) {
-      var cell = document.createElement("TD", null);
-      var text = document.createTextNode(genName());
-      cell.appendChild(text);
-      row.appendChild(cell);
-	}
-	table.appendChild(row);
-  }
-}
-
-</SCRIPT>
-</HEAD>
-<BODY>
-<form>
-<select>
- <option>append cell</option>
- <option>insert cell</option>
- <option>delete cell</option>
- <option>append row</option>
- <option>insert row</option>
- <option>delete row</option>
- <option>build table</option>
-</select>
-&nbsp tbody
-<input type=text size=5 value=0>
-&nbsp row
-<input type=text size=5 value=0>
-&nbsp col
-<input type=text size=5 value=0>
-&nbsp row span
-<input type=text size=5 value=1>
-&nbsp col span
-<input type=text size=5 value=1>
-&nbsp &nbsp 
-<INPUT TYPE="button" NAME="doIt" VALUE="Do It" onClick="doIt()" width=100>
-</form>
-<BR>
-<table bgcolor=orange border>
- <tbody>
- <tr>
-  <td>c11</td>
- </tr>
- <tr>
-  <td>c21</td><td>c22</td>
- </tr>
- </tbody>
-</table>
-<BR>
-
-</BODY></HTML>
-
-
-
-
-
-
diff --git a/layout/html/tests/table/dom/tableDom.js b/layout/html/tests/table/dom/tableDom.js
deleted file mode 100644
index e3c8b4e38578..000000000000
--- a/layout/html/tests/table/dom/tableDom.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * 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 ***** */
-
-var count = 1;
-function genName(prefix) {
-  return "X" + count++ + "\n";
-}
-
-function appendCell(aRow, aRowSpan, aColSpan) {
-  var cell = document.createElement("TD", null);
-  cell.rowSpan = aRowSpan;
-  cell.colSpan = aColSpan;
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  aRow.appendChild(cell);
-}
-
-function appendCellAt(aRowIndex, aRowSpan, aColSpan) {
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  appendCell(row, aRowSpan, aColSpan);
-}
-
-function insertCell(aRow, aColIndex, aRowSpan, aColSpan) {
-  var cells = aRow.cells;
-  var refCell = cells.item(aColIndex);
-  var newCell = document.createElement("TD", null);
-  newCell.rowSpan = aRowSpan;
-  newCell.colSpan = aColSpan;
-  var text = document.createTextNode(genName());
-  newCell.appendChild(text);
-  aRow.insertBefore(newCell, refCell);
-  //dump("SCRIPT: inserted  CELL as first cell in first row\n");
-}
-
-function insertCellAt(aRowIndex, aColIndex, aRowSpan, aColSpan) {
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  insertCell(row, aColIndex, aRowSpan, aColSpan);
-}
-
-function deleteCell(aRow, aColIndex) {
-  aRow.deleteCell(aColIndex);
-}
-
-function deleteCellAt(aRowIndex, aColIndex) {
-  var row = document.getElementsByTagName("TR")[aRowIndex];
-  deleteCell(row, aColIndex);
-}
-
-//function appendRow(aRowGroup) {
-//  var row = document.createElement("TR", null);
-//  cell = document.createElement("TD", null);
-//  row.appendChild(cell);
-//  aRowGroup.appendChild(row);
-//}
-
-function appendRow(aRowGroup) {
-  var row = document.createElement("TR", null);
-  cell = document.createElement("TD", null);
-  aRowGroup.appendChild(row);
-  //row.appendChild(cell);
-  //appendCell(row, 1, 1);
-}
-
-function appendRowAt(aRowGroupIndex) {
-  var rowGroup = document.getElementsByTagName("TBODY")[aRowGroupIndex];
-  appendRow(rowGroup);
-}
-
-function insertRow(aRowGroup, aRowIndex) {
-  var rows = aRowGroup.rows;
-  var refRow = rows.item(aRowIndex);
-  var row = document.createElement("TR", null);
-  aRowGroup.insertBefore(row, refRow);
-  //appendCell(row, 1, 1);
-}
-
-function insertRowAt(aRowGroupIndex, aRowIndex) {
-  var rowGroup = document.getElementsByTagName("TBODY")[aRowGroupIndex];
-  insertRow(rowGroup, aRowIndex);
-}
-
-function deleteRow(aRowGroup, aRowIndex) {
-  aRowGroup.deleteRow(aRowIndex);
-}
-
-function deleteRowAt(aRowGroupIndex, aRowIndex) {
-  var row = document.getElementsByTagName("TBODY")[aRowGroupIndex];
-  deleteRow(row, aRowIndex);
-}
-
-function insertTbody(aTable, aTbodyIndex) {
-  var tbodies = aTable.tBodies;
-  var refTbody = tbodies.item(aTbodyIndex);
-  var tbody = document.createElement("TBODY", null);
-  aTable.insertBefore(tbody, refTbody);
-}
-
-function insertTbodyAt(aTableIndex, aTbodyIndex) {
-  var table = document.getElementsByTagName("TABLE")[aTableIndex];
-  insertTbodyAt(table, aTbodyIndex);
-}
-
-function deleteTbody(aTable, aTbodyIndex) {
-  var tbodies = aTable.tBodies;
-  var tbody = tbodies.item(aTbodyIndex);
-  aTable.removeChild(tbody);
-}
-
-function deleteTbodyAt(aTableIndex, aTbodyIndex) {
-  var table = document.getElementsByTagName("TABLE")[aTableIndex];
-  deleteTbody(table, aTbodyIndex);
-}
-
-function buildTable(aNumRows, aNumCols) {
-  var table = document.getElementsByTagName("TABLE")[0];
-  for (rowX = 0; rowX < aNumRows; rowX++) {
-    var row = document.createElement("TR", null);
-	  for (colX = 0; colX < aNumCols; colX++) {
-      var cell = document.createElement("TD", null);
-      var text = document.createTextNode(genName());
-      cell.appendChild(text);
-      row.appendChild(cell);
-	}
-	table.appendChild(row);
-  }
-}
-
diff --git a/layout/html/tests/table/images/0.gif b/layout/html/tests/table/images/0.gif
deleted file mode 100644
index 62c50e309404b336d41fef3cebd15d61fc299294..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54
zcmZ?wbhEHbWMp7uX!y@?;J^U}1_s5SEQ~;kK?g*DWEdD3jTo#;;*)by6N~iHGt+nh
DKlcl9

diff --git a/layout/html/tests/table/images/002-bizcard-small.gif b/layout/html/tests/table/images/002-bizcard-small.gif
deleted file mode 100644
index 2dd0a9db4ce51dd1c41a2aee0c1d4eaa5f56a60e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2629
zcmV-L3cB@2Nk%w1VP*h30K@<Q@9*wTPfrmM5sr?HaBpv}t*y)e07ytlfq{UvwX~I$
zlvPz#T3T9UWMrqOrpd_2X=!P8c6EDud&9!PVPIf~hlVC5CqhC)Gc+{6zrH*@J-fTQ
zo12=UprF^*)?Qv-A^8LV00000EC2ui0A>I?000I5pdpTAX`X1Ru58N&%L2zt{e4v4
z>`((igdbrzj1Y{-V`RBJ9wi8iMKGOGuUDx6Yu$Rk;4oMeDAN`;1_ihC`G7#8Q^~9^
zB@sM6QlVC*fK^yrVuglZWHU4jAB;L~Z$WZSc1#j_mzkFc6@Pw!epy>uU5BP#A~K6M
zHxxWSLX${#noyYto0$WDfxWz4rKhH3sxdb>uC8xzL``+Inh4U<(-phE*rcMt!iA|b
zH8pE(uaZSYchQ^DP}CKi)}PtE+k)MO#AvJ^ZLsF&dGg${<?dYtg9i^P@PzHtHbUI)
zr9y+|n2sLI<j`8@juX6uAO|d*H_xG#QTN9G7>J?Ik+NmY=m>0wOBzCu)^ZN8#(`wE
zP$y5OM6|M{ON{<Brn}WK<jw(5qYmgP0E16@zEBQDWk3-lHp^nk6iCgc)2C9SD(EoJ
zYDs(AwhEXSu9X|H=w_D1`P7;Mkx&%~7VO}YRkytmzZI1-Rb8-=;yA%XGi1WFA_ouV
z;2<#|x1bxsjd+Ugv3_DLku7*xZQ#wDI~0(D_%Lk?ihXJwG^{8qWkMw1S&a~_YuFqV
za9GYk_GjGC58K8tJu4{E-hA7=t8}%;gT^y!R<4}+atE_%SFas9w`kt@Rx()7%2iS%
zwW{e1EMBnr<sEd;Tn7o<Mjdsy9SB<gd)9#>k#CHkCR{qzd?eL)<uwOjfDUxvK!FA-
z2wj3CM(17@*r}w?cCf^u7Zk;*_19+12^gS<9y;K_2I?v3qjb_mCz>EB&IKVqFy+OR
zW&HV9BZnO7sAB;<CivrlCI)F+iM;G4hGUNO)65+;eP>ORG-`OGjyV>9UItfQX(fU}
zZrM<80oc%h8nHBifDtx9btZ=9-I!yW1teO)1R?%tC5aknFyd{2gi@M(3_xIk1|L8W
zfd&v<KtKftU_gL03Sba`fSL}lfCEk%DkXa8DOx}R6C9=i2D?%x=>-yOY5@lqSP(!3
z6j*hErk!9A!7c)nL4^bYXfR6uFmyE#fCUtIszC%71f&54)&zTias+6wLjf7CnPaVq
zCU9#452)8`uNZ_2odVV(kZ-XVDA2$FTO0rZ6$b=Bg|--MVQnd3-mriLd8n(wC8t^-
z0S5_VP(cR`5MTiV1#AfAl(xz%?*<RV+3N+nSnI$60zg241R{rv0S8ntK&=HaRJ*_h
z3vAIa#J*7wfVyxjdr1TVj9Nhi9lWCe0t&p-fpYHBs;J5dB(MR?R_$swuV^oU+XB7*
zaNq&PmR;(m)*@(?rChBT#}Bwbkp~B7zP1*60=mgT*ywE_@2&GHK6VBk;C3&syM6{*
z<yA?_<%m_0LRz)~K(K)Srw16ZfHVvY009FBN$}Lo1$6KM0tw*k00$5#u)(}xhrK}t
z6SPb><&p+~00X`bk^BeL4Q&+zpEhs71&6WiN5e$Hkf{Zlen5Z#2pp_{!u+l-f$<?D
zpaH2OC7^)<4=j+ts)~y(b_N-+?7@MNnr(psFq;?!3M8q6Ajkm?h}HlwFt-BO%v$`=
z!nUlHH#9(ifdU`^+yW2*1|DDm{K7#57$7izkxT;_SU>?T0KZT{-~qn7-|r?cf&C4y
zfB&o5_ddWQUQsMn0svXfAfSOLV4wjNkihf4H-$W5ZwnI{owF>!yatSGXdhTW1uj5=
z1q?s~$67)F9N@P90vtdB8z2A&0${)2{SJ7++aK|8m^EUJYyw2Y00Rin0jnTzQ-JG<
z1_*G0TyYBla1+1+@|8V(*arxEun9b{CYS+iO-CFk+2YWHtNM*?hBSP@18iuvNKuc0
zzKYb+G;o0c%rR2=q8yO06c;FV#gX<wM<(8Z7V?~@O&{XjC-Dco3_Ku|07zy3SeeQT
znC$}2G-dyyxlCBXl0<GHiYn~Vr##@IHED{{*LwFjI381!9*|=-oe9l$va+4<bSE_5
zNlk0gvQqgF#||Xnok9J@WKtTZ*xqPPbUq-N#ET|7=^4+4I&_}>^A(*0k%)?1qzJcY
z%~ZH1&UpF%?v0@o<tWps&S|pqp%*wnN>_@~g+}zAR3Jv4ZUB>jz$kFBLX<GwNW<Wb
zQluV0=sX>&QkBB<07gYBOQC7hdg4nlMoJhBE~<offJZz4n$=E0>Qi)*G?}JsXj6-t
z(xM{OtY<ZAJncDA5hN^6VUo-`z%wI&j?-}k^{Q8e8qcP#RIO<ZY+#u>RJJ0>tskri
zKZHP`tHwsF!o*)s_4-u+?CPO|6|81A>sMIP60v0vhbwexme&kOrynh-2fRwspz`Xd
ze`P9X1CUnQ+E%b@#g_#{kWz3g)<v73tA9EguTM_)r>ku(0E9YLv}*RYNTqGUrYl|P
zl9ihOhc!TNX}|^-d6N^S9gvO^06fL5)|lzsYh{y(o7nOSsTM%$t^yFv>e}|UWyo(C
zrmNIwQir#1HO3>Ka8tn42xWYrApsKL0S6FZ1FaoE0+uTq%O>$(oFXH2I>1T=I6woh
z`c!`3x?la`_pB^Mn+P<Z($GeTv2!);ni2rA4-CKq5pcjL2~fitdH`!d1waG<V1Wi?
zAingqKn5CMfdK%ZRPv*a1QMVs6I<EJgZ1x<%PNBx1A$E7%}iDkr$Gi=(gO+j0015^
zfKeuZ06`7F1}rN92OLp-0hkTU0D!y!bnpX*Yo&f=V1_|snYQ!9z?NH?*zS7Dn+f^<
zr+DMFqY2<olyMAdI%^1kbS_r|3{YvL_**I#fAFmYxUY#-0fQO1dc+Bv=ZaYwU^R^P
z38i%s$_ARhbEa3honG#8eKlCy3i`e&ErzmL(rRYMpw-fKrU+hp>@bm5xRYkw*enfH
z<pw#}mNj)?uWV(OJlovpHg~i4tI}zk5~)-50Y;?}m<_?JoIoAvS2Zo{QAanrS0=Qp
z)6J6k%!l9tm+rJFw_S0-7#?EgkViq8?@oJK*!>pwTS*M<fh(fm`k+WS!a<Q|?^gr~
zdZ!uKfKdrJwmG}LUssds=^%eQ+_mMnz?XdnksEyEKri{T4>0WnF?HqgCO~k)>n-t>
zZ6KsH=QqYPj^BXu+~*^2L?gb!h&0rI*(lc)Qw98Re<I3v#;l>fFFy58gK^{KHiNmp
z{`0Qy;~1^D!N_A!bpCCZKJs1y#04Yqc}W(z>%F<#0Z!YU&t2q3xjWw1kaxXreE|!n
zjVV`tYe+-om&JX$PrVK9sngo(#W*<7yN>tz-~bup$N}YR(0BDf(+s&3h(fqFC7H8!
ny=}MbvGaR%gRe;IlTXGDUP6urB%={7h`#ivPyOnXAOrwAbfTI=

diff --git a/layout/html/tests/table/images/1.gif b/layout/html/tests/table/images/1.gif
deleted file mode 100644
index f9ab4e8040961bc2c3357d0a9655dce82b55cc83..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/1.jpg b/layout/html/tests/table/images/1.jpg
deleted file mode 100644
index 11e4d067ddf65682b226e10d5e9d005d2f8a4701..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 754
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX1{nrPW=16jCP7AKLB{__7$g}On3x$EkN^`a10ypVP)Z!=37|KS
z0V5O3|62?^Kn+X+%mNGyjPLle&+pNWZq=P)v9PHSs7YRcfsuuQ9Z3@t1EYW-GmDUt
zp^*zvGY8N}Mph<SzboFQ7j^VDdU)J6wLA9A9;jDD5Y;vY1_iJNW=2MPMtM96m|zN2
zfNo-CVr50Lo{>pF&~PF%i?D*CQDJf8L8ueh?3re2b4_jaI=o_y(6JkulP(AGcf8%K
z`#AjAm-|4g6a^TV7@1j+gN9L1(eZ<TVPIim<HCzDpV%w*-c5R<Z+>z0+0AO+Uw%xu
zZqv6VbEU_h(<Q%!wrcn)%sZm1+P(F*KTrcW+!&aFjuR03q7Sr0Oc2aNaxH^^Al%CW
z+CU|uf@o2|AixM#0rIneCQyZf05CRy0O3?d20=wb$H2mcjT1j294f$dM0sy0k4Wp+
z`{p99>w35E_<Kcl>pq=?wOI_zTW@V~x^Ts`XP;{I7dP$TgxF2zZA90lDF!l3I<z!Y
fZ0W2if8<Y2-1+?HWbFk3Hjew$w}sE&`Tr&WZ7Z(Z

diff --git a/layout/html/tests/table/images/10empty.jpg b/layout/html/tests/table/images/10empty.jpg
deleted file mode 100644
index a19c103fba1c69570a852087f04aa0f0118d01c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 938
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX1`P&DW=16jCP7AKLB{__7^D~&n3$LukO31j8zT!VP);1^3!p!c
z0V5O3|62?^%!~|70?Yyo42-)^Z2J68XBW3VvwzT)t#J%DS#JmQ1NABkFfaiXvm<F{
zVrCQr2857+ps=E$kulI54xs6btW3S(sexXLW{31&ZZFcG_~5x?VaLUN=~9WaP5M_C
zT-df$ce}j*HK#klASVf8I7v`I2y7HHBcnazsda&1RSZBEq5wuA0kA42kgAg@n{MU+
z)oBSZ0Nu#K%n4V@$iU3RB4j8aXk;R+I8jMiC8%)H<i!u6Ze_D)lAV~Eu%)l-p!3V#
z$(8qY_=G32-T82AR`#_e_ZB=gD6)OlYR;m2^#IGEid)xCztx^|SeEOq`5O(6Wl>D>
z+UC)hKh~`WTC4&L9VP}=W>$p7f((iRhJlHNjtf6DPQ3W=BP@9A75Cf{bNOYH&04$3
zVEYu`RPmP_6BPVn+%AO6bM4%JPiuLcTDRtwKX)D&KWO~e^lITd-%OkREDS6;3#?Y#
zE#c8;V096X-opnp4;*a_pvV?ryIjTj9&30qG6+IK3KX6K&vXtX+y|<Y0ERnQC)~jd
zi~@p*@E{e)Jt#VjAE;1K0H~0Ok(m`9{)|AM89D-e)_C#5$BA%n2}E7s&{}w%k#Y9z
zX2W>qb#;j!+vez}AG6YUyJz*C3HQxy^7s4L-swD8$@DIJj!Vk2z5mX*?g*H@^8It0
z{P)lKWM60ph`rfc@;mjT)j4M2<WuiGB75(=jdW%{!dc-xPfcM_rfX@f`G>SuDINN&
U%1^SES&Fe%Z_lgqw*P+<046^G4gdfE

diff --git a/layout/html/tests/table/images/125_ncbug.gif b/layout/html/tests/table/images/125_ncbug.gif
deleted file mode 100644
index e04cb3e7c1dd719ac81e14ce606d79ada49b1e8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 986
zcmV<0110=NNk%w1VSNB10L1?Qlb)!@)#PxKx}>bMUSehf0s=8(oZ##A|Ns9_qeMrJ
zY{t^ud4GkFtI0lXqVe_kSb(oRKtj^o=H%=0gQ3H%!PgxgAWKeC#Lm{&;p{6dFSftO
zy35{6cc_Psl%TiKA^!_OL{CCRI!RJ7E-(V#?EoS91ONa4001li0001e03rYY1^=KS
zj$~<`XsWJk>%MR-&vb3yc&_gyf;1%G$Vc=ACJ2ZKSrIi5AA_S2@I5%d(v%b6RFtAe
zU`!5#!6Y+<EFMz~?XnpzAERGH!4R=;`27?W2yYNpA{+>MRRMk#NOK|%0eT`GlOm8N
z83A_&nVuz|X(kRCGFA^AB0{TtB@|Ew9|%=?NDc<9kqxRN4U{8Om?;60cb~|_C!#Dq
zuo<|zx+5L521o)36%Gid*9a38zn!4UC}tfKXvw4JCJh{?e1c8VMLs}Ch4Bv$*--`{
zR4Jma9f~+)-jst-u-u4G2;GD!g8&Pz7_2h<u=mH09zlrS2&zTGfdBywH2+R8xXfI@
zVh)F~3`L?rlNqcWJRq{?1gxF7ej>mnKwQabzq9~kCR2n!Ni=89G%9aIA&wn^RO=SW
z$4Uboc4qj41Yo2~l`>Fb8uO*Mhf!OW%s{T0D-p2n-sAZ#izjWtK4?TBMqx>KV>qCR
zC{YxI2XQCXc_S*_MIM+lYu?Pcv**vCLyI0w8i#_@s8g$6&APSg*RW&Do=sbIg4?)r
z>)y?~x9{J;g9{%{T=xI~$dfBy&b+zv=g^}|pH97c@&OVSXy4AgyZ7(l!;2qJzP$PK
z+a(-W&%V9;_weJ(pHIKO{rmXy>)+46zyJRL1}NZw1QuxEfe6w!!2f~^VzAx@130)I
zg9E@P!Gi2j7~z8(PRO8y2W+UJdIwxsVS)k{prVQlND#q_1gy7W0Tz%rp#>^hu)zT{
z7SQ60D#pm;i~z{Uz>q6eH~@|`?ucT5KCVZA1r;(-fCoGtxj~fdMWBHM5?F8ndt6Rg
z<&{~MXh8%<rrDmCV2T+ch)?dvr3FGBpuw0?Zh0hoRubR=op<KBCyxXihi97wM8LqK
z>jgS!n|1QXC6@<8z~+oKy2pS9Dq=|~rkWyI0099ox@M`7f{JE`mFjornCmTiDu(U>
zP@x1D6hP*ma@HE7j~JZ#tDEfUT4JxU`p2b}3=Gg~g_yecB1Li<Sa9qC&`MhXwMPPg
zW}3G)m}vpnY8!2{vi`{}jusS&ta}^uT7U*lBFg~0@^TqLr&0E(rM>vh%kIGlC#>+o
I3WopyJ8xdSCIA2c

diff --git a/layout/html/tests/table/images/15.gif b/layout/html/tests/table/images/15.gif
deleted file mode 100644
index 4ffd581bdb732ad6dab30c3dc3aff36dead9ae78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50
wcmZ?wbhEHb<Y!=Hn8?8J|NnmmFaR<Xf3h$#FfcRdfCNDD3{1>(`Xd>v0ZIr9W&i*H

diff --git a/layout/html/tests/table/images/160x160.JPG b/layout/html/tests/table/images/160x160.JPG
deleted file mode 100644
index d899778af2821d2b0c4879ac9c9942724a6cb9cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/160x40.JPG b/layout/html/tests/table/images/160x40.JPG
deleted file mode 100644
index accd056e6e7fbe0e5f18010a9aebe54a52b259d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3875
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
KV<75e`ab}yy#r(b

diff --git a/layout/html/tests/table/images/160x80.JPG b/layout/html/tests/table/images/160x80.JPG
deleted file mode 100644
index 8852f0b9849b3d31812d0c7dfb27eab50a64e284..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3826
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
S=S!$?D{|U8Ck^0e<NpTXvfN()

diff --git a/layout/html/tests/table/images/1ptrans.gif b/layout/html/tests/table/images/1ptrans.gif
deleted file mode 100644
index 5c26dfdfe4becddf8a6a46c42c6d51b50eeafbec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44
tcmZ?wbhEHbWMp7uXkcLYZ+wP<fkE*n3nP$X&;b!383!h&mOut;1^~8n2Fd^c

diff --git a/layout/html/tests/table/images/2.gif b/layout/html/tests/table/images/2.gif
deleted file mode 100644
index b6d50c5c491d88ade6cfadf9c6574490881d3d67..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/2.jpg b/layout/html/tests/table/images/2.jpg
deleted file mode 100644
index ca61537116dedf57af7bd65c172180276d393d9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 791
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX1{nrPW=16jCP7AKLB{__7$g`N8JHOvkN`6y6B{c~MjYq`W+ZVS
zlaYz#|1Aa{pn4_&W&t4oPMomqfyvX%<E1xicnSbD$q6tp0RfUeMkWSk79jyaRwZSi
zUJjt4jI2ztUB8{TS9df&*NuJk>Sl7(lEcUHye~ds$+HKVAtH$49-zGnV4cj2jP{K3
zcoZ<f6sQO=Ffuc;vm#s%bg`fz&>afKfeRHK6ALFo-NI(i#O5B)wf4s<v8|KjCipWg
zak}_Ko9TKF%hny`_j{&?ZR5}peXFhxv{eb{HAW^@Btsb(1r;3)6DL0WP`Gg8!H+QS
z*(;`q9JEs@H!Ylbw<51L_N<Cco~n#hUtY>dy(z9f_gkITxO9X!RdFwM_PMfLO8H8Z
z&Vy<7K;7Vg1&6tStK4j$m12VEF~A@o2oDPZZJ-iypc1s;ViXhrs{sXvfU4Aapeh9c
zV7Q}145J`}qG4iSVdDpZg$Lm-7l@m#kZLH<k{QR*-k$x-`cDY=wORAsM0i!Mt&8^6
zZBqOE@;}3!yC>vaf|fFL%rTE>bh(v%Ou%bb`s#_#S(I|i*n~8~*WD?Ln=fJWhSSb?
J_m}klHvxwewR->n

diff --git a/layout/html/tests/table/images/24pipe.7.jpg b/layout/html/tests/table/images/24pipe.7.jpg
deleted file mode 100644
index d7897190c96cabfddf27194fadbbfb1b8ccca45f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15457
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
A2mk;8

diff --git a/layout/html/tests/table/images/40x80.JPG b/layout/html/tests/table/images/40x80.JPG
deleted file mode 100644
index 354028e42285e8ec1a1a93ab70a48d19e5668dab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2173
zcmbW$XHb({8VB(AO$bTo0Rlk+1PHw;CNv{e#2As{wE*HpIwD;uB8#9xlqM)BMT$tf
zXdu!Jaz&94M7e~Z5Xu6Ihzd$e0Ff--yR$p9pLX~E%sF44XU?48oH>GF!6YDca6frJ
z0D=GjZWkaJ1?&KXurOR0hJeH2NF+i;OjcY>R8&ksT1HY<X@`ok(he*Zhd0#1sp+d@
zvD&6O`a5?K2m}=^^Sx%qB*WbV<DZ9sNF-8BR1707jxkonsv7^#5j+J@2*4T8hJtDU
z1O-A-pr8v-*}f+X{4>Bm145ueFkv_XDI&T(&?E&wKqwR<1ckwbgtn&>w)=n(3MQ?(
z%SKqn<uqI^Le@Aby9}XjOYcOx4t&G!_Kr+Oipa@h6n1E6YH91}5{M?IX66=l`|S5S
z93US&^2^a<$4|Jq`}q3#2LuM4i8^;aIwm&m!sRPhQ&OqduIJpmm790_PJY3?^7|E)
zRn;}WJ!)udYHn$5d;IKq*Nbju5383w$QgR`c6fw4HT~}W%!k>JbDtKMmRDAJ{I&Is
zpDqx9{>9qf|API83$^Wn2nj)j;6Gg;BxZX-Q9>})UBc2fF7VS4GHS+22wB_gGI}Rc
zeYfj3w0Goyh#a0UrLp*v_NVN>gC+l8vVXz;?cxGrP;mS4peVo!;BU-qN+yIwRDCj`
zlRJV#j%^--6sZQYdR)g%eS~O{P#v7`$rXA2n+^ZFQHgO{w}XRaUhSUOI-{+T3D*LY
zb7vDJeBZ8yA+D9BI<mJ$;$tG>6OeA)Aopp<ZnWzWz)PRjzg4H~VTidDQ_!6Mqe50v
zcEWz<{_lZJMYKh1p_`>&&sc>gC;f7YneMPxAh(1^E4oRR9H9-O#<_B1Zw9^O(u>62
z;ZnL44%YY9Ybo<7jKN7aT6-AHL6L&Rt;+=%sXqubYhLIpA0;jR^7WhmkO|zle_`X4
z`<Z(8QI`0t2hkzup+4yBkv6wHH%?tI14YiWHVK`CHr^{wjtzY{-P)38UYZMK;?F90
z9_YbkBGiiptg%*ItPhMo&hOPk`etgc#J~L9eT}N&YE0iZ-08gVqO-rxU_AV3vnfeY
z0O0nNd>8rj>xKu>p|Vq=YT5|Bcg&?XX_C#AcV^-BfWi-Oa}C;kI33(?akGET=;*JA
zpqOIiMRZ^OppjojQ+^A^Q0z|YI6jqHB2%hnm*Nd+D7pmJEJ_~v4$DjmdB0x5RmKg@
zw}dipU(53xW?FrsXIk>&y?AKmS|$H*>WdEL)MHK-LuzeLl3_`e(T_9APK=;He?PLn
z8SpNT*@LKpXPmE-8QWKk8YmC3bO4*ucxtkTW-oNNF58@}cAm=Zl-7@Z4{=H{J>{Q2
zEpD+V7T3hyv`GjE!Rj>X|1IE-utm5p&Ibxa*hkHmCO*@u9-V6`=&1eemE|>bM`3VS
z6i>6YfK$K3w?z*{gjYoNLDnCts-lyum1cfiU9D`;Y^$U$C{to5A3r+({7`mdddHCk
zP=#N|PZGbXkd;SsBpr>b2<EO<@g!<t<D1QVdcOWE_R~7~9C!O>V?T$HNa2})fYGbY
zzKU|UxfNfjBua%Fixf{pJU?}Sk;7IG3XSek)Md*V+Ah`REJz&1(-WrnY_-d--{z~h
zL`5rNfns5$(Z$SCLI|OddX|Y48)4q6$#o3}J3qQRC4JeX)UFq+FgPJw{bw^Ym??hV
zEkN&UQe%s#!qUXpq*}5_F<JA8%$Bsms?|z@jAO@cQ}L)oKZ8b-^^bjzuEd$WmfIO=
zE!Kk}1_l-c@GP@nHyvmD825`47#HX6rm-}~?lSJ?H)jfmn?V}2p;;V4|CbCWyEmbl
z%XNy*C(et0V^AFQBOR~@+wgX??U;0F@HyR}jpeRPSSJzq23;mG(YG5~_^K(>=DufR
zo~dIc4(|lbWS!wglSBb<#m;*1WXs}VyyH<?F^4>R2wyNUVFPLN`M`Q?gE4>EEP0Gp
zzJ*Fl@c5zCRc}-MdNa)}%Alh4OO4{i2hU3;awlR;$6Zlzy!Fk~c=2UBqw9lx=}UDD
zWH)*B4kc7-xo&ak@rcBPu*#sfru>|^=w>=;(2^Z}FZsk|WH>lytsGOkRuBds4sNDY
zvowm+7oCW&-^ImYO^vQl<1*m|m>xTGRUfGtU;PM<8>?onShtaFNF)>WD7AWN*&3W(
z4;I_QL?#KRrOKpNMsC=wQ*n}ehT8W=RA01MOpkHod9)I0T@r6#o4$B_omGd2z74(s
z!hwaSTzSjv;O$?ZDA!RX|1!AZg=KLa=OkI(b_u=Lq>QQ=Nlx4;#jx~(G831aNE89!
zRa^H%mUG<39thvkYlv5oV$v?t_c>!0@-fU1eMzI2I?kg$d3yN+6@H^qo=iN=c=apQ
z;yATk>0wYo!jm!X)$!kly^~c8r|ic3wbNdSw(m-wPv29s?u1R>@QV}xQeh8Q`jLg-
zStN#sr|q+#lAt{<p;P+d=4QZ3sYKX8_UgPl@9*|+UD;eMr}+?X#URhBp!{WExzqNN
zg~=a<y$1JmvM-B#Cdq%#66MZiba4-#8v&=Xa-#Kex0F6gTU#;Imi8m*Qw+s4PYX)z
z+U66A^R4mm%E^l@UJzz>=hA>rR(SV(Aw7?H%4#h;Hj_tQs~?)VZeO&d{&<*v)@M`q
XGuFdmhM#N`$hmY**2Nx36pZ`>be_!D

diff --git a/layout/html/tests/table/images/5.jpg b/layout/html/tests/table/images/5.jpg
deleted file mode 100644
index 8a105c189ee47933a8c1249c843ce8334f80d1fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 766
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX21y1<W=16jCP7AKLB{__7$g`Nn1OCZ0!++oEFc+ipdV0W7?>DY
z{@-HYVP<4t5?~f!U|`&qmOJO$#&XY7n%uICoZdiPG6D=tOsFO@GBFDX3Yj_qwQ>Lr
zWMpMp#ofv=$K{b~*_9<`8L^?2YwXKkCIdB#2%@+I=qLrSCZKutjPgJQqJn5HVh~^i
zt6&1D&;+Vb7GPjxW@2SUcnIiNL1rNV1w*5W!itVgMNnt3*)y@Rbvtb96T5gQ*En$c
zk!agb;(fDcJ>MYsMuoAz)%meH&^QI4cNm#jm=VS?FbXOf1`0S%Jh*V<N0^uF6;ofm
z4C^%6-nda)-^rXoF~2?0$7f}TWKx9ePoc0M%*u!3y|x#HGasq4mi+?M1r9?7kg)=x
z^V#tE4CHqKMW6}^K?WvdcL4P=3J4m)y)U5S(+>^+pof7G#Rv}qMh1|J9Sav86iB@I
z@B_lp0^x6(o_Z{qvU$xxcej}z?Wa%K@1U!o_kGQ)6qOr(a;gn^o33|$xo7v8y?TMP
n8OIvU&7FY^CGKm?_!y6w&pG`ksqXb0vv=Q3s`u8^|Gx<ULL01Y

diff --git a/layout/html/tests/table/images/6.jpg b/layout/html/tests/table/images/6.jpg
deleted file mode 100644
index f09957bde0600f776d5ac316defe7aca27a56c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 765
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX21y1<W=16jCP7AKLB{__7$g`Nn1OCZ2Fz@XEI=7?MxYF`I0FMC
z6U+Zw3_L(#CIMyvAb)GtFXLNbAB97Owr<h5;||m%E5N|S#K?-IkCBN%K$t~P$kY+2
zmjh@QBP)|j9BWvzvtdWy_RX%UrU94B{>=jF6%j<Uk3j*f1?WI~MtM96m|zN&1b}X2
zWno5G4|J-aqM^}576BmzrQ$}Y6WHvTa#}?fb6sq8Y`In>^Drm<!VH6-8#k}H#qO)W
zw)Q^IE=8b67+IK@5N0t7GAJ4bCJHzfPF(o#1I#n_ib?8;q59MB1hBBX9uieGd64RS
z;f&9|XU(tl6&WNOE~GzW>fE9wE%D8^_WaEi>WLqZ1GR#~kO5@2z_jnCK<mT=K}iM$
z2too3<a>cI)q0>JNkIlCv^ZfD0D2GX7EmAv6nyKO4|Y7z-%O0mh<IRR0IG9LocK{7
zaN)*>aK{TI8A^P*aH{OFl*FEoYzdoq?^({%Ws+U%%=j+0v^Ba_cF{Y_FU5YG&xN*i
l&sw_3B;w`fwx^C8q|D`KWE^<#Ui+8w6T8d)E9(E>1OW2Iuw(!L

diff --git a/layout/html/tests/table/images/9empty.jpg b/layout/html/tests/table/images/9empty.jpg
deleted file mode 100644
index 83e581b18b29f8be26fdeb49db22433d09cb416a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 912
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJX1`P&DW=16jCP7AKLB{__7^E2(n3$Lu8IS-Y6Eo1g>_ACzpf`XX
zK?aOWEdOsY@Bno%2`~#VFfhJ-u6}+;cvV|+VC1h?=2xE{$npi5t02I@$im3NjL^%(
zz{o7b!X_weC@Q7|G=l?ZG9xRKAXh*rYe>NMQ+1b1wuhezO`DOzEct0spB~5crt^19
z{zc_l8{4n-+7C2SOc32Q41x+^lb9J9?HP}_1Jy_fG5|RUTY)S_K_LOKDkhMsC(34L
zHv<)_0UgN9%*@0NR}1tKv!KvKMMEQDM-~AEWs|^3P-n8)GvzgNC$=74o!G)Y?_Qr^
z%DRqS4{mRNvp{$My+_Mx<*M{~3RXR<_gXhic&X`xg(Vj<Z#`<g{G-VKZup62)_S0I
ziUPoJW@KhXIE_&dC}`-I7}z**;l_io0I^rpSbBslVOxsShr}bY2Ex&|RCmsu$h}>M
ztL@m<;|*O*bEi)DX@2C5ufpjau2WLOyf)T6aOwMHQn%QJ-}ooz6{qa`T=hW1z%j%C
z3Vwl*Pt#iDaReVD*j`ZZ2}JDJab_t{nWP{v91zX~1rMWupkg3cB`635Om^(#6##ik
zNdOqsOiT=H@Ms2k%Ft1uu<_u-4~Z8)!hI#MBU0g+d`}Q(nBl}q)|DStZ_=E3D_zN^
zdG>6!6WN!wKP1g`6_iy!Cvai)P0scMyS3{+&oB9YB9fikQu*Ai7e-diE4D9r$@uw{
yc8ln{J&NUe^~t}F$F2{&CBEWa;VefD?)7Rd&$9J5C$maDSR?QA`~9~1|2F|6#P(PK

diff --git a/layout/html/tests/table/images/Ad-1.GIF b/layout/html/tests/table/images/Ad-1.GIF
deleted file mode 100644
index 6de9b73cb660860d7cc12fdc09ab2ed988cc1925..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11790
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
Ys8@hL)WgfyK@e!DudjpBG62Z_4<S@qr~m)}

diff --git a/layout/html/tests/table/images/Ad169638St1Sz1Sq1Id2.gif b/layout/html/tests/table/images/Ad169638St1Sz1Sq1Id2.gif
deleted file mode 100644
index a3b6a97df710c751de9909c25eadc891cb3be538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9353
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
O08Ow5Ne2M{SN;#qIra(w

diff --git a/layout/html/tests/table/images/MBIAuto120x90.gif b/layout/html/tests/table/images/MBIAuto120x90.gif
deleted file mode 100644
index 8c5c25951c3ffc55b6e7b32f582e3bd577072ed9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/N.gif b/layout/html/tests/table/images/N.gif
deleted file mode 100644
index dc5d2ee5a0f26f808dd70f51ee6c4274641186f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6162
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
G^#1@l4#8aj

diff --git a/layout/html/tests/table/images/TopRule.gif b/layout/html/tests/table/images/TopRule.gif
deleted file mode 100644
index b10a1b28077de0b03439e5a3fdefb28e9e7fbf36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmZ?wbhEHb<Ys1On8?8JpMhZ}kemr57!-f907(W09S{MMXJCq%(!cWbTmHp!w%qF8
zd~eTh{<cRR)1GxMTgA2I9ry81KG(nXKL2&@`#*jjuJ$8~K6dzMO+T~jGiR?G^OaR!
pyUu29zq9T;H(&ShC!2ou_^rPFX4`Mx{?pID?E2exT%3Wy8UTMiK&b!#

diff --git a/layout/html/tests/table/images/abc.gif b/layout/html/tests/table/images/abc.gif
deleted file mode 100644
index dab912c33d4146f838b641922d6c75d5c434f96a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 606
zcmZ?wbhEHb)MAigIP#z2|NsB*-@i}3_up&lJ<BP_42zc@J9kaOtEakUihyBpRQ41G
z%_&jIEerxtbLQ-2U|=|K-~f;$9w`1~VPs$sV9)_+0olpG`d>kzFDb#oeeo*q$s4?N
z&VTWl=67ey?^C<BCcI6vxDuz^wrGQuf(RGWA_HrSbsUeIrU-wNX*i%gk)uOIfI(#$
zhr<-MhQcQ|IFmaq8a4(o@aUzbBx<K}Mb{g|afLH**w!_qCMA?wvGa83m&Nh%a3s#I
zW8~pmlG<mi)2Cg|%_-2lhL<OC8QUff$D%IBEo=gr45hpi8~f6BnKJG*(dO&tO-MRg
zuRk?YV2&R**V%KtJ9zoGu34;CsF7~O$F~0ds)UOR5;K(eG9N8q^v}Gw_Cbh-!-3_D
zP0cKVa!)2NaBb4QFu}xff)hJ)mxS>y4~L7aZhfpXOe_R~PIECavE1(PF>qjLWYT4C
zDXCOYZJcOUDCF_L$dPfXO~@9J2~I1xrf3Im5$XJr!8}Eq>&_QPg=foF`o^yKVYxuj
zi;0`>P7dd{Q0G;qtULw3rl_3}&pde~M?h$Kl$Mp>t-GC}xmUO9PLPwhV07@Dn0@ZE
z)Y&r}?lbZ8e1351`#M>1jaatYD$}R8wkd`7oSZq$^Tx@nTAQzi-yOrIDNWxMaJ%3j
zgYstn{XZ<PvL@~}N)&RnnWLI;TkEKhuE?eX%h*+3n$6EUp5DK!Vu_X8rpT@3S68KI
SeBwKo*dO*GhLe+#!5RQLPu=?f

diff --git a/layout/html/tests/table/images/aboutHeader.gif b/layout/html/tests/table/images/aboutHeader.gif
deleted file mode 100644
index fc4750db93ab..000000000000
--- a/layout/html/tests/table/images/aboutHeader.gif
+++ /dev/null
@@ -1,99 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>mozillaZine - Error - Page Not Found</TITLE>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-</HEAD>
-
-<BODY
-BGCOLOR="#FFFFFF"
-MARGINWIDTH="0"
-MARGINHEIGHT="0"
-TEXT="#000000"
-VLINK="#CC6633"
-LINK="#336600">
-
-<!-- Head Graphics/Blimp -->
-  <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0"><TR><TD HEIGHT="90"
-   BGCOLOR="#FFFFFF" BACKGROUND="http://www.mozillazine.org/image/tile.jpg">
-
-  <IMG BORDER="0" SRC="http://www.mozillazine.org/image/title.gif" WIDTH="180" HEIGHT="90" ALIGN="LEFT"
-   ALT="MoZine Chrome">
-  <IMG BORDER="0" SRC="http://www.mozillazine.org/image/blimp.gif" WIDTH="133" HEIGHT="90" ALIGN="RIGHT">
-
-  </TD></TR></TABLE>
-<!-- End Head Graphics/Blimp -->
-
-<!-- Grass Area -->
-  <TABLE BORDER="0" WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BACKGROUND="http://www.mozillazine.org/image/grass.gif"
-  ><TR><TD BGCOLOR="#FFFFFF" BACKGROUND="http://www.mozillazine.org/image/grass.gif"
-  ><IMG BORDER="0" SRC="http://www.mozillazine.org/image/transparent.gif" WIDTH="1" HEIGHT="7"
-  ></TD></TR></TABLE>
-<!-- End Grass Area -->
-
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="15" CELLSPACING="0"><TR><TD WIDTH="100%">
-
-<!-- ------------------ -->
-<!-- Page Content Begin -->
-<!-- ------------------ -->
-<TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="1" BORDER="0"  BGCOLOR="#669900">
-<TR><TD>
-<TABLE WIDTH="100%" BORDER="0" CELLPADDING="15" CELLSPACING="1">
-<TR><TD BGCOLOR="#FFFFFF">
-<FONT FACE="Trebuchet MS, Helvetica, Arial, sans-serif" SIZE="+1">
-<B>This Page Does Not Exist!</B>
-</font>
-<P>
-<FONT FACE="georgia, times, times new roman, serif">The page you are looking for does not exist!
-If you have reached this page via a link from a page on Mozillazine or elsewhere, please email
-<A HREF="mailto:mozineAdmin@mozillazine.org">mozineAdmin</A> and tell us the
-pages url that got you here, and the url of this page.  If you are looking for a specific page on
-Mozillazine, try the navbar on the right.
-</FONT>
-</TD></TR>
-</TABLE>
-</td></tr>
-</table>
-<!-- ------------------ -->
-<!-- -Page Content End- -->
-<!-- ------------------ -->
-
-</TD><TD WIDTH="175" VALIGN="TOP">
-
-<!-- MZ Link -->
-
-  <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="0" BORDER="0"><TR><TD ALIGN="center"
-  ><A HREF="../"><IMG BORDER="0" SRC="http://www.mozillazine.org/image/navHeader.gif" WIDTH="175" HEIGHT="36"></A
-  ></TD></TR></TABLE>
-
-<!-- End MZ Link -->
-
-<!-- Side Menu -->
-  <table border="0" width="100%" cellpadding="2" cellspacing="0"><tr bgcolor="#669900" valign="top"><td>                              
-  <table border="0" width="100%" cellspacing="0" cellpadding="10" bgcolor="#ffffff"><tr><td>
-
-  <font face="Trebuchet MS, Helvetica, Arial, sans-serif">
-  <a href="http://www.mozillazine.org/">home</a><br>
-  <a href="http://www.mozillazine.org/submit/">submitArticle</a><br>
-  <a href="http://www.mozillazine.org/builds/">fetchBuilds</a><br>
-  <a href="http://www.mozillazine.org/screenshots/">screenShots</a><br>
-  <a href="http://www.mozillazine.org/resources/">resources</a><br>
-  <a href="http://www.mozillazine.org/chrome/">chromeZone</a><br>
-  <a href="http://www.mozillazine.org/demos/">demos</a><br>
-  <br>
-  <a href="http://www.mozillazine.org/members/"><b>members</b></a><br>
-  <a href="http://www.mozillazine.org/about/" >about</a><br>
-  <center>
-    <a href="http://my.netscape.com/addchannel.tmpl?service=net.254">
-    <img src="http://www.mozillazine.org/image/add_channel.gif" width="88" height="32" border="0">
-    </a>
-  </center>
-  <br>
-  </font>
-
-  </td></tr></table>
-  </td></tr></table>
-<!-- End Side Menu -->
-
-</TD></TR></TABLE>
-</BODY>
-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/table/images/ad_info.gif b/layout/html/tests/table/images/ad_info.gif
deleted file mode 100644
index 49a19ba17ce66fe95ef606b5272290781de566f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmZ?wbhEHb6lSnt*!-X2|NsAIK<Eq*%=~|5CXhTcGwsZoG$1*1rtz7X#z1mr8pF)A
z0|yQ;Ffb_oWMO1r;A7AMvKc^TFtA+MaME+-?(MI-wokwL-11Sxyo^=rcn_O79OPq2
zSmPn9@RCWv<lv(v3>s3M4n8d!3@pq~gF{wxakV{UpJ=g4tmWXr(xi~=JwYG02{3F~
z)F57_eX(Mn$=5&4)e>B6fngTD`t7P5bsAx;UFyCj=|&pd6Pc=+II2`xCz+N`WwlnX
z%U3rI_gg4GFMW>cv<-6oLYzG-{igV=OYfGqGubW8!#azHqmiXLbhDJ55w}T-yla8|
liW$1zohwa?mAL&F*K|C4{^F&Siq0D?MNL^%i7$c-)&S5vb8G+r

diff --git a/layout/html/tests/table/images/adforce_imgis_com.html b/layout/html/tests/table/images/adforce_imgis_com.html
deleted file mode 100644
index 3076258ef75c22a972e36bfc873a16eeb6dfd3eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 125
zcmZ?wbhEHbyuxV1(7*r$^+2rnpWDwhB-q(8z|~04fSC~_^pl0f21x4wF#||(6Hw{@
z{|x{C|G$6#{{H>@>+3-}fq?nH#jZR53{H8j-fQvt?C$>w8ht65TE`UD<h<TjpmV+?
S_kP8?_cibTA6QV}p#uO}pfG*_

diff --git a/layout/html/tests/table/images/alpha-2.jpg b/layout/html/tests/table/images/alpha-2.jpg
deleted file mode 100644
index f293aee1006f044fa9cdd037f557d306c176f965..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/amazon-logo.gif b/layout/html/tests/table/images/amazon-logo.gif
deleted file mode 100644
index caa6f072eaca790c8f218e69ca071d294ddc1082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmV-^1cCcUNk%w1VU7SF0K@<QySt_{Gcxe-@RpZ{`T6;XiF{{gUEJK;<+)!`QA~Jv
zZ0G0Ys;ZLp&W!WjwaUt_{{8v<`S17k*Zb?xKtMbN1qIB^%>S7H|Ns900000000000
z000000000000000A^8LV00000EC2ui0FD43000I5ASRAvX`X1Ru59bRa4gSsZQm@A
zRD1%Ef`M?cC<G`B0cJ4>1PTiiW7qqQg2Jq@U=<w-lz>k;vJ|)&ow!>H1}cF8`Pzgl
z4)mXeQlUIVMQ;XpDgt~wh!qNDhzy531_Y0NQGk<(iy{_@oD?GfoN$#G20VV81117g
zh@MxM0Tv>l0icOLlL4bAtf5w$p@?ss1tYzj44T2Fv&*_7rEtT-1SM1h77RR@k~|Ct
z0B_H<a25}52?`Yj2Lq5PwtW^B(Td8#$9;(j&8G9L{FW3@K(JRa43Ds}I#{pIBsR8^
ziO^O-mb(gFfTglUfef$;5=p_Sb|N031Fi1=@xW8y7KV?mC{|SI${Mwoh$3M?$s<6u
zdamlF8d1t8i8raxl~Ct1;?a?eD(q4<hi4y^nHJn6Fsvp40drtVNkm8;kD&+=$*O1N
z;yMz10)869<KQPA=J3L;Aa}{iLJSOqN#yF|Pys1LbOjQ4aN?*uy0GdZR3wi|@$7Q7
zcLG>Q5f35*BP4<kH@_7~o3Jpglgh)77i(%wxWuErkGiznW?5>#w}8%~u*C)^NMN!?
zm<IB<bD{!ynHjGDTl(g!JD*#K=hZA!<%o1+>P;r|mAb<tmjDI;`QForQ=_PNP^)yq
z!L7@#JiX?}3V)EmN=TK}QywCky>Z(A60&$!LTCWG2OfOQnUF{&Vog^acGtNwO>*1;
zGR+eM06@rYz+ESwfxl_ShgTw{!W#(`9ROi+rE!*@Y9u6*oOkl!hZ={nO=Cqvc(@fx
zBv!csA$BaLfglNHjlvTy--)mTKephQ7KQQwz|K=W1?HMn8`dP-BLSFM8;ZdwQBMMO
zcmoY02cid#aXN`K&Wspb^hcNPF(;K731}u$BGY(+W`0CUr=&25@Pi@+m`<a_0kri%
zQk3TLk&0Oq)Ja(nZU#i?goZBgfFo$#naCo1==A82YFgLOTY^;6#Ah!VVAM;rB`^o5
zQz|Iycmi@Fmo2I-ciy3AXr>AK10@o&02>bg0Kh2QnOKImUS^XmAOV^nfdmi?cg8m*
zfYaU;-hTU15@iff05+ZJ%P+m@Y9cNP4+MCC1#`6E0J}J>-~a*_L>w^!5j1S^#W6H+
zfdlPgOo9U!ARsct5i{)Z$taVc@dXWZobm`DUr_POG<zH~0u4;y^2HN0KrzS^*DN%~
zB!|54&NN8y@WdEs%<<4rH@vjOBIk_s3KIBS^u{7UJag1w+u*arRO8%00}iCEwgYEt
zO?JpFi!cGpVb^`b*l*{p_uDvsje*E^2X4azQ}4Yu&N{2>x8RJ&K)BXhPh9oUjaP2@
Q<(Ox#`R1H=enJQUJFXV`ZU6uP

diff --git a/layout/html/tests/table/images/ananova.gif b/layout/html/tests/table/images/ananova.gif
deleted file mode 100644
index df11c0efb602981e81bc7bf881f1f35936931310..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmV;+0W|(cNk%w1VOjtW0HXf@{r&yX(b1lso@i)jLqkI<Dk>5Z5&!@IEC2ui09pVK
z000C3Shhv;Lm73dy*TU5yXVF+6@wrIL9~2q>%JM|n88^Sp_W@yhGV-*p@3;z9K-`j
zGav{-jS}P$00ff7+C=~u907vMpv$W|EnFv|3IG?lUa|Esj%S85fx|GU3a}S!c3fZ<
zV_`yV07(UcXk7(uHB~8XSO!%Qihve)B`78*dO;Oqk~xHAbcGeEh>ePIa9jc*2D7XO
zTmia@h(&lOij<rpnSQNcZDEHM1Z}2Hu!K%<C>N0d&j8YG1l!R*p2CW%TXWk)aNy0D
zg}WkFx6rh?6;-_f?zNe#`WOU;kRUhdpM`A>P`o2!3fY(|<OaA4LFm|`gLC$^nWxW~
zhB;^7zJ0PH;K7A`2P_hRQ_5E)ZU&%PS#z-$w1+tQs4@k~Tg*x|L53VD3D84ZP9Cy!
zwv3h#B9y9NF(r|WuRw*6iBM;+fyhrL9vIb@AuQR0DNb-|6e>s`B79J!DDp>_!A^5|
zc!dx)LJS=tisc|xVX%i4Fg74{@F_*H#E>Jqz_Ea_FntR$Yu?Pcv**r_C2L3k06QC!
BywLyv

diff --git a/layout/html/tests/table/images/animated.gif b/layout/html/tests/table/images/animated.gif
deleted file mode 100644
index c77fbb6609c5326394e543d56ae90fa8f400a7d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21710
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
L5dIfK2=f08n{t-o

diff --git a/layout/html/tests/table/images/ant.jpg b/layout/html/tests/table/images/ant.jpg
deleted file mode 100644
index 7cfaaed630d4866e9368e3638b3a20c0fa79ea96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8474
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
IlAe|S*_5cKH~;_u

diff --git a/layout/html/tests/table/images/b_pre2.gif b/layout/html/tests/table/images/b_pre2.gif
deleted file mode 100644
index 1e37d61a2241728c3d9c12a774804d9490846574..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1231
zcmZ?wbhEHb6lKt5_|CvExhs70{ET-OJMJHC_;w=o`-R#ITg%_gWBRmC`|BR>pO?EX
zb~3FiVrmU%N_ArL&}Yg`^nTkQ{4!k2i8#P83PwX<5Ql)`e{Mh5kYH!W09PYD17=2`
zQx$)*u%2MxV$cCO8<b5LIBqfUbI5pXSa7hJLs%>3#0JH~9DLk*69ft$xO9o~8%$_0
zd~~#r&%9{O4?z{@iORCmOlB4^o|?iFzRBjrq{U}vvZX#!iTJE`rbRzr@5;~52>}ar
zYk!4Qh-msQ^%gWM)e_7K=?q>OwWaE6QrKFl{kM+1TEKXHqm86R#e)Yr-qW*h7cE^m
z?QP7i!nNDhXqRU)wG_zP1XMXVGO|>#>W3cqk?+UGE7G6pGn3)bmWk~BOU^_xHnL2Q
zO?x(D!RE|UOiT_x7#t71yw1fU!N72k;m!3;%se}Ks~Z?t85zOe<wEuDDm3pdJlrn8
zuNNT@sBpAPSX(Y(fuZuTK5@mW9*LlolkMuVeIlHjl23QZ7%t1PnEcRds;T(1kc!KS
z%`=oFEixQ}UNA3ml$Ft4b%pUVyWeCd*BJ~CnHKW}X=yY#EV{_9F50m+>qAyEdje-y
ztoH(K$IThe>*lU*aA4YAa9M4^>GHJ=3<7oz4i~m>U}9ura4<;NVep87S;|^Y!NJji
G!5RRq=gx}&

diff --git a/layout/html/tests/table/images/b_sui.gif b/layout/html/tests/table/images/b_sui.gif
deleted file mode 100644
index d0b20a310f32bd4b6ba2b65339dd7fc2c13f0d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 281
zcmV+!0p|WkNk%w1VHE%^0JHx91aP+~hQC&#%Uhdsp{Ak4*C+b+1I@~tlZscfpJ?vU
zh~LG4(6x8Kz`$)`OF}|IA^8LW000dDEC2ui02Kf&000EW5XedET&>w%iPBsMd}2s|
zNLdA-p;n4yq_0HCMo<F+@EC@|PWJ=qUPNGU=TjO6yCP6nlLDbHE3oRkX1iOJ7D(eH
z!LCqm3{04s=p1JOM^h~twh~J@)$JAsd2xFb0vUgR6M}<;UOXR-j%kdNjtCwZmV^nB
zh<Z*444R*l4hR^eiCw1*o~3c83$L(Xvb42M4hgfQs$;vUzM6@_!@hqAyvN8z1<JzA
f83_(S(9*sP4$qy~*{!(P3kj~?!wS9Tz7YUBbe4IA

diff --git a/layout/html/tests/table/images/b_sui2.gif b/layout/html/tests/table/images/b_sui2.gif
deleted file mode 100644
index 40026e5ec3ebc51b7bf98d150b8aa90cd3aeb8d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1296
zcmZ?wbhEHb6lKt5_|CvExhs70{ET-OJMJHC_;w=o$N8e~7iuqTEq^zU>C-yxuY0_I
zUhcZs$+WJBsWqG_)rl!L(fe(K@XK&5A`!zV7!83z90H2}x&2&2f}I@$T#fV$m>Gdi
zRs6}qdV+zQK?me)P&Q%U_{<>4A>*;(fdezQm_$rOfTL5J0IO0D$HWFF7C{X$pMsCg
z$C|h$41P@bxY&V-N2=yShEO9D8(-M8KQkH*Hc!>@y>(<}@MFI@#+v_*to*EYet|%{
z(AUf_8o~3tm9<!<Hl_uy2wfhO+VM#%tc`8Urxb}x+96ByPCLbB3oMLS&TP3V_IGGP
zV@v+SQ**t`b((fpoW0chz(Dc-J|kXsx1P-h8IHEUwBq;>QFxD^k3mL&!7~3D;~Z=5
zV>}EdPmX3Q2JqEJt$uZCdEnz3+1sB&Z*Aq}KRVYsk%2?I@_SqX!;Y+LhdZ4w^w|7t
zV3<AGSu7!H*P{k-IB=nc!zJ9|(8Vnrb0njHk(o_~TPWdzf{G(6kIW1iu=kl`4~b|L
zr}@q>4}WH|(>TSy&t7v|4QKI-GZS6Hr8uN6CSRJsH`B;P<LUyp<=WgTYrH;aU7HZK
z-LChA!Nc%{X-AV%3>4l*w(&A;@zuV{*uczm$7rjy!uop~nScKJyZb`por5i$Mhyzr
zbCYKEJhw8dE-rk0vZOO=T8|~rj~r&@Wz`H!%nXbI{c!=m*1fvQ%=94kZG=Potv+TZ
G25SKG2Ki_J

diff --git a/layout/html/tests/table/images/banner.gif b/layout/html/tests/table/images/banner.gif
deleted file mode 100644
index 0e1cc291e909c7d5c62774a7fe43fc39d1f7149b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5520
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
MhJ%3tqRP(pe?mgb9{>OV

diff --git a/layout/html/tests/table/images/banner_bizinternet.gif b/layout/html/tests/table/images/banner_bizinternet.gif
deleted file mode 100644
index 9e9ff153ed12e1aa1487cf119e0aadd653529d8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/bar.gif b/layout/html/tests/table/images/bar.gif
deleted file mode 100644
index 7e58b02a1e3bd774017f739a47075c4cd0e246bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmZ?wbhEHbtYctiSjxb_pywN$-xylZ9A4ZSQPLJs(jHmb9#z&6UDg?0-WgNg6;lC3
z-LXJa*&SEa6Iaz64@A|y3DtcGHGPRS{fV{xNwpJ_>Lw)DPfTf;l-e*kt#L|P)0E=2
zNj3emYy0QaPny>_c|p^Z1<g|zwa!@5K66>e?B$(vR&>o-**$Mn&%D(=^H=xIU(>f>
zP5+{G6BezXxMahmB^xI#-8gyarYXxdO<lfa>WVGXR&1TVa_jU}+h(lVK4bOvnX7mF
z2Lr`_e7=b(sS4$pB^e6tp1uJLIzUe`fPBZmCgspj;GrYce_~0|$sDWs7gm&bt&LiL
NV@;Vf3xhQ;7XSqOe`Npw

diff --git a/layout/html/tests/table/images/bar_yellow_left.gif b/layout/html/tests/table/images/bar_yellow_left.gif
deleted file mode 100644
index e7c545193bffd39e949bda5a0ebcc226f718225b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 699
zcma*k`%ler9LMqZ_d9a7?x&;g>7tUdQ%h^QtQ?`xm8FYHLdYybhqFpQWL+qdtfU=u
z6|y!-lZDl~9o>`Ba@kReOsgo1H0Sf8|G@L-$8S&nKtE5fgJLqJ2_h^Iei42O_${z`
zfh`L7PM9bBAT~$ZS;8!jZ-hx=(;Q}ad?I`$HbEFAj1a~MZwMN~d%`f`6|o@>eS{ap
z28s2Owx8Gl54MO-V%;1%d2N>neG;?~Ya?wtX<G?u4$lSFEuc$^9x1x*@#Q*Z8qiF5
zMy!eOlxH25_>hgsIy@pgAv`8DOQ3eeumY0}ctEHp_K-sj;XdIW;Vz+yaGOIFk8)x+
zNn1`R<xt6?oM*+PRS{Gi3JBK-g&Ycb<Py6~$mdYD7Uv1s94>Om;kEe&cvpwB#4-q(
z94?rkDHW4LSeQlHKVyljuIMU)rWq+5%aEX6fj^4?=s$8=GD|OL1=5w7%Ju6U*4S8C
zNF^)9`UZMgM-$`s@7Wy|vMXS_uiV=`bAz{=%*lF{xtU;MWL%)DOi&~qK5}4hWJG9C
z+15%ArI*}YmSbsUmS=QDPe*jR;aL1WRoKpwGWkY#H=k{4nWJ4zZ|%U~sl>$BaWPR5
zA;JEBA2qVgzLnM1xu$|;Yi4pqq&zkz*()&2P-<u)%hO9e(=~D{U94m4*)kL7>=3S6
zD3taT8LpQ2N5|U@ay}kYC)1AG&P4@EwluyC2t8!)7qCoI7oMdMOtS5oDplj-Ivr(j
zX$w<~wv>2GJ0-M=#SSjj!Jj)CGkotj>Plnvcf=(bn0pr6)SjqGF&wL~sSY|9t)6<B
XwOpjrZ``iF<b0!aQ&N?&h~$3(I*v!w

diff --git a/layout/html/tests/table/images/bar_yellow_right.gif b/layout/html/tests/table/images/bar_yellow_right.gif
deleted file mode 100644
index 3dd199f5c25ac6d7900049d14aa3039fa8c5a5fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 208
zcmV;>05AVXNk%w1VH5xs0K@<Q|NjC1{|f*A82|qv|Nk`q|2hBvJ^%k%|Nmb9|Aznn
zp8x;8|NqSY|Iz>d)&I-@|IG#e&I$j~7yr^A|I;P^+e-i5SpVN$|M0c{^1lD~)&KhF
z|NHF!|Nj6000000EC2ui02BZg000G5AOHvik~CeauIl5yk7Q*mE8aLzEOiS1uga#D
zD~bjT7I689U{=Oxz|mqZC!ADti||>O5KU*hJ#@ZI$cDUCpqUqT)bL(X<i<dKi8t<n
KeMNsiApkob9dV5S

diff --git a/layout/html/tests/table/images/bg.jpg b/layout/html/tests/table/images/bg.jpg
deleted file mode 100644
index 116ffd60ac8591e6817c75c7768f1f774917ea55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/bkgd_yellow.gif b/layout/html/tests/table/images/bkgd_yellow.gif
deleted file mode 100644
index c8e55d9a06eb..000000000000
--- a/layout/html/tests/table/images/bkgd_yellow.gif
+++ /dev/null
@@ -1,495 +0,0 @@
-

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<HTML>

-<HEAD>

-<TITLE>superpages.com: Not Found - Please Try Again</TITLE>

-<SCRIPT LANGUAGE="JavaScript" TYPE="text/javascript">

-<!--

-function buildURL(stype)

-{ 

-  if (((navigator.appName == "Netscape") ||

-  (navigator.appName == "Microsoft Internet Explorer")) && 

-  (parseFloat(navigator.appVersion) >= 3.0)) 

-       {  

-	var str="?SRC="+escape(document.ypform.SRC.value)+"&STYPE="+stype+"&C="+

-   	escape(document.ypform.C.value)+"&N="+escape(document.ypform.N.value)

-        

-   	if (stype == "D") {

-          return str+"&RT="+escape(document.ypform.T.value)+"&RS="+

-          escape(document.ypform.S.options[document.ypform.S.selectedIndex].value)}       

-   	else {

-          return str+"&T="+escape(document.ypform.T.value)+"&S="+

-          escape(document.ypform.S.options[document.ypform.S.selectedIndex].value)}

-        }

-  else { 

-        return "?SRC=&STYPE=S&PG=L&R=N&C=&N=&T=&S="}

-}

-// -->

-</SCRIPT>

-</HEAD>

-

-<body bgcolor="#ffffff">

-<BASEFONT SIZE=3> 

-

-<script language="JavaScript" type="text/javascript">

-<!--

-function revon(imageName) {

-  if (document.images) {

-    document.images[imageName].src = img_on_array[imageName].src;

-  }

-}

-function revoff(imageName) {

-  if (document.images) {

-    document.images[imageName].src = "http://superpages.com/images-yp/decor/images/"+imageName+".gif";

-  }

-}

-

-if(document.images) {

-  img_on_array = new Array();

-  for(var i=1;i<8;i++) {

-    img_on_array[i] = new Image();

-    img_on_array[i].src = "http://superpages.com/images-yp/decor/images/" + i + "on.gif";

-  }

-}

-// -->

-</script>

-<!--/topbar.script.phtml-->

-

-<table bgcolor="CCCC00" cellpadding="0" cellspacing="0" border="0">

-  <tr valign=top>

-    <td valign="top" width=35><img src="http://superpages.com/images-yp/decor/images/navleft_spacer.gif" width=35 height=20 border="0" alt=""></td>

-

-    <td valign="top" width=50><a href="http://superpages.com" onMouseOver="revon(1)" onMouseOut="revoff(1)"><img name="1" src="http://superpages.com/images-yp/decor/images/1.gif" width=50 height=20 alt="Home" border="0"></a></td>

-

-    <td valign="top" width=106><a href="http://yp.superpages.com/sform.phtml?SRC=&STYPE=S" onMouseOver="revon(2)" onMouseOut="revoff(2)"><img name="2" src="http://superpages.com/images-yp/decor/images/2.gif" width="106" height="20" border="0" alt="Yellow Pages"></a></td>

-

-    <td valign="top" width=87><a href="http://superpages.com/ideas" onMouseOver="revon(3)" onMouseOut="revoff(3)"><img name="3" src="http://superpages.com/images-yp/decor/images/3.gif" width=87 height=20 alt="Idea Pages" border=0></a></td>

-

-    <td valign="top" width=120><a href="http://superpages.com/shopping" onMouseOver="revon(4)" onMouseOut="revoff(4)"><img name="4" src="http://superpages.com/images-yp/decor/images/4.gif" width=120 height=20 alt="Shopping Pages" border=0></a></td>

-

-    <td valign="top" width=88><a href="http://superpages.com/cities" onMouseOver="revon(5)" onMouseOut="revoff(5)"><img name="5" src="http://superpages.com/images-yp/decor/images/5.gif" width=88 height=20 alt="City Pages" border=0></a></td>

-

-    <td valign="top" width=83><a href="http://superpages.com/products" onMouseOver="revon(6)" onMouseOut="revoff(6)"><img name="6" src="http://superpages.com/images-yp/decor/images/6.gif" width=83 height=20 alt="Advertise" border=0></a></td>

-

-    <td valign="top" width=54><a href="http://superpages.com/about/" onMouseOver="revon(7)" onMouseOut="revoff(7)"><img name="7" src="http://superpages.com/images-yp/decor/images/7.gif" width=54 height=20 alt="About" border=0></a></td>

-  </tr>

-</table>

-

-<table cellpadding="0" cellspacing="0" border="0">

-  <tr valign=top> 

-    <td width=142><a href="http://superpages.com"><img src="http://superpages.com/images-yp/decor/images/superpgs_logo.gif" width=142 height=57 alt="GTE superpages.com" border=0></a></td>  

-

-    

-<td width=410><img src="http://superpages.com/images-yp/images/home_taglineALT.gif" width="410" height="57" alt="More Ideas. More Fun. Shop On."></td>      

-

-    

-<td width=46><img src="http://superpages.com/images-yp/images/home_tagline_corner.gif" width="46" height="57" alt=""></td>

-  </tr>

-</table>

-

-<!--top_spacer.phtml--->

-<table cellpadding="0" cellspacing="0" border="0">

-  <tr>

-    <td width="150" bgcolor="#FFFF99"><img src="http://superpages.com/images-yp/images/pixel_none.gif" height="8" width="1"></td>

-    <td> </td>

-  </tr>   

-</table>

-<!--/top_spacer.phtml-->

-

-<TABLE cellpadding=0 cellspacing=0 border=0 bgcolor="#ffffff">

-<TR>

-<TD BGCOLOR="#FFFF99" valign=top width=150>

-

-<!--sidebar_alt.phtml-->

-<TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 BGCOLOR="#FFFF99" width=150>

-  <TR>

-    <TD rowspan="3" width="5">&nbsp;</TD>

-    <TD width="145">

-      <font size="-1" face="geneva,arial,helvetica" color="#ff9900"><center><B>Search&nbsp;Nationwide<BR>Yellow&nbsp;Pages</B></center></font><BR>

-      <FORM>

-<font size="-1" face="geneva,arial,helvetica"> <A href="http://yp.superpages.com/sform.phtml?SRC=&amp;STYPE=S&amp;PG=L&amp;R=N&amp;C=&amp;N=&amp;T=&amp;S=" 

-	onclick='if (window.buildURL) { this.href="http://yp.superpages.com/sform.phtml"+buildURL("S");}'>Simple&nbsp;Search</A><BR>

-</font> <!--yp_sidenav_links.phtml--><font size="-1" face="geneva,arial,helvetica"><A href="http://yp.superpages.com/ypform.phtml?SRC=&amp;STYPE=&amp;PG=L&amp;C=&amp;N=&amp;E=&amp;T=&amp;K=&amp;S=&amp;Z=&amp;A=&amp;X=&amp;P=&amp;R=N" onclick='if (window.buildURL) { this.href="http://yp.superpages.com/ypform.phtml"+buildURL("");}'>Detailed 

-Search</A> <BR>

-<A href="http://yp.superpages.com/dsearch.phtml?SRC=&amp;STYPE=D&amp;R=D&amp;PG=L&amp;C=&amp;N=&amp;RR=&amp;RE=&amp;RT=&amp;K=&amp;RS=&amp;RZ=&amp;RL0=&amp;RLT=" onclick='if (window.buildURL) { this.href="http://yp.superpages.com/dsearch.phtml"+buildURL("D");}'>Search 

-By Distance</A> <BR>

-<A HREF="http://superpages.com/canada.html">Search in Canada</A>

-<BR>

-<A HREF="http://yp.superpages.com/tips.phtml?SRC=&amp;STYPE=S&amp;PG=L&amp;R=N&amp;C=&amp;N=&amp;T=&amp;S=" onclick='if (window.buildURL) { this.href="http://yp.superpages.com/tips.phtml"+buildURL("S");}'>Search&nbsp;Tips</A> 

-<B>|</B> <A HREF="http://yp.superpages.com/help/help.phtml?SRC=&amp;STYPE=S&amp;PG=L&amp;R=N&amp;C=&amp;N=&amp;T=&amp;S=" onclick='if (window.buildURL) { this.href="http://yp.superpages.com/help/help.phtml"+buildURL("S");}'>Help</A></font> 

-<!--/yp_sidenav_links.phtml--> <BR>

-</FORM>

-      

-<!--yp_sidenav_maps.phtml--><font size="-1" face="geneva,arial,helvetica"> <A HREF="http://yp.superpages.com/supermaps/mapform.phtml?SRC=&amp;STYPE=S">Maps</A> 

-<BR>

-<A HREF="http://yp.superpages.com/mapquest/cgi-bin/mqtripplus.cgi?var1=yp.superpages.com&var2=none&var9=&var10=S">Driving Directions</A>

-<hr size="1" width="140" align="left" style="color: blue" noshade></font>

-<!--/yp_sidenav_maps.phtml-->

-

-    </TD>

-  </TR>

-

-  <TR>

-    <TD width="145">

-      <!--yp_sidenav_se.phtml-->

-  <form action="http://se.superpages.com/se/results.phtml">

-    <input type="hidden" name="search" value="GO">

-    <input type="hidden" name="SRC" value="">

-    <font size="-1" color="#FF9900" face="geneva,arial,helvetica"><b>Find Products<BR>For Sale Online</b></font>

-    <font face="courier" size="-1"><input type="text" name="SEQ" size="15" value=""></font>

-    <input type="image" src="http://superpages.com/images-yp/decor/images/go_btn.gif" name="GO" alt="GO" width="24" height="20" border="0" align="top">

-    <br><font size="-1" face="geneva,arial,helvetica">Search using multiple words for best results.<br>

-    <b>Example:</b> women's 5 pocket blue jeans</font>

-    <BR>

-    <font size="-1" face="geneva,arial,helvetica"><a href="http://se.superpages.com/se/help.phtml?SEQ=&SRC=&STYPE=S&PG=L&R=N&C=&N=&T=&S=">Shopping Help</a>

-    </font>

-  </form>

-  <!--/yp_sidenav_se.phtml-->

-    

-    </TD>

-  </TR>

-

-  <TR>

-    <TD>

-      <center>

-      

-

-<BR>

-<a HREF="http://ad.doubleclick.net/jump/www.spdart.gte/pos1;stile=1;c=;cid=;t=;s=;sz=120x60;ord=1006"><img SRC="http://ad.doubleclick.net/ad/www.spdart.gte/pos1;stile=1;c=;cid=;t=;s=;sz=120x60;ord=1006" WIDTH="120" HEIGHT="60" ALT="please visit our sponsor" border="0"></a><BR>&nbsp;<BR>

-

-<a HREF="http://ad.doubleclick.net/jump/www.spdart.gte/pos2;stile=2;c=;cid=;t=;s=;sz=120x60;ord=1006"><img SRC="http://ad.doubleclick.net/ad/www.spdart.gte/pos2;stile=2;c=;cid=;t=;s=;sz=120x60;ord=1006" WIDTH="120" HEIGHT="60" ALT="please visit our sponsor" border="0"></a><BR>&nbsp;<BR>

-

-

-      </center>

-    </TD>

-  </TR>

-</TABLE>

-

-

-</TD>

-

-<TD width="7"><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="7" HEIGHT="5" BORDER="0" alt=""></TD>

-

-<TD valign=top>

-

-

-

-<!--navbartop.phtml-->

-<TABLE cellpadding=0 cellspacing=0 border=0 bgcolor="#ffffff" width=468>

-<TR>

-<TD height=20 valign=middle><font face="geneva,arial,helvetica" size="-1"> <A HREF="http://superpages.com">Home</A> 

-<IMG SRC="http://superpages.com/images-yp/images/arrow.gif" BORDER=0 width=16 height=7 alt="&gt;"> 

-Error<BR>

-&nbsp;</font></TD>

-</TR>

-</TABLE>

-

-<a href="http://ad.doubleclick.net/jump/superpages.gte.net/yellow_pages;num=1006"><img src="http://ad.doubleclick.net/ad/superpages.gte.net/yellow_pages;num=1006"  ALT="please visit our sponsor" HEIGHT=60 WIDTH=468 ALIGN=MIDDLE border="0"></a><BR>&nbsp;<BR>

-

-<table cellspacing=0 cellpadding=0 border=0 bgcolor="#ffffff" width=468>

-<tr> 

-<td width=18 bgcolor="#ffff00"><img src="http://superpages.com/images-yp/decor/images/bar_yellow_left_s.gif" width=18 height=16 alt=""></td>

-

-<td width=458 bgcolor="#ffff00" background="http://superpages.com/images-yp/decor/images/bkgd_yellow.gif"><font face="geneva,arial,helvetica" size="-1"><b>&nbsp;ERROR</b></font></td>

-</tr>

-</table>

-

-<TABLE cellspacing=0 cellpadding=0 border=0 bgcolor="#ffffff" 

-WIDTH=468>

-<TR>

-<TD valign=top>

-<BR><CENTER>

-<font face="geneva,arial,helvetica" color="#0066CC"> <STRONG>Not Found - Please 

-Try Again<br>

-</STRONG></font><font face="geneva, arial, helvetica" size="-1">The page you requested 

-cannot be found or is not accessible - try v</font><font face="geneva,arial,helvetica" size="-1">isiting 

-these primary areas or search the yellow pages using the form below.</font> <br>&nbsp;

-</CENTER>

-<table width="468" border="0" cellspacing="0" cellpadding="0">

-<tr>

-<td width="152" align="center"><form name="Online Shopping Pages" action="http://superpages.com/cgi-bin/ssend.cgi">

-<a href="http://superpages.com/shopping"><img src="http://superpages.com/images/header_shopping.gif" width=152 height=41 alt="Shopping Pages" border="0"></a><br>

-<select name="destiny">

-<option selected value="index">Select Category:</option>

-<option value="books">Books </option>

-<option value="career">Career </option>

-<option value="computers">Computers </option>

-<option value="electronics">Electronics </option>

-<option value="entertainment">Entertainment </option>

-<option value="family">Family & Kids</option>

-<option value="fashion">Fashion</option>

-<option value="financial">Financial</option>

-<option value="flowers">Flowers</option>

-<option value="food">Food</option>

-<option value="health">Health/Wellness</option>

-<option value="hobbies">Hobbies &amp; Crafts</option>

-<option value="home_garden">Home &amp; Garden</option>

-<option value="music_video">Music &amp; Video</option>

-<option value="pets">Pets</option>

-<option value="software">Software</option>

-<option value="sports">Sports</option>

-<option value="toys">Toys</option>

-</select>

-<input type=image src="http://superpages.com/images-yp/decor/images/go_btn.gif" border=0 alt="Go" name="Submit">

-</form></td>

-<td valign="middle" width="7"><img src="http://superpages.com/images-yp/images/pixel_none.gif" width="7" height="5" border="0" alt=""></td>

-<td width="151" align="center">

-<form name="Idea Pages" action="http://superpages.com/cgi-bin/isend.cgi">

-<a href="http://superpages.com/ideas"><img src="http://superpages.com/images/header_ideas.gif" width=115 height=41 alt="Idea Pages" border="0"></a><br>

-

-<select name="destiny">

-<option selected value="index">Select Occasion:</option>

-<option value="party">Plan a Party</option>

-<option value="vacation">Plan a Vacation</option>

-<option value="auto">Buy a Car</option>

-<option value="home">Buy a Home</option>

-<option value="wedding">Plan a Wedding</option>

-<option value="business">Start a Business</option>

-</select>

-<input type=image src="http://superpages.com/images-yp/decor/images/go_btn.gif" border=0 alt="Go" name="Submit">

-</form></td>

-<td valign="middle" width="7"><img src="http://superpages.com/images-yp/images/pixel_none.gif" width="7" height="5" border="0" alt=""></td>

-<td width="151" align="center"><form name="City Pages" action="http://superpages.com/cgi-bin/csend.cgi">

-<a href="http://superpages.com/cities"><img src="http://superpages.com/images/header_cities.gif" width=102 height=41 alt="City Pages" border="0"></a><br>

-<select name="destiny">

-<option selected value="index">Select City: </option>

-<option value="atlanta">Atlanta </option>

-<option value="boston">Boston </option>

-<option value="chicago">Chicago </option>

-<option value="dfw">Dallas / Ft. Worth</option>

-<option value="honolulu">Honolulu</option>

-<option value="houston">Houston</option>

-<option value="la">Los Angeles</option>

-<option value="nyc">New York City</option>

-<option value="philadelphia">Philadelphia</option>

-<option value="phoenix">Phoenix</option>

-<option value="portland">Portland</option>

-<option value="raleigh_durham">Raleigh-Durham </option>

-<option value="sandiego">San Diego</option>

-<option value="san_francisco">San Francisco</option>

-<option value="seattle">Seattle</option>

-<option value="tampabay">Tampa Bay</option>

-<option value="other">All Others</option>

-</select>

-<input type=image src="http://superpages.com/images-yp/decor/images/go_btn.gif" border=0 alt="Go" name="Submit">

-</form></td>

-</tr>

-</table>

-<br>

-<CENTER>

-<FORM NAME="ypform" METHOD="get" ACTION="http://yp.superpages.com/listings.phtml">

-<INPUT TYPE="hidden" NAME="SRC" VALUE="">

-<INPUT TYPE="hidden" NAME="STYPE" VALUE="S">

-<INPUT TYPE="hidden" NAME="PG" VALUE="L">

-<TABLE border="0" width="468" cellpadding="0" cellspacing="0" bgcolor="#EBEBE4">

-<TR bgcolor="#0066CC">

-    <TD align="center" colspan=6 height="25" valign="bottom" background="http://superpages.com/images-yp/decor/images/bkgd_blue.gif"><font face="geneva,arial,helvetica" color="white"><b>U.S. YELLOW PAGES</b></font></TD>

-</TR>

-

-<TR bgcolor="#ffcc00">

-      <TD colspan=6><img src="http://superpages.com/images-yp/images/pixel_none.gif" width="468" height="4"></TD>

-</TR>

-

-<TR bgcolor="#EBEBE4">

-      <TD colspan=6><img src="http://superpages.com/images-yp/images/pixel_none.gif" width="468" height="4"></TD>

-</TR>

-

-<TR>

-	<td width="4" rowspan=7><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="4" HEIGHT="1" BORDER="0" alt=""></td>

-

-	<TD align="center" BGCOLOR="#0066CC" width="23"><IMG SRC="http://superpages.com/images-yp/decor/images/one.gif" ALIGN=TOP WIDTH="23" HEIGHT="23" BORDER="0" alt="1"></TD>

-

-	<td width="4"><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="4" HEIGHT="1" BORDER="0" alt=""></td>

-

-	<TD><font size="-1" face="geneva,arial,helvetica"><STRONG>Category</STRONG> (<A HREF="http://yp.superpages.com/topcats.phtml?SRC=&STYPE=S&PG=L&R=N&C=&N=&T=&S=" ONCLICK='this.href="http://yp.superpages.com/topcats.phtml"+buildURL("S")'>Top&nbsp;Categories</A>)</font><BR><font face="courier"><INPUT NAME="C" TABINDEX=1 TYPE="text" SIZE="16" VALUE=""></font></TD>

-

-	<TD valign="middle" align="center"><font face="geneva, arial,helvetica" size="-1">&nbsp;or&nbsp;</font></TD>

-

-	<td><font size="-1" face="geneva,arial,helvetica"><STRONG>Business Name</STRONG> (e.g.,&nbsp;GTE)</font><BR><font face="courier"><INPUT NAME="N" TABINDEX=2 TYPE="text" SIZE="16" VALUE=""></font></td>

-</TR>

-

-<TR>

-	<TD height="8" colspan=5><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="1" HEIGHT="8" BORDER="0" alt=""></TD>

-</TR>

-

-<TR>

-	<td align="center" width="23" BGCOLOR="#0066CC"><IMG SRC="http://superpages.com/images-yp/decor/images/two.gif" ALIGN=TOP WIDTH="23" HEIGHT="23" BORDER="0" alt="2"></td>

-

-	<td width="4"><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="4" HEIGHT="1" BORDER="0" alt=""></td>

-

-	<td><font size="-1" face="geneva,arial,helvetica"><STRONG>City</STRONG>&nbsp;(optional)</font><BR><font face="courier"><INPUT NAME="T" TABINDEX=3 TYPE="text" SIZE="16" VALUE=""></font></td>

-

-	<TD align="center" valign="middle"><font face="geneva,arial,helvetica" size="-1">&nbsp;and&nbsp;</font></TD>

-

-	<TD><font size="-1" face="geneva,arial,helvetica"><STRONG>State</STRONG>&nbsp;(required)</font><BR><!--statelist.phtml-->

-<SELECT NAME="S" TABINDEX=4>

-	<OPTION selected VALUE="">Choose a State

-

-	<OPTION  VALUE="AL">Alabama

-

-	<OPTION  VALUE="AK">Alaska

-

-	<OPTION  VALUE="AZ">Arizona

-

-	<OPTION  VALUE="AR">Arkansas

-

-	

-	<OPTION  VALUE="CA">California

-

-	<OPTION  VALUE="CO">Colorado

-

-	<OPTION  VALUE="CT">Connecticut

-

-	<OPTION  VALUE="DE">Delaware

-

-	<OPTION  VALUE="DC">D.C.

-

-	<OPTION  VALUE="FL">Florida

-

-	<OPTION  VALUE="GA">Georgia

-

-	<OPTION  VALUE="HI">Hawaii

-

-	<OPTION  VALUE="ID">Idaho

-

-	<OPTION  VALUE="IL">Illinois

-

-	<OPTION  VALUE="IN">Indiana

-

-	<OPTION  VALUE="IA">Iowa

-

-	<OPTION  VALUE="KS">Kansas

-

-	<OPTION  VALUE="KY">Kentucky

-

-	<OPTION  VALUE="LA">Louisiana

-

-	<OPTION  VALUE="ME">Maine

-

-	<OPTION  VALUE="MD">Maryland

-

-	<OPTION  VALUE="MA">Massachusetts

-

-	<OPTION  VALUE="MI">Michigan

-

-	<OPTION  VALUE="MN">Minnesota

-

-	<OPTION  VALUE="MS">Mississippi

-

-	<OPTION  VALUE="MO">Missouri

-

-	<OPTION  VALUE="MT">Montana

-

-	<OPTION  VALUE="NE">Nebraska

-

-	<OPTION  VALUE="NV">Nevada

-

-	<OPTION  VALUE="NH">New Hampshire

-

-	<OPTION  VALUE="NJ">New Jersey

-

-	<OPTION  VALUE="NM">New Mexico

-

-	<OPTION  VALUE="NY">New York

-

-	<OPTION  VALUE="NC">North Carolina

-

-	<OPTION  VALUE="ND">North Dakota

-

-	<OPTION  VALUE="OH">Ohio

-

-	<OPTION  VALUE="OK">Oklahoma

-

-	<OPTION  VALUE="OR">Oregon

-

-	<OPTION  VALUE="PA">Pennsylvania

-

-	<OPTION  VALUE="RI">Rhode Island

-

-	<OPTION  VALUE="SC">South Carolina

-

-	<OPTION  VALUE="SD">South Dakota

-

-	<OPTION  VALUE="TN">Tennessee

-

-	<OPTION  VALUE="TX">Texas

-

-	<OPTION  VALUE="UT">Utah

-

-	<OPTION  VALUE="VT">Vermont

-

-	<OPTION  VALUE="VA">Virginia

-

-	<OPTION  VALUE="WA">Washington

-

-	<OPTION  VALUE="DC">Washington D.C.

-

-	<OPTION  VALUE="WV">West Virginia

-

-	<OPTION  VALUE="WI">Wisconsin

-

-	<OPTION  VALUE="WY">Wyoming

-</SELECT></TD>

-</TR>

-	

-<TR>

-	<TD height="8" colspan=5><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="1" HEIGHT="8" BORDER="0" alt=""></TD>

-</TR>

-

-<TR>

-	<td align="center" width="23" BGCOLOR="#0066CC"><IMG SRC="http://superpages.com/images-yp/decor/images/three.gif" ALIGN=MIDDLE WIDTH="23" HEIGHT="20" BORDER="0" alt="3"></td>

-

-	<td width="4"><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="4" HEIGHT="1" BORDER="0" alt=""></td>

-

-	<td colspan=2><INPUT TYPE="hidden" NAME="R" VALUE="N"><INPUT type="submit" TABINDEX=5 Name="search" value="Find It">&nbsp;&nbsp;<font face="geneva,arial,helvetica" size="-1"><A HREF="http://yp.superpages.com/tips.phtml?SRC=&STYPE=S&PG=L&R=N&C=&N=&T=&S=" ONCLICK='this.href="http://yp.superpages.com/tips.phtml"+buildURL("S")'>Search&nbsp;Tips</A></font></td>

-

-	<td>&nbsp;</td>

-</TR>

-

-<TR>

-	<TD height="8" colspan=5><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="1" HEIGHT="8" BORDER="0" alt=""></TD>

-</TR>

-

-

-

-<TR>

-<TD height="8" colspan=6><IMG SRC="http://superpages.com/images-yp/images/pixel_none.gif" WIDTH="1" HEIGHT="8" BORDER="0" alt=""></TD>

-</TR>

-</TABLE>

-</form>

-</CENTER>

-</TD>

-</TR>

-</TABLE>

-</TD>

-</TR>

-

-<TR>

-<TD WIDTH="150" BGCOLOR="#FFFF99" VALIGN="bottom"><img src="http://superpages.com/images-yp/images/pixel_none.gif" width="150" height="1"><img src="http://superpages.com/images-yp/decor/images/sidebottom.gif" width="39" height="36"></TD>

-<TD>&nbsp;</TD>

-<TD valign="bottom">

-	<TABLE WIDTH="468" BORDER="0" CELLSPACING="0" CELLPADDING="0" bgcolor="#ffffff">

-	<TR>

-	<td align=center><BR>

-	<hr size="1" noshade>

-<font size="-1" face="geneva,arial,helvetica"> <a href="http://superpages.com/prom/linktous.html">Link&nbsp;to&nbsp;Us</a> 

-| <a href="https://customer.superpages.com:887/servlet/Marketing/Listing">Add&nbsp;/&nbsp;Change&nbsp;Your&nbsp;Listing</a> 

-| <a href="http://superpages.com/products/scentry.html">Buy Ads Online</a> | <a href="http://superpages.com/about/privacy.html">Privacy&nbsp;Policy</a> 

-<br>

- <a href="http://www.gte.net/pands/">Internet Access</a> | 

- <a href="http://www2.gte.com/OrderBook/">Buy a Phone Book</a>

- <br>&nbsp;<br>

-</font> <font size="-2" face="geneva,arial,helvetica"> <a href="http://superpages.com">Home</A> 

-| <a href="http://yp.superpages.com/sform.phtml">Yellow&nbsp;Pages</a> | <a href="http://superpages.com/ideas">Idea&nbsp;Pages</a> 

-| <a href="http://superpages.com/shopping">Shopping&nbsp;Pages</a> | <a href="http://superpages.com/cities">City&nbsp;Pages</a> 

-| <a href="http://superpages.com/products">Advertise</a> | <a href="http://superpages.com/about/">About&nbsp;Us</a> 

-</font> <br>

-	<FONT SIZE="-2" face="geneva,arial,helvetica">Copyright &copy; 1999 GTE New Media Services, Inc. a part of GTE Corporation. All rights reserved.</FONT>

-</td>

-	</TR>

-	</TABLE>

-</TD>

-</TR>

-</TABLE>

-</body>

-</HTML>
\ No newline at end of file
diff --git a/layout/html/tests/table/images/blue_1x1.gif b/layout/html/tests/table/images/blue_1x1.gif
deleted file mode 100644
index 901b6c25cd7012e80d4114d61b7cf75eada42a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35
mcmZ?wbhEHbWMp7uX!y^-z>o&SIzSBMGcqtRF}W}@SOWlNr369%

diff --git a/layout/html/tests/table/images/bnr_all.gif b/layout/html/tests/table/images/bnr_all.gif
deleted file mode 100644
index e11b6293f4db443ab13f12ca94438ed4850300bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7976
zcmWld`Cm+n8^_N%bLPxGovEp&RHi0vl#>>zE;Eyg3X>&8n5htwiKLq@XQq8)3K{F2
z7D;kV3uT}7A`D8&HYJ2Gkt=j>-~0Xi@caXx*XMaZ&nIwkfY&_9Prw)WJ_RVNZcI&0
zU4QiMOv@l%)mwD=>F%-z3?uW!+l!P}pZC5R`}5XI_3hUkPeupceEsq3pN+~pKPUeg
z{rcnRm1kUxzy83D*yDExKYY9W?BmOK<DCN^Qz{-Ezy5qp_NAfGZ)e+vOnEMQ&OH3`
z_peRIx>xP53X&d)`CZX)|LtGbZ*M($_rak4$>2y##+l~FAMU^W+<dq1;H818_E$Uh
zD}FzDbH|_evo7}az5WukI=cG8#qd4F^Vk33>=$vX_q`+L8FxTkQ1|5agZ^D5S||Q0
zmYMbEZ$G!6x+kyhjXu(T=~~m>=bx@T7?B@2XW=w&Y0{~At9G8c@#6Kzzu$iTo^+&c
z#UB+h#hroM4)|@%wD(z>P@*j;ZH$PH|L327mnNPF+E%dtT+fHGiFFx&i4~gfKPEFS
zJl-Nr%BkrO!_W6T8-6!7;lDXIs;DJLQT*-4<fXfBUcdj8SJOXtQFuv{uD1Ji$WG<l
z74aD->##*)^BJy(8=r>BsxNj8N9H!V1guk@EQ!o%xX?MAeCA<de#IY^Ju~J8l{M+s
zCS(u28XlkcHT34g<mBX>py>7a*Mw1N<KKUYl2!U|KR3%ymejU-hwnCb@YpNM4o_Ft
zb-%Im3O3=+^zs!pJ$?@pNfDWKm2E>ySA^x&K6&!y%ahk%9K3^1-F(s1`(9akVNKSh
zbL~Sb_np1^U?j2h!F>PV4_|()-B%h@+!3%bgG^`Hy9*;SYBwIey*ll$<tb&=ov%_W
zAI*>4>nYmiv21H={|72+Y-DN2^9b-=lN=D6=eA_ivyrcSF>dAZ+v8Vbj=wFJs_t(-
z-u>z8kFmdhZa;nR+QX68pZ;ExRae%md;0dPq^PB}??cp~*1cyRRkRE?-hZoo`FZ5?
z_lckX*v#<@O)2}m;$h}rec2cLRJUGUzV~)S|9yW|&-sp57jF;W?0NU^zf-e4e{=K-
za0`wJjFAarGL~)23f&?L+Hqt>N=Z_BQOcq7F^8IR)cseQx=J*<##Zgw)}fBB+fSZ6
zx!0$=_u}*05Bj&G`mwKnfBpN1^%PC8aGB8Gd+~Bt7Yusw5wQLN1OL~o|BwHt1RzfV
zfn<wCYE@Gj*~lrfQ(e-Mg%WL)k7B6K5tcp5CkgPflLnXLy5>D71rKgD66QOK-k20e
zNMh$5KNQe0+p>uLKsF{56d{Y}jGTM?wQH6+19Es?T7T}*S<%seg01mRJ=x)PTc6+F
zeV!M%Wb1=9F@lXpm;@x1eXiVp@!H;DTNW~d$~Lf?L#`{)_#4t0aB8+u;6X&i%-knh
zzA5mCD`9x_i}=#cM+=Kjgx$4Joqu~@<u~`_ir_FJS&)CY$?ZJ#w1I2fJBjv9x*@|J
z**~eb{zxi~3y$LawOK%Cm=`r>hhAW0PEV?^Z8R1FhbuVQ(xj{N+&0}SZONOOesTBx
z2MqXOp94@vHF;4J-Kyo`Stk|rIA<Nk2M|-|PHPfjnXLvSEu#ZZT^P0<xCPW7l}?<d
z!89(-huOf2rwI+u_Z%y<AIi2hWVa#>$pQ^0`Z`Fkvh5yg&0m&^El-2U;uAnyHmjH5
zbW*K>etX9v7%<#Lbc5}a>OhjQh3g$7D_dR`lhTiBNPQITU=k~C^^h_qGt(ap=cr|-
zPLK5n!#jBl-fvIt2N0&0xP`DZ2hThhwB_u|D4Rbtel+uXG0cG3XbT0(56y%^G0h?~
ztL{<)32d!-&f6eg{id=!AVxs-KWUbJyn!RYjq`k`Tm{PrR2*4p$}Ynh%`x1{70z*@
zX$Fm!g_*OW`wdqT)^keaw2k@J-K08)jRffFj5^C{QN`~+Hjpz)+GnBNQ394A9Tl3{
zhJ$_(eI!&vx&{oaMC>jp(xFLe+4dE#iP}t+LAHv`HXkj0><qJcd^!`><Is`><rCtQ
zB-*ETU6QuRX6RlK#Mqo7AW-U-^3y=0Sn&?P?6G5(A$0g~IwREUTljJ?{oP6eZM0TE
zcB+@8wUr>E?j*z5?y*N@F0~yt#`!cEF<jNyG;QoL-`dJ7d=v*#95_!GL8GNIsu_^7
z$RnULl%Cl&VS$scJ&WQG+_Iap1dykKSMELOhrD(Zhl1wOuGCqC5<vI#&~z4E{{iP%
zIj~wz($F@b{F`;sIv{EyM!ozGu&UYFxbs27%kH?h&AN;}m(ymOA{Xu^?(K}qoK;~Q
zx{%{uKjA=dA!7h3*;b))zI4f&PuOZ-BBy$y*1|bvqs<zCC>5Vtez{yAG~DO&ttqKo
z8~^LqpB`hq>=j<kZ5F$ff|hf8ftF5-6_tF3A%=UlT7yOt0x-Kg%hN%S;)~*j*+<l$
zXXqF^99mwz-~!{0ui<D^L$pu<w{4xlr(;Exx{l`iTwTWOkTm0msELbI#!Bs%S?+5h
zMue;A4vu_qYM(xB4}*);o8=Um)X}VlGYJclBgqe6XK?C)=pYt>k*<NMu`SHN@C{j_
zPP2K97c*khvyC5n<x4O*D{O*jlrJD{h!nDtfXvArg@8B7UE?9r1wJ%P^Ey08n%-Gx
zF$55Jm3e?44Pu<u0;UT~7|x<x!wM{CNn8{;go9X>KFmbLAXLvMa=f_*H&)7lczF}7
z$3Sa4F7uQaaKuFUG_fBXm&}K|1>N_`$CTj_JYJ%T5UG>129)Vcd@RIYH?+@ok<7Ff
z>DqJzL_Dh6^T{}o)7g|mz-6X#Q93(a72&QVT5*Quo~f!Grd$mZc`zkgw~!d`s34kV
z3bGR8vMe?)tPmOug+xv^moQ(qu>VFoEQcY^D&@$zTz=Yt(kx(sj&FhJVUC40QNK0K
z8ByS_9Pa6Xbb;@Foym~_VX*g3YTIE$Fz-?cGJ2Be{6<8a8Ar;qUQ@Z;*d}L#wuvG-
zLvX3m)1o7z4AT_vEn;i3cn(a+k=*PYADZ^Ybv9h9fvngo3t){3LC7E@S5rH;TMjTz
zE}Q1ACW5UX!2oZzt|*nw{eAZ;*JDDR;nkIAoP>snDnA#yY56`lPEj^SyJX7nnpshM
zw&Hx2r@CUt&E2eB{4Hxjsu06ja_<0r^O^#2dgoNK3*ppp+%QhVW$^tmnkv-71Oqww
z5}#giT(q%wj-{7?<<l>-u><q0$K{-)&J356IN+A3Tm15Qnz`Bp8t)O)r&SWMTv367
zEo05#w6oe#Xs)s91|e1_jphQTlc4~$zimAJ^<g7l&_5viHEhRk@3z>Jai;(yr&^~A
zB8RBL5&zk#P4KD6LBqsO2j`txg}<c_mY-kq$T?Rech}+<B>Fb4ZPOgj8#7&kP?5!H
zaURmDB75}v8$OeR65kmMy7v;m>r&do6p0Vxa!C4FUpZq#6l(Iu&l|f=@Q!`OOzf^S
zTO?&gD81?}Ry{)8Uk~Z*R8s`yKN+S~gAeEQEMhwMXIRYF$cX(>guK{e_~&}}v;9K?
z!oxJHxG~v3{D>>`!A$hpm^)1a5U38BPH+@R>%W(Gv@v~lebbZ0m@H4JZ8zR2!`Jjg
zbzk`v-uqXv)2u|DX_!j(Rm`O=R!U4fw0;b{TV_x%F?G_q8UCrxqU!r(j94)K#228@
zm;3;#x|@Um?=pM`AyX89y^u8e$~KE<9GRCLA9%W@#k8zK!<8oFEE$Jjr3yFQ6`HZe
zOTI6rIOCJ>={uehH1$^cn;DXQXD2Q+Ff#Xp;u7RRh}T@(N+Nx!6e3Y498JB(<J8Vv
zx1DxZ(5ZX5R)?Y7gtTB|`L<kerM1lOr0&uBdfxOZ4ICb;q=Wz<F%ita*b_yy?X+|*
zc6q_8l&}s+-&<V=(x8<%jXc7KOvC`~ut(uF4bCVkAVwz3!1|J7hMUeln(PjIkitO+
z8lG>@SosQ#)8Kb*&0wC%29R(L2p+Zpo=SdDeXsy*M2ZtaAegI;%aRFLKS7H<A%V}V
zj_Y9Wo*@%zNR!2XcS6MJJ4-Ao8^6Wr<nwyZd3qP6QBIVC{=Wj|*MyEIwGYl;HL(w_
z(zQGLGA3&bH=u~Ti9d@wxi&5ZM!niU_YS|S&Hwh}&W@WPwdm4XY1)J%E}L3DM-0C+
z5;~S+8dpVvVznXg3!0aid-K*LH(vt{>6_<xIUo2w*Y>IpN<XS5m?e?+V6akw-$dzQ
zA}CV7!xkg{<w*?s?wZGk6umH_wt_KYqX>)^!>Ab8s7H)6z>E^m1qV9|d8%EIuO?~9
z;A&bi;OP+QaMX-^WG6HTbxFZwlp0iH&?5rE%b}0OfR&d18jBCm0?!NqtpYd|#@ql9
z1C;ce9l(@|-Gwnbxaf1WL8>9pucfrE22^UZUm^kzAWTIu`+@kWo#erQR00T6xL`{n
zXoR5~0Y;PtDUd=EFKEAr{vR&}Lh1O_e|uLncOjpgoQ>wHlZ&Lp)hY%_ODmWQlam9(
z@C6dVf`9+s(fHN%Mj7D>MhwT01sEd1NL$q)qJWIQxTI)JeowN$zLL&S)11-S{%_cA
zToOeeXuSxaRPdj&2%pmYLo3<MT1!v`nMkQYp>%oH%3uMRCyMPWq{EsdT?P9%zJI_5
zD#86BoNgpCF3<sK-^eh!aRtcG&xI&rCR3cI)gVND<{OkrZY8|I!PCXm-|YdSo)o3S
zsNytMSt@mGCAovNT1!)P(hB-$d!&>mjJ^sZc@C5RO<J(%Xku_5xJ5zRh0&^N94?8#
zUH*iCDV(%G9hRa=@OT9Iiho;B0@n5;hnrV)0Yo!w?y{9YfH?2k+xcY#MuK+!tJVLJ
z%Q#d;?G+ijh+v$T(aUG13J*xk07@4S1Tu!W<VIsKS)E45plAP~4q!gRT@6Hx4t_DH
z0AVg;{m8<{*mg51v~m$zrKKC{Q=cgqW*SDD_#i>T02KgFRh(gu)~ukn1_D{?W0VIg
zTX33>j;7SouIma_WavB+NEZ7=YGM1|6B~_Wwi;p)M$Z!i>+$uGN1!dxatvKgPxpLe
zwB1}x%Tpl>w1QL{WI?v62q5Z`Kr=05ubNKOBjd)92Zz)>^}y(AqWxlkYKkKVHAqt{
zo8;>KF^Trf2DyEfx@wHrpr@~rfw0JU+z~C;8<=6BqziFg72C^2_p8{i6^lWDO4oo!
z{4HguU6*dlGt7HPMSUzxwVQhsaixM9z-2S&sRW|9$K^-qeImG<3w^Xh6BLYZ7+NI-
z`_yQoBCC#13`7|c5ooNVAJNgT=tDFjh&i&u?j6}yk+?}jGY%zsixEfNiD@ciFK+H=
zxM+t6Xcz|*0^PD6+6IVe94=rkqC4q$T`191ZOT+Z3ssgj;#0g~$VCOa@0#9=l6pmq
z>m6x4%v)y991tF>(y(Kv_>7-sfD1psR1vQU1cp#JE|97T6z}gmSlL2<qGhvCVjDo9
zi;VB0`{mJ0X<adnL7gh0lQ&AsB_Rn0phD$&99)wOb@9*fM2t9bArB{-Dqxy~==;9x
z5x3k@L%FA;UzL_i4<lp|v;-ps2QAnnS}^sdJdjT~zZ?z(!fsN6J@hWiwCf+VBy7}?
zO|;x=l@L|soTZ>!iBC22;l*Y^tm0xb5dZiXXeK746!PZT90{t~vR>tU8$);~od3RZ
zRVdwo#L(Q{l973=LF*1`&lL?Y&i-U~iRh^i5vrlHjDS~S_%G`D+7y)Rp&&NxeL2NP
z-2ujp<Maj$O~<M|Q>weJRxf>9{op-aC?*wYLza9CnRB>&gRE%c>(=SJ;8VrWatL%+
z+XZNC>U(@=g)%OWA(t@H`6zgqeqNh`9*ZM!dk@&CEPIccCLFiFZbNSqn|i8)snY=Z
z2Q@mg=HH+ig*Qm@J4ZxIhI9huIqD;%cGg*{KOZ=yHV8$lKs~v#sw$`uNVCtlm`e{*
zvCm1-f$U?DjNYT7{^P~W%{f&iX83-n<IhCr=2lY+k%iM30W@S2pDt7<i_WZj^pjSk
zA@{w<*`X{Ak0y~u4efMsEVe@UVa6gzpaDW2Lg*eia5M0H>IXPgVn1VeW|x}Cl9E^L
z1e4zbW-9wO9T18V_dIOaKMgRLR%7(5axs@IiDJIw6L8#hN&(#5eT=7ooLcFSwG!l0
zd$oX0z5m!bHb<LrTN^LUF1|QkTbj48Lj;SBp(=DAi_5rk6r^GXGxD-B_d+HrxNau8
zAh^2W8ahLLO)vo7Q;=+>5rj(GRW)JW!qz5~9-Mc*?#B-HgwM-w5fZVB37_DoD>vej
z+{HvxJAG9Lu;nVSUUeo~#28O-un;j^a3rmb9m<E{U+pP_K(j~~3*`Up12OV$$*$d6
zmB27TeI~9MgqLsmrM&`yglAt2(x=qGDi+g2JO2$AsEvt<!wi@wVNA*hay{xoyQ-aA
zIi-TSapH57X@(i_0577{rOV^!aTJIpgF^sgN(}QfbT?nf!=k?N1iFe}{|H6$^wsm@
z)`j2_p;ThpzA+W0H!6@B_=2TDo9cD0kFWde#Yl}(n9c<#YLczW<?V9hGQVOv*Y|wk
z249r47bX2+1it%qld3jtR@pN(mz_rEuN!HQf4}ttNDXR2<f;OUkjlZ`wK_&8x~uZe
z!KqSqzdkEK6uYE^-iw>h$u7QzX8ySsoW@0AT}^C+b!G@)rBFC26i+)C>@tX<H@K}m
zS1x7_O=0LM6mX}d&hV*+LS5#kz|E7@(T|gjJh!&07=a&YUp&dHRpgUr$_@HkIb#uf
z^|rMbsc0iuR|Gf+36>h7ElxZS5@;efVKXQWnr0#be6hVt3&HJcg{gx;Z^WrjD;ULM
z%4rkWRZMxM-r}zTinWv~4B08BP_THrDhh|o_^ybzJKpE&gnm`QElt3o3)ENYV40xW
z9|L~c05AEeh@$TspFjW!|H?o*S5vGf$+@T;U}`47{<GBmY6GTU^#Q|V$Q2ppGw$?-
z`7*%y9}|6^wX9H6NI2yXMnRGz_#N;bAn_(Yu`h^qIpXf0{vMW7B3j5cq68<7%s~>w
zG>iYNPFWti_TId(<wIp~gB~G>7#sz?iw}n+fXJ?yBE`#Q?y1d=8&_VAygl&fx1VJ`
zqdqIN$)_qM7L=mGtQ|^BQY0dNPXmlu(oK(j!nYIG`4HX5w^{261XPfi1m|J2+TAbm
z%lRn^n5c!<bLV&Ifq}2U*3`M6l$^F3jN-!q0hPpkAx)|lV}3W|=JD!xIgg3C=9|{t
zz{pL&s{0}4%W{1-VWLDnw9pV<)<NtjGT$&T9jS=P8V<7#M-o)9GK7?hA=j|*BdlQ?
z-2F)C@EQp~0je)8wBz#Yw<?}Jze-VShDlQxJiV(>)j!g=QIgw-vt>maeMn&%@+K6i
z)tuRiFQ`=y3I3zy7?z+XAgJ7N4j5Pp)=7aPJwn5_zuRS;a=>^au7Spg&%EqTa7Vfr
z$O?c~&~Ti2dZd7v`)5Bbgir4nh4TTr`O>Hj1+)PV`T-P~Iq1O(zw57-w##1pGFlxj
zA|!|sd@+&|MFzim*TsiiVzL@uXs<4{Q}gTjr-mzlQMLMW^QXeL(<4)-M|z#%e6imq
z+{5+|MAir7N{NX$P>a#FMgam8HrAD!=n)D|S`UCFyYo!=^Xye1O~p96lUDZh)6%g|
zEY@d&>*r%X4AxGG=+=r46sh*EhS94xU}+J@r-1$$z&?rI5Pwcz3XwFl=F{W<TIs?2
za1kG>)sbsO@Y<hC%^$!`Dsq_KIFc`u0N@A+){3A@V$hgRTjsQW#Vs<dde2aklkh_p
zQg5fvpJu&88<>o&2f!0e!Sz5UQBS<9+X5=+ke2d93YLfrg3D6d^u%{R4X&xts~CJj
zN1LG`De=*ze~t$)8x8q99-^Ra62V)!BGdKAMy;$!MJuzTXt<P|tmIodvb_iGrW@&&
z4!)&8R&f{fUnN;9fbl|TlW2p}_zVkSNZaA>1_>Xg^u(S8UwL|>mWw)+r|zHPp&S&H
z^zVtZ1R%}Nmm6}B1YP?&m!%!o_Gu`;YjsOR&^k5KTL)iNk&OeugCz6@lkTf-$u}oY
zi=9=qTzL1ybW3E*iO%8N+1q`RIA7bc3VCZ*yl9oF{Q8cFTdKMTAGYRa%&~}bykgu=
z%km6bTAveI&~k8&$L+&1*OKEvZ1rVWY_73*#0ovL^vs&x_p7QSF2%q0E)Buq<+s?=
zSSmr!MF}B1cR&}sGG2Vkb7okBQdZqkD%AOW$UYuxJSn~H_L_glko<5&D%_l<m^q-t
z(PW@i?YOC#{X-zW&mv3YiRhe>+s4+yiSox8wAE_M)M~DSt3P9kvTmB=NL0Eihj-Wd
z#VoO^Bd?HHubg!&?OY!^;>X9uhTBMgS-2T0uIfK;!T%a;J7|B)<3f0CSLcC6sEQwP
znfI)j_+bYBY^60hwzsC?^Ggio#ZlLzEAne1*^UMBE_fiF5}^*aEw^cRupzqPg{{h&
zNov1BF?+CuvN%y!n(lAWwef%rmn%!R%k0W9c)znIiWyijqH3m`t_(Qn`XV`+^j@hP
z?p*w7(HExOr;(DZkU3-N`SV922B+(9KiV1WQsX_lswO}z&V$K~IvP#4?ZXAu5cNa1
zd3z(5eL-HBJDVIi&qmWkovBWDs@4h&*Rh`rQmJ;}l!UxKS=MG65&wi=fCWjLnH#bt
z&Go@a<aXx#(assBi;rXNbV5aC8$ALY+IG-z=h#McU3_(h30YWKg4@qehG?@B=joWJ
zokY%|){ptKL({|kO_#-M<@BJRe4FX}Ye#pkjqm!kGaYl*;OA&?&ejVa?`XjanvzPq
zSe<&M?&22cgT~B_ys$cVH?jns)8)X6H9|)<{v?0cJgP`Q&nzf3NP94YW1Xb(FR(j4
z;h$ypPLshBSMkNnnVg=D9GBP#7$V%(M9YbW$}-dNt?}cybxPAPbGugdDl>^%D9Kr_
z03eoU{l}y&6?c4)^<#9h{JiCxj491U;5#<sWef1JFGmQ*D^vt=)9>7nlhIKm?}v+8
zsBUODZ0hsk-kD-HJ3&Y~m?eqfG$bV0nA#X{0}2nuoZ}ML?VqrgF*sdq%xFY1bVb%}
zHFRKC*cI78sZ7dyR}nn-pTx0~>Vb<qC+%?)!>ezO)~I>YPQ;BcNBkE@&mPpfM<*)%
zNHd#71db)DE2WCrC9g~)tEB00AYS4}j@oJ0&J2hg2)SjR^ermaasA0CW@KWGA33ys
z-q~HtD%KH5sq`kp-IHJYHWc-4ro<g&;!W7EpKCta?#jBY_&D!|m!Xk^)_ObY7tuPx
z=9xE>y(5QA4{$PF_Ki*Dxl3iVOA3FEMG4t%IDW5p<q}eO0Pc#a{`)qB2fEc+?^l)3
zE{aG#@=Z{3bxG`O^`8&N_bjwc%3+3G8(<yK%9tyg>3;o3RpwtgPg!|!1T*2lfi^fd
zHr*z3s9<;k%ND2$XvdDpjl<?-Iabc1+oHlJ(g4ukc3B`whCs3|V@_oW)#ilI2(LM?
zI}rrui9s4vNCZ?m;$~@!b-r?8$fly1SHdlg1H>|(RG52%%aya;Sy8s<OwU_D0<6$>
zJC+Rz$pP5JfBqc?IO$IXE=BgVo1IYFmRO;4XM?YsLT7kFO*cwq<&X468K9bG=j&<^
zn(Bm1=L+c<`w7)#f=?Z*^s|+z<ut|8Lmy(^t{PQ)lf!Yuq!MuM*5(P5N^q*MC&t9s
zQa)~Tq-)JR<59h@n2WQn>Q!HKBSP}1gt<i3X62+N)3k23EnXVCl#+tQkuqj}<=xF{
zG0y1W!j~$W$!<xdVG|mXTP49ZRJt^-vhI}6cKhi{B}AL`ieu7GpnOs@TpD?d7GT-}
zBac(gI}4#sA&;0Up~qH$oaxayX5FH^dDT^ft<rUzW_})1DJhV|LPT?-{Eb9N-o6c@
zIEiI8>0G$MK}d>uAfsOQE6itaUc$3p9JHqBY~H%fy^}`EXu$5TW>t%1ZYebdf4KJI
zOCV4X?}?I@O9e+otyuce%rzP^$Rh-p2dT3nDrIN5GTdxLCkVjnO?}Weppu&&3AC^*
z)i{{H4M)W?q)J4DH8?ID1`K84LKCLX;<?Wb);#quUG{wr6vO3}nHg`TrsEM87dN{C
zD|(zvFZqYW`b|5E%3WPT1pz&!6fdVHRicLM(m6z4q9RyUp_!;wNXm5!Fj|vU`E^ON
zY1Tl~>^JHx8?iMkSOnhruMOs)0DYZ9I;CRmy+!?g)3Z^*ipa?*PDgmVTSY>__S9&L
Vx8WT=ZxRmvF&WJzak+rc{{U%A>RbQ-

diff --git a/layout/html/tests/table/images/bnum.gif b/layout/html/tests/table/images/bnum.gif
deleted file mode 100644
index aebb63d17354f3e9bc7d4fa4913ee6ab77a442d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3178
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
Qxw^Z&y}rM|!JZKSJJbaqH~;_u

diff --git a/layout/html/tests/table/images/book1.jpg b/layout/html/tests/table/images/book1.jpg
deleted file mode 100644
index edff91bfbb1fa24d08c88cc91ca7fa27c4a54b22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2747
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
Id%XAm1hL5n^Z)<=

diff --git a/layout/html/tests/table/images/book2.jpg b/layout/html/tests/table/images/book2.jpg
deleted file mode 100644
index 15f24e9ab15d5a4257a8dbc9f93b3ab968d6781d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/box1.gif b/layout/html/tests/table/images/box1.gif
deleted file mode 100644
index 2735f70c79cee52d6a408974fd047b35a83c315d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 821
zcmc(eEmDL*3`AS*9svpz7S{#}vlxCH4zmJGs<;amh(n;MJq99*8{oJBGQ7+s7?;gV
z=XK}X+xwe~%jd1O`fc@`>dx-ycJm8WRabUJm%B90tj_F=PIqeVMs;LIbhtzF)YZ;*
zwB6Qdt6JHLmRl5PBaIf1xviNqC##~$RhqF>nUzuLN(}|g$cm_Ng$9bd&T^Dp7K}VC
zWhqK7F%@dWfQAw*dJIMzX|#B(F*G$NGM%aM$5^U}3}<NULP67!c3QXxio2;uIfXs)
z0F&3mfqx)y2sL6rL&;S*7>qX3Xlat0HZ{i)njrDVSSmX#a>XtbG(!%NBS{kgTwEt;
z+!7^ufXQp(fC<Amgc>oRc?lLA3`QGi&5GtWZEB9#7(wEXu~e33fouIku{JvUTuU0L
zmHVuBMLCQso!Ry>Jjlz#EPr8*gEa|hJ_oi$cz9yef1UFgJpYB==2&N&le@#)^~=Zp
UX#aWm-aUT3pT7P)JneM#2c1AtMgRZ+

diff --git a/layout/html/tests/table/images/box2.gif b/layout/html/tests/table/images/box2.gif
deleted file mode 100644
index 213585a8473065a15d3e8230e2790ff38e11216a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 819
zcmc(eF>aMX41`B%cqt-9qM=BU8l@Wvfe;cEA$LeaGd0(7#}T*!R1`iAQcClAFTr+x
z-W`84{@>%%m-ipOUF%vequJ9lHIo?+zfg5g*L0>mt!-9M)l{ZDrM;V;)Fcy6v`^jR
z8fWaWR$D!)QAQq7pp7(IJm$7`&YtQ{x4X4tsj9lt<t{A+%~U5HceGI4b+yxWTQKsp
zRjst#Vk*>#0SzTs^cajb(rEEmYiMgus$8Y@$5^VQ;)>QT6f~W(%fdZS+%2W#686Xg
zOkNWQ{(-<D)QABMC0F5KFxp6?rA=<z)Ep<;Ao0goDmxarViyXUkt1>>X##+Y>jaHk
zq9hM6c}*NJVHk%{BL*}t!GeRqXd|s%(cY#_%@G?TNc=ID%F-_ItbZxaMt7fQNegvy
z-}Rm-m+_>t+dhUD`FPmnAFOq7CLzt|z?KLPPmKCs=V1r$f8q1xjXquOzW)62>*{jz
U_W95E``=fuUcdW$d#jKC0NAxoEC2ui

diff --git a/layout/html/tests/table/images/box3.gif b/layout/html/tests/table/images/box3.gif
deleted file mode 100644
index 24becceb75427d03efee5987e1207019fcf0350a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 819
zcmc(eA##;L5QN+1MWiYz3?c$e;kqi76b3~gXTV@u=Q`s!0#^WqnEN1yZ}t+bn>V{X
zU-$g)`RnJ$r|;Lg*5A?W>6x0zjE7&Sx~FS8)1KBgtEXxzQ=Zb^O;2i)i6`2p?s1JX
z_E@W}9@Qu#k0{Va8Z91kTRUe@b*J0i+ObqsUFmX{mV#!gla4!DDDJx2X}c{LdD^O0
zT5d5FYQ%ts5-fTQMjL6gc&s(FH78ZB()wd8RZ?+9YZnTdPT6JQ9w_dXQgR7<<N+qH
zi39&Y;1FuWfQFK*a4;Bcq|wqQw{2>U6K#<AV=R>&i(Ih_1<lA2Ig&I1z{Pcf#w}5j
z2bjDj4wx{EL#Po0nwMa~!C<tJ)~;x8)28N#jS(dN7)xbo7kJjc6lbHm&$Fb3I=Sz9
zPn64e(%Eev!;5@8?D7xRIyjS%=5t_6goh_a{jc+32k(F3)8(z6FZW-5{`mEBxq1KX
R&+EJ2FIR6K?(c5(@gLn2P455z

diff --git a/layout/html/tests/table/images/breaking_weather_314_anim.gif b/layout/html/tests/table/images/breaking_weather_314_anim.gif
deleted file mode 100644
index 44ce8c9f90e20289cd092234026f93ed5aac7987..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmV-E0>S-9Nk%w1VLky70HXf@`~3Y@j>H~Vj-0m65swQ10000000000A^!_OL{CCR
zI!RJ7E-(V#?EoS91ONa4001li0000!0TBQI1OFJh-2O1iNvpj$>&?6WU?`4cX`X1R
zu59bRa4gSsZQppV?|kq7I)QLVEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMeS1(?s~
zzz}^N5ZP_wz+6nP?E<^m{RR*Nb9;P70D}T^e|~vzg>nFDLX3@%MgfY8aBh+VkYt{p
zo`M6TbdiOlfrFx>3PYBAeUPwsYH@c%frV(Du9u6Qh<Ut6x|P1d#%sgMM!}%Z&|G)|
zue80F)6KfRX|J5In3SeMfxM{1kd}bV$VrIey>-i$?1b~j(fRsNjE0h(|AbVVqiUNW
zQ?(x9DV1$WqeGmq)kAma7`-?5CSoiC=<(pbk06PiiuiC5s#14Yog>$%nkh7dDA9S9
z5aFFOM=mNFRq-YpNX|-9J0=Nbz)c~ODg`IdsJLtmn~t1y<`q$yifA${c@keFKw163
zgJ%zyuZtRorv2(@+0wVsrn&qjm1&V&Y;0Nuhtg`;V}X#I0*JPqwoLIha>VA=FiW_Q
z^$7x7a@s7DDml$HrD?3wnr2a^B84+2%8J|?lkM45UNW{6>v)VzJ4`=-@B+WgBy^})
zvZeI^K25q1*d#*L_2E7HVPVIuccandws-C8NC;@(&b_<$@8H9WA5Xr#`Sa-0t6$H)
Mz5Dm@)h7S|I~Ug)zyJUM

diff --git a/layout/html/tests/table/images/browsecathead.gif b/layout/html/tests/table/images/browsecathead.gif
deleted file mode 100644
index 078b096254eb60b9a9958d719252b427ad335637..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 678
zcmZ?wbhEHbEMt&lIKsg2|Nnmu4hE+nhM;VQmbDB$TN%8P8IoHVisvv)ImRHN$e?M-
z5LL~PJ%vF)f<e)c!O)9=B%t_{1*~2NM1t&eVEvz<(wCAsFJslZoY(svPd>Am@&1yD
zHfx<Pv@m2DywEH-5%@qcMpssao&RW$4m-<~Et;z)iCpe@B%x{G(sd-#N6%J)Go#3F
z{q6TZ_SDHwH05FD<nYc);xx13V&W{|;N@W#<T2*u7G&q-<!!RG7Mv~E$jzC{XRI#3
z#?dY~CzX|VH8VdeN8`j9N}LndEoNe2syTG{$kAiRPn<mEVPwY0%38~5FUZZx$?7w6
zAtyKEU9RgrN|R^C2wJVSUhK-mp<*1s&+Gcom}Qws*eh2?j;*`bByin$b$ms6=DD4M
zEE&fn!cwJbP6;JWZ44|_5p8^&FwvZ8qMMG<g9Q#Ak*X#CO)45RCDbj<mKj<GC^$$l
zHnK_VkVw49EGZD>sq#E)=EcPxleJ<`ZCQDFdBEbRpFe}oZPe9cTCzzbl&zUvV&{a&
zMH9M0&D2V43JSg*S)w#KrzCT6=aF0bJ_!pml@B@I6uFj>GI`p9j(cp8VLz=+v<@`t
ztW-L1ahqEUAM^Qpq8>We1DdupKj834Z+1KzxN=wMpEtr8t7G{LEF}!4cr_)=zqZk<
zxnqhZ%eG~#+y@+D-^eB$UhtVki<hxWd4c1{K$QuN6P;YIL~VF*P=dvJ=d-M%ujhUX
z%@yxb7ATo==RouHY-9fPW3$+<3(PSsNC;&#>i(cA!0Y;iO-6fm$>RoPtBDCN%xTQ6
iTX?0md!|O$RPQL}XRbdOys%ZFP2*9A$~i$M25SJ?XX~E;

diff --git a/layout/html/tests/table/images/bug106024.jpg b/layout/html/tests/table/images/bug106024.jpg
deleted file mode 100644
index 92fe5dba175dd5389dde8e0dad49544428ef1cb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13375
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
A$^ZZW

diff --git a/layout/html/tests/table/images/bug120107.cgi b/layout/html/tests/table/images/bug120107.cgi
deleted file mode 100644
index 5834b93b82d6283af51cd45270bfc832b81b0947..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11055
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
Vu%?>M)v5YcnLPst<mH~1{y*&M-x~k`

diff --git a/layout/html/tests/table/images/bullet.gif b/layout/html/tests/table/images/bullet.gif
deleted file mode 100644
index 6db8e59fb72e9e2014332448deb32deb22a2d33d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64
zcmZ?wbhEHb<YeGvn8?8Je<s6!AUKo8z`&sRlLbgJFzA2?kURsE;GF)M2YVEiDgw_i
NKV|;2YQ6}AH2_vC66pW{

diff --git a/layout/html/tests/table/images/button_go_nav.gif b/layout/html/tests/table/images/button_go_nav.gif
deleted file mode 100644
index f6997c2f656f3af6d4cbef323523565520509dd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmZ?wbhEHb6lM@&n8?6z=FFM2v@~O5V+IBW#h)xJA`Jf-bbxFIkURsE@s$3V2i~6N
znd29frGI8u*S=a`2R5IVz5SJDlHN>f-gK2%pO4`@Zu;W^L#sm4@fCp@Q&}0T0jm8W
ALjV8(

diff --git a/layout/html/tests/table/images/c-tl.gif b/layout/html/tests/table/images/c-tl.gif
deleted file mode 100644
index 12e092352612039bf77b57f9ec31bc15b5aa0a56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmZ?wbhEHb<Y(Y#_|5<U92^`190EWjAt0bAA)zUusHv!EsHkbEX=tfwX=w;TPKHiS
z|3|@S2n??fQ2fcl$iTqIpaaSYpgh6A;mW|sA)^uC(8$6oqoEQZ;ONvUASo2UuyGM{
y6T4hgjK+rpZrx1W8GkAS8C)j`axYkuQKag^q#USJ!1+<dceY;gr6rOA4AuZSb?%G+

diff --git a/layout/html/tests/table/images/c-tr.gif b/layout/html/tests/table/images/c-tr.gif
deleted file mode 100644
index 4f973b5e6bd42ba11032428f0421c2fb246a7283..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 872
zcmZ?wbhEHb<Y(Y#_|5<U92^`190EWjAt0bAA)zUusHv!EsHkbEX=tfwX=w;TPKHiS
z|3|@S2n??fQ2fcl$iTqIpaaSYpgh6A;mROu60m@Qk&%HzSgqv1gog*1xWvuotYBDl
zs8d2(W=DtMW49JrV>uQ9p~Xy$D&BrB6M~jHGwP{}b=)*y^ldjUew8C3z+epkn5OSz

diff --git a/layout/html/tests/table/images/canoe.gif b/layout/html/tests/table/images/canoe.gif
deleted file mode 100644
index d291a411e59303b08d86c5b5f331904128ae7fdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 241
zcmZ?wbhEHbjAY<t*v!B%^UVLWnP(V`(~OOc|NsA=mX>zr%$b=pXYOWT0CE{HfZ|UU
zMg|5>1|5(L$P5OSc>yOqSMRlWeRlW%1dSy2#Ca<!15#fJy}q*Vh1KO%J<AKL{~U<-
zW9MdT7n(0PBUrEYh`R7Jm%IgHIa6olMlF8OH*L$|oBM7XZ)e*3a94KG&!v4E_ZDuL
z&9*)MB3E*9RYQ~=b4O=Kt$$c^rcP@`P@C2i=W4yW{>HvZAv0&W6xS&)TfRb+b@iIH
f>(+1BxM}m2t(%0pcJA7}XYaoK2M%@%GFSru02yax

diff --git a/layout/html/tests/table/images/clearpixel.gif b/layout/html/tests/table/images/clearpixel.gif
deleted file mode 100644
index ae710460bda40603c111250dd7e6a975a005dded..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
tcmZ?wbhEHbWMp7uXkcLY|NlP&1B2pE7Dh%OtpmhBaUhe4$%T=@8UV<?2KoR1

diff --git a/layout/html/tests/table/images/cnn.gif b/layout/html/tests/table/images/cnn.gif
deleted file mode 100644
index 4a32eb81b09a3f501eeae264b76b763b35464b96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/control.gif b/layout/html/tests/table/images/control.gif
deleted file mode 100644
index 6e063799480866c12a00a3892aab293915ac7ce2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1245
zcmbV}>sJzX06>2N@yMxIfrU+hOgpXZ)ag`aFD!aYJ!PjYw-Y&9Wwy-3$Fyt(sE7y(
z>Ocu736)d?XMs2$WQO?67e2B)zEdp1Y@$1+Tl*7sKiqHk(>?y}G2guxz6V}l5`dMJ
z6|1#1BqT&G=e~Q_Vm51Yb6H_w6uaH7QmJ<C+{xqds;eIc1|A<Bt#4^j-?<ZY=+J?X
zkYKS`+}Ef77aA>0qsg<`x)h4cH*bs_&aH(7%gjvk(vp37dD(8Cnw{;Pn|o!kn5@>e
z-rmX=Fa8)FHb|wct}bJAbhJ(<Yj4-^`H9b-71`~R)6=G&9&K7$oY`D6KHk9L#Fv%*
zJ~mcwx6c(9XKA&P$;tk?xv}PEU3GP_Uau@E$y!)gFq=&o8Mjm_(T5M?YPIP7dyCOn
zEELkayNyjvs-Yp{=xEQtKvhA3AU{8SXsAx9%$CbD=I3XhKi7?n)OU2$l$PeG)k3S)
zB9(HhsvZgizon<gKYlFJ>t*@*9Ho+PwT?(6EQNyG-><)aKW%Ywv9q&+$GaI97nhTB
zS0dqn{{>+Y_FuQ{vp+uph!r|uCMBn^QUQj8NrkX8`GTzMObkQ>L9#M(q_X>&ju1x$
z??I6=2PqP>C66>&B@iLV&}l0i`Rel8vd1c3UNs8^K`|j~L1V7CC8_;k9kWEP9ni@g
z>kCsFo3yPXNL43uq_MTGf^8MlOq)Q-_{ZL<wvT_8BjuHm(^+0OJPX6SdwaU$gHiy-
z3@_h$DGlp?(bP(4-6D8hi{cVjLlV$ubm_xW1A{&%^BSXwh)<i2W`~&))@Q3Eli|Gu
zu<aL@xBhUdFepaF_s00K-3dio@;JA>X~dI{i1`@`ET$wRfLzD<GEf__%LPxS;u!?`
zpe|}<tXUeUD?9(^wH<6QGJ;M;$3q=Gg8Czo&MBemLR%|ouicV-ePuy6X{ki8A2=@=
z{3moS>kUo^UdBu~pUoWxgg#Oda9+3lK?mtD3>tYEu|0~agRFA$Xn6gA&OC=$gWG7}
zQT9f@)Y1?gZG*b0iSD~I&LmROTI@cuiPvU`14t}n|CWR2WB;;XyPjRA`uimhX<m%k
zxuFLVEj1g^4loC*&iziLD>#DshSDjd*pKr4fh%QL2&;5RpaLu!DTcY77(NTd)*dBN
zFrm5mi4GnebSV5Rq7NBXYFLGeISnY0a!lnY3%)c@q_{_*@6iTlk$o$__FpyKb2wGC
zdF<S#29WIP(tMf9aiI2l@DaXf|IAGRQFKV9H2mkZNZNEk_60wm&CFL%HL%rW_8t-A
zlj;fuy7n*$f7_kD+Z&2zCwNlQYt251blINp8|YWNeJC&qfV&^mXp3Sye#DXBt{c&e
zDD!2T_?){*Cxf<KaGQyFk`_?>NI7o=Vv)C!fw~e)NDf1-A%XMKrxPGAT>!^bG}S(N
zOEvxyOn2H9L4$#;t5HxV9Jhl}J}$gw)lU_cSgYRR1{rW44L!x}YlV%0-%mbG!g)6Y
zA4aW$ZL=9*ZV|SpNS{&->ckYC`Nfg%7)HD&cSn++<5!mm$2LG?-_ADTQ@4FEd5I{|
r>o0kAGI7@xXfnYwxRdPi)3`0U$@fj^T>BXk;kipdI8BXb0I=^Lg#K6p

diff --git a/layout/html/tests/table/images/corner.JPG b/layout/html/tests/table/images/corner.JPG
deleted file mode 100644
index dfda77afb450418ea331d6d7501c9de3d310267d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/couverture.jpg b/layout/html/tests/table/images/couverture.jpg
deleted file mode 100644
index fdfd6dc9559e649193bfceb48c9a2a8dd149ffcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6634
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
V=og9CkXcD;*TAcvkHF*Fe*uCy_^SW_

diff --git a/layout/html/tests/table/images/curve.gif b/layout/html/tests/table/images/curve.gif
deleted file mode 100644
index 9d94691c038b297efbc19dba4fef614a310e2852..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmZ?wbhEHb6k-rz*v!Ci;J|^lwzkU3%94_j{QUgv?Cjv+U^h26M@L6vV`D8XEn#6{
zPEJl%R#pZuQ2fcl2x91f2#^^LEEWO`ljiJ|IDOW7SFD7T()AR-NV%0e7A)A6T4Wwk
jdgEEvf&;UH7-uA3C~8u8za`qN^8B2p<B|cEf(+IGx9ls(

diff --git a/layout/html/tests/table/images/detach.gif b/layout/html/tests/table/images/detach.gif
deleted file mode 100644
index 62423ffec2d25364296454b3ac8a1364f630d972..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmZ?wbhEHb6k_0KnE0RJ|NsAY@7_&IOJiVQ&;eowkhlYr<(&RbfrXb71lo4CsV+PG
zh`&hAqf4;E<k|AMmzmWM_*^#&aP^uIuXDdJHD>k0_o69pConXA=IrI;Vz34Pv6>|$

diff --git a/layout/html/tests/table/images/dot.gif b/layout/html/tests/table/images/dot.gif
deleted file mode 100644
index e91cd406476cfd91ea4de71076a0ceb20e1b7214..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 824
zcmZ?wbhEHbWMN=u`2L^a|NsAMTUzEgIrRt#FpPrH5Ew}zaNxiJ#h)yU3=IDnbU^+F
h<p~E4QHKAVf5aUc8k(5dI3zqSC^)t9Ff%b&0{~K)6>9(h

diff --git a/layout/html/tests/table/images/dot_black.gif b/layout/html/tests/table/images/dot_black.gif
deleted file mode 100644
index 707b12baab3092b677fab2fb0c745352fe440812..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34
icmZ?wbhEHbWMp7uXkY+=|NsB%fM}2i0~4bQgEatl>IK*U

diff --git a/layout/html/tests/table/images/edge.gif b/layout/html/tests/table/images/edge.gif
deleted file mode 100644
index dd94b28a97ffe0dc86e28a0bca5292b532cda25a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3692
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
Hpi}<`f%--Y

diff --git a/layout/html/tests/table/images/edit2.gif b/layout/html/tests/table/images/edit2.gif
deleted file mode 100644
index d3e410e6318d523b36bae70919ebdec89626566a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 117
zcmZ?wbhEHblwsg!nE0RJ|NsAY@7_&IOJiVQ&;eowkhlYr-<<xH)&hz5x&`|x=Np`p
z%S>E!tnpdrB;QkuZc8<FJWtJ^o)9X!{|tW)L)(!>A0u?OPSc7xc4YF0yj?s;yQT&t
VFN)oEGUXo2lTAN+%=oz&tO3fSGR^=1

diff --git a/layout/html/tests/table/images/espn.gif b/layout/html/tests/table/images/espn.gif
deleted file mode 100644
index 671273ffcd7e9933a74b09cbe6fc9fe9cc6c2f4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 542
zcmZ?wbhEHbG-cptxcZ;r|NsBbot&OKSw6P}BE#o~K%{xErR83A^}Xuid&NMMeJ>k`
zlJ6x0QPjOCAPTw{1Vmo<ynx8*+SaYtwywRl7KoN!Te|exoH^I#Ou05?%C(-JYdtO3
zTB@&ASD!m}?A+eH=eBNTU|=|K-~f=M7Et`j!pOj&#-IZ-5acHYw*L+d1s*z5{U??P
zB_vwRKi_&{QA5=FK%NJe59n<<)|cp`#%<ELscNm*1eG@*A0*iv;T1kn>;Ep~o1B{h
zD|2fbGYg*}OM5#@Pj9chXls9e8;i7?vV_>Y`C<~vV&V(tEmaC$x@`X9g~}_Hls7B8
z^RrId$;KtRb0=$%$c}yeqFg)J<eij+`<b@7ij>P06tc=PmkaTvNS$U$W>j)jy2-{Y
z@bV?UvI@_um(N%@Qy4!8@=5R|vs@5kO_q^3=<v*OO#}nqu}NtT4BHJA`$B}(U6>_V
z+-xQ&rmSRW;X7Q?yYfPVk3vx<kB7vegG&Ti%4HgEJWjYT;rrx(WQBptV_$1!{+k9G
zlI^iAd2auD0}Wgb&R|ODh`7+Oa8)Rel!wpWDAQ(E#R%gB33oncHr@*}G6cNKI&W_;
J=mrL*H2_CKzHk5l

diff --git a/layout/html/tests/table/images/ex22.gif b/layout/html/tests/table/images/ex22.gif
deleted file mode 100644
index f2b4925666a400bbb3d799c52ecb4ca921b41817..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 268
zcmZ?wbhEHb^kI->IK%(~2M!!)XlVHV|G$HS16Tk=DE?$&WME)q&;fBkY8{v_TI{;>
z&)}3;3$O8OUDh878hwu*`A%KRv`T6tcMg}cLqe}>CDXaT{bB_kI#TQ=@$L=|uS^<z
zpKepQkY>8{(anx?8Q0{FuihA$a(qjaZ`|%i-M7&f{n%ge<joU2aFD|{Kq}lwoku=A
zS|vBPfjOg7xI$lTvUf56G!X_1pBeKPa5eTXTq+o{Y^AAA)v9$%XRR;Z=sat!XlYAe
zdC^R1lZ*^M+r<%l(+=@z>aKATX!9ry6z5x8;<#m>^udXe*N&TqMJFd)u-x2a=rZSJ
Mv7Ch2QcebI0LoHiC;$Ke

diff --git a/layout/html/tests/table/images/ex23.gif b/layout/html/tests/table/images/ex23.gif
deleted file mode 100644
index 1aa674043c7d1ac37c37607e36c4db518336a87e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmZ?wbhEHblw;6hIK%(~2M!!)XlVHV|G$HS16Tk=DE?$&WME)q&;fBkY8{w2TkP87
zq;$Ydd$JRc#G3yKtQqnLCY)N*!+ly{E^E7&+x_N*Z5r?XA2_Dryu!n7SHwF<OEbm`
zFZhnE@olzhUn%~kYX5$o?U74TCu-a^d0_SYRL|?+n{C&RX{PF_us>g0VWDSPYnR8|
z?3lyN5?$9nVdA6?hN;u0&zL!@b+STL$Q(Y~BtfM{E<a`=FV852@SL({hEy|NV>y<B
hymoKZs?GBk?pUQM)$JrEkyIwPt$$_zLU~RGYXDFbSULaz

diff --git a/layout/html/tests/table/images/ex24.gif b/layout/html/tests/table/images/ex24.gif
deleted file mode 100644
index a47ff50e88c10bc54df3837cba1580542ad32da8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 911
zcmV;A191FDNk%w1VcY<U0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0NenI06+u&IJ(^aFv>}*y)+QayZ>M)j$|bOWvZ@^Ah2*O&nfUKCxb3K<<h{Q
za7Zi~XSt(t$s8t|(B&^mtpaVl*A2Hdb*<pAczk@4&*-8#&A$8s0a33_PZQ!U)OP@g
zTjq6vf`cVkgolU^0eJ*diH{g}IEEmAke5sZ8<T&So}Unn3u_9Zpr>h$sHv8#u2H0`
z8a%BSs;{^yo23@Fxxc`tvBAW}WC3%OrF#;-#?KSZ5pd89v(?xt!`a;3$9)T$3&?)p
z4krNV>g(wci!Si-^7Hid_V@Vle%=%B@VW1l@f%n{Ai-a?4tg?UP=PrL2^C75NO8oI
z99wQktC;>`8%KT~KXwZ#vgE;yCId0ta!pbTd79+yYXG38&6_xL>fFh*r_Y~2g9;r=
zv}jFJ$h0`r(TiD1Q1PCM5I`WJ)Mq5G63eO;7}u`TW`YeQN`qA&PRE|1L<;4(v}%tD
z@H4l8Tf1=M>SeVT+Sk6H{sJC+^(^5g$VNT<VEC|-C*;IB%*(^^p^Tj@Yc522^P`5I
zJ%J8Q+H&L4S2FfUJb;{{c{b#^%U2I|1=a(q4%p+mpzSmMO#S|-0ng~+e6uw0hrG>{
zMWf)wwCzH7b4Y@(kIAk*4EOF<zJsSCems-vu_c>d-?20M5gJ_J{&4rboP7f8N4GD7
z?f#s)tvNMMO#1N0nQ}KI)0BZRG%{Cwl|_gagKB8xo_-vuM`0COoVMX(9)4&<c_Pw4
zVu>=Gh$0LsuGn6IF2>lNj3O+8$5igo=zwql>_T6TI)<}LZvmnNlz>JhspOJO4h7^4
zl!!AEhPyo(<SdIcLd|||SQ+GmU4EH@KLB!so|xx_h^97bu318hZgK!;oNly9=Z{s%
zcjunk@HvE?Iu^IvalZMvqiPJmSZD^cHR|Z2`Do}@GAx;+AD}T_q=y67ENW<?H$Z0>
z2bj|7AXRQWLgl9(5X!0?UcUNAtg=ExYpoKvifaeD?&|BWRFo<sRdWf)7_O*tR{|=K
z!lJm6V#;v}+dQ*Dx~gZI?gr{&6Eurrd@pF(f{(cZ>p+j;xaY08?4I|+mhE1E+X<4!
l%jrYnEN85}%C^?WOdDJ)t0Z}7n;TuX#w#$tH%X8H06Q@sx<CK`

diff --git a/layout/html/tests/table/images/ex25.gif b/layout/html/tests/table/images/ex25.gif
deleted file mode 100644
index 981d6a3221b44d18e99fb8d1d02496f9eddddcb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 739
zcmV<90v!EENk%w1VaNbg0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0LTDU06+u&IJ(^aFv>}*y($pQyZ>M)j-3FIXsQl^u)c6CQ-G_O%(>`PJO99-
za7Zlnc*dl1$!x-E3tYn&X;}pX!c`D}1h(L?cuX#v&uDPh$%X~iL27$0k}9AXz*;Wh
zx8HPuf&)BAR&ZZdHHQpoT!WC27#kV{a4txann#<Ro)>nX6B;|2B{rg|O&bfWJ*cWl
zp|P}@v$ZQ4Ediz+ez?FPT3otQu&=?O$H{+|EO;Nk%+nTBUk=NC*)P3S+tk!wU5^8R
zEZN=Q>X88L>w&lL@-Xr9_9*rD`uj@K{K=u9ks9Fa0hlaX;52B*u%W|;5F<*QNU@^D
zix@L%1fc#Uj|&?}(i!^~q6GnwgRYPyl5eF;2rXaAJa=-}%pd-4rqZ+Hn7L}-bb5jY
z1y)XjLBaj}cNAMvYE6Z*iJF3{)Jdp9T~VmbLLx_C({R;k2gkC3$lyJ_N?{lluVY7P
z>1Y9EBZO=vQL%D2E}^{p5>@Hb1#KR{GZn2x4D=-9#C9Lciz#_><jU$OW6peeGe9hh
z{CXZe%_`|6y0~<Px%hMuo_CI!KIb|RG_7l{A-#fdYi%Y(Ki<g!l(gYC!`{&SyQBDM
z&2#oHo=tZ3Z&lE*$I7lf75DC+zJnjnj5>K+t<S$e>#k&a^;JWn`m%htmEMdVd=1OL
zzpDTKqP>=tDYKae-w1T^B3u;d8K??<@0HhJgta(W3w>GyD3gT;b|nOdnE9~ODM4UJ
z&Uw5<0b4W_b_fD5aAdInjCaIk(Kh@2r{jrI*#V=CYk~Lz7A?NyObaJ0v*H9oRxqJ@
zSvgrG2CFqGRE{y|w&VoXxtJv@hJiHW6^q!!AQ~Ea*;YBjI8e|+YC@vho5X1&UYx+)
VAX}Gs4nYhm&hXi16DTDB06W*5SX=-A

diff --git a/layout/html/tests/table/images/ex26.gif b/layout/html/tests/table/images/ex26.gif
deleted file mode 100644
index 016ddab00a2bc7a2c067cfe0746575ff2e990dff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 416
zcmV;R0bl+{Nk%w1VKx9V0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui05$+J06+u&IJz3dFv__cT|iu^1qq4(Y*My}WU5}MxxVlKWFzUaS_lE)gkrsj
ziSXd$B%cf6I7yN$G3RC(s{$jxST?|`{%+Q=aK;pyWuxrG6lfQB8!$tCWwa}0nNPs)
z2NhHoTxTgBaess<feec<H*_jp3UVtqCV45BHHl#@n4B*&l%SzBBp#a=sRIFgr!}K<
zs}fL?kFyv@u>&G^yhw<4k|kw>ST!icZx8~1d4?23FRn3M!L-Yy4cQdK+7OKq#@{~N
zA?AX;tsd8cv*Rlo0B?||+1~M~yGlpUF}J^9jN3;6o`X*|I^ZJ5VuUn?E4YY22(bj2
zij^*6%%o;<W1NnJT3I2p5F9!?%bEeAh{D<imvI=(2r?sDk#G?niZo(}34xN5;EChW
zh6^`pK1%xIb@C@pnM&HRn)TFW%be|`V8RE8o6a=MFmVwDa;nr?D$u@A+eE4mD^fBQ
KqPT}b0suSd4y!`|

diff --git a/layout/html/tests/table/images/ex27.gif b/layout/html/tests/table/images/ex27.gif
deleted file mode 100644
index d3a23631862e741da180a2262b7638e34c615a58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgCtNk%w1VeJ4i0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0PO%W06+u&IJz3daFGzJy*TU5yZ>M)j(|{^!lVc$BmiS9&vf+G_)_Bc)pI+M
zgCiIYiXl~Q$!wBZwVw_42@XmuXfu%QdM{kBcuX#vk&Cl>%_dVV+AHN^odF&LrIQ(;
z)b|-EZ-5wo0CN_46#;{UjyZohQh|+2kspc{Mvt7Go}VKGaT_V1rks<f6_+Ea3{r;{
ztbtjGdtof9K9#x*vmn19t{I{%cp45AqZtlez0az_ACoU!Z_6imjM&iK-lV*;+|u8V
z<RE=lNXKyDGbo}1T(4=Xwnt+3jOEa{Svg!N1f<pFo{U`hgt)WEuVIHx<q%pj$YGzu
zi|rhq>k$5r4is0VFp6BUP}jx{zwR_(Hw9g+gn$SfD+y}Yvy+qxaa*+$L(d3Gl=v$M
zA>GKMB5>v`s%(c$4T93Z$b_`2Bc(pw;rwCKs#hmn8%Wd%mL*b(r_cgoH0Px{I#z6k
z{c7hYDw=@YDv-u@7hOVFndvZL)Gr^BD;5lmV9|!HWqSWM30w$9kir?4ykKz+#8ZxD
zC5s-tk^@!JsOd&#hBq}KW34-dp^Tw%6}7JKYP35ow6#9}fb!1WWbP^2i^7?R8+tYI
zN5)MdkKi2f;N;J1#{M+@Rp{$0zULXP_+@n*pF?_!4yrr&6NiEuezGB%F%j$?!DfNm
z)BfyYG<0<mW#<)z5JE%MVuN_umGc>61l-Xd0}p!e5fBo5U=(=`9>?KQ22K#h9E*7e
z#XkIf=*5H`_Trv(^c(?0UxCPY-F7WX_M(mAOmhv6BP1vW7;O|;<YPuAsU&9~W>r*t
zosj~?jya07<0K<CLtZfvR+$}9Fv2lMM;@U!6N}zh(<Boq067DV2%ZOkTXTX@poR*n
zwkDfy;s6nujA_v&91MC%-JZ-KF_4pBwJ=s<PZF`vord~?s1JKR5Fu{)b>QeBj2u&p
zdf{nsngo|-m(rZ9wmRodG(xq|3$E5mOraG33V|NWkXoq*RLVoagZ*_%ggh^yEvZ0-
v4b(acv%h8#>;y$TFb{}4z@v<^rD4KtwBW{YDum&d%Lz?=nyYRF2><{)Ky83)

diff --git a/layout/html/tests/table/images/ex29.gif b/layout/html/tests/table/images/ex29.gif
deleted file mode 100644
index 53938109ede1c3b286d5c25f4ec7f7e259ed93a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 684
zcmV;d0#p4*Nk%w1VRQgL0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0CWI906+u&IJ&F?Fv>|IX*lc6yZ_)oKtgDKK*>BzaGjtFHvtgLc<QmVed-M!
z2=F@9aL7U6mc*!<(5Q3<U{n_Z0uvJuJRMq1_jw(7r|7hL&0amvN<wiXTe#-jVz|xs
zjEFN`eHmL(g-8*HeL!(|LRbTg9V%s5l_7G2NpL$Gk_(q&6{DnhnuBnhEtw&Ar>{<5
z8(#v7PIg<gwy-dQ4!c>q9KpQB94;y)b;ks<#;`RI!eS%N&&JU{#a$#`56;VWpB*E1
zrXddy#g7VrpnR$@f7Wa48TMwOlcD%S^lbewgwpY(hA@2bJQ$quZ_S=z0;@b^Fp=E3
zSy>`9yvF{qqel?3mQ4Dnrcxzhgt7#wXl{v@3ooaUT*1T_4OUjn5W@M+feINLX9^t}
z!<$SEDv82-^QFeW5*3{ia%Co{(lFsH(PQag+#W9?m6p^ewwOkA>C}~l2jOCeBWv4a
zJ9>{-*eO;s{Bb+zle+~h7h;;jRbira15f6qf@CkRPa_J2>QeX~PoGHUp8Dp^8aql>
zMcNApqTH!*PV}MXFpl(FZJJznO|288KG_;BFC}qwa<dkzBY9qIDQ?zTG;ZKK{+ccq
z;!v2kP$Y+|^bNW{jNmI5jdM$+!b^xtzP$PK=+|~W_9-c$;OQF>zF9d>{rCcNwj=8x
zl5-XQW(WpELTi~spDlsOfnZH~eD_ful}Y7OLlVXT7!zPQh~I{q{4oJv9!kI+hlXfK
zVo(0j@tYAVo`?lgsaZoAQmw&+5_+7#L6sQotm4)UWe`Z79z8UaP=!JK1QUK;OmicO
SNKK@Riy&QaAC(v+0027&xGISN

diff --git a/layout/html/tests/table/images/ex3.gif b/layout/html/tests/table/images/ex3.gif
deleted file mode 100644
index cc6596a08ea93dc3021a04fd9f98fa75deb522bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmZ?wbhEHblx7fOIK%(~2M!!)XlVHV|G$HS16Tk=DE?$&WME)q&;fBkY8{vpEq1L@
z4A|lssSv0o#HPr6Ah9cK?u#Q+7c%QL%;dXpre;Gg+ughCr5F+f7`|vV-J75o@oFBo
z%v;u_CbCScil@cem~55oUs_<LxZs4+<djv%6+6Fdi89<C%CE8Q+-k$zN=^oA0B~A0
Aod5s;

diff --git a/layout/html/tests/table/images/ex30.gif b/layout/html/tests/table/images/ex30.gif
deleted file mode 100644
index f97f1d2f6674e096f389ac005a3305df64b717dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 951
zcmV;o14#TwNk%w1VXpu^0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0IvW&06+u&IJz7ZLJ&r)y-~o+yZ>M)jwA<^WrVJ5>$U+PqXH0Ige;WKWW}?T
z?L{ntasZzZI5ZBBN|!2dBM}~&7i8zUIv26(*W0~CPTXx{paSm*Tt)S?ki;9ljly10
zKLHtmf`LdfNf$A2gNtW|GGY`tjEsdcQD2xX5+qb0n<RG?ZJDH{h!0gvj*kqZ9Ilm)
zmvk0%8E%Y_uBN;zw3l6Vp)L-+#>dFX%FAqqn1;hr&deNS)YXSyK#)Z_z#(A^)*{y9
z7P|`O!r)Dy9_k^{VC^IF9a*jRwGCqWVEq*ET^mTy*bZ8%R_XHhMocV2vpU#nHz}aM
zf*AWK%E<n)pdWNBM$yvZ;2^h-)FSB7reP$J2Pk98oY}F^q(QNwF;R3g!z!2Jp!Lj<
zlcp1BG+s?hVM0ezqeodesgW%zy@BC6GCA4Bk~TwJ+0~)fDPV&pyUOm7M<z!VkOS2A
zx!UcU7P=y8%qt7wk_1SA<c#b~VWOD8`<kWt6v-|zyf5HAV^g@^9b0fKvvGw+oa1|l
ze?acw04M{=9%@{aNab^#2{3yNosDRA&#<<8Lfy@~_p!_`Ot0f{%l8W47*-4Su$<5F
z)y9=AU!fK{E|t-VXz(HM<(#lIu#C=bBzA1?a$JwNF`c{<2WD8t9iPIw`xfU(6`Oir
zHvV!c*!3sifCPGyTSY${m`idB4pJZoTdhZxT~L661XmG?0D)Hz;=my%c4cTqSQYZ1
z-hd*mhfP%~A_5i);7O4~MkOxsq7yY@6q-jjmiJ*1DPE%&N=VoT0uz`NNeoP?m5{^@
z`PHXDd!8(11X5F3X+<1EzE%N6v~;;g6#G#S!#`ly#h7R@vVa;4^eM%_jv<6bX9ZDC
z$yS?eX7VNrSsfQ<XOxY!Lzx30mS00@7V6L)X-r_!9*N>`A`fw*@Mm6W+>vLL5MUUE
zB6Mv538~!V8EA{uTxzBVt7>RjD2RS=-hRcA#@#5n&SzwL9n7dHcrpAMm#aTOf5|6h
zwVJZ2C`dq<X#-T*^K3xT!q8o6#!~mwx8P!lXSn39;$pezcH7~)?6&LfyYLz#7p%^~
zx~wqMHA{}VzHMvZ2mXREU7noAyPcE}vWLQQ#Y`I4Bn!n`>Al0<W9)LM(!eioB}sTi
Zzza|*ifY5)>I#AtOKjt2Dx;JD06T~nw449{

diff --git a/layout/html/tests/table/images/ex31.gif b/layout/html/tests/table/images/ex31.gif
deleted file mode 100644
index fa8405b71cf1f214fdda2e0a3800a52dc2c5b784..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1763
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
F06Py|UV#7r

diff --git a/layout/html/tests/table/images/ex34.gif b/layout/html/tests/table/images/ex34.gif
deleted file mode 100644
index 5f18c9a2b17dbc76a557ae145e5768089b41289b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1135
zcmV-#1d#hjNk%w1VGsc_0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui01yE(06+u&IJztRFb+XQkT~lttJT59jbv$_XsSkpW41~NxGhDj_yP|yUEL*s
zC`T+BkEww06aZ3?$EM<mBmf}*RS0@?L8y!Ege#emjo|ajjAe*<-hfMxeay4UVJ3}n
z&>ItV18h@*Q(kHegn@q}R*EBehb4R)l9M1y6Nr6=kPk{AS2>lASDIm?n2C{|cCL#G
zv8)fVjfD-aBLb?lzQ4dyz`+%Ik-fvo%22|lpKi#*j|;BNqRZIXTDp6%oZ5j{-zmJ{
z<{Y=Iv*!)t?CabbrR45JuJdPU6zlAp{o)Y}QHe7u9S<S5>e*4K$WJ?JoDAa2KmdTn
zix@2$YcT!_MmY{UdW7K>f`T!IMw*D&$1#pT5~0eh*vO9Ns&g?T2;(EiLX(M!2wadu
zvqnV}AO9)sClscQA(w#C>e)1gCaG1IYSlJPg+8rcOI+GY)>qP9stlSt8!kuAve>4v
z4T|#BgRJZf;?04o7F;N$=BiQqH!rt%8utF`ns}o=4>ogDmBKG?U2O0`>7mnCmmHxz
zBQuaXWk+e3qa$86vWW9)vmSWWDAq4CpctETVW@n_gO%7eB?=P0a9C>qj4eH-M4LHM
z8zdmNqIs_(@^PL*|6EOaKnr6=@2O5EtSaw4uX#jEgcyRg4E(%VTK}u(2T;hm)9M?6
zZT>=BW6egNJ;t!%hahYS2vR-m6=s5dv<QX^16k$qUowll2gZ34yyf7BNAL&Y23?6r
zVtON{2$E=)Xkwx{m%OM0iz?PgLUI|rQ3{8N=!hLkW7#NV5HwQQ5hpS(c4RF@Dqz}>
zP-5U=Bqn+1#g*WMX60>TpcUnp0W~?}XlB?4As2Yj;eeUxJqcz?9$=VWEI5Kg=YS;e
z_+|+u0z+6gpfs3_K~s7akDzbPqnH|chGEEiI6aD|3GvOeRb-XCVHTq9ovBPuWc<k~
ze#;y+Uw?>f=V^2mOt{smo65w*q`RPa%on!KWQY)rE(5DCwo%$euIP*h%yGRc{`2d8
z*x6y^J}Xsoftub;O4@;dBqWe0t6B%Zx8R0r6S53(7Vf#|rmHSDvB?Hp8SBO??|H#?
zIfb)r_19jzze!gHl3pBF+_8wbR@SoWG^+!bPU`mWgO??ztzD@}Q*cGZ!bVoT-px=0
za&3?)$8fcxgU1jbDPinG#zFF@PAFd%qnQ3Y_)Ly27Aa~#@?<<P4s(h3X_fhsxFn@M
zw+Pj!gVeRN9e6Hk91w~rhA?ZZY3b$$Ne;W_s9i%O>u8bCJZJ|=7x6NMo3XJ4wTxkT
zhBZypfvu}@13LDeeWYE)*0pegqgreZmR)B7uNfN$Ve{=^WrXUIEE04$7Cao&Vmtoj
zi*H#&$H)vXhR9wiPrjw*U;-Y))e+ve2dzw^zGtDEQ*HJHu**Ioq`IHl`;Z9$06ST@
B4e<Z~

diff --git a/layout/html/tests/table/images/ex41.gif b/layout/html/tests/table/images/ex41.gif
deleted file mode 100644
index f6973e2292702e340ecd00c883c98b6b49986627..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 522
zcmV+l0`>hzNk%w1VOsz%0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui09ybr06+u&IJ(S1BDD76yg2L4Zvevfg<WZ$B>-?LiV3SbfieLQn~l4)0$;yO
zP|;fyi;dPsDQmg{0+KMM88VOqtaB>^NS0r&nETmf%H#A_CB?9tkimm0mw+T@3PA#s
zhK_U#Fo6?;PEcPK3W#!wFC<Wf5n2j19F}UC9XCW7oLO#dADX09I0ShO0;j2^t_zqN
zv9GiYvlzFvw0#@ATTqlItAr(nRZMGbO;*ClK+YwjMp9uk0b#a&R1zPF#6(_8;XG0_
zBrQGHg;YOn?B4@6$`kUsPQH6n^Qyu2n*Gz(IcVkY#5fHH1qEVOP}i_1tM)Y<vm)1(
zc<?4}iIdPnqDC<c1%50Akch{T_YywChLU1Na4j?W(ic;W3YIfe%IGEr)iP-OUY77l
zM(5Cy^_n2!xquNPAt8wRz!u5FO${H6UMiR8+$o*X2Eh2DE?qEVQ-ofS%G7~YIR~Xy
zG9x!h$v5O+;UJ6049+3lu#IaQv=`704;n#G7Z1^1iTR?eXcGs`i;^>I0%@A@@D;Tv
z6F0{C=}c+OTgDp3iJAw&B&mQwSoONKkGHq~2EwhmWR`tcd}}1S3fGR}BK6vC8l`q4
M<QIw%ww(X~JG<51kN^Mx

diff --git a/layout/html/tests/table/images/ex43.gif b/layout/html/tests/table/images/ex43.gif
deleted file mode 100644
index aa1afcb13b677c6017a5a133112f3da354b3f827..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1476
zcmV;#1v~mjNk%w1Vfp|<0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0Qvwz06+u&IJ(^aFv>}*4Z`ZpyZ>M)jt~H7!U+kPgR$fQw8|{mO9};e*8+qA
z0T6%?2t`nD5lF_K9+M~#gj%myD{Vm#@SH+01(|(F%jmRvt<X7^4LCy{b1SzC)q@&a
z()U#oDR>o4GG0OwRAd}gb~PqMfq)!*Y-fTjnuvK3FECS^1D~9GqF5M3scED%mTYL4
zu(PzawzIM&TaUGxal0^Jz6zgBnnlBh11w^r%sDWn&eFHlB#f`NjHNgN+fLtc;DkMo
zmKZsDOjYP@f7Z4<lM%dc41>h)cY>2$8~Ch_G}8qyO)f#|7%-aC<6s9rgzf=Dp^sRR
zBTO_b8c6=IU>S!RIeHvfP!6bvYd|)@Lu7@kZ7r>I1C%6%NO~1XY^<PiSwd)Wkoa3>
zCgo2F3s(|q2WbREMO%8Ni-@q2zzUnZ&7ey1gVYJxx_W4p_2h`MWp64H8{+GzDoIJ^
zbjp>j-AX`i>^iDuP}V#&hL~vK_tdDC84&+Um#537nhAkqReN_0m6#8-f}O-^XoxTO
zf&gq_DegZuhCGd~9Ab4<dR)DQ;>1ES$0hX~xTdgb)n?Na<fLY8!L7RpeCN!I616Vw
z<nHQv!u*@E8R^7>LtlB+EE6ZWA2y$WZMlW;VY~!kY8AU2<JsYt$o>!Qu_t8zei(kC
zKmM-m^aWT=ZorXe-3anr;9XG+yl@~`)V(F!4$laP6@<;0)D&oQa3xqIAV#7VhuYDQ
zTUfM3NJ2#^9=O{TJ6(Xmc69uKo-$>SsF8|cye7g^=Rx-(Sb&WpQj8k}a-(PV_<)^G
zc~KzE7GXi+M3ilfha6^D2I<@hIPh1<Rahk?<^)e#^q&X|TIlA5Z<+yMoOITig?x7A
zsb>@bPN)ErBhB?=ntQ@CWRZ+%V`3oP?DFTLh*Dvqa)}-`2V_mO#KWb9!Z^f0X0@rt
zrX5jv0;wx>^PY)%09xszovuNR3&D|A;S>={Y93IrK3Hdh^!SA4OPF3U6N5E){%|OM
zWbRRfpmh!rq$2aQXlz|f`iUmAARx&Tp>cjXEpndhDqe?r-6JHoYR+&GwFL%8&YbkY
zhhDtG(uFQ^d*K8wF-4xa4!#qx>!!VYEyy08*X`TUaZ<8-BOnC7@$bR(=1ZD+CR}N*
z20-qh4vz?ZiKD>qS|^;Zthtre9I7SLtth12<k-ibA>tb<Wi^PifD9`YtDYC%74$lt
z=BFPC_C2;=r$-MhwF|Qnit?QqPpvg+l1x(NX0Sv};ns2HmNl<wESp0Tt|GlQthfpz
z8XcV#-3Dsbp_*9=j!Cq)XbYaLEXi?j$(K3+@nCnl{^kR&+B!8$-o$49<B^&T7%i5C
zO&V<>t!}aX3|57;bzz;hjc?G~tS(4i!Q7;QQ6p718cY$(ucF<c%vm}db6tvm@Iw&d
zKH$2H5P!!6k8ogAj>Qpt7$S(2ah~LD!HHh5mc`)=`5uICTrn5w`Y5zS88|kO;De{R
z5FVxtmIwQq*YG6`2xDhR=A&qIy!px_-1r(WK&JqR2O*k>3&2Ca`r&8?3>02+kf0uC
z?5AzIi3|`hs1RQj(126W9@)C`uLI%kM-5C?r<!&v1hH^&SHsw6PB_9EULu7y%%NSx
zro$e}C1aw3$BY(Ni0}CjYdnD&TWrSxCLR%llMBrfiC7#eKJktN#p74`Zb61@JP&R?
zdPVT;myauff=Q)epcldf7aET6b6U(DY9fQE(Wrus5Ub7I9A<}X5hfviyds3m^&DHE
zX9*Y>0_^y;zYMU1Rfx)<0|kkKf#@xKXvkI_qXI^vEDwL=fMh;alDtvgBL|f9z|9Ks
e0w&OG8e(WAtunGZUpNgK;4us?Ng09!0029VJD^+u

diff --git a/layout/html/tests/table/images/ex44.gif b/layout/html/tests/table/images/ex44.gif
deleted file mode 100644
index 27b81934ec0c6cd8261c21ab33f198e4238d604a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 467
zcmV;^0WAJUNk%w1VPya;0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0A&Cy06+u&IJ(@<L4-#YnKkRpI~9Tg4B<193b>qPIh+CExU6U2_~Yh$6##%;
zZ%FJ3fEc2xNUSLV5tgvBWcHjN=y5SshGMc=P%?;>juC+jbYXzVWy0G^uiNkU2m!hH
z0pv+|f`f!MTN!U}1agUi42usxjuv4Mi6CQ%8i#mTGlifYL6Z$mRZ=u5jB|@{p&Kp%
zq+A$j6LYpLu^_c+ufM>-I6r8@h(O56%FE2n%3UeW($msAkjB^**F#m=o;|W8K?B=}
z(7@jg;YT6m4C999zv&e4cHP+Y!fhFjv)OcFX!rpT*acZ?>NPlpA)$x`mB>gb*hh}L
zQVUb1(1@9D;~$C^FhH3lBV3CWTr`#`5e`ZmkT7G)oJq502X;1p#c=t9A51mWf(rE~
zw5T*W6#M|W#I&i?r>^=zol5mhvRWT=hT0QBYcP3UZFUr<Z<rc{QK^6pRkqLBTyCP3
zaS3ZJsJ1A?&7EcM!=+Y@C|un8;9{CYndW5Z3qi|74r7D0mBdMiEi-mEQk={S^S#W3
J@NP%|06UJH%>V!Z

diff --git a/layout/html/tests/table/images/ex5.gif b/layout/html/tests/table/images/ex5.gif
deleted file mode 100644
index b6a137509c40601d26ed847a70a3e465ddcec0da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmZ?wbhEHblw{y#IK%(~2M!!)XlVHV|G$HS16Tk=DE?$&WME)q&;fBkY8{wEEu4(x
z4xIE<kN&vQtog^B37W~Fo%h584&9m+r0m7Oo<D!Gb!m-YOCPsKG%wTYp0_StQ}d?C
n<yRV=OWXBaS0JQBQE~kZMwX4cgql9Gy;xOy=kcyd3=Gx)D)=$E

diff --git a/layout/html/tests/table/images/ex51.gif b/layout/html/tests/table/images/ex51.gif
deleted file mode 100644
index 04aecd1568c193578e1f1082e81f91c0895bf34d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1072
zcmV-01kd|NNk%w1Vf_F&0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0Q~?s06+u&IJ(^aFv>}*y|@t}vj1QxI$UX<=sB)zI}m^?&$I^vL_Gmr$HW+*
zE+XI!7sWv!z~GRC3a2F*d>DVN0DyTMP#fQ$&kG$~y9(_VeHMeuNVs_%PW#~XIRqe=
zXvY`<IUZ6IgC-G!XmNlv0RmipjU<sniiwMvnjvS8JdFedl@5KIrcF|Xs0)HoK3qbD
zu|A>;m#4T<xx2i*z8C_xzr!mx!WFH=xiF*3&MY^RI(b@@TTICdYeXp~%@akXGHnVQ
zPY=O~9fD9deD7D)q|)RVp_|(dwPKIo*^7Ln%}Dp)pQ{J^9Q2D)X$h-l3GFm9=m(y~
zix>kw%k=(dqsNaR39V730LV8b=17G+;*A@JeS%VwSr>{)5t=YJKw8POr_Y}=uH^$t
zwCJvmMn9?<O2HG3q%x2~1-bO(1gjTbjyeW`D?o8B9uZ_E5DC@>p2~Km;MGD^O<EwH
zRoGUC#xD2J9;+8oLOlt6$<SR94s45hb!<Xu^LNNymU8O-&7)-T7%o00<)LiGaK*WY
zrO9g|gd$Tg-AaItQ<nv2nI+ea8tW#u7gj=;j*bFkQsb+qk!6TWvH=v%+BT^<a!*`w
zbZS?4He;hTi5pWz@X5}-dyT|^qI*H^9d7v%w8#5_o%}p7B|8;D5=(Z;PAUE9kDndi
zz5a&&wgl$NC;nBC8w9HK*2paFsYhLb5aQz5a}ic(;e}mrAQgrjPPJQyAVT$9h$OB=
zUWw4WlNt){JceRP*1Z_QQXdqtT7);r*oBHUW>|rEM{LK7Ll6*&hFU-p@eVFFK7~Y*
z4w_O#j3e;C3>G997f5j2C{ziB7QAy~Xe2;+kSQ)s6B$CnO!oqnQR2p*2*xb(2n-rx
z$-qJjX{nr$LvVnDDufEk9+>bgF;q8^Kp_^Mqqte5m;h;3#u9NgXj_phmXHAqaDqS?
zU&p*QhLc`k)5AGv1qWydprVoK8*Iv1TPA7Nke6|d%u1_1iul?d9&qexoTLSD_&Jaq
z)a1k7Z(?-{%&U&k1Ii$?MK;Dgm83*$tJsi&tOlWKCs48GQ1l?KBeuX9N#<xKS`K&4
z7oax2wW>rj<KC+Ya;gYhCO-Xo@SB?j|Cl7A5ePhmNb0Uqj&o)b)^3#>oaI@<Q;5fK
zSLM#+BLx+wIOY*XdYK85AK=-k2`!=;qRcu@^YY6m+UQ!%JO_0Pp~`C7^U$Kg(ML=t
zaXfUy7|zPn$JDM%^wbIq7(>cw)U-#=f-u2VFsdRU3Kg-`A_y&!ymE4PI#d1RnW$k&
q5`!hZJqIFg>uAzRW5qYO-Rt6aS>7^!{4wE(gVQe3i8t;+0suSublkN7

diff --git a/layout/html/tests/table/images/ex52.gif b/layout/html/tests/table/images/ex52.gif
deleted file mode 100644
index 207568a2ca86a199eea5e05f0fd36aef725b115a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1039
zcmV+q1n~PuNk%w1VV?j|0KxzO0002Mz`%fjfdBvhKtMnM0000000000A^8LW00031
zEC2ui0G|L+06+u&IJ(^a0=(Hspg3zSaBKmwjby1vgP=Y^HxO$hT&Zi`7z)v%(+@hF
za0mj>h{)t1U{oTR7N>L)YO(;)>9l&B0BqVY@gp9R9p@#?@m-|LqjWoSe#1RFJK?7g
z@Hb#(fpI1QU1Eb9Ya2`ejw+Cml9QB`mY0xmn46rPla7vuccY}GrY0y6qCgZe6Oczi
zuzf}<BDP(#DYbqIAuui>nWv^f#K*`R5{7eV7tJ&w3V+GQ4Q(yH3sKq0-rwM3o{<Eg
zf8~zA<E}XCe&!YC?&0+HaLo+DGuGgKGmCgyWC^Fr&mlYbrl~Ll@C836tM*(GRgML)
z7c;g!G+6#5kwga&AADp`5hO=6{227I$I?{8mQuJtSp}0GyHPi5>SR?T5l;v{rLplv
z?WZdgLa(`Tv4ZJ>lr3|T@CgoT4KzDdexdp^B|5IfTG_DHXkgZ}Xw#})o8;FEvuxFf
z*h7<86;OEd>c#sK4Z6L6^}@9nxNthK?+gbX%%N!7zAM%C&1WTUi53~{VHS0gK|;$T
zK8F*%tH^`Oq>)9ob9!vuQ_U)$IFvAU2e75;NI<MZwzo6B5#q**v)zs1V~$$|&3sGh
z=4e$BX`#5f_3MJW+{Mnl``*mZhl~tQzI;uoo>>edu{;d&=zTG(*t$@qPk)h4^idZh
z&;Ho`lIYh5Q()`?o?3>uLBU44n3UOin+@1Ogb>!((-IbTvjk>pp{Id{^~~qNAdbO=
z6juu!VMBzY<&Z)yOC=apeLiKu&q}X_^~!(OL}Q{ttHfYoK197&22}omM9Yjs(FBYz
zXh2e8ZV{ko%LKqMX5N-ucIoApVETYXdF4#WTopf*nIlYSYNVxIe|h%^1ak7VW<GIt
zmq-M4zRAd8cOoNDC>WG=U^s*Nri__2mBa?4^*9>lq&rf&RtruV3Egwm>`4u$=CRgK
zO2SzRgr=mBRw@WTIKomERdQfOd%4XjLmrdKf$EVqh<eRfyJ}$@t4Gn+E3LJ9*M?gi
zkm7`^X}?wwOdB?gw?Iff6ooBG)G(n@3fpvxLPOhfJCR7#Si8iygRELYu<sgY0=$IG
zYYnKx-Lb2t^w#_Cjgy(mW@iGMs%XLBcw5Mv2>(W?5Zl!$v2|KTJn_Yg1sYzW(E!@;
zTIe+U@yH~XZ1Tx%nMqZ^3m&5}T7Lc%B`U<Q9G5g591N9*KV+su&oo#O+0SkSO@okN
z<PjGzvdLFvgI57{+JIA2Eud6MM!nRSm-eupQk7B>OwiYkEuhvqbR%Qd*|^X|Qd}a7
J@&X9}06UEU<+%U=

diff --git a/layout/html/tests/table/images/ex53.gif b/layout/html/tests/table/images/ex53.gif
deleted file mode 100644
index faf62cdf39c49cc4d061e3393b9e45e9b2d01ea4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1603
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
B@^SzG

diff --git a/layout/html/tests/table/images/ex54.gif b/layout/html/tests/table/images/ex54.gif
deleted file mode 100644
index 4f165bd4fefb321bd0b43cc792def8281fc3c390..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/excite.gif b/layout/html/tests/table/images/excite.gif
deleted file mode 100644
index 4e4cc85040e73c0e70b46103732db631646c2b29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhChNk%w1VK@L80JHx9|Ns9G5D+;zIa*p;jEsz>rKP>Sy~f7I@8{?LwYC40
zl>c*c|3X6lAtC<=2mk;8EC2ui05|{{06+x)5Xea@NXY8VJ8g}Id1N^ePnrg7HVr8;
z1uK9Q_yM4)Aqh1JP4!?6Ovt3N(r{gx69jaLEDQvLfeugz$Px<S(MGspeG&s<ogoY#
z1oZ7XAUGum#3BDvje!Cbd3SgkdW3m<Bnt@@42@9>gj5~~4v+u~4lW3o01aW3q67ta
z4yPG)9tA3B1_Lyc76vLfDS;BK0|+R%Fez8HJFNh)DgrXU0SCXO0B-_7GByV&0YJ_N
zM8^_54`{!@0JJO7-?9`30$UO=0iy617K|0>@f`^af>RO-3-=@vcw+Fc-=+x*^Z{IS
zDGCQq3q3#tpa2ya5_8z4fv0X-0|)<m46Iv~MN6L|Cc>>iqwB?k4C=N$7!%Hi%p(Zi
z+-jquj0y^@fCO*>1SPXFKD?nR`d~s)FGT~figBPS8VNDsxJ+S1n9`FobttQPz`zy+
wDjyU;dxb^;a%j{I39zeMk#AT944Ed9$TAPw9tdzjZd$~92Ld=dTp<DgJ5^7jX#fBK

diff --git a/layout/html/tests/table/images/fall_167x105.jpg b/layout/html/tests/table/images/fall_167x105.jpg
deleted file mode 100644
index 4c87c802aa80c38f5f5fffaef31b907637c97d02..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/g_back.gif b/layout/html/tests/table/images/g_back.gif
deleted file mode 100644
index a633527b3e0189bc03c3e726f352b999885aad36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99
zcmZ?wbhEHbWME}vn8?8J|NsBHckeQQf#OdV77>R33_4&QP@aLwq@{o5>9_og=WMyv
zz4_jr-~4TlJf^9sv%EUB?H%{=Pd?Yb^*;Y~?)yJ}9<KHyi#~SvXiY!H#9$2o-V`Z2

diff --git a/layout/html/tests/table/images/go.gif b/layout/html/tests/table/images/go.gif
deleted file mode 100644
index b13d9eb5559109690fd38c94f967d2942db2af84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmV;T0A2q_Nk%w1VHp4t0HXf@|NsBY%*>gYnPz5YN=ixq006+izyJUMA^8LW000I6
zEC2ui02u%h000ALXhzlk@DXK7066QdM_Csqa>2l4L8`8-YBpFaw{H=%&Yae_YNbCJ
z53mXrjU|SS=mRzaKjW}SjjpCtsKx41_Iz6>3#*%v%QP<&Jr*bhfPs8Yug~3{N`S!c
Q`~QA<3Q7@$5()_bJ3|#eivR!s

diff --git a/layout/html/tests/table/images/go_earthlink.gif b/layout/html/tests/table/images/go_earthlink.gif
deleted file mode 100644
index b13d9eb5559109690fd38c94f967d2942db2af84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmV;T0A2q_Nk%w1VHp4t0HXf@|NsBY%*>gYnPz5YN=ixq006+izyJUMA^8LW000I6
zEC2ui02u%h000ALXhzlk@DXK7066QdM_Csqa>2l4L8`8-YBpFaw{H=%&Yae_YNbCJ
z53mXrjU|SS=mRzaKjW}SjjpCtsKx41_Iz6>3#*%v%QP<&Jr*bhfPs8Yug~3{N`S!c
Q`~QA<3Q7@$5()_bJ3|#eivR!s

diff --git a/layout/html/tests/table/images/google.gif b/layout/html/tests/table/images/google.gif
deleted file mode 100644
index 613e923b844ef6a2bb5933b1aadd259b3e457467..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmchWd0P^80DylS8lWT!DJrITq&96{kLkKl@rbmM%Z9ERI(;51TbFjv16_caX&#l>
z@@$?dcvlvtBAN$?2PIZIG$~ie48;z%zQo=y@c#3@!MlTee53aO8?XZYBLlz^fKdl9
z<O1YrU{nq)`+#{Xu&f5S^T4qOxQ+m)4v5VS1KTq$+fF53Dgf@2U`roxs>b@ZZ}8xl
ze^*Z0dx?HDv$ko-DX7SkaxEk>>nyW{S@4j-Dd)EjKzttI19?v2ZKUXy$TPgyl&<|p
z?!;fLI&rC}tX`B?R5vVB)$<>tC}T;vBRMs*Gm5wCY4h$e{giXV$MRmsG9|~dWsiF$
zvkS}GkGcz78M9)F!4+}&Q~XYea9AG2o=7ZTx?cahwo~3Bn(rT1PRbRX!*i0!>FJp{
z^@r6@pTA7Mc=>ke!`f%v+`=2>-|sc6+Oer=wMO$vryG$-v|m2fG}qm2tO9WW&;jH)
z1RsLm#oXn6*gHj-lHHwMEG>>pj?1me?UHw~Z?f-H-%)CmGKFkKyRxKSdiVa_hBO@g
z;m@g}6juN5*PrGn=4W&|?Uyef*Va~ay3ZQT^3>F`wKeUsdO<xA`+R`?x)r7BaZ<^1
zG>?(02iU*(CNJfqin}1|IR0rBX`tz3Np75MnD@A&s;QxTjSq$kz=KT0m3Zq%_ZwF=
zOJye^iB#y~oB0=V+0~!GyG5l^G2KvkOS|%6a$MRc?46hPYyMHs)^eYVhZOSX^5(kP
zOGlpd3#Y!{ri=^}pNL+_XU_Ag$1L<FoUu=%_VltD3xWsz^)(F`@B|C#_jYXec5dAl
z!ao?%@N4{N{x#Le;FtkmZS}bAznw`5nk@Tc;z38BKFA=LC0G-ZLn&GG!;-pM{*A)U
z%8E$<#$ezf1n>d)6M#GzNCJQcKo$%VuLnDiHxstCJ(Eg5Yqf8bN}W!(xVR_~2)@Sn
zzeCi*ApppL%UAQ)CjdeRct}D>V@X#!0=xO3sIj!0iLs*;hw#dJIe5>ba+ZpX+e9#{
zamMzAalP=BhNXUt9+vsmOd0Zs3RUEGTu3L|LVI&>T}Y<U!~hYN9@BoagBA;Ar5kN*
z^o?>;j%Eh?Una5ajK&$K+KYL3`>tYUQFy7p10~OIN6PFbb(9#%aSpqSiB5CPF66-u
z)hCTp*&G9--9ty`Y9s0*8W3vtd?!ii&NLHrT~jxCotXzYQIv+xE_8wJ;PC?o58R8~
zYifc_>moYQO7y+81))Wxo!N<o1TqWbm~fU+jFDydrEh|UmEYrEd{rO!#1s`x<q`|R
z@1t6E{-$Vd@y=VQjWNpz%j=i}`Wm-X{1n%<>X0kP7K5#&_qsHv!;QR_*_*p@ILelx
z9#ybi4$cc<SJ+4-L;8>v8PN5J<twH%y61rBWcz7~>m&E&0620XItLp>D9tdQ$Wre)
z3y*9<d5td4h-~$CKv)jku@V615~(kLBNjc$a_`Jgi!BUn8aMd)%BfKFmiW{mXA%4t
zs<Sw>DcFvMSM=HE10o4}3;`ztaWqV5O5~S?UNpW%C&3CZa1-wxgwzVBzU`iYete&F
zwDqF7y~rM#gdyn#+PFj4!_rP!c()N?gC#~6V!9x>9=aHVwPB-O2UI$LvBL<woou(u
zB!g|AX}CX3|KMSBD>LG~+)$4eoR`#}YEMmtl5x!eV0z!upl6$*7pD&DV9U0@iHK#|
z9Wm_*fLme|Len43yR$s_i463XHma10C1BhH2yYeWHn2D;a6a?U>xVtxG|Nuw`DNm4
z`-yp0F=CVL1RH=1r{^)v4qf&WKItV%2R#QD83yDV%_<0LV-@J(>+xnd-{#t6?6$q#
z<BPEh$e}XUS^Lma^%D(auUfz&+|kbA$qo`Lzxa|G(m2gcfZ8inbi>c%aDkBNxK3j<
z3?4;=(KwyCNa#r_#&|<<WouAU0uaEruD(h~+aEObJQw0qA?QL{eNwH=upIBL&Spt*
H7_jYM;OMpE

diff --git a/layout/html/tests/table/images/gray.gif b/layout/html/tests/table/images/gray.gif
deleted file mode 100644
index e4c96cf51e9b2a975069a74770f4a4f95a243c9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmZ?wbhEHbWMp7u*vtR|4Pe{=rW$~}hK2(N4m310{0EBvXZR1MfHaT=1Uf)LpiV{x
L1{S6dE)3QHU9uQ8

diff --git a/layout/html/tests/table/images/gray2.gif b/layout/html/tests/table/images/gray2.gif
deleted file mode 100644
index 11f9c55a5895a242b3b0fa6914aa5125c71799c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41
ocmZ?wbhEHbWMp7unE0RJ|NsBVsmTmrpaUX7;tWhoK8y_30N{@Z9RL6T

diff --git a/layout/html/tests/table/images/header-bolt.gif b/layout/html/tests/table/images/header-bolt.gif
deleted file mode 100644
index 841cc959b2be8e58bebb19ecac6ddf5f58294419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/header-getwinamp.gif b/layout/html/tests/table/images/header-getwinamp.gif
deleted file mode 100644
index 55dbd2ebcec7b95b1ff97d025bb18cebc378adf9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1773
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
PWBsdO2TNF%L;wIgj5j9b

diff --git a/layout/html/tests/table/images/header-highfidelity.gif b/layout/html/tests/table/images/header-highfidelity.gif
deleted file mode 100644
index 3421d44b08769a9ba773ede6764cdd0ed49f3fb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2023
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
F06Tyil0*Oi

diff --git a/layout/html/tests/table/images/header-logotext.gif b/layout/html/tests/table/images/header-logotext.gif
deleted file mode 100644
index 59c6459b02e8e04b0154a7967f6a6d7e20e0f938..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/home_beige_top.gif b/layout/html/tests/table/images/home_beige_top.gif
deleted file mode 100644
index a1436cbcb01a98a686fba8a9354515a00842bd3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 814
zcmV+}1JV3PNk%w1VORnf0HOc@|NsC0|IEzHnVFfHnVDv0W@ct)Gcz+YA^8LW00062
zEC2ui09XPT000C3c)HyFFv>}*y*TU5yZ>M)j$~<`XsR|v>%MR-&vb3yc&_h!@BhG{
za7Zi~kI1BQ$!x+1(5Q4uty-_xtai)odcWYXcuX#v&*-#z&2GEj@abSquiNkVynfH`
z`~QG}f`f#GhKGoWii?bmj*pO$l9P4<mY0~Bnwy-Ro}ZwhqNAjxrl+W>s;jK6uCK7M
zva__cwzs&sy1Tr+zQ4f1!o$SH#>dFX%FE2n&d<=G29{8m1P0id1_ad8m)F?do8a7-
z;o_R$=<4X_+Tohpnb(){_150i-|(FDmiGU`l@p+DAVGr!(M4Oxu%W|;v<w6|IPsr=
z0Qv%I{6--EfX9mSrUg(a@gpaZ7cq^z2(n~G0VO@+L+I~X$9f=bQtWo|<;;XPEq<&B
zW#YP^8zCxP%Csrdd`Knk3<xFLzE4FDnv;g`p0<fuEpFN-b>B2>QFCSs8&+nzY-n4K
zyO}ZUKc7zX>fOt?*SWM)VcPW94Q)TVQ4ROwxAk4NmWpvItU9=5&cQ*8MxJMLTVku!
z5EDguZDrrns8g#(<r1*nvuCY!G?`8`PTHG10u;Now7H@CbaJHk`ZCOIqroDTE%-Id
z%gU42BinVg_3PO8N_|aPt|ikvKTV@&8Ee9nUVp>XHkRyBf*1jZ#)$l$O^~uN#`hlb
zy!5;C;NX|tfCLr@&32^4#ou~nf%aB?IAIkRdtYfa9cZQLHc(dkML3^eY9S}!haCnK
zSwYZsBa=b~w&>!E!BphdCAfX3l1jjFk|T|v?8sv#GUDeWNHZ2GB#z$+StF1{Dv8@r
zO43Lqj8s-><&{`wspXbjcIoApV1_B?m}Hh|=9U1Yspgt&w&~`ZaK<U;oOIS{=bd=w
zspp=2_UY%JfCeh)poGGCrZ0sis_3GOHtOi3kVY!$q<bE^3#FK5s_CYjcIxS;i&~ls
ssHB!^>Zz!vs_LAg-m>beu*NFuthCzMYAv<qs_U-2_6q5(v?KrkJJXZ9NB{r;

diff --git a/layout/html/tests/table/images/horiz-tall.gif b/layout/html/tests/table/images/horiz-tall.gif
deleted file mode 100644
index dfa71b494af1dae8d7bdaf7fb9f387a1d333c70b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45
xcmZ?wbhEHbWMtrDn8?78mc7U|be5WN3IhX!4iGbd#2uK}=Cm~kcd;^90|3%Y2(JJD

diff --git a/layout/html/tests/table/images/howstuffworks.gif b/layout/html/tests/table/images/howstuffworks.gif
deleted file mode 100644
index f49037356bc59a4d4a7d00fd0cad8df759461038..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 905
zcmV;419tpJNk%w1VLJdI0L1?Q|Ns9O7#J}zF*!LoQc_Z5V`GGbgp7=gt*x!Sy}jPv
z-p<z6At@;c5D>=J-nG5PQgfU!T8t@Dgq*F$T63IZd!>w=y-H)0dyKX3@AsUXrG$ix
z#>UoKT4S7)oB#j-EC2ui06PF6000I5ARvxpX`X1Ro=WS!a4gUCoRM627<_N+2VgMh
zD;keTU*RT7cv6{+<3Z&pR#>dzDtbIk8IJgYDPt@a4ilB(D%RQU=%Fb|$D9WmeLg!<
z1`Qbq4IEh`av~gGB4K%AVtjiRWe+F?9|{N`2^l+K2morDC5Zq|BaRP{91|0hlzf&Z
zm<Amm2m}EE1DFd89t8}gTmW<<k9iYRuCL9K7>1=E3=AI!*P8_mm;}JYb6*au&E?N$
zl5hZ+gC85&xYi9H9}D1$bs4Lx%I5xi7$%g!qzTu61`GnM`w(b=2~(&RKw{>vVk`@A
z76DMOML_`q_7-e85bB<>P>?GBs(c0TPbv=w)TJ8G0YLyp08Du?HfH5NNwWZC5D)-i
zh7JizF<8*RRL){v!ti_G^B;x^7Dg!eP=JF0OdT{7;AkMBfe!=hA%g0`Q68%1EV$xR
zrb2}a5h6gCNo_#_T$uiLAkctm2RJ$rsA5T}?o|pDAV`LQH?Q6`9zQhL!~xp_ZrcDb
zH0i~`RlBHBKb|a^Lgfe&D2!m50NdFFw?Q`mz>PEl2NzmXsNfiNYY35%Tdt6b!Mvpi
z&jz>_x;F_^95iG&4neiutE`bn&MP6PPy|UuAyBYDgP{aT7pQ~y1jA(F_^*Ob?)t*(
zK}%%t1OhlUR{#n+J;6c$aLApepIzKp1{($dU_;;s84TbM98p-;$XavM0RRRU@HgCd
z6(GmpYY|+rl>r2NpaBCrG!Os>3G8xE0SGX_!2rC7ke~<(BsW=IcDbe(1eQr4kWdLt
z7XSli9Uy=JXTj8f01bHXR{={r72*gEOcoi0-BlnVd0CBs2?H@=nMsV>Trpi?8FD2g
zTR2b_9%O6gML`Eo0-%jHe;IJ)S@s0L<p8<dVhDC3YDMCo5=wA^KnoP3fB>Bc5DH-d
zBrxL@0vzB$0KzaZzzy`BV47=w!WO}%GNtf_3K^&+W)}sLpa5KGOyJTX$X-{>0y-SA
f!4N+{o5Zx#Dgj3h4cKO@tqi#)>+QEAga80L1W92(

diff --git a/layout/html/tests/table/images/icom-logo-micro.gif b/layout/html/tests/table/images/icom-logo-micro.gif
deleted file mode 100644
index 752d0c4aeeb8338c7cdcf29f3a833ea14baf1ef1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1828
zcmc&z`#02S7=OoPT$WjOD{_c#wyQ3$LMu(R2T4oY#=11+#Os!<q|2~1%vdGPYOU&9
z$mqC4<Tko(R)&)EI;&Gc_Y|VqwVhZ)diVLxKe6v`&v~Bbb9=sDkB#omE+Hw%8vTn9
z;~!;=V~j9{8AE(UDWe>tgi*{W;+q_09LG4qILtW2&l1WA#|U8rGlKY4Oc~}FCJbYS
z5g;){8R8fs3}J?#0BnE;ELetV#Pjfvqm)pJDMdUjR2)Y+LOD!1#H)ZN;V2=LU`h}#
z3T81!F`*b!j6fr-Qp8b2D8dv0E2suA5Dh9p7W9A^umKvdU>Wg-_!=JJILvW~_Xo64
z5yBD75yaaC70|?l!<fSe+=D2X<q+Wz<`CF}JU}LFLmc2AM1Vt34PYP|RKh6e0Aj!f
zXuv{za(o+Vc$g5x2MPXw7AlMhMvyDm1r^XF2onT3LedZb=z?(w8r(vZkO#<wZHNOj
zfnjh6ssRi{!zRcA9Y74&0FC$)@zc<T8Xkg+L6G1NXraQ0|2X(ub@%3*x)bs->#oAj
z>VoD|*Ja1A>f+#!pmWG0=|uB4(dpoUb<prRz?C38@B~!<*IUdJ^Zx=eWJq9W?O9cD
zQ(^e!!r;~_l_t$>j#sW{bz#eKOC0t1^{|229NP^k)(dLp-pRJ#S{QtxW}er|i<K?8
z3u^7#&#sE^&ArfZ^v`o1hmCE#>PqjP_spKXJ-*_?y%OK^UU@_NT8x$MDWdihn(&T`
zQcX(d!qM`cnuwcaYpzd!ccv<;v@LH_XL_f?t#fSZX{S=FKjfLOSAMbKmidj?%(>FH
z+10(bvTQf)f9ottZB8GIdTQP3AgwVFm)fiejE<<5Y_XX1I+GC9wNq$0YIUGCrY!H0
z)#BBsSCT4)zhlJ2h(}lT&aR}%&-N{QU$Hi8!cneq+UA#6F(uuqG?5lRt*By64NoHX
z{2m=@GWA`TKrUSSSeSKU#3Lfvz)vZ9?{s_IHnuNohtS2*&P?nctkyF#u<o`Hzxn5Y
z@`!0e$uog^W6@cOpR4+X@pAnX-?Zn4>d%@xJKJd@clH(JOIBEpY0M>tX*+~k?G&ZJ
z;L1U{Kw_P&`Dxjz)|?~*6QjlqkB`Io$6XJ9*dX*zbuSXmSRba39#zlI+8QKU@$^*J
z(e7EuE-)<rn0{)4QkIgckFwUaTRadfcOA`<;gryD-)|ij%tc~Htu#x5vNS;=S>LPO
z32g<zyS_UVkbi2fR46Gv*)~Pu9W1R~Up$c4eOf5W=noa|5codvQC(&Gzfr9HG$!43
ztYOHu{L{$btMa;r@Wu+o)rY}Fs=cRnZ#^$F9@-yu^2)4r0fQs<sBXsi-Jo>8=w`tO
zqm9oli(2gz>CV>S&1F?CJ>6w)sl?&hPY>>tnGdX(Hm%s_*kI(L%`xMbiaRQ+`s;*6
z^@aI|M<bQxv7J4QK_xck!o+|rKQ7HgzKywlpOSOtXOCz0$*+Cxe?TcPy-zHTZjRCB
zan#C0S}Ju*%-nA9a^BQ3+sXTHe4aEd3@m)%Hk2)^ttfxJ*KM8UzQWsDCx?5Xf)2Ur
zS6N%gR%zkYz7nVCuL|3Z_qdcv`f?ujt3{K;y-ACD{g)`~SG!(*;AX_S?S5G!+V&!;
zwAbRdBt27$0kvB1=J(xtiZ%5IeKKzhdM|wxmf9avyK#x9%X7KHL^Xhvalw;v*|iXD
zg+qb(Vn?T+wq>SO%I3W}ilN}@N`JAqdD%q7qDr&vG07R@dF0c>{?P%c&8*4z`<hjL
zv5}?;(*pwIE<L;*GMM;iY*Oat+Yu-3d+ei_W#1h#c)O?JqkJ&zh;*#v2%C8G_qlo6
zmx(jixvSIuvK*EhdKc(fv^I)X4=0;t6bRM38j^nqi?^f&BB$1yV%f05&O~MC;oNlH
zu6f~nZ<VosYt!^=!>P+MR3_n`8<cUces-oR@qt#&%<<tgiAkZEQJQD-Y^&u*1p@T-
Ef3C$j{Qv*}

diff --git a/layout/html/tests/table/images/icon-unsubscribe.gif b/layout/html/tests/table/images/icon-unsubscribe.gif
deleted file mode 100644
index 4dcb9cc952e43e9eaf6bce97e9260ce7e1e97394..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmZ?wbhEHb6lCCM*v!B%J6$r-TWk9C>G?USXU?4Y{Q2|kcFxmFBaMxX|DQ?w4+JwA
zkb&Y)7BE)_M1ss<U`Y(<ShQ+yOF&E8zG)9anXU`oFbF$oSa5LS7Dt==r;}J@7+4sb
z^~|O97}OljZPJjM*wHZI<(aoxfefaGcQkneR41-xPO7-1Caz=hY67Eab>+#wOvcW)
S|89BvGtbDpxusc<!5RS2DMHf#

diff --git a/layout/html/tests/table/images/iconchart.gif b/layout/html/tests/table/images/iconchart.gif
deleted file mode 100644
index e43ebab50351c5e1f1c11b28ed8b557361e169e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 98
zcmZ?wbhEHb6ky<DSoELaKM<T_xOeZ~)+r3gKnKJDsbOH&_t<rZi|LfdLuL!+Mc1dq
oc(7b=D{P!;cj(6w1BbRk-F&YF@BgghVO(I~!D7|d!@^(<04%T}9{>OV

diff --git a/layout/html/tests/table/images/join.gif b/layout/html/tests/table/images/join.gif
deleted file mode 100644
index 740f064580d2beab3905417b2fe93ee760f93f93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 996
zcmV<A0~`EDNk%w1VdwxE0L1?Q|NsC0%*_AH0RNep|7K?YGc*4H0L=gY%*@QpnVHOH
zX3PKpnas?YnVFepW|;s0W|^60W@csp05fK0Gcz+Y0000pGr+*W0000000000W&i*H
z000000000000000EC2ui0O$Z2000I5peBx@VV-EJu59bRaIBJaJtBCn?|kq7z@TtQ
z)YW9jq;knL*=)tAbV{xANX@Kv%Y2Hg;IKG6;+oIs)N{;kyM3j!e4ee1350@Ph3WSx
zfE5uDZ-qZ`bcu>Dc2fxo1Tub;lzoE@hK3p~0*juBBvJ!=NtLFPfS8$Vn=AsIpRs45
zM3E^E6@3y5EvJ5j000dXlZ2~bF0ZgJ!7R-#!O;Ln(+1Bc*CyF0+bv&02?Z+{6RHgs
z5-h$H00<GO!ju%ML6mNNJju#1-PF}d&$jh*_K%T<Afwbp7#0Bog#;8Hj5~Fp0ig!M
z2sM;PuLnLHAIF5up>H3wYSOg-O=~8wAhu{KrLkOz(&bERHC4L!=0jW`UJv>hkPsn(
zg#ZZRA*f)0Qqy!NBw%QeAOZk~Q{5rJkmApekvS%X^#hXZR<rm*mNZEar_Px)xw*9V
z(ydOMaa-bbdvoW(9tlqTG!T?)1q2ij<10sDL9RYbF-VlKYv=(Ch@)X9)Y!y=1!6s#
zElV16Y13y<WB$07t%|-k0~VAy8|F3HZ*9iq3)7$v6uKllHc;Ve1EvoW51NdD=~ELD
z4Y0%9Ab<e^h%q&k2%3_y9rjX-Kbsac*pI9^DSO4WEpFJgSH%8@n|BKMcn6-~xdV8m
zrdMq>)It$Vz?^fE5f+{Q1Xlqt!88N7qa6l7Rnif7WL0w7c;}gxo-6CMCs%GH)_2#4
z_TBZKZg$P*TTdnoRv2*-Mqt5o2v}f3E(oR*)MVK$bih^sOqXDHUI|eih8vQm1A3;d
zB_fLW;aAsvIo+01igm4c;tKrnFhElj5++noTRFhMaSJ&o6@t-0hk;e>I50>>n8^6Y
zg-@EdnumWjDc+Lel{6)mT6$?$Ougl|8;QK7ROOZ|gb5fgo?$8h1r-f~Km%nO@EN9%
zRbVPw5H!GMk$#-YClBF~=Vykf$?D{XE3hZau3K2@gDojY<p2)EV9JLtNimcZF~uBX
zMKXu-DlHPe{xCpk9w;mzTm^AXw2rFo_(8!!&Vu1Ww9}^hViXA^0IVdwm_ly3$f#>?
zuYXxFia0OC`^P-=wsG&kO;kGt0|;D;M;?0U0m#FHT=Htb^%88c3<guI@f#O+3`52n
Shb)H2Bv+cR$SAiF0suP`$g)%b

diff --git a/layout/html/tests/table/images/join_eln.gif b/layout/html/tests/table/images/join_eln.gif
deleted file mode 100644
index a8f90d20e7cb5c1f5aaea4ae20c0a04e61a4da70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/l_logo.gif b/layout/html/tests/table/images/l_logo.gif
deleted file mode 100644
index ca13b5abf39f2cad7cfcf2a38ba5688d40d37d61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5642
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
VGmFP!!Ybsxg?~aApkaW?{{fz{4k!Qs

diff --git a/layout/html/tests/table/images/latimes.gif b/layout/html/tests/table/images/latimes.gif
deleted file mode 100644
index 6b438fa63f8444ab3cb5a8d346f189bdd0a7ce1e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 598
zcmZ?wbhEHb3}N7BIP#z2|NsB*85r(8f4}wEy_Pw94Wp(k-Fi;IX^vO++U%CSicUQY
zhI5Kr)>=lbt(GukU|=|K-~f;$9w`1~VPs$sV9)_+0olpG`v1Yk9wkdX)v9H0Ud`Gd
zwf(cU{0RmI^_kxeEGY2Mk?Q4QZct?~X=#74BGEx+{f(T03*HPYT#1tnvZS`WFu7Qz
z#K6|&yf{!o^O!Qz5<9I8q8v3E92|*db@tl49GZ1as_ac1{*IbfEWFm%Oq{;6*qE5|
zn5-Ds=34u+%wyo>USXZ0?KP`pX}m@JQf7{MInK$P0xUefOk3EF#0yvp%v)m3nJ2)p
zm?xg4YLl|nqSY&yS2M80F`S#dG~Gedmxr6HE}7$*a-4uw`e%m3<hNXLOfxt&5?;7i
z+IjA431o8QoL=<j*jnp}oDPgp^CUC^w@;k8JM+V=+)pMxm!-XzRb74{eelBLroi{N
z1Q}lhG&aeyrs%z3KXB?8>*ocI8-D8Xh{l(d9GkL(AzpaCCjSGS2@FA<eVS8wWSBFK
zZ>_av+_CxjGSNLLY_DWW1RNZ<vvGB-l`+*ivow6=rchQRw&cy$^Y<CV1SGIuS-5@L
zOp(<J4h-y~rivQsKW8zB7)c)UO;8AITE)Ie&@16-g9%#*^F+6gH($J}zZq~?t?h!N
zd?t&8ZpH$0pI22phkWWTDKM&PnqAR|pSQHNqe*Gr{Q$<!U!4XgHtye?mtH0D_SS0m
J{enyk)&T9G(f$Ac

diff --git a/layout/html/tests/table/images/left_menu_bottom2.gif b/layout/html/tests/table/images/left_menu_bottom2.gif
deleted file mode 100644
index fdf239fde53866a2851e4c45891d52429d5e0e95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 240
zcmZ?wbhEHb%wynZIKsfd#KgqG!NJGJCnhE)EiJ8}prEX*tf8S{XJ_Z^?Cj>|=I!kr
z5D*X%5fK*`my(i_mX`Ma|9=MJ08pjkPZmZ726+Y@kPeWY46L~dDt#%L^D<Vg%XvNN
ztoHem+{q``zOSkMa$rHg5)PjJ6OzpzJgw%dvu@^G%O~CM_DJAIg*#u%L2td;=U;58
zI-9rq{vy|hzUyzluP{k5Jn{Q~LmgjnV{2P`8b?QWPknOlgo(LKlcr8fWtcu|k|KjO
E0LtJ@tN;K2

diff --git a/layout/html/tests/table/images/leftbit.jpg b/layout/html/tests/table/images/leftbit.jpg
deleted file mode 100644
index 843d7244ca1d47410bac21f2391c7898ecd05a4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1053
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=Lg_Vt!g^i7sjh&s1gG+#mi<6T}gpZ#`
zKwLyZLR>^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsJ7}2qQZ?I~NC+Fc+7w
zhLo6;2Fc+6AqGJXhFAt6W=16jCP7AKLB{__7^D~&n3#c%MFLEW%&hEeKsj-sFHofz
zm>609-(uilW@KOzU>0CtV7xcqVbAvo*({O454{;YC%Q7dk||;g3fK_1ZqKvX^QIIR
z0L@VnU|?ioWno6LgOQ0vKv2<;nN>(kRM`n=BnQwUMph=@d7LYDy9ho`WYJW6Htmth
znt({f&w<;tbvTQb@@O1i+*fzfnms*ubC&G<0FVm>85xj`1==7eWB@h}=qY=~Q(^T$
zRg!{0MX1Uc1%-qm>X<<4)~xU2xpp3?R0Zf%Mm9Di#f*Z$01{F#5l}P?oH$8DsSxT|
zHhU(28MVtoHxIDC)XnE!E1kTxs_0ho()<P0S6_OyWTsXtteP2|_P%Uu>&fhhm}wBh
znV5i~ixd)!z(5FeOq_U8ps;b_!4Dr{Az`oR8m6-4Wc+T0n^!lsa!+*parlyKZc5vV
zvNvKjM`I`dO{+?nn=rRyYlq8x3Du11_Alxhm-QNN+dchfA$CMzUPSV4)1I5U>mF_U
zsjBsOwQ8=+FOjtC+F8fVntA?q-n8{ee~`$Z{;iJf<d<dpftG?}6dXnZ_1vHRtv;VQ
z+zfQFgdj!|5M)$Pga@#|jG1>Urq}~jiUY$KB^5C+C?pDk6@o%oU}O4`exNcX0bt5u
zWI;-Dj10gaa12Z=T-Z4A;=>Q{01&8(a1-F-_GPS<ahS9%uZ`&w!_nA;2h9wO3;!rA
z;M#U`ZbIzp?SiFxJ=v1sJX>!3NMu+k7Q6SoSiXHx(5ya@<VPZ`mR&FVPu#ov&vTMf
z<oy*#7e-mPx?X*>pjFn~!6E3)`Lz#jPi}vsW;A8jCcSmc4Qm_wS3W717F~DV)`3B5
zV{28HS<tsX&5i>0?2(&WSL;;OeAd48NzlR6h($DR!5oJLvl^osE_9s~S=D_{gj>(t
kpgC_#apk@8e~a6;yq?A<^?KFg+^_E#*!q85tN(u!0L&UUS^xk5

diff --git a/layout/html/tests/table/images/lime.gif b/layout/html/tests/table/images/lime.gif
deleted file mode 100644
index 489bfc3db4807b5195ab8483d06f5da831e6981a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 80
zcmZ?wbhEHb)L_tH=wM)A_|I_QzyZadEQ|~cj0`$J0id`Bg9DR#OaIE#Z}}I`*>bCU
k^SwR4`P&|OOncV3?A57l@3@bD^11%4_xZ1L%B&3503?|qCIA2c

diff --git a/layout/html/tests/table/images/ll-tall.gif b/layout/html/tests/table/images/ll-tall.gif
deleted file mode 100644
index 7510e94de18633b469ef21a3437040eda814e53e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 60
zcmZ?wbhEHbWML3tn8?78mc7U|be5WN3IhX!4iGbd#2uJKMFiRoFMfD#HoMV9rA52_
Mm^qW&%vc$$0h>Y&tN;K2

diff --git a/layout/html/tests/table/images/logo.gif b/layout/html/tests/table/images/logo.gif
deleted file mode 100644
index edc6eb46af6d69e085b3f67f4fb8769e0ee24612..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1095
zcmV-N1i1T0Nk%w1VSWHr0L1?Q|NsC0|IGi)ng5wH|Cs>H%>T^H%*>gY%$YOHnE=dY
zGt6cHnVHO)nVFepnVDuYnPvc)Gc#sp%w}epW@ct)W;13pGcz-pGc#s0Gcz*)W&ks0
z005c5z`y_i00000A^8LW0012TEC2ui0Db^f000I5U?+}bX`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE<nN%VR-kHW!Z!atgF0oLFqaLha%-*R0s7kb2KB%Xp3DqArt$<bw7-
z#t%ydlTnV{BNGe&goOrmQ+HVrDG^u;7$O&gg#`?PgbavAYL6`mTapHq6OkhqgquVf
zSr0Ljg$#5jsj5O@O|CGM00Iapr~tM>icc^Tg#iP(D9DGyKCD<T7^46M6j>;Q6VN`z
z1b{5a01hIZO^hYv-aXPy3NZ{DB)9}71pwXcI~7=FC&+0^fi4^gO8j`>T9BeaApp-%
z;7V|cTS6Tf+N8+$aMlS&PBe%Z74hN?kWEzoa4h8UghqrWbKuf-f)}BZCl-?17xRY3
z6V|L1X!+5}fJ{AcWOQPR#08E#TP$q?F)0p|_eul<K(qxGoK|NPV@QG=SQl8-g{{E^
z9tnp42F_?pfacm63Y=6JK}jxNCuHx=b)v5C4S#M0&j>@Y1Er`mPzF{E;|kfwIS><w
zM>&Rq%NBD;?i@oGW*x;ilin3t2VDrOVZc4mV`gj@<OF2h@$<HdV7dv2#E7M-?`;4A
zI1zWF;Bgh!Y@-JJ90jEd;CMT+TV0aHg3M_Y1lWCK+!0u~)1bS%yyIFTzzwf4wXS;+
z7znkjuio>t`yG&E0(<kxP#<gn>SqG~23pi$k8#}%a#jcI^~VA@79N)mWF%w}-U<b^
z=N^0~G~nS2A%6H=e!`f*0bI)UrUE$j0VqOi7+_M!1PEjSNeUUTSEG&ZL1c{~JPBEs
z1@mcOL0&!*dC)@;NdRF7G_ui(lqOu@<qBA7xg3`^D2WG|IAHLAJx(O>K!Ir9pg|vb
zWB_NJc;>0+o_zM{=bwNE`e#=c8DQw42KY6@1c#n-D4`cTN&<^5vcQ0$9CpwE1B&`U
z<xMw8P)J1zcFB@cJGNj=rV@-Ygdq~hk*RE>dRMAer<Rqd3x;_Si<d23dd($`I%X)R
zsW7mTp&e``Y+R;n)e;5;7)l4kqlPw+PXP^#uxhi268giZl^*%2c~k~??p9P5U@KRs
zDoD<!16d;rDMyei!n~K*gf2v!cEIS4nm7xKg3`tdFE0~BT5C{-hzrE8Ulth=FCtKa
z)4Zg@n{dJ%Ut252>QZ^-t2Z^EayRqRQO(1INKgXF&7QhdB+hPHO2Q;_T=J0yNIWjR
zH<DY6HQkm~Yt0H$N(Z|vCG0cF_Rb5h5#(NM2-Pvqy!6L5lk4TFaJA_3x9lb@=-O<z
N?e^Pn$8A*z06X)4)sz4L

diff --git a/layout/html/tests/table/images/logo2.gif b/layout/html/tests/table/images/logo2.gif
deleted file mode 100644
index 687d44e16d2a6f58e13acca78892eadd80560c87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
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
H5b*gw<RX#)

diff --git a/layout/html/tests/table/images/logosummer.gif b/layout/html/tests/table/images/logosummer.gif
deleted file mode 100644
index 23786838663fabf3dbfeae85e555315b1ea99b0c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4880
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
a346G_DG5x2VZR?HwT`Uu(Et_;nExLGJu3PD

diff --git a/layout/html/tests/table/images/lr-tall.gif b/layout/html/tests/table/images/lr-tall.gif
deleted file mode 100644
index 2e447c498946b8f75e00055beb655550e7bd02b7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59
zcmZ?wbhEHbWML3tn8?78mc7U|be5WN3IhX!4iGbd#2uJKcof<WFD`27et+_s)?JV8
L|A|Ur3=Gx)oXrqq

diff --git a/layout/html/tests/table/images/main-horizontal-scroll.gif b/layout/html/tests/table/images/main-horizontal-scroll.gif
deleted file mode 100644
index 58d195558ff8..000000000000
--- a/layout/html/tests/table/images/main-horizontal-scroll.gif
+++ /dev/null
@@ -1,86 +0,0 @@
-
-<html>
-<head>
-<title>NBCi 404 Error</title>
-<META NAME="resource-type" CONTENT=document>
-<META NAME="description" CONTENT="">
-<META NAME="keywords" CONTENT="">
-<META NAME=distribution CONTENT=global>
-</head>
-<body bgcolor="#FFFFFF" link="#0000FF" vlink="#666666" text="#333333" $BODYTAG>
-<link href="http://a1356.g.ak.nbci.com/f/1356/814/24h/images.nbci.com/main/css/nbciStyle.css" rel=stylesheet type="text/css">
-<table bgcolor="#FFFFFF" width="100%" cellpadding=0 cellspacing=0 border=0><tr><td width="2%"><a href="http://edition.nbci.com/main/door/0,1,-0,00.html?st.sn.com.t.fd"><img src="http://images.nbci.com/main/images/tabs/hd/logo.gif"  width=132 height=35 alt=NBCi border=0></a></td><td width="90%" align=center valign=bottom nowrap><a href="http://edition.nbci.com/main/door/0,1,-0,00.html?st.sn.srh.t.fd"><img src="http://images.nbci.com/main/images/tabs/hd/home.gif" width=100 height=24 border=0 alt="Search, news, dynamic content, personal finance, personalized features and more."></a><a href="http://edition.nbci.com/dir/0,-668,00.html?st.sn.srh.t.sf"><img src="http://images.nbci.com/main/images/tabs/hd/find2.gif" width=100 height=24 border=0 alt="Search the Web, browse the NBCi directory or submit a site."></a><a href="http://shopping.nbci.com"><img src="http://images.nbci.com/main/images/tabs/hd/shop.gif" width=100 height=24 border=0 alt="Research products, get reviews and compare prices."></a><a href="http://edition.nbci.com/main/channel/0,2,-et,00.html?st.sn.srh.ent"><img src="http://images.nbci.com/main/images/tabs/hd/ent.gif" width=100 height=24 border=0 alt="Music, movies, celebrities, games, NBC TV and more."></a><a href="http://edition.nbci.com/main/channel/0,2,-cc,00.html?st.sn.srh.t.cm"><img src="http://images.nbci.com/main/images/tabs/hd/comm.gif" width=100 height=24 border=0 alt="Clubs, chat, cards, e-mail, your own Web site and more."></a><a href="http://edition.nbci.com/LMOID/mysnap/mysnap/0,160,-0,00.html?st.sn.srh.t.my"><img src="http://images.nbci.com/main/images/tabs/hd/myn.gif" width=100 height=24 border=0 alt="Your personalized page, local news and events, your files, your Web site and more."></a></td><td width="2%">&nbsp;</td></tr></table>
-<table bgcolor="#003366" width="100%" cellpadding=0 cellspacing=0 border=0><tr><td height=3 colspan=11><spacer type=block height=1 width=1></td></tr><tr align=center valign=middle><td width="2%">&nbsp;</td><td width="15%" nowrap><a href="http://listen.nbci.com/listenhome.jsp?st.sn.srh.t.mm"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Music & MP3</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/LMOID/resource/0,566,-1098,00.html?st.sn.srh.t.au"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Audio</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/LMOID/resource/0,566,-1099,00.html?st.sn.srh.t.vd"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Video</b></font></a></td><td width="9%"><a href="http://wwwx.nbci.com/images?st.sn.srh.t.im"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Images</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/LMOID/resource/0,566,-8,00.html?st.sn.srh.t.gm"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Games</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/download/init/0,19,-0,00.html?st.sn.srh.t.so"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Software</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/LMOID/resource/0,566,-564,00.html?st.sn.srh.t.pr"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Products</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/search/people/results/0,57,-0,00.html?st.sn.srh.t.pl"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>People</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/search/business/results/1,60,-0,00.html?st.sn.srh.t.bs"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Businesses</b></font></a></td><td width="9%"><a href="http://edition.nbci.com/search/map/form/0,161,-0,00.html?st.sn.srh.t.mp"><font face="Arial,Helvetica" color="#FFFFFF" size=-1><b>Maps</b></font></a></td></tr>
-<tr><td height=3 colspan=11><spacer type=block height=3 width=1></td></tr></table>
-
-
-<!-- START ACCIPTITER AD -->
-
-<table width="100%" cellpadding=0 cellspacing=10 border=0><tr><td align=center><font size="-2" face="arial,helvetica">
-	
-	<iframe src="http://ad.doubleclick.net/adi/l.gen.nbci/error_othr;u=~1~;sz=468x60;ord=09855554231282?" name="frame1" width="472" height="74" frameborder=0 border=0 MARGINWIDTH=0 MARGINHEIGHT=0 SCROLLING="no" ALIGN="middle">
-<SCRIPT language="JavaScript1.1" SRC="http://ad.doubleclick.net/adj/l.gen.nbci/error_othr;abr=!ie;u=~1~;sz=468x60;ord=09855554231282?">
-</SCRIPT>
-<NOSCRIPT>
-<A HREF="http://ad.doubleclick.net/jump/l.gen.nbci/error_othr;abr=!ie;u=~1~;sz=468x60;ord=09855554231282?" target="%%R_FRAME%%"><IMG SRC="http://ad.doubleclick.net/ad/l.gen.nbci/error_othr;abr=!ie;u=~1~;sz=468x60;ord=09855554231282?" border=0 width="468" height="60"></A>
-</NOSCRIPT>
-</IFRAME>
-                 
-</font></td></tr></table>
-
-<!-- START MEM BAR -->
-
-<table width="100%" valign=top cellpadding=2 cellspacing=0 border=0>
-<tr bgcolor="#DDDDDD"><td width="40%" class="memBd"><font face="Arial,Helvetica" size=-1>
-<a href="http://edition.nbci.com/main/register/membership/1,271,-default ,00.html?targetURL=http%3A%2F%2Fhome.nbci.com%2FLMOID%2Fmysnap%2Fmysnap%2F0%2C160%2C-0%2C00.html%3Fst.sn.srh.t.my"><font color="#0000FF">Sign Up<FONT></a></td>
-<td width="30%" align=center class="memBd"><font face=Arial,Helvetica size=-1><spacer type=block height=1 width=1></font></td>
-<td width="30%" align=right class="memBd"><font face="Arial, Helvetica" size=-1><span style="color:#0000FF">
-<a href="http://edition.nbci.com/main/register/signin/1,268,-default ,00.html?targetURL=http%3A%2F%2Fhome.nbci.com%2FLMOID%2Fmysnap%2Fmysnap%2F0%2C160%2C-0%2C00.html%3Fst.sn.srh.t.my"><font color="#0000FF">Sign In</font></a></span> | <span style="color:#0000FF"><a href="http://edition.nbci.com/LMOID/resource/0,566,-223,00.html"><font color="#0000FF">Need Help?</font></a></span></font></td>
-</tr>
-<tr bgcolor="#FFFFFF"><td colspan=3 height=7><spacer type=block width=1 height=1></td></tr>
-</table>
-<!-- END MEM BAR -->
-
-<!-- POP UP WINDOW -->
-<!-- <SCRIPT LANGUAGE="JavaScript"> -->
-<!-- function openWin() { 
-window.open("http://ad.doubleclick.net/adf/l.gen.nbci/error_othr;sz=200x250","childWindow","height=270,width=220,channelmode=0,dependent=0,directories=0,fullscreen=0,location=0,menubar=0,resizable=0,scrollbars=0,status=0,toolbar=0,top=100,left=100");
-}
-</SCRIPT> -->
-<!-- START MAIN CONTENT -->
-<!-- <body onload="openWin()";> -->
-<table border=0 cellpadding=3 cellspacing=3 width="100%"> 
-<tr valign=top><td width="74%"> 
-<table border=0 cellpadding=0 cellspacing=0 width="100%"><tr><td class=hd bgcolor="#CCCCCC"><font face="Arial, Verdana" size=-1><b>&nbsp;Member Page Not Found</b></font></td></tr></table>
-<br><font face="Arial, Verdana" size=-1><b>You've tried to reach a member page that doesn't exist or is temporarily unavailable.</b><br>
-<br>Possible reasons:<br></font>
-<table cellpadding=0 cellspacing=5 border=0>
-<tr><td valign=top>&#149;&nbsp;</td><td><font face="Arial, Verdana" size=-1>If you typed the URL into the Location/Address field, verify that you typed it correctly. Remember that URLs are case-sensitive.</font></td></tr> 
-<tr><td>&#149;&nbsp;</td><td><font face="Arial, Verdana" size=-1>The page may be temporarily offline for maintenance. Check our <a href="http://home.nbci.com/LMOID/resource/0,566,-2930,00.html">Status Page</a>.</font></td></tr> 
-<tr><td>&#149;&nbsp;</td><td><font face="Arial, Verdana" size=-1>This member page may no longer exist.</font></td></tr> 
-<tr><td>&#149;&nbsp;</td><td><font face="Arial, Verdana" size=-1>This member may have been removed due to violations of our <a href="http://edition.nbci.com/LMOID/resource/0,566,-764,00.html">Terms of Service</a>.</font></td></tr></table>
-<p><font face="Arial, Verdana" size="-1"><b>Get your own free, unlimited web space!</b> &nbsp;<a href="http://edition.nbci.com/main/register/membership/1,271,-default ,00.html?targetURL=http%3A%2F%2Fhome.nbci.com%2FLMOID%2Fmysnap%2Fmysnap%2F0%2C160%2C-0%2C00.html%3Fst.sn.srh.t.my">Sign up here!</a>
-<br>If you believe your member page has been removed in error, please <a href="http://home.nbci.com/main/help/support/0,120,-0,00.html">e-mail us</a>.
-
-</td><td width="250"><table border=0 cellpadding=0 cellspacing=0 width="100%"><tr bgcolor=#cccccc><td><font face="Arial, Verdana" size=-1><b>&nbsp;Internet Deals from our sponsors</b></font></td></tr></table>
-<!----- Begin First Ad ------>
-<table width="100%" border=0 cellspacing=0 cellpadding=4><tr><td>
-<br><a href="http://orders.nbci.com/redirects/s1212no404/"><img src="images/NO-combo90x108na.gif" border=0 hspace=5 vspace=5 align=left width=90 height=108></a>
-<font face="arial,helvetica" size="-1">Get 2 FREE airline tickets or 2 FREE hotel nights & the guaranteed lowest price on 275,000 items. No purchase necessary. <a href="http://orders.nbci.com/redirects/s1212no404/">Click for details</a>.</font>
-</td></tr></table>
-<!----- Begin Second Ad ------>
-<br clear=all><br><br>
-<a href="http://www.jobsonline.com/sales/doorwayic.asp?company=nbci12"><img src="images/NBC_234X60_Yellow_IC.gif" width="234" height="60" border=0></a>
-</td></tr></table>
-<!-- Begin NBCi Search Form-->
-<p><font face="arial,helvetica" size="-1">&nbsp;Try searching below to find what you're looking for. Or, <a href="http://www.nbci.com">return to NBCi Home</a> and try again.</font><br><table cellpadding=5 cellspacing=5 border=0 align=left><tr><td bgcolor="#CCCCCC">
-<form method=get action="http://edition.nbci.com/search/directory/results/1,61,-0,00.html">
-<a href="http://edition.nbci.com/?tt.fos.0.logo.fd"><img src="images/nbci_search_logo.gif" width=80 height=18 vspace=1 alt="" border=0 align=bottom></a>
-<input type="hidden" name="tag" value="tt.fos.sb">&nbsp;<input name="keyword" type="text" size=40 value="">&nbsp;<input type="submit" value="Search"></td></form></tr></table><br clear=all><br>
-<!-- STANDARD FOOTER -->
-<table bgcolor="#006699" width="100%" cellpadding=6 cellspacing=0 border=0>
-<tr><td><font face="Arial,Helvetica" size=-1 color="#FFFFFF"><a href="http://edition.nbci.com/LMOID/resource/0,566,-223,00.html?st.sn.ft.0.help"><font color="#FFFFFF">Help Center</font></a>&nbsp;|&nbsp;<a href="http://edition.nbci.com/LMOID/resource/0,566,-487,00.html?st.sn.ft.0.mmbr"><font color="#FFFFFF">Membership</font></a>&nbsp;|&nbsp;<a href="http://edition.nbci.com/LMOID/resource/0,566,-1739,00.html?st.sn.ft.0.prv"><font color="#FFFFFF">Privacy Policy</font></a>&nbsp;|&nbsp;<a href="http://edition.nbci.com/LMOID/resource/0,566,-1078,00.html?st.sn.ft.0.surl"><font color="#FFFFFF">Submit a Site</font></a>&nbsp;|&nbsp;<a href="http://edition.nbci.com/LMOID/resource/0,566,-2958,00.html?st.sn.ft.0.copy"><font color="#FFFFFF">Copyright</font></a></font></td><td align=right><a href="http://edition.nbci.com/LMOID/resource/0,566,-2959,00.html?st.sn.ft.0.scfi"><font face="Arial,Helvetica" size=-1 color="#FFFFFF">Still Can't Find It?</font></a></td></tr></table>
-
-
-
-
diff --git a/layout/html/tests/table/images/mozilla-banner.gif b/layout/html/tests/table/images/mozilla-banner.gif
deleted file mode 100644
index 1640e73105e7a6496653c9999e8a04f55e876eb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/mslogo.gif b/layout/html/tests/table/images/mslogo.gif
deleted file mode 100644
index e2deb07cdbc1d9d6b2bf9f55733b2c88e14219ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 628
zcmV-)0*n1eNk%w1VQ>H_0JHx9C@3iZ|Nj600DpgfzrVjgKtK=>5by8r&(F_bU|`?h
z-=CkKkB^UVaB#1$uTW4>A^!_OL{CCRI!RJ7E-(V#?EoS91ONa4001li0001R04M+e
z1phF|Nvpj$>&?6WU?`4cX`X1Ru59bRa4gSsZQppV?|kq7z@TtQEba<O<YJOY78;18
zV|ZW;28bC!z~v4kiY~V?=w^coLzl3)5?&0k;2TKD9qsGTE--w%3@;CIUtw|z1c_$>
z2yF`r69|cr2w4XXS6CGYnFCW42YC#Tj06B&1#Ey>Z!4!_UwmBv2wh)Mat#u%38w=K
zYGMfz2(MxQ2NDCpwgJp?T@Q_mCx&7L*3k=H4i3*<4F}N12FALteuG?rvgNkW&{(4?
z4$uXB%nY&!!L$eH_23CW7C@Z<YY!wOY13s`fL8zr$Z|j+SONmcSTvZ$1)VWd9sgyu
zYLKK%M+L@6nG_JP<AZqzf*HuTkxPIA9RrBt@~H(*F0#BZ+bJMHzY9NSBAl?26TAg2
zbt&u;AX<Qyq*{pC*2TaUR9^+e8FK+#fUtBP4h(d*SFSY@Vxp?GE`Uh@FT&!5#Z>?q
zGiL3Ugo{=}#RQ!OKtkE&r+`)~8H{~=lS@JulZSOZFwwEvKA2`rPDT^}9+}1h$?ZdT
zAc2*5Wl89Vv4z1U%~A#{5MZ(x0|?aNl~7X-@V?NN7(A8*q69fEQdaGApmb|G%Y-H4
zMIn1bmEQm?(ODcQ>A=8H6*-Wo_6GKeGE$JF$O3%#M)K?5&%eL_{{RLk;17TV7HHss
O2qviDf()_{0RTI2#sIAV

diff --git a/layout/html/tests/table/images/my16.gif b/layout/html/tests/table/images/my16.gif
deleted file mode 100644
index 31d17bdbb643e197392f355ea2ac6733a0240d0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 417
zcmb_XPfG$(9Q;{kTY^R9zcuRZZn+(z-9Sj~lDR5EQIteCpI)8>LD#N<9mL{C9`+JM
z6d}=}j}Sz-1oFBB)uCJ6`T(6?>vw1vhGFI~Ore-hrYfT_3a<i$;KEf0g#*H-T(|`8
zAa{V<oZHB4;7o9aoKenzo5)RyHb)!Lb`2myWE7c!4A8Ai1A!tK)TWdHH7PX>3Y5AD
zfMFU2P~lGg6BOakSR1Rkba88O!R-6|0p-{00nlN-x6peDzPpFkX8XRD2t6Gfrfb%D
zpmd!w^^WtMR8Op(%k8T<`C_J3YriKVP3uuTyIIofJ|e9Q5BNz<C3-$4N#Tavh|1Gs
zx8Ms%0pFw+lxL%ANC{|?>^UWM=|~$35pRDp?2ks&Ac>RQeo2!RIjBlRJJw^W8oRBJ
lbjlOemvT9-?LAkOZoS-9*49IBA7tt)JD3|9uVgc@{09PEcCP>c

diff --git a/layout/html/tests/table/images/nav_buy_checklist.gif b/layout/html/tests/table/images/nav_buy_checklist.gif
deleted file mode 100644
index 8407c8e573107c6e9fac54657710f05067d8f7c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 786
zcmV+t1MU1rNk%w1VVnRR0L1?QsHCNzo1c}EnTm#zgMW^1Y=Tr!aY;sMR#S2u7)=}*
zP9GdlCL>fTCs#v1hU(_d<lxHZ<IUOC!_&{d#lg3_x3J%zJGQf~000000000000000
z000000000000000EC2ui0Gt3F000I5pp%H?XqM=yrtIpr@GHmkY}fd$=lt&Xz@IQk
z92$$rqcX`{I-Ag^G)kRXtJteH%iVgr;IBAL9-GVPvpUUQyCd+pd`_?1@A$la&+q&5
z5*G+5e}#sJh>41L6bB`Xkdcy;h!O%Ol$n~Fngt?o522!?q@|{(sHv)}tgWu5ixLG1
zps%*KxVgHnkQB5Lp$iHM4FtQ#$jQo)2(=0Z6$T0w4+IyX))xd5584o;+SK62-Q*7w
z0|Vj@0|eg`1OcG|1ofm70R!CD*w+*F{Lbauca0u}f85H2qLA(ZJ%HatIUp4YfHPwk
zrae$Vjw1z*4;mOC)!-Q^0t&GIrF6KUK}ll}hRH)Y@__-7HRrW#AP?k5V-=nmkQZQQ
zPXZJcj0`Fc<%6UKMiMCLGGQnO6GcU$;LO0(nm$3^44~kesE-X6Sgp3wDFl%aAQ)Hx
z0qsba3qnOD_0~YdpP@i94b}HAN0;9Qvt?Iyl+RIEvp%2{IBHeEfbE`SkWro}l*5KS
zRp6Oy1+oS>KT|-#W-)UgJqHdg_?flXju|w5px9}J1xh16mKZq{<;)5O0FJ5LCTo%g
zC@{#$Hb4Mrqsa|W@NYrJv5jx;T{!%i_1aMbd^ERlZq42+CrI-={3=$hlPX6G-$2`L
zr{K`W-DhpB)BpqNOy}B{1G*uVoK4WI6B2>}P!kqVq*cJpfdf?d({{=Q70*8@O>n_>
z^s#5(D944yQz-j2(A;99-1JRGGXe-81#`g#p>q|)WQ;VToz>$}fnhj|F+8?}<Xjg7
zHB1G*wPa3x4@hQQe#&&|<(ID<2j-Y$k|}1HXr{RfCv3Lq=9_j{Am^NP)@kRRc;>0+
Qo_zM{=bwNEI%fy~JLN-QNdN!<

diff --git a/layout/html/tests/table/images/nav_top_left_frag_2.gif b/layout/html/tests/table/images/nav_top_left_frag_2.gif
deleted file mode 100644
index 1f8e3f909ccc9a71a04ca4149784c88dcd15989b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 518
zcmZ?wbhEHb6lRcRc*el6V#(5_ixw|kxOmaLh4W|6UpQ~!oEdXxOqso9!}b|dXHT6p
zv#V`Vcl+dtebalprZm_0RhD)%)b=zt^cCeb*Hm_u6}KhER`zr(%g(6J&uPlbZuIfU
z3Gm4a2`G$>DvyaQON^^bNvuv!sm(~OwXsNYb;|H`%gRcd?&Fyg98eGzTof5r5*1!5
zBjGC}=_fA}pd=rprW~TB9`0=4rmGccpc`#$5NmD{Z)ctCWS_>s$awDbwpY*2J$rQe
z`QtNB9-Mmq`0Vv7hn_w>^We^jhj&lixpDN>lT$aZ9=>+z;N|oCFP+<e{`B6{$9Eq+
zxc$h1Z3p*m*|mMczFnL4?%Z^LzV)`v>+a68*|lxM=JjhftXZ{o<%)xQ_pDsH^x3m#
zXU?2iy?XV;i4z%U40J%|gW`gLJ-fkJx2dJMt+mBiudAoKueWDH|KtgircIeXvwPOe
zIa6lOpEGaT;u#B<8!w%@V&SU(braVt*|cnf)%G1bckK+_yKn!2{lSNi96fe4J}x%K
p=Ipui7fznOaOM1^Ggq%(zj^D_jXT%wJ-GPj@wwa2&Nebw0|151=0N}e

diff --git a/layout/html/tests/table/images/navtop_buy_pr.gif b/layout/html/tests/table/images/navtop_buy_pr.gif
deleted file mode 100644
index 3bd29b342529f08af6d9e9e11539d3d17668538c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/navtop_devzone.gif b/layout/html/tests/table/images/navtop_devzone.gif
deleted file mode 100644
index c2842caf00b70b021ba2d2eedaa94311e5e9ba46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 432
zcmZ?wbh9u|%wP~<*v!E29|X>T!Avkn0|R4Y<1`>PHfCU80AV=L0kJ@O8Cd=YobX(|
z*W&frYV`z-zLd;)8LQUiyxv#vMvXJ$PQ|+SHShl)Sg^r;wP4$cB}FH7Zq3-!<hW`{
z(83#YKF>JIx{uK*NotqiiWnw~1PSrJWad9L)%Lr$>&l7St;l3%WM*dNY&2zLFJx;n
z$!cWfV2^KOZfI)hj;yNgVda^e+sxz2$~e`etKB5AEr~Opwb_J;d5KB&oN7i^?w(aM
zOgNhMa3^Q6Y~RDPc|-ixV~uBb_Qg~jX5s2-U<yudo3bOG%XQC+4OvZ3nD4gEir5u9
zxn*@Tdv0FSlA@+yHukMH8z(7g+-j)a@!`m8re(LS3|e`34wowk%rIkHqH3@$=fdF#
zj?@*BFI)N<EfYEOdILjTl1{OzcT4;ZV|jXP8rSNHN7UcQpSPIg^lMG$;uE%=>;ft&
zGaWLfw^}duddgV3Ds-h^R@U89TUTFSpK!QK)_dEUo0~H(izOb|w)Xb+g2$)kdT(EM
LcXzom1A{dHOYOCg

diff --git a/layout/html/tests/table/images/navtop_products.gif b/layout/html/tests/table/images/navtop_products.gif
deleted file mode 100644
index 61e8af6f2b361062932906609ffb18a6d1f7953c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 571
zcmZ?wbhEHb%wP~<*!-X2KM0%wgPCBE1_s8)#%VxoY|LQH00dwH#9&bT$pWTzKqSZv
z2A2ODR5d5>z5XKCLp?!5h{=;HW7WEx*ZVfyK69lf(e2pVIoE6FPb~1zk?LP0bu{Rt
zO3@tk_urXWn@_AM<DPXP=fUg<o~;@4F0HIOo432%XO{ULnZ?CvB~i2Le*dp8j2CY4
zF0*1|FPHAlV$JT)>7Uq;-IS0hUYf+rIFDJ3Wga6FyXB&J>2nvSGqSKR;*esRx1MA5
zN;cNT%u{=c50tc5Ff(y365H+1$a;GHQFe~q%NQ4MoH@?O$v*cEV`t~OimROcwT;Cy
z+S(<UnRzciWn^c+!S<Qw)F&RUcVg>4>Fh`@U_7`#?LW(m&!uW}=cvAZ^T0^$yztTL
zt}lw-5A+$$YGq%{clmt7=i*-f=YL{?oK~prPGS|A`O_`$_V(11TMAiRjTGFImzij6
zN)KRk&*cf{O1}P1wk?*|<>Z=e-OtxCE#lxv2`d(F^poOYIup34fg!+CmaW*bP2xQF
z?jEKZr`NixW<}qZ+k10W<f708O<_S?6FGyqS@_ihCR8l(wy{tM&p7eCO($Oax>VR7
zmPQ|$`DY!(d~bfv;8U)jc<fEU4Yg&KLFylTqBRcR&fLFY&4*i_Ik(hYrFPiJY%g?Z
zDdpF?V{Q2S`Gv)|1J~I^JalT2=r+{aySv<w`%t&M|GqsxKfk!VI{y5;S{4Rt0NNt&
AxBvhE

diff --git a/layout/html/tests/table/images/next.gif b/layout/html/tests/table/images/next.gif
deleted file mode 100644
index 2c26eabb379f8d2c070baad5d6ddb0c8f10aacfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/ns_netcenter_bar_new.gif b/layout/html/tests/table/images/ns_netcenter_bar_new.gif
deleted file mode 100644
index a40e0f589359aa5c2db2e8d1da374b62248cef73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/orange-arrow.gif b/layout/html/tests/table/images/orange-arrow.gif
deleted file mode 100644
index 036480879919cf4fa85b5db801e959c0507a52a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 58
zcmZ?wbhEHb<YM4tX!y@?CXM01fdh&^Sr{1@7#VaJfB+=pz$EC>mof9fIXUa1Lz4Hh
Lralf}V6X-N&K(fZ

diff --git a/layout/html/tests/table/images/pc.gif b/layout/html/tests/table/images/pc.gif
deleted file mode 100644
index da26d7092e2ab1e6b127f2af153e5e42af7a6e13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42
lcmZ?wbhEHbWMp7u_`m=Kia%KxK};PG0g_>0Vq{^k1^|0{1S$Xk

diff --git a/layout/html/tests/table/images/pfeil1.gif b/layout/html/tests/table/images/pfeil1.gif
deleted file mode 100644
index 3b0e8eb0b7a919a468edbe3c0da69e9caacc26c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 858
zcmZ?wbhEHb<YwSz_|CwP%)oH$*s*gA4FBgO{~raTAuz&1K=CIFBLf2?gAM}_fbs+b
zhdBc?hm6OD2MtXu>>LaY1`SS(-0X5S9EOh=+87x^T2=@qAM2Ij%)0X;@WF`*LXK5?
NI2J5D-N3+L4FI4%4rKrU

diff --git a/layout/html/tests/table/images/pfeil2.gif b/layout/html/tests/table/images/pfeil2.gif
deleted file mode 100644
index bbfe5de581a7104b288f71c9ae61e633c934ee35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 857
zcmZ?wbhEHb<YwSz_|Cv!X=&-?<kZvCvvldwW5<sD9|fZ!Fp@$*@h1x-0|N_#4g(N?
z@&p5i83QMWjK>CrMn(o6J{bjtg$Eb~l({l~6fAP>=9G-v!{PAQt&5R~fkB{X(cvZ@
P|3x7yCnPv9FjxZsmZ1s}

diff --git a/layout/html/tests/table/images/pikajumpr.gif b/layout/html/tests/table/images/pikajumpr.gif
deleted file mode 100644
index e1cef0492b1960635b1079f4d3453b4aec20fd0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/pixel_none.gif b/layout/html/tests/table/images/pixel_none.gif
deleted file mode 100644
index 35d42e808f0a8017b8d52a06be2f8fec0b466a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uXkcLY|NlP&1B2pE7Dgb&paUX6G7L;iE{qJ;0LZEa`2YX_

diff --git a/layout/html/tests/table/images/pxl_df9f3b.gif b/layout/html/tests/table/images/pxl_df9f3b.gif
deleted file mode 100644
index ee72b65af57030f916b3e0c4b95e7be261d98544..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35
ncmZ?wbhEHbWMp7uX!y@?f4(&X1A`6_1Nn>$3`|Tej11NQgMI~-

diff --git a/layout/html/tests/table/images/pxl_white.gif b/layout/html/tests/table/images/pxl_white.gif
deleted file mode 100644
index 07e48b8c2abc88d293c926143201f71e027cdd41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35
ncmZ?wbhEHbWMp7uX!y_Y|Nnmm1_m7<2J#sh7?_w`7#XYqoo)u%

diff --git a/layout/html/tests/table/images/raccoon21.jpg b/layout/html/tests/table/images/raccoon21.jpg
deleted file mode 100644
index 87c213111cf9d45f036d06621b8b8383c7f5a029..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 104416
zcmbTdcT^Kk{5F~pAoPy300BY^MLG#ZLk}H76;SC-L`V=RUz8?FjF8ZT7<%X(se%eh
zmnK~VMS4}KiXvWq?|aX^=iI;Uy|ZWc?4F(3nP+CFe4ghs|K|QJ0XWQzO^pFSAOHZo
zH~|070cK201{fnfduxmq)Y%d0=!3-t+zE!NDk>{^K%p3)a4o2^%4HSgWuzJuYJ1ls
zC?G5nsteUrmxtQjzH=wcKOore;#rC5-zR_pfPtPKOi#xE27?(H8JJjjSXr2vSp>Ma
z*?EKoMMZ=KArL4`Q5q^PF9CtbXv)efDXXceiAp1N5h^;0s%k3#^AR8;BO?nl3qLC>
zzls<{Oy&P`_}2yCWT0^dK|w%q01YP)#0mV@0}#EyOb7g50q}nYAPtC?jvmaw$i#dR
zp_v0f0|bF+XhC#zw6qtoV=mqUXgTS)#FX{uxothb;-Ne$ail^93H^p{Ud)FdFjY@%
zJR{R3K7Ii~NhxU=S-6_Ih9&~3WngGzY=Sm5v$J<_baKAt;^pn*>*pU3hzq+LelH?2
zDk1S<(xb=8__Xwl%&ceGIpm^ZYDsBXc|~R8i>Bt5*0%PSZ{PLw_Vo`84oyr>P0!5E
zeVqTgyt2BszOlKry?=0cbbRvj*Xi&7!36|>{x__P>;DG!|G>q0fs2Ng7DNmFA6!71
zdlx5&la@|QnVw6}7VHtqEv^#Bz@twpZ0Kf`P{sV<^~8Q)x&%}ED!KnZ(Eb;)|98OR
z|9>I-zkvPUxaI*YAmBygfj9wI0W<AWd*Tyb55=!{xsx{p*K(4X0KY$kW&!-l)Sg@l
z%^xkLu9x^{YY-V1U&@?qeO=Ric34P+Pns{cB>EovVk_n%15l&fhtxyZ(aqs0pTDv|
z*xy?YG%?l5Iv<rOidRbGVA-S7XIt62y0Sf_&*^1~aeK~72YL86xr#m)NhWE_u9{`K
zX)vy*m0c;^bAEe}`t|1M(}M?hAE?^Vj`930jP?_jMbw`VYF@jo1fGZGdB0h_$SEas
zY{TNJ#YAZ4qdoq3Q}jh1BQ#DIrK@mY)2&EJ2>2@}t;v-!m*<_odyyz8fAQvMri6q*
zMYw&m;}u_hpNt0#XIrIT`yF^C5?c8;W(vI#(zWmsq-3aU{U5srVVEabUa>`m9(~c1
zJi;GG>Ad#V{h!>3{(X7FB<~+!Q8d@^joZ{v?76yam4-BwYrr_15EJm<*43A9a&;8x
zb!8LX(;`GNr!5bIz1MrVk>{MJ6FJ_ZZ{OsqQM`l$7<JiQW=Y(8-a6*eKb<bBk9xj&
zwylC*k6nFW=2ostO=kIaHSvB}Ui3de*!{bl|Ka^5AFt=bMVm<O=3?i(XPYVmT9xNv
z4J#r?2wEIwS!DVtcl$Y~71u!Y<qZqH^zPoP-%<lh=%#e5V~186&%*?~L5Q29*`um)
zXht2jCYgehM$wHcst?abWHLXMei_XpUcy+zCOUz9HRh(^CgS43gND;di`rNE=V3*v
zeU>@}pgber4c>M$toM!o@)t$({{dW5wXDCTj*>F`kp0b9)L5tXO`2lcOEpK*|5Tk$
zM1IeI37;ip4)AjKIJLlwWt4Cv{@k%2siSf7kA68F7L+1(tN>p8z1NE_2Z)tk17Ez!
zFqgfksmTUXoR#gUvQd%9gn?dW!`s8})}J*0h~|{h^{bWq16Vc5^ge1Li44BtJ}j}%
zeHnDNW!M&E*SXl4LWeY#rKu2Ou}gV<bK@UihRQkmU?YD+ugx>YNP8G|cgHQI_zkHj
zz5Z=_`G((yg_OfK-(khiOFT2Qf93p#E@RzRQ9i`*o5SOh#D4&$^ROR@kdqR*F=1_o
zT1Ul57Is<0{F_{D)q4(STSHWAw0$i1)bev%y*-$|&dSHDT5gu-{Tp`fB9D099UQAu
z%IKy7?F5o9%2~P|v=aCi=V+6Vf~bhafO$vvIgLs*Fg<hs(><ueS06r5bulalcou{>
zL)Zdui2vaYP#B6{J>Nd}rLgp0)K^7s2b<~7URfb4>lGJ$Y;=*N)Z-c1xur<2?SOv(
zpY}f7r7LA;vWDHRx|KJZE8N(ci`MUW;4&@j>TX^>R2!GNx^T8_>I-wX*SDjjWR4e*
z#iqSlEI0FWii5uF-uI<QY2#3y?<7(K-7fm*Td98l_j5J6?7ZaD>2gnnnOcSHotgG+
z%XfvL8B`yh?7NJolj!VlgCq4ad2L4i<*G(poRL;TbRvahk@LvsY|DfaExqAr29QPF
zta}wE$=4t<VH9M!`6d_2&Hdr3Rtx<Ss=&~B-@Z_!=%i7u+U||@<->|A?{WVC7XJXM
z=e&W49Q4?RV;2x5oj0AaaH&^zBzs*b6Crk0E5Nk7kNc|2R7Ttva;24X%8`*Qh(fZ5
zt*$Vhj$=YE+F?9a&QH8F%(4tbZsm=k+k<&0Qcm=a)xN|3^ZWTAr%ExjYsW^lVMS;1
zME|5ZG3Qyi^(f)}W`3?tnlU3)AteU>Dvhs&80V`?b3d#@dd%=_<nr?r3cHKWvi65v
zVsro?<-u>i(}`2n-~ImpF%OQ*uZ18hXjc%tH~KXAT1eckZjD5p&cD{boGw=h)F{Sx
z(DeAFWY=~p>QlV(T~<2LUymgvO2@C}dLa(Tlh4z&gyNk7c&0O!bFqxf_(Tcr?}ly)
z6})$b(QbLKbY<CA#(f_ek4dK-YsqYpn_<3A^K%fpOsic^N3$g_!tV*T&cl?WTywTr
zPEYwjgFy6pA`uj~<4Ecje!!IM_{>n9$NrD<QU5Dlalj$wy$mxE8v`%4infn-$(jo{
zTH~xWRp&P6mn!cZeTT2Ls5b2uZ})S#*H9UMS*N^bIiIU9^0<;l<4Wgrn?z_r!nHq<
zyXp*C*(@Ajvl?ku$CE4Lq21*o@~sd@OnUSSBOc?jweF>pf)_x7{S%NkM+7xXYR8K4
zy{*|m?I9tooX~Z&wT0;fSCq;FL~a=gykhJ`&r!VZl_w*i_>KnDdhzYDg370i4O+>Z
z{b{H@M;p#@dnV<9D%&{9daH9lP0n*NjkOJ1K#4$-wnN+7Bi-!@*nd%ix|z<$Z2m8l
zZzl&IOMkSARIgQ-73c?-7|ELz946>Lw;KNMrQ7>kw!MZYR0?S1dN5*4JQ4U@s@C#I
zQbIQ<H$}PEN^PAv@3;y;s8jcd2gcz?MyckuPn0ZJC?a`H@0gXpyJ)gi_Dkbq%}Ux3
zg`RuGdb?(C>FoyANyX9x!4Gt3VOHZ|e29@<Z$LC7W{R3s+b@C7RDeK86LtCnQBx(8
zcX-E+TX7Bs`i&;dkv#pz;azU2W=(O|Urr}7y{anWg?xDaFeh#N3a*ug>`ttZ#!qIU
zv;Yj1-=RLzYFd!d<@JW_eGarVIgJNEI4--wY!@rs;rN7=>$>qZw#v40;a0yESt=!T
zhRB(aQrhyAp$PH`@bGohcUT&bYTUhr0T0q=6wck_K%x5$cFYDi?pBccZ<I~s$gyFs
z3ii3^ni;Yf!)Z))x4y012b%>)uNOL*&izO5M<6%Uebv~MkmV*e*6M23&5!Q5+@H2a
zt<~$+LlSJW2UgVo3v$;xgG+FMNN(vVF9l2SU67?bBR2GwW4we&zKaN*1l~%;z)`h_
zz<%{9T3T3n#Oihu>bNW>^InuK@0GYROdZ)OqIkp;0h!K<0}F3DbL2gMPuOppa*pr}
zeVr3@OOKCK_gF@;X-&BTbQ~2aCu*3-^o)}g6}+Rew65(s_Jdql#_p0`soy-6Mx3e?
z77(UzgY;{Bn=fvlluQ561yl6BLbU?x`HmM9-$SzeY$9+b`?V`5y!Kab&qnatJ!8<f
zDFLx$5Pyx4o>(_>L}HGOVQb5A8+*j3Fg#2-q)e1+zjWwt0kxX>6E5pnf7+^VM`toF
zP2po9e&i5gU70!DO!0in&>Af6L{nP4PI9|)MV%ss97L36fPR$+Scf<nCq6U#`$n+x
zfW}gvVbfZTvm4l6@e~#}i1(Im78v6%@6v9VFJVIcp^`o~xy}*g?U%wTih|tJk7x>D
zD`gWI+$8*m?#4TwOE|)Eg2v<sO0{VPc~qXS-M;4>&Hn{+nj@c<q|S(C(;E#)j3fKI
zYhiEMw}+uE7h1W0hho%nR%#raBuXqGnlrhp3iKJezwLdc2KOBA#RGO_2`dP-_DcFh
z{l!#0vh|CrNQh%|m8@<5S3C3i3bDx2O0{EA@#bOfAY)78eGXs^@;XX_zp}b3C9^2q
zTivt3z-k_)t_h~SOATV9OdqNQJ!b3|-pQIxx%2GrhrhQfLV#OtwJoNd0=vymuicQE
z;-!Yo0*Gx?E3Jco$@uV<iQ@SXIff6IXR7e3d-c@SapAZEF`bhV?>^=00Y?1E>&iNL
z0o|zvQzxZFo(XTi8iO?&@6jmxPk3@|igI^Z+O<%!Td{zAVheC%qHxq&UCgSK%mXAh
z5g(N=?!v=RT0bkdW(9UImp*=Oq=^6KsdYi&we3G--au53Y18Mm0`BU}SaDtlhu`Xu
z8fGe#c)EZa(O0x$;N?a$-(7Fp{(y}VdRt^}r!URIu7<vU10HVy_%m0kI}1^FK$vMU
zVJw<@><!O8Pup1F()?ApOw`9S2p_%EV#*owqNl`0zouh~^K#B^g^>+a&`X28*UT}-
z$`;A{U&wDD<safGg2`s)o<-@hFHa59dl^Gi=p%|wP)>m3N+w2KOM5pmx2Z6#Cj9-(
zbGcGRR?3W-nH^z#7D~8R9&uMX98*3aO`1iHs0~oP1*r#@mdFIOUcbvF(ac3q?g)D`
zFIBUKvbtW*w;az;s92q$R8?rozZyN;s4<545vIdTabpi$p1()*;hcvuwHHccgUmPT
zH>2zX!*!!3i&5{u`-S6*s53dF@nyZz@ow#k(SZAtmo4^fC?LxX;lN9m<m+z1{0+3d
z#9lh2hyMa_k_Yuo?Cj{paO4^O`_~`if*KDxu-5cNilKxh`=GVZ*!vliQeVGcm!%p#
zhp|Qf{I2&*WSZYAzs7>dr-KhJGFxsC&Bm%klyHf>BR9zdp@#;p41?dlU$f@s&noz6
z{{muPK&Ewlo<euc)gz_7_U>b>55n2oJ1;lDo3=k;M91*`z)HnBsiEl(0$f;B{E}gF
zh+e~YiQAEji;pxKicehZg~ThzqU1lW&`|OJ03&uXgO0Gh&1gp@>i2N}#p&b|I(LSh
z6nIxMaHXuGx^=2pHEk4iqc~Vk=jYj@6_b-DrVliW*24uqt_sd(WIRRL$iP-6KNpkm
zBqDMnVWPryp+_t_IXk|bM&{e<&olUoZ67x%jmf91gY(<*<apPorT(XL(ge@AFoumE
z>PCtgZ{I7r7z@~TF&`fl`k1)WGeF%h17ZTF#0RGZ&9O?XtXQEEo5%?+mXY{K0o_3J
z0P&n;g@=%%!Cohr<J+lvbLC|UsYBE(N2g$JfnMv6{a0J8Dd4wA^OXs6b5>M|I4?+=
z92>6%S+7GTPZ7IPU264{R?14e812_Pj7*K^Suv<GY)I5eX-90tmgzcc8{}v0o5-qS
zMQUQb+r84KbKUF3Dk=FjBK}B$Y6r&FVJ9uKw;AtkiR^D`bX^OjC||GpKQC`#_?V_A
z9?yuVDz*2B?fUKL%<#$*-2s$FsKeFsTHyOGmtYtiJ}&MCdYQ__T0lRzM}9i!+ZRzw
z4o$ytpqg%Y4S;8f4J%9v<P*)kHITe6sS42Aw^d6h#o1E4rZ520(xQjqXb9)dmX+fo
z<#@{iMDg0M;0!gW4>T9tSa8@Z`m9??b*DkD%-2*u<iqz_H-sKaYg9CO+tV|=^UaZ5
z5t(Ml&9CUi4N)hX-#1=<Tnw6WxVDTbJ1ULbYg*b6-j>eHuj3V&u#HL?EYjp(!dc3o
zS5jRt)?YCa0A14>iO1OR21O9pC0%3O=Q1>dt~F0Q2CNIW&!^>_Z^4mWxQZT8g_10<
z?hZA*!-4~A6)6Y(`CD!iJ@yLvl0APve62`Z;8G@6Y<$xVAejE-h2IsaVJ)wrOEWI@
zCaPR%Qts;BLGz0oFIr)4c?meXEu}`e-Rl*g^_xh5(zJF+pp=tnSMaOq$Bh30&Nr`)
zzWkzdpz4<O+VnN;h4uKrWuxML>CtUm85X1%<#i_eaYe_om_lmh8Rt(8gig5NE2o+n
zF$*hX(g(BEkibfbgs!q2A$}c)YnoyD;bNhOoaDqh-M|4rUVB+guCuq@ZJ<3QYO4Gr
z6gXLfFszJJ*D{Rt795$bpF&%q)tTdweee%@=?No-n;Q~3j+maoAiVtt08E74MJQbN
zZ=ii#@^MvwKbp42B9!ZnZCki1TKAFK9svm;xoibJnPMRm`?9-4ZJp%JP!%m697{h+
z$@lI-W<Df4A0SKBm{StemFr^05zf8H^7ypA=91PMZwvn*k9M5)#Cv`5P!8lOIRuPv
zQmBvQg@0o4t;=D|=<>p_{8abvd9|feLdz9Vw#T*LC?-F|CQJ7YG#ZHGkR#dXI7_8b
zoSp5xBmh={2l~(1qNW*=`oNRTZd?Rhufre4%(By{@XEE(n99l814~0Y68VEN=Yffu
zJO2K=u@c2moPmWm>c54lO_V_CsbQX$-B}vgrO%Q_djt?RqD)<2qgO?x&cr6D>y)c=
zUO!NtkH6lg8yK-Xpj)v<^K+fN+SV+aoqFH2j0zS;99R5=r%WX|K-e;G4FdVH^tL7_
ze2D%HJ)+>9=dA<`)}KrA;BatT)^S0^$WW1Ck1{#2nzWut?Jtt#@S^xui!pQ_AC+Gj
zw{8|AW&2GOKX1DxC<{MQ`#7|x`)UVaVb5i)wm~E^vW`a9noU@H-v(~mD@(SWZ15s;
z#ZkixUeFY(gVGv+$ibTcKn+T#Ty+`hcw>n#UIn6&OOyx6)n6^Yx%&Lsv*fac-0qN&
z_)=n{)%HaOzA8f(5&;Ic&eWH5MCMW@zH3BmUM#?Ms)wxh5A$LVNv`t)Jk0uMO^q)a
z-p7`K1wf)DIyXB}8R5ooC+#-qjEzM5aX~|H^yFn?`^kjn75bHUdK}(!<jp<uhG?_|
zCEu*lQebcl^#Bg`LT|I|6Yq8Q#u-84@^7q;KTBF<=KeE7>z(popptXw$3SCWFU%m*
zX9*vC;2OHRp>s%9RJ7A;7ARwZg$(N_h3~{olst1Jtvu9R6UUV2Dlx*&y=U}blz#wt
zmQ0$RAftn~uNWa8o@(XahNZgl?V?qbp?OBuf6L&0?};=a^ay~XUI{oQU;$~{e!H@h
zR!MS9U@Yo2`FYpsGg=N&*lMcFI>*3Bql&pEKN!SQm@ME61E#c<Vcj^V3@US^yD-}-
zJ!}zG0Z||IQFNo6*0f<~ubW3qVpeN0>e2uf2=JHPa?a2Ao=$>^G-dL2Vw<q4wjcXJ
zTz4O%+VdP&V&u7l8FT$EjMQ@oa0W1RmleN2JayFnh!pNF8<E-dU4G*2SFw6hq4S!~
zC|Ke!+~OKP=;1aFBcNvk@@bfy&u__14nc<snYf_#NC_6&*<LeoLU)g9uQ`$L`SdZS
zdAvvqK>6;WOX4=jq0jto#8egW?<sg*zho9m2|cP3hw@3|$Nq#EbcvdIObH*RWK?=C
zWEOFj-5%jPXqY8e$P#cbt0JoxAHco5f6s(gT+5hZZ0)mliQ<8|A5|J%+;F{d33PC+
zui@J229tpTOVgICq4|A8B)BI0?emuE-htOJrl_gMf0E>Mo%1@U_LU9B?CcQb$AY(?
zk(C^)h*cArC7w!b@Q$pYxYHR$rQqGFMmr@Cz)sM{7*PH;O}9TP{k_7MbX!ffhsG=S
zR_er4)uL8-)L3VACUp|>ZbcZUxsaq469~m+JU{*-`)e-D$DrT#`M$wr67$VgxlQ5|
zJoWt$^26+`t(j_uw{_A2B@8(N&{>|X!J&QQhO`zc!<As!-MJC-$Ngr;^Y15Giv?n+
z7UWHP$()L9c3zn$((@FX%K~-Avd-O~SDg`CWDjuLa!u?jt#x9b@=Qi`oE!DZPxawj
zZGZf~AN&J6y*tXo26kCh|M2AN`5tz9M%qa9@m3l1_K21Wy{wcFJ~c2+MqoeAj+gm*
zO3i6<1|f7bAO*N0nrphMMK~%yx$@1(CHKm@TlIgoG`Q578))tTSg4JmhP0acJ2)u?
zZoeYsQ2kii0TXgnuolJ?DJ*+1?D{LBT$3X5v8J6{YW4X6mK9BU;U!(;hyi&|_YmE2
z1pAkI*dCPFX<L<oR%Lj9v!7{bclU@><lGN7;GXTS6DFhDm3+9q(yVkni<VqqDqXi?
z#&|}@Mo_44&k0+E9E1dvuC*a66F10i`EQHUWU3k`N70~$(#V4R5~tISBkH_?pKf3b
zMSr(N2*-jWOJec5aF`FuwA51S>ud?f!)(ov$lpwNo|DVnHYPIKbwDm!viP-b1gOqT
zXF9mqkb5GJx*?Kz)d?@Es#eUjK+a6`5~vK&P*O%8rr|#4Hy$!)4O)fTAVnYQOOD-;
zH61vvUaxNQ($4|x0!njGzcH}rx%JXZ`I)#*!=fiP)}G3U8?wtG{WQf98tM5%)I=Ep
zM0J_ND>EC2rbtL+DJ5ykaTw1nLF>Ty&0h1DeP8kG;tVH!TUoF`uNaXMkNfUm*pUkH
z&D2vMtUCO;;Z&&eG!?cnMb_tMgF8HV4G-Y~Fs-*HDJ%4BHs*!SmX|D8+dAT9&N&k-
z?h0A)ktLs621yzbxo}$;aXu(;CN}X9PZsCwk^t*CY4?m329l-CjiH`-p6)1#G7m>b
zABRDoeqDIgBBUvniz5vsT<PJ6x##}Xlkr5q9~TdVh9(@BbyimKgbqG3Mh#mrd}cqW
z9<jF3ysbmJJfN5E&p&4+r>qV!>`p<^)f;PSO5~l-)l5Y-Ry$7}>r~tHH_?*jI3gto
zjyylvC0Iw=VtF85akib+yNn>H`=2R$L7BPx2PnEWh$oSf7A<HdBcs}<{j-4b#}lt*
zqlDZs)55q<P`p5`b{6_vy0YEoG$tq&>k^F=fBw*4A5c7Nj=lhvv=FeBKgT#q=g>&o
z19q`W6*U9GakCJtiVW~76N!WF^P(1TJ5Vv8D=&5&^pjo}@IBpec}hB7RnW}AJjoM0
zk{5kk30;cUnn-;PqX>Eiu0MY5zv^qESjME>EoaS#eYvdi5lIW`;>}=Vy&4GuQ2ca4
ztyT|m0c}F})N+WFOVUhASMBUz2OWt<Z<PkIp}n{dT*Fk#4`bb1#`9nQ8<w?TiDekz
znW|~vN`4g}CJ!(eT-vBRJ+86g)f)v0SJ7x69DGZNAb6!2?@k|OsL~9Zx+AJ@8Qbx=
zB&&UqMf`<Rsux3Up*VJOvjKi;&p99I#Yat<utM*0W^lZ~vO06}ZnT!TDvRf7O+17=
zfNzx;n>!NL)a>U!=bO=RCv5FFWpdQ0lT55KC)U)OlCyHn`k?G1U1}3g=BCEtLjnqU
zj%$6ZkT?30d&PAhi4;sGqRx4>9s&TeU6;*ff3`^NOP~ON%U7CC2(1`81hJEe@Xc#-
z>zWC>?0-JEl6qQ*_d1oKt@O613Zg&Ic%f~*)n2TD%_72Z%+2ntqOlNt)g|}HGI})~
zNew3I6Dgg40Fi*5Aa?DS(>AUR6^7NXk45bsh5m88X6W31Oudus*K8=|w^V0Fk}?Y7
z9nsd$O6VZDczX;;Ro=NDwLjCeO5)!T)w5s4jC9p_*rG>m8^GjWD+Lt=l8;AdxFRbw
z9&Wj8-DZ@w0UVWkueEJ7tF?ncCGh|D(n3en*J&GEI|)}aoi!}`SY2B<iwN~nWdZhV
z4AK+NwB(4Rf?i4^A?Gr&pSC^N!@$StTgli;D(65Qa-UFi-J5gV7`%N;tI<kBy+jE8
zF`H<tHQnKa0FWz?%<(a@T%KhK_=8Y3w|QY%g^w>|RR{+GjVP`3ney&%lN-2;W=WFE
zmCgLt@K%y}@b^>@NB96QzaK2GX_jqag{CD{%Z20A`J;sen=!oDxGWZj(Ng~2%PfK%
z3A4-f_K{>uykaXbqRE07ahYS>q1@$JOH^KY72ZdkS=TU<zocVhLs_m<gTK<k>v1im
ztT&z1zHLAoTB3>EBd(nAyl6~(d#|5XW6L{qwL5<)f9yb&l~cvlhmNG*#0cID2=zpk
zDrN)biS^UnR$2YIOsNLeW?EaK+o-~wKj2dOi~E>#lI;t^-Srfkc7`Y5FKXXq1ewpK
zo{t7lf7iE_DpP*jaAb*Ow8P@&Ge8}@tcoigFvdK+;z9WUCuDbp6O7|3li<@<Ry2zw
z*2wT)m0z<PbOoFiC~a`8KByJ2JHqWReitNNV>T<mPg9&CPZ50n-T^{!(oQTX40N0-
zldm56uCKwstJ+i2sAd1*6KE7s#!&ty0(ROWr}9G4IMiXDUMKIk5sKiyA)D5PSBXlQ
zer{#GXap;2Rv~Fnym+<TV~li3xL!5rO}FW2#@F#1cxf(pD$X{?3O7%-XETA`Rg-b_
zq^>~H^D?3tPehvxGG0&!#AtlRK)Es@uU!}3cDLIm#F$~Q@|mXOFtrwl0c@%$PgL@>
z-zbN)Kjr^so0;scNdx%F%h>j~2jFuE1gCT^H$XcxQ$#}zh>NlJ%l5k}+?i!eLGB&P
z;?8t8Ufs_uPISIjd~Gn~vn!!8-c;8*szmqfAtX6u4LEOgK}@p0t&Hh>oFn0uHq5^Q
zQ`BOAr;gcPyH=(GfO$OZhlZW&lN}9g1r$Dg4`4~W#6)Go!sCdm2a!nWS4w34070to
z=9n6ri5i;>Fo0eLFc~{0S_9%PEXs&MQcFRPE{K06Y)p)djrA}44~3BYcdr2YHYx1_
z)b5?L%BcbV_%ay#Ockk#!$ghYj)9qylHSHC#x{R!CJt}vX$sqrmLe|4GIM~V+}u~x
z0P{Aw0j6UuF|tiP+7kQ4$Su>e4$RUxP4u|+*P{}VMgM-Cjl6b<Z!F~DPeA)<i1Ms@
z@Vp*(T@F7~1N}WesybhS-e<`D2vNe;n~{(P7TD4s&#Db{b;})Mu0TcIuBsoDXrp`Y
zzOjD0m^Y>I@nd<1XS5!cE-f)HWMzpa`YJ{kU+jgDHoR~f%5pJU+Yfll4Rndj6{AVH
zAX>al51Vs5>m4CyN#<0UG{$*$h~G@}$$qNAW$({@P|0?rx+hd)C19h(U-IRF13lPo
z3zKMn<AQjG_$(GBhu!W_Wq?QMUupWH@Tq9IZeY8g|18ki!TLsEiAzb7zRlBNT=42q
z@j&RPTtJ#wy2H9Z(F=J}of*|SeQB%rt}5Wd!mu$Fy+@OGSfC464JnMM$-MSD$*loW
z*|Sk_T!GOL4lzP00=uMX%2FKqtj&_Gsy5Y%(BeU9VBtUkiTm&Ns~VIf5(q~Xu!9q9
zB(=n@QkLqq>!U+hCxQm5ti_An33$||RrtP3g?Xj;K&-3;^qhyz9oHdVTb6+uI#(BK
zHMv2rYMnpeR^r_4iQJm6i3HR}dDWO@u>hd%Y)6AnOfG1Zz|TM5K84n_gA9QZby0x@
zgVH5xY1n)50Zc7m<ZnlvW3IWD;+R1trBIv34H5>1i2;<sA%`=S{LfgsCtvq^vV#Rq
z3W6`_nmQON?~B=kkFx~)qNm-|*hdxo(9(t3lx@~eSeja2)LXJW35^fM-{IsdV)y;P
znR!ybIMbHO$#s{*`g-y2S*#b(TK(Ox^mBc=^UZVL!j=))Z+8~+Gh?>ZFpJ2Fb<0(D
zJ+i%iLYYYOdq>S2YA$hAUwH%#Nhyo7<%9l-n&A7M#~P-e){u}cPyHghaabmB&)x4w
zrQVOLHE3#Hv_qTZ6t{N|5iZ`Zb5da#^qzEz5xS?df`95b%#fH+UUInKrMALgG>WY3
zk2gk^F`fL1>!OS@jz%4;Jy8<PHKzHYtT(Uh65}bp=98}`5<PWUY}AC8GslD`XQM>@
zaV$awvl~VByYV;R;Z)umGs~5lo2_LY*oGb;8lg6^0^JaQh9!~Ls*=y`(39WHiti&Y
z)HekK&Cg5IwkoySOl0lm1^Qd;)%I#9{uB7OH1tj|`=lX``}UPP<vcg|T3x&XxhP9Z
zf^Cykwl}k_LQ?hbHQRmw^D_5<Lh-e;*j78V@bmav{$E8M4XRenP!{PU#y$X2YKa)E
zuEtPr(G|{#7aM6fzk}pS3XWkcukZSyH9-ek;gLbPq$kI)s|yWT8<_FzZH-0w>-EtE
zW*B~h58-C<?Q{cf7o<qGg@_E81=k1nEqp<TyDjZ#m-4DI<5WI!tQqx8T!}G=BZ4RW
zdSRyNeF3Wpu)&CD34<=H{Ax45DS$M7uk`z=&M;S*7<$vv_?g^Gw*xbJ+B~p&_D@Mi
zG$}j&PYbCJ`41pi=BiieTR@=|ScTBw;vDi;unSx{-l@pZt7E)G#au_;FArfY>=xrc
z72k(^GNnVMi#!sYX~=YvFtY01Qs-O1KIUDyVPXTkI$C~udXTgmv|u_WU3OFs^G^2w
zlmqoPbS9a3b5dED(o6-aKeZP<eI(G51^<XK2Sn0WkJ5D>d<uTr*&;3T(eCKV$I4K&
zxc@2>q>_?!A>=gp_y(^Z7?P3>@+@AshcND-OP@4adlFrOKOdNI3rN_-e(Me$TS++j
zS*ev~z|;%z7T{WB&e-Z)rTkS*eOuH*;_@#^yR0s8mo(m@Dbp|d)C5*^Ew=^W^IvN#
zvJ_S=IS*e%mjfKSy0$1xk9Hg{Q_RcV2H08UIKQ-)oAEmM4mi?Q^t%`-B>nk-LKe6S
z(kp<F{dIxXQMR*cKrxU`7|+C`goIQND}(Oi3Qdjz(Cil;24~Xafu-oFeg>fh&omWI
zMxA^YN4Q-86qNF+T!0%1HwpR?18-*?PXn7}%PDv1YydEwX3A*`zi|mD{G4t@7v%7G
zYd&`^?+OOE#Qm94jvhcD_6F6u5-;W#P+c<%JxWK=N{a~)`YA>0w_Ql|M0{w<RGD<D
z)zrlt!G51kQT4b4u<|*Z@dY>~VJ5eel+a(QWoPb7d0fjr$`fm?E5m`W-sRMjw*r7G
z3gVSi*dnhKk&O|;sW+o+Leslp99UJ<p!j{X!ovY+2!5i){fSU)SDI;vacKXY{px{|
zi0n*kA|Z5^_cFP>?7iQGs2MCHR+W3bw6bMgBWv4a@GBT-a<y)vW%Ak~DSm|00fVEY
zMbrYN!jU;YsDAtxg#T2N|J2ide}1tKdc3A`y9SoRQD12FA5)WT(_@=O$wHJo1oZce
zmRZX4*B@jNqf02j^h2K@fH6Yg)0c^t?#l!poJHoR!PQC4z0K)s%&j&k;Ssr*P<(Lp
zrKjmbA7wM!-^Bz<Nj|D5t-Pd*+p|-6p(KDPo}XlMv?VdBGwNT-t@6HBF5vZRLdapP
zyhy$11WfM@7wMeZWaz58fxe+UqFe-k-2Lt<m6J=ReJ0E<TxmjS{F8Egonr&BocWIB
z&q)Q=sljnPxm9_@lE?cXP)W<7t)aD+J*p90Fjq`dVmgf$7;z-->8LxwHlX_^3jNVS
zzQ^HS_kuH@;Sk|n+cEGr!;!RPlKAb9y3tdb{DBS&i4Yvco}@ggg(vnDxF4$vXq$Fb
z$28_8v!`b?9aPq}SALH4>K8c{y7Ij<kShccY+CD-n6VZfSS3?5Z#MLCvA@Jha!}yD
z+-00HSjTRh7%A17L@yU^Q2WKe!mS_(m~J+i#n0U9@Hkjl)iFy$F80mSFt}QQiQ1~8
zuP1v+=nXO07sCIdtiQ9+CbTU%F)uqXR{)Sgdgphanoj=myk%<k)6Ym5t|uIN&NIII
zKrpO_#czUyUcvL+RCrtbGbzndqMeD(RGfSKzPc!JWNP2-ZeVMX0pZdLGbPm8<iT6&
zrIfdE!CU9*WA|b#+r!3lgp=65zpXKnVNNrdC=ZtF-a}z=2}d<wtysT#um9nbCYh~S
zyA+-F=~eK-Sf`<!Uf{Z#yN4M3)aXP|*{fI>lLzi|O?I(D_cGCyrk_RjkD0t%qme~?
zKVCnfuEtH{Rh&QtW`Hwy;kSMJI66?(_nJXorjD&h2ky9r)7^}~7HHIXS6J1}s`<)o
z&X*+`gnh2KA$wIRdO)wgrBEHfvqGgo=g<sCXh9WCP8DqG9a9DD@}}<=N;b5Tja#5t
zCAe4kF8;Q-It6|-g0Ol-z&z&hBhxZ5j06=s1o=g<AKFbKD>$cL+8LV9>O|Q;5tJFL
zflS*($Hl6s4pQe`YY<CeYUABjto}P@E-LcLmpD)x<cL-fEh*K-bBON^eHmLdvhu&d
z=px5$CBydag07qk&nT05<SKCV!uBYS`PCN_$W?=VHLme#7OrF*!cJc`!V&9x!y!oz
zayViY?1%(*)5fDV<wQ;_uA6`Rgij~s2fC$24U_~YrY$sKLhR_e=#sut1ji!H(FJG4
z&{$*CogX!bXL~1y(%BNy9#7dZR=c?4l`Bc*L;E^P9b$CZS&VZlqBRcH81Z(=8S}Jv
z5IMRfthHHbFWKfJl&GQ`xO&jJnYH=2BZCIeEv-&N?9#u+Yi%Ntr+u!LW5oBakywxi
z7XE!`wcy;C^tN4WE|fHrkHt@Pn8flCwO3-{?aN<4X|9tc;uk5`fL*#<A!hM65n#|n
zriWw(=M?u~DMtk8P4E$3^b-G`E+ao;OdW1E)J2JlFY}|VE75@Qk6sl#VrTtNX-a)j
zOS?70)j&MSPMlJIC4;Uu@&gPTwL;6}{^wn*Zq>b>*COpdPKqU84XMb&46XNppX)7^
zQ{2=NB7A8Nz;@=US?+A8r}`_CHBir2F9<6wGWvEbSAHPD<Ktq2nkda;8685cs^x~-
zx^K9=bCyn;m8C}PrOYUTd-{&4wSHlvF>3ESiVbhT61!_6LC}ha`?Y_r6y&$#U*irC
zFZeGWO-rL<Y0d#p(#JCPX^+z-Nlr?vLA-&MgP-CKZ^QhAHwnri=+)yf+=wM{cqBJA
zfe=nrsYXQ>@O6U)jw*Z(o$ER42aw;%K@CCfYt}j|$gvCez+{+M_y8mS0PT8qQnL9&
zlv0#eL9hC22Nt39yhpTl%t^s*zcET(;Bba5Jir4iAk4mn2KM2sU@vGQeo7I4^sI74
zr(|?7>_%bkmBG2k%9`cq7t;yjG@x&|*$efapP!kuDf`@tQ3CWigHpL>thG^CU=Yz~
zDb24Nx@CsaMTi`MQm|~gFHrBkd&kn#hfd<Ht=CZ9gVL!xR;x>wq#;c1OdyfAE5|Zc
z2EjJWUVzo*Y$apB;BiGfeV6aN@*%`~Tx`>(-e_SL%`fMKS%<P<B`7oie*UX7l@-p2
z!<*48+%FKk5)04d8J@rn-iu5;fP1SNqO-OwEP65r6#B24&9-E@MtodX(ju}kud@7A
z9>I;ntZ&1TuF-A+4L=gk4zu=LN@n<Oh3Xi}e7<(y$0LQ}mpAo%*E}VuxntlDiPw20
zv>yf6glXzpdpPtUQe-vbAv6FC!=19@3!zRZRayX4Dkq@U$|o1i4f}*X=Jmf$?397d
zxSCz7=X>K4d5@VW=RXtg%CRCxHa^N@r^&tp4Aye=_YD@RK?D1F$FzRl-=YTmyv&@r
zWp+bDfcdzRAE8z-U;>IWQ(tX$-+G3vGG4p$b;NEscJ=6}A~PREpHZdpJ+v~0F<t^k
z@Xb%OO*tADc!umgDi@$=$knD(roZ{XipR4PgS?l?o{#f7nI8A8uC6j+%SJ{+x2}hl
z{vH^7BR(XL3hk;O+2paYIzs7=Xkx!w8<>t0T0KT*_20iO*tmBk^Lkfb)a2RpJZ?lO
z6G{*XFk$9D7OIf4hjK;xk~I<t_N!7@6Ehob3H;_$wU;@_D?Ns+oooSx@p(oT_6=PS
zGTn<jhO<EG*B72<`u$<$^d>aa+vd!1UFEElSnd=$C6|Wp*VHYK6_Day{|z&Of7ELB
zD0)u;uP%a4XK!Q~rnvGBMx<PpwsjcA7W@Nf_1z!a{dU`&{5$t{6Jscra}<DikQu<L
z!q%T}ca2dw-sWAK#Hqv46dS!!=u{O(r72t^kUeHldXlEp$WOha5Q@W3TsPNI>Z(Xv
zXVeB*-m>OsNmI_?GmscbyHXxdx=M+E^Dt<L_>x4rcF@f+C~O_IsD+U%CCp-bDE6Li
zA{2-IN98L!HagnY7SrXE(zbaI_<4$Ocmqb^my<3M1e>p>4_9TM{U|emCk$4u@na%y
ze>yA=lT}kk@>#6hgG_x`j2m2jk$9VuK3LMdd5avOcH-Mm{h@>PHw(>$?3j11<9@F;
z5|Z){@KEmk!OTs^&?vsW+5mHGD#aca508D;>S3h{@tderyNQ9kFEX^9lqw)w_K1AW
zv^O)iPt#ain%Otg=J@uL-)Hx#mMzqiEwcQ-#`_u1g%Fj`pU*iO<*R{aYY=7{aSr+#
z-(8wnscDT5-O`;AmfsxXvo@f|rO!afo$KEo{x}QFqKSTz0ML<POvePiVew1(NNs4p
zMtJ~IoG{rLv3~JFL2rH|S0K|!?K)-UxQZ{zekKLuEwi-3qJ(o8X=nZf<&M8qL~fy~
zdk$m2cj^B9Z6`^32k(16M-w`}Tr~gT5{9Y-b>EM(uU)(AfP{Vf({;dD<D)>wznE?w
zA%*45NhZ)3;PQWz2d{ID@Vw;_Kne5gUw9RdpvsM^JQ#rqa(S#m?@D3Bgx0_`6&1PM
z7k9Z9<oDk)S~N&|fb0A9Wk2)^bQ&oZ>3->;yN@Z;y`RxlWbP!U0Ym@SSf+E<esy-g
z#16K-1G#@g;?#77ACMRGd#avGD1&|}?RgwiY^@1WG<LnJt5g~GoVo4k+av+I{<@u0
z`^HFS&WI!cQ=3;BdUSndYRZaz2toi9rnkdzrcZe&m9_N4FVlM1HXs;<hP$`tF7}HQ
zQ_?37tL`wSINs}q_qbC)do~>&yp-HwT>qUYBi4wsB2$YbI|2c;bIvPBb3I!|As%=n
z%`=;mI~@CiZ5o4%+j88~Y`LU%n!N-Zlu8d5bkee>`DL*)zhL9$?P`)E3AhV_+}D+x
z(Q#UCJIc_wWXNbQ<7*+Dvsn<e?>y5Q{tv)@rox$_ezvuawx;F&@Bnz@TKO;Xtxpp_
zq_cX6-U{slx{=kB*tr=~!`WZSVRz}8+sW4tIrQin-<`>gJq^o)cBI^rL%auxS4jJ>
z{=IeKx2et5<(pux2XSDqn(IdvrC&MP2I%crqpWy<gR4KO{9_lM>00V6{iL`t-AxW$
zD<A~!pYW2%^e~7fYVU~ZE-@5x-8o(>UKS|FcHgEXRd@to$>xPI1t@(@MO-y&66cyb
zeQuj=+JOE~Y3W$_yx9Ocfb2pDKz=)9<c?=PrD0S~CjcINq|ycnUl5^yew`_AZyAY9
z{yv=J?OcghdP<&g^*t;QJD9gy!5|<H-Ce-+Emlb<b7za}e|<Qd^%w2M6!xcGqP1{6
zliz#I>YLI~h{>->8g2>=Sfpu9zl#C@ZsY~(JGXa@A)yoQyxNcXSN#f0X#l-Rlkx0p
zW(M3@H(rHKlo-<9aR36l6~@%ct8raHEJUyw$|O_aP|8YgV1?(YfINr*oaB{>H}Q2R
z=*L@GDaj&%3G|DECAJKpP=N!0<u}EPXXJUZP(5&!6leD|w&B99#M^y^CYGkj`=OD9
z*vo|DbNe1g8DkYaFd@|i+he{|j{!oDM`VH7^={rr!m|6u2Jv?A0%clnuO9{AA|7{P
z{)T@3rKt~%9q{iI03%dJLTwzz2kYlV40d5qH*dOO&}&mBZ#W5rZ+{lG?Knf#POq<W
zWiK;BpLU+=6C-{fm9H8xe0W>x!(z3DaoYKABPvrUC7)t4G&fkWG!-oG9wC+m<KpPe
zG*DVv^*&l61Hw2ih3H?h_&a*azjRbXJ2d~e(33Nn&YJe<;=fLNrdZGa;W6stPtm`D
z?Lp>1!BV%h3&!9dVA?=zVLFK()rh#=zc#o!wYkZg(VvDseMIYEZkQEmfp<~PGYtm*
z4g8fJ)!)20N|W}!RrrC{+fa8h<Z;2qOsPGFLAPUqKULp2;F8qB{UDIOU30a<<+gsN
znl37vau;N(E@*X0sr>%%HhZ(@mU*Sx2Flk#7+JziaCf(76_Q<bx8uhhQ41iwtKtSD
z=4+WZ-~_HjC?~$t5A*t%8h{HjuUH5^p^uZJ7qCrrdAtxC;bMT$A>p@D1Z$dn6|1Aj
zz^MZ5NZoB|);SizijyQa_fQP1x?g>k$$?8XW4XT)sdH}s<Du!83+*G?1Y4b9c8kdj
zsUC{y)SvrdYR`?W;1%uN-TYLQq|FCR*)|UX67oI1EBzOWd7J0a#cKz;ccVFQ-d0pt
z@4E})qd)B1vHI@Om{Lk8Ict5ehW^Ya2Cl8^-StbBguia$#Lfw191HBva?<=6WRr)9
zVgXG}hiWhYVl4H8S#l#zsI(B0!|rhVlK>@&xXI?w`_eJ<L`46<g$`56Vjm+%+UHy>
z2b~X`H>*5SEX`QE=T#aMEU?vj2Ji831svvOI=ZcT)n0u|G+V+W?F^@WJ(YTBc2YhA
z>HxNtUkdMI3wXQXziJ;Xw=0*$V!{4p2bD+~ggJO%_dekT*ZKkD<zS^#4%xoI*LyXC
z<!d>gt~5J$#D==aYke~(MMoS{=`?Znnl1i{A9t+hOxmuKC5fSUi_!>Q6uK`?jwZl3
z%_Eu*?Fa+n6U*H0mNKS(wc<{#3E16L^wcn>Cl=~%-%--EYMO|)Z?YA5yrCBKEqXFp
zyNwDZ5sr$9ib}C;7wyG_^@m5>2@5`ffe6KFd7cU6M??Sp4KTEd4y&|aOzd0@t5HyN
z(5#ownRmm=DSPU8JM0+As%W}#pvvT&FKx60&PrQNC``=qyDL$bNY3W9ZaK#9iwI@k
zE`5E~VAaw2$nHlCr2|d68t#gO#{IpO^m5wsg|;_}osKF^D;jvX`fXm9uBd%6Fzwoo
zOXMGiB8532Jq*3|>_q2=>qNfQytgBR>FL1ItWoi;OXTN5x1vkJ=S@w4*S{F-V0Jt<
zTL0*5P87@Xvr^b!T{y`xVV+#hQg!sB^vbv9wAzU1{{zVA99p7TyVDhVB7HZ&{vyX1
zn-e=KKI(uilAi4A#3Cg2@kQL6W9RJDM#zhXa(w9!KkPc8V1W4^?StdWjM40_$1Lud
zU?|1@L+j9=!4O`3;3QNqR#p$*;=BY(L6y$IOqnc|0vOyl=s$l%Tv(<da+kleEj@e;
z!$$URji{MfPM%tD+Vj~gM(|VP6~5Pl+UxDp(91;UJZ+TVk~YALkgr7H{yU#&s98jf
zqspcCq3&28?qCL$ZC8nniXk`oCEvWQGSV*3GP1#Tn3NaL9Bk!j1PFzdBzu~G{sHQ~
zU&C3Ll|vwqKhw_}1=Tt81W-Chm0TwEG^X+<R@qdHK3Ik)d<VaKrof|NcBghoK*01V
zdXRt{o0=6686O%OpoKU&Py=OoSR@HUqbMdV{AfT^0N5`y4?2CP*;Me_^>~$dW=$B*
zZP?<!Y1@SK>x!+yO<MjQ;>GCR#6Xp?vG60&8XO5m5KdG1WS@pY&{V>QdIlF4F8c%o
zv)v4_joXAbgD(UfilDnzdb5<SEY1S7gX+h~6x`1M6jz*W4~G^y{9TSWT|C&}y{@Ow
zCH<PtMF>VLx4|XkwfzI^*of5yZ@=e1U69p@V!GAa$~;b@BoN=$bqd)mJnH5OvSD|J
z7fPAZh`kfxyT`9q3$nkzfjwp&{05)t8fxsTzGm!P7Z|VFfM)7Wu`)sII2Gg9WoR3y
zPve2^?HJ^8T;`LUQuke+0j#xMzDsok_9jboJeJiG_HasLf!N!|FMv2Ig)2_`h9q(+
z8Alc<ss;on=j*?svlQCHWo@d)b*UN0i3UCG);87g`drpZ=??p%dTN;INu@7f@Buy#
z^8(~0u8_TY21*v{6bK+k;o@+Kcy7wkqJ?{{a|ZN5G;;Y#Y_V#+ibhBQJxHLxhVcb<
z4{J(W58=GnT;gq6=-lQ_o2I|COf&*!1QThuh@I!6qp`50A=f!cXt00A3)!zN{{Ybo
zOqGQwJ7`E*TM&61A8srs8vwZ8&~!V=c5hqvsR2ivkfLA&)@e=Kto6=~M>{B$SWZeD
z(Zph(e64^yn_Lujsz>*dBT}@)67G7Iq`62slnc>2cm8dEC1|F)+uMhh6#LQcVhLJ`
z?v{f>xd%4D1e=e(-TY7%B2FK%P=c?QmN&7r%X+G4DwE17?T>`k>0GSka{=lI2O&uC
zC_|8MX$oQu&eBDXm~WSVeayk+%CIW|mX?M+INlDA-K7_hAOh2tJi300d~WIrYGGu#
z`8uGpZ_r4{jPy+p@!P>m5EiLen4$z8);-S*;D-fiHe}~^gwtc#?eeC+D~fXpoN$yp
ziHx|a_i4Yt$b*B<84+SiEBj9LZ8faKLpjNTHg0G&|3_(&Jc?0*#gtz$6#r79EnbAP
zp)C^@UyV51N^ZEl$GnVUP64yFiq159_!1r}8q?Dw!8_M%E#9gOtzcX9kGq%a<V%g;
znT`TM0B=Xq+P04znNf}p9Lun&#gw6aTN<f;jp-4F{(wD{WCu7!*rm_ETrP6|mJDi@
zR-06|``KRN8o96}B`eamac==e&aq;g3((L%^s94u5^gP__Or3gElVHlWlQVP&0k57
zeP5_BcwshU?!ZFOWr<f^Ec0vZN-XjM80gX80v#YYGzpS0U&bk-3t#as4D7KV7+8Ov
zR)eoEk66!>K=p`NvIWkA<=~71(h@WjDb|UaQ(Mliishz9!QlsyBOYVwFV##1mTAuN
za1(L2n^OYMKDqxXCOG0g=Pt0_LJu~&pee3CI8>qn>hfa{t=-6G|10yh=_j_((ZKhg
z<Sx6-IKKkye|cs3w@5ke)DdeJ%|qs`9$jggWbL>tuxfKBg}uh`XBp&po7Fz@ck*1l
z2mdH;&+XphzC}a!6O-fG!aLRiJ8q?~|9tQM2k?I2LazCQ*>cU^o)vK)vk={~zN26j
z9?xn*XcOHfd*#*;j*2MUPE4to0fxnPsy9j{>bHZQtnlfcUS<k5@YOR<MQ2HU!d+eg
zxU25A(rRAxWGrm;sJet%mw!@pt%`6oBGb6owH-jCy!FfBafvbqddq6URY~qOWgFOM
z5?DJEggmP8d&$;DQ;4y`s_xmGPE2POW{hj4$63nE{XDAiWxf!uZc&4@+<(u6^hD2i
zg^c&Z-;?mZvo+Q)=pO{;C~z0ntU2nM+WKOG0W9~`WmxlW8P4|s0h2{991$$=Vi&T0
zNV;kZWFJGNJ>I@$TFuKRmLwaek;bMxPpL9!!>aJ_KFKpehn@YMu9AhzfS}}Tw=#?o
z)~fQ3@hyIVzAo>z$g&dRwi8WV&ay`zTmrFuk@WHF`-LzPNBu$wk6jW)kCsJ*o(>s2
z)Cwl&X-{_K56_(c7ISX!z~KTwuHaM1hBPfxMdh5rE~;)A08LY}G@F%K-~yEViEu#X
z>PfSR7G4a$vy%QzrztO0EwL}~q{~OQNOyx>R2Ts(@p3Pl_AOi9lvSZ=?}Y-_<CR!7
zZrzf5Y#Q-lHI%?+6rz=vk1Gk3oRsNkWC$WSnpXG+EiaqYj&a{yU;rL0zW4qS__Sf+
z(-U_fA&Q(9;+vB^_+Pvc%!^hQOzR%y+w3ACT~Qe5<j#VC5y42_Alg6jUU%5V5Q{$_
z3t!M7Rdm%U@5S{8FD)^jfbxIT@HI&RWrF&Jyz3DP6z{qVpL>qsKaUrNeMpV^OX=M_
zTOd{bLXs(S)5F~a^6lTl!xlMk=iGk6(Rs7yl*HdGBb`gyZ5wyg09}Q|J_%TShjpv;
zapi%P0LA$K0J%U$zd`^H807W;02;iI%8|9iBg{a@X&p%93W=>EhBckr<mhrf{{Xch
zMmUrz6Co!6j04H4vN4s3e3m?Ct!P|Xg^o5<U|4Qoc>o@jPh&(uz#yD}IW;9BsLpZf
zaZ|-BqLLc}p*^!tF&9w52#rT$oYDvx*8t#k$rKD``EM>15(^Rl+}HxOuI96|(|*Yf
z%S`S;aTnYN-2VU({VNT|)*}Rcdedkab?L<+6yc4-IRiZ7tv58lDL^NuG?_X6lmpy#
z6bO7mBPdy!k~6_&86)2v>GMLd9HqoEspwFUe<OoVo*2XsTtZ1n0asFTQbE*yJxABt
ztK+=@Scwh+QcGtfbOWz?k<qQ?bSP2dVn`>R)m}fDm3SFA$@QzqBV!xQBNKu$I;#xh
z`hIi(Npm5FNME4=hkm^Nxy?hAmSO@F7{CDMZ9aKf?ixZ+mH^-k4k||?0~shxa)Lq6
zL&*INAR~_@@*FQ6Guo%~T^PpA@{#}runj|Sk%=9n$w1gv2e)cT;{^nVAQC|&aoeQ>
z9`IZ=<b*Ex$x+Y$0IrxqE(p(-RDjGo{{Z^w_J-*}nhoOw4370A@|jo^7>ZMzF90_g
z{{Zz+1PtZISY!|ePf?5tdLje>gUJUu$i*|sWG9n_VUSNEv;r$x#AO0F)mX(T$OPnN
zezX9~dowGtj)e#eI4XN*+dNc6t3ttX8BhsMxilHsvP&Ey<CBmDIqnM(b_IX#g}^wa
zs0>9#IdblV6PV6O>G@RYa*Jvab`@p;l&3A|NvD_+caTP<803XRz~eO(!XSLb67FNm
zGYlVInD0OmY>k!7QaKTg!vHB<dguC6<`Y3U4FaFEfLQ?mH@Nicnt}K@o<A^^1z2#v
z9AM^~B#`Zm9ofpL0J0Tm@!Q|)Koy*>;u<neG8=Xe`SzehE*J%19C3y?1k|pG_>eI{
zk+?9(C-AD~Si=w(E7+5eYKaGkq)|vy8OYoYK|lVZ(wwUyjS46kBom$wPs*HK9xbt|
zf}@fTUwj|SiXh$qkf><G45>H=Gyp{@g9M_61coQ6p(c@}W)Fa%5~ScCZaY<|KFx6?
zu-!==q-9x@v~2i1U<`Bkny(~a4Z9V<;Ye%)j{g9S05V)Wg~!Smk^t@PP_c4;cgpnL
z$;DieE)sV8WwU~yZUsv5#xsteUiBNolgO(QvX<xx&P@Ux5p{)S7b*@)Y#(@at8q(v
zWa%=3>IUPy?@|cwgU9o%kc=CEGo15QE$$|YVq=k`X+BmU?FTf$nkM!pMcHlS$VoCu
z5j=yAHs>6BR=u)mP~=KvmPd_QR#D~cC%${;uzbWuSjrb8A&xL}=~p0V#@2z|FbDd@
z1OhSMi(H2Kokg<A5(6A!H6yvm$KlOgjH=^$N00~IIT@~I8@9FzSrq|LOGn4)-mXQc
z2H?I2TxTY$*vah7`O@fgBIXqzbOB12aCIyNVhgZW1ZV3&omg@@R&v7Ddfc^M3!%9+
z&9kln1o~E7$qTU{U{ymZ<dK>@;nO{9T2!k?;v#c|wg(ZZ;8bChoC;D^k0+l>O{?3b
zbf<06i82%ek}*;jUAP2P0aP#}pIUH@8=T^_RhHH#m&}wEJq-Z?=QPo7q+~uR!rA(V
z$gB3STcL8Xaf6)x6(Y_M@@f+ViV4Xe(-tDk2GUJsELAj8go~2N8>Ta!D;`(@VpQka
zw_wr>u1PsP1xF^B@wPF?tyMaTTLhrdfM9Xbm{Ec6T|9bVd<=dx=h0JXC9r)fR?;O!
zvy}m{j2dtRcER<n)1@eo4a1XGzp!EQ_Xo+wYB}OpvysgxJ$a?rO=?MGBW!gZwCJrB
z$OPa}<d&jQdl`!nJeub9#oKzL*ne8|XtekM&g|o{t{27ViK{4&81lj6>T4R66IMp_
zp=WcYw?%n~V}Y>#d{Rwq7;n6DOh?-&KE!`2bFplmwan#FKXsKZUZf%v2dzCKh_*9J
zp7`dY!33I#PO9okQ7#yhfEPSeen##=#ye9Zc3%A{=5m?Iu6Cy<dzvQ|&~^$81BzkZ
zz~q5Z8?3P=nr=5#b5vbQv>7^$xapdm7dhs$jN>$-<(HwS?I+X}VraZW9dl6_nD7Tq
z^-x{1^*nl2h%c2+4LHwHIHBSvQgS%-t1w$UoQ?%T*D*NG?rG_Ku?zxDbxLsMz0A^g
z9X+W)PU@<Kqd5mBJt=0rX-O4aG0t;bs#0v#sG`ibGP2`uN{GsFk_|d1T;Q6rM0+|{
zL|SW9Wc^B8l=G9CZt>GNB8hMbBc(-yx~)>C`U{?2$C3+h#-7gD02+)8eiY(It|=(O
zEKRmOWB}tl)5N3Knt+uAkZFa$??k5_j1pyn`RabOj_Zx25((++Rm_5*mR3`^5HZiS
zVa(e!O4^;BlvY#Ni6Op5C<n;n<{dpNobffvzR(&eR1?5G57Mb=>mS<XoS9=PGnlc-
zs(OXmPb`3d6D5?Nyl7Cgu8zNHc<Mvt#fBj<2*w{d+Ia6z5SEci0f8iu(x8B_Mus(J
zUP%Lt=M}G~+Dd^Wl?jZIoyQpikMb*9nQl*G0rMI;E_MZAs*S>&1JCmO>e;u3;^r$b
zAIS_?J%K*8Z(&=NwQGEaVo{GI<YWxh$Ze%)VT{1b9J|1g4<Pe_`SD4}r4yOdZG+o7
zGbm`Cht1WqkJE!qw~b&)BSp%I0^oJQ?N{}fyvt}MjnFKCMhavT$II=5RjnYB?)G*r
zu)8p1U*X-HaaDV(kky@t?xL0_R0M=~RvuW-9CZC^1oJLPjBt|VVDdm6{kg8T=SsZ_
z(U?M=fU!}M2+93@YZBW=k-XLb?u-+Hd1J<Z0qa@0>TAiNgRtDl#z!d`05Lr9Jt>!P
z!6T`*QygJ>$a{Z{bhiE)xV;SVt15*K2^<rj@X7otJDm}r4I-$*@Vl2KkF73rK1Oq4
z1Zu$}5=KA{<X{oUPfCTCa}O=DcHkm%MQ%QkeRsft<UzuKxX7sPbc_3Pq^Fb=VN^II
z55lXN5y;WbOA&BLOcHvYGgX?}UI>kd#&Q>m-Fs(MWhe`ifJaJ(C0B1G76&JW&NKMa
z0}O&WBN^$%H?3*kY4>qq+S+i04W!0Etm2HQ7^4L&KqO#fVwepZbAoU^xiq8z#0CTo
z;9wd~F-}J+!PMc0Adb`kfsWm~j?zKLY|sZj)Bp(sAZNMgDNq7%Xado+{nC|evF<<5
z6hkYtMkFM8tQTnm2c=6K<RHL4YMr?~Kp4m6O}UkdGL|PYnG_H>-O1#8(f|;C=t;ja
zfTXW(PCq(XQOr)IK@k(29N?Og27Rnl<T4%V2T_szaB9Q|h+GF5kdV=ngWm_~MZm5@
zTd|Cg$lE|x8B%!uMx7I+kV|apLbQQ~e}IgP{<UiNds^GfsF-cc<y#}~9=?QQrBW!{
zoU>ym9@y(ka2$X@z%r47M&NpS5lnBMZ~;{gS90_K@y%F<*{49j@J8OBTp!1!S4m1p
zuIizcx)IQfQv&2jmuh2J+3o_7g=`i*zP_K8GDMie7RZ<pm6dQnC!R<=1N8K!?ZwEI
zm4Mty$0NOJNpkH3Vquu17!w1QE6?5o?+>puhGp(ayo|9ztFg{7a5MSRUE3I&4JehE
z1{fS1k6N*H3K(PZ_>v}IK{?1c<R0TAIHk3C#8N9Fw$idHAF0padQqUPLlw=%(wGYZ
z>_NskCX)lp-rKg8Dn>XBNqcT0x|bLv5Xj5GAoKO&r!H18CBrjCI^l>J%MJnhgGPWt
zTslYQrVMC8vYrpr8erL!&nijFFI~S{axyBhkgKQ#3hv1spZ>b8$>r=Dif#mg4}VHx
zCAok?uumJuAdnoWZOo*4j^4D7ZEHGtw)3K34d~|#54W$c6%>qiMoWxs#t6X!pU>-1
zhAPKt1Te>`rXphzT!oQ00m`u2MF^6IQd4+2z$0)p!UXIXx$^+|gPx<?{{XK}Nfk=q
zwgAo#1W*Oopjo1MBas$p0FXvT0}eBT>+Mw>tTUE`f(bj7m#3)5r)ruhCAf4ExMp0E
zJiLHAlj<p`g_&+=P4Jltkf&)l^y$R{G@`e=zp|D~Ylb9%k8JW_$g7NP&Np?)7~-g0
zkFib^2Pjk$vH(a2{Pm=^y?b}vZ!5%9lAxY(T6en5oYK5A=@zmO1Zy(R?8E_qhVPH3
z@}<<REM!M25*Ab~5j|7@;<U8M;)BnTVo`M-8Y3#Jq>KDY@tzw!vCU9OqGcsyQoxYO
z(SYNj@1H?YlNSIC5OcVkkxZ6Y3nMc~6a*xn-Ha$dPSt5+Rs_e-W10fPw7cASq^K^c
zgk=4D;->P}P0SE&=MoMH{<Ug1Gm|EQB*%OLK2p66UkM)Uswrd1By&uN8DYpoK&q>h
zj{tx%pRGvnl{neukf1hB4u2ozTSXZ#AwWEg)O|8D#RVK5ooPf)RMyE!8McO!ew3Lx
z<mR8`$&Q&cf(bFu=C1N3*k~spclD{qOlO*mK_DE1p49OZj&ObGw17t?MnU{4CzX`&
zYGSS2aZK{VFwHM`G#Ix|2U?XcS#Sa5RIykqu*+h!V$vZEl5^`)=iH?W>{W*DM<8v@
zYg)vz5XE_?#RaSiMh0km*kk*gW3^=@r_j<V$EmRlVIvL3F;uQ)QJmtlUsxe<4N!aL
zb~$dm)|BbA5}GxI-qFWVRp+~viN{LM7bABkij>?T<a6y^D#>bdw)zX_v26DhXYKAI
z+A4vONhcpl1fXN(rlkQsV%oTofnh|uRdO&Y4>Y#`bf%mUlHY}ADzJ*NYBFqixn%@r
z6~y?F%jzKi0I~=3uDH5`jA!1t4-k-b0fB+Ee_G|0Xw6w8dU0vo>7P4>I^+B)H#k1k
zB4f?@x@|wwp6;vkt}5zW*G9>%rDE<Ir2*S+NTH=)T8vDf^IYw**%B9S!l974>}tYF
zhpsVCFA?;iTpLDsM<*Pbog!ccYT`UA*A*d_FK%hsu)Io79snRzds`hU*?9BUiUY@-
z_NnENUL_+F9zdiB-EqZe2a1r%7i?2ekX|Jmk&IM|9P||<$rf@cQsF%+`7Ns>o3PI=
zPPEb_0<5*dmB1X*513~aQBkm+%ENdyGD!PzO2i7SCCEyzceu4DA-!p&HY%aN#WU^f
z#}zGkkK|e<f$P?q!O7s%K6zp)bZ`JCnj=n9c0tUL!j1r>2*#&rMmtn%C@t+>3kdgY
zhgY%z6CR?HP-9X;^c<f-Rs_mEwG8{FP$FCt*8{B{!<SLUcXk+VBUld7B5k<B8p4w8
zyzpZ{3XpO+IjxEGtH-zV6(nFe$xXa*oK|va?y4k^F;X(5E=FowvC^Vk(d_2bE`((W
zl0ray<0iWc4-4uy%GRbC8IW#dbG4NAHGjZ<8;WNVTr7YE4S+HT^siLCy@O4*^QJhB
za1J{Pg|58~ERp8xq0eV#%HlySs9A@YHs_w+{*~0|x<XyrK{Mb-ATqLn(fJu4&arim
zh`LS1t<{<?@aRBe(9~ZIJWUMgcc)J&UoFEyxb;$TkI(ticDU2ft>V2sH2Y;l0Yq+R
z82}PP4xfO{aynJ7pQ_uHkyZmZ!G1^{zfN;qAH+>f?)3+@7*#@JQP7e<pEb;Ao^t9I
z@D(V+O^h3icQv9~SjunSJ$fjT$4Z}8zHscYHbEFtFaQ|$#w(uimX~d*OL3@PDuib{
zS9i)rf0t^l<8K&5{uBEwOcq<Hg7xQz0FTR>^Gjb6>K3srwY|e4qXMLMJ*zF*vv%D2
zHcM+H#4aO3;{iqiBh%KWHn!~$Qw)1R;1n1Y^R~CE_>#+8{?62{WVgCjK+I&w8R&No
z-RkfBC;llpv3taAhs)i7bB})Yq9MNQ^u1e6((L9yZiZhO2bDqVR^srsnRNh_ZVbh+
z!GIhOVb;7(eMatUhLYvpRs<b{=W+UaS4IB-3kO<)+*{7;6mg6QAR7vS#t9sXT%E((
zoj$kW%WXC(O1wcxCvTgzk50MiTpap2QRhS?Eyu_cdh?$3at{{ml*=ZMYC$;ONoPEN
zwVKj8yti<HZEZ7yhH{`O1JHE*Dq3q&lTy&d)b$I7wOzKw3hh>9W&@|7;8zuT51iqg
zu~r}uau2_)cSr4M6VD72q7Eb{KBKVb^R8o9b!nbCq>5QLWIE(y^Q9N4NoZi4boHQc
zDb9s(NEkiyLMV0$SOR(yI5nx5(grEW#TiKI4|+C`NFa=L9qG#%Wdvgdw&sBn<rRr5
zoE+pH{8filRA|o<M%iJUhF%EA`RPzg1H~c@yhs5Z!KtmJ*xpf4cQD%c<Dnm|A(BAi
zDB~ejk(`D?xgc@=Kc!kol0z(vc8KuE=Yqq5kLy*Wf>pJR`SMtq0|B0U)b`UAxQTYC
zjhGcy=N&LUhL9E=N0Dzabx_L00o;s(pRHF2S1KaNKu=79JLl<9OF2p8g@zD2Z3=Q1
zbzO<(idJbbT1bNOKJxwF&)$&9?4!4Mo<hY+!yt_u<c8WYoOHqDRR~nvJ}yvhlP$b-
zBvEZBRdF`v0a-vDNWt6rbg3<!RfJ{0jff9}!9Bi|0En*)s;>B15Xl}!PDXG)8j{*M
zMA6*Z1rkPg6eA}eL)Yn2Mi|;pY~W%%PZ1-K+ycJ1$E71q^R$v%#KLmHvNAwy5J%AQ
zPT*I0;%OALVFMG8r{zE4^r%9XU{%<%gST&A@+!>BEU`&)iV>B<$pZ`kPJjJW$R~_j
z5?SJ!Fj^N2(X-0^JJ1B^A-J{=B%iz}<8S*zZqhpS1+$+@gUp*uid$z;_VeJCz+_?6
zFg-!4={{kVLu8f>w-_9MjYsFaOv+mkwsx;xDTtm~Vvc2K*d$B|TnvTC!RyXH$f~lH
zB&m^GoGWw$deV8Siz<{OcnVi`RP)xW6UZZhobWnRLL3y52PATE4h2|PMC6-vaj|!}
zBoZ;y{VEuOyo(&JBT|0xT!Hn+H2IK0E(Am=<ucg>eS3-oE+YQ`mW*(D$m>=u;8|gm
z5USCxR5u~X?e*{YR4*m7KpHqDNkJvZIY2YUJCDY;FD-20SR}T(TibY>E^+0_w~yd%
zoRib70NsqJ%i7$<Gy#%$*br5@1b(^AYg_7*Ug>gaGfM<MeZZDUWIJ-hJe&@C_5T10
zv8#yQ`sQ|!Y@Jo1xP#_QoN&$jCma#$Sd9sm5)oC3oEB4@f1g?eS-r5eh(+X1v-zqS
zSvbM&rA|mb^-UmW1%Sbif~BxUOKj~7%9oH5fq4>qq$%h}eh+b43vFd@G;OFg!H!tN
zhqqwFWE^Moq{pd1238(s{o8T~;gE`JJ6&Bg*+q8bm0i5?PJ5=dXIP9kF|qk%C`L%@
zw>UK%s*`N{JS?BP8<feok~)#~^rj4!Cy5Cq#^6Z<KPf(ydd6TT^A#Nl=XX#C(AH8&
zi?<1mFi7N@(Y7qmlqV!O7;amf)yGpg9ZVXN7+))y0{{>v1~6%@JdzeAF_V_hCbA%a
zt7I~;BZ8*{{uORVFhav=b~wgc1wRU@PE^&*w0af^BPVSODBIHlv(o9vsi2kQYz67f
zC5(Gm9WJHSloBw!9`$hqOrr-LxvbG42Z7S15|-+?$E9?s-CdAek>VboTC8VPCltnI
zU_m&jWCRi19)wjwq#L!#l9jGVWmd_kOQ;0(J*hLCjAEGRaazhZS~E25xhh?iIX$Yv
z>TDF?<29DSfjH;ZqdCAIrDw_9u4mBHYu)D?kJmKAIDYk=k`6s+$p)H918mVHTNph$
z)NTMA9(z?i>?z4Bo|HJbEf^<aP~;Pl%}SCsdQ&4uaseG`^j2pXHJYJ2`_AL`h=pW3
zx$oMi2R*r`n{~(lbL&w!*na*oL-ut3G5gZkvWjv)TCyNU11c*qWFz>^S&mcJeM75<
zeM(W9EIbMU`FQPICy9VvNkIPK{${&YxEMb@aULUZ`iLOpZ391@M>RL3H#LHl^*V4u
zzdZ_({HnFnl0H*X$_o$&9Dju%iAN;oHOE@~=DJwT{o^({r-)=>o@)984agi-j3(R+
zb6MyudKp3|1CnSdCr#W|gTxzwQJYB#I5ix|c4bhlkG)a|oVVVog@nWc4;0}9h<Q9!
zCc28uh(N^TwrSsIBe|)BZP}@X93Q>SbSiY;+B0&OVj~F|=9nTQsi|2c{3<<<oDgeh
zVdDPL4x?QK5C&`(tB`5C*CDbhn#9@8O=!U*A^;95-WDCisxbQ+r&H3GVg<l7q_gB6
z^$W)RFmXrKsjb-kq=r4YW5W(=C({|vuf0o>r<TE~7UU}O`8AB_Qd>x<)R$tX_F3D?
zel*q7FyD5xKHj}L(;n=Tka1Z1E9}iZqU=W=m<i{MQ6+{427!9Oob#G#zhc<Mbke6N
z>}58YT3abIfO$00Wis+cN3CgF&a%E66{ObDyjcdVbE#foqgou{f>3e>b5^aaE*eBa
z!86GDv6`_wYZ1xddXbS)K<pc2V7y?E8HO-B;;OA%t0JjEUsI&h^o2%tmT8f(l|e9I
zdV2P*rqe^y;nEu7;Ul<^f6FMCH$UTCB-ioU=4kDhC;*Q$0YDy}wa@B4Cz^SiWWiCh
zkc+gB%DEJ8xz^`xj-nrk&!Aq*3^oer4jHq9`Bry|e0_7`m=Zf{V{H;(I~LA!TwU9|
zs?(BpWCF*W)g_hDiO&b99SEn&i05xpd&8-1FNh?zzk=fId2)nHZ<v_?`A#^<>sfZ!
zcQGG67i1ughZv&X1!;uvT=`B8K@3!b^{13FZrb7Ys2^N(qR10EJKMQ+F>ieCcHk~L
z?LEz2631_JlSEnM$!rsxla6aMMv6wYTsBZP(xmh!+tRH`V>;e6kv_<Q3JEy|n%GTU
znEoc2r_{+Uzykw33e1Ypu4QQAI17SF;8wl;tId5PtYj59QPdGs1np-b8*tnMNezs;
zg688=XS%s-mka@vv0~W39G-F7q>@Cz2LOi0UUO2t{4Pdwu=BS)>b$p5M5Hzxk&s6i
z6;?!DwiDbeZ0!@^9uIPVAJ(gh8yknr$2lbAnyW3qkN^-U9SA+?@T7ol0FL0}r3@`(
zUV`b=^X43>8%H(S_<vDHvyRbbi5@~sZ70ph#|3!Bad8=g0Az?3UD-V6t!e4bf!xT7
zSb^nEqaj#luYP@LJ&KNu-_&n!<5^@rP?cD;kVc1*_4KYgQN22X@A5*+k~b@E2lMAO
z(vkp{F?3#L=gMZuC;gM}T&AlCNxb;bq;eeXEuF32vWDi;y|gm(no@T*agU(IIl&+{
z&;jl^2AT&MJu6co#1;j>z!=G?;)MB0I`ba=jh-;vpXL2(G**bTh~tb5^#|Il*jz<#
zGnwKNK_cyzJm8*~EA9_8z`cKJvRa3Y_st!{4Y|oE%eXhV;EdK>g-XWJh8P2b$<H;d
zW)Wt#mNzC)0470%&QBkXN9Jm+?XugOcw|zt6$U_i9mo1qF2gjU3vp)@Dxo~fh|m+x
z(Y1l+->p@a+<EGtV0pU{haj@!{Ao8l1`H~Z8wLOlSo4GWnwVUOZDEsh8-UEp0sFl^
zZ}aI=or-GYdZbFMGUUiZZe!7iWBjO&Qr4><m%UUF7z`X9wR>Mckm=?ytR%5XOD|8E
znDg!qMP<ZItT0S)(8(_(9Q5iBp{iPoVpxzRr1D1lnmlg@?`=8H6*N!@8*`B2RwxQ}
z3_&3KReO|cd)cCa_r@P~RPf8s^ffk}bM{b4Qeh=aDCFd4Ykfv(40OXbn0W+pMa~Jq
zaqa#UU1gTtyzQW%kb{GTBz-+<S>i2XCp@~!M&fcvY?1t$p-IfPZ5bFC190jH<Z=3D
zgd)Y<?*RzRvcoEehC|e$&Q-stsxp>VV;gQjNe6y$oc{ov(<7WT206L|mB97?01A!S
z0+6aeEDke~igpW;tbto{?oxO-JQ3VfuP}JLvbh1b0#8BhP#vo<B~H>oAaPPA(D^Hs
zAdTMDM2vYElmOTRj+6vv!P~}pAatt)eVm<=E1=^$cp%hf<?U{oOGbF3BoL<uJq{1A
zGyyzoZ6w}If@Jyd9fnGeaY=WlO=oaolM)~&Y>__YW%jF^Al9a1Y{CnS2J$6*`H$Qy
zexM)DpJk^ck-N=sEx;!W%Q@^u(bMWpF&S$Nra=fs20{P??a87GDQ;!kZiS>(Eb3Se
z22UCGt;DdB3wbVMRd}E{b!8-lJsfvZDy*?0tYH~tMNuS7hqg;#_sI06a2Cbp)0TC+
zwx7vxt>np&vMxsl>N|?7bsQ~pX0b+&ISDCl=PelLjQ;=^*0f4qTIn~I(Ole@QnE{K
z95f~)jC=0f!-4NvP8AR{2Lv!G=x|8pi-A1%w^y!-deU6U8i=FwhUQi0fuDMs2`;0x
zYe+4OsALi<NSKiujtAGcs!|DJbuk~_D9MpdONOb6vUx>|I><p%vi#r$86Tgm11nyE
z_L)>d(GbO+GNnvsy5rdKP{byTG|{V!9Bv(n_p4LSDqS#{9VJ#I890B(-jhs~W1NXz
zMYndurCR_32;Gk4XEX?bWo@iia+B8`s`M~VIyAyna=0YO*d*0i;ApNSiaBDJ01e6a
zPeV_&iHnluNdp8Eo+^<tHX(4xvLd`ut`<O~9G_F4<|^o%8I{&I+kjb%WE1Q?KBlSJ
zN@8&&WGt8}z^>&gdiAS`77Dtl;9#kJz>)1;9I8sq9Pdqwk-ezopvmVQ1xg;%ISYeS
z%tgq2b@Uh%zh*e#P_Xp76YVG5zOq{aIO41!hDO4#CbL%C1QK|wR_?GiYQ2pibIh?W
zoxE{Qhe#}-mgmxk)W-u9gHj;znqO9?_A8x^lSshIoEm}j$w2K=okX`*IP|4k!pDM5
zTw^$|h?e5|8SiB3PFL}$&8c3at!a6z>_##THPZt<#YC#gJL)wA_9-QZZgKe3iDJ8s
zR;K${Rlyw74e0c#Ri!S2aEj_E)6;fJ@lF;{j=XwQUv0^!3zZ|9a`v{+7b4u4K@cNo
zJbF}yA_oNH(yNQLQO6Xf_-B`*H0yPc+@aW!n5tkY&%INT9hj3+o0W5o)VWqZr`D!e
zRV`;ARc-L1xQK(CjG6#t1cQN7vZ8WZ6vHGz2ps3VbIueZ_cT(d$ck@LH*;K;x|=V6
z&VEpTopq)}Md5j_OI>pJz>$xa7^fFX{^3zm`$thAC4d7bAK^_gF<<FZAp%fI$I5@D
zNY0<$%|%*MobMDqXsya(G7mj!K!?_(Eg0l-X*|^(7L;&x9_W`^JqaU>fC(n24u~>&
zCaN2QjC7>)fm|MIrZ_nLq-N_rg`;|^F^Y)YD>qCEs_qHEIi@k@wODFhiFGFWmkg+S
zckfBPG0CdRbHL~YARsqADqbF!VD^&kSOH%EF{#!bGDycxX&^*6Al0_FF1&R06_bTH
z>{aB-#w82XQ*al)1uVAHMmXeEVzMb9_oLhvrLgKc8f&?3kBX+-)N$IQF2MEaP~!;=
zHj4%#<Q?5=L1Y`a#Zmi1Cj``sct;zm6&QCbotIk76#;6L)^edF9z7~lyDh?;RG(-i
zKqu>6Fi~1uhVEuDbZju`-jGTeuxiBMOx<x*WkVitd9I}6Z4B(oA<FWninA7@ENlU6
zk4nmlQX2&Is{~{WesrCNX|?)DKY5&cQo(v6x{Sn0134i<C-bbtW!r)XC%CC1NFBhE
z<it7>Qy_j-jNulIAtsrlsN62609CuT6DZnNRxyG7KQmm-){&^%L?)WfV-`tSq5?!C
z{pHB6iS)~B?CsUyc}kJ6BOvzZ398oK74bE+<@B_WNzXRYl_&5x&*faUvDJI(b0S4C
zFvj&DV1vl2%mZKmK^$YbuHt<g#WOHEpM|8n#sOh#wnP5_1CIyus<$?pFkqKfTCSBK
z;g;qvIxv2}E05NO7C8mpt$~qSnlxi{(hv?JI0m+$@Rg3RLTH+`toJMl7XD#5>%hni
zr`V6iv^1{|wUvy9;xZ&BX#{jU<Wx>vsJOw%%CijwUulf=U_d=PRH<^tR7^6+Ndyys
z4u8U@p43?|jmbH|$74}N0~?>TN;0ar89lpE8C_f)Z0t)cW!S#nLu8V0F<kDgY$I*z
z4jh&v9V@o`DoG1u;FS(Z?M{<Iw$<&*Mj2d?6akWY)=ICvV_#)-d6okJ4nR4{9Gue(
zPR9UX4&>LPU3dYs$G2G_y1AA@cO(iKh&?ge^QIpKYbz>?9|ySr@cM<wecx490=g5q
z&f?MMaYHQf7^98llRtJfEPqPUgG{{16M1%kbr&-Ef1&2PkN8GBZOXjX`gB>#MP?NU
zAMg>M)~L(i=}dv0r?`+DN=h>^_2kuAl5-$fs8KYpaN__7lL|lJNBk;Fd2O=MFxbpC
z?Oc+6wY=UDOpIFU?f~UhIMkERL!akWC(z_sNL?RPX#mJ+3Y?Fi%_{<SGwv?Yl*8sa
z8+QH1R1AN>y7lC8YZ^=0vm(k&izashatZYxk2SBT>9dH^TYVn!0*r|^GXgpNMPOVj
z#~~6x(J}rOQV;7(l)JJrILJBeQpBhl6E5Q!KR>8k_NdVsSr#?HW*`il4AO^Y+6l-V
z0q7_ZE2hL@l0m^!jtHj17@3(%kU|o@@_47aH<RU)mCjX1A$@<9Bum50naY4b9S0(q
zi!n2OmQqO#wC%wF=POpVdy#*09GxUFARvqkg#+=<GgKsS^1CX5xE26<@M=km3D*sf
z0)+>+9V#B>qVAaJt>!o_93V3e;{;V{S>%|J)Uznb$?Ko%R;+@e-6_FYZP~!<$Y2Nc
zs)9C=5ETHiAU{L6<d5k|ZZgZfmp17fB;q)M!?p<LC-B{q_|a!908JT1HuFb@4a-K~
z-e0HksGdiS%#MT@+y?|_YYcV#MOm8BQu5^6Ics%Al}O{{Y=4eF3KAP4WR?88n|v2g
zBasI{ar}tS6!?X;y~J`x%`|Eh%2@~?o>_jLhO1l7(a9i;VPsrqpjI5yrUm3#V`3UW
zLE{<p_WuATffL~)X&^6{Sg=w?G1qVT?V6_|J-ohhkl;25?fy+(mSHupGGS&Re83j~
zk&%)06%1lG+=fOh21qOEo++U+l>SSsZ3__036L<rQ_ty&O{ihO1ULjRCxP!yco}fO
z5P*-EE<pCERF#(<H+3B<i4blWCnR(j<QjGvpMXFZB}m2%C{wr~$Sm007b6ucaRTwI
z!^%T~WZHROU!?$9ghvt<zz)C_IovVGIUnOfY0GowJ-95W0cCzU<2XGjk=hv)q%P)Q
zaEym4>(3{+?M{YSa@Nx<NJC_q6si9J^-wF71Pla{N1R4MAdYd`w(Sw5w2~t#Pq3Dn
z3FX>3#?u+<NfkAvqDUMi%xH`NW+=>~aL5dOm}4WoQ-UZ4qa0T|B1uNw@_e9YqYq3T
z^aCP!ZtXYR**(-Th9hq5{DT}fV~;{Adt#cs_43Ve1(}vJDsF9&nE(eJ_UEwm;<c_s
zOLn0oh&{|cY>~*@k=%k9dlBoJ=IvrH=6O4bF<<~YoPR0-8uoKNlrmdf+C_5}<Y~G&
z6o%&v8CYP7WyPhFS+nj~C5bX)XWr5&^gIp2)84ghNt(_Jxf$ncfNfz|$;!wW6064q
zhR!|fnAK$lUnDf4p>|&_h6-Tq{O~Dt1W1uhWP({DF-aRKMUgN{Hh4Mq>}s~IEt397
z?B_Gv06e!Vjxp)moYjYtT|&tX%NJ#og5ZtqkUILFF_Tpi)kVq;j$)9oKv)7u#~zvF
zQ$R|=5(O6prBSf$2RR2h`MVzVMl*&WlYz+Ntz9NHGsf;vAO&M_l1~{P$Lmo@h?77{
zF^yGBr8<=-^y7*Eo(p+pmuxPI@kG*=cG^OYtIyu!kOf$_wij%v5l=9Z6~gVv9nbh2
zRlP#Q+S;x5m3#KxFp?3%e)8C!cDU*eJM=xOfRAL`;gGCZ2bRtW?UB}+C7QZpMA9r}
zStjI?0op}$07V%KumgeejzRqEm_;(qWk?x!a3jX$KD?fK`qquL)TuEuLd={3OJsmO
zGtc2&H07n4&n2m-$VtdfDkj{gh3is7dkZdOeaq?8)Zb}?IbnfYS#}_(8HZ6#-<HNY
zR)SpGbT~QbLmO8-5tCDB_8p&c7>p;DT3KbbQNZSzD35Q-+~%|8LeG#*E=VzRNfsUB
zW5LBRN>Jn)t+AKC2A%*tPc;&w7E+Th$921)=hm9n1xe3JuNx`~ahY4F&MO(vm)T`T
zqUuSxB*7e0O}Q#bU<Yc9OuS%oN^UvFYSs{}maLgd42`0}$TZ!Dk~76TP77k5B^k#R
zPL*f0iBf{-L$HC)Xet5r^{YUJJb{{UMQ*A2R&t?VxlyT4v0M<iz|XBe%)mc2NNv@#
zw;<CEl$bc?xhhkuABfsAgV=%P3~{@f1M$Z-FWE41deRt7Yo685bZusbMuqw>;%k-h
z3Ix9ZbCn1A*H|S|FsBC`isZaO{{SDuocyEu*JUVEO6lrn%_i+_4xxr!N4NM?q9Km8
z1g*7{)QK*Bg1VHNS{PK^YoS7LGm5D4Hfu+6wsTOt0fEI=v}9PJ<~Oh5K#-{W**=vc
zTb$$yiJ@WJr+Q9Iw24se>&9wenO-{8R0JFm_|>@Bj=iflHWn&eJ3*c*s$Q0G3Bb*3
z$r8$#BP92%o1Hz8w<Rui!pPdTVYCq4t4axg#!nT@+8I!QbH!>$D*!TcSkC1maI(mr
z)m`8O9x!UOcLgvGaaPvhNC%3=-5M)0lfjIFGgN1Qf=C#x;!)I&Guo-#B84Ozno3L@
zPIh#Ve~nZw>7Kc*xdD9TYMi#=x{hl_B1%zRvYvBSQsg@Q>aJ}U@u4l5SZz7YRnVG6
zz*zL=tK2Mr9HBo!n%vT~?65K(D@OLx1zdmu9+aJaRyfmdQ;mmDxt3He(A!4b`Ii!G
zU-A5_Rw%TnQI=czE?f>gh1j3>(`5cjNpo!pVo1sLs*I?hfG{g{R^+u~We$w7saPya
z^geye?oa#$RY&Vn+iLc9jhN%o6pY~i0A@6#elFF^mLa(5+O1o`J<9<EFDv>g=Bnw1
z+B-Gzs+<|FXJP;WZLFh+ey(Y!#@1}u{>{{G8$1s=5TE<xRw8Kj)&M@Wsl#Ll+#yfj
zN`D35el;_At3%U)T_Zzlqn!ErjKBLLarv5wMA9;SP1|j4?w>IDKUI%8A(vR3aopfy
zwKVnCOvL{H!au1bMEs?-sa$?cq*olD5xhV+wT{Nr9x-id27f%(jjh*+b#f%X)-NKA
za`9WuwTJu1g+c!D{3|yWwKY>uL({a)J_#J$+*?GqYTXMfynKIn0BfJ|eZP@*j~WoN
zFgYDFQ|Q|LjitO%!p7veK5f^WT{jNf+wUKs#ZBVt>v()Ud8@{vQ)dxyzS!%J#<QB{
zMzEEc<z6Gd5b9CF3hzOd?O2x@?5*;uC_|Bqb<G|k5kcbX*yWJR63z%>KrDw0I&skU
ztuGSacwXkl>}j@hK{%E-ib7b7VD3|%$Ef12F-cg7Hr>sC3SO?S1hC5LB|;TPP1V`>
zPA{?QFXk`INgFovo-4=n4-vMDWvay(Qui^$VkL96)<ARl6JF1!>sHpQCZ#g|`f^I(
z^vM4J8qQEkT*i@`apg9APAs0w7gp0v86Z2t#Y|(@Bc*Wq?vde}*`g5mtUy4*MJ49U
zAFr?0r`J4RdYW|C+G8VM+8x(1DFhgg8}|PI5`)3?>s)=tnWK2>DX(-bx^}h(`;9h2
zJh^>ZGyOk7)~#x0#J})<t!BdJ*6R9L^Oc(3;bj>5h82;iT<ao5mr{|g0*rs9+cIQ(
zu>N_hRi9PRFIqU|xw4%P%z>~E;n0tI+P3k%^QcSMl43aXBX2Fp_v)wetI*A+XNJ;l
z;vz|>u({-`EBTP0{h4ZniFIrYi*V%uz?LaVQY)pNZ97|t7!uN3mN+onC)wuz0D!vu
zt@>6w*jlW{E%z3VN6l|?xF_g(5ko+k1bXJ8mi|D!oG5MT!b7+mWAZ+qN{Z)Izq;b$
z>RD8QlOf%jORYL<SHVz6P*CMa{{TIygh0)LPQs*-j1bsArf437aCuKMB-m6e127zg
z?^Z5tf;ce-bn^Vg%55b9BRKc#_|<42mg;!ng>xi?1s${g6|1Su4EOVWlM8JG3j}Su
z8;}owQ@H+A0Y&_#vc^c2T=E8TrkiaXj3kk8LIueBkSXqptb|IWl=+vY+!8Q<4r*;F
zb9;j*i2{`}XSaW^T2Ej_Z23}4h9h$Pr|Ly4>|Redb78kICz5%oZ{v<Txl$6_6`O8)
z?EW9e6r$YuG0f)xZ2%FF+0K71DO|ExNM?y6Y!e6!H)Ii<{vA3}!bH%OBrJja!GX~8
zpU(oUXqLgX+emH^lsw`WKz6YVcK#gH6WdD!mrt?QHI<+T9A$Hno|)p6hCVBoHn#wL
z@>~M0NY3HMKTvt8bp1{3*$F=?#A7^XC`iaYy$w^2P;8PmBqBQxFmOO@WBF5v32_je
zK|;7Cc*w;jffugrKE)N?p?{J>Sq9v)Iunk4)S822jbjmw8T__l94W&o^!k5VmGvJs
zbdq9O89-LYBY?R4G1Syvd)ZtF*_^}onL}_v9F_Wt67D8GXA{{)DgY*j<!*Q@#tl_L
z43bB<JaT9EgdBou`Xmbq$W)l!z>!ekY$SC3YL(;+jPV9{F*^icbA`#KgwX>`(X$Rp
zh9MaA%@SJ=DNpe+H~@kv1GJ%wsBw;`jQ;@j>T7A55gE#|DaR+Ok}?nY)e<r&8b&cj
zPV%SaX5bOmp2NK*wDVglFhr6yVYww;!yn<>gI8`Xq1!nm>^Nv&7#Tf})2HiI>@UP+
zmQA3vW-!HaryV~ZdI6ROr(-6iB*NI~sVrq3EgN!V`#wk+#a)8J$5&|n!*a1q5w|Sy
zkhARr?yop+U}~w+68<UftmTc&c`a)J-6w3YUgN(Nl?BS%zuhG8Rr7)vP#$Len%YAR
z&@VlO@r_NQzT%C~%%q-x;~@J}j@?0Io*QV3LAj^4-+&cIEQize%}Dy5gRIOhE=<}*
z#saW|=8T^1JrA{KM}0Pxdc|jk<ngjq<S_dCj-rssZ1q^AvWm*_U6R^Xcv(4MjrY`h
z9=$5nybYxbm$p%L8%yQIG;9j8o^g*{e_F-88`-aI;F1ezU*rXgC_TpSZ+g9BBd&*i
zY|zBbB#231H>TW@SGeQQP{e5H*Z%-z)UEXBkC$loQOHR<xn&EyW4PqwHIuH-9q)**
z?x0{2TbA<M8$lUAH$J?d#-VGEm|K{NT)^PLChQV&IBuCa=zj{5-InrphT%|2aV8yt
z{K{FBpUcpD(1yv;Vv5RWZ(~p;joJx-$@3Q&0QA~<6`yx{X0o*kj07?>5>9cQzu`*q
z&kQr$EP>#NkO3J05;+;@c<oRUXPz}OFb<#wCnGrj03w))CYD!`<lE=4-10F{4i8-Y
zJ!%r@8Pyn-kP*`dw-p>R%Wmu~r*Y;fMk9==;E$oG%w-oRAd)~7z<hTTK*8gcqi_f$
za7|D4_Gx2~+r))XC@Q1|#(rbhpQb60T6wBTVgUR2<%eEz+<hpX-H`_1sz4apau{PE
z&>9++7X&yhCIIBAZYxe3w!ldS_{T{RvPEKBJ+el~>ghNujl>Lf&1l)QbMDwlVhIEu
zx%RDTx3$bBx|$qGwnYR20XY~wsjM4rOA}H=tOAKQfOs1|Y*UOfF(p)xD|Hpsn7i~V
zp&;|lDnTjF2k@ZVNsNUekXuRD1RAvzPNR#l<eXD?oaZ$lx0H-+G@oLW^R$n8cT08_
zV+@|0(@SxjRfW^0U<h6hJ!!{Il}1YPXy=D;<(Fc<@sC;rgN|z4dQ`G^0;f+8$ipol
zA4<k}ig9)>G^Whp%0@?1Kn0H+*5L5d00@&lrld^>pdh&V;<u+b$y|v-NWlnwD8U%x
z@vewyP0k!pG&7!DX0*If9JB0Ts<Aa?2HX={NumIGa43Bp00h2s?@yU@A0sln^}qyT
zoU;Lf4O@LWBsdS8R4r<wfO=APmW)<tiMBgrj(w;xBd6Z{4K?E^c+E3w<N8-Tu#{!c
z)mEA!HlYbB;ELq6@I~+k`=k2TXb_Qu*0|piF3m&__DA)s=Y@qodMwhNSxMQQ9I9QE
z07>)%HEJy~>6j|p$XT(0x06%pWkvQ}5~4Cr8*g#myQp>5gH3s(u(gE5G3T=f1K%dI
za<j3ch4p6;x;@VDj)54Q5XTs+sp00^A(DI*8N#M=DNl{%vyx$L2Ipo0+#Ch~^ZC_F
zpB?IROy^JXH20B*DTdpD)1O*)eM$FCTP+7pxU+W`GZ~S05K{~IR^_LJyf|$H_cC0&
zU;??vKG+rJ7rOqVd2u11P?}dH5<}xZfURvePrlY|8dcQuYXWYV@5@F$oy`p{;GdDz
zT<Crff&Tz`d2<FxDy-^H<62PoE5ma@B#!=RM;ym0fPXPuR98AZgFFU!C5WH(zFyWN
z2d`S1&iV_Du<7?wva6El(EzK{=Fjx0Xr%0QC&AhSOko<du{Q0hueX!!>s93NE}b;8
zMQyDIl?lvdEc5lvS&Lh^nWIT0Q@K=b2&D1p?^4^{-rGthj#g<fQ)JO(D*IIO_A2YK
z&r9Gdw3(G|P%b`Kk|sdLs7v7uX%U(jqm%=W-M&fuE704-&d#x0!d~HkJBj&E2cY7r
z4-hm`6E>9)kxAsS2l-KE7Ky+OA6JZ(lTEtZI|zxUJ-x&k65CB14x!^C73$|-w%fV9
z<!2b%9HEMz#-m>mw70_DEnZ7vxh*2$zxwq&j5%U?P?H%2hJRW|V!#aKSFJVPpL;sM
zG{|HOcxfY2Gx=3J-wtW_(8+HGn*>e{M2VDP{(U-B@&_umjPpcD$Qc8k)U#Sf>&7^)
zy}Tb`B!<+@cWH12;O!px*nWrgtUK=yYF2F{LceN-Gnpe&0OPnk(r{w2%};1oBy_4Q
z?E_??;<aAoxdl(sndU;r_lZxDk#t9Itcbu~l{A`%oV-41e#d2Sxflfg6r)5<xsG3;
ztlcEFDM{GOn&9p}^$z040<X`cPJoayI_9gTl;wsa$pjo@t!ko6WI{MpZ;`ql2W-=2
zzjcVm6O=>F)i|l-(k|s<c6C0TDWgHUCzPu~v69$kByvf~J@ZrB+Zi7Pf~e(~^cAKw
zIn$D(ig)&W$$(dqeo<C|vdmCh*u<t-<O<^`fwsvY_dmkFPEAL5sLy<Y2XP&;pOW4`
zmNoo4pL5Mi7L#*u-ea5+a!ENRuBMQv*k=Thf(YqPL2J<F;ujXO8DIcmzERf)+O^+T
z)S-e)Yn1y+NQO29<d8wlTiFCIqz&P6F`Q<rPUy&ER#g}|VsV<y!Yt8Lk~mXsD?FZ9
zXY$5QIUrM=u5N~8V&p2Q&!FIbRiS+pw)bCXv@IKfjEa7pK8Uc&xAE$t?S>QV(nb?^
zZ0`4|l4#lvGTh9zwRxtFGy$Y$3aC1hTYAOq{f?z3n=R*<VA`z8+ztW9;nJbiqto==
zL2ayBMv!B4=H+Da^X{BvcjmM0?HWdBU`|+^lh&24IY}p>V#`{ePSzmQV^Hr2A(6Qf
zq2ZOim}FAwa4wswEZTg|mhMFMlB403PfkZ5j-Q25zK87hMl!&ipprdJAf2AUp~w2B
z^8xMwz$5d)qhTg>kZSOFwguDmK#8a*{lxhSCO(-wE1z?<kD;z(Qq!f=t_*H>E(ur0
z3H1bj3l4-DpiV{)PW97imw(%Ey`9WrTeXOVC9rN3bO-*LD9+Q|aA|>$Z)YvbtYiR4
z-Iq84dF1<WYhF9@vW+t8AGX>i6h{95eFia=exsA0#;IRk0LyI=-)!+LWrE?PQGzq+
zgW99Ef?J(j+nE+8ZPAA#XxstE>q}59%Mi7ZUdrX(06;41hK;%4{{SqC&LK<jz#)jo
zHM?bOZ$gklGLajw9Q@-ekD*dI^{lDm+KxnGJ&XYdf<MU=TvoA80?9ima~UdBka2*2
zp{qhBXkK6w5bY-%1JfUsB$2!~QOH~n@rG6hh6Q?O^reAzv5oSf(Nrls9Dr%=4?;N*
zq)9hlF^)qFjEbL3Sk9qu6wkF<KnoSlKEM5HuPA7u5lGGxaCK9`Iq&&Yma{#*(#UeI
zk}Cnylh|mvt@(mqHNpm&nBhlp@}Ji|YVMs9-nF%WNg875B4A`U%&WH@v$&tivM*(4
zjecAyEyqxC-n*XyX>BiwOpwZCXe=4xXvZbN8-G4{_NZDUUhK-$Y!02PNi;DZ_?E0v
z%A=s#NAVuzvHnF;)M018yD`g~87>TvvHPcf7=A&y$E9j&V&hbp*urCBJdJU1>B)Ed
zsxhCszjb|1<5|*NtU6k+mHXju<sp-(2a-qf%^KJ=GH)PjNxZP?=m-VWWlm~zlG!7M
zCy|aLX8EJQj!s70_ZZr9{uOB~jQUuTX$c`)Vw?~UUOmYbm2_fwVG%~+bO-GOpO-x2
z9@zD#xV9F1XMmWA!41YvMrvzfjq*vf0tgIw1JKoUO_8qm!iNEY>bdBCm2w|43D1%d
ziBfPtVbh+yX^U_!)^W=T*h2#xk%h}42RR>FZ0@spO={!>1f2Y&o;mvadm0{CO{6kH
z51RuJ<?uHs_4lff-I#pC<%dFd1wSc9=LCO+G=*|`ZWZHU_H{`QC6wSW_Z>f#SMxlF
zY!Xh=uB^Bsl6g{fMg*QP`RSf%$$lsO-NQQ;QlZbxN58Eh6WK@{0UXFBB#$aXg(LCe
zqPt6F3nWHHESQ!uFd~p-b>tD>H9(^(i2%wI!($^gBv&&+#o=;<=Wqvu?T+H8Wvf$h
zG?wBQSf*D3BAHgtJc21NrJ3cB-$%M>2xBN4OMCnMY9yJ2YGR&9=29@Hp!y!wJKfE5
zwWTcbFU^8-N%f#bb7?ADi;cgzaCWy)fBOE_CA5(v2&9Y6jfOA|)>Hl9eSWnWEWtq-
zC5c`z0OFotY>8ZatiThDV9+a?7R7@{31j5Q<e1%n4W2plJW{okt8meys!0(6ww#Rf
z{&=b5vi;CU!T#`c&JXjXSf1YPW{ZfF5WtM!ar~;e864=SV478n_dDcy9Z6%jzaxsG
zit5A(0*(7wv(WZ6(*$;7AixXz)F9*@c*SDs)}`;f$Ya<h!3sGWzx{Na8XRVs3^NVp
z<)Knk0?K+io(~42iY955a;OGMmOK&9TDfmvE+TY~bI3OVfxrWAJ$|&^LKtmzQ*2R;
zHu4B$A9bJm$G@S)Nkk$>T}ft<6;)&hX<R7hILDwhYTCeD!#fE9c*D73F@i8j{CTSK
zOB`d!Fz<>vS)(NU#eE4ML0eK>+t|ehr)UiEmvo&aP^WIiUW2Ai?0p3QXEn63HYT?+
zNf=GLP8LYWBoAJFYQ5apiDL{JJg`(eyi3<<s~1-`i+6HI@9oQe?UhOq*Nh)eOw?Dh
z+DfQlnr9#dEb0Lxp1$Ly07Qr<L<k6QF`Q&RKf<*kwn*5`9%5nxM~|6Ls5Ow1Gz`#?
zKp0@kbC7%bR_2v-OtOJ<8oYRATy5Q)1CLImoYs)Dc4l+GLsl!3!xT_3I0KB;qp7Nb
z0)yy4#%nVx6OprNz$HgC0vnQZp60GtS1qJus`B(Mja8VDux5d%vwr{_`c-I=Lu6w$
zU<DZYe;S8{sJ3HOqW2~HQ?Sm=R4+8SsR78wI5gG=vh?(>dbH-gBS=awVFlF6FgwzV
znVGu&6o3{yj8vcn#xPApDRVOAD<SdCFkTN@w6`;b19kwaVaW$46ozmH3s-D#O4_pr
zU79BT;YI`IqdJYqC+6a)8Pt*UP-P5$_Z3eD`Z9gLa{1J*M?;@#Z}zRoJk?<`{{VPm
zoMl{Ok&1_es<x3zyn7OzPJHAwK-!e5**Q7u%{AqR0ALg9Dy-!KoE#rY!f^n`Ksmp!
zPj+afPDQoUcORG^&XixSc?Pf^XI3B{DW+Llk(!lOuX4Fybi(!)IW+Nc0T{^1>s+^+
zDD|ZhPEJN?`)a+#%M+$%hyr)ub~VI!kcQM$hR@15{Od{XXT}a|2T^8e!G5)*D$Y*L
z=n;xqoqUqV6wx%nOnLd#{{Rs5`kJY%c&0h*TTijm#jUv{g^~9#&OK`Q(dE{k$cH(N
zOsq#>Ff;nsEvni*t@B4Dtt$*+$iX7CZo^Ab0A2dK5_<#G)ycF?O40<mxwnxm+mPd&
ziqP=pjUC*pcW}VN5iRAZ!!a2BE2Pvy>UOfhgAfvVdz6sM-EhP56*mK(@WeWO?evlA
z3n7j*EfEQkyRdGY8ttIbVpxnibZVk?%b^=UDmlsN)0&S+f*lQ-+Ei4QII+LV+<Wpz
zezh68mSqM<^3<>;$jPH^K*-hf%WWB?l%SOniZ`4yhU0;bwLga$t|gVML~Ar?97bOZ
zM|^!NV(bgcAF^Ft3xt#AjxvCP{WHf-I~uKFrA4Qz3u}19!H6v*WVrtT3Snd;YZ5Cw
zcd^A`6E-&<r0{z7^{rcL`$dX4h5rEB&>XTEK4IVS6`Oygt@IK{b_zQK{;cf){<Xo4
zK6^{1ifI`PWHEIGfcN5uaai?ty|bTDG26j2NTdjsCLqVi>(@1}JBzy+H;Hbiw{5bs
zzBY1rU^y7|u6>T52A2fdd@j?-6iS8yrLsAEgVcN04g7k&#_zE#kWB1LNGIA)*VjJu
zTxU@`+gm`AHQl;MiZkXm3D2OVj`vQU;#Ha05)`D65>yOy#d#E_Pwgg-@!ZH9i5#4f
zUZ3IU?NZhWEmBu@Qhe0_v2NJspTeElHt1@y-G+tqS?5U)%vMNpH}l0sbK(yYTi&bQ
z!wg$+Oky@wC)YVWYQ?qwt0l#(aHN63W*%&S2F6Bka5$=3r|+4rbt}0((xp@ag;$LK
z01qSa?^5nkv85-Ao>hW%NQ9^eb#x>X>_=~U(Tl}4?_nF9eWi{XCqh6x^fl+YjoVwr
z0fpnaw=xwftCJfXb?uYdl1McRs}XW7%3I-p3gA276TmeovE6h%0O?v+h|I5ZV+<xd
zjp+MaAH$4SGkNg&#7S{$a2h!n00`U^AL7XESb8<}_K|cRbQd;H78p6<LGFF)tI;)`
zA|oC(!3Mxv$&oUEpGvhW38eQ&ITwR<8B$qo(QYD%ik6A8N%kFS*4kRcz%!7;s6DH!
zxYzD4jLWCo`75|#<BSkSdV~E9aax~<V}ayrw@bMLmE9i<F`VbO<Z0c=mk7k)OAB)t
z-r$a%YP7c2*5r`G>s*1?E#~>7d5{*s2a$?%-86vhn789o%GToNM?)?AQ7;M(Ju5zK
zYyx(twPX3xgM!%=EEcbJl1UjDj1qXsG}DR|<n|_QT32iZ01l?0H}bT`N9pJ|0-`#c
z&^eCZN}Fp$3bcqzVCUxJ)~S82cs9Di<y?hUblNk;Rr?ChskU`lwty7%#&OM8Cs4SR
zQYdDT-APqM$vtY*UB{u?32tD9`&68eh~$-n-yP4rU$)crn?1MBJ*3XXNkJwQ9u5vW
zP_1$DvlZ+$XjxWmKJ823fYFdhsU^}c;+RJ?F~uV`0zAvRJoczHjaqBHLgH(ULKxvj
zXyZ$DBxf1pzB9&am6lmqgXF0vp>Arq?XYqh*H<t@BO|b83~~oN)_jtru2@8>G1D2U
zW>|w{jFHJbsjqjDg%}6D4c%%r2DUD-UCIKWILRSt!gfVv6CO`YR&pyy*(`DDPZX}r
z65u!=PD!O`rF#|1_PG_ztu*f=F=9?Kdg7P~2lO<A_n_7$pejgQq|vZqHn2Gd2BRHm
zPIq8)lYvMLOUcFT;$Wd<a=u_310cuFJvR<dzG~i$<vQL;BcPEZG9VzF63dhLRze-O
zfQR{2fyn8`D_ch^CEe6}$}2@Afwy3AH(>p7(9(MXHSHbL2Ub$7V{(hz3{FTrbIoSW
z0v%fRHGTH+?vS_fY}`9^{w(6Jh-I?1wKpsgW+Ff~<-lwO9@yFlrb@|qs!JS+iLT(1
zH9L0Y$suvjVDZnjB+5D1g7PFJ3}g^+LH_{t)bJ!CNF$a)W0RbLhDOJ~zw)aZjNz{1
zozVj^{peNOu<?*bu^FlkLas&$S7E{VNEjLXdesocW9Qo`1o?r4Yzg4?=lWB_3Cxln
z8B{O;@sNG$Un!g)Fztp$8%R-rc<WJFG--7wo@5cK$PUhWBV+Z&0ESEnQu{W7$K}pQ
z&o$cEU!5bu*BXo~BF!?#1bbI#6EI`<y_cL0=D7%=GFc%YfO122Cj?h<V{vP3qG++X
zm_57_>M|sZJhJ74ah2<nv^NLqP|<1V%GSDkM)OFqV<Ry|yuOrhSmPl9_80(vwN!P4
zw>s^ejl5vN5m<g!>yk;&=YnZ$H_vj?O#8W4kxT6?r?(uDj>4}rc5>=hQ`<)*X%+&p
zVo(*v7&CLu4<4ASu{W@`nn-KsREjH{5<-bTc88p8J@L<9O2#E3zAU+QEJTAFvUy+A
zHLY!JJThLWV3zA6hh+s=fHCs>4^!(-g4PJ(j`T??0c=_|DS#aA81y;yrC{50nAB{g
zwUr{0c*}^FAx=SDa1Xc?*o(n5Q^w4uFeF!u;QRhQ)ivGup7u7H2+G6+L?GG@Gx;B-
zRfc%WN+dZ`lA}BW>-?#RmsMC}wSv+zO#X9&^57L10Q%&RO=g5?C0Nw4e3D4^&-A8=
zoi38(^YdU6&VSBo)RB=0ker5AKtTC+s8h$kGyzsQS`)f6!CrDQGf#rt-Av1D0hk6N
zKAVOKIQPeDY%?^IMH>=QFxwP#9chygw*`<W$P57F41r8!YR-&6BxiyvQ%<(Eom|{A
zqa1B2GNkthxccI$CLHtkiR<bOYuH4wsxz{M2L$x%O*PbsH_%a`JmOckWhDlDrffSe
zs`fuhmeWoS0};6c5OKk+bhALL(mqg(jlD%!ipnV11a<=;@OY|?N=fc!)Y>rDOO9FN
zCSNWlLRWVr5mLoysT)Hw;5Z>$wrgTrdsJWnVYKi%fl?&)2%%j`1GijND%6(5xXqdN
zfm#@eQ@kJq_s@Eq0lAru;!g)0?c)RRtHSq6hEm9cE8}`&BR-?jrW&T2R|N(KBZ^;G
zraxyR7AOQUh}8*Da=Gd$w>FP*p-LQpcHnbc<5SZ?$WPLhwR;xmpb{~VIjj1`Cah1h
zmG5(w(vd8hS>%t(hsi3;$-4!ENBWk|J*t(<!5du3JCii5zD$v(QPcvgaC#h%*0%MV
zhIrz*iU81wcZEEH7XXi8-|?<nP`ODi)TBug?F;3r9ix+6*SXS(mg-j0LtHYOFwYtw
zBg|LZoO<JsYMd8BJ7y*KypgnQg+ai|kbg>Kvy}`0J0!sfPE=#Jzt*4(qCizbkU`pc
zT>4W1=`P2~UF4sc7<{ZMFiQ}FjF2!-8KrU=otFrtleBiAIgsJNY>WbUG{Ckaw@WL8
zx|U?TiPd0?ASlBpcH`7wV;p+YK{H0o3o@|a<DZv`iB?t{_mang3FL~HnVQ{g!s0O@
zc!>jc?g0h5o-xG$beeaSa}vChu`Wqdw*Y#I)mvM1PzwwW0UaxmvbtzeOK^a@;DR|I
zirj#^s3nV%p^2=gDaGC_l^E>J6BW2_3H&LC$xv`fJ*osoZh+^xr-&H!&V4FAu~l^+
zvWw_AI`+*xI2i((Avpl4=B5_RPBx!vQm;}=Rtk(!UptudPx83yoYl3{oE)41?@Da~
zb#cJyQyO(8vMIQ&%IHWq;+XCMJCl)C1WBG+oMVe`Et6X+6>ZeZo&_-K+4(5mgC8zG
z3bZ4KImiTdro2gzLk>kA#<K1l@F2<+&IV~3RRivdn8KS!BPODIQpbiEp~AB63Biyv
zqi_Z)CnyF;&%Ig}P3&pkVmnA9HIq}mw=Ht?C}t)-25MDADmcb!Q)Iw=sfuucl=8T#
zYC~2SBSXPaQmwG$fChR}`3;-|IqYe|Ie_SKO3jsYR(JpekSmqez!!i4fr{)*PDjk7
z*Cnr}%jFoy$__s|)`EQcidH&V@0(6Wo;;V@6eu_cB!Bwr4r%Uni>Sdxd5GEw;8xV}
zLq6DL1eaw90l_CD`ewEC{{RhJX}Xk>NpSPRBR*K!wSymC)z>TD#&*)=npJ{nx@cRb
zGO#&Q9Dgc~=hxb<yizxkHYgId;TSnAN%cL?y;-)3M>0mhc{^}1!3WU#im;HyJc;Hy
zv#Riqfsi`>RMLF~p;axTRxE9$kOm@Rl5)7tbL~|g0Lo0P6o6Z<20K&kVn1mU1aWQ)
z3?~4LAIFNnd2bZ6i)}{jtfXj^?~~@hBepZ`#Y;sda&q0=MKaAAp@nn55o8hDr$1WQ
zww%voOQf(!xd;dGHy*vPdenMdqb>N3HuG&A3riyq6yrP}dfEFWs{Zj2SC6<(La%PV
zl#*j9ks&V(&dDTyd=bcQD$TZ?6@=bku|Xt&nLNeZ8`m`A8aG2Ec?F189muT<%eiAP
z86}mBgL4@a1_%5xRD@HBkz!Vk;y~jeqeQ{y-l)7YPjDiPyR-1h7X($ryu6Ub6F%UD
znl<1R&vJX_nv=^F;<PeJy+L5d0E`Yvp|I4fEiI;Xl3Qqx?)<kRAj~~8@1FG}koor^
zAw`SHKnK~^Xl!Sb-zVC(pr3HHw=%ToaH|?9P&0zRT%TIA_PLg68rH%XrQBm@Yyh~)
zZNr1~rD5oEW$zZ~IkuBzYo9mG%S1TF0rfSg78aT*wPN>Bh_(=tkieW^jB&uv8ShCg
z#6jdqgff+pNT18dUrb|<ezhDBMLpc7=9<#nlF|kW57VwHxo$=5b6T`FP~S-wnIfc2
z<h%;om51<>I%gf}u;{mPH<#wLgpZv{mIJvX)0*rdx3EWvu@pu|C0P8#kN6LNY*h_X
zRkLf0yK9w1kr*64GQ0vlr>!nf-%^X)Nv1;Hd#hm-tg)2<5;_siPip4vtYtT`%28&D
zHYKnD&$nY*V_MR86rNEb2OC1<pL};UNxVm+S((kO6TGUXIE=A;tO)Ki!4)bAY*Uvo
z`|W1s{{Yb;PqU&Op;kf;2l&<u)@;Lk(U_c)K?LEcZ1s6j$etyXOfb?E1%czGY>jT-
z*3iSUIiz4nNwPh9)y7=A8QS}t)1sF<5bXdTQ&A+(7b61)Al2)wUgfRT4Xw0WShBjO
z%t7s+N~~`lcr&vFNcojA4QtN2lgc_<>xme-+B1#-z^x4<TWcAZ7ho9*m+OP;_*No0
z+)Iq0KAh8)JjYUp1e|RHk|^bi=oe`1yg%dHjX5WV=18Ycm1B{j+{~k(VtWp_tM{VI
zQnwODu}^B`qL|k!o^TIJ^K%oAxK29awR|~z`fj38u3js7#@SQ@wY@h1@99`d9Hx<#
z_d4kOF&(2#WVbf=x|@W^jkgs9@IA58s%sJIx=H@dzk$`ARH_!-7##lqcj;DFS%Ui8
zQ93*V-%y3bg6kMyxg8kb<Lg-dGS(xInXUC%bqo8EnPuCxVUHXpIs=^a{<WIsZ$jEu
z(C4*F`)Kcc>m}JE#sr`)6<B|F+OoXWExFD~$t3mWs+VFgPfpZ;=j&R=Ru>^*-9RBR
zj=a=C$vF9Q+lox&iZ}<H8hp%l0^7JGpQi$teY#SU&jSEb8iwvrQAGgK0IA?rFXv5z
z5-=>e!Ea$u0iFQo&{C2}0Gxr_wE#;iiDhXLFo+HUjzF!QDgu!CgO`>mPSexN3P<zZ
z`Bf`O)=ef@LK8gGphqMH0eb%c=vn+LSX|q+#J13e5Xoxr#6igl0SoxE{Kk_GrK#>r
z-Virs7kpwkqYchBwlno0RX4j5!qRVqzTgo`a=8VF9>Z}Tl~1g+HuiGa#Os7$a1;eD
zHiLup&sxmX#CD5o<hJ6_EX>4kUAf2LFh4q!Hp!(!a|Dt}360ghd@cf$jC<oa{Oc-m
zz?VGl&QD@TTF|+bW{OLZDv>TeP%uI0f2JynhL}pHXm(=Q0~v03{A!SyWtcW0jrT^I
z3~omt^T)S8%Al2*UCAHoW88jjaz{U{Ib>xUiUH;l6aj!6j1l<Lr!4C71OO-sK^y{k
zqT=c?U6MO}&cSw<$7A=gTi5cW*W%U!MZ0W`K_}%v4($33#m!(lG!KmL^3Y)8f!tN7
zZp&G_7bfOeHmj4+a$6r#X*5zg3t6qKEhN33LnZbMaYladasdSY0J5vJeQRdhSGTm%
zlTT}yW0KieEC~@UaCvOGJqBxtd;b72qKT1R)mA9M>N0XzpHfeH+0kq+f45%VXtziR
zTZSj*3P|1l6wxN!7sm3|;^yWow;?`UjzR0xlg@eLip9SxW+bq;c9+Xw8Fv?4@^PO0
zoc(L1OH_HTW3gi+!i1nH$Up%Ho;rNSxS7PZ^JO1<8Bfl7hUW(#N_G=wZQGrNRRB%w
zNzWwz0QJAE7-(!S6D135Rzf*F{{Wpy9Bk~-O^xO<Rfx$@GJiU)cCw~StV_zO{G5^x
zPvuBxjTR;fWynl|#B~eD^Q%vAve?6%BE(n$)REgihZ**&v%c6Ph;93!n2x!nf^!$j
zPBENk=tuIWxD0jJu*w_~>coN69FhM3*QAXMjgSc=k_RT4ChUbLJ4OKXtGaV+l^hS5
z8z<j1)vu_VvMgI$ETE}ylCBD?a8FO?TQ=5kv}#64J-PsY`qdFd^A=K=AP_+vGg3!9
zu}$+FqhOPcL9JJ?>dt97y^G5Ph`0@r=xTV{R0AuVR3d%Dme0RRc$5K<*~Mij(OSih
zE`3Kl!+8gc_B9q_Vnzljt_!haO<0IL_pE)R>}krok{F>r#+o37jz<*J69e3P)J~2%
z6Q0#P&wC9=%$!@q-CG!^3wTtXbBdrPWN(`|pxl6d^*(RzjYG_zQH>VWUN>;TfdDoK
zy>n8uu-`ngD#+(KR~ZL2zHXsq0gyi+ocFAo;Twf9qTr68V1g@1YpC|n%`9XIg~&mG
zr1Tt`azb2^5q?Dsa&g5h5x9_;(U=7%rf@n{^nu<RgpnAHyJ97IBvlk=n3yw0%ZUNT
z4+gHKkdeHj2t%|6Ba#n4H`Cg+^%Ry}Ho_=Z&qY$gbAm|(jCzcEA6j9CCXmM)l$b;U
zNH|H6zr0V~Yzz)Lq}UW9jp1P=P4lXwG+^h>9P+0hhC0=cu{5o7B-ZkzY)B5sc85JO
z$EG?Ef30YVcEYVS+oZ<T+Sq5yc;9ye0AP%cqx#hgZxPNKadh$#E^x}+gU?*>!1v7?
zg}RVKWYSwbz%es`1{t<AXOElHo}BvDhMjtF@a05-Kp>p%Bh#%`8lBCYDJ*XBv|qX*
zPDoz6PpY1yH37O?xxCP+3lp3m!6%-73aGm>B(8Ke^E;@)!1Wy}^d*@3)>fSDD#%&Y
znR?*kJc`zZh$L_b>MKb}K89*Kk`o|dfG|7Mk-WvY>FbJmkZ=uHgbWZm`cn3m=u(MV
zUo}rTAo^4+Ndt<~c#Dp;5w##>4r=3FqGe3XCoO;~H^?~eT4vFLk{6n;woX}@htjrH
z%-tf1+y--+LKxuYubU|tk++HklYnwMRVvYB`!-M^y-&3?mj@U%blbo8X`3IfLMZl#
zIT>6tDd!@bCS~e#N>#9P)}t`9oC>7V+)Xj&;ekIkYA3pF*{2u^@=qSL&n#zynmJ<i
zu&*Raw~e=h(xn$H%hsSs0T}|OSQul9R*L8vu?@jIR~_OO-KYcp$o{q2n`Y#S<Ge<N
zH2@D%p#K0mik9UyrG8_pwzW&E$b^bmNBhhVY=4bzU%9unxR=c+>ZGXMk`HgMIIP_%
zf?hsZfiV!c8Rsio&jLNNyliBZqy>~HAZOpFUe(ObgofKJmhh}ng?R!3Nf<4jwH~Px
zL2QE70?fr%dE|`ax28XpT!|h9kjXN~Fd+(++}vmX0M$*qaXTBJ$Z;VKs+&Om?mat<
zQg;N1ZI<P&;<bu7B)gL;Th~2@VZ}^fn6LbM$kKvUqIKjE)MBk$U))0pj9wWb5*LXR
z18L6(*N?3d%jUCO-CQ!rOArx8=4^EQX)B@G8B$sarjk!FEr?zf7bS@G^v|tJWeTKh
zOlv90;ISlUuQg}w7B_xfxVN4=fguEL`Eiav9Mdf)RW~msw&ua)f&eFt++vu7NDb6c
z`4GvnAYIt8APzfr6>SZxO&ZLPJb38LKt7o6Jt{b$ncy-eQE|127zBN2ir>z-V(3^a
zZ3`P@liTq3r?_lEa@O{?=2;V9h!RPB0aSF&M%PtoB)1ZX)q**7$tRymv2kqo&>LAB
z_iPGn9PL`-;JdQ${<7j5nWwY_t9gGZVlq1S6qqx+f;WtbT2KHWZ;TK@_U<bDCfatL
z?!tjEAT7*<yPkvUea&PG<+#&sB($0tV~#duP}{P0<PTieH=uZjRl3#UvAc9DFfp)^
zKxoHa3FvsH*p9CDH`C#k87<lmop(ioRDw9?pfyqM;Yfp9DVWHhg^+DdG54@f1DeyH
zRE}Gw(=On9xQc|03S^Qy@z?8IwZ?}%-Pt;2#-9uhtjhx2Ws`0?j=3~wCw_&}Z!OWU
zzu_dev%j?`$w*`09H8WNZn^qZ4MRxPb-Q_WYm4J?5`s*U!;Qy`kOu$?si<fd))6z@
zrOfe^BuQ%)0x%imp2D+r4-iRr1QEotK(R&;MzbBQ>QAnHD6pN@<kHyM#uh^x5;8Xq
z0X2^HmjY1oEBR%Q%ojBDznC~AsZv2B9M+5zmydDbbHN<qsX>tB(ToyBmjFr_6MzN|
zDTmAs$`RbR86%NfbIRLt70Vus8)+2Cnk2SkD>^t}1bcEHu6gZO$zbO*O9L9Dg9K+Z
z`)OsjW)L)-@>C3iQmRQiZV-Y=-~q*0hSK6WGCoWkk=)g&667fb<1E(Lci@%kYLJN%
zLx4fS8+(e?l|x0hED6siwN^_d1w#@^IpYHcs>qv=#)}%Vn6g_NTXr_o*3-oVtk*I5
zz$pq<wv{~K=h~8MS%y*|p*X=jlTe!}6?YcgNj(Kif@LXKxvtt=#R}^}<_YblDx2f^
z7{1U><?Eij_pW8{GQ1%N)SB9w+EWQu3_v->W=m)SgChk&oM2>{%aTyhGes!NR%bhx
zIXKU*DNzd_LEN5|c_Xw30Pi>_p2CZpX^pfph*%`NrdI`pOO3T`(MtLxQD79~Ap4F*
zCO<m44xc=k1~<qV#ye7-D(K{h`gSK3nO8*<Ml)8<n{=m?1CG0>`vjpuVgVyK$4XZV
zqNNowTNZGez+=W(VMpUrNnp@3qv73H493}0*S!}V(N2IyK|Iy(v4-VQh#g3#i)1Z~
z5PD$JxVezTxDne%p^ia)z;VIH_*Kh7iRH~B3<%1io~(KPN1Cqoff%Mq865YdI}?q}
zNaK;xlWC0?ou2It%#H*`K^ZJ?NgSW?{Arq+dDiy#Jr-m#h0hWE#Yp;aDbVS9jrGde
z+e5!;A2x7+9&%4XT}_3So1rbdch=)myii#bosh=a>;BhH{86yX2)r?>CXTv+5iOj*
zC<a_JbUi&i>ZH0o`Z)sG=Pm)=18)HS6|<}BI)(M*rtaXJk~XQr<LUZUYiq-3_{L+%
z$w7wv4-{RF$jP4Gc$t3F4Ctt%aCpjqeL1O=#E8=n8ZfyaoPtjnuC#c%=te+@?A%Cc
z6gVUKW~)Dm7UYw2rP(@y4q62nKY*xneTq;|smGb5xV+4S0>tj)00L>C6|<A37C;pD
z-OhdSis&BiOL>WtO11^FxW=V%`5K{ex>#_~+Y$p3L70ue_V3=QO8p6Nw^J9sGr_M(
z(6uIxTYX2&KWn-WDF!{oif-QDlBuo)z=SiZ7}TgLBstGcpU%5q4qfT`Z-?g9^(aK*
z1(G{B3zZEkk<-5eIqTM}mR*3N+F2Q+cm?S)?jsnFk~e#>9V-U>$91WhZGoN!U_@bX
z%Aj+{t~>Ora_V<iSIE=F3*63&7=WBCAZKX=clAGjreEKQZH#i;#x4j^JhtOt7%jlh
z1f2HmK^|scwev3wcG1Zs(zyTt5E0w2{0s7|nc)&hu3rdMNn&z9;8v@NA=?~oV`-QM
zMdT`gIs9^eI+jZ)TGb=A4>HXQ&fqA_amUj=aoqkQm|W&12h1Szj-N_tJG%4hO770Z
z%Mwo+J!zoQD3Vz`*}TKlfKMD}ikjL@lVlPHUMjfC<c>!|X`qm5ld}e{taX-}k~-{{
z03PR|tpKQ400A5jM?x!(x4mfoSpX<=#w%9Z@vWI;g~5#A6el9OV<<JMxyd+6FGGDo
zCmS+5A3;(8r;VTrio;XWudWTV7lvbvyNAksdF@(8+7<pVeF&=dbe^^&-&>V-s2~AI
zQ9F_<!z5sE*{Dh>=QMj7PoQ&5VcIy!G}2U@5!Ris4)otFXB_=$sx**u%!XKz`ixZ>
zt(OOB{A*A_lZ>3wn?QP+P83oE=W_?_#Ha<ZGnyo|QiKr1;P4Mq&21YX4+LU^ZxSdc
zliss&qtMYxq0iYzvKxedza&Z{=Z(RGWAVWi+0UXZ`p%fk<{K-C1CY<ce(VB1q12yz
z)*HaFNRJ$3tZmcRt}5zW&F5UE!@gB35)SM}0m1h4?^w<$Y;6f$nflzRWtihgouq#-
zykvq8zIq<~ds5on+uumDT+1feBS@|Q9PCmDAMG#7!`GU3iuDrrGuX1Emf$NyPB%u|
zRJIs(QggwsU@%Ccc>xMnD~9JIJl0E7Lqh)X&9rdNnR`}bigh^oa(+?QjP~tWUTIix
zIv%<2k4kHnStU~0`L|;^1k)H6Za^6%=b)-c37yy~kohd5Bpmwj_;jh_l!<qFXo>*&
z3G1E?Gw;n&P#KgGN55POp58$VlbqmSH*8QQY}j1L8Z}S}+(2&iuLhuuz(#OD0FI#7
zC%ijlTWSD61+jsi)qc|L;!}h&D`9y({r&4mwbag0eGaH!AYef?W-Ub&<hNSKwrJ&2
z7;JUrko6U9E#W8_K6A*&O4X`nSC!2{sw&`<$E8XAuNH7lK&*poq>RbewJ5egGrx*z
zG{c@|xYnW^4wS>JN68$YO3U&WIqUCI2oM3ts!^o6iOyy3?WH3DIjEagJ(rJ4g<wqQ
zv8e=5gUb)47o>%HjA_)Jx+$nl+^zfut$ySKoMclBu;Zq2-lf*15%Nv-D;ecD8!5_V
zCnJo~yvPnfs_$~y;BnfQ)~R+6Wiro{PYnL_^+?A~PkN%)5*|1df@v{;-1}5KY*xr>
zjEz`|E_1-5Z9*7E11}t6v06tzd5O(J<umgFYnG*XPh)sPmvcr<Xo5s*pX*$XyKwh6
z!bt`W+<qL^@)+@uxW#kY$qja-aq`hio10Ruj`K<xzGcS-A_*MeWqGcPC@j3O499WI
zY&cSK0Y6N3^{#(K2z4*sN+MAoQZt{Kc&>olNpk*Oyre?RP<*5y<n0`v#=0KjB9b|a
zD<Y8y#Ahd~cdd;&$zI%u8X_Epn8_dA9P~b(=CkMXr@D;D>|u<U&}~q1I`sGTt;Dp`
z{{XXAD~az7#DjCh8vu|yfyM_~k)j<=!VM}dmg^j`vVW}@%8&8)tRpJqtY~B-A)B1z
z)OvkuQpVV<4{zj2x@84f04jRp-=37&tge_{JWx4`-AcYr(ucPPuTF7IFfuo{nvEPK
zr^sSM5<vd|>(+paQjkv3#}Y#79r?<j+&JgHM@qM4Wb&#^+pW|fZ#5U>?lS%P?T<>l
zmzIlVb!d~wR3KvPfR;TNbDU@T(dG!o)UWR6nh`eF5oZy_z#oT7Nv_0k7*Lo-G8k}J
z@yF*<UEErwv<|Q`02#J{unu_VxgxXm5i_h3O9jEWXw<3^h1<s54yUJ6K#A`qSP}*E
zV3raBmW}xY@>KhePkPI{@GhBjAi0kASeD_*Fn}Ggp1pvmFFZYNS~ZeMV2}dy2>}3l
zV0R|0+QDU~F5Byu5V#-+<k~|Hoq7XBg630Cqj+Uyk4}Q__E|r6*D?)}<Q_u$@!qUU
z;vF7F`)%HbZErJy<d|4H79DpUzm0NQz4Y3Sr8sF-;}Q~uPCy-iKAys%DY;rCVIru`
z0pglOwr=0}oZmAfXl+XXtnhHfeL4P>nWkOb={F+!*}}}3*vvN&PI<?zTo#ROr9ma`
zoGqZ=xo3Ee=`-$nkELm8_D$j)K2PlNZY6-Ti+!XpUtIJ6ka?$cv}EecyUW|{RGW=Q
zRl1p^JfVCKrqRV$wbLckpX~Z=jPu+PlBpi;qmRnEeKSlNM6#RRO3Nc?m<YVUdKN`~
zib(2fPS@fT7Do5`BTa!G;DK!vap6H7SnxBSPC8O`QrQhdU0H=E!=Dl)3n0>nVtG+2
zG5mq1UwD4!LAH+KYb&T#*K0K35MSHUwUb@(73?Ekzq*=B3klJ@s3j4kuef1OI`te<
z-F!{8xchCsucUuySxX^!VRr+|_T7yBJw+u}SJbXZv~s{ZkRgnh<0Oh}*iCRZNaXdv
z0~j>d*KCwe9j%kwMKcnl%3b3JqU7;`>x|Xt^wxVA?(L+2#SF<DjT@GI%rm%-c;g1N
zb=OlbWbdI~3pp*+2*b8WI2|g$acLtw(nigUd2=>FKTlemY1;G&a<6iz1SV+ML<>l}
zh!`39bM7<JqnE-On?VMkvO*qJQgbfm4Y(=Kr(BRa3Qo294N`qX0w#p{O7{gpG8jNA
zI`=-+drY^3P+#32DG-E_<{W}?w;sIuQfdAUlH*a6OFG4gV8~;5hT|Y(hQ~~S!RN19
z={!8)CDbgfrD1TRaYm39`9T}Tdyh|g$<~v0G>s&;FjC6d;z=Zx(2tfyY-LX)@#$DL
z_bYR#t-OmYIB-%hK4LiePhpYXy8D>gZ65N;t|83vM;|1!FvvYX;~nazmEn6!MR}!}
z<amlP0}G62q5l9Hr76Cm<cb?_7MW=GhHV>Bo^`o-Elvc8<Bh80JqLQ`d`T0_a6{W$
zL7meTxA`N(9)V9!rFT-xmmwA+p>vfuIX=Gi%G~JJQR<UwFB;##0R<%)AfCgvM^T?j
zmmO|bOB`!MX0CV2<YWa^UUBYgTl;=#*4jB7`F3#_?Zk%)i`;SC@m1x4PL&v2JQS6g
zu2xb*DZmT2u?N4sMID6q6Gv|ZZ9IeksS@rd^6S=<3tZ5(*6mtgvm~$~1QM-~c<wul
zfyG>tQ?S|=IkI<f0`;s*%_e(G&$7L}!rZPEqGZDd^v7RHy#|GNEREdOlHv0lOb#|k
z2^@e4>ZNh&MJo%CXuq*_VsfmxAu-mo+fznt3v~)IavPCaw>}=dNS5aE9k%T%tC+}V
z1cSHOXC3N;=ywVBw<!}xW<Z#Sz|KP8cVY?cNkkGwuOW<4$gLJxLCIdE)J1l%4&Zv7
zyi!F4-kB74Mn#s&M`+^2fEfVBPS3nMaz#Te^D+WrMO^*RdeY@$vmW8048rGNI0Ozj
zrL|SmCU}L!5EN4(dCt`!e~o9Y%ujZ*PZs#bM$&t8SM^J|XVdiaG%pn94ZHS*^HV%~
zk?v`z_bDOzcBOfx-p6}vur#p}L2wvy2<UjNsXSM6tAS~Ir)lNglyCAvu+QaOa1SD+
zWalRUA4=J<j%(!}S!pg+K+CpRjGh<p$4ZG(jJ0Ui6=e;X-OX{O+9V{rw(!Ru)hj5(
zjx+OZ!1;6a{41H(Z!In_!&wQX+KO9q0t@m_{0FBMi*jx!xh7qxrXXW7F#~8FzO|m=
zos4NLK?58e*d$d)Rj8)y+D7GunRDU^E~naY9@SP~l>?K&$?uGudsWMgG7TDKlI_x1
zg6<0&WIi$eb5$2s`zDiPVHArLaR!z~9b}Z}A6$CY1h?|ZF>xbjX&EOt9MewV^w_hh
zUqy3&EcS7mXx!(^R=^b<ypo2)79b7*;-Iw=7d~KO0LTDjR<@gSX14-uK)jKGffQr{
zM`54g`ry;Hg1)31S;@)4>PhQNjt6;2jX=VZNjz4{9V9%mD~44<%7w52^dH{ERFd}5
z{LP8A<QP>A^2RvsdghRG6rr_dLm)etHqe_%Zk>Onb=P)Ex;~E-h&+gqt*zH?OWZNt
zEUo^^oG3okf_0c}#9w3>kRxwm<c;SeKY-_swRXo+cZSl^*e=M}gT06(bMq6^Ib++3
zXqL^(O(kH^;*)YhvF?)MP(gVZWDFC=!_Z^Wt7#2kd8l1|t)yKp(=*&iKp0RC6ne32
z06jBRwF~8n;3SukJdwoGNXajo9vh;jKa1wiTnttsYGzBQ(kpP#L>$Kf<Q#+ZIq!mV
zlSb?>WNK;hHlKEr&Yo~oFXf@#<(Kr%K*tr&+_cac*i1k>t@o)QGVzi0BOirs+G{q}
z`fT>nTKUT$Ku?{p8J8tk4!c0>&tI)`+MMe;#Um6m02P%u&H(w3x&D;=gts$6^rZm1
zkfYS#cBH9RHb9aF037t>gYQi%l--6Sl?)Fmagj?R1#GFxpSoyp#ff2pdG@78+6u5G
z4^;;g{Fr&7Jk*iO%aAZZ>JLLm;Q{#=kb4n=DWeoCrWU$2EuJ|>P>}fK6P#9!rlmYB
z<%aqO<xOBh#ZE!wcJGSRh1Js~w_^j|x+Cu^9Mg@R&V~(E-bEg9@}xaM<Qlk+tTGNk
z?l~36Jc=L7C_rzz-9a@pGRtnj#^o4x9Sw8O4BoJ1#-+DMR@`zi^rR?QXOK-|L9WP*
z1kr{AxZ^deZ>q&`xf~zv_Z5SqHSxU)_L1m^nB*knkUeTtwPzXKoO+s5DmXtrJ*fa7
ze6Lig(tFHY^Iv3BXx$5PX~M-^ADDe=7m?GPlSn2wJx8@C3K8B+YEyj)jeuB#vx1-y
zJBrW065GPY2^)A|cdt>7gnbWsu_enDC<g>|s`oOqfsk!QVmUlx{Q6c-QNOxsleVS?
zu+H~$mrz(>5)OI}D;y|btNcN+^{$%c))k3}86<VbQgK+uHd#P8Dx|s3LV2yBB+!{!
zBxc<hK;^KYbR!3+)YB!4%92!Y;gpp*9S^-qB5lYAL-S;M`p~KxX+Swr3H2m#Rx6PF
z!GTpE1Cfza#D&)ckV!00U}->*7~>}yY$zuf<o;E!6|&o?S?%0>#x`a+A^VTZnoMSV
zFxs|KXLOB^42!rAum1pAuV3h`rQVBcwh_l64;;wbl0^RUk<?b6pW(x)T3kZ6D3chs
z*@+wt<993m_q8_RZ$whY(JkCC5@d~+4yV^?!Sy{TxL8XKIw@|1QQsf|OGhB*BhZh3
zO0@oUoaP&tnHzU3qYIuZBU8P$M+U_s2oyAOC@RB&l_9g!)Knkvkl#yeA$MYfjISB#
zjQubv+=mp-h$iL)z5(W*>Zy`kkyvnQvPqYbK<~JB_N_QBAebgxuI!LcBDGM9jqj<9
zxs%wRa4W$y#xt)V<W<<Lgo;^ZLOC2B^&zm84oL(ab5Ty5X6)n==8C#TV0p;N^`t8^
z9PYubGiuoEDTcw%IpVkaoPU_l+e@*Q$vOf{<WvG_cVj%B)wT9F2c|%%Udf5h&&Se~
zuq&elUG+vhv&a}^kxUaioEH3RT1!Ilg(;E^L;adpk<j(7d12g5l|;&7TnrYe<GV#2
z$*I>(W;rXztw=P$pb$7Unx}n{eC1PgjmFwQ;oI(Jv=>YS<aVo8)=;Sd_&$}aD3a!8
zq(PVNU>fFi*u;0h5ANsr*P)AOSP(i2;e1w#nxcj2<%9Z~-;qWn!M7u=)0XM3$+Uqb
zaT(knkQ9(J_2gGW5D|$(+W;7XiM)`E2<MKc86S;fXgfc(S9^qAhb%@w<$12PG^u5{
zc7zx5*pN_VPf~i~vU{5$nq91u&LWa&BJ)*{00U%_3HQgnXx>iAELQQ{35u|S6(<0m
zm<`|4nx!S%+Sx6<XsK~4{_a9Hx)Z_qyHo*;c)5~PH*&dMjq@nv4c}5%gHpz{8+&-(
zZ<FSbV<bwr+qH&9GtP1AS{7j;5)IN`!6YMTY=Btx!1gtm@U_IdWK1MLmsn%LWzSN6
zzP{C_noGxXZn8!pw~rHnBX3}!_wABDl^sS$ZqeHmw=mnyBL&<!X8YL$obY+ZDy{FG
zZ!0R>#3qf%AabMY+wrTB*;?J-q<f95au$+FRBg`V@`30&@_j0;)`N1!{i4=j@*$LM
zjB;e)eeQ9Q(*w}czd=~4mo`wqq@~2SO_I!91ztz=&*xYgpNwLTSxhe1E~GD+BV!<R
zQI5i{>cDB*6thPZ^3N&8z_~?2IX=CAoq57WMarQH>IftQ!KZRrt#hqv*G|(JqyY1P
zK2W1RzLd5)ZQj1Vb=A|0X!vPl<N|vE+}0uUC6GW7oRjjX=dE|JX}6j$gI80&kUVAB
z2mw3Hod9g`5Mw-lT2}&|w`Jk|7sK({eV5MF8Ckr~HM$?V*c@@`SUOdm%$HFuuw-T)
zV!0e~)7a*^KLu$m;(rs~NqZtsaH?IJLAgQTZsP!vzyqh{U7v{)P_>>NJ~EFSF>W_P
z6-EO-qo5y!7Y<va&-Ht)THC{R`d+0Z?*qx^#TjtJsr*NN3F5P@HJiH|8{Iz5MY7!j
z9gBj&f4V)*B=X*PhgP@JErK92kd9v<{{Xa4>r`N|cfMN%om{k~csvpb8L0+Dklb8(
zc2S|&TO<d{vmWQ)99LuEZv|>sWHaAe*+wMWhxwU^8R_YcE2GlwY&5HBEu*$ZMwMjV
zsyxO(4n}=5%}uTNoM~$Wn?oVOBygNy<Ea$YifH3JYZdLC&9<E+tsT4wU2V}esxj)^
zb<e4+c(iMsM#SAjf*VMblQidQwlmYz`wG9SV(LhB2WKe267sV&uHW5qew~IoQKQ2S
zw{vl2sOs@)@W!F6<B`aN%qNlU$8keV>P_`C*GRUWRWUofYM>nO3smZ4vAGu3%@iHn
zyrmZdu_Ke7m0MZ1n@N%Fqr10jca`>wXWRe;fynjiSn5lIu`<ITl5$N{U6Bqg?sSc*
zYF6<y7t)Arr(A<HLC916!`H1-w7N(Mc<-G`<dc#K2Rwc?U35$9hKGD=pt7dtkPL3=
z$81+ur+8aVv$eQ}`3>HpWD1*Dh|xIYdXj&YE`ErvOPH4aC~Ir)w83R>6Yf$Rvl66t
z9M<iJi{;d{MuvEmjG0pLsc$gnt~kejwW@S25<N`aM-(p276J&sk3BLJ^dPTMQaljL
zFcx-@G?Im6mNB+O&PFmY2780s6t8w)Es-_Q63$(5yr@yMZ2%9YBoSGps~ykUhnJ1*
z8vqFB_03H_oX}h>NqucJ>k7=#p(TQogU}wGPqk3gE|o1}juf6^7_Gxcl35AikYhPs
z5B~tJi9G=)b4E)8FPSt5`y?Vpm4@BK;18}kaZp%WT<TWKEHSi-SSxJjX~|KM+c-59
zwVctdmY~-+;w5PUd6JCEK|5Q^<R{8{P<8gU)HK~LWwIh7(p%o%O30`?EA1aK7{DjF
z2kN=3t~9RoGPNHMz?RyC*0VLU6)xbZAi9#+{{Uwv`BtZfVAHhi8VyfQx?62dJ<>}w
z%1C~8`3k45cqH{49{eqyxo@p%*Ap$i%`<joGe}FS;Abb1f=M|!HBR4O@X2ZI5Y1s4
z&I}08=G&m)GjaoVE#Ivs`G&OAmhVr}Ep+jG*U+SrpWZsD5{4u<4%r}sz$2cuk7weo
zM@IV`bHy~!!dgph>97?icJ(B4lb(4Ms}8TH{i^oSZ7uHZ6+=T5*2T-PKf*g4bCdL<
z{WNQoMb)k*62c57$}6qSY*`d92kxjNkPm-BNsW1!I_HVCZC^-Xd3P_6Sx1%?KyWfS
z!1u>qaaUKvnsnB7lSOjRDB8kx83gf+uj$97U(&o6r@T{2CKFsn4j_@T8y&#me+ro$
zR@BB-qAEr}`AEk~q-OiGHu>!AZX&VPENrgGk>~qFQSCA#bWAQfA5+lOy1#_<JxfNP
zRq*}GM;)HQa|z3ZEWjLh0eL<1jw<!Xgx6L<d>ZZI^4XZj$WKr=arMPlf;s#cWiScf
zO`OJW51hF%550xs1cFCeO_vn<o@e$&d$xq!MiEIKY0lG({yfyt!7QwjN^%rzRxQ8-
zx6-{1_rdyQr;B8@v%HE+b%4n#%%^IW<yUavlDzR$H9I{kPnb<)lL+!lMJ5;n-yYt_
zwHLb3Qqbp;IIm=gTiS#mDDyjK7(9NpUiIGE<Lr<=$w(_JBzs72L5k?5*Yt<eRy#`>
zmr*hTlE~mj3D4ujbN3oG#2RdRmD7;-axjQ)`G{Y<*z1nK`sR>|aZVQ2cqDwYC<w>-
zRUj0$3l0xaR%Ny*v7MhQE<x&h_4lDP`5$Qm3f;iY1v>_WbAu~@RAp2EK)@oHa^r87
z3Bl+vMO}skj4&u&P7XoABbtD}knUMr1~~xG7a49IC*H1NU=A4Y4Oy3BLZV33q$B2H
zG6?p?P<JoLW&^GX&oro6fRAqAGH@ucSe@d5qDM?A1gTI-C#U6Aq(Qia85tmVrD)ks
z2_W<U(u88IC(E@+1%r1#tuczRU<NElp$m{|aFaTcB@zRSj`Y+r#{522PB#u#o{p;7
z48WeG9w-xJ8>CU4t(^47Y7EYq0Z0U3;9%9iEjEUB4xr;{JmRJ{am<YN(v$;@j^8je
zt}B_6&eFc(Ffo9mpr~1k9GbH<42PEljE*{rue5H#BAG~N$*l_;VJhJDZh7EUAU<v?
z>@K1_oa7t<&|<1C%$eTW7n0c`UBTE({n3Ik_|sO#Ih&9R9y8Pb0Ig6KN87nDao43-
zwh^lY8;Ub2Bpk2<IRm#o{*|L@)-kj0Kl>wVsAOZFG6qF4v~cRiHQd916yW|<rqaN!
zUfNl_wIr%YFvsy6RO@=PAm0uM<2!oLskgHiJdw@5l_Idi6>h+cQ<4Wp<u=F$aylB@
zbV(gt$jSx|0o*Z2w#&P5Wo!~a0{{w9=8GGh(T?({$C=Y3AdZx-=^+@vanR?3T9RAD
z7^#6JM#0HBDr-J%H4702==1y}<Q}zN-?{}9F=SR7U*&Ps9`tY8$FUs<Jk@D!E}|d|
zI9@>=Y9n#R*HQ>PgIDbnLG1e*Q0kLHzq}#T9{ggoV%4C1yN=B9oaAP?RJkjG)qM|I
zu&)up1F6C61!Fo8sjAVGoT7D}dE1ad6&aL<B=@WsrgdxrQy%#Stu5OEeANsGalx)>
zVP>|}wOMs8wdqF4T;`-pfhWx%BONi;nFRJOxXBIZYRaT6!*5RYo21c7rOMX{zSqkH
z9l)Fc$Q4Xm4<jK7Y>}T__N{k#lqd_xJ#j|(8E_O1xIHPy-P{|w%ujBt3}M&-kjEG~
z&ja$T_f4k*k^njE1$8DUyx9OkPS9k?$vp9jg8NH}*fcRPBz)bt;<n}zW?Rb@$u5zs
zBu2rL?*iOsA6~xI)L35I-D$S}0BD=+*D8gCk|so(R4Bs^j6&m{4RiL8JU3y85y+sB
z%((#Lo+?Wiucm19_+}w)2r8uD79Bqv@lSmQjfb#n2nU{oGG4}7XinrQ#~B?kPf=OA
z&HG(l-ori1%21Yt#F@$99i;yN3G0g4{?u9Fj_TSritaTL&j27H0Z%)6cILS2gD5^*
zF<?k#4W2VeZeK#aB)B^OEWl@hl0c}k!zs=?15(7|CsqR^kZ^ECG0q!n4pnyhilRsU
z@)eDkvhEpE*wuuc(NwEv85rHhYLs{l%7Oqq5mKY=+p~f)Hxt&Fnl~-=Nv!7F6&x-z
zgOGYw{g%0DaKII0a07GDR~FuA5&4+OTqzhID9Gpk0Iyc<oLbKm%fq3_InEDii9#~m
zO6cx>){bze@u8*L*q>_S?XPbme=%e(I1I8J;<O^v%%=g)@z^di`P6c_>vkq>Joq`<
zY3ne@B>pv;*HVmpnI5N%(tWh60Ljf<Yg_Fy99!sIlI1rXoDP&N%sW6Wk}8W%vhZU3
zX}dDH35rs$H}-)+b~H|)i@@noo8>L{v02_pC+_i6C5di>o}-$|@{`=X7ede5&h8tE
zc)4PJUQex4Xj(Es1B!Ca=)DF#sYPq68+vGq$vmVSaBGe6DQ47^vB}s!t#s*h*y)<(
zyh7#g!6O7HAI`et8f#d}?1;)u*`v@rHv(Mh{!EfAL82#noG8Il&+@MGHkNiaptjOg
zq&{B<ao}g$+PFUsO>G9K^IbwERe_456SsC(8TI;CTN9VMh{_h?H;qD>P^ezm`VU%f
zb49S*YkOP!o%)X0;9%idGD{y{T;{FV>E}?pf=MPO-6KL|RoX_-3jGdhAZ@JeCRPP5
zl&ePZ^2F}v8Q=gosN&YH{MNmaQ4%=vz+}n{dM|QujEX>OS~Zopl+KaL$e^^cKG_aV
zLSvlc9<^fS+FO}nT{=PL!R8l==LD}zdUxnET=`3lQu${@g4rj?h#U+LQ;vTczYT@m
zymBdU@hnDVaIQcg5HZuguhxN>=6iLNNg;JuBLX(T`Hvk>>5A64)+}Jt2{x$WQb}(w
zXb3U#p8Yt_y<ir&iqx;!nn>g<=p^J8>AWA(y!TesFJ0t@XUQiA9f1Cn?oP+3!>QWp
zFZPz2J7`sQpj?>29glOIR|(>GuzR_rhS{aLxOQNm-~+~3fmxa+t#ppI8w0G(h2!Q1
zwr22@*QKV9RE%A-7~+A(3n&MHj=kwzHF^>FV@ug>CFIu@5CbOIm76lZxL@vywc|Tm
ztDQC-Na}M-4Z{RmR+Bpj>&H{jb5!&zAr#WvZ7nLXX?O*A#?Ys)t!!%$$ExePUAdiL
zg%!6UjFTFS<m1;Jz3FrW%-tbv^ovxA+Uqy6C~47O7zA`a-1MrRDScTjpx<*Kv5ibi
z7;IxdF&^WN^|PkvmaB7dYiNiBi-99@+#SQ7#MTdsH8#A}t*sdOrW|>Zryn;1Z>LXB
zT1*Ja4I@T6gpoimr3xTpkkO8WfzX^(9vhB3crG<Lp<<}Yh{X$JoaB8?TJgL=bt^=Y
zLT+S@T0{pc5IEYSr$N-#yt-A|=`mPC@>$w~>|EfnBXQ%@`cn}~O-k<Vq@Fa2(gn(|
zagX!GGFff3)E76!uHBo>irKzWUmtnB0IeHqVQ&K6+*&I*U@dJxAwlQnKTmqk*YxS;
zw>K@mYpEC#_`t_J4?sOB*$Y#gbAPSghitnszyt2D_*T{5hwUviQ+0PFfz|c~3<gi4
zuYavx(=Seuqzf-1*X?q-nWS~x0-O$ewhuTJQ&rKg?*-KHCi^=yTuGb)+y>9SPijrr
zb}{r@NUrXlJBi_nGX#VSh5&RwcZ2hKRaxS-v${sHy!${PVZs>jPCFi+mC$SYW|L>E
z#izk~_pw{X4CdVf5J&{=Jr6&nXz4mNve?;bX{9E}l@jGlyQFi!Ea3_6zb_p+)bFWQ
z=s!u4*Hi-AR!q$V{#=v8w8+ds<xfTf1FdSlp{Ci}v{9FVt>7|AAwb25JdUH2ka3Rn
z(Z{A(YdRDfy{WgB@W!CCI8_)N1I_`)3C?@gR94<dlHwrAa=<c$h!9f;u6p8yuBf)H
zp@iC)T{))v4gMI0jiiTa$Qvh)G4I#E6+M=wWVKmDZx~#RFyvFNbi14VPTKa~>rb?W
z33reJq`xEPQH=4^>rT10)KYea{sabMF>@a=NstIC-%3gMC9cHUeAhZn-Nc%7@Ibeb
z?3>M9*dsV9dmc#VBAlj1iDwQ~<B-XQB>A5zj(d&=T7t^KrM_rnS!YtMfdcL=!N=35
zdbx8N$pn^>Jf|e8vTzGvfybvkJ*jEBDJN}2DAGc+NUI!fNd%LEc+M(`FkN291<X<X
zkpZ2|<9f&k8y6TmkMyZ5ts2Wqp33(+g}{@{x4DhNvM^qZANVuZukx)a#p0^lJ)e}#
z5G5f2`meuAX@f*iyf*gl6{L3di8(7IFh{$1IppU&fxsrXtuIGQ?Jn*sWdP$q9KUC}
zTdXS>_pnv%_=A)5uC4%%9I#@@!DJl>CZO=$qQRzJVIvofaU*S6g94by3`g8xc)|XZ
z?updq;fd_^my+LEOG}ksE=fY}3KfVubI<UMbDD<w=KEE7Ev2-!p5a?*xwnTKhp8ij
z>s=>>Z)|k!LQOt<oi_4YiObCG^JYcEAy??Y9Q5yzU471&y1Zembr@{mfwxHviI~?p
z-Hx8dpu1nG$lIMl*3t_{i5~R{jovmPa5M8B<m1wo{^D1<S)_MnP`Pq4#Ef<Kts6^-
zV3*6iEh3z$l0KmJz&*S5s<K^M2)@qg8^pwsFa$Vn$N5!Uj$I917sLx}s{^x}HqV-&
zh~V%@$G14DTDx0a>DL-*3im1)MR21c;y?Dg?i>((K9z%VvcgFlh7JQ`A&oH3EZ|GH
zuj7j0RF;NPcYsM4UNOk`sdl}}i*~U800hZ3y_cCBn<QI;z?I1bMg>jc8zA87F*z*~
zhIq<kNKXeC?lV}rZTmxSaj^>SxM>x7fu4HTM3PNDn{jmvj3&1$AwZjejPacN5-OX}
zl^f`C8l(}}3k|w`#005nB#`A~Cm7r5fJS}ILi(Cq%nKkuiV+tifCs16yK`(V?R4nx
z5!x99fSEb-4&mFjGAozXbS0O>7BO2DNbUeo6mXb0{CJ@XNOT6qX^ph8JV;rX9CCAv
zD}TG|Tj`)$-4?XAmMe0KaU-_X9gpY5XKOalE%HYfm}9oW?~q}bU~qAcl{JmzNpmDq
zJcx}Ou-Ku1Y<#&NTG2B;rcSBhi|r=b3yH2RO3cnSiGFCx_F>rjS2ruX^8WEvjs`#&
zAXi=DzY>jTLFL65NYo&3O1UHw#h0ff_4clA(ITGY`N=7a0!Nm4C$>rLQqfv&PzjCL
zMGAgWPb5^3IwKq|TO1z3pE2Et)f8<QVy6L*JkwIu-9QL3PBWScxXESRHe^tHVDn9h
zF)#&CgOP?f0M(|j0djIMxhEOTM;v%yhXW)Hz-JT%#ui|U_pywz-H=bMD8ooZdxGa6
z9!)t>+i)DHIV7(lrjN=tvI5e5q>!<w7#+W+MF0tpJ<{pCh5&F=41I@herbj<(-H`A
z$OQ06_n_R!ku);rB;zNO$7-w{Lt$5se_B9VD5(Bi$|EP8&A=k6JVlt0`|*-U9R*JJ
z49Ky_O9TZ*8#o;BDbe{*vCA>Y8BluA1vc2FOl673%n0BfY3aF187bGE)hUWC>#@Ly
zkT;Ncq@HsjA=`Eb%EV_qC;`#k6hZQmMt2f80<6cW?_eDil^-u0RU}qoL~VhNN$*pO
zNufhH0pnH*Sy**B$GsLpX&0cowvdA0E>18_Xe3c8w2`{BW1J_<aaeG?k+gR)osuhV
zQh6YQ{VD$dXq^m`M>I{zbIuzi_U}~}%Jm{pzQ&^5*ajix*h6$Nu&X5^bykjbU_q={
z^&8hhL5zkYmq6G*(xn#{c5k+95IH1#z>i~EDN{r^NYi)&70)Dg9Yr+4>yfnM9R*Vw
zoNX>-c8nDzSfFhBQpc&gs4^X@dJ;IzT2Xs48j{@>85rZfI*iq6Eh3*GqUnx$8j-Hz
z3Z=ZUp83J2r0|x(a6ud$*{W2Y*B3ptv6}ix2Qaw*0Co8l16$2+pEBLH_bPHLqgGiM
z9HTM7+Rcu6sT~3~4Za%~V0%@287+g`cR7J75(>6R;|GE&K`gzFK&{u)t!@ePAqS@`
z)~UXb=*{G_92@{nMOP%&<L84YiB-5Dh8~q+E-s*DF~~s3JdA@(YbkO;Opc^rf+>ax
z?eT%ReKXBV-%#IULOorN`ozffUTV}guseVXZuC4F!a{+M@Hr=vI+{`g9&krP?M>^w
zn5}J&tL+d5j#Cr-fU6bhgNoF)iq?354(ld<=^R%J1@!i0i0)*J5rPLG)}ZlC>{1aZ
zib4)|s_iH8tmLBni;dB*e`Nq*Lt;?bB=RxEN3l{w5a1ZVbR)M;N2lRb2E7H*V<MDu
z!6%Vc?WB%$R*muoNFZjeJhs%CUgm7Ev}AziaRicjvYh^Avo0W<!;(jq08&ppcCMP{
z*vf%Q?it8o!3We;RJ4(m<DCEm9l&%x_0KP4o7C1aowhkxAZc%7h?P?0C?|kvXOzu%
zH<&Xakh8OJ#Eky{I@P_>)&yIHM=^pjI%C$U%V1%YOCm^NEHcZ~gWMll%IWnrxk^An
z;~2&<#sQ>27lJZR=~nJkyxYo|0r`Ppw{Z9LG&B)MWdrYHGnNuYV<Tn=+ClG;R0xg$
z$gbN<Dd3!PGgioZq-leoU^ke;U|?~9?@Wyk*;#=>8#;^@`MJ+;LH-oe8G_;Cky#!$
zD#Q*z6bO|A+)AKwP6y6$gZ1rFfh3X%QA(9K573NNaWtsTBa|O8a@$4$;PFn0)rrUq
zBTQhn2p-410%om^+b-iYQp*?|v0zvqp{;O`u^0+ifI{SCeMe*MT&hmuP~&L?V=Qtp
zTDEaKspiDvdYrH)1P|+2%_XQLYO*L9+xS!soD-Y@+MThVA*JMCW7JX$VorDDdRIF%
zu@RB6@{x*A@&GX8eJaR=C?udX(X~nW1}ID#B2ZkC>`h7|QoJcX)Q05{VC@wXYB47O
z<kLy8(6F}8)-*iVC*lyo{0A5zNA<1otGbi0kzC%hJ5P2bZ08u}wxXn^sGCh_dJcqw
zT~o^_STtl126)QXX>}B~`f!E^l&ea4C_>19WE`IS;}yi{Z?jr}7)+=^4l{rkgOlxD
z#-k(ZQ;j^_P32lgxU_g(?b&n3%0Ds%biK($Hd8D&3nJKym_u!87=RR?x-tAj`c+HR
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

diff --git a/layout/html/tests/table/images/raf_header.gif b/layout/html/tests/table/images/raf_header.gif
deleted file mode 100644
index f338b46c98605ed3083c350948580ef1608e3a00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4816
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
R#A7HddT95FS^$8#{~t)@2TlM0

diff --git a/layout/html/tests/table/images/rainbowh.gif b/layout/html/tests/table/images/rainbowh.gif
deleted file mode 100644
index b64f265f5bd7b66e167fecb338a9ad04ca7c24d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1197
zcmW+#dra146h3YwG)MD-Yp#Nqme|m4CXFtC9A^SSrCXV4HBYXw7K29pftSr4uaUzj
zn$r~ZD5+n}41wXk7<IbnoEYX>R+Hq^HxO|&%4s%hU+3j)zrEjge&?L$JkRs~N}nnz
ze)QGFkPCl93?6@Y{9ymbtRDS(==2x{pa2{|0%!mW00;pA5eR`11VIrD0SE#C5)c6s
z2!Rq9fzJyJ$Uy9aK^T<597`Ywpa2Q5fC#9734lUSKm}4@1yN81QvictfCgm124bKF
zW&nU8u7eaoP+}_@pl=xhVn7PW0VSXYw18ggX%9kVL_t(U^8ti`VwMP*PzaUK2%Ti$
zSW1k{D2&QzjLtkr>?c7M6hRd<L6;+F97>9;D2l3Rimp*GbR;rlLorlCGlZzFk7J7R
zutd^qz^+;d5t{;YU<s^&EignjaUqK9II@HIJa&Bp#Vv`LiG^5+jeMkcd!grI2(vO9
zvpW%loez0RScFyBgx#K?>?FzSlto#UP1!vQ#?G9)*;tI#*o-0G3#aF9dy#wScDXar
z#So$v6yih)szEKdIqpLgh%mxPl*g5beg}%G5k+hvRZ=4t!+ASJXA>6^R%J(yHzP>Y
zmn3c}qAF_Q;Ev-Xz1s^tr|FwxA|Eqz+Am8Q(&LAp{>vl(pNt6rnJ~v+Li{EmD-Bl%
zCr!pMf8#Bg1@|Nt?Sl!~c_o{M-~WBVx_`4KYvO~{$%ee5>sOYFo@$!)Ow;qrrtYuU
z{J@MCn#<m<T-aDVe<&w8_u$#Rv;VvGuJX>rxt6jI3tu_i`N<E57q{eYOSTn$y=!W9
zWly4`s`Rsrbq6vY>za9{BlFxuedE~Zw|nwaYjS$qYsy<!O>h5o?X)@l$=60F_U-N(
zTmEUyl=QVpO-EDPGw-h0`*gB>uy^OfRTs}BJ1(7-`=)iZ-u}>vqbr{4t-kZdv1Q-1
zESgo)v%JXKH`F#BD%?G~^1_kY?)%$bs($lC!}_Z^7uU>8Ui!YJV&AhppI^K3b4S%c
zUr%@4$cgN{tpkNtH`?~yM_(3Xch6h>%g}GP9lqm>ksDoqe$|(E<dLq+>CVC9FV|#j
zskHT31qs{G{A1m8?%2MgfA!7F=La^=?aAEFwM$;yvGI?E!xuLFb+9zl&)8bu{8rAc
zvY)aaJb7=bVcz-IQ`?G%5~=r|xIUa}EIP1i=awhSPpy1+WKVtm+6Ap;x$hjGQnnP~
G@&5sn5*LF2

diff --git a/layout/html/tests/table/images/rainbowhb.gif b/layout/html/tests/table/images/rainbowhb.gif
deleted file mode 100644
index b8b65ba1864f881b0a0b0772fb43f511c16b8000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1197
zcmW+#dra146h3VvG)MD-Yp#Nqme|N{CdH~hjx&Lv)UAtYHBYXw7K29pftSr4uaUzj
zn$r~ZD5+n}41wXk7<IbnoEYX>R+HrDHxO|&%4s%hU+3j)-|zi?XXl*fJkRs~N}nky
ze*E=CkPCl93?BdS_`&|htRDS(;N%zvpa2{|0%!mW00;pA5eR`11VIrD0SE#C5)c6s
z2!Rq9fzJyJ$Uy9aK^T<597`Ywpa2Q5fC#9734lUSKm}4@1yN81QvictfCgm124bKF
zW&nU8u7eaoP+}_@pl=xhVn7PW0VSXYw18ggX%9kVL_t(U^8ti`VwMP*PzaUK2%Ti$
zSW1k{D2&QzjLtkr>?c7M6hRd<L6;+F97>9;D2l3Rimp*GbR;rlLorlCGlZzFk7J7R
zutd^qz^+;d5t{;YU<s^&EignjaUqK9II@HIJa&Bp#Vv`LiG^5+jeMkcd!grI2(vO9
zvpW%loez0RScFyBgx#K?>?FzSlto#UP1!vQ#?G9)*;tI#*o-0G3#aF9dy#wScDXar
z#So$v6yih)szEKdIqpLgh%mxPl*g5beg}%G5k+hvRZ=4t!+ASJXA>6^R%J(yHzP>Y
zmn3c}qAF_Q;Ev-Xz1s^tr|FwxBA+sI+Am8Q(&LAp{?8--pA1g}%!-frO+Z!}t`1I|
zgkkRbTQdvpO)T64w`Av)Y#9FV;=DEgW=+z>N2%itc}3T+EEYY{H1oNp7nV%fTe0z>
z=`S^xy<0iIv3TxKPIC7C)4T8g@3y<kI}>MG%04c9?PTX?KOJ1ulDj3@R`~6XDb<xd
ziH@q$FEZBb%Xp$|#;K0XGZXZ!BctE%%1^Dz>20qmZ(T91{rA;VXZ0uF7@g3!vukYW
z=QWel*CsX{PHoM+r(*ZB$@anC?T=QSKb7pbbXp#m+SPi;Bg+mid%m~&t{X>|eAlvY
zW=YS|B5Pk)+jyXG=jifthibbYY<s2p?PCpVujZUzH6wZH$Cipc3wpl1cIDTOs)4?q
z?z)j<*?F4>3axIm?T1gkF39elv+}p03%4J<^Q(~?U4MSlmv`u~uFL7p!K1I%WNfOm
zwOIuTTi5(^-8Amlx~+fZ&C6#8HqP$J+{?8uzPxSyAM=OLZTM?{X{evRxxV?GoE>Gq
zWIufTzEs1Uvu~!h6b~g*A3Sw^IMrCRZ^iaaPnVxq{{G0W`ux@NTFY|ZJ36^+F~XDo
E1AOflc>n+a

diff --git a/layout/html/tests/table/images/rainbowv.gif b/layout/html/tests/table/images/rainbowv.gif
deleted file mode 100644
index 0afd41cba9f32423c7d2656505fbef431da16c8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1622
zcmW+#3s96*6h0`^mcpR<N)fpX3QAfl<a?BZ603|LV>6jgu91!`&icS7lALf7K}2&$
zq(ZztSY=XJkkV1HtI}#{ikO&$cq0WLSg83xl<oeWnSbu?`Oi7u`M&S|mMKxA$IKr9
zaqt|Bpf?Y_IY|E_k~-?8qpB4da0bLcFpvxs13+L1h`<pDK_Ey3g#a8F2jsvx5C_3Q
za!?%fJVt;7ob+H21d>2$ECEaa3g7}rfDj-BC;=dWNk9o)0!a`Oqy!}a6fgy-fGZ#c
zLV;AE6aXMI)<JH7pfFld0qQLoLuAMq5<|gIGE@w8txoIUh=eE*C8E*;I5KWzIY;6s
zI7*I+qbAA7DCLAiC<rB?BGk;8F#5Sb5-0>pfl8p3gGpm3mq-$YL@7~8)EY5`8i^|;
zg+ifJs1$;st{z9+kcWgpniP;$jWGk8Ga^QUkz}M8fx*UDh#Tu@WDTO{k=B=SV@uA7
zI0;UYlj3@$?$(7mXM`Y<M2bi|!31eOT&DyHK~j(sr0rpnG)b=OBne4Ul9Hr7V~R9$
zuA3DJMN*Mc1jfD4^t9W$NPDR5(#{wzGG=JOnK4l?DVbDEo1=X&1mbAG2tyvNgyA>i
zhH9J}*n&&RrQ%u)&0AB{Y>b5jNl6;nxEV|s`f_1xDTI_lDxtwOjvlGIb)n8lcYCW4
z`-#Y{FN+)8Zw`IxUpfNXJUswRFjT(;<C}oD-O#mXYx6WAJDa?EGfQm1#IHx$1`oVz
z-V?F0S3va8>JtCcIey*KTh1-rKY3es%X-hXWeHPqO;L`P;B9+PXY}!HC?9NYtV|!*
z>vJz_b+Bb?$5fYRTj=eYoUn1lE5?>3{+#=IVXbG%w&sbu=8ovNm}g&ndCPSBnM2XB
zMHhWTu1#N1w`y4Qv5!p4htVgh+WGM)+lclZ&MW1%dqEqs`jpPyxw1L*pV4^-<DID$
z{SJG*D4SnCxsN?N^=V?QYmfid-sA1ykzPDEFgu0<9^NPotl8-2do=0K3ZLrQ81fHK
zcWnurdTDFGlRLi#hFS{xA79pd&Bwg+(&Z6LZk$Qz>^6nJa@o?3o^=Q9JasbZ@85SM
zP0N|v@yz$?>+!qOcGY*ZyVhpRTUx%wLQ6cm1@m={r50{$>a{w5{f*%>{KIP>o%KuY
zS!dau)+;I_esziW<arysjyrhfklH4d84`8=uQdOfMfDqd)cw(a(}0H2jp;tc*Bi5L
z`5i3SJgF)#Vbkk-n-Wsrdwg`CJ+KRdh)-u_#^rW0SKi5;8C5wbcV>EG;m!pEWMN*X
zyZd}1Y{xU>@?V-GoAZ}NMF!_DYrN;!_2mFOQ1J4zDUMw0!pxw(NeyO4czjSw(3o#V
zS_{8Vts1f@pR8l=darw#-0Vo(9(MnLtzVbK@8*0ELf>|Bx{IuZS<|bmc{x9|ISzhR
zbE9a&`umdxJ5Hul6%|!9y<^=oqqu6(;qqBSl8#(imH6ODO;dDB(YfUhnw%$6W(SwK
z)}LrObToF>!}5$%Aw@qvu=?7{3bVS}9CG{E;))Azb%ThGmz(3HhdHuUdRQXO(j%~?
z<g~XxI?s6Aw);f%o}C@%YBN_pa`m-T4tMq4u(<TxAb(kUzU{>Yr+nAsHT+_aTTW-V
z>D(*xm@(H|N`4ubbZEJ2aMy~*-hu5;9#se1kNkI~_lfM}O3%yv>8wZG(3O`%pG;kO
zX5@_2(wZU3b5=|UYCaoU{e^E#`PBs(*()x%V`Gx9&uRZ*<;}Hy!djl*Ov(7|+0`XI
xY>(;^d>e+>+x#ayuZ{n={&~ZP@rRGxvUe?5Qy=qw&YJ2)VHL-klTDs5?te^L=V|}|

diff --git a/layout/html/tests/table/images/rainbowvb.gif b/layout/html/tests/table/images/rainbowvb.gif
deleted file mode 100644
index 10e5dbea8f76b65ad27da094434344d04db264f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1622
zcmW+#2~d?)6h0^ur8sDcq^Mj5WihQM<UYzlji-(%V>6j6*GNaec`mpj$q6SBL^K(Z
z3iZ11lu7Zil#YsBg`S2ch>1yvH&SrHa>)fzUiW%t-hbbJ=A84L@B8j=ofJ7@`22nl
z4bQ;@z4_6bgY+Ab)KM?(l@E~tXFv=D1Ia)!00f4B2poYB1cF3R2*81HKn|P(aS$9N
z2gO0pV+2URNe>1=APJPl62JtY04{(82mw-n5&#mI1eCxfkOUz?N>CC&0aJhqxB^lj
z6i5Y10RS?y4srv6!nC3S)LSx!$dEH6hJvAFs2J*6oz}q-2~i+QM5PCCWZYyqN8%_r
zN{))7CdtT@azY{$gpyDZYUWIselCy%3V~9f5~$^1(hTJiNurP_B`S$pBc@OzafPH%
zD3l77LNMy;am0;0Bn)X%Kw34%3^r#(j07XeNHGG##w^6mIvQDn=y{~|W!!AZIT0tp
zNpezLkJR0|Q0GhtB1xo(v=dB_=EHSLkPsvVDM8vECP|azx=xaiBqb?H+B2p|Gv~Tl
zkx(QRDMeuJg{G(7)<xPwZI^b&xX75%f-^HwFe#Z-Oq-*9FamKjFv7^Al`wuYZdBvk
zU<)oKmx^mKG;d8&voQ+^l9DvCxfx6teYr4O3L&MCN@#G6qetp)U8r-?)%H+`14QJ~
zm&FCHH-|p;KOO$9?m7)H$UMw90dKpYbB~A3(}e8k;n|Z}r}~fkdblmP{~gQTh>hO<
zlLu8F^*fW*w_9q<xupjtZtG@U@4mJ;c2bT<q`f6*+rBetKE4g5!Is8~)Y0Cbd&XA>
zS+}-Nak{sL-m1w88(p|!RB_zTIj<Mix+iUG9=B`m(DsYD*^8^TOwT@hc=FVOi@pP|
zPG3;BYVhRaA9*YvOrNM~$H&8ML)&&ZE|=Qw25!voDVn=;Wpn61BXSSLIFieHAMt!q
zJim0JPj+VV)3{paUcaq9$7F+BYT?{~%qa4IaJ?v?W@BI9V+ntjc~#d&kzaVKb4$RK
zOI!V)-2OEn)VjORiDk`Ky(~K~RSjKo{cLPUmq++3r!D1Jxhrtz=~D@R|Gpz(TGrh5
zXTDcnkJ*#5tG>O>xi)Ry($XzfTH@X{h_7obvT|FK_v*a$*N4pT3$J}t-Z!~Nopn!&
zcVt@3>Z4sI&fDO5!p_q}YMWI0z{vA|rTEn>s^8eX?vFm3`ZbJbO!X?f)|hd#@1fnB
z$5-aYZhC!pQ*82kkB{xo4(P-n;?r5_(K#I~6}NL{Mpg{SnVA}wzjHx9nV;L?&VH{5
z+lln(yqA^<&3VfrCj{j!YrJdU^<_UixclX2lk7S13)2JlB{W#<;W2?pfg`^e7N7rp
za%IS(Jc=K6r^~vRiOu$u?P2#0+In}2`)<w$1L@li4p%{Ze#Z35_}r|YTJ49vs<~b;
zcKyBa!S+*0l?4T5P4C3-ol#i1=t$|Tkc5)UtK#mL)HF?QDLA+Mev{*5((IsO=lYW^
zhmTF2^`JEE^uU52@5lSvit{r%+w5}tsKT-fZ*_%;_LrNZrJH5KL+NInV3BSCEl1CE
z@k7U1w_Dj>5j|&TMmt+A6_1>~tQA9?y*4Z^Iyb;i7M*W>als+q_3#{WvHMMjBi!TM
zE6d1{*IJJL(m&zwa%XVovd3Kl+MYbB4$3b1?{d$RnTZwdReh-3Eqc((s?aA>R-PR;
zBe|$1ByrA)v4PFyq19jbMwMP!ke0dPf@^A2;<Y(#Kdij5)+emx>5Zhc-=1Ar(%tr`
vF4nhUNWIN(?DN`~f9sz&d>C`2<Yso~-D~Qj-p^W7y(p~gcypqMJB<DxC7b79

diff --git a/layout/html/tests/table/images/raptor.jpg b/layout/html/tests/table/images/raptor.jpg
deleted file mode 100644
index 243ba9e2d43e0073bd2b8d35f570ea4522b4e408..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/rclogo460.gif b/layout/html/tests/table/images/rclogo460.gif
deleted file mode 100644
index 6e67034df2fcf4477a0c37c24fbbf74c05491874..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7933
zcmaKw<zEvH<F%Kt0m1;O5i%HEL%MW~hDj)0qI5S>>NdJ$bi<^(8`P1K5()w;r6Q#w
zD4=|m=l=Zz&v|=ZUFX&HIeG@V$}0D!f#HB90Dulg&%-2wW|x<imXW!NSHl>obNk%j
z_rR$cYVtkM6^bx6HgT}Jci+L?$Hx~h5pOD!WGtI(p_po~k>PZcd>5DHX-9C^&kZy#
z@V!$KYFYBwBPYa$675n=uqz`yjw3oejrXZ1`!^&6HD?7kJ&EYZi|$BICl|!^Ri^Z}
zwzSq2j<=S*>}#AKA6S`t`C(<@^Y({>FQ4}gcaML3`*nGF3Hbj;^8ecZV*$`yQVRq0
zC6Vb9l|hp}s%7)FA%;!1Eh~*-(_bTBY_|5QRHV)Ac1F(n4Qw3M&_h$+eLo+3H20m=
zU6e)oQEXg%LSj-FMwAXImz<HAm7S9<#X`fKTU=6FMsbjr;G%<wKCP>7Xe`5UG0{N8
zo4UGtdIM#6S(qTOn7-kW(J^yTW+ns(e0_Xweql_4gNcO}$SAY;{=<5yEQ)EF20*{D
zySM*Hp2);X2Lgz=9h{z>d$cSc0RfD^L3BJGI=V@Y9B2dpL0}(BKnSuE1BVE)vGhRY
z?1{FI&$xv7v}-X#90cGy^?Li&wDPW4VQ8g`K}U5f`;stzw<`dPxh%rQR3|TNxweFh
zIKv#K-ejg^s%8~{Or6|bH(0N-JzJ3g-G;nsPv(ts&oj%==ZF=W?)EKY`zW2A3NTq$
z=?OoHB+734#KPc*`@Hy-<P=9XQFKKS^=`~CSx|{MZBYrK9&_ri&qU}mSaW0<kTFkx
zym(bB_@XupbuV@y-=wCrNhwbM$}`<8%S|T!uNyw@E6t5|I43|lQDRO!=2zT{{)<UR
z<A;0n)=f=&r-gm}XA~*z`x6>Okmu{?FB<M9Z6A)svMe^2ZJ6mUEVpc=>rPSl{$4@?
zj{uJ<y1KIrV1QZ*R@&ug-TSH&Wytsrv1>E#lxjKzMw$m-X3+2+hb-E1=B~`rRcxKI
zBw~KK<RoEku<}{8I8cBvxF&faMfOw_uiuoWI|N0=lATomN4p<0od)NJvrKixK4*tI
znGF;83@Mr!A6>W8p?7o*wplT;p29h}?1-Igd+O$Jmb56F4ugO9CN9TncJosf2Fnsx
zYWjTh3zBd{Oq3noMb-)bD8Ij3L3RrmV>laf7tE_DsKy$Q75j&;wuXq;SI|Y<j?mGi
z{;7oo*)HH{kJ999X@oWlAPhn-0hC6L5K1kxOsZ2oYi~KG79pK#I@~^^_^z={2Yukv
zAxxPkJvQ&89Cl8ZlZQ?4qXbg(v!k`4Rztw>r6%;V?HwY`yfhKi^RxV*0M2tb#WdKh
zYqr>8HBWX8gm9>@fdNLS7#g0)a8DTPxQGc*jVl@>ZZ_fcV|+}*N!*o(<E=Q`cCEPP
zu&z`2K3Is;3<qK&48#&(mu*{9X-KE<beNWC;FQ_VI62zCe9T%3^@XjmM)i&uH|ErB
z$%Fic-}arX+@M=y^r(bJG^_Na1%*a{jMxUVKKP4;-JV(L8seh|9={VbTCkGgYD9e2
z?4MMRrC&2J#bsAop8&?Svfl@>Vt7*hKKdV=Zoh|4tG<G*-~vC7=NdVE*S3krDtkz7
zAp6%%np@ctLRl9aKe4zFq~7+!xi3G%Dl{>~jax3y#tvE!PN}fl*wXJtJY*~>Lx2v^
zM{^r+ZSZ3d?Rw~e2_Y4?qhOz~(xyeQByJFR7{28o0yanQJwxL!zR8TrT>kf?$9NU`
z^W_GJjxYDd*bdJ`Sr%h?Nz0Ox1PL?DFe+Qvu!P03)Do643-sNnry5KcAOl4I=8@)+
ziyq|z_)S9W701~JwuwVOVQy5xUV_6>pZ+nPs?J*i31b6XV@321_m)gWqDCB9T>|(=
zxllBRs>RG$H|nedHB=@LG~uH&Kxaz4j@Aab^34yU?LEVL`rkoYY5NLMTPeKCq<0L;
zWAslx2IDDsD33KbIrTFB0qv)GX46{e9@HfLfcpw<P%scdCd40UvUob_y%d}$I7n2k
zGu;!>7H&<qFr+#mQvlZtgot4*R907E%7`FCLbi78Hd|AM4mx`#(d4`wY9wk<YcrCi
z4{%+WPcTALwY?Rn{5*L8)@?DMw6_+{jN%Tt;YCb%jMrop-KBuIGUFYtV*!v>v6bKR
zaPibiv>3;z1<4FfjuK!V{(TFLnMqX$uoFx;>URwDm$xhivFF8;FVmcJoB#X5{9GB2
zn%TsbRoG}Y<Y_8(cfb!JI~zwfQ{|mOuvasn&CxnzA)gSkOkeft%n9Ie$m^n%V34Tb
zo>ov$W9Fq1Y*H&7aE(RN807Gu0M$>`1U1nPtA8URQLy>6v>#6~bh;{+0w|OohU6*`
zOgQ>Z0a1%5X=c5i99@x+lyA(Xc7$rBoLmSVGFgb$C&F;C*&yxqir0|sYd3}8rVW|H
zb$|_OO`19%W>^an)pmJ{$X3=g7IYW(I7gv<oyzrkEM4P@`ibE(3dWvg2y=(_a^M?r
z#D}#rheMq^OK$rL^h#e*d?Rwe_irZ1q8QCYAAQ+CWLM<&A=E+402;rQ4M%iN34N!t
z7Es>p)T3}sF>=R^ZZCBd21~NY>mrZh<T?#Z?V07LAp%cmqJ~pJ7sqvw@2}+3IoK|7
zx?P)#J!wZUQPl$-h62*(E*Rhyt4PqC_1lTA&KEQT-Yg_~dvBPP(kO2Nv(fkpN}sLv
z+`bC3=pAcixK(2q{^>yv_m+^ygA!gx5PFFI16G#|Cu#V5rnIh0&hYohc2uPu-<jwv
z=ZCC90084Pty*DJyyOSpPmojyXl{n8&H0TbIcn*IU2`O#7Zm(-^F10i`_hQo%Az~7
z#TpgPBgO`LP(XDRj6Lf>8RL?-dhZK#D${@cY6~e=G~?de0ZkeK>6Q&|M;!Gg+++9k
z3r%^4x-&Fkhz+@t9gT;w63ucR9_kQs+{BrFO&g|?a<fd`=FI=VuAO$~UFr<plgsOc
zf7Fr1IV6DoIaDsSU7?|~Yi)Mi3S3ZP9NIJ#iydgf02dp9^faH|{jTnM?rx_K#sPqw
z{+V#U*Dd6|Fc0*#-#x5Sp)C2SjgIPS@WYP%?2ZSXLe|!=7j<woWB={Z#q>>o`q19}
zbk`-IX8`6cjO&Y4dIBLUcxPu?_!$Cj*mp@thueD|=>n2Q1`l3E7!%<EXdri~b8ugr
zw=nQ<-SckC+KO>!*MNrqx$4?$FzHlzQO!>*S8YHf-S4^quWML3a_1jw=%9*25USXQ
z@$BD-$1ka)7-t`?zRV?J<h@ZY{;#|SsS(VayR)~}Xy)XrTSg1=F5$fXG5dWFZG(!g
zIH%_Y(<STT?qsEI3K?nCYsi3Tfa0;aCOe;jvz;@0&tGPyufG3I^J6x`@kChWO`N6(
zh^%WV0{qKhXhCwZumXU&dI|ndc|ZWWO@<hz+HAcTUWh6s`)Gx$No-zjRJ8L}0>PoU
zhYyrJ?daiE@$eI7F1nlk#b{3p@6naGqs>W;d&0$0-(60lw&M_9Mc?1&!RLFo#s>a-
zq0%aI)p#396_I!L3%St2?qDir+s;b&wQ^C5Z5dZsBYZyn(x7=qc{v$KVpi$vl|j*x
zo?So=9AGIrc)XtH$d{n81W)T~NKv)llojC)N4V-+hzv#Zk})(~m+WQ5&$z0DR3E;v
z|1(%r@1DYDh*uUc6rfz=?o-zjdRE1rbmuYZ1hA27bfV{x<>Jx95%h-Rfi~55=7HCF
zx7YAlG>s@pJ0Q9(+wY-O_~V3N;&SXuK&%mgXh|X7{p_6n6Yx7kXhjENhtlRAQ)y>4
zxn9Y;-$P2&Mt%<9kWqf@P^*jKjBz`=&Hq;CbUa3DGe&{`4pEU=ODUGcEmr3Iv2iQG
z$Xdx1=7rdewg!-DEgz1%Ka%Xe3nCd>hC^DMv8XoL^I#KJjDBqoNpOk&+Zn+DY{1PL
zrR0HO6HMqj3smt)(5HI5I}PJRCmw4Pw8J0J!lEzXE7o!%{&?$$vsU0FPL12UX5@3%
z)t<ZC1Vf#n2Mj`HTjnYuVVvP^@wR!9Xl$TxAn4n&!XQ;8;fps^E)we|dpTy;rVs6`
z)$te6OS5$7=S<AdPrT)nIQxb$5FVT2kviQQ_)9Sb2oIix;pbrR1z7sU=ityP(eYre
z>z$7zm66`Hi4GsV_RmuSdSr#kPXgo;!YmTLt%RlNCdwVhn_g8znUggVA0#KH<0<Kq
z<LPJTvC>INli>+}&mnorNwD9HbX=)hN{m-dH6K~%!BPAQETF3q&b`dn{!!3JRw^yS
zDvQdHIt$Fr*MTkJVYkU)*n|WIsF8XO<np>Jo*-)eEHRiz#niAjePoyLFF!an9Qwq=
zKxNO5mdkWrKU-#%JaJ#63`aURwncABmFN4MAWUU@Zvx^|0J*?C^G5=nvS;p)`=0j)
zt+HdoZ9+m^r3~`?-sVP}<?2E66JY*IlZD}ZSrCIl<D)FUom5<bo=p<|iY55Dg`6CL
zo4<-AAsTqK1_3w%_E|j&134|$g#YbQq^o(7$K`}pfqwT0I)@>9*a^QTa!Kbg*9%+&
zZL)$_vo@2m+E*bFDsfT22@mTM9~Ttq!WD&xvh1HRNOJy2(ya?-fM`Z>@kj(pOV13h
zg#47#086=7@Ys2^fC#t137TC#uR@1$=wbH!w(1BU_uLedJa;`y_u)l}d8HZWrQc5T
zy!HwPBE&gk9>#X2Nlds`=A#K``Mhu?YKRT0FK6+0PRPoWWzWp6#Pse3GM_*gn{DBS
z4OrhgkvrLpmoEC+TB1NC@#|i?@E^kC2w>}Sl_(WB*;@W<o{xu6_NT9Gy%({!m7n_?
z>tdzyFkg6TvI4bNAqcO$9Z>QtAwBgvo;D|_0$zUPQ7D^KsDsVou`O*93nz)oSRkdW
z{*Y|;)8|)wDp;yNEu$m^KqCc_o-3hXs?ERMWKMU?Y@dgwc1@042{fxfr?ntmKlf&A
zdYW@yow=sGez~w-?IovItu~?7w7!;aztFO^bgH(2pj0Pwp2tQ7zWUQRR}akQ(&qwb
z=G_OC)LSCw-I2^m&AWO{bP2`QdN8E>o1_}GT}s4x7(gsWpDJpdTY1u3d8;tpq~6hN
zKX%j>IzE+UjV<DIE&5RawU=|g#sXSdtNQ@E=CuZ~Fu(+AJwh}n1X`*t*wn!3a?Jn@
zkzx&zqL9WR@(8-6YodWE|0y*;Cn-5`^gR6~C-g6}D6O#ZE?YJ@3aTduw37vL5?WXP
z)D1ENUd=l(y^}2~ucsY(Twz<oF;E|tT(DG7gPS7Xph4cRxznfGq2t*ey4O(nphcn8
z4^U7#cHVwzis%rm?*dje-VE=snCD?tL^gfyC^6Jxj#2!u#+Pc*IqWRXFQy*&r^jHm
z6ER(X%F(sA|M*5Xn;}RO{<hR29#Wp<S1*<)Y1A#vUB{?G_Pl7xv@TLq%NAEF5=3XX
zuhfY;DKez+e2`;QflxH2D(6&UK20ULVS9BiI=}Q&R1@9!rkfQIPvysmHs0y5@Ow@Y
z-EL}$cm5O>dsj_(krfW|%I$DX%lf@pGPep^>83*mQGizf&0pg^KYL^?h1$l3@V)PP
z`nj8T_XqZEbM^S|7<vcyzb#1&eX3(>Jz>}PxRsR^BRm~ddV!3aqpw>S=zdLKw$z|Y
zM*&>2KsgG<i$m#UX*&>`oW7e08NQJw+$ZrxFeUcR=buwz1|?DikuN&-ojKnmd>0Jk
zYwSLl>e8Z^{#EPmx`+l#4s`dA;0fLH5+l)lRFO5Rm|U4xr4S=)VCaBl5(H2P1UK#a
z`WQZ;5$cU`wJ(m5Mf=3;>^~Q=&wL?~mBDTD?bv|a@Io8FS`W+nSLAEiHR9UPR}xCq
z2B_c;OSK!TbbX8_py1K&x>fPO(@@ND>y@fVjJeI@4YcK<x6K{<-cYONK+y*9IHkC*
zcl%FtcANS6J9{t5n%v?-<wgU&H|-kum)OIE3VcU3TYq~|PAW+L>OH}t`uvMN^-D8P
z7Jz2WH{=uE;<n)vU;UynhruVpgKhad4dVZ`bzQ_urH;eZM>cFyjsJ`bo}1UC_SLD+
zR=d4y&(mg~NR7hRkpZo8l5!wHAc`MtN1B%4v_pWer7bWpnOn)}JXiD>|JWbZxGVC~
zr&l1Rx2%d`mSNCzSq38H8DT%3?xyT}I9~Bi7s``0YuA`=3wa<1ln{T`f`6vas$vD!
zq~q<WY!iB)5-)FF9BxFvqY4bInA_-lE=PP$d*TE9@I2w-xw8!rE)2BRT@;Zpvq0BZ
z?M)iEfoO39Zza>N2jpBtzdUz&1DUBcr+Z~97NJc7MS{WRe+ias-5`4Sr4F5ixVeRn
z6SwX$ONd%=Th(+>6u=zVKJ;Hqv*^@548xY9tRgk@06A`s0F!1R^871<-741w-)Kw#
zk*3xC3oG-;CL|g2al26#vN~4?G>}K~QoS?nnhr=N8DCd&PkcL<SC%S;DtK27LKfQd
zB<97NZZd-f0js&~YZ)cL)=^Q~GZtPlNMj7EbK(Z~OyvgQN{8s3*!XzcpWXBZ^)p=4
zZ@aSTg|S4v9=RTs6Qlg(z0z&n$wSymAf>1{q$qbunzur{7c!BSx!zFDjljIpLMSZ1
z7Nh;&lmU{oFa3pI(>F^gX}n%1*n-8J0AFV}gtZi!!!|Ff-(8kU>DFbjjQXzoeUy+Q
zgOpwybsgG;>t@uQEu%J91VB$@05KjP;zQH25k<GHd8ivriXe?HQ)-(RW;)Bmg2Jgz
zj2jE6;6853&X5Dz+sc1!ynFdUBf}@t1ZAviEi4L<psnET{xfgp2S}0IT8YDx%Yoq}
z?Qlg!zGnA%UJ(DhkRuQP&(!+{#jHHb4CpWzdvEmc@0gm@dVpy|dQ5{JdgZFT9_jBF
z0^^N1sg++4FhP37j|G<eA4Klxi;z}i0w1{4H<jd|6VJCtD7DhNK_WDx)|Pike|1C&
zdl~;AvYTl25bxwivit*gAO7fnob`klhCpZozo+(JIx~V$0s<2@Gl&6m-+xN}wwThZ
z@i`~H!H$#S(UbpE$hT%q81;>&tr{U_w*+E)xX++IhDS6dH}9l-NkqQLuTM2;X+dYq
z00HLy3ChV6en^7sKT^Or;WmR2D5`WY{oMWM>L(1`-lAZ6Q_8n4<sm;)gJ$j)H6EJC
z22As7@a*dYL5adcqcZQ0i|^;3@(jxSSYmO21{L?A#k-3xK2GQ(7fNXeawwmY#nP$o
z1EmZJ_|2)(Y^V%`2XhFyL%RcO)6G8IYMPlXo%G9l$^f?F9JNNP)ow)OW~YphXv%|m
zjstt9?(_Wg0)Tmkw=iqRI^{r4z%}<rjF)nR<n>rOwe&WtoVQF@DGZO_hWtAUV|>B7
zVX@rG{(v>g;6;PcA0ws1AGPY=J{jEKVT8KAS-5+2pRJWm;j}~g@>uHYTmRsQR38~d
z4T8&E%)_N4@{0j%`tW?zJXfTW91xk7efCUmM6qn)1zq>vzcaRHg&X+e;Nt{8GRPLR
z^XJA6>fbRl#fQ;fcB%gNKZZ8crUQFL;El2wx#u&y^nc*tKWU%_Rb}I~WqKdhe-OX^
zu`G!$G5B?dYTSOQ=6%A`%?FzM@QW98Dx?7T;t&(+F!0i(cj#=}ujR1W5F-Dm@l_c_
z$4i_HhGf~KS<631XC`N?x-|2#Jjvp^j8r!@_iYNf;ycv#iN)t(cK&^#d~1X8;@X2`
zhniQynY16)TSoY#rOPom{A~oY8D1ZUm4{>r2rvMUsgz84B^5OdwX^)A8#$Kx*KG62
z`U+a!*KL%x{!3Oacl1cHmv`@?v_`kgdxZ%}Q!OWh<Z7t8&Fvloe9wcD-eh;p#HX|#
zyhlf-eX?&_)t#Pga)zjtOEa*ta`B>M(1LsrKtNilGq7~q`4e9qqS2|AZkNsy8~Dh_
zU^lP9S{d`ATxIna7MyW+wi7M)GBvFr^<lMzol<pWtGwhYAxb~?JvP*KesvIThD$&n
zF-{t3%EZzzaER(hVgb}7VcAP6G<(fZBu})AE>g7`!9UW#IIB~v->^L+GT%u(H$cZt
zO9?b(NXA$ea)hq$lt%Ok?-VHqhxtu%<+ER9yr}|VGyHCbhG$)caAI{{nNRN}cAl%U
zfhGhR?njh(bw9BVc9mJIx{V@{kqQ|@_UvPFY*~G`*K?X?eS1FGy8Ii%_f9x%hlT}C
zAc!Oy793jv%<QMf;!7i-G6f{q@VVJyDe|pcIo!jtyeiYp8JU_wC!9}NCj}a5E6<sZ
z?Woxq8aaj5E%@GC|9KrGgCTi?6m6X*Hc7FNY3JULh2)`pO>_XGsy1f_ZP^6GbWZ&T
zB&b}i?w{Iy)D0x)QeOkJ(jY?zOCrnUUoF|ikz(Jkn!WJ(kL;cD4qz^p2Zn#zDcrC;
zG18=Z44D{+q*j>HvkGtWgPd{Ldm~Sgo{|!W#cSnyEJi-Km(%sgAFMyA?ZUcJ^1Wj)
z?mCJLXOdUzSXWPer<Oj*q+L)cnB3XaBSZ^%WgyJ{)0rDn-+4S4(`$~e)fxVYfkOfL
z3<b0EpInC7tIB_LuxSXeJ#9UVm0d<g7+iTNEI;i}W>_JlyjUydUrg7s@{(WC@z(D&
zNGUDGw1^eezF8EIpQezo^8c~S?5U3#t0{_0uw~bK&Cd+bdx)klS=kE-ff+Z`tQ;d0
zHnH)xZcCT<jnzx$gVi){_vH>=(<`5Sfji(ooxnC=Ep0?tVy_w+WTaW*f|{;Ytc%LS
zH0>C<;l!AV8&|M|r~_p)dyR=J{`G*Rzs*ZI8cF4ODs?M8%fHPlf=C)~BKhMSx!jyh
zb^LFwNNcA^-@gqmk`~ww6#n+nvsk)x8HU8wVvU@!;oqEDIS2UDVfnallftZg)3m(F
z&<;2Dcdi#Z(ZR3sHiZAHx{tW3Xc)KI%kav`7jw1x^Hx0l&spolYgKEjC<%5U?<UVk
zYR$6ha)_2Ouh=ed(jzI+*WKcYYomp$Tb{4Uw^K9A8=<Se$47o#+2R-iJ{){fk$$T%
zZS=48<@>}2E@+TVhd@_<kYHukZ7KcrEdpfjDfmMSN&I&=Q=Vtoa&nzGr@+qq?xSZ}
zD^?H6jn_QW1~*De0=|$Q+w-qIsG#2f-4wji)p=j61wLV9`NoSsMja1uWhp9VuY}M*
z+Zlond#M*_(?o>*oKcyeouE89d*KR&C|Xzapg2z4@@NVk#Qk>WjR<{>1Mz{aXkxwn
zY57}oDLu1^n8Qdt>c%e<`kd9NR!DE_-`Uo{+gSkc5TaC272#~hPYWnp>_*z|aTUqY
z(5SM5nC;VjTqOnJxN0KWyd2*d@HD*GBBMEkK<ED+Qha}+5t&a&V2>*Qow(V4Dhs^4
zX&1dHY;K_k*-1(?$Gk1W!#aR}Xl*$SU04+tnYYY;=!U!}O-maTf7;b#CG|Qz!(w<X
z>RBM^gjhZZb~vM$(OE9h&|~xUaA@68=(C9&kuIlZv1R^9y8*pN;ni^cc$bWm1Ewmv
z%$sP#+etWe$FcW6sJwLkMaBPF@vn8{dfsX=w%dk4@t%eZjdCSVfH`N4L{#9dZ}{Ci
zE(hVBJ!?X!Y@G>V%wH}jyXvv{-^yjH_y`m4>YakRBm&JMn}Ou%P&hu8{hAyk-Whp4
zc&&2yg2o0C^l9-nPd-*f<eo8$lnwyZ71Ot4GZr0&EBvBn^5^)xmWwC2{KqBtD{%p;
znZOFDc*}<yTi}^WQn<>%)r+ICudhanGZJYUHN%BDnjd9q)jA>EZrV}cG3%pHoBm;&
zg+j}&W(D9XJaungUL_w?87n^g1#TtGn4e2&{+x;EFFs;|6KeD(-VeVk%zp##B($Z4
z`Z#;rLN=MRvr&m&%!zsn^_J51q5w3rhZCK~&yXUa@Iz0oB7OSLg5W%c1CN?tBzjQ-
zpsVYvZ(xz#hw-4sFoGdI3yE}UdsW&zUB@R^lRy{Z1Q8O|gca8((3%0o&0yNFVl~o;
z_1hvKbmf|Dn`M`utkp=9U_7LLWM=Ii&6KMa<iPy{eF(L0PRIWec0;1AJBg!d8m()t
zJa2!|eGB|dA%TVg3jj*y4_yg6ib3%J!q;7HNi^M`Kaa9}|BQdc-2!0j>>;PHM|{DN
z=);Q4z6ZxjNJV1z*^Afib^6JAREB~WqH)`-Cr#-Hv3>TS&|WT=tQW`$|7e%g<>NYu
z5#41ZgCoLK%%ot-qPso&!i({L&*8Mg>2coB%x8{1Kv#{$9K%$!Eo_W`#y6~^sHcO(
zlegHZw+y2*9woAI=EE@_#FDzAo!5+ubE<=~1u}LOysvRIQk!xGz+15#jr`!^Uce?<
zaQEe@9F5fOny|DJh(r5oaFyb(I<qt{F6?h8hQI5YwZN4a$(q9DuJK}q%9$^ov;525
Xr@vZ=ygv7sidM!HyLm|ffZG29`@=3f

diff --git a/layout/html/tests/table/images/rle.cgi b/layout/html/tests/table/images/rle.cgi
deleted file mode 100644
index ba3875ae815320a136166e7409c107601c8214a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmV+d0sa0*Nk%w1VblRU0FnOy|Ns90006+izyJUMA^8LW00062EC2ui0Mr3I06+rM
zl#i*)?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_q_KoNI&iDQg3<`(DqVb4KDwoWr
z^9hYgr_`$Tip^@b+^+Wv4vWX+viXcotJmzd`wfrF=k&V$j?e4&{J#GW7$`VMSZH{N
zn5ekO*y#8O87VnQS!sERnW?$S+3EQS8Y((UT55WVnyR|W+UoiW8!J0YTWfoZo2$Fa
z+w1!a94tIcTx@)doUFXe-0b`e9W6agU2T1hovppi-R=Di9xgskUT%Jlp02*m-tPVm
IZ&v^SJKutaF#rGn

diff --git a/layout/html/tests/table/images/rnsite_logo.gif b/layout/html/tests/table/images/rnsite_logo.gif
deleted file mode 100644
index b9c924e4b8bc8679d3476bfe61c328df3a5a481d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1088
zcmV-G1i$-7Nk%v~VNd`@0J8u9|NsBY%*>gYnPz5YGcz*)X8!<Y%m8MY05h2YGiCrY
zGXMYp|IGgY0000000000EC2ui08ju%000F45J(vYAtP%sg#TY41Y~KRs5yeHr)k$P
z%|LKr*4DMF=%>J7X~pBbESQ<?7TfTABcU`H?G=qM0)>goTz}I*tu!W;r^Hq^DIhGG
zog+tmt=oCKdHjXFaNclk3xkA(hKGoWii?Q^Mlpb0f{c`vmX?x)aDxg62nU{_qNAjx
zrl+W*3WFIpks5;r1+%oZwzs&sy1TdrtgUW0unD}y#>dCM7MwAE3dqpW(5yy-a07$V
z+S|Cwg2I0b+{Fgv2j}Pq<+9P#NY-81<Fw`p3agd(3JL1$y58`-U=zp9z<~sp@_q70
z&)q;kapXlakN{!Ai~A1L^0fd4ym$-$7#2Htv817WvN*=MU`=4GV+Zh=oLR^oz*iYw
z@-iTkrcXnAG+_uQ@|MM)NDFy{2y21HTs)IXCA9L}(1A~H9hf>3#KVrQK1N)Cpchw@
zS|$ikTCHVMVn%(kq{QTqfC)B~hJ6(dZmpwKKVaKYp=A^i;R-oAOv1yYyIa`4gV^_0
z&o^QyK$hTU1P#2CWPAoaC^LYydY3WHxxnu%1cwNirh#p<hzzDtFEEXGHny}9bUPF}
zmLM&_tUikg(2=w?=MV*nmN0n6SFoyuu{J&n`GU<ge!Jn#ct)^1W@vPV?rtuQ#J0T8
zo-}B*atyP}khV=9yH$|f6#$$6V!0UtTzE#f&<bzwY_^tcY8?_(K=5tU(}CA5poDaY
ztu@_gRL$_9h!XB~4Iyz60$zXLDUn`q&AFIgbrWP*6@?EKB@=jwfTzSmJ_d(ZZS382
zqD~tr=87VVxxnI3ZPgXYTtKx&S&n9%CDl^kJd~9!6lsanjc>d_$d@UKITM%7c)62z
zYF0AgYJ`+E5}a`=!lp}uxb|kAi0~s5nQao{Cpjbm>Qr}BnYc-x1;r$$owE#T<$Di3
zGfx2qA%M_j7acmNqW~VdDLv~L1gaqk6jgwwlNHLzsmI{CfC6YX)M$2HWJ;?stK!Ow
zWDm(I(XY7-XoxyHrS@O-aRDN0%OR~A!%=(Rm`RAM(gLOcx43Mz>$8c4B<(HN3JcA(
z9bF2bx#!lhin`H=Yb2(HfO{%zluBc7yRlwXNUpycq;E0G`X|<Qt;PFmPjlj1lR6X|
zT=B&gXN>X28h1=F0++G*uA*EKDlo}f?%5Q|CA$kP%Snm6GR!gWMJLT$k~%ZaJ}re4
zi#%VH1v5=>z{Sx>C$03-Oeg&Ul}tFn0vKT|M}`S!gpmddYgjWSA9YX-MAi&oEd&uA
za{V;aTpW=H2)%hwb=6i}afFm!3)8DWE&R~K+$o@4gxg3g$u!|^Cm6>ac<7-x7H%&c
G0RTJm<nPe{

diff --git a/layout/html/tests/table/images/rock_gra.gif b/layout/html/tests/table/images/rock_gra.gif
deleted file mode 100644
index dcf1a19b380916c78bb21a922476e634143bef93..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/ruler.gif b/layout/html/tests/table/images/ruler.gif
deleted file mode 100644
index 6e33888b997a4af6e3bf33940d016578347c26b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 498
zcmV<O0S*2~Nk%v~VPpVg0Pz3-0RI300RI60{{R30EC2ui0Av7U00091M0AOUovdDT
z(5)$L#x-{5VV5>?V(@KRTCQhBp7AW#^lj%k&hLH?R0M~=A~A@1DPyc8b7^`?C$4EV
zioI$>R&KxuK8D8)v6+nSrPt^7qzQ*^DRS>z6|w8-U4C|t=cnaH$hKx!m>8zWi0I?=
zCkWUw33*2;Syma>7wC!kY3b$ISSn+RN}89-O3E1-`g$pv8M;|l3#v;SE7$sKs0v&<
zEbPd;D|_3SjC(MvoQpgi-HTvcoS2P$xb3}D-ONnwERL}ZYYtsbuKE3b!VP~kFJIK2
zj=w%0zMmhi58V}e^?(#4sN-NkfDG9+949cMw1@wMAXFF+<2=lb7tc}j2U6mvkP{u6
z<d>i$M++-erfli$qeyi#r`42M5~UTGE?vUpxh-JMiaLo>xp~qk$qhc6-T>OssZ<g;
zttmws1MAhHOItuKHZ`m}u~LOv?P`|hShZ)hqJ==V;8%okr&eW)H?2*sZu@eb3#{%&
z!A<qvHJp^C-?n@kGX*RUax22`4qHxKX>s1mJ1O^+j16=u#6{m?UQ2o_<JBcRdlPNU
owMx#aH?z~6+H_~wjbvxzttvNe+KL_9F0Iw~Mc}=eBPsv@JHf%}@c;k-

diff --git a/layout/html/tests/table/images/sbs.gif b/layout/html/tests/table/images/sbs.gif
deleted file mode 100644
index d089186c168f81c137f75c6df681127c11b17026..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmZ?wbhEHbWMW`pXklPrVq&psYhg-DS#|D=o105oS_+eq$+Krq`ucjp!a}O6Ym}5!
zgoH%SojYS;Ve#+ZpH-{Ygw2|B?B1P6kDe@Av_!6~q;J=rqE%~-9Xs;!!-v4Yz=DE;
zxVRWjE*?ES9XUA}#eaOhi7BZH<(VZJ3hti10Sr0}Kmf9xft6#ybHx)Tw*DLp)&POm
BILiP4

diff --git a/layout/html/tests/table/images/sell_side.gif b/layout/html/tests/table/images/sell_side.gif
deleted file mode 100644
index b62c09d538b3ac3eaa35177f402f9722e7f4ccc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmZ?wbhEHboWa1(Fp+`b%$Yf}XQeWLfewfSi8C;%we+t%{g!|6oRYS#&G+`~f8F}X
bBP*eE*{h0m@3^gVeXhUGd0r(h!e9*m&CeZi

diff --git a/layout/html/tests/table/images/sell_text1a.gif b/layout/html/tests/table/images/sell_text1a.gif
deleted file mode 100644
index 5940b1134fdf279cbd593395537faa8b31ac8b01..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1920
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
G0029%D6c61

diff --git a/layout/html/tests/table/images/sell_text2.gif b/layout/html/tests/table/images/sell_text2.gif
deleted file mode 100644
index 84ce59ac048956fc32566a5a851db7954a3683a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/sell_text3.gif b/layout/html/tests/table/images/sell_text3.gif
deleted file mode 100644
index d764262fea577060819e80a4f7f1eef712509f1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/sfgate.gif b/layout/html/tests/table/images/sfgate.gif
deleted file mode 100644
index 53fa2dd023a4cec06b08259a29df1208c57e8d75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 640
zcmV-`0)PESNk%w1VN(DT0JHx9|NsB}{r&m*`SkSk<KyGa&CRf|u#b<AZf<T-QBgB9
zGanxx4-XFp1_lEI0{{R3EC2ui08;=H000F4@X1N5eaE!RyZ>OvD4R$CNT{wXrxb~o
z3<aUIc<wm|P%s^X;q}uQkBoxy;36Ot2?6s0MId4iM`Ft@O%&GW(FHgt2v|y^Fg!RA
zD2rkMpqC$OKtK>604Fnbb!i+8e<4W)2nz@UHxx4p3I;$u2wo2cJ_(wR4+Q`QRta7U
zCkC7V1PdLUDJlp7qnS1nNlXa^tPMRw8x1EZxiFsqgcER{GXq!+3krV>CkG`9)`c|-
zs1FPV0|(Cq)DH=($OBGUnrIHz4SB~BJ-T?3KraLYiWmZ_Ob9gyP_mF9RFYTSRMFUi
z;J^SO1`aet1tib_1P&zRi73&_yaf*bF!eYPWmTh1Go*l;GQrf3HQ*9t06;SU&6_xH
z3UH$3gpV6}1_;$KVIBj3Y;HhNV2W9>6eG#`sL<#Mf_!%B=wkyh)Pb*GAszstjgBq{
zE0<C*dX;7jMl}LB1(jmm0Z;@elr3OK02`8$7BFD2K|!1f4n|mEb--o{Q1LMMSkR!L
zu}q=L&5ff;oWvM14G`EF@v1IN6%<IxXu(vRIdSM-NEXBJWdfdX$B?aw38NSWc9JBF
zNAw{o0*_C~17qC{*{$icar@vz0@VU`mpQ6xL9Yi;lxGUSs>1>$;w6;3nQqNR4!Qbi
zje$VG!+iAVAm}#0W`Rc>^Z?*B1>F?E!2$_fQ66{+EZACtSCD{5g3mOlo*0!`ksbwb
a40u5X8;&932QPSN0RxncsG<cC0027{V(>Nq

diff --git a/layout/html/tests/table/images/showattachment.cgi b/layout/html/tests/table/images/showattachment.cgi
deleted file mode 100644
index 0fdd4a848a3d291d87a07239c037d08b49cd502f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUy3?$!L-`oYHn2Vh}LpV4%Za?&Y0OT43_=LCu
z=>{-v08<S>UIPdmIB?)UQ2al`e=r54fh-`Xmfv^;D9&Eu>FdgVo{Lk6&1~)jk=H;W
z(Gu5)lHmNblJdl&R0j7jg|O5j1p_?`lf-*g$6|mA_&^Gri&7IyGV}8kLNaqx8NQe)
l@B(GHJY5_^D&{250J0}BOcYZ3T@7S0c)I$ztaD0e0syA@L3aQE

diff --git a/layout/html/tests/table/images/slc.gif b/layout/html/tests/table/images/slc.gif
deleted file mode 100644
index 3a7707589b9016955984a21c402c547a85d06432..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmZ?wbhEHb<Yf?Gc+9}y78J5-)t;)h7NfM3fB*iRJ9nmQ*^;QD{Qo$B;y*s$#FSKp
z^30M91$R&100zaMER0+X%nUjVK)?%x4lHUDPH1*pCQLcF`}yUMy-VB$nLKk;)wex}
V+#~B+A9PE|T=Kvi9s?!@YXFmXK>z>%

diff --git a/layout/html/tests/table/images/slr.gif b/layout/html/tests/table/images/slr.gif
deleted file mode 100644
index 550a02dcfa1bdee770b63581d4a925095fbf3acc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmZ?wbhEHbWMN=oXklPrVq&psYhg-DS#|D=o105oS_+eq$+Krq`ucjp!a}O6Ym}5!
zgoH%SojYS;Ve#+ZpH-{Ygw2|B?B1P6kDe@Av_!6~q;J=rqE%~-9Xs;!!-v4Yz=DE;
zxVRWjE*?ES9XUA}#eaOhi7BZH<(VZJ3hti10Sr0}Kmf9xft4r0NtXX=%K1h+9cd;8
FYXD<tIe7p8

diff --git a/layout/html/tests/table/images/smblue_paper.gif b/layout/html/tests/table/images/smblue_paper.gif
deleted file mode 100644
index a59a55867a9e3e3d9c56598c10021cbd6b362430..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/spacer.gif b/layout/html/tests/table/images/spacer.gif
deleted file mode 100644
index a986abe538d4a2265802eedf613fef0527f62ab5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 63
zcmZ?wbhEHboW{V&(7?d(9}E=#@%bjEq$-qWmSiZnd-?`2=r8~QNDTuMS4;oO({K3~
M&j}G@u;%3g0M`B#)Bpeg

diff --git a/layout/html/tests/table/images/srs.gif b/layout/html/tests/table/images/srs.gif
deleted file mode 100644
index f9ee9e0daa65abee25696e7c33c2788c5e626aff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147
zcmZ?wbhEHbWMyDvXklPrVq&psYhg-DS#|D=o105oS_+eq$+Krq`ucjp!a}O6Ym}5!
zgoH%SojYS;Ve#+ZpH-{Ygw2|B?B1P6kDe@Av_!6~q;J=rqE%~-9Xs;!!-v4Yz=DE;
zxVRWjE*?ES9XUA}#eaOhi7BZH<(VZJ3hti10Sr0}Kmf9xft77RyU%%HCI)K&4O=(p

diff --git a/layout/html/tests/table/images/star.gif b/layout/html/tests/table/images/star.gif
deleted file mode 100644
index b079be2c501f965e2afd106c2d979c43938a6616..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 227
zcmZ?wbhEHb6k!lz_`(1J^LkxAUyr!7H|Y80{P)))zFmvhz1nZzdcTji(iTj0J9T8?
zgVSNp&xe1!8oqn`oPDcejvQL^=5oP~CBC0;Ccio#v20ez)&0S5E{B5+Lnjn}vM_?g
zbU*~iP6pNl1%<wp%y|wi>y!>J5=h(g?BE%bOz99kIcu4&01dGQ-e$)GA|4+74o55Y
zn9gi=)jTj)MEY!_#8KV&BN<_lf(Q8GVpyAQx12tmd(gX3-};NTSP_SE38!{*bgp(w
JimD=mH2?(KSy2E0

diff --git a/layout/html/tests/table/images/sun.gif b/layout/html/tests/table/images/sun.gif
deleted file mode 100644
index 7f0424b4db6c9e1cfe9c17370784d50e8ad57584..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 732
zcmZ?wbhEHbv||uuxcZ;r|NsBR#l_dIUHkt1``)cv=S-RM{rU5r>gu&X#<62lii@*@
zg5J-W(-RftrK!0$Dk@4-^Imdti=p8?FRvg0fxQwE*CZt72nbj*Fa$9$WHT`IFfgoT
zU^vFWaE<{44jecDrfEee{$ycfU{GMt0a*a@69e0ShwgL@6+YW(OEx9jSk1q%qJ(R%
ziv;IkhuH}(IzFo^cyz7QI~fzs<}pi%ZmRK1+3`Ntan8BvQ9>2b6$~sgwY8q^JXyI4
z+<bi8EV*nftWs(1{$j#&J7-t0O3KK}Nb|6;^NC1G$uvw6_Yp2<5oOEc&*;f!6HIg#
zY-Wp_D=sA^y~JZrwt}QjSsuGkIa4zOf3@6}8`;ruX@~NrJMYM47Gb|v&MxgL_WaFW
z;fv+m(s!;&T+d_SW_+@-uzZO#tH9@59xpER_cC&|9oy>2kT`#}XWj?fhZh<gobx%f
zOq5#=&YR7~`;O&A!n?j^?f@&9$ps9J#~oQkwp>1NrkC+24@b<QH`h8;mve+mNEj3}
zHfyG6h9>0*E64|$DQNWgq)*a1zdAzwz~mdp7<J5;6(lBITjpR|f5B!>D)YnGJr3Sm
zA8-bI<ZIHd5Oc}h+_0Rzk%7&^;L1ZsrxJDpi#nbM&qH=OXK$3b^h0?YBa2MJ1BPuE
zJ(xt^6?{D~%{NhHj<yU#qs2x>fmH?>36~U`(is_LG9(>p7`8q-!q|~iWcKrs`ckuu
zh6@gjU)dH#=Q2E7c)0Bq`-WtR(#EErJZtn~9P;Zz?f8XM92yel9m-Swz*DqiL!$F#
oK3NULBkH0ip^mJcJ^_pk9CA1AHZm}Ev<R>{YA6ahGB8*J0FD>!H2?qr

diff --git a/layout/html/tests/table/images/support.gif b/layout/html/tests/table/images/support.gif
deleted file mode 100644
index c52a6ede9a89c56c8e2737226bd2417d9cf9e79a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmZ?wbhEHbG+{7ixcZ;r|NsB*|NMXd{{8)*|L@<wfBx(L^XJd+|MY+V{{8FU|6jj;
z{roro=N~;kfByXbm;d|w`x_b>>Yx6vudgq7^uM5>AmRT1goK2EJO2X$0vvAsckm5x
zaBwiV_TRw3K;hDV1qB6x^Zx||1Q^czXW0LqVe@^4W#<`Y?q}#(&(JWRp}3zRt$`u3
zfWbF`!6AUb*nvUKfI&)ufmeWmXrKd93GxdA+kc0K0uLRj{u4`zPUcw6_iW)=+z_>p
zw<kw=N7c->3y;0s%u;$cMRi<=x|VWi@n+Wp>p3`WQ#RgT$R%$iD-v2C9?a67q9|L}
z9nL0gBrnFxHX*D?TG2>Rf|rSveF^hSS9Vd!)xtcyQievlYD!yWIJ3FswkpZ+F*1nm
zIV`zbUC&7GuxJXS%;7x>k{7OQRWsB$EF6FN>b<KPhUypC!&&dY*rQ=!q<!T~nBdE+
z${IQwH{T2Y^m&h(j#0`&iN<veqU?WNdNLFrA3abfs$^ksL&fosxIu<$%QVJ_NeqX6
z&79zvlx$kz&h*AB!pV(GL@R7Z#6qW5&Zf@}Dlf0)w{-oFU~J~9ow!J4mx{FahR2H;
zoH%@#1Z*~3@SJum%j5Ud4%UU;6WHW?G%hGLv-)K$>uY$y?%X5D!!Mw4z{F)zk3@L8
ztHmLHSuRNdImV7G#-<4?I5;>8yxiTkmAk7giB>#(L4c)^sqMyx28KpHv0W__4f|#_
zE3^Iza%OYb(6rk)mf`4zhk-LB+}bN0j2_J9l4N1ApJ4jtNVns<(@D0MZr|oSP{tB)
zS7C)~o*;uX$FkyS;bHl?yb>=A(mpInG4p5m^B}Zi+McbG)~xw9$EHn*Lx)4w<)L#W
zgTM)f`5c}r+;|-_6fVTY7F|?zV9!)2V5`}!D0m?1KEsv9iY7(JISkchvFeB7JXIPN
znonVDyV2y9Q^Cf4q2NKF5NnJ>FS{T|@}VFRfrN$_2ewWJ4iS?pvF`p8g1Q8_R~+W6
z=h84@VdQ#|o}w%16VNBc=&)EW;5X~j3kI176O~O>4;*RY*4wgxiA$-=K~RQ$hD)zs
z`<%>lU2dI6K2{26j-Sq)z;fX7TsBpKgNwMQ%=Bau<>-3cvpgj0<<c2kf-DTy0D7}j
AU;qFB

diff --git a/layout/html/tests/table/images/tab_left.gif b/layout/html/tests/table/images/tab_left.gif
deleted file mode 100644
index b28e685ab3170339497b9429e3f66630435c7fa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120
zcmZ?wbhEHbWM|-K*!-X2z<~n{j&m98r!&}2Vz6jqFmGbeN@vhaWl#xYQ1E4tab*xt
zXW*4%VBul_1I3>#j39;%hya<vz@l)$bNjgoysQi<kLI{E%ypi&e9EjPw>B*}yu>SO
QiL2HeK?dulU={{z0I5eGG5`Po

diff --git a/layout/html/tests/table/images/tab_right.gif b/layout/html/tests/table/images/tab_right.gif
deleted file mode 100644
index 485ccd1df58c410d9b555d984d790702ee7c1023..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmZ?wbhEHbWMklG*!-X2z<~n{j&m98r!&}2Vz6jqFmGbeN@vhaWl#xYQ1E4tab*xt
zXW*4%VBul_1I3>#j39;%hya<vz#>yH=cyJ0qiK2mBU#3>$DvH=w`OV|*y5GF#Z}vd
H!5WAFwkaAo

diff --git a/layout/html/tests/table/images/take5_change468.gif b/layout/html/tests/table/images/take5_change468.gif
deleted file mode 100644
index d41f90818987e003fc6f2189db08104345bb07d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/tbl-border-conflict.gif b/layout/html/tests/table/images/tbl-border-conflict.gif
deleted file mode 100644
index fc5d001e753b5d0ed30f1bda3e3f1802c8f54ffd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/test77.jpg b/layout/html/tests/table/images/test77.jpg
deleted file mode 100644
index 1747bcd91efa5b8eff6b9a3d56e9c266597a70fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2149
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
C&#|EZ

diff --git a/layout/html/tests/table/images/the_web.gif b/layout/html/tests/table/images/the_web.gif
deleted file mode 100644
index 4917fdd1244822508af312f15e60c3248832241a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 116
zcmZ?wbhEHb)L@WgnE0RJ|NsAI&YWQY104_v5_e$o?de~6`Yr$BIa_XVw_bEC-dDOv
zyzWNlvaD1)-HHRJwDl6Cuf0C^{U1M%AIp&>HTBCk&5q3Iad}lU>-4PS9XkwX@6ail
ReW7XNp-n&cXfrTa0|0LoGV%Zb

diff --git a/layout/html/tests/table/images/title.gif b/layout/html/tests/table/images/title.gif
deleted file mode 100644
index 0fe500beaf7b6a10fd7ec12ab7172b2d522dc74a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1013
zcmV<R0}A{{Nk%w1VYC2R0K@<QBqJeJNjV`L7L|Ww82<pkz`)P3jJBM6MLRF=@9)>w
z*SovBs;a7*nwpA=ifwIeRaI3*MMW_&F%c0F000000000000000000000000000000
z000000000000000A^8LW000F5EC2ui0JH#F000I5U?GlVX`X1Ru59bRa4gSsZQppV
z?|kq7z@TtQEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjw0g~MyWjA*d`_?1
z@A$la&+q&HfPsR8goTEOh>41ejE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}
ztgWuEu(7hUw6(UkxVgH!K?evF6afb#z{S8K#>K-+zQDqV2gwx6(iF(j%SqA6*@FVo
z0N2Ul#@#X7)#<<n1>ecxh3VwQ^T6gX=<3n~^~Z(o#^6=!cke|$eZ>T@YX{EI0BrpT
z);Nf8+K7kT4l#%T3<3jU()ul^v7n+c2qiZEcKirwV1a5QX_PccVL}2b(jpXC00CG8
zmIWF}Sa~9W0|-MYNPytrCJBxv9lVql(<Mw23LXHU0N{awspASLa6q=K&}t1zTph?D
zsmBvzBTN7$;X%w3IU7hz`#{=*5)Sl99RU@gO|ZtQhD2QKZiBhW&W1e^IH!rV$tKJ+
z_LoH8bP~Q^P6h$8u?Y;)#Y~V?p9H6c^|8Fl*dOiG=}gmuTWx}95}1ui*h+OoYjtVW
z(p1;Er%99rVyA;%n}Xu7R}&DYiQ;&%!OD}3Tn_zn#ozsw0}Hp=<Vfk#4vUOfeWYIX
zl&eWV5xnArojE0-fNorccan4OY-ddW0SF4`T}MHgr64ds)koh|4FWSk0}H@sO$h^5
zgC20j>Gz;D<`u(IWyVxkO#%tLsK7uIQjpwz0hN#<gd~c0VQ~c7C_(~3nvfwdo#9pD
zVl=7;UUff?;}U%$;C7l*Ao&QTg|tPt*a%hzgym>HS{0Id6zG)Yf?Ez0<c;x-K%_Jk
z&e!IWkqtRz0oql=R9R(Rm)M<Bs;6d@Yz}m!QYTWkW14_E@D*)l`Uu~KJni|YVDnYF
z;Da$Ku)wIKqUY&u1L0^=a_y-zUU7sDs;WsN%;;pNOoqf_F%Sq?qp7)Kx0r|3sM%*l
zuWETJFeA;moN;Il)*q@N9a~Xyl890p7Hbu~Cc>uEGMlZq1%!E8kp=8ZleBmyx>$$^
z^=hED?oO62ry{hfPqKr?+SmxQ)}%m<Vg*?dyJZH;CZFKe^yHfKM(mHA4Io7q1PzR-
j?!FfKORfl6%_TuoP%e5fuEN?YmIHFFhw+#sga80LR|M4~

diff --git a/layout/html/tests/table/images/topnavfeatures.gif b/layout/html/tests/table/images/topnavfeatures.gif
deleted file mode 100644
index ffff00123005471e73d30babc5663ce33eed40d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 851
zcmV-Z1FZZ<Nk%w1VO#+c0K@<Q0000YArU$`A0#R;IyyRQVkH$TKp#C^JxEbjTVZBq
zW_fveyqq5Hw*mjmW-VHVGiI4`e~XEXj+vR6qobp!sHn-(+~DBg@9*#b|Nj6000000
z000000000000000A^sdyY-M3&AV*0?AX9B&a&%K+c4cxPR%LP^GA=LxEC2ui09*kQ
z000I5;M6ch0Gw#5u59bRa6Cj-W@8i)?|kpK1PaEM!Rda;q!JYz-g3*RG}g>a7=ptC
z!tHv$;IMd1E}I_*L=B^uT!`?vd`_?1?|9;6q8PH>d4Yn1gnE2_ZEuB(jEsAI69orm
zl$Dm3W(N@&6cde~po0?>oSvblsB)vFsjaD_69HS8w6(Tj4+9wlimtwm7X-V#zr};W
z!^X;j!3hSp(9yI85(~@Mc?%WR*mx(!+T7iND0JV03jmc4?CrGd($E0j^KkX!r}y?L
zgy)6dD(?6bC}&^>eRTp3@@Fv4xrXM}Ie-Q)o-KrP%GrR3ZxKd@80~NrSnpv-A|oCD
z76h5c<idL?Q%0mz@k_gjU2bx@Ik93*cs||b6iVsjK7a%Hq11SgsnU&4pEi|waOF~{
zSf|cY7?o+$tY4ubEhiP_%CT7ux)cj@D-5=2+d@=FljlyHHHY5S3*o2EpnEYHHA}W_
zT!%*2DlR!#CE}}Lkz!@}wISuO`!GYcS8!@%#*aV8Exg&~Vz4MBg5im?uTIx|{d!@2
zH?Nt-Rda(>+BGR}&{|DW&7JvhWzf3|`z|e4GTV=xbvHjtc`exLZjD=3ZL@W3ysZHT
z9zUDtZEvA9FHNo;_*}2%thN_@dA;H5?z4+_%(=K$`Ndg>8Fu>#xDj{d<rJ8>c(66-
zpo88$SO#tgT~^_R^X*3*YVoCanrZiKD4=y98rR>6sJ$oOh#{6(;716SmzQ0&)h3&a
z;hA?HLH_***N@NHHyw~7Wh50>P6@|YeF_OFR&ddwsF{k?ZT6&ZrxBT&MO=321#TVn
z2ufmLj#=iI{hS%5NM5$drJCK8g=Rv-HB#rCg50@gLT>gM4V-)C6KF?(4*CgQekLlI
dq2m<Fs7H@tgQ%jE?ii^uj$WFlrpkl>06S?LjK2T?

diff --git a/layout/html/tests/table/images/topnavlogin.gif b/layout/html/tests/table/images/topnavlogin.gif
deleted file mode 100644
index ef02bc4c50b7eee40b3f922bc4ac4e09a7eb89e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 197
zcmZ?wbhEHbG-nWE*vtR|mX?;u$;s8#)pO>|S-N!Tv17-cKY#xI{rms_|AXaG2ptd)
zq?duE%3z^T!(NNmXRSF{CwVXx_GGMDm-D)hU9p4p<GqS`Last{b}cX{<xpWe{G=e^
zK;)Fg%LN`RahiH<x=HK9GT}=-+g5Q!pS`&G*3{JP2eT`x^ww{__uYKgzWeu2#+B3-
jMr&8JB^9)GHs^##wOdULh@a9wy>G^>nAvj^1R1OWXj@UY

diff --git a/layout/html/tests/table/images/topnavregister2.gif b/layout/html/tests/table/images/topnavregister2.gif
deleted file mode 100644
index d920d0c2af64cd8bb2911b1b30f391e2b56ddbcb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1010
zcmV<O0}cE~Nk%w1VORhX0QUd@000010RaL60s{jB1Ox;H1qB8M1_uWR2nYxX2?+`c
z3JVJh3=9kn4Gj(s4i66x5D*X%5fKs+5)%^>6ciK{6%`g178e&67#J8C85tTH8XFrM
z92^`S9UUGX9v>ecARr(iAt53nA|oRsBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7
zEiEoCE-x=HFfcGNF)=bSGBYzXG&D3dH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?
zK0iM{KtMo2K|w-7LPJACL_|bIMMXwNMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuy
zP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7SXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?Wj
zVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@X=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2T
za&vQYbaZreb#-=jc6WDoczAeud3kzzdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyD
zgoK2Jg@uNOhKGlTh=_=ZiHVAeii?YjjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}
zm6ev3mY0{8n3$NEnVFiJnwy)OoSdAUot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(
zrl+T;sHmu^si~@}s;jH3tgNi9t*x%EuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#p
zxVX5vxw*Q!y1To(yu7@<y}iD^zQ4b}z`(%4!NJ19!o$PE#KgqK#l^<P#>dCU$jHda
z$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD)(b3Y<($mw^)YR0~)z#M4*4Nk9*x1<F+1c9K
z+S}XP+}zyV-QC{a-rwKf;Nall;o;)q;^X7v<mBY#<>lt)=I7_<=;-L_>FMg~>g((4
z?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg=
z{r&#_{{R2~EC2ui09XJL000Qr0RR1aH%bS9g9sBUT*$DY!-o(f>KOG-;6O8(z**eL
zv7^V2AVZ2AX%So|GZp`h%0#lI%a<@cW*Q|>hsKyVbLuRq;~%O#JA(>!na3CamkM<r
z1i5r*$EGBkLUk%|D%F2hLrOhrG2zCfRk>nCIF@W!s7tdl6+3ckSFUcyz75N9YFw~U
z*^0zl)@)q4edoUQ3izekk7?Ov{fpMGV!eftLS9R^GS<qC>%x89)w1NzmI<HD9C+|x
gv4^!zz8aY|XxF7-8(uBDc3#`KVW!T_`)fb|I|485dH?_b

diff --git a/layout/html/tests/table/images/tos1.gif b/layout/html/tests/table/images/tos1.gif
deleted file mode 100644
index c54d6fc16aff9c2ed09b75c8d2c3d28fea323f52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 121
zcmZ?wbhEHb<YVAt*!-X2|Ns9VK74ra;K89oht{uOKViazyu7^l`1pW;00##LIXO9g
zetrfdp!k!8k%57iK?fuTGQ)vIZNf><Y}11gm4_5=s`YtI(s+C*;nt3}yfX?;4ADn7
PY%qNPYtsT%CI)K&xg#sF

diff --git a/layout/html/tests/table/images/tos3.gif b/layout/html/tests/table/images/tos3.gif
deleted file mode 100644
index 34f3764a2b076b3d5724f128373c726f0c00cb77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 139
zcmZ?wbhEHb<YVAt*!-X2|Ns9VK74ra;K9X<7Y`jew0`~i1q&8Tm@pwPFE2hm-oe2^
zPEL-WpPvB+6o0ZXG61#efCNBhIIvi3IO&<~ykgOWbPo15!8xh3yk_Y=|60r9ta<b|
kXZxLbv;Xq0@m#erK+;RBHABE7U`BJ(mTPw+qXikP0Zmpl#sB~S

diff --git a/layout/html/tests/table/images/tos4.gif b/layout/html/tests/table/images/tos4.gif
deleted file mode 100644
index 8d633db8432bd4386966621a3a957045d1e1686d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmZ?wbhEHb<YVAt*!-X2|Ns9VK74ra;K9X<7uT;}zhJ?F2@@tXHa6zv<pl%;I5;@S
z$;t8a^E1GJ;!hSv2B20QkO0UG2Nv@UCq1*dEz(mWIhh0t!ZN+O7wKFz*AOzA_tED*
iuTp}_)HkecYt#?Q2zUrGngv>lwly@it`1USum%7N1TL@u

diff --git a/layout/html/tests/table/images/tos9.gif b/layout/html/tests/table/images/tos9.gif
deleted file mode 100644
index 5d4d133db0d1d6bc60c3c1c0fc0858e370289acf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 144
zcmZ?wbhEHb<YVAt*!-X2|Ns9VK74ra;K9X<7Y`jew0`~i2@@tXHa6zv<;BOx2LuE-
zI5_C)>hkmRGk}5OPZmZ727U$|5D#RA1B>m2lb)-iSI=vB!NI1a6rVI#eVN%cbCCkU
tf-6dADhd|tnR3T6AobX+94lcqMfC_J)%g=%6a+^|ta9C$-pRmV4FG!hHhcg8

diff --git a/layout/html/tests/table/images/tosdot.gif b/layout/html/tests/table/images/tosdot.gif
deleted file mode 100644
index 5f1af7eafd8c412a951bfb93fee26f1884ae7e73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZ?wbhEHbWM|-GSoELa|Ns9VK74R+a9}_Mia%Kx85md?bU?x&wGPa@7Q62J6KGRd
Mv^Ohkj}U`30K1P8N&o-=

diff --git a/layout/html/tests/table/images/trans.gif b/layout/html/tests/table/images/trans.gif
deleted file mode 100644
index 1d11fa9ada9e93505b3d736acb204083f45d5fbf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uX!y@?;J^U}1_s5SEQ~;kK?g*DWEhy3To@Uw0n;G|I{*Lx

diff --git a/layout/html/tests/table/images/transpix.gif b/layout/html/tests/table/images/transpix.gif
deleted file mode 100644
index e66849ac47bb7fe7aee32dd7591989bed35b7566..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uX!y@?;J^U}1_s5SEQ~;kK?g*DWE_~7To@Uw0o36KdjJ3c

diff --git a/layout/html/tests/table/images/trout.gif b/layout/html/tests/table/images/trout.gif
deleted file mode 100644
index 14be1da38af280733565a86090dd7bdcdd6ad3f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 195
zcmZ?wbhEHbG-429*!-X2|Ns9#etZXl_wV1mc<~$v?%%(6?b_9I=gyuydHneCWBd2-
z-MV!PBO@aN80dgVkX{FtiVY_{SMRlWeO5KlM?#NngF);r-HuoLUTBve(QNZl)F^)c
ze_Eqc;f=o%Yi1Xn%u(WJU@l1ZFeqxgQF8iim3ixmZ?mOtcr+ZWIBdbg@L@-dUwiW`
sj_*#wMm#)B%*>6=O)c$hO=dpau58&UPUf!c6H-Lj`=(8g6=bjm06`jAfB*mh

diff --git a/layout/html/tests/table/images/usatoday.gif b/layout/html/tests/table/images/usatoday.gif
deleted file mode 100644
index a6fa4154541a0d3aa9445d60c0553b8290d18273..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmZ?wbhEHbG-HrwxXQrr|NsB*-~YdV|Nr^(|M%|wzjp2WxpUu-9s9m_@As`+zpq^j
zMDLd_eLrW;`zcf2_w>APX#t|=)z#07i=Ss_KTl469u);d_kx1%d3oJ)a=K?}dC$-g
zh^}dBUQ<-OCLwW6K;Rk&$2A6qa||>9Iv_Jaeqmtyf1shjLr1Fr#FC<uIaX6yI-fVs
zbdl?AOMd*(p^fw1vw|BPZps&y8Lla@WK~aU77NuDIq6&^7ud#A$}g4Csx0cnuGlK*
z%hIB(q$DRUGL4^4Aw$@iJ6%DdR$Ne8f!#@{O_s?=pu0_4NGObdmhv2@c@yO_mN~IG
zvB<P3aeK2#*6x)QJu51-Z3p8n#gYt39+rl-j1DhO@jVk2L<Ki(61+HfzOa0oq8Kxy
zc!rdCy4)I19!be=1xXEy!_2vtcL^#A8GKmqW&&fmvXsCDm8M1^7ID294=1EIx%acW
zdoUEcwKOrXN^Nl#Rtj0d#(E?%An1S-8+V#R#esy*LoEL}wxw}Z9+>1fXW^Y=wJ#oL
z$FuS1x#!GC@I1f4Lx|6$;l;zob}mkV6c4X&-a?Fm1`!Wf4>5&u@<|04usB7wZp_TN
zxc0$BrXxJwEEXK*hnknp=T~rPIC7S$k;^k)R!OKal}Rm7%O*j<OsDC*fI-L3gg}ob
zt|T>;4Gf};f=rSoDLZ10H0IuplsX~2A%RJb-JRKB0>eSZX11GcFOnNx8mqB?@<~oI
zZpq<bVV79^^MeCN+%BOntPTMj&CPcA<QDC8Xjvn>_l_3N0f(}dwigqs6=wuIH(J7X
zkTu{S>o$orUzKku3==s-9$XdGZ0%8Lu*mRmXt0p^Al_-{cA@-#cf;N(Vh)n6dk)1h
zFg;;sV&pD(e2{@t<*9G`Y@USE9xfV(dIOZd9c*ZqENN(S{UUP6vBczF(gF45A`9<w
z*oZL*HgYHi+)QEa5N_)5^xN=+L*B&m$mBq$FJA1n%NTpw^wl0dWHDQmcuj!Kqm8ZK
zaMz0iEbB|kpH9qM^wE8y{Dn55IHegHE{y(@mNG_Vlr*GFs+YOYE-MtUAiO!FVuGg2
zkrstl+Dal0S2!lAHBL9@xsl1i%3Sk2NnT_^Ap^6(%*!jyJSu*)3vgvzn6Ug_p|TS@
zpG|=q2V>R=N7i(Pu9h$!hQ)W7PUeZpFr6@bu$JkTK*OBu^_9CBn2t;S;ySYH&9>L?
LcDu1KGFSruu?c88

diff --git a/layout/html/tests/table/images/valid-html401.png b/layout/html/tests/table/images/valid-html401.png
deleted file mode 100644
index 3855210c6c3c85c56f90221b3247fa664374b6bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/layout/html/tests/table/images/vh40 b/layout/html/tests/table/images/vh40
deleted file mode 100644
index c5e9402e73780c2174188f521bdadaf1f5d86e2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 906
zcmV;519kjINk%w1VORhk0Q3L=|Ns9pGc!3kIZ8@OW@cuDgoK%ynas@0nE(K0GXSNG
zW_xpHduB7|y<`8(X3Uv0y_`xI7zq0R|1pfU5L$b+*5_lT##)@c7<;Wsl)V6EnS{00
z=kNEuy~dd{W&i*HA^8LW000sIEC2ui09XJY000I5;31A=X`X1Ru52m2?*YtoZQpqA
z?0oP4z+mu^fW>miBvQz1I(I~)M5e4(pV%z4Xrx-dI3EPUYm6P^^tgdum(vb2+ZXME
z?>67(!-ISR4ts)o41t6^0(*cAABA*WFkX0fdVD*6fMbjiZXXezI}M(H4vdaHb&)h0
z7!@-W8WS8e92gq6xEC`W0Rsmd1vQmvjDVM<Jb#R2%cQ11sYf#z8XK>+t}`3A7~Qwl
z9iJZq3lYLSgM!9r$UA?20uB)Yn5B)-kkSC#88jEwG%RSaz=6ZR2>>_@_&}h*rvc}Z
zeIVAZUNS(RmeqUqNQxH@tY!fas4L+F4X$ecp#;!@;fw<UIz)75iQPJj?lO(CX)geS
zpJW_Fn?mcPH4Y~+%z`Bg0JV|^0({Jat|m^LfdGlRw=ta~A|5=bqOr{afC{!&Zqo&8
zC4d4DmuQ*G<U!c5`p(AM$7&!4YSyS}$l%IAFu8OS`v{8w0bWV9S_#~MVFFsE95zg_
zC98vhBtjI-0Rmw(UB-<adyq78aOJ-m{`I4Qwi*YSh<!9z5Y&eP0>Bj{M&0<ajcvEg
zA_rJQ;B3%977*xNh5&Errk@a3oi|}xS8ZDzXLaSrZvxpJ{3Zi|fbbw;7kfy}y*q62
zNMjWg$(O=s8~@GlLj%A~_k(miSO?$#T|8`u*H|^I6_8&Si04#n1q29y0Uyk?gLLa1
zNI-%M0D)S34vJ-m4X{}A%1Q@q@DEBb6~Ms(3ykC8Z=#_mVuA(ykm7u)g_RFcHXxOa
zNhzI#i;LmRGY)?M_yC-Azy;Yui0!>6AALj?=fO~{B~$@_94wjH1ccRa009HoNEHtY
z)G1w^>KRC20T5ufAbmx8Ak>j%PEy_v?FChUdpn%Rs1Vz!wuMKA;voce*--~+nDI@z
zVx?awmIY&-dI}+^hl=V1gQyUSYN)DWA!tXRz6xEeiIE9F3%sK6z^}jtE9|hu7Hce_
g0VJ#JvdlK??6V0(EA6z@R%`7Cwb<qZf)oM(J4`N!cK`qY

diff --git a/layout/html/tests/table/images/w.gif b/layout/html/tests/table/images/w.gif
deleted file mode 100644
index 0367b9c83ddb28e1965102894781a948f743ffc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHbWMp7u*vtR|4Pe{=rW$~}1`s%K;J|;N_<x4~U<ybBSwNuplZBImfuBJK
RC<!!yk%57Q>4PhSH2^G58FT;u

diff --git a/layout/html/tests/table/images/washingtonpost.gif b/layout/html/tests/table/images/washingtonpost.gif
deleted file mode 100644
index 9ec78e4d2b76988423d692ee478afa6d675a1995..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 490
zcmV<G0Tup7Nk%w1VIKe;0JHx9|NsBa&d%@e_s-7N*4F2>wZ@#BwTz6VdwZN~Ym8c2
zj7my-IXP=FF=HtyS^xk5EC2ui03QGy000F4Fvuy3NsH;t`(9H~A&avl2GVF5)2y&7
zQ-QHGNg)70;jD~>(Djl5DTl_Qz-#)5Kt(2YlpGw1U6bc47J~|+3{=Bzw_V_CwFm<>
zmY`suJ9ovJmBP&qs0IWI17|%yMh!oDHyZ&A2m}WVOm;t&K^Z@7G7MLM266%iS_TdX
z0|o~KI|B(03>ZKdI{~c)2o4H!3=Ri`Jhyv5Cp-hd2MV|ckq(mu2LU_+U>gm+00g%>
zp9}!3%m7yo4hB34IE&)|0vO*m3*EH@h=>e31`Sd$y$3?=as$W;3~&X5Ko15|G^9I#
zs+|x3w3rbvv|>jAgo_*z%Ld@nyNFDmkcqRV0v5)N4!L<_5=w!A9nv(dNMg`i0s=P1
z1=u4%%NAe?fE1{vF6RORpG<rkkV+kaRv3>Ys8{q=(SGCxVk9CH4k>E_>Rc<}BkP(q
zQD^x1=BsQsw0ihxn2^CBAyQ^xD3Lq2LWV(<^0IN0X9a}<H(sJKkszp|LyQi$TB4<k
gp&?>oFbFXrC&B}*-at8vwt{I1DW-T>{UHJXJ31t`ivR!s

diff --git a/layout/html/tests/table/images/wiz438sidebar.gif b/layout/html/tests/table/images/wiz438sidebar.gif
deleted file mode 100644
index ac2652da92ee9c114484e30a9523c8b944d40312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2447
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
JWhnq~`9F3oXPW>3

diff --git a/layout/html/tests/table/images/wsp600bot.gif b/layout/html/tests/table/images/wsp600bot.gif
deleted file mode 100644
index 4f18293d5d36c23d46b7588da28b309da577ca7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4801
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
bqKKW?ijBjJZLRI=(x3;~l_=RpRsaAyD_^oi

diff --git a/layout/html/tests/table/images/x.gif b/layout/html/tests/table/images/x.gif
deleted file mode 100644
index 9197cb1ea9074fb5238b614f0b203c6d00c6fe4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmZ?wbhEHb6k_0Kn8?8J|NsBHckia9r7<ut=m0STNZf(Ra!!Azz}*+K4Bqr++>tS@
z@~utUP#PvSl`pID)M|!LKGz*As$NyG>U19d666^Fe*5X23{A^EbIOV^FjxZshO{LN

diff --git a/layout/html/tests/table/images/yahoo.gif b/layout/html/tests/table/images/yahoo.gif
deleted file mode 100644
index fb75390773dc044ceee043a5d8a7dc4a17a0a093..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 430
zcmV;f0a5-(Nk%w1VMYKC0JHx9|NsC0y~h80oc}^&{{S)n04ewP_wN8H#yL{GwY8<3
zoRm^pgoK0u006+izyJUMA^8LW000gEEC2ui07d{0000F45XecZy*O(eM5vu0j-s)h
zsAa4sB@_f9Ou}&#cwrw2!2T$b2i1wi21CG$a8OJPiNpZLj2f24qf00-FmnjWb=2}r
zb-Nqkv*cZ-gu)CEK-_c)#A4-R-fam6a103n194~s18gt{gi#6zFdaAuWfgD-A9QgD
z3N=OpbW$*cCNDezaR+({k&~T06kY`gOA8sald3vS0A~fb5~xTbQ#{8Ems564DxIjZ
z9EgVp3$k7ZRWyxhObVSAFLni@6|}ZG($k37+zV6YN~KYxO`Vs&wa1%c$Dge7J*y;5
zl^-3OqH#lpW5ADN3wV_qv1*S21%Wo`3NvBKwFFgLmf(nSB}cgdYK-V`XDE#g1j@X~
z7$EP0%vv3BXqtzhPM)8Ie(HfTKq$;h0qWHg!^93p3mxFZ5Mc-?Fal3gXr&N9fq|qL
YYPfufN$8%fXthF7sx+-zv=IORJML|(CjbBd

diff --git a/layout/html/tests/table/interactive/TableIncrementalReflow.html b/layout/html/tests/table/interactive/TableIncrementalReflow.html
deleted file mode 100644
index 1ec57c84d089..000000000000
--- a/layout/html/tests/table/interactive/TableIncrementalReflow.html
+++ /dev/null
@@ -1,352 +0,0 @@
-
-<HTML>
-<HEAD>
-<SCRIPT>
-
-var count = 1;
-function genName(prefix) {
-  return "X" + count++ + "\n";
-}
-
-function insertCaption() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var caption = document.createElement("CAPTION", null);
-  var text = document.createTextNode("here is the new caption text\n");
-  caption.appendChild(text);
-  table.appendChild(caption);
-}
-
-function deleteCaption() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var caption = document.getElementsByTagName("CAPTION")[0];
-  table.removeChild(caption);
-}
-
-function changeCaptionStyle() {
-  var caption = document.getElementsByTagName("CAPTION")[0];
-  caption.align="bottom";
-  dump("SCRIPT: changed caption align to bottom\n");
-}
-
-
-function changeTableStyle() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  table.width="600";
-  dump("SCRIPT: changed table width to 600\n");
-}
-
-
-function insertColGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refColGroup = document.getElementsByTagName("COLGROUP")[0];
-  var colGroup = document.createElement("COLGROUP", null);
-  colGroup.width=100;
-  colGroup.span=1;
-  table.insertBefore(colGroup, refColGroup);
-  dump("SCRIPT: inserted COLGROUP with span=1 width=200 as first colgroup in table\n");
-}
-
-function appendColGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var colGroup = document.createElement("COLGROUP", null);
-  colGroup.width=300;
-  colGroup.span=1;
-  table.appendChild(colGroup);
-  dump("SCRIPT: appended COLGROUP with span=1 width=300\n");
-}
-
-function deleteColGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var colGroup = document.getElementsByTagName("COLGROUP")[0];
-  table.removeChild(colGroup);
-  dump("SCRIPT: deleted first COLGROUP\n");
-}
-
-function changeColGroupStyle() {
-  var colGroup = document.getElementsByTagName("COLGROUP")[0];
-  colGroup.width="200";
-  dump("SCRIPT: changed default width for first COLGROUP to 200\n");
-}
-
-function insertCol() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refCol = table.getElementsByTagName("COL")[0];
-  var col = document.createElement("COL", null);
-  col.width=200;
-  col.span=1;
-  table.insertBefore(col, refCol);
-  dump("SCRIPT: inserted COL with span=1 width=200 as first col in first col group\n");
-}
-
-function appendCol() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.createElement("COL", null);
-  table.appendChild(col);
-  dump("SCRIPT: appended COL with span=1 width=300\n");
-}
-
-function deleteCol() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var col = document.getElementsByTagName("COL")[0];
-  table.removeChild(col);
-  dump("SCRIPT: deleted first COL in first COLGROUP\n");
-}
-
-function changeColStyle() {
-  var col = document.getElementsByTagName("COL")[0];
-  col.width="200";
-  dump("SCRIPT: changed default width for first COL to 200\n");
-}
-
-
-function insertRowGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var refRowGroup = document.getElementsByTagName("TBODY")[0];
-  var rowGroup = document.createElement("TBODY", null);
-  table.insertBefore(rowGroup, refRowGroup);
-  dump("SCRIPT: inserted empty ROWGROUP as first rowgroup in table\n");
-}
-
-function appendRowGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var rowGroup = document.createElement("TBODY", null);
-  table.appendChild(rowGroup);
-  dump("SCRIPT: appended empty ROWGROUP\n");
-}
-
-function appendRowGroupWithContent() {
-  dump("\nSCRIPT: starting appendRowGroupWithContent\n");
-  var table = document.getElementsByTagName("TABLE")[0];
-  var rowGroup = document.createElement("TBODY", null);
-  var row = document.createElement("TR", null);
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode("here is content in the cell from the script appendRowGroupWithContent\n");
-  cell.appendChild(text);
-  row.appendChild(cell);
-  rowGroup.appendChild(row);  
-  table.appendChild(rowGroup);
-  dump("SCRIPT: appended ROWGROUP with 1 row and 1 cell\n");
-}
-
-function deleteRowGroup() {
-  var table = document.getElementsByTagName("TABLE")[0];
-  var rowGroup = document.getElementsByTagName("TBODY")[0];
-  table.removeChild(rowGroup);
-  dump("SCRIPT: deleted first ROWGROUP\n");
-}
-
-function changeRowGroupStyle() {
-  var rowGroup = document.getElementsByTagName("TBODY")[0];
-  rowGroup.align="right";
-  dump("SCRIPT: changed default align for first ROWGROUP to right\n");
-}
-
-function insertRow() {
-  var rg = document.getElementsByTagName("TBODY")[0];
-  var refRow = document.getElementsByTagName("TR")[0];
-  var row = document.createElement("TR", null);
-  rg.insertBefore(row, refRow);
-  dump("SCRIPT: inserted empty ROW as first row in first rowgroup in table\n");
-}
-
-function appendRow() {
-  var rg = document.getElementsByTagName("TBODY")[0];
-  var row = document.createElement("TR", null);
-  rg.appendChild(row);
-  dump("SCRIPT: appended empty ROW in first ROWGROUP\n");
-}
-
-function appendRowWithContent() {
-  dump("\nSCRIPT: starting appendRowWithContent\n");
-  var rg = document.getElementsByTagName("TBODY")[0];
-  var row = document.createElement("TR", null);
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  row.appendChild(cell);
-  rg.appendChild(row);  
-  dump("SCRIPT: appended ROW with 1 cell in first ROWGROUP\n");
-}
-
-function insertRowWithContent() {
-  dump("\nSCRIPT: starting appendRowWithContent\n");
-  var rg = document.getElementsByTagName("TBODY")[0];
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  row = rg.insertRow(0);  
-  row.appendChild(cell);
-  dump("SCRIPT: inserted ROW with 1 cell in first ROWGROUP\n");
-}
-
-function setRowIndex() {
-  dump("\nSCRIPT: starting setRowIndex\n");
-  var row = document.getElementsByTagName("TR")[0];
-  row.rowIndex = 99;
-  dump("SCRIPT: ending setRowindex - placed 1st row at end\n");
-}
-
-function setSectionRowIndex() {
-  dump("\nSCRIPT: starting setSectionRowIndex\n");
-  var row = document.getElementsByTagName("TR")[0];
-  row.sectionRowIndex = 99;
-  dump("SCRIPT: ending setSectionRowindex - placed 1st row at end\n");
-}
-
-function deleteRow() {
-  var rg = document.getElementsByTagName("TBODY")[0];
-  //var row = document.getElementsByTagName("TR")[0];
-  rg.deleteRow(0);
-  dump("SCRIPT: deleted first ROW in first ROWGROUP\n");
-}
-
-function changeRowStyle() {
-  var row = document.getElementsByTagName("TR")[0];
-  row.vAlign="top";
-  dump("SCRIPT: changed default align for first ROW to right\n");
-}
-
-// why doesn't this cell show up
-function insertCellNew() {
-  var row = document.getElementsByTagName("TR")[0];
-  var cell = row.insertCell(0);
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  dump("SCRIPT: inserted  CELL as first cell in first row\n");
-}
-
-function insertCell() {
-  var row = document.getElementsByTagName("TR")[0];
-  var refCell = document.getElementsByTagName("TD")[0];
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode(genName());
-  cell.colSpan=2;
-  cell.appendChild(text);
-  row.insertBefore(cell, refCell);
-  dump("SCRIPT: inserted  CELL as first cell in first row\n");
-}
-
-function appendCell() {
-  var row = document.getElementsByTagName("TR")[0];
-  var cell = document.createElement("TD", null);
-  var text = document.createTextNode(genName());
-  cell.appendChild(text);
-  row.appendChild(cell);
-  dump("SCRIPT: appended CELL in first ROW\n");
-}
-
-function deleteCell() {
-  var row = document.getElementsByTagName("TR")[0];
-  row.deleteCell(0);
-  dump("SCRIPT: deleted first CELL in first ROW\n");
-}
-
-function deleteCellBack() {
-  var row = document.getElementsByTagName("TR")[0];
-  var cell = document.getElementsByTagName("TD")[0];
-  row.removeChild(cell);
-  dump("SCRIPT: deleted first CELL in first ROW\n");
-}
-
-function changeCellStyle() {
-  var cell = document.getElementsByTagName("TD")[0];
-  cell.width=400;
-  dump("SCRIPT: changed width for first CELL to 400\n");
-}
-
-function setCellIndex() {
-  dump("\nSCRIPT: starting setCellIndex\n");
-  var cell = document.getElementsByTagName("TD")[0];
-  cell.cellIndex = 99;
-  dump("SCRIPT: ending setCellIndex - placed 1st cell at end\n");
-}
-
-function AddALot() {
-  dump("\nSCRIPT: starting AddALot\n");
-  var table = document.getElementsByTagName("TABLE")[0];
-  var rowGroup = document.createElement("TBODY", null);
-  var row = document.createElement("TR", null);
-  var row1 = document.createElement("TR", null);
-  var cell1 = document.createElement("TD", null);
-  var cell2 = document.createElement("TD", null);
-  var cell3 = document.createElement("TD", null);
-  var cell4 = document.createElement("TD", null);
-  var text1 = document.createTextNode("cell1\n");
-  var text2 = document.createTextNode("cell2\n");
-  var text3 = document.createTextNode("cell3 has the most content, and will be the tallest cell in the row\n");
-  var text4 = document.createTextNode("cell4\n");
-  cell1.appendChild(text1); cell2.appendChild(text2);
-  cell3.appendChild(text3); cell4.appendChild(text4);
-  row.appendChild(cell3);   row.appendChild(cell4);
-  row.insertBefore(cell2, cell3);  row.insertBefore(cell1, cell2);
-  row1.appendChild(cell2);   row1.appendChild(cell1);
-  row1.insertBefore(cell3, cell2);  row1.insertBefore(cell4, cell3);
-  rowGroup.appendChild(row);  
-  rowGroup.appendChild(row);
-  rowGroup.appendChild(row1);
-  rowGroup.appendChild(row1);
-  table.appendChild(rowGroup);
-  dump("SCRIPT: finished adding\n");
-}
-
-
-</SCRIPT>
-</HEAD>
-<BODY>
-delete removes the first object of [type].
-<table width=150 border>
-	<tbody>
-		<tr>
-			<td>existing cell</td>
-		</tr>
-	</tbody>
-</table>
-
-<p>
-<form>
-<INPUT TYPE="button" NAME="Ins Caption" VALUE="InsertCaption" onClick="insertCaption()" width=100>
-<INPUT TYPE="button" NAME="Del Caption" VALUE="DeleteCaption" onClick="deleteCaption()" width=100>
-<br>
-
-<INPUT TYPE="button" NAME="Ins ColGroup" VALUE="InsertCG" onClick="insertColGroup()" width=100>
-<INPUT TYPE="button" NAME="App ColGroup" VALUE="AppendCG" onClick="appendColGroup()" width=100>
-<INPUT TYPE="button" NAME="Del ColGroup" VALUE="DeleteCG" onClick="deleteColGroup()" width=100>
-<br>
-<INPUT TYPE="button" NAME="Ins Col" VALUE="InsertCol" onClick="insertCol()" width=100>
-<INPUT TYPE="button" NAME="App Col" VALUE="AppendCol" onClick="appendCol()" width=100>
-<INPUT TYPE="button" NAME="Del Col" VALUE="DeleteCol" onClick="deleteCol()" width=100>
-<br>
-<INPUT TYPE="button" NAME="Ins RowGroup" VALUE="InsertRG" onClick="insertRowGroup()" width=100>
-<INPUT TYPE="button" NAME="App RowGroup" VALUE="AppendRG" onClick="appendRowGroup()" width=100>
-<INPUT TYPE="button" NAME="Del RowGroup" VALUE="DeleteRG" onClick="deleteRowGroup()" width=100>
-<INPUT TYPE="button" NAME="App RowGroup with content" VALUE="AppendRG with content" onClick="appendRowGroupWithContent()" width=100>
-<br>
-<INPUT TYPE="button" NAME="Ins Row" VALUE="InsertRow" onClick="insertRow()" width=100>
-<INPUT TYPE="button" NAME="App Row" VALUE="AppendRow" onClick="appendRow()" width=100>
-<INPUT TYPE="button" NAME="Del Row" VALUE="DeleteRow" onClick="deleteRow()" width=100>
-<INPUT TYPE="button" NAME="App Row with content" VALUE="AppendRow with content" onClick="appendRowWithContent()" width=100>
-<INPUT TYPE="button" NAME="App Row with content" VALUE="InsertRow with content" onClick="insertRowWithContent()" width=100>
-<INPUT TYPE="button" NAME="Set Row Index" VALUE="Set Row Index" onClick="setRowIndex()">
-<INPUT TYPE="button" NAME="Set Section Row Index" VALUE="Set Section Row Index" onClick="setSectionRowIndex()">
-<br>
-<INPUT TYPE="button" NAME="Ins Cell" VALUE="InsertCell" onClick="insertCell()" width=100>
-<INPUT TYPE="button" NAME="App Cell" VALUE="AppendCell" onClick="appendCell()" width=100>
-<INPUT TYPE="button" NAME="Del Cell" VALUE="DeleteCell" onClick="deleteCell()" width=100>
-<INPUT TYPE="button" NAME="Set Cell Index" VALUE="Set Cell Index" onClick="setCellIndex()" width=100>
-<br>
-<INPUT TYPE="button" NAME="Add a lot" VALUE="AddALot" onClick="AddALot()" width=100>
-<br>
-<INPUT TYPE="button" NAME="Change Table Style" VALUE="ChangeTableStyle" onClick="changeTableStyle()" width=100>
-<INPUT TYPE="button" NAME="Change Caption Style" VALUE="ChangeCaptionStyle" onClick="changeCaptionStyle()" width=100>
-<INPUT TYPE="button" NAME="Change ColGroup Style" VALUE="ChangeColGroupStyle" onClick="changeColGroupStyle()" width=100>
-<INPUT TYPE="button" NAME="Change Col Style" VALUE="ChangeColStyle" onClick="changeColStyle()" width=100>
-<INPUT TYPE="button" NAME="Change RowGroup Style" VALUE="ChangeRowGroupStyle" onClick="changeRowGroupStyle()" width=100>
-<INPUT TYPE="button" NAME="Change Row Style" VALUE="ChangeRowStyle" onClick="changeRowStyle()" width=100>
-<INPUT TYPE="button" NAME="Change Cell Style" VALUE="ChangeCellStyle" onClick="changeCellStyle()" width=100>
-</form>
-
-</BODY></HTML>
-
-
-
-
diff --git a/layout/html/tests/table/interactive/bug105268.html b/layout/html/tests/table/interactive/bug105268.html
deleted file mode 100644
index b7e67f34a0cc..000000000000
--- a/layout/html/tests/table/interactive/bug105268.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head><title>Demo of form rendering bug</title></head>
-<body bgcolor="white">
-<table border=1>
-<tr bgcolor="gray">
-<td rowspan=2>
-<input type=submit value=button><br>
-<input type=submit value=button>
-</td>
-<td>
-some text row 1
-</td>
- <tr bgcolor="gray">
-<td>
-some text row 2<br>line 2 of row 2
-</td>
-</tr>
-</table>
-
-
-</body>
-</html>
-
diff --git a/layout/html/tests/table/interactive/bug106024.html b/layout/html/tests/table/interactive/bug106024.html
deleted file mode 100644
index eb05c1c2204e..000000000000
--- a/layout/html/tests/table/interactive/bug106024.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<table border="0" bgcolor="red" cellspacing=0 cellpadding=0>
-<tr style="background-color:orange">
- <td rowspan="2" valign="bottom" bgcolor="blue" background="../images/bug106024.jpg"
-  width="250" height="200"> bar</td>
- <td>x<BR>x<BR>x</td>
-</tr>
-<tr style="background-color:yellow">
- <td>y</td>
-
-</table>
diff --git a/layout/html/tests/table/interactive/bug107857.html b/layout/html/tests/table/interactive/bug107857.html
deleted file mode 100644
index e2b0252a4708..000000000000
--- a/layout/html/tests/table/interactive/bug107857.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-  <head>
-    <title>94041-2</title>
-    </style>
-  </head>
-  <body>
-    <table border="1">
-      <tr>
-        <td height="50" width="50" bgcolor="blue">1</td>
-        <td height="50" width="50" bgcolor="blue"></td>
-      </tr>
-      <tr>
-        <td height="50" width="50" background="http://www.mozilla.org/images/mozilla-banner.gif">2</td>
-        <td height="50" width="50" background="http://www.mozilla.org/images/mozilla-banner.gif"></td>
-      </tr>
-    </table>
-  </body>
-</html>
-
diff --git a/layout/html/tests/table/interactive/bug110523.html b/layout/html/tests/table/interactive/bug110523.html
deleted file mode 100644
index 4ede340cbc48..000000000000
--- a/layout/html/tests/table/interactive/bug110523.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<head>
-<title></title>
-<script type="text/javascript">
-
-function toggle(what) {         
-        var adv = document.getElementById("it_guru");
-        var ns = 'none';
-        if (what.checked) {
-                        ns= "table-row";
-        }
-        adv.style.display = ns;
-}
-
-</script></head><body >
-<form action="http://localhost/">
-Click me twice <input type="checkbox" onclick="toggle(this)">
-<table>
-<tbody>
-<tr>
-<td>Without the &lt;tbody&gt; tags Mozilla doesn't crash
-                </td>
-</tr>
-</tbody>
-<tr id="it_guru">
-<td>I disappear
-                </td>
-</tr>
-<tr>
-<td>Without this row Mozilla doesn't crash
-                </td>
-</tr>
-</table>
-</form>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/interactive/bug111872.html b/layout/html/tests/table/interactive/bug111872.html
deleted file mode 100644
index 6dbff793591e..000000000000
--- a/layout/html/tests/table/interactive/bug111872.html
+++ /dev/null
@@ -1,8 +0,0 @@
-type in the text area and it will get taller if the bug is not fixed.
-<form><table border=1 style="height: 100px">
-   <tr>
-      <td style="height: 100%;"><textarea style="margin-top:30px; width: 200px; height: 100%"></textarea></td>
-      <td>height: 100%</td>
-   </tr>
-</table></form>
-
diff --git a/layout/html/tests/table/interactive/bug1128.html b/layout/html/tests/table/interactive/bug1128.html
deleted file mode 100644
index 3bd58a24e28c..000000000000
--- a/layout/html/tests/table/interactive/bug1128.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style>
-tr[name="foo"] {
-  background-color: red;
-  font-size: 200%;
-}
-</style>
-</head>
-<body>
-<button onclick="document.getElementById('row1').setAttribute('name', 'foo')">
-        Click me!
-</button>
-
-<table border>
-  <tr id="row1">This<td>will<td>show<td>a<td>reflow<td>bug</tr>
-  <tr><td>This<td>is<td>a<td>normal<td>row</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug113659.html b/layout/html/tests/table/interactive/bug113659.html
deleted file mode 100644
index 4b201c2c98f1..000000000000
--- a/layout/html/tests/table/interactive/bug113659.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-<body>
-<table border>
-  <tr> 
-    <td>Typing in the textfield shouldn't cause it's parent tables to grow!
-      <table border height="100%">
-        <tr> 
-          <td>
-              <input type="text">
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug114706.html b/layout/html/tests/table/interactive/bug114706.html
deleted file mode 100644
index ca5a44b48fee..000000000000
--- a/layout/html/tests/table/interactive/bug114706.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-<BODY>
-
-<table border=1 style="width: 100%; height: 100%">
-   <tr>
-      <td style="width: 100%; height: 100%">make the window taller and then shorter</td>
-   </tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug11479.html b/layout/html/tests/table/interactive/bug11479.html
deleted file mode 100644
index 7f2e388537a6..000000000000
--- a/layout/html/tests/table/interactive/bug11479.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head><title>weird bug</title></head>
-<body>
-<form><table border=1>
-<tr>
-<td nowrap>
-<fieldset>
-<legend align=center>Spacing</legend>
-<table width="100%" border=1>
-<tr>
-<td>
-<label>
-Letter:<br>
-<select type="select-one" name="letter-spacing-selector" size=1 maxlength=80>
-<option>foo</option>
-</select>
-</label>
-When in GFX render mode for combobox a table cell grows with each click of the 
-combobox button.
-
-Example:
-</td>
-</tr>
-</table>
-</fieldset>
-</td>
-</tr>
-</table>
-</form>
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug127022.html b/layout/html/tests/table/interactive/bug127022.html
deleted file mode 100644
index 1a387a44ab42..000000000000
--- a/layout/html/tests/table/interactive/bug127022.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-  <body>
-  click on the go button and it should not move<BR>
-    <table border="1" cellpadding="0" cellspacing="0">
-      <tr>
-        <td width="25%">x</td>
-        <td>
-          <nobr>
-           <input type="submit" value="Go!">
-         </nobr>
-       </td>
-     </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug127471.html b/layout/html/tests/table/interactive/bug127471.html
deleted file mode 100644
index 49bedab4da87..000000000000
--- a/layout/html/tests/table/interactive/bug127471.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>
-Table Background Testcase
-</TITLE>
-<style type="text/css">
-table {border-collapse: collapse; font-size: xx-large}
-td {border: 6px solid black; vertical-align: baseline}
-#g {border: 20px solid red}
-</style>
-</HEAD>
-<BODY>
-<div>
-        <TABLE border=1 cellspacing=5>
-        <colgroup>
-                <col>
-                <col>
-        </colgroup>
-        <colgroup span=2>
-        </colgroup>
-        <tbody style="background: url(file:///S|/mozilla/layout/html/tests/table/images/smblue_paper.gif);">
-        <TR>
-                <TD>Cell A</TD>
-                <TD>Cell B</TD>
-                <TD>Cell C</TD>
-                <TD>Cell D</TD>
-        </TR>
-        <TR>
-                <TD>Cell E</TD>
-                <TD>Cell F</TD>
-                <TD id="g">Cell G</TD>
-                <TD>Cell H</TD>
-        </TR>
-        <TR>
-                <TD>Cell I</TD>
-                <TD>Cell J</TD>
-                <TD>Cell K</TD>
-                <TD>Cell L</TD>
-        </TR>
-        </tbody>
-        </TABLE>
-
-</div>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug1295.html b/layout/html/tests/table/interactive/bug1295.html
deleted file mode 100644
index 397b27871835..000000000000
--- a/layout/html/tests/table/interactive/bug1295.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<head>
-<script>
-var selectedCell = null;
-
-function select(e) {
-  if (selectedCell) {
-    selectedCell.style.backgroundColor="white";
-    selectedCell.style.color="black";
-  }
-  selectedCell = this;
-  this.style.backgroundColor="blue";
-  this.style.color="white";
-}
-
-function init() {
-  var cells = document.getElementsByTagName("TD");
-  for (var i=0; i<cells.length; i++) {
-    cells[i].onmousedown=select;
-  }
-}
-</script>
-</head>
-<body onload="init()">
-click on a cell, you may have to load the doc twice
-<BR>
-<table id="mytable" border=1 cellspacing=3 cellpadding=10>
-<tr>
-<td>Apples</td>
-<td>Oranges</td>
-<td>Peaches</td>
-</tr>
-<tr>
-<td>Guitar</td>
-<td>Violin</td>
-<td>Bass</td>
-</tr>
-<tr>
-<td>Basketball</td>
-<td>Baseball</td>
-<td>Football</td>
-</tr>
-</table>
-</body>
-
-<!--
-<table border=3 bordercolor=red stylex="border: 3px solid red">
- <tr>
-  <td>foo</td></tr></table>
-  
--->
diff --git a/layout/html/tests/table/interactive/bug130550.html b/layout/html/tests/table/interactive/bug130550.html
deleted file mode 100644
index 988146d18104..000000000000
--- a/layout/html/tests/table/interactive/bug130550.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html lang="en-US">
-<head>
-<style type="text/css">
-.two { position: fixed; top: 50px; right: 20px; margin-left: auto; background: white; }
-</style>
-</head>
-
-<body>
-The bug causes black to appear in the table's margin.
-<BR>
-<table class="two">
-        <tr><td>Data</td></tr>
-</table>
-
-</body></html>
diff --git a/layout/html/tests/table/interactive/bug135112.html b/layout/html/tests/table/interactive/bug135112.html
deleted file mode 100644
index 486b7d4f4348..000000000000
--- a/layout/html/tests/table/interactive/bug135112.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <style type="text/css">
-  table {
-    border-collapse: collapse;
-  }
-
-  td {
-    border: 1px solid blue;
-  }
-  </style>
-</head>
-
-<body onLoad=handleOnLoad()>
-
-The table below has two rows with blue borders.<br>
-If we add a new similar row using DHTML the borders disappear. They may although
-show up in small bits and pieces depending on what you do hereafter (using the
-menus, opening other windows, and various other things).<p>
-
-<table id="myTable">
-  <tr>
-    <th>Column-A</th>
-    <th>Column-B</th>
-    <th>Column-C</th>
-  </tr>
-  <tr>
-    <td>A1</td>
-    <td>A2</td>
-    <td>A3</td>
-  </tr>
-  <tr>
-    <td>B1</td>
-    <td>B2</td>
-    <td>B3</td>
-  </tr>
-</table>
-
-
-<script>
-
-function handleOnLoad()
-{
-  var table = document.getElementById("myTable");
-
-  alert("Now we add a new row");
-
-    // Add a new row at the end of the table
-  var newRow = table.insertRow(3);
-  var cell;
-
-  for (var i=0 ; i<3 ; ++i)
-  {
-    if (0)
-    {
-      cell = document.createElement("TD");
-
-      cell.innerHTML = "C"+(i+1);
-      newRow.appendChild(cell);
-    }
-    else
-    {
-      cell = newRow.insertCell(i);
-
-      cell.innerHTML = "C"+(i+1);
-    }
-  }
-}
-
-</script>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug138292.html b/layout/html/tests/table/interactive/bug138292.html
deleted file mode 100644
index faf0599aa53b..000000000000
--- a/layout/html/tests/table/interactive/bug138292.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<BODY>
-reload the page
-<BR>
-<FORM name=searchForm action=/xp/Caranddriver/keyword_searchresults.xml method=post>
-<TABLE border> 
- <TR>
-  <TD align=middle>x
-</FORM>
-  </TD>
- </TR>
-</TABLE>
-
-<TABLE border>
- <A target="_blank" href="http://ad.doubleclick.net/click;h=v2|2e21|0|0|%2a|t;3606549;0-0;0;6643197;2-120|90;202605|202272|1;;%3fhttp://www.caranddriver.com/xp/Caranddriver/motorbooks/mbi_on_cd.xml">
-  <IMG src="../images/MBIAuto120x90.gif" border=0 alt="Click Here!"></A>
- 
-</TABLE>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/interactive/bug144024-1_printing.html b/layout/html/tests/table/interactive/bug144024-1_printing.html
deleted file mode 100644
index ff05c33935ff..000000000000
--- a/layout/html/tests/table/interactive/bug144024-1_printing.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div style="border:1px solid red; width:100px; height:870px">div</div>
-<table style="border-collapsex:collapse" border>
- <tr>
-  <td>row 1</td>
- </tr>
- <tr>
-  <td>row 2</td>
- </tr>
- <tr>
-  <td>row 3</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/interactive/bug144024-2_printing.html b/layout/html/tests/table/interactive/bug144024-2_printing.html
deleted file mode 100644
index 06344b684c20..000000000000
--- a/layout/html/tests/table/interactive/bug144024-2_printing.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<div style="border:1px solid red; width:100px; height:750px">there should be a sequence of red, green, and blue 
-borders on the cells when print previewed</div>
-<table style="border-collapse:collapse" border>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/interactive/bug144024-3_printing.html b/layout/html/tests/table/interactive/bug144024-3_printing.html
deleted file mode 100644
index c49be9ca465c..000000000000
--- a/layout/html/tests/table/interactive/bug144024-3_printing.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<div style="border:1px solid red; width:100px; height:700px">there should be a sequence of red, green, and blue 
-borders on the cells when print previewed</div>
-<table style="border-collapse:collapse" border>
- <tbody>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- </tbody>
- <tbody>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- </tbody>
- <tbody>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- </tbody>
- <tbody>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- </tbody>
- <tbody>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid red;border-bottom:2px solid red">row 1<BR>row 1<BR>row 1<BR>row 1<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid green;border-bottom:2px solid green">row 2<BR>row 2<BR>row 2<BR>row 2<BR></td>
- </tr>
- <tr>
-  <td style="border-left:2px solid blue;border-bottom:2px solid blue">row 3<BR>row 3<BR>row 3<BR>row 3<BR></td>
- </tr>
- </tbody>
-</table>
diff --git a/layout/html/tests/table/interactive/bug151230.html b/layout/html/tests/table/interactive/bug151230.html
deleted file mode 100644
index dbaf97084bd0..000000000000
--- a/layout/html/tests/table/interactive/bug151230.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><head><title>Post Reply</title></head>
-
-<body>
-Hit the submit button, it should not move.
-<form>
-
-<table width="604" border=1>
-<tbody>
-<tr><td>test</td><td>test</td></tr>
-<tr>
-<td colspan="2" align="center" width="529"><input type="submit" value="Submit"></td>
-</tr>
-</tbody></table>
-</FORM>
-</body></html>
diff --git a/layout/html/tests/table/interactive/bug175455-1.html b/layout/html/tests/table/interactive/bug175455-1.html
deleted file mode 100644
index 209add6c1454..000000000000
--- a/layout/html/tests/table/interactive/bug175455-1.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-   <head>
-      <title>bug 175455</title>
-      <style>
-         a.freesubtype		{display: block; width: 100%; padding-left: 16px;}
-         a.freesubtype:hover	{font-weight: bold;}
-      </style>
-   </head>
-   <body>
-      <table border="1">
-         <tr>
-
-            <td>
-               <a class='freesubtype'>Classic</a>
-            </td>
-         </tr>
-      </table>
-   </body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/interactive/bug175455-2.html b/layout/html/tests/table/interactive/bug175455-2.html
deleted file mode 100644
index 53487bcfffd1..000000000000
--- a/layout/html/tests/table/interactive/bug175455-2.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-	<title>Bug 175455 testcase</title>
-	<style type="text/css">
-	/* All of these rules seem to be required to trigger this bug */
-	a.xxx {
-		display: block;
-		width: 100%;
-		padding-left: 16px;
-		background-color: silver;
-	}
-	a.xxx:hover	{
-		font-weight: bold;
-	}
-	</style>
-</head>
-<body>
-<h1>Bug 175455 testcase</h1>
-<table>
-	<tr>
-		<td style="background-color: lime">
-
-			<a href="" class='xxx'>Hover on me, then move your mouse off again...</a>
-		</td>
-		<td style="background-color: green">
-			...and watch this cell move!
-		</td>
-	</tr>
-</table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/interactive/bug175455-3.html b/layout/html/tests/table/interactive/bug175455-3.html
deleted file mode 100644
index 448d25ee94e2..000000000000
--- a/layout/html/tests/table/interactive/bug175455-3.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title>bug 175455</title>
-      
-      <style>
-         a.freesubtype		{display: block; width: 100%; padding-left: 16px;}
-         a.freesubtype:hover	{font-weight: bold;}
-      </style></head>
-   <body>
-      <table border="1">
-         <tbody><tr>
-            <td><i>
-               <a class="freesubtype">Classic</a></i>
-            </td>
-
-         </tr>
-      </tbody></table>
-   </body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/interactive/bug19535.html b/layout/html/tests/table/interactive/bug19535.html
deleted file mode 100644
index b24e1e19e824..000000000000
--- a/layout/html/tests/table/interactive/bug19535.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<html>
-<head>
-<style>
-table   {
-  border: 1px solid red;
-}
-td   {
-  border: 1px solid blue;
-  padding: 10px;
-}
-a:hover {
-  font-size: 20pt; 
-  color: red;
-}
-</style>
-</head>
-<body>
-<P>First table for comparison of column widths in 'reflowabble' table below.</p>
-<table>
-  <tr><td>Mouse<td>over<td>the<td>anchors<td>here</tr>
-</table>
-<p>
-Notice that when you mouseover the links in the table below, the table reflows. <br>
-However, on mouseout, the 'active' column does not reflow to its original width. 
-</p>
-<table>
-  <tr><td>Mouse<td><a href=''>over</a><td>the<td>anchors<td><a href=''>here</a></tr>
-  <tr><td>Mouse<td>over<td><a href=''>the</a><td><a href=''>anchors</a><td>here</tr>
-  <tr><td><a href=''>Mouse</a><td>over<td><a href=''>the</a><td>anchors<td>here</tr>
-</table>
-<BR>
-<BR>
-<P>First table for comparison of column widths in 'reflowabble' table below.</p>
-<table>
-  <tr><td>Mouse<td>over<td>the<td>anchors<td>here</tr>
-</table>
-<p>
-Notice that when you mouseover the links in the table below, the table reflows. <br>
-However, on mouseout, the 'active' column does not reflow to its original width. 
-</p>
-<table>
-  <tr><td>Mouse<td><a href=''>over</a><td>the<td>anchors<td><a href=''>here</a></tr>
-  <tr><td>Mouse<td>over<td><a href=''>the</a><td><a href=''>anchors</a><td>here</tr>
-  <tr><td><a href=''>Mouse</a><td>over<td><a href=''>the</a><td>anchors<td>here</tr>
-</table>
-
-<p>
-this text is horked after the mouseover/mouseout on the links in the table.
-this text is horked after the mouseover/mouseout on the links in the table.
-this text is horked after the mouseover/mouseout on the links in the table.
-this text is horked after the mouseover/mouseout on the links in the table.
-this text is horked after the mouseover/mouseout on the links in the table.
-</p>
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug27124.html b/layout/html/tests/table/interactive/bug27124.html
deleted file mode 100644
index 06501b3a4b61..000000000000
--- a/layout/html/tests/table/interactive/bug27124.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><body> 
-Click in the text field.
-<BR>
-<form>
-<table>
-        <tr>
-          <td> 
-                <table border="1" width="100%">
-                        <tr>
-                  <td>
-                            Choose a login name:
-                          </td>
-                          <td width="60%">
-                            <INPUT TYPE="TEXT" NAME="UserID" SIZE="20" MAXLENGTH="30" value="">@usa.net
-                          </td>
-                        </tr>
-                        <tr>
-                          <td>
-                                Password:
-                          </td>
-                          <td >
-                                <INPUT TYPE="password" NAME="Passwd" SIZE="20" MAXLENGTH="30" value="">
-                          </td>
-                        </tr>
-                        <input type="Hidden" Name="TZ" Value="America/Denver">
-                </table>
-          </td>
-        </tr>
-</table>
-</body></html>
diff --git a/layout/html/tests/table/interactive/bug39209.html b/layout/html/tests/table/interactive/bug39209.html
deleted file mode 100644
index e74a33a33b8b..000000000000
--- a/layout/html/tests/table/interactive/bug39209.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<HTML>
-    <HEAD>
-        <TITLE>Moz Bug</TITLE>
-    </HEAD>
-    <BODY>
-Click on the submit button
-<BR>
-        <TABLE border=1>
-            <TR> 
-                <TD>
-                    Blah
-                <TD>
-                    <TABLE align="center" border=1> 
-                        <TR>
-                            <TD>
-                                <FORM> 
-                                    <INPUT type="submit"> 
-                                </FORM>
-                    </TABLE>
-            <TR>
-                <TD colspan=2>
-                    This line is only here to separate the two columns in the row above
-        </TABLE>
-    </BODY>
-</HTML>  
diff --git a/layout/html/tests/table/interactive/bug40721.html b/layout/html/tests/table/interactive/bug40721.html
deleted file mode 100644
index 697818728287..000000000000
--- a/layout/html/tests/table/interactive/bug40721.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<script>
-function toggle( ID ){
-target= document.getElementById(ID);
-if (target.style.visibility == "collapse"){
-   target.style.visibility = "visible";
-}
-else{
-   target.style.visibility="collapse";
-}
-}
-</script>
-
-<table border=1>
-<tr><td>
-
-<input type="button" value="Click" onClick="toggle('row')">
-<table border=1>
-<tr id="row"><td>Hello
-</table>
-
-</table>
diff --git a/layout/html/tests/table/interactive/bug42643.html b/layout/html/tests/table/interactive/bug42643.html
deleted file mode 100644
index e7c4d375c3fc..000000000000
--- a/layout/html/tests/table/interactive/bug42643.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<html>
-<body>
-
-<p style="font-family: geneva, sans-serif; font-size: 12px">
-To reproduce the bug, move slowly the mouse cursor onto one of these cells and
-keep the cursor in an empty area. It will incorrectly hilite part of the text 
-instead of hiliting the entire cell. Then move the cursor above some text inside
-the cell: the entire cell is now hilited correctly.<br><br>
-
-The bug changes a bit depending on the cell.
-<br>- Cells #1 and #4: the first line is not hilited.
-<br>- Cells #2 and #3: the first and last lines of text are not selected.<br><br>
-
-NOTES:
-<br>- After you moused-over all the cells, everything works fine. You have to reload the page
-to see the problem again.
-<br>- The problem seems specific to text inside table cells. It doesn't happen with DIVs.
-<br><br>
-</p>
-
-<h3>DIVs are fine</h3>
-                <div style="border: solid; width: 200px"
-                                onmouseover="this.style.backgroundColor='#8080FF';"
-                                onmouseout="this.style.backgroundColor='#F7F6F4';">
-                                                        The quick brown fox jumps<br> over the lazy dog<br> over and over and over
-                </div>
-
-
-<h3>TABLEs show the bug</h3>
-<table width=200 cellpadding=0 cellspacing=0 border=0><tr><td background="">
-<table border="2" cellpadding="0" cellspacing="0">
-         
-                <tr><td
-                                onmouseover="this.style.backgroundColor='#8080FF';"
-                                onmouseout="this.style.backgroundColor='#F7F6F4';">
-                                                        The quick brown fox jumps over the lazy dog over and over and over
-                </td></tr>
-         
-                <tr><td
-                                onmouseover="this.style.backgroundColor='#8080FF';"
-                                onmouseout="this.style.backgroundColor='#F7F6F4';">
-                                        <font face="Arial, Helvetica, sans-serif" size=3 color="000000">
-                                                        The quick brown fox jumps over the lazy dog over and over and over and over and over and over and over and over and over and over and over and over and over
-                                        </font>
-                </td></tr>
-         
-                <tr><td
-                                onmouseover="this.style.backgroundColor='#8080FF';"
-                                onmouseout="this.style.backgroundColor='#F7F6F4';">
-                                        <font face="courier" size=4 color="000000">
-                                                        The quick brown fox jumps over the lazy dog over and over and1234
-                                        </font>
-                </td></tr>
-         
-                <tr><td
-                                onmouseover="this.style.backgroundColor='#8080FF';"
-                                onmouseout="this.style.backgroundColor='#F7F6F4';">
-                                        <font face="courier" size=4 color="000000">
-                                                        The quick brown fox jumps over the lazy dog over and over and12345
-                                        </font>
-                </td></tr>
-        
-        </table>
-</td></tr></table>
-
-</body>
diff --git a/layout/html/tests/table/interactive/bug43732.html b/layout/html/tests/table/interactive/bug43732.html
deleted file mode 100644
index c1ef61127d83..000000000000
--- a/layout/html/tests/table/interactive/bug43732.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<TABLE style="border: 1px solid black"  WIDTH="100%">
- <TR>
-  <TD>foo foo foo foo</TD>
-  <TD width=40>
-   <TABLE style="border: 1px solid red" WIDTH="100%" CELLSPACING="0" CELLPADDING="3">        
-    <TR>
-     <TD width=45%>
-      Your First Name
-     </TD>
-     <TD>
-      <INPUT TYPE=TEXT NAME="1" SIZE="15" MAXLENGTH="30" VALUE="">&nbsp;<BR></FONT>
-     </TD>
-    </TR>
-   </TABLE>
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/interactive/bug44148.html b/layout/html/tests/table/interactive/bug44148.html
deleted file mode 100644
index d27b956d6a94..000000000000
--- a/layout/html/tests/table/interactive/bug44148.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<HTML>
-<HEAD>
-<style>
-TABLE
-{
-        border: 1px solid grey;
-        border-spacing: 0px;
-        border-collapse: collapse;
-        font-size : 10pt;
-}
-TD
-{
-        border: 1px solid grey;
-        width:75px;
-}
-INPUT
-{
-        width:60px;
-        font-size:10pt;
-        border-style:solid;
-}
-</style>
-<script>
-function insertTextField()
-{
-        var cell1 = document.getElementById("cell1");
-        var tf = document.createElement("input");
-        
-        // remove text node and insert formless textfield
-        cell1.replaceChild(tf, cell1.firstChild); 
-}
-function removeTextField()
-{
-        var cell1 = document.getElementById("cell1");
-        var text = document.createTextNode("new text");
-        cell1.replaceChild(text, cell1.firstChild);
-}
-</script>
-</HEAD>
-<BODY>
-<table>
-<tr>
-        <td>r1c1</td>
-        <td>r1c2</td>
-        <td>r1c3</td>
-</tr>
-
-<tr>
-        <td id="cell1">cell 1</td>
-        <td id="cell2">cell 2</td>
-        <td id="cell3">cell 3</td>
-</tr>
-
-<tr>
-        <td>r3c1</td>
-        <td>r3c2</td>
-        <td>r3c3</td>
-</tr>
-
-</table>
-
-<form>
-<input  type="button" value="Insert textfield into first cell" 
-                onclick="insertTextField();"
-                style="width:300px">
-<input  type="button" value="Remove textfield from first cell"
-                onclick="removeTextField();"
-                style="width:300px">
-</form>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug47252.html b/layout/html/tests/table/interactive/bug47252.html
deleted file mode 100644
index 380623fc0e30..000000000000
--- a/layout/html/tests/table/interactive/bug47252.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<HTML>
-<HEAD>
-
-<TITLE>Account Information</TITLE>
-
-
-</HEAD>
-
-<BODY>
-The button should appear at the bottom and not cause any problems when moused over.
-<BR>
-<TABLE>
-
-  <TFOOT>
-  <TR>
-    <TD COLSPAN=4>
-<FORM METHOD=POST ACTION="/cucorp/ac_switch.jsp">
-    <INPUT TYPE="submit" Value="Get Account Information">
-</FORM>
-</TD>
-  </TR>
-  </TFOOT>
-
-  <TBODY style=" height: 200px; overflow: auto">
-
-  <TR>
-    <TD>000080000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$0.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000340000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000370000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000360000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000390000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000240000048</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$163,620.88</TD>
-  </TR>
-
-  <TR>
-    <TD>000160000048</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$3,149.59</TD>
-  </TR>
-
-  <TR>
-    <TD>000010000048</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$100,299.09</TD>
-  </TR>
-
-  <TR>
-    <TD>000400000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000380000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000350000058</TD>
-    <TD>12 MONTH TERM</TD>
-    <TD>CAD</TD>
-    <TD>$500.00</TD>
-  </TR>
-
-  <TR>
-    <TD>000070000058</TD>
-    <TD>30 DAY TERM</TD>
-    <TD>CAD</TD>
-    <TD>$0.00</TD>
-  </TR>
-
-  </TBODY>
-
-</TABLE>
-
-
-</BODY>
-
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug52531.html b/layout/html/tests/table/interactive/bug52531.html
deleted file mode 100644
index fc423616a915..000000000000
--- a/layout/html/tests/table/interactive/bug52531.html
+++ /dev/null
@@ -1,103 +0,0 @@
- <style type="text/css">
-<!--a:active {  text-decoration: none}
-    A:link {text-decoration: none; color:#006699;}
-    a:visited {  text-decoration: none; color:#cc0000;}
-    a:hover {text-decoration:underline; color:#bb0000;}-->
-</style>
-
-<html>
-<head>
-<title>MedSun - Add User</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<script>
-function checks()
-{
-	if (document.form1.name.value.length == 0)
-	{
-		alert("Please enter the user's login name.");
-		return false;
-	}
-	if (document.form1.pass.value.length == 0)
-	{
-		alert("Please enter the user's password.");
-		return false;
-	}
-}
-
-function access_change()
-{
-	if (document.getElementById("access").value != "1")
-	{
-		document.getElementById("clinicrow").style.display =
-"none";
-		document.getElementById("clinic").value = 0;
-	}
-	else
-	{
-		document.getElementById("clinicrow").style.display =
-"block";
-		document.getElementById("clinic").options[0].selected =
-true;
-	}
-	alert(document.getElementById("clinicrow").style.display);
-}
-</script>
-<body bgcolor="#ffffff" topmargin="5" leftmargin="0">
-<table width="737" border="0" cellspacing="0" cellpadding="0">
-<tr><td valign="top" colspan="2">
-<form
-method="POST" action="adduser.asp" id="form1" name="form1" onsubmit="return
-checks();">
-<div style="background:url('images/cback02655.jpg') repeat-y;width:655;">
-<table border="0" width="665">
-<tr><td colspan="2" align="center"><img
-src="dont_find.jpg" WIDTH="280" HEIGHT="40"></td></tr>
-<tr><td colspan="2">&nbsp;</td></tr> <tr><td width=230>User
-Name</td><td><input type="text" id="name" name="name"></td></tr>
-<tr><td>Password</td><td><input
-type="password" id="pass" name="pass"></td></tr>
-<tr><td>Access&nbsp;&nbsp;</td>
-<td>
-<select id="access" name="access" onchange="return access_change();">
-<!--HARDCODING THIS-->
-<option value="1">Clinical User</option>
-<option value="2">CODA Analyst</option>
-<option value="4">CODA Administrator</option>
-</select>
-</td>
-</tr>
-
-<tr><td>Name</td><td><input
-type="text" id="realname" name="realname"></td></tr>
-<tr><td>E-mail</td><td><input
-type="text" id="email" name="email"></td></tr> <tr><td>Phone
-Number</td><td><input type="text" id="phone" name="phone"></td></tr> <tr
-id="clinicrow"><td width=230>User's Clinic</td>
-<td>
-<select id="clinic" name="clinic">
-<option value=23>EDBABO</option><option value=9>Hello2</option><option
-value=24>HENRYHOUSE</option><option value=35>Local
-hospital</option><option value=22>SUNPOWER</option><option value=27>Test
-Clinic 1</option><option value=29>Test Clinic 2</option><option
-value=30>Test Clinic 3</option><option value=31>Test Clinic
-4</option><option value=32>Test Clinic 5</option>
-</select>
-</td>
-</tr>
-</span>
-<tr><td colspan="2">&nbsp;</td></tr> <tr><td
-colspan="2" align="center"><input
-type="image" src="dont_find.jpg" WIDTH="110" HEIGHT="34" border=0></td></tr>
-</table>
-</div>
-</td></tr><tr><td colspan="2">
-<img SRC="dont_find.jpg" border="0" WIDTH="665" HEIGHT="14">
-</form>
-</td></tr>
-</table>
-</body>
-<script>access_change()</script>
-</html>
-
-
diff --git a/layout/html/tests/table/interactive/bug52598.html b/layout/html/tests/table/interactive/bug52598.html
deleted file mode 100644
index 6c7ee392717e..000000000000
--- a/layout/html/tests/table/interactive/bug52598.html
+++ /dev/null
@@ -1,17 +0,0 @@
-Enter some text and the text field should not disappear
-<BR>
-<table border bgcolor=blue>
- <tr>
-  <td>
-   <table border bgcolor=orange>
-    <div>
-     <tr>
-      <td><input type="Text" size="25"></td>
-     </tr>
-    </div>
-   </table>
-  </td>
- </tr> 
-</table>
-
-
diff --git a/layout/html/tests/table/interactive/bug66804.html b/layout/html/tests/table/interactive/bug66804.html
deleted file mode 100644
index 666919a62903..000000000000
--- a/layout/html/tests/table/interactive/bug66804.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<style>
-table{background: red;}
-tr{background:yellow;}
-</style>
-<BODY>
-Both rows should render equal in strict mode.
-<table border=1 width=200>
-<tr>
-<td>1</td>
-<td></td>
-<td>2</td>
-</tr>
-<tr style='empty-cells: show;'>
-<td>1</td>
-<td style="background:red">   </td>
-<td>2</td>
-</tr>
-</table>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug72181.html b/layout/html/tests/table/interactive/bug72181.html
deleted file mode 100644
index 34c8bf015046..000000000000
--- a/layout/html/tests/table/interactive/bug72181.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-<head>
-<title>resize me</title>
-</head>
-<body>
-Hit Ctl+ a few times to resize text
-<table border>
-<tr>
-<td>
-aaaaa
-</td>
-<td>
-bbbbb
-</td>
-<td>
-ccccc
-</td>
-<td>
-ddddd
-</td>
-<td>
-eeeee
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug7522.html b/layout/html/tests/table/interactive/bug7522.html
deleted file mode 100644
index 39ac1cb724b0..000000000000
--- a/layout/html/tests/table/interactive/bug7522.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<HTML><BODY>
-
-<TABLE>
-<TR>
-
-<TD>
-
-<TABLE>
-<TR>
-
-<TD>
-<A href="">Click here ok?</A>
-</TD>
-
-</TR>
-</TABLE>
-
-</TD>
-
-<TD>
-
-<P>
-Text text text text text text text text text text text text text text text text
-text text text text text text text text text text text text text text text text
-text text text text text text text text text text text text text text text text
-text text text text text text text text text text text text text text text text
-text text text text text text text text text text text text text text text text
-</p>
-
-</TD>
-</TR>
-
-</TABLE>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/interactive/bug77982.html b/layout/html/tests/table/interactive/bug77982.html
deleted file mode 100644
index 1a4c2c7487c2..000000000000
--- a/layout/html/tests/table/interactive/bug77982.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<table border=1 width="640">
- <tr>
-  <td style="border:10px solid red"><img src="../images/mozilla-banner.gif"></td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/interactive/bug80817.html b/layout/html/tests/table/interactive/bug80817.html
deleted file mode 100644
index 1e6278183cb5..000000000000
--- a/layout/html/tests/table/interactive/bug80817.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<html>
-<head>
-
-<style type="text/css">
-
-.tbl {
-    border-spacing: 4px;
-    background-color: #EE4080;
-}
-.cell { 
-    white-space: nowrap;
-    border-width: 0px;
-    padding: 4px;
-    background-color: #80CCFF;
-}
-</style>
-</head>
-<body>
-
-<table class="tbl">
-<tr>
- <td class="cell">
-  Use CTRL+ and CTRL- to increase/decrease fontsize<br>
-  the table must grow and shrink back
- </td>
-</tr>
-</table>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug8398.html b/layout/html/tests/table/interactive/bug8398.html
deleted file mode 100644
index 12b3f2547318..000000000000
--- a/layout/html/tests/table/interactive/bug8398.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <title>Show/Hide</title>
-<script type="text/javascript">
-
-///////////////////////////////////////////// 
-function ShowHide() 
-{ 
-  statusCell = GetTextCell("Cell_0"); 
-  statusCell.data = "Hello"; 
-} 
-/////////////////////////////////////////////
-function GetTextCell(aName) 
-{ 
-  var node = document.getElementById(aName); 
-  if (node != null) 
-  {
-    if (node.hasChildNodes) 
-    { 
-      var children = node.childNodes;
-      var length = children.length;
-      var count = 0;
-      
-      while(count < length)
-      {
-        child = children[count];
-        if (child.nodeType == 3)
-        {
-          dump("found kid\n");
-          return child;
-        }
-        count++ 
-      }
-    } 
-  } 
-  return null; 
-} 
-
-</script>
-  </head>
-The caption should be at the bottom
-<BR>
-  <body>
-    <form method="POST" name="myform" action="">
-      <input type="button" value="Show/Hide" onclick="ShowHide()">
-      <table border="2">
-        <caption align="bottom">Caption text</caption>
-        <tbody>
-          <tr>
-            <td id="Cell_0">
-              &nbsp;
-      </table>
-    </form>
-  </body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug86314.html b/layout/html/tests/table/interactive/bug86314.html
deleted file mode 100644
index 9ef016474679..000000000000
--- a/layout/html/tests/table/interactive/bug86314.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<HTML>
-<BODY>
-
-<TABLE align=center border=1>
-  <TR>
-    <TD>
-7. <span style="background-color: #ffbbbb" onmouseover="this.innerHTML = 'ThisTableCellIsNowWider'">jpg</span>
-    </TD>
-  </TR>
-</TABLE>
-
-<p>Hover over the red "jpg" to simulate an image loading in the table cell.  If the effect isn't obvious, scroll down a few pixels and then scroll back up.
-
-<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p<p>p
-
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug8950.html b/layout/html/tests/table/interactive/bug8950.html
deleted file mode 100644
index 2d0f9f07c1bc..000000000000
--- a/layout/html/tests/table/interactive/bug8950.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<html>
-<HEAD>
-<STYLE TYPE="text/css">
-<!--
-a:hover       {color: red;}
--->
-</STYLE>
-</head>
-<body>
-
-<table border=1 width=653>
- <tr>
-  <td colspan=6 width=653>
-   <table border=1 width=620>
-    <tr>
-     <td width=620 height=4> foo </td>
-    </tr>
-    <tr>
-     <td valign=top>
-      <table border=1 width=39>
-       <tr>
-        <td width=39 height=47 valign=top> bar </tD>
-        <td valign=middle align=center> baz </tD>
-       </tr>
-       <tr>
-        <td width=5 valign=top> faz </td>
-        <td valign=top>
-         <table border=1 width=581>
-          <TR>
-           <td colspan=2 width=581>
-            <table border=1 width=581 border=0>
-             <tr>
-              <td valign=top align=left width=120> frip </td>
-              <td align=center valign=top width=480>
-               Feel free to browse ...
-               <P>
-               <CENTER>
-               <TABLE BORDER=1 WIDTH="273">
-                <TR>
-                 <TD><a href="">Holiday</A></TD>
-                 <TD><a href="">Cars</A></TD>
-                </TR>
-                <TR>
-                 <TD><a href="">Sports</A></TD>
-                 <TD><a href="">Animals</A></TD>
-                </TR>
-                <TR>
-                 <TD><a href="">Computers</A></TD>
-                 <TD><a href="">Cartoons</A></TD>
-                </TR>
-               </TABLE>
-               </CENTER>
-              </td>
-             </tr>
-            </TABLE>
-           </td>
-          </tr>
-         </TABLE>
-        </td>
-       </tr>
-      </TABLE>
-     </td>
-    </tr>
-   </TABLE>
-  </td>
- </tr>
-</TABLE>
-<BR>
-
-<p>The second (nested) table below has fixed widths 300px, 500px, 200px (outer to inner).<br>
-When the <code>a:hover</code> for 'Holiday' gets <code>'onMouseOver'</code>,
-the outer table reflows to 300px,<br>
-clipping the middle (500px) table in the process.</p>
-
-<table border=1 width=300>
- <TR>
-  <td>
-300px wide for comparison
-  </td>
- </tr>
-</TABLE>
-
-<br>
-   
-<table border=1 width=300>
- <TR>
-  <td>
-   <table border=1 width=500>
-    <tr>
-     <td>
-      <TABLE BORDER=1 WIDTH=200>
-       <TR>
-        <TD><a href="">Holiday</A></TD>
-       </TR>
-      </TABLE>
-     </td>
-    </tr>
-   </TABLE>
-  </td>
- </tr>
-</TABLE>
-</body></html>
diff --git a/layout/html/tests/table/interactive/bug9043.html b/layout/html/tests/table/interactive/bug9043.html
deleted file mode 100644
index 7795ff734a45..000000000000
--- a/layout/html/tests/table/interactive/bug9043.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<HTML><HEAD><TITLE>test</TITLE>
-<SCRIPT>
-function debugOutput (t) {
-    document.forms[0].txtdisp.value = t;
-  }
-  w.document.writeln(t + '<HR>');}
-</SCRIPT>
-</HEAD>
-<BODY>
-
-Click on a cell to display cell index (bug causes 1st one to be -1)
-<TABLE>
-<THEAD><TR>
-<TH ONCLICK="debugOutput('TH ' + event.type + ': ' + this.cellIndex);">Name</TH>
-</TR></THEAD>
-
-<TBODY><TR>
-<TD ONCLICK="debugOutput('TD ' + event.type + ': ' + this.cellIndex);">Kibo</TD>
-</TR></TBODY>
-</TABLE>
-
-<FORM><INPUT TYPE="TEXT" NAME="txtdisp"></FORM>
-
-<BR>
-
-Click on a cell to display cell index (bug causes 2nd, 4th to be -1)
-<TABLE>
-<TBODY><TR>
-<TD ONCLICK="debugOutput('TD 1 ' + event.type + ': ' + this.cellIndex);">Cell</TD>
-<TH ONCLICK="debugOutput('TH 2 ' + event.type + ': ' + this.cellIndex);">Cell</TH>
-<TD ONCLICK="debugOutput('TD 3 ' + event.type + ': ' + this.cellIndex);">Cell</TD>
-<TH ONCLICK="debugOutput('TH 4 ' + event.type + ': ' + this.cellIndex);">Cell</TH>
-<TD ONCLICK="debugOutput('TD 5 ' + event.type + ': ' + this.cellIndex);">Cell</TD>
-</TR></TBODY>
-</TABLE>
-
-<FORM><INPUT TYPE="TEXT" NAME="txtdisp"></FORM>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/interactive/bug90960.html b/layout/html/tests/table/interactive/bug90960.html
deleted file mode 100644
index 3b3d61c9cd32..000000000000
--- a/layout/html/tests/table/interactive/bug90960.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>px-color</title>
-
-<script type="text/javascript">
-
-i=0;
-showal=false;
-
-function changeStyleA(){
-        usecolor = (i%2)<1 ? "#f00" : "#00f";
-
-        document.getElementById("extable").style.borderColor=usecolor;
-        document.getElementById("extd").style.borderColor=usecolor;
-        document.getElementById("exdiv").style.borderColor=usecolor;
-
-        document.getElementById("pxtable").style.borderColor=usecolor;
-        document.getElementById("pxtd").style.borderColor=usecolor;
-        document.getElementById("pxdiv").style.borderColor=usecolor;
-
-        document.getElementById("pttable").style.borderColor=usecolor;
-        document.getElementById("pttd").style.borderColor=usecolor;
-        document.getElementById("ptdiv").style.borderColor=usecolor;
-
-        document.getElementById("emtable").style.borderColor=usecolor;
-        document.getElementById("emtd").style.borderColor=usecolor;
-        document.getElementById("emdiv").style.borderColor=usecolor;
-
-        i++;
-
-        if (showal) {
-                alert("document.getElementById('pxtable').style.borderColor = "                                                 +document.getElementById("pxtable").style.borderColor);
-        }
-
-}
-
-
-</script>
-
-</head>
-<body>
-Change the border colors a few times, they all should change color<BR>
-<p>
-
-<table id="extable" style="border:1ex solid #0f0;">
-        <tr>
-                <td id="extd" style="border:1ex solid #0f0;">
-This is a td with border:1ex solid #0f0; in a table with border:1ex solid #0f0;
-                </td>
-        </tr>
-</table>
-
-<p>
-
-<div id="exdiv" style="border:1ex solid #0f0;">
-this is a div with border:1ex solid #0f0;
-</div>
-
-<hr>
-
-<table id="pxtable" style="border:10px solid #0f0;">
-        <tr>
-                <td id="pxtd" style="border:10px solid #0f0;">
-This is a td with border:10px solid #0f0; in a table with border:10px solid #0f0;
-                </td>
-        </tr>
-</table>
-
-<p>
-
-<div id="pxdiv" style="border:10px solid #0f0;">
-this is a div with border:10px solid #0f0;
-</div>
-
-<hr>
-
-<table id="pttable" style="border:10pt solid #0f0;">
-        <tr>
-                <td id="pttd" style="border:10pt solid #0f0;">
-This is a td with border:10pt solid #0f0; in a table with border:10pt solid #0f0;
-                </td>
-        </tr>
-</table>
-
-<p>
-
-<div id="ptdiv" style="border:10pt solid #0f0;">
-this is a div with border:10pt solid #0f0;
-</div>
-
-<hr>
-
-<table id="emtable" style="border:1em solid #0f0;">
-        <tr>
-                <td id="emtd" style="border:1em solid #0f0;">
-This is a td with border:1em solid #0f0; in a table with border:1em solid #0f0;
-                </td>
-        </tr>
-</table>
-
-<p>
-
-<div id="emdiv" style="border:1em solid #0f0;">
-this is a div with border:1em solid #0f0;
-</div>
-
-<hr>
-<p>
-<a onClick="changeStyleA();">&gt;&gt;&gt;click here to change colors&lt;&lt;&lt;</a>
-<a onClick="showal=!showal;">&gt;&gt;&gt;click here to (en|dis)able alert&lt;&lt;&lt;</a>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/interactive/bug91443.html b/layout/html/tests/table/interactive/bug91443.html
deleted file mode 100644
index 782daf05a4d8..000000000000
--- a/layout/html/tests/table/interactive/bug91443.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-
-<style>
-
-#table {
-  border: 8px solid #000;
-  background-color: #fff;
-  padding: 50px;
-  width:  400px;
-  height: 200px;
-}
-
-#cell {
-  background-color: #fff;
-}
-
-</style>
-
-<script>
-
-var ix;
-var a= new Array( "#f00", "#0f0", "#00f", "#000", "#ff0", "#f0f", "#0ff", "#fff" );
-var len= a.length;
-var what= "table";
-var elem;
-var text;
-var id;
-
-function Init( arg ) {
-  what= arg;
-  elem= document.getElementById( arg );
-  text= document.getElementById( "text" );
-  text.value= elem.style.backgroundColor;
-  ix= 0;
-}
-
-function Change() {
-  elem.style.backgroundColor= a[ix++];
-  if ( ix >= len )  ix= 0;
-  text.value= elem.style.backgroundColor;
-}
-
-</script>
-
-<body onload="Init('table')">
-
-Change the color on the table more than once.
-<BR>
-<table id=table><tr>
-  <td id=cell></td>
-</tr></table>
-
-<form>
-  <p>Change
-    <label><input type=radio name=radio onclick="Init('table')"> Table</label>&nbsp;
-    <label><input type=radio name=radio onclick="Init('cell')"> Cell</label>&nbsp;
-    color</p>
-  <p><input type=button onclick="Change()" value="Change Color">&nbsp;&nbsp;
-    Table/Cell backgroundColor is <input id=text type=text size=16></p>
-  <p><input type=button onclick="window.id= setInterval( Change, 1000 )" value="Set Interval">&nbsp;
-    <input type=button onclick="clearInterval( window.id )" value="Clear Interval"></p>
-</form>
-
-</body>
diff --git a/layout/html/tests/table/interactive/bug91934.html b/layout/html/tests/table/interactive/bug91934.html
deleted file mode 100644
index ba4c050701d6..000000000000
--- a/layout/html/tests/table/interactive/bug91934.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<style>
-TD
-{
-        border: 1px solid;
-        width:125px;
-}
-</style>
-<script>
-window.onload = windowLoad;
-
-function windowLoad()
-{
-        var newTable = document.createElement("table");
-        newTable.id = "newTable";
-        
-        for(var y=0;y<5;y++)
-
-        {
-                var newRow = newTable.insertRow(y);
-
-                                
-                for(x=0;x<5;x++)
-
-                {
-                        var newCell = newRow.insertCell(x);
-
-                        
-                        if(y == 0 && x == 4)
-                        {
-                                newCell.appendChild(document.createTextNode("A looooooooooooooooooooooooooooooooooooooooong string"));
-                        }
-                        else
-                        {
-                                newCell.appendChild(document.createTextNode("r" + y + "c" + x));
-                        }
-                }
-        }
-        document.body.appendChild(newTable);
-}
-
-function modify()
-{
-        var t = document.getElementById("newTable");
-
-        var cell = t.rows[0].cells[4];
-
-        cell.firstChild.nodeValue = "A short string";
-}
-</script>
-</head>
-<body>
-
-<form>
-<input type="button" onclick="modify();" value="(1) Fill cell with lshort string"><br>
-</form>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/interactive/bug92647.html b/layout/html/tests/table/interactive/bug92647.html
deleted file mode 100644
index 2440415727df..000000000000
--- a/layout/html/tests/table/interactive/bug92647.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HTML>
- <BODY>
-hit the button
-<BR>
-  <TABLE border="1">
-   <TR>
-    <TD>
-     <TABLE border="1">
-      <TR>
-       <TD WIDTH="30%"></TD>
-       <TD WIDTH="70%"><INPUT TYPE=button></TD>
-       <TD></TD>
-      </TR>
-     </TABLE>
-    </TD>
-   </TR>
-  </TABLE>
- </BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/interactive/bug94341.html b/layout/html/tests/table/interactive/bug94341.html
deleted file mode 100644
index fc423616a915..000000000000
--- a/layout/html/tests/table/interactive/bug94341.html
+++ /dev/null
@@ -1,103 +0,0 @@
- <style type="text/css">
-<!--a:active {  text-decoration: none}
-    A:link {text-decoration: none; color:#006699;}
-    a:visited {  text-decoration: none; color:#cc0000;}
-    a:hover {text-decoration:underline; color:#bb0000;}-->
-</style>
-
-<html>
-<head>
-<title>MedSun - Add User</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<script>
-function checks()
-{
-	if (document.form1.name.value.length == 0)
-	{
-		alert("Please enter the user's login name.");
-		return false;
-	}
-	if (document.form1.pass.value.length == 0)
-	{
-		alert("Please enter the user's password.");
-		return false;
-	}
-}
-
-function access_change()
-{
-	if (document.getElementById("access").value != "1")
-	{
-		document.getElementById("clinicrow").style.display =
-"none";
-		document.getElementById("clinic").value = 0;
-	}
-	else
-	{
-		document.getElementById("clinicrow").style.display =
-"block";
-		document.getElementById("clinic").options[0].selected =
-true;
-	}
-	alert(document.getElementById("clinicrow").style.display);
-}
-</script>
-<body bgcolor="#ffffff" topmargin="5" leftmargin="0">
-<table width="737" border="0" cellspacing="0" cellpadding="0">
-<tr><td valign="top" colspan="2">
-<form
-method="POST" action="adduser.asp" id="form1" name="form1" onsubmit="return
-checks();">
-<div style="background:url('images/cback02655.jpg') repeat-y;width:655;">
-<table border="0" width="665">
-<tr><td colspan="2" align="center"><img
-src="dont_find.jpg" WIDTH="280" HEIGHT="40"></td></tr>
-<tr><td colspan="2">&nbsp;</td></tr> <tr><td width=230>User
-Name</td><td><input type="text" id="name" name="name"></td></tr>
-<tr><td>Password</td><td><input
-type="password" id="pass" name="pass"></td></tr>
-<tr><td>Access&nbsp;&nbsp;</td>
-<td>
-<select id="access" name="access" onchange="return access_change();">
-<!--HARDCODING THIS-->
-<option value="1">Clinical User</option>
-<option value="2">CODA Analyst</option>
-<option value="4">CODA Administrator</option>
-</select>
-</td>
-</tr>
-
-<tr><td>Name</td><td><input
-type="text" id="realname" name="realname"></td></tr>
-<tr><td>E-mail</td><td><input
-type="text" id="email" name="email"></td></tr> <tr><td>Phone
-Number</td><td><input type="text" id="phone" name="phone"></td></tr> <tr
-id="clinicrow"><td width=230>User's Clinic</td>
-<td>
-<select id="clinic" name="clinic">
-<option value=23>EDBABO</option><option value=9>Hello2</option><option
-value=24>HENRYHOUSE</option><option value=35>Local
-hospital</option><option value=22>SUNPOWER</option><option value=27>Test
-Clinic 1</option><option value=29>Test Clinic 2</option><option
-value=30>Test Clinic 3</option><option value=31>Test Clinic
-4</option><option value=32>Test Clinic 5</option>
-</select>
-</td>
-</tr>
-</span>
-<tr><td colspan="2">&nbsp;</td></tr> <tr><td
-colspan="2" align="center"><input
-type="image" src="dont_find.jpg" WIDTH="110" HEIGHT="34" border=0></td></tr>
-</table>
-</div>
-</td></tr><tr><td colspan="2">
-<img SRC="dont_find.jpg" border="0" WIDTH="665" HEIGHT="14">
-</form>
-</td></tr>
-</table>
-</body>
-<script>access_change()</script>
-</html>
-
-
diff --git a/layout/html/tests/table/marvin/backgr_border-table-cell.html b/layout/html/tests/table/marvin/backgr_border-table-cell.html
deleted file mode 100644
index a59f332983c7..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-cell.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<title>Background on 'table-cell'</title>
-<link rel="next" href="backgr_layers-opacity.html" title="Background Layers: opacity">
-<link rel="prev" href="backgr_border-table-column.html" title="Background with Borders: Background on 'table-column'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {border: 5px dotted}
-  .e    {background: black url(../images/edge.gif) top left no-repeat}
-  .m    {background: black url(../images/edge.gif) bottom right no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table-cell'</h3>
-
-    <p>Two cells are styled.</p>
-    <p>There should be three aqua stripes just inside the top and left padding edges of cell E.</p>
-    <p>There should be three aqua stripes just inside the bottom and right padding edges of Cell M</a>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_layers-opacity.html">Special Tests: Opacity</a>
-       <dt>previous
-          <dd><a href="backgr_border-table-column.html">Background with Borders: Background on 'table-column'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table-column-group.html b/layout/html/tests/table/marvin/backgr_border-table-column-group.html
deleted file mode 100644
index 1413b0c9d8ab..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-column-group.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column-group'</title>
-<link rel="next" href="backgr_border-table-row.html" title="Background with Borders: Background on 'table-row'">
-<link rel="prev" href="backgr_border-table-row-group.html" title="Background with Borders: Background on 'table-row-group'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table       {                                                        border: 3px dotted}
-  .colgroup-A {background: black url(../images/edge.gif) bottom right no-repeat; border: 5px dashed}
-  .g, .m      {                                                        border: 5px dashed}
-  .col-3      {                                                        border: 9px dashed}
-  .colgroup-B {background: black url(../images/edge.gif) top    left  no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table-column-group'</h3>
-
-    <p>Three aqua stripes should run along the bottom of the last cell in the first three columns and up along the right edge of the cells in the third column. The stripes should align to be just inside the padding edge in cells M and G.</p>
-    <p>Three aqua stripes should also run just inside the top padding edge of the first cell in the last column and down the left border edge of each cell in that column.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table-row.html">Background with Borders: Background on 'table-row'</a>
-       <dt>previous
-          <dd><a href="backgr_border-table-row-group.html">Background with Borders: Background on 'table-row-group'</a>
-       <dt>contents
-          <dd><a href="./">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=3>TD M</td>
-
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table-column.html b/layout/html/tests/table/marvin/backgr_border-table-column.html
deleted file mode 100644
index 7f8fa69ce2cf..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-column.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column'</title>
-<link rel="next" href="backgr_border-table-cell.html" title="Background with Borders: Background on 'table-cell'">
-<link rel="prev" href="backgr_border-table-row.html" title="Background with Borders: Background on 'table-row'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table  {                                                        border: 3px dotted}
-  .col-1 {background: black url(../images/edge.gif) bottom right no-repeat; border: 5px dashed}
-  .a, .m {                                                        border: 5px dashed}
-  .col-2 {background: black url(../images/edge.gif) bottom right no-repeat; border: 9px dashed}
-  .f     {                                                        border: 9px dashed}
-  .col-3 {background: black url(../images/edge.gif) top    left  no-repeat; border: 5px dashed}
-  .g     {                                                        border: 5px dashed}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table-column'</h3>
-
-    <p>Three columns are styled.</p>
-    <p>In the first column, there should be three vertical stripes along the padding edge of the first cell, continuing down through the column. (In cell E, the aqua stripe will be obscured by the thicker right border.) The stripes will cut across cell E as well, but will be further obscured by its thick border. In the border-collapsed table, the same will happen to the vertical stripes in cell A due to cell B's thick border. The stripes should continue in the last cell, turning a right angle to the left into three aqua stripes along the bottom border edge of the last cell. The last cell (M) should not have three vertical stripes along its right edge.</p>
-    <p>In the second column, three vertical strips should run along the right of the first three cells, aligning along cell F's right padding edge. (The stripes will be partially obscured by cell B's thick border.)</p>
-    <p>In the third column, there should be three vertical stripes should run across the top of the first cell and down the left of the column, aligning along cell K's left padding edge. In border-collapse mode, they will be partially obscured by cell B's thick border.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table-cell.html">Background with Borders: Background on 'table-cell'</a>
-       <dt>previous
-          <dd><a href="backgr_border-table-row.html">Background with Borders: Background on 'table-row'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table-quirks.html b/layout/html/tests/table/marvin/backgr_border-table-quirks.html
deleted file mode 100644
index c7be363066f6..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-quirks.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table'</title>
-<link rel="next" href="border-table-row-group.html" title="Background with Borders: Background on 'table-row-group'">
-<link rel="prev" href="layers-opacity.html" title="Background with Borders: Background on 'table-cell'">
-<link rel="contents" href="./" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {background: black url(edge.gif) top left no-repeat; border: 5px dotted;}
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table'</h3>
-
-    <p>There should be three aqua stripes just inside the bottom and right table borders.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="border-table-row-group.html">Background with Borders: Background on 'table-row-group'</a>
-       <dt>previous
-          <dd><a href="layers-opacity.html">Background with Borders: Background on 'table-cell'</a>
-       <dt>contents
-          <dd><a href="./">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table-row-group.html b/layout/html/tests/table/marvin/backgr_border-table-row-group.html
deleted file mode 100644
index a6296f6e99ce..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-row-group.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row-group'</title>
-<link rel="next" href="backgr_border-table-column-group.html" title="Background with Borders: Background on 'table-column-group'">
-<link rel="prev" href="backgr_border-table.html" title="Background with Borders: Background on 'table'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {                                                        border: 3px dotted}
-  thead {background: black url(../images/edge.gif) top    right no-repeat; border: 5px dashed}
-  .d    {                                                        border: 5px dashed}
-  tbody {background: black url(../images/edge.gif) bottom left  no-repeat; border: 5px dashed}
-  .k    {                                                        border: 5px dashed}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table-row-group'</h3>
-
-    <p>There should be three aqua stripes along the top of cells A, B, C, and D in the first row and three stripes along the right edge of D, the last cell in that row. The stripes should align to be just inside the padding edge of cell D.</p>
-    <p>There should be three aqua stripes along the bottom of cells J, K, and L. The stripes continue across the bottom of cell E, but are partially obscured by the border. The stripes turn up at cell E's bottom left corner to run under its border a few pixels to the right of its left border edge. The stripes will align to be just above cell K's bottom padding edge.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table-column-group.html">Background with Borders: Background on 'table-column-group'</a>
-       <dt>previous
-          <dd><a href="backgr_border-table.html">Background with Borders: Background on 'table'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table-row.html b/layout/html/tests/table/marvin/backgr_border-table-row.html
deleted file mode 100644
index b70b9ad7b1f9..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table-row.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row'</title>
-<link rel="next" href="backgr_border-table-column.html" title="Background with Borders: Background on 'table-column'">
-<link rel="prev" href="backgr_border-table-column-group.html" title="Background with Borders: Background on 'table-column-group'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table     {                                                        border: 3px dotted}
-  .th-row-1 {background: black url(../images/edge.gif) bottom right no-repeat; border: 5px dashed}
-  .d        {                                                        border: 5px dashed}
-  .tb-row-1 {background: black url(../images/edge.gif) bottom left  no-repeat; border: 9px dashed}
-  .g        {                                                        border: 9px dashed}
-  .tb-row-2 {background: black url(../images/edge.gif) top left     no-repeat; border: 5px dashed}
-  .k        {                                                        border: 5px dashed}
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table-row'</h3>
-
-    <p>Three rows are styled.</p>
-    <p>The first row should have three aqua stripes just inside the bottom and right padding edges of its last cell. The bottom three stripes should continue across the row, appearing along the bottom of cells A, B, and C. (The bottom aqua stripe will be obscured by the thicker bottom border in cell B.)</p>
-    <p>The second row should have three vertical aqua stripes a few pixels to the right of the left padding edge. Three horizontal aqua stripes should cut across the first cell and align along the bottom border edge of cell G.</p>
-    <p>The third row should have three horizontal aqua stripes along the top of the last three cells, aligning along cell K's top padding edge. The stripes will not continue into cell E.</p>
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table-column.html">Background with Borders: Background on 'table-column'</a>
-       <dt>previous
-          <dd><a href="backgr_border-table-column-group.html">Background with Borders: Background on 'table-column-group'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_border-table.html b/layout/html/tests/table/marvin/backgr_border-table.html
deleted file mode 100644
index 3706b30f02b9..000000000000
--- a/layout/html/tests/table/marvin/backgr_border-table.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<title>Background on 'table'</title>
-<link rel="next" href="backgr_border-table-row-group.html" title="Background with Borders: Background on 'table-row-group'">
-<link rel="prev" href="backgr_layers-opacity.html" title="Background with Borders: Background on 'table-cell'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {background: black url(../images/edge.gif) top left no-repeat; border: 5px dotted;}
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part D: Background with Borders</h2>
-
-    <h3>Background on 'table'</h3>
-
-    <p>There should be three aqua stripes just inside the bottom and right table borders.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table-row-group.html">Background with Borders: Background on 'table-row-group'</a>
-       <dt>previous
-          <dd><a href="backgr_layers-opacity.html">Background with Borders: Background on 'table-cell'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_fixed-bg.html b/layout/html/tests/table/marvin/backgr_fixed-bg.html
deleted file mode 100644
index d86285d8751a..000000000000
--- a/layout/html/tests/table/marvin/backgr_fixed-bg.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>layers: opacity</title>
-<link rel="prev" href="backgr_layers-opacity.html" title="Special Tests: opacity">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-  table{background: white; color: black;}
-  caption {color: white;}
-  .tb-row-1, thead, .l {background: url(../images/edge.gif) fixed;}
-  .a, .p {background: url(../images/rainbowv.gif) fixed; }
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part E: Special Tests</h2>
-
-    <h3>Fixed Backgrounds</h3>
-    
-    <ul>
-    <li>If you scroll the table over the top left corner of the viewport, the first, second, and fourth rows as well as cell L should reveal a purple and aqua band forming a 90-degree angle in the top left corner.
-    <li>Cells A and P should have a rainbow background that seems attached to the viewport.
-    </ul>
-
-    <dl>
-       <dt>previous
-          <dd><a href="backgr_layers-opacity.html">Special Tests: opacity</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-<pre>
-................................................................................................................................................................................................
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-.
-</pre>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_index.html b/layout/html/tests/table/marvin/backgr_index.html
deleted file mode 100644
index 5ff541b01b9a..000000000000
--- a/layout/html/tests/table/marvin/backgr_index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>CSS2 Table Backgrounds Test Suite</title>
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-strong {text-decoration: underline}
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-<h2>Notes</h2>
-<p>This test suite is not endorsed or approved by the W3C or anyone besides fantasai. It tests conformance to fantasai's <a href="../">table background clarification proposal</a>, not the official CSS2 specification. The intent is to demonstrate the proposal's effects under various styling conditions and to clarify any ambiguity in the proposal in preparation for a better-worded errata suggestion. It's not particularly well-designed, but it is comprehensive.</p>
-<p>This test suite (this page and all pages linked from the table of contents below) and its background images (listed below) are in the public domain by assertion of their author. No rights reserved.</p>
-<p>The images used as backgrounds are the following:
-  <ul>
-  <li><img alt="rainbowh.gif" src="../images/rainbowh.gif">
-  <li><img alt="rainbowv.gif" src="../images/rainbowv.gif">
-  <li><img alt="edge.gif" src="../images/edge.gif">
-  </ul>
-<p>They are in GIF format, with transparency.</p>
-<p>Each color band in the rainbow backgrounds is 20 pixels wide. Each stripe within the color band is two pixels wide.</p>
-<p>The aqua and purple band is 10 pixels wide. Each stripe within the band is two pixels wide.</p>
-<p>Many image background rules in this test suite are backed up with a 'black' background color.</p>
-<p>This test suite assumes that <strong>the border edge for a table element in a table with collapsed borders is the <em>middle</em> of the border around the element, not the outer or inner edge.</strong> (This also needs to be addressed by CSS2.1.) It also assumes support for proper ordering of tables with <code class="sgmltag">&lt;tfoot&gt;</code>.</p>
-
-<h2>Table of Contents</h2>
-<ol style="list-style-type: upper-latin">
-<li>Background Area
-    <ol>
-    <li><a href="backgr_simple-table.html">Background on 'table'</a>
-    <li><a href="backgr_simple-table-row-group.html">Background on 'table-row-group'</a>
-    <li><a href="backgr_simple-table-column-group.html">Background on 'table-column-group'</a>
-    <li><a href="backgr_simple-table-row.html">Background on 'table-row'</a>
-    <li><a href="backgr_simple-table-column.html">Background on 'table-column'</a>
-    <li><a href="backgr_simple-table-cell.html">Background on 'table-cell'</a>
-    </ol>
-<li>Background Position
-    <ol>
-    <li><a href="backgr_position-table.html">Background on 'table'</a>
-    <li><a href="backgr_position-table-row-group.html">Background on 'table-row-group'</a>
-    <li><a href="backgr_position-table-column-group.html">Background on 'table-column-group'</a>
-    <li><a href="backgr_position-table-row.html">Background on 'table-row'</a>
-    <li><a href="backgr_position-table-column.html">Background on 'table-column'</a>
-    <li><a href="backgr_position-table-cell.html">Background on 'table-cell'</a>
-    </ol>
-<li>Background Layers
-    <ol>
-    <li><a href="backgr_layers-show.html">empty-cells: show</a>
-    <li><a href="backgr_layers-hide.html">empty-cells: hide</a>
-    </ol>
-<li>Background with Borders
-    <ol>
-    <li><a href="backgr_border-table.html">Background on 'table'</a>
-    <li><a href="backgr_border-table-row-group.html">Background on 'table-row-group'</a>
-    <li><a href="backgr_border-table-column-group.html">Background on 'table-column-group'</a>
-    <li><a href="backgr_border-table-row.html">Background on 'table-row'</a>
-    <li><a href="backgr_border-table-column.html">Background on 'table-column'</a>
-    <li><a href="backgr_border-table-cell.html">Background on 'table-cell'</a>
-<li>Special Tests
-    <ol>
-    <li><a href="backgr_layers-opacity.html">Opacity</a>
-    <li><a href="backgr_fixed-bg.html">Fixed Backgrounds</a>
-    </ol>
-</ol>
-
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_layers-hide.html b/layout/html/tests/table/marvin/backgr_layers-hide.html
deleted file mode 100644
index 8f22f0dd7a8f..000000000000
--- a/layout/html/tests/table/marvin/backgr_layers-hide.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>empty-cells: hide</title>
-<link rel="next" href="backgr_border-table.html" title="Background with Borders: Background on 'table'">
-<link rel="prev" href="backgr_layers-show.html" title="Background Layers: empty-cell: show">
-<link rel="contents" href="./backgr_indxe.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table        {background: blue; empty-cells: hide}
-  tbody, thead {background: url(../images/edge.gif) right top  no-repeat}
-  tr           {background: url(../iamges/edge.gif) 0     10px   no-repeat}
-  .colgroup-A  {background: url(../images/edge.gif) 100%  20px   no-repeat}
-  .col-3       {background: url(../images/edge.gif) 0     30px   no-repeat}
-  .c           {background: url(../images/edge.gif) -20px 100%   no-repeat; min-height: 50px}
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part C: Background Layers</h2>
-
-    <h3>empty-cells: hide</h3>
-
-    <p>Both tables should look identical to the ones in <a href="backgr_layers-show.html">empty-cells: show</a> except that there should be a blue blank where table cell C should be.
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_border-table.html">Background with Borders: Background on 'table'</a>
-       <dt>previous
-          <dd><a href="backgr_layers-show.html">Background Layers: empty-cells: show</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_layers-opacity.html b/layout/html/tests/table/marvin/backgr_layers-opacity.html
deleted file mode 100644
index be56a9ca7724..000000000000
--- a/layout/html/tests/table/marvin/backgr_layers-opacity.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>layers: opacity</title>
-<link rel="next" href="backgr_fixed-bg.html" title="Special Tests: Fixed Backgrounds">
-<link rel="prev" href="backgr_border-table-cell.html" title="Special Tests: Fixed Backgrounds">
-<link rel="stylesheet" type="text/css" href="common.css">
-
-<style type="text/css">
-  table{background: white; color: black;}
-  caption {color: white;}
-  tr {background: red; opacity: 0.5; }
-  tfoot {background: yellow; opacity: 0.5; }
-  .a, .p {background: blue; opacity: 0.5; }
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part E: Special Tests</h2>
-
-    <h3>opacity: 0.5</h3>
-    
-    <ul>
-    <li>The first three rows should be red.
-    <li>The last row should be orange.
-    <li>Cell A should be purple. Cell P should also be purple, but of a shade that reflects the underlying orange rather than the red.
-    </ul>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_fixed-bg.html">Special Tests: Fixed Backgrounds</a>
-       <dt>previous
-          <dd><a href="backgr_border-table-cell.html">Background with Borders: Background on 'table-cell'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_layers-show.html b/layout/html/tests/table/marvin/backgr_layers-show.html
deleted file mode 100644
index e69e1efdef94..000000000000
--- a/layout/html/tests/table/marvin/backgr_layers-show.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>empty-cells: show</title>
-<link rel="next" href="backgr_layers-hide.html" title="Background Layers: empty-cell: hide">
-<link rel="prev" href="backgr_position-table-cell.html" title="Background Position: Background on 'table-cell'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table        {background: blue; empty-cells: show}
-  tbody, thead {background: url(../images/edge.gif) right top  no-repeat}
-  tr           {background: url(../images/edge.gif) 0     10px   no-repeat}
-  .colgroup-A  {background: url(../images/edge.gif) 100%  20px   no-repeat}
-  .col-3       {background: url(../images/edge.gif) 0     30px   no-repeat}
-  .c           {background: url(../images/edge.gif) -20px 100%   no-repeat; min-height: 50px}
-
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part C: Background Layers</h2>
-
-    <h3>empty-cells: show</h3>
-
-    <p>Both tables should have a blue background.</p>
-
-    <p>In table cell C (third cell in the first row), which is empty:</p>
-    <ul>
-        <li>Four sets of horizontal double violet stripes surrounded by aqua should run just inside the top border edge.
-        <li>One set of aqua-backed double violet stripes should run just inside the left, right, and bottom border edges.
-        <li>The third set along the top should turn down at the right edge and go under the fourth set to form the right-edge set.
-        <li>The fourth set should turn down at the left edge to form the left set.
-        <li>The bottom stripe should be straight and cut across <em>over</em> the side sets.
-    </ul>
-    <p>In table cell A, (first cell in the first row):</p>
-    <ul>
-        <li>Three sets of horizontal aqua-backed double violet stripes should run just inside the top border edge.
-        <li>The first set should run across.
-        <li>The second set should turn down at the left edge, going over the third set to form another set that runs just inside the left border edge.
-    </ul>
-    <p>In table cell D, (last cell in the first row):</p>
-    <ul>
-        <li>Two sets of horizontal aqua-backed double violet strips should run just inside the top border edge.
-        <li>The first set should turn down at the right edge, going under the second horizontal set to run vertically just inside the right border edge.
-    </ul>
-    <p>In table cell G, (third cell in the second row):</p>
-    <ul>
-        <li>Two sets of horizontal aqua-backed double violet stripes should run just inside the top border edge.
-        <li>A set of vertical stripes should run down just inside the left border edge, going under both horizontal stripes.
-        <li>Another set of vertical stripes should run down just inside the right border edge, also going under both horizontal stripes.
-    </ul>
-    <dl>
-       <dt>next
-          <dd><a href="backgr_layers-hide.html">Background Layers: empty-cells: show</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-cell.html">Background Position: Background on 'table-cell'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c"></th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png"  height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table-cell.html b/layout/html/tests/table/marvin/backgr_position-table-cell.html
deleted file mode 100644
index 237d996aeea8..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table-cell.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-cell'</title>
-<link rel="next" href="backgr_layers-show.html" title="Background Layers: empty-cells: show">
-<link rel="prev" href="backgr_position-table-column.html" title="Background Position: Background on 'table-column'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  .e {background: black url(../images/edge.gif) top left no-repeat}
-  .m {background: black url(../images/edge.gif) bottom right no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table-cell'</h3>
-
-    <p>Two cells are styled.</p>
-    <p>There should be three aqua stripes just inside the top and left padding edges of cell E.</p>
-    <p>There should be three aqua stripes just inside the bottom and right padding edges of Cell M</a>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_layers-show.html">Background Layers: empty-cells: show</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-column.html">Background Position: Background on 'table-column'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table-column-group.html b/layout/html/tests/table/marvin/backgr_position-table-column-group.html
deleted file mode 100644
index 6bca0464c7cf..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table-column-group.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column-group'</title>
-<link rel="next" href="backgr_position-table-row.html" title="Background Position: Background on 'table-row'">
-<link rel="prev" href="backgr_position-table-row-group.html" title="Background Position: Background on 'table-row-group'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  .colgroup-A {background: black url(../images/edge.gif) bottom right no-repeat}
-  .colgroup-B {background: black url(../images/edge.gif) top left no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table-column-group'</h3>
-
-    <p>Three aqua stripes should run just inside the bottom border edge of the last cell in the first three columns and up the right border edge of the cells in the third column.</p>
-    <p>Three aqua stripes should also run just inside the top border edge of the first cell in the last column and down the left border edge of each cell in that column.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table-row.html">Background Position: Background on 'table-row'</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-row-group.html">Background Position: Background on 'table-row-group'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=3>TD M</td>
-
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table-column.html b/layout/html/tests/table/marvin/backgr_position-table-column.html
deleted file mode 100644
index 247a8af3b89e..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table-column.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column'</title>
-<link rel="next" href="backgr_position-table-cell.html" title="Background Position: Background on 'table-cell'">
-<link rel="prev" href="backgr_position-table-row.html" title="Background Position: Background on 'table-row'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  .col-1 {background: black url(../images/edge.gif) bottom right no-repeat}
-  .col-2 {background: black url(../images/edge.gif) bottom right no-repeat}
-  .col-3 {background: black url(../images/edge.gif) top left}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table-column'</h3>
-
-    <p>Three columns are styled.</p>
-    <p>In the first column, there should be three vertical stripes just inside the right border edge of the first three cells. The stripes should continue in the last cell, turning a right angle to the left into three aqua stripes along the bottom border edge of the last cell. The last cell should not have three vertical stripes along its right border edge.</p>
-    <p>In the second column, there should be three vertical stripes just inside the right border edge of the first three cells.</p>
-    <p>In the third column, there should be three vertical stripes just inside the top border edge of the first cell and just inside the left edge of all four cells.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table-cell.html">Background Position: Background on 'table-cell'</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-row.html">Background Position: Background on 'table-row'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table-row-group.html b/layout/html/tests/table/marvin/backgr_position-table-row-group.html
deleted file mode 100644
index 7f8237dd385f..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table-row-group.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row-group'</title>
-<link rel="next" href="backgr_position-table-column-group.html" title="Background Position: Background on 'table-row-group'">
-<link rel="prev" href="backgr_position-table.html" title="Background Position: Background on 'table'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  thead {background: black url(../images/edge.gif) top    right no-repeat}
-  tbody {background: black url(../images/edge.gif) bottom left  no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table-row-group'</h3>
-
-    <p>There should be three aqua stripes along the top border edge of each cell in the first row and three stripes along the right border edge of the last cell in that row.</p>
-    <p>There should be three aqua stripes along the bottom border edge of cells E, J, K, and L. There should also be
-three vertical aqua stripes along the left edge of cell E.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table-column-group.html">Background Position: Background on 'table-column-group'</a>
-       <dt>previous
-          <dd><a href="backgr_position-table.html">Background Position: Background on 'table'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table-row.html b/layout/html/tests/table/marvin/backgr_position-table-row.html
deleted file mode 100644
index c82cc74ea3ee..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table-row.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row'</title>
-<link rel="next" href="backgr_position-table-column.html" title="Background Position: Background on 'table-column'">
-<link rel="prev" href="backgr_position-table-column-group.html" title="Background Position: Background on 'table-column-group'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  .th-row-1 {background: black url(../images/edge.gif) bottom right no-repeat;}
-  .tb-row-1 {background: black url(../images/edge.gif) bottom left   no-repeat;}
-  .tb-row-2 {background: black url(../images/edge.gif) top    left no-repeat;}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table-row'</h3>
-
-    <p>Three rows are styled.</p>
-    <p>The first row should have three aqua stripes just inside the
-     bottom and right border edges of its last cell. The bottom three
-     stripes should continue across the row, appearing along the border
-     edge of each cell.</p>
-    <p>The second row should have three vertical aqua stripes just
-     inside the left border edge of the top half of the first cell (Cell
-     E.) Three horizontal aqua stripes should cut across that cell and
-     align along the bottom border edge of the last three cells.</p>
-    <p>The third row should have three horizontal aqua stripes along the
-     top border edge of the last three cells in the row.</p>
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table-column.html">Background Position: Background on 'table-column'</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-column-group.html">Background Position: Background on 'table-column-group'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_position-table.html b/layout/html/tests/table/marvin/backgr_position-table.html
deleted file mode 100644
index 23977ae15791..000000000000
--- a/layout/html/tests/table/marvin/backgr_position-table.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table'</title>
-<link rel="next" href="backgr_position-table-row-group.html" title="Background Position: Background on 'table-row-group'">
-<link rel="prev" href="backgr_position-table-cell.html" title="Background Position: Background on 'table-cell'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {background: black url(../images/edge.gif) top right no-repeat}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part B: Background Position</h2>
-
-    <h3>Background on 'table'</h3>
-
-    <p>There should be three aqua stripes just inside the top and right table borders.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table-row-group.html">Background Position: Background on 'table-row-group'</a>
-       <dt>previous
-          <dd><a href="backgr_position-table-cell.html">Background Position: Background on 'table-cell'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr id="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr id="tb-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table-cell.html b/layout/html/tests/table/marvin/backgr_simple-table-cell.html
deleted file mode 100644
index 15ed40edc4d0..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table-cell.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-cell'</title>
-<link rel="prev" href="backgr_simple-table-column.html" title="Background Area: Background on 'table-column'">
-<link rel="next" href="backgr_position-table.html" title="Background Position: Background on 'table'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  td,th {background: black url(../images/rainbowv.gif) top right}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table-cell'</h3>
-
-    <p class="clip">Each cell's background should fill the rectangle
-     defined by its border edge. There should be no gaps or holes in
-     the background within a cell.</p>
-    <p class="position">A purple band should align with the top
-     padding edge of each cell, and an orange stripe should align a
-     few pixels to the left of its right padding edge.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_position-table.html">Background Position: Background on 'table'</a>
-       <dt>previous
-          <dd><a href="backgr_simple-table-column.html">Background Area: Background on 'table-column'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table-column-group.html b/layout/html/tests/table/marvin/backgr_simple-table-column-group.html
deleted file mode 100644
index 689f2b76cf3a..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table-column-group.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column-group'</title>
-<link rel="next" href="backgr_simple-table-row.html" title="Background Area: Background on 'table-row'">
-<link rel="prev" href="backgr_simple-table-row-group.html" title="Background Area: Background on 'table-row-group'">
-<link rel="contents" href="./backgr_index,.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  colgroup {background: black url(../images/rainbowv.gif) top left}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table-column-group'</h3>
-
-    <p class="scope">The first column group spans the first three
-     columns. The second column group only contains the last column.
-    <p class="clip">The table column group background should be visible
-     within the border edge of each cell originating in the column
-     group. Within each column group, all stripes should line up as if
-     the cells were cutouts in a stencil placed over the column group
-     background. Furthermore, the horizontal stripes should also align
-     across the two column groups.</p>
-    <p class="position">A purple band should align with the top border
-     edge of the cells in the first row. An aqua stripe should align a
-     few pixels to the right of the left border edge of cells in the
-     column group's leftmost column.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_simple-table-row.html">Background Area: Background on 'table-row'</a>
-       <dt>previous
-          <dd><a href="backgr_simple-table-row-group.html">Background Area: Background on 'table-row-group'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table-column.html b/layout/html/tests/table/marvin/backgr_simple-table-column.html
deleted file mode 100644
index 096bde84a89e..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table-column.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-column'</title>
-<link rel="next" href="backgr_simple-table-cell.html" title="Background Area: Background on 'table-cell'">
-<link rel="prev" href="backgr_simple-table-row.html" title="Background Area: Background on 'table-row'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  col {background: black url(../images/rainbowv.gif) bottom right}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table-column'</h3>
-
-    <p class="scope">All four columns are styled.</p>
-    <p class="clip">The table column background should be visible within
-     the border edge of each cell originating in the column, and the
-     background should be continuously tiled to fill the entire cell.
-     Within the column, all stripes should line up as if the cells were
-     cutouts in a stencil placed over the column background.
-     Furthermore, horizontal stripes should align across columns.</p>
-    <p class="position">A red band should align with the bottom
-     border edge of the last cell in each column. An orange stripe
-     should align a few pixels to the left of the right border of the
-     non-column-spanning cells in each column.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_simple-table-cell.html">Background Area: Background on 'table-cell'</a>
-       <dt>previous
-          <dd><a href="backgr_simple-table-row.html">Background Area: Background on 'table-row'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table-row-group.html b/layout/html/tests/table/marvin/backgr_simple-table-row-group.html
deleted file mode 100644
index c1dc00b2e641..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table-row-group.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row-group'</title>
-<link rel="next" href="backgr_simple-table-column-group.html" title="Background Area: Background on 'table-row-group'">
-<link rel="prev" href="backgr_simple-table.html" title="Background Area: Background on 'table'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  tbody {background: black url(../images/rainbowh.gif) bottom left}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table-row-group'</h3>
-
-    <p class="scope">The styled row group spans the second and third
-     rows.</p>
-    <p class="clip">The table row group background should be visible
-     within the border edge of each cell originating in the row group.
-     All stripes should line up as if the cells were cutouts in a
-     stencil placed over the row group background.</p>
-    <p class="position">A red band should align with the left border
-     edge of the first cells in each of the row group's rows. An orange
-     stripe should align a few pixels above the bottom border of the
-     cells in the row group's last row.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_simple-table-column-group.html">Background Area: Background on 'table-column-group'</a>
-       <dt>previous
-          <dd><a href="backgr_simple-table.html">Background Area: Background on 'table'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table-row.html b/layout/html/tests/table/marvin/backgr_simple-table-row.html
deleted file mode 100644
index 0b563add19d3..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table-row.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table-row'</title>
-<link rel="next" href="backgr_simple-table-column.html" title="Background Area: Background on 'table-column'">
-<link rel="prev" href="backgr_simple-table-column-group.html" title="Background Area: Background on 'table-column-group'">
-<link rel="contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  tr {background: black url(../images/rainbowh.gif) bottom left;}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table-row'</h3>
-
-    <p class="scope">All four rows are styled.</p>
-    <p class="clip">The table row background should be visible within
-     the border edge of each cell originating in the row, and the
-     background should be continuously tiled to fill the entire cell.
-     Within each row, all stripes should line up as if the cells were
-     cutouts in a stencil placed over the row background. Furthermore,
-     vertical stripes should align across rows.</p>
-    <p class="position">A red band should align with the left border
-     edge of the first cells in each row. An orange stripe should align
-     a few pixels above the bottom border of the non-row-spanning cells
-     in each row.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_simple-table-column.html">Background Area: Background on 'table-column'</a>
-       <dt>previous
-          <dd><a href="backgr_simple-table-column-group.html">Background Area: Background on 'table-column-group'</a>
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/backgr_simple-table.html b/layout/html/tests/table/marvin/backgr_simple-table.html
deleted file mode 100644
index 747a9408b770..000000000000
--- a/layout/html/tests/table/marvin/backgr_simple-table.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Background on 'table'</title>
-<link rel="next" href="backgr_simple-table-row-group.html" title="Background Area: Background on 'table-row-group'">
-<link rel="prev contents" href="./backgr_index.html" title="Table of Contents">
-<link rel="stylesheet" type="text/css" href="common.css">
-<style type="text/css">
-
-  table {background: black url(../images/rainbowh.gif) top right}
-  
-</style>
-</head>
-<body>
-<h1>CSS2 Table Backgrounds Test Suite</h1>
-
-<h2>Part A: Background Area</h2>
-
-    <h3>Background on 'table'</h3>
-
-    <p class="clip">The table background should fill the rectangle
-     defined by the outer border of the table. There should be no gaps
-     or holes in the background and the stripes should all be
-     continuous.</p>
-    <p class="position">A purple band should align with the left edge
-     of the painted area, and an aqua stripe should align a few pixels
-     below the top border.</p>
-
-    <dl>
-       <dt>next
-          <dd><a href="backgr_simple-table-row-group.html">Background Area: Background on 'table-row-group'</a>
-       <dt>previous
-          <dd>--
-       <dt>contents
-          <dd><a href="./backgr_index.html">Table of Contents</a>
-    </dl>
-
-    <table class="separate">
-    <caption>With 'border-collapse: separate'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-
-    <table class="collapse">
-    <caption>With 'border-collapse: collapse'</caption>
-    <colgroup class="colgroup-A">
-      <col class="col-1">
-      <col class="col-2">
-      <col class="col-3">
-    </colgroup>
-    <colgroup class="colgroup-B">
-      <col class="col-4">
-    </colgroup>
-    <thead>
-      <tr class="th-row-1">
-        <th class="a">TH A</th>
-        <th class="b">TH B</th>
-        <th class="c">TH C</th>
-        <th class="d">TH D</th>
-      </tr>
-    </thead>
-    <tfoot>
-      <tr class="tf-row-1">
-        <td class="m" colspan=2>TD M</td>
-
-        <td class="o">TD O</td>
-        <td class="p">TD P</td>
-    </tfoot>
-    <tbody>
-      <tr class="tb-row-1">
-        <td class="e" rowspan=2>TD E</td>
-        <td class="f">TD F</td>
-        <td class="g">TD G</td>
-        <td class="h">TD H</td>
-      </tr>
-      <tr class="tb-row-2">
-
-        <td class="j">TD J</td>
-        <td class="k">TD K</td>
-        <td class="l">TD L</td>
-      </tr>
-    </tbody>
-    </table>
-<div class="validity">
-  <a href="http://validator.w3.org/check/referer"><img
-     src="../images/valid-html401.png" height="31" width="88"
-     alt="Valid HTML 4.01!"></a>
-</div>
-<address>
-  CSS2 Table Backgrounds Test Suite designed and written by fantasai &lt;fantasai&#64;escape.com&gt;
-</address>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/marvin/body_col.html b/layout/html/tests/table/marvin/body_col.html
deleted file mode 100644
index 1b48e48eb578..000000000000
--- a/layout/html/tests/table/marvin/body_col.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<head><!-- testcase: body_col.html
-  description: HTML Text Markup Element- COL --> 
-<!-- Author: Chris Petersen  Date: 11/2/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test the COL Element. The COL element specifies the characteristics of the a table's column such as width -->
-<!-- Expected result:  The first column has a width property of 40 pixels ; the second column has width of 100 pixels. -->
-<title>Web Browser Web View (HTML): Document COL</title>
-</head>
-<TABLE BORDER=2>
-<COLGROUP>
-<COL WIDTH="40">
-<COL WIDTH="100">
-</COLGROUP>
-<TR>
-<TH>
-La Mesa
-</TH>
-<TD>X
-</TD>
-</TR>
-<TR>
-<TH>
-El Cajon
-</TH>
-<TD>
-X
-</TD>
-</TR>
-<TR>
-<TH>
-Chula Vista
-</TH>
-<TD>
-X
-</TD>
-<TR>
-<TH>
-Bonita
-</TH>
-<TD>
-N/A
-</TD>
-</TABLE>
-</html>
-
diff --git a/layout/html/tests/table/marvin/body_tbody.html b/layout/html/tests/table/marvin/body_tbody.html
deleted file mode 100644
index 8e86dce7fd8d..000000000000
--- a/layout/html/tests/table/marvin/body_tbody.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: body_tbody.html
-  description: HTML Text Markup Element- TBODY--> 
-<!-- Author: Chris Petersen  Date: 11/5/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test the TBODY Element. The TBODY element allows table rows to be grouped in table foot. The table head purpose is to contain information about the table's column's. -->
-<!-- Expected result: The table has a single TBODY element which contains all the table's rows and columns . -->
-<title>Web Browser Web View (HTML): Document TBODY</title>
-</HEAD>
-<TABLE>
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<TBODY>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</TBODY>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/body_tfoot.html b/layout/html/tests/table/marvin/body_tfoot.html
deleted file mode 100644
index 6bc29bffe924..000000000000
--- a/layout/html/tests/table/marvin/body_tfoot.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: body_tfoot.html
-  description: HTML Text Markup Element- TFOOT--> 
-<!-- Author: Chris Petersen  Date: 11/5/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test the TFOOT Element. The TFOOT element allows table rows to be grouped in table foot. The table head purpose is to contain information about the table's column's. -->
-<!-- Expected result: The table has a single TFOOT element which contains the sentence "This is the footer information".  It should be rendered below the body of the table. -->
-<title>Web Browser Web View (HTML): Document TFOOT</title>
-</HEAD>
-<TABLE>
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<TFOOT><TR><TD>This is the footer information</TD></TR>
-<TBODY>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</TBODY>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/body_thead.html b/layout/html/tests/table/marvin/body_thead.html
deleted file mode 100644
index 0a534e4c50f5..000000000000
--- a/layout/html/tests/table/marvin/body_thead.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: body_thead.html
-  description: HTML Text Markup Element- THEAD --> 
-<!-- Author: Chris Petersen  Date: 11/5/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test the THEAD Element. The THEAD element allows table rows to be grouped in table head. The table head purpose is to contain information about the table's column's. -->
-<!-- Expected result: The table has a single THEAD element which contains the sentence "This is the header information". It should be rendered above the body of the table. -->
-<title>Web Browser Web View (HTML): Document THEAD</title>
-</HEAD>
-<TABLE>
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<THEAD><TR><TD>This is the header information</TD></TR>
-<TBODY>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</TBODY>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/col_span.html b/layout/html/tests/table/marvin/col_span.html
deleted file mode 100644
index 0bd7f67b70ed..000000000000
--- a/layout/html/tests/table/marvin/col_span.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: col_span.html -->
-
-<!-- description: HTML 4.0 COL element with SPAN attribute --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the SPAN attribute of the COL element tag-->
-
-<!-- Expected result: A table with two columns should be displayed. The heading should span across the two columns -->
-
-<title>col_span.html</title>
-
-</head>
-
-<body>
-
-<p>The COL element specifies attributes for a table column. In this test case, the COL element is used in conjunction with the SPAN attribute.  </p>
-
-<table BORDER=1 >
-
-<col span="2">
-
-<tr>
-
-<th>This heading should span across the two columns in this table.</th>
-
-</tr>
-
-<tr>
-
-<td>This is column one.</td>
-
-<td>This is column two.</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_align_center.html b/layout/html/tests/table/marvin/colgroup_align_center.html
deleted file mode 100644
index a9740fba8e5e..000000000000
--- a/layout/html/tests/table/marvin/colgroup_align_center.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_align_center.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with ALIGN attribute. Value=center --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN/center attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be center-aligned -->
-
-<title>colgroup_align_center.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>Text in the cells should be center-aligned.</p>
-
-<table BORDER >
-
-<colgroup width=100 align="center">
-
-<colgroup width=300 align="center">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_align_justify.html b/layout/html/tests/table/marvin/colgroup_align_justify.html
deleted file mode 100644
index 7463924fcc9d..000000000000
--- a/layout/html/tests/table/marvin/colgroup_align_justify.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_align_justify.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with ALIGN attribute. Value=justify --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN/left attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be justified -->
-
-<title>colgroup_align_justify.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>Text in the cells should be justified.</p>
-
-<table BORDER >
-
-<colgroup width=100 align="justify">
-
-<colgroup width=300 align="justify">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_align_left.html b/layout/html/tests/table/marvin/colgroup_align_left.html
deleted file mode 100644
index 01099fbce5dc..000000000000
--- a/layout/html/tests/table/marvin/colgroup_align_left.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_align_left.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with ALIGN attribute. Value=left --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN/left attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be left-aligned -->
-
-<title>colgroup_align_left.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>Text in the cells should be left-aligned.</p>
-
-<table BORDER >
-
-<colgroup width=100 align="left">
-
-<colgroup width=300 align="left">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_align_right.html b/layout/html/tests/table/marvin/colgroup_align_right.html
deleted file mode 100644
index 0e91a43b7d05..000000000000
--- a/layout/html/tests/table/marvin/colgroup_align_right.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_align_right.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with ALIGN attribute. Value=right --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN/right attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be right-aligned -->
-
-<title>colgroup_align_right.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>Text in the cells should be right-aligned.</p>
-
-<table BORDER >
-
-<colgroup width=100 align="right">
-
-<colgroup width=300 align="right">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_span.html b/layout/html/tests/table/marvin/colgroup_span.html
deleted file mode 100644
index b259ee3b2845..000000000000
--- a/layout/html/tests/table/marvin/colgroup_span.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_span.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with SPAN attribute --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the SPAN attribute of the COLGROUP element tag-->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns -->
-
-<title>colgroup_span.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. In this test case, the COLGROUP element is used in conjunction with the SPAN attribute. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'.</p>
-
-<table BORDER >
-
-<colgroup span=2>
-
-<colgroup span=3>
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_valign_baseline.html b/layout/html/tests/table/marvin/colgroup_valign_baseline.html
deleted file mode 100644
index 6498eb637d3a..000000000000
--- a/layout/html/tests/table/marvin/colgroup_valign_baseline.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_valign_baseline.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with VALIGN attribute. Value=baseline --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the VALIGN/baseline attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be baseline-aligned -->
-
-<title>colgroup_valign_baseline.html</title>
-
-
-
-<style type="text/css">
-
-	TD { height: 50px }
-
-	TH { height: 50px }
-
-</style>
-
-
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>In this test case, the cell text should be baseline-aligned.</p>
-
-<table BORDER >
-
-<colgroup valign="baseline">
-
-<colgroup valign="baseline">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_valign_bottom.html b/layout/html/tests/table/marvin/colgroup_valign_bottom.html
deleted file mode 100644
index 3b509f0da419..000000000000
--- a/layout/html/tests/table/marvin/colgroup_valign_bottom.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_valign_bottom.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with VALIGN attribute. Value=bottom --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the VALIGN/bottom attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be bottom-aligned -->
-
-<title>colgroup_valign_bottom.html</title>
-
-
-
-<style type="text/css">
-
-	TD { height: 50px }
-
-	TH { height: 50px }
-
-</style>
-
-
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>In this test case, the cell text should be bottom-aligned.</p>
-
-<table BORDER >
-
-<colgroup valign="bottom">
-
-<colgroup valign="bottom">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_valign_middle.html b/layout/html/tests/table/marvin/colgroup_valign_middle.html
deleted file mode 100644
index 06d0c9f2827a..000000000000
--- a/layout/html/tests/table/marvin/colgroup_valign_middle.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_valign_middle.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with VALIGN attribute. Value=middle --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the VALIGN/middle attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be middle-aligned -->
-
-<title>colgroup_valign_middle.html</title>
-
-
-
-<style type="text/css">
-
-	TD { height: 50px }
-
-	TH { height: 50px }
-
-</style>
-
-
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>In this test case, the cell text should be middle-aligned.</p>
-
-<table BORDER >
-
-<colgroup valign="middle">
-
-<colgroup valign="middle">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_valign_top.html b/layout/html/tests/table/marvin/colgroup_valign_top.html
deleted file mode 100644
index 1f72218309de..000000000000
--- a/layout/html/tests/table/marvin/colgroup_valign_top.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_valign_top.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with VALIGN attribute. Value=top --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the VALIGN/top attribute/value of the COLGROUP element tag -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns. Text in the cells should be top-aligned -->
-
-<title>colgroup_valign_top.html</title>
-
-
-
-<style type="text/css">
-
-	TD { height: 50px }
-
-	TH { height: 50px }
-
-</style>
-
-
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. The table below has two distinct column groups; 'Airport Location' and 'Car Rental Information'. The first column group contains two columns and the second column group contains three columns.</p>
-
-
-
-<p>In this test case, the cell text should be top-aligned.</p>
-
-<table BORDER >
-
-<colgroup valign="top">
-
-<colgroup valign="top">
-
-<tr>
-
-<th COLSPAN="2">Airport Location</th>
-
-<th COLSPAN="3">Car Rental information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_width_pct.html b/layout/html/tests/table/marvin/colgroup_width_pct.html
deleted file mode 100644
index 3387bfdcc1c0..000000000000
--- a/layout/html/tests/table/marvin/colgroup_width_pct.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_width_pct.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with WIDTH attribute. Value=percentage. --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the WIDTH attribute of the COLGROUP element tag (pixel value) -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns -->
-
-<title>colgroup_width_pct.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. This table has two distinct column groups titled 'Airport Location' and 'Car Rental Information'. The first has a width of 20%; the second has a width of 40% pixels.</p>
-
-<table BORDER >
-
-<colgroup width="20%">
-
-<colgroup width="40%">
-
-<tr>
-
-<th COLSPAN=2>Airport Location</th>
-
-<th COLSPAN=3>Car Rental Information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/colgroup_width_px.html b/layout/html/tests/table/marvin/colgroup_width_px.html
deleted file mode 100644
index 5caada213cb4..000000000000
--- a/layout/html/tests/table/marvin/colgroup_width_px.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: colgroup_width_px.html -->
-
-<!-- description: HTML 4.0 COLGROUP element with WIDTH attribute. Value=pixels. --> 
-
-<!-- Author: Christine Dreckman Date: 2/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the WIDTH attribute of the COLGROUP element tag (pixel value) -->
-
-<!-- Expected result: A table with two distinct column groups should be displayed. The first column group has two columns and the second column group has three columns -->
-
-<title>colgroup_width_px.html</title>
-
-</head>
-
-<body>
-
-<p>Colgroups are used to identify column groups. This table has two distinct column groups titled 'Airport Location' and 'Car Rental Information'. The first has a width of 200 pixels; the second has a width of 400 pixels.</p>
-
-<table BORDER >
-
-<colgroup width=200>
-
-<colgroup width=400>
-
-<tr>
-
-<th COLSPAN=2>Airport Location</th>
-
-<th COLSPAN=3>Car Rental Information</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>Country</th>
-
-<th>City</th>
-
-<th>ABC Company</th>
-
-<th>EFG Company</th>
-
-<th>XYZ Company</th>
-
-</tr>
-
-
-
-<tr>
-
-<td>France</td>
-
-<td>Paris</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Germany</td>
-
-<td>Frankfurt</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>England</td>
-
-<td>London</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Netherlands</td>
-
-<td>Amsterdam</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>USA</td>
-
-<td>New York</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-<td>yes</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
diff --git a/layout/html/tests/table/marvin/common.css b/layout/html/tests/table/marvin/common.css
deleted file mode 100644
index 2a9607e57bd0..000000000000
--- a/layout/html/tests/table/marvin/common.css
+++ /dev/null
@@ -1,43 +0,0 @@
-body {
-	color: lime;
-	background: #333333;
-	font-family: monospace;
-}
-:link {
-	color: yellow;
-}
-:visited {
-	color: #999900;
-}
-table {
-	border: 1px dotted;
-	border-spacing: 7px;
-	font-size: larger;
-	font-weight: 900;
-	font-family: sans-serif;
-	color: white;
-}
-td, th {
-	border: 1px dotted;
-}
-.separate {
-	border-collapse: separate;
-}
-.collapse {
-	border-collapse: collapse;
-}
-.b, .e {
-	border: 13px dotted;
-}
-
-/*Columns*/
-.a {width: 126px}
-.b {width: 192px}
-.c {width: 114px}
-.d {width: 109px}
-
-/*Rows*/
-.d {height: 96px}
-.h {height: 104px}
-.l {height: 80px}
-.p {height: 111px}
diff --git a/layout/html/tests/table/marvin/rtest.lst b/layout/html/tests/table/marvin/rtest.lst
deleted file mode 100644
index 63e6b2ce82a1..000000000000
--- a/layout/html/tests/table/marvin/rtest.lst
+++ /dev/null
@@ -1,334 +0,0 @@
-body_col.html
-body_tbody.html
-body_tfoot.html
-body_thead.html
-col_span.html
-colgroup_align_center.html
-colgroup_align_justify.html
-colgroup_align_left.html
-colgroup_align_right.html
-colgroup_span.html
-colgroup_valign_baseline.html
-colgroup_valign_bottom.html
-colgroup_valign_middle.html
-colgroup_valign_top.html
-colgroup_width_pct.html
-colgroup_width_px.html
-table_frame_above.html
-table_frame_below.html
-table_frame_border.html
-table_frame_box.html
-table_frame_hsides.html
-table_frame_lhs.html
-table_frame_rhs.html
-table_frame_void.html
-table_frame_vsides.html
-table_row_align_center.html
-table_row_align_left.html
-table_row_align_right.html
-table_rules_all.html
-table_rules_cols.html
-table_rules_groups.html
-table_rules_none.html
-table_rules_rows.html
-tables_align_center.html
-tables_align_left.html
-tables_align_right.html
-tables_bgcolor_aqua.html
-tables_bgcolor_aqua_rgb.html
-tables_border_0.html
-tables_border_1.html
-tables_border_2.html
-tables_border_3.html
-tables_caption_align_bot.html
-tables_caption_align_left.html
-tables_caption_align_right.html
-tables_caption_align_top.html
-tables_cellpadding.html
-tables_cellpadding_pct.html
-tables_cellspacing.html
-tables_cellspacing_pct.html
-tables_class.html
-tables_default.html
-tables_id.html
-tables_onclick.html
-tables_onkeydown.html
-tables_onkeypress.html
-tables_onkeyup.html
-tables_onmousedown.html
-tables_onmousemove.html
-tables_onmouseout.html
-tables_onmouseover.html
-tables_onmouseup.html
-tables_row_th_nowrap.html
-tables_style.html
-tables_td_align_center.html
-tables_td_align_left.html
-tables_td_align_right.html
-tables_td_colspan.html
-tables_td_height.html
-tables_td_nowrap.html
-tables_td_rowspan.html
-tables_td_width.html
-tables_th_align_center.html
-tables_th_align_left.html
-tables_th_align_right.html
-tables_th_colspan.html
-tables_th_height.html
-tables_th_rowspan.html
-tables_th_width.html
-tables_width_percent.html
-tables_width_px.html
-tbody_align_center.html
-tbody_align_char.html
-tbody_align_justify.html
-tbody_align_left.html
-tbody_align_right.html
-tbody_char.html
-tbody_valign_baseline.html
-tbody_valign_bottom.html
-tbody_valign_middle.html
-tbody_valign_top.html
-td_valign_baseline.html
-td_valign_bottom.html
-td_valign_middle.html
-td_valign_top.html
-tfoot_align_center.html
-tfoot_align_char.html
-tfoot_align_justify.html
-tfoot_align_left.html
-tfoot_align_right.html
-tfoot_char.html
-tfoot_valign_baseline.html
-tfoot_valign_bottom.html
-tfoot_valign_middle.html
-tfoot_valign_top.html
-th_valign_baseline.html
-th_valign_bottom.html
-th_valign_middle.html
-th_valign_top.html
-thead_align_center.html
-thead_align_char.html
-thead_align_justify.html
-thead_align_left.html
-thead_align_right.html
-thead_char.html
-thead_valign_baseline.html
-thead_valign_bottom.html
-thead_valign_middle.html
-thead_valign_top.html
-tr_bgcolor_blue.html
-tr_bgcolor_blue_rgb.html
-tr_valign_baseline.html
-tr_valign_bottom.html
-tr_valign_middle.html
-tr_valign_top.html
-table_overflow_caption.html
-table_overflow_caption_bottom.html
-table_overflow_caption_hidden.html
-table_overflow_caption_hidden_table.html
-table_overflow_caption_left.html
-table_overflow_caption_right.html
-table_overflow_caption_top.html
-table_overflow_dirty_reflow.html
-table_overflow_dirty_reflow_row.html
-table_overflow_dirty_reflow_table.html
-table_overflow_dirty_reflow_tbody.html
-table_overflow_hidden_table.html
-table_overflow_hidden_tbody.html
-table_overflow_hidden_td.html
-table_overflow_hidden_tr.html
-table_overflow_style_reflow_cell.html
-table_overflow_style_reflow_cell_sibling.html
-table_overflow_style_reflow_row.html
-table_overflow_style_reflow_row_sibling.html
-table_overflow_style_reflow_table.html
-table_overflow_style_reflow_table_caption.html
-table_overflow_style_reflow_tbody.html
-table_overflow_style_reflow_tbody_sibling.html
-table_overflow_td_align_right.html
-table_overflow_td_dynamic_activate.html
-table_overflow_td_dynamic_deactivate.html
-table_overflow_td_valign_bottom.html
-table_overflow_td_valign_middle.html
-table_overflow_td_valign_top.html
-x_caption_align_top.xml
-x_caption_align_bottom.xml
-x_caption_align_left.xml
-x_caption_align_right.xml
-x_caption_id.xml
-x_caption_class.xml
-x_caption_style.xml
-x_col_span.xml
-x_col_width_px.xml
-x_col_width_pct.xml
-x_col_width_rel.xml
-x_col_align_left.xml
-x_col_align_center.xml
-x_col_align_right.xml
-x_col_align_justify.xml
-x_col_align_char.xml
-x_col_valign_top.xml
-x_col_valign_middle.xml
-x_col_valign_bottom.xml
-x_col_valign_baseline.xml
-x_colgroup_span.xml
-x_colgroup_width_px.xml
-x_colgroup_width_pct.xml
-x_colgroup_width_rel.xml
-x_colgroup_align_left.xml
-x_colgroup_align_center.xml
-x_colgroup_align_right.xml
-x_colgroup_align_justify.xml
-x_colgroup_align_char.xml
-x_colgroup_valign_top.xml
-x_colgroup_valign_middle.xml
-x_colgroup_valign_bottom.xml
-x_colgroup_valign_baseline.xml
-x_table.xml
-x_table_width_px.xml
-x_table_width_pct.xml
-x_table_border_none.xml
-x_table_frame_void.xml
-x_table_frame_above.xml
-x_table_frame_below.xml
-x_table_frame_hsides.xml
-x_table_frame_vsides.xml
-x_table_frame_lhs.xml
-x_table_frame_rhs.xml
-x_table_frame_box.xml
-x_table_frame_border.xml
-x_table_rules_none.xml
-x_table_rules_groups.xml
-x_table_rules_rows.xml
-x_table_rules_cols.xml
-x_table_rules_all.xml
-x_table_cellspacing.xml
-x_table_cellspacing_pct.xml
-x_table_cellpadding.xml
-x_table_cellpadding_pct.xml
-x_table_align_left.xml
-x_table_align_center.xml
-x_table_align_right.xml
-x_table_bgcolor_name.xml
-x_table_bgcolor_rgb.xml
-x_table_id.xml
-x_table_class.xml
-x_table_style.xml
-x_tbody_align_left.xml
-x_tbody_align_center.xml
-x_tbody_align_right.xml
-x_tbody_align_justify.xml
-x_tbody_align_char.xml
-x_tbody_valign_top.xml
-x_tbody_valign_middle.xml
-x_tbody_valign_bottom.xml
-x_tbody_valign_baseline.xml
-x_tbody_id.xml
-x_tbody_class.xml
-x_tbody_style.xml
-x_td_rowspan.xml
-x_td_colspan.xml
-x_td_align_left.xml
-x_td_align_center.xml
-x_td_align_right.xml
-x_td_align_justify.xml
-x_td_align_char.xml
-x_td_valign_top.xml
-x_td_valign_middle.xml
-x_td_valign_top.xml
-x_td_valign_bottom.xml
-x_td_valign_baseline.xml
-x_td_nowrap.xml
-x_td_bgcolor_name.xml
-x_td_bgcolor_rgb.xml
-x_td_width.xml
-x_td_height.xml
-x_td_id.xml
-x_td_class.xml
-x_td_style.xml
-x_tfoot_align_left.xml
-x_tfoot_align_center.xml
-x_tfoot_align_right.xml
-x_tfoot_align_justify.xml
-x_tfoot_align_char.xml
-x_tfoot_valign_top.xml
-x_tfoot_valign_middle.xml
-x_tfoot_valign_top.xml
-x_tfoot_valign_bottom.xml
-x_tfoot_valign_baseline.xml
-x_tfoot_id.xml
-x_tfoot_class.xml
-x_tfoot_style.xml
-x_th_rowspan.xml
-x_th_colspan.xml
-x_th_align_left.xml
-x_th_align_center.xml
-x_th_align_right.xml
-x_th_align_justify.xml
-x_th_align_char.xml
-x_th_valign_top.xml
-x_th_valign_middle.xml
-x_th_valign_top.xml
-x_th_valign_bottom.xml
-x_th_valign_baseline.xml
-x_th_nowrap.xml
-x_th_bgcolor_name.xml
-x_th_bgcolor_rgb.xml
-x_th_width.xml
-x_th_height.xml
-x_th_id.xml
-x_th_class.xml
-x_th_style.xml
-x_thead_align_left.xml
-x_thead_align_center.xml
-x_thead_align_right.xml
-x_thead_align_justify.xml
-x_thead_align_char.xml
-x_thead_valign_top.xml
-x_thead_valign_middle.xml
-x_thead_valign_top.xml
-x_thead_valign_bottom.xml
-x_thead_valign_baseline.xml
-x_thead_id.xml
-x_thead_class.xml
-x_thead_style.xml
-x_tr_bgcolor_name.xml
-x_tr_bgcolor_rgb.xml
-x_tr_align_left.xml
-x_tr_align_center.xml
-x_tr_align_right.xml
-x_tr_align_justify.xml
-x_tr_align_char.xml
-x_tr_valign_top.xml
-x_tr_valign_middle.xml
-x_tr_valign_top.xml
-x_tr_valign_bottom.xml
-x_tr_valign_baseline.xml
-x_tr_id.xml
-x_tr_class.xml
-x_tr_style.xml
-backgr_simple-table.html
-backgr_simple-table-row-group.html
-backgr_simple-table-column-group.html
-backgr_simple-table-row.html
-backgr_simple-table-column.html
-backgr_simple-table-cell.html
-backgr_position-table.html
-backgr_position-table-row-group.html
-backgr_position-table-column-group.html
-backgr_position-table-row.html
-backgr_position-table-column.html
-backgr_position-table-cell.html
-backgr_layers-show.html
-backgr_layers-hide.html
-backgr_border-table.html
-backgr_border-table-row-group.html
-backgr_border-table-column-group.html
-backgr_border-table-row.html
-backgr_border-table-column.html
-backgr_border-table-cell.html
-backgr_layers-opacity.html
-backgr_fixed-bg.html
-
-
diff --git a/layout/html/tests/table/marvin/table_frame_above.html b/layout/html/tests/table/marvin/table_frame_above.html
deleted file mode 100644
index 3483e3619b27..000000000000
--- a/layout/html/tests/table/marvin/table_frame_above.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_above.html -->
-<!-- Description: To test the TABLE Element with FRAME=above (The top side only). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/ABOVE</title>
-</HEAD>
-<TABLE border="5" frame="above">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_below.html b/layout/html/tests/table/marvin/table_frame_below.html
deleted file mode 100644
index a6dee3180528..000000000000
--- a/layout/html/tests/table/marvin/table_frame_below.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_below.html -->
-<!-- Description: To test the TABLE Element with FRAME=below (The bottom side only). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/BELOW</title>
-</HEAD>
-<TABLE border="5" frame="below">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_border.html b/layout/html/tests/table/marvin/table_frame_border.html
deleted file mode 100644
index a5448870c389..000000000000
--- a/layout/html/tests/table/marvin/table_frame_border.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_border.html -->
-<!-- Description: To test the TABLE Element with FRAME=BORDER (All four sides rendered). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/BORDER</title>
-</HEAD>
-<TABLE border="5" frame="border">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_box.html b/layout/html/tests/table/marvin/table_frame_box.html
deleted file mode 100644
index 173e75770181..000000000000
--- a/layout/html/tests/table/marvin/table_frame_box.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_box.html -->
-<!-- Description: To test the TABLE Element with FRAME=BOX (All four sides rendered). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/BOX</title>
-</HEAD>
-<TABLE border="5" frame="box">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_hsides.html b/layout/html/tests/table/marvin/table_frame_hsides.html
deleted file mode 100644
index 3a9f6274c988..000000000000
--- a/layout/html/tests/table/marvin/table_frame_hsides.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_hsides.html -->
-<!-- Description: To test the TABLE Element with FRAME=HSIDES (The top and bottom sides only). The FRAME attribute determines which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/HSIDES</title>
-</HEAD>
-<TABLE border="5" frame="hsides">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_lhs.html b/layout/html/tests/table/marvin/table_frame_lhs.html
deleted file mode 100644
index 61d1d59fe6bd..000000000000
--- a/layout/html/tests/table/marvin/table_frame_lhs.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_lhs.html -->
-<!-- Description: To test the TABLE Element with FRAME=LHS (The left side only). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/LHS</title>
-</HEAD>
-<TABLE border="5" frame="lhs">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_rhs.html b/layout/html/tests/table/marvin/table_frame_rhs.html
deleted file mode 100644
index c267976738d4..000000000000
--- a/layout/html/tests/table/marvin/table_frame_rhs.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_rhs.html -->
-<!-- Description: To test the TABLE Element with FRAME=RHS (Right Hand Side only). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/RHS</title>
-</HEAD>
-<TABLE border="5" frame="rhs">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_void.html b/layout/html/tests/table/marvin/table_frame_void.html
deleted file mode 100644
index 3b4615ac1a23..000000000000
--- a/layout/html/tests/table/marvin/table_frame_void.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_void.html -->
-<!-- Description: To test the TABLE Element with FRAME=VOID (No sides; default). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/VOID</title>
-</HEAD>
-<TABLE border="5" frame="void">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_frame_vsides.html b/layout/html/tests/table/marvin/table_frame_vsides.html
deleted file mode 100644
index a67ed837264b..000000000000
--- a/layout/html/tests/table/marvin/table_frame_vsides.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_frame_vsides.html -->
-<!-- Description: To test the TABLE Element with FRAME=VSIDES (Left and Right sides only). The FRAME attribute determines  which side or sides in a frame ,which surrounds a table, should be rendered. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document FRAME/VSIDES</title>
-</HEAD>
-<TABLE border="5" frame="vsides">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_overflow_caption.html b/layout/html/tests/table/marvin/table_overflow_caption.html
deleted file mode 100644
index bf196b74f294..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow inside a caption</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:top}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_bottom.html b/layout/html/tests/table/marvin/table_overflow_caption_bottom.html
deleted file mode 100644
index 3cf051dc89ee..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_bottom.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a bottom aligned caption</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:bottom;}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_hidden.html b/layout/html/tests/table/marvin/table_overflow_caption_hidden.html
deleted file mode 100644
index a247ee159e12..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_hidden.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a caption (hiding the overflow)</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:left;overflow:hidden;}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_hidden_table.html b/layout/html/tests/table/marvin/table_overflow_caption_hidden_table.html
deleted file mode 100644
index a18c75e37a2d..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_hidden_table.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a caption (overflow hidden on the table)</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:left;}
-table {overflow:hidden;}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_left.html b/layout/html/tests/table/marvin/table_overflow_caption_left.html
deleted file mode 100644
index 6ca3def41757..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_left.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a left aligned caption</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:left;}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_right.html b/layout/html/tests/table/marvin/table_overflow_caption_right.html
deleted file mode 100644
index ebf9c4e24490..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_right.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a right aligned caption</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:right}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_caption_top.html b/layout/html/tests/table/marvin/table_overflow_caption_top.html
deleted file mode 100644
index a9f6c86c05fe..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_caption_top.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling inside a top aligned caption</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-caption {caption-side:top}
-</style>
-</head>
-
-<body>
-<table border="1">
-<caption><div id="outer"><div id="inner">d</div></div></caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td>bar</td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_dirty_reflow.html b/layout/html/tests/table/marvin/table_overflow_dirty_reflow.html
deleted file mode 100644
index 5c23de4d7f7e..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_dirty_reflow.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling - dirty reflow due to caption removal</title>
-<style type="text/css">
-table { 
-  width:200px;
-  background-color:blue;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   background-color:green;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   background-color:red;
-}
-#target {
-  vertical-align:top;
-}
-caption {caption-side:top;
-background-color:orange;}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var table= document.getElementById("t1");
-var caption= document.getElementById("c1");
- table.removeChild(caption);
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table  id="t1" cellspacing="0" cellpadding="0">
-<caption id="c1">
-cap
-</caption>
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_row.html b/layout/html/tests/table/marvin/table_overflow_dirty_reflow_row.html
deleted file mode 100644
index f8768c5fe834..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_row.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling  dirty reflow due to cell removal</title>
-<style type="text/css">
-td {padding:15px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var row= document.getElementById("row_par");
-var cell= document.getElementById("spacer");
- row.removeChild(cell);
-}
-</script>
-
-</head>
-
-<body  onload="window.setTimeout('domfunc()',100)">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_table.html b/layout/html/tests/table/marvin/table_overflow_dirty_reflow_table.html
deleted file mode 100644
index fbb2e0c0ba61..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_table.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling  dirty reflow due to row group removal</title>
-<style type="text/css">
-td {padding:20px;
-background-color:yellow}
-table { 
-  width:200px;
-  border-spacing:0px;
-  background-color:blue
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   background-color:green;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   background:red;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-background-color:orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var table= document.getElementById("t1");
-var rowgroup= document.getElementById("remove");
- table.removeChild(rowgroup);
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table id="t1">
-<caption id="c1">
-cap
-</caption>
-<tbody id="remove">
-<tr>
-<td style="height:100px">foo</td><td> bar<br>baz</td></tr>
-</tbody>
-<tbody>
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_tbody.html b/layout/html/tests/table/marvin/table_overflow_dirty_reflow_tbody.html
deleted file mode 100644
index 717f2397ee63..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_dirty_reflow_tbody.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling dirty reflow due to row removal</title>
-<style type="text/css">
-td {padding:15px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var table= document.getElementById("table_body");
-var row= document.getElementById("remove");
- table.removeChild(row);
-}
-</script>
-
-</head>
-
-<body  onload="window.setTimeout('domfunc()',10)">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
-<tbody id="table_body">
-<tr id="remove">
-<td>foo</td><td> bar<br>baz<br>zap</td></tr>
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_hidden_table.html b/layout/html/tests/table/marvin/table_overflow_hidden_table.html
deleted file mode 100644
index 54b2b95c4676..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_hidden_table.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling table overflow hidden</title>
-<style type="text/css">
-table{ 
-  overflow:hidden;
-}
-</style>
-</head>
-
-<body>
-<table border="1"><tbody><tr><td>
-<div style="width:10px; height:10px; border:solid green 1px; "><div style="width:700px; height:500px; border:solid red 1px; ">scrollbars</div></div>
-</td></tr></tbody></table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_hidden_tbody.html b/layout/html/tests/table/marvin/table_overflow_hidden_tbody.html
deleted file mode 100644
index 5cb42b8cb9d1..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_hidden_tbody.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling tbody overflow hidden</title>
-<style type="text/css">
-tbody{ 
-  overflow:hidden;
-}
-</style>
-</head>
-
-<body>
-<table border="1"><tbody><tr><td>
-<div style="width:10px; height:10px; border:solid green 1px; "><div style="width:700px; height:500px; border:solid red 1px; ">scrollbars</div></div>
-</td></tr></tbody>
-</table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_hidden_td.html b/layout/html/tests/table/marvin/table_overflow_hidden_td.html
deleted file mode 100644
index e285bfc295d9..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_hidden_td.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling td overflow hidden</title>
-<style type="text/css">
-td { 
-  overflow:hidden;
-}
-</style>
-</head>
-
-<body>
-<table border="1"><tr><td>
-<div style="width:10px; height:10px; border:solid green 1px; "><div style="width:700px; height:500px; border:solid red 1px; ">scrollbars</div></div>
-</td></tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_hidden_tr.html b/layout/html/tests/table/marvin/table_overflow_hidden_tr.html
deleted file mode 100644
index 25a8fffaadb7..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_hidden_tr.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling tr overflow hidden</title>
-<style type="text/css">
-tr{ 
-  overflow:hidden;
-}
-</style>
-</head>
-
-<body>
-<table border="1"><tr><td>
-<div style="width:10px; height:10px; border:solid green 1px; "><div style="width:700px; height:500px; border:solid red 1px; ">scrollbars</div></div>
-</td></tr>
-</table>
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_cell.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_cell.html
deleted file mode 100644
index 857ac40b616b..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_cell.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow on a table cell</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var cell= document.getElementById("target");
-cell.style.verticalAlign="top";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_cell_sibling.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_cell_sibling.html
deleted file mode 100644
index c4f487c3180f..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_cell_sibling.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow on a neighbour cell</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var cell= document.getElementById("spacer");
-cell.style.fontSize="10pt";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_row.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_row.html
deleted file mode 100644
index 585d971862a2..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_row.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow on a table row</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var row= document.getElementById("row_par");
-row.style.fontSize="10pt";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_row_sibling.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_row_sibling.html
deleted file mode 100644
index d670c0158db5..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_row_sibling.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling  style change reflow on a neighbour tablerow</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var row= document.getElementById("sibling");
-row.style.fontSize="10pt";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
-<tbody>
-<tr id="sibling">
-<td>foo</td><td> bar<br>baz<br>zap</td></tr>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_table.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_table.html
deleted file mode 100644
index 828c1809621f..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_table.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow on a table</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:left;
-border:solid orange;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var table= document.getElementById("t1");
-table.style.borderSpacing="0px";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_table_caption.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_table_caption.html
deleted file mode 100644
index 985bae5fdadf..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_table_caption.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow with a caption as reflow target</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:left;
-border:solid orange;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var cap= document.getElementById("c1");
-cap.style.captionSide="top";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody.html
deleted file mode 100644
index 35a24436fff4..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow target: tbody</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var tbody= document.getElementById("tb");
-tbody.style.fontSize="12pt";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
- <tbody id="tb">
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody_sibling.html b/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody_sibling.html
deleted file mode 100644
index dd7af381674d..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_style_reflow_tbody_sibling.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling style change reflow target:tbody neighbour</title>
-<style type="text/css">
-td {padding:0px;}
-table { 
-  width:200px;
-  border-spacing:30px;
-  font-size:24pt;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-caption {caption-side:right;
-border:solid orange;
-height:200px;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var tbody= document.getElementById("sibling");
-tbody.style.fontSize="12pt";
-
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1" id="t1">
-<caption id="c1">
-cap
-</caption>
-<tbody id="sibling">
-<tr >
-<td>foo</td><td> bar<br>baz<br>zap</td></tr>
-</tbody>
- <tbody id="tb">
- <tr id="row_par">
-  <td id="spacer">foo bar baz</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</tbody>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_align_right.html b/layout/html/tests/table/marvin/table_overflow_td_align_right.html
deleted file mode 100644
index 7e451119cf04..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_align_right.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling align right</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-#target {
-  
-}
-</style>
-</head>
-
-<body>
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target" align="right"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_dynamic_activate.html b/layout/html/tests/table/marvin/table_overflow_td_dynamic_activate.html
deleted file mode 100644
index dc37f9b011e4..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_dynamic_activate.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling dynamic overflow creation inside a table cell</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:10px;
-   height:10px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var innerdiv= document.getElementById("inner");
-innerdiv.style.width="300px";
-innerdiv.style.height="400px";
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_dynamic_deactivate.html b/layout/html/tests/table/marvin/table_overflow_td_dynamic_deactivate.html
deleted file mode 100644
index e0269ba47175..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_dynamic_deactivate.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling of the removal of the overflow condition inside a table cell</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:50px;
-   height:50px;
-   border: solid green 1px;
-}
-#inner { 
-   width:400px;
-   height:300px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-</style>
-<script type="text/javascript">
-function domfunc(){
-var innerdiv= document.getElementById("inner");
-innerdiv.style.width="40px";
-innerdiv.style.height="20px";
-}
-</script>
-
-</head>
-
-<body  onload="domfunc()">
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_valign_bottom.html b/layout/html/tests/table/marvin/table_overflow_td_valign_bottom.html
deleted file mode 100644
index fe23a0564f57..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_valign_bottom.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling valign bottom</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:bottom;
-}
-</style>
-</head>
-
-<body>
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_valign_middle.html b/layout/html/tests/table/marvin/table_overflow_td_valign_middle.html
deleted file mode 100644
index bce173e7b84c..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_valign_middle.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling valign middle</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:middle;
-}
-</style>
-</head>
-
-<body>
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_overflow_td_valign_top.html b/layout/html/tests/table/marvin/table_overflow_td_valign_top.html
deleted file mode 100644
index 1477e1dc3cc2..000000000000
--- a/layout/html/tests/table/marvin/table_overflow_td_valign_top.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-<!-- ***** 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 a layout regression testcase .
-   -
-   - The Initial Developer of the Original Code is
-   - bmlk@gmx.de.
-   - Portions created by the Initial Developer are Copyright (C) 2003   
-   - 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 LGPL or the GPL. 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 ***** -->
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> 
-<title>testscase for table overflow handling valign top</title>
-<style type="text/css">
-table { 
-  width:200px;
-}
-#spacer {
-height:100px;
-}
-#outer { 
-   width:10px;
-   height:10px;
-   border: solid green 1px;
-}
-#inner { 
-   width:300px;
-   height:400px;
-   border: solid red 1px;
-}
-#target {
-  vertical-align:top;
-}
-</style>
-</head>
-
-<body>
-<table border="1">
- <tr>
-  <td id="spacer">foo</td>
-  <td id="target"><div id="outer"><div id="inner">d</div></div></td>
- </tr>
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/table_row_align_center.html b/layout/html/tests/table/marvin/table_row_align_center.html
deleted file mode 100644
index e8850b9c9f41..000000000000
--- a/layout/html/tests/table/marvin/table_row_align_center.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_row_align_center.html
-
-  description: HTML Text Markup Element, TABLE/TR/ALIGN --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/TR/ALIGN tag.-->
-
-<!-- Expected result: The contents of each cell should center aligned  -->
-
-<title>Web Browser Web View (HTML): Document TABLE/TR/ALIGN</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns. Each table row has been aligned
-
-left. The table has been assigned a width and border value so that it is easier to 
-
-see the alignment.<br>
-
-<table width=300 border=1>
-
-<tr align=center>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr align=center>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/table_row_align_left.html b/layout/html/tests/table/marvin/table_row_align_left.html
deleted file mode 100644
index a7569dc3beb5..000000000000
--- a/layout/html/tests/table/marvin/table_row_align_left.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_row_align_left.html
-
-  description: HTML Text Markup Element, TABLE/TR/ALIGN --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/TR/ALIGN tag.-->
-
-<!-- Expected result: The contents of each cell should left aligned  -->
-
-<title>Web Browser Web View (HTML): Document TABLE/TR/ALIGN</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns. Each table row has been aligned
-
-left. The table has been assigned a width and border value so that it is easier to 
-
-see the alignment.<br>
-
-<table width=300 border=1>
-
-<tr align=left>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr align=left>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/table_row_align_right.html b/layout/html/tests/table/marvin/table_row_align_right.html
deleted file mode 100644
index 9794c73f16ec..000000000000
--- a/layout/html/tests/table/marvin/table_row_align_right.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_row_align_right.html
-
-  description: HTML Text Markup Element, TABLE/TR/ALIGN --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/TR/ALIGN tag.-->
-
-<!-- Expected result: The contents of each cell should right aligned  -->
-
-<title>Web Browser Web View (HTML): Document TABLE/TR/ALIGN</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns. Each table row has been aligned
-
-right. The table has been assigned a width and border value so that it is easier to 
-
-see the alignment.<br>
-
-<table width=300 border=1>
-
-<tr align=right>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr align=right>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/table_rules_all.html b/layout/html/tests/table/marvin/table_rules_all.html
deleted file mode 100644
index 4f2c5e16c66e..000000000000
--- a/layout/html/tests/table/marvin/table_rules_all.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_rules_all.html -->
-<!-- Description: To test the TABLE Element with RULES=ALL (Rules will appear between all columns and rows ) . The RULES attribute specifies which rules will appear between the cells within a table. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document RULES/ALL</title>
-</HEAD>
-<TABLE border="5" rules="all">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_rules_cols.html b/layout/html/tests/table/marvin/table_rules_cols.html
deleted file mode 100644
index aef038eab396..000000000000
--- a/layout/html/tests/table/marvin/table_rules_cols.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_rules_cols.html -->
-<!-- Description: To test the TABLE Element with RULES=COLS (Rules will appear between columns only) . The RULES attribute specifies which rules will appear between the cells within a table. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document RULES/COLS</title>
-</HEAD>
-<TABLE border="5" rules="cols">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_rules_groups.html b/layout/html/tests/table/marvin/table_rules_groups.html
deleted file mode 100644
index bd3b37e2b8e9..000000000000
--- a/layout/html/tests/table/marvin/table_rules_groups.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_rules_groups.html -->
-<!-- Description: To test the TABLE Element with RULES=GROUPS (Rules will appear between row groups and column groups) . The RULES attribute specifies which rules will appear between the cells within a table. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document RULES/GROUPS</title>
-</HEAD>
-<table>
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<colgroup span="4" >
-<thead><tr><td>This is the header information</td></tr>
-<tfoot><tr><td>This is the footer information</td></tr>
-<tbody>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</tbody>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_rules_none.html b/layout/html/tests/table/marvin/table_rules_none.html
deleted file mode 100644
index 4c634742d4e3..000000000000
--- a/layout/html/tests/table/marvin/table_rules_none.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_rules_none.html -->
-<!-- Description: To test the TABLE Element with RULES=NONE (No Rules in table ) . The RULES attribute specifies which rules will appear between the cells within a table. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document RULES/NONE</title>
-</HEAD>
-<TABLE border="5" rules="none">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/table_rules_rows.html b/layout/html/tests/table/marvin/table_rules_rows.html
deleted file mode 100644
index 835770e2e95d..000000000000
--- a/layout/html/tests/table/marvin/table_rules_rows.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<HEAD><!-- testcase: table_rules_rows.html-->
-<!-- Description: To test the TABLE Element with RULES=ROWS (Rules will appear between rows only) . The RULES attribute specifies which rules will appear between the cells within a table. -->
-<!-- Author: Chris Petersen  Date: 11/17/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<title>Web Browser Web View (HTML): Document RULES/ROWS</title>
-</HEAD>
-<TABLE border="5" rules="rows">
-<caption>
-Communicator 4.5 Installers for Mac and Windows Platforms</caption>
-<tr>
-<th></th>
-<th>Macintosh PPC</th>
-<th>Windows 95</th>
-<th>Windows NT</th>
-</tr>
-<tr>
-<td>Base Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Complete Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-<tr>
-<td>Pro Edition Install
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-<td>
-yes
-</td>
-</tr>
-</table>
-</html>
-
diff --git a/layout/html/tests/table/marvin/tables_align_center.html b/layout/html/tests/table/marvin/tables_align_center.html
deleted file mode 100644
index e079b5dcf6be..000000000000
--- a/layout/html/tests/table/marvin/tables_align_center.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- test case: tables_align_center.html
-
-  description: HTML Text Markup Element, TABLE --> 
-
-<!-- Author: Chris Petersen Date: 8/5/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window with center alignment.-->
-
-<title>Web Browser Web View (HTML): Document TABLE</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with center alignment.<br>
-
-<table align=center>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_align_left.html b/layout/html/tests/table/marvin/tables_align_left.html
deleted file mode 100644
index fb60a3789b13..000000000000
--- a/layout/html/tests/table/marvin/tables_align_left.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- test case: tables_align_left.html
-
-  description: HTML Text Markup Element, TABLE --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window with left alignment -->
-
-<title>Web Browser Web View (HTML): Document TABLE</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with left alignment(default).<br>
-
-<table align=left>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_align_right.html b/layout/html/tests/table/marvin/tables_align_right.html
deleted file mode 100644
index e5f3a5589aae..000000000000
--- a/layout/html/tests/table/marvin/tables_align_right.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- test case: tables_align_right.html
-  description: HTML Text Markup Element, TABLE --> 
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE tag.-->
-<!-- Expected result: A table should be displayed in the window with right alignment. -->
-<title>Web Browser Web View (HTML): Document TABLE</title>
-</head>
-<body>
-The table displayed is two rows by three columns with right alignment.<br>
-<table align=right>
-<tr>
-<td>Navigator</td>
-<td>Messenger</td>
-<td>Collabra</td>
-</tr>
-<tr>
-<td>Composer</td>
-<td>Calendar</td>
-<td>Netcaster</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_aqua.html b/layout/html/tests/table/marvin/tables_bgcolor_aqua.html
deleted file mode 100644
index 232b2132bc43..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_aqua.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_aqua.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: An aqua table should be displayed -->
-
-<title>tables_bgcolor_aqua</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Aqua table with a white body background</p>
-
-<table border bgcolor="aqua">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_aqua_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_aqua_rgb.html
deleted file mode 100644
index f660a4531bfc..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_aqua_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_aqua_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: An aqua table should be displayed -->
-
-<title>tables_bgcolor_aqua_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Aqua table with a white body background</p>
-
-<table border bgcolor="#00FFFF">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_black.html b/layout/html/tests/table/marvin/tables_bgcolor_black.html
deleted file mode 100644
index 374ed7e0c34a..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_black.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_black.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A black table should be displayed -->
-
-<title>tables_bgcolor_black</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-<table border bgcolor="black">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_black_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_black_rgb.html
deleted file mode 100644
index 04879693a56a..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_black_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_black_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A black table should be displayed -->
-
-<title>tables_bgcolor_black_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-<table border bgcolor="#000000">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_blue.html b/layout/html/tests/table/marvin/tables_bgcolor_blue.html
deleted file mode 100644
index 6e7705caba1a..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_blue.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_blue.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A blue table should be displayed -->
-
-<title>tables_bgcolor_blue</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Blue table with a white body background</p>
-
-<table border bgcolor="blue">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_blue_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_blue_rgb.html
deleted file mode 100644
index c0b3a0c454cb..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_blue_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_blue_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A blue table should be displayed -->
-
-<title>tables_bgcolor_blue_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Blue table with a white body background</p>
-
-<table border bgcolor="#0000FF">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_fuchsia.html b/layout/html/tests/table/marvin/tables_bgcolor_fuchsia.html
deleted file mode 100644
index 8c0506ff54cd..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_fuchsia.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_fuchsia.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A fuchsia table should be displayed -->
-
-<title>tables_bgcolor_fuchsia</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Fuchsia table with a white body background</p>
-
-<table border bgcolor="fuchsia">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_fuchsia_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_fuchsia_rgb.html
deleted file mode 100644
index dcc4a63655aa..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_fuchsia_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_fuchsia_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A fuchsia table should be displayed -->
-
-<title>tables_bgcolor_fuchsia_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Fuchsia table with a white body background</p>
-
-<table border bgcolor="#FF00FF">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_gray.html b/layout/html/tests/table/marvin/tables_bgcolor_gray.html
deleted file mode 100644
index 0c32c7a9adba..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_gray.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_gray.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A gray table should be displayed -->
-
-<title>tables_bgcolor_gray</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Gray table with a white body background</p>
-
-<table border bgcolor="gray">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_gray_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_gray_rgb.html
deleted file mode 100644
index de0e2e8d7a4d..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_gray_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_gray_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A gray table should be displayed -->
-
-<title>tables_bgcolor_gray_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Gray table with a white body background</p>
-
-<table border bgcolor="#808080">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_green.html b/layout/html/tests/table/marvin/tables_bgcolor_green.html
deleted file mode 100644
index 886b93647adc..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_green.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_green.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A green table should be displayed -->
-
-<title>tables_bgcolor_green</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Green table with a white body background</p>
-
-<table border bgcolor="green">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_green_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_green_rgb.html
deleted file mode 100644
index 86acf0911db3..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_green_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_green_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A green table should be displayed -->
-
-<title>tables_bgcolor_green_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Green table with a white body background</p>
-
-<table border bgcolor="#008000">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_lime.html b/layout/html/tests/table/marvin/tables_bgcolor_lime.html
deleted file mode 100644
index 76f8e633e4fa..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_lime.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_lime.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A lime table should be displayed -->
-
-<title>tables_bgcolor_lime</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Lime table with a white body background</p>
-
-<table border bgcolor="lime">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_lime_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_lime_rgb.html
deleted file mode 100644
index c3ecaa902b96..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_lime_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_lime_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A lime table should be displayed -->
-
-<title>tables_bgcolor_lime_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Lime table with a white body background</p>
-
-<table border bgcolor="#00FF00">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_maroon.html b/layout/html/tests/table/marvin/tables_bgcolor_maroon.html
deleted file mode 100644
index 95c47e35a49a..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_maroon.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_maroon.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A maroon table should be displayed -->
-
-<title>tables_bgcolor_maroon</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Maroon table with a white body background</p>
-
-<table border bgcolor="maroon">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_maroon_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_maroon_rgb.html
deleted file mode 100644
index 84044481c5b5..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_maroon_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_maroon_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A maroon table should be displayed -->
-
-<title>tables_bgcolor_maroon_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Maroon table with a white body background</p>
-
-<table border bgcolor="#8000000">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_navy.html b/layout/html/tests/table/marvin/tables_bgcolor_navy.html
deleted file mode 100644
index 09567cdcd217..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_navy.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_navy.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A navy table should be displayed -->
-
-<title>tables_bgcolor_navy</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Navy table with a white body background</p>
-
-<table border bgcolor="navy">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_navy_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_navy_rgb.html
deleted file mode 100644
index 243b68f0f839..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_navy_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_navy_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A navy table should be displayed -->
-
-<title>tables_bgcolor_navy_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Navy table with a white body background</p>
-
-<table border bgcolor="#000080">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_olive.html b/layout/html/tests/table/marvin/tables_bgcolor_olive.html
deleted file mode 100644
index df030a47e047..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_olive.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_olive.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: An olive table should be displayed -->
-
-<title>tables_bgcolor_olive</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Olive table with a white body background</p>
-
-<table border bgcolor="olive">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_olive_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_olive_rgb.html
deleted file mode 100644
index 1f1f843713f5..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_olive_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_olive_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: An olive table should be displayed -->
-
-<title>tables_bgcolor_olive_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Olive table with a white body background</p>
-
-<table border bgcolor="#808000">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_purple.html b/layout/html/tests/table/marvin/tables_bgcolor_purple.html
deleted file mode 100644
index d4804b19c47d..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_purple.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_purple.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A purple table should be displayed -->
-
-<title>tables_bgcolor_purple</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Purple table with a white body background</p>
-
-<table border bgcolor="purple">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_purple_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_purple_rgb.html
deleted file mode 100644
index 87da50653072..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_purple_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_purple_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A purple table should be displayed -->
-
-<title>tables_bgcolor_purple_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Purple table with a white body background</p>
-
-<table border bgcolor="#800080">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_red.html b/layout/html/tests/table/marvin/tables_bgcolor_red.html
deleted file mode 100644
index 5d50fd5ef259..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_red.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_red.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A red table should be displayed -->
-
-<title>tables_bgcolor_red</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Red table with a white body background</p>
-
-<table border bgcolor="red">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_red_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_red_rgb.html
deleted file mode 100644
index 8eaa97cccad2..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_red_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_red_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A red table should be displayed -->
-
-<title>tables_bgcolor_red_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Red table with a white body background</p>
-
-<table border bgcolor="#FF0000">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_silver.html b/layout/html/tests/table/marvin/tables_bgcolor_silver.html
deleted file mode 100644
index 3be6f386b8a3..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_silver.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_silver.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A silver table should be displayed -->
-
-<title>tables_bgcolor_silver</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Silver table with a white body background</p>
-
-<table border bgcolor="silver">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_silver_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_silver_rgb.html
deleted file mode 100644
index 0391a0c7b27c..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_silver_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_silver_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A silver table should be displayed -->
-
-<title>tables_bgcolor_silver_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Silver table with a white body background</p>
-
-<table border bgcolor="#C0C0C0">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_teal.html b/layout/html/tests/table/marvin/tables_bgcolor_teal.html
deleted file mode 100644
index e224294babda..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_teal.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_teal.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A teal table should be displayed -->
-
-<title>tables_bgcolor_teal</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Teal table with a white body background</p>
-
-<table border bgcolor="teal">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_teal_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_teal_rgb.html
deleted file mode 100644
index 82d93f321026..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_teal_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_teal_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A teal table should be displayed -->
-
-<title>tables_bgcolor_teal_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Teal table with a white body background</p>
-
-<table border bgcolor="#008080">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_white.html b/layout/html/tests/table/marvin/tables_bgcolor_white.html
deleted file mode 100644
index ebe5a5fc162a..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_white.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_white.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A white table should be displayed -->
-
-<title>tables_bgcolor_white</title>
-
-</head>
-
-<body bgcolor="#FF0000">
-
-<p>White table with a red body background</p>
-
-<table border bgcolor="white">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_white_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_white_rgb.html
deleted file mode 100644
index 3a0ace3f7e95..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_white_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_white_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A white table should be displayed -->
-
-<title>tables_bgcolor_white_rgb</title>
-
-</head>
-
-<body bgcolor="#FF0000">
-
-<p>White table with a red body background</p>
-
-<table border bgcolor="#FFFFFF">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_yellow.html b/layout/html/tests/table/marvin/tables_bgcolor_yellow.html
deleted file mode 100644
index 9038056195dc..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_yellow.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_yellow.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A yellow table should be displayed -->
-
-<title>tables_bgcolor_yellow</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Yellow table with a white body background</p>
-
-<table border bgcolor="yellow">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_bgcolor_yellow_rgb.html b/layout/html/tests/table/marvin/tables_bgcolor_yellow_rgb.html
deleted file mode 100644
index 2daad07fb6c5..000000000000
--- a/layout/html/tests/table/marvin/tables_bgcolor_yellow_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_bgcolor_yellow_rgb.html -->
-
-<!-- description: HTML 4.0 TABLE element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TABLE element tag-->
-
-<!-- Expected result: A yellow table should be displayed -->
-
-<title>tables_bgcolor_yellow_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Yellow table with a white body background</p>
-
-<table border bgcolor="#FFFF00">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_border_0.html b/layout/html/tests/table/marvin/tables_border_0.html
deleted file mode 100644
index 8b9e596357f9..000000000000
--- a/layout/html/tests/table/marvin/tables_border_0.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_border_0.html
-
-  description: HTML Text Markup Element, TABLE BORDER --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/BORDER tag.-->
-
-<!-- Expected result: A table with no border should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE BORDER</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with a border of 0.<br>
-
-<table border=0>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_border_1.html b/layout/html/tests/table/marvin/tables_border_1.html
deleted file mode 100644
index ca5d712268c1..000000000000
--- a/layout/html/tests/table/marvin/tables_border_1.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_border_1.html
-
-  description: HTML Text Markup Element, TABLE BORDER --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/BORDER tag.-->
-
-<!-- Expected result: A table with a 1 pixel border should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE BORDER</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with a 1 pixel border.<br>
-
-<table border=1>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_border_2.html b/layout/html/tests/table/marvin/tables_border_2.html
deleted file mode 100644
index 9e545b9e6c0f..000000000000
--- a/layout/html/tests/table/marvin/tables_border_2.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_border_2.html
-
-  description: HTML Text Markup Element, TABLE BORDER --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/BORDER tag.-->
-
-<!-- Expected result: A table with a two pixel border should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE BORDER</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with a two pixel border.<br>
-
-<table border=2>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_border_3.html b/layout/html/tests/table/marvin/tables_border_3.html
deleted file mode 100644
index 00c2944364f5..000000000000
--- a/layout/html/tests/table/marvin/tables_border_3.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_border_3.html
-
-  description: HTML Text Markup Element, TABLE BORDER --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE/BORDER tag.-->
-
-<!-- Expected result: A table with a three pixel border should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE BORDER</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with a 3 pixel border.<br>
-
-<table border=3>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_caption_align_bot.html b/layout/html/tests/table/marvin/tables_caption_align_bot.html
deleted file mode 100644
index 8b5bdc266dbd..000000000000
--- a/layout/html/tests/table/marvin/tables_caption_align_bot.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_caption_align_bottom.html -->
-
-<!-- description: HTML 4.0 TABLE element/CAPTION attribute --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman Date: 1/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CAPTION attribute of the TABLE element tag-->
-
-<!-- Expected result: A table should be displayed with a bottom aligned caption -->
-
-<title>tables_caption_align_bottom</title>
-
-</head>
-
-<body>
-
-<p>The caption should be at the bottom of the table</p>
-
-<table border=1>
-
-<caption align=bottom>Wild Cats</caption>
-
-<tr>
-
-<td>Lion</td>
-
-<td>Leopard</td>
-
-<td>Cheetah</td>
-
-</tr>
-
-<tr>
-
-<td>Jaguar</td>
-
-<td>Bobcat</td>
-
-<td>Ocelot</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_caption_align_left.html b/layout/html/tests/table/marvin/tables_caption_align_left.html
deleted file mode 100644
index ec289493069a..000000000000
--- a/layout/html/tests/table/marvin/tables_caption_align_left.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_caption_align_left.html -->
-
-<!-- description: HTML 4.0 TABLE element/CAPTION attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/99 -->
-
-<!-- Modified: Christine Dreckman Date: 2/16/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CAPTION attribute of the TABLE element tag-->
-
-<!-- Expected result: A table should be displayed with a left aligned caption -->
-
-<title>tables_caption_align_left</title>
-
-</head>
-
-<body>
-
-<p>The caption should be aligned at the left side of the top of the table.</p>
-
-<table border=1>
-
-<caption align=left>Wild Cats</caption>
-
-<tr>
-
-<td>Lion</td>
-
-<td>Leopard</td>
-
-<td>Cheetah</td>
-
-</tr>
-
-<tr>
-
-<td>Jaguar</td>
-
-<td>Bobcat</td>
-
-<td>Ocelot</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_caption_align_right.html b/layout/html/tests/table/marvin/tables_caption_align_right.html
deleted file mode 100644
index 7bde156af128..000000000000
--- a/layout/html/tests/table/marvin/tables_caption_align_right.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_caption_align_right.html -->
-
-<!-- description: HTML 4.0 TABLE element/CAPTION attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/99 -->
-
-<!-- Modified: Christine Dreckman Date: 2/16/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CAPTION attribute of the TABLE element tag-->
-
-<!-- Expected result: A table should be displayed with a right aligned caption -->
-
-<title>tables_caption_align_right</title>
-
-</head>
-
-<body>
-
-<p>The caption should be aligned at the right side of the top of the table.</p>
-
-<table border=1>
-
-<caption align=right>Wild Cats</caption>
-
-<tr>
-
-<td>Lion</td>
-
-<td>Leopard</td>
-
-<td>Cheetah</td>
-
-</tr>
-
-<tr>
-
-<td>Jaguar</td>
-
-<td>Bobcat</td>
-
-<td>Ocelot</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_caption_align_top.html b/layout/html/tests/table/marvin/tables_caption_align_top.html
deleted file mode 100644
index 1883094c1845..000000000000
--- a/layout/html/tests/table/marvin/tables_caption_align_top.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_caption_align_top.html -->
-
-<!-- description: HTML 4.0 TABLE element/CAPTION attribute --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman Date: 1/19/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CAPTION attribute of the TABLE element tag-->
-
-<!-- Expected result: A table should be displayed with a top aligned caption -->
-
-<title>tables_caption_align_top</title>
-
-</head>
-
-<body>
-
-<p>The caption should be at the top of the table</p>
-
-<table border=1>
-
-<caption align=top>Wild Cats</caption>
-
-<tr>
-
-<td>Lion</td>
-
-<td>Leopard</td>
-
-<td>Cheetah</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>Jaguar</td>
-
-<td>Bobcat</td>
-
-<td>Ocelot</td>
-
-</tr>
-
-
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_cellpadding.html b/layout/html/tests/table/marvin/tables_cellpadding.html
deleted file mode 100644
index 30f9b62131e2..000000000000
--- a/layout/html/tests/table/marvin/tables_cellpadding.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- test case: tables_cellpadding.html
-
-  description: HTML Text Markup Element, TABLE CELLPADDING --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE CELLPADDING</title>
-
-</head>
-
-<body>
-
-CELLPADDING controls the padding in pixels between the border of each cells and the cell's 
-
-contents.The first table has a cellpadding of 8 pixels. The second table is not using cell
-
-padding. Notice the difference. There should be a larger gap between the cell border and it's 
-
-contents in the first table.
-
-<br>
-
-<br>
-
-<table cellpadding=8 border=2>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-<br><br>
-
-This table contains no cellpadding.
-
-<table border=2>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_cellpadding_pct.html b/layout/html/tests/table/marvin/tables_cellpadding_pct.html
deleted file mode 100644
index 3b94f6f92a99..000000000000
--- a/layout/html/tests/table/marvin/tables_cellpadding_pct.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_cellpadding_pct.html -->
-
-<!-- description: HTML 4.0 TABLE element/CELLPADDING attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CELLPADDING attribute of the TABLE element tag-->
-
-<!-- Expected result: A table with a 20% cellpadding value should be displayed -->
-
-<title>tables_cellpadding_pct</title>
-
-</head>
-
-<body>
-
-<p>CELLPADDING specifies the amount of space between the border of the cell and its contents. The first table has a cellpadding value of 20%; the second table does not have cellpadding.</p>
-
-<table border=1 cellpadding=20%>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-</table>
-
-<br><br>
-
-<table border=1>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_cellspacing.html b/layout/html/tests/table/marvin/tables_cellspacing.html
deleted file mode 100644
index 903d8b8daa27..000000000000
--- a/layout/html/tests/table/marvin/tables_cellspacing.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- test case: tables_cellspacing.html
-
-  description: HTML Text Markup Element, TABLE CELLSPACING --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE CELLSPACING</title>
-
-</head>
-
-<body>
-
-CELLSPACING controls the distance in pixels
-
-between each cell in the table. The first table has a cellspacing of 15 pixels; the second table isn't using cellspacing.
-
-Notice the difference here. The first table should be rendered with a wider gap between the cells.
-
-<br>
-
-<table cellspacing=15>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-<br><br>
-
-This table contains no cellspacing.
-
-<table>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_cellspacing_pct.html b/layout/html/tests/table/marvin/tables_cellspacing_pct.html
deleted file mode 100644
index dd7af181ad90..000000000000
--- a/layout/html/tests/table/marvin/tables_cellspacing_pct.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_cellspacing_pct.html -->
-
-<!-- description: HTML 4.0 TABLE element/CELLSPACING attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CELLSPACING attribute of the TABLE element tag-->
-
-<!-- Expected result: A table with a 20% cellspacing value should be displayed -->
-
-<title>tables_cellpadding_pct</title>
-
-</head>
-
-<body>
-
-<p>CELLSPACING specifies the amount space between cells. The first table has a cellspacing value of 20%; the second table does not have cellspacing.</p>
-
-<table border=1 cellspacing=20%>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-</table>
-
-<br><br>
-
-<table border=1>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-<tr>
-
-<td>text</td>
-
-<td>text</td>
-
-<td>text</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_class.html b/layout/html/tests/table/marvin/tables_class.html
deleted file mode 100644
index 73dd92cf4b2d..000000000000
--- a/layout/html/tests/table/marvin/tables_class.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_class.html -->
-
-<!-- description: HTML 4.0 TABLE element/CLASS attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CLASS attribute of the TABLE element tag-->
-
-<!-- Expected result: A lime table should be displayed above a paragraph with a lime background -->
-
-<title>table_class</title>
-
-<style type="text/css">
-
-.example { background: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table class=example border=1>
-
-<tr>
-
-<td>Here is a table using the CLASS attribute. The table should have a lime background.
-
-</td>
-
-<td>Here is a table using the CLASS attribute. The table should have a lime background.
-
-
-
-</td>
-
-</tr>
-
-</table>
-
-<p class=example>This is a paragraph using the CLASS attribute. The paragraph should have a lime background. This paragraph validates that the CLASS attribute works for multiple elements.</p>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_default.html b/layout/html/tests/table/marvin/tables_default.html
deleted file mode 100644
index 1b6990d6c547..000000000000
--- a/layout/html/tests/table/marvin/tables_default.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_default.html
-
-  description: HTML Text Markup Element, TABLE --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window -->
-
-<title>Web Browser Web View (HTML): Document TABLE</title>
-
-</head>
-
-<body>
-
-The table displayed is two rows by three columns with no alignment.<br>
-
-<table>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_id.html b/layout/html/tests/table/marvin/tables_id.html
deleted file mode 100644
index a32a763857b6..000000000000
--- a/layout/html/tests/table/marvin/tables_id.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_id.html -->
-
-<!-- description: HTML 4.0 TABLE element/ID attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ID attribute of the TABLE element tag-->
-
-<!-- Expected result: Two tables should be displayed. One table should be lime and the other table should not have a color value -->
-
-<title>table_id</title>
-
-<style type="text/css">
-
-#xyz12 { background: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table id=xyz12 border=1>
-
-<tr>
-
-<td>Here is a table with a lime background using the ID attribute.
-
-</td>
-
-<td>Here is a table with a lime background using the ID attribute.
-
-</td>
-
-</tr>
-
-</table>
-
-<br>
-
-<br>
-
-<table border=1>
-
-<tr>
-
-<td>Here is a table with no ID attribute value.
-
-</td>
-
-<td>Here is a table with no ID attribute value.
-
-</td>
-
-</tr>
-
-</table>
-
-
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onclick.html b/layout/html/tests/table/marvin/tables_onclick.html
deleted file mode 100644
index fa8e476e217c..000000000000
--- a/layout/html/tests/table/marvin/tables_onclick.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onclick.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONCLICK attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONCLICK attribute of the TABLE element tag-->
-
-<!-- Expected result: Clicking on the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_onclick</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONCLICK attribute of the TABLE element tag. Click on the table and a Javascript alert dialog box will display with the following message: 'Clicked!'.</p>
-
-<table border onClick="window.alert ('Clicked!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_ondblclick.html b/layout/html/tests/table/marvin/tables_ondblclick.html
deleted file mode 100644
index 80d2b5c06137..000000000000
--- a/layout/html/tests/table/marvin/tables_ondblclick.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_ondblclick.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONDBLCLICK attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONDBLCLICK attribute of the TABLE element tag-->
-
-<!-- Expected result: Double-clicking on the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_ondblclick</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONDBLCLICK attribute of the TABLE element tag. Double-click on the table and a Javascript alert dialog box will display with the following message: 'Double-clicked!'.</p>
-
-<table border ondblClick="window.alert ('Double-clicked!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onkeydown.html b/layout/html/tests/table/marvin/tables_onkeydown.html
deleted file mode 100644
index b0d798a88462..000000000000
--- a/layout/html/tests/table/marvin/tables_onkeydown.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onkeydown.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONKEYDOWN attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONKEYDOWN attribute of the TABLE element tag-->
-
-<!-- Expected result: With focus on the table, pressing a key down should cause a Javascript alert dialog box to display -->
-
-<title>tables_onkeydown</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONKEYDOWN attribute of the TABLE element tag. With focus on the table, pressing a key down should cause a Javascript alert dialog box to display with the following message: 'Key was pressed down!'.</p>
-
-<table border onKeyDown="window.alert ('Key was pressed down!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onkeypress.html b/layout/html/tests/table/marvin/tables_onkeypress.html
deleted file mode 100644
index c9af23b07359..000000000000
--- a/layout/html/tests/table/marvin/tables_onkeypress.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onkeypress.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONKEYPRESS attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONKEYPRESS attribute of the TABLE element tag-->
-
-<!-- Expected result: With focus on the table, pressing a key down should cause a Javascript alert dialog box to display -->
-
-<title>tables_onkeypress</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONKEYPRESS attribute of the TABLE element tag. Once the table has focus, the user presses a key down and a Javascript alert dialog box will display with the following message: 'Key was pressed!'.</p>
-
-<table border onKeyPress="window.alert ('Key was pressed!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onkeyup.html b/layout/html/tests/table/marvin/tables_onkeyup.html
deleted file mode 100644
index 6a89dac5c823..000000000000
--- a/layout/html/tests/table/marvin/tables_onkeyup.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onkeyup.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONKEYUP attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONKEYUP attribute of the TABLE element tag-->
-
-<!-- Expected result: With focus on the table, pressing a key down and then breaking contact with the key should cause a Javascript alert dialog box to display -->
-
-<title>tables_onkeyup</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONKEYUP attribute of the TABLE element tag. Once the table has focus, the user presses a key down. Then the user breaks contact with the key which will cause a Javascript alert dialog box to be displayed with the following message: 'Key was pressed down and then released!'.</p>
-
-<table border onKeyUp="window.alert ('Key was pressed down and then released!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onmousedown.html b/layout/html/tests/table/marvin/tables_onmousedown.html
deleted file mode 100644
index d454381da6a6..000000000000
--- a/layout/html/tests/table/marvin/tables_onmousedown.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onmousedown.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONMOUSEDOWN attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONMOUSEDOWN attribute of the TABLE element tag-->
-
-<!-- Expected result: Mousing down on the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_onmousedown</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONMOUSEDOWN attribute of the TABLE element tag. Mouse down on the table and a Javascript alert dialog box will be displayed with the following message: 'Mouse pressed down!'.</p>
-
-<table border onMouseDown="window.alert ('Mouse pressed down!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onmousemove.html b/layout/html/tests/table/marvin/tables_onmousemove.html
deleted file mode 100644
index 369fef6c8174..000000000000
--- a/layout/html/tests/table/marvin/tables_onmousemove.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onmousemove.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONMOUSEMOVE attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONMOUSEMOVE attribute of the TABLE element tag-->
-
-<!-- Expected result: Moving the mouse on the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_onmousemove</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONMOUSEMOVE attribute of the TABLE element tag. When the mouse is moved on the link, a Javascript alert dialog box will be displayed with the following message: 'Mouse moved!'.</p>
-
-<table border onMouseMove="window.alert ('Mouse moved!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onmouseout.html b/layout/html/tests/table/marvin/tables_onmouseout.html
deleted file mode 100644
index 18fd2e7f04c9..000000000000
--- a/layout/html/tests/table/marvin/tables_onmouseout.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onmouseout.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONMOUSEOUT attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONMOUSEOUT attribute of the TABLE element tag-->
-
-<!-- Expected result: Mousing down on the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_onmouseout</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONMOUSEOUT attribute of the TABLE element tag. Mouse over the table and then mouse out of the table. On the mouse out action, a Javascript alert dialog box will be displayed with the following message: 'Mouse over and out of table!'.</p>
-
-<table border onMouseOut="window.alert ('Mouse over and out of table!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onmouseover.html b/layout/html/tests/table/marvin/tables_onmouseover.html
deleted file mode 100644
index facd915d97cf..000000000000
--- a/layout/html/tests/table/marvin/tables_onmouseover.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onmouseover.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONMOUSEOVER attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONMOUSEOVER attribute of the TABLE element tag-->
-
-<!-- Expected result: Mousing over the table should cause a Javascript alert dialog box to display -->
-
-<title>tables_onmouseover</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONMOUSEOVER attribute of the TABLE element tag. Mouse over the table and a Javascript alert dialog box will be displayed with the following message: 'Mouse over!'.</p>
-
-<table border onMouseOver="window.alert ('Mouse over!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_onmouseup.html b/layout/html/tests/table/marvin/tables_onmouseup.html
deleted file mode 100644
index 644a5e07e9d3..000000000000
--- a/layout/html/tests/table/marvin/tables_onmouseup.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_onmouseup.html -->
-
-<!-- description: HTML 4.0 TABLE element/ONMOUSEUP attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ONMOUSEUP attribute of the TABLE element tag-->
-
-<!-- Expected result: Mousing down on the link should cause a Javascript alert dialog box to display  -->
-
-<title>tables_onmouseup</title>
-
-<script language="Javascript">
-
-</script>
-
-</head>
-
-<body>
-
-<p>This tests the ONMOUSEUP attribute of the TABLE element tag. Mouse down on the table and then mouse up on the table and a Javascript alert dialog box will be displayed with the following message: 'Mouse down, then up!</p>
-
-<table border onMouseUp="window.alert ('Mouse down, then up!')">
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_row_th_nowrap.html b/layout/html/tests/table/marvin/tables_row_th_nowrap.html
deleted file mode 100644
index 6f27d8f9e1aa..000000000000
--- a/layout/html/tests/table/marvin/tables_row_th_nowrap.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- test case: tables_row_th_nowrap.html
-
-  description: HTML Text Markup Element, TABLE TH NOWRAP --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: The table heading should not wrap when window is resized. -->
-
-<title>Web Browser Web View (HTML): Document TABLE TH NOWRAP</title>
-
-</head>
-
-<body>
-
-The table heading (The EggPlant Exchange) should not wrap when window is resized. However, the cell below the 
-
-heading will wrap automatically.<br>
-
-<table border=1>
-
-<tr>
-
-<TH nowrap>The Eggplant Exchange<TH>
-
-</tr>
-
-<tr>
-
-<td>Lots of Recipies for Eggplant Lovers</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_style.html b/layout/html/tests/table/marvin/tables_style.html
deleted file mode 100644
index dc529b96be86..000000000000
--- a/layout/html/tests/table/marvin/tables_style.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tables_style.html -->
-
-<!-- description: HTML 4.0 TABLE element/STYLE attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/11/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the STYLE attribute of the TABLE element tag-->
-
-<!-- Expected result: A table with a dashed red border should be displayed -->
-
-<title>table_style</title>
-
-<style type="text/css">
-
-table { border: dashed red }
-
-</style>
-
-</head>
-
-<body>
-
-<table border=2>
-
-<tr>
-
-<td>This is a table with a red dashed border to test the STYLE attribute of the TABLE element.
-
-</td>
-
-<td>This is a table with a red dashed border to test the STYLE attribute of the TABLE element.
-
-</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_align_center.html b/layout/html/tests/table/marvin/tables_td_align_center.html
deleted file mode 100644
index a0efee21d657..000000000000
--- a/layout/html/tests/table/marvin/tables_td_align_center.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_align_center.html
-  description: HTML Text Markup Element, TABLE/TD/ALIGN/CENTER --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test center align in a TD tag -->
-<!-- Expected Result: The contents in the TD tag should be center aligned -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/ALIGN/CENTER</title>
-</head>
-<body>
-The TD tag uses the ALIGN attribute. The contents in the first TD tag (Netscape Communicator) should be aligned center.
-<table BORDER=1>
-<tr>
-<TD align=center>Netscape Communicator</TD>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_align_left.html b/layout/html/tests/table/marvin/tables_td_align_left.html
deleted file mode 100644
index 4111ca92e325..000000000000
--- a/layout/html/tests/table/marvin/tables_td_align_left.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_align_left.html
-  description: HTML Text Markup Element, TABLE/TD/ALIGN/LEFT --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test left align in a TD tag -->
-<!-- Expected Result: The contents in the TD tag should be aligned left -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/ALIGN/LEFT</title>
-</head>
-<body>
-The TD tag uses the ALIGN attribute. The contents in the first TD tag (Netscape Communicator) should be aligned left.<br>
-<table BORDER=1>
-<tr>
-<TD align=left>Netscape Communicator<TD>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_align_right.html b/layout/html/tests/table/marvin/tables_td_align_right.html
deleted file mode 100644
index 38a87ee0b552..000000000000
--- a/layout/html/tests/table/marvin/tables_td_align_right.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_align_right.html
-  description: HTML Text Markup Element, TABLE/TD/ALIGN/RIGHT --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test right align in a TD tag -->
-<!-- Expected Result: The contents in the TD tag should be right aligned -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/ALIGN/RIGHT</title>
-</head>
-<body>
-The TD tag uses the ALIGN attribute. The contents in the first TD tag (Netscape Communicator) should be aligned right.<br>
-<table BORDER=1>
-<tr>
-<td align=right>Netscape Communicator<td>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_colspan.html b/layout/html/tests/table/marvin/tables_td_colspan.html
deleted file mode 100644
index ebd2daf544b0..000000000000
--- a/layout/html/tests/table/marvin/tables_td_colspan.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_colspan.html
-  description: HTML Text Markup Element, TABLE/TD/COLSPAN --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE/TD/COLSPAN tag.-->
-<!-- Expected result: The TD tag(Netscape Communicator)will span across 6 columns -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/COLSPAN</title>
-</head>
-<body>
-This table uses a COLSPAN attribute in the TD tag. The COLSPAN attribute
-has a value of 6.<br><br>
-<table BORDER=1>
-<tr>
-<td colspan=6>Netscape Communicator 4.0.6 Platforms</td>
-</tr>
-<tr>
-<td>Mac 68k</td>
-<td>Power Mac</td>
-<td>Win 3.1</td>
-<td>Win 95</td>
-<td>Win 98</td>
-<td>Unix</td> 
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_height.html b/layout/html/tests/table/marvin/tables_td_height.html
deleted file mode 100644
index a26369c5afc4..000000000000
--- a/layout/html/tests/table/marvin/tables_td_height.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_height.html
-  description: HTML Text Markup Element, TABLE/TD/WIDTH --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test height attribute in a TD tag -->
-<!-- Expected Result: The TD height is set to 80 pixels -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/WIDTH</title>
-</head>
-<body>
-The TD tag uses the HEIGTH attribute. The TD has been set to 80 pixels.<br>
-<table BORDER=1>
-<tr>
-<td height=80>Netscape Communicator</td>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_nowrap.html b/layout/html/tests/table/marvin/tables_td_nowrap.html
deleted file mode 100644
index 097e8de20153..000000000000
--- a/layout/html/tests/table/marvin/tables_td_nowrap.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- test case: tables_td_nowrap.html
-  description: HTML Text Markup Element, TABLE TD NOWRAP --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE TD tag.-->
-<!-- Expected result: The TD cell should not wrap when window is resized. -->
-<title>Web Browser Web View (HTML): Document TABLE TD NOWRAP</title>
-</head>
-<body>
-The TD cell (The EggPlant Exchange) should not wrap when window is resized. However, the cell below the 
-heading will wrap automatically.<br>
-<table border=1>
-<tr>
-<TD nowrap>The Eggplant Exchange</TD>
-</tr>
-<tr>
-<td>Lots of Recipies for Eggplant Lovers</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_rowspan.html b/layout/html/tests/table/marvin/tables_td_rowspan.html
deleted file mode 100644
index 9a513fa60659..000000000000
--- a/layout/html/tests/table/marvin/tables_td_rowspan.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_rowspan.html
-  description: HTML Text Markup Element, TABLE/TD/ROWSPAN --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE/TD/ROWSPAN tag.-->
-<!-- Expected result: The first TD(Platforms)will span across 2 rows -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/ROWSPAN</title>
-</head>
-<body>
-This table uses a ROWSPAN attribute in the first TD tag. The ROWSPAN attribute
-has a value of 2.<br><br>
-<table BORDER=1>
-<tr>
-<td rowspan=2>Platforms</td>
-<td>Netscape Communicator 4.0.6</td>
-</tr>
-<tr>
-<td>Available Everywhere</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_td_width.html b/layout/html/tests/table/marvin/tables_td_width.html
deleted file mode 100644
index 2e370d74b7b4..000000000000
--- a/layout/html/tests/table/marvin/tables_td_width.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_td_width.html
-  description: HTML Text Markup Element, TABLE/TD/WIDTH --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test width attribute in a TD tag -->
-<!-- Expected Result: The TD width is set to 500 pixels and 200 pixels -->
-<title>Web Browser Web View (HTML): Document TABLE/TD/WIDTH</title>
-</head>
-<body>
-The TD tag uses the WIDTH attribute. The first table's TD width is set to 500 pixels.<br>
-<table BORDER=1>
-<tr>
-<td width=600>Netscape Communicator Version 4.0.6</td>
-</tr>
-<tr>
-<td>Platforms</td>
-</tr>
-</table>
-<br>
-This second table's TD width is set to 200 pixels.<br>
-<table BORDER=1>
-<tr>
-<td width=200>Netscape Communicator Version 4.0.6</td>
-</tr>
-<tr>
-<td>Platforms</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_align_center.html b/layout/html/tests/table/marvin/tables_th_align_center.html
deleted file mode 100644
index d53c01694269..000000000000
--- a/layout/html/tests/table/marvin/tables_th_align_center.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_align_center.html
-  description: HTML Text Markup Element, TABLE/TH/ALIGN/CENTER --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test center align in a TH tag -->
-<!-- Expected Result: The contents in the TH tag should be center aligned -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/ALIGN/CENTER</title>
-</head>
-<body>
-The TH tag uses the ALIGN attribute. The contents in the TH tag should be center aligned.<br>
-<table BORDER=1>
-<tr>
-<th align=center>Netscape Communicator<th>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_align_left.html b/layout/html/tests/table/marvin/tables_th_align_left.html
deleted file mode 100644
index 93254e09f203..000000000000
--- a/layout/html/tests/table/marvin/tables_th_align_left.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_align_left.html
-  description: HTML Text Markup Element, TABLE/TH/ALIGN/LEFT --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test left align in a TH tag -->
-<!-- Expected Result: The contents in the TH tag should be aligned left -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/ALIGN/LEFT</title>
-</head>
-<body>
-The TH tag uses the ALIGN attribute. The contents in the TH tag should be aligned left.<br>
-<table BORDER=1>
-<tr>
-<th align=left>Netscape Communicator<th>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_align_right.html b/layout/html/tests/table/marvin/tables_th_align_right.html
deleted file mode 100644
index b56cb14bd371..000000000000
--- a/layout/html/tests/table/marvin/tables_th_align_right.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_align_right.html
-  description: HTML Text Markup Element, TABLE/TH/ALIGN/RIGHT --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test right align in a TH tag -->
-<!-- Expected Result: The contents in the TH tag should be right aligned -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/ALIGN/RIGHT</title>
-</head>
-<body>
-The TH tag uses the ALIGN attribute. The contents in the TH tag should be right aligned.<br>
-<table BORDER=1>
-<tr>
-<th align=right>Netscape Communicator<th>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_colspan.html b/layout/html/tests/table/marvin/tables_th_colspan.html
deleted file mode 100644
index 2e77360f8824..000000000000
--- a/layout/html/tests/table/marvin/tables_th_colspan.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_colspan.html
-  description: HTML Text Markup Element, TABLE/TH/COLSPAN --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE/TR/COLSPAN tag.-->
-<!-- Expected result: The TH tag(Netscape Communicator)will span across 6 columns -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/COLSPAN</title>
-</head>
-<body>
-This table uses a COLSPAN attribute in the TH tag. The COLSPAN attribute
-has a value of 6.<br><br>
-<table BORDER=1>
-<tr>
-<th colspan=6>Netscape Communicator 4.0.6 Platforms</th>
-</tr>
-<tr>
-<td>Mac 68k</td>
-<td>Power Mac</td>
-<td>Win 3.1</td>
-<td>Win 95</td>
-<td>Win 98</td>
-<td>Unix</td> 
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_height.html b/layout/html/tests/table/marvin/tables_th_height.html
deleted file mode 100644
index 8709969aa8df..000000000000
--- a/layout/html/tests/table/marvin/tables_th_height.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_height.html
-  description: HTML Text Markup Element, TABLE/TH/WIDTH --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test height attribute in a TH tag -->
-<!-- Expected Result: The TH height is set to 80 pixels -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/WIDTH</title>
-</head>
-<body>
-The TH tag uses the HEIGTH attribute. The TH has been set to 80 pixels.<br>
-<table BORDER=1>
-<tr>
-<th height=80>Netscape Communicator</th>
-</tr>
-<tr>
-<td>Available on the Mac/PC/UNIX platforms !</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_rowspan.html b/layout/html/tests/table/marvin/tables_th_rowspan.html
deleted file mode 100644
index c2de7bafea5b..000000000000
--- a/layout/html/tests/table/marvin/tables_th_rowspan.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_rowspan.html
-  description: HTML Text Markup Element, TABLE/TH/ROWSPAN --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose:To test the TABLE/TR/ROWSPAN tag.-->
-<!-- Expected result: The first TH(Platforms)will span across 2 rows -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/ROWSPAN</title>
-</head>
-<body>
-This table uses a ROWSPAN attribute in the first TH tag. The ROWSPAN attribute
-has a value of 2.<br><br>
-<table BORDER=1>
-<tr>
-<th rowspan=2>Platforms</th>
-<th>Netscape Communicator 4.0.6</th>
-</tr>
-<tr>
-<td>Available Everywhere</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_th_width.html b/layout/html/tests/table/marvin/tables_th_width.html
deleted file mode 100644
index 03ec81785a28..000000000000
--- a/layout/html/tests/table/marvin/tables_th_width.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-<html>
-<head>
-<!-- testcase: tables_th_width.html
-  description: HTML Text Markup Element, TABLE/TH/WIDTH --> 
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-<!-- Purpose: To test width attribute in a TH tag -->
-<!-- Expected Result: The TH width is set to 500 pixels and 200 pixels -->
-<title>Web Browser Web View (HTML): Document TABLE/TH/WIDTH</title>
-</head>
-<body>
-The TH tag uses the WIDTH attribute. The first table's TH width is set to 500 pixels.<br>
-<table BORDER=1>
-<tr>
-<th width=600>Netscape Communicator Version 4.0.6</th>
-</tr>
-<tr>
-<td>Platforms</td>
-</tr>
-</table>
-<br>
-This second table's TH width is set to 200 pixels.<br>
-<table BORDER=1>
-<tr>
-<th width=200>Netscape Communicator Version 4.0.6</th>
-</tr>
-<tr>
-<td>Platforms</td>
-</tr>
-</table>
-</body>
-</html>
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_width_percent.html b/layout/html/tests/table/marvin/tables_width_percent.html
deleted file mode 100644
index cd923b7ee4c0..000000000000
--- a/layout/html/tests/table/marvin/tables_width_percent.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_width_percent.html
-
-  description: HTML Text Markup Element, TABLE WIDTH PERCENT--> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window with width set by pixel value-->
-
-<title>Web Browser Web View (HTML): TABLE WIDTH PERCENT</title>
-
-</head>
-
-<body>
-
-This test case shows how WIDTH can set the width of the table to a fixed size using PERCENT. PERCENT
-
-is based on the percentage of the space between the current left and right margins. 
-
-This first table has a width of 80 percent
-
-<table width="80%">
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-<br>
-
-While, this second table has a width of 50 percent
-
-<table width="50%">
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tables_width_px.html b/layout/html/tests/table/marvin/tables_width_px.html
deleted file mode 100644
index d201853337b6..000000000000
--- a/layout/html/tests/table/marvin/tables_width_px.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tables_width_px.html
-
-  description: HTML Text Markup Element, TABLE WIDTH PIXELS --> 
-
-<!-- Author: Chris Petersen Date: 8/5/98 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose:To test the TABLE tag.-->
-
-<!-- Expected result: A table should be displayed in the window with width set by pixel value-->
-
-<title>Web Browser Web View (HTML): Document TABLE WIDTH PIXELS</title>
-
-</head>
-
-<body>
-
-This test case shows how WIDTH can set the width of the table to a fixed size using PIXELS.
-
-This first table has a width of 400 pixels.
-
-<table width=400>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-<br>
-
-While, this second table has a width of 300 pixels.
-
-<table width=300>
-
-<tr>
-
-<td>Navigator</td>
-
-<td>Messenger</td>
-
-<td>Collabra</td>
-
-</tr>
-
-<tr>
-
-<td>Composer</td>
-
-<td>Calendar</td>
-
-<td>Netcaster</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tbody_align_center.html b/layout/html/tests/table/marvin/tbody_align_center.html
deleted file mode 100644
index a30e4136e199..000000000000
--- a/layout/html/tests/table/marvin/tbody_align_center.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_align_center.html --> 
-
-<!-- description: HTML 4.0 TBODY element/ALIGN-CENTER attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-CENTER attribute of the TBODY element. -->
-
-<!-- Expected result: The text in the TBODY section should be center aligned -->
-
-<title>tbody_align_center</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TBODY element labels the body area of a table. In this test, the TBODY text should be center aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="center">
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_align_char.html b/layout/html/tests/table/marvin/tbody_align_char.html
deleted file mode 100644
index bf4ec2118bb4..000000000000
--- a/layout/html/tests/table/marvin/tbody_align_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_align_char.html --> 
-
-<!-- description: HTML 4.0 TBODY element/ALIGN-char attribute/value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-char attribute/value of the TBODY element. -->
-
-<!-- Expected result: The numbers in the TBODY section should align on the decimal point -->
-
-<title>tbody_align_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>In this test, the TBODY section of the table contains numbers with decimals. The test uses the attribute/value ALIGN=char without the additional CHAR attribute to specify a particular character. Therefore, ALIGN=char should cause the numbers to align to the default value (decimal point).</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="char">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_align_justify.html b/layout/html/tests/table/marvin/tbody_align_justify.html
deleted file mode 100644
index abd2f1cbb019..000000000000
--- a/layout/html/tests/table/marvin/tbody_align_justify.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_align_justify.html --> 
-
-<!-- description: HTML 4.0 TBODY element/ALIGN-JUSTIFY attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-JUSTIFY attribute of the TBODY element. -->
-
-<!-- Expected result: The text in the TBODY section should be justified -->
-
-<title>tbody_align_justify</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TBODY element labels the body area of a table. In this test, the TBODY text has an attribute value of ALIGN=JUSTIFY. ALIGN-JUSTIFY should attempt to justify text within all cells of the TBODY.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="justify">
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_align_left.html b/layout/html/tests/table/marvin/tbody_align_left.html
deleted file mode 100644
index df0bebe07e95..000000000000
--- a/layout/html/tests/table/marvin/tbody_align_left.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_align_left.html --> 
-
-<!-- description: HTML 4.0 TBODY element/ALIGN-LEFT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-LEFT attribute of the TBODY element. -->
-
-<!-- Expected result: The text in the TBODY section should be left aligned -->
-
-<title>tbody_align_left</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TBODY element labels the body area of a table. In this test, the TBODY text should be left aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="left">
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_align_right.html b/layout/html/tests/table/marvin/tbody_align_right.html
deleted file mode 100644
index 8c08b71ed88f..000000000000
--- a/layout/html/tests/table/marvin/tbody_align_right.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_align_right.html --> 
-
-<!-- description: HTML 4.0 TBODY element/ALIGN-RIGHT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-RIGHT attribute of the TBODY element. -->
-
-<!-- Expected result: The text in the TBODY section should be right aligned -->
-
-<title>tbody_align_right</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TBODY element labels the body area of a table. In this test, the TBODY text should be right aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="right">
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_char.html b/layout/html/tests/table/marvin/tbody_char.html
deleted file mode 100644
index d9b67abc0d16..000000000000
--- a/layout/html/tests/table/marvin/tbody_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_char.html --> 
-
-<!-- description: HTML 4.0 TBODY element/CHAR attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CHAR attribute of the TBODY element. -->
-
-<!-- Expected result: The numbers in the TBODY section should align on the decimal point -->
-
-<title>tbody_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TBODY element defines the table body within a table. In this test, the numbers contained in the TBODY cells should align on the decimal point.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody align="char" char=".">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_valign_baseline.html b/layout/html/tests/table/marvin/tbody_valign_baseline.html
deleted file mode 100644
index 3c19744554d3..000000000000
--- a/layout/html/tests/table/marvin/tbody_valign_baseline.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_valign_baseline.html --> 
-
-<!-- description: TBODY element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TBODY element with the VALIGN attribute, assigning a value of 'baseline' -->
-
-<!-- Expected result: The text in the TBODY section should be vertically baseline aligned -->
-
-<title>tbody_align_baseline</title>
-
-</head>
-
-<body>
-
-TBODY VALIGN&#61;BASELINE
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign=baseline>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TBODY element and should be vertically aligned to the baseline</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_valign_bottom.html b/layout/html/tests/table/marvin/tbody_valign_bottom.html
deleted file mode 100644
index 0358c677bdbe..000000000000
--- a/layout/html/tests/table/marvin/tbody_valign_bottom.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_valign_bottom.html --> 
-
-<!-- description: TBODY element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TBODY element with the VALIGN attribute, assigning a value of 'bottom' -->
-
-<!-- Expected result: The text in the TBODY section should be vertically bottom aligned -->
-
-<title>tbody_align_bottom</title>
-
-</head>
-
-<body>
-
-TBODY VALIGN&#61;BOTTOM
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign=bottom>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TBODY element and should be vertically aligned to the bottom</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_valign_middle.html b/layout/html/tests/table/marvin/tbody_valign_middle.html
deleted file mode 100644
index c52a76b7bbf4..000000000000
--- a/layout/html/tests/table/marvin/tbody_valign_middle.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_valign_middle.html --> 
-
-<!-- description: TBODY element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TBODY element with the VALIGN attribute, assigning a value of 'middle' -->
-
-<!-- Expected result: The text in the TBODY section should be vertically middle aligned -->
-
-<title>tbody_align_middle</title>
-
-</head>
-
-<body>
-
-TBODY VALIGN&#61;MIDDLE
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign=middle>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TBODY element and should be vertically aligned to the middle</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tbody_valign_top.html b/layout/html/tests/table/marvin/tbody_valign_top.html
deleted file mode 100644
index 78179fcf602d..000000000000
--- a/layout/html/tests/table/marvin/tbody_valign_top.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tbody_valign_top.html --> 
-
-<!-- description: TBODY element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TBODY element with the VALIGN attribute, assigning a value of 'top' -->
-
-<!-- Expected result: The text in the TBODY section should be vertically top aligned -->
-
-<title>tbody_align_top</title>
-
-</head>
-
-<body>
-
-TBODY VALIGN&#61;TOP
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign=top>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TBODY element and should be vertically aligned to the top</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/td_valign_baseline.html b/layout/html/tests/table/marvin/td_valign_baseline.html
deleted file mode 100644
index 890fc2aa7d21..000000000000
--- a/layout/html/tests/table/marvin/td_valign_baseline.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: td_valign_baseline.html --> 
-
-<!-- description: TD element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TD element with the VALIGN attribute, assigning a value of 'baseline'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the baseline -->
-
-<title>td_align_baseline</title>
-
-</head>
-
-<body>
-
-TD VALIGN&#61;BASELINE
-
-<table border=1>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td valign=baseline>This text should be vertically aligned to the baseline</td>
-
-<td valign=baseline>This text should be vertically aligned to the baseline</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/td_valign_bottom.html b/layout/html/tests/table/marvin/td_valign_bottom.html
deleted file mode 100644
index 451e2b667f3f..000000000000
--- a/layout/html/tests/table/marvin/td_valign_bottom.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: td_valign_bottom.html --> 
-
-<!-- description: TD element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TD element with the VALIGN attribute, assigning a value of 'bottom'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the bottom -->
-
-<title>td_align_bottom</title>
-
-</head>
-
-<body>
-
-TD VALIGN&#61;BOTTOM
-
-<table border=1>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td valign=bottom>This text should be vertically aligned to the bottom</td>
-
-<td valign=bottom>This text should be vertically aligned to the bottom</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/td_valign_middle.html b/layout/html/tests/table/marvin/td_valign_middle.html
deleted file mode 100644
index 44aee6cc0ea2..000000000000
--- a/layout/html/tests/table/marvin/td_valign_middle.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: td_valign_middle.html --> 
-
-<!-- description: TD element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TD element with the VALIGN attribute, assigning a value of 'middle'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the middle -->
-
-<title>td_align_middle</title>
-
-</head>
-
-<body>
-
-TD VALIGN&#61;MIDDLE
-
-<table border=1>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td valign=middle>This text should be vertically aligned to the middle</td>
-
-<td valign=middle>This text should be vertically aligned to the middle</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/td_valign_top.html b/layout/html/tests/table/marvin/td_valign_top.html
deleted file mode 100644
index 0c2b2f6debed..000000000000
--- a/layout/html/tests/table/marvin/td_valign_top.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: td_valign_top.html --> 
-
-<!-- description: TD element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TD element with the VALIGN attribute, assigning a value of 'top'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the top -->
-
-<title>td_align_top</title>
-
-</head>
-
-<body>
-
-TD VALIGN&#61;TOP
-
-<table border=1>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td valign=top>This text should be vertically aligned to the top</td>
-
-<td valign=top>This text should be vertically aligned to the top</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tfoot_align_center.html b/layout/html/tests/table/marvin/tfoot_align_center.html
deleted file mode 100644
index 5f51620de2cb..000000000000
--- a/layout/html/tests/table/marvin/tfoot_align_center.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_align_center.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/ALIGN-CENTER attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-CENTER attribute of the TFOOT element. -->
-
-<!-- Expected result: The text in the TFOOT section should be center aligned -->
-
-<title>tfoot_align_center</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TFOOT element labels the head area of a table. In this test, the TFOOT text should be center aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="center">
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_align_char.html b/layout/html/tests/table/marvin/tfoot_align_char.html
deleted file mode 100644
index c404c4fd7af2..000000000000
--- a/layout/html/tests/table/marvin/tfoot_align_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_align_char.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/ALIGN-char attribute/value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-char attribute/value of the TFOOT element. -->
-
-<!-- Expected result: The numbers in the TFOOT section should align on the decimal point -->
-
-<title>tfoot_align_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>In this test, the TFOOT section of the table contains numbers with decimals. The test uses the attribute/value ALIGN=char without the additional CHAR attribute to specify a particular character. Therefore, ALIGN=char should cause the numbers to align to the default value (decimal point).</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="char">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-</tfoot>
-
-<tbody >
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_align_justify.html b/layout/html/tests/table/marvin/tfoot_align_justify.html
deleted file mode 100644
index ca7c5bb449d9..000000000000
--- a/layout/html/tests/table/marvin/tfoot_align_justify.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_align_justify.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/ALIGN-JUSTIFY attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-JUSTIFY attribute of the TFOOT element. -->
-
-<!-- Expected result: The text in the TFOOT section should be justified -->
-
-<title>tfoot_align_justify</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TFOOT element labels the head area of a table. In this test, the TFOOT text has an attribute value of ALIGN=JUSTIFY. ALIGN-JUSTIFY should attempt to justify text within all cells of the TFOOT.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="justify">
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_align_left.html b/layout/html/tests/table/marvin/tfoot_align_left.html
deleted file mode 100644
index a3f6a0e03791..000000000000
--- a/layout/html/tests/table/marvin/tfoot_align_left.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_align_left.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/ALIGN-LEFT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-LEFT attribute of the TFOOT element. -->
-
-<!-- Expected result: The text in the TFOOT section should be left aligned -->
-
-<title>tfoot_align_left</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TFOOT element labels the head area of a table. In this test, the TFOOT text should be left aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="left">
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_align_right.html b/layout/html/tests/table/marvin/tfoot_align_right.html
deleted file mode 100644
index 229cd86ec867..000000000000
--- a/layout/html/tests/table/marvin/tfoot_align_right.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_align_right.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/ALIGN-RIGHT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-RIGHT attribute of the TFOOT element. -->
-
-<!-- Expected result: The text in the TFOOT section should be right aligned -->
-
-<title>tfoot_align_right</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TFOOT element labels the head area of a table. In this test, the TFOOT text should be right aligned.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-<td>This text is in the THEADThis text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="right">
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_char.html b/layout/html/tests/table/marvin/tfoot_char.html
deleted file mode 100644
index c4d56e3557e2..000000000000
--- a/layout/html/tests/table/marvin/tfoot_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_char.html --> 
-
-<!-- description: HTML 4.0 TFOOT element/CHAR attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CHAR attribute of the TFOOT element. -->
-
-<!-- Expected result: The numbers in the TFOOT section should align on the decimal point -->
-
-<title>tfoot_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>The TFOOT element defines a table footer within a table. In this test, the numbers contained in the TFOOT cells should align on the decimal point.</p>
-
-
-
-<table border>
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot align="char" char=".">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-</tfoot>
-
-<tbody >
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_valign_baseline.html b/layout/html/tests/table/marvin/tfoot_valign_baseline.html
deleted file mode 100644
index b66ee9c66772..000000000000
--- a/layout/html/tests/table/marvin/tfoot_valign_baseline.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_valign_baseline.html --> 
-
-<!-- description: TFOOT element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TFOOT element with the VALIGN attribute, assigning a value of 'baseline' -->
-
-<!-- Expected result: The text in the TFOOT section should be vertically baseline aligned -->
-
-<title>tfoot_align_baseline</title>
-
-</head>
-
-<body>
-
-TFOOT VALIGN&#61;BASELINE
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign=baseline>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TFOOT element and should be vertically aligned to the baseline</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_valign_bottom.html b/layout/html/tests/table/marvin/tfoot_valign_bottom.html
deleted file mode 100644
index ca2b2925dd6b..000000000000
--- a/layout/html/tests/table/marvin/tfoot_valign_bottom.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_valign_bottom.html --> 
-
-<!-- description: TFOOT element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TFOOT element with the VALIGN attribute, assigning a value of 'bottom' -->
-
-<!-- Expected result: The text in the TFOOT section should be vertically bottom aligned -->
-
-<title>tfoot_align_bottom</title>
-
-</head>
-
-<body>
-
-TFOOT VALIGN&#61;BOTTOM
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign=bottom>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TFOOT element and should be vertically aligned to the bottom</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_valign_middle.html b/layout/html/tests/table/marvin/tfoot_valign_middle.html
deleted file mode 100644
index 601162cb5210..000000000000
--- a/layout/html/tests/table/marvin/tfoot_valign_middle.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_valign_middle.html --> 
-
-<!-- description: TFOOT element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TFOOT element with the VALIGN attribute, assigning a value of 'middle' -->
-
-<!-- Expected result: The text in the TFOOT section should be vertically middle aligned -->
-
-<title>tfoot_align_middle</title>
-
-</head>
-
-<body>
-
-TFOOT VALIGN&#61;MIDDLE
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign=middle>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TFOOT element and should be vertically aligned to the middle</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tfoot_valign_top.html b/layout/html/tests/table/marvin/tfoot_valign_top.html
deleted file mode 100644
index 2d41628c4a1b..000000000000
--- a/layout/html/tests/table/marvin/tfoot_valign_top.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: tfoot_valign_top.html --> 
-
-<!-- description: TFOOT element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TFOOT element with the VALIGN attribute, assigning a value of 'top' -->
-
-<!-- Expected result: The text in the TFOOT section should be vertically top aligned -->
-
-<title>tfoot_align_top</title>
-
-</head>
-
-<body>
-
-TFOOT VALIGN&#61;TOP
-
-<table border>
-
-
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign=top>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the TFOOT element and should be vertically aligned to the top</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/th_valign_baseline.html b/layout/html/tests/table/marvin/th_valign_baseline.html
deleted file mode 100644
index 94f1887ecdf3..000000000000
--- a/layout/html/tests/table/marvin/th_valign_baseline.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: th_valign_baseline.html --> 
-
-<!-- description: TH element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TH element with the VALIGN attribute, assigning a value of 'baseline'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the baseline -->
-
-<title>th_align_baseline</title>
-
-</head>
-
-<body>
-
-TH VALIGN&#61;BASELINE
-
-<table border=1>
-
-<tr>
-
-<th><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<th valign=baseline>This text should be vertically aligned to the baseline</th>
-
-<th valign=baseline>This text should be vertically aligned to the baseline</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/th_valign_bottom.html b/layout/html/tests/table/marvin/th_valign_bottom.html
deleted file mode 100644
index e5164dc25da7..000000000000
--- a/layout/html/tests/table/marvin/th_valign_bottom.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: th_valign_bottom.html --> 
-
-<!-- description: TH element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TH element with the VALIGN attribute, assigning a value of 'bottom'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the bottom -->
-
-<title>th_align_bottom</title>
-
-</head>
-
-<body>
-
-TH VALIGN&#61;BOTTOM
-
-<table border=1>
-
-<tr>
-
-<th><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<th valign=bottom>This text should be vertically aligned to the bottom</th>
-
-<th valign=bottom>This text should be vertically aligned to the bottom</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/th_valign_middle.html b/layout/html/tests/table/marvin/th_valign_middle.html
deleted file mode 100644
index a8da7e5a7da4..000000000000
--- a/layout/html/tests/table/marvin/th_valign_middle.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: th_valign_middle.html --> 
-
-<!-- description: TH element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TH element with the VALIGN attribute, assigning a value of 'middle'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the middle -->
-
-<title>th_align_middle</title>
-
-</head>
-
-<body>
-
-TH VALIGN&#61;MIDDLE
-
-<table border=1>
-
-<tr>
-
-<th><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<th valign=middle>This text should be vertically aligned to the middle</th>
-
-<th valign=middle>This text should be vertically aligned to the middle</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/th_valign_top.html b/layout/html/tests/table/marvin/th_valign_top.html
deleted file mode 100644
index 6cdb7713e711..000000000000
--- a/layout/html/tests/table/marvin/th_valign_top.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: th_valign_top.html --> 
-
-<!-- description: TH element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Chris Petersen Date: 8/7/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TH element with the VALIGN attribute, assigning a value of 'top'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the top -->
-
-<title>th_align_top</title>
-
-</head>
-
-<body>
-
-TH VALIGN&#61;TOP
-
-<table border=1>
-
-<tr>
-
-<th><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<th valign=top>This text should be vertically aligned to the top</th>
-
-<th valign=top>This text should be vertically aligned to the top</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/thead_align_center.html b/layout/html/tests/table/marvin/thead_align_center.html
deleted file mode 100644
index 0bf67d349d68..000000000000
--- a/layout/html/tests/table/marvin/thead_align_center.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_align_center.html --> 
-
-<!-- description: HTML 4.0 THEAD element/ALIGN-CENTER attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-CENTER attribute of the THEAD element. -->
-
-<!-- Expected result: The text in the THEAD section should be center aligned -->
-
-<title>thead_align_center</title>
-
-</head>
-
-
-
-<body>
-
-<p>The THEAD element labels the head area of a table. In this test, the THEAD text should be center aligned.</p>
-
-
-
-<table border>
-
-<thead align="center">
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_align_char.html b/layout/html/tests/table/marvin/thead_align_char.html
deleted file mode 100644
index 826df8cd59df..000000000000
--- a/layout/html/tests/table/marvin/thead_align_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_align_char.html --> 
-
-<!-- description: HTML 4.0 THEAD element/ALIGN-char attribute/value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-char attribute/value of the THEAD element. -->
-
-<!-- Expected result: The numbers in the THEAD section should align on the decimal point -->
-
-<title>thead_align_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>In this test, the THEAD section of the table contains numbers with decimals. The test uses the attribute/value ALIGN=char without the additional CHAR attribute to specify a particular character. Therefore, ALIGN=char should cause the numbers to align to the default value (decimal point).</p>
-
-
-
-<table border>
-
-<thead align="char">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody >
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_align_justify.html b/layout/html/tests/table/marvin/thead_align_justify.html
deleted file mode 100644
index 54a29f9a341f..000000000000
--- a/layout/html/tests/table/marvin/thead_align_justify.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_align_justify.html --> 
-
-<!-- description: HTML 4.0 THEAD element/ALIGN-JUSTIFY attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-JUSTIFY attribute of the THEAD element. -->
-
-<!-- Expected result: The text in the THEAD section should be justified -->
-
-<title>thead_align_justify</title>
-
-</head>
-
-
-
-<body>
-
-<p>The THEAD element labels the head area of a table. In this test, the THEAD text has an attribute value of ALIGN=JUSTIFY. ALIGN-JUSTIFY should attempt to justify text within all cells of the THEAD.</p>
-
-
-
-<table border>
-
-<thead align="justify">
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_align_left.html b/layout/html/tests/table/marvin/thead_align_left.html
deleted file mode 100644
index 87cbbd4598d2..000000000000
--- a/layout/html/tests/table/marvin/thead_align_left.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_align_left.html --> 
-
-<!-- description: HTML 4.0 THEAD element/ALIGN-LEFT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-LEFT attribute of the THEAD element. -->
-
-<!-- Expected result: The text in the THEAD section should be left aligned -->
-
-<title>thead_align_left</title>
-
-</head>
-
-
-
-<body>
-
-<p>The THEAD element labels the head area of a table. In this test, the THEAD text should be left aligned.</p>
-
-
-
-<table border>
-
-<thead align="left">
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_align_right.html b/layout/html/tests/table/marvin/thead_align_right.html
deleted file mode 100644
index febfe6ea88af..000000000000
--- a/layout/html/tests/table/marvin/thead_align_right.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_align_right.html --> 
-
-<!-- description: HTML 4.0 THEAD element/ALIGN-RIGHT attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/13/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the ALIGN-RIGHT attribute of the THEAD element. -->
-
-<!-- Expected result: The text in the THEAD section should be right aligned -->
-
-<title>thead_align_right</title>
-
-</head>
-
-
-
-<body>
-
-<p>The THEAD element labels the head area of a table. In this test, the THEAD text should be right aligned.</p>
-
-
-
-<table border>
-
-<thead align="right">
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-<td>This text is in the TFOOTThis text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-<td>This text is in the TBODYThis text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_char.html b/layout/html/tests/table/marvin/thead_char.html
deleted file mode 100644
index 31f67851d6b8..000000000000
--- a/layout/html/tests/table/marvin/thead_char.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_char.html --> 
-
-<!-- description: HTML 4.0 THEAD element/CHAR attribute --> 
-
-<!-- Author: Christine Dreckman  Date: 1/27/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the CHAR attribute of the THEAD element. -->
-
-<!-- Expected result: The numbers in the THEAD section should align on the decimal point -->
-
-<title>thead_char</title>
-
-</head>
-
-
-
-<body>
-
-<p>The THEAD element defines a table header within a table. In this test, the numbers contained in the THEAD cells should align on the decimal point.</p>
-
-
-
-<table border>
-
-<thead align="char" char=".">
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody >
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_valign_baseline.html b/layout/html/tests/table/marvin/thead_valign_baseline.html
deleted file mode 100644
index 5529df3833a9..000000000000
--- a/layout/html/tests/table/marvin/thead_valign_baseline.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_valign_baseline.html --> 
-
-<!-- description: THEAD element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the THEAD element with the VALIGN attribute, assigning a value of 'baseline' -->
-
-<!-- Expected result: The text in the THEAD section should be vertically baseline aligned -->
-
-<title>thead_align_baseline</title>
-
-</head>
-
-<body>
-
-THEAD VALIGN&#61;BASELINE
-
-<table border>
-
-<thead valign=baseline>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the THEAD element and should be vertically aligned to the baseline</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_valign_bottom.html b/layout/html/tests/table/marvin/thead_valign_bottom.html
deleted file mode 100644
index 8c3045a79d07..000000000000
--- a/layout/html/tests/table/marvin/thead_valign_bottom.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_valign_bottom.html --> 
-
-<!-- description: THEAD element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the THEAD element with the VALIGN attribute, assigning a value of 'bottom' -->
-
-<!-- Expected result: The text in the THEAD section should be vertically bottom aligned -->
-
-<title>thead_align_bottom</title>
-
-</head>
-
-<body>
-
-THEAD VALIGN&#61;BOTTOM
-
-<table border>
-
-<thead valign=bottom>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the THEAD element and should be vertically aligned to the bottom</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_valign_middle.html b/layout/html/tests/table/marvin/thead_valign_middle.html
deleted file mode 100644
index be3b7a5b7ab1..000000000000
--- a/layout/html/tests/table/marvin/thead_valign_middle.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_valign_middle.html --> 
-
-<!-- description: THEAD element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the THEAD element with the VALIGN attribute, assigning a value of 'middle' -->
-
-<!-- Expected result: The text in the THEAD section should be vertically middle aligned -->
-
-<title>thead_align_middle</title>
-
-</head>
-
-<body>
-
-THEAD VALIGN&#61;MIDDLE
-
-<table border>
-
-<thead valign=middle>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the THEAD element and should be vertically aligned to the middle</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/thead_valign_top.html b/layout/html/tests/table/marvin/thead_valign_top.html
deleted file mode 100644
index 4df79e6ae802..000000000000
--- a/layout/html/tests/table/marvin/thead_valign_top.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-
-<html>
-
-<head>
-
-<!-- testcase: thead_valign_top.html --> 
-
-<!-- description: THEAD element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Christine Dreckman  Date: 1/29/99 -->
-
-<!-- Modified: Christine Dreckman  Date: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the THEAD element with the VALIGN attribute, assigning a value of 'top' -->
-
-<!-- Expected result: The text in the THEAD section should be vertically top aligned -->
-
-<title>thead_align_top</title>
-
-</head>
-
-<body>
-
-THEAD VALIGN&#61;TOP
-
-<table border>
-
-<thead valign=top>
-
-<tr>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text is within the THEAD element and should be vertically aligned to the top</td>
-
-</tr>
-
-</thead>
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-<tbody>
-
-</table>
-
-</body>
-
-</html>
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_aqua_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_aqua_rgb.html
deleted file mode 100644
index d5b75d7af76a..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_aqua_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_aqua_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be aqua; the second row should be white -->
-
-<title>tr_bgcolor_aqua_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one aqua row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#00FFFF">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_black.html b/layout/html/tests/table/marvin/tr_bgcolor_black.html
deleted file mode 100644
index 03ff27bcef94..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_black.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_black.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be black; the second row should be white -->
-
-<title>tr_bgcolor_black</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one black row and one white row</p>
-
-<table border>
-
-<tr bgcolor="black" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_black_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_black_rgb.html
deleted file mode 100644
index 23b36a461f2e..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_black_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_black_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be black; the second row should be white -->
-
-<title>tr_bgcolor_black_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one black row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#000000">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_blue.html b/layout/html/tests/table/marvin/tr_bgcolor_blue.html
deleted file mode 100644
index 9c6f34d65399..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_blue.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_blue.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be blue; the second row should be white -->
-
-<title>tr_bgcolor_blue</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one blue row and one white row</p>
-
-<table border>
-
-<tr bgcolor="blue" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_blue_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_blue_rgb.html
deleted file mode 100644
index ca3b560297f2..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_blue_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_blue_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be blue; the second row should be white -->
-
-<title>tr_bgcolor_blue_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one blue row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#0000FF">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_fuchsia.html b/layout/html/tests/table/marvin/tr_bgcolor_fuchsia.html
deleted file mode 100644
index 24f16eb18905..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_fuchsia.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_fuchsia.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be fuchsia; the second row should be white -->
-
-<title>tr_bgcolor_fuchsia</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one fuchsia row and one white row</p>
-
-<table border>
-
-<tr bgcolor="fuchsia" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_fuchsia_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_fuchsia_rgb.html
deleted file mode 100644
index 2fcc9f668a27..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_fuchsia_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_fuchsia_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be fuchsia; the second row should be white -->
-
-<title>tr_bgcolor_fuchsia_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one fuchsia row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#FF00FF">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_gray.html b/layout/html/tests/table/marvin/tr_bgcolor_gray.html
deleted file mode 100644
index 600869734d4f..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_gray.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_gray.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99-->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be gray; the second row should be white -->
-
-<title>tr_bgcolor_gray</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one gray row and one white row</p>
-
-<table border>
-
-<tr bgcolor="gray" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_gray_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_gray_rgb.html
deleted file mode 100644
index 501c4ecca078..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_gray_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_gray_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be gray; the second row should be white -->
-
-<title>tr_bgcolor_gray_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one gray row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#808080">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_green.html b/layout/html/tests/table/marvin/tr_bgcolor_green.html
deleted file mode 100644
index 29a5ab40241f..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_green.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_green.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99-->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be green; the second row should be white -->
-
-<title>tr_bgcolor_green</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one green row and one white row</p>
-
-<table border>
-
-<tr bgcolor="green" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_green_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_green_rgb.html
deleted file mode 100644
index aeefdce6f21c..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_green_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_green_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be green; the second row should be white -->
-
-<title>tr_bgcolor_green_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one green row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#008000">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_lime.html b/layout/html/tests/table/marvin/tr_bgcolor_lime.html
deleted file mode 100644
index fb35721bc7ac..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_lime.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_lime.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be lime; the second row should be white -->
-
-<title>tr_bgcolor_lime</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one lime row and one white row</p>
-
-<table border>
-
-<tr bgcolor="lime" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_lime_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_lime_rgb.html
deleted file mode 100644
index fafa8194c2b0..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_lime_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_lime_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be lime; the second row should be white -->
-
-<title>tr_bgcolor_lime_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one lime row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#00FF00">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_maroon.html b/layout/html/tests/table/marvin/tr_bgcolor_maroon.html
deleted file mode 100644
index 2603e106a327..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_maroon.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_maroon.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99-->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be maroon; the second row should be white -->
-
-<title>tr_bgcolor_maroon</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one maroon row and one white row</p>
-
-<table border>
-
-<tr bgcolor="maroon" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_maroon_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_maroon_rgb.html
deleted file mode 100644
index 4478321a44f6..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_maroon_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_maroon_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be maroon; the second row should be white -->
-
-<title>tr_bgcolor_maroon_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one maroon row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#800000">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_navy.html b/layout/html/tests/table/marvin/tr_bgcolor_navy.html
deleted file mode 100644
index 73bf7e2fa459..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_navy.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_navy.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be navy; the second row should be white -->
-
-<title>tr_bgcolor_navy</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one navy row and one white row</p>
-
-<table border>
-
-<tr bgcolor="navy" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_navy_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_navy_rgb.html
deleted file mode 100644
index 93e92363fa4e..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_navy_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_navy_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be navy; the second row should be white -->
-
-<title>tr_bgcolor_navy_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one navy row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#000080">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_olive.html b/layout/html/tests/table/marvin/tr_bgcolor_olive.html
deleted file mode 100644
index 0dde28271deb..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_olive.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_olive.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be olive; the second row should be white -->
-
-<title>tr_bgcolor_olive</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one olive row and one white row</p>
-
-<table border>
-
-<tr bgcolor="olive" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_olive_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_olive_rgb.html
deleted file mode 100644
index e092f9c967ed..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_olive_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_olive_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be olive; the second row should be white -->
-
-<title>tr_bgcolor_olive_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one olive row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#808000">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_purple.html b/layout/html/tests/table/marvin/tr_bgcolor_purple.html
deleted file mode 100644
index e7f37340b926..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_purple.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_purple.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be purple; the second row should be white -->
-
-<title>tr_bgcolor_purple</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one purple row and one white row</p>
-
-<table border>
-
-<tr bgcolor="purple" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_purple_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_purple_rgb.html
deleted file mode 100644
index c93f51140038..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_purple_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_purple_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be purple; the second row should be white -->
-
-<title>tr_bgcolor_purple_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one purple row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#800080">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_red.html b/layout/html/tests/table/marvin/tr_bgcolor_red.html
deleted file mode 100644
index 0f58805edfb7..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_red.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_red.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99-->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be red; the second row should be white -->
-
-<title>tr_bgcolor_red</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one red row and one white row</p>
-
-<table border>
-
-<tr bgcolor="red" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_red_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_red_rgb.html
deleted file mode 100644
index 6d837b709cbb..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_red_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_red_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be red; the second row should be white -->
-
-<title>tr_bgcolor_red_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one red row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#FF0000">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_silver.html b/layout/html/tests/table/marvin/tr_bgcolor_silver.html
deleted file mode 100644
index 787f32f5e050..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_silver.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_silver.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be silver; the second row should be white -->
-
-<title>tr_bgcolor_silver</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one silver row and one white row</p>
-
-<table border>
-
-<tr bgcolor="silver" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_silver_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_silver_rgb.html
deleted file mode 100644
index 64c9945192a4..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_silver_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_silver_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be silver; the second row should be white -->
-
-<title>tr_bgcolor_silver_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one silver row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#C0C0C0">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_teal.html b/layout/html/tests/table/marvin/tr_bgcolor_teal.html
deleted file mode 100644
index 81bc8e4aa187..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_teal.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_teal.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be teal; the second row should be white -->
-
-<title>tr_bgcolor_teal</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one teal row and one white row</p>
-
-<table border>
-
-<tr bgcolor="teal" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_teal_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_teal_rgb.html
deleted file mode 100644
index 133e75586fe7..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_teal_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_teal_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be teal; the second row should be white -->
-
-<title>tr_bgcolor_teal_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one teal row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#008080">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_white.html b/layout/html/tests/table/marvin/tr_bgcolor_white.html
deleted file mode 100644
index 31794c7b1cd0..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_white.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_white.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be white; the second row should be red -->
-
-<title>tr_bgcolor_white</title>
-
-</head>
-
-<body bgcolor="#FF0000">
-
-<p>Table with one white row and one red row. This tests the color white.</p>
-
-<table border>
-
-<tr bgcolor="white" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_white_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_white_rgb.html
deleted file mode 100644
index 655583cb47ee..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_white_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_white_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be white; the second row should be red -->
-
-<title>tr_bgcolor_white_rgb</title>
-
-</head>
-
-<body bgcolor="#FF0000">
-
-<p>Table with one white row and one red row. This tests the color white.</p>
-
-<table border>
-
-<tr bgcolor="#FFFFFF">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_yellow.html b/layout/html/tests/table/marvin/tr_bgcolor_yellow.html
deleted file mode 100644
index a0647b20fc22..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_yellow.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_yellow.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be yellow; the second row should be white -->
-
-<title>tr_bgcolor_yellow</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one yellow row and one white row</p>
-
-<table border>
-
-<tr bgcolor="yellow" >
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_bgcolor_yellow_rgb.html b/layout/html/tests/table/marvin/tr_bgcolor_yellow_rgb.html
deleted file mode 100644
index cf605aaeb454..000000000000
--- a/layout/html/tests/table/marvin/tr_bgcolor_yellow_rgb.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- test case: tr_bgcolor_yellow_rgb.html -->
-
-<!-- description: HTML 4.0 TR element/BGCOLOR attribute --> 
-
-<!-- Author: Christine Dreckman Date: 1/29/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the BGCOLOR attribute of the TR element tag-->
-
-<!-- Expected result: The first row should be yellow; the second row should be white -->
-
-<title>tr_bgcolor_yellow_rgb</title>
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Table with one yellow row and one white row</p>
-
-<table border>
-
-<tr bgcolor="#FFFF00">
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-<tr>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_valign_baseline.html b/layout/html/tests/table/marvin/tr_valign_baseline.html
deleted file mode 100644
index 8dae845f9b19..000000000000
--- a/layout/html/tests/table/marvin/tr_valign_baseline.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: tr_valign_baseline.html --> 
-
-<!-- description: TR element, VALIGN attribute, BASELINE value --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TR element with the VALIGN attribute, assigning a value of 'baseline'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the baseline -->
-
-<title>tr_align_baseline</title>
-
-</head>
-
-<body>
-
-TR VALIGN&#61;BASELINE
-
-<table border=1>
-
-<tr valign=baseline>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text should be vertically aligned to the baseline</td>
-
-<td>This text should be vertically aligned to the baseline</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_valign_bottom.html b/layout/html/tests/table/marvin/tr_valign_bottom.html
deleted file mode 100644
index b9fcf4fba578..000000000000
--- a/layout/html/tests/table/marvin/tr_valign_bottom.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: tr_valign_bottom.html --> 
-
-<!-- description: TR element, VALIGN attribute, BOTTOM value --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TR element with the VALIGN attribute, assigning a value of 'bottom'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the bottom -->
-
-<title>tr_align_bottom</title>
-
-</head>
-
-<body>
-
-TR VALIGN&#61;BOTTOM
-
-<table border=1>
-
-<tr valign=bottom>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text should be vertically aligned to the bottom</td>
-
-<td>This text should be vertically aligned to the bottom</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_valign_middle.html b/layout/html/tests/table/marvin/tr_valign_middle.html
deleted file mode 100644
index 3092e1e44e5b..000000000000
--- a/layout/html/tests/table/marvin/tr_valign_middle.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: tr_valign_middle.html --> 
-
-<!-- description: TR element, VALIGN attribute, MIDDLE value --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TR element with the VALIGN attribute, assigning a value of 'middle'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the middle -->
-
-<title>tr_align_middle</title>
-
-</head>
-
-<body>
-
-TR VALIGN&#61;MIDDLE
-
-<table border=1>
-
-<tr valign=middle>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text should be vertically aligned to the middle</td>
-
-<td>This text should be vertically aligned to the middle</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/tr_valign_top.html b/layout/html/tests/table/marvin/tr_valign_top.html
deleted file mode 100644
index c1ebbd25cccd..000000000000
--- a/layout/html/tests/table/marvin/tr_valign_top.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-
-<head>
-
-<!-- testcase: tr_valign_top.html --> 
-
-<!-- description: TR element, VALIGN attribute, TOP value --> 
-
-<!-- Author: Chris Petersen Date: 8/6/98 -->
-
-<!-- Modified: Christine Dreckman: 3/18/99 -->
-
-
-<!-- ***** 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 table layout tests.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!-- Purpose: To test the TR element with the VALIGN attribute, assigning a value of 'top'-->
-
-<!-- Expected result: There is one row and 3 columns. The cell in the first column contains an image. The text in the second and third column cells should be vertically aligned to the top -->
-
-<title>tr_align_top</title>
-
-</head>
-
-<body>
-
-TR VALIGN&#61;TOP
-
-<table border=1>
-
-<tr valign=top>
-
-<td><img SRC="../images/raptor.jpg" alt=image height=185 width=300></td>
-
-<td>This text should be vertically aligned to the top</td>
-
-<td>This text should be vertically aligned to the top</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_align_bottom.xml b/layout/html/tests/table/marvin/x_caption_align_bottom.xml
deleted file mode 100644
index 80e01f8ac959..000000000000
--- a/layout/html/tests/table/marvin/x_caption_align_bottom.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_align_bottom.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The table caption should be aligned at the bottom</p>
-
-
-
-<table border="1">
-
-<caption align="bottom">CAPTION</caption>
-
-
-
-<tr>
-
-<td>cell 1</td>
-
-<td>cell 2</td>
-
-<td>cell 3</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>cell 4</td>
-
-<td>cell 5</td>
-
-<td>cell 6</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_align_left.xml b/layout/html/tests/table/marvin/x_caption_align_left.xml
deleted file mode 100644
index 32194ae00d6a..000000000000
--- a/layout/html/tests/table/marvin/x_caption_align_left.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/11/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The table caption should be aligned at the left</p>
-
-
-
-<table border="1">
-
-<caption align="left">CAPTION</caption>
-
-
-
-<tr>
-
-<td>cell 1</td>
-
-<td>cell 2</td>
-
-<td>cell 3</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>cell 4</td>
-
-<td>cell 5</td>
-
-<td>cell 6</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_align_right.xml b/layout/html/tests/table/marvin/x_caption_align_right.xml
deleted file mode 100644
index 9f4be288b53b..000000000000
--- a/layout/html/tests/table/marvin/x_caption_align_right.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_align_right.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/11/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The table caption should be aligned at the right</p>
-
-
-
-<table border="1">
-
-<caption align="right">CAPTION</caption>
-
-
-
-<tr>
-
-<td>cell 1</td>
-
-<td>cell 2</td>
-
-<td>cell 3</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>cell 4</td>
-
-<td>cell 5</td>
-
-<td>cell 6</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_align_top.xml b/layout/html/tests/table/marvin/x_caption_align_top.xml
deleted file mode 100644
index d1fadf99f09e..000000000000
--- a/layout/html/tests/table/marvin/x_caption_align_top.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_align_top.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The table caption should be aligned at the top</p>
-
-
-
-<table border="1">
-
-<caption align="top">CAPTION</caption>
-
-
-
-<tr>
-
-<td>cell 1</td>
-
-<td>cell 2</td>
-
-<td>cell 3</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>cell 4</td>
-
-<td>cell 5</td>
-
-<td>cell 6</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_class.xml b/layout/html/tests/table/marvin/x_caption_class.xml
deleted file mode 100644
index 1b59f3518c0b..000000000000
--- a/layout/html/tests/table/marvin/x_caption_class.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_class.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-
-
-.one { background-color: lime }
-
-
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<caption class="one">This caption should have a lime
-
-background</caption>
-
-
-
-<tr>
-
-<td>cell</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_id.xml b/layout/html/tests/table/marvin/x_caption_id.xml
deleted file mode 100644
index 7b0dcbb82dc6..000000000000
--- a/layout/html/tests/table/marvin/x_caption_id.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_id.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-
-
-#xyz12 { background-color: lime }
-
-
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<caption id="xyz12">This caption should have a lime
-
-background</caption>
-
-
-
-<tr>
-
-<td>cell</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_caption_style.xml b/layout/html/tests/table/marvin/x_caption_style.xml
deleted file mode 100644
index 70eb83821ac7..000000000000
--- a/layout/html/tests/table/marvin/x_caption_style.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>caption_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<caption style="background-color: lime">This caption should have a
-
-lime background</caption>
-
-
-
-<tr>
-
-<td>cell</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_align_center.xml b/layout/html/tests/table/marvin/x_col_align_center.xml
deleted file mode 100644
index 981ca24812cc..000000000000
--- a/layout/html/tests/table/marvin/x_col_align_center.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup>
-
-<col align="center" />
-
-<col align="center" /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be center aligned</td>
-
-<td>Cell text should be center aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_align_char.xml b/layout/html/tests/table/marvin/x_col_align_char.xml
deleted file mode 100644
index fdd078a7c70c..000000000000
--- a/layout/html/tests/table/marvin/x_col_align_char.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>Numbers in table should be aligned at decimal points</p>
-
-
-
-<table border="1" width="400">
-
-<colgroup>
-
-<col align="char" char="." />
-
-<col align="char" char="." /></colgroup>
-
-
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_align_justify.xml b/layout/html/tests/table/marvin/x_col_align_justify.xml
deleted file mode 100644
index 70b0fa6fba6a..000000000000
--- a/layout/html/tests/table/marvin/x_col_align_justify.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_align_justify.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup>
-
-<col align="justify" />
-
-<col align="justify" /></colgroup>
-
-
-
-<tr>
-
-<td>The text in this cell text should be justified which means that
-
-the right and left margins should line up, no matter how long the
-
-content becomes (except the last line which should be left
-
-aligned).</td>
-
-<td>The text in this cell text should be justified which means that
-
-the right and left margins should line up, no matter how long the
-
-content becomes (except the last line which should be left
-
-aligned).</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_align_left.xml b/layout/html/tests/table/marvin/x_col_align_left.xml
deleted file mode 100644
index c602d12a673a..000000000000
--- a/layout/html/tests/table/marvin/x_col_align_left.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup>
-
-<col align="left" />
-
-<col align="left" /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be left aligned</td>
-
-<td>Cell text should be left aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_align_right.xml b/layout/html/tests/table/marvin/x_col_align_right.xml
deleted file mode 100644
index ee0356991e87..000000000000
--- a/layout/html/tests/table/marvin/x_col_align_right.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_align_right.xml</title>
-
-
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup>
-
-<col align="right" />
-
-<col align="right" /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be right aligned</td>
-
-<td>Cell text should be right aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_span.xml b/layout/html/tests/table/marvin/x_col_span.xml
deleted file mode 100644
index 969ad8de62f0..000000000000
--- a/layout/html/tests/table/marvin/x_col_span.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_span.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<colgroup>
-
-<col span="2" width="200" /></colgroup>
-
-
-
-<tr>
-
-<td>This column should be 200px wide</td>
-
-<td>This column should be 200px wide</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_valign_baseline.xml b/layout/html/tests/table/marvin/x_col_valign_baseline.xml
deleted file mode 100644
index 4b83df5156a7..000000000000
--- a/layout/html/tests/table/marvin/x_col_valign_baseline.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_valign_baseline.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col valign="baseline" />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_valign_bottom.xml b/layout/html/tests/table/marvin/x_col_valign_bottom.xml
deleted file mode 100644
index 5d4ca715baca..000000000000
--- a/layout/html/tests/table/marvin/x_col_valign_bottom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_valign_bottom.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col valign="bottom" />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_valign_middle.xml b/layout/html/tests/table/marvin/x_col_valign_middle.xml
deleted file mode 100644
index 3993348c1d16..000000000000
--- a/layout/html/tests/table/marvin/x_col_valign_middle.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col valign="middle" />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The middle of this text should be vertically aligned to the
-
-middle of the image.</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_valign_top.xml b/layout/html/tests/table/marvin/x_col_valign_top.xml
deleted file mode 100644
index 38619ceb3903..000000000000
--- a/layout/html/tests/table/marvin/x_col_valign_top.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_valign_top.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col valign="top" />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_width_pct.xml b/layout/html/tests/table/marvin/x_col_width_pct.xml
deleted file mode 100644
index cadb4765da73..000000000000
--- a/layout/html/tests/table/marvin/x_col_width_pct.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_width_pct.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL WIDTH=pct</p>
-
-
-
-<table border="1" width="400">
-
-<colgroup>
-
-<col width="25%" />
-
-<col width="75%" /></colgroup>
-
-
-
-<tr>
-
-<td>This column should have a width of 25% of 400px or 100px</td>
-
-<td>This column should have a width of 75% of 400px or 300px</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_width_px.xml b/layout/html/tests/table/marvin/x_col_width_px.xml
deleted file mode 100644
index 74b035a867e8..000000000000
--- a/layout/html/tests/table/marvin/x_col_width_px.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_width_px.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL WIDTH=px</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col width="200" />
-
-<col width="400" /></colgroup>
-
-
-
-<tr>
-
-<td>This column should have a width of 200 pixels</td>
-
-<td>This column should have a width of 400 pixels</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_col_width_rel.xml b/layout/html/tests/table/marvin/x_col_width_rel.xml
deleted file mode 100644
index 2e1d3e6510ba..000000000000
--- a/layout/html/tests/table/marvin/x_col_width_rel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>col_width_rel.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COL WIDTH=relative</p>
-
-
-
-<table border="1" width="300">
-
-<colgroup>
-
-<col width="1*" />
-
-<col width="2*" /></colgroup>
-
-
-
-<tr>
-
-<td>Table width is 300px. This column should be 1/2 as wide as
-
-Column 2 or 100px</td>
-
-<td>Table width is 300px. This column should be twice as wide as
-
-Column 1 or 200px</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_align_center.xml b/layout/html/tests/table/marvin/x_colgroup_align_center.xml
deleted file mode 100644
index 3fa0f7062aa1..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_align_center.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup align="center">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be center aligned</td>
-
-<td>Cell text should be center aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_align_char.xml b/layout/html/tests/table/marvin/x_colgroup_align_char.xml
deleted file mode 100644
index 9ecc8049cd38..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_align_char.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>Numbers in table should be aligned at decimal points</p>
-
-
-
-<table border="1" width="600">
-
-<colgroup align="char" char=".">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_align_justify.xml b/layout/html/tests/table/marvin/x_colgroup_align_justify.xml
deleted file mode 100644
index 1b1c9826286a..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_align_justify.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_align_justify.xml</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup align="justify">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>The text in this cell text should be justified which means that
-
-the right and left margins should line up, no matter how long the
-
-content becomes (except the last line which should be left
-
-aligned).</td>
-
-<td>The text in this cell text should be justified which means that
-
-the right and left margins should line up, no matter how long the
-
-content becomes (except the last line which should be left
-
-aligned).</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_align_left.xml b/layout/html/tests/table/marvin/x_colgroup_align_left.xml
deleted file mode 100644
index 8e2954877448..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_align_left.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup align="left">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be left aligned</td>
-
-<td>Cell text should be left aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_align_right.xml b/layout/html/tests/table/marvin/x_colgroup_align_right.xml
deleted file mode 100644
index 6213584f418e..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_align_right.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_align_right.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<colgroup align="right">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>Cell text should be right aligned</td>
-
-<td>Cell text should be right aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_span.xml b/layout/html/tests/table/marvin/x_colgroup_span.xml
deleted file mode 100644
index 1b7d299ace6f..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_span.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_span.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<colgroup span="2" width="200"></colgroup>
-
-
-
-<tr>
-
-<td>This column should be 200px wide</td>
-
-<td>This column should be 200px wide</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_valign_baseline.xml b/layout/html/tests/table/marvin/x_colgroup_valign_baseline.xml
deleted file mode 100644
index 53f9ef519519..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_valign_baseline.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_valign_baseline</title>
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<colgroup valign="baseline">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_valign_bottom.xml b/layout/html/tests/table/marvin/x_colgroup_valign_bottom.xml
deleted file mode 100644
index f17b006ba191..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_valign_bottom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_valign_bottom.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<colgroup valign="bottom">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_valign_middle.xml b/layout/html/tests/table/marvin/x_colgroup_valign_middle.xml
deleted file mode 100644
index ef84158e3ba7..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_valign_middle.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<colgroup valign="middle">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The middle of text should be vertically aligned to the middle
-
-of the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_valign_top.xml b/layout/html/tests/table/marvin/x_colgroup_valign_top.xml
deleted file mode 100644
index 3f05804ddcb7..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_valign_top.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_valign_top.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<colgroup valign="top">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_width_pct.xml b/layout/html/tests/table/marvin/x_colgroup_width_pct.xml
deleted file mode 100644
index fea119e2818a..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_width_pct.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_width_pct.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP WIDTH=pct</p>
-
-
-
-<table border="1" width="400">
-
-<colgroup width="25%"></colgroup>
-
-
-
-<colgroup width="75%"></colgroup>
-
-
-
-<tr>
-
-<td>This column should have a width of 25% of 400 pixels or
-
-100px</td>
-
-<td>This column should have a width of 75% of 400 pixels or
-
-300px</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_width_px.xml b/layout/html/tests/table/marvin/x_colgroup_width_px.xml
deleted file mode 100644
index 3b7fc8894b79..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_width_px.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_width_px.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP WIDTH=px</p>
-
-
-
-<table border="1">
-
-<colgroup span="2" width="200">
-
-<col />
-
-<col /></colgroup>
-
-
-
-<tr>
-
-<td>This column should have a width of 200 pixels</td>
-
-<td>This column should have a width of 200 pixels</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_colgroup_width_rel.xml b/layout/html/tests/table/marvin/x_colgroup_width_rel.xml
deleted file mode 100644
index 6edf386d2f02..000000000000
--- a/layout/html/tests/table/marvin/x_colgroup_width_rel.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>colgroup_width_rel.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/17/01 -->
-
-<!-- 
-
-
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date 2/19/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>COLGROUP WIDTH=relative</p>
-
-
-
-<table border="1" width="300">
-
-<colgroup width="1*"></colgroup>
-
-
-
-<colgroup width="2*"></colgroup>
-
-
-
-<tr>
-
-<td>Table width is 300px. This column should be 1/2 as wide as
-
-Column 2 or 100px</td>
-
-<td>Table width is 300px. This column should be twice as wide as
-
-Column 1 or 200px</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table.xml b/layout/html/tests/table/marvin/x_table.xml
deleted file mode 100644
index 3764bd822026..000000000000
--- a/layout/html/tests/table/marvin/x_table.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta name="generator"
-content="HTML Tidy for Mac OS, see www.w3.org" />
-<title>table</title>
-<!-- ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1999
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-  <!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/12/01 -->
-</head>
-<body>
-<p>The table below should have the following:</p>
-
-<ol>
-<li>a caption 'TABLE'</li>
-
-<li>no border</li>
-
-<li>3 colgroups, each with one column</li>
-
-<li>a THEAD with one row</li>
-
-<li>a TBODY with two rows</li>
-
-<li>a TFOOT with one row</li>
-</ol>
-
-<br />
- <br />
- 
-
-<table>
-<caption>TABLE</caption>
-
-<colgroup>
-<col /></colgroup>
-
-<colgroup>
-<col /></colgroup>
-
-<colgroup>
-<col /></colgroup>
-
-<thead>
-<tr>
-<th>THEAD</th>
-<th>THEAD</th>
-<th>THEAD</th>
-</tr>
-</thead>
-
-<tfoot>
-<tr>
-<td>TFOOT</td>
-<td>TFOOT</td>
-<td>TFOOT</td>
-</tr>
-</tfoot>
-
-<tbody>
-<tr>
-<td>TBODY</td>
-<td>TBODY</td>
-<td>TBODY</td>
-</tr>
-
-<tr>
-<td>TBODY</td>
-<td>TBODY</td>
-<td>TBODY</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
-
diff --git a/layout/html/tests/table/marvin/x_table_align_center.xml b/layout/html/tests/table/marvin/x_table_align_center.xml
deleted file mode 100644
index 7c272fb3074b..000000000000
--- a/layout/html/tests/table/marvin/x_table_align_center.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_align_center</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen  Date: 8/5/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" align="center">
-
-<tr>
-
-<td>This table should be center aligned on the page</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_align_left.xml b/layout/html/tests/table/marvin/x_table_align_left.xml
deleted file mode 100644
index 6e0b6adccd4d..000000000000
--- a/layout/html/tests/table/marvin/x_table_align_left.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_align_left</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen  Date: 8/5/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" align="left">
-
-<tr>
-
-<td>This table should be left aligned on the page</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_align_right.xml b/layout/html/tests/table/marvin/x_table_align_right.xml
deleted file mode 100644
index 19f1da2500bd..000000000000
--- a/layout/html/tests/table/marvin/x_table_align_right.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_align_right</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen  Date: 8/5/98
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<table border="1" align="right">
-
-<tr>
-
-<td>This table should be right aligned on the page</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_bgcolor_name.xml b/layout/html/tests/table/marvin/x_table_bgcolor_name.xml
deleted file mode 100644
index ff368b8c8be0..000000000000
--- a/layout/html/tests/table/marvin/x_table_bgcolor_name.xml
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_bgcolor_name</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/11/98
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1" bgcolor="black">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1" bgcolor="silver">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1" bgcolor="gray">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1" bgcolor="white">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1" bgcolor="maroon">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1" bgcolor="red">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1" bgcolor="purple">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1" bgcolor="fuchsia">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1" bgcolor="green">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1" bgcolor="lime">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1" bgcolor="olive">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1" bgcolor="yellow">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1" bgcolor="navy">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1" bgcolor="blue">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table border="1" bgcolor="teal">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1" bgcolor="aqua">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_bgcolor_rgb.xml b/layout/html/tests/table/marvin/x_table_bgcolor_rgb.xml
deleted file mode 100644
index 4bfc1409475e..000000000000
--- a/layout/html/tests/table/marvin/x_table_bgcolor_rgb.xml
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_bgcolor_name</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 8/21/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#000000">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#C0C0C0">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#808080">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#FFFFFF">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#800000">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#FF0000">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#800080">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#FF00FF">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#008000">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#00FF00">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#808000">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#FFFF00">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#000080">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#0000FF">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#008080">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1" bgcolor="#00FFFF">
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_border.xml b/layout/html/tests/table/marvin/x_table_border.xml
deleted file mode 100644
index bc8a33175548..000000000000
--- a/layout/html/tests/table/marvin/x_table_border.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_border</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>No 'number' specification is given for border. There should be a
-
-2 pixel border around the frame of the table below.</p>
-
-
-
-<table border="1">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_border_none.xml b/layout/html/tests/table/marvin/x_table_border_none.xml
deleted file mode 100644
index a4293ab971fe..000000000000
--- a/layout/html/tests/table/marvin/x_table_border_none.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_border_none</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-   <!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>There should be no border around the frame of the table
-
-below.</p>
-
-
-
-<table border="0">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_border_px.xml b/layout/html/tests/table/marvin/x_table_border_px.xml
deleted file mode 100644
index 3fb49abef436..000000000000
--- a/layout/html/tests/table/marvin/x_table_border_px.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_border_px</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-  <!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>There should be a 5 pixel border around the frame of the table
-
-below.</p>
-
-
-
-<table border="5">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_cellpadding.xml b/layout/html/tests/table/marvin/x_table_cellpadding.xml
deleted file mode 100644
index c1634619f0a2..000000000000
--- a/layout/html/tests/table/marvin/x_table_cellpadding.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_cellpadding</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/5/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" cellpadding="10">
-
-<tr>
-
-<td>This cell should have an 10px padding</td>
-
-<td>This cell should have an 10px padding</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_cellpadding_pct.xml b/layout/html/tests/table/marvin/x_table_cellpadding_pct.xml
deleted file mode 100644
index 2a23369060df..000000000000
--- a/layout/html/tests/table/marvin/x_table_cellpadding_pct.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_cellpadding_pct</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/5/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" cellpadding="20%">
-
-<tr>
-
-<td>This cell should have 20% padding</td>
-
-<td>This cell should have 20% padding</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_cellspacing.xml b/layout/html/tests/table/marvin/x_table_cellspacing.xml
deleted file mode 100644
index 77ecd121c4b0..000000000000
--- a/layout/html/tests/table/marvin/x_table_cellspacing.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_cellspacing</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/5/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" cellspacing="10">
-
-<tr>
-
-<td>This cell should have 10px spacing</td>
-
-<td>This cell should have 10px spacing</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_cellspacing_pct.xml b/layout/html/tests/table/marvin/x_table_cellspacing_pct.xml
deleted file mode 100644
index 014019062c45..000000000000
--- a/layout/html/tests/table/marvin/x_table_cellspacing_pct.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_cellspacing_pct</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/11/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" cellspacing="20%">
-
-<tr>
-
-<td>This cell should have 20% spacing</td>
-
-<td>This cell should have 20% spacing</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_class.xml b/layout/html/tests/table/marvin/x_table_class.xml
deleted file mode 100644
index a8e2b60105fd..000000000000
--- a/layout/html/tests/table/marvin/x_table_class.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_class</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/11/99
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-<style type="text/css">
-
-
-
-.one { background-color: lime }
-
-
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1" class="one">
-
-<tr>
-
-<td>Here is a bordered table using the CLASS attribute for
-
-background color. The table should have a lime background.</td>
-
-<td>Here is a bordered table using the CLASS attribute for
-
-background color. The table should have a lime background.</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_above.xml b/layout/html/tests/table/marvin/x_table_frame_above.xml
deleted file mode 100644
index d4ba7d0d9b12..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_above.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_above</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>Only the top side of the frame surrounding the table below
-
-should be visible.</p>
-
-
-
-<table frame="above">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_below.xml b/layout/html/tests/table/marvin/x_table_frame_below.xml
deleted file mode 100644
index dd4eb7bea50b..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_below.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_below</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>Only the bottom side of the frame surrounding the table below
-
-should be visible.</p>
-
-
-
-<table frame="below">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_border.xml b/layout/html/tests/table/marvin/x_table_frame_border.xml
deleted file mode 100644
index 7a7948c0137c..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_border.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_border</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>All four sides of the frame surrounding the table below should
-
-be visible.</p>
-
-
-
-<table frame="border">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_box.xml b/layout/html/tests/table/marvin/x_table_frame_box.xml
deleted file mode 100644
index 65c301e8690e..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_box.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_box</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>All four sides of the frame surrounding the table below should
-
-be visible.</p>
-
-
-
-<table frame="box">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_hsides.xml b/layout/html/tests/table/marvin/x_table_frame_hsides.xml
deleted file mode 100644
index 2e3e4b2f87c7..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_hsides.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_hsides</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>Only the top and bottom sides of the frame surrounding the table
-
-below should be visible.</p>
-
-
-
-<table frame="hsides">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_lhs.xml b/layout/html/tests/table/marvin/x_table_frame_lhs.xml
deleted file mode 100644
index 9017e982ab1c..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_lhs.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_lhs</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>Only the left side of the frame surrounding the table below
-
-should be visible.</p>
-
-
-
-<table frame="lhs">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_rhs.xml b/layout/html/tests/table/marvin/x_table_frame_rhs.xml
deleted file mode 100644
index 3dd9ed57459e..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_rhs.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_rhs</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>Only the right side of the frame surrounding the table below
-
-should be visible.</p>
-
-
-
-<table frame="rhs">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_void.xml b/layout/html/tests/table/marvin/x_table_frame_void.xml
deleted file mode 100644
index a178f346e94d..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_void.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_void</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>No side of the frame surrounding the table below should be
-
-visible.</p>
-
-
-
-<table frame="void">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_frame_vsides.xml b/layout/html/tests/table/marvin/x_table_frame_vsides.xml
deleted file mode 100644
index 0f104c4e1e90..000000000000
--- a/layout/html/tests/table/marvin/x_table_frame_vsides.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_frame_vsides</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>Only the right and left sides of the frame surrounding the table
-
-below should be visible.</p>
-
-
-
-<table frame="vsides">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_id.xml b/layout/html/tests/table/marvin/x_table_id.xml
deleted file mode 100644
index 6392b1122003..000000000000
--- a/layout/html/tests/table/marvin/x_table_id.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_id</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/11/99
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1" id="xyz12">
-
-<tr>
-
-<td>Here is a bordered table using the ID attribute for background
-
-color. The table should have a lime background.</td>
-
-<td>Here is a bordered table using the ID attribute for background
-
-color. The table should have a lime background.</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_rules_all.xml b/layout/html/tests/table/marvin/x_table_rules_all.xml
deleted file mode 100644
index 2a210cd878eb..000000000000
--- a/layout/html/tests/table/marvin/x_table_rules_all.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_rules_all</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/30/01 -->
-
-</head>
-
-<body>
-
-<p>There should be rules between all rows and columns in the table
-
-below.</p>
-
-
-
-<table border="1" rules="all">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_rules_cols.xml b/layout/html/tests/table/marvin/x_table_rules_cols.xml
deleted file mode 100644
index 254f721c6124..000000000000
--- a/layout/html/tests/table/marvin/x_table_rules_cols.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_rules_cols</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-</head>
-
-<body>
-
-<p>There should be rules between all columns (and only columns) in
-
-the table below.</p>
-
-
-
-<table border="1" rules="cols">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_rules_groups.xml b/layout/html/tests/table/marvin/x_table_rules_groups.xml
deleted file mode 100644
index 64bede351ee3..000000000000
--- a/layout/html/tests/table/marvin/x_table_rules_groups.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_rules_groups</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/10/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>There should be rules around each row and column group in the
-
-table below.</p>
-
-
-
-<table border="1" rules="groups">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_rules_none.xml b/layout/html/tests/table/marvin/x_table_rules_none.xml
deleted file mode 100644
index df6ac18f76d6..000000000000
--- a/layout/html/tests/table/marvin/x_table_rules_none.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_rules_none.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>There should be no rules between any rows and columns in the
-
-table below.</p>
-
-
-
-<table border="1" rules="none">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_rules_rows.xml b/layout/html/tests/table/marvin/x_table_rules_rows.xml
deleted file mode 100644
index 7517f56afce4..000000000000
--- a/layout/html/tests/table/marvin/x_table_rules_rows.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_rules_rows.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/11/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>There should be rules between all rows (and only rows) in the
-
-table below.</p>
-
-
-
-<table border="1" rules="rows">
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<colgroup>
-
-<col /></colgroup>
-
-
-
-<thead>
-
-<tr>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-<th>THEAD</th>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_style.xml b/layout/html/tests/table/marvin/x_table_style.xml
deleted file mode 100644
index a82a278ca31b..000000000000
--- a/layout/html/tests/table/marvin/x_table_style.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/11/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table style="border: solid red">
-
-<tr>
-
-<td>This tests the 'style' attribute of TABLE. This table should
-
-have a solid medium red border</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_width_pct.xml b/layout/html/tests/table/marvin/x_table_width_pct.xml
deleted file mode 100644
index f59a60dd4205..000000000000
--- a/layout/html/tests/table/marvin/x_table_width_pct.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_width_pct.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/11/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<tr>
-
-<td>This table should have a width 100% of the available horizontal
-
-space</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="75%">
-
-<tr>
-
-<td>This table should have a width 75% of the available horizontal
-
-space</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="50%">
-
-<tr>
-
-<td>This table should have a width 50% of the available horizontal
-
-space</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="25%">
-
-<tr>
-
-<td>This table should have a width 25% of the available horizontal
-
-space</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_table_width_px.xml b/layout/html/tests/table/marvin/x_table_width_px.xml
deleted file mode 100644
index 5c97afd9eb54..000000000000
--- a/layout/html/tests/table/marvin/x_table_width_px.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>table_width_px.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/11/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100">
-
-<tr>
-
-<td>This table should have a width of 100 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="200">
-
-<tr>
-
-<td>This table should have a width of 200 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="300">
-
-<tr>
-
-<td>This table should have a width of 300 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="400">
-
-<tr>
-
-<td>This table should have a width of 400 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1" width="500">
-
-<tr>
-
-<td>This table should have a width of 500 pixels</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_align_center.xml b/layout/html/tests/table/marvin/x_tbody_align_center.xml
deleted file mode 100644
index af4c160d8c09..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_align_center.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_align_center.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TBODY text should be center aligned.</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody align="center">
-
-<tr>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_align_char.xml b/layout/html/tests/table/marvin/x_tbody_align_char.xml
deleted file mode 100644
index 1ae43d166a2b..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_align_char.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_align_char.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/27/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The numbers in the TBODY should align at the decimal points</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody align="char" char=".">
-
-<tr>
-
-<td>TBODY 55.00</td>
-
-<td>TBODY 55555.00</td>
-
-<td>TBODY 555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY 1234.56</td>
-
-<td>TBODY 123.45</td>
-
-<td>TBODY 12345.67</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_align_justify.xml b/layout/html/tests/table/marvin/x_tbody_align_justify.xml
deleted file mode 100644
index f2cf121d2f7c..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_align_justify.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_align_justify.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TBODY text should be justified.</p>
-
-
-
-<table width="300" border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody align="justify">
-
-<tr>
-
-<td>This TBODY text should be justified which means that the right
-
-and left margins should line up, no matter how long the content
-
-becomes (except the last line which should be left aligned)</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_align_left.xml b/layout/html/tests/table/marvin/x_tbody_align_left.xml
deleted file mode 100644
index 6f11e22b8dbe..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_align_left.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TBODY text should be left aligned.</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody align="left">
-
-<tr>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_align_right.xml b/layout/html/tests/table/marvin/x_tbody_align_right.xml
deleted file mode 100644
index 76f33779ae6c..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_align_right.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_align_right.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TBODY text should be right aligned.</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody align="right">
-
-<tr>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_class.xml b/layout/html/tests/table/marvin/x_tbody_class.xml
deleted file mode 100644
index 1053ab51da65..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_class.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_class.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tbody class="one">
-
-<tr>
-
-<td>This tbody should have a lime background</td>
-
-<td>This tbody should have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_id.xml b/layout/html/tests/table/marvin/x_tbody_id.xml
deleted file mode 100644
index 940fd2f5de7d..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_id.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_id.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tbody id="xyz12">
-
-<tr>
-
-<td>This tbody should have a lime background</td>
-
-<td>This tbody should have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_style.xml b/layout/html/tests/table/marvin/x_tbody_style.xml
deleted file mode 100644
index 33d006164fd0..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_style.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tbody style="background-color: lime">
-
-<tr>
-
-<td>This tbody should have a lime background</td>
-
-<td>This tbody should have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_valign_baseline.xml b/layout/html/tests/table/marvin/x_tbody_valign_baseline.xml
deleted file mode 100644
index fdf8c2d085b0..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_valign_baseline.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_valign_baseline</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TBODY VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign="baseline">
-
-<tr>
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_valign_bottom.xml b/layout/html/tests/table/marvin/x_tbody_valign_bottom.xml
deleted file mode 100644
index 8a72e4baf661..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_valign_bottom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_valign_bottom</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TBODY VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign="bottom">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_valign_middle.xml b/layout/html/tests/table/marvin/x_tbody_valign_middle.xml
deleted file mode 100644
index bc52bfaf479f..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_valign_middle.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_valign_middle</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TBODY VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign="middle">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>This text should be vertically aligned to the middle of the
-
-image</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tbody_valign_top.xml b/layout/html/tests/table/marvin/x_tbody_valign_top.xml
deleted file mode 100644
index 19a0d271775f..000000000000
--- a/layout/html/tests/table/marvin/x_tbody_valign_top.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tbody_valign_top</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TBODY VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody valign="top">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_align_center.xml b/layout/html/tests/table/marvin/x_td_align_center.xml
deleted file mode 100644
index 862fdb20a1ce..000000000000
--- a/layout/html/tests/table/marvin/x_td_align_center.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_center</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: td align="center"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<td align="center">Cell text should be center aligned</td>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td align="center">Cell text should be center aligned</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_align_char.xml b/layout/html/tests/table/marvin/x_td_align_char.xml
deleted file mode 100644
index 00eb942f46bd..000000000000
--- a/layout/html/tests/table/marvin/x_td_align_char.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_char</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: Numbers should align by decimal points</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td align="char" char=".">55.00</td>
-
-<td align="char" char=".">55555.00</td>
-
-<td align="char" char=".">555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td align="char" char=".">1234.56</td>
-
-<td align="char" char=".">123.45</td>
-
-<td align="char" char=".">12345.67</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_align_justify.xml b/layout/html/tests/table/marvin/x_td_align_justify.xml
deleted file mode 100644
index d51a933678e0..000000000000
--- a/layout/html/tests/table/marvin/x_td_align_justify.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_justify</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td width="400" align="justify">This cell text should be justified
-
-which means that the right and left margins should line up, no
-
-matter how long the content becomes (except the last line which
-
-should be left aligned)</td>
-
-<td width="400">This cell text should be left justified</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_align_left.xml b/layout/html/tests/table/marvin/x_td_align_left.xml
deleted file mode 100644
index 597cdff39b9c..000000000000
--- a/layout/html/tests/table/marvin/x_td_align_left.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_left</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: td align="left"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<td align="left">Cell text should be left aligned</td>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td align="left">Cell text should be left aligned</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_align_right.xml b/layout/html/tests/table/marvin/x_td_align_right.xml
deleted file mode 100644
index 806e5698febb..000000000000
--- a/layout/html/tests/table/marvin/x_td_align_right.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_right</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: td align="right"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<td align="right">Cell text should be right aligned</td>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td align="right">Cell text should be right aligned</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_bgcolor_name.xml b/layout/html/tests/table/marvin/x_td_bgcolor_name.xml
deleted file mode 100644
index 12b2c0844f31..000000000000
--- a/layout/html/tests/table/marvin/x_td_bgcolor_name.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_bgcolor_name</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-<td bgcolor="black">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-<td bgcolor="silver">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-<td bgcolor="gray">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-<td bgcolor="white">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-<td bgcolor="maroon">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-<td bgcolor="red">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-<td bgcolor="purple">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-<td bgcolor="fuchsia">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-<td bgcolor="green">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-<td bgcolor="lime">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-<td bgcolor="olive">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-<td bgcolor="yellow">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-<td bgcolor="navy">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-<td bgcolor="blue">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-<td bgcolor="teal">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-<td bgcolor="aqua">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_bgcolor_rgb.xml b/layout/html/tests/table/marvin/x_td_bgcolor_rgb.xml
deleted file mode 100644
index c965d1610c7b..000000000000
--- a/layout/html/tests/table/marvin/x_td_bgcolor_rgb.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_bgcolor_name</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-<td bgcolor="#000000">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-<td bgcolor="#C0C0C0">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-<td bgcolor="#808080">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-<td bgcolor="#FFFFFF">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-<td bgcolor="#800000">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-<td bgcolor="#FF0000">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-<td bgcolor="#800080">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-<td bgcolor="#FF00FF">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-<td bgcolor="#008000">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-<td bgcolor="#00FF00">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-<td bgcolor="#808000">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-<td bgcolor="#FFFF00">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-<td bgcolor="#000080">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-<td bgcolor="#0000FF">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-<td bgcolor="#008080">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-</tr>
-
-
-
-<tr>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-<td bgcolor="#00FFFF">
-
-table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_class.xml b/layout/html/tests/table/marvin/x_td_class.xml
deleted file mode 100644
index 03c4e90de019..000000000000
--- a/layout/html/tests/table/marvin/x_td_class.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_class</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td class="one">This cell should have a lime background</td>
-
-<td class="one">This cell should have a lime background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_colspan.xml b/layout/html/tests/table/marvin/x_td_colspan.xml
deleted file mode 100644
index 586a059f9958..000000000000
--- a/layout/html/tests/table/marvin/x_td_colspan.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<!-- test case: td_colspan.html -->
-
-<!-- description: TD element/Colspan attribute -->
-
-<!-- Author: Christine Dreckman Date: 5/10/99 -->
-
-<!-- Modified: Chris Petersen Date: 5/19/99 -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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 ***** -->
-
-<!-- Purpose: To test the TD element with the Colspan attribute -->
-
-<!-- Expected result: The top row should span two columns  -->
-
-<title>HTML Functional -- TD - COLSPAN</title>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td colspan="2">This cell spans two columns</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>xxx xxx</td>
-
-<td>xxx xxx</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_height.xml b/layout/html/tests/table/marvin/x_td_height.xml
deleted file mode 100644
index 70de1116662d..000000000000
--- a/layout/html/tests/table/marvin/x_td_height.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_height</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td height="100">The height of this cell should be 100 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td height="200">The height of this cell should be 200 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td height="300">The height of this cell should be 300 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td height="400">The height of this cell should be 400 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td height="500">The height of this cell should be 500 pixels</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_id.xml b/layout/html/tests/table/marvin/x_td_id.xml
deleted file mode 100644
index b57196fb878b..000000000000
--- a/layout/html/tests/table/marvin/x_td_id.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_id</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td id="xyz12">This cell should have a lime background</td>
-
-<td id="xyz12">This cell should have a lime background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_nowrap.xml b/layout/html/tests/table/marvin/x_td_nowrap.xml
deleted file mode 100644
index 2614e7d295f2..000000000000
--- a/layout/html/tests/table/marvin/x_td_nowrap.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_nowrap</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td nowrap="nowrap">The text in the cell should not wrap upon
-
-window resizing&nbsp;&nbsp;&nbsp;&nbsp;x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill</td>
-
-</tr>
-
-
-
-<tr>
-
-<td nowrap="nowrap">The text in the cell should not wrap upon
-
-window resizing&nbsp;&nbsp;&nbsp;&nbsp;x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_rowspan.xml b/layout/html/tests/table/marvin/x_td_rowspan.xml
deleted file mode 100644
index f0a827ca51f9..000000000000
--- a/layout/html/tests/table/marvin/x_td_rowspan.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<!-- test case: td_rowspan.xml -->
-
-<!-- description: TD element/Rowspan attribute -->
-
-<!-- Author: Christine Dreckman Date: 5/10/99 -->
-
-<!-- Modified: Chris Petersen Date: 5/19/99 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- Purpose: To test the TD element with the Colspan attribute -->
-
-<!-- Expected result: The left column should span two rows  -->
-
-<title>HTML Functional -- TD - ROWSPAN</title>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td rowspan="2">This cell spans two rows</td>
-
-<td>xxx xxx</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>xxx xxx</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_style.xml b/layout/html/tests/table/marvin/x_td_style.xml
deleted file mode 100644
index 643226116ef0..000000000000
--- a/layout/html/tests/table/marvin/x_td_style.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_style</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td style="background-color: lime">This cell should have a lime
-
-background</td>
-
-<td style="background-color: lime">This cell should have a lime
-
-background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_valign_baseline.xml b/layout/html/tests/table/marvin/x_td_valign_baseline.xml
deleted file mode 100644
index 4452bef1192b..000000000000
--- a/layout/html/tests/table/marvin/x_td_valign_baseline.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_valign_baseline</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TD VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td valign="baseline">Compare the baseline of the first line of
-
-text in this cell with the baseline of the first line of text in
-
-the next cell: they should be vertically aligned</td>
-
-<td valign="baseline" style="font-size: 30pt">Compare the baseline
-
-of the first line of text in this cell with the baseline of the
-
-first line of text in the previous cell: they should be vertically
-
-aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_valign_bottom.xml b/layout/html/tests/table/marvin/x_td_valign_bottom.xml
deleted file mode 100644
index 43482a1a2c7b..000000000000
--- a/layout/html/tests/table/marvin/x_td_valign_bottom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_valign_bottom</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TD VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td valign="bottom"><img src="../images/lime.gif" alt="image"
-
-height="200" width="200" /></td>
-
-<td valign="bottom">The bottom of this text should be vertically
-
-aligned to the bottom of the image. x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_valign_middle.xml b/layout/html/tests/table/marvin/x_td_valign_middle.xml
deleted file mode 100644
index ec50c2f7e150..000000000000
--- a/layout/html/tests/table/marvin/x_td_valign_middle.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_valign_middle</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TD VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td valign="middle">This text should be vertically aligned to the
-
-middle of the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_valign_top.xml b/layout/html/tests/table/marvin/x_td_valign_top.xml
deleted file mode 100644
index ef08f3d4e769..000000000000
--- a/layout/html/tests/table/marvin/x_td_valign_top.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_valign_top</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TD VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td valign="top">The top of this text should be vertically aligned
-
-to the top of the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_td_width.xml b/layout/html/tests/table/marvin/x_td_width.xml
deleted file mode 100644
index 31727a9bb828..000000000000
--- a/layout/html/tests/table/marvin/x_td_width.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_width</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<td width="100">The width of this cell should be 100 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td width="200">The width of this cell should be 200 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td width="300">The width of this cell should be 300 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td width="400">The width of this cell should be 400 pixels</td>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<td width="500">The width of this cell should be 500 pixels</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_align_center.xml b/layout/html/tests/table/marvin/x_tfoot_align_center.xml
deleted file mode 100644
index d07e43612203..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_align_center.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TFOOT text should be center aligned</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot align="center">
-
-<tr>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_align_char.xml b/layout/html/tests/table/marvin/x_tfoot_align_char.xml
deleted file mode 100644
index 6c7439cc0456..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_align_char.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/27/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The numbers in the TFOOT should align at the decimal points</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot align="char" char=".">
-
-<tr>
-
-<td>TFOOT 55.00</td>
-
-<td>TFOOT 55555.00</td>
-
-<td>TFOOT 555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TFOOT 1234.56</td>
-
-<td>TFOOT 123.45</td>
-
-<td>TFOOT 12345.67</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_align_justify.xml b/layout/html/tests/table/marvin/x_tfoot_align_justify.xml
deleted file mode 100644
index f25b7781db47..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_align_justify.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_align_justify.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TFOOT text should be justified.</p>
-
-
-
-<table width="300" border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot align="justify">
-
-<tr>
-
-<td>This TFOOT text should be justified which means that the right
-
-and left margins should line up, no matter how long the content
-
-becomes (except the last line which should be left aligned)</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_align_left.xml b/layout/html/tests/table/marvin/x_tfoot_align_left.xml
deleted file mode 100644
index e12413d1678d..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_align_left.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TFOOT text should be left aligned</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot align="left">
-
-<tr>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_align_right.xml b/layout/html/tests/table/marvin/x_tfoot_align_right.xml
deleted file mode 100644
index c772088387a0..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_align_right.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_align_right.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the TFOOT text should be right aligned</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>This text is in the THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot align="right">
-
-<tr>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_class.xml b/layout/html/tests/table/marvin/x_tfoot_class.xml
deleted file mode 100644
index 7d82d53afb98..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_class.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_class.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tfoot class="one">
-
-<tr>
-
-<td>This tfoot should have a lime background</td>
-
-<td>This tfoot should have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_id.xml b/layout/html/tests/table/marvin/x_tfoot_id.xml
deleted file mode 100644
index a270c10bc480..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_id.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_id.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tfoot id="xyz12">
-
-<tr>
-
-<td>This tfoot should have a lime background</td>
-
-<td>This tfoot should have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_style.xml b/layout/html/tests/table/marvin/x_tfoot_style.xml
deleted file mode 100644
index 271990be18cb..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_style.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tfoot style="background-color: lime">
-
-<tr>
-
-<td>This tfoot should have a lime background</td>
-
-<td>This tfoot should have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_valign_baseline.xml b/layout/html/tests/table/marvin/x_tfoot_valign_baseline.xml
deleted file mode 100644
index c3a0525f7352..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_valign_baseline.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_valign_baseline.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TFOOT VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign="baseline">
-
-<tr>
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_valign_bottom.xml b/layout/html/tests/table/marvin/x_tfoot_valign_bottom.xml
deleted file mode 100644
index d96496660439..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_valign_bottom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_valign_bottom.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TFOOT VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign="bottom">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_valign_middle.xml b/layout/html/tests/table/marvin/x_tfoot_valign_middle.xml
deleted file mode 100644
index 1afaac317fe5..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_valign_middle.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TFOOT VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign="middle">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>This text should be vertically aligned to the middle of the
-
-image</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tfoot_valign_top.xml b/layout/html/tests/table/marvin/x_tfoot_valign_top.xml
deleted file mode 100644
index 538986c65333..000000000000
--- a/layout/html/tests/table/marvin/x_tfoot_valign_top.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tfoot_valign_top.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TFOOT VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<thead>
-
-<tr>
-
-<td>THEAD</td>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot valign="top">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_align_center.xml b/layout/html/tests/table/marvin/x_th_align_center.xml
deleted file mode 100644
index d2a74d2a879f..000000000000
--- a/layout/html/tests/table/marvin/x_th_align_center.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>td_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: th align="center"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<th align="center">Cell text should be center aligned</th>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th align="center">Cell text should be center aligned</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_align_char.xml b/layout/html/tests/table/marvin/x_th_align_char.xml
deleted file mode 100644
index d8df60537169..000000000000
--- a/layout/html/tests/table/marvin/x_th_align_char.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: Numbers should align by decimal points</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th align="char" char=".">55.00</th>
-
-<th align="char" char=".">55555.00</th>
-
-<th align="char" char=".">555.00</th>
-
-</tr>
-
-
-
-<tr>
-
-<th align="char" char=".">1234.56</th>
-
-<th align="char" char=".">123.45</th>
-
-<th align="char" char=".">12345.67</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_align_justify.xml b/layout/html/tests/table/marvin/x_th_align_justify.xml
deleted file mode 100644
index c40dc17c3988..000000000000
--- a/layout/html/tests/table/marvin/x_th_align_justify.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_align_justify.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th width="400" align="justify">This cell text should be justified
-
-which means that the right and left margins should line up, no
-
-matter how long the content becomes (except the last line which
-
-should be left aligned)</th>
-
-<th width="400" align="left">This cell text should be left
-
-justified</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_align_left.xml b/layout/html/tests/table/marvin/x_th_align_left.xml
deleted file mode 100644
index 2ca1c3e1d7ac..000000000000
--- a/layout/html/tests/table/marvin/x_th_align_left.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: th align="left"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<th align="left">Cell text should be left aligned</th>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th align="left">Cell text should be left aligned</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_align_right.xml b/layout/html/tests/table/marvin/x_th_align_right.xml
deleted file mode 100644
index 1804d78efa70..000000000000
--- a/layout/html/tests/table/marvin/x_th_align_right.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_align_right.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: th align="right"</p>
-
-
-
-<p><b>Example 1.</b><br />
-
-Table width=100%</p>
-
-
-
-<table border="1" width="100%">
-
-<tr>
-
-<th align="right">Cell text should be right aligned</th>
-
-</tr>
-
-</table>
-
-
-
-<p><b>Example 2.</b><br />
-
-No specific table width; text in second row exceeds text in first
-
-row</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th align="right">Cell text should be right aligned</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx
-
-xxx xxx xxx xxx</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_bgcolor_name.xml b/layout/html/tests/table/marvin/x_th_bgcolor_name.xml
deleted file mode 100644
index 1d9c0bc8702f..000000000000
--- a/layout/html/tests/table/marvin/x_th_bgcolor_name.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_bgcolor_name.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-<th bgcolor="black">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-<th bgcolor="silver">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-<th bgcolor="gray">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-<th bgcolor="white">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-<th bgcolor="maroon">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-<th bgcolor="red">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-<th bgcolor="purple">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-<th bgcolor="fuchsia">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-<th bgcolor="green">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-<th bgcolor="lime">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-<th bgcolor="olive">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-<th bgcolor="yellow">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-<th bgcolor="navy">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-<th bgcolor="blue">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-<th bgcolor="teal">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-<th bgcolor="aqua">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_bgcolor_rgb.xml b/layout/html/tests/table/marvin/x_th_bgcolor_rgb.xml
deleted file mode 100644
index b8fb6029b142..000000000000
--- a/layout/html/tests/table/marvin/x_th_bgcolor_rgb.xml
+++ /dev/null
@@ -1,767 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_bgcolor_name.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 9/6/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-<th bgcolor="#000000">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-<th bgcolor="#C0C0C0">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-<th bgcolor="#808080">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-<th bgcolor="#FFFFFF">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-<th bgcolor="#800000">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-<th bgcolor="#FF0000">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-<th bgcolor="#800080">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-<th bgcolor="#FF00FF">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-<th bgcolor="#008000">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-<th bgcolor="#00FF00">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-<th bgcolor="#808000">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-<th bgcolor="#FFFF00">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-<th bgcolor="#000080">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-<th bgcolor="#0000FF">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-<th bgcolor="#008080">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-</tr>
-
-
-
-<tr>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-<th bgcolor="#00FFFF">
-
-table table table table</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_class.xml b/layout/html/tests/table/marvin/x_th_class.xml
deleted file mode 100644
index b79f91943a33..000000000000
--- a/layout/html/tests/table/marvin/x_th_class.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_class.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th class="one">This heading cell should have a lime
-
-background</th>
-
-<th class="one">This heading cell should have a lime
-
-background</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_colspan.xml b/layout/html/tests/table/marvin/x_th_colspan.xml
deleted file mode 100644
index f4fcf18a40ba..000000000000
--- a/layout/html/tests/table/marvin/x_th_colspan.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<!-- test case: th_colspan.html -->
-
-<!-- description: TH element/Colspan attribute -->
-
-<!-- Author: Christine Dreckman Date: 5/10/99 -->
-
-<!-- Modified: Chris Petersen: 5/18/99 -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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 ***** -->
-
-<!-- Purpose: To test the TH element with the Colspan attribute -->
-
-<!-- Expected result: The top row should span two columns  -->
-
-<title>XHTML Functional -- TH - COLSPAN</title>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th colspan="2">This cell spans two columns</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>xxx xxx</th>
-
-<th>xxx xxx</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_height.xml b/layout/html/tests/table/marvin/x_th_height.xml
deleted file mode 100644
index 83ca52167d6f..000000000000
--- a/layout/html/tests/table/marvin/x_th_height.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_height.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th height="100">The height of this cell should be 100 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th height="200">The height of this cell should be 200 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th height="300">The height of this cell should be 300 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th height="400">The height of this cell should be 400 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th height="500">The height of this cell should be 500 pixels</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_id.xml b/layout/html/tests/table/marvin/x_th_id.xml
deleted file mode 100644
index 2ada6a27d4b7..000000000000
--- a/layout/html/tests/table/marvin/x_th_id.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_id.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th id="xyz12">This heading cell should have a lime background</th>
-
-<th id="xyz12">This heading cell should have a lime background</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_nowrap.xml b/layout/html/tests/table/marvin/x_th_nowrap.xml
deleted file mode 100644
index 119e01d5e305..000000000000
--- a/layout/html/tests/table/marvin/x_th_nowrap.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_nowrap.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th nowrap="nowrap">The text in the cell should not wrap upon
-
-window resizing&nbsp;&nbsp;&nbsp;&nbsp;x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill</th>
-
-</tr>
-
-
-
-<tr>
-
-<th nowrap="nowrap">The text in the cell should not wrap upon
-
-window resizing&nbsp;&nbsp;&nbsp;&nbsp;x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_rowspan.xml b/layout/html/tests/table/marvin/x_th_rowspan.xml
deleted file mode 100644
index 1047bf997dc3..000000000000
--- a/layout/html/tests/table/marvin/x_th_rowspan.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<!-- test case: th_rowspan.xml -->
-
-<!-- description: TH element/Rowspan attribute -->
-
-<!-- Author: Christine Dreckman Date: 5/10/99 -->
-
-<!-- Modified: Chris Petersen Date: 5/18/99 -->
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -
-   - 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 ***** -->
-
-<!-- Purpose: To test the TH element with the Colspan attribute -->
-
-<!-- Expected result: The left column should span two rows  -->
-
-<title>XHTML Functional -- TH - ROWSPAN</title>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th rowspan="2">This cell spans two rows</th>
-
-<th>xxx xxx</th>
-
-</tr>
-
-
-
-<tr>
-
-<th>xxx xxx</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_style.xml b/layout/html/tests/table/marvin/x_th_style.xml
deleted file mode 100644
index 65f20af5a532..000000000000
--- a/layout/html/tests/table/marvin/x_th_style.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th style="background-color: lime">This heading cell should have a
-
-lime background</th>
-
-<th style="background-color: lime">This heading cell should have a
-
-lime background</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_valign_baseline.xml b/layout/html/tests/table/marvin/x_th_valign_baseline.xml
deleted file mode 100644
index cca1fc8c2183..000000000000
--- a/layout/html/tests/table/marvin/x_th_valign_baseline.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_valign_baseline.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TH VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th valign="baseline">Compare the baseline of the first line of
-
-text in this cell with the baseline of the first line of text in
-
-the next cell: they should be vertically aligned</th>
-
-<th valign="baseline" style="font-size: 30pt">Compare the baseline
-
-of the first line of text in this cell with the baseline of the
-
-first line of text in the previous cell: they should be vertically
-
-aligned</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_valign_bottom.xml b/layout/html/tests/table/marvin/x_th_valign_bottom.xml
deleted file mode 100644
index 2ca0894d79a3..000000000000
--- a/layout/html/tests/table/marvin/x_th_valign_bottom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_valign_bottom.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TH VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th valign="bottom"><img src="../images/lime.gif" alt="image"
-
-height="200" width="200" /></th>
-
-<th valign="bottom">The bottom of this text should be vertically
-
-aligned to the bottom of the image. x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_valign_middle.xml b/layout/html/tests/table/marvin/x_th_valign_middle.xml
deleted file mode 100644
index f3350abd116e..000000000000
--- a/layout/html/tests/table/marvin/x_th_valign_middle.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TH VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></th>
-
-<th valign="middle">This text should be vertically aligned to the
-
-middle of the image</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_valign_top.xml b/layout/html/tests/table/marvin/x_th_valign_top.xml
deleted file mode 100644
index 54cb672b4f98..000000000000
--- a/layout/html/tests/table/marvin/x_th_valign_top.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_valign_top.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/7/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TH VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<tr>
-
-<th><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></th>
-
-<th valign="top">The top of this text should be vertically aligned
-
-to the top of the image</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_th_width.xml b/layout/html/tests/table/marvin/x_th_width.xml
deleted file mode 100644
index d2275383f5cb..000000000000
--- a/layout/html/tests/table/marvin/x_th_width.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>th_width.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 5/10/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr>
-
-<th width="100">The width of this cell should be 100 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th width="200">The width of this cell should be 200 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th width="300">The width of this cell should be 300 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th width="400">The width of this cell should be 400 pixels</th>
-
-</tr>
-
-</table>
-
-
-
-<br />
-
- 
-
-
-
-<table border="1">
-
-<tr>
-
-<th width="500">The width of this cell should be 500 pixels</th>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_align_center.xml b/layout/html/tests/table/marvin/x_thead_align_center.xml
deleted file mode 100644
index 6e3cbfb44509..000000000000
--- a/layout/html/tests/table/marvin/x_thead_align_center.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 2/01/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the THEAD text should be center aligned</p>
-
-
-
-<table border="1">
-
-<thead align="center">
-
-<tr>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_align_char.xml b/layout/html/tests/table/marvin/x_thead_align_char.xml
deleted file mode 100644
index 775d40480932..000000000000
--- a/layout/html/tests/table/marvin/x_thead_align_char.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/27/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>The numbers in the THEAD should align at the decimal points</p>
-
-
-
-<table border="1">
-
-<thead align="char" char=".">
-
-<tr>
-
-<td>THEAD 55.00</td>
-
-<td>THEAD 55555.00</td>
-
-<td>THEAD 555.00</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>THEAD 1234.56</td>
-
-<td>THEAD 123.45</td>
-
-<td>THEAD 12345.67</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_align_justify.xml b/layout/html/tests/table/marvin/x_thead_align_justify.xml
deleted file mode 100644
index 84dc33eecfbf..000000000000
--- a/layout/html/tests/table/marvin/x_thead_align_justify.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_align_justify.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the THEAD text should be justified.</p>
-
-
-
-<table width="300" border="1">
-
-<thead align="justify">
-
-<tr>
-
-<td>This THEAD text should be justified which means that the right
-
-and left margins should line up, no matter how long the content
-
-becomes (except the last line which should be left aligned)</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_align_left.xml b/layout/html/tests/table/marvin/x_thead_align_left.xml
deleted file mode 100644
index 0a16eaa7a25e..000000000000
--- a/layout/html/tests/table/marvin/x_thead_align_left.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_align_left.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the THEAD text should be left aligned.</p>
-
-
-
-<table border="1">
-
-<thead align="left">
-
-<tr>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_align_right.xml b/layout/html/tests/table/marvin/x_thead_align_right.xml
deleted file mode 100644
index 7a9d4f328e46..000000000000
--- a/layout/html/tests/table/marvin/x_thead_align_right.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_align_right.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/13/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>In this test, the THEAD text should be right aligned</p>
-
-
-
-<table border="1">
-
-<thead align="right">
-
-<tr>
-
-<td>THEAD</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This text is in the TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This text is in the TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_class.xml b/layout/html/tests/table/marvin/x_thead_class.xml
deleted file mode 100644
index dc48b5cc407d..000000000000
--- a/layout/html/tests/table/marvin/x_thead_class.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_class.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<thead class="one">
-
-<tr>
-
-<td>This thead should have a lime background</td>
-
-<td>This thead should have a lime background</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This tfoot should NOT have a lime background</td>
-
-<td>This tfoot should NOT have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_id.xml b/layout/html/tests/table/marvin/x_thead_id.xml
deleted file mode 100644
index cc48929fa165..000000000000
--- a/layout/html/tests/table/marvin/x_thead_id.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_id.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/22/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<thead id="xyz12">
-
-<tr>
-
-<td>This thead should have a lime background</td>
-
-<td>This thead should have a lime background</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This tfoot should NOT have a lime background</td>
-
-<td>This tfoot should NOT have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_style.xml b/layout/html/tests/table/marvin/x_thead_style.xml
deleted file mode 100644
index d9facacb2018..000000000000
--- a/layout/html/tests/table/marvin/x_thead_style.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<thead style="background-color: lime">
-
-<tr>
-
-<td>This thead should have a lime background</td>
-
-<td>This thead should have a lime background</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>This tfoot should NOT have a lime background</td>
-
-<td>This tfoot should NOT have a lime background</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>This tbody should NOT have a lime background</td>
-
-<td>This tbody should NOT have a lime background</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_valign_baseline.xml b/layout/html/tests/table/marvin/x_thead_valign_baseline.xml
deleted file mode 100644
index b3c0f6b66d92..000000000000
--- a/layout/html/tests/table/marvin/x_thead_valign_baseline.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_valign_baseline.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>THEAD VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<thead valign="baseline">
-
-<tr>
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_valign_bottom.xml b/layout/html/tests/table/marvin/x_thead_valign_bottom.xml
deleted file mode 100644
index 2f1e12ff2b44..000000000000
--- a/layout/html/tests/table/marvin/x_thead_valign_bottom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_valign_bottom.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>THEAD VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<thead valign="bottom">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_valign_middle.xml b/layout/html/tests/table/marvin/x_thead_valign_middle.xml
deleted file mode 100644
index cf36edb6497b..000000000000
--- a/layout/html/tests/table/marvin/x_thead_valign_middle.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>THEAD VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<thead valign="middle">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>This text should be vertically aligned to the middle of the
-
-image</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_thead_valign_top.xml b/layout/html/tests/table/marvin/x_thead_valign_top.xml
deleted file mode 100644
index fa63aa3a6d97..000000000000
--- a/layout/html/tests/table/marvin/x_thead_valign_top.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>thead_valign_top.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 1/29/99, 3/18/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>THEAD VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<thead valign="top">
-
-<tr>
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</thead>
-
-
-
-<tfoot>
-
-<tr>
-
-<td>TFOOT</td>
-
-<td>TFOOT</td>
-
-</tr>
-
-</tfoot>
-
-
-
-<tbody>
-
-<tr>
-
-<td>TBODY</td>
-
-<td>TBODY</td>
-
-</tr>
-
-</tbody>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_align_center.xml b/layout/html/tests/table/marvin/x_tr_align_center.xml
deleted file mode 100644
index 40e56c5c21e2..000000000000
--- a/layout/html/tests/table/marvin/x_tr_align_center.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_align_center.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<tr align="center">
-
-<td>Cell text should be center aligned</td>
-
-<td>Cell text should be center aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_align_char.xml b/layout/html/tests/table/marvin/x_tr_align_char.xml
deleted file mode 100644
index df23cc09dbf0..000000000000
--- a/layout/html/tests/table/marvin/x_tr_align_char.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_align_char.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 9/7/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TEST: Numbers should align by decimal points</p>
-
-
-
-<table border="1">
-
-<tr align="char" char=".">
-
-<td>55.00</td>
-
-<td>55555.00</td>
-
-<td>555.00</td>
-
-</tr>
-
-
-
-<tr align="char" char=".">
-
-<td>1234.56</td>
-
-<td>123.45</td>
-
-<td>12345.67</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_align_justify.xml b/layout/html/tests/table/marvin/x_tr_align_justify.xml
deleted file mode 100644
index c64105a7d872..000000000000
--- a/layout/html/tests/table/marvin/x_tr_align_justify.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_align_justify.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="600">
-
-<tr align="justify">
-
-<td>Cell text should be justified which means that the right and
-
-left margins should line up, no matter how long the content becomes
-
-(except the last line which should be left aligned).</td>
-
-<td>Cell text should be justified which means that the right and
-
-left margins should line up, no matter how long the content becomes
-
-(except the last line which should be left aligned).</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_align_left.xml b/layout/html/tests/table/marvin/x_tr_align_left.xml
deleted file mode 100644
index b71512abb1ae..000000000000
--- a/layout/html/tests/table/marvin/x_tr_align_left.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_align_left.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<tr align="left">
-
-<td>Cell text should be left aligned</td>
-
-<td>Cell text should be left aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_align_right.xml b/layout/html/tests/table/marvin/x_tr_align_right.xml
deleted file mode 100644
index 3d51e04af3c5..000000000000
--- a/layout/html/tests/table/marvin/x_tr_align_right.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_align_right.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 4/20/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1" width="100%">
-
-<tr align="right">
-
-<td>Cell text should be right aligned</td>
-
-<td>Cell text should be right aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_bgcolor_name.xml b/layout/html/tests/table/marvin/x_tr_bgcolor_name.xml
deleted file mode 100644
index d65bdf6538b1..000000000000
--- a/layout/html/tests/table/marvin/x_tr_bgcolor_name.xml
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_bgcolor_name.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/29/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="black">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="black">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="silver">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="silver">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="gray">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="gray">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="white">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="white">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="maroon">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="maroon">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="red">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="red">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="purple">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="purple">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="fuchsia">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="fuchsia">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="green">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="green">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="lime">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="lime">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="olive">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="olive">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="yellow">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="yellow">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="navy">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="navy">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="blue">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="blue">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr bgcolor="teal">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="teal">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="aqua">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="aqua">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_bgcolor_rgb.xml b/layout/html/tests/table/marvin/x_tr_bgcolor_rgb.xml
deleted file mode 100644
index e74a27e8e921..000000000000
--- a/layout/html/tests/table/marvin/x_tr_bgcolor_rgb.xml
+++ /dev/null
@@ -1,575 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_bgcolor_rgb.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman   Date: 1/29/99
-   -
-   - 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 ***** -->
-
-</head>
-
-<body bgcolor="#FFFFFF">
-
-<p>Black table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#000000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#000000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Silver table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#C0C0C0">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#C0C0C0">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Gray table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#808080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#808080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>White table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#FFFFFF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#FFFFFF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Maroon table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#800000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#800000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Red table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#FF0000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#FF0000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Purple table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#800080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#800080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Fuchsia table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#FF00FF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#FF00FF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Green table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#008000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#008000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Lime table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#00FF00">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#00FF00">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Olive table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#808000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#808000">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Yellow table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#FFFF00">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#FFFF00">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Navy table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#000080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#000080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Blue table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#0000FF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#0000FF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Teal table with a white body background</p>
-
-
-
-<table>
-
-<tr bgcolor="#008080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#008080">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-
-
-<p>Aqua table with a white body background</p>
-
-
-
-<table border="1">
-
-<tr bgcolor="#00FFFF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-
-
-<tr bgcolor="#00FFFF">
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-<td>table table table table</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_class.xml b/layout/html/tests/table/marvin/x_tr_class.xml
deleted file mode 100644
index caa80904527e..000000000000
--- a/layout/html/tests/table/marvin/x_tr_class.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_class.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-.one { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr class="one">
-
-<td>This row should have a lime background</td>
-
-<td>This row should have a lime background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_id.xml b/layout/html/tests/table/marvin/x_tr_id.xml
deleted file mode 100644
index 5a582361a8bc..000000000000
--- a/layout/html/tests/table/marvin/x_tr_id.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_id.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-<style type="text/css">
-
-#xyz12 { background-color: lime }
-
-</style>
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr id="xyz12">
-
-<td>This row should have a lime background</td>
-
-<td>This row should have a lime background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_style.xml b/layout/html/tests/table/marvin/x_tr_style.xml
deleted file mode 100644
index ff3deeab3657..000000000000
--- a/layout/html/tests/table/marvin/x_tr_style.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_style.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Christine Dreckman  Date: 8/23/2000
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<table border="1">
-
-<tr style="background-color: lime">
-
-<td>This row should have a lime background</td>
-
-<td>This row should have a lime background</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_valign_baseline.xml b/layout/html/tests/table/marvin/x_tr_valign_baseline.xml
deleted file mode 100644
index 20af314e5712..000000000000
--- a/layout/html/tests/table/marvin/x_tr_valign_baseline.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_valign_baseline.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TR VALIGN=BASELINE</p>
-
-
-
-<table border="1">
-
-<tr valign="baseline">
-
-<td>Compare the baseline of the first line of text in this cell
-
-with the baseline of the first line of text in the next cell: they
-
-should be vertically aligned</td>
-
-<td style="font-size: 30pt">Compare the baseline of the first line
-
-of text in this cell with the baseline of the first line of text in
-
-the previous cell: they should be vertically aligned</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_valign_bottom.xml b/layout/html/tests/table/marvin/x_tr_valign_bottom.xml
deleted file mode 100644
index 50da8dc40c82..000000000000
--- a/layout/html/tests/table/marvin/x_tr_valign_bottom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_valign_bottom.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TR VALIGN=BOTTOM</p>
-
-
-
-<table border="1">
-
-<tr valign="bottom">
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The bottom of this text should be vertically aligned to the
-
-bottom of the image. x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill x-fill
-
-x-fill x-fill x-fill x-fill</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_valign_middle.xml b/layout/html/tests/table/marvin/x_tr_valign_middle.xml
deleted file mode 100644
index d2c10b57b1e4..000000000000
--- a/layout/html/tests/table/marvin/x_tr_valign_middle.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_valign_middle.xml</title>
-
-<!-- Modified: Changed doctype to xhtml 1.0 transitional Author: Chris Petersen Date: 1/31/01 -->
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TR VALIGN=MIDDLE</p>
-
-
-
-<table border="1">
-
-<tr valign="middle">
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>This text should be vertically aligned to the middle of the
-
-image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/marvin/x_tr_valign_top.xml b/layout/html/tests/table/marvin/x_tr_valign_top.xml
deleted file mode 100644
index b09011f9b67d..000000000000
--- a/layout/html/tests/table/marvin/x_tr_valign_top.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-
-<meta name="generator"
-
-content="HTML Tidy for Mac OS, see www.w3.org" />
-
-<title>tr_valign_top.xml</title>
-
-<!-- 
-
-   - ***** 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 Communicator Test Cases.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Chris Petersen   Date: 8/6/98
-   -
-   - 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 ***** -->
-
-</head>
-
-<body>
-
-<p>TR VALIGN=TOP</p>
-
-
-
-<table border="1">
-
-<tr valign="top">
-
-<td><img src="../images/lime.gif" alt="image" height="200"
-
-width="200" /></td>
-
-<td>The top of this text should be vertically aligned to the top of
-
-the image</td>
-
-</tr>
-
-</table>
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/other/cell_widths.html b/layout/html/tests/table/other/cell_widths.html
deleted file mode 100644
index 38bbf7d7b2ce..000000000000
--- a/layout/html/tests/table/other/cell_widths.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<html><body>
-
-fixed width table with 100px width image in 1st cell
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-fixed width table with 100px width table in 1st cell
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td>
-    <table width=100>
-     <tr>
-      <td>foo</td></tr></table></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-auto width table with 100px width image in 1st cell
-<table bgcolor=orange border=1>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-fixed width table with 100px width 1st cell containing image
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td width=100>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-auto width table with 100px width 1st cell containing image
-<table bgcolor=orange border=1>
- <tr>
-  <td width=100>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-small fixed width table with 100px image in 1st cell
-<table width=150 bgcolor=orange border=1>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-fixed width table with 100px image in 1st cell, 100px 2nd cell containing text
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td width=100>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-auto width table with 100px image in 1st cell, 100px 2nd cell containing text.
-This differs from Nav4.5 but is similar to IE5
-<table bgcolor=orange border=1>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td width=100>a bunch of text, a bunch of text, a bunch of text, a bunch of text
-      a bunch of text, a bunch of text, a bunch of text, a bunch of text</td></tr>
-</table>
-<BR>
-Fixed width table with colspan=2 in 1st row, 2nd row containing 100px image, text
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td colspan=2>
-    hello hello hello hello hello hello hello hello hello hello hello</td></tr>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>there there there there there there there there there there there there</td></tr>
-</table>
-<BR>
-Auto width table with colspan=2 in 1st row, 2nd row containing 100px image, text
-<table bgcolor=orange border=1>
- <tr>
-  <td colspan=2>
-    hello hello hello hello hello hello hello hello hello hello hello</td></tr>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td>there there there there there there there there there there there there</td></tr>
-</table>
-<BR>
-Fixed width table with colspan=2 in 1st row, 2nd row containing 100px image, 100px cell 
-<table width=500 bgcolor=orange border=1>
- <tr>
-  <td colspan=2>
-    hello hello hello hello hello hello hello hello hello hello hello</td></tr>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td width=100>there there there there there there there there there there there there</td></tr>
-</table>
-<BR>
-Auto width table with colspan=2 in 1st row, 2nd row containing 100px image, 100px cell 
-<table bgcolor=orange border=1>
- <tr>
-  <td colspan=2>
-    hello hello hello hello hello hello hello hello hello hello hello</td></tr>
- <tr>
-  <td>
-    <img src=../images/raptor.jpg width=100 height=100></td>
-  <td width=100>there there there there there there there there there there there there</td></tr>
-</table>
-<BR>
-
-</body></html>
-
diff --git a/layout/html/tests/table/other/cellspacing.html b/layout/html/tests/table/other/cellspacing.html
deleted file mode 100644
index a1830ed1b833..000000000000
--- a/layout/html/tests/table/other/cellspacing.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<HTML><BODY>
-This table should have cell spacing of 2px
-<table border>
-<TR><TD style="border: 3px inset black;">AAA</td><td>BBBB</td></tr>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-</table>
-</html>
-<BR>
-
-This table should have cell spacing of 5px
-<table border cellspacing=5>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-</table>
-</html>
-
-<BR>
-This table should have cell spacingX of 5px, spacingY of 10px
-<table border style="border-spacing: 5px 10px;">
-<TR><TD>AAA</td><td>BBBB</td></tr>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-</table>
-</html>
-
-<BR>
-This table should have cell spacingX of 5px, spacingY of 10px
-<table border cellspacing=0 style="border-spacing: 5px 10px;">
-<TR><TD>AAA</td><td>BBBB</td></tr>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-</table>
-</html>
-
-</body></html>
-
diff --git a/layout/html/tests/table/other/empty_cells.html b/layout/html/tests/table/other/empty_cells.html
deleted file mode 100644
index fc649971f71c..000000000000
--- a/layout/html/tests/table/other/empty_cells.html
+++ /dev/null
@@ -1,536 +0,0 @@
-<html>
-
-<body bgcolor=white>
-  <p> this table should be about 6 (12 in NavQuirks) pixels tall
-  <table bgcolor=orange border=0 cellspacing=0 cellpadding=0 width=100>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-  </table>
-  <BR>
-  <p> this table should be about 8 (14 in NavQuirks) pixels tall 
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0 width=100>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-   <tr><td></td></tr>
-  </table>
-  <BR>
-  <p> this table should be about 12 pixels tall
-  <table bgcolor=orange border=0 cellspacing=0 cellpadding=0 width=100>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-  </table>
-  <BR>
-  <p> this table should be about 14 pixels tall
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0 width=100>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-   <tr><td height=2></td></tr>
-  </table>
-  <BR>
-  <p> this table should be about 5 (3 in Standard) pixels wide 
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 8 (4 in Standard) pixels wide 
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td></td>
-     <td></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 20 (8 in Standard) pixels wide 
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-  </table>
-  <BR>
-  <p> this table should be about 272 pixels wide, but can shrink to 92 pixels
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-     <td></td><td></td><td></td><td></td><td></td><td></td>
-  </table>
-  <BR>
-  <p> this table should be about 8 pixels wide (nested without border)
-<table border=1 cellspacing=0 cellpadding=0>
- <tr>
-  <td>
-  <table bgcolor=orange border=0 cellspacing=0 cellpadding=0>
-   <tr>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-  </table>
-  </td>
- </tr>
-</table>
-  <BR>
-  <p> this table should be about 122 pixels wide (nested, width=10 without border)</p>
-<hr style="width:122px" align=left>
-<table border=1 cellspacing=0 cellpadding=0>
- <tr>
-  <td>
-  <table bgcolor=orange border=0 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-     <td width=10></td>
-  </table>
-  </td>
- </tr>
-</table>
-<BR>
-  <p> this table should be about 32 pixels wide (cellpadding=1)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=1>
-   <tr>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-     <td></td>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (width=2)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-  </table>
-  <BR>
-  <p> this table should be about 20 pixels wide (colspan=3)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=3></td>
-     <td colspan=3></td>
-     <td colspan=3></td>
-     <td colspan=3></td>
-     <td colspan=3></td>
-     <td colspan=3></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (colspan=3 width=2)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=2 colspan=3></td>
-     <td width=2 colspan=3></td>
-     <td width=2 colspan=3></td>
-     <td width=2 colspan=3></td>
-     <td width=2 colspan=3></td>
-     <td width=2 colspan=3></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (colspan=4)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 38 pixels wide (colspan=4, cellspacing=2)
-  <table bgcolor=orange border=1 cellspacing=2 cellpadding=0>
-   <tr>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 38 pixels wide (colspan=4, cellpadding=2)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=2>
-   <tr>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 38 pixels wide (colspan=4, cellpadding=3)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=3>
-   <tr>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-     <td colspan=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (colspan=4 width=2)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=2 colspan=4></td>
-     <td width=2 colspan=4></td>
-     <td width=2 colspan=4></td>
-     <td width=2 colspan=4></td>
-     <td width=2 colspan=4></td>
-     <td width=2 colspan=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 20 pixels wide (colspan=3 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=3><BR></td>
-     <td colspan=3><BR></td>
-     <td colspan=3><BR></td>
-     <td colspan=3><BR></td>
-     <td colspan=3><BR></td>
-     <td colspan=3><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 20 pixels wide (colspan=3 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=3>
-	  <BR>
-	 </td>
-     <td colspan=3>
-	  <BR>
-	 </td>
-     <td colspan=3>
-	  <BR>
-	 </td>
-     <td colspan=3>
-	  <BR>
-	 </td>
-     <td colspan=3>
-	  <BR>
-	 </td>
-     <td colspan=3>
-	  <BR>
-	 </td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (colspan=3 width=2 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=3 width=2><BR></td>
-     <td colspan=3 width=2><BR></td>
-     <td colspan=3 width=2><BR></td>
-     <td colspan=3 width=2><BR></td>
-     <td colspan=3 width=2><BR></td>
-     <td colspan=3 width=2><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 32 pixels wide (colspan=3 width=3 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=3 width=3><BR></td>
-     <td colspan=3 width=3><BR></td>
-     <td colspan=3 width=3><BR></td>
-     <td colspan=3 width=3><BR></td>
-     <td colspan=3 width=3><BR></td>
-     <td colspan=3 width=3><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (colspan=4 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=4><BR></td>
-     <td colspan=4><BR></td>
-     <td colspan=4><BR></td>
-     <td colspan=4><BR></td>
-     <td colspan=4><BR></td>
-     <td colspan=4><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 32 pixels wide (colspan=5 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=5><BR></td>
-     <td colspan=5><BR></td>
-     <td colspan=5><BR></td>
-     <td colspan=5><BR></td>
-     <td colspan=5><BR></td>
-     <td colspan=5><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 92 pixels wide (colspan=15 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 92 pixels wide (nested, colspan=15 with BR)
-<table border=1 cellspacing=0 cellpadding=0>
- <tr>
-  <td>
-  <table bgcolor=orange border=0 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-     <td colspan=15><BR></td>
-   </tr>
-  </table>
- </td>
- </tr>
-</table>
-  <BR>
-  <p> this table should be about 92 pixels wide (colspan=15 with BR)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15>
-	  <BR>
-	 </td>
-     <td colspan=15>
-	  <BR>
-	 </td>
-     <td colspan=15>
-	  <BR>
-	 </td>
-     <td colspan=15>
-	  <BR>
-	 </td>
-     <td colspan=15>
-	  <BR>
-	 </td>
-     <td colspan=15>
-	  <BR>
-	 </td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 92 pixels wide (colspan=15 with x)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15>x</td>
-     <td colspan=15>x</td>
-     <td colspan=15>x</td>
-     <td colspan=15>x</td>
-     <td colspan=15>x</td>
-     <td colspan=15>x</td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 20 pixels wide (width=0)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=0></td>
-     <td width=0></td>
-     <td width=0></td>
-     <td width=0></td>
-     <td width=0></td>
-     <td width=0></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 20 pixels wide (width=1)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=1></td>
-     <td width=1></td>
-     <td width=1></td>
-     <td width=1></td>
-     <td width=1></td>
-     <td width=1></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 26 pixels wide (width=2)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-     <td width=2></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 32 pixels wide (width=3)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=3></td>
-     <td width=3></td>
-     <td width=3></td>
-     <td width=3></td>
-     <td width=3></td>
-     <td width=3></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 38 pixels wide (width=4)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=4></td>
-     <td width=4></td>
-     <td width=4></td>
-     <td width=4></td>
-     <td width=4></td>
-     <td width=4></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about xx pixels wide (width=7)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=7></td>
-     <td width=7></td>
-     <td width=7></td>
-     <td width=7></td>
-     <td width=7></td>
-     <td width=7></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about 38 pixels wide (width=4 x)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=7>x</td>
-     <td width=7>x</td>
-     <td width=7>x</td>
-     <td width=7>x</td>
-     <td width=7>x</td>
-     <td width=7>x</td>
-   </tr>
-  </table>
-
-  <BR>
-  <p> this table should be about xx pixels wide (colspan=15 with dot)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-     <td colspan=15>.</td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about xx pixels wide (colspan=15 empty)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-     <td colspan=15></td>
-   </tr>
-  </table>
-  <BR>
-  <p> this table should be about xx pixels wide (colspan=15 width=1 empty)
-  <table bgcolor=orange border=1 cellspacing=0 cellpadding=0>
-   <tr>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-     <td width=1 colspan=15></td>
-   </tr>
-  </table>
-<BR>
-<TABLE border cellpadding=0 cellspacing=0>
-<TR>
-  <TD BGCOLOR="#000000" COLSPAN=15><BR></TD>
-  <TD BGCOLOR="#000000" COLSPAN=15><BR></TD>
-</TR>
-</TABLE>
-</body>
-</html>
-
-
-
diff --git a/layout/html/tests/table/other/move_row.html b/layout/html/tests/table/other/move_row.html
deleted file mode 100644
index f517c911176b..000000000000
--- a/layout/html/tests/table/other/move_row.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<script>
-function moveRow(from, to)
-{
-	if (from == -1 && to == -1)
-	{
-		var fromE = document.getElementsByTagName("INPUT")[0];
-		from = parseInt(fromE.value);
-		var toE = document.getElementsByTagName("INPUT")[1];
-		to = parseInt(toE.value);
-	}
-	var row = document.getElementsByTagName("TR")[from];
-	row.rowIndex = to;
-}
-function runTests()
-{
-	// Test fails if final ordering differs from initial ordering
-	//
-	// Starting with order 0,1,2,3,4,5 shift through the rows and 
-	// end up back where we started.  
-	moveRow(0, 5);
-	moveRow(1, 4);
-	moveRow(2, 3);
-	moveRow(3, 2);
-	moveRow(4, 1);
-	moveRow(5, 0);
-
-	// Throw 2 out-of-bounds tests at the end and still get back to the starting point.
-	moveRow(5, -1);
-	moveRow(0, 6);
-}
-function delay()
-{
-	setTimeout("runTests()", 9);
-}
-</script>
-<body bgcolor=white onload="delay()">
-<table>
-<tr><td>Row 0</td></tr>
-<tr><td>Row 1</td></tr>
-<tr><td>Row 2</td></tr>
-<tr><td>Row 3</td></tr>
-<tr><td>Row 4</td></tr>
-<tr><td>Row 5</td></tr>
-</table>
-<input type=text name=from value=2 size=1>
-<input type=text name=to value=4 size=1>
-<input type=button name=go value=go onclick="moveRow(-1,-1);">
-</body>
-</html>
diff --git a/layout/html/tests/table/other/ms.html b/layout/html/tests/table/other/ms.html
deleted file mode 100644
index b89af2add130..000000000000
--- a/layout/html/tests/table/other/ms.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<HTML>
-<HEAD>
-</HEAD>
-
-<BODY BGCOLOR="#FFFFFF" TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0" TEXT="#000000" ALINK="#003399" LINK="#003399" VLINK="#003399">
-<!-- Start: ToolBar for down-level browsers-->
-
-<SPAN ID="TBDownLevelDiv">
-<TABLE WIDTH='100%' CELLPADDING=0 CELLSPACING=0 BORDER=0 BGCOLOR='#FFFFFF'>
- <TR>
-  <TD VALIGN='TOP' HEIGHT=60 ROWSPAN=2><A HREF='/isapi/gomscom.asp?target=/' TARGET='_top'><IMG SRC='../images/bnr_all.gif' WIDTH=250 HEIGHT=60 ALT='microsoft.com Home' BORDER=0></A></TD>
-  <TD VALIGN='TOP' HEIGHT=20 ALIGN='RIGHT'><IMG SRC='../images/curve.gif' WIDTH=18 HEIGHT=20 ALT='' BORDER=0></TD>
-  <TD BGCOLOR='#000000' HEIGHT=20 VALIGN='MIDDLE' ALIGN='RIGHT' NOWRAP COLSPAN=2>
-   <FONT COLOR='#FFFFFF' FACE='Verdana, Arial' SIZE=1>
-    <B>
-     &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/catalog/default.asp?subid=22' TARGET='_top'><FONT COLOR='#FFFFFF'>All Products</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-     &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/support/' TARGET='_top'><FONT COLOR='#FFFFFF'>Support</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-     &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gosearch.asp?target=/' TARGET='_top'><FONT COLOR='#FFFFFF'>Search</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-     &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/' TARGET='_top'><FONT COLOR='#FFFFFF'>microsoft.com Home</FONT></A>&nbsp;&nbsp;
-    </B>
-   </FONT></TD></TR>
- <TR>
-  <TDx VALIGN='TOP' HEIGHT=40 WIDTH=19><IMGx SRC='../images/gifs/homepage/1ptrans.gif' WIDTH=19 HEIGHT=40 ALT='' BORDER=0></TDx>
-  <TD VALIGN='TOP' HEIGHT=40 ALIGN='RIGHT' NOWRAP COLSPAN=2><A HREF='/isapi/gomscom.asp?target=/' TARGET='_top'><IMG SRC='../images/mslogo.gif' WIDTH=112 HEIGHT=40 ALT='Microsoft' BORDER=0></A></TD>
- </TR>
- <TR>
-  <!-- Start: Local menus -->
-  <TD BGCOLOR='#6699CC' HEIGHT=20 VALIGN='MIDDLE' NOWRAP COLSPAN=4>
-   <FONT COLOR='#FFFFFF' FACE='Verdana, Arial' SIZE=1><B>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/' TARGET='_top'><FONT COLOR='#FFFFFF'>Home</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/goevents.asp?target=/' TARGET='_top'><FONT COLOR='#FFFFFF'>Events</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/train_cert/' TARGET='_top'><FONT COLOR='#FFFFFF'>Training</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/downloads/' TARGET='_top'><FONT COLOR='#FFFFFF'>Downloads</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/goregwiz.asp?target=/regwiz/forms/pic.asp' TARGET='_top'><FONT COLOR='#FFFFFF'>Newsletters</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/worldwide/' TARGET='_top'><FONT COLOR='#FFFFFF'>U.S. &amp; International</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-    &nbsp;&nbsp;<A STYLE='color:#FFFFFF;text-decoration:none;' HREF='/isapi/gomscom.asp?target=/backstage/' TARGET='_top'><FONT COLOR='#FFFFFF'>About Our Site</FONT></A>&nbsp;&nbsp;<FONT COLOR='#FFFFFF'>|</FONT>
-   </B></FONT></TD>
- <!-- End: Local menus -->
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/other/nested2.html b/layout/html/tests/table/other/nested2.html
deleted file mode 100644
index d3840e4c3769..000000000000
--- a/layout/html/tests/table/other/nested2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<TABLE BORDER="2" CELLSPACING="3">
- <TR>
-  <TD BGCOLOR="#DDDDDD" VALIGN="TOP">
-   <TABLE CELLPADDING=0 CELLSPACING=3 BORDER=1>
-    <TR><TD>TheMozillaOrganization-TheMozillaOrganization</TD></TR>
-   </TABLE>
-  </TD>
-  <TD>
-   Checkin Guidelines for the Seamonkey Tree xxxxxxxxxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxxxxx
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/other/nestedTables.html b/layout/html/tests/table/other/nestedTables.html
deleted file mode 100644
index 7eff815a3ce5..000000000000
--- a/layout/html/tests/table/other/nestedTables.html
+++ /dev/null
@@ -1,351 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="Author" CONTENT="Steve Clark">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.04 [en] (WinNT; U) [Netscape]">
-   <TITLE>table</TITLE>
-</HEAD>
-<BODY>
-&nbsp;
-<TABLE BORDER WIDTH="100%" BGCOLOR="#FFFFCC" >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#DDDDDD" >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#66FFFF" >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#FF0000" >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#66FF99" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#FF99FF" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#FF9900" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD>
-
-<TD>0</TD>
-</TR>
-
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>5</TD>
-
-<TD>6</TD>
-</TR>
-
-<TR>
-<TD>7</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>6</TD>
-</TR>
-
-<TR>
-<TD>7</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;
-<BR>
-the following text should display on one line
-       <TABLE CELLSPACING=0 CELLPADDING=0 BORDER=0>
-        <TR>
-         <TD BGCOLOR="#B70000" ALIGN=LEFT>
-          <TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 WIDTH=100%>
-           <TR>
-            <TD VALIGN=TOP ALIGN=LEFT><IMG SRC="../images/slc.gif"></TD>
-            <TD WIDTH=190>AlphaLinux Distributions</TD>
-            <TD VALIGN=TOP align=RIGHT><IMG SRC="../images/slr.gif"></TD>
-           </TR>
-          </TABLE>
-        </TR></TD>
-       </TABLE>
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/other/padding.html b/layout/html/tests/table/other/padding.html
deleted file mode 100644
index 8809fd8d59b5..000000000000
--- a/layout/html/tests/table/other/padding.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<HTML><BODY>
-This table should have cell padding of 5px
-<table border cellpadding=5>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-</table>
-</html>
-
-<BR>
-This table should have cell padding of 5px
-<table border>
-<TR><TD style="padding:5px;">AAA</td><td style="padding:5px;">BBBB</td></tr>
-<TR><TD style="padding:5px;">AAA</td><td style="padding:5px;">BBBB</td></tr>
-</table>
-</html>
-
-<BR>
-This table should have cell padding of 5px
-<table border cellpadding=0>
-<TR><TD style="padding:5px;">AAA</td><td style="padding:5px;">BBBB</td></tr>
-<TR><TD style="padding:5px;">AAA</td><td style="padding:5px;">BBBB</td></tr>
-</table>
-</html>
-
-<BR>
-This table should have cell padding of 5px except the 1st cell's left padding will be 0
-<table border cellpadding=5>
-<TR><TD style="padding-left:0px;">AAA</td><td>BBBB</td></tr>
-<TR><TD >AAA</td><td>BBBB</td></tr>
-</table>
-
-<BR>
-This table should have cell padding of 5px except the last cell's left padding will be 30
-<table border cellpadding=5>
-<TR><TD>AAA</td><td>BBBB</td></tr>
-<TR><TD >AAA</td><td style="padding-left:30px;">BBBB</td></tr>
-</table>
-</body></html>
-
diff --git a/layout/html/tests/table/other/rtest.lst b/layout/html/tests/table/other/rtest.lst
deleted file mode 100644
index 25f26ce40e33..000000000000
--- a/layout/html/tests/table/other/rtest.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-cellspacing.html
-cell_widths.html
-empty_cells.html
-nestedTables.html
-padding.html
-slashlogo.html
-wa_table_thtd_rowspan.html
-wa_table_tr_align.html
-ms.html
-wf_table_index.html
-move_row.html
-nestedTables.html
-nested2.html
-table-intrinsic-cases-standards.html
-table-intrinsic-cases-quirks.html
diff --git a/layout/html/tests/table/other/slashlogo.html b/layout/html/tests/table/other/slashlogo.html
deleted file mode 100644
index ade83d2d41fb..000000000000
--- a/layout/html/tests/table/other/slashlogo.html
+++ /dev/null
@@ -1,3471 +0,0 @@
-<html><body><table width=100% border=0 cellpadding=0 cellspacing=0>
-
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/layout/html/tests/table/other/table-intrinsic-cases-quirks.html b/layout/html/tests/table/other/table-intrinsic-cases-quirks.html
deleted file mode 100644
index b5fc16cfee5c..000000000000
--- a/layout/html/tests/table/other/table-intrinsic-cases-quirks.html
+++ /dev/null
@@ -1,2499 +0,0 @@
-<!-- XXX Need to repeat entire test page with large and zero values of
-border, cellpadding, and cellspacing -->
-
-<style type="text/css">
-
-table { margin: 5px 0; }
-
-table.bigcellborder { border-width: 10px; }
-table.bigcellborder td { border-width: 10px; }
-
-</style>
-
-<p>Firefox 1.5 has different empty-cells defaults and different border
-coloring throughout between standards mode and quirks mode.</p>
-
-<p>Firefox 1.5 wraps the last word of the third of these tables in
-quirks mode and of all three in standards mode.</p>
-
-<table border>
-  <tr>
-    <td width="40%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-
-<table cellpadding="0" cellspacing="0"><tr><td>
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-</table>
-
-<table cellpadding="0" cellspacing="0"><tr><td width="1">
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td width="10">x</td></tr>
-  <tr><td width="100">x</td></tr>
-</table>
-<table border>
-  <tr><td>x</td></tr>
-  <tr><td width="100">x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td width="5%">x</td></tr>
-</table>
-<table border>
-  <tr><td width="1%">xxx</td></tr>
-</table>
-<table border>
-  <tr><td width="2%">x</td></tr>
-  <tr><td width="100%">x</td></tr>
-</table>
-<table border>
-  <tr><td>x</td></tr>
-  <tr><td width="100%">x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-</table>
-<table border>
-  <col width="1"><col><col width="1">
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-</table>
-<table border>
-  <tr><td width="1">x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td width="1">x</td></tr>
-</table>
-
-<p>with third row:</p>
-
-<table border>
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-<table border>
-  <col width="1"><col><col width="1">
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-<table border>
-  <tr><td width="1">x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td width="1">x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-
-<hr>
-
-<table border><tr><td width="90%">x</td><td>x</td></tr></table>
-<table border><tr><td width="90%">x</td><td>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</td></tr></table>
-<table border><tr><td width="90%">x</td><td>xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx</td></tr></table>
-
-<hr>
-
-<table cellpadding="0" border><tr><td width="20">x</td></tr></table>
-<table cellpadding="20" border><tr><td width="20">x</td></tr></table>
-<table cellpadding="40" border><tr><td width="20">x</td></tr></table>
-
-<table cellspacing="0" border><tr><td width="20">x</td></tr></table>
-<table cellspacing="20" border><tr><td width="20">x</td></tr></table>
-<table cellspacing="40" border><tr><td width="20">x</td></tr></table>
-
-<hr>
-
-<table border>
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding="0" cellspacing="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<p>Padding:</p>
-<table border style="padding: 20px" cellspacing="0" cellpadding="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<p>Padding and cellspacing:</p>
-<table border style="padding: 10px" cellspacing="10" cellpadding="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<p>Firefox 1.5 handles this set slightly differently in quirks and
-standards modes.</p>
-
-<table border><tr><td width="5%">x x x x x</td><td width="95%">x</td></tr></table>
-<table border><tr><td width="5%">x x x x x</td><td width="85%">x</td></tr></table>
-<table border><tr><td width="5%">x x x x x</td><td width="85%">x</td><td>x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="20">x</td><td width="20">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="20">x</td><td width="20">xxx</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td><td width="20">x</td></tr></table>
-
-<hr>
-
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td></tr></table>
-
-<hr>
-
-<table border><tr><td width="1%">x x x x x</td><td width="80%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="99%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="3%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="3%">x x x</td></tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="50"><tr><td width="100%">x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="50%">x</td><td>x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="25%">x</td><td>x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="50%">x</td><td>xxx</td></tr></table>
-
-<h1>percentage boundary and overflow conditions</h1>
-
-<h1>specified widths</h1>
-<table border="10" width="200"><tr><td>200</td></tr></table>
-<table border="10" style="width: 200px"><tr><td>200</td></tr></table>
-<table border="10"><tr><td><div style="width:200px">200</div></td></tr></table>
-<table style="border: 10px solid" width="200"><tr><td>200</td></tr></table>
-<table style="border: 10px solid; width: 200px"><tr><td>200</td></tr></table>
-<table style="border: 10px solid"><tr><td><div style="width:200px">200</div></td></tr></table>
-<p>These three are border-collapse, which means Firefox 1.5 handles them
-differently in quirks and standards modes.</p>
-<table style="border-collapse: collapse; border: 10px solid" width="200"><tr><td>200</td></tr></table>
-<table style="border-collapse: collapse; border: 10px solid; width: 200px"><tr><td>200</td></tr></table>
-<table style="border-collapse: collapse; border: 10px solid"><tr><td><div style="width:200px">200</div></td></tr></table>
-
-<h1>border-collapse</h1>
-
-<p>Firefox 1.5 handles all of these differently between quirks and
-standards modes.</p>
-
-<table border="10" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td></tr></table>
-</td></tr></table>
-
-<table style="border-collapse: collapse; border: 10px solid purple" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td></tr></table>
-</td></tr></table>
-
-<table border="10" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td><td style="border: 10px solid blue">text</td><td>text</td></tr></table>
-</td></tr></table>
-
-<table style="border-collapse: collapse; border: 10px solid purple" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td><td style="border: 10px solid blue">text</td><td>text</td></tr></table>
-</td></tr></table>
-
-<table border><tr>
-  <td>
-    <table border="10" height="80"><tr><td>80 s</td></tr></table>
-  </td>
-  <td>
-    <table border="10" height="80" style="border-collapse: collapse"><tr><td>80 c</td></tr></table>
-  </td>
-  <td>
-    <div style="height: 80px; background: yellow; color: black">80</div>
-  </td>
-</tr></table>
-
-<h1>table-layout:fixed</h1>
-
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border><tr><td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border><tr><td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>z</td>
-  </tr>
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-
-<table border><tr>
-<td>z z z z z</td>
-<td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col>
-  <col>
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <col style="width: 50px">
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 200px">
-  <col style="width: 200px">
-  <col style="width: 200px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<h2>with percentages</h2>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 20%">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td style="width: 40%">z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 20%">
-  <col style="width: 20%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 45%">
-  <col style="width: 45%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 49%">
-  <col style="width: 49%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<h2>with percentages and auto width</h2>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 20%">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td style="width: 40%">z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 20%">
-  <col style="width: 20%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 45%">
-  <col style="width: 45%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 49%">
-  <col style="width: 49%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>See <a
-href="http://www.hixie.ch/tests/adhoc/css/box/table/inspection/">Hixie's
-tests</a>.</p>
-
-<hr>
-
-<table border width="200"><tr>
-  <td width="150">x</td>
-  <td width="150">x</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td width="250">x</td>
-  <td width="250">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="20">x</td>
-  <td width="60">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="50">x</td>
-  <td width="150">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="55">x</td>
-  <td width="165">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">x</td>
-  <td width="450">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="300">x</td>
-  <td width="900">x</td>
-</tr></table>
-
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="20">ZZZZZZZ</td>
-  <td width="60">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="50">ZZZZZZZ</td>
-  <td width="150">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="55">ZZZZZZZ</td>
-  <td width="165">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">ZZZZZZZ</td>
-  <td width="450">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="300">ZZZZZZZ</td>
-  <td width="900">ZZZZZZZ</td>
-</tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">Z</td>
-  <td><div style="width:150px"></div></td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">Z</td>
-  <td width="150">Z</td>
-  <td><div style="width:150px"></div></td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="150">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="50%">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:250px"></div></td>
-  <td width="50%">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="50%">, ,</td>
-  <td width="150">, ,</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:250px"></div></td>
-  <td width="50%">, ,</td>
-  <td width="150">, ,</td>
-</tr></table>
-
-<hr>
-
-<table border width="200"><tr>
-  <td>z</td>
-  <td>zzz</td>
-  <td>z&nbsp;z</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td>z</td>
-  <td>zzz</td>
-  <td>z z</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td>zzzzz</td>
-  <td>z z z z z z z z z z</td>
-  <td>z z z z z z z z z z</td>
-</tr></table>
-
-<div style="width: 200px">
-<table border><tr>
-  <td>zzzzz</td>
-  <td>z z z z z z z z z z</td>
-  <td>z z z z z z z z z z</td>
-</tr></table>
-</div>
-
-<hr>
-
-<p>Firefox 1.5 does this one very differently between quirks and
-standards modes.</p>
-
-<table border>
-<tr><td width="50">x</td></tr>
-<tr><td>z z z z z z z z z z z z z</td></tr>
-</table>
-
-<hr>
-
-<table border width="600"><tr>
-  <td style="width:50px">50</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600"><tr>
-  <td>z z z z</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600"><tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td style="width:100px"></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<p>Firefox 1.5 handles this one (with 100) differently in quirks and
-standards mode (wraps the 100 in standards mode; wider in quirks
-mode).</p>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:100px">100</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:49px">49</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:49px">49</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:50px">50</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:50px">50</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<p>Note the row order dependence in WinIE6 for the 51 and 160 pairs.</p>
-
-<p>Firefox 1.5 has the same quirk for the 51, 60, and 160 tests (6 tests
-total) that it did for the 100 test above.</p>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:60px">60</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:160px">160</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:160px">160</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px"><span style="padding-left:50px;background:#99f">50</span></td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px"><span style="padding-left:50px;background:#99f">50</span></td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<hr>
-
-<table border width="500">
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border width="500">
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border dir="rtl">
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-</table>
-
-<table border dir="rtl">
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-  </tr>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="25%">25%[1]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="50%">50%[1]</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td width="50%" colspan="2">50%[2]</td>
-    <td width="50%">50%[1]</td>
-  </tr>
-</table>
-
-<table border width="500">
-  <tr>
-    <td width="50%">50%[1]</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td width="50%" colspan="2">50%[2]</td>
-    <td width="50%">50%[1]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>ZZZZZZZZZZZZZZZZZZZZZZZZZZ</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="45%" colspan="2">45%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="45%" colspan="2">45%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="45%" colspan="2">45%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="45%" colspan="2">45%[2]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>Note that these 16 cases, in WinIE6, have a row order dependence but
-not a cell order dependence:</p>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="16%">16% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="17%">17% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="50%">50% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="11%">11% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="10%">10% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="9%">9% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="3%">3% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="4">[4]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="4">[4]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="5">[5]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="4">[4]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="4">[4]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="5">[5]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>WinIE6 leaves the full horizontal and vertical gaps in quirks mode,
-but only leaves the gap for the third column in standards mode (in
-collapses the third row).  (Firefox 1.5 collapses both columns and rows
-in both modes, although sometimes fails to do so when incrementally
-loading.  No other layout engines appear to collapse anything.  See <a
-href="http://dbaron.org/css/test/2006/empty-cells-quirks">separate
-quirks</a> and <a
-href="http://dbaron.org/css/test/2006/empty-cells-standards">standards</a>
-mode tests.</p>
-
-<table border class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellspacing=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding=0 cellspacing=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table cellpadding=0 cellspacing=0>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-</table>
-
-<h1>More colspan cases</h1>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-  <tr><td colspan="2">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td colspan="2">cs</td></tr>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="200">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td colspan="2" width="200">cs</td></tr>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-</table>
-
-<table border>
-  <tr><td width="25%">25%</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td width="25%">25%</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="20">20</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="50">50</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="100">100</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td>x</td><td colspan="2" width="400">cs 400</td></tr>
-  <tr><td colspan="2" width="400">cs 400</td><td>x</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="400">cs 400</td><td>x</td></tr>
-  <tr><td>x</td><td colspan="2" width="400">cs 400</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td>x</td><td colspan="2" width="75%">cs 75%</td></tr>
-  <tr><td colspan="2" width="75%">cs 75%</td><td>x</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="75%">cs 75%</td><td>x</td></tr>
-  <tr><td>x</td><td colspan="2" width="75%">cs 75%</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td width="57%">57%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="92%">92%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="98%" colspan="2">98%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="10%">10%</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="10%">10%</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="80%">80%</td>
-    <td width="80%" colspan="2">80%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="10%">10%</td>
-    <td>x</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="2%" colspan="2">2% (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="98%" colspan="2">98% (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="200" colspan="2">200 (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td width="200" colspan="2">200 (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td width="200">200</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border>
-  <tr>
-    <td width="20">20</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="20">20</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="20">20</td>
-    <td width="20">20</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="20">20</td>
-    <td width="20">20</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>xxx</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<hr>
-
-<table border width="600">
-  <tr>
-    <td width="200">200</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="100">100</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xxxxx</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td width="10">10</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="10%">10%</td>
-	<td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xxxxx</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td width="10">10</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="10%">10%</td>
-	<td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>xxx</td>
-	<td></td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td width="30">x</td>
-	<td width="30">xxx</td>
-	<td width="30"></td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td width="25%">x</td>
-	<td width="25%">xxx</td>
-	<td width="25%"></td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>xx</td>
-	<td>xx</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>x</td>
-	<td>xxx</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>x</td>
-	<td>x x x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x x x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x x x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<h1>More balancing cases</h1>
-
-<table border width="600">
-  <tr>
-    <td width="25%">25%</td>
-    <td width="100">100</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="25%">25%</td>
-    <td width="100">100</td>
-    <td></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3">(3)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2">(2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2">(2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3" width="200">200 (3)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2" width="200">200 (2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2" width="200">200 (2)</td></tr>
-</table>
-
-<h1>widths on col</h1>
-
-<table border>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col>
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="25%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="25%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="2%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="2%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="98%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="98%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="200" style="border: 20px solid; margin: 20px; padding: 20px">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <col width="200" span="2">
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <col width="200" span="2">
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup width="200" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup width="200" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup width="200" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup width="200" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup style="width:200px" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup style="width:200px" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup style="width:200px" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup style="width:200px" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
diff --git a/layout/html/tests/table/other/table-intrinsic-cases-standards.html b/layout/html/tests/table/other/table-intrinsic-cases-standards.html
deleted file mode 100644
index 159bb3ed8d29..000000000000
--- a/layout/html/tests/table/other/table-intrinsic-cases-standards.html
+++ /dev/null
@@ -1,2500 +0,0 @@
-<!DOCTYPE html>
-<!-- XXX Need to repeat entire test page with large and zero values of
-border, cellpadding, and cellspacing -->
-
-<style type="text/css">
-
-table { margin: 5px 0; }
-
-table.bigcellborder { border-width: 10px; }
-table.bigcellborder td { border-width: 10px; }
-
-</style>
-
-<p>Firefox 1.5 has different empty-cells defaults and different border
-coloring throughout between standards mode and quirks mode.</p>
-
-<p>Firefox 1.5 wraps the last word of the third of these tables in
-quirks mode and of all three in standards mode.</p>
-
-<table border>
-  <tr>
-    <td width="40%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-
-<table cellpadding="0" cellspacing="0"><tr><td>
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-</table>
-
-<table cellpadding="0" cellspacing="0"><tr><td width="1">
-<table border>
-  <tr>
-    <td width="50%">s
-	<td>aose unth asnu etha snue hoae
-</table>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td width="10">x</td></tr>
-  <tr><td width="100">x</td></tr>
-</table>
-<table border>
-  <tr><td>x</td></tr>
-  <tr><td width="100">x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td width="5%">x</td></tr>
-</table>
-<table border>
-  <tr><td width="1%">xxx</td></tr>
-</table>
-<table border>
-  <tr><td width="2%">x</td></tr>
-  <tr><td width="100%">x</td></tr>
-</table>
-<table border>
-  <tr><td>x</td></tr>
-  <tr><td width="100%">x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-</table>
-<table border>
-  <col width="1"><col><col width="1">
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-</table>
-<table border>
-  <tr><td width="1">x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td width="1">x</td></tr>
-</table>
-
-<p>with third row:</p>
-
-<table border>
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-<table border>
-  <col width="1"><col><col width="1">
-  <tr><td>x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td>x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-<table border>
-  <tr><td width="1">x</td><td colspan="2">aoeuidhtns</td></tr>
-  <tr><td colspan="2">aoeuidhtns</td><td width="1">x</td></tr>
-  <tr><td><td><td></tr>
-</table>
-
-<hr>
-
-<table border><tr><td width="90%">x</td><td>x</td></tr></table>
-<table border><tr><td width="90%">x</td><td>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</td></tr></table>
-<table border><tr><td width="90%">x</td><td>xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx</td></tr></table>
-
-<hr>
-
-<table cellpadding="0" border><tr><td width="20">x</td></tr></table>
-<table cellpadding="20" border><tr><td width="20">x</td></tr></table>
-<table cellpadding="40" border><tr><td width="20">x</td></tr></table>
-
-<table cellspacing="0" border><tr><td width="20">x</td></tr></table>
-<table cellspacing="20" border><tr><td width="20">x</td></tr></table>
-<table cellspacing="40" border><tr><td width="20">x</td></tr></table>
-
-<hr>
-
-<table border>
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding="0" cellspacing="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<p>Padding:</p>
-<table border style="padding: 20px" cellspacing="0" cellpadding="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<p>Padding and cellspacing:</p>
-<table border style="padding: 10px" cellspacing="10" cellpadding="0">
-  <tr><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<p>Firefox 1.5 handles this set slightly differently in quirks and
-standards modes.</p>
-
-<table border><tr><td width="5%">x x x x x</td><td width="95%">x</td></tr></table>
-<table border><tr><td width="5%">x x x x x</td><td width="85%">x</td></tr></table>
-<table border><tr><td width="5%">x x x x x</td><td width="85%">x</td><td>x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="20">x</td><td width="20">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="20">x</td><td width="20">xxx</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td><td width="20">x</td></tr></table>
-
-<hr>
-
-<table border><tr><td width="1%">x x x x x</td><td width="50%">x</td><td width="10">x</td></tr></table>
-
-<hr>
-
-<table border><tr><td width="1%">x x x x x</td><td width="80%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="99%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="3%">x</td></tr></table>
-<table border><tr><td width="1%">x x x x x</td><td width="3%">x x x</td></tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="50"><tr><td width="100%">x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="50%">x</td><td>x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="25%">x</td><td>x</td></tr></table>
-<table border cellpadding="0" cellspacing="50"><tr><td width="50%">x</td><td>xxx</td></tr></table>
-
-<h1>percentage boundary and overflow conditions</h1>
-
-<h1>specified widths</h1>
-<table border="10" width="200"><tr><td>200</td></tr></table>
-<table border="10" style="width: 200px"><tr><td>200</td></tr></table>
-<table border="10"><tr><td><div style="width:200px">200</div></td></tr></table>
-<table style="border: 10px solid" width="200"><tr><td>200</td></tr></table>
-<table style="border: 10px solid; width: 200px"><tr><td>200</td></tr></table>
-<table style="border: 10px solid"><tr><td><div style="width:200px">200</div></td></tr></table>
-<p>These three are border-collapse, which means Firefox 1.5 handles them
-differently in quirks and standards modes.</p>
-<table style="border-collapse: collapse; border: 10px solid" width="200"><tr><td>200</td></tr></table>
-<table style="border-collapse: collapse; border: 10px solid; width: 200px"><tr><td>200</td></tr></table>
-<table style="border-collapse: collapse; border: 10px solid"><tr><td><div style="width:200px">200</div></td></tr></table>
-
-<h1>border-collapse</h1>
-
-<p>Firefox 1.5 handles all of these differently between quirks and
-standards modes.</p>
-
-<table border="10" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td></tr></table>
-</td></tr></table>
-
-<table style="border-collapse: collapse; border: 10px solid purple" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td></tr></table>
-</td></tr></table>
-
-<table border="10" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td><td style="border: 10px solid blue">text</td><td>text</td></tr></table>
-</td></tr></table>
-
-<table style="border-collapse: collapse; border: 10px solid purple" cellpadding="0"><tr><td>
-<table style="border-collapse: collapse; border: 10px solid blue"><tr><td>text</td><td style="border: 10px solid blue">text</td><td>text</td></tr></table>
-</td></tr></table>
-
-<table border><tr>
-  <td>
-    <table border="10" height="80"><tr><td>80 s</td></tr></table>
-  </td>
-  <td>
-    <table border="10" height="80" style="border-collapse: collapse"><tr><td>80 c</td></tr></table>
-  </td>
-  <td>
-    <div style="height: 80px; background: yellow; color: black">80</div>
-  </td>
-</tr></table>
-
-<h1>table-layout:fixed</h1>
-
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border><tr><td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border><tr><td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>z</td>
-  </tr>
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-
-<table border><tr>
-<td>z z z z z</td>
-<td>
-<table border style="table-layout: fixed">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col>
-  <col>
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 50px">
-  <col style="width: 50px">
-  <col style="width: 50px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 200px">
-  <col style="width: 200px">
-  <col style="width: 200px">
-  <tr>
-    <td style="width: 350px">z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<h2>with percentages</h2>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 20%">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td style="width: 40%">z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 20%">
-  <col style="width: 20%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 45%">
-  <col style="width: 45%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed; width: 400px;">
-  <col style="width: 49%">
-  <col style="width: 49%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<h2>with percentages and auto width</h2>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 20%">
-  <col>
-  <col>
-  <tr>
-    <td style="width: 350px">z</td>
-    <td style="width: 40%">z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 20%">
-  <col style="width: 20%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 45%">
-  <col style="width: 45%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<table border style="table-layout: fixed;">
-  <col style="width: 49%">
-  <col style="width: 49%">
-  <col style="width: 80px">
-  <tr>
-    <td>z</td>
-    <td>z</td>
-    <td>zzzzzzzzzzzzzzzzz</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>See <a
-href="http://www.hixie.ch/tests/adhoc/css/box/table/inspection/">Hixie's
-tests</a>.</p>
-
-<hr>
-
-<table border width="200"><tr>
-  <td width="150">x</td>
-  <td width="150">x</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td width="250">x</td>
-  <td width="250">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="20">x</td>
-  <td width="60">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="50">x</td>
-  <td width="150">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="55">x</td>
-  <td width="165">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">x</td>
-  <td width="450">x</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="300">x</td>
-  <td width="900">x</td>
-</tr></table>
-
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="20">ZZZZZZZ</td>
-  <td width="60">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="50">ZZZZZZZ</td>
-  <td width="150">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="55">ZZZZZZZ</td>
-  <td width="165">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">ZZZZZZZ</td>
-  <td width="450">ZZZZZZZ</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="300">ZZZZZZZ</td>
-  <td width="900">ZZZZZZZ</td>
-</tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">Z</td>
-  <td><div style="width:150px"></div></td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td width="150">Z</td>
-  <td width="150">Z</td>
-  <td><div style="width:150px"></div></td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="150">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<hr>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="50%">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:250px"></div></td>
-  <td width="50%">Z</td>
-  <td width="150">Z</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:150px"></div></td>
-  <td width="50%">, ,</td>
-  <td width="150">, ,</td>
-</tr></table>
-
-<table border cellpadding="0" cellspacing="0" width="200"><tr>
-  <td><div style="width:250px"></div></td>
-  <td width="50%">, ,</td>
-  <td width="150">, ,</td>
-</tr></table>
-
-<hr>
-
-<table border width="200"><tr>
-  <td>z</td>
-  <td>zzz</td>
-  <td>z&nbsp;z</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td>z</td>
-  <td>zzz</td>
-  <td>z z</td>
-</tr></table>
-
-<table border width="200"><tr>
-  <td>zzzzz</td>
-  <td>z z z z z z z z z z</td>
-  <td>z z z z z z z z z z</td>
-</tr></table>
-
-<div style="width: 200px">
-<table border><tr>
-  <td>zzzzz</td>
-  <td>z z z z z z z z z z</td>
-  <td>z z z z z z z z z z</td>
-</tr></table>
-</div>
-
-<hr>
-
-<p>Firefox 1.5 does this one very differently between quirks and
-standards modes.</p>
-
-<table border>
-<tr><td width="50">x</td></tr>
-<tr><td>z z z z z z z z z z z z z</td></tr>
-</table>
-
-<hr>
-
-<table border width="600"><tr>
-  <td style="width:50px">50</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600"><tr>
-  <td>z z z z</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600"><tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr></table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td style="width:100px"></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<p>Firefox 1.5 handles this one (with 100) differently in quirks and
-standards mode (wraps the 100 in standards mode; wider in quirks
-mode).</p>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:100px">100</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:49px">49</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:49px">49</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:50px">50</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:50px">50</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<p>Note the row order dependence in WinIE6 for the 51 and 160 pairs.</p>
-
-<p>Firefox 1.5 has the same quirk for the 51, 60, and 160 tests (6 tests
-total) that it did for the 100 test above.</p>
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:60px">60</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-
-<table border width="600">
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:160px">160</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:160px">160</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px">50</td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td style="width:50px"><span style="padding-left:50px;background:#99f">50</span></td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-</table>
-
-<table border width="600">
-<tr>
-  <td><div style="background:yellow;width:51px">51</div></td>
-  <td></td>
-  <td></td>
-  <td></td>
-</tr>
-<tr>
-  <td style="width:50px"><span style="padding-left:50px;background:#99f">50</span></td>
-  <td>auto</td>
-  <td>auto</td>
-  <td style="width:50%">50%</td>
-</tr>
-</table>
-
-<hr>
-
-<table border width="500">
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border width="500">
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%">60%</td>
-    <td width="50%">50%</td>
-    <td width="50%">50%</td>
-	<td>xx xx xx xx xx</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border dir="rtl">
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-</table>
-
-<table border dir="rtl">
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-	<td>x</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xx xx xx xx xx</td>
-    <td width="60%">60%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-  </tr>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="25%">25%[1]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="50%">50%[1]</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td width="50%" colspan="2">50%[2]</td>
-    <td width="50%">50%[1]</td>
-  </tr>
-</table>
-
-<table border width="500">
-  <tr>
-    <td width="50%">50%[1]</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td width="50%" colspan="2">50%[2]</td>
-    <td width="50%">50%[1]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>ZZZZZZZZZZZZZZZZZZZZZZZZZZ</td>
-    <td width="50%" colspan="2">50%[2]</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%">25%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-	<td>Z</td>
-    <td width="5%">5%[1]</td>
-    <td width="5%">5%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="45%" colspan="2">45%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="45%" colspan="2">45%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="25%" colspan="2">25%[2]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="45%" colspan="2">45%[2]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="25%" colspan="2">25%[2]</td>
-    <td width="15%">15%[1]</td>
-	<td>Z</td>
-  </tr>
-  <tr>
-    <td width="15%">15%[1]</td>
-    <td width="45%" colspan="2">45%[2]</td>
-	<td>Z</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>Note that these 16 cases, in WinIE6, have a row order dependence but
-not a cell order dependence:</p>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="16%">16% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="17%">17% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="18%">18% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="15%">15% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="16%">16% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="17%">17% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="50%">50% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="11%">11% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="10%">10% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="9%">9% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td colspan="3" width="15%">15% [3]</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td colspan="2" width="3%">3% [2]</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="4">[4]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="4">[4]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="5">[5]</td>
-  </tr>
-  <tr>
-    <td colspan="1">[1]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="4">[4]</td>
-  </tr>
-  <tr>
-    <td colspan="2">[2]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="3">[3]</td>
-  </tr>
-  <tr>
-    <td colspan="3">[3]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="2">[2]</td>
-  </tr>
-  <tr>
-    <td colspan="4">[4]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-    <td colspan="1">[1]</td>
-  </tr>
-  <tr>
-    <td colspan="5">[5]</td>
-    <td colspan="2" width="20%">20%[2]</td>
-  </tr>
-</table>
-
-<hr>
-
-<p>WinIE6 leaves the full horizontal and vertical gaps in quirks mode,
-but only leaves the gap for the third column in standards mode (in
-collapses the third row).  (Firefox 1.5 collapses both columns and rows
-in both modes, although sometimes fails to do so when incrementally
-loading.  No other layout engines appear to collapse anything.  See <a
-href="http://dbaron.org/css/test/2006/empty-cells-quirks">separate
-quirks</a> and <a
-href="http://dbaron.org/css/test/2006/empty-cells-standards">standards</a>
-mode tests.</p>
-
-<table border class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellspacing=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table border cellpadding=0 cellspacing=0 class="bigcellborder">
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-  <tr><td>x</td><td>x</td><td></td><td>x</td><td>x</td></tr>
-</table>
-
-<table cellpadding=0 cellspacing=0>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td></td><td></td><td></td><td></td><td></td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-  <tr><td>X</td><td>X</td><td></td><td>X</td><td>X</td></tr>
-</table>
-
-<h1>More colspan cases</h1>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-  <tr><td colspan="2">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td colspan="2">cs</td></tr>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="200">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td colspan="2" width="200">cs</td></tr>
-  <tr><td>Z</td><td>ZZZZZZZ</td></tr>
-</table>
-
-<table border>
-  <tr><td width="25%">25%</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2">cs</td></tr>
-</table>
-
-<table border>
-  <tr><td width="25%">25%</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="20">20</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="50">50</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td width="100">100</td><td width="75%">75%</td></tr>
-  <tr><td colspan="2" width="200">cs 200</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td>x</td><td colspan="2" width="400">cs 400</td></tr>
-  <tr><td colspan="2" width="400">cs 400</td><td>x</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="400">cs 400</td><td>x</td></tr>
-  <tr><td>x</td><td colspan="2" width="400">cs 400</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td>x</td><td colspan="2" width="75%">cs 75%</td></tr>
-  <tr><td colspan="2" width="75%">cs 75%</td><td>x</td></tr>
-</table>
-
-<table border>
-  <tr><td>Z</td><td>ZZZZZ</td><td>ZZZZZZZZZ</td></tr>
-  <tr><td colspan="2" width="75%">cs 75%</td><td>x</td></tr>
-  <tr><td>x</td><td colspan="2" width="75%">cs 75%</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td width="57%">57%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="92%">92%</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="98%" colspan="2">98%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="10%">10%</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="60%" colspan="2">60%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="10%">10%</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="80%">80%</td>
-    <td width="80%" colspan="2">80%</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="10%">10%</td>
-    <td>x</td>
-    <td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="2%" colspan="2">2% (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="98%" colspan="2">98% (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border>
-  <tr>
-    <td>x</td>
-    <td width="200" colspan="2">200 (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td width="200" colspan="2">200 (2)</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td width="200">200</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table border>
-  <tr>
-    <td width="20">20</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="20">20</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="20">20</td>
-    <td width="20">20</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="20">20</td>
-    <td width="20">20</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td>x</td>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>xxx</td>
-    <td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<hr>
-
-<table border width="600">
-  <tr>
-    <td width="200">200</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="200" colspan="2">200 (2)</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td width="100">100</td>
-    <td>x</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xxxxx</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td width="10">10</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="10%">10%</td>
-	<td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td>xxxxx</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td width="10">10</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td width="75%" colspan="2">75% (2)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="20">20</td>
-	<td width="200">200</td>
-	<td>x</td>
-  </tr>
-  <tr>
-	<td width="10%">10%</td>
-	<td width="10%">10%</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td>x</td>
-	<td>xxx</td>
-	<td></td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td width="30">x</td>
-	<td width="30">xxx</td>
-	<td width="30"></td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3">3ZZZZZZZZZZZZZZZZZZZZZZ3</td>
-  </tr>
-  <tr>
-	<td width="25%">x</td>
-	<td width="25%">xxx</td>
-	<td width="25%"></td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>xx</td>
-	<td>xx</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>x</td>
-	<td>xxx</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table border>
-  <tr>
-    <td colspan="3" width="60%">60% (3)</td>
-	<td>x</td>
-  </tr>
-  <tr>
-    <td width="50%">50%</td>
-	<td>x</td>
-	<td>x x x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<hr>
-
-<table border>
-  <tr>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x x x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-
-<table width="1" border><tr><td>
-<table border>
-  <tr>
-    <td colspan="2">2ZZZZZZZZZZZZ2</td>
-    <td>x</td>
-  </tr>
-  <tr>
-    <td>x x x</td>
-	<td>x</td>
-	<td>x</td>
-  </tr>
-</table>
-</td></tr></table>
-
-<h1>More balancing cases</h1>
-
-<table border width="600">
-  <tr>
-    <td width="25%">25%</td>
-    <td width="100">100</td>
-    <td>x</td>
-  </tr>
-</table>
-
-<table border width="600">
-  <tr>
-    <td width="25%">25%</td>
-    <td width="100">100</td>
-    <td></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3">(3)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2">(2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2">(2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2"></td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="3" width="200">200 (3)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td style="background:aqua"></td>
-  </tr>
-  <tr><td colspan="2" width="200">200 (2)</td></tr>
-</table>
-
-<table border="0" width="600" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="25%" style="background: lime">25%</td>
-    <td width="100" style="background:yellow">100</td>
-  </tr>
-  <tr><td colspan="2" width="200">200 (2)</td></tr>
-</table>
-
-<h1>widths on col</h1>
-
-<table border>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col>
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="25%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="25%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="2%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="2%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="98%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="600">
-  <col width="98%">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <col width="200">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <col width="200" style="border: 20px solid; margin: 20px; padding: 20px">
-  <col>
-  <tr><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
-
-<table border>
-  <col width="200" span="2">
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <col width="200" span="2">
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup width="200" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup width="200" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup width="200" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup width="200" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup style="width:200px" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup style="width:200px" span="2">
-    <col span="2">
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border>
-  <colgroup style="width:200px" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<table border width="800">
-  <colgroup style="width:200px" span="2">
-    <col>
-    <col>
-  </colgroup>
-  <col>
-  <tr><td>x</td><td>x</td><td>x</td></tr>
-</table>
-
-<hr>
diff --git a/layout/html/tests/table/other/wa_table_thtd_rowspan.html b/layout/html/tests/table/other/wa_table_thtd_rowspan.html
deleted file mode 100644
index 7a8f5df77ada..000000000000
--- a/layout/html/tests/table/other/wa_table_thtd_rowspan.html
+++ /dev/null
@@ -1,977 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-	<title>Web Browser Web View (HTML): Table</title>
-
-	<meta name="GENERATOR" CONTENT="Mozilla/3.0 (Win95; I) [Netscape]">
-
-</head>
-
-
-
-<body bgcolor=#FFDEAD TEXT=#000000>
-
-<h1><font color=#FF0000>Acceptance Test Case<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color="#FF0000" size=+2><b>Table: &lt;TH&gt; &amp; &lt;TD&gt; ROWSPAN</b></font>
-
-
-
-<hr>
-
-This acceptance test case tests the optional <b>&lt;TH&gt;</b> &amp; <b>&lt;TD&gt;</b> tag <b>ROWSPAN</b> attribute which, 
-
-when placed in a table header or data tag, specifies how many rows the table header or data cell will span. The 
-
-<b>ROWSPAN</b> attribute is set to an integer value equal the number of rows the table header or data cell spans.
-
-<p>
-
-<b>Test Instructions:</b>
-
-<ol>
-
-<li>Verify that the sample text displays as stated in each of the following test cases:</li>
-
-	<p>
-
-	<table bgcolor=#F08080 cellpadding=7>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_1">Test Case #1</a></td>
-
-		<td><font color=blue><b>table with header cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_2">Test Case #2</a></td>
-
-		<td><font color=blue><b>table with data cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_3">Test Case #3</a></td>
-
-		<td><font color=blue><b>table with nested header & data cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	</table>
-
-<p>
-
-<li>Verify that the table is maintained when you <b>minimize/maximize</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size left & right</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size top & bottom</b> the screen.</li>
-
-<li>Verify re-draw takes place correctly after maximizing the screen.</li>
-
-<li>Verify reload works.</li>
-
-</ol>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_1"></A>Test Case #1: <font color=blue>table with header cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTH ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<br>
-
-<table border bgcolor=#FFD700 cellpadding=10 width=90%>
-
-<tr><td><font color="FF0000"><b>In the following sample table you should see that the <font color=blue>ROWSPAN</font> 
-
-attribute applies an integer value equal to the number of rows the <font color=blue>HEADER</font> cell is to span. This 
-
-tells the browser to make the table header cell occupy the same vertical space as the integer number of cells specified in rows 
-
-above or below it. The browser flows the contents of the spanning cell to occupy the entire spanned space.
-
-</font></td></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Table <b>Header Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th rowspan=2 bgcolor=bisque>Header 1<br>span=2 rows</th>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=5 bgcolor=bisque>Header 2<br>span=5 rows</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr bgcolor=bisque>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=3 bgcolor=bisque>Header 3<br>span=3 rows</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-<p>
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_2"></A>Test Case #2: <font color=blue>table with data cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTD ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<br>
-
-<table border bgcolor=#FFD700 cellpadding=10 width=90%>
-
-<tr><td><font color="FF0000"><b>In the following sample table you should see that the <font color=blue>ROWSPAN</font> 
-
-attribute applies an integer value equal to the number of rows the <font color=blue>DATA</font> cell is to span. This 
-
-tells the browser to make the table data cell occupy the same vertical space as the integer number of cells specified in rows 
-
-above or below it. The browser flows the contents of the spanning cell to occupy the entire spanned space.
-
-</font></td></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Table <b>Data Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th bgcolor=violet>Head</th>
-
-	<td rowspan=2 bgcolor=lemonchiffon>Data 1<br>span=2 rows</td>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=violet>Head</th>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td rowspan=5 bgcolor=lemonchiffon>Data 2<br>span=5 rows</td>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td rowspan=3 bgcolor=lemonchiffon>Data 3<br>span=3 rows</td>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-<p>
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_3"></A>Test Case #3: <font color=blue>table with nested header & data cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTH ROWSPAN=integer value&gt &ltTD ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Nested Table <b>Header Cells</b> &amp; <b>Data Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th rowspan=7 bgcolor=bisque>Header 1<br>span=7 rows</td>
-
-	<td rowspan=2 bgcolor=lemonchiffon>Data 1<br>span=2 rows</td>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td rowspan=5 bgcolor=lemonchiffon>Data 2<br>span=5 rows</td>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=3 bgcolor=bisque>Header 2<br>span=3 rows</td>
-
-	<td rowspan=3 bgcolor=lemonchiffon>Data 3<br>span=3 rows</td>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-
-<p>	
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 9/19/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<p>
-
-<br>
-
-<!-- ***** 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 table tests.
-   
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** -->
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/other/wa_table_tr_align.html b/layout/html/tests/table/other/wa_table_tr_align.html
deleted file mode 100644
index daf2a956af0f..000000000000
--- a/layout/html/tests/table/other/wa_table_tr_align.html
+++ /dev/null
@@ -1,251 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-	<title>Web Browser Web View (HTML): Table</title>
-
-	<meta name="GENERATOR" CONTENT="Mozilla/3.0 (Win95; I) [Netscape]">
-
-</head>
-
-
-
-<body bgcolor=FFDEAD TEXT="000000">
-If there is missing vertical space between tables and/or tables and other content, it is bug 6997.
-<BR>
-<h1><font color=#FF0000>Acceptance Test Case<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color=#FF0000 size=+2><b>Table: &lt;TR&gt; ALIGN</b></font>
-
-
-
-<hr>
-
-This acceptance test case tests the optional <b>&lt;TR&gt;</b> tag <b>ALIGN</b> attribute which controls the 
-
-horizontal alignment of all the cells in a row. This cause the contents of each cell in the row to be aligned 
-
-either LEFT|CENTER|RIGHT with respect to the current left and right margins of the display window. 
-
-The <b>Header</b> cells by default are aligned <b>CENTER</b> while the <b>Data</b> cells by default are aligned <b>LEFT</b>.
-
-<p>
-
-<b>Test Instructions:</b>
-
-<ol>
-
-<li>Verify that the sample text displays as stated in each of the following test cases:</li>
-
-	<p>
-
-	<table bgcolor=#F08080 cellpadding=7>
-
-	<tr>
-
-		<td><a href="wa_table_tr_align.html#TestCase_1">Test Case #1</a></td>
-
-		<td><font color=blue><b>Table displaying Header "CENTER "& Data "LEFT" default horizontal row alignment</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_tr_align.html#TestCase_2">Test Case #2</a></td>
-
-		<td><font color=blue><b>Tables displaying Header & Data "LEFT|CENTER|RIGHT" horizontal row alignment</b></font></td>
-
-	</tr>
-
-	</table>
-
-<p>
-
-<li>Verify that the table is maintained when you <b>minimize/maximize</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size left & right</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size top & bottom</b> the screen.</li>
-
-<li>Verify re-draw takes place correctly after maximizing the screen.</li>
-
-<li>Verify reload works.</li>
-
-</ol>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10>
-
-<tr><th>
-
-<A NAME="TestCase_1"></A>Test Case #1: <font color=blue>Table displaying Header "CENTER "& Data "LEFT" default horizontal row alignment</font> 
-
-<font size=-1><i>(using &ltTR&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Default Horizontal Row Alignment</caption>
-
-<tr><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-</table>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10>
-
-<tr><th>
-
-<A NAME="TestCase_2"></A>Test Case #2: <font color=blue>Tables displaying Header & Data "LEFT|CENTER|RIGHT" horizontal row alignment</font> 
-
-<font size=-1><i>(using &ltTR ALIGN=LEFT|CENTER|RIGHT&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-
-
-
-<p>
-
-
-<table border bgcolor=bisque width=45%>
-
-
-<caption align=top>Horizontal Row Alignment=LEFT</caption>
-
-
-<tr align=left><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=left><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-
-</tr>
-
-<tr bgcolor=gold><td colspan=3>
-
-<b><font color=red>
-
-Note: The attribute <font color=blue>ALIGN=LEFT</font> has no special effect on the row data since it simply reiterates the default horizontal row alignment!
-
-<p></font></b>
-
-</td></tr>
-
-</table>
-
-
-
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Horizontal Row Alignment=CENTER</caption>
-
-<tr align=center><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=center><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-<tr bgcolor=gold><td colspan=3>
-
-<b><font color=red>
-
-Note: The attribute <font color=blue>ALIGN=CENTER</font> has no special effect on the row head since it simply reiterates the default horizontal row alignment!
-
-<p></font></b>
-
-</td></tr>
-
-</table>
-
-
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Horizontal Row Alignment=RIGHT</caption>
-
-<tr align=right><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=right><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-</table>
-
-
-
-<p>	
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 9/9/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<p>
-
-<br><p>
-
-<!-- ***** 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 table tests.
-   
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** -->
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/other/wf_table_index.html b/layout/html/tests/table/other/wf_table_index.html
deleted file mode 100644
index 320ccfb01f62..000000000000
--- a/layout/html/tests/table/other/wf_table_index.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-   <title>Web Browser Web View (HTML): DocType</title>
-
-</head>
-
-
-
-<body bgcolor=#FFDEAD TEXT=#000000>
-
-<h1><font color=teal>Functional Test<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color=teal size=+2><b>Tables</b></font>
-
-
-
-<hr>
-
-<b><i>Objective</i></b>: Tests the Simple HTML Table Model.
-
-<p>
-
-<b><i>Syntax</i></b>: The Simple Table Model is the table model that most browsers currently support. 
-
-The model is from the HTML 3.2 Draft specifications which describes tables in terms of table cells 
-
-grouped into row-based cell layouts.
-
-<p>
-
-Based on the simple table model, you can create a wide variety of tables with only five tags:
-
-	<ol>
-
-	<li>the <b>&lt;TABLE&gt;</b> tag, which encapsulates a table and its elements in the HTML document's body content;</li>
-
-	<li>the <b>&lt;TR&gt</b> tag, which defines a table row;</li>
-
-	<li>the <b>&lt;TH&gt</b> tag, which define the table header;</li>
-
-	<li>the <b>&lt;TD&gt;</b> tag, which define the table data cell;</li>
-
-	<li>the <b>&lt;CAPTION&gt</b> tag, which defines a table title (caption);
-
-	</ol>
-
-Each tag has one or more required and optional attributes, some of which affect not only the tag itself, but related tags.
-
-<p>
-
-<b><i>Procedure</i></b>: Click each <font color=#0000FF>link</font> in the <b>Special Case</b> column to verify that the expected results match the resulting display.
-
-<hr>
-
-
-
-<!-- ********************** Functional Test Cases ************************** -->
-
-<p>
-
-<center>
-
-<table border=1 bgcolor=lemonchiffon cellpadding=7 width=90%>
-
-	<tr>
-
-		<th width=20%>Special Case</th><th>Expected Results</th>
-
-	</tr>
-
-
-	<tr>
-
-
-
-		<td valign=top><a href="wf_table_bgcolor.html">Table with background color</a></td>
-
-
-
-		<td><li type=square>Verify what happens when you use the Edit|Preferences|Appearance|Color checkbox.</li></td>
-
-
-
-	</tr>
-
-
-
-
-
-
-	<tr>
-
-		<td valign=top><a href="wf_table_mixed_widths.html">Table with Mixed Widths</a></td>
-
-		<td><li type=square>Verify what happens when you have mixed <b>absolute</b> and <b>relative</b> table cell widths?.</li></td>
-
-	</tr>
-
-	<tr>
-		<td valign=top><a href="wf_table_large.html">Large Table</a></td>
-		<td><li type=square>Verify that you can load a table with a large number of rows & columns.</li></td>
-	</tr>
-
-	<tr><td valign=top><a href="../charstyles/wf_charstyles_tables.html">Character Styles inside Tables</a></td>
-	<td><li type=square>Verify that tables can contain character styles.<font color=teal><b>[from Character Styles Functional Test Case]</b></font></li></td>
-	</tr>
-	<tr>
-
-	<td valign=top><a href="../images/wf_images_in_table.html">Images inside Tables</a></td>		<td><li type=square>Verify that images can be contained inside tables.<font color=teal><b>[from Image Functional Test Case]</b></font></li></td>	</tr>
-
-	<tr><td><a href="../multicol/wf_multicol_table.html">Multicolumns inside a Table</a></td>		<td><li type=square>Verify that multicolumns can be contained inside a table.<font color=teal><b>[from Multicolumn Functional Test Case]</b></font></li></td>
-	</tr>
-	<tr>
-	<td><a href="wf_table_with_plug-in.html">Table with Plug-ins</a></td>
-	<td><li type=square>Verify that multimedia plug-ins can be contained inside a table.</li></td>
-	</tr>
-
-	<tr>
-	<td><a href="wf_table_nests.html">Nested Tables</a></td>
-
-	<td><li type=square>Verify that tables can be nested inside other tables.</li></td>
-
-	</tr>
-<tr>
-
-	<td><a href="wf_table_crash.html">Invalid Table Tags</a></td>
-
-	<td><li type=square>Verify that table will NOT crash when closing table tags were missing.</li></td>
-
-	</tr>
-
-<tr>
-
-	<td><a href="wf_img_overlap_tbl.html">Image/table overlapping</a></td>
-
-	<td><li type=square>Verify that Image and table text should NOT co-exist in the same space.</li></td>
-
-	</tr>
-
-</table>
-
-</center>
-
-
-
-<p>
-
-<br>
-
-<center>
-
-<table bgcolor=pink border=2 cellspacing=3 cellpadding=5>
-
-<tr>
-	<td><font size=-1>
-	<a href="../wf_body_index.html"><img width=9 height=11 ALIGN=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Body</a><br>
-	</font>
-	</td>
-	<td><font size=-1>
-	<a href="../../../../lf_testspec.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Functional Test Suite</a>
-	</font>
-	</td>
-	<td><font size=-1>
-	<a href="../../wf_html_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Tag Index</a>
-	</font>
-	</td>
-	<td bgcolor=navajowhite>&nbsp;</td>
-	<td bgcolor=lightcoral><font size=-1>
-	<a href="wa_table_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Acceptance Test</a>
-	</font>
-	</td>
-	</td>
-	<td bgcolor=plum><font size=-1>
-	<a href="ws_table_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_r.gif" alt="" border=0> on to Stress Test</a>
-	</font>
-	</td>
-</tr>
-
-</table>
-
-</center>
-
-
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 5/13/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 11/03/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 12/08/96 by <a href="mailto:robw@netscape.com">Robert Wehrfritz</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 03/04/97 by <a href="mailto:chitra@netscape.com">Chitra Natarajan</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 1/13/98 by <a href="mailto:chitra@netscape.com">Fenella Gor</a><br>
-
-<p>
-
-<br><p>
-<!-- ***** 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 table tests.
-   
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** -->
diff --git a/layout/html/tests/table/printing/bug102784.html b/layout/html/tests/table/printing/bug102784.html
deleted file mode 100644
index ec26dc311766..000000000000
--- a/layout/html/tests/table/printing/bug102784.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-<BODY>
-<div style="border:1px solid black; width:100px; height:800px">div</div>
-<TABLE BORDER>
- <TR><td>row 1</TD></TR>
- <TR>
-  <TD>  row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-  row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-   row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-    row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-         row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-          row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-           row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-   row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-    row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-         row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-          row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-           row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-  </td>
- </tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/printing/bug105166.html b/layout/html/tests/table/printing/bug105166.html
deleted file mode 100644
index 9fed46df98ef..000000000000
--- a/layout/html/tests/table/printing/bug105166.html
+++ /dev/null
@@ -1,14 +0,0 @@
-FOO
-
-<table border="1" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="6">
-   <img src="../images/spacer.gif" 
-     width="6" height="1500" border="0"></td>
-  <td>bar</td>
- </tr>
-</table> 
-
-</td></tr>
-</table>
-
diff --git a/layout/html/tests/table/printing/bug111028.html b/layout/html/tests/table/printing/bug111028.html
deleted file mode 100644
index 3ca19c6761c0..000000000000
--- a/layout/html/tests/table/printing/bug111028.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<!-- saved from url=(0065)http://forums.compuserve.com/gvforums/Main.asp?SRV=Literary&HMN=0 -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<FRAMESET border=0 frameSpacing=0 rows=32,*,20 frameBorder=no>
-  <FRAME name=Login marginWidth=0 marginHeight=0 src="bug111028Top.html" scrolling=no>
-  <FRAME name=ForumHome marginWidth=8 marginHeight=8 src="bug111028Middle.html">
-  <FRAME name=Welcome marginWidth=0 marginHeight=0 src="bug111028Bottom.html" scrolling=no>
-</FRAMESET>
-</HTML>
diff --git a/layout/html/tests/table/printing/bug111028Bottom.html b/layout/html/tests/table/printing/bug111028Bottom.html
deleted file mode 100644
index 89189279e002..000000000000
--- a/layout/html/tests/table/printing/bug111028Bottom.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML><HEAD>
-<BODY bgcolor=#CCFF00>
-Body of Welcome 
-</BODY></HTML>
diff --git a/layout/html/tests/table/printing/bug111028Middle.html b/layout/html/tests/table/printing/bug111028Middle.html
deleted file mode 100644
index 778003a10335..000000000000
--- a/layout/html/tests/table/printing/bug111028Middle.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0069)http://forums.compuserve.com/gvforums/WhatsNew.asp?SRV=Literary&HMN=0 -->
-<HTML><HEAD><TITLE></TITLE>
-<BODY leftMargin=0 topMargin=0>
-<TABLE height=899 cellSpacing=0 cellPadding=0 width="100%" border=1>
-  <TR>
-    <TD vAlign=top width=165 height=899 rowSpan=4 bgcolor=#c0d0f0>Cell XX</TD>
-    <TD vAlign=top align=left colSpan=2 height=50 bgcolor=yellow>Cel XY</TD>
-  </TR>
-  <TR>
-    <TD vAlign=top height=288 bgcolor=#d0c0f0>CELL XYX</TD>
-    <TD vAlign=top width=165 height=288 bgcolor=green> cell 3</TD>
-  </TR>
-</TABLE>
-</BODY></HTML>
diff --git a/layout/html/tests/table/printing/bug111028Top.html b/layout/html/tests/table/printing/bug111028Top.html
deleted file mode 100644
index e429eaec6f06..000000000000
--- a/layout/html/tests/table/printing/bug111028Top.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0066)http://forums.compuserve.com/gvforums/LoginBanner.asp?SRV=Literary -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY vLink=#0000ff aLink=#0000ff link=#0000ff bgColor=#ffcc00 leftMargin=0 topMargin=0>
-Body of LoginBanner</BODY></HTML>
diff --git a/layout/html/tests/table/printing/bug123983.html b/layout/html/tests/table/printing/bug123983.html
deleted file mode 100644
index 917258abaf18..000000000000
--- a/layout/html/tests/table/printing/bug123983.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<TABLE cellSpacing=0 cellPadding=0 width=750 border=2>
- <TR>
-  <TD vAlign=top rowSpan=2>
-         xxx<BR>yyy<BR>zzz<BR>
-    <BR>
-  </TD>
-  <TD vAlign=top width=447 rowSpan=2>
-
-   <TABLE width=400 border=1>
-    <TR>
-     <TD vAlign=top width=20><INPUT type=radio value=2 name=correct1>
-         </TD>
-     <TD width=380><FONT face=Verdana size=-1>The paramilitaries have 
-            been accused by UN observers of torture and murder.</FONT>
-                        <BR><BR><BR>1<BR><BR><BR><BR><BR>2<BR><BR><BR><BR><BR><BR>3<BR><BR><BR><BR>
-                        <BR><BR>4<BR><BR><BR><BR><BR>5<BR><BR><BR><BR><BR><BR>6<BR><BR><BR><BR><BR>foo
-         </TD>
-        </TR>
-    <TR>
-     <TD vAlign=top width=20>ppp
-      <BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR><BR>bar
-         </TD>
-        </TR>
-   </TABLE>
-
-  </TD>
- </TR>
- <TR>
-  <TD width=17><IMG height=1 alt="" 
-      src="S:\mozilla\dist\WIN32_D.OBJ\bin\res\samples\test0_files\spacer(1).gif" 
-      width=5>
-  </TD>
- <TR>
-  <TD align=right width=600 colSpan=6><IMG height=1 hspace=0 
-      src="test0_files/gray.gif" width=600 border=0>
-  </TD>
- </tr>
-</TABLE>
diff --git a/layout/html/tests/table/printing/bug124041.html b/layout/html/tests/table/printing/bug124041.html
deleted file mode 100644
index d9f2f52e1149..000000000000
--- a/layout/html/tests/table/printing/bug124041.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<TABLE cellSpacing=0 cellPadding=0 width="100%" border=0>
- <TR>
-  <TD width="30%">
-   <IFRAME border=0 marginWidth=0 marginHeight=0 src="bug124041_iframe.html" frameBorder=no 
-    width=468 scrolling=no height=60>
-   </IFRAME>
-  </TD>
- </TR>
-</TABLE>
diff --git a/layout/html/tests/table/printing/bug124041_iframe.html b/layout/html/tests/table/printing/bug124041_iframe.html
deleted file mode 100644
index 870ba6e93e36..000000000000
--- a/layout/html/tests/table/printing/bug124041_iframe.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<BASE HREF="http://bugzilla.mozilla.org/">
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- saved from url=(0028)http://sfads.osdn.com/1.html -->
-<HTML><HEAD>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
-<BODY>
-<TABLE cellSpacing=0 cellPadding=0 border=0>
-  <TBODY>
-  <TR>
-    <TD width=468>
-      <A HREF='/cgi-bin/adlog.pl?docman/display_doc,andf0011en' TARGET=_top><IMG SRC='/banner/andf0011en.gif?1014647352135' WIDTH=468 HEIGHT=60 BORDER=0 ALT="Click here for 100,000+ Clipart images."></A><BR>
-</TD></TR></TBODY></TABLE>
-<TABLE cellSpacing=0 cellPadding=0 border=0>
-  <TBODY>
-  <TR>
-    <TD width=1>
-      <IMG SRC='../images/pc.gif?docman/display_doc,1014647352145' WIDTH=1 HEIGHT=1 BORDER=0><BR>
-</TD></TR></TBODY></TABLE></BODY></HTML>
diff --git a/layout/html/tests/table/printing/bug125543.html b/layout/html/tests/table/printing/bug125543.html
deleted file mode 100644
index ebb4166bdc45..000000000000
--- a/layout/html/tests/table/printing/bug125543.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<TABLE height="100%" cellSpacing=0 cellPadding=0 width="100%" border=0>
- <TR>
-  <TD>
-   <TABLE width="90%" align=center>
-    <TR>
-     <TD>
-      <TABLE width="90%" align=center bgColor=#cc0000 border=0>
-       <TR>
-        <TD bgColor=#f0f0f0>
-          <BR>1.In many states the highway 
-                          patrol carries two gallons of Coke in the truck to 
-                          remove blood from the highway after a car accident. 
-                          <P>2.You can put a T-bone steak in a bowl of coke and 
-                          it will be gone in two days. 
-                          <P>3.To clean a toilet: Pour a can of Coca-Cola into 
-                          the toilet <NOBR>bowl . . .</NOBR> Let the "real 
-                          thing" sit for one hour, then flush clean. 
-                          <P>4.The citric acid in Coke removes stains from 
-                          vitreous china. 
-                          <P>5.To remove rust spots from chrome car bumpers: Rub 
-                          the bumper with a crumpled-up piece of Reynolds Wrap 
-                          aluminum foil dipped in Coca-Cola. 
-                          <P>6.To clean corrosion from car battery terminals: 
-                          Pour a can of Coca-Cola over the terminals to bubble 
-                          away the corrosion. 
-                          <P>7.To loosen a rusted bolt: Applying a cloth soaked 
-                          in Coca-Cola to the rusted bolt for several minutes. 
-                          <P>8.To bake a moist ham: Empty a can of Coca-Cola 
-                          into the baking pan;rap the ham in aluminum foil, and 
-                          bake. Thirty minutes before the ham is finished, 
-                          remove the foil, allowing the drippings to mix with 
-                          the Coke for a sumptuous brown gravy. 
-                          <P>9.To remove grease from clothes: Empty a can of 
-                          coke into a load of greasy clothes, add detergent, And 
-                          run through a regular cycle. The Coca-Cola will help 
-                          loosen grease stains. It will also clean road haze 
-                          fromyour windshield. 
-                          <P>FYI: 
-                          <P>1.The active ingredient in Coke is phosphoric acid. 
-                          It's pH is 2.8. It will dissolve a nail in about 4 
-                          days. 
-                          <P>2.To carry Coca Cola syrup (the concentrate) the 
-                          commercial truck must use the Hazardous material place 
-                          cards reserved for Highly Corrosive materials. 
-                          <P>3.The distributors of coke have been using it to 
-                          clean the engines of their trucks for about 20 years! 
-                          Drink up! No joke. Think what coke and other soft 
-                          drinks do to your teeth on a daily basis. A tooth will 
-                          dissolve in a cup of coke in 24-48 hours 
-                          </P>
-                        <P></P>
-                </TD>
-           </TR>
-          </TABLE>
-        Many of the 
-                  entries above are just simple household tips involving 
-                  Coca-Cola. That you can cook and clean with Coke is relatively 
-                  meaningless from a safety standpoint <NOBR>--</NOBR> you can 
-                  use a wide array of common household substances (including 
-                  water) for the same purposes; that doesn't necessarily make 
-                  them dangerous. The fact is that <I>all</I> carbonated soft 
-                  drinks contain <A 
-                  onmouseover="window.status='Carbonic acid';return true" 
-                  onclick='this.href="#origins";window.open("http://www.bartleby.com/65/ca/carbonic.html", "carbonic", "scrollbar=yes,menubar=yes,resizable=yes")' 
-                  onmouseout="window.status='';return true" 
-                  href="http://www.bartleby.com/65/ca/carbonic.html"><FONT 
-                  face=Arial color=#cc0000>carbonic acid</FONT></A>, which is 
-                  moderately useful for tasks such as removing stains and 
-                  dissolving rust deposits (although plain soda water is much 
-                  better for such purposes than Coca-Cola or other soft drinks, 
-                  as it doesn't leave a sticky sugar residue behind). Carbonic 
-                  acid is relatively weak, however, and people have been 
-                  drinking carbonated water for many years with no detrimental 
-                  effects. 
-                  <P><A name=acid></A>The rest of the claims offered here are, 
-                  in a word, stupid. Coca-Cola does contain small amounts of 
-                  citric acid (from the orange, lemon, and lime oils in its 
-                  formula) and phosphoric acid. However, all the insinuations 
-                  about the dangers these acids might pose to people who drink 
-                  Coca-Cola ignore a simple concept familiar to any first-year 
-                  chemistry student: concentration. Coca-Cola contains less 
-                  citric acid than orange juice does, and the concentration of 
-                  phosphoric acid in Coke is far too small (a mere 11 to 13 
-                  grams per gallon of syrup, or about 0.20 to 0.30 per cent of 
-                  the total formula) to harm anyone, no matter how much Coke he 
-                  guzzles. The only people who proffer the ridiculous statements 
-                  that Coca-Cola will dissolve a steak, a <A 
-                  onmouseover="window.status='Tooth in Advertising';return true" 
-                  onclick='this.href="#acid";window.open("tooth.htm")' 
-                  onmouseout="window.status='';return true" 
-                  href="http://www.snopes2.com/cokelore/tooth.htm"><FONT 
-                  color=#cc0000>tooth</FONT></A>, or a nail in a matter of days 
-                  are people who have never actually tried any of these things, 
-                  because they just don't happen. (Anyone who conducts these 
-                  experiments will find himself at the end of two days with a 
-                  whole tooth, a whole nail, and one very soggy t-bone.) 
-                  <P>The next time you're stopped by a highway patrolman, try 
-                  asking him if he's ever cleaned blood stains off a highway 
-                  with Coca-Cola. If you're lucky, by the time he stops laughing 
-                  he'll have forgotten about the citation he was going to give 
-                  you. 
-                  <P><FONT face=Arial color=#cc0000><B>Last updated:</B></FONT> 
-                  &nbsp; 20 November 2001. </P></FONT></TD></TR>
-   </TABLE>
-            <P>
-            <CENTER><FONT face=Verdana,Arial color=#cc0000 size=2>The URL for 
-            this page is http://www.snopes.com/cokelore/acid.htm
-             
-            <P>Urban Legends Reference Pages © 1995-2001 <BR>by Barbara and 
-            David P. Mikkelson <BR>This material may not be reproduced without 
-            permisson </FONT></CENTER>
-            <P><FONT face="Book Antiqua,Bookman Old Style,Arial" size=2>
-            <HR>
-            &nbsp; <IMG height=54 alt=Sources src="notfound.gif" 
-            width=75 align=absMiddle> <FONT face=Arial color=#cc0000 
-            size=5><I>Sources:</I></FONT> 
-       </FONT>
-  </TD>
-  <TD width="2%" height="100%"><IMG height=10 src="notfound.gif" 
-      width=4 border=0></TD>
- </TR>
-</TABLE>
-
-</BODY></HTML>
diff --git a/layout/html/tests/table/printing/bug126118.html b/layout/html/tests/table/printing/bug126118.html
deleted file mode 100644
index ec26dc311766..000000000000
--- a/layout/html/tests/table/printing/bug126118.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<HTML>
-<BODY>
-<div style="border:1px solid black; width:100px; height:800px">div</div>
-<TABLE BORDER>
- <TR><td>row 1</TD></TR>
- <TR>
-  <TD>  row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-  row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-   row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-    row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-         row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-          row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-           row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-   row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-    row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-         row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-          row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-           row 2 row 2  row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2 row 2
-  </td>
- </tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/printing/bug138349-1.html b/layout/html/tests/table/printing/bug138349-1.html
deleted file mode 100644
index 2489a1ed7932..000000000000
--- a/layout/html/tests/table/printing/bug138349-1.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-<body>
-<table border=1   align=left width="1%"><tr><td align=center valign=top>
-
-<table border=1   width="100%"><tr><td width="100%">
-</td>
-</tr></table><table border=1   width="100%"  >
-<form> 
-
-
-
-
-
-
-<tr><td align=right>Yahoo! ID:</td><td><input name=login size=12 maxlength=34></td></tr><tr><td align=right>Yahoo!<br>Password:</td><td></td></tr><tr><td colspan=2 nowrap align=center><input type=checkbox name=".persistent" value="Y">Remember my ID & Password</td></tr><tr><td>&nbsp;</td><td></td></tr><tr><td colspan=2 align=center><br>Need help signing in?<br><br></td></tr></form></table>
-<br>
-<table border=1   width="100%"><tr><td width="100%"><table border=1   width="100%"><tr><td><img>New on My Yahoo!</td></tr></table></td>
-</tr></table>
-<table border=1   width="100%"  ><tr><td colspan=2><img>&nbsp;<a href="http://rd.yahoo.com/motd/?http://my.yahoo.com/promo/hleat.html">Recipes - Daily recipes from Epicurious.com, Yahoo! recipe
-search box and more!</td></tr>
-
-<tr><td width="1%" align=center valign=top><img></td><td width="99%">Track your Diet<br>Keep track of your success on your my Yahoo! page.</td></tr>
-<tr><td width="1%" align=center valign=top><img></td><td width="99%">TV Listings<br>What's on tonight? Keep track on My Yahoo!</td></tr>
-<tr><td colspan=2 align=center><hr size=0>More New Features</td></tr></table>
-<br><table border=1   width="100%"><tr><td width="100%"><table border=1   width="100%"><tr><td><img> <img> Weather</td></tr></table></td>
-</tr></table><table border=1   width="100%"  ><tr><td colspan=3><table border=1   width=100%><tr><td ><center><img>&nbsp;Yahoo! Weather Alerts<br>Get your daily forecast by email</center></td></tr></table></td></tr><tr><td>Chicago, IL&#42;&nbsp;<img></td><td align=right nowrap>64...80 F</td><td align=right><img></td></tr>
-<tr><td>London, UK&nbsp;<img></td><td align=right nowrap>51...66 F</td><td align=right><img></td></tr>
-<tr><td>New York, NY&nbsp;<img></td><td align=right nowrap>59...82 F</td><td align=right><img></td></tr>
-<tr><td>San Francisco, CA&#42;&nbsp;<img></td><td align=right nowrap>58...91 F</td><td align=right><img></td></tr>
-<tr><td align=center colspan=3>&#42;indicates severe weather alert</td></tr><tr><td align=center colspan=3><img>click image for video forecast</td></tr><tr><td align=center colspan=3><form>&nbsp;<br>search by Zip Code or City<br></form></td></tr></table>
-<br><table border=1   width="100%"><tr><td width="100%"><table border=1   width="100%"><tr><td><img> <img> Best Fares</td></tr></table></td>
-</tr></table><table border=1   width="100%"  ><tr><td colspan=3><table border=1   width=100%><tr><td ><center><img></center></td></tr></table></td></tr><tr><td colspan=3>Depart: New York, NY - all</td></tr><tr><td>Paris, France - all</td><td align=right colspan=2>$373.00</td></tr>
-<tr><td colspan=3>Depart: Seattle/Tacoma, WA</td></tr><tr><td>Honolulu, HI</td><td align=right colspan=2>$451.20</td></tr>
-<tr><td colspan=3>Depart: San Francisco, CA</td></tr><tr><td>London, UK - all</td><td align=right colspan=2>$577.00</td></tr>
-<tr><td colspan=3>Find other Best Fares: </td></tr><tr valign=top><td colspan=3 align=center><form><table width="100%"  ><tr valign=top><td valign=middle>From:</td><td>
-</td></tr><tr valign=top> <td valign=middle>To:</td><td>
-</td></tr></td></tr><tr valign=top><td valign=middle>Adults:&nbsp;</td><td><select name="adult_pax_cnt"><option selected>1</option> <option>2</option><option>3</option> <option>4</option></select>&nbsp;</td></tr></form></table><hr size=0></td></tr><tr><td colspan=3 align=center><p>How do I use this?&nbsp;-&nbsp;Disclaimer</td></tr></table>
-<br><hr noshade size=1 width=204></td></tr></table>
-<table border=1  ><tr><td width=1> </td><td valign=top>
-
-<table   border=1 bgcolor=996699 width="100%">
-<tr><td>
-<table   border=1 bgcolor=996699 width="100%">
-<tr bgcolor=eeeeff>
-<td colspan=2><img></td></tr>
-<tr bgcolor=eeeeff>
-<td rowspan=2 width="1%"><img></td>
-<td width="99%"><ul>
-<li>My Yahoo! is everything you need on one page
-<li>Check your stocks, mail, weather, sports scores, and movie listings on one page.
-<li>Take a tour of My Yahoo!
-</ul>
-</td></tr>
-<tr bgcolor=eeeeff>
-<td align=right><img>&nbsp;&nbsp;</td>
-</tr></TABLE>
-</td></tr></table>
-
-<hr size=0><table border=1   width="100%"><tr><td width="100%"><table border=1   width="100%"><tr><td><img>Lead Photo<nobr>&nbsp;&nbsp;&nbsp;Jul 10 10:50pm PT</nobr></td></tr></table></td>
-</tr></table><table border=1   width="100%" ><tr><td><img>Senate Passes Multiple Corporate Crackdowns<br>Jack Grubman(R) testifies before the House Financial Services committee July 8, 2002 beside (L-R) former Arthur Andersen executive Melvin Dick, former WorldCom CEO Bernard Ebbers and former WorldCom CFO Scott Sullivan. The U.S. Senate, responding to a wave of corporate scandals at giant companies Worldcom and Enron, unanimously approved a measure on July 10 that would make defrauding shareholders a felony carrying penalties of up to 10 years in prison. (Hyungwon Kang/Reuters)
-
-</td></tr></table>
-<hr size=0><table border=1   width="100%"><tr><td width="100%"><table border=1   width="100%"><tr><td><img> <img>  <img>Front&nbsp;Page Headlines<nobr>&nbsp;&nbsp;&nbsp;Jul 10 10:50pm PT</nobr></td></tr></table></td>
-</tr></table>
-
-<table border=1   width="100%" ><tr><td>Customize your My Yahoo Headlines to see only the news of interest to you.</td></tr>
-<tr><td colspan=2>Top Stories from  Reuters&nbsp;</td><td align=right>Jul 10 10:30pm PT&nbsp;</td></tr>
-<tr><td colspan=3><ul>
-<li>Senate Passes Multiple Corporate Crackdowns<li>Stocks Careen to 1997 Lows Amid Accounting Worries<li>Mississippi U.S. Attorney Taken Off WorldCom Case</ul></td></tr>
-<tr><td colspan=2>World  News from  Reuters&nbsp;</td><td align=right>Jul 10 10:28pm PT&nbsp;</td></tr>
-<tr><td colspan=3><ul>
-<li>S.Korea Picks First Female PM, Replaces 6 Ministers<li>Amnesty Raps Palestinian Attacks on Israelis<li>Typhoon Misses Tokyo, Pounds Northern Japan</ul></td></tr>
-<tr><td colspan=2>Politics  News from  Reuters&nbsp;</td><td align=right>Jul 10 8:16pm PT&nbsp;</td></tr>
-<tr><td colspan=3><ul>
-<li>House Passes Bill to Arm Airline Pilots<li>Senate Approves Bush Corporate Crime Proposals<li>Watchdog Group Sues Halliburton, Cheney</ul></td></tr>
-<tr><td colspan=2>Business  News from  Reuters&nbsp;</td><td align=right>Jul 10 9:35pm PT&nbsp;</td></tr>
-<li>Stocks Careen to 1997 Lows<li>Oracle CEO Compliments Microsoft<li>June Retail Sales Seen Up 0.7 Percent</ul></td></tr>
-</table>
-
-<hr size=0>
-
-</body>
-</html>
diff --git a/layout/html/tests/table/printing/bug138349-2.html b/layout/html/tests/table/printing/bug138349-2.html
deleted file mode 100644
index d0123fa7d8da..000000000000
--- a/layout/html/tests/table/printing/bug138349-2.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<style>
-img { width: 200px; height: 1000px }
-</style>
-<body><table border="1" align=left><tr><td><img><form><input></form></td></tr></table><table border="1"><tr><td><img></td></tr></table></body>
-</html>
diff --git a/layout/html/tests/table/printing/bug145842.html b/layout/html/tests/table/printing/bug145842.html
deleted file mode 100644
index 6601efe41e56..000000000000
--- a/layout/html/tests/table/printing/bug145842.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<div style="border:1px solid red; width:100px; height:850px">div</div>
-<table border>
- <thead>
-  <tr>
-   <td>thead row 1<BR></td>
-  </tr>
-  <tr>
-   <td>thead row 2<BR></td>
-  </tr>
-  <tr>
-   <td>thead row 3<BR></td>
-  </tr>
- </thead>
- <tbody>
-  <tr>
-   <td>tbody row 1<BR></td>
-  </tr>
-  <tr>
-   <td>tbody row 2<BR></td>
-  </tr>
-  <tr>
-   <td>tbody row 3<BR></td>
-  </tr>
- </tbody>
-</table>
diff --git a/layout/html/tests/table/printing/bug153785-1.html b/layout/html/tests/table/printing/bug153785-1.html
deleted file mode 100644
index 5a383b2ccc33..000000000000
--- a/layout/html/tests/table/printing/bug153785-1.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<HTML>
-  <HEAD>
-    <TITLE></TITLE>
-  </HEAD>
-  <BODY>
-    <table align="left">
-      <tr>
-        <td>
-          <table>
-            <tr>
-              <td>
-                <br>
-                <br clear="all">
-                <H2 ALIGN=CENTER>M&auml;rchen von einem, der auszog, das F&uuml;rchten zu lernen</H2>
-                <P>Ein Vater hatte zwei S&ouml;hne, davon war der &auml;Iteste klug und gescheit, und wu&szlig;te sich in alles wohl zu schicken, der j&uuml;ngste aber war dumm, konnte nichts begreifen und lernen: und wenn ihn die Leute sahen, sprachen sie 'mit dem wird der Vater noch seine Last haben!' Wenn nun etwas zu tun war, so mu&szlig;te es der &auml;lteste allzeit ausrichten: hie&szlig; ihn aber der Vater noch sp&auml;t oder gar in der Nacht etwas holen, und der Weg ging dabei &uuml;ber den Kirchhof oder sonst einen schaurigen Ort, so antwortete er wohl 'ach nein, Vater, ich gehe nicht dahin, es gruselt mir!' denn er f&uuml;rchtete sich. Oder, wenn abends beim Feuer Geschichten erz&auml;hlt wurden, wobei einem die Haut schaudert, so sprachen die Zuh&ouml;rer manchmal 'ach, es gruselt mir!' Der j&uuml;ngste sa&szlig; in einer Ecke und h&ouml;rte das mit an, und konnte nicht begreifen,was es hei&szlig;en sollte. 'Immer sagen sie: es gruselt mir! es gruselt mir! mir gruselts nicht: das wird wohl eine Kunst sein, von der ich auch nichts verstehe.'
-                <P>Nun geschah es, da&szlig; der Vater einmal zu ihm sprach 'h&ouml;r du, in der Ecke dort, du wirst gro&szlig; und stark, du mu&szlig;t auch etwas lernen, womit du dein Brot verdienst. Siehst du, wie dein Bruder sich M&uuml;he gibt, aber an dir ist Hopfen und Malz verloren.' 'Ei, Vater,' antwortete er, 'ich will gerne was lernen; ja, wenns anginge, so m&ouml;chte ich lernen, da&szlig; mirs gruselte; davon verstehe ich noch gar nichts.' Der &auml;lteste lachte, als er das h&ouml;rte, und dachte bei sich 'du lieber Gott, was ist mein Bruder ein Dummbart, aus dem wird sein Lebtag nichts: was ein H&auml;kchen werden will, mu&szlig; sich beizeiten kr&uuml;mmen.' Der Vater seufzte und antwortete ihm 'das Gruseln, das sollst du schon lernen, aber dein Brot wirst du damit nicht verdienen.'
-                <P>Bald danach kam der K&uuml;ster zum Besuch ins Haus, da klagte ihm der Vater seine Not und erz&auml;hlte, wie sein j&uuml;ngster Sohn in allen Dingen so schlecht beschlagen w&auml;re, er w&uuml;&szlig;te nichts und lernte nichts. 'Denkt Euch, als ich ihn fragte, womit er sein Brot verdienen wollte, hat er gar verlangt, das Gruseln zu lernen.' 'Wenns weiter nichts ist,' antwortete der K&uuml;ster, 'das kann er bei mir lernen; tut ihn nur zu mir, ich werde ihn schon abhobeln.' Der Vater war es zufrieden, weil er dachte 'der Junge wird doch ein wenig zugestutzt.' Der K&uuml;ster nahm ihn also ins Haus, und er mu&szlig;te die Glocke l&auml;uten. Nach ein paar Tagen weckte er ihn um Mitternacht, hie&szlig; ihn aufstehen, in den Kirchturm steigen und l&auml;uten. 'Du sollst schon lernen, was Gruseln ist,' dachte er, ging heimlich voraus, und als der Junge oben war, und sich umdrehte und das Glockenseil fassen wollte, so sah er auf der Treppe, dem Schalloch gegen&uuml;ber, eine wei&szlig;e Gestalt stehen. 'Wer da?' rief er, aber die Gestalt gab keine Antwort, regte und bewegte sich nicht. 'Gib Antwort,' rief der Junge, 'oder mache, da&szlig; du fortkommst, du hast hier in der Nacht nichts zu schaffen.' Der K&uuml;ster aber blieb unbeweglich stehen, damit der Junge glauben sollte, es w&auml;re ein Gespenst. Der Junge rief zum zweitenmal 'was willst du hier? sprich, wenn du ein ehrlicher Kerl bist, oder ich werfe dich die Treppe hinab.' Der K&uuml;ster dachte 'das wird so schlimm nicht gemeint sein,' gab keinen Laut von sich und stand, als wenn er von Stein w&auml;re. Da rief ihn der Junge zum drittenmal an, und als das auch vergeblich war, nahm er einen Anlauf und stie&szlig; das Gespenst die Treppe hinab, da&szlig; es zehn Stufen hinabfiel und in einer Ecke liegen blieb. Darauf l&auml;utete er die Glocke, ging heim, legte sich, ohne ein Wort zu sagen, ins Bett und schlief fort. Die K&uuml;sterfrau wartete lange Zeit auf ihren Mann, aber er wollte nicht wiederkommen. Da ward ihr endlich angst, sie weckte den Jungen und 
-fragte 'wei&szlig;t du nicht, wo mein Mann geblieben ist? er ist vor dir auf den Turm gestiegen.' 'Nein,' antwortete der Junge, 'aber da hat einer dem Schalloch gegen&uuml;ber auf der Treppe gestanden, und weil er keine Antwort geben und auch nicht weggehen wollte, so habe ich ihn f&uuml;r einen Spitzbuben gehalten und hinuntergesto&szlig;en. Geht nur hin, so werdet Ihr sehen ob ers gewesen ist, es sollte mir leid tun.' Die Frau sprang fort und fand ihren Mann, der in einer Ecke lag und jammerte, und ein Bein gebrochen hatte.
-                <P>Sie trug ihn herab und eilte dann mit lautem Geschrei zu dem Vater des Jungen. 'Euer Junge,' rief sie, 'hat ein gro&szlig;es Ungl&uuml;ck angerichtet, meinen Mann hat er die Treppe hinabgeworfen, da&szlig; er ein Bein gebrochen hat: schafft den Taugenichts aus unserm Haus.' Der Vater erschrak, kam herbeigelaufen und schalt den Jungen aus. 'Was sind das f&uuml;r gottlose Streiche, die mu&szlig; dir der B&ouml;se eingegeben haben.' 'Vater,' antwortete er, 'h&ouml;rt nur an, ich bin ganz unschuldig: er stand da in der Nacht wie einer, der B&ouml;ses im Sinne hat. Ich wu&szlig;te nicht, wers war, und hab ihn dreimal ermahnt, zu reden oder wegzugehen.' 'Ach,' sprach der Vater, 'mit dir erleb ich nur Ungl&uuml;ck, geh mir aus den Augen, ich will dich nicht mehr ansehen.' 'Ja, Vater, recht gerne, wartet nur, bis Tag ist, da will ich ausgehen und das Gruseln lernen, so versteh ich doch eine Kunst, die mich ern&auml;hren kann.' 'Lerne, was du willst,' sprach der Vater, 'mir ist alles einerlei. Da hast du f&uuml;nfzig Taler, damit geh in die weite Welt und sage keinem Menschen wo du her bist und wer dein Vater ist, denn ich mu&szlig; mich deiner sch&auml;men.' 'Ja, Vater, wie Ihrs haben wollt, wenn Ihr nicht mehr verlangt, das kann ich leicht in acht behalten.'
-                <P>Als nun der Tag anbrach, steckte der Junge seine f&uuml;nfzig Taler in die Tasche, ging hinaus auf die gro&szlig;e Landstra&szlig;e und sprach immer vor sich hin 'wenn mirs nur gruselte! wenn mirs nur gruselte!' Da kam ein Mann heran, der h&ouml;rte das Gespr&auml;ch, das der Junge mit sich selber f&uuml;hrte, und als sie ein St&uuml;ck weiter waren, da&szlig; man den Galgen sehen konnte, sagte der Mann zu ihm 'siehst du, dort ist der Baum, wo siebene mit des Seilers Tochter Hochzeit gehalten haben und jetzt das Fliegen lernen: setz dich darunter und warte, bis die Nacht kommt, so wirst du schon das Gruseln lernen.' 'Wenn weiter nichts dazu geh&ouml;rt,' antwortete der Junge, 'das ist leicht getan; lerne ich aber so geschwind das Gruseln, so sollst du meine f&uuml;nfzig Taler haben, komm nur morgen fr&uuml;h wieder zu mir.' Da ging der Junge zu dem Galgen, setzte sich darunter und wartete' bis der Abend kam. Und weil ihn fror, machte er sich ein Feuer an: aber um Mitternacht ging der Wind so kalt, da&szlig; er trotz des Feuers nicht warm werden wollte. Und als der Wind die Gehenkten gegeneinander stie&szlig;, da&szlig; sie sich hinund herbewegten, so dachte er 'du frierst unten bei dem Feuer, was m&ouml;gen die da oben erst frieren und zappeln.' Und weil er mitleidig war, legte er die Leiter an, stieg hinauf, kn&uuml;pfte einen nach dem andern los, und holte sie alle siebene herab. Darauf sch&uuml;rte er das Feuer, blies es an und setzte sie ringsherum, da&szlig; sie sich w&auml;rmen sollten. Aber sie sa&szlig;en da und regten sich nicht' und das Feuer ergriff ihre Kleider. Da sprach er 'nehmt euch in acht, sonst h&auml;ng ich euch wieder hinauf.' Die Toten aber h&ouml;rten nicht, schwiegen und lie&szlig;en ihre Lumpen fortbrennen. Da ward er b&ouml;s und sprach 'wenn ihr nicht achtgeben wollt, so kann ich euch nicht helfen, ich will nicht mit euch verbrennen,' und hing sie nach der Reihe wieder hinauf. Nun setzte er sich zu seinem Feuer und schlief ein, und am andern Morgen, da kam der Mann zu ihm, wollte die f
-&uuml;nfzig Taler haben und sprach 'nun, wei&szlig;t du, was Gruseln ist?' 'Nein,' antwortete er, 'woher sollte ichs wissen? die da droben haben das Maul nicht aufgetan und waren so dumm, da&szlig; sie die paar alten Lappen, die sie am Leibe haben, brennen lie&szlig;en.' Da sah der Mann, da&szlig; er die f&uuml;nfzig Taler heute nicht davontragen w&uuml;rde, ging fort und sprach 'so einer ist mir noch nicht vorgekommen.'
-                <P>Der Junge ging auch seines Wegs und fing wieder an vor sich hin zu reden 'ach, wenn mirs nur gruselte! ach, wenn mirs nur gruselte!' Das h&ouml;rte ein Fuhrmann, der hinter ihm herschritt, und fragte 'wer bist du?' 'Ich wei&szlig; nicht,' antwortete der Junge. Der Fuhrmann fragte weiter 'wo bist du her?' 'Ich wei&szlig; nicht.' 'Wer ist dein Vater?' 'Das darf ich nicht sagen.' 'Was brummst du best&auml;ndig in den Bart hinein?' 'Ei,' antwortete der Junge, 'ich wollte, da&szlig; mirs gruselte, aber niemand kann michs lehren.' 'La&szlig; dein dummes Geschw&auml;tz,' sprach der Fuhrmann, 'komm, geh mit mir, ich will sehen, da&szlig; ich dich unterbringe.' Der Junge ging mit dem Fuhrmann, und abends gelangten sie zu einem Wirtshaus, wo sie &uuml;bernachten wollten. Da sprach er beim Eintritt in die Stube wieder ganz laut 'wenn mirs nur gruselte! wenn mirs nur gruselte!' Der Wirt, der das h&ouml;rte, lachte und sprach 'wenn dich danach I&uuml;stet, dazu sollte hier wohl Gelegenheit sein.' 'Ach schweig stille,' sprach die Wirtsfrau, 'so mancher Vorwitzige hat schon sein Leben eingeb&uuml;&szlig;t, es w&auml;re Jammer und Schade um die sch&ouml;nen Augen, wenn die das Tageslicht nicht wieder sehen sollten.' Der Junge aber sagte 'wenns noch so schwer w&auml;re, ich wills einmal lernen, deshalb bin ich ja ausgezogen.' Er lie&szlig; dem Wirt auch keine Ruhe, bis dieser erz&auml;hlte, nicht weit davon st&auml;nde ein verw&uuml;nschtes Schlo&szlig;, wo einer wohl lernen k&ouml;nnte, was Gruseln w&auml;re, wenn er nur drei N&auml;chte darin wachen wollte. Der K&ouml;nig h&auml;tte dem, ders wagen sollte, seine Tochter zur Frau versprochen, und die w&auml;re die sch&ouml;nste Jungfrau, welche die Sonne beschien: in dem Schlosse steckten auch gro&szlig;e Sch&auml;tze, von b&ouml;sen Geistern bewacht, die w&uuml;rden dann frei und k&ouml;nnten einen Armen reich genug machen. Schon viele w&auml;ren wohl hinein-, aber noch keiner wieder herausgekommen. Da ging der Junge am andern Morgen vor den K&ouml;nig und sprach 'wenns erlaub
-t w&auml;re, so wollte ich wohl drei N&auml;chte in dem verw&uuml;nschten Schlosse wachen. Der K&ouml;nig sah ihn an, und weil er ihm gefiel, sprach er 'du darfst dir noch dreierlei ausbitten, aber es m&uuml;ssen leblose Dinge sein, und das darfst du mit ins Schlo&szlig; nehmen.' Da antwortete er 'so bitt ich um ein Feuer, eine Drehbank und eine Schnitzbank mit dem Messer.'
-                <P>Der K&ouml;nig lie&szlig; ihm das alles bei Tage in das Schlo&szlig; tragen. Als es Nacht werden wollte, ging der Junge hinauf, machte sich in einer Kammer ein helles Feuer an, stellte die Schnitzbank mit dem Messer daneben und setzte sich auf die Drehbank. 'Ach, wenn mirs nur gruselte!' sprach er, 'aber hier werde ichs auch nicht lernen.' Gegen Mitternacht wollte er sich sein Feuer einmal aufsch&uuml;ren: wie er so hineinblies, da schries pl&ouml;tzlich aus einer Ecke 'au, miau! was uns friert!' 'Ihr Narren,' rief er, 'was schreit ihr? wenn euch friert, kommt, setzt euch ans Feuer und w&auml;rmt euch.' Und wie er das gesagt hatte, kamen zwei gro&szlig;e schwarze Katzen in einem gewaltigen Sprunge herbei, setzten sich ihm zu beiden Seiten und sahen ihn mit ihren feurigen Augen ganz wild an. &Uuml;ber ein Weilchen, als sie sich gew&auml;rmt hatten, sprachen sie 'Kamerad, wollen wir eins in der Karte spielen?' 'Warum nicht?' antwortete er, 'aber zeigt einmal eure Pfoten her.' Da streckten sie die Krallen aus. 'Ei,' sagte er, 'was habt ihr lange N&auml;gel! wartet, die mu&szlig; ich euch erst abschneiden.' Damit packte er sie beim Kragen, hob sie auf die Schnitzbank und schraubte ihnen die Pfoten fest. 'Euch habe ich auf die Finger gesehen,' sprach er, 'da vergeht mir die Lust zum Kartenspiel,' schlug sie tot und warf sie hinaus ins Wasser. Als er aber die zwei zur Ruhe gebracht hatte und sich wieder zu seinem Feuer setzen wollte, da kamen aus allen Ecken und Enden schwarze Katzen und schwarze Hunde an gl&uuml;henden Ketten, immer mehr und mehr, da&szlig; er sich nicht mehr bergen konnte: die schrieen greulich, traten ihm auf sein Feuer, zerrten es auseinander und wollten es ausmachen. Das sah er ein Weilchen ruhig mit an, als es ihm aber zu arg ward, fa&szlig;te er sein Schnitzmesser und rief 'fort mit dir, du Gesindel,' und haute auf sie los. Ein Teil sprang weg, die andern schlug er tot und warf sie hinaus in den Teich. Als er wiedergekommen war, blies er aus den Funken sein Feuer frisch an und w&auml;rmte sich.
- Und als er so sa&szlig;, wollten ihm die Augen nicht l&auml;nger offen bleiben, und er bekam Lust zu schlafen. Da blickte er um sich und sah in der Ecke ein gro&szlig;es Bett, 'das ist mir eben recht,' sprach er und legte sich hinein. Als er aber die Augen zutun wollte, so fing das Bett von selbst an zu fahren, und fuhr im ganzen Schlo&szlig; herum. 'Recht so,' sprach er, 'nur besser zu.' Da rollte das Bett fort, als w&auml;ren sechs Pferde vorgespannt, &uuml;ber Schwellen und Treppen auf und ab: auf einmal hopp hopp! warf es um, das unterste zu oberst, da&szlig; es wie ein Berg auf ihm lag. Aber er schleuderte Decken und Kissen in die H&ouml;he, stieg heraus und sagte 'nun mag fahren, wer Lust hat,' legte sich an sein Feuer und schlief, bis es Tag war. Am Morgen kam der K&ouml;nig, und als er ihn da auf der Erde liegen sah, meinte er, die Gespenster h&auml;tten ihn umgebracht, und er w&auml;re tot. Da sprach er 'es ist doch schade um den sch&ouml;nen Menschen.' Das h&ouml;rte der Junge, richtete sich auf und sprach 'so weit ists noch nicht!' Da verwunderte sich der K&ouml;nig, freute sich aber und fragte, wie es ihm gegangen w&auml;re. 'Recht gut,' antwortete er, 'eine Nacht w&auml;re herum, die zwei andern werden auch herumgehen.' Als er zum Wirt kam, da machte der gro&szlig;e Augen. 'Ich dachte nicht,' sprach er, 'da&szlig; ich dich wieder lebendig sehen w&uuml;rde; hast du nun gelernt, was Gruseln ist?' 'Nein,' sagte er, 'es ist alles vergeblich: wenn mirs nur einer sagen k&ouml;nnte!'
-                <P>Die zweite Nacht ging er abermals hinauf ins alte Schlo&szlig;, setzte sich zum Feuer und fing sein altes Lied wieder an 'wenn mirs nur gruselte!' Wie Mitternacht herankam, lie&szlig; sich ein L&auml;rm und Gepolter h&ouml;ren, erst sachte, dann immer st&auml;rker, dann wars ein bi&szlig;chen still, endlich kam mit lautem Geschrei ein halber Mensch den Schornstein herab und fiel vor ihm hin. 'Heda!' rief er, 'noch ein halber geh&ouml;rt dazu, das ist zu wenig.' Da ging der L&auml;rm von frischem an, es tobte und heulte, und fiel die andere H&auml;lfte auch herab. 'Wart,' sprach er, 'ich will dir erst das Feuer ein wenig anblasen.' Wie er das getan hatte und sich wieder umsah, da waren die beiden St&uuml;cke zusammengefahren, und sa&szlig; da ein greulicher Mann auf seinem Platz. 'So haben wir nicht gewettet,' sprach der Junge, 'die Bank ist mein.' Der Mann wollte ihn wegdr&auml;ngen, aber der Junge lie&szlig; sichs nicht gefallen, schob ihn mit Gewalt weg und setzte sich wieder auf seinen Platz. Da fielen noch mehr M&auml;nner herab, einer nach dem andern, die holten neun Totenbeine und zwei Totenk&ouml;pfe, setzten auf und spielten Kegel. Der Junge bekam auch Lust und fragte 'h&ouml;rt ihr, kann ich mit sein?' 'Ja, wenn du Geld hast.' 'Geld genug,' antwortete er, 'aber eure Kugeln sind nicht recht rund.' Da nahm er die Totenk&ouml;pfe, setzte sie in die Drehbank und drehte sie rund. 'So, jetzt werden sie besser sch&uuml;ppeln,' sprach er 'heida! nun gehts lustig!' Er spielte mit und verlor etwas von seinem Geld, als es aber zw&ouml;lf schlug, war alles vor seinen Augen verschwunden. Er legte sich nieder und schlief ruhig ein. Am andern Morgen kam der K&ouml;nig und wollte sich erkundigen. 'Wie ist dirs diesmal ergangen?' fragte er. 'Ich habe gekegelt,' antwortete er, 'und ein paar Heller verloren.' 'Hat dir denn nicht gegruselt?' 'Ei was,' sprach er, 'lustig hab ich mich gemacht. Wenn ich nur w&uuml;&szlig;te, was Gruseln w&auml;re!'
-                <P>In der dritten Nacht setzte er sich wieder auf seine Bank und sprach ganz verdrie&szlig;lich 'wenn es mir nur gruselte!' Als es sp&auml;t ward, kamen sechs gro&szlig;e M&auml;nner und brachten eine Totenlade hereingetragen. Da sprach er 'ha ha, das ist gewi&szlig; mein Vetterchen, das erst vor ein paar Tagen gestorben ist, winkte mit dem Finger und rief 'komm Vetterchen, komm, Sie stellten den Sarg auf die Erde, er aber ging hinzu und nahm den Deckel ab: da lag ein toter Mann darin. Er f&uuml;hlte ihm ans Gesicht, aber es war kalt wie Eis. 'Wart,' sprach er, 'ich will dich ein bi&szlig;chen w&auml;rmen,' ging ans Feuer, w&auml;rmte seine Hand und legte sie ihm aufs Gesicht, aber der Tote blieb kalt. Nun nahm er ihn heraus, setzte sich ans Feuer und legte ihn auf seinen Scho&szlig;, und rieb ihm die Arme, damit das Blut wieder in Bewegung kommen sollte. Als auch das nichts helfen wollte, fiel ihm ein 'wenn zwei zusammen im Bett liegen, so w&auml;rmen sie sich,' brachte ihn ins Bett, deckte ihn zu und legte sich neben ihn. Ober ein Weilchen ward auch der Tote warm und fing an sich zu regen. Da sprach der Junge 'siehst du, Vetterchen, h&auml;tt ich dich nicht gew&auml;rmt!' Der Tote aber hub an und rief 'jetzt will ich dich erw&uuml;rgen.' 'Was,' sagte er, 'ist das mein Dank? gleich sollst du wieder in deinen Sarg,' hub ihn auf, warf ihn hinein und machte den Deckel zu. da kamen die sechs M&auml;nner, und trugen ihn wieder fort. 'Es will mir nicht gruseln,' sagte er, 'hier lerne ichs mein Lebtag nicht.'
-                <P>Da trat ein Mann herein, der war gr&ouml;&szlig;er als alle andere, und sah f&uuml;rchterlich aus; er war aber alt und hatte einen langen wei&szlig;en Bart. 'O du Wicht,' rief er, 'nun sollst du bald lernen, was Gruseln ist, denn du sollst sterben.' 'Nicht so schnell,' antwortete der Junge, 'soll ich sterben, so mu&szlig; ich auch dabei sein.' 'Dich will ich schon packen,' sprach der Unhold. 'Sachte, sachte, mach dich nicht so breit; so stark wie du bin ich auch, und wohl noch st&auml;rker.' 'Das wollen wir sehn,' sprach der Alte, 'bist du st&auml;rker als ich, so will ich dich gehn lassen; komm, wir wollens versuchen.' Da f&uuml;hrte er ihn durch dunkle G&auml;nge zu einem Schmiedefeuer, nahm eine Axt und schlug den einen Ambo&szlig; mit einem Schlag in die Erde. 'Das kann ich noch besser,' sprach der Junge und ging zu dem andern Ambo&szlig;: der Alte stellte sich neben hin und wollte zusehen, und sein wei&szlig;er Bart hing herab. Da fa&szlig;te der Junge die Axt, spaltete den Ambo&szlig; auf einen Hieb und klemmte den Bart des Alten mit hinein. 'Nun hab ich dich,' sprach der Junge, 'jetzt ist das Sterben an dir.' Dann fa&szlig;te er eine Eisenstange und schlug auf den Alten los, bis er wimmerte und bat, er m&ouml;chte aufh&ouml;ren, er wollte ihm gro&szlig;e Reicht&uuml;mer geben. Der Junge zog die Axt raus, und lie&szlig; ihn los. Der Alte f&uuml;hrte ihn wieder ins Schlo&szlig; zur&uuml;ck und zeigte ihm in einem Keller drei Kasten voll Gold. 'Davon,' sprach er, 'ist ein Teil den Armen, der andere dem K&ouml;nig, der dritte dein.' Indem schlug es zw&ouml;lfe, und der Geist verschwand, also da&szlig; der Junge im Finstern stand. 'Ich werde mir doch heraushelfen k&ouml;nnen,' sprach er, tappte herum, fand den Weg in die Kammer und schlief dort bei seinem Feuer ein. Am andern Morgen kam der K&ouml;nig und sagte 'nun wirst du gelernt haben, was Gruseln ist?' 'Nein,' antwortete er, 'was ists nur? mein toter Vetter war da, und ein b&auml;rtiger Mann ist gekommen, der hat mir da unten viel Geld gezeigt, aber was G
-ruseln ist, hat mir keiner gesagt.' Da sprach der K&ouml;nig 'du hast das Schlo&szlig; erl&ouml;st und sollst meine Tochter heiraten.' 'Das ist all recht gut,' antwortete er, 'aber ich wei&szlig; noch immer nicht, was Gruseln ist.'
-                <P>Da ward das Gold heraufgebracht und die Hochzeit gefeiert, aber der junge K&ouml;nig, so lieb er seine Gemahlin hatte und so vergn&uuml;gt er war, sagte doch immer 'wenn mir nur gruselte, wenn mir nur gruselte.' Das verdro&szlig; sie endlich. Ihr Kammerm&auml;dchen sprach 'ich will Hilfe schaffen, das Gruseln soll er schon lernen.' Sie ging hinaus zum Bach, der durch den Garten flo&szlig;, und lie&szlig; sich einen ganzen Eimer voll Gr&uuml;ndlinge holen. Nachts, als der junge K&ouml;nig schlief, mu&szlig;te seine Gemahlin ihm die Decke wegziehen und den Eimer voll kalt Wasser mit den Gr&uuml;ndlingen &uuml;ber ihn hersch&uuml;tten, da&szlig; die kleinen Fische um ihn herumzappelten. Da wachte er auf und rief 'ach was gruselt mir, was gruselt mir, liebe Frau! Ja, nun wei&szlig; ich, was Gruseln ist.'
-                <br>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-    <br clear=all>
-    <table>
-      <tr>
-        <td>
-          <br>
-          [ <a href="http://www.spiegel.de/" target="_top">Home</a> | <a href="http://www.spiegel.de/politik/" target="_top">Politik</a> | <a href="http://www.spiegel.de/wirtschaft/" target="_top">Wirtschaft</a> | <a href="http://www.spiegel.de/netzwelt/" target="_top">Netzwelt</a> | <a href="http://www.spiegel.de/panorama/" target="_top">Panorama</a> | <a href="http://www.spiegel.de/kultur/" target="_top">Kultur</a> | <a href="http://www.spiegel.de/wissenschaft/" target="_top">Wissenschaft</a> | <a href="http://www.spiegel.de/unispiegel/" target="_top">UniSPIEGEL</a> | <a href="http://www.spiegel.de/sport/" target="_top">Sport</a> | <a href="http://www.spiegel.de/auto/" target="_top">Auto</a> | <a href="http://www.spiegel.de/reise/" target="_top">Reise</a> ]<br>
-          [ <a href="http://www.spiegel.de/schlagzeilen/" target="_top">Schlagzeilen</a> | <a href="http://www.spiegel.de/leserbriefe" target="_top">Leserbriefe</a> | <a href="http://www.spiegel.de/forum/" target="_top">Forum</a> | <a href="http://www.spiegel.de/dertag/" target=_top> Newsletter "Der&nbsp;Tag"</a> | <a href="http://www.spiegel.de/archiv/" target="_top">Archiv</a> | <a href="http://www.spiegel.de/shop/" target="_top">Shop</a> | <a href="http://www.spiegel.de/impressum" target="_top">Impressum</a> | <a href="http://www.spiegel.de/hilfe" target="_top">Hilfe</a> | <a href="http://www.spiegel.de/kontakt">Kontakt</a> ]<br>
-          [ <a href="http://www.spiegel.de/spiegel/" target="_top">DER&nbsp;SPIEGEL</a> | <a href="http://www.spiegel.de/sptv/" target="_top">SPIEGEL&nbsp;TV</a> | <a href="http://www.spiegel.de/almanach/" target="_top">SPIEGEL&nbsp;Almanach</a> | <a href="http://www.spiegel.de/kulturspiegel/" target="_top">kulturSPIEGEL</a> ]<br>
-          [ <a href="http://www.manager-magazin.de/" target=_blank>manager&nbsp;magazin</a> | <a href="http://www.spiegelgruppe.de/" target="_new">SPIEGEL-Gruppe</a> | <a href="http://www.spiegel.de/mediadaten" target="_top">Mediadaten</a> | <a href="http://www.schule.spiegel.de/" target=_blank>SCHULE@SPIEGEL</a> ]<br>
-          <br>
-          <br>
-        </td>
-      </tr>
-    </table>
-  </BODY>
-</HTML>
diff --git a/layout/html/tests/table/printing/bug153785-2.html b/layout/html/tests/table/printing/bug153785-2.html
deleted file mode 100644
index 00ef0ec70887..000000000000
--- a/layout/html/tests/table/printing/bug153785-2.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="width:100px; height:1000px; border:1px solid blue">div</div>
-<table border align=left><tr><td> 1<BR>2<BR>3<BR>4<BR>5<BR>6<BR> </td><tr></table><br clear=all>foo
-
diff --git a/layout/html/tests/table/printing/bug153785-3.html b/layout/html/tests/table/printing/bug153785-3.html
deleted file mode 100644
index 685d1b98b1a5..000000000000
--- a/layout/html/tests/table/printing/bug153785-3.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<table align="left">
-      <tr>
-        <td>
-                <H2 ALIGN=CENTER>M&auml;rchen von einem, der auszog, das F&uuml;rchten zu lernen
-                Ein Vater hatte zwei S&ouml;hne, davon war der &auml;Iteste klug und gescheit, und wu&szlig;te sich in alles wohl zu schicken, der j&uuml;ngste aber war dumm, konnte nichts begreifen und lernen: und wenn ihn die Leute sahen, sprachen sie 'mit dem wird der Vater noch seine Last haben!' Wenn nun etwas zu tun war, so mu&szlig;te es der &auml;lteste allzeit ausrichten: 
-                                hie&szlig; ihn aber der Vater noch sp&auml;t oder gar in der Nacht etwas holen, und der 
-                                Weg ging dabei &uuml;ber den Kirchhof oder sonst einen schaurigen Ort, so antwortete er 
-                                wohl 'ach nein, Vater, ich gehe nicht dahin, es gruselt mir!' denn er f&uuml;rchtete sich. 
-                                Oder, wenn abends beim Feuer Geschichten erz&auml;hlt wurden, wobei einem die Haut schaudert, 
-                                so sprachen die Zuh&ouml;rer manchmal 'ach, es gruselt mir!' Der j&uuml;ngste sa&szlig; in 
-                                einer Ecke und h&ouml;rte das mit an, und konnte nicht begreifen,was es hei&szlig;en sollte. 
-                                'Immer sagen sie: es gruselt mir! es gruselt mir! mir gruselts nicht: das wird wohl eine Kunst 
-                                sein, von der ich auch nichts verstehe.'
-                Nun geschah es, da&szlig; der Vater einmal zu ihm sprach 'h&ouml;r du, in der Ecke dort, 
-                                du wirst gro&szlig; und stark, du mu&szlig;t auch etwas lernen, womit du dein Brot verdienst. 
-                                Siehst du, wie dein Bruder sich M&uuml;he gibt, aber an dir ist Hopfen und Malz verloren.' 'Ei,
-                                 Vater,' antwortete er, 'ich will gerne was lernen; ja, wenns anginge, so m&ouml;chte ich lernen, da&szlig; mirs gruselte; davon verstehe ich noch gar nichts.' Der &auml;lteste lachte, als er das h&ouml;rte, und dachte bei sich 'du lieber Gott, was ist mein Bruder ein Dummbart, aus dem wird sein Lebtag nichts: was ein H&auml;kchen werden will, mu&szlig; sich beizeiten kr&uuml;mmen.' Der Vater seufzte und antwortete ihm 'das Gruseln, das sollst du schon lernen, aber dein Brot wirst du damit nicht verdienen.'
-                Bald danach kam der K&uuml;ster zum Besuch ins Haus, da klagte ihm der Vater seine Not und 
-                                erz&auml;hlte, wie sein j&uuml;ngster Sohn in allen Dingen so schlecht beschlagen w&auml;re, 
-                                er w&uuml;&szlig;te nichts und lernte nichts. 'Denkt Euch, als ich ihn fragte, womit er sein 
-                                Brot verdienen wollte, hat er gar verlangt, das Gruseln zu lernen.' 'Wenns weiter nichts ist,' 
-                                antwortete der K&uuml;ster, 'das kann er bei mir lernen; tut ihn nur zu mir, </H2>
-        </td>
-      </tr>
-    </table><br clear=all><table border>
-      <tr>
-        <td>foo
-        </td>
-      </tr>
-    </table>
diff --git a/layout/html/tests/table/printing/bug153785-4.html b/layout/html/tests/table/printing/bug153785-4.html
deleted file mode 100644
index 6a7f5f0884fc..000000000000
--- a/layout/html/tests/table/printing/bug153785-4.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html><BODY>
-<table border align="left">
- <tr>
-  <td>
-foo<BR>foo<BR>foo>  </td>
- </tr>
-</table>
-<table border align="right">
- <tr>
-  <td>
-bar</td>
- </tr>
-</table>
-<br clear=right>some text
-
-<table border align="left">
- <tr>
-  <td>
-   <BR>
-   <div style="width:30px; height:790px; border:1px solid red">take up some vertical space</div>
-   <H2 ALIGN=CENTER>shown</H2>
-   <H2 ALIGN=CENTER>missing</H2>
-  </td>
- </tr>
-</table>
-<br clear=all>
-should be on 2nd page
-<table border>
- <tr>
-  <td>table is missing too</td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/printing/bug153785-5.html b/layout/html/tests/table/printing/bug153785-5.html
deleted file mode 100644
index 7156319de39c..000000000000
--- a/layout/html/tests/table/printing/bug153785-5.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<style>
-img { width: 200px; height: 1000px; background-color: blue; }
-</style>
-<body><table border="1" align=left><tr><td><img><form><input></form></td></tr></table></body>
-</html>
diff --git a/layout/html/tests/table/printing/bug165772-1.html b/layout/html/tests/table/printing/bug165772-1.html
deleted file mode 100644
index e6269ddd8395..000000000000
--- a/layout/html/tests/table/printing/bug165772-1.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-            "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<title> Susan Hamburger - Resume </title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<link REL=StyleSheet HREF="default.css" TYPE="text/css">
-<script LANGUAGE="JAVASCRIPT" TYPE="TEXT/JAVASCRIPT">
-<!--
-var fullVersion = navigator.appVersion;
-var pos = fullVersion.indexOf('MSIE');
-if (pos > -1) {
-bVer = fullVersion.substring(pos + 5);
-var pos = bVer.indexOf(';');
-var bVer = bVer.substring(0,pos);
-}
-if (pos > -1 && bVer < 6)
-{
-	document.write("<STYLE TYPE=\"text/css\">\<!--@import url(import-no-netscape.css);\-\-\><\/STYLE>")
-}
-//-->
-</SCRIPT>
-
-<style TYPE="text/css"><!--
-A.resumelink:link, A.resumelink:visited 
-{
-	color: #FFFFFF;
-	text-decoration: none;
-	font-weight: bolder;
-	text-transform: uppercase;
-}
---></STYLE>
-</head>
-<body>
-	<table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
-
-		<tr>
-			<td WIDTH="110" ALIGN="LEFT">
-				<img SRC="../images/spacer.gif" WIDTH="110" HEIGHT="1" BORDER="0" ALT=" "></td>
-			<td ROWSPAN="2" VALIGN="MIDDLE" WIDTH="100%" ALIGN="LEFT">
-				<center>
-					<table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="80%">
-						<tr>
-							<td ALIGN="LEFT">
-								<center>
-
-									<h3>Susan Hamburger<br>
-									Lighting&nbsp;Design</h3>
-								</center>
-								<table WIDTH="100%" BORDER="0" CELLPADDING="0" CELLSPACING="0">
-									<tr>
-										<td ALIGN="LEFT" WIDTH="33%">
-											<p>410&nbsp;West&nbsp;24<sup>th</sup>&nbsp;Street NY,&nbsp;NY&nbsp;&nbsp;10011
-											<br>
-
-											<p><a HREF="mailto:hamburger8@aol.com">hamburger8@aol.com</a>
-										</td>
-										<td ALIGN="CENTER" WIDTH="34%">
-											<p><a HREF="http://www.susanhamburger.com/">www.susanhamburger.com</a>
-										</td>
-										<td ALIGN="RIGHT" WIDTH="33%">
-											<p>Tel: 917-523-7473
-											<br>
-
-											Fax: 212-691-0297
-											<br>
-										</td>
-									</tr>
-								</table>
-								<hr>
-								<h6>Agent:&nbsp;&nbsp;Russ&nbsp;Rosensweig, Summit&nbsp;Entertainment&nbsp;Group, T)&nbsp;203-453-0188,&nbsp;F)&nbsp;203-453-6532</h6>
-
-								<table BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
-									<tr>
-										<td VALIGN="TOP" ALIGN="LEFT"><p><b>EDUCATION:</b></td>
-										<td ALIGN="LEFT">&nbsp;&nbsp;&nbsp;&nbsp;</td>
-										<td VALIGN="TOP" ALIGN="LEFT">
-											<p CLASS="indent">Yale University School of Drama, MFA, Academic Honors, 1997
-											<p CLASS="indent">Bard College, BA, Academic Honors, 1990
-										</td>
-									</tr>
-
-									<tr>
-										<td COLSPAN="3" ALIGN="LEFT">&nbsp;</td>
-									</tr>
-									<tr>
-										<td VALIGN="TOP" ALIGN="LEFT"><p><b>PROFESSIONAL<br>AFFILIATIONS:</b></td>
-										<td ALIGN="LEFT">&nbsp;&nbsp;&nbsp;&nbsp;</td>
-										<td VALIGN="TOP" ALIGN="LEFT"><p CLASS="indent">USA Local 829 Lighting Design</td>
-
-									</tr>
-								</table>
-								<table WIDTH="100%" CELLPADDING="0" CELLSPACING="0" BORDER="0">
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>THEATER:</b></td>
-									</tr>
-									<tr>
-										<td ALIGN="LEFT">&nbsp;&nbsp;&nbsp;&nbsp;</td>
-
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep"><i>Logic of the Birds</i>, by Shirin Neshat, Sussan Deyhim, Shoja Azari and Ghasem Ebrahimian,  Off-Off Broadway, The Kitchen, NY 10/01
-<p CLASS="indentandsep"><i>Single Action Shotgun</i>, written and directed by Mike Gorman,  Off-Off Broadway,  La Mama, etc.,  NY  6/01
-<p CLASS="indentandsep"><i>Frankie's Wedding</i>, Adapted and Directed by Gabrielle Lansner, Off-Off Broadway, The Walkerspace,  NY, 3/01.
-<p CLASS="indentandsep"><i>A Child's Christmas in Wales</i>, by Dylan Thomas, National Theater of The Deaf, Connecticut Tour, Directed by Peter Flynn, 12/00.
-<p CLASS="indentandsep"><i>Little Shop of Horrors</i>, Directed by William Sanders, Baker Theater, PA, 10/00.
-<p CLASS="indentandsep"><i>Downstream</i>, Written by James C. Ryder, Directed by Obi Ndefo, Regional, Santa Monica Playhouse, CA, 10/00.
-<p CLASS="indentandsep"><i>An Angry Man</i>, Written and Directed by Jeremy Weller, Off-Off Broadway, Theater Four, NY, 7/00
-<p CLASS="indentandsep"><i>Yield Burning</i>, Written by Jill Szuchmacher, Directed by Heidi R. Miller, Off-Off Broadway, The Ontological Theater, NY, 6/00.
-
-<p CLASS="indentandsep"><i>West Side Story</i>, Directed by Charles Richter, Empie Theater, PA, 3/00.
-<p CLASS="indentandsep"><i>Splendora</i>, Directed by Donna Drake, Off Broadway, Chelsea Playhouse, NY, 1/00.
-<p CLASS="indentandsep"><i>Varla Jean Merman in Enough About Me</i>, Written and Performed by Jeffery Roberson, Directed by Michael Schiralli, Off Broadway, Chelsea Playhouse, NY, 1/00.
-<p CLASS="indentandsep"><i>This Is The Real</i>, Police Athletic League Armory Players, Directed by Jeremy Weller, Off-Off Broadway, The Kitchen, NY, 9/99, 12/99 and 7/00.
-<p CLASS="indentandsep"><i>On The Verge</i>, by Eric Overmeyer, Directed by Bruce Katzman, Off Broadway, John Houseman Studio A, NY, 3/99 and 9/99.
-<p CLASS="indentandsep"><i>Narcissus and Echo</i>, by John Goode and Larrance Fingerhut, Directed by John James Hickey, Off-Off Broadway, Wings Theater, NY 3/99.
-<p CLASS="indentandsep"><i>Putting it Together</i>, Written by Stephen Sondheim, Directed by Stephan Kitsakos, Regional, Rhinebeck Performing Arts Center, NY, 9/98.
-<p CLASS="indentandsep"><i>If I Were You</i>, Written and Directed by Mike Taylor, Off-Off Broadway, The Kitchen, NY, 8/98.
-<p CLASS="indentandsep"><i>Death of A Damn Nation</i>, Written by Aida Croal, Directed by N'Gai Croal, Off-Off Broadway, Trilogy Theater, NY, 6/98.
-
-<p CLASS="indentandsep"><i>Suddenly Last Summer</i>, Written by Tennessee Williams, Directed by Eddie Bennett, Off-Off Broadway, Sanford Meisner Theater, 4/98.
-<p CLASS="indentandsep"><i>Le Menage</i>, Written by Aida M. Croal, Directed by Robert Allen, Off-Off Broadway, La Mama Annex, NY, 2/98.
-<p CLASS="indentandsep"><i>The Farmyard and Through The Leaves</i>, Written by Franz Xavier Kroets, Directed by William Driver, Bard College Drama Department, NY, 10/97.
-<p CLASS="indentandsep"><i>The Great Highway</i>, Written by August Strindberg, Directed by Robert Allen, Columbia University Horace Mann Theater, NY, 12/97.
-<p CLASS="indentandsep"><i>Thornton Wilder Commemorative</i>, Directed by David Grillo, Yale Club, NY, 12/97.
-<p CLASS="indentandsep"><i>Much Ado About Nothing</i>, Directed by Allison Narver, Yale Experimental Theater, CT, 4/97.
-<p CLASS="indentandsep"><i>The Cryptogram</i>, Written by David Mamet, Directed by Mark Rucker, Starring Stephen Spinella and Ellen McLaughlin, Yale Repertory Theater, CT, 11/96.
-<p CLASS="indentandsep"><i>Hamlet</i>, Directed by Andrew Utter, Yale Experimantal Theater, CT, 1/96.
-<p CLASS="indentandsep"><i>The Art of Success</i>, Written by Nick Dear, Directed by Preston Lane, Yale Repertory Theater, CT, 10/95.
-
-<p CLASS="indentandsep"><i>Waiting For Godot</i>, Written by Samuel Beckett, Directed by Constance Grappo, Yale University Theater, CT, 3/95.
-<p CLASS="indentandsep"><i>Judge and Jury</i>, Directed by Robert Kreis, Off-Off Broadway, 13th Street Repertory Theater, NY, Spring 1994.
-<p CLASS="indentandsep"><i>Miscast</i>, Written by Jennie S. Staniloff, Directed by Jeremy Dobrish, Off-Off Broadway, Soho Rep, NY, 7/93.
-<p CLASS="indentandsep"><i>Underground Goddess</i>, Written by Abigail Gampel, Directed by Anthony Koplin, Public Fringe Festival, Lu Esther Hall, Public Theater, NY, 4/93.
-<p CLASS="indentandsep"><i>Internfest</i>, Helena Webb, Coordinator, Off-Off Broadway, Ensemble Studio Theater, NY, 1992.
-<p CLASS="indentandsep"><i>Franks Life</i>, Written by Mark Dunn, Directed by Laura Josepher, Off-Off Broadway, 13th Street Repertory Theater, NY, 5/92.
-<p CLASS="indentandsep"><i>Seven Pillars of Wicca-Dick: A Triumph</i>, Written and Performed by Mark Ameen, Directed by Rich Rubin, Off-Off Broadway, Duality Playhouse, NY, 11/91.
-<p CLASS="indentandsep"><i>Coco</i>, Directed by Vincent Kyd, Off Broadway, Judith Anderson Theater, NY, 1991.
-<p CLASS="indentandsep"><i>Mame</i>, Written by Jerry Herman, Jerome Lawrence and Robert E. Lee, Directed by Christine Watson, Regional, John Harms Theater, NJ, 1991.
-										</td>
-
-									</tr>
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>DANCE:</b></td>
-									</tr>
-									<tr>
-										<td ALIGN="LEFT"></td>
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep">American College Dance Festival Association, Student and Faculty Choreographers,  Muhlenberg  College, PA, 3/02
-<p CLASS="indentandsep">Marymount Manhattan, NY, <i>Dancers At Work</i>, Student Choreographers, 12/01
-
-<p CLASS="indentandsep">David Parker-The Bang Group, <i>Lowbrowse</i>, Zagreb, Croatia, 6/01.
-<p CLASS="indentandsep">SUNY Purchase, NY,  MFA Concert, 5/01 <i>Dearest,  Awkward Silence</i>, Choreographed by Jean McDade;  <i>Les Enfants Terrible,  Anchor</i>, Choreographed by Ayako Kurakake.
-<p CLASS="indentandsep">Carol Nolte/Dance Collective, <i>The Skinwalker, Off The Grid, Yellow Dog Blues,</i> New York Premiere, 3/01.
-<p CLASS="indentandsep">Troika Ranch, <i>Reine-Rien,  Suite Devo, She IS Not A Fictional Character,</i>  9/01; <i>Chemical Wedding of Christian Rosenkreutz,</i> New York Premiere, 1/01; <i>Red People,</i> 6/00; <i>Vera's Body,</i> New York Premiere, 8/99; <i>Bank/Perspective 1,</i> 6/98; <i>In Plane,</i> 6/98; <i>Monitored,</i> 6/98; Choreographed by Dawn Stoppiello.
-
-<p CLASS="indentandsep">Lise Brenner and Company, <i>Birdcalls,</i> New York Premiere, 12/00; <i>And I will see you there Always,</i> New York Premiere, 5/99; <i>Polka Love,</i> New York Premiere, 5/99; <i>Franks Dance I-III,</i> 5/99; <i>The Fifth Season,</i> 5/99.
-<p CLASS="indentandsep">Wellspring Project, 11/00, <i>Hymne A La Vie</i>, Choreographed by Mariko Tanabe; <i>Caesura</i>, Choreographed by Ashley Smith; <i>Hidden Places of Snow</i>, Choreographed by Lise Brenner, Riverside Church Theater, NY.
-
-<p CLASS="indentandsep">Alice Farley, <i>Black Fire</i>, New York Premiere, 9/00; <i>Imaginary Ancestors</i>, 10/93.
-<p CLASS="indentandsep">Susan Cherniak, <i>Wunderhorn Tanz</i>, New York Premiere, 9/00; <i>Ego</i>, 9/00; <i>Fragile Life</i>, 9/00; <i>The Wind Bids a Lover's Farewell</i>, 9/00; <i>Rheinlegendchen</i>, 9/00; <i>Riders of The Tides</i>, 9/00; <i>Engravings in Space</i>, 9/00; <i>Out of The Sea Came She</i>, New York Premiere, 4/99; <i>Far Woods</i>, 4/99; <i>The Second Half of Joy</i>, 4/99; <i>Toil</i>, 4/99, Cunningham Studios, NY.
-
-<p CLASS="indentandsep">Muhlenberg College, PA, <i>Faculty Dance Concert</i>, 1998 to Present, Choreographed by Karen Dearborn, Clare Byrne, Shelly Oliver, Kimberly Manisealco.
-<p CLASS="indentandsep">Fly By Night Dance Theater, <i>Seasoned Women</i>, 3/00; <i>Three's a Crowd</i>, 3/00; <i>Birds of a Feather</i>, 3/00; <i>By Chance</i>, 6/99; <i>The Colors of Flight</i>, 6/99; Choreographed by Julie Ludwick.
-<p CLASS="indentandsep">Old Dominion University Ballet, <i>The Nutcracker</i>, 12/99, Choreographed by Istvan Ament, Norfolk Performing Arts Center, VA.
-
-<p CLASS="indentandsep">Jonathon Appels Company, <i>The Lake Is Now Closed For Swimming</i>, <i>Not An Exit Door</i>, <i>Coco-Grille</i>, Morocco Tour, 6/99.
-<p CLASS="indentandsep"><i>Four By Bard</i>, 7/99, <i>Periodic Solution</i>, <i>Not Gentle</i>, <i>Snow</i>, Choreographed by Jean Churchill; <i>In Tandem</i>, Choreographed by Peggy Florin with Jean Churchill; <i>Benched</i>, Choreographed by Peggy Florin; <i>Land in Sky-Fire in Water</i>, <i>Rumi</i>, Choreographed by Susan Osberg; <i>Spell</i>, Choreographed by Gary Reigenborn, Rhinebeck Performing Arts Center, NY.
-
-<p CLASS="indentandsep">Bard College, NY, Dance Theater IV, 11/97, <i>The Dying of The Light</i>, Choreographed by Albert Reid; <i>Far Rockaway</i>, Choreographed by Rosalie Purvis; <i>Dream Songs</i>, Choreographed by Rosalie Purvis and Megan Savage; <i>109 Freeman Street</i>, <i>String Theory</i>, Choreographed by Suzanne Schulz; <i>Cosmic Tones</i>, Choreographed by Kristin Solomon.
-<p CLASS="indentandsep">New Choreographers on Pointe, 2/94, <i>Bits of Love in E Flat Major</i>, Choreographed by Michael Kraus; <i>Expectations</i>, Choreographed by Mark Diamond; <i>Mandara</i>, Choreographed by Chil Han; <i>Fall Pas de Deux from Seasons</i>, Choreographed by Raymond Van Mason; <i>Pastoral</i>, Choreographed by Jenny Siu-kan Chiang; <i>Rushing Water</i>, Choreographed by Kathryn Posin, Marymount Manhattan Theater, NY.
-
-<p CLASS="indentandsep">Choreographer Showcases, Mariko Tanabe, Curator, Context Studios, NY. 93-94.
-<p CLASS="indentandsep">Allnations Dance Company, Selected Productions, Chuck Golden, Manager, 92-94.
-<p CLASS="indentandsep">Bard Alumni Concert, 9/93, <i>Intoxicating Calm</i>, <i>The Typical New York-Rican</i>, Choreographed by Arther Aviles; <i>Trilogy for Two</i>, Choreographed by David Parker with Jeffrey Kazin; <i>Landings</i>, <i>Incidence of Light</i>, Choreographed by Gina Gibney; <i>A Blip on The Horizon</i>, <i>Salad Days</i>, <i>Intervals</i>, Choreographed by Susan Christensen; <i>Whose Life</i>, Choreographed by Kaitlyn Granda; <i>Black Jello</i>, Choreographed by Rob Kitsos, Bard College Dance Theater, NY.
-
-<p CLASS="indentandsep">Marijeanne Liederbach and Company, <i>Lake</i>, <i>Good Apprentices</i>, <i>Montage #1</i>, <i>Herself</i>, <i>So There</i>, Dia Center For The Arts, NY, 4/93.
-<p CLASS="indentandsep"><i>Field Benefit Concert</i>, Various Artists, Steve Gross, Artistic Director, The Kitchen, NY, 1992.
-<p CLASS="indentandsep">Marc and Julliet Franco, <i>Le Marble Tremble</i>, Schloss Charlottenberg, Germany, Spring 1992.
-<p CLASS="indentandsep">Emergency Fund For Student Dancers, 1/92, <i>Touch</i>, Choreographed by Ana Escoda; <i>Adagietto #5</i>, Choreographed by Royston Maldoom; <i>Tree Song</i>, Choreographed by Jacqulyn Buglisi; <i>Bolt Out of The Blue</i>, Choreographed by Brenda Baden-Semper; <i>Between me and me</i>, Choreographed by Maki Fujita; <i>Insomnia</i>, Choreographed by Paolo Mereu and Riikka Rasanen; <i>De Sus Pies</i>, Choreographed by Sabrina Peck; <i>Liebesbotschaft</i>, Choreographed by Henning Rubsam; <i>Our Turn To Swallow</i>, Choreographed by Sara Hook, Marymount Manhattan Theater, NY.
-
-<p CLASS="indentandsep">New Choreographers on Pointe, 2/92, Michael Kraus, Curator, Marymount  Manhattan Theater, NY.
-<p CLASS="indentandsep">Bard College, NY, <i>Dance Theater II</i>, 4/90, <i>Shaken Not Stirred</i>, <i>Photos From The Attic</i>, Choreographed by Susan Hamburger; <i>Funky People</i>, Choreographed by Rob Kitsos; <i>Undercurrents</i>, Choreographed by Christephor Gilbert.
-<p CLASS="indentandsep">Frey Faust, Selected Dances, Spring 1989, Bard College Dance Studio.
-<p CLASS="indentandsep"><i>Aids Benefit Concert</i>, Spring 1989, Jean Churchill, Chairperson, Bard College Olin Auditorium, NY.
-<p CLASS="indentandsep">Bard College, NY, <i>Dance Theater I</i>, 2/89, <i>Artemis in a Thunderstorm</i>, Choreographed by Aileen Passiloff; <i>Pas de Ducks</i>, Choreographed by Susan Hamburger; <i>Simply Bananas</i>, Choreographed by Kelly Munn; <i>Watch Out</i>, Choreographed by Beth Ann Finisdore.
-										</td>
-
-									</tr>
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>MUSIC/OPERA:</b></td>
-									</tr>
-									<tr>
-										<td ALIGN="LEFT"></td>
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep"><i>Bang On A Can Festival,</i> Various Artists, Kevin Cunningham, Production Manager, The Kitchen, NY, 1993.
-
-<p CLASS="indentandsep"><i>The Two Widows,</i> Manhattan School of Music, NY, Associate Lighting Designer; Rick Martin, Lighting Designer, 4/98.
-										</td>
-									</tr>
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>EXHIBITION AND INDUSTRIAL:</b></td>
-									</tr>
-									<tr>
-										<td ALIGN="LEFT"></td>
-
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep">Physical Therapy Studio, Marijeanne Liederbach, Therapist/ Owner, City Center, NY, 1/02.
-<p CLASS="indentandsep"><i>The Big Swim</i>,  Asphalt Green Pool, NY,  Assistant Lighting Designer; John Kelly Lighting Designer, 4/01.
-<p CLASS="indentandsep"><i>State Farm Industrial</i>, State Farm Company, US Tour, Assistant Lighting Designer; Gene Lenahan, Lighting Designer, Summer 2000.
-<p CLASS="indentandsep">Sotheby's Auction House, NY, Selected Auctions, 1997-2001.
-										</td>
-									</tr>
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>ASSOCIATE AND ASSISTANT LIGHTING DESIGNER:</b></td>
-									</tr>
-
-									<tr>
-										<td ALIGN="LEFT"></td>
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep"><i>Last 5 Years</i>, Directed by Daisy Prince, Minetta Lane Theater, NY, Assistant Lighting Designer; Christine Binder, Lighting Designer, 3/02.
-<p CLASS="indentandsep"><i>Caravane</i>, Tamango and Urban Tap,  2001-2002 Tour, Associate Lighting Designer; Michael Mazzola, Lighting Designer, 2001-2002.
-<p CLASS="indentandsep">Lucinda Childs Dance Company, <i>25th Anniversary European Tour</i>, Associate Lighting Designer;  Pat Dignan, Eric Wurtz Lighting Designers Spring 2000.	
-<p CLASS="indentandsep"><i>Jet Lag</i>, The Builder's Association, Directed by Marianne Weems, European tour, Associate Lighting Designer; Jennifer Tipton, Lighting Designer, 1998-2000.
-<p CLASS="indentandsep"><i>Jump Cut</i>, The Builder's Association, Directed by Marianne Weems, Williamsburg Art and Historical, NY, Assistant Lighting Designer; Jennifer Tipton, Lighting Designer, 11/98.
-
-<p CLASS="indentandsep"><i>The Sound of Music</i>, Directed by Susan H. Schulman, Starring Rebecca Luker, Martin Beck Theater, Assistant to Mr Gallo, Paul Gallo, Lighting Designer, Winter 1998.
-<p CLASS="indentandsep"><i>Tharp!</i>, Twyla Tharp, Choreographer, Assistant Lighting Designer; Jennifer Tipton, Lighting Designer, University of Massachusetts, Amhearst, 3/98.
-<p CLASS="indentandsep"><i>Le Bourgeois Avante Garde</i>, Written by Charles Ludlam, Directed by Liz Diamond, Assistant Lighting Designer; Robert Wierzel, Lighting Designer, 4/95.
-<p CLASS="indentandsep"><i>The Three Sisters</i>, Written by Anton Chekov, Assistant Lighting Designer; Mathew Addelson, Lighting Designer, 11/94.
-<p CLASS="indentandsep"><i>Juilliard Drama III Repertory</i>, Juilliard Drama Theater, NY, Assistant Lighting Designer; Matthew Frey, Lighting Designer, 3/93.
-<p CLASS="indentandsep">Selected Productions, Regional and Off Broadway, Assistant Lighting Designer; Douglas O'Flaherty, Lighting Designer, 1991-1993.
-										</td>
-									</tr>
-									<tr>
-										<td COLSPAN="2" ALIGN="LEFT"><p><b><br>SPECIAL SKILLS:</b></td>
-
-									</tr>
-									<tr>
-										<td ALIGN="LEFT"></td>
-										<td ALIGN="LEFT">
-<p CLASS="indentandsep">Teaching Artist, Roundabout Education Department.
-<p CLASS="indentandsep">Fluency in German, ability in French and Spanish.
-<p CLASS="indentandsep">Experience as Modern Dance choreographer and performer.
-<p CLASS="indentandsep">Experience in computer drafting and Photoshop.
-										</td>
-									</tr>
-								</table>
-
-							</td>
-						</tr>
-					</table>
-				</center>
-			</td>
-		</tr>
-		<tr>
-			<td WIDTH="110" VALIGN="TOP" ALIGN="LEFT">
-				<a HREF="./"><img SRC="../images/002-bizcard-small.gif" WIDTH="102" HEIGHT="59" BORDER="0" ALT="Susan Hamburger - Lighting Designer"></a><br>
-
-				<p CLASS="menu">
-				<br><br>
-				<a CLASS="homelink" HREF="./">Home</a>
-				<br><br>
-				<a CLASS="portfoliolink" HREF="portfolio.html">Portfolio</a>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;<a CLASS="theatrelink" HREF="theatre.html">theatre</a>
-
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;<a CLASS="dancelink" HREF="dance.html">dance</a>
-				<br>
-				&nbsp;&nbsp;&nbsp;&nbsp;<a CLASS="operalink" HREF="opera.html">opera</a>
-				<br><br>
-				<a CLASS="resumelink" HREF="resume.html">Resume</a>
-				<br><br>
-
-				<a CLASS="contactlink" HREF="contact.html">Contact</a>
-			</td>
-		</tr>
-		<tr>
-			<td ALIGN="LEFT">
-				&nbsp;
-			</td>
-			<td ALIGN="CENTER">
-
-				<br><br><br><br>
-				<hr WIDTH="80%">
-				<p CLASS="credits">
-				Copyright &copy; 2002 Susan Hamburger
-				<br>
-				Web Services by <a HREF="http://www.goluxstudio.com/web.html">Golux Studio, Inc.</a>
-			</td>
-
-		</tr>
-	</table>
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug165772-2.html b/layout/html/tests/table/printing/bug165772-2.html
deleted file mode 100644
index d18d85dc52ae..000000000000
--- a/layout/html/tests/table/printing/bug165772-2.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head></head><body><div style="border: 1px solid blue; width: 50px; height: 740px;"></div>
-<table border="1">
- <tbody><tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C01</td>
-  <td>C02</td>
- </tr>
- <tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C12</td>
- </tr>
- <tr>
-  <td>C20</td>
-  <td>C22</td>
- </tr>
-</tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug165772-3.html b/layout/html/tests/table/printing/bug165772-3.html
deleted file mode 100644
index 4915a62a7f55..000000000000
--- a/layout/html/tests/table/printing/bug165772-3.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head></head><body><div style="border: 1px solid blue; width: 50px; height: 740px;"></div>
-<table border="1">
- <tbody><tr>
-  <td rowspan="2">one<br>two<br>three<br>four<br>five</td>
-  <td>C01</td>
-  <td>C02</td>
- </tr>
- <tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C12</td>
- </tr>
- <tr>
-  <td>C20</td>
-  <td>C22</td>
- </tr>
-</tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug165772-4.html b/layout/html/tests/table/printing/bug165772-4.html
deleted file mode 100644
index bb3f1e4eb344..000000000000
--- a/layout/html/tests/table/printing/bug165772-4.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head></head><body><div style="border: 1px solid blue; width: 50px; height: 790px;"></div>
-<table border="1">
- <tbody><tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C01</td>
-  <td>C02</td>
- </tr>
- <tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C12</td>
- </tr>
- <tr>
-  <td>C20</td>
-  <td>C22</td>
- </tr>
-</tbody></table>
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug165772-5.html b/layout/html/tests/table/printing/bug165772-5.html
deleted file mode 100644
index 6889dfe0188e..000000000000
--- a/layout/html/tests/table/printing/bug165772-5.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head></head><body><div style="border: 1px solid blue; width: 50px; height: 790px;"></div>
-<table border="1">
- <tbody><tr>
-  <td rowspan="2">one<br>two<br>three<br>four<br>five</td>
-  <td>C01</td>
-  <td>C02</td>
- </tr>
- <tr>
-  <td rowspan="2"><button style="width: 50px; height: 100px;">button</button></td>
-  <td>C12</td>
- </tr>
- <tr>
-  <td>C20</td>
-  <td>C22</td>
- </tr>
-</tbody></table>
-
-</body></html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug24000-1.html b/layout/html/tests/table/printing/bug24000-1.html
deleted file mode 100644
index 809d51299c5f..000000000000
--- a/layout/html/tests/table/printing/bug24000-1.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<title>Test of page-break-after</title>
-<style>
-   P {page-break-after :always}
-</style>
-</head>
-<body>
-<p>
-This test attempts to use CSS2's page-break-after. This should create 3 pages when printed.<br>
-Page 1
-</p>
-
-<p>
-Page 2
-</p>
-Page 3
-</body>
-</html>
-
diff --git a/layout/html/tests/table/printing/bug24000-2.html b/layout/html/tests/table/printing/bug24000-2.html
deleted file mode 100644
index 36f9de29b493..000000000000
--- a/layout/html/tests/table/printing/bug24000-2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-text on 1st page
-<table style="page-break-before: always; page-break-after: always" border>
- <tbody>
-  <tr><td>table on a new page</td></tr>
- </tbody>
- <tbody style="page-break-after: always">
-  <tr><td>tbody on same page</td></tr>
- </tbody>
- <tbody style="page-break-before: always; background-color:red;">
-  <tr><td>tbody on new page</td></tr>
- </tbody>
-</table>
-<BR>
-<table border>
- <tr>
-  <td>table on a new page</td></tr>
- <tr style="page-break-after: always">
-  <td>row on same page</td></tr>
- <tr style="page-break-before: always; background-color:red;">
-  <td>row on new page</td></tr>
-</table>
-<BR>
-<div style="border:1px solid black; page-break-before:always">div on a new page</div>
-<div style="border:1px solid black; page-break-after:always">div on same page as previous one</div>
-<div style="border:1px solid black;">div on a new page</div>
--->
-
diff --git a/layout/html/tests/table/printing/bug26792.html b/layout/html/tests/table/printing/bug26792.html
deleted file mode 100644
index f8528180c67d..000000000000
--- a/layout/html/tests/table/printing/bug26792.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-                        "http://www.w3.org/TR/REC-html40/loose.dtd">
-
-<title>test</title>
-
-<style type="text/css">
-<!--
-p {
-  font-size: 3em; margin-top: 11px; margin-bottom: 0;
-}
---></style>
-
-<table cellpadding="5">
-<tr>
- <td>
-  <p>a<br>b<br><br>d</p>
- </td>
-</tr>
-<tr>
- <td>
-  <p>e<br>f<br><br>h</p>
- </td>
-</tr>
-<tr>
- <td>
-  i<p>j<br>k<br><br>m</p>
- </td>
-</tr>
-<tr>
- <td>
-  n<br><br>n
- </td>
- <td>
-  o<p>p<br>q<br><br>s</p>
- </td>
-</tr>
-<tr>
- <td>
-  t
- </td>
-</tr>
-<tr>
- <td>
-  u<br><br><br>y
- </td>
-</tr>
-</table>
diff --git a/layout/html/tests/table/printing/bug362348.html b/layout/html/tests/table/printing/bug362348.html
deleted file mode 100644
index dd4df934da1f..000000000000
--- a/layout/html/tests/table/printing/bug362348.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<title>
-Testcase bug 362348 - Crash [@ nsTableRowFrame::CollapseRowIfNecessary] on print preview with testcase, using display: table-footer-group; visibility: collapse;
-</title>
-</head>
-<body>
-This page should not crash on print preview
-<div style="display: table;">
-    <div style="height:6100px;"></div>
-  <div style="display: table-footer-group; visibility: collapse;"></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/layout/html/tests/table/printing/bug53690.html b/layout/html/tests/table/printing/bug53690.html
deleted file mode 100644
index 2057b58b2b73..000000000000
--- a/layout/html/tests/table/printing/bug53690.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<HTML><BODY><TABLE><TR><TD>
- <TABLE border=1><TR><TD><SCRIPT language=JavaScript>
-
-document.write('<form method=post name = "DominoForm1" action="' + document.forms[1].action + '">');
-
-</SCRIPT>
-</TD></TR></TABLE></TD><TD>X</TD></TR></TABLE>
diff --git a/layout/html/tests/table/printing/bug54829.html b/layout/html/tests/table/printing/bug54829.html
deleted file mode 100644
index 3c2c68e78769..000000000000
--- a/layout/html/tests/table/printing/bug54829.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<table>
- <thead>
-  <tr><td>foo</td></tr>
- </thead>
- <tbody>
-  <tr>
-   <td>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>
-       foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>fooX<BR></td>
-  </tr>
-  <tr>
-   <td>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>
-       foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>foo<BR>fooY<BR></td>
-  </tr>
- </tbody>
-</table>
diff --git a/layout/html/tests/table/printing/bug57378.html b/layout/html/tests/table/printing/bug57378.html
deleted file mode 100644
index a07f2de507e7..000000000000
--- a/layout/html/tests/table/printing/bug57378.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html lang="en">
-
-<BODY>
-<table border=1 align=center>
-<thead><tr align=center><th>Name<th>Values<th>Initial value<th>Applies to <BR> (Default: all)<th>Inherited?<th>Percentages <BR> (Default: N/A)<th>Media groups<BR></thead>
-<tr><td><a href="aural.html#propdef-azimuth" class="noxref"><span class="propinst-azimuth">'azimuth'</span></a>
-<td><a href="syndata.html#value-def-angle" class="noxref"><span class="value-inst-angle noxref">&lt;angle&gt;</span></a> | [[ left-side | far-left | left | center-left | center | center-right | right | far-right | right-side ] || behind ] | leftwards | rightwards | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>center
-<td>&nbsp;
-<td>yes
-<td>&nbsp;
-<td><a href="media.html#aural-media-group">aural</a>
-
-<tr><td><a href="colors.html#propdef-background" class="noxref"><span class="propinst-background">'background'</span></a>
-<td>[<a href="colors.html#propdef-background-color" class="noxref"><span class="propinst-background-color noxref">'background-color'</span></a> || <a href="colors.html#propdef-background-image" class="noxref"><span class="propinst-background-image noxref">'background-image'</span></a> || <a href="colors.html#propdef-background-repeat" class="noxref"><span class="propinst-background-repeat noxref">'background-repeat'</span></a> || <a href="colors.html#propdef-background-attachment" class="noxref"><span class="propinst-background-attachment noxref">'background-attachment'</span></a> || <a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position noxref">'background-position'</span></a>] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>XX
-<td>&nbsp;
-<td>no
-<td>allowed on 'background-position'
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="colors.html#propdef-background-attachment" class="noxref"><span class="propinst-background-attachment">'background-attachment'</span></a>
-<td>scroll | fixed | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>scroll
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="colors.html#propdef-background-color" class="noxref"><span class="propinst-background-color">'background-color'</span></a>
-<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color noxref">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>transparent
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="colors.html#propdef-background-image" class="noxref"><span class="propinst-background-image">'background-image'</span></a>
-<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri noxref">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>none
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position">'background-position'</span></a>
-<td>[ [<a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage noxref">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length noxref">&lt;length&gt;</span></a> ]{1,2} |  [ [top | center | bottom] || [left | center | right] ] ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>0% 0%
-<td>block-level and replaced elements
-<td>no
-<td>refer to the size of the box itself
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="colors.html#propdef-background-repeat" class="noxref"><span class="propinst-background-repeat">'background-repeat'</span></a>
-<td>repeat | repeat-x | repeat-y | no-repeat | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>repeat
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border" class="noxref"><span class="propinst-border">'border'</span></a>
-<td>[ <a href="box.html#propdef-border-width" class="noxref"><span class="propinst-border-width noxref">'border-width'</span></a> || <a href="box.html#propdef-border-style" class="noxref"><span class="propinst-border-style noxref">'border-style'</span></a> || <a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color noxref">&lt;color&gt;</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>see individual properties
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="tables.html#propdef-border-collapse" class="noxref"><span class="propinst-border-collapse">'border-collapse'</span></a>
-<td>collapse | separate | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>collapse
-<td>'table' and 'inline-table' elements
-<td>yes
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-color" class="noxref"><span class="propinst-border-color">'border-color'</span></a>
-<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color noxref">&lt;color&gt;</span></a>{1,4} | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>see individual properties
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="tables.html#propdef-border-spacing" class="noxref"><span class="propinst-border-spacing">'border-spacing'</span></a>
-<td><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length noxref">&lt;length&gt;</span></a> <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length noxref">&lt;length&gt;</span></a>? | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>0
-<td>'table' and 'inline-table' elements
-<td>yes
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-style" class="noxref"><span class="propinst-border-style">'border-style'</span></a>
-<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style noxref">&lt;border-style&gt;</span></a>{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>see individual properties
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-top" class="noxref"><span class="propinst-border-top">'border-top'</span></a>
-<a href="box.html#propdef-border-right" class="noxref"><span class="propinst-border-right">'border-right'</span></a>
-<a href="box.html#propdef-border-bottom" class="noxref"><span class="propinst-border-bottom">'border-bottom'</span></a>
-<a href="box.html#propdef-border-left" class="noxref"><span class="propinst-border-left">'border-left'</span></a>
-<td>[ <a href="box.html#propdef-border-top-width" class="noxref"><span class="propinst-border-top-width noxref">'border-top-width'</span></a> || <a href="box.html#propdef-border-style" class="noxref"><span class="propinst-border-style noxref">'border-style'</span></a> || <a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color noxref">&lt;color&gt;</span></a> ] | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>see individual properties
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-top-color" class="noxref"><span class="propinst-border-top-color">'border-top-color'</span></a>
-<a href="box.html#propdef-border-right-color" class="noxref"><span class="propinst-border-right-color">'border-right-color'</span></a>
-<a href="box.html#propdef-border-bottom-color" class="noxref"><span class="propinst-border-bottom-color">'border-bottom-color'</span></a>
-<a href="box.html#propdef-border-left-color" class="noxref"><span class="propinst-border-left-color">'border-left-color'</span></a>
-<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color noxref">&lt;color&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>the value of the 'color' property
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-top-style" class="noxref"><span class="propinst-border-top-style">'border-top-style'</span></a>
-<a href="box.html#propdef-border-right-style" class="noxref"><span class="propinst-border-right-style">'border-right-style'</span></a>
-<a href="box.html#propdef-border-bottom-style" class="noxref"><span class="propinst-border-bottom-style">'border-bottom-style'</span></a>
-<a href="box.html#propdef-border-left-style" class="noxref"><span class="propinst-border-left-style">'border-left-style'</span></a>
-<td><a href="box.html#value-def-border-style" class="noxref"><span class="value-inst-border-style noxref">&lt;border-style&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>none
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-<tr><td><a href="box.html#propdef-border-top-width" class="noxref"><span class="propinst-border-top-width">'border-top-width'</span></a>
-<a href="box.html#propdef-border-right-width" class="noxref"><span class="propinst-border-right-width">'border-right-width'</span></a>
-<a href="box.html#propdef-border-bottom-width" class="noxref"><span class="propinst-border-bottom-width">'border-bottom-width'</span></a>
-<a href="box.html#propdef-border-left-width" class="noxref"><span class="propinst-border-left-width">'border-left-width'</span></a>
-<td><a href="box.html#value-def-border-width" class="noxref"><span class="value-inst-border-width noxref">&lt;border-width&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit noxref">inherit</span></a>
-<td>medium
-<td>&nbsp;
-<td>no
-<td>&nbsp;
-<td><a href="media.html#visual-media-group">visual</a>
-
-
-</table>
-</BODY>
-</HTML>
-
diff --git a/layout/html/tests/table/printing/bug57467.html b/layout/html/tests/table/printing/bug57467.html
deleted file mode 100644
index 5e5e4c3607ea..000000000000
--- a/layout/html/tests/table/printing/bug57467.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-<TITLE>Netscape Standards Challenge</TITLE>
-</HEAD">
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#0000FF" VLINK="#CC0000">
-TEXT OUTSIDE OF TABLE
-
-<TABLE BORDER="1" WIDTH="600" CELLPADDING="0" CELLSPACING="0">
- <TR>
-  <TD>FIRST ROW</td>
- </tr>
- <TR>
-  <TD>
-SECOND ROW<BR>
-W3C Standards Support in IE and the Netscape Gecko Browser Engine
-
-<p>
-&quot;The underlying technology of the web browser has reached the point where standards compliance must take precedence. In order for the web to maintain its bullet-train rate of innovation, the web browser must become a stable building block for site designers, just as standardization on Windows has encouraged innovation in the PC space.&quot; - David Kerley, senior analyst, Jupiter Communications
-<p>
-Why support web standards? It's pretty clear to us here at Netscape that a standards-compliant browser provides developers and end users with the following benefits:
-<ul>
-<li>ability to access rich web content and applications across a variety of hardware platforms and devices
-<li>reduced cost for content and application development by enabling development to a single specification 
-<li>increased innovation by providinga rich, standards-based platform for application development
-<li>freedom of choice by reducing switching costs between vendors and applications
-<li>investment protection by enabling the creation of applications built on stable industry standards rather than proprietary technology subject to change </li">
-<li>the preservation of vigorouscompetition between vendors by preventing vendor lock-in 
-</ul>
-Given the demand by developers and users for web standards compliance in browsers, it's surprising to find newly-released browsers that don't adhere to published, mature web standards. Yet even brief testing reveals dramatic differences in the scope, robustness, and consistency across platforms of the W3C standards support in the latest releases of Internet Explorer and the Netscape Gecko browser engine in the Mozilla M13 milestone build. This document compares the two browsers' support for the following: 
-<ul>
-<li><a href="#5">Document Object Model (DOM)</a>
-<li><a href="#3">Extensible Markup Language (XML)</a>
-<li><a href="#4">Resource Description Framework (RDF)</a>
-<li><a href="#1">Cascading Style Sheets, Level 1 (CSS-1)</a>
-<li><a href="#2">HyperText Markup Language 4.0 (HTML 4.0)</a>
-</ul>
-Netscape Gecko's robust support for W3C standards for the first time 
-          enables the development of sophisticated, entirely standards-based applications. 
-          Developers are already applauding this commitment to enabling the platform, 
-          device, browser, and vendor-independent web applications of the future. 
-          Meanwhile, industry leaders like IBM, Intel, Liberate, NetObjects, Nokia, 
-          red Hat, and Sun Microsystems are <a
-
-  href="http://home.netscape.com/newsref/pr/newsrelease799.html">adopting</a> 
-          Netscape Gecko to power a new generation of web browsers, web-enabled 
-          applications, and web browsing devices that will bring low cost, trouble-free 
-          Internet access to millions of new users who lack it today. To hasten 
-          the web application and web device revolutions, Netscape Gecko also 
-          supports free, open source, cross-platform <a
-
-  href="http://home.netscape.com/browsers/gecko/whitepaper.pdf">Netscape Gecko 
-          Technologies</a> that make it easier to achieve this unprecedented standards 
-          support across platforms and devices by speeding the implementation 
-          of standards-compliant browsers, applications, set top boxes, and browsing 
-          appliances.
-<p>
-<B><FONT COLOR="#000066">Document Object Model (DOM)</FONT><A NAME="5"></A></B>
-<p> As the standard itself states, the Document Object Model Level 1 provides 
-          &quot;a platform- and language-neutral interface that allows programs 
-          and scripts to dynamically access and update the content, structure 
-          and style of documents. The Document Object Model provides a standard 
-          set of objects for representing HTML and XML documents, a standard model 
-          of how these objects can be combined, and a standard interface for accessing 
-          and manipulating them. Vendors can support the DOM as an interface to 
-          their proprietary data structures and APIs, and content authors can 
-          write to the standard DOM interfaces rather than product-specific APIs, 
-          thus increasing interoperability on the web.&quot;
-<p>
-Robust support for 
-          the W3C DOM is perhaps the most critical requirement for enabling the 
-          next generation of platform and device independent web applications 
-          that will have functionality and user interfaces equivalent to current 
-          native applications, because it is the W3C DOM that opens up the content 
-          and format of the page to manipulation from languages like JavaScript. 
-          The W3C DOM, level 1 has two parts: DOM 1 Core and DOM 1 HTML. DOM 1 
-          Core provides a crucial set of core methods for reading, writing, and 
-          changing the content of documents on any platform or device--methods 
-          that work equally well for HTML and XML. DOM 1 HTML provides a set of 
-          convenience extensions that are specific to HTML documents only.
-
-Robust support for 
-          the W3C DOM is perhaps the most critical requirement for enabling the 
-          next generation of platform and device independent web applications 
-          that will have functionality and user interfaces equivalent to current 
-          native applications, because it is the W3C DOM that opens up the content 
-          and format of the page to manipulation from languages like JavaScript. 
-          The W3C DOM, level 1 has two parts: DOM 1 Core and DOM 1 HTML. DOM 1 
-          Core provides a crucial set of core methods for reading, writing, and 
-          changing the content of documents on any platform or device--methods 
-          that work equally well for HTML and XML. DOM 1 HTML provides a set of 
-          convenience extensions that are specific to HTML documents only.
-  </td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/printing/bug58665.html b/layout/html/tests/table/printing/bug58665.html
deleted file mode 100644
index f5514db6a3c1..000000000000
--- a/layout/html/tests/table/printing/bug58665.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<body>
-  <table border="2" cellspacing="1" bordercolor="#006633" width="575"
-   bordercolorlight="#33999B" bordercolordark="#000000" cellpadding="0" height="1171">
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 1 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 2 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 3 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 4 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 5 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 6 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 7 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 8 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 9 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 10 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 11 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> 
-                  <p align="CENTER"><b>12</b> 
-                </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 13 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 14 
-                  </b> </td>
-             </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 15 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 16 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 17 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="7"> <b> 
-                  <p align="CENTER"> 18 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="7"><b> 
-                  <p align="CENTER">19 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 20 
-                  </b></td>
-             </tr>
-              <tr> 
-                <td width="7%" height="16"> <b> 
-                  <p align="CENTER"> 21 
-                  </b> </td>
-              </tr>
-              <tr> 
-                <td width="7%" height="15"> <b> 
-                  <p align="CENTER"> 22 
-                  </b> </td>
-              </tr>
-</table>
diff --git a/layout/html/tests/table/printing/bug59280-1.html b/layout/html/tests/table/printing/bug59280-1.html
deleted file mode 100644
index 3afa1a4f2a45..000000000000
--- a/layout/html/tests/table/printing/bug59280-1.html
+++ /dev/null
@@ -1,509 +0,0 @@
-<html>
-<head>
-<title>Your Order with Amazon.com</title>
-<meta http-equiv="Content-Type" content="text/html;
-charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" link="#0066CC">
-
-<table width="80%" border="0" cellspacing="0" cellpadding="1" align="center">
-  <tr> 
-    <td valign="middle" height="61">
-<a href="http://www.amazon.com/exec/obidos/subst/home/home.html/ref=cs_ae_amp"><img src="../images/amazon-logo.gif" width=142 height=31 border=0 alt="Amazon.com logo"></a></td>
-    <td height="61"> 
-      <div align="right">
-        <img src="../images/control.gif" width=85 height=36 border=0 alt="your account" usemap="#double_tab_nav_map">
-<map name="double_tab_nav_map">
-
-<area shape="rect" coords="2,18,82,35" href="http://www.amazon.com/exec/obidos/account-access-login/ref=cs_ae_yr">
-<area shape="rect" coords="2,2,40,17" href="http://www.amazon.com/exec/obidos/shopping-basket/ref=cs_ae_cart">
-<area shape="rect" coords="40,2,82,17" href="http://www.amazon.com/exec/obidos/subst/help/desk.html/ref=cs_ae_help">
-</map>
-<br>
-        <br>
-      </div>
-    </td>
-  </tr>
-  <tr bgcolor="00659c" valign="top"> 
-    <td colspan="2" height="812"> 
-      <table width="100%" border="0" cellspacing="0" cellpadding="5" bgcolor="#FFFFFF">
-        <tr> 
-          <td rowspan="4" width="95%" valign="top"> 
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr> 
-                <td height="348"> 
-                  <table width="100%" cellpadding="4">
-                    <tr valign="top" bgcolor="#FFFFFF"> 
-                      <td height="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>Thank 
-                        you for ordering from Amazon.com.</b> 
-                        </font> 
-
-
-
-
-
-
-
-         
-        
-
-
-
-
-
-                    <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">If 
-                          you ordered several items to be delivered to the same 
-                          address, we may send them to you in separate boxes to 
-                          give you the speediest service. Rest assured: This will 
-                          not affect your shipping charges. </font>  
-
-
-
-
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">Thanks 
-                          for shopping with us! </font> 
-                        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">Amazon.com 
-                          Customer Service </font>
-
-
-
-
-
-
-
-                      </td>
-                    </tr>
-                    <tr valign="top" bgcolor="006699"> 
-                      <td height="2"> 
-                        <p> <font face="Verdana, Arial, Helvetica, sans-serif"><b>
-                        <font color="#FFFFFF" size="-1">Purchasing Information: 
-                          </b> </font></font> 
-                      </td>
-                    </tr>
-                    <tr valign="top"> 
-                      <td height="199"> 
-                        <table width="300" align="left">
-                          <tr> 
-
-                            <td> 
-                              <p> 
-                              <table cellpadding="0" cellspacing="0">
-                                <tr> 
-                                  <td valign="top" align="right"> </td>
-
-                                </tr>
-                              </table>
-                              <p> 
-                              <table cellspacing="0" cellpadding="0">
-                                <tr> 
-                                  <td></td>
-                                </tr>
-
-
-                                
-
-
-                                <tr> 
-                                  <td>
-                                  </td>
-
-                                  <td>
-                                  </td>
-
-                                  <td align="right">
-                                  </td>
-                                </tr>
-
-
-
-                                
-
-                                <tr>
-                                  <td colspan="2">&nbsp;</td>
-                                  <td align="right">TABLE 1</td>
-                                </tr>
-
-
-                               <tr>
-                                  <td>
-                                  </td>
-
-                                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                                    &nbsp; </font>
-                                  </td>
-
-                                  <td align="right">
-                                  </td>
-                                </tr>
-
-
-                                <tr>
-                                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                                    </font>
-                                  </td>
-
-                                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                                    &nbsp; </font>
-                                  </td>
-
-                                  <td align="right"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                                    </font>
-                                  </td>
-                                </tr>
-
-
-                                
-
-
-                                <tr>
-                                  <td colspan="2">&nbsp;</td>
-                                  <td align="right"></td>
-                                </tr>
-
-                                <tr>
-                                  <td>
-                                  </td>
-
-                                  <td><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                                    &nbsp;</font>
-                                  </td>
-
-                                  <td align="right">
-                                  </td>
-                                </tr>
-                              </table>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-              <tr> 
-                <td> 
-                  <table width="100%" cellpadding="4">
-                    <tr valign="top" bgcolor="006699"> 
-                      <td height="3"> 
-                        <p> <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&nbsp; 
-                          </font><font color="#FFFFFF" size="-1">
-                        <b><font face="Verdana, Arial, Helvetica, sans-serif">Order Summary:</font></b></font>
-                      </td>
-                    </tr>
-                    <tr valign="top"> 
-                      <td>
-                        <table width="100%" border="0" cellspacing="0" cellpadding="4">
-<tr>
-
-
-
-
-
-
-
-
-
-
-
-<td width="5%" valign="top">
-
-
-</td>
-
-                        <td width="0%" valign="top">
-                        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                        <b>1</b>
-                        </font>
-                        </td>
-
-                        <td valign="top" width="95%">
-                        </td>
-                </tr>
-<tr>
-
-
-
-
-
-
-
-
-
-
-
-<td width="5%" valign="top">
-
-</td>
-
-                        <td width="0%" valign="top">
-                        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                        <b>1</b>
-                        </font>
-                        </td>
-
-                        <td valign="top" width="95%">
-                        </td>
-                </tr>
-
-                        </table>
-<br>
-
-
-
-                        </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-              <tr valign="top"> 
-                <td height="2"> 
-                  <table cellpadding="4" width="100%">
-                    <tr bgcolor="006699"> 
-                      <td height="16"> <font face="Verdana, Arial, Helvetica, sans-serif" size="-1"> 
-                        <p><b><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">Manage 
-                          Your Account:</font></b> 
-                        </font></td>
-                    </tr>
-                    <tr> 
-                      <td height="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"> 
-                        <p>Manage all your orders online. Access <a href="http://www.amazon.com/your-account">Your Account</a>, and you can: 
-                        <ul>
-                          <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=most-recent-order&return-url=order-history-filtered/ref=cs_ae_tr">Track the status of this order</a> 
-                          <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_com">Combine open orders to save on shipping</a> 
-                          <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_pay">Change the payment option for this order</a> 
-                          <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_cha">Change the shipping option or address</a> 
-                          <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_can2">Cancel unshipped items from this order</a> 
-                        
-
-
-                        
-                        </ul>
-                        <p>If you still need to get in touch with us about your order, send an e-mail message to orders@amazon.com (or just reply to this message). 
-
-
-
-<p>Thanks again for shopping at Amazon.com!  
-</font><p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-<b><a href="http://www.amazon.com/exec/obidos/subst/home/home.html/ref=cs_ae_amt">Amazon.com</a></b><br>          
-               <b>Earth's Biggest Selection</b> 
-                        </font></td>
-                    </tr>
-                  </table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                  <table cellpadding="4" width="100%" border=0>
-                    <tr bgcolor="006699">
-                      <td height="16" colspan=2>
-                        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#FFFFFF">
-                        <p><b>Your Recommendations:</font></b></td>
-                    </tr>
-
-                  <tr>
-                      <td height="2" colspan=2>
-                        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color=#cc6600><b>Ideas for Your Next Visit</font><br>
-
-                      </td>
-                    </tr>
-
-<tr valign=top>
-
-
-
-        <td width="50%">
-        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-        
-               <a href="http://www.amazon.com/exec/obidos/ASIN/0201604426/ref=cs_ae_rm1">
-<img src="../images/book1.jpg" align=left vspace=3 hspace=5 border=0>
-</a>
-        
-
-
-       <a href="http://www.amazon.com/exec/obidos/ASIN/0201604426/ref=cs_ae_rm2">Programming Windows Security (The DevelopMentor Series)</a>
-
-
-
-
- <br>by Keith Brown
-
-
-
-<br>
-
-        
-         <b>Our Price: <font color=#990000>$39.95</font></b><br>
-        
-
-
-        </font>
-        </td>
-        
-        <td width="50%">
-        <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-        
-               <a href="http://www.amazon.com/exec/obidos/ASIN/0201615940/ref=cs_ae_rm1">
-<img src="../images/book2.jpg" align=left vspace=3 hspace=5 border=0>
-</a>
-        
-
-
-       <a href="http://www.amazon.com/exec/obidos/ASIN/0201615940/ref=cs_ae_rm2">Transactional COM+</a>
-
-
-
-
- <br>by Tim Ewald
-
-
-
-<br>
-
-        
-         <b>Our Price: <font color=#990000>$39.95</font></b><br>
-        
-
-
-        </font>
-        </td>
-        
-
-
-</tr>
-
-<tr>
-<td colspan=2>
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-<img src="../images/orange-arrow.gif" width=10 height=9 border=0 align=middle>
-<b>
-See All Your <a href="http://www.amazon.com/exec/obidos/instant-recs/recs/instant-recs-home.html/ref=cs_ae_rmal">
-Recommendations
-</a>
-</b>
-</font>
-</td>
-</tr>
-</table>
-
-
-
-
-
-
-
-
-
-
-
-<img src="../images/icon-unsubscribe.gif" width="17" height="15" border="0" alt="unsubscribe icon"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&nbsp;Prefer not to receive HTML Mail? <a href="http://www.amazon.com/e-mail-format-preference">Click here</a></font></td>
-              </tr>
-            </table>
-          </td>
-          <td rowspan="4" valign="top" bgcolor="e1e4da" width="5%"> 
-            <table width="150" border="1" cellspacing="0" cellpadding="0">
-              <tr valign="top"> 
-                <td height="111"> 
-                  <table bgcolor=#006699 border=2 cellpadding=1 cellspacing=0 width=156 align="center" height="0">
-                    <tbody> 
-                    <tr valign="top"> 
-                      <td width=100%> 
-                        <table bgcolor=#cccc99 border=3 cellpadding=4 cellspacing=0 width=100% align="center">
-                          <tbody> 
-                          <tr bgcolor="#006699"> 
-                            <td align=left valign=center colspan="2"> 
-                              <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#FFFFFF"><b>Manage Your Account:</b></font></div>
-                            </td>
-                          </tr>
-                          <tr> 
-                            <td bgcolor=#ffffff valign=top width="1%" height="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&#149;</font></font></td>
-                            <td bgcolor=#ffffff valign=middle width="99%%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-<a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;method=POST&amp;response=wheres-my-stuff/ref=cs_ae_or">View Your Orders</a></font></td>
-                          </tr>
-                          <tr> 
-                            <td bgcolor=#ffffff valign=top width="1%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&#149;</font></td>
-
-                            <td bgcolor=#ffffff valign=middle width="99%%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-<a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_shp">Edit Shipping Options</a></font></td>
-                          </tr>
-                          <tr> 
-                            <td bgcolor=#ffffff valign=top width="1%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&#149;</font></td>
-                            <td bgcolor=#ffffff valign=middle width="99%%" height="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&amp;page=help/ya-sign-in-secure.html&amp;response=order-history-filtered&amp;method=POST&amp;ss-order-filter=open-orders&amp;return-url=order-history-filtered/ref=cs_ae_can">Cancel Unshipped Orders</a></font></td>
-                          </tr>
-                          <tr> 
-                            <td bgcolor=#ffffff valign=top width="1%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">&#149;</font></td>
-                            <td bgcolor=#ffffff valign=middle width="99%%" height="2">
-<font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-<a href="http://www.amazon.com/exec/obidos/account-access-login/ref=cs_ae_gtyr">Go to Your Account</a></font></td>
-                          </tr>
-                          </tbody> 
-                        </table>
-                      </td>
-                    </tr>
-                    </tbody> 
-                  </table>
-                </td>
-              </tr>
-              <tr> 
-                <td>
-                  <p>&nbsp;</p>
-                  <p><br>
-                  </p>
-                  <table bgcolor=#006699 border=1 cellpadding=1 cellspacing=0 width=150 align="center">
-                    <tbody> 
-                    <tr valign="top"> 
-                      <td width="100%"> 
-                        <table bgcolor=#ffffff border=1 cellpadding=4 cellspacing=0 width="100%">
-                          <tbody> 
-                          <tr> 
-                            <td bgcolor=#ffffff valign=top width="100%" height="100%"> 
-                              <div align="center"><img src="../images/raf_header.gif" width=148 height=65 alt="Refer a friend banner"><br>
-                                <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">and receive a $5.00 gift certificate!<br>
-                                <a href="http://www.amazon.com/exec/obidos/refer-a-friend-login-page/ref=cs_ae_ad1">Click here</a> for details.</font></div>
-                            </td>
-                          </tr>
-                          </tbody> 
-                        </table>
-                      </td>
-                    </tr>
-                    </tbody> 
-                  </table>
-                </td>
-              </tr>
-              <tr> 
-                <td height="116"><br>
-                </td>
-              </tr>
-              <tr>
-                <td> <br>
-                  <p>&nbsp;</p>
-                </td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <tr></tr>
-        <tr></tr>
-        <tr> </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<p>&nbsp;</p><div align="center"> &nbsp;</div>
-</body>
-</html>
diff --git a/layout/html/tests/table/printing/bug59280-2.html b/layout/html/tests/table/printing/bug59280-2.html
deleted file mode 100644
index eab6411c6398..000000000000
--- a/layout/html/tests/table/printing/bug59280-2.html
+++ /dev/null
@@ -1,188 +0,0 @@
-<table border>
- <tr>
-  <td rowspan=2>
-   <div style="width:300px; height:500px; border:1px solid black">div1</div>
-   <div style="width:300px; height:500px; border:1px solid black">div1</div>
-  </td>
- </tr>
- <tr></tr>
-</table>
-<!-- it also fails if there is a td in the last row -->
-
-
-<!-- this how far I got reducing the test case before realizing it was a colspan problem
-<html>
-<head>
-<title>Your Order with Amazon.com</title>
-<meta http-equiv="Content-Type" content="text/html;
-charset=iso-8859-1">
-</head>
-
-<body bgcolor="#FFFFFF" link="#0066CC">
-
-   <table width="100%" border="0" cellspacing="0" cellpadding="5" bgcolor="#FFFFFF">
-    <tr> 
-     <td rowspan="4" width="95%" valign="top"> 
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-       <tr> 
-        <td height="348"> 
-         <font face="Verdana, Arial, Helvetica, sans-serif" size="-1"><b>Thank 
-             you for ordering from Amazon.com.</b></font> 
-             <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">If 
-                          you ordered several items to be delivered to the same 
-                          address, we may send them to you in separate boxes to 
-                          give you the speediest service. Rest assured: This will 
-                          not affect your shipping charges. </font>  
-             <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">Thanks 
-                          for shopping with us! </font> 
-             <p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">Amazon.com 
-                          Customer Service </font>
-             <p> <font face="Verdana, Arial, Helvetica, sans-serif"><b>
-              <font color="#FFFFFF" size="-1">Purchasing Information: 
-              </b> </font></font> 
-         </td>
-        </tr>
-        <tr> 
-         <td> 
-          <table width="100%" cellpadding="4">
-           <tr valign="top" bgcolor="006699"> 
-            <td height="3"> 
-              <p> <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">  
-              </font><font color="#FFFFFF" size="-1">
-              <b><font face="Verdana, Arial, Helvetica, sans-serif">Order Summary:</font></b></font>
-            </td>
-           </tr>
-           <tr valign="top"> 
-            <td>
-             <table width="100%" border="0" cellspacing="0" cellpadding="4">
-              <tr>
-               <td width="5%" valign="top"></td>
-               <td width="0%" valign="top">
-                <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-                <b>1</b></font>
-               </td>
-
-               <td valign="top" width="95%"> </td>
-              </tr>
-             <tr>
-              <td width="5%" valign="top"></td>
-              <td width="0%" valign="top">
-               <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-               <b>1</b></font>
-              </td>
-              <td valign="top" width="95%"> </td>
-             </tr>
-            </table>
-            <br>
-           </td>
-          </tr>
-         </table>
-        </td>
-       </tr>
-       <tr valign="top"> 
-        <td height="2"> 
-         <table cellpadding="4" width="100%">
-          <tr bgcolor="006699"> 
-           <td height="16"> <font face="Verdana, Arial, Helvetica, sans-serif" size="-1"> 
-             <p><b><font face="Verdana, Arial, Helvetica, sans-serif" color="#FFFFFF">Manage 
-              Your Account:</font></b> 
-              </font>
-                        </td>
-           </tr>
-          <tr> 
-           <td height="2"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"> 
-            <p>Manage all your orders online. Access <a href="http://www.amazon.com/your-account">Your Account</a>, and you can: 
-             <ul>
-              <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=most-recent-order&return-url=order-history-filtered/ref=cs_ae_tr">Track the status of this order</a> 
-              <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=open-orders&return-url=order-history-filtered/ref=cs_ae_com">Combine open orders to save on shipping</a> 
-              <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=open-orders&return-url=order-history-filtered/ref=cs_ae_pay">Change the payment option for this order</a> 
-              <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=open-orders&return-url=order-history-filtered/ref=cs_ae_cha">Change the shipping option or address</a> 
-              <li><a href="http://www.amazon.com/exec/obidos/flex-sign-in/?opt=a&page=help/ya-sign-in-secure.html&response=order-history-filtered&method=POST&ss-order-filter=open-orders&return-url=order-history-filtered/ref=cs_ae_can2">Cancel unshipped items from this order</a> 
-             </ul>
-            <p>If you still need to get in touch with us about your order, send an e-mail message to orders@amazon.com (or just reply to this message). 
-            <p>Thanks again for shopping at Amazon.com!  
-             </font><p><font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-             <b><a href="http://www.amazon.com/exec/obidos/subst/home/home.html/ref=cs_ae_amt">Amazon.com</a></b><br>          
-              <b>Earth's Biggest Selection</b> 
-                        </font>
-                   </td>
-          </tr>
-         </table>
-         <table cellpadding="4" width="100%" border=0>
-          <tr bgcolor="006699">
-           <td height="16" colspan=2>
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color="#FFFFFF">
-            <p><b>Your Recommendations:</font></b>
-                   </td>
-          </tr>
-          <tr>
-           <td height="2" colspan=2>
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="-1" color=#cc6600><b>Ideas for Your Next Visit</font><br>
-           </td>
-          </tr>
-          <tr valign=top>
-           <td width="50%">
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-            <a href="http://www.amazon.com/exec/obidos/ASIN/0201604426/ref=cs_ae_rm1">
-             <img srcx="http://images.amazon.com/images/P/0201604426.01.TZZZZZZZ.jpg" align=left vspace=3 hspace=5 border=0>
-            </a>
-            <a href="http://www.amazon.com/exec/obidos/ASIN/0201604426/ref=cs_ae_rm2">Programming Windows Security (The DevelopMentor Series)</a>
-             <br>by Keith Brown
-             <br>
-             <b>Our Price: <font color=#990000>$39.95</font></b><br>
-            </font>
-           </td>
-           <td width="50%">
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-            <a href="http://www.amazon.com/exec/obidos/ASIN/0201615940/ref=cs_ae_rm1">
-             <img srcx="http://images.amazon.com/images/P/0201615940.01.TZZZZZZZ.jpg" align=left vspace=3 hspace=5 border=0>
-            </a>
-            <a href="http://www.amazon.com/exec/obidos/ASIN/0201615940/ref=cs_ae_rm2">Transactional COM+</a>
-             <br>by Tim Ewald
-             <br>
-             <b>Our Price: <font color=#990000>$39.95</font></b><br>
-                </font>
-           </td>
-          </tr>
-          <tr>
-           <td colspan=2>
-            <font face="Verdana, Arial, Helvetica, sans-serif" size="-1">
-             <img srcx="http://www.amazon.com/g/icons/orange-arrow.gif" width=10 height=9 border=0 align=middle>
-             <b>
-             See All Your <a href="http://www.amazon.com/exec/obidos/instant-recs/recs/instant-recs-home.html/ref=cs_ae_rmal">
-             Recommendations
-             </a>
-             </b>
-             </font>
-            </td>
-           </tr>
-          </table>
-          <img srcx="http://www.amazon.com/g/cs-email/icon-unsubscribe.gif" width="17" height="15" border="0" alt="unsubscribe icon"><font face="Verdana, Arial, Helvetica, sans-serif" size="-1"> Prefer not to receive HTML Mail? <a href="http://www.amazon.com/e-mail-format-preference">Click here</a></font>
-                 </td>
-        </tr>
-       </table>
-      </td>
-      <td rowspan="4" valign="top" bgcolor="e1e4da" width="5%"> 
-       <table width="150" border="1" cellspacing="0" cellpadding="0">
-        <tr valign="top"> 
-         <td height="111"> 
-          <table bgcolor=#006699 border=2 cellpadding=1 cellspacing=0 width=156 align="center" height="0">
-           <tbody> 
-            <tr valign="top"> 
-             <td width=100%> 
-             </td>
-            </tr>
-           </tbody> 
-          </table>
-         </td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-     <tr></tr>
-     <tr></tr>
-     <tr> </tr>
-    </table>
-</body>
-</html>
--->
diff --git a/layout/html/tests/table/printing/bug61663.html b/layout/html/tests/table/printing/bug61663.html
deleted file mode 100644
index fb5c5128a8da..000000000000
--- a/layout/html/tests/table/printing/bug61663.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html>
-<head>
-<title>thead test - print me!</title>
-</head>
-<body>
-<table>
-<thead>
-<tr>
-        <td align=center>This thead element</td>
-        </tr>
-<tr>
-        <td align=center>will only appear on the first and</td>
-        </tr>
-<tr>
-        <td align=center>last pages printed.</td>
-        </tr>
-<tr>
-        <td align=center>November 30, 2000</td>
-        </tr>
-</thead>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>text</td></tr>
-<tr><td>last text</td></tr>
-</table>
-</body>
-</html>
diff --git a/layout/html/tests/table/printing/bug66804.html b/layout/html/tests/table/printing/bug66804.html
deleted file mode 100644
index 9181e4c9883d..000000000000
--- a/layout/html/tests/table/printing/bug66804.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<BASE HREF="http://www.networkcomputing.com/1202/">
-
-<body link="#0022BB" vlink="#555555" alink="#EE0000" bgcolor="#FFFFFF" topmargin=0 leftmargin=0 marginwidth=0 marginheight=0>
-
-<!-- HEADER -->
-
-<IMG SRCx="http://img.cmpnet.com/nc/graphics/techwebtop2.gif" WIDTH="160" HEIGHT="197">
-
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
- <tr> 
-  <td width="15" rowspan=7><img srcx="http://img.cmpnet.com/cmpnet/blank.gif" width=15 border=0 height=1></td>
-  <td valign=top align=left>
-   <table border="0" width="421" cellspacing="0" cellpadding="0">
-    <tr> <!--MAIN CONTENT COLUMN--> 
-     <td width="50%" valign="top" align=CENTER> <!--TOP STORY TABLE--> <!--TOP STORY TABLE--> 
-      <table border=0 width=421 cellspacing=0 cellpadding=0>
-       <tr> 
-        <td valign=TOP width=421 colspan=3 align=RIGHT> 
-         <img srcx="http://img.cmpnet.com/nc/graphics/header_networkaps.gif" alt="Network Applications" width=421 height=25 hspace=0 vspace=0 border=0 align=RIGHT> 
-        </td>
-       </tr>
-       <tr> 
-        <td valign=TOP colspan=2> foo
-       </tr>
-       <tr> 
-        <td valign=TOP colspan=2><font size=5 color="#319C9C" face="geneva, arial, helvetica"> 
-         </font></td>
-       </tr>
-       <tr> 
-        <td valign=TOP colspan=2><img srcx="http://img.cmpnet.com/cmpnet/blank.gif" alt="" width=1 vspace=0 hspace=10 border=0 height=1></td>
-       </tr>
-       <tr> 
-        <td bgcolor="#FFFFFF" align=LEFT valign=TOP colspan=2> 
-         <p>&nbsp; <font size=1 color="#000000" face="geneva, arial, helvetica">
-         </font> </p>
-        </td>
-       </tr>
-       <tr> 
-        <td valign=MIDDLE align=RIGHT> bar
-       </tr>
-       <tr> 
-        <td valign=TOP>
-         <br><br>
-         <font size=2 face="geneva, arial, helvetica"> 
-            But agents soon will be able to get electronic forms and cut processing time down to five minutes or less: Farm Bureau Financial Services, an insurance and financial services company in West Des Moines, Iowa, is rolling out a new extranet for its growing number of agent offices and affiliates across the country. <P>
-The extranet environment replaces the "dumb" terminals that linked the company's 370 remote offices to headquarters with browser-based workstations or laptops. "In the past, we just threw a router out there with TN3270 and a green screen," says Duke Burrell, network architect for Farm Bureau Financial Services. "As our agent offices and business affiliates grow, so does our need to get information to them."<P>
-Farm Bureau now also provides Novell VPN (virtual private network) client access at the desktop for the Novell BorderManager-based VPN, and some of the company's larger offices will have their own servers equipped with VPN access to the hosts at headquarters. "That will be more of a site-to-site VPN," Burrell says. <P>
-The insurance and financial services company uses the IPsec (IP security) feature in the VPN software for encrypting the IP transmission and authenticating the devices. Burrell says a few Farm Bureau offices purchased their own Internet access, so filters and access controllers will also be used on their edge routers for security, but the bulk of the sites and users connecting to the extranet will do so with IPsec. Digital certificates also are on the horizon for authenticating agents when they log onto the extranet, as are digital signatures for agents to electronically sign forms.<P>
-Farm Bureau's server farm consists of clustered Novell NetWare 5.1 servers and Microsoft Windows 2000 servers connected to a Xiotech Corp. Magnitude SAN (storage area network) system. Among its applications are a massive Lotus Notes installation and some homegrown applications for policy-generation and other insurance-specific applications. For now, the extranet site contains mainly PDF files of policy forms for the agents, but Farm Bureau has begun recoding select legacy mainframe applications, including those for policy, agent membership and commission statement, with Allaire Corp.'s ColdFusion and Spectra tools to make them Web-based and accessible on the site, too.<P>
diff --git a/layout/html/tests/table/printing/bug80966.html b/layout/html/tests/table/printing/bug80966.html
deleted file mode 100644
index b847e26f23eb..000000000000
--- a/layout/html/tests/table/printing/bug80966.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Repository" content="CCEWP">
-   <meta name="author" content="llgilber">
-   <meta name="SearchPublicationDate" content="Mon, 23 Apr 2001 19:47:00 GMT">
-   <meta name="FileOwner" content="llgilber">
-   <meta name="FileName" content="bri-back-dp.html">
-   <meta name="Folder" content="/warp/customer/129">
-   <meta name="Object_ID" content="5145770">
-   <meta name="Chronicle ID" content="5129194">
-   <meta name="Revision" content="/main/CCO/2">
-   <meta name="CCOCategoryType" content="Support">
-   <meta name="PubDate" content="Wed, 25 Apr 2001 13:14:17 GMT">
-   <meta name="PushDate" content="Wed, 25 Apr 2001 13:14:55 GMT">
-   <meta name="ParentTree" content="/warp/customer/129">
-   <meta name="Parents" content="/warp/customer/129">
-   <meta name="Language" content="US_en">
-   <meta http-equiv="Expires" content="4/23/02">
-   <meta name="Glob97" content="Internetworking:ISDN:Sample_Configs,">
-   <meta name="Keywords" content="BRI ddr dialer profile backup interface">
-   <meta http-equiv="Owner" content="llgilber@cisco.com">
-   <meta http-equiv="Reply-to" content="access-feedback@cisco.com">
-   <meta name="Subject97" content="Internetworking:ISDN:Sample_Configs">
-   <meta name="DocType" content="SampleConfig">
-   <meta name="GENERATOR" content="Mozilla/4.76 [en] (Win98; U) [Netscape]">
-   <title>Cisco - Configuring BRI Backup Interface with Dialer Profiles</title>
-<!-- source by npanicke -->
-<!-- reviewed by burgess,revieweruserid (no spaces after commas) -->
-<!-- posted to CCO by llgilber on 04/23/2001 -->
-<!-- updated per SMEuserid by TWuserid on MM/DD/YYYY -->
-<!-- re-certified by SMEuserid and TWuserid on MM/DD/YYYY -->
-</head>
-<body bgcolor="#FFFFFF">
-&nbsp;
-<br>This configuration uses a BRI circuit to backup a serial link. It also
-uses the Open Shortest Path First (OSPF) routing protocol between the two
-routers. Once the backup connection is activated, you must ensure that
-the routing table is updated to use the new backup link. Only one side
-(maui-soho-01) is configured to dial out. The other side (maui-nas-05)
-is configured to accept the call.
-<p>In this configuration we have a Cisco 1604 router connected to a Cisco
-3640 router using a serial connection. Both routers are also equipped with
-BRI interfaces that will be used for the backup link. The Cisco 1604 is
-running Cisco IOS<sup>&reg;</sup> Software Release 12.1(5)T and the Cisco
-3640 is using Cisco IOS 12.1(2).
-<p><b>Note</b>: Configure and verify that the DDR connection (dialer 1
-with BRI0) is working properly before you configure the <b>backup interface</b>
-and <b>backup delay</b> commands. This will allow you to effectively manage
-troubleshooting dialer profiles, ISDN, Point-to-Point Protocol (PPP) and
-authentication issues before you configure the backup.
-<br>&nbsp;
-<table BORDER CELLPADDING=3 WIDTH="80%" BGCOLOR="#FFFFFF" valign="TOP" >
-<tr BGCOLOR="#CCCCFF">
-<th><b>maui-soho-01 (1600)</b></th>
-</tr>
-
-<tr>
-<td HEIGHT="1486">
-<pre>maui-soho-01#<b>show running-config&nbsp;
-</b>Building configuration...
-
-Current configuration : 1687 bytes
-!
-version 12.1
-no service single-slot-reload-enable
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname maui-soho-01
-!
-logging rate-limit console 10 except errors
-aaa new-model
-aaa authentication login default local
-aaa authentication login NO_AUTHEN none
-aaa authentication ppp default local
-<i><font color="#3333FF">!--- basic AAA configuration for ppp calls
-</font></i>enable secret 5 &lt;deleted>
-!
-username maui-nas-05 password 0 cisco
-<i><font color="#3333FF">!--- username for remote router (maui-nas-05) and
-shared secret
-!---(used for CHAP authentication)
-!--- shared secret must be the same on both sides
-</font></i>ip subnet-zero
-no ip finger
-!
-isdn switch-type basic-ni
-!
-interface Loopback0
-&nbsp;ip address 172.17.1.1 255.255.255.0
-<i><font color="#3333FF">!--- The loopback address will be used by OSPF for the
-router ID.
-</font></i>!
-interface Ethernet0
-&nbsp;ip address 172.16.1.1 255.255.255.0
-!
-interface Serial0
-<i><font color="#3333FF">!--- Primary Interface
-</font></i>&nbsp;backup delay 10 30
-<i><font color="#3333FF">!--- Backup link will be activated 10 seconds after
-primary link
-&nbsp;goes down.
-!--- Backup link will be deactivated 30 seconds after primary
-&nbsp;link
-&nbsp;is restored.
-</font></i>&nbsp;backup interface Dialer1
-<i><font color="#3333FF">!--- Interface Dialer 1 will provide backup.
-</font></i>&nbsp;ip address 192.168.10.2 255.255.255.252
-&nbsp;encapsulation ppp
-&nbsp;no fair-queue
-&nbsp;clockrate 64000
-&nbsp;ppp authentication chap
-!
-interface BRI0
-&nbsp;ip unnumbered Loopback0
-<i><font color="#3333FF">!--- unnumbered to the Loopback 0 address
-</font></i>&nbsp;encapsulation ppp
-&nbsp;dialer pool-member 10
-<i><font color="#3333FF">!--- Assign BRI0 as member of dialer pool 10.
-!--- Dialer pool 10 is specified in interface Dialer 1.
-</font></i>&nbsp;isdn switch-type basic-ni
-&nbsp;isdn spid1 51255511110101 5551111
-&nbsp;isdn spid2 51255511120101 5551112
-&nbsp;ppp authentication chap
-<i><font color="#3333FF">!--- Use ppp chap authentication.
-</font></i>&nbsp;ppp multilink
-!
-interface Dialer1
-<i><font color="#3333FF">!--- Dialer 1 provides backup for the serial link.
-</font></i>&nbsp;ip address 172.20.10.2 255.255.255.0
-<i><font color="#3333FF">!--- Address for the dialer interface.&nbsp;
-!--- The remote side dialer interface is in the same subnet.
-</font></i>&nbsp;encapsulation ppp
-&nbsp;dialer pool 10
-<i><font color="#3333FF">!--- defines Dialer pool 10
-!--- BRI 0 is a member of this pool.
-</font></i>&nbsp;dialer remote-name maui-nas-05
-<i><font color="#3333FF">!--- specifies remote router name&nbsp;
-!--- This name must match that used by the remote router to
-&nbsp;authenticate itself.
-</font></i>&nbsp;dialer idle-timeout 900
-<i><font color="#3333FF">!--- Idle timeout is set to 900 seconds (15 minutes).
-!--- The link will be disconnected if there is no interesting
-&nbsp;traffic for 900 secs.
-!--- Since OSPF hellos are interesting traffic, this will reset
-&nbsp;the idle timeout and
-!--- cause the link to stay up until the primary link is
-!--- restored.
-</font></i>&nbsp;dialer string 5552222
-<i><font color="#3333FF">!--- defines the destination routers phone number
-</font></i>&nbsp;dialer load-threshold 80 outbound
-<i><font color="#3333FF">!--- This sets the outbound load level for traffic at
-which&nbsp;
-!---additional connections will be added to the MP bundle load level.
-!--- Values range from 1 (unloaded) to 255 (fully loaded). The threshold
-!--- in this case is 80/255=32%.
-</font></i>&nbsp;dialer-group 1
-<i><font color="#3333FF">!--- apply interesting traffic definition from
-dialer-list 1
-</font></i>&nbsp;ppp authentication chap
-<i><font color="#3333FF">!--- use ppp chap authentication
-</font></i>&nbsp;ppp multilink
-!
-router ospf 5
-&nbsp;log-adjacency-changes
-&nbsp;network 172.16.1.0 0.0.0.255 area 0
-&nbsp;network 172.17.1.0 0.0.0.255 area 0
-&nbsp;network 172.20.10.0 0.0.0.255 area 0
-&nbsp;network 192.168.10.0 0.0.0.3 area 0
-!
-ip classless
-no ip http server
-!
-dialer-list 1 protocol ip permit
-<i><font color="#3333FF">!--- All IP traffic is designated as interesting.
-!--- This is applied to Interface Dialer 1 using dialer-group 1.
-!--- OSPF hello packets will trigger the dial.
-</font></i>!
-line con 0
-&nbsp;exec-timeout 0 0
-&nbsp;login authentication NO_AUTHEN
-&nbsp;transport input none
-line vty 0 4
-!
-end</pre>
-</td>
-</tr>
-</table>
-
-<table BORDER CELLPADDING=3 WIDTH="80%" BGCOLOR="#FFFFFF" valign="TOP" >
-<tr BGCOLOR="#CCCCFF">
-<th><b>maui-nas-05 (3640)</b></th>
-</tr>
-
-<tr>
-<td>
-<pre>maui-nas-05#<b>show running-config&nbsp;
-</b>Building configuration...
-
-Current configuration:
-!
-version 12.1
-service timestamps debug datetime msec
-service timestamps log datetime msec
-no service password-encryption
-!
-hostname maui-nas-05
-!
-aaa new-model
-aaa authentication login default local
-aaa authentication login NO_AUTHEN none
-aaa authentication ppp default local
-<i><font color="#0000FF">!--- basic AAA configuration for ppp calls
-</font></i>enable secret 5 &lt;deleted>
-!
-username maui-soho-01 password 0 cisco
-<i><font color="#3333FF">!--- username for remote router (maui-soho-01) and
-shared secret
-!---(used for CHAP authentication)
-!--- shared secret must be the same on both sides
-</font></i>ip subnet-zero
-!&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-isdn switch-type basic-ni
-!
-interface Loopback0
-&nbsp;ip address 172.22.1.1 255.255.255.0
-<i><font color="#0000FF">!--- The loopback address will be used by OSPF for the
-router ID.
-</font></i>!
-interface Ethernet0/0
-&nbsp;ip address 172.22.53.105 255.255.255.0
-!
-interface Ethernet0/1
-&nbsp;no ip address
-&nbsp;shutdown
-!
-interface BRI1/0
-&nbsp;ip unnumbered Loopback0
-<i><font color="#0000FF">!--- unnumbered to the Loopback 0 address
-</font></i>&nbsp;encapsulation ppp
-&nbsp;dialer pool-member 20
-<i><font color="#0000FF">!--- Assign BRI0 as member of dialer pool 20.
-!--- Dialer pool 20 is specified in interface Dialer 1.
-</font></i>&nbsp;isdn switch-type basic-ni
-&nbsp;isdn spid1 51255522220101 5552222
-&nbsp;isdn spid2 51255522230101 5552223
-&nbsp;ppp authentication chap
-<i><font color="#0000FF">!--- Use ppp chap authentication.
-</font></i>&nbsp;ppp multilink
-!
-<i><font color="#0000FF">! &lt;&lt;-- Unused interface configurations have been
-removed.
-</font></i>!
-interface Serial2/0
-<i><font color="#0000FF">!--- primary interface
-</font></i>&nbsp;ip address 192.168.10.1 255.255.255.252
-&nbsp;encapsulation ppp
-&nbsp;no fair-queue
-&nbsp;ppp authentication chap
-!
-<i><font color="#0000FF">! &lt;&lt;--Unused interface configurations have been
-removed.
-</font></i>!
-interface Dialer1
-<i><font color="#0000FF">!--- Dialer 1 provides backup for the serial link.
-</font></i>&nbsp;ip address 172.20.10.1 255.255.255.0
-<i><font color="#0000FF">!--- address for the dialer interface&nbsp;
-!--- The remote side dialer interface is in the same subnet.
-</font></i>&nbsp;encapsulation ppp
-&nbsp;dialer remote-name maui-soho-01
-<i><font color="#0000FF">!--- specifies remote router name&nbsp;
-!--- This name must match that used by the remote router to
-&nbsp;authenticate itself.
-</font></i>&nbsp;dialer pool 20
-<i><font color="#0000FF">!--- defines dialer pool 20
-</font></i>&nbsp;dialer idle-timeout 900
-<i><font color="#0000FF">!--- Idle timeout is set to 900 seconds (15 minutes).
-!--- This is equal to the idle timeout set on maui-soho-01.
-</font></i>&nbsp;Dialer max-call 4096
-&nbsp;dialer-group 1
-<i><font color="#0000FF">!--- apply interesting traffic definition from
-dialer-list 1
-</font></i>&nbsp;ppp authentication chap
-<i><font color="#0000FF">!--- Use ppp chap authentication.
-</font></i>&nbsp;ppp multilink
-!
-router ospf 5
-&nbsp;network 172.20.10.0 0.0.0.255 area 0
-&nbsp;network 172.22.1.0 0.0.0.255 area 0
-&nbsp;network 172.22.53.0 0.0.0.255 area 0
-&nbsp;network 192.168.10.0 0.0.0.3 area 0
-&nbsp;default-information originate
-<i><font color="#0000FF">!--- transmit ospf default information&nbsp;
-!--- This may be required for remote router to use the BRI DDR
-&nbsp;link.
-</font></i>!
-ip classless
-ip route 0.0.0.0 0.0.0.0 Ethernet0/0
-no ip http server
-!
-dialer-list 1 protocol ip permit
-<i><font color="#0000FF">!--- All IP traffic is designated as interesting.
-!--- This is applied to Interface Dialer 1 using dialer-group
-&nbsp;1.
-</font></i>!
-line con 0
-&nbsp;login authentication NO_AUTHEN
-&nbsp;transport input none
-line 97 102
-line aux 0
-line vty 0 4
-!
-end
-
-</pre>
-</td>
-</tr>
-</table>
-
-<h2>
-<a NAME="debug"></a>Debug and Show Commands</h2>
-Before issuing <b>debug</b> commands, please see <a
-href="http://www.cisco.com/warp/customer/793/access_dial/debug.html">Important
-Information on Debug Commands</a>.
-<ul><b>show isdn status</b> - Ensure that the router is properly communicating
-with the ISDN switch. In the output, verify that Layer 1 Status is ACTIVE,
-and that the Layer 2 Status state = MULTIPLE_FRAME_ESTABLISHED appears.
-This command also displays the number of active calls.
-<p><b>show ip interface brief</b> - This will show dialer 1(on maui-soho-01)
-in standby mode. Using dialer 1 as the backup interface means the physical
-interface (BRI0) is not dedicated to the backup. Therefor, BRI 0 can be
-used for normal DDR while the primary link is up
-<p><b>debug dialer</b> - This is used to display DDR information about
-the packets received on the dialer interface.
-<p><b>debug isdn events</b> - This is used to see ISDN activity occurring
-on the user side of the ISDN interface.
-<p><b>debug isdn q931</b> - Shows call setup and tear down of the ISDN
-network connection (Layer 3) between the router and the ISDN switch.
-<p><b>debug ppp negotiation</b> - Displays information on PPP traffic and
-exchanges while negotiating the PPP components including Link Control Protocol
-(LCP), Authentication, and NCP. A successful PPP negotiation will first
-open the LCP state, then Authenticate, and finally negotiate NCP.
-<p><b>debug ppp authentication</b> - Displays the PPP authentication protocol
-messages, including Challenge Authentication Protocol (CHAP) packet exchanges
-and Password Authentication Protocol (PAP) exchanges. If you observe a
-failure verify that the chap username and password are configured correctly.
-<p><b>debug ppp error</b> - This is used to display protocol errors and
-error statistics associated with PPP connection negotiation and operation.</ul>
-<font size=-1></font>
-</body>
-</html>
diff --git a/layout/html/tests/table/printing/bug82401.html b/layout/html/tests/table/printing/bug82401.html
deleted file mode 100644
index b88ee9f1383c..000000000000
--- a/layout/html/tests/table/printing/bug82401.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<table border="1" >
- <tbody>
-   <tr>
-    <td style="background-color:yellow" rowspan="2" valign="Top" width="110" bgcolor="#eeeeee">  <!-- CategoryMenu -->
-         <div style="width:12px; height:770px">present31</div>
-         A
-    </td>
-   </tr>
-   <tr>
-    <td> 
-     <br><br><br><br><br><br>
-     <table style="background-color:green" border="0" cellpadding="2" cellspacing="0" width="180">
-      <tr>
-       <td align="Center"><img src="images/pol052102.jpg" width="180" height="123" alt="a"><BR>
-       <td>some text some text some text some text some text some text</td>
-      </tr>
-     </table>
-         <div style="height:580px">present32</div>
-    </td>
-   </tr>
-  </tbody>
-</table>
-
diff --git a/layout/html/tests/table/printing/bug85738.html b/layout/html/tests/table/printing/bug85738.html
deleted file mode 100644
index 19af47469fbc..000000000000
--- a/layout/html/tests/table/printing/bug85738.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<TABLE BORDER height=1500> 
-<TR> 
-  <TD> 
-   foo 
-  </td> 
- </TR> 
- <TR> 
-  <TD> 
-   bar 
-  </td> 
- </tR> 
-</table> 
diff --git a/layout/html/tests/table/printing/bug92215.html b/layout/html/tests/table/printing/bug92215.html
deleted file mode 100644
index 4ac0d0881d6d..000000000000
--- a/layout/html/tests/table/printing/bug92215.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<table>
-<tr>
-<td>
-<div style="border:1px solid red;width:500;height:1500">div</div>
-<div style="border:1px solid blue;float:right;width:50;height:50">div</div>
-</td>
-</tr>
-</table>
-
diff --git a/layout/html/tests/table/printing/rtest.lst b/layout/html/tests/table/printing/rtest.lst
deleted file mode 100644
index 20c17bb7ca07..000000000000
--- a/layout/html/tests/table/printing/rtest.lst
+++ /dev/null
@@ -1,44 +0,0 @@
-bug26792.html
-bug102784.html
-bug105166.html
-bug111028.html
-bug123983.html
-bug125543.html
-bug124041.html
-bug126118.html
-bug138349-1.html
-bug138349-2.html
-bug145842.html
-bug153785-1.html
-bug153785-2.html
-bug153785-3.html
-bug153785-4.html
-bug153785-5.html
-bug165772-1.html
-bug165772-2.html
-bug165772-3.html
-bug165772-4.html
-bug165772-5.html
-bug24000-1.html
-bug24000-2.html
-bug362348.html
-bug53690.html
-bug54829.html
-bug57378.html
-bug57467.html
-bug58665.html
-bug59280-1.html
-bug59280-2.html
-bug61663.html
-bug66804.html
-bug80966.html
-bug82401.html
-bug85738.html
-bug92215.html
-split2Rows.html
-split3Rows.html
-splitCell-1.html
-splitCell-2.html
-tfoot.html
-thead.html
-theadtfoot.html
diff --git a/layout/html/tests/table/printing/split2Rows.html b/layout/html/tests/table/printing/split2Rows.html
deleted file mode 100644
index 840e76174f0c..000000000000
--- a/layout/html/tests/table/printing/split2Rows.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<table border>
-<tr><td><div style="height:800px">row one</div></td></tr>
-<tr><td><div style="height:800px">row two</div></td></tr>
-</table>
diff --git a/layout/html/tests/table/printing/split3Rows.html b/layout/html/tests/table/printing/split3Rows.html
deleted file mode 100644
index 0955e1cb6633..000000000000
--- a/layout/html/tests/table/printing/split3Rows.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<table border>
-<tr><td><div style="height:800px">row one</div></td></tr>
-<tr><td><div style="height:800px">row two</div></td></tr>
-<tr><td><div style="height:800px">row three</div></td></tr>
-</table>
diff --git a/layout/html/tests/table/printing/splitCell-1.html b/layout/html/tests/table/printing/splitCell-1.html
deleted file mode 100644
index ef4cb7862d9a..000000000000
--- a/layout/html/tests/table/printing/splitCell-1.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<table border>
- <tr>
- <td>THIS IS THE BEGINNINGING OF IT - YOU SHOULD SEE the numbers 20, 40, 60, 80 <BR>
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text<BR>
-  20 a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text<BR>
-  40 a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text<BR>
-  60 a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text
-    a bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch bunch of text<BR>
-  80 THIS IS THE END OF IT
- </td>
- </tr>
-</table>
diff --git a/layout/html/tests/table/printing/splitCell-2.html b/layout/html/tests/table/printing/splitCell-2.html
deleted file mode 100644
index 8a040e017469..000000000000
--- a/layout/html/tests/table/printing/splitCell-2.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<table border>
- <tr>
- <td>THIS IS THE BEGINNING - YOU SHOULD SEE THE NUMBERS 20, 40, 50, 60 <BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  20 row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  40 row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  50 row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  row 1<BR>
-  60 row 1<BR> </tr>
-</table>
-   
diff --git a/layout/html/tests/table/printing/tfoot.html b/layout/html/tests/table/printing/tfoot.html
deleted file mode 100644
index a2749754bc62..000000000000
--- a/layout/html/tests/table/printing/tfoot.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<table border>
- <tfoot><tr><td>tfoot</td></tr></tfoot>
- <tbody>
-  <tr>
-   <td><div style="height:800px">this is row 1</div></td>
-  </tr>
-  <tr>
-   <td><div style="height:800px">this is row 2</div></td>
-  </tr>
- </tbody>
-</table>
diff --git a/layout/html/tests/table/printing/thead.html b/layout/html/tests/table/printing/thead.html
deleted file mode 100644
index e7f340f4c9c4..000000000000
--- a/layout/html/tests/table/printing/thead.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<table border>
- <thead><tr><td>thead</td></tr></thead>
- <tbody>
-  <tr>
-   <td><div style="height:800px">this is row 1</div></td>
-  </tr>
-  <tr>
-   <td><div style="height:800px">this is row 2</div></td>
-  </tr>
- </tbody>
-</table>
diff --git a/layout/html/tests/table/printing/theadtfoot.html b/layout/html/tests/table/printing/theadtfoot.html
deleted file mode 100644
index 3d93c9ff452e..000000000000
--- a/layout/html/tests/table/printing/theadtfoot.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<table border>
-<thead><tr><td>thead</td></tr></thead>
-<tfoot><tr><td>tfoot</td></tr></tfoot>
-<tr><td><div style="height:800px">row one</div></td></tr>
-<tr><td><div style="height:800px">row two</div></td></tr>
-</table>
diff --git a/layout/html/tests/table/testcases/nestedTables.html b/layout/html/tests/table/testcases/nestedTables.html
deleted file mode 100644
index 78f7cbe008b4..000000000000
--- a/layout/html/tests/table/testcases/nestedTables.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="Author" CONTENT="Steve Clark">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.04 [en] (WinNT; U) [Netscape]">
-   <TITLE>table</TITLE>
-</HEAD>
-<BODY>
-&nbsp;
-<TABLE BORDER WIDTH="100%" BGCOLOR="#FFFFCC" >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#DDDDDD" >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#66FFFF" >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR="#FF0000" >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#66FF99" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#FF99FF" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER COLS=5 WIDTH="100%" BGCOLOR="#FF9900" >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD>
-
-<TD>0</TD>
-</TR>
-
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>5</TD>
-
-<TD>6</TD>
-</TR>
-
-<TR>
-<TD>7</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>6</TD>
-</TR>
-
-<TR>
-<TD>7</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>8</TD>
-
-<TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/testcases/slashlogo.html b/layout/html/tests/table/testcases/slashlogo.html
deleted file mode 100644
index ade83d2d41fb..000000000000
--- a/layout/html/tests/table/testcases/slashlogo.html
+++ /dev/null
@@ -1,3471 +0,0 @@
-<html><body><table width=100% border=0 cellpadding=0 cellspacing=0>
-
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=158E8C><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=249393><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=349392><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=66BABC><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=44A3A2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=469191><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=338686><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=72A3A1><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CADEDD><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=447877><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=589594><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=7CAEAF><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=1E7A79><font size=1>&nbsp;</td>
-	<td bgcolor=287A7A><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=1A6B6A><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=2D3433><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=1A5C5C><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=1C2524><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=3D4242><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=396B6A><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=527274><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=696A69><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=526B6B><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=5A8787><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=B6D8D7><font size=1>&nbsp;</td>
-	<td bgcolor=5CADAE><font size=1>&nbsp;</td>
-	<td bgcolor=7DBAB9><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=A4CCCC><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=B6D0D1><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=A2B5B4><font size=1>&nbsp;</td>
-	<td bgcolor=60A2A3><font size=1>&nbsp;</td>
-	<td bgcolor=1B8685><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=97C1C0><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=048485><font size=1>&nbsp;</td>
-	<td bgcolor=027777><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=072323><font size=1>&nbsp;</td>
-	<td bgcolor=4D4F4F><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=8DB7B6><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=026766><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=025E5E><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=7B918F><font size=1>&nbsp;</td>
-	<td bgcolor=305D5D><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044F4F><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=044140><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=083131><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=647979><font size=1>&nbsp;</td>
-	<td bgcolor=515C5B><font size=1>&nbsp;</td>
-	<td bgcolor=425A5A><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=223C3D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=274C4D><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=344C4E><font size=1>&nbsp;</td>
-	<td bgcolor=5E5F60><font size=1>&nbsp;</td>
-	<td bgcolor=777878><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=91A3A3><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=848788><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=939494><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=A5A6A6><font size=1>&nbsp;</td>
-	<td bgcolor=B4B4B4><font size=1>&nbsp;</td>
-	<td bgcolor=BEC2C2><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-<tr>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=CECFCF><font size=1>&nbsp;</td>
-	<td bgcolor=DEDFDF><font size=1>&nbsp;</td>
-	<td bgcolor=E0EAE9><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=EDEEEF><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-	<td bgcolor=FDFDFB><font size=1>&nbsp;</td>
-</tr>
-</table>
\ No newline at end of file
diff --git a/layout/html/tests/table/testcases/wa_table_thtd_rowspan.html b/layout/html/tests/table/testcases/wa_table_thtd_rowspan.html
deleted file mode 100644
index 38cd0182483d..000000000000
--- a/layout/html/tests/table/testcases/wa_table_thtd_rowspan.html
+++ /dev/null
@@ -1,977 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-	<title>Web Browser Web View (HTML): Table</title>
-
-	<meta name="GENERATOR" CONTENT="Mozilla/3.0 (Win95; I) [Netscape]">
-
-</head>
-
-
-
-<body bgcolor=#FFDEAD TEXT=#000000>
-
-<h1><font color=#FF0000>Acceptance Test Case<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color="#FF0000" size=+2><b>Table: &lt;TH&gt; &amp; &lt;TD&gt; ROWSPAN</b></font>
-
-
-
-<hr>
-
-This acceptance test case tests the optional <b>&lt;TH&gt;</b> &amp; <b>&lt;TD&gt;</b> tag <b>ROWSPAN</b> attribute which, 
-
-when placed in a table header or data tag, specifies how many rows the table header or data cell will span. The 
-
-<b>ROWSPAN</b> attribute is set to an integer value equal the number of rows the table header or data cell spans.
-
-<p>
-
-<b>Test Instructions:</b>
-
-<ol>
-
-<li>Verify that the sample text displays as stated in each of the following test cases:</li>
-
-	<p>
-
-	<table bgcolor=#F08080 cellpadding=7>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_1">Test Case #1</a></td>
-
-		<td><font color=blue><b>table with header cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_2">Test Case #2</a></td>
-
-		<td><font color=blue><b>table with data cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_thtd_rowspan.html#TestCase_3">Test Case #3</a></td>
-
-		<td><font color=blue><b>table with nested header & data cells spanning multiple rows</b></font></td>
-
-	</tr>
-
-	</table>
-
-<p>
-
-<li>Verify that the table is maintained when you <b>minimize/maximize</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size left & right</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size top & bottom</b> the screen.</li>
-
-<li>Verify re-draw takes place correctly after maximizing the screen.</li>
-
-<li>Verify reload works.</li>
-
-</ol>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_1"></A>Test Case #1: <font color=blue>table with header cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTH ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<br>
-
-<table border bgcolor=#FFD700 cellpadding=10 width=90%>
-
-<tr><td><font color="FF0000"><b>In the following sample table you should see that the <font color=blue>ROWSPAN</font> 
-
-attribute applies an integer value equal to the number of rows the <font color=blue>HEADER</font> cell is to span. This 
-
-tells the browser to make the table header cell occupy the same vertical space as the integer number of cells specified in rows 
-
-above or below it. The browser flows the contents of the spanning cell to occupy the entire spanned space.
-
-</font></td></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Table <b>Header Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th rowspan=2 bgcolor=bisque>Header 1<br>span=2 rows</th>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=5 bgcolor=bisque>Header 2<br>span=5 rows</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr bgcolor=bisque>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=3 bgcolor=bisque>Header 3<br>span=3 rows</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-<p>
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_2"></A>Test Case #2: <font color=blue>table with data cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTD ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<br>
-
-<table border bgcolor=#FFD700 cellpadding=10 width=90%>
-
-<tr><td><font color="FF0000"><b>In the following sample table you should see that the <font color=blue>ROWSPAN</font> 
-
-attribute applies an integer value equal to the number of rows the <font color=blue>DATA</font> cell is to span. This 
-
-tells the browser to make the table data cell occupy the same vertical space as the integer number of cells specified in rows 
-
-above or below it. The browser flows the contents of the spanning cell to occupy the entire spanned space.
-
-</font></td></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Table <b>Data Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th bgcolor=violet>Head</th>
-
-	<td rowspan=2 bgcolor=lemonchiffon>Data 1<br>span=2 rows</td>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=violet>Head</th>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td rowspan=5 bgcolor=lemonchiffon>Data 2<br>span=5 rows</td>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightgreen>Head</th>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td rowspan=3 bgcolor=lemonchiffon>Data 3<br>span=3 rows</td>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th bgcolor=lightblue>Head</th>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-<p>
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10 width=85%>
-
-<tr align=left><th>
-
-<A NAME="TestCase_3"></A>Test Case #3: <font color=blue>table with nested header & data cells spanning multiple rows</font> 
-
-<font size=-1><i>(using &ltTH ROWSPAN=integer value&gt &ltTD ROWSPAN=integer value&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-
-
-<p><br><br>
-
-<ul>
-
-<table border width=65%>
-
-<caption align=top>Nested Table <b>Header Cells</b> &amp; <b>Data Cells</b> spanning multiple rows</caption>
-
-<tr>
-
-	<th rowspan=7 bgcolor=bisque>Header 1<br>span=7 rows</td>
-
-	<td rowspan=2 bgcolor=lemonchiffon>Data 1<br>span=2 rows</td>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=violet>col 1</td>
-
-	<td bgcolor=violet>col 2</td>
-
-	<td bgcolor=violet>col 3</td>
-
-	<td bgcolor=violet>col 4</td>
-
-	<td bgcolor=violet>col 5</td>
-
-	<td bgcolor=violet>col 6</td>
-
-	<td bgcolor=violet>col 7</td>
-
-	<td bgcolor=violet>col 8</td>
-
-	<td bgcolor=violet>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td rowspan=5 bgcolor=lemonchiffon>Data 2<br>span=5 rows</td>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightgreen>col 1</td>
-
-	<td bgcolor=lightgreen>col 2</td>
-
-	<td bgcolor=lightgreen>col 3</td>
-
-	<td bgcolor=lightgreen>col 4</td>
-
-	<td bgcolor=lightgreen>col 5</td>
-
-	<td bgcolor=lightgreen>col 6</td>
-
-	<td bgcolor=lightgreen>col 7</td>
-
-	<td bgcolor=lightgreen>col 8</td>
-
-	<td bgcolor=lightgreen>col 9</td>
-
-</tr>
-
-<tr>
-
-	<th rowspan=3 bgcolor=bisque>Header 2<br>span=3 rows</td>
-
-	<td rowspan=3 bgcolor=lemonchiffon>Data 3<br>span=3 rows</td>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-<tr>
-
-	<td bgcolor=lightblue>col 1</td>
-
-	<td bgcolor=lightblue>col 2</td>
-
-	<td bgcolor=lightblue>col 3</td>
-
-	<td bgcolor=lightblue>col 4</td>
-
-	<td bgcolor=lightblue>col 5</td>
-
-	<td bgcolor=lightblue>col 6</td>
-
-	<td bgcolor=lightblue>col 7</td>
-
-	<td bgcolor=lightblue>col 8</td>
-
-	<td bgcolor=lightblue>col 9</td>
-
-</tr>
-
-</table>
-
-</ul>
-
-
-
-
-<p>	
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 9/19/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<p>
-
-<br><p>
-
-<!-- ***** 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 table tests.
-
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** --> 
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/testcases/wa_table_tr_align.html b/layout/html/tests/table/testcases/wa_table_tr_align.html
deleted file mode 100644
index 48234993af7f..000000000000
--- a/layout/html/tests/table/testcases/wa_table_tr_align.html
+++ /dev/null
@@ -1,250 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-	<title>Web Browser Web View (HTML): Table</title>
-
-	<meta name="GENERATOR" CONTENT="Mozilla/3.0 (Win95; I) [Netscape]">
-
-</head>
-
-
-
-<body bgcolor=FFDEAD TEXT="000000">
-
-<h1><font color=#FF0000>Acceptance Test Case<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color=#FF0000 size=+2><b>Table: &lt;TR&gt; ALIGN</b></font>
-
-
-
-<hr>
-
-This acceptance test case tests the optional <b>&lt;TR&gt;</b> tag <b>ALIGN</b> attribute which controls the 
-
-horizontal alignment of all the cells in a row. This cause the contents of each cell in the row to be aligned 
-
-either LEFT|CENTER|RIGHT with respect to the current left and right margins of the display window. 
-
-The <b>Header</b> cells by default are aligned <b>CENTER</b> while the <b>Data</b> cells by default are aligned <b>LEFT</b>.
-
-<p>
-
-<b>Test Instructions:</b>
-
-<ol>
-
-<li>Verify that the sample text displays as stated in each of the following test cases:</li>
-
-	<p>
-
-	<table bgcolor=#F08080 cellpadding=7>
-
-	<tr>
-
-		<td><a href="wa_table_tr_align.html#TestCase_1">Test Case #1</a></td>
-
-		<td><font color=blue><b>Table displaying Header "CENTER "& Data "LEFT" default horizontal row alignment</b></font></td>
-
-	</tr>
-
-	<tr>
-
-		<td><a href="wa_table_tr_align.html#TestCase_2">Test Case #2</a></td>
-
-		<td><font color=blue><b>Tables displaying Header & Data "LEFT|CENTER|RIGHT" horizontal row alignment</b></font></td>
-
-	</tr>
-
-	</table>
-
-<p>
-
-<li>Verify that the table is maintained when you <b>minimize/maximize</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size left & right</b> the screen.</li>
-
-<li>Verify that the table is maintained when you <b>re-size top & bottom</b> the screen.</li>
-
-<li>Verify re-draw takes place correctly after maximizing the screen.</li>
-
-<li>Verify reload works.</li>
-
-</ol>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10>
-
-<tr><th>
-
-<A NAME="TestCase_1"></A>Test Case #1: <font color=blue>Table displaying Header "CENTER "& Data "LEFT" default horizontal row alignment</font> 
-
-<font size=-1><i>(using &ltTR&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Default Horizontal Row Alignment</caption>
-
-<tr><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-</table>
-
-
-
-<hr>
-
-<p>
-
-<table border=1 bgcolor=lightcoral cellpadding=10>
-
-<tr><th>
-
-<A NAME="TestCase_2"></A>Test Case #2: <font color=blue>Tables displaying Header & Data "LEFT|CENTER|RIGHT" horizontal row alignment</font> 
-
-<font size=-1><i>(using &ltTR ALIGN=LEFT|CENTER|RIGHT&gt tag)</i></font>
-
-</th></tr>
-
-</table>
-
-
-
-
-<p>
-
-
-<table border bgcolor=bisque width=45%>
-
-
-<caption align=top>Horizontal Row Alignment=LEFT</caption>
-
-
-<tr align=left><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=left><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-
-</tr>
-
-<tr bgcolor=gold><td colspan=3>
-
-<b><font color=red>
-
-Note: The attribute <font color=blue>ALIGN=LEFT</font> has no special effect on the row data since it simply reiterates the default horizontal row alignment!
-
-<p></font></b>
-
-</td></tr>
-
-</table>
-
-
-
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Horizontal Row Alignment=CENTER</caption>
-
-<tr align=center><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=center><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-<tr bgcolor=gold><td colspan=3>
-
-<b><font color=red>
-
-Note: The attribute <font color=blue>ALIGN=CENTER</font> has no special effect on the row head since it simply reiterates the default horizontal row alignment!
-
-<p></font></b>
-
-</td></tr>
-
-</table>
-
-
-
-<p>
-
-<table border bgcolor=bisque width=45%>
-
-<caption align=top>Horizontal Row Alignment=RIGHT</caption>
-
-<tr align=right><th>row head 1</th><th>row head 2</th><th>row head 3</th></tr>
-
-<tr align=right><td>row data 1</td><td>row data 2</td><td>row data 3</td></tr>
-
-</table>
-
-
-
-<p>	
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 9/9/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<p>
-
-<br><p>
-
-<!-- ***** 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 table tests.
-
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** -->
-
-</body>
-
-</html>
-
-
-
diff --git a/layout/html/tests/table/testcases/wf_table_index.html b/layout/html/tests/table/testcases/wf_table_index.html
deleted file mode 100644
index 747d94308de3..000000000000
--- a/layout/html/tests/table/testcases/wf_table_index.html
+++ /dev/null
@@ -1,240 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 3.2 Draft//EN">
-
-<html>
-
-<head>
-
-   <title>Web Browser Web View (HTML): DocType</title>
-
-</head>
-
-
-
-<body bgcolor=#FFDEAD TEXT=#000000>
-
-<h1><font color=teal>Functional Test<br>Web Browser: Web View (HTML)</font></h1>
-
-<p>
-
-<font color=teal size=+2><b>Tables</b></font>
-
-
-
-<hr>
-
-<b><i>Objective</i></b>: Tests the Simple HTML Table Model.
-
-<p>
-
-<b><i>Syntax</i></b>: The Simple Table Model is the table model that most browsers currently support. 
-
-The model is from the HTML 3.2 Draft specifications which describes tables in terms of table cells 
-
-grouped into row-based cell layouts.
-
-<p>
-
-Based on the simple table model, you can create a wide variety of tables with only five tags:
-
-	<ol>
-
-	<li>the <b>&lt;TABLE&gt;</b> tag, which encapsulates a table and its elements in the HTML document's body content;</li>
-
-	<li>the <b>&lt;TR&gt</b> tag, which defines a table row;</li>
-
-	<li>the <b>&lt;TH&gt</b> tag, which define the table header;</li>
-
-	<li>the <b>&lt;TD&gt;</b> tag, which define the table data cell;</li>
-
-	<li>the <b>&lt;CAPTION&gt</b> tag, which defines a table title (caption);
-
-	</ol>
-
-Each tag has one or more required and optional attributes, some of which affect not only the tag itself, but related tags.
-
-<p>
-
-<b><i>Procedure</i></b>: Click each <font color=#0000FF>link</font> in the <b>Special Case</b> column to verify that the expected results match the resulting display.
-
-<hr>
-
-
-
-<!-- ********************** Functional Test Cases ************************** -->
-
-<p>
-
-<center>
-
-<table border=1 bgcolor=lemonchiffon cellpadding=7 width=90%>
-
-	<tr>
-
-		<th width=20%>Special Case</th><th>Expected Results</th>
-
-	</tr>
-
-
-	<tr>
-
-
-
-		<td valign=top><a href="wf_table_bgcolor.html">Table with background color</a></td>
-
-
-
-		<td><li type=square>Verify what happens when you use the Edit|Preferences|Appearance|Color checkbox.</li></td>
-
-
-
-	</tr>
-
-
-
-
-
-
-	<tr>
-
-		<td valign=top><a href="wf_table_mixed_widths.html">Table with Mixed Widths</a></td>
-
-		<td><li type=square>Verify what happens when you have mixed <b>absolute</b> and <b>relative</b> table cell widths?.</li></td>
-
-	</tr>
-
-	<tr>
-		<td valign=top><a href="wf_table_large.html">Large Table</a></td>
-		<td><li type=square>Verify that you can load a table with a large number of rows & columns.</li></td>
-	</tr>
-
-	<tr><td valign=top><a href="../charstyles/wf_charstyles_tables.html">Character Styles inside Tables</a></td>
-	<td><li type=square>Verify that tables can contain character styles.<font color=teal><b>[from Character Styles Functional Test Case]</b></font></li></td>
-	</tr>
-	<tr>
-
-	<td valign=top><a href="../images/wf_images_in_table.html">Images inside Tables</a></td>		<td><li type=square>Verify that images can be contained inside tables.<font color=teal><b>[from Image Functional Test Case]</b></font></li></td>	</tr>
-
-	<tr><td><a href="../multicol/wf_multicol_table.html">Multicolumns inside a Table</a></td>		<td><li type=square>Verify that multicolumns can be contained inside a table.<font color=teal><b>[from Multicolumn Functional Test Case]</b></font></li></td>
-	</tr>
-	<tr>
-	<td><a href="wf_table_with_plug-in.html">Table with Plug-ins</a></td>
-	<td><li type=square>Verify that multimedia plug-ins can be contained inside a table.</li></td>
-	</tr>
-
-	<tr>
-	<td><a href="wf_table_nests.html">Nested Tables</a></td>
-
-	<td><li type=square>Verify that tables can be nested inside other tables.</li></td>
-
-	</tr>
-<tr>
-
-	<td><a href="wf_table_crash.html">Invalid Table Tags</a></td>
-
-	<td><li type=square>Verify that table will NOT crash when closing table tags were missing.</li></td>
-
-	</tr>
-
-<tr>
-
-	<td><a href="wf_img_overlap_tbl.html">Image/table overlapping</a></td>
-
-	<td><li type=square>Verify that Image and table text should NOT co-exist in the same space.</li></td>
-
-	</tr>
-
-</table>
-
-</center>
-
-
-
-<p>
-
-<br>
-
-<center>
-
-<table bgcolor=pink border=2 cellspacing=3 cellpadding=5>
-
-<tr>
-	<td><font size=-1>
-	<a href="../wf_body_index.html"><img width=9 height=11 ALIGN=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Body</a><br>
-	</font>
-	</td>
-	<td><font size=-1>
-	<a href="../../../../lf_testspec.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Functional Test Suite</a>
-	</font>
-	</td>
-	<td><font size=-1>
-	<a href="../../wf_html_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Tag Index</a>
-	</font>
-	</td>
-	<td bgcolor=navajowhite>&nbsp;</td>
-	<td bgcolor=lightcoral><font size=-1>
-	<a href="wa_table_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_l.gif" alt="" border=0> back to Acceptance Test</a>
-	</font>
-	</td>
-	</td>
-	<td bgcolor=plum><font size=-1>
-	<a href="ws_table_index.html"><img width=9 height=11 align=bottom src="pics/red_arrow_r.gif" alt="" border=0> on to Stress Test</a>
-	</font>
-	</td>
-</tr>
-
-</table>
-
-</center>
-
-
-
-<hr>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Created 5/13/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 11/03/96 by <a href="mailto:ronaldg@netscape.com">Ronald Greti</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 12/08/96 by <a href="mailto:robw@netscape.com">Robert Wehrfritz</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 03/04/97 by <a href="mailto:chitra@netscape.com">Chitra Natarajan</a><br>
-
-<img width=13 height=13 src="../images/raptor.jpg"> Modified 1/13/98 by <a href="mailto:chitra@netscape.com">Fenella Gor</a><br>
-
-<p>
-
-<br><p>
-<!-- ***** 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 table tests.
-
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1996
-   - 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 LGPL or the GPL. 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 ***** -->
diff --git a/layout/html/tests/table/viewer_tests/body_col.html b/layout/html/tests/table/viewer_tests/body_col.html
deleted file mode 100644
index 434aed3f463d..000000000000
--- a/layout/html/tests/table/viewer_tests/body_col.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
-<html>
-<head><!-- testcase: body_col.html
-  description: HTML Text Markup Element- COL --> 
-<!-- Author: Chris Petersen  Date: 11/2/98 -->
-<!-- ***** 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 table tests.
-
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 1998
-   - 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 LGPL or the GPL. 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 ***** --> 
-<!-- Purpose: To test the COL Element. The COL element specifies the characteristics of the a table's column such as width -->
-<!-- Expected result:  The first column has a width property of 40 pixels ; the second column has width of 100 pixels. -->
-<title>Web Browser Web View (HTML): Document COL</title>
-</head>
-<body>
-<TABLE BORDER=2>
-<COLGROUP>
-<COL WIDTH="40">
-<COL WIDTH="100">
-</COLGROUP>
-<TR>
-<TH>
-La Mesa
-</TH>
-<TD>X
-</TD>
-</TR>
-<TR>
-<TH>
-El Cajon
-</TH>
-<TD>
-X
-</TD>
-</TR>
-<TR>
-<TH>
-Chula Vista
-</TH>
-<TD>
-X
-</TD>
-<TR>
-<TH>
-Bonita
-</TH>
-<TD>
-N/A
-</TD>
-</TABLE>
-</html>
diff --git a/layout/html/tests/table/viewer_tests/rtest.lst b/layout/html/tests/table/viewer_tests/rtest.lst
deleted file mode 100644
index 57e6f2580020..000000000000
--- a/layout/html/tests/table/viewer_tests/rtest.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-test3.html
-test4.html
-test6.html
-
diff --git a/layout/html/tests/table/viewer_tests/test3.html b/layout/html/tests/table/viewer_tests/test3.html
deleted file mode 100644
index f09a21f51c00..000000000000
--- a/layout/html/tests/table/viewer_tests/test3.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<html>
-<head>
-<title>Example 3</title>
-<meta name="crc" content=2849229639>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-<h1>Example 3: Basic Tables</h1>
-<h2>Simple table, 75% width, border=1</h2>
-<table border="1" width="75%">
-  <tr>
-    <td bgcolor=blue>cell bg</td>
-    <td>Two</td>
-    <td>Three</td>
-  </tr>
-  <tr>
-    <td align=left>left</td>
-    <td align=center>center</td>
-    <td align=right>right</td>
-  </tr>
-  <tr bgcolor=yellow>
-    <td height=50>row bg</td>
-    <td valign=top>top</td>
-    <td valign=bottom>bottom</td>
-  </tr>
-</table>
-<h2>Row Span, auto width table, border=5</h2>
-<table border=5>
-  <tr> 
-    <td rowspan=2 >c0r[0-1] Data 1 span=2 rows</td>
-    <td >c0r0</td>
-    <td >c1r0</td>
-  </tr>
-  <tr> 
-    <td >c0r1</td>
-    <td >c1r1</td>
-  </tr>
-  <tr> 
-    <td rowspan=5 background=bg.jpg>c0r[2-6],Data 2 span=5 rows</td>
-    <td >c0r2</td>
-    <td >c1r2</td>
-  </tr>
-  <tr> 
-    <td >c0r3</td>
-    <td >c1r3</td>
-  </tr>
-  <tr> 
-    <td >c0r4</td>
-    <td >c1r4</td>
-  </tr>
-  <tr> 
-    <td >c0r5</td>
-    <td >c1r5</td>
-  </tr>
-  <tr> 
-    <td >c0r6</td>
-    <td >c1r6</td>
-  </tr>
-  <tr> 
-    <td rowspan=3  >c0r[7-9] span=3 rows</td>
-    <td >c0r7</td>
-    <td >c1r7</td>
-  </tr>
-  <tr> 
-    <td >c0r8</td>
-    <td >c1r8</td>
-  </tr>
-  <tr> 
-    <td >c0r9</td>
-    <td >c1r9</td>
-  </tr>
-</table>
-<h2>Col Span auto width table</h2>
-<table border >
-  <tr> 
-    <td colspan=8>r0c[0-7], span=8</td>
-    <td colspan=10>r0col[8-17], span=10 cols</td>
-  </tr>
-  <tr> 
-    <td colspan=3>r1c[0-2], span=3</td>
-    <td colspan=5>r1c[3-7], span=5</td>
-    <td colspan=7>r1c[8-14], span=7</td>
-    <td colspan=3>r1c[15-17], span=3</td>
-  </tr>
-  <tr> 
-    <td >r2c0</td>
-    <td >r2c1</td>
-    <td >r2c3</td>
-    <td >r2c4</td>
-    <td >r2c5</td>
-    <td >r2c6</td>
-    <td >r2c7</td>
-    <td >r2c8</td>
-    <td >r2c9</td>
-    <td >r2c10</td>
-    <td >r2c11</td>
-    <td >r2c12</td>
-    <td >r2c13</td>
-    <td >r2c14</td>
-    <td >r2c15</td>
-    <td >r2c16</td>
-    <td >r2c17</td>
-    <td >r2c18</td>
-  </tr>
-</table>
-<h2>Row and Col Span</h2>
-<table border >
-  <tr> 
-    <td colspan=2 rowspan=2>r[0-2]c[0-1]</td>
-    <td>r0c2</td>
-    <td>r0c3</td>
-  </tr>
-  <tr> 
-    <td>r1c2</td>
-    <td>r1c3</td>
-  </tr>
-  <tr> 
-    <td>r2c0</td>
-    <td>r2c1</td>
-    <td>r2c2</td>
-    <td>r2c3</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/layout/html/tests/table/viewer_tests/test4.html b/layout/html/tests/table/viewer_tests/test4.html
deleted file mode 100644
index ea077d308241..000000000000
--- a/layout/html/tests/table/viewer_tests/test4.html
+++ /dev/null
@@ -1,335 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.09 [en] (WinNT; U) [Netscape]">
-   <TITLE>test4</TITLE>
-<STYLE>
-BODY { font-size: 12pt; background-image: url(../images/bg.jpg); }
-</STYLE>
-<meta name="crc" content=250397440>
-</HEAD>
-<BODY>
-
-<H1>
-Example 4: Some simple tables.</H1>
-
-<TABLE BORDER >
-<TR>
-<TH BACKGROUND="../images/rock_gra.gif">Color&nbsp;</TH>
-
-<TH BACKGROUND="../images/rock_gra.gif">Meaning&nbsp;</TH>
-</TR>
-
-<TR>
-<TD BGCOLOR="#90EE90">lightgreen</TD>
-
-<TD>Light green is used on cells that have a colspan</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="#F0E68C">khaki</TD>
-
-<TD>Khaki is used on cells that have a rowspan</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="#D3D3D3">lightgrey</TD>
-
-<TD>Light grey is used on cells that have a rowspan <B>and</B> a colspan</TD>
-</TR>
-</TABLE>
-<br>
-&nbsp;
-<TABLE BORDER WIDTH="100%" >
-<CAPTION>Table 1 has this caption at the top.&nbsp; It is defined to be 100%
-of it's parent's width.</CAPTION>
-
-<TR>
-<TD COLSPAN="2" BGCOLOR="#90EE90">Cell</TD>
-
-<TD>Stuff to test out table cell layout. This should be long enough.</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-
-<TD COLSPAN="2" BGCOLOR="#90EE90">Stuff to test out table cell layout.
-This should be long enough.</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-
-<TD>Stuff to test out table cell layout. This should be long enough.</TD>
-
-<TD>Cell</TD>
-</TR>
-</TABLE>
-<br>
-&nbsp;
-<TABLE BORDER >
-<CAPTION>Table 2 has auto-width (no width param specified.)</CAPTION>
-
-<TR>
-<TD>Cell</TD>
-
-<TD COLSPAN="2" ROWSPAN="2" BGCOLOR="#D3D3D3">Stuff to test out table cell
-layout. This should be long enough.</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-
-<TD>Stuff to test out table cell layout. This should be long enough.</TD>
-
-<TD>more text</TD>
-</TR>
-</TABLE>
-&nbsp;
-<TABLE BORDER COLS=3 >
-<CAPTION>Table 3 is the same as Table 2, but with equal column widths.&nbsp;</CAPTION>
-
-<TR>
-<TD>Cell</TD>
-
-<TD COLSPAN="2" ROWSPAN="2" BGCOLOR="#D3D3D3">Stuff to test out table cell
-layout. This should be long enough.</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-</TR>
-
-<TR>
-<TD>Cell</TD>
-
-<TD>Stuff to test out table cell layout. This should be long enough.</TD>
-
-<TD>more text</TD>
-</TR>
-</TABLE><br>
-&nbsp;
-<table cellpadding=2 style="border-collapse:collapse">
-<CAPTION ALIGN=BOTTOM>Table 4 has this bottom caption. The table has specified
-column widths and collapsing borders.</CAPTION>
-<colgroup>
-<col width=90 style="border-left: 2px solid black; border-right:2px dashed blue">
-<col width=80 style="border-right:1px solid red">
-<col width=80 style="border-right:2px solid black">
-</colgroup>
-
-<thead style="border-bottom: 6px solid black">
-<tr style="border: 2px solid black;">
-  <th style="border-right: hidden">Player</th>
-  <th style="border-right: hidden">Ranking</th>
-  <th>Record</th>
-</tr>
-</thead>
-
-<tbody>
-<tr style="border: 2px solid black">
-  <td>Steve Clark</td>
-  <td align=center>1</td>
-  <td align=center>77-0</td>
-</tr>
-<tr style="border: 2px solid black">
-  <td>Cliff Swain</td>
-  <td align=center>2</td>
-  <td align=center>67-10</td>
-</tr>
-<tr style="border: 2px solid black">
-  <td>Marty Hogan</td>
-  <td align=center>3</td>
-  <td align=center>57-15</td>
-</tr>
-</tbody>
-</TABLE>
-
-<BR>
-<table>
-<CAPTION ALIGN=BOTTOM>Table 5 has a scrolling tbody.</CAPTION>
-<thead>
-<tr><td colspan=2 style="font-size: 8pt; font-weight: bold">HEADER
-</thead>
-
-<tbody style="overflow: auto; height: 200px; border: 1px solid black">
-<tr><td>cell-00<td>cell-01<td>cell-02<td>cell-03</tr>
-<tr><td>cell-10<td>cell-11<td>cell-12<td>cell-13</tr>
-<tr><td>cell-20<td>cell-21<td>cell-22<td>cell-23</tr>
-<tr><td>cell-30<td>cell-31<td>cell-32<td>cell-33</tr>
-<tr><td>cell-40<td>cell-41<td>cell-42<td>cell-43</tr>
-<tr><td>cell-50<td>cell-51<td>cell-52<td>cell-53</tr>
-<tr><td>cell-60<td>cell-61<td>cell-62<td>cell-63</tr>
-<tr><td>cell-70<td>cell-71<td>cell-72<td>cell-73</tr>
-<tr><td>cell-80<td>cell-81<td>cell-82<td>cell-83</tr>
-<tr><td>cell-90<td>cell-91<td>cell-92<td>cell-93</tr>
-<tr><td>cell-a0<td>cell-a1<td>cell-a2<td>cell-a3</tr>
-<tr><td>cell-b0<td>cell-b1<td>cell-b2<td>cell-b3</tr>
-<tr><td>cell-c0<td>cell-c1<td>cell-c2<td>cell-c3</tr>
-<tr><td>cell-d0<td>cell-d1<td>cell-d2<td>cell-d3</tr>
-<tr><td>cell-e0<td>cell-e1<td>cell-e2<td>cell-e3</tr>
-<tr><td>cell-f0<td>cell-f1<td>cell-f2<td>cell-f3</tr>
-</tbody>
-
-<tfoot>
-<tr><td colspan=2 style="font-size: 8pt; font-weight: bold">FOOTER
-</tfoot>
-
-<CAPTION ALIGN=BOTTOM>Table 5 has a scrolling tbody.</CAPTION>
-</table>
-
-<BR>
-This is a table formed from a list with display of table-row and
-list items with display of table-cell.
-<UL style="display: table-row; background-color:orange;">
-<LI style="display: table-cell; background-color:orange;">ONE</LI>
-<LI style="display: table-cell; background-color:orange;">TWO</LI>
-<LI style="display: table-cell; background-color:orange;">THREE</LI>
-<LI style="display: table-cell; background-color:orange;">FOUR</LI>
-<LI style="display: table-cell; background-color:orange;">FIVE</LI>
-</UL>
-<BR>
-
-This is a table formed from a list with display of table-row-group and
-list items with display of table-cell. 
-<BR>
-<UL style="display:table-row-group;">
-<LI style="display:table-cell;  background-color:orange;">ONE</LI>
-<LI style="display:table-cell;  background-color:orange;">TWO</LI>
-<LI style="display:table-cell;  background-color:orange;">THREE</LI>
-<LI style="display:table-cell;  background-color:orange;">FOUR</LI>
-<LI style="display:table-cell;  background-color:orange;">FIVE</LI>
-<LI style="display:table-cell;  background-color:orange;">SIX</LI>
-</UL>
-<BR>
-
-This is like the previous table plus the list's overflow property set
-<UL style="display:table-row-group; overflow:auto; height: 50px;">
-<LI style="display:table-cell;  background-color:orange;">ONE</LI>
-<LI style="display:table-cell;  background-color:orange;">TWO</LI>
-<LI style="display:table-cell;  background-color:orange;">THREE</LI>
-<LI style="display:table-cell;  background-color:orange;">FOUR</LI>
-<LI style="display:table-cell;  background-color:orange;">FIVE</LI>
-<LI style="display:table-cell;  background-color:orange;">SIX</LI>
-</UL>
-<BR>
-<P> The following table will have its rows and columns in red collapsed 
-<BR>
-<table border=1 style="background-color:orange;">
-<caption><b>before</b></caption>
-<colgroup>
-<col>
-<col>
-<col>
-</colgroup>
-<tr><td>C11<td style="background-color:red;">C12<td>C13 large
-<tr style="background-color:red;"><td>C21<td>C22<td>C23
-<tr><td>C31<td style="background-color:red;">C32<td>C33
-</table>
-
-<BR>
-<table border=1 style="background-color:orange;">
-<caption><b>after</b></caption>
-<colgroup>
-<col>
-<col style="visibility:collapse;">
-<col>
-</colgroup>
-<tr><td>C11<td>C12<td>C13 large
-<tr style="visibility:collapse;"><td>C21<td>C22<td>C23
-<tr><td>C31<td>C32<td>C33
-</table>
-
-<P> The following table will have its 2nd row and 2nd col collapsed. A window resize may be necessary to see it properly.
-<BR>
-<table cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>before</b></caption>
-<colgroup>
-<col>
-<col>
-<col>
-<col>
-</colgroup>
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr><td>C21<td rowspan=2 colspan=2>C12 C13 C22 C23<td>C14
-<tr><td>C31<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-<table cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>after</b></caption>
-<colgroup>
-<col>
-<col style="visibility:collapse;">
-<col>
-<col>
-</colgroup>
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr style="visibility:collapse;"><td>C21<td rowspan=2 colspan=2>C12 C13 C22 C23<td>C14
-<tr><td>C31<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-<P> The following table will have its 1st row group collapsed (rows 1 and 2)
-<BR>
-<table cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>before</b></caption>
-<tbody style="background-color:red;">
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr><td>C21<td>C22<td>C23<td>C24
-</tbody>
-<tbody>
-<tr><td>C31<td>C32<td>C33<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-<BR>
-<table cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>after</b></caption>
-<tbody style="visibility:collapse;">
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr><td>C21<td>C22<td>C23<td>C24
-</tbody>
-<tbody>
-<tr><td>C31<td>C32<td>C33<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-<BR>
-<P> The following table is similar to a previous table except that the direction is right-to-left. 
-It will have its 2nd row and 2nd col collapsed. A window resize may be necessary to see it properly.
-<BR>
-<table dir=rtl cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>before</b></caption>
-<colgroup>
-<col>
-<col>
-<col>
-<col>
-</colgroup>
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr><td>C21<td rowspan=2 colspan=2>C12 C13 C22 C23<td>C14
-<tr><td>C31<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-<table dir=rtl cellspacing=0 border=1 style="background-color:orange;">
-<caption><b>after</b></caption>
-<colgroup>
-<col>
-<col style="visibility:collapse;">
-<col>
-<col>
-</colgroup>
-<tr><td>C11<td>C12<td>C13<td>C14
-<tr style="visibility:collapse;"><td>C21<td rowspan=2 colspan=2>C12 C13 C22 C23<td>C14
-<tr><td>C31<td>C34
-<tr><td>C41<td>C42<td>C43<td>C44
-</table>
-
-</BODY>
-</HTML>
diff --git a/layout/html/tests/table/viewer_tests/test6.html b/layout/html/tests/table/viewer_tests/test6.html
deleted file mode 100644
index 22ca885e996f..000000000000
--- a/layout/html/tests/table/viewer_tests/test6.html
+++ /dev/null
@@ -1,335 +0,0 @@
-<html>
-<head>
-<title>Test 6</title>
-
-<style>
-PRE { color:red; }
-</style>
-<meta name="crc" content=1567940029>
-</head>
-
-<body>
-<h1>Example 6: Table Stress Test</h1>
-<PRE>Resize document for maximum effect</PRE>
-
-<br>
-<h2>Auto-width tables with spans nested 8 levels deep</h2>
-<table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=orange>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=red>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightblue>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2><table border=1 bgcolor=lightgreen>
-<TR><TD>Cell</TD><TD COLSPAN=2 ROWSPAN=2> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-</TD></TR>
-<TR><TD>Cell</TD></TR>
-<TR><TD>Cell</TD><TD> Cell, and stuff to test out table cell layout. This should be long  enough for testing.</TD><TD>Cell</TD></TR>
-</table>
-<br>
-<h2>100% width tables nested 6 levels deep</h2>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=yellow >
-<TR>
-<TD>Cell one</TD>
-
-<TD>Cell2</TD>
-
-<TD>Cell 3</TD>
-</TR>
-
-<TR>
-<TD>Cell 4</TD>
-
-<TD>Cell 5</TD>
-
-<TD>Cell 6</TD>
-</TR>
-
-<TR>
-<TD>
-<TABLE WIDTH="100%"  BGCOLOR=lightgrey >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-</TR>
-
-<TR>
-<TD>4</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=lightblue >
-<TR>
-<TD>1</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%"  BGCOLOR=red >
-<TR>
-<TD>1</TD>
-
-<TD>2</TD>
-
-<TD>3</TD>
-
-<TD>4</TD>
-
-<TD>5</TD>
-</TR>
-
-<TR>
-<TD>6</TD>
-
-<TD>7</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=green >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=purple >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>
-<TABLE BORDER WIDTH="100%" BGCOLOR=orange >
-<TR>
-<TD>a</TD>
-
-<TD>b</TD>
-
-<TD>c</TD>
-
-<TD>d</TD>
-
-<TD>e</TD>
-</TR>
-
-<TR>
-<TD>f</TD>
-
-<TD>g</TD>
-
-<TD>h</TD>
-
-<TD>i</TD>
-
-<TD>j</TD>
-</TR>
-
-<TR>
-<TD>k</TD>
-
-<TD>l</TD>
-
-<TD>m</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>n</TD>
-
-<TD>o</TD>
-</TR>
-
-<TR>
-<TD>p</TD>
-
-<TD>q</TD>
-
-<TD>r</TD>
-
-<TD>s</TD>
-
-<TD>t</TD>
-</TR>
-
-<TR>
-<TD>u</TD>
-
-<TD>v</TD>
-
-<TD>w</TD>
-
-<TD>x</TD>
-
-<TD>y</TD>
-</TR>
-</TABLE>
-&nbsp;</TD>
-
-<TD>9</TD><TD>0</TD>
-</TR>
-<TR>
-<TD>a</TD><TD>b</TD><TD>c</TD><TD>d</TD><TD>e</TD>
-</TR>
-<TR>
-<TD>f</TD><TD>g</TD><TD>h</TD><TD>i</TD><TD>j</TD>
-</TR>
-<TR>
-<TD>k</TD><TD>l</TD><TD>m</TD><TD>n</TD><TD>o</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>3</TD>
-</TR>
-<TR>
-<TD>4</TD><TD>5</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>6</TD>
-</TR>
-<TR>
-<TD>7</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-&nbsp;</TD><TD>8</TD><TD>9</TD>
-</TR>
-</TABLE>
-
-</body>
-</html>
-
diff --git a/layout/html/tests/xbl/insaneInsertion.css b/layout/html/tests/xbl/insaneInsertion.css
deleted file mode 100644
index f51d5a5adfb6..000000000000
--- a/layout/html/tests/xbl/insaneInsertion.css
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#numberone {
-  -moz-binding: url('insaneInsertion.xml#numberone');
-  border: 1px solid blue;
-  padding: 2px;
-}
-
-#numbertwo {
-  -moz-binding: url('insaneInsertion2.xml#numbertwo');
-  border: 1px solid purple;
-  padding: 2px;
-}
-
-text {
-  border: 1px solid green;
-  padding: 2px;
-}
-
diff --git a/layout/html/tests/xbl/insaneInsertion.xml b/layout/html/tests/xbl/insaneInsertion.xml
deleted file mode 100644
index 114fddae8761..000000000000
--- a/layout/html/tests/xbl/insaneInsertion.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="insaneBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="numberone">
-    <content>
-      <xul:text value="a"/>
-      <xul:box id="numbertwo">
-        <xul:checkbox label="b"/>
-        <children/>
-        <xul:text value="g"/>
-      </xul:box>
-      <xul:text value="i"/>
-    </content>
-  </binding>
-          
-</bindings>          
-
diff --git a/layout/html/tests/xbl/insaneInsertion.xul b/layout/html/tests/xbl/insaneInsertion.xul
deleted file mode 100644
index 422854489030..000000000000
--- a/layout/html/tests/xbl/insaneInsertion.xul
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="insaneInsertion.css"?>
-<?xml-stylesheet href="chrome://communicator/skin/"?>
-
-<window id="insaneInsertion"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        orient="vertical" align="start">
-<html>
-    Below this text is a group of XUL widgets with the labels A-I.  If
-  the insertion code is behaving correctly, then the widgets will all be in alphabetical
-  order.  Clicking on the button labeled 'D' should cause an alert to pop up indicating
-  that the button was clicked.
-  </html>
-
-  <box id="numberone">
-    <button label="d"/> 
-    <text value="f"/> 
-  </box>
-
-</window>
\ No newline at end of file
diff --git a/layout/html/tests/xbl/insaneInsertion2.xml b/layout/html/tests/xbl/insaneInsertion2.xml
deleted file mode 100644
index f36e50af4805..000000000000
--- a/layout/html/tests/xbl/insaneInsertion2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="insaneBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="numbertwo">
-    <content>
-      <children/>
-      <xul:text value="c"/>
-      <children includes="button"/>
-      <xul:text value="e"/>
-      <children includes="text"/>
-      <xul:text value="h"/>
-    </content>
-  </binding>     
-  
-</bindings>
-
-  
\ No newline at end of file
diff --git a/layout/html/tests/xbl/rtest.lst b/layout/html/tests/xbl/rtest.lst
deleted file mode 100644
index 9b858097d914..000000000000
--- a/layout/html/tests/xbl/rtest.lst
+++ /dev/null
@@ -1 +0,0 @@
-insaneInsertion.xul

From f70d867b0e1801240aefc03adfd7f30f77e48270 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sun, 8 May 2011 20:15:49 +0200
Subject: [PATCH 072/314] Bug 655512 - Forward implementation of nsIDOMDocument
 from nsHTMLDocument to nsDocument; r=smaug

---
 content/base/src/nsDocument.cpp              |  31 ++-
 content/html/document/src/nsHTMLDocument.cpp | 233 -------------------
 content/html/document/src/nsHTMLDocument.h   |   2 +-
 3 files changed, 27 insertions(+), 239 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index cdf837319695..641598647c24 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -4466,8 +4466,13 @@ nsDocument::CreateCDATASection(const nsAString& aData,
   NS_ENSURE_ARG_POINTER(aReturn);
   *aReturn = nsnull;
 
-  if (FindInReadable(NS_LITERAL_STRING("]]>"), aData))
+  if (IsHTML()) {
+    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+  }
+
+  if (FindInReadable(NS_LITERAL_STRING("]]>"), aData)) {
     return NS_ERROR_DOM_INVALID_CHARACTER_ERR;
+  }
 
   nsCOMPtr<nsIContent> content;
   nsresult rv = NS_NewXMLCDATASection(getter_AddRefs(content),
@@ -4490,6 +4495,11 @@ nsDocument::CreateProcessingInstruction(const nsAString& aTarget,
 {
   *aReturn = nsnull;
 
+  // There are no PIs for HTML
+  if (IsHTML()) {
+    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+  }
+
   nsresult rv = nsContentUtils::CheckQName(aTarget, PR_FALSE);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -4559,8 +4569,12 @@ nsDocument::CreateEntityReference(const nsAString& aName,
                                   nsIDOMEntityReference** aReturn)
 {
   NS_ENSURE_ARG_POINTER(aReturn);
-
   *aReturn = nsnull;
+
+  if (IsHTML()) {
+    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+  }
+
   return NS_OK;
 }
 
@@ -5841,7 +5855,8 @@ nsDocument::GetInputEncoding(nsAString& aInputEncoding)
 NS_IMETHODIMP
 nsDocument::GetXmlEncoding(nsAString& aXmlEncoding)
 {
-  if (mXMLDeclarationBits & XML_DECLARATION_BITS_DECLARATION_EXISTS &&
+  if (!IsHTML() &&
+      mXMLDeclarationBits & XML_DECLARATION_BITS_DECLARATION_EXISTS &&
       mXMLDeclarationBits & XML_DECLARATION_BITS_ENCODING_EXISTS) {
     // XXX We don't store the encoding given in the xml declaration.
     // For now, just output the inputEncoding which we do store.
@@ -5857,6 +5872,7 @@ NS_IMETHODIMP
 nsDocument::GetXmlStandalone(PRBool *aXmlStandalone)
 {
   *aXmlStandalone = 
+    !IsHTML() &&
     mXMLDeclarationBits & XML_DECLARATION_BITS_DECLARATION_EXISTS &&
     mXMLDeclarationBits & XML_DECLARATION_BITS_STANDALONE_EXISTS &&
     mXMLDeclarationBits & XML_DECLARATION_BITS_STANDALONE_YES;
@@ -5867,12 +5883,17 @@ nsDocument::GetXmlStandalone(PRBool *aXmlStandalone)
 NS_IMETHODIMP
 nsDocument::SetXmlStandalone(PRBool aXmlStandalone)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return IsHTML() ? NS_ERROR_DOM_NOT_SUPPORTED_ERR : NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
 nsDocument::GetXmlVersion(nsAString& aXmlVersion)
 {
+  if (IsHTML()) {
+    SetDOMStringToNull(aXmlVersion);
+    return NS_OK;
+  }
+
   // If there is no declaration, the value is "1.0".
 
   // XXX We only support "1.0", so always output "1.0" until that changes.
@@ -5884,7 +5905,7 @@ nsDocument::GetXmlVersion(nsAString& aXmlVersion)
 NS_IMETHODIMP
 nsDocument::SetXmlVersion(const nsAString& aXmlVersion)
 {
-  return NS_ERROR_NOT_IMPLEMENTED;
+  return IsHTML() ? NS_ERROR_DOM_NOT_SUPPORTED_ERR : NS_ERROR_NOT_IMPLEMENTED;
 }
 
 NS_IMETHODIMP
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index dfc984c1c852..c17f02f272fc 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1192,208 +1192,6 @@ nsHTMLDocument::SetCompatibilityMode(nsCompatibility aMode)
   }
 }
 
-//
-// nsIDOMDocument interface implementation
-//
-NS_IMETHODIMP
-nsHTMLDocument::CreateElement(const nsAString& aTagName,
-                              nsIDOMElement** aReturn)
-{
-  return nsDocument::CreateElement(aTagName, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateElementNS(const nsAString& aNamespaceURI,
-                                const nsAString& aQualifiedName,
-                                nsIDOMElement** aReturn)
-{
-  return nsDocument::CreateElementNS(aNamespaceURI, aQualifiedName, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateProcessingInstruction(const nsAString& aTarget,
-                                            const nsAString& aData,
-                                            nsIDOMProcessingInstruction** aReturn)
-{
-  if (!IsHTML()) {
-    return nsDocument::CreateProcessingInstruction(aTarget, aData, aReturn);
-  }
-
-  // There are no PIs for HTML
-  *aReturn = nsnull;
-
-  return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateCDATASection(const nsAString& aData,
-                                   nsIDOMCDATASection** aReturn)
-{
-  if (!IsHTML()) {
-    return nsDocument::CreateCDATASection(aData, aReturn);
-  }
-
-  // There are no CDATASections in HTML
-  *aReturn = nsnull;
-
-  return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateEntityReference(const nsAString& aName,
-                                      nsIDOMEntityReference** aReturn)
-{
-  if (!IsHTML()) {
-    return nsDocument::CreateEntityReference(aName, aReturn);
-  }
-
-  // There are no EntityReferences in HTML
-  *aReturn = nsnull;
-
-  return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetDoctype(nsIDOMDocumentType** aDocumentType)
-{
-  return nsDocument::GetDoctype(aDocumentType);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetImplementation(nsIDOMDOMImplementation** aImplementation)
-{
-  return nsDocument::GetImplementation(aImplementation);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetDocumentElement(nsIDOMElement** aDocumentElement)
-{
-  return nsDocument::GetDocumentElement(aDocumentElement);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateDocumentFragment(nsIDOMDocumentFragment** aReturn)
-{
-  return nsDocument::CreateDocumentFragment(aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateComment(const nsAString& aData, nsIDOMComment** aReturn)
-{
-  return nsDocument::CreateComment(aData, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateAttribute(const nsAString& aName, nsIDOMAttr** aReturn)
-{
-  return nsDocument::CreateAttribute(aName, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateTextNode(const nsAString& aData, nsIDOMText** aReturn)
-{
-  return nsDocument::CreateTextNode(aData, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetElementsByTagName(const nsAString& aTagname,
-                                     nsIDOMNodeList** aReturn)
-{
-  return nsDocument::GetElementsByTagName(aTagname, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetInputEncoding(nsAString& aInputEncoding)
-{
-  return nsDocument::GetInputEncoding(aInputEncoding);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetXmlEncoding(nsAString& aXmlEncoding)
-{
-  if (!IsHTML()) {
-    return nsDocument::GetXmlEncoding(aXmlEncoding);
-  }
-
-  SetDOMStringToNull(aXmlEncoding);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetXmlStandalone(PRBool* aXmlStandalone)
-{
-  if (!IsHTML()) {
-    return nsDocument::GetXmlStandalone(aXmlStandalone);
-  }
-
-  *aXmlStandalone = PR_FALSE;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::SetXmlStandalone(PRBool aXmlStandalone)
-{
-  if (!IsHTML()) {
-    return nsDocument::SetXmlStandalone(aXmlStandalone);
-  }
-
-  return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetXmlVersion(nsAString& aXmlVersion)
-{
-  if (!IsHTML()) {
-    return nsDocument::GetXmlVersion(aXmlVersion);
-  }
-
-  SetDOMStringToNull(aXmlVersion);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::SetXmlVersion(const nsAString& aXmlVersion)
-{
-  if (!IsHTML()) {
-    return nsDocument::SetXmlVersion(aXmlVersion);
-  }
-
-  return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetDocumentURI(nsAString& aDocumentURI)
-{
-  return nsDocument::GetDocumentURI(aDocumentURI);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::SetDocumentURI(const nsAString& aDocumentURI)
-{
-  return nsDocument::SetDocumentURI(aDocumentURI);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::AdoptNode(nsIDOMNode* aSource, nsIDOMNode** aRetval)
-{
-  return nsDocument::AdoptNode(aSource, aRetval);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::NormalizeDocument()
-{
-  return nsDocument::NormalizeDocument();
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetDefaultView(nsIDOMWindow** aWindow)
-{
-  return nsDocument::GetDefaultView(aWindow);
-}
-
 //
 // nsIDOMHTMLDocument interface implementation
 //
@@ -2204,37 +2002,6 @@ nsHTMLDocument::Writeln(const nsAString& aText)
   return WriteCommon(aText, PR_TRUE);
 }
 
-NS_IMETHODIMP
-nsHTMLDocument::ImportNode(nsIDOMNode* aImportedNode,
-                           PRBool aDeep,
-                           nsIDOMNode** aReturn)
-{
-  return nsDocument::ImportNode(aImportedNode, aDeep, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::CreateAttributeNS(const nsAString& aNamespaceURI,
-                                  const nsAString& aQualifiedName,
-                                  nsIDOMAttr** aReturn)
-{
-  return nsDocument::CreateAttributeNS(aNamespaceURI, aQualifiedName, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI,
-                                       const nsAString& aLocalName,
-                                       nsIDOMNodeList** aReturn)
-{
-  return nsDocument::GetElementsByTagNameNS(aNamespaceURI, aLocalName, aReturn);
-}
-
-NS_IMETHODIMP
-nsHTMLDocument::GetElementById(const nsAString& aElementId,
-                               nsIDOMElement** aReturn)
-{
-  return nsDocument::GetElementById(aElementId, aReturn);
-}
-
 PRBool
 nsHTMLDocument::MatchNameAttribute(nsIContent* aContent, PRInt32 aNamespaceID,
                                    nsIAtom* aAtom, void* aData)
diff --git a/content/html/document/src/nsHTMLDocument.h b/content/html/document/src/nsHTMLDocument.h
index f3cf4efca43f..fa94a9714f1b 100644
--- a/content/html/document/src/nsHTMLDocument.h
+++ b/content/html/document/src/nsHTMLDocument.h
@@ -122,7 +122,7 @@ public:
   virtual NS_HIDDEN_(nsContentList*) GetFormControls();
  
   // nsIDOMDocument interface
-  NS_DECL_NSIDOMDOCUMENT
+  NS_FORWARD_NSIDOMDOCUMENT(nsDocument::)
 
   // nsIDOMNode interface
   NS_FORWARD_NSIDOMNODE(nsDocument::)

From 61d110280181a09c8db33ee7efd7f611c9103812 Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Mon, 9 May 2011 09:10:28 +1200
Subject: [PATCH 073/314] Bug 566779 - Clean up media start and end time
 calculation. r=doublec

---
 content/media/nsBuiltinDecoder.h              |  13 +-
 content/media/nsBuiltinDecoderReader.cpp      |  12 +-
 content/media/nsBuiltinDecoderReader.h        |  11 +-
 .../media/nsBuiltinDecoderStateMachine.cpp    |  38 ++----
 content/media/nsBuiltinDecoderStateMachine.h  |  11 +-
 .../media/ogg/nsOggDecoderStateMachine.cpp    |  21 ----
 content/media/ogg/nsOggDecoderStateMachine.h  |   4 -
 content/media/ogg/nsOggReader.cpp             | 119 +++++++++---------
 content/media/ogg/nsOggReader.h               |  27 ++--
 content/media/raw/nsRawReader.cpp             |   5 -
 10 files changed, 112 insertions(+), 149 deletions(-)

diff --git a/content/media/nsBuiltinDecoder.h b/content/media/nsBuiltinDecoder.h
index 17d3cc8b4761..ea702c12c9a1 100644
--- a/content/media/nsBuiltinDecoder.h
+++ b/content/media/nsBuiltinDecoder.h
@@ -260,6 +260,11 @@ public:
   // aDuration is in microseconds.
   virtual void SetDuration(PRInt64 aDuration) = 0;
 
+  // Called while decoding metadata to set the end time of the media
+  // resource. The decoder monitor must be obtained before calling this.
+  // aEndTime is in microseconds.
+  virtual void SetEndTime(PRInt64 aEndTime) = 0;
+
   // Functions used by assertions to ensure we're calling things
   // on the appropriate threads.
   virtual PRBool OnDecodeThread() const = 0;
@@ -285,9 +290,15 @@ public:
   virtual void ClearPositionChangeFlag() = 0;
 
   // Called from the main thread to set whether the media resource can
-  // be seeked. The decoder monitor must be obtained before calling this.
+  // seek into unbuffered ranges. The decoder monitor must be obtained
+  // before calling this.
   virtual void SetSeekable(PRBool aSeekable) = 0;
 
+  // Returns PR_TRUE if the media resource can seek into unbuffered ranges,
+  // as set by SetSeekable(). The decoder monitor must be obtained before
+  // calling this.
+  virtual PRBool GetSeekable() = 0;
+
   // Update the playback position. This can result in a timeupdate event
   // and an invalidate of the frame being dispatched asynchronously if
   // there is no such event currently queued.
diff --git a/content/media/nsBuiltinDecoderReader.cpp b/content/media/nsBuiltinDecoderReader.cpp
index ffa1809a1003..aa83f773fc75 100644
--- a/content/media/nsBuiltinDecoderReader.cpp
+++ b/content/media/nsBuiltinDecoderReader.cpp
@@ -229,15 +229,10 @@ nsresult nsBuiltinDecoderReader::ResetDecode()
   return res;
 }
 
-VideoData* nsBuiltinDecoderReader::FindStartTime(PRInt64 aOffset,
-                                                 PRInt64& aOutStartTime)
+VideoData* nsBuiltinDecoderReader::FindStartTime(PRInt64& aOutStartTime)
 {
   NS_ASSERTION(mDecoder->OnStateMachineThread(), "Should be on state machine thread.");
 
-  if (NS_FAILED(ResetDecode())) {
-    return nsnull;
-  }
-
   // Extract the start times of the bitstreams in order to calculate
   // the duration.
   PRInt64 videoStartTime = PR_INT64_MAX;
@@ -267,11 +262,6 @@ VideoData* nsBuiltinDecoderReader::FindStartTime(PRInt64 aOffset,
   return videoData;
 }
 
-PRInt64 nsBuiltinDecoderReader::FindEndTime(PRInt64 aEndOffset)
-{
-  return -1;
-}
-
 template<class Data>
 Data* nsBuiltinDecoderReader::DecodeToFirstData(DecodeFn aDecodeFn,
                                                 MediaQueue<Data>& aQueue)
diff --git a/content/media/nsBuiltinDecoderReader.h b/content/media/nsBuiltinDecoderReader.h
index b459da569780..1427e21c3365 100644
--- a/content/media/nsBuiltinDecoderReader.h
+++ b/content/media/nsBuiltinDecoderReader.h
@@ -444,14 +444,9 @@ public:
   virtual nsresult ReadMetadata(nsVideoInfo* aInfo) = 0;
 
   // Stores the presentation time of the first frame/sample we'd be
-  // able to play if we started playback at aOffset, and returns the
-  // first video sample, if we have video.
-  virtual VideoData* FindStartTime(PRInt64 aOffset,
-                                   PRInt64& aOutStartTime);
-
-  // Returns the end time of the last page which occurs before aEndOffset.
-  // This will not read past aEndOffset. Returns -1 on failure. 
-  virtual PRInt64 FindEndTime(PRInt64 aEndOffset);
+  // able to play if we started playback at the current position. Returns
+  // the first video sample, if we have video.
+  VideoData* FindStartTime(PRInt64& aOutStartTime);
 
   // Moves the decode head to aTime microseconds. aStartTime and aEndTime
   // denote the start and end times of the media in usecs, and aCurrentTime
diff --git a/content/media/nsBuiltinDecoderStateMachine.cpp b/content/media/nsBuiltinDecoderStateMachine.cpp
index cdf4ff75bbfd..2605b2c58845 100644
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -817,6 +817,10 @@ void nsBuiltinDecoderStateMachine::SetDuration(PRInt64 aDuration)
     "Should be on main or state machine thread.");
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
 
+  if (aDuration == -1) {
+    return;
+  }
+
   if (mStartTime != -1) {
     mEndTime = mStartTime + aDuration;
   } else {
@@ -825,6 +829,14 @@ void nsBuiltinDecoderStateMachine::SetDuration(PRInt64 aDuration)
   }
 }
 
+void nsBuiltinDecoderStateMachine::SetEndTime(PRInt64 aEndTime)
+{
+  NS_ASSERTION(OnStateMachineThread(), "Should be on state machine thread");
+  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+
+  mEndTime = aEndTime;
+}
+
 void nsBuiltinDecoderStateMachine::SetSeekable(PRBool aSeekable)
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
@@ -1559,7 +1571,7 @@ VideoData* nsBuiltinDecoderStateMachine::FindStartTime()
   VideoData* v = nsnull;
   {
     ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
-    v = mReader->FindStartTime(0, startTime);
+    v = mReader->FindStartTime(startTime);
   }
   if (startTime != 0) {
     mStartTime = startTime;
@@ -1580,30 +1592,6 @@ VideoData* nsBuiltinDecoderStateMachine::FindStartTime()
   return v;
 }
 
-void nsBuiltinDecoderStateMachine::FindEndTime() 
-{
-  NS_ASSERTION(OnStateMachineThread(), "Should be on state machine thread.");
-  mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
-
-  nsMediaStream* stream = mDecoder->GetCurrentStream();
-
-  // Seek to the end of file to find the length and duration.
-  PRInt64 length = stream->GetLength();
-  NS_ASSERTION(length > 0, "Must have a content length to get end time");
-
-  mEndTime = 0;
-  PRInt64 endTime = 0;
-  {
-    ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
-    endTime = mReader->FindEndTime(length);
-  }
-  if (endTime != -1) {
-    mEndTime = endTime;
-  }
-
-  LOG(PR_LOG_DEBUG, ("%p Media end time is %lld", mDecoder, mEndTime));   
-}
-
 void nsBuiltinDecoderStateMachine::UpdateReadyState() {
   mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
 
diff --git a/content/media/nsBuiltinDecoderStateMachine.h b/content/media/nsBuiltinDecoderStateMachine.h
index 0011768423a6..0a9274db89e7 100644
--- a/content/media/nsBuiltinDecoderStateMachine.h
+++ b/content/media/nsBuiltinDecoderStateMachine.h
@@ -158,6 +158,7 @@ public:
   virtual void Shutdown();
   virtual PRInt64 GetDuration();
   virtual void SetDuration(PRInt64 aDuration);
+  void SetEndTime(PRInt64 aEndTime);
   virtual PRBool OnDecodeThread() const {
     return IsCurrentThread(mDecodeThread);
   }
@@ -247,6 +248,11 @@ public:
     return mEndTime;
   }
 
+  PRBool GetSeekable() {
+    mDecoder->GetReentrantMonitor().AssertCurrentThreadIn();
+    return mSeekable;
+  }
+
   // Sets the current frame buffer length for the MozAudioAvailable event.
   // Accessed on the main and state machine threads.
   virtual void SetFrameBufferLength(PRUint32 aLength);
@@ -303,11 +309,6 @@ protected:
   // machine thread.
   VideoData* FindStartTime();
 
-  // Finds the end time of the last frame of data in the file, storing the value
-  // in mEndTime if successful. The decoder must be held with exactly one lock
-  // count. Called on the state machine thread.
-  void FindEndTime();
-
   // Update only the state machine's current playback position (and duration,
   // if unknown).  Does not update the playback position on the decoder or
   // media element -- use UpdatePlaybackPosition for that.  Called on the state
diff --git a/content/media/ogg/nsOggDecoderStateMachine.cpp b/content/media/ogg/nsOggDecoderStateMachine.cpp
index 3b55b45baaff..989d04d85423 100644
--- a/content/media/ogg/nsOggDecoderStateMachine.cpp
+++ b/content/media/ogg/nsOggDecoderStateMachine.cpp
@@ -45,24 +45,3 @@ nsOggDecoderStateMachine::nsOggDecoderStateMachine(nsBuiltinDecoder* aDecoder) :
   nsBuiltinDecoderStateMachine(aDecoder, new nsOggReader(aDecoder))
 {
 }
-
-void nsOggDecoderStateMachine::LoadMetadata()
-{
-  nsBuiltinDecoderStateMachine::LoadMetadata();
-
-  // Get the duration from the media file. We only do this if the
-  // content length of the resource is known as we need to seek
-  // to the end of the file to get the last time field. We also
-  // only do this if the resource is seekable and if we haven't
-  // already obtained the duration via an HTTP header.
-
-  if (mState != DECODER_STATE_SHUTDOWN &&
-      mDecoder->GetCurrentStream()->GetLength() >= 0 &&
-      mSeekable &&
-      mEndTime == -1)
-  {
-    mDecoder->StopProgressUpdates();
-    FindEndTime();
-    mDecoder->StartProgressUpdates();
-  }
-}
diff --git a/content/media/ogg/nsOggDecoderStateMachine.h b/content/media/ogg/nsOggDecoderStateMachine.h
index 6f1d4f23dab5..de261314bfbf 100644
--- a/content/media/ogg/nsOggDecoderStateMachine.h
+++ b/content/media/ogg/nsOggDecoderStateMachine.h
@@ -45,10 +45,6 @@ class nsOggDecoderStateMachine : public nsBuiltinDecoderStateMachine
 {
 public:
   nsOggDecoderStateMachine(nsBuiltinDecoder* aDecoder);
-
-  // Overload LoadMetadata to seek to the end of the file and get the
-  // duration.
-  virtual void LoadMetadata();
 };
 
 #endif
diff --git a/content/media/ogg/nsOggReader.cpp b/content/media/ogg/nsOggReader.cpp
index cb58230c7101..a83f31a55f16 100644
--- a/content/media/ogg/nsOggReader.cpp
+++ b/content/media/ogg/nsOggReader.cpp
@@ -261,13 +261,13 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     mInfo.mHasVideo = PR_TRUE;
     mInfo.mPixelAspectRatio = mTheoraState->mPixelAspectRatio;
     mInfo.mPicture = nsIntRect(mTheoraState->mInfo.pic_x,
-                                mTheoraState->mInfo.pic_y,
-                                mTheoraState->mInfo.pic_width,
-                                mTheoraState->mInfo.pic_height);
+                               mTheoraState->mInfo.pic_y,
+                               mTheoraState->mInfo.pic_width,
+                               mTheoraState->mInfo.pic_height);
     mInfo.mFrame = nsIntSize(mTheoraState->mInfo.frame_width,
                               mTheoraState->mInfo.frame_height);
     mInfo.mDisplay = nsIntSize(mInfo.mPicture.width,
-                                mInfo.mPicture.height);
+                               mInfo.mPicture.height);
     gfxIntSize sz(mTheoraState->mInfo.pic_width,
                   mTheoraState->mInfo.pic_height);
     mDecoder->SetVideoData(sz,
@@ -318,6 +318,32 @@ nsresult nsOggReader::ReadMetadata(nsVideoInfo* aInfo)
     }
   }
 
+  {
+    ReentrantMonitorAutoExit exitReaderMon(mReentrantMonitor);
+    ReentrantMonitorAutoEnter decoderMon(mDecoder->GetReentrantMonitor());
+
+    nsMediaStream* stream = mDecoder->GetCurrentStream();
+    if (mDecoder->GetStateMachine()->GetDuration() == -1 &&
+        mDecoder->GetStateMachine()->GetState() != nsDecoderStateMachine::DECODER_STATE_SHUTDOWN &&
+        stream->GetLength() >= 0 &&
+        mDecoder->GetStateMachine()->GetSeekable())
+    {
+      // We didn't get a duration from the index or a Content-Duration header.
+      // Seek to the end of file to find the end time.
+      PRInt64 length = stream->GetLength();
+      NS_ASSERTION(length > 0, "Must have a content length to get end time");
+
+      PRInt64 endTime = 0;
+      {
+        ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
+        endTime = RangeEndTime(length);
+      }
+      if (endTime != -1) {
+        mDecoder->GetStateMachine()->SetEndTime(endTime);
+        LOG(PR_LOG_DEBUG, ("Got Ogg duration from seeking to end %lld", endTime));
+      }
+    }
+  }
   *aInfo = mInfo;
 
   return NS_OK;
@@ -401,27 +427,6 @@ PRBool nsOggReader::DecodeAudioData()
   return PR_TRUE;
 }
 
-#ifdef DEBUG
-// Ensures that all the VideoData in aFrames array are stored in increasing
-// order by timestamp. Used in assertions in debug builds.
-static PRBool
-AllFrameTimesIncrease(nsTArray<nsAutoPtr<VideoData> >& aFrames)
-{
-  PRInt64 prevTime = -1;
-  PRInt64 prevGranulepos = -1;
-  for (PRUint32 i = 0; i < aFrames.Length(); i++) {
-    VideoData* f = aFrames[i];
-    if (f->mTime < prevTime) {
-      return PR_FALSE;
-    }
-    prevTime = f->mTime;
-    prevGranulepos = f->mTimecode;
-  }
-
-  return PR_TRUE;
-}
-#endif
-
 nsresult nsOggReader::DecodeTheora(ogg_packet* aPacket)
 {
   NS_ASSERTION(aPacket->granulepos >= TheoraVersion(&mTheoraState->mInfo,3,2,1),
@@ -620,8 +625,7 @@ GetChecksum(ogg_page* page)
   return c;
 }
 
-VideoData* nsOggReader::FindStartTime(PRInt64 aOffset,
-                                      PRInt64& aOutStartTime)
+PRInt64 nsOggReader::RangeStartTime(PRInt64 aOffset)
 {
   NS_ASSERTION(mDecoder->OnStateMachineThread(),
                "Should be on state machine thread.");
@@ -629,30 +633,42 @@ VideoData* nsOggReader::FindStartTime(PRInt64 aOffset,
   NS_ENSURE_TRUE(stream != nsnull, nsnull);
   nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, aOffset);
   NS_ENSURE_SUCCESS(res, nsnull);
-  return nsBuiltinDecoderReader::FindStartTime(aOffset, aOutStartTime);
+  PRInt64 startTime = 0;
+  nsBuiltinDecoderReader::FindStartTime(startTime);
+  return startTime;
 }
 
-PRInt64 nsOggReader::FindEndTime(PRInt64 aEndOffset)
+struct nsAutoOggSyncState {
+  nsAutoOggSyncState() {
+    ogg_sync_init(&mState);
+  }
+  ~nsAutoOggSyncState() {
+    ogg_sync_clear(&mState);
+  }
+  ogg_sync_state mState;
+};
+
+PRInt64 nsOggReader::RangeEndTime(PRInt64 aEndOffset)
 {
   ReentrantMonitorAutoEnter mon(mReentrantMonitor);
   NS_ASSERTION(mDecoder->OnStateMachineThread(),
                "Should be on state machine thread.");
-  PRInt64 endTime = FindEndTime(0, aEndOffset, PR_FALSE, &mOggState);
-  // Reset read head to start of media data.
+
   nsMediaStream* stream = mDecoder->GetCurrentStream();
   NS_ENSURE_TRUE(stream != nsnull, -1);
-  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, 0);
+  PRInt64 position = stream->Tell();
+  PRInt64 endTime = RangeEndTime(0, aEndOffset, PR_FALSE);
+  nsresult res = stream->Seek(nsISeekableStream::NS_SEEK_SET, position);
   NS_ENSURE_SUCCESS(res, -1);
   return endTime;
 }
 
-PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
-                                 PRInt64 aEndOffset,
-                                 PRBool aCachedDataOnly,
-                                 ogg_sync_state* aState)
+PRInt64 nsOggReader::RangeEndTime(PRInt64 aStartOffset,
+                                  PRInt64 aEndOffset,
+                                  PRBool aCachedDataOnly)
 {
   nsMediaStream* stream = mDecoder->GetCurrentStream();
-  ogg_sync_reset(aState);
+  nsAutoOggSyncState sync;
 
   // We need to find the last page which ends before aEndOffset that
   // has a granulepos that we can convert to a timestamp. We do this by
@@ -669,7 +685,7 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
   PRBool mustBackOff = PR_FALSE;
   while (PR_TRUE) {
     ogg_page page;    
-    int ret = ogg_sync_pageseek(aState, &page);
+    int ret = ogg_sync_pageseek(&sync.mState, &page);
     if (ret == 0) {
       // We need more data if we've not encountered a page we've seen before,
       // or we've read to the end of file.
@@ -681,7 +697,7 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
         mustBackOff = PR_FALSE;
         prevChecksumAfterSeek = checksumAfterSeek;
         checksumAfterSeek = 0;
-        ogg_sync_reset(aState);
+        ogg_sync_reset(&sync.mState);
         readStartOffset = NS_MAX(static_cast<PRInt64>(0), readStartOffset - step);
         readHead = NS_MAX(aStartOffset, readStartOffset);
       }
@@ -692,7 +708,7 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
       limit = NS_MIN(limit, static_cast<PRInt64>(step));
       PRUint32 bytesToRead = static_cast<PRUint32>(limit);
       PRUint32 bytesRead = 0;
-      char* buffer = ogg_sync_buffer(aState, bytesToRead);
+      char* buffer = ogg_sync_buffer(&sync.mState, bytesToRead);
       NS_ASSERTION(buffer, "Must have buffer");
       nsresult res;
       if (aCachedDataOnly) {
@@ -711,7 +727,7 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
 
       // Update the synchronisation layer with the number
       // of bytes written to the buffer
-      ret = ogg_sync_wrote(aState, bytesRead);
+      ret = ogg_sync_wrote(&sync.mState, bytesRead);
       if (ret != 0) {
         endTime = -1;
         break;
@@ -761,8 +777,6 @@ PRInt64 nsOggReader::FindEndTime(PRInt64 aStartOffset,
     }
   }
 
-  ogg_sync_reset(aState);
-
   return endTime;
 }
 
@@ -784,9 +798,9 @@ nsresult nsOggReader::GetSeekRanges(nsTArray<SeekRange>& aRanges)
     }
     PRInt64 startOffset = range.mStart;
     PRInt64 endOffset = range.mEnd;
-    FindStartTime(startOffset, startTime);
+    startTime = RangeStartTime(startOffset);
     if (startTime != -1 &&
-        ((endTime = FindEndTime(endOffset)) != -1))
+        ((endTime = RangeEndTime(endOffset)) != -1))
     {
       NS_ASSERTION(startTime < endTime,
                    "Start time must be before end time");
@@ -1423,8 +1437,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
   // offset is after the end of the media stream, or there's no more cached
   // data after the offset. This loop will run until we've checked every
   // buffered range in the media, in increasing order of offset.
-  ogg_sync_state state;
-  ogg_sync_init(&state);
+  nsAutoOggSyncState sync;
   for (PRUint32 index = 0; index < ranges.Length(); index++) {
     // Ensure the offsets are after the header pages.
     PRInt64 startOffset = ranges[index].mStart;
@@ -1439,20 +1452,18 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     // Find the start time of the range. Read pages until we find one with a
     // granulepos which we can convert into a timestamp to use as the time of
     // the start of the buffered range.
-    ogg_sync_reset(&state);
+    ogg_sync_reset(&sync.mState);
     while (startTime == -1) {
       ogg_page page;
       PRInt32 discard;
       PageSyncResult res = PageSync(stream,
-                                    &state,
+                                    &sync.mState,
                                     PR_TRUE,
                                     startOffset,
                                     endOffset,
                                     &page,
                                     discard);
       if (res == PAGE_SYNC_ERROR) {
-        // If we don't clear the sync state before exit we'll leak.
-        ogg_sync_clear(&state);
         return NS_ERROR_FAILURE;
       } else if (res == PAGE_SYNC_END_OF_RANGE) {
         // Hit the end of range without reading a page, give up trying to
@@ -1486,7 +1497,6 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
       else {
         // Page is for a stream we don't know about (possibly a chained
         // ogg), return an error.
-        ogg_sync_clear(&state);
         return PAGE_SYNC_ERROR;
       }
     }
@@ -1494,7 +1504,7 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     if (startTime != -1) {
       // We were able to find a start time for that range, see if we can
       // find an end time.
-      PRInt64 endTime = FindEndTime(startOffset, endOffset, PR_TRUE, &state);
+      PRInt64 endTime = RangeEndTime(startOffset, endOffset, PR_TRUE);
       if (endTime != -1) {
         aBuffered->Add(startTime / static_cast<double>(USECS_PER_S),
                        (endTime - aStartTime) / static_cast<double>(USECS_PER_S));
@@ -1502,9 +1512,6 @@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     }
   }
 
-  // If we don't clear the sync state before exit we'll leak.
-  ogg_sync_clear(&state);
-
   return NS_OK;
 }
 
diff --git a/content/media/ogg/nsOggReader.h b/content/media/ogg/nsOggReader.h
index 8077351f0d88..f2d555f36447 100644
--- a/content/media/ogg/nsOggReader.h
+++ b/content/media/ogg/nsOggReader.h
@@ -71,13 +71,6 @@ public:
   virtual PRBool DecodeVideoFrame(PRBool &aKeyframeSkip,
                                   PRInt64 aTimeThreshold);
 
-  virtual VideoData* FindStartTime(PRInt64 aOffset,
-                                   PRInt64& aOutStartTime);
-
-  // Get the end time of aEndOffset. This is the playback position we'd reach
-  // after playback finished at aEndOffset.
-  virtual PRInt64 FindEndTime(PRInt64 aEndOffset);
-
   virtual PRBool HasAudio()
   {
     mozilla::ReentrantMonitorAutoEnter mon(mReentrantMonitor);
@@ -177,17 +170,25 @@ private:
                             PRInt64 aEndTime,
                             const nsTArray<SeekRange>& aRanges);
 
+  // Get the end time of aEndOffset. This is the playback position we'd reach
+  // after playback finished at aEndOffset.
+  PRInt64 RangeEndTime(PRInt64 aEndOffset);
+
   // Get the end time of aEndOffset, without reading before aStartOffset.
   // This is the playback position we'd reach after playback finished at
   // aEndOffset. If PRBool aCachedDataOnly is PR_TRUE, then we'll only read
   // from data which is cached in the media cached, otherwise we'll do
   // regular blocking reads from the media stream. If PRBool aCachedDataOnly
-  // is PR_TRUE, and aState is not mOggState, this can safely be called on
-  // the main thread, otherwise it must be called on the state machine thread.
-  PRInt64 FindEndTime(PRInt64 aStartOffset,
-                      PRInt64 aEndOffset,
-                      PRBool aCachedDataOnly,
-                      ogg_sync_state* aState);
+  // is PR_TRUE, this can safely be called on the main thread, otherwise it
+  // must be called on the state machine thread.
+  PRInt64 RangeEndTime(PRInt64 aStartOffset,
+                       PRInt64 aEndOffset,
+                       PRBool aCachedDataOnly);
+
+  // Get the start time of the range beginning at aOffset. This is the start
+  // time of the first frame and or audio sample we'd be able to play if we
+  // started playback at aOffset.
+  PRInt64 RangeStartTime(PRInt64 aOffset);
 
   // Performs a seek bisection to move the media stream's read cursor to the
   // last ogg page boundary which has end time before aTarget usecs on both the
diff --git a/content/media/raw/nsRawReader.cpp b/content/media/raw/nsRawReader.cpp
index 110dd1949295..edb0220e8c09 100644
--- a/content/media/raw/nsRawReader.cpp
+++ b/content/media/raw/nsRawReader.cpp
@@ -305,11 +305,6 @@ nsresult nsRawReader::Seek(PRInt64 aTime, PRInt64 aStartTime, PRInt64 aEndTime,
   return NS_OK;
 }
 
-PRInt64 nsRawReader::FindEndTime(PRInt64 aEndTime)
-{
-  return -1;
-}
-
 nsresult nsRawReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
   return NS_OK;

From e0a6c862fb1671d9f0723a411459afe85f91f09d Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Mon, 9 May 2011 09:10:44 +1200
Subject: [PATCH 074/314] Bug 566779 - Don't move media to readyState
 HAVE_ENOUGH_DATA when resource loaded, if metadata not loaded yet r=roc

---
 content/html/content/src/nsHTMLMediaElement.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index 3ac83ee2fe0c..80d684b8d213 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -1974,7 +1974,9 @@ void nsHTMLMediaElement::ResourceLoaded()
   mBegun = PR_FALSE;
   mNetworkState = nsIDOMHTMLMediaElement::NETWORK_IDLE;
   AddRemoveSelfReference();
-  ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
+  if (mReadyState >= nsIDOMHTMLMediaElement::HAVE_METADATA) {
+    ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_ENOUGH_DATA);
+  }
   // Ensure a progress event is dispatched at the end of download.
   DispatchAsyncEvent(NS_LITERAL_STRING("progress"));
   // The download has stopped.

From b01fb5db2edd5286f27f97ef9cc7313eece66afa Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Mon, 2 May 2011 08:33:16 +1200
Subject: [PATCH 075/314] b=647469 continue after crashes in addr2line r=dbaron

--HG--
extra : transplant_source : %3B%3D%1AX%09%D6N%5D%A2%3D%1F%23%2C%408%F7P%B46S
---
 config/preprocessor.pl      | 0
 tools/rb/fix-linux-stack.pl | 9 +++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 config/preprocessor.pl

diff --git a/config/preprocessor.pl b/config/preprocessor.pl
old mode 100644
new mode 100755
diff --git a/tools/rb/fix-linux-stack.pl b/tools/rb/fix-linux-stack.pl
index 903cc15a81bd..4038d113958e 100755
--- a/tools/rb/fix-linux-stack.pl
+++ b/tools/rb/fix-linux-stack.pl
@@ -243,6 +243,9 @@ sub addr2line_pipe($) {
     return $pipe;
 }
 
+# Ignore SIGPIPE as a workaround for addr2line crashes in some situations.
+$SIG{PIPE} = 'IGNORE';
+
 select STDOUT; $| = 1; # make STDOUT unbuffered
 while (<>) {
     my $line = $_;
@@ -262,8 +265,10 @@ while (<>) {
             printf {$out} "0x%X\n", $address;
             chomp(my $symbol = <$in>);
             chomp(my $fileandline = <$in>);
-            if ($symbol eq '??') { $symbol = $badsymbol; }
-            if ($fileandline eq '??:0') { $fileandline = $file; }
+            if (!$symbol || $symbol eq '??') { $symbol = $badsymbol; }
+            if (!$fileandline || $fileandline eq '??:0') {
+                $fileandline = $file;
+            }
             print "$before$symbol ($fileandline)$after\n";
         } else {
             print STDERR "Warning: File \"$file\" does not exist.\n";

From 1e810a8749c4c7fd4affe5ff83c0a15ef02b32d0 Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Mon, 2 May 2011 08:33:16 +1200
Subject: [PATCH 076/314] b=644542 don't process expose event if the window is
 destroyed during WILL_PAINT r=roc

--HG--
extra : transplant_source : U%28%AA%26s%A3%3EF%FE%DB%01%03%0F%08%BDZj%B9%EE%2C
---
 widget/src/gtk2/nsWindow.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
index fa41cc28bbdb..11c5dc433e4d 100644
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -2136,6 +2136,11 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
         nsPaintEvent willPaintEvent(PR_TRUE, NS_WILL_PAINT, this);
         willPaintEvent.willSendDidPaint = PR_TRUE;
         DispatchEvent(&willPaintEvent, status);
+
+        // If the window has been destroyed during WILL_PAINT, there is
+        // nothing left to do.
+        if (!mGdkWindow)
+            return TRUE;
     }
 
     nsPaintEvent event(PR_TRUE, NS_PAINT, this);

From e3dc04b1c23fec54ec35f8f0880ddd550cd11f7f Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Mon, 2 May 2011 08:33:16 +1200
Subject: [PATCH 077/314] b=629472 revert to using NP_GetValue instead of
 NPPluginFuncs::getvalue for NPPVpluginDescriptionString when testing for
 Flash r=cjones

--HG--
extra : transplant_source : %FBW%24%E0%DD%03%82%3E%EDA5%A0.%F8%1A%0A%AF%C9%9E%15
---
 dom/plugins/ipc/PluginInstanceChild.cpp | 14 -----------
 dom/plugins/ipc/PluginModuleChild.cpp   | 31 ++++++++++++++++++-------
 dom/plugins/ipc/PluginModuleChild.h     |  4 ++--
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
index 211724b18712..98eb5e75a69b 100644
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -169,20 +169,6 @@ PluginInstanceChild::PluginInstanceChild(const NPPluginFuncs* aPluginIface)
 #if defined(OS_WIN)
     InitPopupMenuHook();
 #endif // OS_WIN
-#ifdef MOZ_X11
-    // Maemo flash can render plugin with any provided rectangle and not require this quirk.
-#ifndef MOZ_PLATFORM_MAEMO
-    const char *description = NULL;
-    mPluginIface->getvalue(GetNPP(), NPPVpluginDescriptionString,
-                           &description);
-    if (description) {
-        NS_NAMED_LITERAL_CSTRING(flash10Head, "Shockwave Flash 10.");
-        if (StringBeginsWith(nsDependentCString(description), flash10Head)) {
-          PluginModuleChild::current()->AddQuirk(PluginModuleChild::QUIRK_FLASH_EXPOSE_COORD_TRANSLATION);
-        }
-    }
-#endif
-#endif
 }
 
 PluginInstanceChild::~PluginInstanceChild()
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
index 13921dfce5cb..ff964e851959 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -185,22 +185,37 @@ PluginModuleChild::Init(const std::string& aPluginFilename,
         return false;
 
     mPluginFilename = aPluginFilename.c_str();
-    nsCOMPtr<nsILocalFile> pluginFile;
+    nsCOMPtr<nsILocalFile> localFile;
     NS_NewLocalFile(NS_ConvertUTF8toUTF16(mPluginFilename),
                     PR_TRUE,
-                    getter_AddRefs(pluginFile));
+                    getter_AddRefs(localFile));
 
     PRBool exists;
-    pluginFile->Exists(&exists);
+    localFile->Exists(&exists);
     NS_ASSERTION(exists, "plugin file ain't there");
 
-    nsCOMPtr<nsIFile> pluginIfile;
-    pluginIfile = do_QueryInterface(pluginFile);
+    nsPluginFile pluginFile(localFile);
 
-    nsPluginFile lib(pluginIfile);
+    nsresult rv;
+    // Maemo flash can render with any provided rectangle and so does not
+    // require this quirk.
+#if defined(MOZ_X11) && !defined(MOZ_PLATFORM_MAEMO)
+    nsPluginInfo info = nsPluginInfo();
+    rv = pluginFile.GetPluginInfo(info, &mLibrary);
+    if (NS_FAILED(rv))
+        return false;
 
-    nsresult rv = lib.LoadPlugin(&mLibrary);
-    NS_ASSERTION(NS_OK == rv, "trouble with mPluginFile");
+    NS_NAMED_LITERAL_CSTRING(flash10Head, "Shockwave Flash 10.");
+    if (StringBeginsWith(nsDependentCString(info.fDescription), flash10Head)) {
+        AddQuirk(QUIRK_FLASH_EXPOSE_COORD_TRANSLATION);
+    }
+
+    if (!mLibrary)
+#endif
+    {
+        rv = pluginFile.LoadPlugin(&mLibrary);
+        NS_ASSERTION(NS_OK == rv, "trouble with mPluginFile");
+    }
     NS_ASSERTION(mLibrary, "couldn't open shared object");
 
     if (!Open(aChannel, aParentProcessHandle, aIOLoop))
diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
index 604ca66ae410..871309539b0b 100644
--- a/dom/plugins/ipc/PluginModuleChild.h
+++ b/dom/plugins/ipc/PluginModuleChild.h
@@ -256,13 +256,13 @@ public:
     };
 
     int GetQuirks() { return mQuirks; }
+
+private:
     void AddQuirk(PluginQuirks quirk) {
       if (mQuirks == QUIRKS_NOT_INITIALIZED)
         mQuirks = 0;
       mQuirks |= quirk;
     }
-
-private:
     void InitQuirksModes(const nsCString& aMimeType);
     bool InitGraphics();
     void DeinitGraphics();

From 9f1dd5cfc718c1906602c41e76720155484093ac Mon Sep 17 00:00:00 2001
From: Karl Tomlinson <karlt+@karlt.net>
Date: Wed, 4 May 2011 10:43:13 +1200
Subject: [PATCH 078/314] crash test for bug 644542

--HG--
extra : transplant_source : x%E6%5C%FCI%8E%8Di%9D%D83%0A%BA%81%E7%9BP%03%9BJ
---
 layout/forms/test/Makefile.in         |  1 +
 layout/forms/test/test_bug644542.html | 63 +++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 layout/forms/test/test_bug644542.html

diff --git a/layout/forms/test/Makefile.in b/layout/forms/test/Makefile.in
index ee51d24fe18e..b7f050f2eeca 100644
--- a/layout/forms/test/Makefile.in
+++ b/layout/forms/test/Makefile.in
@@ -76,6 +76,7 @@ _TEST_FILES =	test_bug231389.html \
 		test_bug36619.html \
 		test_bug620936.html \
 		test_bug595310.html \
+		test_bug644542.html \
 		$(NULL)
 
 _CHROME_FILES = \
diff --git a/layout/forms/test/test_bug644542.html b/layout/forms/test/test_bug644542.html
new file mode 100644
index 000000000000..a99531832a92
--- /dev/null
+++ b/layout/forms/test/test_bug644542.html
@@ -0,0 +1,63 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=644542
+-->
+<head>
+  <title>Test for Bug 644542</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <style type="text/css">
+    select:after {
+	    content: ' appended string';
+    }
+  </style>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=644542">Mozilla Bug 644542</a>
+<p id="display">
+  <form method="post" action="">
+    <select id="select">
+      <option value="1">1</option>
+      <option value="2">2</option>
+    </select>
+  </form>
+</p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 644542 **/
+
+var select = document.getElementById("select");
+
+var clicks = 0;
+
+function click() {
+    synthesizeMouseAtCenter(select, { });
+    ++clicks;
+
+    // At least two clicks were required for bug 644542, sometimes more;
+    // delay is long enough that this doesn't look like a double
+    // click, and also allows time for popup to show and for painting.
+    setTimeout(clicks < 4 ? click : done, 500);
+}
+
+function done() {
+    ok(true, "No crash on opening dropdown");
+    SimpleTest.finish();
+}
+
+SimpleTest.waitForExplicitFinish();
+// waitForFocus is most likely not the right thing to wait for, but
+// without this the first click is ineffective (even with a reflow forced
+// before synthesizeMouse).
+SimpleTest.waitForFocus(click);
+</script>
+</pre>
+</body>
+</html>

From 79a3953c0da9d32dc712e56a2e5d60a6f6d14580 Mon Sep 17 00:00:00 2001
From: Chris Coulson <chrisccoulson@ubuntu.com>
Date: Wed, 4 May 2011 16:10:43 +1200
Subject: [PATCH 079/314] b=639467 Use GIO in HandlerExists and
 GetAppDescForScheme r=karlt

--HG--
extra : transplant_source : N%94%FAE%F5%F6%C0%13%17%28%E5%7D%F4%09L%D1%01%8D%9D%EF
---
 uriloader/exthandler/unix/nsGNOMERegistry.cpp | 62 ++++++++++++-------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/uriloader/exthandler/unix/nsGNOMERegistry.cpp b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
index de4a7b37d0bd..be7d3ba3bddd 100644
--- a/uriloader/exthandler/unix/nsGNOMERegistry.cpp
+++ b/uriloader/exthandler/unix/nsGNOMERegistry.cpp
@@ -60,16 +60,25 @@
 /* static */ PRBool
 nsGNOMERegistry::HandlerExists(const char *aProtocolScheme)
 {
+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (!gconf)
-    return PR_FALSE;
+  if (giovfs) {
+    nsCOMPtr<nsIGIOMimeApp> app;
+    if (NS_FAILED(giovfs->GetAppForURIScheme(nsDependentCString(aProtocolScheme),
+                                             getter_AddRefs(app))))
+      return PR_FALSE;
+    else
+      return PR_TRUE;
+  } else if (gconf) {
+    PRBool isEnabled;
+    nsCAutoString handler;
+    if (NS_FAILED(gconf->GetAppForProtocol(nsDependentCString(aProtocolScheme), &isEnabled, handler)))
+      return PR_FALSE;
 
-  PRBool isEnabled;
-  nsCAutoString handler;
-  if (NS_FAILED(gconf->GetAppForProtocol(nsDependentCString(aProtocolScheme), &isEnabled, handler)))
-    return PR_FALSE;
+    return isEnabled;
+  }
 
-  return isEnabled;
+  return PR_FALSE;
 }
 
 // XXX Check HandlerExists() before calling LoadURL.
@@ -99,27 +108,36 @@ nsGNOMERegistry::GetAppDescForScheme(const nsACString& aScheme,
                                      nsAString& aDesc)
 {
   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-  if (!gconf)
+  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+  if (!gconf && !giovfs)
     return;
 
-  PRBool isEnabled;
-  nsCAutoString app;
-  if (NS_FAILED(gconf->GetAppForProtocol(aScheme, &isEnabled, app)))
-    return;
+  nsCAutoString name;
+  if (giovfs) {
+    nsCOMPtr<nsIGIOMimeApp> app;
+    if (NS_FAILED(giovfs->GetAppForURIScheme(aScheme, getter_AddRefs(app))))
+      return;
 
-  if (!app.IsEmpty()) {
-    // Try to only provide the executable name, as it is much simpler than with the path and arguments
-    PRInt32 firstSpace = app.FindChar(' ');
-    if (firstSpace != kNotFound) {
-      app.Truncate(firstSpace);
-      PRInt32 lastSlash = app.RFindChar('/');
-      if (lastSlash != kNotFound) {
-        app.Cut(0, lastSlash + 1);
+    app->GetName(name);
+  } else {
+    PRBool isEnabled;
+    if (NS_FAILED(gconf->GetAppForProtocol(aScheme, &isEnabled, name)))
+      return;
+
+    if (!name.IsEmpty()) {
+      // Try to only provide the executable name, as it is much simpler than with the path and arguments
+      PRInt32 firstSpace = name.FindChar(' ');
+      if (firstSpace != kNotFound) {
+        name.Truncate(firstSpace);
+        PRInt32 lastSlash = name.RFindChar('/');
+        if (lastSlash != kNotFound) {
+          name.Cut(0, lastSlash + 1);
+        }
       }
     }
-
-    CopyUTF8toUTF16(app, aDesc);
   }
+
+  CopyUTF8toUTF16(name, aDesc);
 }
 
 

From 5f5d1cd1840839d254efbb08b4a95c12e7ec8c70 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Sun, 1 May 2011 19:12:22 +0900
Subject: [PATCH 080/314] Bug 564774 - nsMacCharset.cpp looks obsolete.
 r=smontagu

---
 intl/locale/src/mac/Makefile.in           |  9 ---
 intl/locale/src/mac/maccharset.properties | 81 ---------------------
 intl/locale/src/mac/nsMacCharset.cpp      | 85 ++---------------------
 intl/locale/src/nsPlatformCharset.h       |  1 -
 intl/locale/src/os2/nsOS2Charset.cpp      |  6 --
 intl/locale/src/windows/nsWinCharset.cpp  |  6 --
 6 files changed, 4 insertions(+), 184 deletions(-)
 delete mode 100644 intl/locale/src/mac/maccharset.properties

diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in
index 28b4564564f4..5aa1e1fa8556 100644
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -58,12 +58,3 @@ CPPSRCS		= \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
-
-nsMacCharset.$(OBJ_SUFFIX): maccharset.properties.h
-
-maccharset.properties.h: $(srcdir)/../props2arrays.py maccharset.properties
-	$(PYTHON) $^ $@
-
-GARBAGE += \
-	maccharset.properties.h \
-	$(NULL)
diff --git a/intl/locale/src/mac/maccharset.properties b/intl/locale/src/mac/maccharset.properties
deleted file mode 100644
index effdecb851cc..000000000000
--- a/intl/locale/src/mac/maccharset.properties
+++ /dev/null
@@ -1,81 +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 is mozilla.org code.
-#
-# 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):
-#
-# 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 *****
-
-## Region code section, this is used to map a region code to a charset name
-## It have higher priority than the Script code section
-##
-region.68=x-mac-croatian
-region.25=x-mac-croatian
-region.20=x-mac-greek
-region.21=x-mac-icelandic
-region.39=x-mac-romanian
-region.24=x-mac-turkish
-##
-## Script code section, this is used to map a script code to a charset name
-## It have lower priority than the Region code section
-##
-script.0=x-mac-roman
-script.1=Shift_JIS
-script.2=Big5
-script.3=EUC-KR
-script.4=x-mac-arabic
-script.5=x-mac-hebrew
-script.6=x-mac-greek
-script.7=x-mac-cyrillic
-script.8=x-mac-rsymbol
-script.9=x-mac-devanagari
-script.10=x-mac-gurmukhi
-script.11=x-mac-gujarati
-script.12=x-mac-oriya
-script.13=x-mac-bengali
-script.14=x-mac-tamil
-script.15=x-mac-telugu
-script.16=x-mac-kannada
-script.17=x-mac-malayalam
-script.18=x-mac-sinhalese
-script.19=x-mac-burmese
-script.20=x-mac-khmer
-script.21=TIS-620
-script.22=x-mac-lao
-script.23=x-mac-georgian
-script.24=x-mac-armenian
-script.25=GB2312
-script.26=x-mac-tibetan
-script.27=x-mac-mongolian
-script.28=x-mac-ethiopic
-script.29=x-mac-ce
-script.30=x-mac-vietnamese
-script.31=x-mac-extarabic
diff --git a/intl/locale/src/mac/nsMacCharset.cpp b/intl/locale/src/mac/nsMacCharset.cpp
index 17e760dafdbf..112e5e86b8dd 100644
--- a/intl/locale/src/mac/nsMacCharset.cpp
+++ b/intl/locale/src/mac/nsMacCharset.cpp
@@ -38,7 +38,6 @@
 #include <Carbon/Carbon.h>
 #include "nsIPlatformCharset.h"
 #include "pratom.h"
-#include "nsUConvPropertySearch.h"
 #include "nsCOMPtr.h"
 #include "nsIServiceManager.h"
 #include "nsIMacLocale.h"
@@ -47,10 +46,6 @@
 #include "nsPlatformCharset.h"
 #include "nsEncoderDecoderUtils.h"
 
-static const char* kMacCharsets[][3] = {
-#include "maccharset.properties.h"
-};
-
 NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset)
 
 nsPlatformCharset::nsPlatformCharset()
@@ -60,90 +55,18 @@ nsPlatformCharset::~nsPlatformCharset()
 {
 }
 
-nsresult nsPlatformCharset::MapToCharset(short script, short region, nsACString& outCharset)
-{
-  switch (region) {
-    case verUS:
-    case verFrance:
-    case verGermany:
-      outCharset.AssignLiteral("x-mac-roman");
-      return NS_OK;
-    case verJapan:
-      outCharset.AssignLiteral("Shift_JIS");
-      return NS_OK;
-  }
-
-  // try mapping from region then from script
-  nsCAutoString key("region.");
-  key.AppendInt(region, 10);
-
-  nsresult rv = nsUConvPropertySearch::SearchPropertyValue(kMacCharsets,
-      NS_ARRAY_LENGTH(kMacCharsets), key, outCharset);
-  if (NS_FAILED(rv)) {
-    key.AssignLiteral("script.");
-    key.AppendInt(script, 10);
-    rv = nsUConvPropertySearch::SearchPropertyValue(kMacCharsets,
-        NS_ARRAY_LENGTH(kMacCharsets), key, outCharset);
-    // not found in the .property file, assign x-mac-roman
-    if (NS_FAILED(rv)) {
-      outCharset.AssignLiteral("x-mac-roman");
-    }
-  }
-  
-  return NS_OK;
-}
-
 NS_IMETHODIMP 
 nsPlatformCharset::GetCharset(nsPlatformCharsetSel selector, nsACString& oResult)
 {
-  nsresult rv;
-  if (mCharset.IsEmpty()) {
-    rv = MapToCharset(
-           (short)(0x0000FFFF & ::GetScriptManagerVariable(smSysScript)),
-           (short)(0x0000FFFF & ::GetScriptManagerVariable(smRegionCode)),
-           mCharset);
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  switch (selector) {
-#ifdef XP_MACOSX  
-    case kPlatformCharsetSel_FileName:
-      oResult.AssignLiteral("UTF-8");
-      break;
-#endif
-    case  kPlatformCharsetSel_KeyboardInput:
-      rv = MapToCharset(
-             (short) (0x0000FFFF & ::GetScriptManagerVariable(smKeyScript)),
-             kTextRegionDontCare, oResult);
-      NS_ENSURE_SUCCESS(rv, rv);
-      break;
-    default:
-      oResult = mCharset;
-      break;
-  }
-
-   return NS_OK;
+  oResult.AssignLiteral("UTF-8");
+  return NS_OK;
 }
 
 NS_IMETHODIMP 
 nsPlatformCharset::GetDefaultCharsetForLocale(const nsAString& localeName, nsACString &oResult)
 {
-  nsresult rv;
-  nsCOMPtr<nsIMacLocale> pMacLocale;
-  pMacLocale = do_GetService(NS_MACLOCALE_CONTRACTID, &rv);
-  if (NS_SUCCEEDED(rv)) {
-    short script, language, region;
-    rv = pMacLocale->GetPlatformLocale(localeName, &script, &language, &region);
-    if (NS_SUCCEEDED(rv)) {
-      if (NS_SUCCEEDED(MapToCharset(script, region, oResult))) {
-        return NS_OK;
-      }
-    }
-  }
-
-  // fallback 
-  oResult.AssignLiteral("x-mac-roman");
-  return NS_SUCCESS_USING_FALLBACK_LOCALE;
+  oResult.AssignLiteral("UTF-8");
+  return NS_OK;
 }
 
 NS_IMETHODIMP 
diff --git a/intl/locale/src/nsPlatformCharset.h b/intl/locale/src/nsPlatformCharset.h
index 7768720fe66f..122cd5a8d02f 100644
--- a/intl/locale/src/nsPlatformCharset.h
+++ b/intl/locale/src/nsPlatformCharset.h
@@ -56,7 +56,6 @@ private:
   nsCString mCharset;
   nsString mLocale; // remember the locale & charset
 
-  nsresult MapToCharset(short script, short region, nsACString& outCharset); 
   nsresult MapToCharset(nsAString& inANSICodePage, nsACString& outCharset);
   nsresult InitGetCharset(nsACString& oString);
   nsresult ConvertLocaleToCharsetUsingDeprecatedConfig(nsAString& locale, nsACString& oResult);
diff --git a/intl/locale/src/os2/nsOS2Charset.cpp b/intl/locale/src/os2/nsOS2Charset.cpp
index 37e9ce9e288e..9a6ab8ed055c 100644
--- a/intl/locale/src/os2/nsOS2Charset.cpp
+++ b/intl/locale/src/os2/nsOS2Charset.cpp
@@ -143,12 +143,6 @@ nsPlatformCharset::Init()
   return NS_OK;
 }
 
-nsresult 
-nsPlatformCharset::MapToCharset(short script, short region, nsACString& outCharset)
-{
-  return NS_OK;
-}
-
 nsresult
 nsPlatformCharset::InitGetCharset(nsACString &oString)
 {
diff --git a/intl/locale/src/windows/nsWinCharset.cpp b/intl/locale/src/windows/nsWinCharset.cpp
index bb5306c8b2d3..af89cd96d8c1 100644
--- a/intl/locale/src/windows/nsWinCharset.cpp
+++ b/intl/locale/src/windows/nsWinCharset.cpp
@@ -122,12 +122,6 @@ nsPlatformCharset::Init()
   return NS_OK;
 }
 
-nsresult 
-nsPlatformCharset::MapToCharset(short script, short region, nsACString& outCharset)
-{
-  return NS_OK;
-}
-
 nsresult
 nsPlatformCharset::InitGetCharset(nsACString &oString)
 {

From ac69aff181348842cdb8c300cfbcf89409569f00 Mon Sep 17 00:00:00 2001
From: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date: Mon, 9 May 2011 00:07:58 +0900
Subject: [PATCH 081/314] Bug 571739 - Fix VC8 support on Win64. r=neil

---
 gfx/ycbcr/Makefile.in | 6 ++++++
 gfx/ycbcr/win64.patch | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in
index 2ebe9d3b1925..41b29f9f1355 100644
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -54,8 +54,14 @@ endif
 
 ifdef _MSC_VER
 ifeq ($(OS_TEST),x86_64)
+ifeq (1400,$(_MSC_VER))
+# VC8 doesn't support some SSE2 built-in functions
+CPPSRCS += yuv_row_win.cpp \
+           $(NULL)
+else
 CPPSRCS += yuv_row_win64.cpp \
            $(NULL)
+endif
 else
 CPPSRCS += yuv_row_win.cpp \
            $(NULL)
diff --git a/gfx/ycbcr/win64.patch b/gfx/ycbcr/win64.patch
index f182987d8edd..bdccf2784012 100644
--- a/gfx/ycbcr/win64.patch
+++ b/gfx/ycbcr/win64.patch
@@ -11,7 +11,7 @@ new file mode 100644
 +
 +extern "C" {
 +
-+// x64 compiler does'nt support MMX and inline assembler.  Use SSE2 intrin.
++// x64 compiler doesn't support MMX and inline assembler.  Use SSE2 intrinsics.
 +
 +#define kCoefficientsRgbU (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 2048)
 +#define kCoefficientsRgbV (reinterpret_cast<uint8*>(kCoefficientsRgbY) + 4096)

From 53362a4bfd4b272e97f12b5f248b6f94e3ff89d2 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Mon, 9 May 2011 11:44:03 +1200
Subject: [PATCH 082/314] Bug 649685 - Don't flip when drawing the backbuffer
 to the window with OpenGL. r=joe

---
 gfx/layers/opengl/LayerManagerOGL.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp
index 80350afd6b7d..0dfa1606cc5c 100644
--- a/gfx/layers/opengl/LayerManagerOGL.cpp
+++ b/gfx/layers/opengl/LayerManagerOGL.cpp
@@ -666,10 +666,13 @@ LayerManagerOGL::Render()
                          right * 2.0f - 1.0f,
                          -(bottom * 2.0f - 1.0f) };
 
-    float coords[] = { left, top,
-                       right, top,
-                       left, bottom,
-                       right, bottom };
+    // Use flipped texture coordinates since our
+    // projection matrix also has a flip and we
+    // need to cancel that out.
+    float coords[] = { left, bottom,
+                       right, bottom,
+                       left, top,
+                       right, top };
 
     mGLContext->fVertexAttribPointer(vcattr,
                                      2, LOCAL_GL_FLOAT,

From 806a4c3479c356bd9a414ae890fbf9f96f50834f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 9 May 2011 07:38:11 +0200
Subject: [PATCH 083/314] Bug 654080 - Display which GLIBCXX symbols cause an
 error. r=ted

---
 config/config.mk        | 2 +-
 js/src/config/config.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index 0f816b3e4a3a..ee3cf2b1274d 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -841,5 +841,5 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselist -- $(LD)
 EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) --uselist -- $(MKSHLIB)
 
 ifdef STDCXX_COMPAT
-CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && echo "Error: We don't want these libstdc++ symbol versions to be used" && exit 1 || exit 0
+CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0
 endif
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 0f816b3e4a3a..ee3cf2b1274d 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -841,5 +841,5 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselist -- $(LD)
 EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) --uselist -- $(MKSHLIB)
 
 ifdef STDCXX_COMPAT
-CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && echo "Error: We don't want these libstdc++ symbol versions to be used" && exit 1 || exit 0
+CHECK_STDCXX = objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo "TEST-UNEXPECTED-FAIL | | We don't want these libstdc++ symbols to be used:" && objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || exit 0
 endif

From 2325b4e33a72685ce165e7f55453dfcfdf8be69f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 9 May 2011 07:38:34 +0200
Subject: [PATCH 084/314] Bug 652399 - Disable building embedded libjpeg-turbo
 when using system libjpeg. r=ted

---
 configure.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 5152f3c30250..097c40ca3e18 100644
--- a/configure.in
+++ b/configure.in
@@ -4630,6 +4630,11 @@ if test "$SYSTEM_JPEG" = 1; then
                      #endif ],
                    SYSTEM_JPEG=1,
                    [SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=]) 
+fi
+
+MOZ_LIBJPEG_TURBO=
+if test -z "$SYSTEM_JPEG"; then
+    MOZ_LIBJPEG_TURBO=1
 fi 
 CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
@@ -4822,7 +4827,6 @@ VPX_AS_CONVERSION=
 VPX_ASM_SUFFIX=
 VPX_X86_ASM=
 VPX_ARM_ASM=
-MOZ_LIBJPEG_TURBO=1
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 LIBJPEG_TURBO_X86_ASM=

From 0afd7434181ccb3c0c2a7008e8a4382dfaa5cf25 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Mon, 9 May 2011 07:39:14 +0200
Subject: [PATCH 085/314] Bug 650246 - Replace %APP% with "firefox" in Firefox
 preferences. r=gavin

---
 browser/app/profile/firefox.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 1eb32ef82c85..a6cce334dd94 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -57,10 +57,10 @@ pref("extensions.logging.enabled", false);
 // Preferences for AMO integration
 pref("extensions.getAddons.cache.enabled", true);
 pref("extensions.getAddons.maxResults", 15);
-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
+pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
+pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
 
 // Blocklist preferences
 pref("extensions.blocklist.enabled", true);
@@ -74,7 +74,7 @@ pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blockl
 pref("extensions.update.autoUpdateDefault", true);
 
 // Dictionary download preference
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries/");
+pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
 
 // The minimum delay in seconds for the timer to fire.
 // default=2 minutes
@@ -199,7 +199,7 @@ pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/Ve
 pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                             // Themes every day
 // Non-symmetric (not shared by extensions) extension-specific [update] preferences
-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/getpersonas");
+pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
 pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
 pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                 // restart.
@@ -323,7 +323,7 @@ pref("browser.download.manager.scanWhenDone", true);
 pref("browser.download.manager.resumeOnWakeDelay", 10000);
 
 // search engines URL
-pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/");
+pref("browser.search.searchEnginesURL",      "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
 
 // pointer to the default engine name
 pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
@@ -712,8 +712,8 @@ pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://{moz:locale}.ma
 pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://{moz:locale}.malware-error.mozilla.com/?hl={moz:locale}");
 
 // FAQ URLs
-pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/phishing-protection/");
-pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/%APP%/geolocation/");
+pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/");
+pref("browser.geolocation.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/geolocation/");
 
 // Name of the about: page contributed by safebrowsing to handle display of error
 // pages on phishing/malware hits.  (bug 399233)
@@ -859,7 +859,7 @@ pref("browser.zoom.updateBackgroundTabs", true);
 pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
 
 // base URL for web-based support pages
-pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/");
+pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/");
 
 // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
 pref("security.alternate_certificate_error_page", "certerror");

From 9476a3a424fdf5722aca036adf6bc3b39ed074c1 Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Mon, 9 May 2011 14:56:27 +0900
Subject: [PATCH 086/314] Bug 650723. Add ClearType parameter data to
 about:support. r=gavin,jrmuizel

---
 gfx/thebes/gfxWindowsPlatform.cpp             | 97 ++++++++++++++++++-
 gfx/thebes/gfxWindowsPlatform.h               | 16 +++
 toolkit/content/aboutSupport.js               | 14 ++-
 .../chrome/global/aboutSupport.properties     |  7 +-
 widget/public/nsIGfxInfo.idl                  |  3 +-
 widget/src/android/GfxInfo.cpp                |  7 ++
 widget/src/android/GfxInfo.h                  |  1 +
 widget/src/cocoa/GfxInfo.h                    |  1 +
 widget/src/cocoa/GfxInfo.mm                   |  7 ++
 widget/src/windows/GfxInfo.cpp                | 74 ++++++++++++++
 widget/src/windows/GfxInfo.h                  |  1 +
 11 files changed, 218 insertions(+), 10 deletions(-)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index fe31539831af..c898fd332fca 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -785,6 +785,97 @@ gfxWindowsPlatform::GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion
     aVersion.Assign(NS_ConvertUTF8toUTF16(buf));
 }
 
+void 
+gfxWindowsPlatform::GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams)
+{
+    HKEY  hKey, subKey;
+    DWORD i, rv, size, type;
+    WCHAR displayName[256], subkeyName[256];
+
+    aParams.Clear();
+
+    // construct subkeys based on HKLM subkeys, assume they are same for HKCU
+    rv = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                       L"Software\\Microsoft\\Avalon.Graphics",
+                       0, KEY_READ, &hKey);
+
+    if (rv != ERROR_SUCCESS) {
+        return;
+    }
+
+    // enumerate over subkeys
+    for (i = 0, rv = ERROR_SUCCESS; rv != ERROR_NO_MORE_ITEMS; i++) {
+        size = NS_ARRAY_LENGTH(displayName);
+        rv = RegEnumKeyExW(hKey, i, displayName, &size, NULL, NULL, NULL, NULL);
+        if (rv != ERROR_SUCCESS) {
+            continue;
+        }
+
+        ClearTypeParameterInfo ctinfo;
+        ctinfo.displayName.Assign(displayName);
+
+        DWORD subrv, value;
+        bool foundData = false;
+
+        swprintf_s(subkeyName, NS_ARRAY_LENGTH(subkeyName),
+                   L"Software\\Microsoft\\Avalon.Graphics\\%s", displayName);
+
+        // subkey for gamma, pixel structure
+        subrv = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                              subkeyName, 0, KEY_QUERY_VALUE, &subKey);
+
+        if (subrv == ERROR_SUCCESS) {
+            size = sizeof(value);
+            subrv = RegQueryValueExW(subKey, L"GammaLevel", NULL, &type,
+                                     (LPBYTE)&value, &size);
+            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
+                foundData = true;
+                ctinfo.gamma = value;
+            }
+
+            size = sizeof(value);
+            subrv = RegQueryValueExW(subKey, L"PixelStructure", NULL, &type,
+                                     (LPBYTE)&value, &size);
+            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
+                foundData = true;
+                ctinfo.pixelStructure = value;
+            }
+
+            RegCloseKey(subKey);
+        }
+
+        // subkey for cleartype level, enhanced contrast
+        subrv = RegOpenKeyExW(HKEY_CURRENT_USER,
+                              subkeyName, 0, KEY_QUERY_VALUE, &subKey);
+
+        if (subrv == ERROR_SUCCESS) {
+            size = sizeof(value);
+            subrv = RegQueryValueExW(subKey, L"ClearTypeLevel", NULL, &type,
+                                     (LPBYTE)&value, &size);
+            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
+                foundData = true;
+                ctinfo.clearTypeLevel = value;
+            }
+      
+            size = sizeof(value);
+            subrv = RegQueryValueExW(subKey, L"EnhancedContrastLevel",
+                                     NULL, &type, (LPBYTE)&value, &size);
+            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
+                foundData = true;
+                ctinfo.enhancedContrast = value;
+            }
+
+            RegCloseKey(subKey);
+        }
+
+        if (foundData) {
+            aParams.AppendElement(ctinfo);
+        }
+    }
+
+    RegCloseKey(hKey);
+}
+
 void
 gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref)
 {
@@ -830,19 +921,19 @@ gfxWindowsPlatform::SetupClearTypeParams(nsIPrefBranch *aPrefBranch)
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_GAMMA,
                                                  &value))) {
             if (value >= 1000 && value <= 2200) {
-                gamma = (FLOAT)value / 1000.0;
+                gamma = FLOAT(value / 1000.0);
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_CONTRAST,
                                                  &value))) {
             if (value >= 0 && value <= 1000) {
-                contrast = (FLOAT)value / 100.0;
+                contrast = FLOAT(value / 100.0);
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_LEVEL,
                                                  &value))) {
             if (value >= 0 && value <= 100) {
-                level = (FLOAT)value / 100.0;
+                level = FLOAT(value / 100.0);
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_STRUCTURE,
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index 35cdc5ae16d3..6dfede43360b 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -114,6 +114,19 @@ struct DCFromContext {
     PRBool needsRelease;
 };
 
+// ClearType parameters set by running ClearType tuner
+struct ClearTypeParameterInfo {
+    ClearTypeParameterInfo() :
+        gamma(-1), pixelStructure(-1), clearTypeLevel(-1), enhancedContrast(-1)
+    { }
+
+    nsString    displayName;  // typically just 'DISPLAY1'
+    PRInt32     gamma;
+    PRInt32     pixelStructure;
+    PRInt32     clearTypeLevel;
+    PRInt32     enhancedContrast;
+};
+
 class THEBES_API gfxWindowsPlatform : public gfxPlatform {
 public:
     gfxWindowsPlatform();
@@ -236,6 +249,9 @@ public:
 
     static void GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion);
 
+    // returns ClearType tuning information for each display
+    static void GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams);
+
     virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);
 
     void SetupClearTypeParams(nsIPrefBranch *aPrefBranch);
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 6c149ace5c71..a8c92a6e630f 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -259,11 +259,17 @@ function populateGraphicsSection() {
       try {
         dwEnabled = gfxInfo.DWriteEnabled + " (" + gfxInfo.DWriteVersion + ")";
       } catch(e) {}
-      trGraphics.push(createParentElement("tr", [
-        createHeader(bundle.GetStringFromName("directWriteEnabled")),
-        createElement("td", dwEnabled),
-      ]));
+      pushInfoRow(trGraphics, "directWriteEnabled", dwEnabled);  
+
+      var cleartypeParams = "";
+      try {
+        cleartypeParams = gfxInfo.cleartypeParameters;
+      } catch(e) {
+        cleartypeParams = bundle.GetStringFromName("clearTypeParametersNotFound");
+      }
+      pushInfoRow(trGraphics, "clearTypeParameters", cleartypeParams);  
     }
+
 #endif
 
     var webglrenderer;
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 723559d15c56..197a137ed80c 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -1,5 +1,6 @@
-# LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated.
-# Feel free to leave english strings if there are no good translations, these are only used in about:support
+# LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType" 
+# are proper nouns and should not be translated. Feel free to leave english strings if 
+# there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
@@ -21,6 +22,8 @@ blockedOSVersion = Blocked for your operating system version.
 
 direct2DEnabled = Direct2D Enabled
 directWriteEnabled = DirectWrite Enabled
+clearTypeParameters = ClearType Parameters
+clearTypeParametersNotFound = ClearType parameters not found
 adapterDescription = Adapter Description
 adapterVendorID = Vendor ID
 adapterDeviceID = Device ID
diff --git a/widget/public/nsIGfxInfo.idl b/widget/public/nsIGfxInfo.idl
index a78ff4da151d..9002ca7258e5 100644
--- a/widget/public/nsIGfxInfo.idl
+++ b/widget/public/nsIGfxInfo.idl
@@ -40,7 +40,7 @@
 
 /* NOTE: this interface is completely undesigned, not stable and likely to change */
 
-[scriptable, uuid(5c5de1e7-f7f4-46b4-9ced-03ab1f869eaf)]
+[scriptable, uuid(a67c77af-2952-4028-93ab-e7bc3b43cf81)]
 interface nsIGfxInfo : nsISupports
 {
   /*
@@ -49,6 +49,7 @@ interface nsIGfxInfo : nsISupports
   readonly attribute boolean D2DEnabled;
   readonly attribute boolean DWriteEnabled;
   readonly attribute DOMString DWriteVersion;
+  readonly attribute DOMString cleartypeParameters;
   
   /**
    * The name of the display adapter.
diff --git a/widget/src/android/GfxInfo.cpp b/widget/src/android/GfxInfo.cpp
index affba473434d..01f1f3fa97ef 100644
--- a/widget/src/android/GfxInfo.cpp
+++ b/widget/src/android/GfxInfo.cpp
@@ -73,6 +73,13 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_ERROR_FAILURE;
 }
 
+/* readonly attribute DOMString cleartypeParameters; */
+NS_IMETHODIMP
+GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
+{
+  return NS_ERROR_FAILURE;
+}
+
 nsresult
 GfxInfo::Init()
 {
diff --git a/widget/src/android/GfxInfo.h b/widget/src/android/GfxInfo.h
index ca21ddfd4e90..f04ebd7d4915 100644
--- a/widget/src/android/GfxInfo.h
+++ b/widget/src/android/GfxInfo.h
@@ -55,6 +55,7 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
diff --git a/widget/src/cocoa/GfxInfo.h b/widget/src/cocoa/GfxInfo.h
index ca21ddfd4e90..f04ebd7d4915 100644
--- a/widget/src/cocoa/GfxInfo.h
+++ b/widget/src/cocoa/GfxInfo.h
@@ -55,6 +55,7 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
diff --git a/widget/src/cocoa/GfxInfo.mm b/widget/src/cocoa/GfxInfo.mm
index 4080b1d407ec..6e3eff38b926 100644
--- a/widget/src/cocoa/GfxInfo.mm
+++ b/widget/src/cocoa/GfxInfo.mm
@@ -114,6 +114,13 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_ERROR_FAILURE;
 }
 
+/* readonly attribute DOMString cleartypeParameters; */
+NS_IMETHODIMP
+GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
+{
+  return NS_ERROR_FAILURE;
+}
+
 /* readonly attribute DOMString adapterDescription; */
 NS_IMETHODIMP
 GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp
index 20720a2678ab..89001a49abed 100644
--- a/widget/src/windows/GfxInfo.cpp
+++ b/widget/src/windows/GfxInfo.cpp
@@ -106,6 +106,80 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_OK;
 }
 
+#define PIXEL_STRUCT_RGB  1
+#define PIXEL_STRUCT_BGR  2
+
+/* readonly attribute DOMString cleartypeParameters; */
+NS_IMETHODIMP
+GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
+{
+  nsTArray<ClearTypeParameterInfo> clearTypeParams;
+
+  gfxWindowsPlatform::GetPlatform()->GetCleartypeParams(clearTypeParams);
+  PRUint32 d, numDisplays = clearTypeParams.Length();
+  bool displayNames = (numDisplays > 1);
+  bool foundData = false;
+  nsString outStr;
+  WCHAR valStr[256];
+
+  for (d = 0; d < numDisplays; d++) {
+    ClearTypeParameterInfo& params = clearTypeParams[d];
+
+    if (displayNames) {
+      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                 L"%s [ ", params.displayName.get());
+      outStr.Append(valStr);
+    }
+
+    if (params.gamma >= 0) {
+      foundData = true;
+      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                 L"Gamma: %d ", params.gamma);
+      outStr.Append(valStr);
+    }
+
+    if (params.pixelStructure >= 0) {
+      foundData = true;
+      if (params.pixelStructure == PIXEL_STRUCT_RGB ||
+          params.pixelStructure == PIXEL_STRUCT_BGR)
+      {
+        swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                   L"Pixel Structure: %s ",
+                   (params.pixelStructure == PIXEL_STRUCT_RGB ?
+                      L"RGB" : L"BGR"));
+      } else {
+        swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                   L"Pixel Structure: %d ", params.pixelStructure);
+      }
+      outStr.Append(valStr);
+    }
+
+    if (params.clearTypeLevel >= 0) {
+      foundData = true;
+      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                 L"ClearType Level: %d ", params.clearTypeLevel);
+      outStr.Append(valStr);
+    }
+
+    if (params.enhancedContrast >= 0) {
+      foundData = true;
+      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
+                 L"Enhanced Contrast: %d ", params.enhancedContrast);
+      outStr.Append(valStr);
+    }
+
+    if (displayNames) {
+      outStr.Append(L"] ");
+    }
+  }
+
+  if (foundData) {
+    aCleartypeParams.Assign(outStr);
+    return NS_OK;
+  }
+  return NS_ERROR_FAILURE;
+}
+
 /* XXX: GfxInfo doesn't handle multiple GPUs. We should try to do that. Bug #591057 */
 
 static nsresult GetKeyValue(const WCHAR* keyLocation, const WCHAR* keyName, nsAString& destString, int type)
diff --git a/widget/src/windows/GfxInfo.h b/widget/src/windows/GfxInfo.h
index efc7541721ce..d71143913409 100644
--- a/widget/src/windows/GfxInfo.h
+++ b/widget/src/windows/GfxInfo.h
@@ -59,6 +59,7 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);

From 0a81d96dc03a738ec1db35ac9beadb461d24bffd Mon Sep 17 00:00:00 2001
From: John Daggett <jdaggett@mozilla.com>
Date: Mon, 9 May 2011 15:19:33 +0900
Subject: [PATCH 087/314] Backed out changeset d34dd7156b4d

---
 gfx/thebes/gfxWindowsPlatform.cpp             | 97 +------------------
 gfx/thebes/gfxWindowsPlatform.h               | 16 ---
 toolkit/content/aboutSupport.js               | 14 +--
 .../chrome/global/aboutSupport.properties     |  7 +-
 widget/public/nsIGfxInfo.idl                  |  3 +-
 widget/src/android/GfxInfo.cpp                |  7 --
 widget/src/android/GfxInfo.h                  |  1 -
 widget/src/cocoa/GfxInfo.h                    |  1 -
 widget/src/cocoa/GfxInfo.mm                   |  7 --
 widget/src/windows/GfxInfo.cpp                | 74 --------------
 widget/src/windows/GfxInfo.h                  |  1 -
 11 files changed, 10 insertions(+), 218 deletions(-)

diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index c898fd332fca..fe31539831af 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -785,97 +785,6 @@ gfxWindowsPlatform::GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion
     aVersion.Assign(NS_ConvertUTF8toUTF16(buf));
 }
 
-void 
-gfxWindowsPlatform::GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams)
-{
-    HKEY  hKey, subKey;
-    DWORD i, rv, size, type;
-    WCHAR displayName[256], subkeyName[256];
-
-    aParams.Clear();
-
-    // construct subkeys based on HKLM subkeys, assume they are same for HKCU
-    rv = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                       L"Software\\Microsoft\\Avalon.Graphics",
-                       0, KEY_READ, &hKey);
-
-    if (rv != ERROR_SUCCESS) {
-        return;
-    }
-
-    // enumerate over subkeys
-    for (i = 0, rv = ERROR_SUCCESS; rv != ERROR_NO_MORE_ITEMS; i++) {
-        size = NS_ARRAY_LENGTH(displayName);
-        rv = RegEnumKeyExW(hKey, i, displayName, &size, NULL, NULL, NULL, NULL);
-        if (rv != ERROR_SUCCESS) {
-            continue;
-        }
-
-        ClearTypeParameterInfo ctinfo;
-        ctinfo.displayName.Assign(displayName);
-
-        DWORD subrv, value;
-        bool foundData = false;
-
-        swprintf_s(subkeyName, NS_ARRAY_LENGTH(subkeyName),
-                   L"Software\\Microsoft\\Avalon.Graphics\\%s", displayName);
-
-        // subkey for gamma, pixel structure
-        subrv = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                              subkeyName, 0, KEY_QUERY_VALUE, &subKey);
-
-        if (subrv == ERROR_SUCCESS) {
-            size = sizeof(value);
-            subrv = RegQueryValueExW(subKey, L"GammaLevel", NULL, &type,
-                                     (LPBYTE)&value, &size);
-            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
-                foundData = true;
-                ctinfo.gamma = value;
-            }
-
-            size = sizeof(value);
-            subrv = RegQueryValueExW(subKey, L"PixelStructure", NULL, &type,
-                                     (LPBYTE)&value, &size);
-            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
-                foundData = true;
-                ctinfo.pixelStructure = value;
-            }
-
-            RegCloseKey(subKey);
-        }
-
-        // subkey for cleartype level, enhanced contrast
-        subrv = RegOpenKeyExW(HKEY_CURRENT_USER,
-                              subkeyName, 0, KEY_QUERY_VALUE, &subKey);
-
-        if (subrv == ERROR_SUCCESS) {
-            size = sizeof(value);
-            subrv = RegQueryValueExW(subKey, L"ClearTypeLevel", NULL, &type,
-                                     (LPBYTE)&value, &size);
-            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
-                foundData = true;
-                ctinfo.clearTypeLevel = value;
-            }
-      
-            size = sizeof(value);
-            subrv = RegQueryValueExW(subKey, L"EnhancedContrastLevel",
-                                     NULL, &type, (LPBYTE)&value, &size);
-            if (subrv == ERROR_SUCCESS && type == REG_DWORD) {
-                foundData = true;
-                ctinfo.enhancedContrast = value;
-            }
-
-            RegCloseKey(subKey);
-        }
-
-        if (foundData) {
-            aParams.AppendElement(ctinfo);
-        }
-    }
-
-    RegCloseKey(hKey);
-}
-
 void
 gfxWindowsPlatform::FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref)
 {
@@ -921,19 +830,19 @@ gfxWindowsPlatform::SetupClearTypeParams(nsIPrefBranch *aPrefBranch)
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_GAMMA,
                                                  &value))) {
             if (value >= 1000 && value <= 2200) {
-                gamma = FLOAT(value / 1000.0);
+                gamma = (FLOAT)value / 1000.0;
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_CONTRAST,
                                                  &value))) {
             if (value >= 0 && value <= 1000) {
-                contrast = FLOAT(value / 100.0);
+                contrast = (FLOAT)value / 100.0;
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_LEVEL,
                                                  &value))) {
             if (value >= 0 && value <= 100) {
-                level = FLOAT(value / 100.0);
+                level = (FLOAT)value / 100.0;
             }
         }
         if (NS_SUCCEEDED(aPrefBranch->GetIntPref(GFX_CLEARTYPE_PARAMS_STRUCTURE,
diff --git a/gfx/thebes/gfxWindowsPlatform.h b/gfx/thebes/gfxWindowsPlatform.h
index 6dfede43360b..35cdc5ae16d3 100644
--- a/gfx/thebes/gfxWindowsPlatform.h
+++ b/gfx/thebes/gfxWindowsPlatform.h
@@ -114,19 +114,6 @@ struct DCFromContext {
     PRBool needsRelease;
 };
 
-// ClearType parameters set by running ClearType tuner
-struct ClearTypeParameterInfo {
-    ClearTypeParameterInfo() :
-        gamma(-1), pixelStructure(-1), clearTypeLevel(-1), enhancedContrast(-1)
-    { }
-
-    nsString    displayName;  // typically just 'DISPLAY1'
-    PRInt32     gamma;
-    PRInt32     pixelStructure;
-    PRInt32     clearTypeLevel;
-    PRInt32     enhancedContrast;
-};
-
 class THEBES_API gfxWindowsPlatform : public gfxPlatform {
 public:
     gfxWindowsPlatform();
@@ -249,9 +236,6 @@ public:
 
     static void GetDLLVersion(const PRUnichar *aDLLPath, nsAString& aVersion);
 
-    // returns ClearType tuning information for each display
-    static void GetCleartypeParams(nsTArray<ClearTypeParameterInfo>& aParams);
-
     virtual void FontsPrefsChanged(nsIPrefBranch *aPrefBranch, const char *aPref);
 
     void SetupClearTypeParams(nsIPrefBranch *aPrefBranch);
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index a8c92a6e630f..6c149ace5c71 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -259,17 +259,11 @@ function populateGraphicsSection() {
       try {
         dwEnabled = gfxInfo.DWriteEnabled + " (" + gfxInfo.DWriteVersion + ")";
       } catch(e) {}
-      pushInfoRow(trGraphics, "directWriteEnabled", dwEnabled);  
-
-      var cleartypeParams = "";
-      try {
-        cleartypeParams = gfxInfo.cleartypeParameters;
-      } catch(e) {
-        cleartypeParams = bundle.GetStringFromName("clearTypeParametersNotFound");
-      }
-      pushInfoRow(trGraphics, "clearTypeParameters", cleartypeParams);  
+      trGraphics.push(createParentElement("tr", [
+        createHeader(bundle.GetStringFromName("directWriteEnabled")),
+        createElement("td", dwEnabled),
+      ]));
     }
-
 #endif
 
     var webglrenderer;
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 197a137ed80c..723559d15c56 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -1,6 +1,5 @@
-# LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType" 
-# are proper nouns and should not be translated. Feel free to leave english strings if 
-# there are no good translations, these are only used in about:support
+# LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated.
+# Feel free to leave english strings if there are no good translations, these are only used in about:support
 
 # LOCALIZATION NOTE: This can be localized with a more generic term, like
 # "Graphics-accelerated Windows". It describes a number of windows, e.g.:
@@ -22,8 +21,6 @@ blockedOSVersion = Blocked for your operating system version.
 
 direct2DEnabled = Direct2D Enabled
 directWriteEnabled = DirectWrite Enabled
-clearTypeParameters = ClearType Parameters
-clearTypeParametersNotFound = ClearType parameters not found
 adapterDescription = Adapter Description
 adapterVendorID = Vendor ID
 adapterDeviceID = Device ID
diff --git a/widget/public/nsIGfxInfo.idl b/widget/public/nsIGfxInfo.idl
index 9002ca7258e5..a78ff4da151d 100644
--- a/widget/public/nsIGfxInfo.idl
+++ b/widget/public/nsIGfxInfo.idl
@@ -40,7 +40,7 @@
 
 /* NOTE: this interface is completely undesigned, not stable and likely to change */
 
-[scriptable, uuid(a67c77af-2952-4028-93ab-e7bc3b43cf81)]
+[scriptable, uuid(5c5de1e7-f7f4-46b4-9ced-03ab1f869eaf)]
 interface nsIGfxInfo : nsISupports
 {
   /*
@@ -49,7 +49,6 @@ interface nsIGfxInfo : nsISupports
   readonly attribute boolean D2DEnabled;
   readonly attribute boolean DWriteEnabled;
   readonly attribute DOMString DWriteVersion;
-  readonly attribute DOMString cleartypeParameters;
   
   /**
    * The name of the display adapter.
diff --git a/widget/src/android/GfxInfo.cpp b/widget/src/android/GfxInfo.cpp
index 01f1f3fa97ef..affba473434d 100644
--- a/widget/src/android/GfxInfo.cpp
+++ b/widget/src/android/GfxInfo.cpp
@@ -73,13 +73,6 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_ERROR_FAILURE;
 }
 
-/* readonly attribute DOMString cleartypeParameters; */
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  return NS_ERROR_FAILURE;
-}
-
 nsresult
 GfxInfo::Init()
 {
diff --git a/widget/src/android/GfxInfo.h b/widget/src/android/GfxInfo.h
index f04ebd7d4915..ca21ddfd4e90 100644
--- a/widget/src/android/GfxInfo.h
+++ b/widget/src/android/GfxInfo.h
@@ -55,7 +55,6 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
diff --git a/widget/src/cocoa/GfxInfo.h b/widget/src/cocoa/GfxInfo.h
index f04ebd7d4915..ca21ddfd4e90 100644
--- a/widget/src/cocoa/GfxInfo.h
+++ b/widget/src/cocoa/GfxInfo.h
@@ -55,7 +55,6 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
diff --git a/widget/src/cocoa/GfxInfo.mm b/widget/src/cocoa/GfxInfo.mm
index 6e3eff38b926..4080b1d407ec 100644
--- a/widget/src/cocoa/GfxInfo.mm
+++ b/widget/src/cocoa/GfxInfo.mm
@@ -114,13 +114,6 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_ERROR_FAILURE;
 }
 
-/* readonly attribute DOMString cleartypeParameters; */
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  return NS_ERROR_FAILURE;
-}
-
 /* readonly attribute DOMString adapterDescription; */
 NS_IMETHODIMP
 GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
diff --git a/widget/src/windows/GfxInfo.cpp b/widget/src/windows/GfxInfo.cpp
index 89001a49abed..20720a2678ab 100644
--- a/widget/src/windows/GfxInfo.cpp
+++ b/widget/src/windows/GfxInfo.cpp
@@ -106,80 +106,6 @@ GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
   return NS_OK;
 }
 
-#define PIXEL_STRUCT_RGB  1
-#define PIXEL_STRUCT_BGR  2
-
-/* readonly attribute DOMString cleartypeParameters; */
-NS_IMETHODIMP
-GfxInfo::GetCleartypeParameters(nsAString & aCleartypeParams)
-{
-  nsTArray<ClearTypeParameterInfo> clearTypeParams;
-
-  gfxWindowsPlatform::GetPlatform()->GetCleartypeParams(clearTypeParams);
-  PRUint32 d, numDisplays = clearTypeParams.Length();
-  bool displayNames = (numDisplays > 1);
-  bool foundData = false;
-  nsString outStr;
-  WCHAR valStr[256];
-
-  for (d = 0; d < numDisplays; d++) {
-    ClearTypeParameterInfo& params = clearTypeParams[d];
-
-    if (displayNames) {
-      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                 L"%s [ ", params.displayName.get());
-      outStr.Append(valStr);
-    }
-
-    if (params.gamma >= 0) {
-      foundData = true;
-      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                 L"Gamma: %d ", params.gamma);
-      outStr.Append(valStr);
-    }
-
-    if (params.pixelStructure >= 0) {
-      foundData = true;
-      if (params.pixelStructure == PIXEL_STRUCT_RGB ||
-          params.pixelStructure == PIXEL_STRUCT_BGR)
-      {
-        swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                   L"Pixel Structure: %s ",
-                   (params.pixelStructure == PIXEL_STRUCT_RGB ?
-                      L"RGB" : L"BGR"));
-      } else {
-        swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                   L"Pixel Structure: %d ", params.pixelStructure);
-      }
-      outStr.Append(valStr);
-    }
-
-    if (params.clearTypeLevel >= 0) {
-      foundData = true;
-      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                 L"ClearType Level: %d ", params.clearTypeLevel);
-      outStr.Append(valStr);
-    }
-
-    if (params.enhancedContrast >= 0) {
-      foundData = true;
-      swprintf_s(valStr, NS_ARRAY_LENGTH(valStr),
-                 L"Enhanced Contrast: %d ", params.enhancedContrast);
-      outStr.Append(valStr);
-    }
-
-    if (displayNames) {
-      outStr.Append(L"] ");
-    }
-  }
-
-  if (foundData) {
-    aCleartypeParams.Assign(outStr);
-    return NS_OK;
-  }
-  return NS_ERROR_FAILURE;
-}
-
 /* XXX: GfxInfo doesn't handle multiple GPUs. We should try to do that. Bug #591057 */
 
 static nsresult GetKeyValue(const WCHAR* keyLocation, const WCHAR* keyName, nsAString& destString, int type)
diff --git a/widget/src/windows/GfxInfo.h b/widget/src/windows/GfxInfo.h
index d71143913409..efc7541721ce 100644
--- a/widget/src/windows/GfxInfo.h
+++ b/widget/src/windows/GfxInfo.h
@@ -59,7 +59,6 @@ public:
   NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
   NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_SCRIPTABLE NS_IMETHOD GetCleartypeParameters(nsAString & aCleartypeParams);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
   NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);

From 239a65c6f7455ba9560162c004586cd089aadd02 Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Mon, 9 May 2011 09:48:46 +0300
Subject: [PATCH 088/314] Bug 650001 - Make the HTML serializer pay attention
 to namespaces. r=bzbarsky.

---
 content/base/src/nsHTMLContentSerializer.cpp | 101 ++++++++++++-------
 content/base/src/nsHTMLContentSerializer.h   |   1 +
 2 files changed, 66 insertions(+), 36 deletions(-)

diff --git a/content/base/src/nsHTMLContentSerializer.cpp b/content/base/src/nsHTMLContentSerializer.cpp
index 352fb0ce4a5e..ff152393abb1 100644
--- a/content/base/src/nsHTMLContentSerializer.cpp
+++ b/content/base/src/nsHTMLContentSerializer.cpp
@@ -90,10 +90,11 @@ nsresult NS_NewHTMLContentSerializer(nsIContentSerializer** aSerializer)
 
 static
 PRBool
-IsInvisibleBreak(nsIContent *aNode, nsIAtom *aTag) {
+IsInvisibleBreak(nsIContent *aNode, nsIAtom *aTag, PRInt32 aNamespace) {
   // xxxehsan: we should probably figure out a way to determine
   // if a BR node is visible without using the editor.
-  if (aTag != nsGkAtoms::br || !aNode->IsEditable()) {
+  if (!(aTag == nsGkAtoms::br && aNamespace == kNameSpaceID_XHTML) ||
+      !aNode->IsEditable()) {
     return PR_FALSE;
   }
 
@@ -145,6 +146,7 @@ nsHTMLContentSerializer::SerializeHTMLAttributes(nsIContent* aContent,
                                                  nsAString& aTagPrefix,
                                                  const nsAString& aTagNamespaceURI,
                                                  nsIAtom* aTagName,
+                                                 PRInt32 aNamespace,
                                                  nsAString& aStr)
 {
   PRInt32 count = aContent->GetAttrCount();
@@ -173,20 +175,24 @@ nsHTMLContentSerializer::SerializeHTMLAttributes(nsIContent* aContent,
     // Filter out special case of <br type="_moz"> or <br _moz*>,
     // used by the editor.  Bug 16988.  Yuck.
     //
-    if (aTagName == nsGkAtoms::br && attrName == nsGkAtoms::type &&
+    if (aTagName == nsGkAtoms::br && aNamespace == kNameSpaceID_XHTML &&
+        attrName == nsGkAtoms::type && namespaceID == kNameSpaceID_None &&
         StringBeginsWith(valueStr, _mozStr)) {
       continue;
     }
 
-    if (mIsCopying && mIsFirstChildOfOL && (aTagName == nsGkAtoms::li) && 
-        (attrName == nsGkAtoms::value)){
+    if (mIsCopying && mIsFirstChildOfOL &&
+        aTagName == nsGkAtoms::li && aNamespace == kNameSpaceID_XHTML &&
+        attrName == nsGkAtoms::value && namespaceID == kNameSpaceID_None){
       // This is handled separately in SerializeLIValueAttribute()
       continue;
     }
     PRBool isJS = IsJavaScript(aContent, attrName, namespaceID, valueStr);
     
-    if (((attrName == nsGkAtoms::href) || 
-         (attrName == nsGkAtoms::src))) {
+    if (((attrName == nsGkAtoms::href &&
+          (namespaceID == kNameSpaceID_None ||
+           namespaceID == kNameSpaceID_XLink)) ||
+         (attrName == nsGkAtoms::src && namespaceID == kNameSpaceID_None))) {
       // Make all links absolute when converting only the selection:
       if (mFlags & nsIDocumentEncoder::OutputAbsoluteLinks) {
         // Would be nice to handle OBJECT and APPLET tags,
@@ -209,7 +215,8 @@ nsHTMLContentSerializer::SerializeHTMLAttributes(nsIContent* aContent,
     }
 
     if (mRewriteEncodingDeclaration && aTagName == nsGkAtoms::meta &&
-        attrName == nsGkAtoms::content) {
+        aNamespace == kNameSpaceID_XHTML && attrName == nsGkAtoms::content
+        && namespaceID == kNameSpaceID_None) {
       // If we're serializing a <meta http-equiv="content-type">,
       // use the proper value, rather than what's in the document.
       nsAutoString header;
@@ -221,12 +228,21 @@ nsHTMLContentSerializer::SerializeHTMLAttributes(nsIContent* aContent,
     }
 
     nsDependentAtomString nameStr(attrName);
+    nsAutoString prefix;
+    if (namespaceID == kNameSpaceID_XML) {
+      prefix.Assign(NS_LITERAL_STRING("xml"));
+    } else if (namespaceID == kNameSpaceID_XLink) {
+      prefix.Assign(NS_LITERAL_STRING("xlink"));
+    }
 
     // Expand shorthand attribute.
-    if (IsShorthandAttr(attrName, aTagName) && valueStr.IsEmpty()) {
+    if (aNamespace == kNameSpaceID_XHTML &&
+        namespaceID == kNameSpaceID_None &&
+        IsShorthandAttr(attrName, aTagName) &&
+        valueStr.IsEmpty()) {
       valueStr = nameStr;
     }
-    SerializeAttr(EmptyString(), nameStr, valueStr, aStr, !isJS);
+    SerializeAttr(prefix, nameStr, valueStr, aStr, !isJS);
   }
 }
 
@@ -245,13 +261,14 @@ nsHTMLContentSerializer::AppendElementStart(Element* aElement,
   }
 
   nsIAtom *name = content->Tag();
+  PRInt32 ns = content->GetNameSpaceID();
 
   if ((mFlags & nsIDocumentEncoder::OutputPreformatted) &&
-      IsInvisibleBreak(content, name)) {
+      IsInvisibleBreak(content, name, ns)) {
     return NS_OK;
   }
 
-  PRBool lineBreakBeforeOpen = LineBreakBeforeOpen(content->GetNameSpaceID(), name);
+  PRBool lineBreakBeforeOpen = LineBreakBeforeOpen(ns, name);
 
   if ((mDoFormat || forceFormat) && !mPreLevel && !mDoRaw) {
     if (mColPos && lineBreakBeforeOpen) {
@@ -291,7 +308,7 @@ nsHTMLContentSerializer::AppendElementStart(Element* aElement,
 
   // Need to keep track of OL and LI elements in order to get ordinal number 
   // for the LI.
-  if (mIsCopying && name == nsGkAtoms::ol){
+  if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML){
     // We are copying and current node is an OL;
     // Store its start attribute value in olState->startVal.
     nsAutoString start;
@@ -312,7 +329,7 @@ nsHTMLContentSerializer::AppendElementStart(Element* aElement,
     mOLStateStack.AppendElement(olState(startAttrVal, PR_TRUE));
   }
 
-  if (mIsCopying && name == nsGkAtoms::li) {
+  if (mIsCopying && name == nsGkAtoms::li && ns == kNameSpaceID_XHTML) {
     mIsFirstChildOfOL = IsFirstChildOfOL(aOriginalElement);
     if (mIsFirstChildOfOL){
       // If OL is parent of this LI, serialize attributes in different manner.
@@ -323,19 +340,26 @@ nsHTMLContentSerializer::AppendElementStart(Element* aElement,
   // Even LI passed above have to go through this 
   // for serializing attributes other than "value".
   nsAutoString dummyPrefix;
-  SerializeHTMLAttributes(content, aOriginalElement, dummyPrefix, EmptyString(), name, aStr);
+  SerializeHTMLAttributes(content,
+                          aOriginalElement,
+                          dummyPrefix,
+                          EmptyString(),
+                          name,
+                          ns,
+                          aStr);
 
   AppendToString(kGreaterThan, aStr);
 
-  if (name == nsGkAtoms::script ||
-      name == nsGkAtoms::style ||
-      name == nsGkAtoms::noscript ||
-      name == nsGkAtoms::noframes) {
+  if (ns == kNameSpaceID_XHTML &&
+      (name == nsGkAtoms::script ||
+       name == nsGkAtoms::style ||
+       name == nsGkAtoms::noscript ||
+       name == nsGkAtoms::noframes)) {
     ++mDisableEntityEncoding;
   }
 
   if ((mDoFormat || forceFormat) && !mPreLevel &&
-    !mDoRaw && LineBreakAfterOpen(content->GetNameSpaceID(), name)) {
+    !mDoRaw && LineBreakAfterOpen(ns, name)) {
     AppendNewLineToString(aStr);
   }
 
@@ -353,11 +377,13 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
   nsIContent* content = aElement;
 
   nsIAtom *name = content->Tag();
+  PRInt32 ns = content->GetNameSpaceID();
 
-  if (name == nsGkAtoms::script ||
-      name == nsGkAtoms::style ||
-      name == nsGkAtoms::noscript ||
-      name == nsGkAtoms::noframes) {
+  if (ns == kNameSpaceID_XHTML &&
+      (name == nsGkAtoms::script ||
+       name == nsGkAtoms::style ||
+       name == nsGkAtoms::noscript ||
+       name == nsGkAtoms::noframes)) {
     --mDisableEntityEncoding;
   }
 
@@ -379,7 +405,7 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
       return NS_OK;
     }
   }
-  else if (mIsCopying && name == nsGkAtoms::ol) {
+  else if (mIsCopying && name == nsGkAtoms::ol && ns == kNameSpaceID_XHTML) {
     NS_ASSERTION((!mOLStateStack.IsEmpty()), "Cannot have an empty OL Stack");
     /* Though at this point we must always have an state to be deleted as all 
     the OL opening tags are supposed to push an olState object to the stack*/
@@ -388,21 +414,24 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
     }
   }
   
-  nsIParserService* parserService = nsContentUtils::GetParserService();
+  if (ns == kNameSpaceID_XHTML) {
+    nsIParserService* parserService = nsContentUtils::GetParserService();
 
-  if (parserService) {
-    PRBool isContainer;
+    if (parserService) {
+      PRBool isContainer;
 
-    parserService->
-      IsContainer(parserService->HTMLCaseSensitiveAtomTagToId(name),
-                  isContainer);
-    if (!isContainer)
-      return NS_OK;
+      parserService->
+        IsContainer(parserService->HTMLCaseSensitiveAtomTagToId(name),
+                    isContainer);
+      if (!isContainer) {
+        return NS_OK;
+      }
+    }
   }
 
   if ((mDoFormat || forceFormat) && !mPreLevel && !mDoRaw) {
 
-    PRBool lineBreakBeforeClose = LineBreakBeforeClose(content->GetNameSpaceID(), name);
+    PRBool lineBreakBeforeClose = LineBreakBeforeClose(ns, name);
 
     if (mColPos && lineBreakBeforeClose) {
       AppendNewLineToString(aStr);
@@ -427,14 +456,14 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
   MaybeLeaveFromPreContent(content);
 
   if ((mDoFormat || forceFormat) && !mPreLevel
-      && !mDoRaw && LineBreakAfterClose(content->GetNameSpaceID(), name)) {
+      && !mDoRaw && LineBreakAfterClose(ns, name)) {
     AppendNewLineToString(aStr);
   }
   else {
     MaybeFlagNewlineForRootNode(aElement);
   }
 
-  if (name == nsGkAtoms::body) {
+  if (name == nsGkAtoms::body && ns == kNameSpaceID_XHTML) {
     --mInBody;
   }
 
diff --git a/content/base/src/nsHTMLContentSerializer.h b/content/base/src/nsHTMLContentSerializer.h
index acd4792a1209..38f416da989d 100644
--- a/content/base/src/nsHTMLContentSerializer.h
+++ b/content/base/src/nsHTMLContentSerializer.h
@@ -73,6 +73,7 @@ class nsHTMLContentSerializer : public nsXHTMLContentSerializer {
                                        nsAString& aTagPrefix,
                                        const nsAString& aTagNamespaceURI,
                                        nsIAtom* aTagName,
+                                       PRInt32 aNamespace,
                                        nsAString& aStr);
 
   virtual void AppendAndTranslateEntities(const nsAString& aStr,

From 048181c657424bc68caa319887fcda58457f6d12 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Mon, 9 May 2011 10:55:19 +0100
Subject: [PATCH 089/314] bug 655207 - don't read an uninitialized entry in the
 hyphenation array. r=roc

---
 layout/generic/nsTextFrameThebes.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 270e31429e16..0826f01bd3e5 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -2862,7 +2862,7 @@ PropertyProvider::GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
         mFrag->CharAt(run.GetOriginalOffset() + run.GetRunLength() - 1) == CH_SHY;
     } else {
       PRInt32 runOffsetInSubstring = run.GetSkippedOffset() - aStart;
-      memset(aBreakBefore + runOffsetInSubstring, 0, run.GetRunLength());
+      memset(aBreakBefore + runOffsetInSubstring, PR_FALSE, run.GetRunLength());
       // Don't allow hyphen breaks at the start of the line
       aBreakBefore[runOffsetInSubstring] = allowHyphenBreakBeforeNextChar &&
           (!(mFrame->GetStateBits() & TEXT_START_OF_LINE) ||
@@ -6153,7 +6153,9 @@ nsTextFrame::AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
          (mTextRun->GetFlags() & nsTextFrameUtils::TEXT_HAS_TRAILING_BREAK))) {
       if (preformattedNewline) {
         aData->ForceBreak(aRenderingContext);
-      } else if (hyphBreakBefore && hyphBreakBefore[i - start]) {
+      } else if (i < flowEndInTextRun && hyphBreakBefore &&
+                 hyphBreakBefore[i - start])
+      {
         aData->OptionallyBreak(aRenderingContext, provider.GetHyphenWidth());
       } {
         aData->OptionallyBreak(aRenderingContext);

From 83468b9fea5a9a5a1d20ae8422999f95f88bd55e Mon Sep 17 00:00:00 2001
From: Anas Husseini <linux.anas@gmail.com>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 090/314] Bug 652259 - [RTL] Arrow is on the wrong side when
 opening a new tab [r=vingtetun]

---
 mobile/chrome/content/bindings/arrowbox.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/content/bindings/arrowbox.xml b/mobile/chrome/content/bindings/arrowbox.xml
index ec7b96ea3a7a..a6a80b7b6e21 100644
--- a/mobile/chrome/content/bindings/arrowbox.xml
+++ b/mobile/chrome/content/bindings/arrowbox.xml
@@ -128,7 +128,7 @@
                 } else {
                   arrowbox.style.marginLeft = ((anchorRect.left - popupRect.left) + (anchorRect.width / 2) - HALF_ARROW_WIDTH) + "px";
                   if (vertPos == 1) {
-                    container.dir = "ltr"; 
+                    container.dir = "normal"; 
                     anchorClass = "top";
                   } else if (vertPos == -1) {
                     container.dir = "reverse"; 
@@ -143,7 +143,7 @@
                   container.dir = "ltr"; 
                   anchorClass = "left";
                 } else if (horizPos == -1) {
-                  container.dir = "reverse";
+                  container.dir = "rtl";
                   anchorClass = "right";
                 }
               } else {

From ab019cd8961daf369520f5e6f214301fc5327830 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 091/314] Bug 653219 - autocomplete popup mispositioned when
 remember password message is shown [r=mfinkle]

---
 mobile/chrome/content/common-ui.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index e470e8742309..073bd4549df5 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -1022,6 +1022,12 @@ var FormHelperUI = {
     // The sidebars scroll needs to be taken into account, otherwise the arrows
     // can be misplaced if the sidebars are open
     let topOffset = (BrowserUI.toolbarH - Browser.getScrollboxPosition(Browser.pageScrollboxScroller).y);
+
+    // Notifications take height _before_ the browser if there any
+    let notification = Browser.getNotificationBox().currentNotification;
+    if (notification)
+      topOffset += notification.getBoundingClientRect().height;
+
     let virtualContentRect = {
       width: rect.width,
       height: rect.height,

From 2fe65b214ea57016e648126f5ff8b58f7527f512 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 092/314] Bug 655005 - [RTL] left scrollbar is mispositioned
 when the control sidebar is visible [r=mfinkle]

---
 mobile/chrome/content/browser.js         | 11 +++---
 mobile/chrome/tests/browser_scrollbar.js | 50 ++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index c0add50e621a..1893e8f398d0 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1394,13 +1394,12 @@ Browser.MainDragger.prototype = {
       // the 'solution' for now is to reposition it if needed
       let x = 0;
       if (Browser.floatedWhileDragging) {
+        let [tabsVis, controlsVis, tabsW, controlsW] = Browser.computeSidebarVisibility();
+        let [tabsSidebar, controlsSidebar] = [Elements.tabs.getBoundingClientRect(), Elements.controls.getBoundingClientRect()];
+
         // Check if the sidebars are inverted (rtl)
-        let [leftVis, rightVis, leftW, rightW] = Browser.computeSidebarVisibility();
-        let [leftSidebar, rightSidebar] = [Elements.tabs.getBoundingClientRect(), Elements.controls.getBoundingClientRect()];
-        if (leftSidebar.left > rightSidebar.left)
-          x = Math.round(Math.max(0, rightW * rightVis));
-        else
-          x = Math.round(Math.max(0, leftW * leftVis)) * -1.0;
+        let direction = (tabsSidebar.left > controlsSidebar.left) ? 1 : -1;
+        x = Math.round(tabsW * tabsVis) * direction
       }
 
       this._verticalScrollbar.style.MozTransform = "translate(" + x + "px," + y + "px)";
diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index be54149b9735..e0f270d1bee2 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -56,6 +56,21 @@ function checkScrollbars(aHorizontalVisible, aVerticalVisible, aHorizontalPositi
   EventUtils.synthesizeMouse(browser, width / 2, height * 3 / 4, { type: "mouseup" });
 }
 
+function checkScrollbarsPosition(aX) {
+  let browser = getBrowser();
+  let width = browser.getBoundingClientRect().width;
+  let height = browser.getBoundingClientRect().height;
+  EventUtils.synthesizeMouse(browser, width / 2, height / 4, { type: "mousedown" });
+  EventUtils.synthesizeMouse(browser, width / 2, height * 3 / 4, { type: "mousemove" });
+
+  let verticalRect = verticalScrollbar.getBoundingClientRect();
+  let margin = parseInt(verticalScrollbar.getAttribute("end"));
+  let expectedPosition = window.innerWidth - aX - margin;
+  is(verticalRect.right, expectedPosition, "The vertical scrollbar should be position to " + expectedPosition + " (got " + verticalRect.right + ")");
+
+  EventUtils.synthesizeMouse(browser, width / 2, height * 3 / 4, { type: "mouseup" });
+}
+
 gTests.push({
   desc: "Testing visibility of scrollbars",
 
@@ -101,6 +116,41 @@ gTests.push({
   }
 });
 
+gTests.push({
+  desc: "Testing position of scrollbars",
+
+  run: function() {
+    waitForPageShow(testURL_01 + "vertical", gCurrentTest.checkScrollbarsPosition);
+    gOpenedTabs.push(Browser.addTab(testURL_01 + "vertical", true));
+  },
+
+  checkScrollbarsPosition: function() {
+    let [,, tabsWidth, controlsWidth] = Browser.computeSidebarVisibility();
+
+    checkScrollbarsPosition(0);
+
+    // Show the left sidebar and ensure scrollbar is visible
+    Browser.controlsScrollboxScroller.scrollTo(0, 0);
+    checkScrollbarsPosition(-tabsWidth);
+
+    // Show the right sidebar and ensure scrollbar is visible
+    Browser.controlsScrollboxScroller.scrollTo(tabsWidth + controlsWidth, 0);
+    checkScrollbarsPosition(controlsWidth);
+
+    gCurrentTest.finish();
+  },
+
+  finish: function() {
+    Elements.browsers.addEventListener("PanFinished", function(aEvent) {
+      Elements.browsers.removeEventListener("PanFinished", arguments.callee, false);
+      setTimeout(function() {
+        Browser.hideSidebars();
+      }, 0);
+      runNextTest();
+    }, false);
+  }
+});
+
 
 gTests.push({
   desc: "Check scrollbar visibility when the touch sequence is cancelled",

From 97001fe39e0299b52ab1bdfda148f3822c27ab31 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 093/314] Bug 650694 - browser_scrollbar.js on Android fails
 four tests and times out [r=mbrubeck]

---
 mobile/chrome/content/browser.js         | 3 ++-
 mobile/chrome/tests/browser_scrollbar.js | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 1893e8f398d0..5954eb8b406a 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2679,7 +2679,8 @@ Tab.prototype = {
 
     // Make sure the viewport height is not shorter than the window when
     // the page is zoomed out to show its full width.
-    viewportH = Math.max(viewportH, screenH * (browser.contentDocumentWidth / screenW));
+    if (viewportH * this.clampZoomLevel(this.getPageZoomLevel()) < screenH)
+      viewportH = Math.max(viewportH, screenH * (browser.contentDocumentWidth / screenW));
 
     if (browser.contentWindowWidth != viewportW || browser.contentWindowHeight != viewportH)
       browser.setWindowSize(viewportW, viewportH);
diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index e0f270d1bee2..0bfb3c8c6449 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -87,11 +87,7 @@ gTests.push({
   },
 
   checkHorizontalScrollable: function() {
-    checkScrollbars(true, true);
-    // TODO: current code forces the height to grow so we always have visible document when
-    // zooming out to see the wide document
-    //checkScrollbars(true, false);
-    todo(false, "Don't cause the height to grow beyond the window height if it doesn't need to");
+    checkScrollbars(true, false);
 
     waitForPageShow(testURL_01 + "vertical", gCurrentTest.checkVerticalScrollable);
     gOpenedTabs.push(Browser.addTab(testURL_01 + "vertical", true));

From 270b7c6ac53c51649217a2a5e01dae17767d258c Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 094/314] Bug 639530 - Suggestions bubble persists on results
 page after filling out the search form [r=mfinkle]

---
 mobile/chrome/content/forms.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mobile/chrome/content/forms.js b/mobile/chrome/content/forms.js
index 1c6fc14ba9b8..46eb422a9725 100644
--- a/mobile/chrome/content/forms.js
+++ b/mobile/chrome/content/forms.js
@@ -79,6 +79,7 @@ function FormAssistant() {
   addEventListener("focus", this, true);
   addEventListener("pageshow", this, false);
   addEventListener("pagehide", this, false);
+  addEventListener("submit", this, false);
 
   this._enabled = Services.prefs.getBoolPref("formhelper.enabled");
 };
@@ -295,6 +296,11 @@ FormAssistant.prototype = {
 
     let currentElement = this.currentElement;
     switch (aEvent.type) {
+      case "submit":
+        // submit is a final action and the form assistant should be closed
+        this.close();
+        break;
+
       case "pagehide":
       case "pageshow":
         // When reacting to a page show/hide, if the focus is different this

From d6acfbd33e9aa91f7f61e1cc143734f4c9f31ee4 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Mon, 9 May 2011 13:28:48 +0200
Subject: [PATCH 095/314] Bug 647841 - Opening a new tab occasionally causes a
 side panel to appear [r=mfinkle]

---
 mobile/chrome/content/browser-ui.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index 94addab12cee..d69f2a50a326 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -661,16 +661,22 @@ var BrowserUI = {
     // Make sure we're online before attempting to load
     Util.forceOnline();
 
-    // Give the new page lots of room
-    Browser.hideSidebars();
+    // Close the autocomplete panel and quickly update the urlbar value
     this.closeAutoComplete();
-
     this._edit.value = aURI;
 
     let postData = {};
     aURI = Browser.getShortcutOrURI(aURI, postData);
     Browser.loadURI(aURI, { flags: Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP, postData: postData });
 
+    // If a page goes from remote (about:blank) to local (about:home), fennec
+    // create a tab for the local page and then close the about:blank tab.
+    // If the newly created tab spawn a new column the sidebars position can
+    // be messed up. Hopefully, the viewable area should be maximized when a
+    // new page is opened, so a call to Browser.hideSidebars() fill this
+    // requirement and fix the sidebars position.
+    Browser.hideSidebars();
+
     // Delay doing the fixup so the raw URI is passed to loadURIWithFlags
     // and the proper third-party fixup can be done
     let fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_ALLOW_KEYWORD_LOOKUP;
@@ -922,9 +928,14 @@ var BrowserUI = {
           let { x: x1, y: y1 } = Browser.getScrollboxPosition(Browser.controlsScrollboxScroller);
           tabs.removeClosedTab();
 
-          let [,, leftWidth, rightWidth] = Browser.computeSidebarVisibility();
-          let delta = (oldLeftWidth - leftWidth) || (oldRightWidth - rightWidth);
-          x1 += (x1 == leftWidth) ? delta : -delta;
+          // If the tabs sidebar lives on the left side of the window, width
+          // variation should be taken into account to reposition the sidebars
+          if (tabs.getBoundingClientRect().left < 0) {
+            let [,, leftWidth, rightWidth] = Browser.computeSidebarVisibility();
+            let delta = (oldLeftWidth - leftWidth) || (oldRightWidth - rightWidth);
+            x1 += (x1 == leftWidth) ? delta : -delta;
+          }
+
           Browser.controlsScrollboxScroller.scrollTo(x1, 0);
           Browser.tryFloatToolbar(0, 0);
         }

From b962186b7c052798a27b896eafaa0408f8923705 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sat, 9 Apr 2011 10:22:02 -0700
Subject: [PATCH 096/314] Bug 514437 - Content part of the progress element.
 r=smaug

---
 content/html/content/public/nsIFormControl.h  |   3 +-
 content/html/content/src/Makefile.in          |   1 +
 .../html/content/src/nsGenericHTMLElement.cpp |   3 +-
 .../html/content/src/nsGenericHTMLElement.h   |   1 +
 .../content/src/nsHTMLFieldSetElement.cpp     |   3 +-
 .../html/content/src/nsHTMLFormElement.cpp    |   1 +
 .../content/src/nsHTMLProgressElement.cpp     | 227 ++++++++++++++++++
 dom/base/nsDOMClassInfo.cpp                   |   8 +
 dom/base/nsDOMClassInfoClasses.h              |   1 +
 dom/interfaces/html/Makefile.in               |   1 +
 .../html/nsIDOMHTMLProgressElement.idl        |  62 +++++
 .../libeditor/base/nsEditPropertyAtomList.h   |   1 +
 editor/libeditor/html/nsHTMLEditUtils.cpp     |   6 +-
 js/src/xpconnect/src/dom_quickstubs.qsconf    |   1 +
 parser/htmlparser/public/nsHTMLTagList.h      |   1 +
 parser/htmlparser/src/nsElementTable.cpp      |   9 +
 parser/htmlparser/src/nsHTMLTags.cpp          |   2 +
 17 files changed, 326 insertions(+), 5 deletions(-)
 create mode 100644 content/html/content/src/nsHTMLProgressElement.cpp
 create mode 100644 dom/interfaces/html/nsIDOMHTMLProgressElement.idl

diff --git a/content/html/content/public/nsIFormControl.h b/content/html/content/public/nsIFormControl.h
index 647157a6eed3..3e7a19d78efe 100644
--- a/content/html/content/public/nsIFormControl.h
+++ b/content/html/content/public/nsIFormControl.h
@@ -58,6 +58,7 @@ enum FormControlsTypes {
   NS_FORM_SELECT,
   NS_FORM_TEXTAREA,
   NS_FORM_OBJECT,
+  NS_FORM_PROGRESS,
   eFormControlsWithoutSubTypesMax,
   // After this, all types will have sub-types which introduce new enum lists.
   // eFormControlsWithoutSubTypesMax let us know if the previous types values
@@ -283,7 +284,7 @@ nsIFormControl::IsLabelableControl() const
          // type == NS_FORM_KEYGEN ||
          // type == NS_FORM_METER ||
          type == NS_FORM_OUTPUT ||
-         // type == NS_FORM_PROGRESS ||
+         type == NS_FORM_PROGRESS ||
          type == NS_FORM_SELECT ||
          type == NS_FORM_TEXTAREA;
 }
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
index e72e5b27eea7..6dacf0712324 100644
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -94,6 +94,7 @@ CPPSRCS		= \
 		nsHTMLOutputElement.cpp \
 		nsHTMLParagraphElement.cpp \
 		nsHTMLPreElement.cpp \
+		nsHTMLProgressElement.cpp \
 		nsHTMLScriptElement.cpp \
 		nsHTMLSelectElement.cpp \
 		nsHTMLSharedElement.cpp \
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index de962cd29c37..e10e8fd27aed 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -2732,7 +2732,8 @@ nsGenericHTMLFormElement::CanBeDisabled() const
   return
     type != NS_FORM_LABEL &&
     type != NS_FORM_OBJECT &&
-    type != NS_FORM_OUTPUT;
+    type != NS_FORM_OUTPUT &&
+    type != NS_FORM_PROGRESS;
 }
 
 PRBool
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h
index 9302eeac037d..a47b1e157aa5 100644
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -1578,6 +1578,7 @@ NS_DECLARE_NS_NEW_HTML_ELEMENT(Option)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Output)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Paragraph)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Pre)
+NS_DECLARE_NS_NEW_HTML_ELEMENT(Progress)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Script)
 NS_DECLARE_NS_NEW_HTML_ELEMENT(Select)
 #if defined(MOZ_MEDIA)
diff --git a/content/html/content/src/nsHTMLFieldSetElement.cpp b/content/html/content/src/nsHTMLFieldSetElement.cpp
index 9ec60636392b..30eb1f21b690 100644
--- a/content/html/content/src/nsHTMLFieldSetElement.cpp
+++ b/content/html/content/src/nsHTMLFieldSetElement.cpp
@@ -156,7 +156,8 @@ nsHTMLFieldSetElement::MatchListedElements(nsIContent* aContent, PRInt32 aNamesp
                                            nsIAtom* aAtom, void* aData)
 {
   nsCOMPtr<nsIFormControl> formControl = do_QueryInterface(aContent);
-  return formControl && formControl->GetType() != NS_FORM_LABEL;
+  return formControl && formControl->GetType() != NS_FORM_LABEL &&
+                        formControl->GetType() != NS_FORM_PROGRESS;
 }
 
 NS_IMETHODIMP
diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp
index bef6fa5d8304..600fa60fdee1 100644
--- a/content/html/content/src/nsHTMLFormElement.cpp
+++ b/content/html/content/src/nsHTMLFormElement.cpp
@@ -221,6 +221,7 @@ ShouldBeInElements(nsIFormControl* aFormControl)
   //
   // NS_FORM_INPUT_IMAGE
   // NS_FORM_LABEL
+  // NS_FORM_PROGRESS
 
   return PR_FALSE;
 }
diff --git a/content/html/content/src/nsHTMLProgressElement.cpp b/content/html/content/src/nsHTMLProgressElement.cpp
new file mode 100644
index 000000000000..191ca89acd69
--- /dev/null
+++ b/content/html/content/src/nsHTMLProgressElement.cpp
@@ -0,0 +1,227 @@
+/* -*- 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 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):
+ *   Mounir Lamouri <mounir.lamouri@mozilla.com> (original author)
+ *
+ * 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 ***** */
+
+#include "nsIDOMHTMLProgressElement.h"
+#include "nsGenericHTMLElement.h"
+#include "nsAttrValue.h"
+
+
+class nsHTMLProgressElement : public nsGenericHTMLFormElement,
+                              public nsIDOMHTMLProgressElement
+{
+public:
+  nsHTMLProgressElement(already_AddRefed<nsINodeInfo> aNodeInfo);
+  virtual ~nsHTMLProgressElement();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIDOMNode
+  NS_FORWARD_NSIDOMNODE(nsGenericHTMLFormElement::)
+
+  // nsIDOMElement
+  NS_FORWARD_NSIDOMELEMENT(nsGenericHTMLFormElement::)
+
+  // nsIDOMHTMLElement
+  NS_FORWARD_NSIDOMHTMLELEMENT(nsGenericHTMLFormElement::)
+
+  // nsIDOMHTMLProgressElement
+  NS_DECL_NSIDOMHTMLPROGRESSELEMENT
+
+  // nsIFormControl
+  NS_IMETHOD_(PRUint32) GetType() const { return NS_FORM_PROGRESS; }
+  NS_IMETHOD Reset();
+  NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
+
+  nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
+
+  PRBool ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute,
+                        const nsAString& aValue, nsAttrValue& aResult);
+
+  virtual nsXPCClassInfo* GetClassInfo();
+
+protected:
+  /**
+   * Returns whethem the progress element is in the indeterminate state.
+   * A progress element is in the indeterminate state if its value is ommited
+   * or is not a floating point number..
+   *
+   * @return whether the progress element is in the indeterminate state.
+   */
+  bool IsIndeterminate() const;
+
+  static const double kIndeterminatePosition;
+  static const double kDefaultValue;
+  static const double kDefaultMax;
+};
+
+const double nsHTMLProgressElement::kIndeterminatePosition = -1.0;
+const double nsHTMLProgressElement::kDefaultValue          =  0.0;
+const double nsHTMLProgressElement::kDefaultMax            =  1.0;
+
+NS_IMPL_NS_NEW_HTML_ELEMENT(Progress)
+
+
+nsHTMLProgressElement::nsHTMLProgressElement(already_AddRefed<nsINodeInfo> aNodeInfo)
+  : nsGenericHTMLFormElement(aNodeInfo)
+{
+}
+
+nsHTMLProgressElement::~nsHTMLProgressElement()
+{
+}
+
+NS_IMPL_ADDREF_INHERITED(nsHTMLProgressElement, nsGenericElement)
+NS_IMPL_RELEASE_INHERITED(nsHTMLProgressElement, nsGenericElement)
+
+DOMCI_NODE_DATA(HTMLProgressElement, nsHTMLProgressElement)
+
+NS_INTERFACE_TABLE_HEAD(nsHTMLProgressElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE1(nsHTMLProgressElement,
+                                   nsIDOMHTMLProgressElement)
+  NS_HTML_CONTENT_INTERFACE_TABLE_TO_MAP_SEGUE(nsHTMLProgressElement,
+                                               nsGenericHTMLFormElement)
+NS_HTML_CONTENT_INTERFACE_TABLE_TAIL_CLASSINFO(HTMLProgressElement)
+
+NS_IMPL_ELEMENT_CLONE(nsHTMLProgressElement)
+
+
+NS_IMETHODIMP
+nsHTMLProgressElement::Reset()
+{
+  // The progress element is not resettable.
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::SubmitNamesValues(nsFormSubmission* aFormSubmission)
+{
+  // The progress element is not submittable.
+  return NS_OK;
+}
+
+PRBool
+nsHTMLProgressElement::ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute,
+                                      const nsAString& aValue, nsAttrValue& aResult)
+{
+  if (aNamespaceID == kNameSpaceID_None) {
+    if (aAttribute == nsGkAtoms::value || aAttribute == nsGkAtoms::max) {
+      return aResult.ParseDoubleValue(aValue);
+    }
+  }
+
+  return nsGenericHTMLFormElement::ParseAttribute(aNamespaceID, aAttribute,
+                                                  aValue, aResult);
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::GetForm(nsIDOMHTMLFormElement** aForm)
+{
+  return nsGenericHTMLFormElement::GetForm(aForm);
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::GetValue(double* aValue)
+{
+  const nsAttrValue* attrValue = mAttrsAndChildren.GetAttr(nsGkAtoms::value);
+  if (!attrValue || attrValue->Type() != nsAttrValue::eDoubleValue ||
+      attrValue->GetDoubleValue() < 0.0) {
+    *aValue = kDefaultValue;
+    return NS_OK;
+  }
+
+  *aValue = attrValue->GetDoubleValue();
+
+  double max;
+  GetMax(&max);
+
+  *aValue = PR_MIN(*aValue, max);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::SetValue(double aValue)
+{
+  return SetDoubleAttr(nsGkAtoms::value, aValue);
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::GetMax(double* aValue)
+{
+  const nsAttrValue* attrMax = mAttrsAndChildren.GetAttr(nsGkAtoms::max);
+  if (attrMax && attrMax->Type() == nsAttrValue::eDoubleValue &&
+      attrMax->GetDoubleValue() > 0.0) {
+    *aValue = attrMax->GetDoubleValue();
+  } else {
+    *aValue = kDefaultMax;
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::SetMax(double aValue)
+{
+  return SetDoubleAttr(nsGkAtoms::max, aValue);
+}
+
+NS_IMETHODIMP
+nsHTMLProgressElement::GetPosition(double* aPosition)
+{
+  if (IsIndeterminate()) {
+    *aPosition = kIndeterminatePosition;
+    return NS_OK;
+  }
+
+  double value;
+  double max;
+  GetValue(&value);
+  GetMax(&max);
+
+  *aPosition = value / max;
+
+  return NS_OK;
+}
+
+bool
+nsHTMLProgressElement::IsIndeterminate() const
+{
+  const nsAttrValue* attrValue = mAttrsAndChildren.GetAttr(nsGkAtoms::value);
+  return !attrValue || attrValue->Type() != nsAttrValue::eDoubleValue;
+}
+
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 7bc26019f806..1c45745e7e79 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -300,6 +300,7 @@
 #include "nsIDOMHTMLParagraphElement.h"
 #include "nsIDOMHTMLParamElement.h"
 #include "nsIDOMHTMLPreElement.h"
+#include "nsIDOMHTMLProgressElement.h"
 #include "nsIDOMHTMLQuoteElement.h"
 #include "nsIDOMHTMLScriptElement.h"
 #include "nsIDOMHTMLStyleElement.h"
@@ -848,6 +849,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLPreElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(HTMLProgressElement, nsElementSH,
+                           ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLQuoteElement, nsElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(HTMLScriptElement, nsElementSH,
@@ -2873,6 +2876,11 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(HTMLProgressElement, nsIDOMHTMLProgressElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLProgressElement)
+    DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
   DOM_CLASSINFO_MAP_BEGIN(HTMLQuoteElement, nsIDOMHTMLQuoteElement)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHTMLQuoteElement)
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 21d07d1c06f5..881ea8287cc4 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -127,6 +127,7 @@ DOMCI_CLASS(HTMLOutputElement)
 DOMCI_CLASS(HTMLParagraphElement)
 DOMCI_CLASS(HTMLParamElement)
 DOMCI_CLASS(HTMLPreElement)
+DOMCI_CLASS(HTMLProgressElement)
 DOMCI_CLASS(HTMLQuoteElement)
 DOMCI_CLASS(HTMLScriptElement)
 DOMCI_CLASS(HTMLSelectElement)
diff --git a/dom/interfaces/html/Makefile.in b/dom/interfaces/html/Makefile.in
index 43ef30e35c9d..21e1249629b6 100644
--- a/dom/interfaces/html/Makefile.in
+++ b/dom/interfaces/html/Makefile.in
@@ -92,6 +92,7 @@ SDK_XPIDLSRCS =					\
 	nsIDOMHTMLParagraphElement.idl		\
 	nsIDOMHTMLParamElement.idl		\
 	nsIDOMHTMLPreElement.idl		\
+	nsIDOMHTMLProgressElement.idl		\
 	nsIDOMHTMLQuoteElement.idl		\
 	nsIDOMHTMLScriptElement.idl		\
 	nsIDOMHTMLSelectElement.idl		\
diff --git a/dom/interfaces/html/nsIDOMHTMLProgressElement.idl b/dom/interfaces/html/nsIDOMHTMLProgressElement.idl
new file mode 100644
index 000000000000..dcf8cf5ced75
--- /dev/null
+++ b/dom/interfaces/html/nsIDOMHTMLProgressElement.idl
@@ -0,0 +1,62 @@
+/* -*- Mode: IDL; 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 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):
+ *   Mounir Lamouri <mounir.lamouri@mozilla.com> (original author)
+ *
+ * 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 ***** */
+
+#include "nsIDOMHTMLElement.idl"
+
+/**
+ * The nsIDOMHTMLProgressElement interface is the interface to a HTML
+ * <progress> element.
+ *
+ * For more information on this interface, please see
+ * http://www.whatwg.org/specs/web-apps/current-work/#the-progress-element
+ *
+ * @status UNDER_DEVELOPMENT
+ */
+
+[scriptable, uuid(d14250f5-3176-4244-8085-1d0a532ce44c)]
+interface nsIDOMHTMLProgressElement : nsIDOMHTMLElement
+{
+           attribute double value;
+           attribute double max;
+  readonly attribute double position;
+  readonly attribute nsIDOMHTMLFormElement form;
+  /**
+   * The labels attribute will be done with bug 567740.
+   */
+  //readonly attribute NodeList labels;
+};
+
diff --git a/editor/libeditor/base/nsEditPropertyAtomList.h b/editor/libeditor/base/nsEditPropertyAtomList.h
index 491b75843a9e..adbbbfe833fb 100644
--- a/editor/libeditor/base/nsEditPropertyAtomList.h
+++ b/editor/libeditor/base/nsEditPropertyAtomList.h
@@ -157,6 +157,7 @@ EDITOR_ATOM(ol, "ol")
 EDITOR_ATOM(output, "output")
 EDITOR_ATOM(p, "p")
 EDITOR_ATOM(pre, "pre")
+EDITOR_ATOM(progress, "progress")
 EDITOR_ATOM(q, "q")
 EDITOR_ATOM(samp, "samp")
 EDITOR_ATOM(script, "script")
diff --git a/editor/libeditor/html/nsHTMLEditUtils.cpp b/editor/libeditor/html/nsHTMLEditUtils.cpp
index 702d03395a67..18edcdf06fa1 100644
--- a/editor/libeditor/html/nsHTMLEditUtils.cpp
+++ b/editor/libeditor/html/nsHTMLEditUtils.cpp
@@ -433,6 +433,7 @@ nsHTMLEditUtils::IsFormWidget(nsIDOMNode *node)
       || (nodeAtom == nsEditProperty::button)
       || (nodeAtom == nsEditProperty::output)
       || (nodeAtom == nsEditProperty::keygen)
+      || (nodeAtom == nsEditProperty::progress)
       || (nodeAtom == nsEditProperty::input);
 }
 
@@ -484,8 +485,8 @@ nsHTMLEditUtils::SupportsAlignAttr(nsIDOMNode * aNode)
 // strong, var
 #define GROUP_PHRASE           (1 << 4)
 
-// a, applet, basefont, bdo, br, font, iframe, img, map, object, output, q,
-// script, span, sub, sup
+// a, applet, basefont, bdo, br, font, iframe, img, map, object, output,
+// progress, q, script, span, sub, sup
 #define GROUP_SPECIAL          (1 << 5)
 
 // button, form, input, label, select, textarea
@@ -683,6 +684,7 @@ static const nsElementInfo kElements[eHTMLTag_userdefined] = {
   ELEM(param, PR_FALSE, PR_FALSE, GROUP_OBJECT_CONTENT, GROUP_NONE),
   ELEM(plaintext, PR_FALSE, PR_FALSE, GROUP_NONE, GROUP_NONE),
   ELEM(pre, PR_TRUE, PR_TRUE, GROUP_BLOCK, GROUP_INLINE_ELEMENT),
+  ELEM(progress, PR_TRUE, PR_FALSE, GROUP_SPECIAL, GROUP_FLOW_ELEMENT),
   ELEM(q, PR_TRUE, PR_TRUE, GROUP_SPECIAL, GROUP_INLINE_ELEMENT),
   ELEM(s, PR_TRUE, PR_TRUE, GROUP_FONTSTYLE, GROUP_INLINE_ELEMENT),
   ELEM(samp, PR_TRUE, PR_TRUE, GROUP_PHRASE, GROUP_INLINE_ELEMENT),
diff --git a/js/src/xpconnect/src/dom_quickstubs.qsconf b/js/src/xpconnect/src/dom_quickstubs.qsconf
index cbae578eccbf..bc77957ac0ad 100644
--- a/js/src/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/src/xpconnect/src/dom_quickstubs.qsconf
@@ -286,6 +286,7 @@ members = [
     'nsIDOMHTMLOptionElement.disabled',
     'nsIDOMHTMLOptionsCollection.item',
     'nsIDOMHTMLOptionsCollection.length',
+    'nsIDOMHTMLProgressElement.*',
     'nsIDOMHTMLSelectElement.name',
     'nsIDOMHTMLSelectElement.form',
     'nsIDOMHTMLSelectElement.add',
diff --git a/parser/htmlparser/public/nsHTMLTagList.h b/parser/htmlparser/public/nsHTMLTagList.h
index 0a78c53c3028..898edf1615c1 100644
--- a/parser/htmlparser/public/nsHTMLTagList.h
+++ b/parser/htmlparser/public/nsHTMLTagList.h
@@ -157,6 +157,7 @@ HTML_TAG(p, Paragraph)
 HTML_TAG(param, Shared)
 HTML_HTMLELEMENT_TAG(plaintext)
 HTML_TAG(pre, Pre)
+HTML_TAG(progress, Progress)
 HTML_TAG(q, Shared)
 HTML_HTMLELEMENT_TAG(s)
 HTML_HTMLELEMENT_TAG(samp)
diff --git a/parser/htmlparser/src/nsElementTable.cpp b/parser/htmlparser/src/nsElementTable.cpp
index b1082768ca63..b01a4944785b 100644
--- a/parser/htmlparser/src/nsElementTable.cpp
+++ b/parser/htmlparser/src/nsElementTable.cpp
@@ -1009,6 +1009,15 @@ const nsHTMLElement gHTMLElements[] = {
     /*special props, prop-range*/       kRequiresBody, kDefaultPropRange,
     /*special parents,kids*/            0,&gPreKids,
   },
+  {
+    /*tag*/                             eHTMLTag_progress,
+    /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
+    /*rootnodes,endrootnodes*/          &gRootTags,&gRootTags,
+    /*autoclose starttags and endtags*/ 0,0,0,0,
+    /*parent,incl,exclgroups*/          kFormControl, kFlowEntity, kNone,
+    /*special props, prop-range*/       0,kDefaultPropRange,
+    /*special parents,kids*/            0,0,
+  },
   {
     /*tag*/                             eHTMLTag_q,
     /*req-parent excl-parent*/          eHTMLTag_unknown,eHTMLTag_unknown,
diff --git a/parser/htmlparser/src/nsHTMLTags.cpp b/parser/htmlparser/src/nsHTMLTags.cpp
index a99bba412e30..0ed6b74154f0 100644
--- a/parser/htmlparser/src/nsHTMLTags.cpp
+++ b/parser/htmlparser/src/nsHTMLTags.cpp
@@ -229,6 +229,8 @@ static const PRUnichar sHTMLTagUnicodeName_plaintext[] =
   {'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_pre[] =
   {'p', 'r', 'e', '\0'};
+static const PRUnichar sHTMLTagUnicodeName_progress[] =
+  {'p', 'r', 'o', 'g', 'r', 'e', 's', 's', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_q[] =
   {'q', '\0'};
 static const PRUnichar sHTMLTagUnicodeName_s[] =

From 8062f8349d9d6c0974b46eaffb5c8ccce7e52ed1 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 20 Apr 2011 13:05:59 +0200
Subject: [PATCH 097/314] Bug 514437 - Tests for progress element (content
 part). r=smaug

---
 content/html/content/test/Makefile.in         |   1 +
 content/html/content/test/test_bug514437.html | 277 ++++++++++++++++++
 .../html/content/test/test_bug588683-1.html   |   3 +-
 3 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 content/html/content/test/test_bug514437.html

diff --git a/content/html/content/test/Makefile.in b/content/html/content/test/Makefile.in
index 713d1ccd52cc..b913716ad95b 100644
--- a/content/html/content/test/Makefile.in
+++ b/content/html/content/test/Makefile.in
@@ -262,6 +262,7 @@ _TEST_FILES = \
 		test_bug641219.html \
 		test_bug643051.html \
 		test_bug583514.html \
+		test_bug514437.html \
 		$(NULL)
 
 libs:: $(_TEST_FILES)
diff --git a/content/html/content/test/test_bug514437.html b/content/html/content/test/test_bug514437.html
new file mode 100644
index 000000000000..bd4ca0440eb5
--- /dev/null
+++ b/content/html/content/test/test_bug514437.html
@@ -0,0 +1,277 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=514437
+-->
+<head>
+  <title>Test for Bug 514437</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=514437">Mozilla Bug 514437</a>
+<p id="display"></p>
+<iframe name="submit_frame" onload="onFormSubmission();" style="visibility: hidden;"></iframe>
+<div id="content" style="visibility: hidden;">
+  <form id='f' method='get' target='submit_frame' action='foo'>
+    <progress id='p'></progress>
+  </form>
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 514437 **/
+
+function checkFormIDLAttribute(aElement)
+{
+  var form = document.forms[0];
+  var content = document.getElementById('content');
+  is(aElement.form, form, "The form IDL attribute should be the parent form");
+
+  content.removeChild(form);
+  content.appendChild(aElement);
+  is(aElement.form, null, "The form IDL attribute should be null");
+
+  // Cleaning-up.
+  content.appendChild(form);
+  form.appendChild(aElement);
+}
+
+function checkAttribute(aElement, aAttribute, aNewValue, aExpectedValueForIDL)
+{
+  var expectedValueForIDL = aNewValue;
+  var expectedValueForContent = aNewValue;
+
+  if (aExpectedValueForIDL !== undefined) {
+    expectedValueForIDL = aExpectedValueForIDL;
+  }
+
+  if (aNewValue != null) {
+    aElement.setAttribute(aAttribute, aNewValue);
+    is(aElement.getAttribute(aAttribute), expectedValueForContent,
+       aAttribute + " content attribute should be " + expectedValueForContent);
+    is(aElement[aAttribute], expectedValueForIDL,
+       aAttribute + " IDL attribute should be " + expectedValueForIDL);
+
+    if (parseFloat(aNewValue) == aNewValue) {
+      aElement[aAttribute] = aNewValue;
+      is(aElement.getAttribute(aAttribute), expectedValueForContent,
+         aAttribute + " content attribute should be " + expectedValueForContent);
+      is(aElement[aAttribute], parseFloat(expectedValueForIDL),
+         aAttribute + " IDL attribute should be " + parseFloat(expectedValueForIDL));
+    }
+  } else {
+    aElement.removeAttribute(aAttribute);
+    is(aElement.getAttribute(aAttribute), expectedValueForContent,
+       aAttribute + " content attribute should be " + expectedValueForContent);
+    is(aElement[aAttribute], expectedValueForIDL,
+       aAttribute + " IDL attribute should be " + expectedValueForIDL);
+  }
+}
+
+function checkValueAttribute()
+{
+  var tests = [
+    // value has to be a valid float, its default value is 0.0 otherwise.
+    [ null, 0.0 ],
+    [ 'fo', 0.0 ],
+    // If value < 0.0, 0.0 is used instead.
+    [ -1.0, 0.0 ],
+    // If value >= max, max is used instead (max default value is 1.0).
+    [  2.0, 1.0 ],
+    [  1.0, 0.5, 0.5 ],
+    [  10.0, 5.0, 5.0 ],
+    [ 13.37, 13.37, 42.0 ],
+    // Regular reflection.
+    [  0.0 ],
+    [  0.5 ],
+    [  1.0 ],
+    // Check double-precision value.
+    [  0.234567898765432 ],
+  ];
+
+  var element = document.createElement('progress');
+
+  for each(var test in tests) {
+    if (test[2]) {
+      element.setAttribute('max', test[2]);
+    }
+
+    checkAttribute(element, 'value', test[0], test[1]);
+
+    element.removeAttribute('max');
+  }
+}
+
+function checkMaxAttribute()
+{
+  var tests = [
+    // max default value is 1.0.
+    [ null, 1.0 ],
+    // If value <= 0.0, 1.0 is used instead.
+    [  0.0, 1.0 ],
+    [ -1.0, 1.0 ],
+    // Regular reflection.
+    [  0.5 ],
+    [  1.0 ],
+    [  2.0 ],
+    // Check double-precision value.
+    [  0.234567898765432 ],
+  ];
+
+  var element = document.createElement('progress');
+
+  for each(var test in tests) {
+    checkAttribute(element, 'max', test[0], test[1]);
+  }
+}
+
+function checkPositionAttribute()
+{
+  function checkPositionValue(aElement, aValue, aMax, aExpected) {
+    if (aValue != null) {
+      aElement.setAttribute('value', aValue);
+    } else {
+      aElement.removeAttribute('value');
+    }
+
+    if (aMax != null) {
+      aElement.setAttribute('max', aMax);
+    } else {
+      aElement.removeAttribute('max');
+    }
+
+    is(aElement.position, aExpected, "position IDL attribute should be " + aExpected);
+  }
+
+  var tests = [
+    // value has to be defined (indeterminate state).
+    [ null, null, -1.0 ],
+    [ null,  1.0, -1.0 ],
+    // value has to be defined to a valid float (indeterminate state).
+    [ 'foo', 1.0, -1.0 ],
+    // If value < 0.0, 0.0 is used instead.
+    [ -1.0,  1.0,  0.0 ],
+    // If value >= max, max is used instead.
+    [  2.0,  1.0,  1.0 ],
+    // If max isn't present, max is set to 1.0.
+    [ 1.0,  null,  1.0 ],
+    // If max isn't a valid float, max is set to 1.0.
+    [ 1.0, 'foo',  1.0 ],
+    // If max isn't > 0, max is set to 1.0.
+    [ 1.0,  -1.0,  1.0 ],
+    // A few simple and valid values.
+    [ 0.0,   1.0,  0.0 ],
+    [ 0.1,   1.0,  0.1/1.0  ],
+    [ 0.1,   2.0,  0.1/2.0  ],
+    [  10,    50,  10/50 ],
+    // Values implying .position is a double.
+    [ 1.0,   3.0,  1.0/3.0 ],
+    [ 0.1,   0.7,  0.1/0.7  ],
+  ];
+
+  var element = document.createElement('progress');
+
+  for each(var test in tests) {
+    checkPositionValue(element, test[0], test[1], test[2], test[3]);
+  }
+}
+
+function checkFormListedElement(aElement)
+{
+  is(document.forms[0].elements.length, 0, "the form should have no element");
+}
+
+function checkLabelable(aElement)
+{
+  var content = document.getElementById('content');
+  var label = document.createElement('label');
+
+  content.appendChild(label);
+  label.appendChild(aElement);
+  is(label.control, aElement, "progress should be labelable");
+
+  // Cleaning-up.
+  content.removeChild(label);
+  content.appendChild(aElement);
+}
+
+function checkNotResetableAndFormSubmission(aElement)
+{
+  // Creating an input element to check the submission worked.
+  var form = document.forms[0];
+  var input = document.createElement('input');
+
+  input.name = 'a';
+  input.value = 'tulip';
+  form.appendChild(input);
+
+  // Setting values.
+  aElement.value = 42.0;
+  aElement.max = 100.0;
+
+  // This is going to call onFormSubmission().
+  form.submit();
+}
+
+function onFormSubmission()
+{
+  /**
+   * All elements values have been set just before the submission.
+   * The input element value should be in the submit url but the progress
+   * element value should not appear.
+   */
+  is(frames['submit_frame'].location.href,
+    'http://mochi.test:8888/tests/content/html/content/test/foo?a=tulip',
+     "The progress element value should not be submitted");
+
+  checkNotResetable();
+}
+
+function checkNotResetable()
+{
+  // Try to reset the form.
+  var form = document.forms[0];
+  var element = document.getElementById('p');
+
+  element.value = 3.0;
+  element.max = 42.0;
+
+  form.reset();
+
+  SimpleTest.executeSoon(function() {
+    is(element.value, 3.0, "progress.value should not have changed");
+    is(element.max, 42.0, "progress.max should not have changed");
+
+    SimpleTest.finish();
+  });
+}
+
+SimpleTest.waitForExplicitFinish();
+
+var p = document.getElementById('p');
+
+ok(p instanceof HTMLProgressElement,
+   "The progress element should be instance of HTMLProgressElement");
+is(p.constructor, HTMLProgressElement,
+   "The progress element constructor should be HTMLProgressElement");
+
+checkFormIDLAttribute(p);
+
+checkValueAttribute();
+
+checkMaxAttribute();
+
+checkPositionAttribute();
+
+checkFormListedElement(p);
+
+checkLabelable(p);
+
+checkNotResetableAndFormSubmission(p);
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/content/html/content/test/test_bug588683-1.html b/content/html/content/test/test_bug588683-1.html
index 0cbdd8162b11..44f7977bc7f5 100644
--- a/content/html/content/test/test_bug588683-1.html
+++ b/content/html/content/test/test_bug588683-1.html
@@ -401,13 +401,12 @@ var forms = [
 
 var elementNames = [
   'button', 'fieldset', 'input', 'label', 'object', 'output', 'select',
-  'textarea',
+  'textarea', 'progress',
 ];
 
 var todoElements = [
   ['keygen', 'Keygen'],
   ['meter', 'Meter'],
-  ['progress', 'Progress'],
 ];
 
 for each(var e in todoElements) {

From 75a14a114e59c7e269a5b3ab64e1722ff6d9045d Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sat, 7 May 2011 10:15:14 +0200
Subject: [PATCH 098/314] Bug 567872 - Layout part of the progress element.
 r=roc,dbaron

---
 layout/base/nsCSSFrameConstructor.cpp         |   3 +-
 layout/forms/Makefile.in                      |   1 +
 layout/forms/nsProgressFrame.cpp              | 241 ++++++++++++++++++
 layout/forms/nsProgressFrame.h                | 107 ++++++++
 layout/generic/nsHTMLParts.h                  |   2 +
 layout/generic/nsQueryFrame.h                 |   1 +
 .../forms/progress/margin-padding-ref.html    |  88 +++++++
 .../forms/progress/margin-padding.html        |  39 +++
 layout/reftests/forms/progress/reftest.list   |   9 +
 layout/reftests/forms/progress/style.css      |  26 ++
 .../forms/progress/transformations-ref.html   |  78 ++++++
 .../forms/progress/transformations.html       |  35 +++
 .../reftests/forms/progress/values-ref.html   |  58 +++++
 .../forms/progress/values-rtl-ref.html        |  58 +++++
 .../reftests/forms/progress/values-rtl.html   |  15 ++
 layout/reftests/forms/progress/values.html    |  15 ++
 layout/reftests/forms/reftest.list            |   3 +
 layout/style/forms.css                        |  25 ++
 layout/style/html.css                         |  81 ++++--
 19 files changed, 865 insertions(+), 20 deletions(-)
 create mode 100644 layout/forms/nsProgressFrame.cpp
 create mode 100644 layout/forms/nsProgressFrame.h
 create mode 100644 layout/reftests/forms/progress/margin-padding-ref.html
 create mode 100644 layout/reftests/forms/progress/margin-padding.html
 create mode 100644 layout/reftests/forms/progress/reftest.list
 create mode 100644 layout/reftests/forms/progress/style.css
 create mode 100644 layout/reftests/forms/progress/transformations-ref.html
 create mode 100644 layout/reftests/forms/progress/transformations.html
 create mode 100644 layout/reftests/forms/progress/values-ref.html
 create mode 100644 layout/reftests/forms/progress/values-rtl-ref.html
 create mode 100644 layout/reftests/forms/progress/values-rtl.html
 create mode 100644 layout/reftests/forms/progress/values.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index af1aa23f1f5b..769aec2e73ab 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -3548,7 +3548,8 @@ nsCSSFrameConstructor::FindHTMLData(Element* aElement,
     SIMPLE_TAG_CREATE(video, NS_NewHTMLVideoFrame),
     SIMPLE_TAG_CREATE(audio, NS_NewHTMLVideoFrame),
 #endif
-    SIMPLE_TAG_CREATE(isindex, NS_NewIsIndexFrame)
+    SIMPLE_TAG_CREATE(isindex, NS_NewIsIndexFrame),
+    SIMPLE_TAG_CREATE(progress, NS_NewProgressFrame)
   };
 
   return FindDataByTag(aTag, aElement, aStyleContext, sHTMLData,
diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in
index 78a28ef46f98..6fb5c1f07976 100644
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -72,6 +72,7 @@ CPPSRCS		= \
 		nsGfxButtonControlFrame.cpp \
 		nsGfxCheckboxControlFrame.cpp \
 		nsGfxRadioControlFrame.cpp \
+		nsProgressFrame.cpp \
 		nsTextControlFrame.cpp \
 		nsHTMLButtonControlFrame.cpp \
 		nsImageControlFrame.cpp \
diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
new file mode 100644
index 000000000000..b33362258959
--- /dev/null
+++ b/layout/forms/nsProgressFrame.cpp
@@ -0,0 +1,241 @@
+/* -*- 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 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):
+ *   Mounir Lamouri <mounir.lamouri@mozilla.com> (original author)
+ *
+ * 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 ***** */
+
+#include "nsProgressFrame.h"
+
+#include "nsIDOMHTMLProgressElement.h"
+#include "nsIContent.h"
+#include "prtypes.h"
+#include "nsPresContext.h"
+#include "nsGkAtoms.h"
+#include "nsINameSpaceManager.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsNodeInfoManager.h"
+#include "nsINodeInfo.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsContentUtils.h"
+#include "nsFormControlFrame.h"
+#include "nsFontMetrics.h"
+
+
+nsIFrame*
+NS_NewProgressFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
+{
+  return new (aPresShell) nsProgressFrame(aContext);
+}
+
+NS_IMPL_FRAMEARENA_HELPERS(nsProgressFrame)
+
+nsProgressFrame::nsProgressFrame(nsStyleContext* aContext)
+  : nsHTMLContainerFrame(aContext)
+  , mBarDiv(nsnull)
+{
+}
+
+nsProgressFrame::~nsProgressFrame()
+{
+}
+
+void
+nsProgressFrame::DestroyFrom(nsIFrame* aDestructRoot)
+{
+  NS_ASSERTION(!GetPrevContinuation(),
+               "nsProgressFrame should not have continuations; if it does we "
+               "need to call RegUnregAccessKey only for the first.");
+  nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), PR_FALSE);
+  nsContentUtils::DestroyAnonymousContent(&mBarDiv);
+  nsHTMLContainerFrame::DestroyFrom(aDestructRoot);
+}
+
+nsresult
+nsProgressFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+{
+  // Get the NodeInfoManager and tag necessary to create the progress bar div.
+  nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
+
+  nsCOMPtr<nsINodeInfo> nodeInfo;
+  nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nsnull,
+                                                 kNameSpaceID_XHTML);
+  NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
+
+  // Create the div.
+  nsresult rv = NS_NewHTMLElement(getter_AddRefs(mBarDiv), nodeInfo.forget(),
+                                  mozilla::dom::NOT_FROM_PARSER);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  if (!aElements.AppendElement(mBarDiv)) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return NS_OK;
+}
+
+void
+nsProgressFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
+                                          PRUint32 aFilter)
+{
+  aElements.MaybeAppendElement(mBarDiv);
+}
+
+NS_QUERYFRAME_HEAD(nsProgressFrame)
+  NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
+NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
+
+
+NS_IMETHODIMP nsProgressFrame::Reflow(nsPresContext*           aPresContext,
+                                      nsHTMLReflowMetrics&     aDesiredSize,
+                                      const nsHTMLReflowState& aReflowState,
+                                      nsReflowStatus&          aStatus)
+{
+  DO_GLOBAL_REFLOW_COUNT("nsProgressFrame");
+  DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
+
+  NS_ASSERTION(mBarDiv, "Progress bar div must exist!");
+  NS_ASSERTION(!GetPrevContinuation(),
+               "nsProgressFrame should not have continuations; if it does we "
+               "need to call RegUnregAccessKey only for the first.");
+
+  if (mState & NS_FRAME_FIRST_REFLOW) {
+    nsFormControlFrame::RegUnRegAccessKey(this, PR_TRUE);
+  }
+
+  nsIFrame* barFrame = mBarDiv->GetPrimaryFrame();
+  NS_ASSERTION(barFrame, "The progress frame should have a child with a frame!");
+
+  ReflowBarFrame(barFrame, aPresContext, aReflowState, aStatus);
+
+  aDesiredSize.width = aReflowState.ComputedWidth() +
+                       aReflowState.mComputedBorderPadding.LeftRight();
+  aDesiredSize.height = aReflowState.ComputedHeight() +
+                        aReflowState.mComputedBorderPadding.TopBottom();
+  aDesiredSize.height = NS_CSS_MINMAX(aDesiredSize.height,
+                                      aReflowState.mComputedMinHeight,
+                                      aReflowState.mComputedMaxHeight);
+
+  aDesiredSize.SetOverflowAreasToDesiredBounds();
+  ConsiderChildOverflow(aDesiredSize.mOverflowAreas, barFrame);
+  FinishAndStoreOverflow(&aDesiredSize);
+
+  aStatus = NS_FRAME_COMPLETE;
+
+  NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
+
+  return NS_OK;
+}
+
+void
+nsProgressFrame::ReflowBarFrame(nsIFrame*                aBarFrame,
+                                nsPresContext*           aPresContext,
+                                const nsHTMLReflowState& aReflowState,
+                                nsReflowStatus&          aStatus)
+{
+  nsHTMLReflowState reflowState(aPresContext, aReflowState, aBarFrame,
+                                nsSize(aReflowState.ComputedWidth(),
+                                       NS_UNCONSTRAINEDSIZE));
+  nscoord width = aReflowState.ComputedWidth();
+  nscoord xoffset = aReflowState.mComputedBorderPadding.left;
+  nscoord yoffset = aReflowState.mComputedBorderPadding.top;
+
+  double position;
+  nsCOMPtr<nsIDOMHTMLProgressElement> progressElement =
+    do_QueryInterface(mContent);
+  progressElement->GetPosition(&position);
+
+  // Force the bar's width to match the current progress.
+  // When indeterminate, the progress' width will be 100%.
+  if (position >= 0.0) {
+    width *= position;
+  }
+
+  if (GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
+    xoffset += aReflowState.ComputedWidth() - width;
+  }
+
+  // We want the frame to take all the available size.
+  width -= reflowState.mComputedMargin.LeftRight() +
+           reflowState.mComputedBorderPadding.LeftRight();
+  width = NS_MAX(width, 0);
+  reflowState.SetComputedWidth(width);
+
+  xoffset += reflowState.mComputedMargin.left;
+  yoffset += reflowState.mComputedMargin.top;
+
+  nsHTMLReflowMetrics barDesiredSize;
+  ReflowChild(aBarFrame, aPresContext, barDesiredSize, reflowState, xoffset,
+              yoffset, 0, aStatus);
+  FinishReflowChild(aBarFrame, aPresContext, &reflowState, barDesiredSize,
+                    xoffset, yoffset, 0);
+}
+
+NS_IMETHODIMP
+nsProgressFrame::AttributeChanged(PRInt32  aNameSpaceID,
+                                  nsIAtom* aAttribute,
+                                  PRInt32  aModType)
+{
+  NS_ASSERTION(mBarDiv, "Progress bar div must exist!");
+
+  if (aNameSpaceID == kNameSpaceID_None &&
+      (aAttribute == nsGkAtoms::value || aAttribute == nsGkAtoms::max)) {
+    nsIFrame* barFrame = mBarDiv->GetPrimaryFrame();
+    NS_ASSERTION(barFrame, "The progress frame should have a child with a frame!");
+    PresContext()->PresShell()->FrameNeedsReflow(barFrame, nsIPresShell::eResize,
+                                                 NS_FRAME_IS_DIRTY);
+  }
+
+  return nsHTMLContainerFrame::AttributeChanged(aNameSpaceID, aAttribute,
+                                                aModType);
+}
+
+nsSize
+nsProgressFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
+                                 nsSize aCBSize, nscoord aAvailableWidth,
+                                 nsSize aMargin, nsSize aBorder,
+                                 nsSize aPadding, PRBool aShrinkWrap)
+{
+  nsRefPtr<nsFontMetrics> fontMet;
+  NS_ENSURE_SUCCESS(nsLayoutUtils::GetFontMetricsForFrame(this,
+                                                          getter_AddRefs(fontMet)),
+                    nsSize(0, 0));
+
+  nsSize autoSize;
+  autoSize.height = autoSize.width = fontMet->Font().size; // 1em
+  autoSize.width *= 10; // 10em
+
+  return autoSize;
+}
+
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
new file mode 100644
index 000000000000..0d6e524e09b4
--- /dev/null
+++ b/layout/forms/nsProgressFrame.h
@@ -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 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):
+ *   Mounir Lamouri <mounir.lamouri@mozilla.com> (original author)
+ *
+ * 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 ***** */
+
+#ifndef nsProgressFrame_h___
+#define nsProgressFrame_h___
+
+#include "nsHTMLContainerFrame.h"
+#include "nsIAnonymousContentCreator.h"
+#include "nsCOMPtr.h"
+
+
+class nsProgressFrame : public nsHTMLContainerFrame,
+                        public nsIAnonymousContentCreator
+{
+public:
+  NS_DECL_QUERYFRAME_TARGET(nsProgressFrame)
+  NS_DECL_QUERYFRAME
+  NS_DECL_FRAMEARENA_HELPERS
+
+  nsProgressFrame(nsStyleContext* aContext);
+  virtual ~nsProgressFrame();
+
+  virtual void DestroyFrom(nsIFrame* aDestructRoot);
+
+  NS_IMETHOD Reflow(nsPresContext*           aCX,
+                    nsHTMLReflowMetrics&     aDesiredSize,
+                    const nsHTMLReflowState& aReflowState,
+                    nsReflowStatus&          aStatus);
+
+#ifdef NS_DEBUG
+  NS_IMETHOD GetFrameName(nsAString& aResult) const {
+    return MakeFrameName(NS_LITERAL_STRING("Progress"), aResult);
+  }
+#endif
+
+  virtual PRBool IsLeaf() const { return PR_TRUE; }
+
+  // nsIAnonymousContentCreator
+  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
+                                        PRUint32 aFilter);
+
+  NS_IMETHOD AttributeChanged(PRInt32  aNameSpaceID,
+                              nsIAtom* aAttribute,
+                              PRInt32  aModType);
+
+  virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
+                                 nsSize aCBSize, nscoord aAvailableWidth,
+                                 nsSize aMargin, nsSize aBorder,
+                                 nsSize aPadding, PRBool aShrinkWrap);
+
+  virtual PRBool IsFrameOfType(PRUint32 aFlags) const
+  {
+    return nsHTMLContainerFrame::IsFrameOfType(aFlags &
+      ~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
+  }
+
+protected:
+  // Helper function which reflow the anonymous div frame.
+  void ReflowBarFrame(nsIFrame*                aBarFrame,
+                      nsPresContext*           aPresContext,
+                      const nsHTMLReflowState& aReflowState,
+                      nsReflowStatus&          aStatus);
+
+  /**
+   * The div used to show the progress bar.
+   * @see nsProgressFrame::CreateAnonymousContent
+   */
+  nsCOMPtr<nsIContent> mBarDiv;
+};
+
+#endif
+
diff --git a/layout/generic/nsHTMLParts.h b/layout/generic/nsHTMLParts.h
index 56f323a8c0a5..4428c865d3fd 100644
--- a/layout/generic/nsHTMLParts.h
+++ b/layout/generic/nsHTMLParts.h
@@ -204,6 +204,8 @@ nsIFrame*
 NS_NewComboboxControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, PRUint32 aFlags);
 nsIFrame*
 NS_NewIsIndexFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
+nsIFrame*
+NS_NewProgressFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
 
 // Table frame factories
 nsIFrame*
diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h
index e474daa9a132..e88fcdf919e9 100644
--- a/layout/generic/nsQueryFrame.h
+++ b/layout/generic/nsQueryFrame.h
@@ -185,6 +185,7 @@ public:
     nsPageFrame_id,
     nsPlaceholderFrame_id,
     nsPopupSetFrame_id,
+    nsProgressFrame_id,
     nsProgressMeterFrame_id,
     nsResizerFrame_id,
     nsRootBoxFrame_id,
diff --git a/layout/reftests/forms/progress/margin-padding-ref.html b/layout/reftests/forms/progress/margin-padding-ref.html
new file mode 100644
index 000000000000..33f35c306c79
--- /dev/null
+++ b/layout/reftests/forms/progress/margin-padding-ref.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > div:nth-child(1) { margin: 10px; padding: 0px; }
+    body > div:nth-child(2) { margin: 0px; padding: 10px; }
+    body > div:nth-child(3) { margin: 10px; padding: 10px; }
+    body > div:nth-child(4) { margin: 5px; padding: 5px; }
+    body > div:nth-child(5) { margin: 50px; padding: 50px; }
+    body > div:nth-child(6) { margin: 100px; padding: 100px; }
+    body > div:nth-child(7) { margin: 10px 0px 0px 0px; padding: 0px; }
+    body > div:nth-child(8) { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > div:nth-child(9) { margin: 0px 0px 10px 0px; padding: 0px; }
+    body > div:nth-child(10) { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > div:nth-child(11) { margin: 0px; padding: 10px 0px 0px 0px; }
+    body > div:nth-child(12) { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > div:nth-child(13) { margin: 0px; padding: 0px 0px 10px 0px; }
+    body > div:nth-child(14) { margin: 0px; padding: 0px 0px 0px 10px; }
+    body > div:nth-child(15) { margin: 0px; padding: 2px 4px 6px 8px; }
+    body > div:nth-child(16) { margin: 2px 4px 6px 8px; padding: 0px; }
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/margin-padding.html b/layout/reftests/forms/progress/margin-padding.html
new file mode 100644
index 000000000000..6674425d1b84
--- /dev/null
+++ b/layout/reftests/forms/progress/margin-padding.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <style>
+    progress:nth-child(1) { margin: 10px; padding: 0px; }
+    progress:nth-child(2) { margin: 0px; padding: 10px; }
+    progress:nth-child(3) { margin: 10px; padding: 10px; }
+    progress:nth-child(4) { margin: 5px; padding: 5px; }
+    progress:nth-child(5) { margin: 50px; padding: 50px; }
+    progress:nth-child(6) { margin: 100px; padding: 100px; }
+    progress:nth-child(7) { margin: 10px 0px 0px 0px; padding: 0px; }
+    progress:nth-child(8) { margin: 0px 10px 0px 0px; padding: 0px; }
+    progress:nth-child(9) { margin: 0px 0px 10px 0px; padding: 0px; }
+    progress:nth-child(10) { margin: 0px 0px 0px 10px; padding: 0px; }
+    progress:nth-child(11) { margin: 0px; padding: 10px 0px 0px 0px; }
+    progress:nth-child(12) { margin: 0px; padding: 0px 10px 0px 0px; }
+    progress:nth-child(13) { margin: 0px; padding: 0px 0px 10px 0px; }
+    progress:nth-child(14) { margin: 0px; padding: 0px 0px 0px 10px; }
+    progress:nth-child(15) { margin: 0px; padding: 2px 4px 6px 8px; }
+    progress:nth-child(16) { margin: 2px 4px 6px 8px; padding: 0px; }
+  </style>
+  <body>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/reftest.list b/layout/reftests/forms/progress/reftest.list
new file mode 100644
index 000000000000..09fdd4b6e17f
--- /dev/null
+++ b/layout/reftests/forms/progress/reftest.list
@@ -0,0 +1,9 @@
+# For the moment, none of these tests will work on MacOS X.
+skip-if(cocoaWidget) == values.html values-ref.html
+skip-if(cocoaWidget) == values-rtl.html values-rtl-ref.html
+skip-if(cocoaWidget) == margin-padding.html margin-padding-ref.html
+
+# The following test is disabled but kept in the repository because the
+# transformations will not behave exactly the same for <progress> and two divs.
+# However, it would be possible to manually check those.
+# == transformations.html transformations-ref.html
diff --git a/layout/reftests/forms/progress/style.css b/layout/reftests/forms/progress/style.css
new file mode 100644
index 000000000000..d6f198d00f1c
--- /dev/null
+++ b/layout/reftests/forms/progress/style.css
@@ -0,0 +1,26 @@
+div.progress-element {
+  -moz-appearance: progressbar;
+  display: inline-block;
+  height: 1em;
+  width: 10em;
+  vertical-align: -0.2em;
+
+  /* TODO: this is a workaround for bug 568825 */
+  overflow: hidden;
+
+  /* Default style in case of there is -moz-appearance: none; */
+  border: 2px solid;
+  -moz-border-top-colors: ThreeDShadow -moz-Dialog;
+  -moz-border-right-colors: ThreeDHighlight -moz-Dialog;
+  -moz-border-bottom-colors: ThreeDHighlight -moz-Dialog;
+  -moz-border-left-colors: ThreeDShadow -moz-Dialog;
+  background-color: -moz-Dialog;
+}
+
+div.progress-bar {
+  -moz-appearance: progresschunk;
+  height: 100%;
+
+  /* Default style in case of there is -moz-appearance: none; */
+  background-color: ThreeDShadow;
+}
diff --git a/layout/reftests/forms/progress/transformations-ref.html b/layout/reftests/forms/progress/transformations-ref.html
new file mode 100644
index 000000000000..7182d9858c5c
--- /dev/null
+++ b/layout/reftests/forms/progress/transformations-ref.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > div:nth-child(1) { -moz-transform: matrix(1, -0.2, 0, 1, 0, 0); }
+    body > div:nth-child(2) { -moz-transform: matrix(1, 0, 0.6, 1, 15em, 0); }
+    body > div:nth-child(3) { -moz-transform: rotate(30deg); }
+    body > div:nth-child(4) { -moz-transform: scale(2, 4); }
+    body > div:nth-child(5) { -moz-transform: scale(0.1, 0.4); }
+    body > div:nth-child(6) { -moz-transform: scale(1, 0.4); }
+    body > div:nth-child(7) { -moz-transform: scale(0.1, 1); }
+    body > div:nth-child(8) { -moz-transform: skew(30deg, -10deg); }
+    body > div:nth-child(9) { -moz-transform: skew(-30deg, 10deg); }
+    body > div:nth-child(10) { -moz-transform: translate(10px, 30px); }
+    body > div:nth-child(11) { -moz-transform: translate(30px, 10px); }
+    body > div:nth-child(12) { -moz-transform: translate(-10px, 30px); }
+    body > div:nth-child(13) { -moz-transform: translate(30px, -10px); }
+    body > div:nth-child(14) { -moz-transform: scale(0, 0); }
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/transformations.html b/layout/reftests/forms/progress/transformations.html
new file mode 100644
index 000000000000..ce61f311b54d
--- /dev/null
+++ b/layout/reftests/forms/progress/transformations.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <style>
+    progress:nth-child(1) { -moz-transform: matrix(1, -0.2, 0, 1, 0, 0); }
+    progress:nth-child(2) { -moz-transform: matrix(1, 0, 0.6, 1, 15em, 0); }
+    progress:nth-child(3) { -moz-transform: rotate(30deg); }
+    progress:nth-child(4) { -moz-transform: scale(2, 4); }
+    progress:nth-child(5) { -moz-transform: scale(0.1, 0.4); }
+    progress:nth-child(6) { -moz-transform: scale(1, 0.4); }
+    progress:nth-child(7) { -moz-transform: scale(0.1, 1); }
+    progress:nth-child(8) { -moz-transform: skew(30deg, -10deg); }
+    progress:nth-child(9) { -moz-transform: skew(-30deg, 10deg); }
+    progress:nth-child(10) { -moz-transform: translate(10px, 30px); }
+    progress:nth-child(11) { -moz-transform: translate(30px, 10px); }
+    progress:nth-child(12) { -moz-transform: translate(-10px, 30px); }
+    progress:nth-child(13) { -moz-transform: translate(30px, -10px); }
+    progress:nth-child(14) { -moz-transform: scale(0, 0); }
+  </style>
+  <body>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/values-ref.html b/layout/reftests/forms/progress/values-ref.html
new file mode 100644
index 000000000000..048e1164ca85
--- /dev/null
+++ b/layout/reftests/forms/progress/values-ref.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    div:nth-child(1) > .progress-bar { width: 100%; }
+    div:nth-child(2) > .progress-bar { width: 0%; }
+    div:nth-child(3) > .progress-bar { width: 10%; }
+    div:nth-child(4) > .progress-bar { width: 50%; }
+    div:nth-child(5) > .progress-bar { width: 0%; }
+    div:nth-child(6) > .progress-bar { width: 100%; }
+    div:nth-child(7) > .progress-bar { width: 42%; }
+    div:nth-child(8) > .progress-bar { width: 100%; }
+    div:nth-child(9) > .progress-bar { width: 100%; }
+    div:nth-child(10) > .progress-bar { width: 10%; }
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/values-rtl-ref.html b/layout/reftests/forms/progress/values-rtl-ref.html
new file mode 100644
index 000000000000..99bf9fb2a785
--- /dev/null
+++ b/layout/reftests/forms/progress/values-rtl-ref.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    div:nth-child(1) > .progress-bar { width: 100%; }
+    div:nth-child(2) > .progress-bar { width: 0%; }
+    div:nth-child(3) > .progress-bar { width: 10%; }
+    div:nth-child(4) > .progress-bar { width: 50%; }
+    div:nth-child(5) > .progress-bar { width: 0%; }
+    div:nth-child(6) > .progress-bar { width: 100%; }
+    div:nth-child(7) > .progress-bar { width: 42%; }
+    div:nth-child(8) > .progress-bar { width: 100%; }
+    div:nth-child(9) > .progress-bar { width: 100%; }
+    div:nth-child(10) > .progress-bar { width: 10%; }
+  </style>
+  <body dir='rtl'>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/values-rtl.html b/layout/reftests/forms/progress/values-rtl.html
new file mode 100644
index 000000000000..ad29a63782c8
--- /dev/null
+++ b/layout/reftests/forms/progress/values-rtl.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <body dir='rtl'>
+    <progress value="1.0"></progress>
+    <progress value="0.0"></progress>
+    <progress value="0.1"></progress>
+    <progress value="0.5"></progress>
+    <progress value="-1"></progress>
+    <progress value="42"></progress>
+    <progress value="42" max="100"></progress>
+    <progress value="42" max="1"></progress>
+    <progress value="42" max="-1"></progress>
+    <progress value="0.1" max="-1"></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/values.html b/layout/reftests/forms/progress/values.html
new file mode 100644
index 000000000000..9e0f2016ed6c
--- /dev/null
+++ b/layout/reftests/forms/progress/values.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <progress value="1.0"></progress>
+    <progress value="0.0"></progress>
+    <progress value="0.1"></progress>
+    <progress value="0.5"></progress>
+    <progress value="-1"></progress>
+    <progress value="42"></progress>
+    <progress value="42" max="100"></progress>
+    <progress value="42" max="1"></progress>
+    <progress value="42" max="-1"></progress>
+    <progress value="0.1" max="-1"></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list
index 5c9905b83b90..ebe9a2f26382 100644
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@@ -59,3 +59,6 @@ include input/reftest.list
 
 # output element
 include output/reftest.list
+
+# progress element
+include progress/reftest.list
diff --git a/layout/style/forms.css b/layout/style/forms.css
index 1c5f1bc3ca26..629151ec7362 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -668,6 +668,31 @@ output:-moz-ui-invalid {
   input[type="file"] { height: 2em; }
 }
 
+progress {
+  -moz-appearance: progressbar;
+  display: inline-block;
+  vertical-align: -0.2em;
+
+  /* TODO: this is a workaround for bug 568825 */
+  overflow: hidden;
+
+  /* Default style in case of there is -moz-appearance: none; */
+  border: 2px solid;
+  -moz-border-top-colors: ThreeDShadow -moz-Dialog;
+  -moz-border-right-colors: ThreeDHighlight -moz-Dialog;
+  -moz-border-bottom-colors: ThreeDHighlight -moz-Dialog;
+  -moz-border-left-colors: ThreeDShadow -moz-Dialog;
+  background-color: -moz-Dialog;
+}
+
+progress > div {
+  -moz-appearance: progresschunk;
+  height: 100%;
+
+  /* Default style in case of there is -moz-appearance: none; */
+  background-color: ThreeDShadow;
+}
+
 %if OSARCH==OS2
 input {
   font: medium serif; font-family: inherit
diff --git a/layout/style/html.css b/layout/style/html.css
index 908dc2a5079a..a0da93ca2db0 100644
--- a/layout/style/html.css
+++ b/layout/style/html.css
@@ -695,32 +695,75 @@ canvas {
 }
 
 /* focusable content: anything w/ tabindex >=0 is focusable */
-abbr:-moz-focusring, acronym:-moz-focusring, address:-moz-focusring,
+abbr:-moz-focusring,
+acronym:-moz-focusring,
+address:-moz-focusring,
 applet:-moz-focusring,
-b:-moz-focusring, base:-moz-focusring, big:-moz-focusring,
-blockquote:-moz-focusring, br:-moz-focusring, canvas:-moz-focusring,
-caption:-moz-focusring, center:-moz-focusring, cite:-moz-focusring,
-code:-moz-focusring, col:-moz-focusring, colgroup:-moz-focusring,
-dd:-moz-focusring, del:-moz-focusring, dfn:-moz-focusring, dir:-moz-focusring,
-div:-moz-focusring, dl:-moz-focusring, dt:-moz-focusring, em:-moz-focusring,
+b:-moz-focusring,
+base:-moz-focusring,
+big:-moz-focusring,
+blockquote:-moz-focusring,
+br:-moz-focusring,
+canvas:-moz-focusring,
+caption:-moz-focusring,
+center:-moz-focusring,
+cite:-moz-focusring,
+code:-moz-focusring,
+col:-moz-focusring,
+colgroup:-moz-focusring,
+dd:-moz-focusring,
+del:-moz-focusring,
+dfn:-moz-focusring,
+dir:-moz-focusring,
+div:-moz-focusring,
+dl:-moz-focusring,
+dt:-moz-focusring,
+em:-moz-focusring,
 embed:-moz-focusring,
-fieldset:-moz-focusring, font:-moz-focusring, form:-moz-focusring,
-h1:-moz-focusring, h2:-moz-focusring, h3:-moz-focusring, h4:-moz-focusring,
-h5:-moz-focusring, h6:-moz-focusring, hr:-moz-focusring, i:-moz-focusring,
-img:-moz-focusring, ins:-moz-focusring, kbd:-moz-focusring,
-label:-moz-focusring, legend:-moz-focusring, li:-moz-focusring,
+fieldset:-moz-focusring,
+font:-moz-focusring,
+form:-moz-focusring,
+h1:-moz-focusring,
+h2:-moz-focusring,
+h3:-moz-focusring,
+h4:-moz-focusring,
+h5:-moz-focusring,
+h6:-moz-focusring,
+hr:-moz-focusring,
+i:-moz-focusring,
+img:-moz-focusring,
+ins:-moz-focusring,
+kbd:-moz-focusring,
+label:-moz-focusring,
+legend:-moz-focusring,
+li:-moz-focusring,
 link:-moz-focusring,
 menu:-moz-focusring,
 object:-moz-focusring,
 ol:-moz-focusring,
 p:-moz-focusring,
-pre:-moz-focusring, q:-moz-focusring, s:-moz-focusring, samp:-moz-focusring,
-small:-moz-focusring, span:-moz-focusring, strike:-moz-focusring,
-strong:-moz-focusring, sub:-moz-focusring, sup:-moz-focusring,
-table:-moz-focusring, tbody:-moz-focusring, td:-moz-focusring,
-tfoot:-moz-focusring, th:-moz-focusring, thead:-moz-focusring, 
-tr:-moz-focusring, tt:-moz-focusring, u:-moz-focusring,
-ul:-moz-focusring, var:-moz-focusring {
+pre:-moz-focusring,
+progress:-moz-focusring,
+q:-moz-focusring,
+s:-moz-focusring,
+samp:-moz-focusring,
+small:-moz-focusring,
+span:-moz-focusring,
+strike:-moz-focusring,
+strong:-moz-focusring,
+sub:-moz-focusring,
+sup:-moz-focusring,
+table:-moz-focusring,
+tbody:-moz-focusring,
+td:-moz-focusring,
+tfoot:-moz-focusring,
+th:-moz-focusring,
+thead:-moz-focusring,
+tr:-moz-focusring,
+tt:-moz-focusring,
+u:-moz-focusring,
+ul:-moz-focusring,
+var:-moz-focusring {
   /* Don't specify the outline-color, we should always use initial value. */
    outline: 1px dotted;
 }

From 8fd2b2f9bb5ffbb90e39ae248cdc2caed1ac5749 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 6 May 2011 11:52:05 +0200
Subject: [PATCH 099/314] Bug 633209 - Add ::-moz-progress-bar to access the
 anonymous div inside the progress element. r=dbaron

--HG--
rename : layout/reftests/forms/progress/margin-padding-ref.html => layout/reftests/forms/progress/margin-padding-rtl-ref.html
rename : layout/reftests/forms/progress/margin-padding.html => layout/reftests/forms/progress/margin-padding-rtl.html
---
 layout/forms/nsProgressFrame.cpp              |  24 ++++
 layout/forms/nsProgressFrame.h                |   3 +
 .../progress/bar-pseudo-element-ref.html      | 105 ++++++++++++++++++
 .../progress/bar-pseudo-element-rtl-ref.html  |  45 ++++++++
 .../progress/bar-pseudo-element-rtl.html      |  26 +++++
 .../forms/progress/bar-pseudo-element.html    |  50 +++++++++
 .../progress/margin-padding-rtl-ref.html      |  88 +++++++++++++++
 .../forms/progress/margin-padding-rtl.html    |  40 +++++++
 .../forms/progress/margin-padding.html        |   1 +
 layout/reftests/forms/progress/reftest.list   |  10 +-
 layout/reftests/forms/progress/style.css      |   7 +-
 .../forms/progress/transformations.html       |   1 +
 .../reftests/forms/progress/values-rtl.html   |   1 +
 layout/reftests/forms/progress/values.html    |   1 +
 layout/style/forms.css                        |  11 +-
 layout/style/nsCSSPseudoElementList.h         |   3 +
 layout/style/nsStyleContext.cpp               |   2 +-
 17 files changed, 406 insertions(+), 12 deletions(-)
 create mode 100644 layout/reftests/forms/progress/bar-pseudo-element-ref.html
 create mode 100644 layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
 create mode 100644 layout/reftests/forms/progress/bar-pseudo-element-rtl.html
 create mode 100644 layout/reftests/forms/progress/bar-pseudo-element.html
 create mode 100644 layout/reftests/forms/progress/margin-padding-rtl-ref.html
 create mode 100644 layout/reftests/forms/progress/margin-padding-rtl.html

diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index b33362258959..79274c663c6e 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -71,6 +71,30 @@ nsProgressFrame::~nsProgressFrame()
 {
 }
 
+NS_IMETHODIMP
+nsProgressFrame::SetInitialChildList(nsIAtom*     aListName,
+                                     nsFrameList& aChildList)
+{
+  NS_ASSERTION(mBarDiv, "Progress bar div must exist!");
+
+  nsresult rv = nsHTMLContainerFrame::SetInitialChildList(aListName,
+                                                          aChildList);
+
+  nsIFrame* barFrame = mBarDiv->GetPrimaryFrame();
+  nsCSSPseudoElements::Type pseudoType = nsCSSPseudoElements::ePseudo_mozProgressBar;
+  nsRefPtr<nsStyleContext> newStyleContext;
+
+  newStyleContext = barFrame->PresContext()->StyleSet()->
+    ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
+                              barFrame->GetParent()->GetStyleContext());
+
+  if (newStyleContext) {
+    barFrame->SetStyleContext(newStyleContext);
+  }
+
+  return rv;
+}
+
 void
 nsProgressFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
index 0d6e524e09b4..2bf43d369f80 100644
--- a/layout/forms/nsProgressFrame.h
+++ b/layout/forms/nsProgressFrame.h
@@ -54,6 +54,9 @@ public:
   nsProgressFrame(nsStyleContext* aContext);
   virtual ~nsProgressFrame();
 
+  NS_IMETHOD SetInitialChildList(nsIAtom*     aListName,
+                                 nsFrameList& aChildList);
+
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
 
   NS_IMETHOD Reflow(nsPresContext*           aCX,
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
new file mode 100644
index 000000000000..ae95d4e233dc
--- /dev/null
+++ b/layout/reftests/forms/progress/bar-pseudo-element-ref.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > div:nth-child(1) > .progress-bar { margin: 10px; padding: 0px; }
+    body > div:nth-child(2) > .progress-bar { margin: 0px; padding: 10px; }
+    body > div:nth-child(3) > .progress-bar { margin: 10px; padding: 10px; }
+    body > div:nth-child(4) > .progress-bar { margin: 5px; padding: 5px; }
+    body > div:nth-child(5) > .progress-bar { margin: 50px; padding: 50px; }
+    body > div:nth-child(6) > .progress-bar { margin: 100px; padding: 100px; }
+    body > div:nth-child(7) > .progress-bar { margin: 10px 0px 0px 0px; padding: 0px; }
+    body > div:nth-child(8) > .progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > div:nth-child(9) > .progress-bar { margin: 0px 0px 10px 0px; padding: 0px; }
+    body > div:nth-child(10) > .progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > div:nth-child(11) > .progress-bar { margin: 0px; padding: 10px 0px 0px 0px; }
+    body > div:nth-child(12) > .progress-bar { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > div:nth-child(13) > .progress-bar { margin: 0px; padding: 0px 0px 10px 0px; }
+    body > div:nth-child(14) > .progress-bar { margin: 0px; padding: 0px 0px 0px 10px; }
+    body > div:nth-child(15) > .progress-bar { margin: 200px; padding: 0px; }
+    body > div:nth-child(16) > .progress-bar { margin: 0px; padding: 200px; }
+    /* 15 - 18 should have 100% width, no need to specify. */
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
new file mode 100644
index 000000000000..102fb61f5c5c
--- /dev/null
+++ b/layout/reftests/forms/progress/bar-pseudo-element-rtl-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > div:nth-child(1) > .progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > div:nth-child(2) > .progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > div:nth-child(3) > .progress-bar { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > div:nth-child(4) > .progress-bar { margin: 0px; padding: 0px 0px 0px 10px; }
+    /* 15 - 18 should have 100% width, no need to specify. */
+  </style>
+  <body dir='rtl'>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/bar-pseudo-element-rtl.html b/layout/reftests/forms/progress/bar-pseudo-element-rtl.html
new file mode 100644
index 000000000000..711dc26ba474
--- /dev/null
+++ b/layout/reftests/forms/progress/bar-pseudo-element-rtl.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > progress:nth-child(1)::-moz-progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > progress:nth-child(2)::-moz-progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > progress:nth-child(3)::-moz-progress-bar { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > progress:nth-child(4)::-moz-progress-bar { margin: 0px; padding: 0px 0px 0px 10px; }
+    body > progress:nth-child(5)::-moz-progress-bar { width: 1000px; }
+    body > progress:nth-child(6)::-moz-progress-bar { width: 10px; }
+    body > progress:nth-child(7)::-moz-progress-bar { width: 10%; }
+    body > progress:nth-child(8)::-moz-progress-bar { width: 200%; }
+  </style>
+  <body dir='rtl'>
+    <!-- Those will be used to change padding/margin on ::-moz-progress-bar -->
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <!-- Those will be used to change width. -->
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/bar-pseudo-element.html b/layout/reftests/forms/progress/bar-pseudo-element.html
new file mode 100644
index 000000000000..15caf21ef534
--- /dev/null
+++ b/layout/reftests/forms/progress/bar-pseudo-element.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > progress:nth-child(1)::-moz-progress-bar { margin: 10px; padding: 0px; }
+    body > progress:nth-child(2)::-moz-progress-bar { margin: 0px; padding: 10px; }
+    body > progress:nth-child(3)::-moz-progress-bar { margin: 10px; padding: 10px; }
+    body > progress:nth-child(4)::-moz-progress-bar { margin: 5px; padding: 5px; }
+    body > progress:nth-child(5)::-moz-progress-bar { margin: 50px; padding: 50px; }
+    body > progress:nth-child(6)::-moz-progress-bar { margin: 100px; padding: 100px; }
+    body > progress:nth-child(7)::-moz-progress-bar { margin: 10px 0px 0px 0px; padding: 0px; }
+    body > progress:nth-child(8)::-moz-progress-bar { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > progress:nth-child(9)::-moz-progress-bar { margin: 0px 0px 10px 0px; padding: 0px; }
+    body > progress:nth-child(10)::-moz-progress-bar { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > progress:nth-child(11)::-moz-progress-bar { margin: 0px; padding: 10px 0px 0px 0px; }
+    body > progress:nth-child(12)::-moz-progress-bar { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > progress:nth-child(13)::-moz-progress-bar { margin: 0px; padding: 0px 0px 10px 0px; }
+    body > progress:nth-child(14)::-moz-progress-bar { margin: 0px; padding: 0px 0px 0px 10px; }
+    body > progress:nth-child(15)::-moz-progress-bar { margin: 200px; padding: 0px; }
+    body > progress:nth-child(16)::-moz-progress-bar { margin: 0px; padding: 200px; }
+    body > progress:nth-child(17)::-moz-progress-bar { width: 1000px; }
+    body > progress:nth-child(18)::-moz-progress-bar { width: 10px; }
+    body > progress:nth-child(19)::-moz-progress-bar { width: 10%; }
+    body > progress:nth-child(20)::-moz-progress-bar { width: 200%; }
+  </style>
+  <body>
+    <!-- Those will be used to change padding/margin on ::-moz-progress-bar -->
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <!-- Those will be used to change width. -->
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/margin-padding-rtl-ref.html b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
new file mode 100644
index 000000000000..dcf76f0f3b8b
--- /dev/null
+++ b/layout/reftests/forms/progress/margin-padding-rtl-ref.html
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > div:nth-child(1) { margin: 10px; padding: 0px; }
+    body > div:nth-child(2) { margin: 0px; padding: 10px; }
+    body > div:nth-child(3) { margin: 10px; padding: 10px; }
+    body > div:nth-child(4) { margin: 5px; padding: 5px; }
+    body > div:nth-child(5) { margin: 50px; padding: 50px; }
+    body > div:nth-child(6) { margin: 100px; padding: 100px; }
+    body > div:nth-child(7) { margin: 10px 0px 0px 0px; padding: 0px; }
+    body > div:nth-child(8) { margin: 0px 10px 0px 0px; padding: 0px; }
+    body > div:nth-child(9) { margin: 0px 0px 10px 0px; padding: 0px; }
+    body > div:nth-child(10) { margin: 0px 0px 0px 10px; padding: 0px; }
+    body > div:nth-child(11) { margin: 0px; padding: 10px 0px 0px 0px; }
+    body > div:nth-child(12) { margin: 0px; padding: 0px 10px 0px 0px; }
+    body > div:nth-child(13) { margin: 0px; padding: 0px 0px 10px 0px; }
+    body > div:nth-child(14) { margin: 0px; padding: 0px 0px 0px 10px; }
+    body > div:nth-child(15) { margin: 0px; padding: 2px 4px 6px 8px; }
+    body > div:nth-child(16) { margin: 2px 4px 6px 8px; padding: 0px; }
+  </style>
+  <body dir='rtl'>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/margin-padding-rtl.html b/layout/reftests/forms/progress/margin-padding-rtl.html
new file mode 100644
index 000000000000..fc445c36c450
--- /dev/null
+++ b/layout/reftests/forms/progress/margin-padding-rtl.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    progress:nth-child(1) { margin: 10px; padding: 0px; }
+    progress:nth-child(2) { margin: 0px; padding: 10px; }
+    progress:nth-child(3) { margin: 10px; padding: 10px; }
+    progress:nth-child(4) { margin: 5px; padding: 5px; }
+    progress:nth-child(5) { margin: 50px; padding: 50px; }
+    progress:nth-child(6) { margin: 100px; padding: 100px; }
+    progress:nth-child(7) { margin: 10px 0px 0px 0px; padding: 0px; }
+    progress:nth-child(8) { margin: 0px 10px 0px 0px; padding: 0px; }
+    progress:nth-child(9) { margin: 0px 0px 10px 0px; padding: 0px; }
+    progress:nth-child(10) { margin: 0px 0px 0px 10px; padding: 0px; }
+    progress:nth-child(11) { margin: 0px; padding: 10px 0px 0px 0px; }
+    progress:nth-child(12) { margin: 0px; padding: 0px 10px 0px 0px; }
+    progress:nth-child(13) { margin: 0px; padding: 0px 0px 10px 0px; }
+    progress:nth-child(14) { margin: 0px; padding: 0px 0px 0px 10px; }
+    progress:nth-child(15) { margin: 0px; padding: 2px 4px 6px 8px; }
+    progress:nth-child(16) { margin: 2px 4px 6px 8px; padding: 0px; }
+  </style>
+  <body dir='rtl'>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+    <progress value='1'></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/margin-padding.html b/layout/reftests/forms/progress/margin-padding.html
index 6674425d1b84..fe4f3d003cd6 100644
--- a/layout/reftests/forms/progress/margin-padding.html
+++ b/layout/reftests/forms/progress/margin-padding.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
   <style>
     progress:nth-child(1) { margin: 10px; padding: 0px; }
     progress:nth-child(2) { margin: 0px; padding: 10px; }
diff --git a/layout/reftests/forms/progress/reftest.list b/layout/reftests/forms/progress/reftest.list
index 09fdd4b6e17f..66a512cd594e 100644
--- a/layout/reftests/forms/progress/reftest.list
+++ b/layout/reftests/forms/progress/reftest.list
@@ -1,7 +1,9 @@
-# For the moment, none of these tests will work on MacOS X.
-skip-if(cocoaWidget) == values.html values-ref.html
-skip-if(cocoaWidget) == values-rtl.html values-rtl-ref.html
-skip-if(cocoaWidget) == margin-padding.html margin-padding-ref.html
+== values.html values-ref.html
+== values-rtl.html values-rtl-ref.html
+== margin-padding.html margin-padding-ref.html
+== margin-padding-rtl.html margin-padding-rtl-ref.html
+== bar-pseudo-element.html bar-pseudo-element-ref.html
+== bar-pseudo-element-rtl.html bar-pseudo-element-rtl-ref.html
 
 # The following test is disabled but kept in the repository because the
 # transformations will not behave exactly the same for <progress> and two divs.
diff --git a/layout/reftests/forms/progress/style.css b/layout/reftests/forms/progress/style.css
index d6f198d00f1c..9635f5351c36 100644
--- a/layout/reftests/forms/progress/style.css
+++ b/layout/reftests/forms/progress/style.css
@@ -5,9 +5,6 @@ div.progress-element {
   width: 10em;
   vertical-align: -0.2em;
 
-  /* TODO: this is a workaround for bug 568825 */
-  overflow: hidden;
-
   /* Default style in case of there is -moz-appearance: none; */
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow -moz-Dialog;
@@ -24,3 +21,7 @@ div.progress-bar {
   /* Default style in case of there is -moz-appearance: none; */
   background-color: ThreeDShadow;
 }
+
+progress, progress::-moz-progress-bar, div.progress-element, div.progress-bar {
+  -moz-appearance: none;
+}
diff --git a/layout/reftests/forms/progress/transformations.html b/layout/reftests/forms/progress/transformations.html
index ce61f311b54d..d185f4760865 100644
--- a/layout/reftests/forms/progress/transformations.html
+++ b/layout/reftests/forms/progress/transformations.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
   <style>
     progress:nth-child(1) { -moz-transform: matrix(1, -0.2, 0, 1, 0, 0); }
     progress:nth-child(2) { -moz-transform: matrix(1, 0, 0.6, 1, 15em, 0); }
diff --git a/layout/reftests/forms/progress/values-rtl.html b/layout/reftests/forms/progress/values-rtl.html
index ad29a63782c8..6a143b0c1989 100644
--- a/layout/reftests/forms/progress/values-rtl.html
+++ b/layout/reftests/forms/progress/values-rtl.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
   <body dir='rtl'>
     <progress value="1.0"></progress>
     <progress value="0.0"></progress>
diff --git a/layout/reftests/forms/progress/values.html b/layout/reftests/forms/progress/values.html
index 9e0f2016ed6c..3c5e3e80b73b 100644
--- a/layout/reftests/forms/progress/values.html
+++ b/layout/reftests/forms/progress/values.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
   <body>
     <progress value="1.0"></progress>
     <progress value="0.0"></progress>
diff --git a/layout/style/forms.css b/layout/style/forms.css
index 629151ec7362..b024cc5758a4 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -673,9 +673,6 @@ progress {
   display: inline-block;
   vertical-align: -0.2em;
 
-  /* TODO: this is a workaround for bug 568825 */
-  overflow: hidden;
-
   /* Default style in case of there is -moz-appearance: none; */
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow -moz-Dialog;
@@ -685,7 +682,13 @@ progress {
   background-color: -moz-Dialog;
 }
 
-progress > div {
+::-moz-progress-bar {
+  /* Block styles that would change the type of frame we construct. */
+  display: inline-block ! important;
+  float: none ! important;
+  position: static ! important;
+  overflow: visible ! important;
+
   -moz-appearance: progresschunk;
   height: 100%;
 
diff --git a/layout/style/nsCSSPseudoElementList.h b/layout/style/nsCSSPseudoElementList.h
index 14507e572a69..bd2b5b45b8ca 100644
--- a/layout/style/nsCSSPseudoElementList.h
+++ b/layout/style/nsCSSPseudoElementList.h
@@ -86,3 +86,6 @@ CSS_PSEUDO_ELEMENT(mozMathStretchy, ":-moz-math-stretchy", 0)
 CSS_PSEUDO_ELEMENT(mozMathAnonymous, ":-moz-math-anonymous", 0)
 #endif
 
+// HTML5 Forms pseudo elements
+CSS_PSEUDO_ELEMENT(mozProgressBar, ":-moz-progress-bar", 0)
+
diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp
index e44688db10b7..ba7a70aec275 100644
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@@ -75,7 +75,7 @@ nsStyleContext::nsStyleContext(nsStyleContext* aParent,
     mBits(((PRUint32)aPseudoType) << NS_STYLE_CONTEXT_TYPE_SHIFT),
     mRefCnt(0)
 {
-  PR_STATIC_ASSERT((PR_UINT32_MAX >> NS_STYLE_CONTEXT_TYPE_SHIFT) >
+  PR_STATIC_ASSERT((PR_UINT32_MAX >> NS_STYLE_CONTEXT_TYPE_SHIFT) >=
                    nsCSSPseudoElements::ePseudo_MAX);
 
   mNextSibling = this;

From f1a1b86182b130413f96e181c2c3cdd36f7a390c Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:53:17 +0200
Subject: [PATCH 100/314] Bug 633913 - Add a pseudo-class to access
 indeterminate <progress> elements. r=bz

---
 .../content/src/nsHTMLProgressElement.cpp     | 15 ++++++
 content/html/content/test/test_bug514437.html | 50 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/content/html/content/src/nsHTMLProgressElement.cpp b/content/html/content/src/nsHTMLProgressElement.cpp
index 191ca89acd69..c639b27b3226 100644
--- a/content/html/content/src/nsHTMLProgressElement.cpp
+++ b/content/html/content/src/nsHTMLProgressElement.cpp
@@ -38,6 +38,7 @@
 #include "nsIDOMHTMLProgressElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsAttrValue.h"
+#include "nsEventStateManager.h"
 
 
 class nsHTMLProgressElement : public nsGenericHTMLFormElement,
@@ -67,6 +68,8 @@ public:
   NS_IMETHOD Reset();
   NS_IMETHOD SubmitNamesValues(nsFormSubmission* aFormSubmission);
 
+  nsEventStates IntrinsicState() const;
+
   nsresult Clone(nsINodeInfo* aNodeInfo, nsINode** aResult) const;
 
   PRBool ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute,
@@ -134,6 +137,18 @@ nsHTMLProgressElement::SubmitNamesValues(nsFormSubmission* aFormSubmission)
   return NS_OK;
 }
 
+nsEventStates
+nsHTMLProgressElement::IntrinsicState() const
+{
+  nsEventStates state = nsGenericHTMLFormElement::IntrinsicState();
+
+  if (IsIndeterminate()) {
+    state |= NS_EVENT_STATE_INDETERMINATE;
+  }
+
+  return state;
+}
+
 PRBool
 nsHTMLProgressElement::ParseAttribute(PRInt32 aNamespaceID, nsIAtom* aAttribute,
                                       const nsAString& aValue, nsAttrValue& aResult)
diff --git a/content/html/content/test/test_bug514437.html b/content/html/content/test/test_bug514437.html
index bd4ca0440eb5..8e02bce77653 100644
--- a/content/html/content/test/test_bug514437.html
+++ b/content/html/content/test/test_bug514437.html
@@ -2,15 +2,18 @@
 <html>
 <!--
 https://bugzilla.mozilla.org/show_bug.cgi?id=514437
+https://bugzilla.mozilla.org/show_bug.cgi?id=633913
 -->
 <head>
-  <title>Test for Bug 514437</title>
+  <title>Test for Bug 514437 and Bug 633913</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=514437">Mozilla Bug 514437</a>
+and
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=633913">Mozilla Bug 633913</a>
 <p id="display"></p>
 <iframe name="submit_frame" onload="onFormSubmission();" style="visibility: hidden;"></iframe>
 <div id="content" style="visibility: hidden;">
@@ -21,7 +24,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=514437
 <pre id="test">
 <script type="application/javascript">
 
-/** Test for Bug 514437 **/
+/** Test for Bug 514437 and Bug 633913 **/
 
 function checkFormIDLAttribute(aElement)
 {
@@ -178,6 +181,47 @@ function checkPositionAttribute()
   }
 }
 
+function checkIndeterminatePseudoClass()
+{
+  function checkIndeterminate(aElement, aValue, aMax, aIndeterminate) {
+    if (aValue != null) {
+      aElement.setAttribute('value', aValue);
+    } else {
+      aElement.removeAttribute('value');
+    }
+
+    if (aMax != null) {
+      aElement.setAttribute('max', aMax);
+    } else {
+      aElement.removeAttribute('max');
+    }
+
+    is(aElement.mozMatchesSelector("progress:indeterminate"), aIndeterminate,
+       "<progress> indeterminate state should be " + aIndeterminate);
+  }
+
+  var tests = [
+    // Indeterminate state: (value is undefined, or not a float)
+    // value has to be defined (indeterminate state).
+    [ null, null, true ],
+    [ null,  1.0, true ],
+    [ 'foo', 1.0, true ],
+    // Determined state:
+    [ -1.0,  1.0, false ],
+    [  2.0,  1.0, false ],
+    [ 1.0,  null, false ],
+    [ 1.0, 'foo', false ],
+    [ 1.0,  -1.0, false ],
+    [ 0.0,   1.0, false ],
+  ];
+
+  var element = document.createElement('progress');
+
+  for each(var test in tests) {
+    checkIndeterminate(element, test[0], test[1], test[2]);
+  }
+}
+
 function checkFormListedElement(aElement)
 {
   is(document.forms[0].elements.length, 0, "the form should have no element");
@@ -265,6 +309,8 @@ checkMaxAttribute();
 
 checkPositionAttribute();
 
+checkIndeterminatePseudoClass();
+
 checkFormListedElement(p);
 
 checkLabelable(p);

From bb4266242b4edcfe361354465b00b48c09e800ef Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 6 May 2011 11:56:47 +0200
Subject: [PATCH 101/314] Bug 642667 - Let authors set the progress bar's width
 when in indeterminate state. r=dbaron

---
 layout/forms/nsProgressFrame.cpp              | 19 +++++++---
 .../indeterminate-style-width-ref.html        | 37 +++++++++++++++++++
 .../progress/indeterminate-style-width.html   | 19 ++++++++++
 layout/reftests/forms/progress/reftest.list   |  1 +
 layout/reftests/forms/progress/style.css      |  5 +++
 layout/style/forms.css                        |  1 +
 6 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 layout/reftests/forms/progress/indeterminate-style-width-ref.html
 create mode 100644 layout/reftests/forms/progress/indeterminate-style-width.html

diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index 79274c663c6e..a203a0a00cb4 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -210,11 +210,20 @@ nsProgressFrame::ReflowBarFrame(nsIFrame*                aBarFrame,
     xoffset += aReflowState.ComputedWidth() - width;
   }
 
-  // We want the frame to take all the available size.
-  width -= reflowState.mComputedMargin.LeftRight() +
-           reflowState.mComputedBorderPadding.LeftRight();
-  width = NS_MAX(width, 0);
-  reflowState.SetComputedWidth(width);
+  // The bar width is fixed in these cases:
+  // - the progress position is determined: the bar width is fixed according
+  //   to it's value.
+  // - the progress position is indeterminate and the bar appearance is the
+  //   native one ('progresschunk'): the bar width is forced to 100%.
+  // Otherwise (when the progress is indeterminate and the bar appearance isn't
+  // native), the bar width isn't fixed and can be set by the author.
+  if (position != -1 ||
+      aBarFrame->GetStyleDisplay()->mAppearance == NS_THEME_PROGRESSBAR_CHUNK) {
+    width -= reflowState.mComputedMargin.LeftRight() +
+             reflowState.mComputedBorderPadding.LeftRight();
+    width = NS_MAX(width, 0);
+    reflowState.SetComputedWidth(width);
+  }
 
   xoffset += reflowState.mComputedMargin.left;
   yoffset += reflowState.mComputedMargin.top;
diff --git a/layout/reftests/forms/progress/indeterminate-style-width-ref.html b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
new file mode 100644
index 000000000000..8a135b2ea4cb
--- /dev/null
+++ b/layout/reftests/forms/progress/indeterminate-style-width-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    div.progress-bar {
+      width:100%;
+    }
+    body > div:nth-child(1) > .progress-bar { width: 20px; }
+    body > div:nth-child(2) > .progress-bar { width: 0px; }
+    body > div:nth-child(3) > .progress-bar { width: 50%; }
+    body > div:nth-child(4) > .progress-bar { width: 1em; }
+    body > div:nth-child(5) > .progress-bar { width: 100%; }
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar">
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/forms/progress/indeterminate-style-width.html b/layout/reftests/forms/progress/indeterminate-style-width.html
new file mode 100644
index 000000000000..f5db8ff66614
--- /dev/null
+++ b/layout/reftests/forms/progress/indeterminate-style-width.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <link rel='stylesheet' type='text/css' href='style.css'>
+  <style>
+    body > progress:nth-child(1)::-moz-progress-bar { width: 20px; }
+    body > progress:nth-child(2)::-moz-progress-bar { width: 0px; }
+    body > progress:nth-child(3)::-moz-progress-bar { width: 50%; }
+    body > progress:nth-child(4)::-moz-progress-bar { width: 1em; }
+    /* last one is for the default value: width=100%. */
+  </style>
+  <body>
+    <!-- Those will be used to change padding/margin on ::-moz-progress-bar -->
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+  </body>
+</html>
diff --git a/layout/reftests/forms/progress/reftest.list b/layout/reftests/forms/progress/reftest.list
index 66a512cd594e..1412ed7d90a9 100644
--- a/layout/reftests/forms/progress/reftest.list
+++ b/layout/reftests/forms/progress/reftest.list
@@ -4,6 +4,7 @@
 == margin-padding-rtl.html margin-padding-rtl-ref.html
 == bar-pseudo-element.html bar-pseudo-element-ref.html
 == bar-pseudo-element-rtl.html bar-pseudo-element-rtl-ref.html
+== indeterminate-style-width.html indeterminate-style-width-ref.html
 
 # The following test is disabled but kept in the repository because the
 # transformations will not behave exactly the same for <progress> and two divs.
diff --git a/layout/reftests/forms/progress/style.css b/layout/reftests/forms/progress/style.css
index 9635f5351c36..63db367696ca 100644
--- a/layout/reftests/forms/progress/style.css
+++ b/layout/reftests/forms/progress/style.css
@@ -17,6 +17,11 @@ div.progress-element {
 div.progress-bar {
   -moz-appearance: progresschunk;
   height: 100%;
+  /*
+   * We can't apply the following style to the reference because it will have
+   * underisable effectes:
+   * width: 100%;
+   */
 
   /* Default style in case of there is -moz-appearance: none; */
   background-color: ThreeDShadow;
diff --git a/layout/style/forms.css b/layout/style/forms.css
index b024cc5758a4..16c97459da0c 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -691,6 +691,7 @@ progress {
 
   -moz-appearance: progresschunk;
   height: 100%;
+  width: 100%;
 
   /* Default style in case of there is -moz-appearance: none; */
   background-color: ThreeDShadow;

From 091f77177703b5fd2090156ce14e568963de8233 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Fri, 6 May 2011 12:00:30 +0200
Subject: [PATCH 102/314] Bug 638176 - Make <progress> friendly with
 -moz-appearance:none and author styling. r=bz

---
 layout/forms/nsProgressFrame.cpp              | 23 +++++--
 layout/forms/nsProgressFrame.h                |  5 ++
 ...rogressbar-fallback-default-style-ref.html | 64 +++++++++++++++++++
 .../progressbar-fallback-default-style.html   | 20 ++++++
 widget/reftests/reftest.list                  |  1 +
 widget/src/xpwidgets/Makefile.in              |  3 +
 widget/src/xpwidgets/nsNativeTheme.cpp        | 14 ++++
 7 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 widget/reftests/progressbar-fallback-default-style-ref.html
 create mode 100644 widget/reftests/progressbar-fallback-default-style.html

diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index a203a0a00cb4..f2f05f8e11c6 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -137,6 +137,7 @@ nsProgressFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
 }
 
 NS_QUERYFRAME_HEAD(nsProgressFrame)
+  NS_QUERYFRAME_ENTRY(nsProgressFrame)
   NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
 NS_QUERYFRAME_TAIL_INHERITING(nsHTMLContainerFrame)
 
@@ -213,12 +214,11 @@ nsProgressFrame::ReflowBarFrame(nsIFrame*                aBarFrame,
   // The bar width is fixed in these cases:
   // - the progress position is determined: the bar width is fixed according
   //   to it's value.
-  // - the progress position is indeterminate and the bar appearance is the
-  //   native one ('progresschunk'): the bar width is forced to 100%.
+  // - the progress position is indeterminate and the bar appearance should be
+  //   shown as native: the bar width is forced to 100%.
   // Otherwise (when the progress is indeterminate and the bar appearance isn't
   // native), the bar width isn't fixed and can be set by the author.
-  if (position != -1 ||
-      aBarFrame->GetStyleDisplay()->mAppearance == NS_THEME_PROGRESSBAR_CHUNK) {
+  if (position != -1 || ShouldUseNativeStyle()) {
     width -= reflowState.mComputedMargin.LeftRight() +
              reflowState.mComputedBorderPadding.LeftRight();
     width = NS_MAX(width, 0);
@@ -272,3 +272,18 @@ nsProgressFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
   return autoSize;
 }
 
+bool
+nsProgressFrame::ShouldUseNativeStyle() const
+{
+  // Use the native style if these conditions are satisfied:
+  // - both frames use the native appearance;
+  // - neither frame has author specified rules setting the border or the
+  //   background.
+  return GetStyleDisplay()->mAppearance == NS_THEME_PROGRESSBAR &&
+         mBarDiv->GetPrimaryFrame()->GetStyleDisplay()->mAppearance == NS_THEME_PROGRESSBAR_CHUNK &&
+         !PresContext()->HasAuthorSpecifiedRules(const_cast<nsProgressFrame*>(this),
+                                                 NS_AUTHOR_SPECIFIED_BORDER | NS_AUTHOR_SPECIFIED_BACKGROUND) &&
+         !PresContext()->HasAuthorSpecifiedRules(mBarDiv->GetPrimaryFrame(),
+                                                 NS_AUTHOR_SPECIFIED_BORDER | NS_AUTHOR_SPECIFIED_BACKGROUND);
+}
+
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
index 2bf43d369f80..8fcae5821221 100644
--- a/layout/forms/nsProgressFrame.h
+++ b/layout/forms/nsProgressFrame.h
@@ -92,6 +92,11 @@ public:
       ~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
   }
 
+  /**
+   * Returns whether the frame and its child should use the native style.
+   */
+  bool ShouldUseNativeStyle() const;
+
 protected:
   // Helper function which reflow the anonymous div frame.
   void ReflowBarFrame(nsIFrame*                aBarFrame,
diff --git a/widget/reftests/progressbar-fallback-default-style-ref.html b/widget/reftests/progressbar-fallback-default-style-ref.html
new file mode 100644
index 000000000000..19cee0169171
--- /dev/null
+++ b/widget/reftests/progressbar-fallback-default-style-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html>
+  <style>
+    div.progress-element {
+      /**
+       * The purpose of this test is to not show the native style.
+       * -moz-appearance: progressbar;
+       */
+      display: inline-block;
+      height: 1em;
+      width: 10em;
+      vertical-align: -0.2em;
+
+      /* Default style in case of there is -moz-appearance: none; */
+      border: 2px solid;
+      -moz-border-top-colors: ThreeDShadow -moz-Dialog;
+      -moz-border-right-colors: ThreeDHighlight -moz-Dialog;
+      -moz-border-bottom-colors: ThreeDHighlight -moz-Dialog;
+      -moz-border-left-colors: ThreeDShadow -moz-Dialog;
+      background-color: -moz-Dialog;
+    }
+
+    div.progress-bar {
+      /**
+       * The purpose of this test is to not show the native style.
+       * -moz-appearance: progresschunk;
+       */
+
+      height: 100%;
+      width: 100%;
+
+      /* Default style in case of there is -moz-appearance: none; */
+      background-color: ThreeDShadow;
+    }
+
+    div.progress-element { padding: 5px; }
+    body > div:nth-child(1)  { -moz-appearance: none; }
+    body > div:nth-child(2) > .progress-bar { -moz-appearance: none; }
+    body > div:nth-child(3)  { background-color: red; }
+    body > div:nth-child(4) > .progress-bar { background-color: red; }
+    body > div:nth-child(5)  { border: 2px solid red; }
+    body > div:nth-child(6) > .progress-bar { border: 5px solid red; }
+  </style>
+  <body>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+    <div class="progress-element">
+      <div class="progress-bar"></div>
+    </div>
+  </body>
+</html>
diff --git a/widget/reftests/progressbar-fallback-default-style.html b/widget/reftests/progressbar-fallback-default-style.html
new file mode 100644
index 000000000000..7594e6555637
--- /dev/null
+++ b/widget/reftests/progressbar-fallback-default-style.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <style>
+    progress { padding: 5px }
+    body > progress:nth-child(1) { -moz-appearance: none; }
+    body > progress:nth-child(2)::-moz-progress-bar { -moz-appearance: none; }
+    body > progress:nth-child(3) { background-color: red; }
+    body > progress:nth-child(4)::-moz-progress-bar { background-color: red; }
+    body > progress:nth-child(5) { border: 2px solid red; }
+    body > progress:nth-child(6)::-moz-progress-bar { border: 5px solid red; }
+  </style>
+  <body>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+    <progress></progress>
+  </body>
+</html>
diff --git a/widget/reftests/reftest.list b/widget/reftests/reftest.list
index 36337fc45e0d..1cf1e1f3f3a6 100644
--- a/widget/reftests/reftest.list
+++ b/widget/reftests/reftest.list
@@ -1 +1,2 @@
 skip-if(!cocoaWidget) != 507947.html about:blank
+== progressbar-fallback-default-style.html progressbar-fallback-default-style-ref.html
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 8e73b77a0495..9c763ff9e6d1 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -100,6 +100,9 @@ endif
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../$(MOZ_WIDGET_TOOLKIT) \
 		-I$(srcdir)/../shared \
+		-I$(topsrcdir)/layout/forms \
+		-I$(topsrcdir)/layout/generic \
+		-I$(topsrcdir)/layout/xul/base/src \
 		-I$(srcdir) \
 		$(NULL)
 
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index 5e7a035e3166..b160102ae0d4 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -51,6 +51,7 @@
 #include "nsThemeConstants.h"
 #include "nsIComponentManager.h"
 #include "nsPIDOMWindow.h"
+#include "nsProgressFrame.h"
 
 nsNativeTheme::nsNativeTheme()
 : mAnimatedContentTimeout(PR_UINT32_MAX)
@@ -251,6 +252,19 @@ nsNativeTheme::IsWidgetStyled(nsPresContext* aPresContext, nsIFrame* aFrame,
     }
   }
 
+  /**
+   * Progress bar appearance should be the same for the bar and the container
+   * frame. nsProgressFrame owns the logic and will tell us what we should do.
+   */
+  if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK ||
+      aWidgetType == NS_THEME_PROGRESSBAR) {
+    nsProgressFrame* progressFrame = do_QueryFrame(aWidgetType == NS_THEME_PROGRESSBAR_CHUNK
+                                       ? aFrame->GetParent() : aFrame);
+    if (progressFrame) {
+      return !progressFrame->ShouldUseNativeStyle();
+    }
+  }
+
   return (aWidgetType == NS_THEME_BUTTON ||
           aWidgetType == NS_THEME_TEXTFIELD ||
           aWidgetType == NS_THEME_TEXTFIELD_MULTILINE ||

From 681ce1b32b182b2ef4e2110951c7984cacf5d924 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Tue, 1 Mar 2011 03:06:22 +0100
Subject: [PATCH 103/314] Bug 634088 - Use native rendering for indeterminate
 progress bar for Cocoa. r=mstange,roc

---
 widget/src/cocoa/nsNativeThemeCocoa.mm  | 4 ++--
 widget/src/xpwidgets/nsNativeTheme.cpp  | 7 ++++++-
 widget/src/xpwidgets/nsNativeTheme.h    | 2 +-
 widget/src/xpwidgets/nsWidgetAtomList.h | 1 +
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index cbb326e2383a..c2f8e3251d89 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -1759,13 +1759,13 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
       if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 30)) {
         NS_WARNING("Unable to animate progressbar!");
       }
-      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame),
+      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame, eventState),
                    PR_TRUE, GetProgressValue(aFrame),
                    GetProgressMaxValue(aFrame), aFrame);
       break;
 
     case NS_THEME_PROGRESSBAR_VERTICAL:
-      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame),
+      DrawProgress(cgContext, macRect, IsIndeterminateProgress(aFrame, eventState),
                    PR_FALSE, GetProgressValue(aFrame),
                    GetProgressMaxValue(aFrame), aFrame);
       break;
diff --git a/widget/src/xpwidgets/nsNativeTheme.cpp b/widget/src/xpwidgets/nsNativeTheme.cpp
index b160102ae0d4..dce6db986940 100644
--- a/widget/src/xpwidgets/nsNativeTheme.cpp
+++ b/widget/src/xpwidgets/nsNativeTheme.cpp
@@ -457,11 +457,16 @@ nsNativeTheme::IsNextToSelectedTab(nsIFrame* aFrame, PRInt32 aOffset)
 
 // progressbar:
 PRBool
-nsNativeTheme::IsIndeterminateProgress(nsIFrame* aFrame)
+nsNativeTheme::IsIndeterminateProgress(nsIFrame* aFrame,
+                                       nsEventStates aEventStates)
 {
   if (!aFrame)
     return PR_FALSE;
 
+  if (aFrame->GetContent()->IsHTML(nsWidgetAtoms::progress)) {
+    return aEventStates.HasState(NS_EVENT_STATE_INDETERMINATE);
+  }
+
   return aFrame->GetContent()->AttrValueIs(kNameSpaceID_None, nsWidgetAtoms::mode,
                                            NS_LITERAL_STRING("undetermined"),
                                            eCaseMatters);
diff --git a/widget/src/xpwidgets/nsNativeTheme.h b/widget/src/xpwidgets/nsNativeTheme.h
index 63c49b0db991..cdd0af946cde 100644
--- a/widget/src/xpwidgets/nsNativeTheme.h
+++ b/widget/src/xpwidgets/nsNativeTheme.h
@@ -160,7 +160,7 @@ class nsNativeTheme : public nsITimerCallback
   PRBool IsHorizontal(nsIFrame* aFrame);
 
   // progressbar:
-  PRBool IsIndeterminateProgress(nsIFrame* aFrame);
+  PRBool IsIndeterminateProgress(nsIFrame* aFrame, nsEventStates aEventStates);
 
   PRInt32 GetProgressValue(nsIFrame* aFrame) {
     return CheckIntAttr(aFrame, nsWidgetAtoms::value, 0);
diff --git a/widget/src/xpwidgets/nsWidgetAtomList.h b/widget/src/xpwidgets/nsWidgetAtomList.h
index b0b902cd08de..a629ef908125 100644
--- a/widget/src/xpwidgets/nsWidgetAtomList.h
+++ b/widget/src/xpwidgets/nsWidgetAtomList.h
@@ -104,6 +104,7 @@ WIDGET_ATOM(open, "open") // Whether or not a menu, tree, etc. is open
 WIDGET_ATOM(orient, "orient")
 WIDGET_ATOM(pageincrement, "pageincrement")
 WIDGET_ATOM(parentfocused, "parentfocused")
+WIDGET_ATOM(progress, "progress")
 WIDGET_ATOM(radio, "radio")
 WIDGET_ATOM(readonly, "readonly")
 WIDGET_ATOM(Reload, "Reload")

From 85055ecb5c15cf8780136a314ad0a7a43c808cc1 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 12 Apr 2011 21:18:37 +0300
Subject: [PATCH 104/314] Bug 632275 - Web Console: Error message when click on
 an object to create an inspect window; f=rcampbell r=dcamp,sdwilsh

---
 .../console/hudservice/PropertyPanel.jsm      | 42 ++++++++++++--
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...nsole_bug_632275_getters_document_width.js | 58 +++++++++++++++++++
 .../browser/test-bug-632275-getters.html      | 19 ++++++
 4 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 3ebad1877a18..9cff654e376d 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,6 +134,20 @@ function presentableValueFor(aObject)
   }
 }
 
+/**
+ * Tells if the given function is native or not.
+ *
+ * @param function aFunction
+ *        The function you want to check if it is native or not.
+ *
+ * @return boolean
+ *         True if the given function is native, false otherwise.
+ */
+function isNativeFunction(aFunction)
+{
+  return typeof aFunction == "function" && !("prototype" in aFunction);
+}
+
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -145,17 +159,33 @@ function presentableValueFor(aObject)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable;
+  let value, presentable, getter;
+
+  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
 
   for (var propName in aObject) {
-    try {
-      value = aObject[propName];
-      presentable = presentableValueFor(value);
-    }
-    catch (ex) {
+    // See bug 632275: skip deprecated width and height properties.
+    if (isDOMDocument && (propName == "width" || propName == "height")) {
       continue;
     }
 
+    // Also skip non-native getters.
+    // TODO: implement a safer way to skip non-native getters. See bug 647235.
+    getter = aObject.__lookupGetter__(propName);
+    if (getter && !isNativeFunction(getter)) {
+      value = ""; // Value is never displayed.
+      presentable = {type: TYPE_OTHER, display: "Getter"};
+    }
+    else {
+      try {
+        value = aObject[propName];
+        presentable = presentableValueFor(value);
+      }
+      catch (ex) {
+        continue;
+      }
+    }
+
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 87dd39e2d23a..b33842e3070e 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,6 +131,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
+	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -199,6 +200,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
+	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
new file mode 100644
index 000000000000..08b34e22ef7b
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+  let jsterm = HUD.jsterm;
+
+  let doc = content.wrappedJSObject.document;
+
+  let panel = jsterm.openPropertyPanel("Test1", doc);
+
+  let rows = panel.treeView._rows;
+  let find = function(regex) {
+    return rows.some(function(row) {
+      return regex.test(row.display);
+    });
+  };
+
+  ok(!find(/^(width|height):/), "no document.width/height");
+
+  panel.destroy();
+
+  let getterValue = doc.foobar._val;
+
+  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
+  rows = panel.treeView._rows;
+
+  is(getterValue, doc.foobar._val, "getter did not execute");
+  is(getterValue+1, doc.foobar.val, "getter executed");
+  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
+
+  ok(find(/^val: Getter$/),
+     "getter is properly displayed");
+
+  ok(find(new RegExp("^_val: " + getterValue + "$")),
+     "getter _val is properly displayed");
+
+  panel.destroy();
+
+  executeSoon(function() {
+    let textContent = HUD.outputNode.textContent;
+    is(textContent.indexOf("document.body.client"), -1,
+       "no document.width/height warning displayed");
+
+    finishTest();
+  });
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
new file mode 100644
index 000000000000..fbe4c7bf678a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 632275 - getters</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+
+<script type="application/javascript;version=1.8">
+  document.foobar = {
+    _val: 5,
+    get val() { return ++this._val; }
+  };
+</script>
+
+  </head>
+  <body>
+    <p>Web Console test for bug 632275 - getters.</p>
+  </body>
+</html>

From 1efb09873157dc0017b66237b4aa1c5280cc70f7 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 12 Apr 2011 17:00:29 -0300
Subject: [PATCH 105/314] Bug 620832 - Web console attempts to remove its
 observers multiple times; f=ddahl,rcampbell r=sdwilsh,rcampbell

---
 toolkit/components/console/hudservice/HUDService.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 6537de01233e..15491379f7ee 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      this.shutdown();
+      HUDService.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    HUDService.shutdown();
+    Services.obs.removeObserver(this, "xpcom-shutdown");
     this.initialConsoleCreated = false;
   },
 

From 3f79db3c8cd904da455da09340a55fa0298d329d Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Tue, 12 Apr 2011 20:54:14 -0300
Subject: [PATCH 106/314] backout bug 632275 and bug 620832, a=rcampbell,orange

---
 .../console/hudservice/HUDService.jsm         |  4 +-
 .../console/hudservice/PropertyPanel.jsm      | 42 ++------------
 .../hudservice/tests/browser/Makefile.in      |  2 -
 ...nsole_bug_632275_getters_document_width.js | 58 -------------------
 .../browser/test-bug-632275-getters.html      | 19 ------
 5 files changed, 8 insertions(+), 117 deletions(-)
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 delete mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 15491379f7ee..6537de01233e 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      HUDService.shutdown();
+      this.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    Services.obs.removeObserver(this, "xpcom-shutdown");
+    HUDService.shutdown();
     this.initialConsoleCreated = false;
   },
 
diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 9cff654e376d..3ebad1877a18 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,20 +134,6 @@ function presentableValueFor(aObject)
   }
 }
 
-/**
- * Tells if the given function is native or not.
- *
- * @param function aFunction
- *        The function you want to check if it is native or not.
- *
- * @return boolean
- *         True if the given function is native, false otherwise.
- */
-function isNativeFunction(aFunction)
-{
-  return typeof aFunction == "function" && !("prototype" in aFunction);
-}
-
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -159,33 +145,17 @@ function isNativeFunction(aFunction)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable, getter;
-
-  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
+  let value, presentable;
 
   for (var propName in aObject) {
-    // See bug 632275: skip deprecated width and height properties.
-    if (isDOMDocument && (propName == "width" || propName == "height")) {
+    try {
+      value = aObject[propName];
+      presentable = presentableValueFor(value);
+    }
+    catch (ex) {
       continue;
     }
 
-    // Also skip non-native getters.
-    // TODO: implement a safer way to skip non-native getters. See bug 647235.
-    getter = aObject.__lookupGetter__(propName);
-    if (getter && !isNativeFunction(getter)) {
-      value = ""; // Value is never displayed.
-      presentable = {type: TYPE_OTHER, display: "Getter"};
-    }
-    else {
-      try {
-        value = aObject[propName];
-        presentable = presentableValueFor(value);
-      }
-      catch (ex) {
-        continue;
-      }
-    }
-
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index b33842e3070e..87dd39e2d23a 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,7 +131,6 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
-	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -200,7 +199,6 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
-	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
deleted file mode 100644
index 08b34e22ef7b..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
-
-function test() {
-  addTab(TEST_URI);
-  browser.addEventListener("load", tabLoaded, true);
-}
-
-function tabLoaded() {
-  browser.removeEventListener("load", tabLoaded, true);
-  openConsole();
-
-  let hudId = HUDService.getHudIdByWindow(content);
-  let HUD = HUDService.hudReferences[hudId];
-  let jsterm = HUD.jsterm;
-
-  let doc = content.wrappedJSObject.document;
-
-  let panel = jsterm.openPropertyPanel("Test1", doc);
-
-  let rows = panel.treeView._rows;
-  let find = function(regex) {
-    return rows.some(function(row) {
-      return regex.test(row.display);
-    });
-  };
-
-  ok(!find(/^(width|height):/), "no document.width/height");
-
-  panel.destroy();
-
-  let getterValue = doc.foobar._val;
-
-  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
-  rows = panel.treeView._rows;
-
-  is(getterValue, doc.foobar._val, "getter did not execute");
-  is(getterValue+1, doc.foobar.val, "getter executed");
-  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
-
-  ok(find(/^val: Getter$/),
-     "getter is properly displayed");
-
-  ok(find(new RegExp("^_val: " + getterValue + "$")),
-     "getter _val is properly displayed");
-
-  panel.destroy();
-
-  executeSoon(function() {
-    let textContent = HUD.outputNode.textContent;
-    is(textContent.indexOf("document.body.client"), -1,
-       "no document.width/height warning displayed");
-
-    finishTest();
-  });
-}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
deleted file mode 100644
index fbe4c7bf678a..000000000000
--- a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>Web Console test for bug 632275 - getters</title>
-    <!-- Any copyright is dedicated to the Public Domain.
-         http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<script type="application/javascript;version=1.8">
-  document.foobar = {
-    _val: 5,
-    get val() { return ++this._val; }
-  };
-</script>
-
-  </head>
-  <body>
-    <p>Web Console test for bug 632275 - getters.</p>
-  </body>
-</html>

From 5e1f6515a2f9cb42c70915e35fd1fe62f20fb8a1 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 19:04:12 +0300
Subject: [PATCH 107/314] Bug 620832 - Web console attempts to remove its
 observers multiple times; f=ddahl,rcampbell r=sdwilsh,rcampbell

---
 toolkit/components/console/hudservice/HUDService.jsm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 20d87ca6a188..1c573e7f5d00 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3527,7 +3527,7 @@ let ConsoleAPIObserver = {
       HUDService.logConsoleAPIMessage(hudId, aMessage.level, aMessage.arguments);
     }
     else if (aTopic == "quit-application-granted") {
-      this.shutdown();
+      HUDService.shutdown();
     }
   },
 
@@ -5845,7 +5845,7 @@ HUDWindowObserver = {
   uninit: function HWO_uninit()
   {
     Services.obs.removeObserver(this, "content-document-global-created");
-    HUDService.shutdown();
+    Services.obs.removeObserver(this, "xpcom-shutdown");
     this.initialConsoleCreated = false;
   },
 

From 77fc545081e3624f8ed479e31062c8223fb3ca01 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Mon, 11 Apr 2011 20:48:15 +0300
Subject: [PATCH 108/314] Bug 585956 - Implement console.trace() in web
 console; f=ddahl r=rcampbell,jonas

---
 dom/base/ConsoleAPI.js                        | 33 +++++++-
 dom/tests/browser/browser_ConsoleAPITests.js  | 34 +++++++-
 dom/tests/browser/test-console-api.html       | 14 ++++
 .../mochitest/general/test_consoleAPI.html    |  1 +
 .../console/hudservice/HUDService.jsm         | 84 ++++++++++++++++++-
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...ser_webconsole_bug_585956_console_trace.js | 76 +++++++++++++++++
 .../test-bug-585956-console-trace.html        | 27 ++++++
 .../tests/browser/test-console-extras.html    |  1 -
 .../chrome/global/headsUpDisplay.properties   | 11 +++
 10 files changed, 274 insertions(+), 9 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html

diff --git a/dom/base/ConsoleAPI.js b/dom/base/ConsoleAPI.js
index 1a383f7d37a2..194595ee4690 100644
--- a/dom/base/ConsoleAPI.js
+++ b/dom/base/ConsoleAPI.js
@@ -21,6 +21,7 @@
  *  David Dahl <ddahl@mozilla.com>  (Original Author)
  *  Ryan Flint <rflint@mozilla.com>
  *  Rob Campbell <rcampbell@mozilla.com>
+ *  Mihai Sucan <mihai.sucan@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
@@ -79,12 +80,16 @@ ConsoleAPI.prototype = {
       debug: function CA_debug() {
         self.notifyObservers(id, "log", arguments);
       },
+      trace: function CA_trace() {
+        self.notifyObservers(id, "trace", self.getStackTrace());
+      },
       __exposedProps__: {
         log: "r",
         info: "r",
         warn: "r",
         error: "r",
         debug: "r",
+        trace: "r",
       }
     };
 
@@ -100,6 +105,7 @@ ConsoleAPI.prototype = {
             warn: bind.call(x.warn, x),\
             error: bind.call(x.error, x),\
             debug: bind.call(x.debug, x),\
+            trace: bind.call(x.trace, x),\
             __noSuchMethod__: function() {}\
           };\
           Object.defineProperty(obj, '__mozillaConsole__', { value: true });\
@@ -126,7 +132,32 @@ ConsoleAPI.prototype = {
 
     Services.obs.notifyObservers(consoleEvent,
                                  "console-api-log-event", aID);
-  }
+  },
+
+  /**
+   * Build the stacktrace array for the console.trace() call.
+   *
+   * @return array
+   *         Each element is a stack frame that holds the following properties:
+   *         filename, lineNumber, functionName and language.
+   **/
+  getStackTrace: function CA_getStackTrace() {
+    let stack = [];
+    let frame = Components.stack.caller;
+    while (frame = frame.caller) {
+      if (frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT ||
+          frame.language == Ci.nsIProgrammingLanguage.JAVASCRIPT2) {
+        stack.push({
+          filename: frame.filename,
+          lineNumber: frame.lineNumber,
+          functionName: frame.name,
+          language: frame.language,
+        });
+      }
+    }
+
+    return stack;
+  },
 };
 
 let NSGetFactory = XPCOMUtils.generateNSGetFactory([ConsoleAPI]);
diff --git a/dom/tests/browser/browser_ConsoleAPITests.js b/dom/tests/browser/browser_ConsoleAPITests.js
index aa82a285809b..4c086a85ae26 100644
--- a/dom/tests/browser/browser_ConsoleAPITests.js
+++ b/dom/tests/browser/browser_ConsoleAPITests.js
@@ -21,6 +21,7 @@
  * Contributor(s):
  *  David Dahl <ddahl@mozilla.com>
  *  Rob Campbell <rcampbell@mozilla.com>
+ *  Mihai Sucan <mihai.sucan@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
@@ -73,15 +74,39 @@ function testConsoleData(aMessageObject) {
   is(aMessageObject.level, gLevel, "expected level received");
   ok(aMessageObject.arguments, "we have arguments");
   is(aMessageObject.arguments.length, gArgs.length, "arguments.length matches");
-  gArgs.forEach(function (a, i) {
-    is(aMessageObject.arguments[i], a, "correct arg " + i);
-  });
 
-  if (aMessageObject.level == "error") {
+  if (gLevel == "trace") {
+    is(aMessageObject.arguments.toSource(), gArgs.toSource(),
+       "stack trace is correct");
+
     // Test finished
     ConsoleObserver.destroy();
     finish();
   }
+  else {
+    gArgs.forEach(function (a, i) {
+      is(aMessageObject.arguments[i], a, "correct arg " + i);
+    });
+  }
+
+  if (aMessageObject.level == "error") {
+    // Now test console.trace()
+    startTraceTest();
+  }
+}
+
+function startTraceTest() {
+  gLevel = "trace";
+  gArgs = [
+    {filename: TEST_URI, lineNumber: 6, functionName: null, language: 2},
+    {filename: TEST_URI, lineNumber: 11, functionName: "foobar585956b", language: 2},
+    {filename: TEST_URI, lineNumber: 15, functionName: "foobar585956a", language: 2},
+    {filename: TEST_URI, lineNumber: 1, functionName: "onclick", language: 2}
+  ];
+
+  let button = gWindow.document.getElementById("test-trace");
+  ok(button, "found #test-trace button");
+  EventUtils.synthesizeMouse(button, 2, 2, {}, gWindow);
 }
 
 var gLevel, gArgs;
@@ -114,6 +139,7 @@ function consoleAPISanityTest() {
   ok(win.console.info, "console.info is here");
   ok(win.console.warn, "console.warn is here");
   ok(win.console.error, "console.error is here");
+  ok(win.console.trace, "console.trace is here");
 }
 
 var ConsoleObserver = {
diff --git a/dom/tests/browser/test-console-api.html b/dom/tests/browser/test-console-api.html
index 235275b430e3..ea58306f420f 100644
--- a/dom/tests/browser/test-console-api.html
+++ b/dom/tests/browser/test-console-api.html
@@ -2,6 +2,19 @@
 <html dir="ltr" xml:lang="en-US" lang="en-US"><head>
     <title>Console API test page</title>
     <script type="text/javascript">
+      window.foobar585956c = function(a) {
+        console.trace();
+        return a+"c";
+      };
+
+      function foobar585956b(a) {
+        return foobar585956c(a+"b");
+      }
+
+      function foobar585956a(omg) {
+        return foobar585956b(omg + "a");
+      }
+
       function test() {
         var str = "Test Message."
         console.foobar(str); // if this throws, we don't execute following funcs
@@ -15,5 +28,6 @@
   <body>
     <h1>Console API Test Page</h1>
     <button onclick="test();">Log stuff</button>
+    <button id="test-trace" onclick="foobar585956a('omg');">Test trace</button>
   </body>
 </html>
diff --git a/dom/tests/mochitest/general/test_consoleAPI.html b/dom/tests/mochitest/general/test_consoleAPI.html
index c99867446c29..f12077e851e5 100644
--- a/dom/tests/mochitest/general/test_consoleAPI.html
+++ b/dom/tests/mochitest/general/test_consoleAPI.html
@@ -26,6 +26,7 @@ function doTest() {
     "warn": "function",
     "error": "function",
     "debug": "function",
+    "trace": "function",
     "__noSuchMethod__": "function"
   };
 
diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 1c573e7f5d00..6936a76810c8 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -145,6 +145,7 @@ const LEVELS = {
   warn: SEVERITY_WARNING,
   info: SEVERITY_INFO,
   log: SEVERITY_LOG,
+  trace: SEVERITY_LOG,
 };
 
 // The lowest HTTP response code (inclusive) that is considered an error.
@@ -1981,12 +1982,89 @@ HUD_SERVICE.prototype =
     function formatResult(x) {
       return (typeof(x) == "string") ? x : hud.jsterm.formatResult(x);
     }
-    let mappedArguments = Array.map(aArguments, formatResult);
-    let joinedArguments = Array.join(mappedArguments, " ");
+
+    let body = null;
+    let clipboardText = null;
+    let sourceURL = null;
+    let sourceLine = 0;
+
+    switch (aLevel) {
+      case "log":
+      case "info":
+      case "warn":
+      case "error":
+      case "debug":
+        let mappedArguments = Array.map(aArguments, formatResult);
+        body = Array.join(mappedArguments, " ");
+        break;
+
+      case "trace":
+        let filename = ConsoleUtils.abbreviateSourceURL(aArguments[0].filename);
+        let functionName = aArguments[0].functionName ||
+                           this.getStr("stacktrace.anonymousFunction");
+        let lineNumber = aArguments[0].lineNumber;
+
+        body = this.getFormatStr("stacktrace.outputMessage",
+                                 [filename, functionName, lineNumber]);
+
+        sourceURL = aArguments[0].filename;
+        sourceLine = aArguments[0].lineNumber;
+
+        clipboardText = "";
+
+        aArguments.forEach(function(aFrame) {
+          clipboardText += aFrame.filename + " :: " +
+                           aFrame.functionName + " :: " +
+                           aFrame.lineNumber + "\n";
+        });
+
+        clipboardText = clipboardText.trimRight();
+        break;
+
+      default:
+        Cu.reportError("Unknown Console API log level: " + aLevel);
+        return;
+    }
+
     let node = ConsoleUtils.createMessageNode(hud.outputNode.ownerDocument,
                                               CATEGORY_WEBDEV,
                                               LEVELS[aLevel],
-                                              joinedArguments);
+                                              body,
+                                              sourceURL,
+                                              sourceLine,
+                                              clipboardText);
+
+    // Make the node bring up the property panel, to allow the user to inspect
+    // the stack trace.
+    if (aLevel == "trace") {
+      node._stacktrace = aArguments;
+
+      let linkNode = node.querySelector(".webconsole-msg-body");
+      linkNode.classList.add("hud-clickable");
+      linkNode.setAttribute("aria-haspopup", "true");
+
+      node.addEventListener("mousedown", function(aEvent) {
+        this._startX = aEvent.clientX;
+        this._startY = aEvent.clientY;
+      }, false);
+
+      node.addEventListener("click", function(aEvent) {
+        if (aEvent.detail != 1 || aEvent.button != 0 ||
+            (this._startX != aEvent.clientX &&
+             this._startY != aEvent.clientY)) {
+          return;
+        }
+
+        if (!this._panelOpen) {
+          let propPanel = hud.jsterm.openPropertyPanel(null,
+                                                       node._stacktrace,
+                                                       this);
+          propPanel.panel.setAttribute("hudId", aHUDId);
+          this._panelOpen = true;
+        }
+      }, false);
+    }
+
     ConsoleUtils.outputMessageNode(node, aHUDId);
   },
 
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 87dd39e2d23a..2da05635fa93 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -131,6 +131,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
+	browser_webconsole_bug_585956_console_trace.js \
 	head.js \
 	$(NULL)
 
@@ -199,6 +200,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-630733-response-redirect-headers.sjs \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
+	test-bug-585956-console-trace.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
new file mode 100644
index 000000000000..16a1bf133a53
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_585956_console_trace.js
@@ -0,0 +1,76 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** 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 Web Console test suite.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mihai Sucan <mihai.sucan@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 ***** */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+
+  openConsole();
+
+  browser.addEventListener("load", tabReloaded, true);
+  content.location.reload();
+}
+
+function tabReloaded() {
+  browser.removeEventListener("load", tabReloaded, true);
+
+  // The expected stack trace object.
+  let stacktrace = [
+    { filename: TEST_URI, lineNumber: 9, functionName: null, language: 2 },
+    { filename: TEST_URI, lineNumber: 14, functionName: "foobar585956b", language: 2 },
+    { filename: TEST_URI, lineNumber: 18, functionName: "foobar585956a", language: 2 },
+    { filename: TEST_URI, lineNumber: 21, functionName: null, language: 2 }
+  ];
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+
+  let node = HUD.outputNode.querySelector(".hud-log");
+  ok(node, "found trace log node");
+  ok(node._stacktrace, "found stacktrace object");
+  is(node._stacktrace.toSource(), stacktrace.toSource(), "stacktrace is correct");
+  isnot(node.textContent.indexOf("bug-585956"), -1, "found file name");
+
+  finishTest();
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html b/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
new file mode 100644
index 000000000000..52571bc64be2
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-585956-console-trace.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 585956 - console.trace()</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+<script type="application/javascript">
+window.foobar585956c = function(a) {
+  console.trace();
+  return a+"c";
+};
+
+function foobar585956b(a) {
+  return foobar585956c(a+"b");
+}
+
+function foobar585956a(omg) {
+  return foobar585956b(omg + "a");
+}
+
+foobar585956a("omg");
+</script>
+  </head>
+  <body>
+    <p>Web Console test for bug 585956 - console.trace().</p>
+  </body>
+</html>
diff --git a/toolkit/components/console/hudservice/tests/browser/test-console-extras.html b/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
index 65f5675fffc5..cb5f958a2806 100644
--- a/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
+++ b/toolkit/components/console/hudservice/tests/browser/test-console-extras.html
@@ -11,7 +11,6 @@
         console.clear()
         console.dir()
         console.dirxml()
-        console.trace()
         console.group()
         console.groupCollapsed()
         console.groupEnd()
diff --git a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
index 14719e375e0e..34f6c504ad07 100644
--- a/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
+++ b/toolkit/locales/en-US/chrome/global/headsUpDisplay.properties
@@ -114,3 +114,14 @@ NetworkPanel.imageSizeDeltaDurationMS=%Sx%Spx, Δ%Sms
 #  o music/crescendo
 NetworkPanel.responseBodyUnableToDisplay.content=Unable to display responses of type "%S"
 ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
+
+# LOCALIZATION NOTE (stacktrace.anonymousFunction):
+# This string is used to display JavaScript functions that have no given name -
+# they are said to be anonymous. See stacktrace.outputMessage.
+stacktrace.anonymousFunction=<anonymous>
+
+# LOCALIZATION NOTE (stacktrace.outputMessage):
+# This string is used in the Web Console output to identify a web developer call
+# to console.trace(). The stack trace of JavaScript function calls is displayed.
+# In this minimal message we only show the last call.
+stacktrace.outputMessage=Stack trace from %S, function %S, line %S.

From c60aded6c2930bebd7f7e3eeaf4b5bf0296b6b16 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 23:02:36 +0300
Subject: [PATCH 109/314] Bug 595223 - Keep track of file:// url 'loadGroups';
 f=ddahl r=dcamp,dolske

---
 .../console/hudservice/HUDService.jsm         | 119 ++++++++++++++----
 .../hudservice/tests/browser/Makefile.in      |   1 +
 .../browser_webconsole_bug_595223_file_uri.js |  79 ++++++++++++
 3 files changed, 175 insertions(+), 24 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 6936a76810c8..b9ceec95daab 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -1439,7 +1439,8 @@ HUD_SERVICE.prototype =
    */
   deactivateHUDForContext: function HS_deactivateHUDForContext(aContext, aAnimated)
   {
-    let window = aContext.linkedBrowser.contentWindow;
+    let browser = aContext.linkedBrowser;
+    let window = browser.contentWindow;
     let nBox = aContext.ownerDocument.defaultView.
       getNotificationBox(window);
     let hudId = "hud_" + nBox.id;
@@ -1450,7 +1451,12 @@ HUD_SERVICE.prototype =
         this.storeHeight(hudId);
       }
 
+      let hud = this.hudReferences[hudId];
+      browser.webProgress.removeProgressListener(hud.progressListener);
+      delete hud.progressListener;
+
       this.unregisterDisplay(displayNode);
+
       window.focus();
     }
   },
@@ -2718,27 +2724,6 @@ HUD_SERVICE.prototype =
     13: "typeWarning", // JSREPORT_STRICT_MODE_ERROR | JSREPORT_WARNING | JSREPORT_ERROR
   },
 
-  /**
-   * Closes the Console, if any, that resides on the given tab.
-   *
-   * @param nsIDOMNode aTab
-   *        The tab on which to close the console.
-   * @returns void
-   */
-  closeConsoleOnTab: function HS_closeConsoleOnTab(aTab)
-  {
-    let xulDocument = aTab.ownerDocument;
-    let xulWindow = xulDocument.defaultView;
-    let gBrowser = xulWindow.gBrowser;
-    let linkedBrowser = aTab.linkedBrowser;
-    let notificationBox = gBrowser.getNotificationBox(linkedBrowser);
-    let hudId = "hud_" + notificationBox.getAttribute("id");
-    let outputNode = xulDocument.getElementById(hudId);
-    if (outputNode != null) {
-      this.unregisterDisplay(outputNode);
-    }
-  },
-
   /**
    * onTabClose event handler function
    *
@@ -2747,7 +2732,7 @@ HUD_SERVICE.prototype =
    */
   onTabClose: function HS_onTabClose(aEvent)
   {
-    this.closeConsoleOnTab(aEvent.target);
+    this.deactivateHUDForContext(aEvent.target, false);
   },
 
   /**
@@ -2765,7 +2750,7 @@ HUD_SERVICE.prototype =
 
     let tab = tabContainer.firstChild;
     while (tab != null) {
-      this.closeConsoleOnTab(tab);
+      this.deactivateHUDForContext(tab, false);
       tab = tab.nextSibling;
     }
   },
@@ -2837,6 +2822,11 @@ HUD_SERVICE.prototype =
       HUDService.registerHUDReference(hud);
       let windowId = this.getWindowId(aContentWindow.top);
       this.windowIds[windowId] = hudId;
+
+      hud.progressListener = new ConsoleProgressListener(hudId);
+
+      _browser.webProgress.addProgressListener(hud.progressListener,
+        Ci.nsIWebProgress.NOTIFY_STATE_ALL);
     }
     else {
       hud = this.hudReferences[hudId];
@@ -6085,6 +6075,87 @@ HUDConsoleObserver = {
   }
 };
 
+/**
+ * A WebProgressListener that listens for location changes, to update HUDService
+ * state information on page navigation.
+ *
+ * @constructor
+ * @param string aHudId
+ *        The HeadsUpDisplay ID.
+ */
+function ConsoleProgressListener(aHudId)
+{
+  this.hudId = aHudId;
+}
+
+ConsoleProgressListener.prototype = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIWebProgressListener,
+                                         Ci.nsISupportsWeakReference]),
+
+  onStateChange: function CPL_onStateChange(aProgress, aRequest, aState,
+                                            aStatus)
+  {
+    if (!(aState & Ci.nsIWebProgressListener.STATE_START)) {
+      return;
+    }
+
+    let uri = null;
+    if (aRequest instanceof Ci.imgIRequest) {
+      let imgIRequest = aRequest.QueryInterface(Ci.imgIRequest);
+      uri = imgIRequest.URI;
+    }
+    else if (aRequest instanceof Ci.nsIChannel) {
+      let nsIChannel = aRequest.QueryInterface(Ci.nsIChannel);
+      uri = nsIChannel.URI;
+    }
+
+    if (!uri || !uri.schemeIs("file") && !uri.schemeIs("ftp")) {
+      return;
+    }
+
+    let outputNode = HUDService.hudReferences[this.hudId].outputNode;
+
+    let chromeDocument = outputNode.ownerDocument;
+    let msgNode = chromeDocument.createElementNS(HTML_NS, "html:span");
+
+    // Create the clickable URL part of the message.
+    let linkNode = chromeDocument.createElementNS(HTML_NS, "html:span");
+    linkNode.appendChild(chromeDocument.createTextNode(uri.spec));
+    linkNode.classList.add("hud-clickable");
+    linkNode.classList.add("webconsole-msg-url");
+
+    linkNode.addEventListener("mousedown", function(aEvent) {
+      this._startX = aEvent.clientX;
+      this._startY = aEvent.clientY;
+    }, false);
+
+    linkNode.addEventListener("click", function(aEvent) {
+      if (aEvent.detail == 1 && aEvent.button == 0 &&
+          this._startX == aEvent.clientX && this._startY == aEvent.clientY) {
+        let viewSourceUtils = chromeDocument.defaultView.gViewSourceUtils;
+        viewSourceUtils.viewSource(uri.spec, null, chromeDocument);
+      }
+    }, false);
+
+    msgNode.appendChild(linkNode);
+
+    let messageNode = ConsoleUtils.createMessageNode(chromeDocument,
+                                                     CATEGORY_NETWORK,
+                                                     SEVERITY_LOG,
+                                                     msgNode,
+                                                     null,
+                                                     null,
+                                                     uri.spec);
+
+    ConsoleUtils.outputMessageNode(messageNode, this.hudId);
+  },
+
+  onLocationChange: function() {},
+  onStatusChange: function() {},
+  onProgressChange: function() {},
+  onSecurityChange: function() {},
+};
+
 ///////////////////////////////////////////////////////////////////////////
 // appName
 ///////////////////////////////////////////////////////////////////////////
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 2da05635fa93..2f18d02814b6 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -132,6 +132,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
 	browser_webconsole_bug_585956_console_trace.js \
+	browser_webconsole_bug_595223_file_uri.js \
 	head.js \
 	$(NULL)
 
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
new file mode 100644
index 000000000000..1fd37b4ea35a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_595223_file_uri.js
@@ -0,0 +1,79 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** 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 Web Console test suite.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mihai Sucan <mihai.sucan@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 ***** */
+
+const TEST_FILE = "test-network.html";
+
+function tabLoad(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  hud = HUDService.hudReferences[hudId];
+
+  browser.addEventListener("load", tabReload, true);
+
+  content.location.reload();
+}
+
+function tabReload(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+
+  let textContent = hud.outputNode.textContent;
+  isnot(textContent.indexOf("test-network.html"), -1,
+        "found test-network.html");
+  isnot(textContent.indexOf("test-image.png"), -1, "found test-image.png");
+  isnot(textContent.indexOf("testscript.js"), -1, "found testscript.js");
+  isnot(textContent.indexOf("running network console logging tests"), -1,
+        "found the console.log() message from testscript.js");
+
+  finishTest();
+}
+
+function test() {
+  let jar = getJar(getRootDirectory(gTestPath));
+  let dir = jar ?
+            extractJarToTmp(jar) :
+            getChromeDir(getResolvedURI(gTestPath));
+  dir.append(TEST_FILE);
+
+  let uri = Services.io.newFileURI(dir);
+
+  addTab(uri.spec);
+  browser.addEventListener("load", tabLoad, true);
+}

From 8a438cd825f8bb8c3e28df5a811ff961340b6d39 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 13 Apr 2011 21:05:15 +0300
Subject: [PATCH 110/314] Bug 632275 - Web Console: Error message when click on
 an object to create an inspect window; f=rcampbell r=dcamp,sdwilsh

---
 .../console/hudservice/PropertyPanel.jsm      | 43 ++++++++++++--
 .../hudservice/tests/browser/Makefile.in      |  2 +
 ...nsole_bug_632275_getters_document_width.js | 58 +++++++++++++++++++
 .../browser/test-bug-632275-getters.html      | 19 ++++++
 4 files changed, 116 insertions(+), 6 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
 create mode 100644 toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html

diff --git a/toolkit/components/console/hudservice/PropertyPanel.jsm b/toolkit/components/console/hudservice/PropertyPanel.jsm
index 3ebad1877a18..b23ba617c8ee 100644
--- a/toolkit/components/console/hudservice/PropertyPanel.jsm
+++ b/toolkit/components/console/hudservice/PropertyPanel.jsm
@@ -134,6 +134,20 @@ function presentableValueFor(aObject)
   }
 }
 
+/**
+ * Tells if the given function is native or not.
+ *
+ * @param function aFunction
+ *        The function you want to check if it is native or not.
+ *
+ * @return boolean
+ *         True if the given function is native, false otherwise.
+ */
+function isNativeFunction(aFunction)
+{
+  return typeof aFunction == "function" && !("prototype" in aFunction);
+}
+
 /**
  * Get an array of property name value pairs for the tree.
  *
@@ -145,17 +159,34 @@ function presentableValueFor(aObject)
 function namesAndValuesOf(aObject)
 {
   let pairs = [];
-  let value, presentable;
+  let value, presentable, getter;
+
+  let isDOMDocument = aObject instanceof Ci.nsIDOMDocument;
 
   for (var propName in aObject) {
-    try {
-      value = aObject[propName];
-      presentable = presentableValueFor(value);
-    }
-    catch (ex) {
+    // See bug 632275: skip deprecated width and height properties.
+    if (isDOMDocument && (propName == "width" || propName == "height")) {
       continue;
     }
 
+    // Also skip non-native getters.
+    // TODO: implement a safer way to skip non-native getters. See bug 647235.
+    getter = aObject.__lookupGetter__ ?
+             aObject.__lookupGetter__(propName) : null;
+    if (getter && !isNativeFunction(getter)) {
+      value = ""; // Value is never displayed.
+      presentable = {type: TYPE_OTHER, display: "Getter"};
+    }
+    else {
+      try {
+        value = aObject[propName];
+        presentable = presentableValueFor(value);
+      }
+      catch (ex) {
+        continue;
+      }
+    }
+
     let pair = {};
     pair.name = propName;
     pair.display = propName + ": " + presentable.display;
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 2f18d02814b6..1f5e71eb67fe 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -133,6 +133,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_642108_pruneTest.js \
 	browser_webconsole_bug_585956_console_trace.js \
 	browser_webconsole_bug_595223_file_uri.js \
+	browser_webconsole_bug_632275_getters_document_width.js \
 	head.js \
 	$(NULL)
 
@@ -202,6 +203,7 @@ _BROWSER_TEST_PAGES = \
 	test-bug-621644-jsterm-dollar.html \
 	test-bug-632347-iterators-generators.html \
 	test-bug-585956-console-trace.html \
+	test-bug-632275-getters.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
new file mode 100644
index 000000000000..08b34e22ef7b
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_632275_getters_document_width.js
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "http://example.com/browser/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html";
+
+function test() {
+  addTab(TEST_URI);
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded() {
+  browser.removeEventListener("load", tabLoaded, true);
+  openConsole();
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  let HUD = HUDService.hudReferences[hudId];
+  let jsterm = HUD.jsterm;
+
+  let doc = content.wrappedJSObject.document;
+
+  let panel = jsterm.openPropertyPanel("Test1", doc);
+
+  let rows = panel.treeView._rows;
+  let find = function(regex) {
+    return rows.some(function(row) {
+      return regex.test(row.display);
+    });
+  };
+
+  ok(!find(/^(width|height):/), "no document.width/height");
+
+  panel.destroy();
+
+  let getterValue = doc.foobar._val;
+
+  panel = jsterm.openPropertyPanel("Test2", doc.foobar);
+  rows = panel.treeView._rows;
+
+  is(getterValue, doc.foobar._val, "getter did not execute");
+  is(getterValue+1, doc.foobar.val, "getter executed");
+  is(getterValue+1, doc.foobar._val, "getter executed (recheck)");
+
+  ok(find(/^val: Getter$/),
+     "getter is properly displayed");
+
+  ok(find(new RegExp("^_val: " + getterValue + "$")),
+     "getter _val is properly displayed");
+
+  panel.destroy();
+
+  executeSoon(function() {
+    let textContent = HUD.outputNode.textContent;
+    is(textContent.indexOf("document.body.client"), -1,
+       "no document.width/height warning displayed");
+
+    finishTest();
+  });
+}
diff --git a/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
new file mode 100644
index 000000000000..fbe4c7bf678a
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/test-bug-632275-getters.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Web Console test for bug 632275 - getters</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+
+<script type="application/javascript;version=1.8">
+  document.foobar = {
+    _val: 5,
+    get val() { return ++this._val; }
+  };
+</script>
+
+  </head>
+  <body>
+    <p>Web Console test for bug 632275 - getters.</p>
+  </body>
+</html>

From 3b6a01e37a16abae5b04e8dba73cf7cd71666081 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 20 Apr 2011 11:18:00 +0300
Subject: [PATCH 111/314] Bug 642176 - Integrate Workspace extension into the
 browser; f=rcampbell r=ddahl,sdwilsh

---
 browser/app/profile/firefox.js                |   3 +
 browser/base/content/browser-appmenu.inc      |   5 +
 browser/base/content/browser-menubar.inc      |   5 +
 browser/base/content/browser-sets.inc         |   3 +
 browser/base/content/browser.js               |  24 +
 browser/base/content/workspace.js             | 552 ++++++++++++++++++
 browser/base/content/workspace.xul            | 331 +++++++++++
 browser/base/jar.mn                           |   2 +
 .../locales/en-US/chrome/browser/browser.dtd  |   4 +
 .../en-US/chrome/browser/workspace.dtd        |  88 +++
 .../en-US/chrome/browser/workspace.properties |  30 +
 browser/locales/jar.mn                        |   2 +
 .../console/hudservice/HUDService.jsm         |  12 +
 13 files changed, 1061 insertions(+)
 create mode 100644 browser/base/content/workspace.js
 create mode 100644 browser/base/content/workspace.xul
 create mode 100644 browser/locales/en-US/chrome/browser/workspace.dtd
 create mode 100644 browser/locales/en-US/chrome/browser/workspace.properties

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 7cdde5cc8f31..f71d071e2cd2 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1047,6 +1047,9 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 pref("devtools.errorconsole.enabled", false);
 pref("devtools.inspector.enabled", false);
 
+// Enable the Workspace tool.
+pref("devtools.workspace.enabled", true);
+
 // The last Web Console height. This is initially 0 which means that the Web
 // Console will use the default height next time it shows.
 // Change to -1 if you do not want the Web Console to remember its last height.
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 17ed11006397..296b7cd207db 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -187,6 +187,11 @@
                     type="checkbox"
                     command="Tools:Inspect"
                     key="key_inspect"/>
+          <menuitem id="appmenu_workspace"
+                    hidden="true"
+                    label="&workspace.label;"
+                    key="key_workspace"
+                    command="Tools:Workspace"/>
           <menuitem id="appmenu_pageSource"
                     label="&viewPageSourceCmd.label;"
                     command="View:PageSource"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 2f1c4674e029..0aa6613600c8 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -550,6 +550,11 @@
                         accesskey="&webConsoleCmd.accesskey;"
                         key="key_webConsole"
                         oncommand="HUDConsoleUI.toggleHUD();"/>
+              <menuitem id="menu_workspace"
+                        hidden="true"
+                        label="&workspace.label;"
+                        key="key_workspace"
+                        command="Tools:Workspace"/>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 19a212a0774b..59fa6f1bdf9b 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -125,6 +125,7 @@
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
+    <command id="Tools:Workspace" oncommand="Workspace.openWorkspace();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -241,6 +242,8 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
     <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
     <key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
+    <key id="key_workspace" keycode="&workspace.keycode;"
+         keytext="&workspace.keytext;" command="Tools:Workspace"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7d1cd26fcd6f..ac97d646cc38 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -54,6 +54,7 @@
 #   Rob Campbell <rcampbell@mozilla.com>
 #   David Dahl <ddahl@mozilla.com>
 #   Patrick Walton <pcwalton@mozilla.com>
+#   Mihai Sucan <mihai.sucan@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
@@ -1662,6 +1663,16 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
 #endif
   }
 
+  // Enable Workspace in the UI, if the preference allows this.
+  let workspaceEnabled = gPrefService.getBoolPref(Workspace.prefEnabledName);
+  if (workspaceEnabled) {
+    document.getElementById("menu_workspace").hidden = false;
+    document.getElementById("Tools:Workspace").removeAttribute("disabled");
+#ifdef MENUBAR_CAN_AUTOHIDE
+    document.getElementById("appmenu_workspace").hidden = false;
+#endif
+  }
+
 #ifdef MENUBAR_CAN_AUTOHIDE
   // If the user (or the locale) hasn't enabled the top-level "Character
   // Encoding" menu via the "browser.menu.showCharacterEncoding" preference,
@@ -8607,6 +8618,19 @@ function toggleAddonBar() {
   setToolbarVisibility(addonBar, addonBar.collapsed);
 }
 
+var Workspace = {
+  prefEnabledName: "devtools.workspace.enabled",
+
+  openWorkspace: function WS_openWorkspace() {
+    const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
+    const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+
+    return Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
+                                  WORKSPACE_WINDOW_FEATURES, null);
+  },
+};
+
+
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
   // Only show resizers on Windows 2000 and XP
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
new file mode 100644
index 000000000000..0f69fca8bac3
--- /dev/null
+++ b/browser/base/content/workspace.js
@@ -0,0 +1,552 @@
+/* vim:set ts=2 sw=2 sts=2 et:
+ * ***** 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 Workspace.
+ *
+ * The Initial Developer of the Original Code is
+ * The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Rob Campbell <robcee@mozilla.com> (original author)
+ *   Erik Vold <erikvvold@gmail.com>
+ *   David Dahl <ddahl@mozilla.com>
+ *   Mihai Sucan <mihai.sucan@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 *****/
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource:///modules/PropertyPanel.jsm");
+
+const WORKSPACE_CONTEXT_CONTENT = 1;
+const WORKSPACE_CONTEXT_CHROME = 2;
+const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
+const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
+const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+
+/**
+ * The workspace object handles the Workspace window functionality.
+ */
+var Workspace = {
+  /**
+   * The script execution context. This tells Workspace in which context the
+   * script shall execute.
+   *
+   * Possible values:
+   *   - WORKSPACE_CONTEXT_CONTENT to execute code in the context of the current
+   *   tab content window object.
+   *   - WORKSPACE_CONTEXT_CHROME to execute code in the context of the
+   *   currently active chrome window object.
+   */
+  executionContext: WORKSPACE_CONTEXT_CONTENT,
+
+  /**
+   * Retrieve the xul:textbox DOM element. This element holds the source code
+   * the user writes and executes.
+   */
+  get textbox() document.getElementById("workspace-textbox"),
+
+  /**
+   * Retrieve the xul:statusbarpanel DOM element. The status bar tells the
+   * current code execution context.
+   */
+  get statusbarStatus() document.getElementById("workspace-status"),
+
+  /**
+   * Get the selected text from the textbox.
+   */
+  get selectedText()
+  {
+    return this.textbox.value.substring(this.textbox.selectionStart,
+                                        this.textbox.selectionEnd);
+  },
+
+  /**
+   * Get the most recent chrome window of type navigator:browser.
+   */
+  get browserWindow() Services.wm.getMostRecentWindow("navigator:browser"),
+
+  /**
+   * Get the gBrowser object of the most recent browser window.
+   */
+  get gBrowser()
+  {
+    let recentWin = this.browserWindow;
+    return recentWin ? recentWin.gBrowser : null;
+  },
+
+  /**
+   * Get the Cu.Sandbox object for the active tab content window object.
+   */
+  get contentSandbox()
+  {
+    if (!this.browserWindow) {
+      Cu.reportError(this.strings.
+                     GetStringFromName("browserWindow.unavailable"));
+      return;
+    }
+
+    // TODO: bug 646524 - need to cache sandboxes if
+    // currentBrowser == previousBrowser
+    let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+    return new Cu.Sandbox(contentWindow,
+                          { sandboxPrototype: contentWindow,
+                            wantXrays: false });
+  },
+
+  /**
+   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * chrome window object.
+   */
+  get chromeSandbox()
+  {
+    if (!this.browserWindow) {
+      Cu.reportError(this.strings.
+                     GetStringFromName("browserWindow.unavailable"));
+      return;
+    }
+
+    return new Cu.Sandbox(this.browserWindow,
+                          { sandboxPrototype: this.browserWindow,
+                            wantXrays: false });
+  },
+
+  /**
+   * Drop the textbox selection.
+   */
+  deselect: function WS_deselect()
+  {
+    this.textbox.selectionEnd = this.textbox.selectionStart;
+  },
+
+  /**
+   * Select a specific range in the Workspace xul:textbox.
+   *
+   * @param number aStart
+   *        Selection range start.
+   * @param number aEnd
+   *        Selection range end.
+   */
+  selectRange: function WS_selectRange(aStart, aEnd)
+  {
+    this.textbox.selectionStart = aStart;
+    this.textbox.selectionEnd = aEnd;
+  },
+
+  /**
+   * Evaluate a string in the active tab content window.
+   *
+   * @param string aString
+   *        The script you want evaluated.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalInContentSandbox: function WS_evalInContentSandbox(aString)
+  {
+    let result;
+    try {
+      result = Cu.evalInSandbox(aString, this.contentSandbox, "1.8",
+                                "Workspace", 1);
+    }
+    catch (ex) {
+      this.openWebConsole();
+
+      let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+
+      let scriptError = Cc["@mozilla.org/scripterror;1"].
+                        createInstance(Ci.nsIScriptError2);
+
+      scriptError.initWithWindowID(ex.message + "\n" + ex.stack, ex.fileName,
+                                   "", ex.lineNumber, 0, scriptError.errorFlag,
+                                   "content javascript",
+                                   this.getWindowId(contentWindow));
+
+      Services.console.logMessage(scriptError);
+    }
+
+    return result;
+  },
+
+  /**
+   * Evaluate a string in the most recent navigator:browser chrome window.
+   *
+   * @param string aString
+   *        The script you want evaluated.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalInChromeSandbox: function WS_evalInChromeSandbox(aString)
+  {
+    let result;
+    try {
+      result = Cu.evalInSandbox(aString, this.chromeSandbox, "1.8",
+                                "Workspace", 1);
+    }
+    catch (ex) {
+      Cu.reportError(ex);
+      Cu.reportError(ex.stack);
+      this.openErrorConsole();
+    }
+
+    return result;
+  },
+
+  /**
+   * Evaluate a string in the currently desired context, that is either the
+   * chrome window or the tab content window object.
+   *
+   * @param string aString
+   *        The script you want to evaluate.
+   * @return mixed
+   *         The script evaluation result.
+   */
+  evalForContext: function WS_evaluateForContext(aString)
+  {
+    return this.executionContext == WORKSPACE_CONTEXT_CONTENT ?
+           this.evalInContentSandbox(aString) :
+           this.evalInChromeSandbox(aString);
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context.
+   */
+  execute: function WS_execute()
+  {
+    let selection = this.selectedText || this.textbox.value;
+    let result = this.evalForContext(selection);
+    this.deselect();
+    return [selection, result];
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context. The resulting object is opened up in the Property Panel
+   * for inspection.
+   */
+  inspect: function WS_inspect()
+  {
+    let [selection, result] = this.execute();
+
+    if (result) {
+      this.openPropertyPanel(selection, result);
+    }
+  },
+
+  /**
+   * Execute the selected text (if any) or the entire textbox content in the
+   * current context. The evaluation result is "printed" in the textbox after
+   * the selected text, or at the end of the textbox value if there is no
+   * selected text.
+   */
+  print: function WS_print()
+  {
+    let selectionStart = this.textbox.selectionStart;
+    let selectionEnd = this.textbox.selectionEnd;
+    if (selectionStart == selectionEnd) {
+      selectionEnd = this.textbox.value.length;
+    }
+
+    let [selection, result] = this.execute();
+    if (!result) {
+      return;
+    }
+
+    let firstPiece = this.textbox.value.slice(0, selectionEnd);
+    let lastPiece = this.textbox.value.
+                    slice(selectionEnd, this.textbox.value.length);
+
+    let newComment = "/*\n" + result.toString() + "\n*/";
+
+    this.textbox.value = firstPiece + newComment + lastPiece;
+
+    // Select the added comment.
+    this.selectRange(firstPiece.length, firstPiece.length + newComment.length);
+  },
+
+  /**
+   * Open the Property Panel to inspect the given object.
+   *
+   * @param string aEvalString
+   *        The string that was evaluated. This is re-used when the user updates
+   *        the properties list, by clicking the Update button.
+   * @param object aOutputObject
+   *        The object to inspect, which is the aEvalString evaluation result.
+   * @return object
+   *         The PropertyPanel object instance.
+   */
+  openPropertyPanel: function WS_openPropertyPanel(aEvalString, aOutputObject)
+  {
+    let self = this;
+    let propPanel;
+    // The property panel has a button:
+    // `Update`: reexecutes the string executed on the command line. The
+    // result will be inspected by this panel.
+    let buttons = [];
+
+    // If there is a evalString passed to this function, then add a `Update`
+    // button to the panel so that the evalString can be reexecuted to update
+    // the content of the panel.
+    if (aEvalString !== null) {
+      buttons.push({
+        label: this.strings.
+               GetStringFromName("propertyPanel.updateButton.label"),
+        accesskey: this.strings.
+                   GetStringFromName("propertyPanel.updateButton.accesskey"),
+        oncommand: function () {
+          try {
+            let result = self.evalForContext(aEvalString);
+
+            if (result !== undefined) {
+              propPanel.treeView.data = result;
+            }
+          }
+          catch (ex) { }
+        }
+      });
+    }
+
+    let doc = this.browserWindow.document;
+    let parent = doc.getElementById("mainPopupSet");
+    let title = aOutputObject.toString();
+    propPanel = new PropertyPanel(parent, doc, title, aOutputObject, buttons);
+
+    let panel = propPanel.panel;
+    panel.setAttribute("class", "workspace_propertyPanel");
+    panel.openPopup(null, "after_pointer", 0, 0, false, false);
+    panel.sizeTo(200, 400);
+
+    return propPanel;
+  },
+
+  // Menu Operations
+
+  /**
+   * Open a new Workspace window.
+   */
+  openWorkspace: function WS_openWorkspace()
+  {
+    Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
+                           WORKSPACE_WINDOW_FEATURES, null);
+  },
+
+  /**
+   * Export the textbox content to a file.
+   *
+   * @param nsILocalFile aFile
+   *        The file where you want to save the textbox content.
+   * @param boolean aNoConfirmation
+   *        If the file already exists, ask for confirmation?
+   * @param boolean aSilentError
+   *        True if you do not want to display an error when file save fails,
+   *        false otherwise.
+   * @param function aCallback
+   *        Optional function you want to call when file save completes. It will
+   *        get the following arguments:
+   *        1) the nsresult status code for the export operation.
+   */
+  exportToFile: function WS_exportToFile(aFile, aNoConfirmation, aSilentError,
+                                         aCallback)
+  {
+    if (!aNoConfirmation && aFile.exists() &&
+        !window.confirm(this.strings.
+                        GetStringFromName("export.fileOverwriteConfirmation"))) {
+      return;
+    }
+
+    let fs = Cc["@mozilla.org/network/file-output-stream;1"].
+             createInstance(Ci.nsIFileOutputStream);
+    let modeFlags = 0x02 | 0x08 | 0x20;
+    fs.init(aFile, modeFlags, 0644, fs.DEFER_OPEN);
+
+    let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                    createInstance(Ci.nsIScriptableUnicodeConverter);
+    converter.charset = "UTF-8";
+    let input = converter.convertToInputStream(this.textbox.value);
+
+    let self = this;
+    NetUtil.asyncCopy(input, fs, function(aStatus) {
+      if (!aSilentError && !Components.isSuccessCode(aStatus)) {
+        window.alert(self.strings.GetStringFromName("saveFile.failed"));
+      }
+
+      if (aCallback) {
+        aCallback.call(self, aStatus);
+      }
+    });
+  },
+
+  /**
+   * Read the content of a file and put it into the textbox.
+   *
+   * @param nsILocalFile aFile
+   *        The file you want to save the textbox content into.
+   * @param boolean aSilentError
+   *        True if you do not want to display an error when file load fails,
+   *        false otherwise.
+   * @param function aCallback
+   *        Optional function you want to call when file load completes. It will
+   *        get the following arguments:
+   *        1) the nsresult status code for the import operation.
+   *        2) the data that was read from the file, if any.
+   */
+  importFromFile: function WS_importFromFile(aFile, aSilentError, aCallback)
+  {
+    // Prevent file type detection.
+    let channel = NetUtil.newChannel(aFile);
+    channel.contentType = "application/javascript";
+
+    let self = this;
+    NetUtil.asyncFetch(channel, function(aInputStream, aStatus) {
+      let content = null;
+
+      if (Components.isSuccessCode(aStatus)) {
+        content = NetUtil.readInputStreamToString(aInputStream,
+                                                  aInputStream.available());
+        self.textbox.value = content;
+      }
+      else if (!aSilentError) {
+        window.alert(self.strings.GetStringFromName("openFile.failed"));
+      }
+
+      if (aCallback) {
+        aCallback.call(self, aStatus, content);
+      }
+    });
+  },
+
+  /**
+   * Open a file to edit in the Workspace.
+   */
+  openFile: function WS_openFile()
+  {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, this.strings.GetStringFromName("openFile.title"),
+            Ci.nsIFilePicker.modeOpen);
+    fp.defaultString = "";
+    if (fp.show() != Ci.nsIFilePicker.returnCancel) {
+      document.title = this.filename = fp.file.path;
+      this.importFromFile(fp.file);
+    }
+  },
+
+  /**
+   * Save the textbox content to the currently open file.
+   */
+  saveFile: function WS_saveFile()
+  {
+    if (!this.filename) {
+      return this.saveFileAs();
+    }
+
+    let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsILocalFile);
+    file.initWithPath(this.filename);
+    this.exportToFile(file, true);
+  },
+
+  /**
+   * Save the textbox content to a new file.
+   */
+  saveFileAs: function WS_saveFileAs()
+  {
+    let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
+    fp.init(window, this.strings.GetStringFromName("saveFileAs"),
+            Ci.nsIFilePicker.modeSave);
+    fp.defaultString = "workspace.js";
+    if (fp.show() != Ci.nsIFilePicker.returnCancel) {
+      document.title = this.filename = fp.file.path;
+      this.exportToFile(fp.file);
+    }
+  },
+
+  /**
+   * Open the Error Console.
+   */
+  openErrorConsole: function WS_openErrorConsole()
+  {
+    this.browserWindow.toJavaScriptConsole();
+  },
+
+  /**
+   * Open the Web Console.
+   */
+  openWebConsole: function WS_openWebConsole()
+  {
+    if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
+      this.browserWindow.HUDConsoleUI.toggleHUD();
+    }
+    this.browserWindow.focus();
+  },
+
+  /**
+   * Set the current execution context to be the active tab content window.
+   */
+  setContentContext: function WS_setContentContext()
+  {
+    let content = document.getElementById("ws-menu-content");
+    document.getElementById("ws-menu-chrome").removeAttribute("checked");
+    content.setAttribute("checked", true);
+    this.statusbarStatus.label = content.getAttribute("label");
+    this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+  },
+
+  /**
+   * Set the current execution context to be the most recent chrome window.
+   */
+  setChromeContext: function WS_setChromeContext()
+  {
+    let chrome = document.getElementById("ws-menu-chrome");
+    document.getElementById("ws-menu-content").removeAttribute("checked");
+    chrome.setAttribute("checked", true);
+    this.statusbarStatus.label = chrome.getAttribute("label");
+    this.executionContext = WORKSPACE_CONTEXT_CHROME;
+  },
+
+  /**
+   * Gets the ID of the outer window of the given DOM window object.
+   *
+   * @param nsIDOMWindow aWindow
+   * @return integer
+   *         the outer window ID
+   */
+  getWindowId: function HS_getWindowId(aWindow)
+  {
+    return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
+           getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
+  },
+};
+
+XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
+  return Services.strings.createBundle(WORKSPACE_L10N);
+});
+
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
new file mode 100644
index 000000000000..625b486055db
--- /dev/null
+++ b/browser/base/content/workspace.xul
@@ -0,0 +1,331 @@
+<?xml version="1.0"?>
+#ifdef 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 Workspace.
+   -
+   - The Initial Developer of the Original Code is
+   - The Mozilla Foundation.
+   - Portions created by the Initial Developer are Copyright (C) 2011
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Rob Campbell <robcee@mozilla.com> (original author)
+   -   Mihai Sucan <mihai.sucan@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 ***** -->
+#endif
+<!DOCTYPE window [
+<!ENTITY % workspaceDTD SYSTEM "chrome://browser/locale/workspace.dtd" >
+ %workspaceDTD;
+]>
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
+
+<window id="main-window"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&window.title;"
+        windowtype="devtools:workspace"
+        screenX="4" screenY="4"
+        width="640" height="480"
+        persist="screenX screenY width height sizemode">
+
+<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/javascript" src="chrome://browser/content/workspace.js"/>
+
+<commandset id="editMenuCommands"/>
+
+<commandset id="ws-commandset">
+  <command id="ws-cmd-newWindow" oncommand="Workspace.openWorkspace();"/>
+  <command id="ws-cmd-openFile" oncommand="Workspace.openFile();"/>
+  <command id="ws-cmd-save" oncommand="Workspace.saveFile();"/>
+  <command id="ws-cmd-saveas" oncommand="Workspace.saveFileAs();"/>
+
+  <!-- TODO: bug 650340 - implement printFile()
+  <command id="ws-cmd-printFile" oncommand="Workspace.printFile();" disabled="true"/>
+ -->
+
+  <command id="ws-cmd-close" oncommand="window.close();"/>
+  <command id="ws-cmd-execute" oncommand="Workspace.execute();"/>
+  <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
+  <command id="ws-cmd-print" oncommand="Workspace.print();"/>
+  <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
+  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();"/>
+  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();"/>
+  <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
+</commandset>
+
+<keyset id="ws-keyset">
+  <key id="ws-key-window"
+       key="&newWindowCmd.commandkey;"
+       command="ws-cmd-newWindow"
+       modifiers="accel"/>
+  <key id="ws-key-open"
+       key="&openFileCmd.commandkey;"
+       command="ws-cmd-openFile"
+       modifiers="accel"/>
+  <key id="ws-key-save"
+       key="&saveFileCmd.commandkey;"
+       command="ws-cmd-save"
+       modifiers="accel"/>
+  <key id="ws-key-close"
+       key="&closeCmd.key;"
+       command="ws-cmd-close"
+       modifiers="accel"/>
+
+  <!-- TODO: bug 650340 - implement printFile
+  <key id="ws-key-printFile"
+       key="&printCmd.commandkey;"
+       command="ws-cmd-printFile"
+       modifiers="accel"/>
+  -->
+
+  <key id="key_cut"
+       key="&cutCmd.key;"
+       modifiers="accel"/>
+
+  <key id="key_copy"
+       key="&copyCmd.key;"
+       modifiers="accel"/>
+  <key id="key_paste"
+       key="&pasteCmd.key;"
+       modifiers="accel"/>
+  <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+  <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
+  <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
+  <key id="ws-key-execute"
+       key="&execute.key;"
+       command="ws-cmd-execute"
+       modifiers="accel"/>
+  <key id="ws-key-inspect"
+       key="&inspect.key;"
+       command="ws-cmd-inspect"
+       modifiers="accel"/>
+  <key id="ws-key-print"
+       key="&print.key;"
+       command="ws-cmd-print"
+       modifiers="accel"/>
+  <key id="ws-key-errorConsole"
+       key="&errorConsoleCmd.commandkey;"
+       command="ws-cmd-errorConsole"
+       modifiers="accel,shift"/>
+  <key id="ws-key-webConsole"
+       key="&webConsoleCmd.commandkey;"
+       command="ws-cmd-webConsole"
+       modifiers="accel,shift"/>
+</keyset>
+
+
+<menubar id="ws-menubar">
+  <menu id="ws-file-menu" label="&fileMenu.label;"
+        accesskey="&fileMenu.accesskey;">
+    <menupopup id="ws-menu-filepopup">
+      <menuitem id="ws-menu-newworkspace"
+                label="&newWindowCmd.label;"
+                accesskey="&newWindowCmd.accesskey;"
+                key="ws-key-window"
+                command="ws-cmd-newWindow"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-open"
+                label="&openFileCmd.label;"
+                command="ws-cmd-openFile"
+                key="ws-key-open"
+                accesskey="&openFileCmd.accesskey;"/>
+      <menuitem id="ws-menu-save"
+                label="&saveFileCmd.label;"
+                accesskey="&saveFileCmd.accesskey;"
+                key="ws-key-save"
+                command="ws-cmd-save"/>
+      <menuitem id="ws-menu-saveas"
+                label="&saveFileAsCmd.label;"
+                accesskey="&saveFileAsCmd.accesskey;"
+                command="ws-cmd-saveas"/>
+      <menuseparator/>
+
+      <!-- TODO: bug 650340 - implement printFile
+      <menuitem id="ws-menu-print"
+                label="&printCmd.label;"
+                accesskey="&printCmd.accesskey;"
+                command="ws-cmd-printFile"/>
+      <menuseparator/>
+      -->
+
+      <menuitem id="ws-menu-close"
+                label="&closeCmd.label;"
+                key="ws-key-close"
+                accesskey="&closeCmd.accesskey;"
+                command="ws-cmd-close"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-edit-menu" label="&editMenu.label;"
+        accesskey="&editMenu.accesskey;">
+    <menupopup id="ws-menu_editpopup">
+      <menuitem id="ws-menu_undo"
+                label="&undoCmd.label;"
+                key="key_undo"
+                accesskey="&undoCmd.accesskey;"
+                disabled="true"
+                oncommand="cmd_undo"/>
+      <menuitem id="ws-menu-redo"
+                label="&redoCmd.label;"
+                key="key_redo"
+                disabled="true"
+                accesskey="&redoCmd.accesskey;"
+                command="cmd_redo"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-cut"
+                label="&cutCmd.label;"
+                key="key_cut"
+                accesskey="&cutCmd.accesskey;"
+                command="cmd_cut"/>
+      <menuitem id="ws-menu-copy"
+                label="&copyCmd.label;"
+                key="key_copy"
+                accesskey="&copyCmd.accesskey;"
+                command="cmd_copy"/>
+      <menuitem id="ws-menu-paste"
+                label="&pasteCmd.label;"
+                key="key_paste"
+                accesskey="&pasteCmd.accesskey;"
+                command="cmd_paste"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-selectAll"
+                label="&selectAllCmd.label;"
+                key="key_selectAll"
+                accesskey="&selectAllCmd.accesskey;"
+                command="cmd_selectAll"/>
+      <menuseparator/>
+
+      <!-- TODO: bug 650345 - implement search and replace
+      <menuitem id="ws-menu-find"
+                label="&findOnCmd.label;"
+                accesskey="&findOnCmd.accesskey;"
+                key="key_find"
+                disabled="true"
+                command="cmd_find"/>
+      <menuitem id="ws-menu-findAgain"
+                label="&findAgainCmd.label;"
+                accesskey="&findAgainCmd.accesskey;"
+                key="key_findAgain"
+                disabled="true"
+                command="cmd_findAgain"/>
+      <menuseparator id="ws-execute-separator"/>
+      -->
+
+      <menuitem id="ws-text-execute"
+                label="&execute.label;"
+                accesskey="&execute.accesskey;"
+                key="ws-key-execute"
+                command="ws-cmd-execute"/>
+      <menuitem id="ws-text-inspect"
+                label="&inspect.label;"
+                accesskey="&inspect.accesskey;"
+                key="ws-key-inspect"
+                command="ws-cmd-inspect"/>
+      <menuitem id="ws-text-print"
+                label="&print.label;"
+                accesskey="&print.accesskey;"
+                key="ws-key-print"
+                command="ws-cmd-print"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-context-menu"
+        label="&contextMenu.label;"
+        accesskey="&contextMenu.accesskey;">
+    <menupopup id="ws-menu-context">
+      <menuitem id="ws-menu-content"
+                label="&contentContext.label;"
+                accesskey="&contentContext.accesskey;"
+                command="ws-cmd-contentContext"
+                checked="true"
+                type="radio"/>
+      <menuitem id="ws-menu-chrome"
+                command="ws-cmd-chromeContext"
+                label="&chromeContext.label;"
+                accesskey="&chromeContext.accesskey;"
+                type="radio"/>
+    </menupopup>
+  </menu>
+
+  <menu id="ws-tools-menu"
+        label="&toolsMenu.label;"
+        accesskey="&toolsMenu.accesskey;">
+    <menupopup id="ws-menu-tools">
+      <menuitem id="ws-menu-errorConsole"
+                label="&errorConsoleCmd.label;"
+                accesskey="&errorConsoleCmd.accesskey;"
+                key="ws-key-errorConsole"
+                command="ws-cmd-errorConsole"/>
+      <menuitem id="ws-menu-webConsole"
+                label="&webConsoleCmd.label;"
+                accesskey="&webConsoleCmd.accesskey;"
+                key="ws-key-webConsole"
+                command="ws-cmd-webConsole"/>
+    </menupopup>
+  </menu>
+</menubar>
+
+<popupset id="workspace-popups">
+  <menupopup id="workspace-text-popup">
+    <menuitem id="menu_cut"/>
+    <menuitem id="menu_copy"/>
+    <menuitem id="menu_paste"/>
+    <menuitem id="menu_delete"/>
+    <menuseparator/>
+    <menuitem id="menu_selectAll"/>
+    <menuseparator/>
+    <menuitem id="ws-text-execute"
+              label="&execute.label;"
+              accesskey="&execute.accesskey;"
+              key="ws-key-execute"
+              command="ws-cmd-execute"/>
+    <menuitem id="ws-text-inspect"
+              label="&inspect.label;"
+              accesskey="&inspect.accesskey;"
+              key="ws-key-inspect"
+              command="ws-cmd-inspect"/>
+    <menuitem id="ws-text-print"
+              label="&print.label;"
+              accesskey="&print.accesskey;"
+              key="ws-key-print"
+              command="ws-cmd-print"/>
+  </menupopup>
+</popupset>
+
+<textbox id="workspace-textbox"
+         multiline="true"
+         flex="1"
+         context="workspace-text-popup"
+         placeholder="&textbox.placeholder;" />
+<statusbar id="workspace-statusbar" align="end">
+  <statusbarpanel id="workspace-status"
+                  label="&contentContext.label;"
+                  class="statusbarpanel-iconic-text"/>
+  <spacer flex="1"/>
+</statusbar>
+</window>
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index dbc7a62d07da..d427c70a196f 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -30,6 +30,8 @@ browser.jar:
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
+*       content/browser/workspace.xul                 (content/workspace.xul)
+*       content/browser/workspace.js                  (content/workspace.js)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 8d98ca9339bb..7202bee28d8f 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -191,6 +191,10 @@ can reach it easily. -->
 <!ENTITY inspectMenu.accesskey        "T">
 <!ENTITY inspectMenu.commandkey       "I">
 
+<!ENTITY workspace.label               "Workspace">
+<!ENTITY workspace.keycode             "VK_F4">
+<!ENTITY workspace.keytext             "F4">
+
 <!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Inspect">
 <!ENTITY inspectButton.accesskey      "I">
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/workspace.dtd
new file mode 100644
index 000000000000..d2ade7d685f8
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/workspace.dtd
@@ -0,0 +1,88 @@
+<!-- LOCALIZATION NOTE : FILE This file contains the Workspace window strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
+
+<!ENTITY window.title                 "Workspace">
+
+<!ENTITY fileMenu.label               "File">
+<!ENTITY fileMenu.accesskey           "F">
+
+<!ENTITY newWindowCmd.label           "New Window">
+<!ENTITY newWindowCmd.accesskey       "N">
+<!ENTITY newWindowCmd.commandkey      "n">
+
+<!ENTITY openFileCmd.label            "Open File…">
+<!ENTITY openFileCmd.accesskey        "O">
+<!ENTITY openFileCmd.commandkey       "o">
+
+<!ENTITY saveFileCmd.label            "Save">
+<!ENTITY saveFileCmd.accesskey        "S">
+<!ENTITY saveFileCmd.commandkey       "s">
+
+<!ENTITY saveFileAsCmd.label          "Save As…">
+<!ENTITY saveFileAsCmd.accesskey      "A">
+
+<!ENTITY closeCmd.label               "Close">
+<!ENTITY closeCmd.key                 "W">
+<!ENTITY closeCmd.accesskey           "C">
+
+<!ENTITY editMenu.label               "Edit">
+<!ENTITY editMenu.accesskey           "E">
+
+<!ENTITY undoCmd.label                "Undo">
+<!ENTITY undoCmd.key                  "Z">
+<!ENTITY undoCmd.accesskey            "U">
+
+<!ENTITY redoCmd.label                "Redo">
+<!ENTITY redoCmd.key                  "Y">
+<!ENTITY redoCmd.accesskey            "R">
+
+<!ENTITY cutCmd.label                 "Cut">
+<!ENTITY cutCmd.key                   "X">
+<!ENTITY cutCmd.accesskey             "t">
+
+<!ENTITY copyCmd.label                "Copy">
+<!ENTITY copyCmd.key                  "C">
+<!ENTITY copyCmd.accesskey            "C">
+
+<!ENTITY pasteCmd.label               "Paste">
+<!ENTITY pasteCmd.key                 "V">
+<!ENTITY pasteCmd.accesskey           "P">
+
+<!ENTITY selectAllCmd.label           "Select All">
+<!ENTITY selectAllCmd.key             "A">
+<!ENTITY selectAllCmd.accesskey       "A">
+
+<!ENTITY execute.label                "Execute">
+<!ENTITY execute.accesskey            "E">
+<!ENTITY execute.key                  "t">
+
+<!ENTITY inspect.label                "Inspect">
+<!ENTITY inspect.accesskey            "I">
+<!ENTITY inspect.key                  "i">
+
+<!ENTITY print.label                  "Print">
+<!ENTITY print.accesskey              "p">
+<!ENTITY print.key                    "r">
+
+<!ENTITY contextMenu.label            "Context">
+<!ENTITY contextMenu.accesskey        "C">
+
+<!ENTITY contentContext.label         "Content">
+<!ENTITY contentContext.accesskey     "C">
+
+<!ENTITY chromeContext.label          "Chrome">
+<!ENTITY chromeContext.accesskey      "H">
+
+<!ENTITY toolsMenu.label              "Tools">
+<!ENTITY toolsMenu.accesskey          "T">
+
+<!ENTITY errorConsoleCmd.label        "Error Console">
+<!ENTITY errorConsoleCmd.accesskey    "C">
+<!ENTITY errorConsoleCmd.commandkey   "j">
+
+<!ENTITY webConsoleCmd.label          "Web Console">
+<!ENTITY webConsoleCmd.accesskey      "W">
+<!ENTITY webConsoleCmd.commandkey     "k">
+
+<!ENTITY textbox.placeholder          "// Enter some JavaScript, select it, right click and select Execute, Inspect or Print.">
+
diff --git a/browser/locales/en-US/chrome/browser/workspace.properties b/browser/locales/en-US/chrome/browser/workspace.properties
new file mode 100644
index 000000000000..3b0dbab5241c
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/workspace.properties
@@ -0,0 +1,30 @@
+# LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
+# Panel that is opened by the Workspace window when inspecting an object. This
+# is the Update button label.
+propertyPanel.updateButton.label=Update
+propertyPanel.updateButton.accesskey=U
+
+# LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
+# the user attempts to save to an already existing file.
+export.fileOverwriteConfirmation=File exists. Overwrite?
+
+# LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
+# when Workspace does not find any recently active window of navigator:browser
+# type.
+browserWindow.unavailable=Workspace cannot find any browser window where to execute the code.
+
+# LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
+# open a file from Workspace.
+openFile.title=Open File
+
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+openFile.failed=Failed to read the file.
+
+# LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
+# a file in Workspace.
+saveFileAs=Save File As
+
+# LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
+# save fails.
+saveFile.failed=The file save operation failed.
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 79b73fe55ea7..32b4a00759be 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -15,6 +15,8 @@
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
     locale/browser/inspector.properties            (%chrome/browser/inspector.properties)
+    locale/browser/workspace.properties            (%chrome/browser/workspace.properties)
+    locale/browser/workspace.dtd                   (%chrome/browser/workspace.dtd)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
     locale/browser/openLocation.properties         (%chrome/browser/openLocation.properties)
 *   locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)
diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index b9ceec95daab..01240dce9bd7 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -5512,6 +5512,18 @@ HeadsUpDisplayUICommands = {
     }
   },
 
+  /**
+   * Find the hudId for the active chrome window.
+   * @return string|null
+   *         The hudId or null if the active chrome window has no open Web
+   *         Console.
+   */
+  getOpenHUD: function UIC_getOpenHUD() {
+    let chromeWindow = HUDService.currentContext();
+    let contentWindow = chromeWindow.gBrowser.selectedBrowser.contentWindow;
+    return HUDService.getHudIdByWindow(contentWindow);
+  },
+
   /**
    * The event handler that is called whenever a user switches a filter on or
    * off.

From 4cf675db3d15a77f5e76887b92dd46f904d59d6b Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 19 Apr 2011 23:40:30 +0300
Subject: [PATCH 112/314] Bug 636725 - Unit tests for Workspaces;
 r=rcampbell,sdwilsh

---
 browser/base/content/test/Makefile.in         |   6 +
 .../test/browser_workspace_contexts.js        |  93 +++++++++++
 .../test/browser_workspace_execute_print.js   | 115 ++++++++++++++
 .../content/test/browser_workspace_files.js   | 149 ++++++++++++++++++
 .../test/browser_workspace_initialization.js  |  39 +++++
 .../content/test/browser_workspace_inspect.js |  65 ++++++++
 .../base/content/test/browser_workspace_ui.js |  80 ++++++++++
 7 files changed, 547 insertions(+)
 create mode 100644 browser/base/content/test/browser_workspace_contexts.js
 create mode 100644 browser/base/content/test/browser_workspace_execute_print.js
 create mode 100644 browser/base/content/test/browser_workspace_files.js
 create mode 100644 browser/base/content/test/browser_workspace_initialization.js
 create mode 100644 browser/base/content/test/browser_workspace_inspect.js
 create mode 100644 browser/base/content/test/browser_workspace_ui.js

diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 286cb74dba5f..e4ec14f7113f 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -192,6 +192,12 @@ _BROWSER_FILES = \
                  browser_inspector_treePanel_output.js \
                  browser_inspector_treePanel_input.html \
                  browser_inspector_treePanel_result.html \
+                 browser_workspace_initialization.js \
+                 browser_workspace_contexts.js \
+                 browser_workspace_execute_print.js \
+                 browser_workspace_inspect.js \
+                 browser_workspace_files.js \
+                 browser_workspace_ui.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
new file mode 100644
index 000000000000..9bfb2566be8c
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_contexts.js
@@ -0,0 +1,93 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,test context switch in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  let contentMenu = gWorkspaceWindow.document.getElementById("ws-menu-content");
+  let chromeMenu = gWorkspaceWindow.document.getElementById("ws-menu-chrome");
+  let statusbar = ws.statusbarStatus;
+
+  ok(contentMenu, "found #ws-menu-content");
+  ok(chromeMenu, "found #ws-menu-chrome");
+  ok(statusbar, "found Workspace.statusbarStatus");
+
+  ws.setContentContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(contentMenu.getAttribute("checked"), "true",
+     "content menuitem is checked");
+
+  ok(!chromeMenu.hasAttribute("checked"),
+     "chrome menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "window.foobarBug636725 = 'aloha';";
+
+  ok(!content.wrappedJSObject.foobarBug636725,
+     "no content.foobarBug636725");
+
+  ws.execute();
+
+  is(content.wrappedJSObject.foobarBug636725, "aloha",
+     "content.foobarBug636725 has been set");
+
+  ws.setChromeContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CHROME,
+     "executionContext is chrome");
+
+  is(chromeMenu.getAttribute("checked"), "true",
+     "chrome menuitem is checked");
+
+  ok(!contentMenu.hasAttribute("checked"),
+     "content menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ws.textbox.value = "window.foobarBug636725 = 'aloha2';";
+
+  ok(!window.foobarBug636725, "no window.foobarBug636725");
+
+  ws.execute();
+
+  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
+
+  ws.textbox.value = "window.gBrowser";
+
+  is(typeof ws.execute()[1].addTab, "function",
+     "chrome context has access to chrome objects");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_execute_print.js b/browser/base/content/test/browser_workspace_execute_print.js
new file mode 100644
index 000000000000..3257b897ce7e
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_execute_print.js
@@ -0,0 +1,115 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<p>test execute() and print() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  content.wrappedJSObject.foobarBug636725 = 1;
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "++window.foobarBug636725";
+
+  let exec = ws.execute();
+  is(exec[0], ws.textbox.value, "execute()[0] is correct");
+  is(exec[1], content.wrappedJSObject.foobarBug636725,
+     "execute()[1] is correct");
+
+  is(ws.textbox.value, "++window.foobarBug636725",
+     "execute() does not change the textbox value");
+
+  is(content.wrappedJSObject.foobarBug636725, 2,
+     "execute() updated window.foobarBug636725");
+
+  ws.print();
+
+  is(content.wrappedJSObject.foobarBug636725, 3,
+     "print() updated window.foobarBug636725");
+
+  is(ws.textbox.value, "++window.foobarBug636725/*\n3\n*/",
+     "print() shows evaluation result in the textbox");
+
+  is(ws.selectedText, "/*\n3\n*/", "selectedText is correct");
+  is(ws.textbox.selectionStart, 24, "selectionStart is correct");
+  is(ws.textbox.selectionEnd, 31, "selectionEnd is correct");
+
+  // Test selection execute() and print().
+
+  ws.textbox.value = "window.foobarBug636725 = 'a';\n" +
+                     "window.foobarBug636725 = 'b';";
+
+  ws.selectRange(1, 2);
+
+  is(ws.textbox.selectionStart, 1, "selectionStart is 1");
+  is(ws.textbox.selectionEnd, 2, "selectionEnd is 2");
+
+  ws.selectRange(0, 29);
+
+  is(ws.textbox.selectionStart, 0, "selectionStart is 0");
+  is(ws.textbox.selectionEnd, 29, "selectionEnd is 29");
+
+  exec = ws.execute();
+
+  is(exec[0], "window.foobarBug636725 = 'a';",
+     "execute()[0] is correct");
+  is(exec[1], "a",
+     "execute()[1] is correct");
+
+  is(ws.textbox.value, "window.foobarBug636725 = 'a';\n" +
+                       "window.foobarBug636725 = 'b';",
+     "execute() does not change the textbox value");
+
+  is(content.wrappedJSObject.foobarBug636725, "a",
+     "execute() worked for the selected range");
+
+  ws.textbox.value = "window.foobarBug636725 = 'c';\n" +
+                     "window.foobarBug636725 = 'b';";
+
+  ws.selectRange(0, 22);
+
+  ws.print();
+
+  is(content.wrappedJSObject.foobarBug636725, "a",
+     "print() worked for the selected range");
+
+  is(ws.textbox.value, "window.foobarBug636725" +
+                       "/*\na\n*/" +
+                       " = 'c';\n" +
+                       "window.foobarBug636725 = 'b';",
+     "print() shows evaluation result in the textbox");
+
+  is(ws.selectedText, "/*\na\n*/", "selectedText is correct");
+  is(ws.textbox.selectionStart, 22, "selectionStart is correct");
+  is(ws.textbox.selectionEnd, 29, "selectionEnd is correct");
+
+  ws.deselect();
+
+  ok(!ws.selectedText, "selectedText is empty");
+  is(ws.textbox.selectionStart, ws.textbox.selectionEnd, "deselect() works");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_files.js b/browser/base/content/test/browser_workspace_files.js
new file mode 100644
index 000000000000..478a60b31e0b
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_files.js
@@ -0,0 +1,149 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+Cu.import("resource://gre/modules/NetUtil.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+// Reference to the Workspace object.
+let gWorkspace;
+
+// Reference to the temporary nsIFile we will work with.
+let gFile;
+
+// The temporary file content.
+let gFileContent = "hello.world('bug636725');";
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<p>test file open and save in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  gWorkspace = gWorkspaceWindow.Workspace;
+
+  // Create a temporary file.
+  gFile = FileUtils.getFile("TmpD", ["fileForBug636725.tmp"]);
+  gFile.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0666);
+
+  // Write the temporary file.
+  let fout = Cc["@mozilla.org/network/file-output-stream;1"].
+             createInstance(Ci.nsIFileOutputStream);
+  fout.init(gFile.QueryInterface(Ci.nsILocalFile), 0x02 | 0x08 | 0x20,
+            0644, fout.DEFER_OPEN);
+
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"].
+                  createInstance(Ci.nsIScriptableUnicodeConverter);
+  converter.charset = "UTF-8";
+  let fileContentStream = converter.convertToInputStream(gFileContent);
+
+  NetUtil.asyncCopy(fileContentStream, fout, tempFileSaved);
+}
+
+function tempFileSaved(aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was saved successfully");
+
+  // Import the file into Workspace.
+  gWorkspace.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
+                            fileImported);
+}
+
+function fileImported(aStatus, aFileContent)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was imported successfully with Workspace");
+
+  is(aFileContent, gFileContent,
+     "received data is correct");
+
+  is(gWorkspace.textbox.value, gFileContent,
+     "the textbox.value is correct");
+
+  // Save the file after changes.
+  gFileContent += "// omg, saved!";
+  gWorkspace.textbox.value = gFileContent;
+
+  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
+                          fileExported);
+}
+
+function fileExported(aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was exported successfully with Workspace");
+
+  let oldContent = gFileContent;
+
+  // Attempt another file save, with confirmation which returns false.
+  gFileContent += "// omg, saved twice!";
+  gWorkspace.textbox.value = gFileContent;
+
+  let oldConfirm = gWorkspaceWindow.confirm;
+  let askedConfirmation = false;
+  gWorkspaceWindow.confirm = function() {
+    askedConfirmation = true;
+    return false;
+  };
+
+  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
+                          fileExported2);
+
+  gWorkspaceWindow.confirm = oldConfirm;
+
+  ok(askedConfirmation, "exportToFile() asked for overwrite confirmation");
+
+  gFileContent = oldContent;
+
+  let channel = NetUtil.newChannel(gFile);
+  channel.contentType = "application/javascript";
+
+  // Read back the temporary file.
+  NetUtil.asyncFetch(channel, fileRead);
+}
+
+function fileExported2()
+{
+  ok(false, "exportToFile() did not cancel file overwrite");
+}
+
+function fileRead(aInputStream, aStatus)
+{
+  ok(Components.isSuccessCode(aStatus),
+     "the temporary file was read back successfully");
+
+  let updatedContent =
+    NetUtil.readInputStreamToString(aInputStream, aInputStream.available());;
+
+  is(updatedContent, gFileContent, "file properly updated");
+
+  // Done!
+  gFile.remove(false);
+  gFile = null;
+  gWorkspace = null;
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
new file mode 100644
index 000000000000..9306c546ffef
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -0,0 +1,39 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Workspace, "Workspace variable exists");
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,initialization test for Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  ok(ws, "Workspace object exists in new window");
+  is(typeof ws.execute, "function", "Workspace.execute() exists");
+  is(typeof ws.inspect, "function", "Workspace.inspect() exists");
+  is(typeof ws.print, "function", "Workspace.print() exists");
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_inspect.js b/browser/base/content/test/browser_workspace_inspect.js
new file mode 100644
index 000000000000..e0cc6ddacca1
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_inspect.js
@@ -0,0 +1,65 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+
+  ok(ws.textbox, "textbox exists");
+  ws.textbox.value = "document";
+
+  ws.inspect();
+
+  let propPanel = document.querySelector(".workspace_propertyPanel");
+  ok(propPanel, "property panel is open");
+
+  propPanel.addEventListener("popupshown", function() {
+    propPanel.removeEventListener("popupshown", arguments.callee, false);
+
+    let tree = propPanel.querySelector("tree");
+    ok(tree, "property panel tree found");
+
+    let column = tree.columns[0];
+    let found = false;
+
+    for (let i = 0; i < tree.view.rowCount; i++) {
+      let cell = tree.view.getCellText(i, column);
+      if (cell == 'title: "foobarBug636725"') {
+        found = true;
+        break;
+      }
+    }
+    ok(found, "found the document.title property");
+
+    executeSoon(function() {
+      propPanel.hidePopup();
+
+      gWorkspaceWindow.close();
+      gWorkspaceWindow = null;
+      gBrowser.removeCurrentTab();
+      finish();
+    });
+  }, false);
+}
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
new file mode 100644
index 000000000000..1fcc6a22b3d4
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_ui.js
@@ -0,0 +1,80 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Workspace";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  let doc = gWorkspaceWindow.document;
+
+  let methodsAndItems = {
+    "ws-menu-newworkspace": "openWorkspace",
+    "ws-menu-open": "openFile",
+    "ws-menu-save": "saveFile",
+    "ws-menu-saveas": "saveFileAs",
+    "ws-text-execute": "execute",
+    "ws-text-inspect": "inspect",
+    "ws-menu-content": "setContentContext",
+    "ws-menu-chrome": "setChromeContext",
+    "ws-menu-errorConsole": "openErrorConsole",
+    "ws-menu-webConsole": "openWebConsole",
+  };
+
+  let lastMethodCalled = null;
+  ws.__noSuchMethod__ = function(aMethodName) {
+    lastMethodCalled = aMethodName;
+  };
+
+  for (let id in methodsAndItems) {
+    lastMethodCalled = null;
+
+    let methodName = methodsAndItems[id];
+    let oldMethod = ws[methodName];
+    ok(oldMethod, "found method " + methodName + " in Workspace object");
+
+    delete ws[methodName];
+
+    let menu = doc.getElementById(id);
+    ok(menu, "found menuitem #" + id);
+
+    try {
+      menu.doCommand();
+    }
+    catch (ex) {
+      ok(false, "exception thrown while executing the command of menuitem #" + id);
+    }
+
+    ok(lastMethodCalled == methodName,
+       "method " + methodName + " invoked by the associated menuitem");
+
+    ws[methodName] = oldMethod;
+  }
+
+  delete ws.__noSuchMethod__;
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}

From 5f07973699b7658da1d536ea6eea7877b8a89867 Mon Sep 17 00:00:00 2001
From: Adam <unusualtears@gmail.com>
Date: Tue, 19 Apr 2011 12:40:36 -0500
Subject: [PATCH 113/314] Bug 626484 - Incorrect order of lines when copying
 from web console; f=rcampbell,mihai.sucan r=mihai.sucan,gavin.sharp

---
 .../console/hudservice/HUDService.jsm         | 10 ++-
 .../hudservice/tests/browser/Makefile.in      |  1 +
 ...webconsole_bug_626484_output_copy_order.js | 61 +++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index 01240dce9bd7..fd5122dd61a1 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -2981,8 +2981,14 @@ HUD_SERVICE.prototype =
 
     let strings = [];
     let newGroup = false;
-    for (let i = 0; i < aOutputNode.selectedCount; i++) {
-      let item = aOutputNode.selectedItems[i];
+
+    let children = aOutputNode.children;
+
+    for (let i = 0; i < children.length; i++) {
+      let item = children[i];
+      if (!item.selected) {
+        continue;
+      }
 
       // Add dashes between groups so that group boundaries show up in the
       // copied output.
diff --git a/toolkit/components/console/hudservice/tests/browser/Makefile.in b/toolkit/components/console/hudservice/tests/browser/Makefile.in
index 718aeea47eaa..40aee0b60672 100644
--- a/toolkit/components/console/hudservice/tests/browser/Makefile.in
+++ b/toolkit/components/console/hudservice/tests/browser/Makefile.in
@@ -128,6 +128,7 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_611795.js \
 	browser_webconsole_bug_618311_close_panels.js \
 	browser_webconsole_bug_618311_private_browsing.js \
+	browser_webconsole_bug_626484_output_copy_order.js \
 	browser_webconsole_bug_632347_iterators_generators.js \
 	browser_webconsole_bug_642108_refForOutputNode.js \
 	browser_webconsole_bug_642108_pruneTest.js \
diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
new file mode 100644
index 000000000000..b101619a7a47
--- /dev/null
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_bug_626484_output_copy_order.js
@@ -0,0 +1,61 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+let itemsSet;
+
+function test() {
+  addTab("data:text/html,Web Console test for bug 626484");
+  browser.addEventListener("load", tabLoaded, true);
+}
+
+function tabLoaded(aEvent) {
+  browser.removeEventListener(aEvent.type, arguments.callee, true);
+  openConsole();
+
+  let console = browser.contentWindow.wrappedJSObject.console;
+  console.log("The first line.");
+  console.log("The second line.");
+  console.log("The last line.");
+
+  let hudId = HUDService.getHudIdByWindow(content);
+  HUD = HUDService.hudReferences[hudId];
+  outputNode = HUD.outputNode;
+
+  itemsSet = [[0, 1, 2], [0, 2, 1], [1, 0, 2], [1, 2, 0], [2, 0, 1],
+    [2, 1, 0]];
+
+  nextTest();
+}
+
+function nextTest() {
+  if (itemsSet.length === 0) {
+    outputNode.clearSelection();
+    HUD.jsterm.clearOutput();
+    finish();
+  }
+  else {
+    outputNode.clearSelection();
+    let items = itemsSet.shift();
+    items.forEach(function (index) {
+      outputNode.addItemToSelection(outputNode.getItemAtIndex(index));
+    });
+    outputNode.focus();
+    waitForClipboard(getExpectedClipboardText(items.length),
+      clipboardSetup, nextTest, nextTest);
+  }
+}
+
+function getExpectedClipboardText(aItemCount) {
+  let expectedClipboardText = [];
+  for (let i = 0; i < aItemCount; i++) {
+    let item = outputNode.getItemAtIndex(i);
+    expectedClipboardText.push("[" +
+      ConsoleUtils.timestampString(item.timestamp) + "] " +
+      item.clipboardText);
+  }
+  return expectedClipboardText.join("\n");
+}
+
+function clipboardSetup() {
+  goDoCommand("cmd_copy");
+}
+

From 39b2d9f4b921a5181323543a3e7ae93d10728926 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 2 May 2011 22:13:22 +0000
Subject: [PATCH 114/314] Bug 558651 - "Check Spelling" should only be shown in
 context menu when input element is in 'text' or 'search' state. r=sdwilsh

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

diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 24be9f9e9f3a..9ac1bc20d578 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -497,9 +497,9 @@ nsContextMenu.prototype = {
       }
       else if (this.target instanceof HTMLInputElement ) {
         this.onTextInput = this.isTargetATextBox(this.target);
-        // allow spellchecking UI on all writable text boxes except passwords
+        // Allow spellchecking UI on all text and search inputs.
         if (this.onTextInput && ! this.target.readOnly &&
-            this.target.type != "password") {
+            (this.target.type == "text" || this.target.type == "search")) {
           this.onEditableArea = true;
           InlineSpellCheckerUI.init(this.target.QueryInterface(Ci.nsIDOMNSEditableElement).editor);
           InlineSpellCheckerUI.initFromEvent(aRangeParent, aRangeOffset);

From 42dc21cbe6762aedca581a349f8801c028ee478a Mon Sep 17 00:00:00 2001
From: "timeless@mozdev.org" <timeless@mozdev.org>
Date: Tue, 3 May 2011 12:31:20 -0400
Subject: [PATCH 115/314] Bug 619777 obj_toSource guard of IS_SHARP instead of
 !ida confuses coverity r=jorendorff

---
 js/src/jsobj.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 91ad0ee2a74e..69ed6b6c727f 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -505,13 +505,13 @@ obj_toSource(JSContext *cx, uintN argc, Value *vp)
         ok = JS_FALSE;
         goto out;
     }
-    if (IS_SHARP(he)) {
+    if (!ida) {
         /*
          * We didn't enter -- obj is already "sharp", meaning we've visited it
          * already in our depth first search, and therefore chars contains a
          * string of the form "#n#".
          */
-        JS_ASSERT(!ida);
+        JS_ASSERT(IS_SHARP(he));
 #if JS_HAS_SHARP_VARS
         nchars = js_strlen(chars);
 #else
@@ -522,7 +522,7 @@ obj_toSource(JSContext *cx, uintN argc, Value *vp)
 #endif
         goto make_string;
     }
-    JS_ASSERT(ida);
+    JS_ASSERT(!IS_SHARP(he));
     ok = JS_TRUE;
 
     if (!chars) {

From 6e18f8dd1bb56bd584928e14111540cf119cc353 Mon Sep 17 00:00:00 2001
From: Robert Longson <longsonr@gmail.com>
Date: Tue, 3 May 2011 08:45:30 +0100
Subject: [PATCH 116/314] Bug 620286 - White space at beginning (end) of tspan
 should render when there is preceding (following) non-white space text. r=roc

---
 layout/reftests/svg/reftest.list              |  1 +
 layout/reftests/svg/text-layout-04-ref.svg    | 11 +++
 layout/reftests/svg/text-layout-04.svg        | 11 +++
 layout/svg/base/src/nsISVGGlyphFragmentLeaf.h |  4 +
 layout/svg/base/src/nsISVGGlyphFragmentNode.h |  8 +-
 layout/svg/base/src/nsSVGGlyphFrame.cpp       | 29 +++---
 layout/svg/base/src/nsSVGGlyphFrame.h         | 21 ++++-
 layout/svg/base/src/nsSVGTSpanFrame.cpp       | 10 +-
 layout/svg/base/src/nsSVGTSpanFrame.h         |  3 +-
 .../svg/base/src/nsSVGTextContainerFrame.cpp  | 94 ++++++-------------
 layout/svg/base/src/nsSVGTextContainerFrame.h | 10 +-
 layout/svg/base/src/nsSVGTextFrame.cpp        | 32 ++++++-
 layout/svg/base/src/nsSVGTextFrame.h          |  2 +
 13 files changed, 125 insertions(+), 111 deletions(-)
 create mode 100644 layout/reftests/svg/text-layout-04-ref.svg
 create mode 100644 layout/reftests/svg/text-layout-04.svg

diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 9275353232c0..814699b35271 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -196,6 +196,7 @@ fails-if(Android) random-if(gtk2Widget) != text-language-01.xhtml text-language-
 == text-layout-01.svg text-layout-01-ref.svg
 == text-layout-02.svg text-layout-02-ref.svg
 == text-layout-03.svg text-layout-03-ref.svg
+== text-layout-04.svg text-layout-04-ref.svg
 == text-scale-01.svg text-scale-01-ref.svg
 == text-stroke-scaling-01.svg text-stroke-scaling-01-ref.svg
 == stroke-linecap-square-w-zero-length-segs-01.svg pass.svg
diff --git a/layout/reftests/svg/text-layout-04-ref.svg b/layout/reftests/svg/text-layout-04-ref.svg
new file mode 100644
index 000000000000..f63d84521bc1
--- /dev/null
+++ b/layout/reftests/svg/text-layout-04-ref.svg
@@ -0,0 +1,11 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <title>Reference to check whitespace handling</title>
+
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=620286 -->
+
+  <text x="10" y="50" font-size="50">A <tspan/>B</text>
+</svg>
diff --git a/layout/reftests/svg/text-layout-04.svg b/layout/reftests/svg/text-layout-04.svg
new file mode 100644
index 000000000000..c91e0b44e5dd
--- /dev/null
+++ b/layout/reftests/svg/text-layout-04.svg
@@ -0,0 +1,11 @@
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/licenses/publicdomain/
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <title>Testcase to check whitespace handling</title>
+
+  <!-- From https://bugzilla.mozilla.org/show_bug.cgi?id=620286 -->
+
+  <text x="10" y="50" font-size="50">A <tspan/> B</text>
+</svg>
diff --git a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
index 5730051502a3..cfdbd2a7aa72 100644
--- a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
+++ b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h
@@ -87,6 +87,10 @@ public:
                                        nsTArray<float> &aRotate)=0;
   NS_IMETHOD_(PRUint16) GetTextAnchor()=0;
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned()=0;
+  NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace)=0;
+  NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace)=0;
+  NS_IMETHOD_(PRBool) EndsWithWhitespace() const=0;
+  NS_IMETHOD_(PRBool) IsAllWhitespace() const=0;
 };
 
 #endif // __NS_ISVGGLYPHFRAGMENTLEAF_H__
diff --git a/layout/svg/base/src/nsISVGGlyphFragmentNode.h b/layout/svg/base/src/nsISVGGlyphFragmentNode.h
index aeb421b9556e..0a86b3e6092a 100644
--- a/layout/svg/base/src/nsISVGGlyphFragmentNode.h
+++ b/layout/svg/base/src/nsISVGGlyphFragmentNode.h
@@ -45,11 +45,6 @@
 class nsISVGGlyphFragmentLeaf;
 class nsIDOMSVGPoint;
 
-#define PRESERVE_WHITESPACE       0x00
-#define COMPRESS_WHITESPACE       0x01
-#define TRIM_LEADING_WHITESPACE   0x02
-#define TRIM_TRAILING_WHITESPACE  0x04
-
 class nsISVGGlyphFragmentNode : public nsQueryFrame
 {
 public:
@@ -61,8 +56,7 @@ public:
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point)=0;
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment()=0;
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment()=0;
-  NS_IMETHOD_(void) SetWhitespaceHandling(PRUint8 aWhitespaceHandling)=0;
-  NS_IMETHOD_(PRBool) IsAllWhitespace()=0;
+  NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace)=0;
 };
 
 #endif // __NS_ISVGGLYPHFRAGMENTNODE_H__
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.cpp b/layout/svg/base/src/nsSVGGlyphFrame.cpp
index 84e093eafcfa..e816d46ed2fd 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.cpp
+++ b/layout/svg/base/src/nsSVGGlyphFrame.cpp
@@ -669,12 +669,9 @@ nsSVGGlyphFrame::GetCharacterData(nsAString & aCharacterData)
   nsAutoString characterData;
   mContent->AppendTextTo(characterData);
 
-  if (mWhitespaceHandling & COMPRESS_WHITESPACE) {
-    PRBool trimLeadingWhitespace, trimTrailingWhitespace;
-    trimLeadingWhitespace = ((mWhitespaceHandling & TRIM_LEADING_WHITESPACE) != 0);
-    trimTrailingWhitespace = ((mWhitespaceHandling & TRIM_TRAILING_WHITESPACE) != 0);
-    characterData.CompressWhitespace(trimLeadingWhitespace, 
-                                     trimTrailingWhitespace);
+  if (mCompressWhitespace) {
+    characterData.CompressWhitespace(mTrimLeadingWhitespace,
+                                     mTrimTrailingWhitespace);
   } else {
     nsAString::iterator start, end;
     characterData.BeginWriting(start);
@@ -1340,12 +1337,13 @@ nsSVGGlyphFrame::IsAbsolutelyPositioned()
 PRUint32
 nsSVGGlyphFrame::GetNumberOfChars()
 {
-  if (mWhitespaceHandling == PRESERVE_WHITESPACE)
-    return mContent->TextLength();
+  if (mCompressWhitespace) {
+    nsAutoString text;
+    GetCharacterData(text);
+    return text.Length();
+  }
 
-  nsAutoString text;
-  GetCharacterData(text);
-  return text.Length();
+  return mContent->TextLength();
 }
 
 float
@@ -1442,14 +1440,15 @@ nsSVGGlyphFrame::GetNextGlyphFragment()
   return node ? node->GetNextGlyphFragment() : nsnull;
 }
 
-NS_IMETHODIMP_(void)
-nsSVGGlyphFrame::SetWhitespaceHandling(PRUint8 aWhitespaceHandling)
+NS_IMETHODIMP_(PRBool)
+nsSVGGlyphFrame::EndsWithWhitespace() const
 {
-  mWhitespaceHandling = aWhitespaceHandling;
+  const nsTextFragment* text = mContent->GetText();
+  return NS_IsAsciiWhitespace(text->CharAt(text->GetLength() - 1));
 }
 
 NS_IMETHODIMP_(PRBool)
-nsSVGGlyphFrame::IsAllWhitespace()
+nsSVGGlyphFrame::IsAllWhitespace() const
 {
   const nsTextFragment* text = mContent->GetText();
 
diff --git a/layout/svg/base/src/nsSVGGlyphFrame.h b/layout/svg/base/src/nsSVGGlyphFrame.h
index 3e5b0b5dd9cf..075cf9ff5766 100644
--- a/layout/svg/base/src/nsSVGGlyphFrame.h
+++ b/layout/svg/base/src/nsSVGGlyphFrame.h
@@ -66,7 +66,9 @@ protected:
     : nsSVGGlyphFrameBase(aContext),
       mTextRun(nsnull),
       mStartIndex(0),
-      mWhitespaceHandling(COMPRESS_WHITESPACE),
+      mCompressWhitespace(PR_TRUE),
+      mTrimLeadingWhitespace(PR_FALSE),
+      mTrimTrailingWhitespace(PR_FALSE),
       mPropagateTransform(PR_TRUE)
       {}
   ~nsSVGGlyphFrame()
@@ -160,6 +162,14 @@ public:
                                        nsTArray<float> &aRotate);
   NS_IMETHOD_(PRUint16) GetTextAnchor();
   NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();
+  NS_IMETHOD_(void) SetTrimLeadingWhitespace(PRBool aTrimLeadingWhitespace) {
+    mTrimLeadingWhitespace = aTrimLeadingWhitespace;
+  }
+  NS_IMETHOD_(void) SetTrimTrailingWhitespace(PRBool aTrimTrailingWhitespace) {
+    mTrimTrailingWhitespace = aTrimTrailingWhitespace;
+  }
+  NS_IMETHOD_(PRBool) EndsWithWhitespace() const;
+  NS_IMETHOD_(PRBool) IsAllWhitespace() const;
 
   // nsISVGGlyphFragmentNode interface:
   // These do not use the global transform if NS_STATE_NONDISPLAY_CHILD
@@ -169,8 +179,9 @@ public:
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point);
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment();
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment();
-  NS_IMETHOD_(void) SetWhitespaceHandling(PRUint8 aWhitespaceHandling);
-  NS_IMETHOD_(PRBool) IsAllWhitespace();
+  NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace) {
+    mCompressWhitespace = aCompressWhitespace;
+  }
 
 protected:
   friend class CharacterIterator;
@@ -227,7 +238,9 @@ protected:
   gfxPoint mPosition;
   // The start index into the position and rotation data
   PRUint32 mStartIndex;
-  PRUint8 mWhitespaceHandling;
+  PRPackedBool mCompressWhitespace;
+  PRPackedBool mTrimLeadingWhitespace;
+  PRPackedBool mTrimTrailingWhitespace;
   PRPackedBool mPropagateTransform;
 };
 
diff --git a/layout/svg/base/src/nsSVGTSpanFrame.cpp b/layout/svg/base/src/nsSVGTSpanFrame.cpp
index 3b62a0fc78c4..14dce0a5a28a 100644
--- a/layout/svg/base/src/nsSVGTSpanFrame.cpp
+++ b/layout/svg/base/src/nsSVGTSpanFrame.cpp
@@ -190,13 +190,7 @@ nsSVGTSpanFrame::GetNextGlyphFragment()
 }
 
 NS_IMETHODIMP_(void)
-nsSVGTSpanFrame::SetWhitespaceHandling(PRUint8 aWhitespaceHandling)
+nsSVGTSpanFrame::SetWhitespaceCompression(PRBool)
 {
-  nsSVGTSpanFrameBase::SetWhitespaceHandling();
-}
-
-NS_IMETHODIMP_(PRBool)
-nsSVGTSpanFrame::IsAllWhitespace()
-{
-  return nsSVGTSpanFrameBase::IsAllWhitespace();
+  nsSVGTSpanFrameBase::SetWhitespaceCompression();
 }
diff --git a/layout/svg/base/src/nsSVGTSpanFrame.h b/layout/svg/base/src/nsSVGTSpanFrame.h
index 2229ab5085be..4001ceee5559 100644
--- a/layout/svg/base/src/nsSVGTSpanFrame.h
+++ b/layout/svg/base/src/nsSVGTSpanFrame.h
@@ -92,8 +92,7 @@ public:
   virtual PRInt32 GetCharNumAtPosition(nsIDOMSVGPoint *point);
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetFirstGlyphFragment();
   NS_IMETHOD_(nsISVGGlyphFragmentLeaf *) GetNextGlyphFragment();
-  NS_IMETHOD_(void) SetWhitespaceHandling(PRUint8 aWhitespaceHandling);
-  NS_IMETHOD_(PRBool) IsAllWhitespace();
+  NS_IMETHOD_(void) SetWhitespaceCompression(PRBool aCompressWhitespace);
 };
 
 #endif
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.cpp b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
index 108afff3f3c3..a58616ceb22f 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.cpp
@@ -319,70 +319,6 @@ nsSVGTextContainerFrame::GetNextGlyphFragmentChildNode(nsISVGGlyphFragmentNode *
   return retval;
 }
 
-void
-nsSVGTextContainerFrame::SetWhitespaceHandling()
-{
-  PRUint8 whitespaceHandling = COMPRESS_WHITESPACE | TRIM_LEADING_WHITESPACE;
-
-  for (nsIFrame *frame = this; frame != nsnull; frame = frame->GetParent()) {
-    nsIContent *content = frame->GetContent();
-    static nsIContent::AttrValuesArray strings[] =
-      {&nsGkAtoms::preserve, &nsGkAtoms::_default, nsnull};
-
-    PRInt32 index = content->FindAttrValueIn(kNameSpaceID_XML,
-                                             nsGkAtoms::space,
-                                             strings, eCaseMatters);
-    if (index == 0) {
-      whitespaceHandling = PRESERVE_WHITESPACE;
-      break;
-    }
-    if (index != nsIContent::ATTR_MISSING ||
-        (frame->GetStateBits() & NS_STATE_IS_OUTER_SVG))
-      break;
-  }
-
-  nsISVGGlyphFragmentNode* firstNode = GetFirstGlyphFragmentChildNode();
-  nsISVGGlyphFragmentNode* lastNonWhitespaceNode = nsnull;
-  nsISVGGlyphFragmentNode* node;
-
-  if (whitespaceHandling != PRESERVE_WHITESPACE) {
-    lastNonWhitespaceNode = node = firstNode;
-    while (node) {
-      if (!node->IsAllWhitespace()) {
-        lastNonWhitespaceNode = node;
-      }
-      node = GetNextGlyphFragmentChildNode(node);
-    }
-  }
-
-  node = firstNode;
-  while (node) {
-    if (node == lastNonWhitespaceNode) {
-      whitespaceHandling |= TRIM_TRAILING_WHITESPACE;
-    }
-    node->SetWhitespaceHandling(whitespaceHandling);
-    if ((whitespaceHandling & TRIM_LEADING_WHITESPACE) &&
-        !node->IsAllWhitespace()) {
-      whitespaceHandling &= ~TRIM_LEADING_WHITESPACE;
-    }
-    node = GetNextGlyphFragmentChildNode(node);
-  }
-}
-
-PRBool
-nsSVGTextContainerFrame::IsAllWhitespace()
-{
-  nsISVGGlyphFragmentNode* node = GetFirstGlyphFragmentChildNode();
-
-  while (node) {
-    if (!node->IsAllWhitespace()) {
-      return PR_FALSE;
-    }
-    node = GetNextGlyphFragmentChildNode(node);
-  }
-  return PR_TRUE;
-}
-
 // -------------------------------------------------------------------------
 // Private functions
 // -------------------------------------------------------------------------
@@ -547,3 +483,33 @@ nsSVGTextContainerFrame::GetEffectiveRotate(nsTArray<float> &aRotate)
 {
   aRotate.AppendElements(mRotate);
 }
+
+void
+nsSVGTextContainerFrame::SetWhitespaceCompression()
+{
+  PRBool compressWhitespace = PR_TRUE;
+
+  for (const nsIFrame *frame = this; frame != nsnull; frame = frame->GetParent()) {
+    static const nsIContent::AttrValuesArray strings[] =
+      {&nsGkAtoms::preserve, &nsGkAtoms::_default, nsnull};
+
+    PRInt32 index = frame->GetContent()->FindAttrValueIn(
+                                           kNameSpaceID_XML,
+                                           nsGkAtoms::space,
+                                           strings, eCaseMatters);
+    if (index == 0) {
+      compressWhitespace = PR_FALSE;
+      break;
+    }
+    if (index != nsIContent::ATTR_MISSING ||
+        (frame->GetStateBits() & NS_STATE_IS_OUTER_SVG))
+      break;
+  }
+
+  nsISVGGlyphFragmentNode* node = GetFirstGlyphFragmentChildNode();
+
+  while (node) {
+    node->SetWhitespaceCompression(compressWhitespace);
+    node = GetNextGlyphFragmentChildNode(node);
+  }
+}
diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.h b/layout/svg/base/src/nsSVGTextContainerFrame.h
index 88f1a5056054..93488affab3e 100644
--- a/layout/svg/base/src/nsSVGTextContainerFrame.h
+++ b/layout/svg/base/src/nsSVGTextContainerFrame.h
@@ -45,16 +45,16 @@ class nsSVGTextFrame;
 
 class nsSVGTextContainerFrame : public nsSVGDisplayContainerFrame
 {
-public:
+protected:
   nsSVGTextContainerFrame(nsStyleContext* aContext) :
     nsSVGDisplayContainerFrame(aContext) {}
 
+public:
   void NotifyGlyphMetricsChange();
   virtual void GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY);
   virtual void GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy);
   virtual const SVGNumberList *GetRotate();
   
-public:
   NS_DECL_QUERYFRAME_TARGET(nsSVGTextContainerFrame)
   NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS
@@ -106,11 +106,6 @@ protected:
   nsISVGGlyphFragmentNode *
   GetNextGlyphFragmentChildNode(nsISVGGlyphFragmentNode *node);
 
-  /*
-   * Set Whitespace handling
-   */
-  void SetWhitespaceHandling();
-  PRBool IsAllWhitespace();
   void CopyPositionList(nsTArray<float> *parentList,
                         SVGUserUnitList *selfList,
                         nsTArray<float> &dstList,
@@ -121,6 +116,7 @@ protected:
                       PRUint32 aOffset);
   PRUint32 BuildPositionList(PRUint32 aOffset, PRUint32 aDepth);
 
+  void SetWhitespaceCompression();
 private:
   /*
    * Returns the glyph fragment containing a particular character
diff --git a/layout/svg/base/src/nsSVGTextFrame.cpp b/layout/svg/base/src/nsSVGTextFrame.cpp
index 7cc6bca2b984..13fa67125375 100644
--- a/layout/svg/base/src/nsSVGTextFrame.cpp
+++ b/layout/svg/base/src/nsSVGTextFrame.cpp
@@ -294,18 +294,40 @@ nsSVGTextFrame::NotifyGlyphMetricsChange()
   UpdateGlyphPositioning(PR_FALSE);
 }
 
+void
+nsSVGTextFrame::SetWhitespaceHandling(
+  nsISVGGlyphFragmentLeaf *fragment)
+{
+  SetWhitespaceCompression();
+
+  PRBool trimLeadingWhitespace = PR_TRUE;
+  nsISVGGlyphFragmentLeaf* lastNonWhitespaceFragment = fragment;
+
+  while (fragment) {
+    if (!fragment->IsAllWhitespace()) {
+      lastNonWhitespaceFragment = fragment;
+    }
+
+    fragment->SetTrimLeadingWhitespace(trimLeadingWhitespace);
+    trimLeadingWhitespace = fragment->EndsWithWhitespace();
+
+    fragment = fragment->GetNextGlyphFragment();
+  }
+
+  lastNonWhitespaceFragment->SetTrimTrailingWhitespace(PR_TRUE);
+}
+
 void
 nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
 {
   if (mMetricsState == suspended || !mPositioningDirty)
     return;
 
-  SetWhitespaceHandling();
+  mPositioningDirty = PR_FALSE;
 
   nsISVGGlyphFragmentNode* node = GetFirstGlyphFragmentChildNode();
-  if (!node) return;
-
-  mPositioningDirty = PR_FALSE;
+  if (!node)
+    return;
 
   nsISVGGlyphFragmentLeaf *fragment, *firstFragment;
 
@@ -314,6 +336,8 @@ nsSVGTextFrame::UpdateGlyphPositioning(PRBool aForceGlobalTransform)
     return;
   }
 
+  SetWhitespaceHandling(firstFragment);
+
   BuildPositionList(0, 0);
 
   gfxPoint ctp(0.0, 0.0);
diff --git a/layout/svg/base/src/nsSVGTextFrame.h b/layout/svg/base/src/nsSVGTextFrame.h
index a93f2358589b..0805324463d4 100644
--- a/layout/svg/base/src/nsSVGTextFrame.h
+++ b/layout/svg/base/src/nsSVGTextFrame.h
@@ -121,6 +121,8 @@ private:
    */
   void UpdateGlyphPositioning(PRBool aForceGlobalTransform);
 
+  void SetWhitespaceHandling(nsISVGGlyphFragmentLeaf *fragment);
+
   nsCOMPtr<nsIDOMSVGMatrix> mCanvasTM;
 
   enum UpdateState { unsuspended, suspended };

From 597bcee8c3cd9e204dddbd17d57cc94c68f18844 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Wed, 20 Apr 2011 02:59:18 +0800
Subject: [PATCH 117/314] Bug 627966 - Use Places db's favicon service [r=ian]

---
 browser/base/content/tabview/groupitems.js | 25 +++++-----------------
 browser/base/content/tabview/tabitems.js   |  8 +++----
 browser/base/content/tabview/tabview.js    |  5 +++++
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 0547361c3a07..7b483a2179a4 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1140,19 +1140,6 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
       self.remove(child, newOptions);
     });
   },
-  
-  // ----------
-  // Handles error event for loading app tab's fav icon.
-  _onAppTabError : function(event) {
-    iQ(".appTabIcon", this.$appTabTray).each(function(icon) {
-      let $icon = iQ(icon);
-      if ($icon.data("xulTab") == event.target) {
-        $icon.attr("src", Utils.defaultFaviconURL);
-        return false;
-      }
-      return true;
-    });
-  },
 
   // ----------
   // Adds the given xul:tab as an app tab in this group's apptab tray
@@ -1167,10 +1154,9 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
   addAppTab: function GroupItem_addAppTab(xulTab, options) {
     let self = this;
 
-    xulTab.addEventListener("error", this._onAppTabError, false);
-
     // add the icon
-    let iconUrl = xulTab.image || Utils.defaultFaviconURL;
+    let iconUrl = gFavIconService.getFaviconImageForPage(
+                    xulTab.linkedBrowser.currentURI).spec;
     let $appTab = iQ("<img>")
       .addClass("appTabIcon")
       .attr("src", iconUrl)
@@ -1204,8 +1190,6 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     
     // adjust the tray
     this.adjustAppTabTray(true);
-
-    xulTab.removeEventListener("error", this._onAppTabError, false);
   },
 
   // ----------
@@ -1227,7 +1211,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
       if (targetIndex < (length - 1))
         self.$appTabTray[0].insertBefore(
           icon,
-        iQ(".appTabIcon:nth-child(" + (targetIndex + 1) + ")", self.$appTabTray)[0]);
+          iQ(".appTabIcon:nth-child(" + (targetIndex + 1) + ")", self.$appTabTray)[0]);
       else
         $icon.appendTo(self.$appTabTray);
       return false;
@@ -2037,7 +2021,8 @@ let GroupItems = {
     if (xulTab.ownerDocument.defaultView != gWindow || !xulTab.pinned)
       return;
 
-    let iconUrl = xulTab.image || Utils.defaultFaviconURL;
+    let iconUrl = gFavIconService.getFaviconImageForPage(
+                    xulTab.linkedBrowser.currentURI).spec;
     this.groupItems.forEach(function(groupItem) {
       iQ(".appTabIcon", groupItem.$appTabTray).each(function(icon) {
         let $icon = iQ(icon);
diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 69192a4e23e0..5eca4949620a 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -986,11 +986,9 @@ let TabItems = {
 
       // ___ icon
       if (this.shouldLoadFavIcon(tab.linkedBrowser)) {
-        let iconUrl = tab.image;
-        if (!iconUrl)
-          iconUrl = Utils.defaultFaviconURL;
-
-        if (iconUrl != tabItem.$favImage[0].src)
+        let iconUrl = gFavIconService.getFaviconImageForPage(
+                        tab.linkedBrowser.currentURI).spec;
+        if (tabItem.$favImage[0].src != iconUrl)
           tabItem.$favImage[0].src = iconUrl;
 
         iQ(tabItem.$fav[0]).show();
diff --git a/browser/base/content/tabview/tabview.js b/browser/base/content/tabview/tabview.js
index 9c1496d718d3..8ef247efd87a 100644
--- a/browser/base/content/tabview/tabview.js
+++ b/browser/base/content/tabview/tabview.js
@@ -23,6 +23,11 @@ XPCOMUtils.defineLazyGetter(this, "gPrivateBrowsing", function() {
            getService(Ci.nsIPrivateBrowsingService);
 });
 
+XPCOMUtils.defineLazyGetter(this, "gFavIconService", function() {
+  return Cc["@mozilla.org/browser/favicon-service;1"].
+           getService(Ci.nsIFaviconService);
+});
+
 XPCOMUtils.defineLazyGetter(this, "gNetUtil", function() {
   var obj = {};
   Cu.import("resource://gre/modules/NetUtil.jsm", obj);

From bfbf6f773a5168915fc46cb38b3d614f4956f680 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Tue, 19 Apr 2011 23:42:56 +0300
Subject: [PATCH 118/314] Bug 646070 - Respect chrome developer tools
 preference in workspace; f=rcampbell r=sdwilsh

---
 browser/app/profile/firefox.js                |  3 +
 browser/base/content/test/Makefile.in         |  1 +
 ...orkspace_bug_646070_chrome_context_pref.js | 66 +++++++++++++++++++
 .../test/browser_workspace_initialization.js  | 22 +++++++
 browser/base/content/workspace.js             | 22 +++++++
 browser/base/content/workspace.xul            |  8 +--
 6 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index f71d071e2cd2..fdec6aecbc2f 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1050,6 +1050,9 @@ pref("devtools.inspector.enabled", false);
 // Enable the Workspace tool.
 pref("devtools.workspace.enabled", true);
 
+// Enable tools for Chrome development.
+pref("devtools.chrome.enabled", false);
+
 // The last Web Console height. This is initially 0 which means that the Web
 // Console will use the default height next time it shows.
 // Change to -1 if you do not want the Web Console to remember its last height.
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index e4ec14f7113f..0cb6c6422cdb 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -198,6 +198,7 @@ _BROWSER_FILES = \
                  browser_workspace_inspect.js \
                  browser_workspace_files.js \
                  browser_workspace_ui.js \
+                 browser_workspace_bug_646070_chrome_context_pref.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
new file mode 100644
index 000000000000..514951db23ab
--- /dev/null
+++ b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
@@ -0,0 +1,66 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Workspace chrome window object.
+let gWorkspaceWindow;
+
+let gOldPref;
+let DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gOldPref = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
+  Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, true);
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Workspace, "Workspace variable exists");
+
+    gWorkspaceWindow = Workspace.openWorkspace();
+    gWorkspaceWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,Workspace test for bug 646070 - chrome context preference";
+}
+
+function runTests()
+{
+  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+
+  let ws = gWorkspaceWindow.Workspace;
+  ok(ws, "Workspace object exists in new window");
+
+  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
+  ok(contextMenu, "Context menu element exists");
+  ok(!contextMenu.hasAttribute("hidden"), "Context menu is visible");
+
+  let errorConsoleCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  ok(!errorConsoleCommand.hasAttribute("disabled"),
+     "Error console command is enabled");
+
+  let errorConsoleMenu = gWorkspaceWindow.document.
+                         getElementById("ws-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  ok(!errorConsoleMenu.hasAttribute("hidden"),
+     "Error console menuitem is visible");
+
+  let chromeContextCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  ok(!chromeContextCommand.hasAttribute("disabled"),
+     "Chrome context command is disabled");
+
+  Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, gOldPref);
+
+  gWorkspaceWindow.close();
+  gWorkspaceWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
index 9306c546ffef..ef1fa9a893c9 100644
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -32,6 +32,28 @@ function runTests()
   is(typeof ws.inspect, "function", "Workspace.inspect() exists");
   is(typeof ws.print, "function", "Workspace.print() exists");
 
+  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
+  ok(contextMenu, "Context menu element exists");
+  is(contextMenu.getAttribute("hidden"), "true", "Context menu is hidden");
+
+  let errorConsoleCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  is(errorConsoleCommand.getAttribute("disabled"), "true",
+     "Error console command is disabled");
+
+  let errorConsoleMenu = gWorkspaceWindow.document.
+                         getElementById("ws-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  is(errorConsoleMenu.getAttribute("hidden"), "true",
+     "Error console menu item is hidden");
+
+  let chromeContextCommand = gWorkspaceWindow.document.
+                            getElementById("ws-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  is(chromeContextCommand.getAttribute("disabled"), "true",
+     "Chrome context command is disabled");
+
   gWorkspaceWindow.close();
   gWorkspaceWindow = null;
   gBrowser.removeCurrentTab();
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
index 0f69fca8bac3..bd134fdf8c65 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/workspace.js
@@ -53,6 +53,7 @@ const WORKSPACE_CONTEXT_CHROME = 2;
 const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
 const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
 const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+const DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
 
 /**
  * The workspace object handles the Workspace window functionality.
@@ -544,9 +545,30 @@ var Workspace = {
     return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
            getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
   },
+
+  /**
+   * The Workspace window DOMContentLoaded event handler.
+   */
+  onLoad: function HS_onLoad()
+  {
+    let contextMenu = document.getElementById("ws-context-menu");
+    let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
+    let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
+    let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
+
+    let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
+    if (chrome) {
+      contextMenu.removeAttribute("hidden");
+      errorConsoleMenu.removeAttribute("hidden");
+      errorConsoleCommand.removeAttribute("disabled");
+      chromeContextCommand.removeAttribute("disabled");
+    }
+  },
 };
 
 XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
   return Services.strings.createBundle(WORKSPACE_L10N);
 });
 
+addEventListener("DOMContentLoaded", Workspace.onLoad.bind(Workspace), false);
+
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index 625b486055db..c2b6074d1241 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -73,8 +73,8 @@
   <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
   <command id="ws-cmd-print" oncommand="Workspace.print();"/>
   <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
-  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();"/>
-  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();"/>
+  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
+  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
   <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
 </commandset>
 
@@ -254,7 +254,7 @@
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu"
+  <menu id="ws-context-menu" hidden="true"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
     <menupopup id="ws-menu-context">
@@ -276,7 +276,7 @@
         label="&toolsMenu.label;"
         accesskey="&toolsMenu.accesskey;">
     <menupopup id="ws-menu-tools">
-      <menuitem id="ws-menu-errorConsole"
+      <menuitem id="ws-menu-errorConsole" hidden="true"
                 label="&errorConsoleCmd.label;"
                 accesskey="&errorConsoleCmd.accesskey;"
                 key="ws-key-errorConsole"

From 19eba7bd60fbfd86f0eee1a9646725419879bd1f Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Thu, 21 Apr 2011 11:24:30 +0300
Subject: [PATCH 119/314] Bug 646524 - Workspace: cache the sandboxes;
 f=rcampbell r=ddahl,sdwilsh

---
 ...orkspace_bug_646070_chrome_context_pref.js |  8 ++-
 .../test/browser_workspace_contexts.js        | 32 +++++++++
 .../test/browser_workspace_initialization.js  |  8 ++-
 .../base/content/test/browser_workspace_ui.js |  1 +
 browser/base/content/workspace.js             | 70 +++++++++++++++----
 browser/base/content/workspace.xul            | 10 ++-
 .../en-US/chrome/browser/workspace.dtd        |  6 ++
 7 files changed, 114 insertions(+), 21 deletions(-)

diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
index 514951db23ab..bc622bca1fe1 100644
--- a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
+++ b/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
@@ -35,9 +35,11 @@ function runTests()
   let ws = gWorkspaceWindow.Workspace;
   ok(ws, "Workspace object exists in new window");
 
-  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
-  ok(contextMenu, "Context menu element exists");
-  ok(!contextMenu.hasAttribute("hidden"), "Context menu is visible");
+  let chromeContextMenu = gWorkspaceWindow.document.
+                          getElementById("ws-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  ok(!chromeContextMenu.hasAttribute("hidden"),
+     "Chrome context menuitem is visible");
 
   let errorConsoleCommand = gWorkspaceWindow.document.
                             getElementById("ws-cmd-errorConsole");
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
index 9bfb2566be8c..6cc8f18edaa3 100644
--- a/browser/base/content/test/browser_workspace_contexts.js
+++ b/browser/base/content/test/browser_workspace_contexts.js
@@ -86,6 +86,38 @@ function runTests()
   is(typeof ws.execute()[1].addTab, "function",
      "chrome context has access to chrome objects");
 
+  // Check that the sandbox is cached.
+
+  ws.textbox.value = "typeof foobarBug636725cache;";
+  is(ws.execute()[1], "undefined", "global variable does not exist");
+
+  ws.textbox.value = "var foobarBug636725cache = 'foo';";
+  ws.execute();
+
+  ws.textbox.value = "typeof foobarBug636725cache;";
+  is(ws.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  ws.resetContext();
+
+  is(ws.execute()[1], "undefined",
+     "global variable no longer exists after calling resetContext()");
+
+  ws.textbox.value = "var foobarBug636725cache2 = 'foo';";
+  ws.execute();
+
+  ws.textbox.value = "typeof foobarBug636725cache2;";
+  is(ws.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  ws.setContentContext();
+
+  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(ws.execute()[1], "undefined",
+     "global variable no longer exists after changing the context");
+
   gWorkspaceWindow.close();
   gWorkspaceWindow = null;
   gBrowser.removeCurrentTab();
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
index ef1fa9a893c9..3e0218215fc6 100644
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ b/browser/base/content/test/browser_workspace_initialization.js
@@ -32,9 +32,11 @@ function runTests()
   is(typeof ws.inspect, "function", "Workspace.inspect() exists");
   is(typeof ws.print, "function", "Workspace.print() exists");
 
-  let contextMenu = gWorkspaceWindow.document.getElementById("ws-context-menu");
-  ok(contextMenu, "Context menu element exists");
-  is(contextMenu.getAttribute("hidden"), "true", "Context menu is hidden");
+  let chromeContextMenu = gWorkspaceWindow.document.
+                          getElementById("ws-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  is(chromeContextMenu.getAttribute("hidden"), "true",
+     "Chrome context menuitem is hidden");
 
   let errorConsoleCommand = gWorkspaceWindow.document.
                             getElementById("ws-cmd-errorConsole");
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
index 1fcc6a22b3d4..b1af4447e148 100644
--- a/browser/base/content/test/browser_workspace_ui.js
+++ b/browser/base/content/test/browser_workspace_ui.js
@@ -37,6 +37,7 @@ function runTests()
     "ws-text-inspect": "inspect",
     "ws-menu-content": "setContentContext",
     "ws-menu-chrome": "setChromeContext",
+    "ws-menu-resetContext": "resetContext",
     "ws-menu-errorConsole": "openErrorConsole",
     "ws-menu-webConsole": "openWebConsole",
   };
diff --git a/browser/base/content/workspace.js b/browser/base/content/workspace.js
index bd134fdf8c65..e1abf7ce76c9 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/workspace.js
@@ -97,6 +97,12 @@ var Workspace = {
    */
   get browserWindow() Services.wm.getMostRecentWindow("navigator:browser"),
 
+  /**
+   * Reference to the last chrome window of type navigator:browser. We use this
+   * to check if the chrome window changed since the last code evaluation.
+   */
+  _previousWindow: null,
+
   /**
    * Get the gBrowser object of the most recent browser window.
    */
@@ -107,7 +113,15 @@ var Workspace = {
   },
 
   /**
-   * Get the Cu.Sandbox object for the active tab content window object.
+   * Cached Cu.Sandbox object for the active tab content window object.
+   */
+  _contentSandbox: null,
+
+  /**
+   * Get the Cu.Sandbox object for the active tab content window object. Note
+   * that the returned object is cached for later reuse. The cached object is
+   * kept only for the current browser window and it is reset for each context
+   * switch or navigator:browser window switch.
    */
   get contentSandbox()
   {
@@ -117,18 +131,30 @@ var Workspace = {
       return;
     }
 
-    // TODO: bug 646524 - need to cache sandboxes if
-    // currentBrowser == previousBrowser
-    let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
-    return new Cu.Sandbox(contentWindow,
-                          { sandboxPrototype: contentWindow,
-                            wantXrays: false });
+    if (!this._contentSandbox ||
+        this.browserWindow != this._previousBrowserWindow) {
+      let contentWindow = this.gBrowser.selectedBrowser.contentWindow;
+      this._contentSandbox = new Cu.Sandbox(contentWindow,
+        { sandboxPrototype: contentWindow, wantXrays: false });
+
+      this._previousBrowserWindow = this.browserWindow;
+    }
+
+    return this._contentSandbox;
   },
 
   /**
-   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * Cached Cu.Sandbox object for the most recently active navigator:browser
    * chrome window object.
    */
+  _chromeSandbox: null,
+
+  /**
+   * Get the Cu.Sandbox object for the most recently active navigator:browser
+   * chrome window object. Note that the returned object is cached for later
+   * reuse. The cached object is kept only for the current browser window and it
+   * is reset for each context switch or navigator:browser window switch.
+   */
   get chromeSandbox()
   {
     if (!this.browserWindow) {
@@ -137,9 +163,15 @@ var Workspace = {
       return;
     }
 
-    return new Cu.Sandbox(this.browserWindow,
-                          { sandboxPrototype: this.browserWindow,
-                            wantXrays: false });
+    if (!this._chromeSandbox ||
+        this.browserWindow != this._previousBrowserWindow) {
+      this._chromeSandbox = new Cu.Sandbox(this.browserWindow,
+        { sandboxPrototype: this.browserWindow, wantXrays: false });
+
+      this._previousBrowserWindow = this.browserWindow;
+    }
+
+    return this._chromeSandbox;
   },
 
   /**
@@ -519,6 +551,7 @@ var Workspace = {
     content.setAttribute("checked", true);
     this.statusbarStatus.label = content.getAttribute("label");
     this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+    this.resetContext();
   },
 
   /**
@@ -531,6 +564,17 @@ var Workspace = {
     chrome.setAttribute("checked", true);
     this.statusbarStatus.label = chrome.getAttribute("label");
     this.executionContext = WORKSPACE_CONTEXT_CHROME;
+    this.resetContext();
+  },
+
+  /**
+   * Reset the cached Cu.Sandbox object for the current context.
+   */
+  resetContext: function WS_resetContext()
+  {
+    this._chromeSandbox = null;
+    this._contentSandbox = null;
+    this._previousWindow = null;
   },
 
   /**
@@ -551,14 +595,14 @@ var Workspace = {
    */
   onLoad: function HS_onLoad()
   {
-    let contextMenu = document.getElementById("ws-context-menu");
+    let chromeContextMenu = document.getElementById("ws-menu-chrome");
     let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
     let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
     let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
 
     let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
     if (chrome) {
-      contextMenu.removeAttribute("hidden");
+      chromeContextMenu.removeAttribute("hidden");
       errorConsoleMenu.removeAttribute("hidden");
       errorConsoleCommand.removeAttribute("disabled");
       chromeContextCommand.removeAttribute("disabled");
diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index c2b6074d1241..a8b97cb6a853 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -74,6 +74,7 @@
   <command id="ws-cmd-print" oncommand="Workspace.print();"/>
   <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
   <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
+  <command id="ws-cmd-resetContext" oncommand="Workspace.resetContext();"/>
   <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
   <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
 </commandset>
@@ -254,7 +255,7 @@
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu" hidden="true"
+  <menu id="ws-context-menu"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
     <menupopup id="ws-menu-context">
@@ -264,11 +265,16 @@
                 command="ws-cmd-contentContext"
                 checked="true"
                 type="radio"/>
-      <menuitem id="ws-menu-chrome"
+      <menuitem id="ws-menu-chrome" hidden="true"
                 command="ws-cmd-chromeContext"
                 label="&chromeContext.label;"
                 accesskey="&chromeContext.accesskey;"
                 type="radio"/>
+      <menuseparator/>
+      <menuitem id="ws-menu-resetContext"
+                command="ws-cmd-resetContext"
+                label="&resetContext.label;"
+                accesskey="&resetContext.accesskey;"/>
     </menupopup>
   </menu>
 
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/workspace.dtd
index d2ade7d685f8..35589c1a83cc 100644
--- a/browser/locales/en-US/chrome/browser/workspace.dtd
+++ b/browser/locales/en-US/chrome/browser/workspace.dtd
@@ -73,6 +73,12 @@
 <!ENTITY chromeContext.label          "Chrome">
 <!ENTITY chromeContext.accesskey      "H">
 
+<!-- LOCALIZATION NOTE (resetContext.label): This command allows the developer
+  -  to reset/clear the global object of the context where the code executes.
+  -->
+<!ENTITY resetContext.label           "Reset">
+<!ENTITY resetContext.accesskey       "R">
+
 <!ENTITY toolsMenu.label              "Tools">
 <!ENTITY toolsMenu.accesskey          "T">
 

From 7d26270904e029cb7d4caa6499ac755cff151e7e Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 5 May 2011 15:11:35 +0200
Subject: [PATCH 120/314] Bug 634086 - Simulate the native rendering for
 indeterminate progress bar in GTK. r=karlt

---
 widget/src/gtk2/gtk2drawing.c        | 33 ++++++++++++++++++++++++++--
 widget/src/gtk2/gtkdrawing.h         |  2 ++
 widget/src/gtk2/nsNativeThemeGTK.cpp | 16 +++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/widget/src/gtk2/gtk2drawing.c b/widget/src/gtk2/gtk2drawing.c
index dec76cc3d71f..d824ed65d8bd 100644
--- a/widget/src/gtk2/gtk2drawing.c
+++ b/widget/src/gtk2/gtk2drawing.c
@@ -48,6 +48,7 @@
 #include <string.h>
 #include "gtkdrawing.h"
 #include "nsDebug.h"
+#include "prinrval.h"
 
 #include <math.h>
 
@@ -2235,7 +2236,8 @@ moz_gtk_progressbar_paint(GdkDrawable* drawable, GdkRectangle* rect,
 
 static gint
 moz_gtk_progress_chunk_paint(GdkDrawable* drawable, GdkRectangle* rect,
-                             GdkRectangle* cliprect, GtkTextDirection direction)
+                             GdkRectangle* cliprect, GtkTextDirection direction,
+                             GtkThemeWidgetType widget)
 {
     GtkStyle* style;
 
@@ -2245,6 +2247,31 @@ moz_gtk_progress_chunk_paint(GdkDrawable* drawable, GdkRectangle* rect,
     style = gProgressWidget->style;
 
     TSOffsetStyleGCs(style, rect->x, rect->y);
+
+    if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE) {
+      /**
+       * The bar's width and the bar speed are set depending of the progress
+       * bar size. These could also be constant for all progress bars easily.
+       */
+
+      /* The bar is using a fifth of the element size, based on GtkProgressBar
+       * activity-blocks property. */
+      const gint barWidth = MAX(1, rect->width / 5);
+
+      /* Represents the travel that has to be done for a complete cycle. */
+      const gint travel = 2 * (rect->width - barWidth);
+
+      /* period equals to travel / pixelsPerMillisecond
+       * where pixelsPerMillisecond equals rect->width / 1000.0.
+       * This is equivalent to 1600. */
+      const guint period = 1600;
+      const gint t = PR_IntervalToMilliseconds(PR_IntervalNow()) % period;
+      const gint dx = travel * t / period;
+
+      rect->x += (dx < travel / 2) ? dx : travel - dx;
+      rect->width = barWidth;
+    }
+
     gtk_paint_box(style, drawable, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT,
                   cliprect, gProgressWidget, "bar", rect->x, rect->y,
                   rect->width, rect->height);
@@ -2958,6 +2985,7 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
     case MOZ_GTK_SCALE_THUMB_VERTICAL:
     case MOZ_GTK_GRIPPER:
     case MOZ_GTK_PROGRESS_CHUNK:
+    case MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE:
     case MOZ_GTK_EXPANDER:
     case MOZ_GTK_TREEVIEW_EXPANDER:
     case MOZ_GTK_TOOLBAR_SEPARATOR:
@@ -3304,8 +3332,9 @@ moz_gtk_widget_paint(GtkThemeWidgetType widget, GdkDrawable* drawable,
         return moz_gtk_progressbar_paint(drawable, rect, cliprect, direction);
         break;
     case MOZ_GTK_PROGRESS_CHUNK:
+    case MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE:
         return moz_gtk_progress_chunk_paint(drawable, rect, cliprect,
-                                            direction);
+                                            direction, widget);
         break;
     case MOZ_GTK_TAB:
         return moz_gtk_tab_paint(drawable, rect, cliprect, state,
diff --git a/widget/src/gtk2/gtkdrawing.h b/widget/src/gtk2/gtkdrawing.h
index 283faa2ccc00..32bdc719f798 100644
--- a/widget/src/gtk2/gtkdrawing.h
+++ b/widget/src/gtk2/gtkdrawing.h
@@ -178,6 +178,8 @@ typedef enum {
   MOZ_GTK_PROGRESSBAR,
   /* Paints a progress chunk of a GtkProgressBar. */
   MOZ_GTK_PROGRESS_CHUNK,
+  /* Paints a progress chunk of an indeterminated GtkProgressBar. */
+  MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE,
   /* Paints a tab of a GtkNotebook. flags is a GtkTabFlags, defined above. */
   MOZ_GTK_TAB,
   /* Paints the background and border of a GtkNotebook. */
diff --git a/widget/src/gtk2/nsNativeThemeGTK.cpp b/widget/src/gtk2/nsNativeThemeGTK.cpp
index 2198d7f8907d..6cc55d2b1912 100644
--- a/widget/src/gtk2/nsNativeThemeGTK.cpp
+++ b/widget/src/gtk2/nsNativeThemeGTK.cpp
@@ -566,7 +566,14 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
     break;
   case NS_THEME_PROGRESSBAR_CHUNK:
   case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
-    aGtkWidgetType = MOZ_GTK_PROGRESS_CHUNK;
+    {
+      nsIFrame* stateFrame = aFrame->GetParent();
+      nsEventStates eventStates = GetContentState(stateFrame, aWidgetType);
+
+      aGtkWidgetType = IsIndeterminateProgress(stateFrame, eventStates)
+                         ? MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE
+                         : MOZ_GTK_PROGRESS_CHUNK;
+    }
     break;
   case NS_THEME_TAB_SCROLLARROW_BACK:
   case NS_THEME_TAB_SCROLLARROW_FORWARD:
@@ -873,6 +880,13 @@ nsNativeThemeGTK::DrawWidgetBackground(nsRenderingContext* aContext,
     }
   }
 
+  // Indeterminate progress bar are animated.
+  if (gtkWidgetType == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE) {
+    if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 30)) {
+      NS_WARNING("unable to animate widget!");
+    }
+  }
+
   return NS_OK;
 }
 

From 0dca09f5ff3af58d77d32e714d143753ff3ad199 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 21 Apr 2011 11:06:51 +0200
Subject: [PATCH 121/314] Bug 634549 - Cocoa's progress bar widget should use
 HTML progress element's values. r=mstange,roc

---
 widget/src/cocoa/nsNativeThemeCocoa.h  |  6 +++-
 widget/src/cocoa/nsNativeThemeCocoa.mm | 43 ++++++++++++++++++++++++--
 widget/src/xpwidgets/nsNativeTheme.h   |  8 -----
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/widget/src/cocoa/nsNativeThemeCocoa.h b/widget/src/cocoa/nsNativeThemeCocoa.h
index 79403605151c..256598ce8aa6 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.h
+++ b/widget/src/cocoa/nsNativeThemeCocoa.h
@@ -96,13 +96,17 @@ protected:
   nsresult GetSystemColor(PRUint8 aWidgetType, nsILookAndFeel::nsColorID& aColorID);
   nsIntMargin RTLAwareMargin(const nsIntMargin& aMargin, nsIFrame* aFrame);
 
+  // Helpers for progressbar.
+  double GetProgressValue(nsIFrame* aFrame);
+  double GetProgressMaxValue(nsIFrame* aFrame);
+
   // HITheme drawing routines
   void DrawFrame(CGContextRef context, HIThemeFrameKind inKind,
                  const HIRect& inBoxRect, PRBool inReadOnly,
                  nsEventStates inState);
   void DrawProgress(CGContextRef context, const HIRect& inBoxRect,
                     PRBool inIsIndeterminate, PRBool inIsHorizontal,
-                    PRInt32 inValue, PRInt32 inMaxValue, nsIFrame* aFrame);
+                    double inValue, double inMaxValue, nsIFrame* aFrame);
   void DrawTab(CGContextRef context, HIRect inBoxRect, nsEventStates inState,
                nsIFrame* aFrame);
   void DrawTabPanel(CGContextRef context, const HIRect& inBoxRect, nsIFrame* aFrame);
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index c2f8e3251d89..e40edbbb9352 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -61,6 +61,7 @@
 #include "nsCocoaWindow.h"
 #include "nsNativeThemeColors.h"
 #include "nsIScrollableFrame.h"
+#include "nsIDOMHTMLProgressElement.h"
 
 #include "gfxContext.h"
 #include "gfxQuartzSurface.h"
@@ -1042,7 +1043,7 @@ RenderProgress(CGContextRef cgContext, const HIRect& aRenderRect, void* aData)
 void
 nsNativeThemeCocoa::DrawProgress(CGContextRef cgContext, const HIRect& inBoxRect,
                                  PRBool inIsIndeterminate, PRBool inIsHorizontal,
-                                 PRInt32 inValue, PRInt32 inMaxValue,
+                                 double inValue, double inMaxValue,
                                  nsIFrame* aFrame)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
@@ -1056,8 +1057,8 @@ nsNativeThemeCocoa::DrawProgress(CGContextRef cgContext, const HIRect& inBoxRect
   tdi.kind = inIsIndeterminate ? kThemeMediumIndeterminateBar: kThemeMediumProgressBar;
   tdi.bounds = inBoxRect;
   tdi.min = 0;
-  tdi.max = inMaxValue;
-  tdi.value = inValue;
+  tdi.max = PR_INT32_MAX;
+  tdi.value = PR_INT32_MAX * (inValue / inMaxValue);
   tdi.attributes = inIsHorizontal ? kThemeTrackHorizontal : 0;
   tdi.enableState = FrameIsInActiveWindow(aFrame) ? kThemeTrackActive : kThemeTrackInactive;
   tdi.trackInfo.progress.phase = PR_IntervalToMilliseconds(PR_IntervalNow()) /
@@ -2527,3 +2528,39 @@ nsNativeThemeCocoa::GetWidgetTransparency(nsIFrame* aFrame, PRUint8 aWidgetType)
     return eUnknownTransparency;
   }
 }
+
+double
+nsNativeThemeCocoa::GetProgressValue(nsIFrame* aFrame)
+{
+  // When we are using the HTML progress element,
+  // we can get the value from the IDL property.
+  if (aFrame) {
+    nsCOMPtr<nsIDOMHTMLProgressElement> progress =
+      do_QueryInterface(aFrame->GetContent());
+    if (progress) {
+      double value;
+      progress->GetValue(&value);
+      return value;
+    }
+  }
+
+  return (double)CheckIntAttr(aFrame, nsWidgetAtoms::value, 0);
+}
+
+double
+nsNativeThemeCocoa::GetProgressMaxValue(nsIFrame* aFrame)
+{
+  // When we are using the HTML progress element,
+  // we can get the max from the IDL property.
+  if (aFrame) {
+    nsCOMPtr<nsIDOMHTMLProgressElement> progress =
+      do_QueryInterface(aFrame->GetContent());
+    if (progress) {
+      double max;
+      progress->GetMax(&max);
+      return max;
+    }
+  }
+
+  return (double)PR_MAX(CheckIntAttr(aFrame, nsWidgetAtoms::max, 100), 1);
+}
diff --git a/widget/src/xpwidgets/nsNativeTheme.h b/widget/src/xpwidgets/nsNativeTheme.h
index cdd0af946cde..8b6cd28791c1 100644
--- a/widget/src/xpwidgets/nsNativeTheme.h
+++ b/widget/src/xpwidgets/nsNativeTheme.h
@@ -162,14 +162,6 @@ class nsNativeTheme : public nsITimerCallback
   // progressbar:
   PRBool IsIndeterminateProgress(nsIFrame* aFrame, nsEventStates aEventStates);
 
-  PRInt32 GetProgressValue(nsIFrame* aFrame) {
-    return CheckIntAttr(aFrame, nsWidgetAtoms::value, 0);
-  }
-  
-  PRInt32 GetProgressMaxValue(nsIFrame* aFrame) {
-    return PR_MAX(CheckIntAttr(aFrame, nsWidgetAtoms::max, 100), 1);
-  }
-
   // textfield:
   PRBool IsReadOnly(nsIFrame* aFrame) {
       return CheckBooleanAttr(aFrame, nsWidgetAtoms::readonly);

From 0b2e4171218afcbc21af9e3aaa3522006ddef4f8 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Thu, 21 Apr 2011 11:07:32 +0200
Subject: [PATCH 122/314] Bug 634551 - Cocoa's progress bar widget shouldn't
 have a max size. r=mstange,joshmoz

---
 widget/src/cocoa/nsNativeThemeCocoa.h  |   2 +
 widget/src/cocoa/nsNativeThemeCocoa.mm | 177 +++++++++++++++++++++----
 2 files changed, 156 insertions(+), 23 deletions(-)

diff --git a/widget/src/cocoa/nsNativeThemeCocoa.h b/widget/src/cocoa/nsNativeThemeCocoa.h
index 256598ce8aa6..7efbfb222336 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.h
+++ b/widget/src/cocoa/nsNativeThemeCocoa.h
@@ -49,6 +49,7 @@
 #include "gfxASurface.h"
 
 @class CellDrawView;
+@class NSProgressBarCell;
 class nsDeviceContext;
 
 class nsNativeThemeCocoa : private nsNativeTheme,
@@ -152,6 +153,7 @@ private:
   NSSearchFieldCell* mSearchFieldCell;
   NSPopUpButtonCell* mDropdownCell;
   NSComboBoxCell* mComboBoxCell;
+  NSProgressBarCell* mProgressBarCell;
   CellDrawView* mCellDrawView;
 };
 
diff --git a/widget/src/cocoa/nsNativeThemeCocoa.mm b/widget/src/cocoa/nsNativeThemeCocoa.mm
index e40edbbb9352..fe4255384eee 100644
--- a/widget/src/cocoa/nsNativeThemeCocoa.mm
+++ b/widget/src/cocoa/nsNativeThemeCocoa.mm
@@ -111,6 +111,108 @@ extern "C" {
 
 @end
 
+/**
+ * NSProgressBarCell is used to draw progress bars of any size.
+ */
+@interface NSProgressBarCell : NSCell
+{
+    /*All instance variables are private*/
+    double mValue;
+    double mMax;
+    bool   mIsIndeterminate;
+    bool   mIsHorizontal;
+}
+
+- (void)setValue:(double)value;
+- (double)value;
+- (void)setMax:(double)max;
+- (double)max;
+- (void)setIndeterminate:(bool)aIndeterminate;
+- (bool)isIndeterminate;
+- (void)setHorizontal:(bool)aIsHorizontal;
+- (bool)isHorizontal;
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
+@end
+
+@implementation NSProgressBarCell
+
+- (void)setMax:(double)aMax
+{
+  mMax = aMax;
+}
+
+- (double)max
+{
+  return mMax;
+}
+
+- (void)setValue:(double)aValue
+{
+  mValue = aValue;
+}
+
+- (double)value
+{
+  return mValue;
+}
+
+- (void)setIndeterminate:(bool)aIndeterminate
+{
+  mIsIndeterminate = aIndeterminate;
+}
+
+- (bool)isIndeterminate
+{
+  return mIsIndeterminate;
+}
+
+- (void)setHorizontal:(bool)aIsHorizontal
+{
+  mIsHorizontal = aIsHorizontal;
+}
+
+- (bool)isHorizontal
+{
+  return mIsHorizontal;
+}
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+  CGContext* cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+
+  HIThemeTrackDrawInfo tdi;
+
+  tdi.version = 0;
+  tdi.min = 0;
+
+  tdi.value = PR_INT32_MAX * (mValue / mMax);
+  tdi.max = PR_INT32_MAX;
+  tdi.bounds = NSRectToCGRect(cellFrame);
+  tdi.attributes = mIsHorizontal ? kThemeTrackHorizontal : 0;
+  tdi.enableState = [self controlTint] == NSClearControlTint ? kThemeTrackInactive
+                                                             : kThemeTrackActive;
+
+  NSControlSize size = [self controlSize];
+  if (size == NSRegularControlSize) {
+    tdi.kind = mIsIndeterminate ? kThemeLargeIndeterminateBar
+                                : kThemeLargeProgressBar;
+  } else {
+    NS_ASSERTION(size == NSSmallControlSize,
+                 "We shouldn't have another size than small and regular for the moment");
+    tdi.kind = mIsIndeterminate ? kThemeMediumIndeterminateBar
+                                : kThemeMediumProgressBar;
+  }
+
+  PRInt32 stepsPerSecond = mIsIndeterminate ? 60 : 30;
+  PRInt32 milliSecondsPerStep = 1000 / stepsPerSecond;
+  tdi.trackInfo.progress.phase = PR_IntervalToMilliseconds(PR_IntervalNow()) /
+                                 milliSecondsPerStep % 32;
+
+  HIThemeDrawTrack(&tdi, NULL, cgContext, kHIThemeOrientationNormal);
+}
+
+@end
+
 // Workaround for Bug 542048
 // On 64-bit, NSSearchFieldCells don't draw focus rings.
 #if defined(__x86_64__)
@@ -266,6 +368,8 @@ nsNativeThemeCocoa::nsNativeThemeCocoa()
   [mComboBoxCell setEditable:YES];
   [mComboBoxCell setFocusRingType:NSFocusRingTypeExterior];
 
+  mProgressBarCell = [[NSProgressBarCell alloc] init];
+
   mCellDrawView = [[CellDrawView alloc] init];
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
@@ -275,6 +379,7 @@ nsNativeThemeCocoa::~nsNativeThemeCocoa()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
+  [mProgressBarCell release];
   [mPushButtonCell release];
   [mRadioButtonCell release];
   [mCheckboxCell release];
@@ -1032,13 +1137,44 @@ nsNativeThemeCocoa::DrawFrame(CGContextRef cgContext, HIThemeFrameKind inKind,
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }
 
-static void
-RenderProgress(CGContextRef cgContext, const HIRect& aRenderRect, void* aData)
-{
-  HIThemeTrackDrawInfo* tdi = (HIThemeTrackDrawInfo*)aData;
-  tdi->bounds = aRenderRect;
-  HIThemeDrawTrack(tdi, NULL, cgContext, kHIThemeOrientationNormal);
-}
+static const CellRenderSettings progressSettings[2] = {
+  // Determined settings.
+  {
+    {
+      NSZeroSize, // mini
+      NSMakeSize(0, 10), // small
+      NSMakeSize(0, 16)  // regular
+    },
+    {
+      NSZeroSize, NSZeroSize, NSZeroSize
+    },
+    {
+      { // Leopard
+        {0, 0, 0, 0},     // mini
+        {1, 1, 1, 1},     // small
+        {1, 1, 1, 1}      // regular
+      }
+    }
+  },
+  // There is no horizontal margin in regular undetermined size.
+  {
+    {
+      NSZeroSize, // mini
+      NSMakeSize(0, 10), // small
+      NSMakeSize(0, 16)  // regular
+    },
+    {
+      NSZeroSize, NSZeroSize, NSZeroSize
+    },
+    {
+      { // Leopard
+        {0, 0, 0, 0},     // mini
+        {1, 1, 1, 1},     // small
+        {0, 1, 0, 1}      // regular
+      }
+    }
+  }
+};
 
 void
 nsNativeThemeCocoa::DrawProgress(CGContextRef cgContext, const HIRect& inBoxRect,
@@ -1048,24 +1184,19 @@ nsNativeThemeCocoa::DrawProgress(CGContextRef cgContext, const HIRect& inBoxRect
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK;
 
-  HIThemeTrackDrawInfo tdi;
+  NSProgressBarCell* cell = mProgressBarCell;
 
-  PRInt32 stepsPerSecond = inIsIndeterminate ? 60 : 30;
-  PRInt32 milliSecondsPerStep = 1000 / stepsPerSecond;
+  [cell setValue:inValue];
+  [cell setMax:inMaxValue];
+  [cell setIndeterminate:inIsIndeterminate];
+  [cell setHorizontal:inIsHorizontal];
+  [cell setControlTint:(FrameIsInActiveWindow(aFrame) ? [NSColor currentControlTint]
+                                                      : NSClearControlTint)];
 
-  tdi.version = 0;
-  tdi.kind = inIsIndeterminate ? kThemeMediumIndeterminateBar: kThemeMediumProgressBar;
-  tdi.bounds = inBoxRect;
-  tdi.min = 0;
-  tdi.max = PR_INT32_MAX;
-  tdi.value = PR_INT32_MAX * (inValue / inMaxValue);
-  tdi.attributes = inIsHorizontal ? kThemeTrackHorizontal : 0;
-  tdi.enableState = FrameIsInActiveWindow(aFrame) ? kThemeTrackActive : kThemeTrackInactive;
-  tdi.trackInfo.progress.phase = PR_IntervalToMilliseconds(PR_IntervalNow()) /
-                                 milliSecondsPerStep % 16;
-
-  RenderTransformedHIThemeControl(cgContext, inBoxRect, RenderProgress, &tdi,
-                                  IsFrameRTL(aFrame));
+  DrawCellWithSnapping(cell, cgContext, inBoxRect,
+                       progressSettings[inIsIndeterminate],
+                       VerticalAlignFactor(aFrame), mCellDrawView,
+                       IsFrameRTL(aFrame));
 
   NS_OBJC_END_TRY_ABORT_BLOCK;
 }

From 0989c22c9ddc91de64e4d957a45c776db49adffe Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Thu, 21 Apr 2011 18:46:06 +0300
Subject: [PATCH 123/314] Bug 651872 - Create access key for Workspace menu
 item; r=rcampbell

---
 browser/base/content/browser-menubar.inc         | 1 +
 browser/locales/en-US/chrome/browser/browser.dtd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 0aa6613600c8..d1a240af716f 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -553,6 +553,7 @@
               <menuitem id="menu_workspace"
                         hidden="true"
                         label="&workspace.label;"
+                        accesskey="&workspace.accesskey;"
                         key="key_workspace"
                         command="Tools:Workspace"/>
               <menuitem id="menu_pageInfo"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 7202bee28d8f..8a9bdcb2128b 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -192,6 +192,7 @@ can reach it easily. -->
 <!ENTITY inspectMenu.commandkey       "I">
 
 <!ENTITY workspace.label               "Workspace">
+<!ENTITY workspace.accesskey           "O">
 <!ENTITY workspace.keycode             "VK_F4">
 <!ENTITY workspace.keytext             "F4">
 

From 052271d1f612520239914753cb7edb6e0f512874 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Thu, 21 Apr 2011 13:20:18 -0300
Subject: [PATCH 124/314] Bug 627342 - re-enable
 browser_webconsole_js_input_expansion.js; f=pwalton r=gavin.sharp

---
 .../tests/browser/browser_webconsole_js_input_expansion.js   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
index f539db54b5a3..ea4c2199d45d 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_js_input_expansion.js
@@ -93,7 +93,10 @@ function testJSInputExpansion() {
   input.value = "";
   EventUtils.synthesizeKey("d", {});
   let height = getHeight();
-  // is(height, initialHeight, "height shrank to original size");
+  info("height: " + height);
+  info("initialHeight: " + initialHeight);
+  let finalHeightDifference = Math.abs(initialHeight - height);
+  ok(finalHeightDifference <= 1, "height shrank to original size within 1px");
 
   finishTest();
 }

From 1249f6bd8c6a09ffba0a735366cdbf2ae89a9e54 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Thu, 21 Apr 2011 13:22:13 -0300
Subject: [PATCH 125/314] Bug 650780 - evaluating a null object in the web
 console returns TypeError: aObject is null; r=ddahl,dtownsend

---
 toolkit/components/console/hudservice/HUDService.jsm         | 4 ++++
 .../hudservice/tests/browser/browser_webconsole_jsterm.js    | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/toolkit/components/console/hudservice/HUDService.jsm b/toolkit/components/console/hudservice/HUDService.jsm
index fd5122dd61a1..2b09e5ad9e42 100644
--- a/toolkit/components/console/hudservice/HUDService.jsm
+++ b/toolkit/components/console/hudservice/HUDService.jsm
@@ -3861,6 +3861,10 @@ function JSPropertyProvider(aScope, aInputValue)
 
 function isIteratorOrGenerator(aObject)
 {
+  if (aObject === null) {
+    return false;
+  }
+
   if (typeof aObject == "object") {
     if (typeof aObject.__iterator__ == "function" ||
         aObject.constructor && aObject.constructor.name == "Iterator") {
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 c71e8ab5a90c..f83d8a88ef69 100644
--- a/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
+++ b/toolkit/components/console/hudservice/tests/browser/browser_webconsole_jsterm.js
@@ -153,5 +153,10 @@ function testJSTerm()
   isnot(label.textContent.indexOf("SEVERITY_LOG"), -1,
         "pprint(function) shows function source");
 
+  // check that an evaluated null produces "null", bug 650780
+  jsterm.clearOutput();
+  jsterm.execute("null");
+  checkResult("null", "null is null", 1);
+
   finishTest();
 }

From 650a6ba4cf94b8a5928a156f020f694737baf42f Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:29:56 +0100
Subject: [PATCH 126/314] bug 253317 - part 5 - support none/manual/auto values
 for -moz-hyphens in layout. r=roc

---
 content/base/public/nsLineBreaker.h  |  23 ++++-
 content/base/src/nsLineBreaker.cpp   | 121 ++++++++++++++++++++++-----
 gfx/src/nsFontMetrics.cpp            |   5 ++
 gfx/thebes/gfxFont.cpp               |  13 +--
 gfx/thebes/gfxFont.h                 |  53 ++++++++----
 layout/build/nsLayoutStatics.cpp     |   4 +
 layout/generic/nsTextFrameThebes.cpp |  34 ++++++--
 7 files changed, 204 insertions(+), 49 deletions(-)

diff --git a/content/base/public/nsLineBreaker.h b/content/base/public/nsLineBreaker.h
index c4ef2ab45e7e..d323348af8bc 100644
--- a/content/base/public/nsLineBreaker.h
+++ b/content/base/public/nsLineBreaker.h
@@ -43,6 +43,7 @@
 #include "nsILineBreaker.h"
 
 class nsIAtom;
+class nsHyphenator;
 
 /**
  * A receiver of line break data.
@@ -55,8 +56,12 @@ public:
    * will cover the entire text chunk. Substrings may overlap (i.e., we may
    * set the break-before state of a character more than once).
    * @param aBreakBefore the break-before states for the characters in the substring.
+   * These are enum values from gfxTextRun::CompressedGlyph:
+   *    FLAG_BREAK_TYPE_NONE     - no linebreak is allowed here
+   *    FLAG_BREAK_TYPE_NORMAL   - a normal (whitespace) linebreak
+   *    FLAG_BREAK_TYPE_HYPHEN   - a hyphenation point
    */
-  virtual void SetBreaks(PRUint32 aStart, PRUint32 aLength, PRPackedBool* aBreakBefore) = 0;
+  virtual void SetBreaks(PRUint32 aStart, PRUint32 aLength, PRUint8* aBreakBefore) = 0;
   
   /**
    * Indicates which characters should be capitalized. Only called if
@@ -153,7 +158,12 @@ public:
      * We need to be notified of characters that should be capitalized
      * (as in text-transform:capitalize) in this chunk of text.
      */
-    BREAK_NEED_CAPITALIZATION = 0x08
+    BREAK_NEED_CAPITALIZATION = 0x08,
+    /**
+     * Auto-hyphenation is enabled, so we need to get a hyphenator
+     * (if available) and use it to find breakpoints.
+     */
+    BREAK_USE_AUTO_HYPHENATION = 0x10
   };
 
   /**
@@ -214,9 +224,18 @@ private:
   // appropriate sink(s). Then we clear the current word state.
   nsresult FlushCurrentWord();
 
+  void UpdateCurrentWordLangGroup(nsIAtom *aLangGroup);
+
+  void FindHyphenationPoints(nsHyphenator *aHyphenator,
+                             const PRUnichar *aTextStart,
+                             const PRUnichar *aTextLimit,
+                             PRPackedBool *aBreakState);
+
   nsAutoTArray<PRUnichar,100> mCurrentWord;
   // All the items that contribute to mCurrentWord
   nsAutoTArray<TextItem,2>    mTextItems;
+  nsIAtom*                    mCurrentWordLangGroup;
+  PRPackedBool                mCurrentWordContainsMixedLang;
   PRPackedBool                mCurrentWordContainsComplexChar;
 
   // True if the previous character was breakable whitespace
diff --git a/content/base/src/nsLineBreaker.cpp b/content/base/src/nsLineBreaker.cpp
index c0a3a5aba0c6..ab7a14c7ba52 100644
--- a/content/base/src/nsLineBreaker.cpp
+++ b/content/base/src/nsLineBreaker.cpp
@@ -39,9 +39,14 @@
 #include "nsLineBreaker.h"
 #include "nsContentUtils.h"
 #include "nsILineBreaker.h"
+#include "gfxFont.h" // for the gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_* values
+#include "nsHyphenationManager.h"
+#include "nsHyphenator.h"
 
 nsLineBreaker::nsLineBreaker()
-  : mCurrentWordContainsComplexChar(PR_FALSE),
+  : mCurrentWordLangGroup(nsnull),
+    mCurrentWordContainsMixedLang(PR_FALSE),
+    mCurrentWordContainsComplexChar(PR_FALSE),
     mAfterBreakableSpace(PR_FALSE), mBreakHere(PR_FALSE)
 {
 }
@@ -74,7 +79,7 @@ nsresult
 nsLineBreaker::FlushCurrentWord()
 {
   PRUint32 length = mCurrentWord.Length();
-  nsAutoTArray<PRPackedBool,4000> breakState;
+  nsAutoTArray<PRUint8,4000> breakState;
   if (!breakState.AppendElements(length))
     return NS_ERROR_OUT_OF_MEMORY;
   
@@ -82,25 +87,47 @@ nsLineBreaker::FlushCurrentWord()
 
   if (!mCurrentWordContainsComplexChar) {
     // Just set everything internal to "no break"!
-    memset(breakState.Elements(), PR_FALSE, length*sizeof(PRPackedBool));
+    memset(breakState.Elements(),
+           gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE,
+           length*sizeof(PRUint8));
   } else {
     nsContentUtils::LineBreaker()->
       GetJISx4051Breaks(mCurrentWord.Elements(), length, breakState.Elements());
   }
 
+  PRBool autoHyphenate = mCurrentWordLangGroup &&
+    !mCurrentWordContainsMixedLang;
   PRUint32 i;
+  for (i = 0; autoHyphenate && i < mTextItems.Length(); ++i) {
+    TextItem* ti = &mTextItems[i];
+    if (!(ti->mFlags & BREAK_USE_AUTO_HYPHENATION)) {
+      autoHyphenate = PR_FALSE;
+    }
+  }
+  if (autoHyphenate) {
+    nsRefPtr<nsHyphenator> hyphenator =
+      nsHyphenationManager::Instance()->GetHyphenator(mCurrentWordLangGroup);
+    if (hyphenator) {
+      FindHyphenationPoints(hyphenator,
+                            mCurrentWord.Elements(),
+                            mCurrentWord.Elements() + length,
+                            breakState.Elements());
+    }
+  }
+
   PRUint32 offset = 0;
   for (i = 0; i < mTextItems.Length(); ++i) {
     TextItem* ti = &mTextItems[i];
     NS_ASSERTION(ti->mLength > 0, "Zero length word contribution?");
 
     if ((ti->mFlags & BREAK_SUPPRESS_INITIAL) && ti->mSinkOffset == 0) {
-      breakState[offset] = PR_FALSE;
+      breakState[offset] = gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
     if (ti->mFlags & BREAK_SUPPRESS_INSIDE) {
       PRUint32 exclude = ti->mSinkOffset == 0 ? 1 : 0;
-      memset(breakState.Elements() + offset + exclude, PR_FALSE,
-             (ti->mLength - exclude)*sizeof(PRPackedBool));
+      memset(breakState.Elements() + offset + exclude,
+             gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE,
+             (ti->mLength - exclude)*sizeof(PRUint8));
     }
 
     // Don't set the break state for the first character of the word, because
@@ -130,6 +157,8 @@ nsLineBreaker::FlushCurrentWord()
   mCurrentWord.Clear();
   mTextItems.Clear();
   mCurrentWordContainsComplexChar = PR_FALSE;
+  mCurrentWordContainsMixedLang = PR_FALSE;
+  mCurrentWordLangGroup = nsnull;
   return NS_OK;
 }
 
@@ -150,6 +179,7 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUnichar* aText, PRUint32
       if (!mCurrentWordContainsComplexChar && IsComplexChar(aText[offset])) {
         mCurrentWordContainsComplexChar = PR_TRUE;
       }
+      UpdateCurrentWordLangGroup(aLangGroup);
       ++offset;
     }
 
@@ -166,7 +196,7 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUnichar* aText, PRUint32
       return rv;
   }
 
-  nsAutoTArray<PRPackedBool,4000> breakState;
+  nsAutoTArray<PRUint8,4000> breakState;
   if (aSink) {
     if (!breakState.AppendElements(aLength))
       return NS_ERROR_OUT_OF_MEMORY;
@@ -198,27 +228,42 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUnichar* aText, PRUint32
   PRUint32 wordStart = offset;
   PRBool wordHasComplexChar = PR_FALSE;
 
+  nsRefPtr<nsHyphenator> hyphenator;
+  if ((aFlags & BREAK_USE_AUTO_HYPHENATION) && !(aFlags & BREAK_SUPPRESS_INSIDE)) {
+    hyphenator = nsHyphenationManager::Instance()->GetHyphenator(aLangGroup);
+  }
+
   for (;;) {
     PRUnichar ch = aText[offset];
     PRBool isSpace = IsSpace(ch);
     PRBool isBreakableSpace = isSpace && !(aFlags & BREAK_SUPPRESS_INSIDE);
 
     if (aSink) {
-      breakState[offset] = mBreakHere || (mAfterBreakableSpace && !isBreakableSpace);
+      breakState[offset] =
+        mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ?
+          gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL :
+          gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
     mBreakHere = PR_FALSE;
     mAfterBreakableSpace = isBreakableSpace;
 
     if (isSpace) {
       if (offset > wordStart && aSink) {
-        if (wordHasComplexChar && !(aFlags & BREAK_SUPPRESS_INSIDE)) {
-          // Save current start-of-word state because GetJISx4051Breaks will
-          // set it to false
-          PRPackedBool currentStart = breakState[wordStart];
-          nsContentUtils::LineBreaker()->
-            GetJISx4051Breaks(aText + wordStart, offset - wordStart,
-                              breakState.Elements() + wordStart);
-          breakState[wordStart] = currentStart;
+        if (!(aFlags & BREAK_SUPPRESS_INSIDE)) {
+          if (wordHasComplexChar) {
+            // Save current start-of-word state because GetJISx4051Breaks will
+            // set it to false
+            PRUint8 currentStart = breakState[wordStart];
+            nsContentUtils::LineBreaker()->
+              GetJISx4051Breaks(aText + wordStart, offset - wordStart,
+                                breakState.Elements() + wordStart);
+            breakState[wordStart] = currentStart;
+          }
+          if (hyphenator) {
+            FindHyphenationPoints(hyphenator,
+                                  aText + wordStart, aText + offset,
+                                  breakState.Elements() + wordStart);
+          }
         }
         if (aFlags & BREAK_NEED_CAPITALIZATION) {
           SetupCapitalization(aText + wordStart, offset - wordStart,
@@ -246,6 +291,7 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUnichar* aText, PRUint32
         mTextItems.AppendElement(TextItem(aSink, wordStart, len, aFlags));
         // Ensure that the break-before for this word is written out
         offset = wordStart + 1;
+        UpdateCurrentWordLangGroup(aLangGroup);
         break;
       }
     }
@@ -262,17 +308,35 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUnichar* aText, PRUint32
   return NS_OK;
 }
 
+void
+nsLineBreaker::FindHyphenationPoints(nsHyphenator *aHyphenator,
+                                     const PRUnichar *aTextStart,
+                                     const PRUnichar *aTextLimit,
+                                     PRPackedBool *aBreakState)
+{
+  nsDependentSubstring string(aTextStart, aTextLimit);
+  nsAutoTArray<PRPackedBool,200> hyphens;
+  if (NS_SUCCEEDED(aHyphenator->Hyphenate(string, hyphens))) {
+    for (PRUint32 i = 0; i + 1 < string.Length(); ++i) {
+      if (hyphens[i]) {
+        aBreakState[i + 1] =
+          gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_HYPHEN;
+      }
+    }
+  }
+}
+
 nsresult
 nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUint8* aText, PRUint32 aLength,
                           PRUint32 aFlags, nsILineBreakSink* aSink)
 {
   NS_ASSERTION(aLength > 0, "Appending empty text...");
 
-  if (aFlags & BREAK_NEED_CAPITALIZATION) {
-    // Defer to the Unicode path if capitalization is required
+  if (aFlags & (BREAK_NEED_CAPITALIZATION | BREAK_USE_AUTO_HYPHENATION)) {
+    // Defer to the Unicode path if capitalization or hyphenation is required
     nsAutoString str;
-    CopyASCIItoUTF16(nsDependentCString(reinterpret_cast<const char*>(aText), aLength),
-                     str);
+    const char* cp = reinterpret_cast<const char*>(aText);
+    CopyASCIItoUTF16(nsDependentCSubstring(cp, cp + aLength), str);
     return AppendText(aLangGroup, str.get(), aLength, aFlags, aSink);
   }
 
@@ -306,7 +370,7 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUint8* aText, PRUint32 aL
       return rv;
   }
 
-  nsAutoTArray<PRPackedBool,4000> breakState;
+  nsAutoTArray<PRUint8,4000> breakState;
   if (aSink) {
     if (!breakState.AppendElements(aLength))
       return NS_ERROR_OUT_OF_MEMORY;
@@ -337,7 +401,10 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUint8* aText, PRUint32 aL
     PRBool isBreakableSpace = isSpace && !(aFlags & BREAK_SUPPRESS_INSIDE);
 
     if (aSink) {
-      breakState[offset] = mBreakHere || (mAfterBreakableSpace && !isBreakableSpace);
+      breakState[offset] =
+        mBreakHere || (mAfterBreakableSpace && !isBreakableSpace) ?
+          gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NORMAL :
+          gfxTextRun::CompressedGlyph::FLAG_BREAK_TYPE_NONE;
     }
     mBreakHere = PR_FALSE;
     mAfterBreakableSpace = isBreakableSpace;
@@ -390,6 +457,16 @@ nsLineBreaker::AppendText(nsIAtom* aLangGroup, const PRUint8* aText, PRUint32 aL
   return NS_OK;
 }
 
+void
+nsLineBreaker::UpdateCurrentWordLangGroup(nsIAtom *aLangGroup)
+{
+  if (mCurrentWordLangGroup && mCurrentWordLangGroup != aLangGroup) {
+    mCurrentWordContainsMixedLang = PR_TRUE;
+  } else {
+    mCurrentWordLangGroup = aLangGroup;
+  }
+}
+
 nsresult
 nsLineBreaker::AppendInvisibleWhitespace(PRUint32 aFlags)
 {
diff --git a/gfx/src/nsFontMetrics.cpp b/gfx/src/nsFontMetrics.cpp
index 268ab89a1d31..bdc7d3a59427 100644
--- a/gfx/src/nsFontMetrics.cpp
+++ b/gfx/src/nsFontMetrics.cpp
@@ -40,6 +40,7 @@
 #include "nsBoundingMetrics.h"
 #include "nsRenderingContext.h"
 #include "nsDeviceContext.h"
+#include "nsStyleConsts.h"
 #include "gfxTextRunCache.h"
 
 namespace {
@@ -80,6 +81,10 @@ public:
                                       PRPackedBool* aBreakBefore) {
         NS_ERROR("This shouldn't be called because we never call BreakAndMeasureText");
     }
+    virtual PRInt8 GetHyphensOption() {
+        NS_ERROR("This shouldn't be called because we never call BreakAndMeasureText");
+        return NS_STYLE_HYPHENS_NONE;
+    }
     virtual gfxFloat GetHyphenWidth() {
         NS_ERROR("This shouldn't be called because we never enable hyphens");
         return 0;
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
index 5bd9354282ba..17ec6cb38eb7 100644
--- a/gfx/thebes/gfxFont.cpp
+++ b/gfx/thebes/gfxFont.cpp
@@ -65,6 +65,7 @@
 #include "nsBidiUtils.h"
 #include "nsUnicodeRange.h"
 #include "nsCompressedCharMap.h"
+#include "nsStyleConsts.h"
 
 #include "cairo.h"
 #include "gfxFontTest.h"
@@ -3120,7 +3121,7 @@ gfxTextRun::~gfxTextRun()
 
 PRBool
 gfxTextRun::SetPotentialLineBreaks(PRUint32 aStart, PRUint32 aLength,
-                                   PRPackedBool *aBreakBefore,
+                                   PRUint8 *aBreakBefore,
                                    gfxContext *aRefContext)
 {
     NS_ASSERTION(aStart + aLength <= mCharacterCount, "Overflow");
@@ -3130,12 +3131,12 @@ gfxTextRun::SetPotentialLineBreaks(PRUint32 aStart, PRUint32 aLength,
     PRUint32 changed = 0;
     PRUint32 i;
     for (i = 0; i < aLength; ++i) {
-        PRBool canBreak = aBreakBefore[i];
+        PRUint8 canBreak = aBreakBefore[i];
         if (canBreak && !mCharacterGlyphs[aStart + i].IsClusterStart()) {
             // This can happen ... there is no guarantee that our linebreaking rules
             // align with the platform's idea of what constitutes a cluster.
             NS_WARNING("Break suggested inside cluster!");
-            canBreak = PR_FALSE;
+            canBreak = CompressedGlyph::FLAG_BREAK_TYPE_NONE;
         }
         changed |= mCharacterGlyphs[aStart + i].SetCanBreakBefore(canBreak);
     }
@@ -3722,7 +3723,9 @@ gfxTextRun::BreakAndMeasureText(PRUint32 aStart, PRUint32 aMaxLength,
     }
     PRPackedBool hyphenBuffer[MEASUREMENT_BUFFER_SIZE];
     PRBool haveHyphenation = aProvider &&
-                             (mFlags & gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS) != 0;
+        (aProvider->GetHyphensOption() == NS_STYLE_HYPHENS_AUTO ||
+         (aProvider->GetHyphensOption() == NS_STYLE_HYPHENS_MANUAL &&
+          (mFlags & gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS) != 0));
     if (haveHyphenation) {
         aProvider->GetHyphenationBreaks(bufferStart, bufferLength,
                                         hyphenBuffer);
@@ -3766,7 +3769,7 @@ gfxTextRun::BreakAndMeasureText(PRUint32 aStart, PRUint32 aMaxLength,
         // could be the first and last break opportunity on the line, and that
         // would trigger an infinite loop.
         if (!aSuppressInitialBreak || i > aStart) {
-            PRBool lineBreakHere = mCharacterGlyphs[i].CanBreakBefore();
+            PRBool lineBreakHere = mCharacterGlyphs[i].CanBreakBefore() == 1;
             PRBool hyphenation = haveHyphenation && hyphenBuffer[i - bufferStart];
             PRBool wordWrapping = aCanWordWrap && *aBreakPriority <= eWordWrapBreak;
 
diff --git a/gfx/thebes/gfxFont.h b/gfx/thebes/gfxFont.h
index d98cb932afc7..578f630a2760 100644
--- a/gfx/thebes/gfxFont.h
+++ b/gfx/thebes/gfxFont.h
@@ -1407,7 +1407,13 @@ public:
     }
     PRBool CanBreakLineBefore(PRUint32 aPos) {
         NS_ASSERTION(0 <= aPos && aPos < mCharacterCount, "aPos out of range");
-        return mCharacterGlyphs[aPos].CanBreakBefore();
+        return mCharacterGlyphs[aPos].CanBreakBefore() ==
+            CompressedGlyph::FLAG_BREAK_TYPE_NORMAL;
+    }
+    PRBool CanHyphenateBefore(PRUint32 aPos) {
+        NS_ASSERTION(0 <= aPos && aPos < mCharacterCount, "aPos out of range");
+        return mCharacterGlyphs[aPos].CanBreakBefore() ==
+            CompressedGlyph::FLAG_BREAK_TYPE_HYPHEN;
     }
 
     PRUint32 GetLength() { return mCharacterCount; }
@@ -1431,7 +1437,7 @@ public:
      * breaks are the same as the old
      */
     virtual PRBool SetPotentialLineBreaks(PRUint32 aStart, PRUint32 aLength,
-                                          PRPackedBool *aBreakBefore,
+                                          PRUint8 *aBreakBefore,
                                           gfxContext *aRefContext);
 
     /**
@@ -1451,6 +1457,11 @@ public:
         virtual void GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
                                           PRPackedBool *aBreakBefore) = 0;
 
+        // Returns the provider's hyphenation setting, so callers can decide
+        // whether it is necessary to call GetHyphenationBreaks.
+        // Result is an NS_STYLE_HYPHENS_* value.
+        virtual PRInt8 GetHyphensOption() = 0;
+
         // Returns the extra width that will be consumed by a hyphen. This should
         // be constant for a given textrun.
         virtual gfxFloat GetHyphenWidth() = 0;
@@ -1722,14 +1733,22 @@ public:
             // Indicates that a cluster and ligature group starts at this
             // character; this character has a single glyph with a reasonable
             // advance and zero offsets. A "reasonable" advance
-            // is one that fits in the available bits (currently 14) (specified
+            // is one that fits in the available bits (currently 13) (specified
             // in appunits).
             FLAG_IS_SIMPLE_GLYPH  = 0x80000000U,
-            // Indicates that a linebreak is allowed before this character
-            FLAG_CAN_BREAK_BEFORE = 0x40000000U,
+
+            // Indicates whether a linebreak is allowed before this character;
+            // this is a two-bit field that holds a FLAG_BREAK_TYPE_xxx value
+            // indicating the kind of linebreak (if any) allowed here.
+            FLAGS_CAN_BREAK_BEFORE = 0x60000000U,
+
+            FLAGS_CAN_BREAK_SHIFT = 29,
+            FLAG_BREAK_TYPE_NONE   = 0,
+            FLAG_BREAK_TYPE_NORMAL = 1,
+            FLAG_BREAK_TYPE_HYPHEN = 2,
 
             // The advance is stored in appunits
-            ADVANCE_MASK  = 0x3FFF0000U,
+            ADVANCE_MASK  = 0x1FFF0000U,
             ADVANCE_SHIFT = 16,
 
             GLYPH_MASK = 0x0000FFFFU,
@@ -1783,13 +1802,15 @@ public:
                     (FLAG_NOT_LIGATURE_GROUP_START | FLAG_NOT_MISSING);
         }
 
-        PRBool CanBreakBefore() const { return (mValue & FLAG_CAN_BREAK_BEFORE) != 0; }
-        // Returns FLAG_CAN_BREAK_BEFORE if the setting changed, 0 otherwise
-        PRUint32 SetCanBreakBefore(PRBool aCanBreakBefore) {
-            NS_ASSERTION(aCanBreakBefore == PR_FALSE || aCanBreakBefore == PR_TRUE,
+        PRUint8 CanBreakBefore() const {
+            return (mValue & FLAGS_CAN_BREAK_BEFORE) >> FLAGS_CAN_BREAK_SHIFT;
+        }
+        // Returns FLAGS_CAN_BREAK_BEFORE if the setting changed, 0 otherwise
+        PRUint32 SetCanBreakBefore(PRUint8 aCanBreakBefore) {
+            NS_ASSERTION(aCanBreakBefore <= 2,
                          "Bogus break-before value!");
-            PRUint32 breakMask = aCanBreakBefore*FLAG_CAN_BREAK_BEFORE;
-            PRUint32 toggle = breakMask ^ (mValue & FLAG_CAN_BREAK_BEFORE);
+            PRUint32 breakMask = (PRUint32(aCanBreakBefore) << FLAGS_CAN_BREAK_SHIFT);
+            PRUint32 toggle = breakMask ^ (mValue & FLAGS_CAN_BREAK_BEFORE);
             mValue ^= toggle;
             return toggle;
         }
@@ -1797,13 +1818,15 @@ public:
         CompressedGlyph& SetSimpleGlyph(PRUint32 aAdvanceAppUnits, PRUint32 aGlyph) {
             NS_ASSERTION(IsSimpleAdvance(aAdvanceAppUnits), "Advance overflow");
             NS_ASSERTION(IsSimpleGlyphID(aGlyph), "Glyph overflow");
-            mValue = (mValue & FLAG_CAN_BREAK_BEFORE) | FLAG_IS_SIMPLE_GLYPH |
+            mValue = (mValue & FLAGS_CAN_BREAK_BEFORE) |
+                FLAG_IS_SIMPLE_GLYPH |
                 (aAdvanceAppUnits << ADVANCE_SHIFT) | aGlyph;
             return *this;
         }
         CompressedGlyph& SetComplex(PRBool aClusterStart, PRBool aLigatureStart,
                 PRUint32 aGlyphCount) {
-            mValue = (mValue & FLAG_CAN_BREAK_BEFORE) | FLAG_NOT_MISSING |
+            mValue = (mValue & FLAGS_CAN_BREAK_BEFORE) |
+                FLAG_NOT_MISSING |
                 (aClusterStart ? 0 : FLAG_NOT_CLUSTER_START) |
                 (aLigatureStart ? 0 : FLAG_NOT_LIGATURE_GROUP_START) |
                 (aGlyphCount << GLYPH_COUNT_SHIFT);
@@ -1814,7 +1837,7 @@ public:
          * the cluster-start flag (see bugs 618870 and 619286).
          */
         CompressedGlyph& SetMissing(PRUint32 aGlyphCount) {
-            mValue = (mValue & (FLAG_CAN_BREAK_BEFORE | FLAG_NOT_CLUSTER_START)) |
+            mValue = (mValue & (FLAGS_CAN_BREAK_BEFORE | FLAG_NOT_CLUSTER_START)) |
                 (aGlyphCount << GLYPH_COUNT_SHIFT);
             return *this;
         }
diff --git a/layout/build/nsLayoutStatics.cpp b/layout/build/nsLayoutStatics.cpp
index c05d91d3dcf7..d7eda83581be 100644
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -129,6 +129,8 @@
 #include "nsRefreshDriver.h"
 #include "CanvasImageCache.h"
 
+#include "nsHyphenationManager.h"
+
 extern void NS_ShutdownChainItemPool();
 
 using namespace mozilla;
@@ -382,4 +384,6 @@ nsLayoutStatics::Shutdown()
   nsHTMLInputElement::DestroyUploadLastDir();
 
   nsLayoutUtils::Shutdown();
+
+  nsHyphenationManager::Shutdown();
 }
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index 502182aef3eb..270e31429e16 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -865,7 +865,7 @@ public:
                 mChangedBreaks(PR_FALSE), mExistingTextRun(aExistingTextRun) {}
 
     virtual void SetBreaks(PRUint32 aOffset, PRUint32 aLength,
-                           PRPackedBool* aBreakBefore) {
+                           PRUint8* aBreakBefore) {
       if (mTextRun->SetPotentialLineBreaks(aOffset + mOffsetIntoTextRun, aLength,
                                            aBreakBefore, mContext)) {
         mChangedBreaks = PR_TRUE;
@@ -1145,6 +1145,7 @@ BuildTextRuns(gfxContext* aContext, nsTextFrame* aForFrame,
   }
 
   nsPresContext* presContext = aLineContainer->PresContext();
+  nsStyleContext* sc = aForFrame->GetStyleContext();
   BuildTextRunsScanner scanner(presContext, aContext, aLineContainer);
 
   nsBlockFrame* block = nsLayoutUtils::GetAsBlock(aLineContainer);
@@ -2037,6 +2038,9 @@ BuildTextRunsScanner::SetupBreakSinksForTextRun(gfxTextRun* aTextRun,
     if (textStyle->mTextTransform == NS_STYLE_TEXT_TRANSFORM_CAPITALIZE) {
       flags |= nsLineBreaker::BREAK_NEED_CAPITALIZATION;
     }
+    if (textStyle->mHyphens == NS_STYLE_HYPHENS_AUTO) {
+      flags |= nsLineBreaker::BREAK_USE_AUTO_HYPHENATION;
+    }
 
     if (HasCompressedLeadingWhitespace(startFrame, textStyle,
                                        mappedFlow->GetContentEnd(), iter)) {
@@ -2456,6 +2460,9 @@ public:
   virtual gfxFloat GetHyphenWidth();
   virtual void GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
                                     PRPackedBool* aBreakBefore);
+  virtual PRInt8 GetHyphensOption() {
+    return mTextStyle->mHyphens;
+  }
 
   void GetSpacingInternal(PRUint32 aStart, PRUint32 aLength, Spacing* aSpacing,
                           PRBool aIgnoreTabs);
@@ -2825,7 +2832,9 @@ PropertyProvider::GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
   NS_PRECONDITION(IsInBounds(mStart, mLength, aStart, aLength), "Range out of bounds");
   NS_PRECONDITION(mLength != PR_INT32_MAX, "Can't call this with undefined length");
 
-  if (!mTextStyle->WhiteSpaceCanWrap()) {
+  if (!mTextStyle->WhiteSpaceCanWrap() ||
+      mTextStyle->mHyphens == NS_STYLE_HYPHENS_NONE)
+  {
     memset(aBreakBefore, PR_FALSE, aLength);
     return;
   }
@@ -2861,6 +2870,14 @@ PropertyProvider::GetHyphenationBreaks(PRUint32 aStart, PRUint32 aLength,
       allowHyphenBreakBeforeNextChar = PR_FALSE;
     }
   }
+
+  if (mTextStyle->mHyphens == NS_STYLE_HYPHENS_AUTO) {
+    for (PRUint32 i = 0; i < aLength; ++i) {
+      if (mTextRun->CanHyphenateBefore(aStart + i)) {
+        aBreakBefore[i] = PR_TRUE;
+      }
+    }
+  }
 }
 
 void
@@ -6053,7 +6070,9 @@ nsTextFrame::AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
   // otherwise we can just pass PR_INT32_MAX to mean "all the text"
   PRInt32 len = PR_INT32_MAX;
   PRBool hyphenating = frag->GetLength() > 0 &&
-    (mTextRun->GetFlags() & gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS) != 0;
+    (textStyle->mHyphens == NS_STYLE_HYPHENS_AUTO ||
+     (textStyle->mHyphens == NS_STYLE_HYPHENS_MANUAL &&
+      (mTextRun->GetFlags() & gfxTextRunFactory::TEXT_ENABLE_HYPHEN_BREAKS) != 0));
   if (hyphenating) {
     gfxSkipCharsIterator tmp(iter);
     len = PR_MIN(GetContentOffset() + GetInFlowContentLength(),
@@ -6136,7 +6155,7 @@ nsTextFrame::AddInlineMinWidthForFlow(nsRenderingContext *aRenderingContext,
         aData->ForceBreak(aRenderingContext);
       } else if (hyphBreakBefore && hyphBreakBefore[i - start]) {
         aData->OptionallyBreak(aRenderingContext, provider.GetHyphenWidth());
-      } else {
+      } {
         aData->OptionallyBreak(aRenderingContext);
       }
       wordStart = i;
@@ -6360,6 +6379,10 @@ static PRBool
 HasSoftHyphenBefore(const nsTextFragment* aFrag, gfxTextRun* aTextRun,
                     PRInt32 aStartOffset, const gfxSkipCharsIterator& aIter)
 {
+  if (aIter.GetSkippedOffset() < aTextRun->GetLength() &&
+      aTextRun->CanHyphenateBefore(aIter.GetSkippedOffset())) {
+    return PR_TRUE;
+  }
   if (!(aTextRun->GetFlags() & nsTextFrameUtils::TEXT_HAS_SHY))
     return PR_FALSE;
   gfxSkipCharsIterator iter = aIter;
@@ -6934,6 +6957,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
     AddStateBits(TEXT_HAS_NONCOLLAPSED_CHARACTERS);
   }
   if (charsFit > 0 && charsFit == length &&
+      textStyle->mHyphens != NS_STYLE_HYPHENS_NONE &&
       HasSoftHyphenBefore(frag, mTextRun, offset, end)) {
     // Record a potential break after final soft hyphen
     aLineLayout.NotifyOptionalBreakPosition(mContent, offset + length,
@@ -6966,7 +6990,7 @@ nsTextFrame::ReflowText(nsLineLayout& aLineLayout, nscoord aAvailableWidth,
   aStatus = contentLength == maxContentLength
     ? NS_FRAME_COMPLETE : NS_FRAME_NOT_COMPLETE;
 
-  if (charsFit == 0 && length > 0) {
+  if (charsFit == 0 && length > 0 && !usedHyphenation) {
     // Couldn't place any text
     aStatus = NS_INLINE_LINE_BREAK_BEFORE();
   } else if (contentLength > 0 && mContentOffset + contentLength - 1 == newLineOffset) {

From 4a12238b9f11682c90fcc033cd6f077c560cda04 Mon Sep 17 00:00:00 2001
From: Mehdi Mulani <mmmulani@uwaterloo.ca>
Date: Tue, 3 May 2011 13:39:28 -0400
Subject: [PATCH 127/314] Bug 468313 - Add permissions to safe-browsing so
 warnings don't keep showing up on attack sites. r=sdwilsh ui-r=limi

---
 browser/base/content/browser.js                      |  5 +++++
 .../url-classifier/nsUrlClassifierDBService.cpp      | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 7a9467280105..ff8e1146b3ed 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -2688,6 +2688,11 @@ function BrowserOnClick(event) {
         gBrowser.loadURIWithFlags(content.location.href,
                                   nsIWebNavigation.LOAD_FLAGS_BYPASS_CLASSIFIER,
                                   null, null, null);
+
+        Services.perms.add(makeURI(content.location.href), "safe-browsing",
+                           Ci.nsIPermissionManager.ALLOW_ACTION,
+                           Ci.nsIPermissionManager.EXPIRE_SESSION);
+
         let buttons = [{
           label: gNavigatorBundle.getString("safebrowsing.getMeOutOfHereButton.label"),
           accessKey: gNavigatorBundle.getString("safebrowsing.getMeOutOfHereButton.accessKey"),
diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
index 526a0284b04f..7b8601e19cbc 100644
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -54,6 +54,7 @@
 #include "nsIDirectoryService.h"
 #include "nsIKeyModule.h"
 #include "nsIObserverService.h"
+#include "nsIPermissionManager.h"
 #include "nsIPrefBranch.h"
 #include "nsIPrefBranch2.h"
 #include "nsIPrefService.h"
@@ -4025,6 +4026,17 @@ nsUrlClassifierDBService::LookupURI(nsIURI* uri,
     rv = mWorker->CheckCleanHost(key, &clean);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    if (!clean) {
+      nsCOMPtr<nsIPermissionManager> permissionManager =
+        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+
+      if (permissionManager) {
+        PRUint32 perm;
+        permissionManager->TestPermission(uri, "safe-browsing", &perm);
+        clean |= (perm == nsIPermissionManager::ALLOW_ACTION);
+      }
+    }
+
     *didLookup = !clean;
     if (clean) {
       return NS_OK;

From 88c9ed0c0cba53ab4710841c5a40a5be8d9b286d Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:14:50 +0100
Subject: [PATCH 128/314] bug 253317 - part 1 - implement -moz-hyphens property
 in CSS. r=dbaron

---
 dom/interfaces/css/nsIDOMCSS2Properties.idl |  5 ++++-
 layout/base/nsStyleConsts.h                 |  6 ++++++
 layout/style/nsCSSKeywordList.h             |  1 +
 layout/style/nsCSSPropList.h                |  9 +++++++++
 layout/style/nsCSSProps.cpp                 |  8 ++++++++
 layout/style/nsCSSProps.h                   |  1 +
 layout/style/nsComputedDOMStyle.cpp         | 11 +++++++++++
 layout/style/nsComputedDOMStyle.h           |  1 +
 layout/style/nsRuleNode.cpp                 |  5 +++++
 layout/style/nsStyleStruct.cpp              |  3 +++
 layout/style/nsStyleStruct.h                |  1 +
 layout/style/test/property_database.js      |  8 ++++++++
 12 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl
index f18f4d9c274b..7d6a1d47b185 100644
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@@ -50,7 +50,7 @@
  * http://www.w3.org/TR/DOM-Level-2-Style
  */
 
-[scriptable, uuid(35c15ba1-932d-4a95-8f08-ddcdd50c041a)]
+[scriptable, uuid(249755DF-EEFE-4AF4-8127-BE3D6BDAED2D)]
 interface nsIDOMCSS2Properties : nsISupports
 {
            attribute DOMString        background;
@@ -665,6 +665,9 @@ interface nsIDOMCSS2Properties : nsISupports
            attribute DOMString        wordWrap;
                                         // raises(DOMException) on setting
 
+           attribute DOMString        MozHyphens;
+                                        // raises(DOMException) on setting
+
            attribute DOMString        MozTransform;
                                         // raises(DOMException) on setting
 
diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index c8dedc6cee28..736fb2fde640 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -705,6 +705,12 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
 #define NS_STYLE_WORDWRAP_NORMAL                0
 #define NS_STYLE_WORDWRAP_BREAK_WORD            1
 
+// See nsStyleText
+#define NS_STYLE_HYPHENS_NONE                   0
+#define NS_STYLE_HYPHENS_MANUAL                 1
+#define NS_STYLE_HYPHENS_AUTO                   2
+#define NS_STYLE_HYPHENS_ALL                    3
+
 // See nsStyleText
 #define NS_STYLE_LINE_HEIGHT_BLOCK_HEIGHT       0
 
diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h
index 967a70496c4b..d70d3fd48182 100644
--- a/layout/style/nsCSSKeywordList.h
+++ b/layout/style/nsCSSKeywordList.h
@@ -326,6 +326,7 @@ CSS_KEY(lower-latin, lower_latin)
 CSS_KEY(lower-roman, lower_roman)
 CSS_KEY(lowercase, lowercase)
 CSS_KEY(ltr, ltr)
+CSS_KEY(manual, manual)
 CSS_KEY(margin-box, margin_box)
 CSS_KEY(matrix, matrix)
 CSS_KEY(medium, medium)
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index c6ea1a2aebae..ab4149286df0 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -2407,6 +2407,15 @@ CSS_PROP_TEXT(
     kWordwrapKTable,
     CSS_PROP_NO_OFFSET,
     eStyleAnimType_None)
+CSS_PROP_TEXT(
+    -moz-hyphens,
+    hyphens,
+    CSS_PROP_DOMPROP_PREFIXED(Hyphens),
+    CSS_PROPERTY_PARSE_VALUE,
+    VARIANT_HK,
+    kHyphensKTable,
+    CSS_PROP_NO_OFFSET,
+    eStyleAnimType_None)
 CSS_PROP_POSITION(
     z-index,
     z_index,
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index 701d4d00f7e5..e372be45482c 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1328,6 +1328,14 @@ const PRInt32 nsCSSProps::kWordwrapKTable[] = {
   eCSSKeyword_UNKNOWN,-1
 };
 
+const PRInt32 nsCSSProps::kHyphensKTable[] = {
+  eCSSKeyword_none, NS_STYLE_HYPHENS_NONE,
+  eCSSKeyword_manual, NS_STYLE_HYPHENS_MANUAL,
+  eCSSKeyword_auto, NS_STYLE_HYPHENS_AUTO,
+  eCSSKeyword_all, NS_STYLE_HYPHENS_ALL,
+  eCSSKeyword_UNKNOWN,-1
+};
+
 // Specific keyword tables for XUL.properties
 const PRInt32 nsCSSProps::kBoxAlignKTable[] = {
   eCSSKeyword_stretch,  NS_STYLE_BOX_ALIGN_STRETCH,
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index 021a614160dd..d60ed0d68e51 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -425,6 +425,7 @@ public:
   static const PRInt32 kWidthKTable[]; // also min-width, max-width
   static const PRInt32 kWindowShadowKTable[];
   static const PRInt32 kWordwrapKTable[];
+  static const PRInt32 kHyphensKTable[];
 };
 
 #endif /* nsCSSProps_h___ */
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index b86b4977e61e..8a85a67c7cd8 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -2435,6 +2435,16 @@ nsComputedDOMStyle::DoGetWordWrap()
   return val;
 }
 
+nsIDOMCSSValue*
+nsComputedDOMStyle::DoGetHyphens()
+{
+  nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
+  val->SetIdent(
+    nsCSSProps::ValueToKeywordEnum(GetStyleText()->mHyphens,
+                                   nsCSSProps::kHyphensKTable));
+  return val;
+}
+
 nsIDOMCSSValue*
 nsComputedDOMStyle::DoGetPointerEvents()
 {
@@ -4355,6 +4365,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
     COMPUTED_STYLE_MAP_ENTRY(transition_timing_function,    TransitionTimingFunction),
     COMPUTED_STYLE_MAP_ENTRY(_moz_window_shadow,            WindowShadow),
     COMPUTED_STYLE_MAP_ENTRY(word_wrap,                     WordWrap),
+    COMPUTED_STYLE_MAP_ENTRY(hyphens,                       Hyphens),
     COMPUTED_STYLE_MAP_ENTRY(clip_path,                     ClipPath),
     COMPUTED_STYLE_MAP_ENTRY(clip_rule,                     ClipRule),
     COMPUTED_STYLE_MAP_ENTRY(color_interpolation,           ColorInterpolation),
diff --git a/layout/style/nsComputedDOMStyle.h b/layout/style/nsComputedDOMStyle.h
index 3f61b3d94537..53eef0dd5915 100644
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@@ -319,6 +319,7 @@ private:
   nsIDOMCSSValue* DoGetWordSpacing();
   nsIDOMCSSValue* DoGetWhiteSpace();
   nsIDOMCSSValue* DoGetWordWrap();
+  nsIDOMCSSValue* DoGetHyphens();
   nsIDOMCSSValue* DoGetMozTabSize();
 
   /* Visibility properties */
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index bbf8e156193f..222a80389833 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -3353,6 +3353,11 @@ nsRuleNode::ComputeTextData(void* aStartStruct,
               SETDSC_ENUMERATED, parentText->mWordWrap,
               NS_STYLE_WORDWRAP_NORMAL, 0, 0, 0, 0);
 
+  // hyphens: enum, inherit, initial
+  SetDiscrete(*aRuleData->ValueForHyphens(), text->mHyphens, canStoreInRuleTree,
+              SETDSC_ENUMERATED, parentText->mHyphens,
+              NS_STYLE_HYPHENS_MANUAL, 0, 0, 0, 0);
+
   COMPUTE_END_INHERITED(Text, text)
 }
 
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 8bf074ad3933..d63615f647c0 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -2700,6 +2700,7 @@ nsStyleText::nsStyleText(void)
   mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE;
   mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL;
   mWordWrap = NS_STYLE_WORDWRAP_NORMAL;
+  mHyphens = NS_STYLE_HYPHENS_MANUAL;
 
   mLetterSpacing.SetNormalValue();
   mLineHeight.SetNormalValue();
@@ -2715,6 +2716,7 @@ nsStyleText::nsStyleText(const nsStyleText& aSource)
     mTextTransform(aSource.mTextTransform),
     mWhiteSpace(aSource.mWhiteSpace),
     mWordWrap(aSource.mWordWrap),
+    mHyphens(aSource.mHyphens),
     mTabSize(aSource.mTabSize),
     mLetterSpacing(aSource.mLetterSpacing),
     mLineHeight(aSource.mLineHeight),
@@ -2741,6 +2743,7 @@ nsChangeHint nsStyleText::CalcDifference(const nsStyleText& aOther) const
       (mTextTransform != aOther.mTextTransform) ||
       (mWhiteSpace != aOther.mWhiteSpace) ||
       (mWordWrap != aOther.mWordWrap) ||
+      (mHyphens != aOther.mHyphens) ||
       (mLetterSpacing != aOther.mLetterSpacing) ||
       (mLineHeight != aOther.mLineHeight) ||
       (mTextIndent != aOther.mTextIndent) ||
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index d7736b791474..c437f7624275 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1242,6 +1242,7 @@ struct nsStyleText {
   PRUint8 mTextTransform;               // [inherited] see nsStyleConsts.h
   PRUint8 mWhiteSpace;                  // [inherited] see nsStyleConsts.h
   PRUint8 mWordWrap;                    // [inherited] see nsStyleConsts.h
+  PRUint8 mHyphens;                     // [inherited] see nsStyleConsts.h
   PRInt32 mTabSize;                     // [inherited] see nsStyleConsts.h
 
   nsStyleCoord  mLetterSpacing;         // [inherited] coord, normal
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index 9b09a0f8a468..45940342fd7f 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -2717,6 +2717,14 @@ var gCSSProperties = {
 		other_values: [ "break-word" ],
 		invalid_values: []
 	},
+	"-moz-hyphens": {
+		domProp: "MozHyphens",
+		inherited: true,
+		type: CSS_TYPE_LONGHAND,
+		initial_values: [ "manual" ],
+		other_values: [ "none", "auto", "all" ],
+		invalid_values: []
+	},
 	"z-index": {
 		domProp: "zIndex",
 		inherited: false,

From d6efcfa2e3736424765e9a6d56c623c9b38b365a Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:14:51 +0100
Subject: [PATCH 129/314] bug 253317 - part 2 - import hyphenation code (from
 http://sourceforge.net/projects/hunspell/files/Hyphen/2.7/hyphen-2.7.1.tar.gz/download)
 r=smontagu

---
 intl/hyphenation/src/COPYING            |   17 +
 intl/hyphenation/src/COPYING.LGPL       |  515 +++++++++++
 intl/hyphenation/src/COPYING.MPL        |  470 ++++++++++
 intl/hyphenation/src/README             |  127 +++
 intl/hyphenation/src/README.compound    |   77 ++
 intl/hyphenation/src/README.hyphen      |  108 +++
 intl/hyphenation/src/README.nonstandard |  122 +++
 intl/hyphenation/src/hyphen.c           | 1126 +++++++++++++++++++++++
 intl/hyphenation/src/hyphen.h           |  172 ++++
 9 files changed, 2734 insertions(+)
 create mode 100644 intl/hyphenation/src/COPYING
 create mode 100644 intl/hyphenation/src/COPYING.LGPL
 create mode 100644 intl/hyphenation/src/COPYING.MPL
 create mode 100644 intl/hyphenation/src/README
 create mode 100644 intl/hyphenation/src/README.compound
 create mode 100644 intl/hyphenation/src/README.hyphen
 create mode 100644 intl/hyphenation/src/README.nonstandard
 create mode 100644 intl/hyphenation/src/hyphen.c
 create mode 100644 intl/hyphenation/src/hyphen.h

diff --git a/intl/hyphenation/src/COPYING b/intl/hyphenation/src/COPYING
new file mode 100644
index 000000000000..4c278cb77352
--- /dev/null
+++ b/intl/hyphenation/src/COPYING
@@ -0,0 +1,17 @@
+GPL 2.0/LGPL 2.1/MPL 1.1 tri-license
+
+The contents of this software may be used under the terms 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",
+see COPYING.LGPL) or the Mozilla Public License Version 1.1 or later
+(the "MPL", see COPYING.MPL).
+
+The Plain TeX hyphenation tables "hyphen.tex" by Donald E. Knuth
+has a non MPL/LGPL compatible license, but freely redistributable:
+"Unlimited copying and redistribution of this file are permitted as long
+as this file is not modified. Modifications are permitted, but only if
+the resulting file is not named hyphen.tex."
+
+Software distributed under these licenses is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the licences
+for the specific language governing rights and limitations under the licenses.
diff --git a/intl/hyphenation/src/COPYING.LGPL b/intl/hyphenation/src/COPYING.LGPL
new file mode 100644
index 000000000000..c4792dd27a32
--- /dev/null
+++ b/intl/hyphenation/src/COPYING.LGPL
@@ -0,0 +1,515 @@
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+^L
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+^L
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+^L
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+^L
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+^L
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+^L
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+^L
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+^L
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it
+does.>
+    Copyright (C) <year>  <name of author>
+
+    This library 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; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+
+Also add information on how to contact you by electronic and paper
+mail.
+
+You should also get your employer (if you work as a programmer) or
+your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/intl/hyphenation/src/COPYING.MPL b/intl/hyphenation/src/COPYING.MPL
new file mode 100644
index 000000000000..7714141d1542
--- /dev/null
+++ b/intl/hyphenation/src/COPYING.MPL
@@ -0,0 +1,470 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``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 Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
diff --git a/intl/hyphenation/src/README b/intl/hyphenation/src/README
new file mode 100644
index 000000000000..2a02d36e3218
--- /dev/null
+++ b/intl/hyphenation/src/README
@@ -0,0 +1,127 @@
+Hyphen - hyphenation library to use converted TeX hyphenation patterns
+ 
+(C) 1998 Raph Levien
+(C) 2001 ALTLinux, Moscow
+(C) 2006, 2007, 2008, 2010 László Németh
+ 
+This was part of libHnj library by Raph Levien.
+ 
+Peter Novodvorsky from ALTLinux cut hyphenation part from libHnj
+to use it in OpenOffice.org.
+ 
+Compound word and non-standard hyphenation support by László Németh.
+  
+License is the original LibHnj license:
+LibHnj is dual licensed under LGPL and MPL (see also README.libhnj).
+
+Because LGPL allows GPL relicensing, COPYING contains now 
+LGPL/GPL/MPL tri-license for explicit Mozilla source compatibility.
+
+Original Libhnj source with OOo's patches are managed by Rene Engelhard
+and Chris Halls at Debian:
+
+http://packages.debian.org/stable/libdevel/libhnj-dev
+and http://packages.debian.org/unstable/source/libhnj
+
+
+OTHER FILES
+
+This distribution is the source of the en_US hyphenation patterns
+"hyph_en_US.dic", too. See README_hyph_en_US.txt.
+
+Source files of hyph_en_US.dic in the distribution:
+
+hyphen.tex (en_US hyphenation patterns from plain TeX)
+
+  Source: http://tug.ctan.org/text-archive/macros/plain/base/hyphen.tex
+
+tbhyphext.tex: hyphenation exception log from TugBoat archive
+
+  Source of the hyphenation exception list: 
+  http://www.ctan.org/tex-archive/info/digests/tugboat/tb0hyf.tex
+
+  Generated with the hyphenex script
+  (http://www.ctan.org/tex-archive/info/digests/tugboat/hyphenex.sh)
+
+  sh hyphenex.sh <tb0hyf.tex >tbhyphext.tex
+
+
+INSTALLATION
+
+./configure
+make
+make install
+
+UNIT TESTS (WITH VALGRIND DEBUGGER)
+
+make check
+VALGRIND=memcheck make check
+
+USAGE
+
+./example hyph_en_US.dic mywords.txt
+
+or (under Linux)
+
+echo example | ./example hyph_en_US.dic /dev/stdin
+
+NOTE: In the case of Unicode encoded input, convert your words
+to lowercase before hyphenation (under UTF-8 console environment):
+
+cat mywords.txt | awk '{print tolower($0)}' >mywordslow.txt
+
+DEVELOPMENT
+
+See README.hyphen for hyphenation algorithm, README.nonstandard
+and doc/tb87nemeth.pdf for non-standard hyphenation,
+README.compound for compound word hyphenation, and tests/*.
+
+Description of the dictionary format:
+
+First line contains the character encoding (ISO8859-x, UTF-8).
+
+Possible options in the following lines:
+
+LEFTHYPHENMIN num          minimal hyphenation distance from the left word end
+RIGHTHYPHENMIN num         minimal hyphation distance from the right word end
+COMPOUNDLEFTHYPHENMIN num  min. hyph. dist. from the left compound word boundary
+COMPOUNDRIGHTHYPHENMIN num min. hyph. dist. from the right comp. word boundary
+
+hyphenation patterns       see README.* files
+
+NEXTWORD                   separate the two compound sets (see README.compound)
+
+Default values:
+Without explicite declarations, hyphenmin fields of dict struct
+are zeroes, but in this case the lefthyphenmin and righthyphenmin
+will be the default 2 under the hyphenation (for backward compatibility).
+
+Comments
+
+Use percent sign at the beginning of the lines to add comments to your
+hpyhenation patterns (after the character encoding in the first line):
+
+% comment
+
+*****************************************************************************
+* Warning! Correct working of Libhnj *needs* prepared hyphenation patterns. *
+
+For example, generating hyph_en_US.dic from "hyphen.us" TeX patterns:
+    
+perl substrings.pl hyphen.us hyph_en_US.dic ISO8859-1
+
+or with default LEFTHYPHENMIN and RIGHTHYPHENMIN values:
+
+perl substrings.pl hyphen.us hyph_en_US.dic ISO8859-1 2 3
+perl substrings.pl hyphen.gb hyph_en_GB.dic ISO8859-1 3 3
+****************************************************************************
+
+OTHERS
+
+Java hyphenation: Peter B. West (Folio project) implements a hyphenator with
+non standard hyphenation facilities based on extended Libhnj. The HyFo module
+is released in binary form as jar files and in source form as zip files.
+See http://sourceforge.net/project/showfiles.php?group_id=119136
+
+László Németh
+<nemeth (at) openoffice (dot) org>
diff --git a/intl/hyphenation/src/README.compound b/intl/hyphenation/src/README.compound
new file mode 100644
index 000000000000..40e764254854
--- /dev/null
+++ b/intl/hyphenation/src/README.compound
@@ -0,0 +1,77 @@
+New option of Libhyphen 2.7: NOHYPHEN
+
+Hyphen, apostrophe and other characters may be word boundary characters,
+but they don't need (extra) hyphenation. With NOHYPHEN option
+it's possible to hyphenate the words parts correctly.
+
+Example:
+
+ISO8859-1
+NOHYPHEN -,'
+1-1
+1'1
+NEXTLEVEL
+
+Description:
+
+1-1 and 1'1 declare hyphen and apostrophe as word boundary characters
+and NOHYPHEN with the comma separated character (or character sequence)
+list forbid the (extra) hyphens at the hyphen and apostrophe characters.
+
+Compound word hyphenation
+
+Hyphen library supports better compound word hyphenation and special
+rules of compound word hyphenation of German languages and other
+languages with arbitrary number of compound words. The new options,
+COMPOUNDLEFTHYPHENMIN and COMPOUNDRIGHTHYPHENMIN help to set the right
+style for the hyphenation of compound words.
+
+Algorithm
+
+The algorithm is an extension of the original pattern based hyphenation
+algorithm. It uses two hyphenation pattern sets, defined in the same
+pattern file and separated by the NEXTLEVEL keyword. First pattern
+set is for hyphenation only at compound word boundaries, the second one
+is for hyphenation within words or word parts.
+
+Recursive compound level hyphenation
+
+The algorithm is recursive: every word parts of a successful 
+first (compound) level hyphenation will be rehyphenated
+by the same (first) pattern set.
+
+Finally, when first level hyphenation is not possible, Hyphen uses
+the second level hyphenation for the word or the word parts.
+
+Word endings and word parts
+
+Patterns for word endings (patterns with ellipses) match the
+word parts, too.
+
+Options
+
+COMPOUNDLEFTHYPHENMIN: min. hyph. dist. from the left compound word boundary
+COMPOUNDRIGHTHYPHENMIN: min. hyph. dist. from the right comp. word boundary
+NEXTLEVEL: sign second level hyphenation patterns
+
+Default hyphenmin values
+
+Default values of COMPOUNDLEFTHYPHENMIN and COMPOUNDRIGHTHYPHENMIN are 0,
+and 0 under the hyphenation, too. ("0" values of
+LEFTHYPHENMIN and RIGHTHYPHENMIN mean the default "2" under the hyphenation.)
+
+Examples
+
+See tests/compound* test files.
+
+Preparation of hyphenation patterns
+
+It hasn't been special pattern generator tool for compound hyphenation
+patterns, yet. It is possible to use PATGEN to generate both of
+pattern sets, concatenate it manually and set the requested HYPHENMIN values.
+(But don't forget the preprocessing steps by substrings.pl before
+concatenation.) One of the disadvantage of this method, that PATGEN
+doesn't know recursive compound hyphenation of Hyphen.
+
+László Németh
+<nemeth (at) openoffice.org>
diff --git a/intl/hyphenation/src/README.hyphen b/intl/hyphenation/src/README.hyphen
new file mode 100644
index 000000000000..8aa8c8767922
--- /dev/null
+++ b/intl/hyphenation/src/README.hyphen
@@ -0,0 +1,108 @@
+Brief explanation of the hyphenation algorithm herein.[1]
+
+Raph Levien <raph@acm.org>
+4 Aug 1998
+
+   The hyphenation algorithm is basically the same as Knuth's TeX
+algorithm. However, the implementation is quite a bit faster.
+
+   The hyphenation files from TeX can almost be used directly. There
+is a preprocessing step, however. If you don't do the preprocessing
+step, you'll get bad hyphenations (i.e. a silent failure).
+
+   Start with a file such as hyphen.us. This is the TeX ushyph1.tex
+file, with the exception dictionary encoded using the same rules as
+the main portion of the file. Any line beginning with % is a comment.
+Each other line should contain exactly one rule.
+
+   Then, do the preprocessing - "perl substrings.pl hyphen.us". The
+resulting file is hyphen.mashed. It's in Perl, and it's fairly slow
+(it uses brute force algorithms; about 17 seconds on a P100), but it
+could probably be redone in C with clever algorithms. This would be
+valuable, for example, if it was handle user-supplied exception
+dictionaries by integrating them into the rule table.[2]
+
+   Once the rules are preprocessed, loading them is quite quick -
+about 200ms on a P100. It then hyphenates at about 40,000 words per
+second on a P100. I haven't benchmarked it against other
+implementations (both TeX and groff contain essentially the same
+algorithm), but expect that it runs quite a bit faster than any of
+them.
+
+Knuth's algorithm
+
+   This section contains a brief explanation of Knuth's algorithm, in
+case you missed it from the TeX books. We'll use the semi-word
+"example" as our running example.
+
+   Since the beginning and end of a word are special, the algorithm is
+actually run over the prepared word (prep_word in the source)
+".example.". Knuths algorithm basically just does pattern matches from
+the rule set, then applies the matches. The patterns in this case that
+match are "xa", "xam", "mp", and "pl". These are actually stored as
+"x1a", "xam3", "4m1p", and "1p2l2". Whenever numbers appear between
+the letters, they are added in. If two (or more) patterns have numbers
+in the same place, the highest number wins. Here's the example:
+
+ . e x a m p l e .
+     x1a
+     x a m3
+        4m1p
+          1p2l2
+ -----------------
+ . e x1a4m3p2l2e .
+
+   Finally, hyphens are placed wherever odd numbers appear. They are,
+however, suppressed after the first letter and before the last letter
+of the word (TeX actually suppresses them before the next-to-last, as
+well). So, it's "ex-am-ple", which is correct.
+
+   Knuth uses a trie to implement this. I.e. he stores each rule in a
+trie structure. For each position in the word, he searches the trie,
+searching for a match. Most patterns are short, so efficiency should
+be quite good.
+
+Theory of the algorithm
+
+   The algorithm works as a slightly modified finite state machine.
+There are two kinds of transitions: those that consume one letter of
+input (which work just like your regular finite state machine), and
+"fallback" transitions, which don't consume any input. If no
+transition matching the next letter is found, the fallback is used.
+One way of looking at this is a form of compression of the transition
+tables - i.e. it behaves the same as a completely vanilla state
+machine in which the actual transition table of a node is made up of
+the union of transition tables of the node itself, plus its fallbacks.
+
+   Each state is represented by a string. Thus, if the current state
+is "am" and the next letter is "p", then the next state is "amp".
+Fallback transitions go to states which chop off one or (sometimes)
+more letters from the beginning. For example, if none of the
+transitions from "amp" match the next letter, then it will fall back
+to "mp". Similarly, if none of the transitions from "mp" match the
+next letter, it will fall back to "m".
+
+   Each state is also associated with a (possibly null) "match"
+string. This represents the union of all patterns which are
+right-justified substrings of the match string. I.e. the pattern "mp"
+is a right-justified substring of the state "amp", so it's numbers get
+added in. The actual calculation of this union is done by the
+Perl preprocessing script, but could probably be done in C just about
+as easily.
+
+   Because each state transition either consumes one input character
+or shortens the state string by one character, the total number of
+state transitions is linear in the length of the word.
+
+[1] Documentations:
+
+Franklin M. Liang: Word Hy-phen-a-tion by Com-put-er.
+Stanford University, 1983. http://www.tug.org/docs/liang.
+
+László Németh: Automatic non-standard hyphenation in OpenOffice.org,
+TUGboat (27), 2006. No. 2., http://hunspell.sourceforge.net/tb87nemeth.pdf
+
+[2] There is the C version of pattern converter "substrings.c"
+in the distribution written by Nanning Buitenhuis. Unfortunatelly,
+this version hasn't handled the non standard extension of the
+algorithm, yet.
diff --git a/intl/hyphenation/src/README.nonstandard b/intl/hyphenation/src/README.nonstandard
new file mode 100644
index 000000000000..fd80d12c689f
--- /dev/null
+++ b/intl/hyphenation/src/README.nonstandard
@@ -0,0 +1,122 @@
+Non-standard hyphenation
+------------------------
+
+Some languages use non-standard hyphenation; `discretionary'
+character changes at hyphenation points. For example,
+Catalan: paral·lel -> paral-lel,
+Dutch: omaatje -> oma-tje,
+German (before the new orthography): Schiffahrt -> Schiff-fahrt,
+Hungarian: asszonnyal -> asz-szony-nyal (multiple occurance!)
+Swedish: tillata -> till-lata.
+
+Using this extended library, you can define 
+non-standard hyphenation patterns. For example:
+
+l·1l/l=l
+a1atje./a=t,1,3
+.schif1fahrt/ff=f,5,2
+.as3szon/sz=sz,2,3
+n1nyal./ny=ny,1,3
+.til1lata./ll=l,3,2
+
+or with narrow boundaries:
+
+l·1l/l=,1,2
+a1atje./a=,1,1
+.schif1fahrt/ff=,5,1
+.as3szon/sz=,2,1
+n1nyal./ny=,1,1
+.til1lata./ll=,3,1
+
+Note: Libhnj uses modified patterns by preparing substrings.pl.
+Unfortunatelly, now the conversion step can generate bad non-standard
+patterns (non-standard -> standard pattern conversion), so using
+narrow boundaries may be better for recent Libhnj. For example,
+substrings.pl generates a few bad patterns for Hungarian hyphenation
+patterns resulting bad non-standard hyphenation in a few cases. Using narrow
+boundaries solves this problem. Java HyFo module can check this problem.
+
+Syntax of the non-standard hyphenation patterns
+------------------------------------------------
+
+pat1tern/change[,start,cut]
+
+If this pattern matches the word, and this pattern win (see README.hyphen)
+in the change region of the pattern, then pattern[start, start + cut - 1]
+substring will be replaced with the "change".
+
+For example, a German ff -> ff-f hyphenation:
+
+f1f/ff=f 
+
+or with expansion
+
+f1f/ff=f,1,2
+
+will change every "ff" with "ff=f" at hyphenation.
+
+A more real example:
+
+% simple ff -> f-f hyphenation
+f1f
+% Schiffahrt -> Schiff-fahrt hyphenation
+% 
+schif3fahrt/ff=f,5,2
+
+Specification
+
+- Pattern: matching patterns of the original Liang's algorithm
+  - patterns must contain only one hyphenation point at change region
+    signed with an one-digit odd number (1, 3, 5, 7 or 9).
+    These point may be at subregion boundaries: schif3fahrt/ff=,5,1
+  - only the greater value guarantees the win (don't mix non-standard and
+    non-standard patterns with the same value, for example
+    instead of f3f and schif3fahrt/ff=f,5,2 use f3f and schif5fahrt/ff=f,5,2)
+
+- Change: new characters.
+  Arbitrary character sequence. Equal sign (=) signs hyphenation points
+  for OpenOffice.org (like in the example). (In a possible German LaTeX
+  preprocessor, ff could be replaced with "ff, for a Hungarian one, ssz
+  with `ssz, according to the German and Hungarian Babel settings.)
+
+- Start: starting position of the change region.
+  - begins with 1 (not 0): schif3fahrt/ff=f,5,2
+  - start dot doesn't matter: .schif3fahrt/ff=f,5,2
+  - numbers don't matter: .s2c2h2i2f3f2ahrt/ff=f,5,2
+  - In UTF-8 encoding, use Unicode character positions: össze/sz=sz,2,3
+    ("össze" looks "össze" in an ISO 8859-1 8-bit editor). 
+
+- Cut: length of the removed character sequence in the original word.
+  - In UTF-8 encoding, use Unicode character length: paral·1lel/l=l,5,3
+    ("paral·lel" looks "paral·1lel" in an ISO 8859-1 8-bit editor).
+
+Dictionary developing
+---------------------
+
+There hasn't been extended PatGen pattern generator for non-standard
+hyphenation patterns, yet.
+
+Fortunatelly, non-standard hyphenation points are forbidden in the PatGen
+generated hyphenation patterns, so with a little patch can be develop
+non-standard hyphenation patterns also in this case.
+
+Warning: If you use UTF-8 Unicode encoding in your patterns, call
+substrings.pl with UTF-8 parameter to calculate right
+character positions for non-standard hyphenation:
+
+./substrings.pl input output UTF-8
+
+Programming
+-----------
+
+Use hyphenate2() or hyphenate3() to handle non-standard hyphenation.
+See hyphen.h for the documentation of the hyphenate*() functions.
+See example.c for processing the output of the hyphenate*() functions.
+
+Warning: change characters are lower cased in the source, so you may need
+case conversion of the change characters based on input word case detection.
+For example, see OpenOffice.org source
+(lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx).
+
+László Németh
+<nemeth (at) openoffice.org>
diff --git a/intl/hyphenation/src/hyphen.c b/intl/hyphenation/src/hyphen.c
new file mode 100644
index 000000000000..93685b1f51b9
--- /dev/null
+++ b/intl/hyphenation/src/hyphen.c
@@ -0,0 +1,1126 @@
+/* Libhnj is dual licensed under LGPL and MPL. Boilerplate for both
+ * licenses follows.
+ */
+
+/* LibHnj - a library for high quality hyphenation and justification
+ * Copyright (C) 1998 Raph Levien, 
+ * 	     (C) 2001 ALTLinux, Moscow (http://www.alt-linux.org), 
+ *           (C) 2001 Peter Novodvorsky (nidd@cs.msu.su)
+ *           (C) 2006, 2007, 2008, 2010 László Németh (nemeth at OOo)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+ * Boston, MA  02111-1307  USA.
+*/
+
+/*
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.0 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ */
+#include <stdlib.h> /* for NULL, malloc */
+#include <stdio.h>  /* for fprintf */
+#include <string.h> /* for strdup */
+
+#ifdef UNX
+#include <unistd.h> /* for exit */
+#endif
+
+#define noVERBOSE
+
+/* calculate hyphenmin values with long ligature length (2 or 3 characters
+ * instead of 1 or 2) for comparison with hyphenation without ligatures */
+#define noLONG_LIGATURE
+
+#ifdef LONG_LIGATURE
+#define LIG_xx	1
+#define LIG_xxx	2
+#else
+#define LIG_xx	0
+#define LIG_xxx	1
+#endif
+
+#include "hnjalloc.h"
+#include "hyphen.h"
+
+static char *
+hnj_strdup (const char *s)
+{
+  char *new;
+  int l;
+
+  l = strlen (s);
+  new = hnj_malloc (l + 1);
+  memcpy (new, s, l);
+  new[l] = 0;
+  return new;
+}
+
+/* remove cross-platform text line end characters */
+void hnj_strchomp(char * s)
+{
+  int k = strlen(s);
+  if ((k > 0) && ((*(s+k-1)=='\r') || (*(s+k-1)=='\n'))) *(s+k-1) = '\0';
+  if ((k > 1) && (*(s+k-2) == '\r')) *(s+k-2) = '\0';
+}
+
+/* a little bit of a hash table implementation. This simply maps strings
+   to state numbers */
+
+typedef struct _HashTab HashTab;
+typedef struct _HashEntry HashEntry;
+
+/* A cheap, but effective, hack. */
+#define HASH_SIZE 31627
+
+struct _HashTab {
+  HashEntry *entries[HASH_SIZE];
+};
+
+struct _HashEntry {
+  HashEntry *next;
+  char *key;
+  int val;
+};
+
+/* a char* hash function from ASU - adapted from Gtk+ */
+static unsigned int
+hnj_string_hash (const char *s)
+{
+  const char *p;
+  unsigned int h=0, g;
+  for(p = s; *p != '\0'; p += 1) {
+    h = ( h << 4 ) + *p;
+    if ( ( g = h & 0xf0000000 ) ) {
+      h = h ^ (g >> 24);
+      h = h ^ g;
+    }
+  }
+  return h /* % M */;
+}
+
+static HashTab *
+hnj_hash_new (void)
+{
+  HashTab *hashtab;
+  int i;
+
+  hashtab = hnj_malloc (sizeof(HashTab));
+  for (i = 0; i < HASH_SIZE; i++)
+    hashtab->entries[i] = NULL;
+
+  return hashtab;
+}
+
+static void
+hnj_hash_free (HashTab *hashtab)
+{
+  int i;
+  HashEntry *e, *next;
+
+  for (i = 0; i < HASH_SIZE; i++)
+    for (e = hashtab->entries[i]; e; e = next)
+      {
+	next = e->next;
+	hnj_free (e->key);
+	hnj_free (e);
+      }
+
+  hnj_free (hashtab);
+}
+
+/* assumes that key is not already present! */
+static void
+hnj_hash_insert (HashTab *hashtab, const char *key, int val)
+{
+  int i;
+  HashEntry *e;
+
+  i = hnj_string_hash (key) % HASH_SIZE;
+  e = hnj_malloc (sizeof(HashEntry));
+  e->next = hashtab->entries[i];
+  e->key = hnj_strdup (key);
+  e->val = val;
+  hashtab->entries[i] = e;
+}
+
+/* return val if found, otherwise -1 */
+static int
+hnj_hash_lookup (HashTab *hashtab, const char *key)
+{
+  int i;
+  HashEntry *e;
+  i = hnj_string_hash (key) % HASH_SIZE;
+  for (e = hashtab->entries[i]; e; e = e->next)
+    if (!strcmp (key, e->key))
+      return e->val;
+  return -1;
+}
+
+/* Get the state number, allocating a new state if necessary. */
+static int
+hnj_get_state (HyphenDict *dict, HashTab *hashtab, const char *string)
+{
+  int state_num;
+
+  state_num = hnj_hash_lookup (hashtab, string);
+
+  if (state_num >= 0)
+    return state_num;
+
+  hnj_hash_insert (hashtab, string, dict->num_states);
+  /* predicate is true if dict->num_states is a power of two */
+  if (!(dict->num_states & (dict->num_states - 1)))
+    {
+      dict->states = hnj_realloc (dict->states,
+				  (dict->num_states << 1) *
+				  sizeof(HyphenState));
+    }
+  dict->states[dict->num_states].match = NULL;
+  dict->states[dict->num_states].repl = NULL;
+  dict->states[dict->num_states].fallback_state = -1;
+  dict->states[dict->num_states].num_trans = 0;
+  dict->states[dict->num_states].trans = NULL;
+  return dict->num_states++;
+}
+
+/* add a transition from state1 to state2 through ch - assumes that the
+   transition does not already exist */
+static void
+hnj_add_trans (HyphenDict *dict, int state1, int state2, char ch)
+{
+  int num_trans;
+
+  num_trans = dict->states[state1].num_trans;
+  if (num_trans == 0)
+    {
+      dict->states[state1].trans = hnj_malloc (sizeof(HyphenTrans));
+    }
+  else if (!(num_trans & (num_trans - 1)))
+    {
+      dict->states[state1].trans = hnj_realloc (dict->states[state1].trans,
+						(num_trans << 1) *
+						sizeof(HyphenTrans));
+    }
+  dict->states[state1].trans[num_trans].ch = ch;
+  dict->states[state1].trans[num_trans].new_state = state2;
+  dict->states[state1].num_trans++;
+}
+
+#ifdef VERBOSE
+HashTab *global;
+
+static char *
+get_state_str (int state)
+{
+  int i;
+  HashEntry *e;
+
+  for (i = 0; i < HASH_SIZE; i++)
+    for (e = global->entries[i]; e; e = e->next)
+      if (e->val == state)
+	return e->key;
+  return NULL;
+}
+#endif
+
+HyphenDict *
+hnj_hyphen_load (const char *fn)
+{
+  HyphenDict *dict[2];
+  HashTab *hashtab;
+  FILE *f;
+  char buf[MAX_CHARS];
+  char word[MAX_CHARS];
+  char pattern[MAX_CHARS];
+  char * repl;
+  signed char replindex;
+  signed char replcut;
+  int state_num = 0, last_state;
+  int i, j, k;
+  char ch;
+  int found;
+  HashEntry *e;
+  int nextlevel = 0;
+
+  f = fopen (fn, "r");
+  if (f == NULL)
+    return NULL;
+
+// loading one or two dictionaries (separated by NEXTLEVEL keyword)
+for (k = 0; k == 0 || (k == 1 && nextlevel); k++) { 
+  hashtab = hnj_hash_new ();
+#ifdef VERBOSE
+  global = hashtab;
+#endif
+  hnj_hash_insert (hashtab, "", 0);
+  dict[k] = hnj_malloc (sizeof(HyphenDict));
+  dict[k]->num_states = 1;
+  dict[k]->states = hnj_malloc (sizeof(HyphenState));
+  dict[k]->states[0].match = NULL;
+  dict[k]->states[0].repl = NULL;
+  dict[k]->states[0].fallback_state = -1;
+  dict[k]->states[0].num_trans = 0;
+  dict[k]->states[0].trans = NULL;
+  dict[k]->nextlevel = NULL;
+  dict[k]->lhmin = 0;
+  dict[k]->rhmin = 0;
+  dict[k]->clhmin = 0;
+  dict[k]->crhmin = 0;
+  dict[k]->nohyphen = NULL;
+  dict[k]->nohyphenl = 0;
+
+  /* read in character set info */
+  if (k == 0) {
+    for (i=0;i<MAX_NAME;i++) dict[k]->cset[i]= 0;
+    if (fgets(dict[k]->cset,  sizeof(dict[k]->cset),f) != NULL) {
+      for (i=0;i<MAX_NAME;i++)
+        if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
+          dict[k]->cset[i] = 0;
+    } else {
+      dict[k]->cset[0] = 0;
+    }
+    dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0);
+  } else {
+    strcpy(dict[k]->cset, dict[0]->cset);
+    dict[k]->utf8 = dict[0]->utf8;
+  }
+
+  while (fgets (buf, sizeof(buf), f) != NULL)
+    {
+      if (buf[0] != '%')
+	{
+	  if (strncmp(buf, "NEXTLEVEL", 9) == 0) {
+	    nextlevel = 1;
+	    break;
+	  } else if (strncmp(buf, "LEFTHYPHENMIN", 13) == 0) {
+	    dict[k]->lhmin = atoi(buf + 13);
+	    continue;
+	  } else if (strncmp(buf, "RIGHTHYPHENMIN", 14) == 0) {
+	    dict[k]->rhmin = atoi(buf + 14);
+	    continue;
+	  } else if (strncmp(buf, "COMPOUNDLEFTHYPHENMIN", 21) == 0) {
+	    dict[k]->clhmin = atoi(buf + 21);
+	    continue;
+	  } else if (strncmp(buf, "COMPOUNDRIGHTHYPHENMIN", 22) == 0) {
+	    dict[k]->crhmin = atoi(buf + 22);
+	    continue;
+	  } else if (strncmp(buf, "NOHYPHEN", 8) == 0) {
+	    char * space = buf + 8;
+	    while (*space != '\0' && (*space == ' ' || *space == '\t')) space++;
+	    if (*buf != '\0') dict[k]->nohyphen = hnj_strdup(space);
+	    if (dict[k]->nohyphen) {
+	        char * nhe = dict[k]->nohyphen + strlen(dict[k]->nohyphen) - 1;
+	        *nhe = 0;
+	        for (nhe = nhe - 1; nhe > dict[k]->nohyphen; nhe--) {
+	                if (*nhe == ',') {
+	                    dict[k]->nohyphenl++;
+	                    *nhe = 0;
+	                }
+	        }
+	    }
+	    continue;
+	  } 
+	  j = 0;
+	  pattern[j] = '0';
+          repl = strchr(buf, '/');
+          replindex = 0;
+          replcut = 0;
+          if (repl) {
+            char * index = strchr(repl + 1, ',');
+            *repl = '\0';
+            if (index) {
+                char * index2 = strchr(index + 1, ',');
+                *index = '\0';
+                if (index2) {
+                    *index2 = '\0';
+                    replindex = (signed char) atoi(index + 1) - 1;
+                    replcut = (signed char) atoi(index2 + 1);                
+                }
+            } else {
+                hnj_strchomp(repl + 1);
+                replindex = 0;
+                replcut = (signed char) strlen(buf);
+            }
+            repl = hnj_strdup(repl + 1);
+          }
+	  for (i = 0; ((buf[i] > ' ') || (buf[i] < 0)); i++)
+	    {
+	      if (buf[i] >= '0' && buf[i] <= '9')
+		pattern[j] = buf[i];
+	      else
+		{
+		  word[j] = buf[i];
+		  pattern[++j] = '0';
+		}
+	    }
+	  word[j] = '\0';
+	  pattern[j + 1] = '\0';
+
+          i = 0;
+	  if (!repl) {
+	    /* Optimize away leading zeroes */
+            for (; pattern[i] == '0'; i++);
+          } else {
+            if (*word == '.') i++;
+            /* convert UTF-8 char. positions of discretionary hyph. replacements to 8-bit */
+            if (dict[k]->utf8) {
+                int pu = -1;        /* unicode character position */
+                int ps = -1;        /* unicode start position (original replindex) */
+                int pc = (*word == '.') ? 1: 0; /* 8-bit character position */
+                for (; pc < (strlen(word) + 1); pc++) {
+                /* beginning of an UTF-8 character (not '10' start bits) */
+                    if ((((unsigned char) word[pc]) >> 6) != 2) pu++;
+                    if ((ps < 0) && (replindex == pu)) {
+                        ps = replindex;
+                        replindex = (signed char) pc;
+                    }
+                    if ((ps >= 0) && ((pu - ps) == replcut)) {
+                        replcut = (signed char) (pc - replindex);
+                        break;
+                    }
+                }
+                if (*word == '.') replindex--;
+            }
+          }
+
+#ifdef VERBOSE
+	  printf ("word %s pattern %s, j = %d  repl: %s\n", word, pattern + i, j, repl);
+#endif
+	  found = hnj_hash_lookup (hashtab, word);
+	  state_num = hnj_get_state (dict[k], hashtab, word);
+	  dict[k]->states[state_num].match = hnj_strdup (pattern + i);
+	  dict[k]->states[state_num].repl = repl;
+	  dict[k]->states[state_num].replindex = replindex;
+          if (!replcut) {
+            dict[k]->states[state_num].replcut = (signed char) strlen(word);
+          } else {
+            dict[k]->states[state_num].replcut = replcut;
+          }
+
+	  /* now, put in the prefix transitions */
+          for (; found < 0 ;j--)
+	    {
+	      last_state = state_num;
+	      ch = word[j - 1];
+	      word[j - 1] = '\0';
+	      found = hnj_hash_lookup (hashtab, word);
+	      state_num = hnj_get_state (dict[k], hashtab, word);
+	      hnj_add_trans (dict[k], state_num, last_state, ch);
+	    }
+	}
+    }
+
+  /* Could do unioning of matches here (instead of the preprocessor script).
+     If we did, the pseudocode would look something like this:
+
+     foreach state in the hash table
+        foreach i = [1..length(state) - 1]
+           state to check is substr (state, i)
+           look it up
+           if found, and if there is a match, union the match in.
+
+     It's also possible to avoid the quadratic blowup by doing the
+     search in order of increasing state string sizes - then you
+     can break the loop after finding the first match.
+
+     This step should be optional in any case - if there is a
+     preprocessed rule table, it's always faster to use that.
+
+*/
+
+  /* put in the fallback states */
+  for (i = 0; i < HASH_SIZE; i++)
+    for (e = hashtab->entries[i]; e; e = e->next)
+      {
+	if (*(e->key)) for (j = 1; 1; j++)
+	  {          
+	    state_num = hnj_hash_lookup (hashtab, e->key + j);
+	    if (state_num >= 0)
+	      break;
+	  }
+        /* KBH: FIXME state 0 fallback_state should always be -1? */
+	if (e->val)
+	  dict[k]->states[e->val].fallback_state = state_num;
+      }
+#ifdef VERBOSE
+  for (i = 0; i < HASH_SIZE; i++)
+    for (e = hashtab->entries[i]; e; e = e->next)
+      {
+	printf ("%d string %s state %d, fallback=%d\n", i, e->key, e->val,
+		dict[k]->states[e->val].fallback_state);
+	for (j = 0; j < dict[k]->states[e->val].num_trans; j++)
+	  printf (" %c->%d\n", dict[k]->states[e->val].trans[j].ch,
+		  dict[k]->states[e->val].trans[j].new_state);
+      }
+#endif
+
+#ifndef VERBOSE
+  hnj_hash_free (hashtab);
+#endif
+  state_num = 0;
+}
+  fclose(f);
+  if (k == 2) dict[0]->nextlevel = dict[1];
+  return dict[0];
+}
+
+void hnj_hyphen_free (HyphenDict *dict)
+{
+  int state_num;
+  HyphenState *hstate;
+
+  for (state_num = 0; state_num < dict->num_states; state_num++)
+    {
+      hstate = &dict->states[state_num];
+      if (hstate->match)
+	hnj_free (hstate->match);
+      if (hstate->repl)
+	hnj_free (hstate->repl);
+      if (hstate->trans)
+	hnj_free (hstate->trans);
+    }
+  if (dict->nextlevel) hnj_hyphen_free(dict->nextlevel);
+
+  if (dict->nohyphen) hnj_free(dict->nohyphen);
+
+  hnj_free (dict->states);
+
+  hnj_free (dict);
+}
+
+#define MAX_WORD 256
+
+int hnj_hyphen_hyphenate (HyphenDict *dict,
+			   const char *word, int word_size,
+			   char *hyphens)
+{
+  char prep_word_buf[MAX_WORD];
+  char *prep_word;
+  int i, j, k;
+  int state;
+  char ch;
+  HyphenState *hstate;
+  char *match;
+  int offset;
+
+  if (word_size + 3 < MAX_WORD)
+    prep_word = prep_word_buf;
+  else
+    prep_word = hnj_malloc (word_size + 3);
+
+  j = 0;
+  prep_word[j++] = '.';
+
+  for (i = 0; i < word_size; i++)
+      prep_word[j++] = word[i];
+
+  prep_word[j++] = '.';
+  prep_word[j] = '\0';
+
+  for (i = 0; i < word_size + 5; i++)
+    hyphens[i] = '0';
+
+#ifdef VERBOSE
+  printf ("prep_word = %s\n", prep_word);
+#endif
+
+  /* now, run the finite state machine */
+  state = 0;
+  for (i = 0; i < j; i++)
+    {
+      ch = prep_word[i];
+      for (;;)
+	{
+
+	  if (state == -1) {
+            /* return 1; */
+	    /*  KBH: FIXME shouldn't this be as follows? */
+            state = 0;
+            goto try_next_letter;
+          }          
+
+#ifdef VERBOSE
+	  char *state_str;
+	  state_str = get_state_str (state);
+
+	  for (k = 0; k < i - strlen (state_str); k++)
+	    putchar (' ');
+	  printf ("%s", state_str);
+#endif
+
+	  hstate = &dict->states[state];
+	  for (k = 0; k < hstate->num_trans; k++)
+	    if (hstate->trans[k].ch == ch)
+	      {
+		state = hstate->trans[k].new_state;
+		goto found_state;
+	      }
+	  state = hstate->fallback_state;
+#ifdef VERBOSE
+	  printf (" falling back, fallback_state %d\n", state);
+#endif
+	}
+    found_state:
+#ifdef VERBOSE
+      printf ("found state %d\n",state);
+#endif
+      /* Additional optimization is possible here - especially,
+	 elimination of trailing zeroes from the match. Leading zeroes
+	 have already been optimized. */
+      match = dict->states[state].match;
+      /* replacing rules not handled by hyphen_hyphenate() */
+      if (match && !dict->states[state].repl)
+	{
+	  offset = i + 1 - strlen (match);
+#ifdef VERBOSE
+	  for (k = 0; k < offset; k++)
+	    putchar (' ');
+	  printf ("%s\n", match);
+#endif
+	  /* This is a linear search because I tried a binary search and
+	     found it to be just a teeny bit slower. */
+	  for (k = 0; match[k]; k++)
+	    if (hyphens[offset + k] < match[k])
+	      hyphens[offset + k] = match[k];
+	}
+
+      /* KBH: we need this to make sure we keep looking in a word */
+      /* for patterns even if the current character is not known in state 0 */
+      /* since patterns for hyphenation may occur anywhere in the word */
+      try_next_letter: ;
+
+    }
+#ifdef VERBOSE
+  for (i = 0; i < j; i++)
+    putchar (hyphens[i]);
+  putchar ('\n');
+#endif
+
+  for (i = 0; i < j - 4; i++)
+#if 0
+    if (hyphens[i + 1] & 1)
+      hyphens[i] = '-';
+#else
+    hyphens[i] = hyphens[i + 1];
+#endif
+  hyphens[0] = '0';
+  for (; i < word_size; i++)
+    hyphens[i] = '0';
+  hyphens[word_size] = '\0';
+
+  if (prep_word != prep_word_buf)
+    hnj_free (prep_word);
+    
+  return 0;    
+}
+
+/* Unicode ligature length */
+int hnj_ligature(unsigned char c) {
+    switch (c) {
+        case 0x80:			/* ff */
+        case 0x81:			/* fi */
+        case 0x82: return LIG_xx;	/* fl */
+        case 0x83:			/* ffi */
+        case 0x84: return LIG_xxx;	/* ffl */
+        case 0x85:			/* long st */
+        case 0x86: return LIG_xx;	/* st */
+    }
+    return 0;
+}
+
+/* character length of the first n byte of the input word */
+int hnj_hyphen_strnlen(const char * word, int n, int utf8)
+{
+    int i = 0;
+    int j = 0;
+    while (j < n && word[j] != '\0') {
+      i++;
+      // Unicode ligature support
+      if (utf8 && ((unsigned char) word[j] == 0xEF) && ((unsigned char) word[j + 1] == 0xAC))  {
+        i += hnj_ligature(word[j + 2]);
+      }
+      for (j++; utf8 && (word[j] & 0xc0) == 0x80; j++);
+    }
+    return i;
+}
+
+int hnj_hyphen_lhmin(int utf8, const char *word, int word_size, char * hyphens,
+	char *** rep, int ** pos, int ** cut, int lhmin)
+{
+    int i = 1, j;
+
+    // Unicode ligature support
+    if (utf8 && ((unsigned char) word[0] == 0xEF) && ((unsigned char) word[1] == 0xAC))  {
+      i += hnj_ligature(word[2]);
+    }
+
+    for (j = 0; i < lhmin && word[j] != '\0'; i++) do {
+      // check length of the non-standard part
+      if (*rep && *pos && *cut && (*rep)[j]) {
+        char * rh = strchr((*rep)[j], '=');
+        if (rh && (hnj_hyphen_strnlen(word, j - (*pos)[j] + 1, utf8) +
+          hnj_hyphen_strnlen((*rep)[j], rh - (*rep)[j], utf8)) < lhmin) {
+            free((*rep)[j]);
+            (*rep)[j] = NULL;
+            hyphens[j] = '0';
+          }
+       } else {
+         hyphens[j] = '0';
+       }
+       j++;
+
+       // Unicode ligature support
+       if (utf8 && ((unsigned char) word[j] == 0xEF) && ((unsigned char) word[j + 1] == 0xAC))  {
+         i += hnj_ligature(word[j + 2]);
+       }
+    } while (utf8 && (word[j] & 0xc0) == 0x80);
+    return 0;
+}
+
+int hnj_hyphen_rhmin(int utf8, const char *word, int word_size, char * hyphens,
+	char *** rep, int ** pos, int ** cut, int rhmin)
+{
+    int i;
+    int j = word_size - 2;    
+    for (i = 1; i < rhmin && j > 0; j--) {
+      // check length of the non-standard part
+      if (*rep && *pos && *cut && (*rep)[j]) {
+        char * rh = strchr((*rep)[j], '=');
+        if (rh && (hnj_hyphen_strnlen(word + j - (*pos)[j] + (*cut)[j] + 1, 100, utf8) +
+          hnj_hyphen_strnlen(rh + 1, strlen(rh + 1), utf8)) < rhmin) {
+            free((*rep)[j]);
+            (*rep)[j] = NULL;
+            hyphens[j] = '0';
+          }
+       } else {
+         hyphens[j] = '0';
+       }
+       if (!utf8 || (word[j] & 0xc0) != 0xc0) i++;
+    }
+    return 0;
+}
+
+// recursive function for compound level hyphenation
+int hnj_hyphen_hyph_(HyphenDict *dict, const char *word, int word_size,
+    char * hyphens, char *** rep, int ** pos, int ** cut,
+    int clhmin, int crhmin, int lend, int rend)
+{
+  char prep_word_buf[MAX_WORD];
+  char *prep_word;
+  int i, j, k;
+  int state;
+  char ch;
+  HyphenState *hstate;
+  char *match;
+  char *repl;
+  signed char replindex;
+  signed char replcut;
+  int offset;
+  int matchlen_buf[MAX_CHARS];
+  int matchindex_buf[MAX_CHARS];
+  char * matchrepl_buf[MAX_CHARS];
+  int * matchlen;
+  int * matchindex;
+  char ** matchrepl;  
+  int isrepl = 0;
+  int nHyphCount;
+
+  if (word_size + 3 < MAX_CHARS) {
+    prep_word = prep_word_buf;
+    matchlen = matchlen_buf;
+    matchindex = matchindex_buf;
+    matchrepl = matchrepl_buf;
+  } else {
+    prep_word = hnj_malloc (word_size + 3);
+    matchlen = hnj_malloc ((word_size + 3) * sizeof(int));
+    matchindex = hnj_malloc ((word_size + 3) * sizeof(int));
+    matchrepl = hnj_malloc ((word_size + 3) * sizeof(char *));
+  }
+
+  j = 0;
+  prep_word[j++] = '.';
+  
+  for (i = 0; i < word_size; i++)
+      prep_word[j++] = word[i];
+
+  prep_word[j++] = '.';
+  prep_word[j] = '\0';
+
+  for (i = 0; i < j; i++)
+    hyphens[i] = '0';    
+
+#ifdef VERBOSE
+  printf ("prep_word = %s\n", prep_word);
+#endif
+
+  /* now, run the finite state machine */
+  state = 0;
+  for (i = 0; i < j; i++)
+    {
+      ch = prep_word[i];
+      for (;;)
+	{
+
+	  if (state == -1) {
+            /* return 1; */
+	    /*  KBH: FIXME shouldn't this be as follows? */
+            state = 0;
+            goto try_next_letter;
+          }          
+
+#ifdef VERBOSE
+	  char *state_str;
+	  state_str = get_state_str (state);
+
+	  for (k = 0; k < i - strlen (state_str); k++)
+	    putchar (' ');
+	  printf ("%s", state_str);
+#endif
+
+	  hstate = &dict->states[state];
+	  for (k = 0; k < hstate->num_trans; k++)
+	    if (hstate->trans[k].ch == ch)
+	      {
+		state = hstate->trans[k].new_state;
+		goto found_state;
+	      }
+	  state = hstate->fallback_state;
+#ifdef VERBOSE
+	  printf (" falling back, fallback_state %d\n", state);
+#endif
+	}
+    found_state:
+#ifdef VERBOSE
+      printf ("found state %d\n",state);
+#endif
+      /* Additional optimization is possible here - especially,
+	 elimination of trailing zeroes from the match. Leading zeroes
+	 have already been optimized. */
+      match = dict->states[state].match;
+      repl = dict->states[state].repl;
+      replindex = dict->states[state].replindex;
+      replcut = dict->states[state].replcut;
+      /* replacing rules not handled by hyphen_hyphenate() */
+      if (match)
+	{
+	  offset = i + 1 - strlen (match);
+#ifdef VERBOSE
+	  for (k = 0; k < offset; k++)
+	    putchar (' ');
+	  printf ("%s (%s)\n", match, repl);
+#endif
+          if (repl) {
+            if (!isrepl) for(; isrepl < word_size; isrepl++) {
+                matchrepl[isrepl] = NULL;
+                matchindex[isrepl] = -1;
+            }
+            matchlen[offset + replindex] = replcut;
+          }
+	  /* This is a linear search because I tried a binary search and
+	     found it to be just a teeny bit slower. */
+	  for (k = 0; match[k]; k++) {
+	    if ((hyphens[offset + k] < match[k])) {
+	      hyphens[offset + k] = match[k];
+              if (match[k]&1) {
+                matchrepl[offset + k] = repl;
+                if (repl && (k >= replindex) && (k <= replindex + replcut)) {
+                    matchindex[offset + replindex] = offset + k;
+                }
+              }
+            }
+          }
+          
+	}
+
+      /* KBH: we need this to make sure we keep looking in a word */
+      /* for patterns even if the current character is not known in state 0 */
+      /* since patterns for hyphenation may occur anywhere in the word */
+      try_next_letter: ;
+
+    }
+#ifdef VERBOSE
+  for (i = 0; i < j; i++)
+    putchar (hyphens[i]);
+  putchar ('\n');
+#endif
+
+  for (i = 0; i < j - 3; i++)
+#if 0
+    if (hyphens[i + 1] & 1)
+      hyphens[i] = '-';
+#else
+    hyphens[i] = hyphens[i + 1];
+#endif
+  for (; i < word_size; i++)
+    hyphens[i] = '0';
+  hyphens[word_size] = '\0';
+
+       /* now create a new char string showing hyphenation positions */
+       /* count the hyphens and allocate space for the new hyphenated string */
+       nHyphCount = 0;
+       for (i = 0; i < word_size; i++)
+          if (hyphens[i]&1)
+             nHyphCount++;
+       j = 0;
+       for (i = 0; i < word_size; i++) {
+           if (isrepl && (matchindex[i] >= 0) && matchrepl[matchindex[i]]) { 
+                if (rep && pos && cut) {
+                    if (!*rep && !*pos && !*cut) {
+                        int k;
+                        *rep = (char **) malloc(sizeof(char *) * word_size);
+                        *pos = (int *) malloc(sizeof(int) * word_size);
+                        *cut = (int *) malloc(sizeof(int) * word_size);
+                        for (k = 0; k < word_size; k++) {
+                            (*rep)[k] = NULL;
+                            (*pos)[k] = 0;
+                            (*cut)[k] = 0;
+                        }
+                    }
+                    (*rep)[matchindex[i] - 1] = hnj_strdup(matchrepl[matchindex[i]]);
+                    (*pos)[matchindex[i] - 1] = matchindex[i] - i;
+                    (*cut)[matchindex[i] - 1] = matchlen[i];
+                }
+                j += strlen(matchrepl[matchindex[i]]);
+                i += matchlen[i] - 1;
+          }
+       }
+
+  if (matchrepl != matchrepl_buf) {
+    hnj_free (matchrepl);
+    hnj_free (matchlen);
+    hnj_free (matchindex);
+  }
+
+  // recursive hyphenation of the first (compound) level segments
+  if (dict->nextlevel) {
+     char * rep2_buf[MAX_WORD];
+     int pos2_buf[MAX_WORD];
+     int cut2_buf[MAX_WORD];
+     char hyphens2_buf[MAX_WORD];
+     char ** rep2;
+     int * pos2;
+     int * cut2;
+     char * hyphens2;
+     int begin = 0;
+     if (word_size < MAX_CHARS) {
+        rep2 = rep2_buf;
+        pos2 = pos2_buf;
+        cut2 = cut2_buf;
+        hyphens2 = hyphens2_buf;
+     } else {
+        rep2 = hnj_malloc (word_size * sizeof(char *));
+        pos2 = hnj_malloc (word_size * sizeof(int));
+        cut2 = hnj_malloc (word_size * sizeof(int));
+        hyphens2 = hnj_malloc (word_size);
+     }
+     for (i = 0; i < word_size; i++) rep2[i] = NULL;
+     for (i = 0; i < word_size; i++) if 
+        (hyphens[i]&1 || (begin > 0 && i + 1 == word_size)) {
+        if (i - begin > 1) {
+            int hyph = 0;
+            prep_word[i + 2] = '\0';
+            /* non-standard hyphenation at compound boundary (Schiffahrt) */
+            if (*rep && *pos && *cut && (*rep)[i]) {
+                char * l = strchr((*rep)[i], '=');
+                strcpy(prep_word + 2 + i - (*pos)[i], (*rep)[i]);
+                if (l) {
+                    hyph = (l - (*rep)[i]) - (*pos)[i];
+                    prep_word[2 + i + hyph] = '\0';
+                }
+            }
+            hnj_hyphen_hyph_(dict, prep_word + begin + 1, i - begin + 1 + hyph,
+                hyphens2, &rep2, &pos2, &cut2, clhmin,
+                crhmin, (begin > 0 ? 0 : lend), (hyphens[i]&1 ? 0 : rend));
+            for (j = 0; j < i - begin - 1; j++) {
+                hyphens[begin + j] = hyphens2[j];
+                if (rep2[j] && rep && pos && cut) {
+                    if (!*rep && !*pos && !*cut) {
+                        int k;
+                        *rep = (char **) malloc(sizeof(char *) * word_size);
+                        *pos = (int *) malloc(sizeof(int) * word_size);
+                        *cut = (int *) malloc(sizeof(int) * word_size);
+                        for (k = 0; k < word_size; k++) {
+                            (*rep)[k] = NULL;
+                            (*pos)[k] = 0;
+                            (*cut)[k] = 0;
+                        }
+                    }
+                    (*rep)[begin + j] = rep2[j];
+                    (*pos)[begin + j] = pos2[j];
+                    (*cut)[begin + j] = cut2[j];
+                }
+            }
+            prep_word[i + 2] = word[i + 1];
+            if (*rep && *pos && *cut && (*rep)[i]) {
+                strcpy(prep_word + 1, word);
+            }
+        }
+        begin = i + 1;
+        for (j = 0; j < word_size; j++) rep2[j] = NULL;
+     }
+     
+     // non-compound
+     if (begin == 0) {
+        hnj_hyphen_hyph_(dict->nextlevel, word, word_size,
+            hyphens, rep, pos, cut, clhmin, crhmin, lend, rend);
+        if (!lend) hnj_hyphen_lhmin(dict->utf8, word, word_size, hyphens,
+            rep, pos, cut, clhmin);
+        if (!rend) hnj_hyphen_rhmin(dict->utf8, word, word_size, hyphens,
+            rep, pos, cut, crhmin);
+     }
+     
+     if (rep2 != rep2_buf) {
+        free(rep2);
+        free(cut2);
+        free(pos2);
+        free(hyphens2);
+     }
+  }
+
+  if (prep_word != prep_word_buf) hnj_free (prep_word);
+  return 0;
+}
+
+/* UTF-8 normalization of hyphen and non-standard positions */
+int hnj_hyphen_norm(const char *word, int word_size, char * hyphens,
+	char *** rep, int ** pos, int ** cut)
+{
+  int i, j, k;
+  if ((((unsigned char) word[0]) >> 6) == 2) {
+    fprintf(stderr, "error - bad, non UTF-8 input: %s\n", word);
+    return 1;
+  }
+
+  /* calculate UTF-8 character positions */
+  for (i = 0, j = -1; i < word_size; i++) {
+    /* beginning of an UTF-8 character (not '10' start bits) */
+    if ((((unsigned char) word[i]) >> 6) != 2) j++;
+    hyphens[j] = hyphens[i];
+    if (rep && pos && cut && *rep && *pos && *cut) {
+        int l = (*pos)[i];
+        (*pos)[j] = 0;
+        for (k = 0; k < l; k++) {
+            if ((((unsigned char) word[i - k]) >> 6) != 2) (*pos)[j]++;
+        }
+        k = i - l + 1;
+        l = k + (*cut)[i];
+        (*cut)[j] = 0;        
+        for (; k < l; k++) {
+            if ((((unsigned char) word[k]) >> 6) != 2) (*cut)[j]++;
+        }
+        (*rep)[j] = (*rep)[i];
+        if (j < i) {
+            (*rep)[i] = NULL;
+            (*pos)[i] = 0;
+            (*cut)[i] = 0;
+        }
+    }
+  }
+  hyphens[j + 1] = '\0';
+  return 0;
+}
+
+/* get the word with all possible hyphenations (output: hyphword) */
+void hnj_hyphen_hyphword(const char * word, int l, const char * hyphens, 
+    char * hyphword, char *** rep, int ** pos, int ** cut)
+{
+  int i, j;
+  for (i = 0, j = 0; i < l; i++, j++) {
+    if (hyphens[i]&1) {
+      hyphword[j] = word[i];
+      if (*rep && *pos && *cut && (*rep)[i]) {
+        strcpy(hyphword + j - (*pos)[i] + 1, (*rep)[i]);
+        j += strlen((*rep)[i]) - (*pos)[i];
+        i += (*cut)[i] - (*pos)[i];
+      } else hyphword[++j] = '=';
+    } else hyphword[j] = word[i];
+  }
+  hyphword[j] = '\0';
+}
+
+
+/* main api function with default hyphenmin parameters */
+int hnj_hyphen_hyphenate2 (HyphenDict *dict,
+			   const char *word, int word_size, char * hyphens,
+			   char *hyphword, char *** rep, int ** pos, int ** cut)
+{
+  hnj_hyphen_hyph_(dict, word, word_size, hyphens, rep, pos, cut,
+    dict->clhmin, dict->crhmin, 1, 1);
+  hnj_hyphen_lhmin(dict->utf8, word, word_size,
+    hyphens, rep, pos, cut, (dict->lhmin > 0 ? dict->lhmin : 2));
+  hnj_hyphen_rhmin(dict->utf8, word, word_size,
+    hyphens, rep, pos, cut, (dict->rhmin > 0 ? dict->rhmin : 2));
+
+  /* nohyphen */
+  if (dict->nohyphen) {
+    char * nh = dict->nohyphen;
+    int nhi;
+    for (nhi = 0; nhi <= dict->nohyphenl; nhi++) {
+        char * nhy = (char *) strstr(word, nh);
+        while (nhy) {
+            hyphens[nhy - word + strlen(nh) - 1] = 0;
+            if (nhy - word  - 1 >= 0) hyphens[nhy - word - 1] = 0;
+            nhy = (char *) strstr(nhy + 1, nh);
+        }
+        nh = nh + strlen(nh) + 1;
+    }
+  }
+
+  if (hyphword) hnj_hyphen_hyphword(word, word_size, hyphens, hyphword, rep, pos, cut);
+  if (dict->utf8) return hnj_hyphen_norm(word, word_size, hyphens, rep, pos, cut);
+  return 0;
+}
+
+/* previous main api function with hyphenmin parameters */
+int hnj_hyphen_hyphenate3 (HyphenDict *dict,
+	const char *word, int word_size, char * hyphens,
+	char *hyphword, char *** rep, int ** pos, int ** cut,
+	int lhmin, int rhmin, int clhmin, int crhmin)
+{
+  lhmin = (lhmin > 0 ? lhmin : dict->lhmin);
+  rhmin = (rhmin > 0 ? rhmin : dict->rhmin);
+  hnj_hyphen_hyph_(dict, word, word_size, hyphens, rep, pos, cut,
+    clhmin, crhmin, 1, 1);
+  hnj_hyphen_lhmin(dict->utf8, word, word_size, hyphens,
+    rep, pos, cut, (lhmin > 0 ? lhmin : 2));
+  hnj_hyphen_rhmin(dict->utf8, word, word_size, hyphens,
+    rep, pos, cut, (rhmin > 0 ? rhmin : 2));
+  if (hyphword) hnj_hyphen_hyphword(word, word_size, hyphens, hyphword, rep, pos, cut);
+
+  /* nohyphen */
+  if (dict->nohyphen) {
+    char * nh = dict->nohyphen;
+    int nhi;
+    for (nhi = 0; nhi <= dict->nohyphenl; nhi++) {
+        char * nhy = (char *) strstr(word, nh);
+        while (nhy) {
+            hyphens[nhy - word + strlen(nh) - 1] = 0;
+            if (nhy - word  - 1 >= 0) hyphens[nhy - word - 1] = 0;
+            nhy = (char *) strstr(nhy + 1, nh);
+        }
+        nh = nh + strlen(nh) + 1;
+    }
+  }
+
+  if (dict->utf8) return hnj_hyphen_norm(word, word_size, hyphens, rep, pos, cut);
+  return 0;
+}
diff --git a/intl/hyphenation/src/hyphen.h b/intl/hyphenation/src/hyphen.h
new file mode 100644
index 000000000000..1b91ddc0102c
--- /dev/null
+++ b/intl/hyphenation/src/hyphen.h
@@ -0,0 +1,172 @@
+/* Hyphen - hyphenation library using converted TeX hyphenation patterns
+ *
+ * (C) 1998 Raph Levien
+ * (C) 2001 ALTLinux, Moscow
+ * (C) 2006, 2007, 2008 László Németh
+ *
+ * This was part of libHnj library by Raph Levien.
+ *
+ * Peter Novodvorsky from ALTLinux cut hyphenation part from libHnj
+ * to use it in OpenOffice.org.
+ *
+ * Non-standard and compound word hyphenation support by László Németh.
+ * 
+ * License is the original LibHnj license:
+ *
+ * LibHnj is dual licensed under LGPL and MPL. Boilerplate for both
+ * licenses follows.
+ */
+
+/* LibHnj - a library for high quality hyphenation and justification
+ * Copyright (C) 1998 Raph Levien
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
+ * Boston, MA  02111-1307  USA.
+*/
+
+/*
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.0 (the "MPL"); you may not use this file except in
+ * compliance with the MPL.  You may obtain a copy of the MPL at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL
+ * for the specific language governing rights and limitations under the
+ * MPL.
+ *
+ */
+#ifndef __HYPHEN_H__
+#define __HYPHEN_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef struct _HyphenDict HyphenDict;
+typedef struct _HyphenState HyphenState;
+typedef struct _HyphenTrans HyphenTrans;
+#define MAX_CHARS 100
+#define MAX_NAME 20
+
+struct _HyphenDict {
+  /* user options */
+  char lhmin;    /* lefthyphenmin: min. hyph. distance from the left side */
+  char rhmin;    /* righthyphenmin: min. hyph. distance from the right side */
+  char clhmin;   /* min. hyph. distance from the left compound boundary */
+  char crhmin;   /* min. hyph. distance from the right compound boundary */
+  char * nohyphen; /* comma separated list of characters or character
+                    sequences with forbidden hyphenation */
+  int nohyphenl; /* count of elements in nohyphen */
+  /* system variables */
+  int num_states;
+  char cset[MAX_NAME];
+  int utf8;
+  HyphenState *states;
+  HyphenDict *nextlevel;
+};
+
+struct _HyphenState {
+  char *match;
+  char *repl;
+  signed char replindex;
+  signed char replcut;
+  int fallback_state;
+  int num_trans;
+  HyphenTrans *trans;
+};
+
+struct _HyphenTrans {
+  char ch;
+  int new_state;
+};
+
+HyphenDict *hnj_hyphen_load (const char *fn);
+void hnj_hyphen_free (HyphenDict *dict);
+
+/* obsolete, use hnj_hyphen_hyphenate2() or *hyphenate3() functions) */
+int hnj_hyphen_hyphenate (HyphenDict *dict,
+			   const char *word, int word_size,
+			   char *hyphens);
+
+/*
+
+ int hnj_hyphen_hyphenate2(): non-standard hyphenation.
+
+ (It supports Catalan, Dutch, German, Hungarian, Norwegian, Swedish
+  etc. orthography, see documentation.)
+ 
+ input data:
+ word:      input word
+ word_size: byte length of the input word
+ 
+ hyphens:   allocated character buffer (size = word_size + 5)
+ hyphenated_word: allocated character buffer (size ~ word_size * 2) or NULL
+ rep, pos, cut: pointers (point to the allocated and _zeroed_ buffers
+                (size=word_size) or with NULL value) or NULL
+
+ output data:
+ hyphens:   hyphenation vector (hyphenation points signed with odd numbers)
+ hyphenated_word: hyphenated input word (hyphens signed with `='),
+                  optional (NULL input)
+ rep:       NULL (only standard hyph.), or replacements (hyphenation points
+            signed with `=' in replacements);
+ pos:       NULL, or difference of the actual position and the beginning
+            positions of the change in input words;
+ cut:       NULL, or counts of the removed characters of the original words
+            at hyphenation,
+
+ Note: rep, pos, cut are complementary arrays to the hyphens, indexed with the
+       character positions of the input word.
+
+ For example:
+ Schiffahrt -> Schiff=fahrt,
+ pattern: f1f/ff=f,1,2
+ output: rep[5]="ff=f", pos[5] = 1, cut[5] = 2
+
+ Note: hnj_hyphen_hyphenate2() can allocate rep, pos, cut (word_size
+       length arrays):
+
+ char ** rep = NULL;
+ int * pos = NULL;
+ int * cut = NULL;
+ char hyphens[MAXWORDLEN];
+ hnj_hyphen_hyphenate2(dict, "example", 7, hyphens, NULL, &rep, &pos, &cut);
+ 
+ See example in the source distribution.
+
+*/
+
+int hnj_hyphen_hyphenate2 (HyphenDict *dict,
+        const char *word, int word_size, char * hyphens,
+        char *hyphenated_word, char *** rep, int ** pos, int ** cut);
+
+/* like hnj_hyphen_hyphenate2, but with hyphenmin parameters */
+/* lhmin: lefthyphenmin
+ * rhmin: righthyphenmin
+ * clhmin: compoundlefthyphemin
+ * crhmin: compoundrighthyphenmin
+ * (see documentation) */
+
+int hnj_hyphen_hyphenate3 (HyphenDict *dict,
+	const char *word, int word_size, char * hyphens,
+	char *hyphword, char *** rep, int ** pos, int ** cut,
+	int lhmin, int rhmin, int clhmin, int crhmin);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __HYPHEN_H__ */

From 020cec067158113574ff0b2c6031cdc9db0b0118 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:14:51 +0100
Subject: [PATCH 130/314] bug 253317 - part 3 - import en-US hyphenation
 patterns (from
 http://sourceforge.net/projects/hunspell/files/Hyphen/2.7/hyphen-2.7.1.tar.gz/download)
 r=smontagu

---
 .../en-US/hyphenation/README_hyph_en_US.txt   |    53 +
 intl/locales/en-US/hyphenation/hyph_en_US.dic | 11117 ++++++++++++++++
 2 files changed, 11170 insertions(+)
 create mode 100644 intl/locales/en-US/hyphenation/README_hyph_en_US.txt
 create mode 100644 intl/locales/en-US/hyphenation/hyph_en_US.dic

diff --git a/intl/locales/en-US/hyphenation/README_hyph_en_US.txt b/intl/locales/en-US/hyphenation/README_hyph_en_US.txt
new file mode 100644
index 000000000000..dd743f68e400
--- /dev/null
+++ b/intl/locales/en-US/hyphenation/README_hyph_en_US.txt
@@ -0,0 +1,53 @@
+hyph_en_US.dic - American English hyphenation patterns for OpenOffice.org
+
+version 2010-02-23
+
+Changes
+
+- set correct LEFTHYPHENMIN = 2, RIGHTHYPHENMIN = 3
+- handle apostrophes (forbid *o'=clock etc.)
+- set COMPOUNDLEFTHYPHENMIN, COMPOUNDRIGHTHYPHENMIN values
+- UTF-8 encoding
+- Unicode ligature support
+
+License
+
+BSD-style. Unlimited copying, redistribution and modification of this file
+is permitted with this copyright and license information.
+
+See original license in this file.
+
+Conversion and modifications by László Németh (nemeth at OOo).
+
+Based on the plain TeX hyphenation table
+(http://tug.ctan.org/text-archive/macros/plain/base/hyphen.tex) and
+the TugBoat hyphenation exceptions log in
+http://www.ctan.org/tex-archive/info/digests/tugboat/tb0hyf.tex, processed
+by the hyphenex.sh script (see in the same directory).
+
+Originally developed and distributed with the Hyphen hyphenation library,
+see http://hunspell.sourceforge.net/ for the source files and the conversion
+scripts.
+
+Licenses
+
+hyphen.tex:
+% The Plain TeX hyphenation tables [NOT TO BE CHANGED IN ANY WAY!]
+% Unlimited copying and redistribution of this file are permitted as long
+% as this file is not modified. Modifications are permitted, but only if
+% the resulting file is not named hyphen.tex.
+
+output of hyphenex.sh:
+% Hyphenation exceptions for US English, based on hyphenation exception
+% log articles in TUGboat.
+%
+% Copyright 2007 TeX Users Group.
+% You may freely use, modify and/or distribute this file.
+%
+% This is an automatically generated file.  Do not edit!
+%
+% Please contact the TUGboat editorial staff <tugboat@tug.org>
+% for corrections and omissions.
+
+hyph_en_US.txt:
+See the previous licenses.
diff --git a/intl/locales/en-US/hyphenation/hyph_en_US.dic b/intl/locales/en-US/hyphenation/hyph_en_US.dic
new file mode 100644
index 000000000000..d71ac389c073
--- /dev/null
+++ b/intl/locales/en-US/hyphenation/hyph_en_US.dic
@@ -0,0 +1,11117 @@
+UTF-8
+LEFTHYPHENMIN 2
+RIGHTHYPHENMIN 3
+COMPOUNDLEFTHYPHENMIN 2
+COMPOUNDRIGHTHYPHENMIN 3
+NOHYPHEN -,',’
+1-1
+1'1
+1’1
+NEXTLEVEL
+.a2ch4
+.ad4der
+.a2d
+.ad1d4
+.a2f1t
+.a2f
+.a4l3t
+.am5at
+.4a1ma
+.an5c
+.a2n
+.2ang4
+.an1i5m
+.an1t4
+.an3te
+.anti5s
+.ant2i
+.a4r5s2
+.2a2r
+.ar4t2ie4
+.ar1ti
+.ar4ty
+.as3c
+.as1p
+.a2s1s
+.aster5
+.a2tom5
+.a1to
+.au1d
+.av4i
+.awn4
+.ba4g
+.ba5na
+.ba2n
+.bas4e
+.ber4
+.be5r1a
+.be3s1m
+.4bes4
+.b4e5s2to
+.bri2
+.but4ti
+.bu4t3t2
+.cam4pe
+.1ca
+.ca4m1p
+.can5c
+.ca2n
+.capa5b
+.ca1pa
+.car5ol
+.c2a2r
+.ca4t
+.ce4la
+.2ch4
+.chill5i
+.ch4il2
+.chil1l
+.1ci2
+.cit5r
+.2c1it
+.co3e2
+.1co
+.co4r
+.cor5n1er
+.corn2e
+.de4moi2
+.d4em
+.de1mo
+.de3o
+.de3r1a
+.de3r1i
+.de1s4c
+.des2
+.dic1t2io5
+.3di2c1t
+.do4t
+.1do
+.du4c
+.1du
+.du4m1b5
+.earth5
+.ear2t
+.e2a2r
+.eas3i
+.2e1b4
+.eer4
+.eg2
+.e2l5d
+.el3em
+.enam3
+.e1na
+.en3g
+.e2n3s2
+.eq5ui5t
+.e1q
+.equ2
+.eq2ui2
+.er4ri
+.er1r4
+.es3
+.4eu3
+.eye5
+.fes3
+.for5mer
+.1fo
+.fo2r
+.for1m
+.for2me
+.1ga2
+.ge2
+.gen3t4
+.1gen
+.ge5o2g
+.1geo
+.1g2i5a
+.gi4b
+.go4r
+.1go
+.hand5i
+.ha2n
+.h4and
+.ha4n5k2
+.he2
+.hero5i2
+.h2ero
+.h1es3
+.he4t3
+.hi3b
+.hi3er
+.h2ie4
+.hon5ey
+.ho2n
+.hon3o
+.hov5
+.id4l
+.2id
+.idol3
+.i1do
+.im3m
+.im5p1i2n
+.i4m1p
+.im2pi
+.in1
+.in3ci
+.2ine2
+.4i4n2k2
+.2i2n3s2
+.ir5r4
+.4ir
+.is4i
+.ju3r
+.la4cy
+.la4m
+.lat5er
+.l4ath5
+.le2
+.leg5e
+.len4
+.lep5
+.lev1
+.l2i4g
+.li1g5a
+.li2n
+.l2i3o
+.l1i4t
+.ma1g5a5
+.1ma
+.mal5o
+.ma1n5a
+.ma2n
+.mar5ti
+.m2a2r
+.me2
+.mer3c
+.me5ter
+.me1te
+.m2is1
+.mis4t5i
+.mon3e
+.1mo
+.mo2n
+.mo3ro
+.mo2r
+.mu5ta
+.1mu
+.mu2ta5b
+.ni4c
+.od2
+.od1d5
+.of5te
+.o2ft
+.or5a1to
+.o1ra
+.or3c
+.or1d
+.or3t
+.os3
+.os4tl
+.4oth3
+.out3
+.ou2
+.ped5al
+.2p2ed
+.p2e2d2a
+.pe5te
+.pe2t
+.pe5tit
+.p2i4e4
+.pio5n4
+.3p2i1o
+.pi2t
+.pre3m
+.pr2
+.ra4c
+.ran4t
+.ra2n
+.ratio5n1a
+.ratio2n4
+.ra1t2io
+.ree2
+.re5mit
+.res2
+.re5stat
+.res2t
+.res1ta
+.r2i4g
+.ri2t5u
+.ro4q
+.ros5t
+.row5d
+.ru4d
+.3s4c2i3e4
+.s1ci
+.5se2l2f5
+.5se2l4ff
+.5se2l2�
+.5se2l2fl2
+.sel1l5
+.se2n
+.se5r2ie4
+.ser1i
+.s2h2
+.si2
+.s3ing4
+.2s1in
+.st4
+.sta5b2l2
+.s1ta
+.s2tab
+.s4y2
+.1ta4
+.te4
+.3ten5a2n
+.te1na
+.th2
+.ti2
+.til4
+.ti1m5o5
+.1tim
+.ting4
+.2t1in
+.t4i4n5k2
+.to1n4a
+.1to
+.to2n
+.to4p
+.top5i
+.to2u5s
+.tou2
+.trib5ut
+.tr4ib
+.u1n1a
+.un3ce
+.under5
+.un1de
+.u2n1e
+.u4n5k2
+.un5o
+.un3u4
+.up3
+.ure3
+.us5a2
+.2us
+.ven4de
+.ve5r1a
+.wil5i
+.wi2
+.wil2
+.ye4
+4ab.
+a5bal
+a5ba2n
+abe2
+ab5erd
+ab2i5a
+ab5i2t5ab
+abi2t
+abi1ta
+ab5lat
+ab2l2
+ab5o5l1iz
+abol2i
+4abr
+ab5rog
+ab3ul
+a4c2a2r
+a1ca
+ac5ard
+ac5aro
+a5ceou2
+ac1er
+a5che4t
+a2ch
+ache2
+4a2ci
+a3c2ie4
+a2c1in
+a3c2io
+ac5rob
+act5if2
+a2c1t
+act5i4ff
+act5i1�
+act5i3fl2
+ac3ul
+ac4um
+a2d
+ad4d1in
+ad1d4
+ad5er.
+2adi
+a3d4i3a
+ad3i1ca
+adi4er
+ad2ie4
+a3d2io
+a3dit
+a5di1u
+ad4le
+ad3ow
+a1do
+ad5ra2n
+a1dr
+ad4su
+a2d1s2
+4a1du
+a3du2c
+ad5um
+ae4r
+aer2i4e4
+aer1i
+a2f
+a4ff4
+a2�
+a2fl2
+a4f1f4
+a4gab
+a1ga
+aga4n
+ag5el1l
+a1ge4o
+4ag4eu
+ag1i
+4ag4l2
+ag1n
+a2go
+3a3g4o4g
+ag3o3ni
+ago2n2
+a5guer
+a2gue
+ag5ul
+a4gy
+a3ha
+a3he
+a4h4l4
+a3ho
+ai2
+a5i1a
+a3ic.
+ai5ly
+a4i4n
+ain5in
+a2ini
+a2i1n5o
+ait5en
+a2ite
+a1j
+ak1en
+al5ab
+al3a2d
+a4l2a2r
+4aldi4
+a2ld
+2ale
+al3end
+a4lent2i
+a1len1t
+a5le5o
+al1i
+al4ia.
+al2i1a
+al2i4e4
+al5lev
+al1l
+al2le
+4allic
+all2i
+4a2lm
+a5log.
+a4ly.
+a1ly
+4a2lys4
+5a5lys1t
+5alyt
+3alyz
+4a1ma
+a2m5ab
+am3ag
+ama5ra
+am2a2r
+am5asc
+a4ma3tis
+a4m5a1to
+am5er1a
+am3ic
+am5if
+am5i4ff
+am5i1�
+am5i3fl2
+am5i1ly
+am1in
+am2i4no
+a2mo
+a5mo2n
+amor5i
+amo2r
+amp5en
+a4m1p
+a2n
+an3age
+a1na
+3ana1ly
+a3n2a2r
+an3ar3c
+anar4i
+a3nati
+an2at
+4and
+ande4s2
+an1de
+an3dis1
+an1dl
+an4dow
+an1do
+a5nee
+a3nen
+an5e2st.
+a1nes
+a2nest
+a3n4eu
+2ang
+ang5ie4
+an1gl2
+a4n1ic
+a3nies
+an2ie4
+an3i3f
+an3i4ff
+an3i3�
+an3i3fl2
+an4ime
+an1im
+a5nim1i
+a5n2ine
+an1in
+an3i4o
+a3n2ip
+an3is2h
+an3it
+a3ni1u
+an4kli
+a4nk2
+an1k1l
+5anniz
+a4n1n2
+ano4
+an5ot
+an4oth5
+an2sa2
+a2n1s2
+an4s1co
+ans4c
+an4s1n4
+an2sp
+ans3po
+an4st
+an4su2r
+an1su
+anta2l4
+an1t
+an1ta
+an4t2ie4
+ant2i
+4an1to
+an2tr
+an4tw4
+an3u1a
+an3ul
+a5nur
+4ao
+ap2a2r4
+a1pa
+ap5at
+ap5er3o
+a3ph4er
+4aphi
+a4pilla
+apil1l
+ap5ill2a2r
+ap3i2n
+ap3i1ta
+a3pi2tu
+a2p2l2
+apo4c5
+ap5o1la
+apor5i
+a1p4or
+apos3t
+a1pos
+aps5e4s
+a2p1s2
+ap2se
+a3pu
+aque5
+aqu2
+2a2r
+ar3a2c1t
+a5rade
+ara2d
+ar5adis1
+ar2adi
+ar3al
+a5rame1te
+aram3et
+ar2an4g
+ara2n
+ara3p
+ar4at
+a5ra1t2io
+ar5a1t2iv
+a5rau
+ar5av4
+araw4
+arbal4
+ar1b
+ar4cha2n
+ar1c
+ar3cha
+ar2ch
+ar5d2ine
+ard2i
+ard1in4
+ar4dr
+ar5eas
+a3ree
+ar3en1t
+a5r2e2ss
+ar4fi
+ar1f
+ar4�
+ar4f4l2
+ar4fl2
+ar1i
+ar5i2al
+ar2i3a
+ar3i2a2n
+a3ri5et
+ar2ie4
+ar4im
+ar5in2at
+ar2i1na
+ar3i1o
+ar2iz
+ar2mi
+ar1m
+ar5o5d
+a5roni
+aro2n
+a3roo2
+ar2p
+ar3q
+arre4
+ar1r4
+ar4sa2
+a4rs2
+ar2s2h
+4as.
+a2s4ab
+asa2
+as3an1t
+asa2n
+ashi4
+as2h
+a5sia.
+as2i1a
+a3si1b
+a3sic
+5a5si4t
+ask3i
+ask2
+as4l2
+a4soc
+a1so
+as5ph
+as4s2h
+a2ss
+as3ten
+as1t4r
+asu1r5a
+a1su
+asu2r
+a2ta
+at3ab2l2
+a2tab
+at5ac
+at3alo
+ata2l
+at5ap
+ate5c
+at5e2ch
+at3e1go
+ateg4
+at3en.
+at3er1a
+ater5n
+a5ter1na
+at3est
+at5ev
+4ath
+ath5em
+ath2e
+a5the2n
+at4ho
+ath5om
+4ati.
+a5t2i1a
+a2t5i5b
+at1ic
+at3if2
+at3i4ff
+at3i1�
+at3i3fl2
+ation5a2r
+a1t2io
+atio2n
+atio1n1a
+at3i1tu
+a4tog
+a1to
+a2tom
+at5om2iz
+a4top
+a4tos2
+a1tr
+at5rop
+at4sk2
+a4t1s2
+at4tag
+a4t3t2
+at1ta
+at5te
+at4th
+a2tu
+at5u1a
+a4t5ue
+at3ul
+at3u1ra
+a2ty
+au4b
+augh3
+au3gu
+au4l2
+aun5d
+au3r
+au5si1b
+a2us
+a4ut5en
+au1th
+a2va
+av3ag4
+a5va2n
+av4e4no
+av3er1a
+av5ern
+av5ery
+av1i
+avi4er
+av2ie4
+av3ig
+av5oc
+a1vor
+3away
+aw3i2
+aw4ly
+aws4
+ax4i5c
+ax3i
+ax4id
+ay5al
+aye4
+ays4
+azi4er
+a2z1i
+az2ie4
+az2z5i
+a4z1z2
+5ba.
+bad5ger
+ba2d
+ba4ge
+bal1a
+ban5dag
+ba2n
+b4and
+ban1d2a
+ban4e
+ban3i
+barbi5
+b2a2r
+bar1b
+bar2i4a
+bar1i
+bas4si
+ba2ss
+1bat
+ba4z
+2b1b
+b2be
+b3ber
+bbi4na
+4b1d
+4be.
+beak4
+bea2t3
+4be2d
+b2e3d2a
+be3de
+b4e3di
+be3gi
+be5gu
+1bel
+be1l2i
+be3lo
+4be5m
+be5n2ig
+be5nu
+4bes4
+be3sp
+b2e5st4r
+3bet
+be1t5iz
+be5tr
+be3tw4
+be3w
+be5y1o4
+2bf
+2b4ff
+2b1�
+2bfl2
+4b3h
+bi2b
+b2i4d
+3b2ie4
+bi5en
+bi4er
+2b3if
+2b3i4ff
+2b3i1�
+2b3i3fl2
+1bil
+bi3l2iz
+bil1i
+bin2a5r4
+bi1na
+b4in4d
+bi5net
+b2ine
+bi3o2gr
+b2io
+bi5ou2
+bi2t
+3b2i3t2io
+bi1ti
+bi3tr
+3bit5u1a
+bi1tu
+b5i4tz
+b1j
+bk4
+b2l2
+bl4ath5
+b4le.
+blen4
+5ble1sp
+bles2
+b3lis
+b4lo
+blun4t
+4b1m
+4b3n
+bne5g
+3bod
+bod3i
+bo4e
+bol3ic
+bol2i
+bom4bi
+bo4m1b
+bo1n4a
+bo2n
+bon5at
+3boo2
+5bor.
+4b1o1ra
+bor5d
+5bore
+5bori
+5bos4
+b5o1ta
+b4oth5
+bo4to
+boun2d3
+bou2
+4bp
+4brit
+br4oth3
+2b5s2
+bsor4
+b1so
+2bt
+b2t4l
+b4to
+b3tr
+buf4fer1
+bu4f1f
+buffer1
+bu4ff
+bu4ga
+bu3l2i
+bu1mi4
+bu4n
+bunt4i
+bun1t
+bu3re
+bus5ie4
+b2us
+buss4e
+bu2ss
+5bust
+4bu1ta
+3bu1t2io
+b4u1t2i
+b5u1to
+b1v
+4b5w
+5by.
+bys4
+1ca
+cab3in
+ca1b2l2
+ca2ch4
+ca5den
+ca2d
+4cag4
+2c5ah
+ca3lat
+cal4la
+cal1l
+cal2l5in4
+call2i
+4calo
+c4an5d
+ca2n
+can4e
+ca4n4ic
+can5is
+can3iz
+can4ty
+can1t
+cany4
+ca5per
+car5om
+c2a2r
+cast5er
+cas5t2ig
+cast2i
+4cas4y
+c4a4th
+4ca1t2iv
+cav5al
+ca2va
+c3c
+ccha5
+c2ch
+c3c2i4a
+c1ci
+ccom1pa5
+c1co
+cco4m1p
+cco2n4
+ccou3t
+ccou2
+2ce.
+4ced.
+4ce1den
+3cei2
+5cel.
+3cel1l
+1cen
+3cenc
+2cen4e
+4ceni
+3cen1t
+3cep
+ce5ram
+cer1a
+4ce1s4a2
+3ces1si
+c2e2ss
+ces5si5b
+ces5t
+cet4
+c5e4ta
+cew4
+2ch
+4ch.
+4ch3ab
+5cha4n1ic
+cha2n
+ch5a5nis
+che2
+cheap3
+4ch4ed
+ch5e5lo
+3chemi
+ch5ene
+che2n
+ch3er.
+ch3e4r1s2
+4ch1in
+5chi2ne.
+ch2ine
+ch5i5n2e2ss
+chi1nes
+5ch2ini
+5ch2io
+3chit
+chi2z
+3cho2
+ch4ti
+1ci
+3c2i1a
+ci2a5b
+ci2a5r
+ci5c
+4cier
+c2ie4
+5c4i2f3ic.
+ci1fi
+5c4i2�c.
+ci1�
+4c4i5i4
+ci4la
+3cil1i
+2cim
+2cin
+c4i1na
+3cin2at
+cin3em
+c2ine
+c1ing
+c5ing.
+5c2i1no
+cio2n4
+c2io
+4cipe4
+c2ip
+ci3ph
+4cip4ic
+cip3i
+4cis1ta
+4cis1t2i
+2c1it
+ci1t3iz
+ci1ti
+5ciz
+ck1
+ck3i
+1c4l4
+4cl2a2r
+c5la5ra1t2io
+clar4at
+5clare
+cle4m
+4clic
+clim4
+c1ly4
+c5n
+1co
+co5ag
+c4oa
+coe2
+2cog
+co4gr
+coi4
+co3inc
+col5i
+5colo
+col3o4r
+com5er
+co2me
+co1n4a
+co2n
+c4one
+con3g
+con5t
+co3pa
+cop3ic
+co4p2l2
+4cor1b
+coro3n
+cos4e
+cov1
+cove4
+cow5a
+co2z5e
+co5z1i
+c1q
+cras5t
+cr2as
+5crat.
+5crat1ic
+cre3a2t
+5c2r2ed
+4c3re1ta
+cre4v2
+cri2
+cri5f
+cri5ff
+cri5�
+cri5fl2
+c4rin
+cr2is4
+5cri1ti
+cro4p2l2
+crop5o
+cros4e
+cru4d
+4c3s2
+2c1t
+c2ta4b
+c1ta
+ct5ang
+cta2n
+c5tan1t
+c2te
+c3ter
+c4t4ic1u
+ctim3i
+c1tim
+ctu4r
+c1tu
+c4tw4
+cud5
+c4uf
+c4u4ff
+c4u1�
+c4u3fl2
+c4ui2
+cu5i1ty
+5cul2i
+cul4tis4
+cul1ti
+cu4lt
+3c4ul1tu2
+cu2ma
+c3ume
+cu4mi
+3cun
+cu3pi
+cu5py
+cu2r5a4b
+cu1ra
+cu5r2i3a
+1c2us
+cus1s4i
+cu2ss
+3c4ut
+cu4t2ie4
+c4u1t2i
+4c5u1t2iv
+4cutr
+1cy
+c2ze4
+1d2a
+5da.
+2d3a4b
+da2ch4
+4da2f
+4da4ff4
+4da2�
+4da2fl2
+2dag
+da2m2
+d2an3g
+da2n
+dard5
+d2a2r
+dark5
+4dary
+3dat
+4da1t2iv
+4da1to
+5dav4
+dav5e
+5day
+d1b
+d5c
+d1d4
+2de.
+dea2f5
+dea4ff4
+dea2�
+dea2fl2
+de4b5i2t
+d2e1b
+de4bo2n
+deca2n4
+de1ca
+de4cil
+de1c2i
+de5com
+de1co
+2d1ed
+4dee.
+de5if
+dei2
+de5i4ff
+de5i1�
+de5i3fl2
+del2i4e4
+del2i
+de4l5i5q
+de5lo
+d4em
+5dem.
+3demic
+dem5ic.
+de5mil
+de4mo2n3s2
+de1mo
+demo2n
+demo2r5
+1den
+de4n2a2r
+de1na
+d4e3no
+denti5f2
+den1t
+dent2i
+denti5ff
+denti5�
+denti5fl2
+de3nu
+de1p
+de3pa
+depi4
+de2pu
+d3e1q
+d4er1h4
+5der3m4
+d5ern5iz
+de4r5s2
+des2
+d2es.
+de1s2c
+de2s5o
+des3t2i
+d2e3st4r
+de4su
+de1t
+de2to
+de1v
+de2v3i4l
+de1vi
+4dey
+4d1f
+4d4ff
+4d1�
+4d1fl2
+d4ga
+d3ge4t
+dg1i
+d2gy
+d1h2
+5di.
+1d4i3a
+dia5b
+d4i4cam
+di1ca
+d4ice
+3di2c1t
+3d2id
+5di3en
+d2ie4
+d1if
+d1i4ff
+d1i1�
+d1i3fl2
+di3ge
+d2ig
+di4la1to
+di1la
+d1in
+1di1na
+3di2ne.
+d2ine
+5d2ini
+di5niz
+1d2io
+dio5g
+di4p2l2
+d2ip
+d4ir2
+di1re
+dir1t5i
+dis1
+5disi
+d4is3t
+d2i1ti
+1d2i1v
+d1j
+d5k2
+4d5la
+3dle.
+3dled
+3dles.
+dles2
+4d3l2e2ss
+2d3lo
+4d5lu
+2d1ly
+d1m
+4d1n4
+1do
+3do.
+do5de
+5doe
+2d5of
+2d5o4ff
+2d5o2�
+2d5ofl2
+d4og
+do4la
+dol2i4
+do5lo4r
+dom5iz
+do3n2at
+do2n
+do1n1a
+doni4
+doo3d
+doo2
+do4p4p
+d4or
+3dos
+4d5out
+dou2
+do4v
+3dox
+d1p
+1dr
+drag5o2n2
+dra2go
+4dr2ai2
+dre4
+dre2a5r
+5dren
+dr4i4b
+dril4
+dro4p
+4drow
+5drupli
+dru3p2l2
+4dry
+2d1s2
+ds4p
+d4sw2
+d4s4y
+d2th
+1du
+d1u1a
+du2c
+d1u3ca
+duc5er
+4duct.
+du2c1t
+4duc4t1s2
+du5el
+du4g
+d3ul4e
+dum4be
+du4m1b
+du4n
+4dup
+du4pe
+d1v
+d1w
+d2y
+5dyn
+dy4s2e
+dys5p
+e1a4b
+e3a2c1t
+ea2d1
+ead5ie4
+e2adi
+ea4ge
+ea5ger
+ea4l
+eal5er
+e2ale
+eal3ou2
+eam3er
+e5and
+ea2n
+ear3a
+e2a2r
+ear4c
+ear5es
+ear4ic
+ear1i
+ear4il
+ear5k
+ear2t
+eart3e
+ea5sp
+e3a2ss
+east3
+ea2t
+eat5en
+eath3i
+e4ath
+e5at3if2
+e5at3i4ff
+e5at3i1�
+e5at3i3fl2
+e4a3tu
+ea2v
+eav3en
+eav5i
+eav5o
+2e1b
+e4bel.
+e1bel
+e4be2l1s2
+e4ben
+e4bi2t
+e3br
+e4ca2d
+e1ca
+ecan5c
+eca2n
+ec1ca5
+ec3c
+e1ce
+ec5es1sa2
+ec2e2ss
+e1c2i
+e4cib
+ec5ificat
+eci1fi
+ecifi1ca
+ec5i�cat
+eci1�
+eci�1ca
+ec5i3f2ie4
+ec5i3�e4
+ec5i1fy
+e2c3im
+e2c1i4t
+e5c2ite
+e4clam
+e1c4l4
+e4cl2us
+e2col
+e1co
+e4com1m
+e4compe
+eco4m1p
+e4con1c
+eco2n
+e2cor
+ec3o1ra
+eco5ro
+e1cr
+e4crem
+ec4ta2n
+e2c1t
+ec1ta
+ec4te
+e1cu
+e4cul
+ec3u1la
+2e2d2a
+4ed3d4
+e4d1er
+ede4s2
+4edi
+e3d4i3a
+ed3ib
+ed3i1ca
+ed3im
+ed1it
+edi5z
+4e1do
+e4dol
+edo2n2
+e4dri
+e1dr
+e4dul
+e1du
+ed5u1l4o
+ee2c
+e4ed3i
+ee2f
+e1e4ff
+ee2�
+ee2fl2
+eel3i
+ee4ly
+ee2m
+ee4na
+ee4p1
+ee2s4
+eest4
+ee4ty
+e5ex
+e1f
+1e4ff
+e1�
+e1fl2
+e4f3ere
+efer1
+1e4f1f
+e4fic
+e1fi
+e4�c
+5ef2i1c4i
+5e�1ci
+efil4
+e�l4
+e3f2i2ne
+e2fin
+e3�ne
+e2�n
+ef5i5n2ite
+ef2ini
+efin2it
+e�5n2ite
+e�ni
+e�n2it
+3efit
+3e�t
+efor5es
+e1fo
+efo2r
+e4fu4se.
+e3fu
+ef2us
+4egal
+e1ga
+eger4
+eg5ib
+eg4ic
+eg5ing
+e5git5
+eg5n
+e4go.
+e1go
+e4gos
+eg1ul
+e5gur
+5e1gy
+e1h4
+eher4
+ei2
+e5ic
+e2i5d
+e2ig2
+ei5g4l2
+e3i4m1b
+e3in3f
+e3in4ff
+e3in3�
+e3in3fl2
+e1ing
+e5inst
+e2i2n1s2
+eir4d
+e4ir
+e2it3e
+e2i3th
+e5i1ty
+e1j
+e4jud
+ej5udi
+eki4n
+ek1i
+ek4la
+ek1l
+e1la
+e4la.
+e4lac
+e3l4an4d
+ela2n
+e4l5a1t2iv
+e4law
+elax1a4
+e3le2a
+el5ebra
+el2e1b
+ele3br
+5elec
+e4led
+el3e1ga
+e5len
+e4l1er
+e1les2
+e2l2f
+e2l4ff
+e2l2�
+e2l2fl2
+el2i
+e3libe4
+e4l5ic.
+el3i1ca
+e3lier
+el2ie4
+el5i3gib
+el2ig
+el4igi
+e5lim
+e4l3ing
+e3l2io
+e2lis
+el5is2h
+e3l2iv3
+4ella
+el1l
+el4lab
+ell4o4
+e5loc
+el5og
+el3op.
+el2s2h
+e2l1s2
+el4ta
+e4lt
+e5lud
+el5ug
+e4mac
+e1ma
+e4mag
+e5ma2n
+em5a1na
+e4m5b
+e1me
+e2mel
+e4met
+em3i1ca
+em2i4e4
+em5igra
+em2ig4
+emi1gr
+em1in2
+em5ine
+em3i3ni
+e4m2is
+em5is2h
+e5m4i2s1s
+em3iz
+5emniz
+e4m1n
+emo4g
+e1mo
+emo3n2i5o
+emo2n
+em3pi
+e4m1p
+e4mul
+e1mu
+em5u1la
+emu3n2
+e3my
+en5a2mo
+e1na
+e4nan1t
+en2a2n
+ench4er
+en2ch
+enche2
+en3dic
+e5nea
+e5nee
+en3em
+en5ero
+en1er
+en5e1si
+e1nes
+e2n5est
+en3etr
+e3ne4w
+en5i4c3s2
+e5n2ie4
+e5nil
+e3n2i4o
+en3is2h
+en3it
+e5ni1u
+5eniz
+4e4n1n2
+4eno
+e4no4g
+e4nos
+en3ov
+en4sw2
+e2n1s2
+ent5age
+en1t
+en1ta
+4enth1es
+enth2e
+en3u1a
+en5uf
+en5u4ff
+en5u1�
+en5u3fl2
+e3ny.
+4e4n3z
+e5of
+e5o4ff
+e5o2�
+e5ofl2
+eo2g
+e4oi4
+e3ol
+eop3a2r
+eo2pa
+e1or
+eo3re
+eo5rol
+eos4
+e4ot
+eo4to
+e5out
+eou2
+e5ow
+e2pa
+e3p4ai2
+ep5anc
+epa2n
+e5pel
+e3pen1t
+ep5e5t2i1t2io
+epe2t
+epeti1ti
+ephe4
+e4pli
+e1p2l2
+e1po
+e4prec
+epr2
+ep5re1ca
+e4p2r2ed
+ep3re1h4
+e3pro
+e4prob
+ep4s4h
+e2p1s2
+ep5ti5b
+e2p1t
+e4pu2t
+ep5u1ta
+e1q
+equi3l
+equ2
+eq2ui2
+e4q3ui3s
+er1a
+e2ra4b
+4er4and
+era2n
+er3a2r
+4er4ati.
+2er1b
+er4b2l2
+er3ch
+er1c
+er4che2
+2e2re.
+e3re1a4l
+ere5co
+ere3in
+erei2
+er5el.
+er3e1mo
+er5e1na
+er5ence
+4erene
+er3en1t
+ere4q
+er5e2ss
+er3es2t
+eret4
+er1h4
+er1i
+e1r2i3a4
+5erick1
+e3rien
+er2ie4
+eri4er
+er3in4e
+e1r2i1o
+4erit
+er4i1u
+er2i4v
+e4ri1va
+er3m4
+er4nis4
+4er3n2it
+5erniz
+er3no4
+2ero
+er5ob
+e5r2oc
+ero4r
+er1ou2
+e4r1s2
+er3set
+er2se
+ert3er
+4er2tl
+er3tw4
+4eru
+eru4t
+5erwau
+er1w
+e1s4a2
+e4sa2ge.
+e4sages
+es2c
+e2s1ca
+es5ca2n
+e3scr
+es5cu
+e1s2e
+e2sec
+es5e1cr
+e4s5enc
+e4sert.
+e4ser4t1s2
+e4ser1va
+4es2h
+e3sha
+esh5e2n
+e1si
+e2sic
+e2s2id
+es5i1den
+e4s5ig1n4a
+es2ig
+e2s5im
+e2s4i4n
+esis4te
+e1sis
+e5si4u
+e5skin
+esk2
+esk1i
+es4mi
+e2s1m
+e2sol
+e1so
+es3olu
+e2so2n
+es5o1n1a4
+e1sp
+e2s3per
+es5pi1ra
+esp4ir
+es4pre
+espr2
+2e2ss
+es4si4b
+es1si
+esta2n4
+es1ta
+es3t2ig
+est2i
+es5tim
+4es2to
+e3sto2n
+2est4r
+e5stro
+estruc5
+e2su2r
+e1su
+es5ur1r4
+es4w2
+e2ta4b
+e1ta
+e3ten4d
+e3teo
+ethod3
+et1ic
+e5tide
+et2id
+e2t1in4
+et2i4no
+e5t4ir
+e5t2i1t2io
+eti1ti
+et5i1t2iv
+4e2t1n2
+et5o1n1a
+e1to
+eto2n
+e3tra
+e3tre
+et3ric
+et5rif
+et5ri4ff
+et5ri1�
+et5ri3fl2
+et3rog
+et5ros
+et3u1a
+e1tu
+et5ym
+e1ty
+e4t5z
+4eu
+e5un
+e3up
+eu3ro
+e2us4
+eute4
+euti5l
+e4u1t2i
+eu5tr
+eva2p5
+e1va
+e2vas
+ev5ast
+e5vea
+ev3el1l
+eve4l3o
+e5veng
+even4i
+ev1er
+e5v2er1b
+e1vi
+ev3id
+e2vi4l
+e4v1in
+e3v2i4v
+e5voc
+e5vu
+e1wa
+e4wag
+e5wee
+e3wh
+ewil5
+ewi2
+ew3in4g
+e3wit
+1ex3p
+5ey1c
+5eye.
+eys4
+1fa
+4ff
+ffa
+fa3b2l2
+ffa3b2l2
+f4ab3r
+ff4ab3r
+fa4ce
+ffa4ce
+4fag
+ffag
+fa4i4n4
+fai2
+ffa4i4n4
+ffai2
+fal2l5e
+fal1l
+ffal2l5e
+ffal1l
+4f4a4ma
+ff4a4ma
+fam5is
+ffam5is
+5f2a2r
+ff2a2r
+far5th
+ffar5th
+fa3ta
+ffa3ta
+fa3th2e
+f4ath
+ffa3th2e
+ff4ath
+4fa1to
+ffa1to
+fau4lt5
+fau4l2
+ffau4lt5
+ffau4l2
+4f5b
+ff5b
+4fd
+ffd
+4fe.
+ffe.
+feas4
+ffeas4
+fe4ath3
+fea2t
+ffe4ath3
+ffea2t
+f2e4b
+ff2e4b
+4fe1ca
+ffe1ca
+5fe2c1t
+ffe2c1t
+2fed
+ffed
+fe3l2i
+ffe3l2i
+fe4mo
+ffe4mo
+fen2d
+ffen2d
+fen1d5e
+ffen1d5e
+fer1
+ffer1
+5fer1r4
+ffer1r4
+fev4
+ffev4
+4f1f
+f4fes
+ffes
+f4f2ie4
+f1fi
+ffie
+f5f2in.
+f2fin
+ffin.
+f2f5is
+ffis
+f4f2ly5
+ff4l2
+ffly
+f2fy
+ffy
+4fh
+ffh
+1fi
+1�
+f2i3a
+�1a
+2f3ic.
+2�c.
+4f3ical
+fi1ca
+4�cal
+�1ca
+f3ica2n
+�ca2n
+4ficate
+4�cate
+f3i1cen
+�1cen
+fi3cer
+�3cer
+f2i1c4i
+�1ci
+5fi3c2i1a
+5�3c2i1a
+5fic2ie4
+5�c2ie4
+4fi4c3s2
+4�4c3s2
+fi3cu
+�3cu
+fi5del
+f2id
+�d
+�5del
+fight5
+f2ig
+�g
+�ght5
+fil5i
+�l1i
+fil2l5in4
+fil1l
+fill2i
+�l2l5in4
+�l1l
+�ll2i
+4fi1ly
+4�1ly
+2fin
+2�n
+5fi1na
+5�1na
+f4in2d5
+�nd
+f2i2ne
+�ne
+f1in3g
+�n3g
+f2i4n4n2
+�4n1n2
+fis4t2i
+�s1t2i
+f4l2
+fl2
+f5l2e2ss
+fles2
+fles2
+fl2e2ss
+flin4
+flin4
+flo3re
+flo3re
+f2ly5
+fly
+4fm
+ffm
+4fn
+ffn
+1fo
+ffo
+5fo2n
+ffo2n
+fon4de
+f2ond
+ffon4de
+ff2ond
+fon4t
+ffon4t
+fo2r
+ffo2r
+fo5rat
+fo1ra
+ffo5rat
+ffo1ra
+for5ay
+ffor5ay
+fore5t
+ffore5t
+for4i
+ffor4i
+for1t5a
+ffor1t5a
+fos5
+ffos5
+4f5p
+ff5p
+fra4t
+ffra4t
+f5rea
+ff5rea
+fres5c
+ffres5c
+fri2
+ffri2
+fril4
+ffril4
+frol5
+ffrol5
+2f3s
+ff3s
+2ft
+fft
+f4to
+ff4to
+f2ty
+ff2ty
+3fu
+ffu
+fu5el
+ffu5el
+4fug
+ffug
+fu4min
+fu1mi
+ffu4min
+ffu1mi
+fu5ne
+ffu5ne
+fu3ri
+ffu3ri
+fusi4
+f2us
+ffusi4
+ff2us
+fu2s4s
+ffu2s4s
+4fu1ta
+ffu1ta
+1fy
+1ga
+ga2f4
+ga4ff4
+ga2�
+ga2fl2
+5gal.
+3gal1i
+ga3lo
+2gam
+ga5met
+g5a2mo
+gan5is
+ga2n
+ga3niz
+gani5za1
+4gano4
+gar5n4
+g2a2r
+ga2ss4
+g4ath3
+4ga1t2iv
+4gaz
+g3b
+gd4
+2ge.
+2ged
+geez4
+gel4in
+gel2i
+ge5lis
+ge5l1iz
+4ge1ly
+1gen
+ge4n2at
+ge1na
+g5e5niz
+4g4eno
+4geny
+1geo
+ge3om
+g4ery
+5ge1si
+geth5
+4ge1to
+ge4ty
+ge4v
+4g1g2
+g2ge
+g3ger
+gglu5
+ggl2
+g1go4
+gh3in
+gh5out
+ghou2
+gh4to
+5gi.
+1g2i4a
+gi2a5r
+g1ic
+5gi3c2i1a
+g2i1ci
+g4i1co
+gien5
+g2ie4
+5gies.
+gil4
+g3i1men
+3g4in.
+g4in5ge
+5g4i2n1s2
+5g2io
+3g4ir
+gir4l
+g3is1l2
+gi4u
+5g2iv
+3giz
+gl2
+gla4
+gl2ad5i
+gla2d
+5glas
+1gle
+gli4b
+g3l2ig
+3glo
+glo3r
+g1m
+g4my
+g1n4a
+g4na.
+gne4t4t2
+g1ni
+g2n1in
+g4n2i4o
+g1no
+g4no4n
+1go
+3go.
+gob5
+5goe
+3g4o4g
+go3is
+goi2
+go2n2
+4g3o3n1a
+gon5do5
+g2ond
+go3ni
+5goo2
+go5riz
+gor5ou2
+5gos.
+gov1
+g3p
+1gr
+4gra1d2a
+gra2d
+g4r2ai2
+gra2n2
+5gra4ph.
+g5ra3ph4er
+5graph1ic
+gr4aphi
+4g3ra1phy
+4gray
+gre4n
+4gress.
+gr2e2ss
+4grit
+g4ro
+gruf4
+gru4ff
+gru1�
+gru3fl2
+gs2
+g5ste
+gth3
+gu4a
+3guar2d
+gu2a2r
+2gue
+5gui5t
+g2ui2
+3gun
+3g2us
+4gu4t
+g3w
+1gy
+2g5y3n
+gy5ra
+h3ab4l2
+ha2ch4
+hae4m
+hae4t
+h5agu
+ha3la
+hala3m
+ha4m
+han4ci
+ha2n
+han4cy
+5hand.
+h4and
+h2an4g
+hang5er
+han1g5o
+h5a5niz
+ha4n4k2
+han4te
+han1t
+ha2p3l2
+ha2p5t
+ha3ra2n
+h2a2r
+ha5r2as
+har2d
+hard3e
+har4le4
+har1l
+harp5en
+har2p
+har5ter
+ha2s5s
+haun4
+5haz
+haz3a1
+h1b
+1hea2d1
+3he2a2r
+he4ca2n
+he1ca
+h5ecat
+h4ed
+h4e5do5
+he3l4i
+hel4lis
+hel1l
+hell2i
+hel4ly
+h5elo
+he4m4p
+he2n
+he1na4
+hen5at
+he1o5r
+hep5
+h4er1a
+hera3p
+her4ba
+h2er1b
+here5a
+h3ern
+h5er1ou2
+h2ero
+h3ery
+h1es
+he2s5p
+he4t
+he2t4ed
+h4eu4
+h1f
+h4ff
+h1�
+h1fl2
+h1h
+hi5a2n
+h2i1a
+hi4co
+high5
+h2ig
+h4il2
+himer4
+h4i1na
+hion4e
+h2io
+hio2n
+h2i4p
+hir4l
+h4ir
+hi3ro
+hir4p
+hir4r4
+his3el
+h4ise
+h4i2s4s
+hith5er
+h2ith
+hith2e
+h2i2v
+4hk
+4h1l4
+hla2n4
+h2lo
+hlo3ri
+4h1m
+hmet4
+2h1n
+h5odiz
+h5o2d1s2
+ho4g
+ho1ge4
+hol5a2r
+ho1la
+3hol4e
+ho4ma
+ho2me3
+ho1n4a
+ho2n
+ho5ny
+3hood
+hoo2
+hoo2n4
+hor5at
+ho1ra
+ho5r2is
+hort3e
+ho5ru
+hos4e
+ho5sen
+hos1p
+1ho2us
+hou2
+house3
+hov5el
+4h5p
+4hr4
+hree5
+hro5niz
+hro2n
+hro3po
+4h1s2
+h4s2h
+h4t2a2r
+h1ta
+ht1en
+ht5es
+h4ty
+hu4g
+hu4min
+hu1mi
+hun5ke
+hu4nk2
+hun4t
+hus3t4
+h2us
+hu4t
+h1w
+h4war4t
+hw2a2r
+hy3pe
+hy3ph
+hy2s
+2i1a
+i2al
+�2al
+iam4
+�am4
+iam5e1te
+�am5e1te
+i2a2n
+�2a2n
+4ianc
+�anc
+ian3i
+�an3i
+4ian4t
+�an4t
+ia5pe
+�a5pe
+ia2ss4
+�a2ss4
+i4a1t2iv
+�4a1t2iv
+ia4tric
+ia1tr
+�a4tric
+�a1tr
+i4a2tu
+�4a2tu
+ibe4
+�be4
+ib3er1a
+�b3er1a
+ib5ert
+�b5ert
+ib5i1a
+�b5i1a
+ib3in
+�b3in
+ib5it.
+ibi2t
+�b5it.
+�bi2t
+ib5ite
+�b5ite
+i1b2l2
+�1b2l2
+ib3li
+�b3li
+i5bo
+�5bo
+i1br
+�1br
+i2b5ri
+�2b5ri
+i5bu4n
+�5bu4n
+4icam
+i1ca
+�cam
+5icap
+�cap
+4ic2a2r
+�c2a2r
+i4car.
+�4car.
+i4cara
+�4cara
+icas5
+�cas5
+i4cay
+�4cay
+iccu4
+ic3c
+�ccu4
+�c3c
+4iceo
+�ceo
+4i2ch
+�2ch
+2i1ci
+i5c2id
+�5c2id
+ic5i1na
+i2cin
+�c5i1na
+�2cin
+i2c2ip
+�2c2ip
+ic3i1pa
+�c3i1pa
+i4c1ly4
+i1c4l4
+�4c1ly4
+�1c4l4
+i2c5oc
+i1co
+�2c5oc
+�1co
+4i1cr
+�1cr
+5icra
+�cra
+i4cry
+�4cry
+ic4te
+i2c1t
+�c4te
+�2c1t
+ic1tu2
+�c1tu2
+ic4t3u1a
+�c4t3u1a
+ic3u1la
+�c3u1la
+ic4um
+�c4um
+ic5uo
+�c5uo
+i3cur
+�3cur
+2id
+i4dai2
+i1d2a
+�4dai2
+�1d2a
+id5anc
+ida2n
+�d5anc
+�da2n
+id5d4
+�d5d4
+ide3a4l
+�de3a4l
+ide4s2
+�de4s2
+i2di
+�2di
+id5i2a2n
+i1d4i3a
+�d5i2a2n
+�1d4i3a
+idi4a2r
+�di4a2r
+i5d2ie4
+�5d2ie4
+i1d3io
+�1d3io
+idi5ou2
+�di5ou2
+id1it
+�d1it
+id5i1u
+�d5i1u
+i3dle
+�3dle
+i4dom
+i1do
+�4dom
+�1do
+id3ow
+�d3ow
+i4dr
+�4dr
+i2du
+�2du
+id5uo
+�d5uo
+2ie4
+�e4
+ied4e
+�ed4e
+5ie5ga
+�e5ga
+ie2ld3
+�e2ld3
+ie1n5a4
+�e1n5a4
+ien4e
+�en4e
+i5e4n1n2
+�5e4n1n2
+i3ent2i
+ien1t
+�3ent2i
+�en1t
+i1er.
+�1er.
+i3es2c
+�3es2c
+i1est
+�1est
+i3et
+�3et
+4if.
+�f.
+if5ero
+ifer1
+�f5ero
+�fer1
+iff5en
+i4f1f
+iff5en
+i4ff
+�ff5en
+�4ff
+if4fr
+iffr
+�ffr
+4i2f3ic.
+i1fi
+4i2�c.
+i1�
+�2�c.
+1�1�
+i3f2ie4
+i3�e4
+�3�e4
+i3f4l2
+i3fl2
+�3fl2
+4i2ft
+�2ft
+2ig
+iga5b
+i1ga
+�ga5b
+�1ga
+ig3er1a
+�g3er1a
+ight3i
+�ght3i
+4igi
+�gi
+i3gib
+�3gib
+ig3il4
+�g3il4
+ig3in
+�g3in
+ig3it
+�g3it
+i4g4l2
+�4g4l2
+i2go
+�2go
+ig3or
+�g3or
+ig5ot
+�g5ot
+i5gre
+i1gr
+�5gre
+�1gr
+ig2u5i2
+�g2u5i2
+ig1ur
+�g1ur
+i3h
+�3h
+4i5i4
+�5i4
+i3j
+�3j
+4ik
+�k
+i1la
+�1la
+il3a4b
+�l3a4b
+i4l4ade
+ila2d
+�4l4ade
+�la2d
+i2l5am
+�2l5am
+ila5ra
+il2a2r
+�la5ra
+�l2a2r
+i3leg
+�3leg
+il1er
+�l1er
+ilev4
+�lev4
+i2l5f
+�2l5f
+i2l5ff
+�2l5ff
+i2l5�
+1�2l5�
+i2l5fl2
+�2l5fl2
+il1i
+il3i1a
+�l3i1a
+il2ib
+�l2ib
+il3io
+�l3io
+il4ist
+�l4ist
+2il1it
+�l1it
+il2iz
+�l2iz
+ill5ab
+il1l
+�ll5ab
+4i2l1n2
+�2l1n2
+il3o1q
+�l3o1q
+il4ty
+i4lt
+�l4ty
+�4lt
+il5ur
+�l5ur
+il3v
+�l3v
+i4mag
+i1ma
+�4mag
+�1ma
+im3age
+�m3age
+ima5ry
+im2a2r
+�ma5ry
+�m2a2r
+iment2a5r
+i1men
+i3men1t
+imen1ta
+�ment2a5r
+�1men
+�3men1t
+�men1ta
+4imet
+�met
+im1i
+�m1i
+im5i1d4a
+im2id
+�m5i1d4a
+�m2id
+imi5le
+�mi5le
+i5m2ini
+�5m2ini
+4imit
+�mit
+im4ni
+i4m1n
+�m4ni
+�4m1n
+i3mo2n
+i1mo
+�3mo2n
+�1mo
+i2mu
+�2mu
+im3u1la
+�m3u1la
+2in.
+�n.
+i4n3au
+i1na
+�4n3au
+4inav
+�nav
+incel4
+�ncel4
+in3cer
+�n3cer
+4ind
+in5dling
+�n5dling
+2ine
+i3nee
+�3nee
+in4er4a2r
+in1er
+iner1a
+�n4er4a2r
+�n1er
+�ner1a
+i5n2e2ss
+i1nes
+�5n2e2ss
+�1nes
+4in1ga
+�n1ga
+4inge
+�nge
+in5gen
+�n5gen
+4ingi
+�ngi
+in5gling
+ingl2
+�n5gling
+�ngl2
+4in1go
+�n1go
+4in1gu
+�n1gu
+2ini
+�ni
+i5ni.
+�5ni.
+i4n4i1a
+�4n4i1a
+in3i4o
+�n3i4o
+in1is
+�n1is
+i5ni4te.
+in2it
+in2ite
+�5ni4te.
+�n2it
+�n2ite
+5i3n2i1t2io
+ini1ti
+�3n2i1t2io
+�ni1ti
+in3i1ty
+�n3i1ty
+4i4nk2
+�4nk2
+4i4n1l
+�4n1l
+2i4n1n2
+2i1no
+�1no
+i4no4c
+�4no4c
+ino4s
+�no4s
+i4not
+�4not
+2i2n1s2
+�2n1s2
+in3se
+�n3se
+insu1r5a
+in1su
+insu2r
+�nsu1r5a
+�n1su
+�nsu2r
+2int.
+in1t
+�nt.
+�n1t
+2in4th
+�n4th
+in1u
+�n1u
+i5n2us
+�5n2us
+4iny
+�ny
+2io
+�o
+4io.
+�o.
+io1ge4
+�o1ge4
+io2gr
+�o2gr
+i1ol
+�1ol
+io4m
+�o4m
+ion3at
+io2n
+io1n1a
+�on3at
+�o2n
+�o1n1a
+ion4ery
+ion1er
+�on4ery
+�on1er
+ion3i
+�on3i
+i2o5ph
+�2o5ph
+ior3i
+�or3i
+i4os
+�4os
+i4o5th
+�4o5th
+i5oti
+�5oti
+io4to
+�o4to
+i4our
+iou2
+�4our
+�ou2
+2ip
+�p
+ipe4
+�pe4
+iphr2as4
+ip4hr4
+�phr2as4
+�p4hr4
+ip3i
+�p3i
+ip4ic
+�p4ic
+ip4re4
+ipr2
+�p4re4
+�pr2
+ip3ul
+�p3ul
+i3qua
+iqu2
+�3qua
+�qu2
+iq5ue1f
+�q5ue1f
+iq5u1e4ff
+�q5u1e4ff
+iq5ue1�
+1�q5ue1�
+iq5ue1fl2
+�q5ue1fl2
+iq3u2id
+iq2ui2
+�q3u2id
+�q2ui2
+iq3ui3t
+�q3ui3t
+4ir
+�r
+i1ra
+�1ra
+i2ra4b
+�2ra4b
+i4rac
+�4rac
+ird5e
+�rd5e
+ire4de
+i2r2ed
+�re4de
+�2r2ed
+i4re1f
+�4re1f
+i4r1e4ff
+�4r1e4ff
+i4re3�
+1�4re3�
+i4re1fl2
+�4re1fl2
+i4rel4
+�4rel4
+i4res
+�4res
+ir5gi
+irg2
+�r5gi
+�rg2
+ir1i
+�r1i
+iri5de
+ir2id
+�ri5de
+�r2id
+ir4is
+�r4is
+iri3tu
+�ri3tu
+5i5r2iz
+�5r2iz
+ir4min
+ir1m
+�r4min
+�r1m
+iro4g
+�ro4g
+5iron.
+iro2n
+�ron.
+�ro2n
+ir5ul
+�r5ul
+2is.
+�s.
+is5ag
+isa2
+�s5ag
+�sa2
+is3a2r
+�s3a2r
+isas5
+�sas5
+2is1c
+�s1c
+is3ch2
+�s3ch2
+4ise
+�se
+is3er
+�s3er
+3i4s3f
+�4s3f
+3i4s4ff
+�4s4ff
+3i4s3�
+1�4s3�
+3i4s3fl2
+�4s3fl2
+is5ha2n
+is2h
+�s5ha2n
+�s2h
+is3ho2n3
+isho4
+�s3ho2n3
+�sho4
+ish5op
+�sh5op
+is3i1b
+�s3i1b
+is2i4d
+�s2i4d
+i5sis
+�5sis
+is5i1t2iv
+isi1ti
+�s5i1t2iv
+�si1ti
+4is4k2
+�s4k2
+isla2n4
+is1l2
+�sla2n4
+�s1l2
+4is4m1s2
+i2s1m
+�s4m1s2
+�2s1m
+i2so
+�2so
+iso5mer
+i3som
+iso2me
+�so5mer
+�3som
+�so2me
+is1p
+�s1p
+is2pi
+�s2pi
+is4py
+�s4py
+4i2s1s
+�2s1s
+is4sal
+is1sa2
+�s4sal
+�s1sa2
+issen4
+�ssen4
+is4s1e4s
+�s4s1e4s
+is4ta.
+is1ta
+�s4ta.
+�s1ta
+is1te
+�s1te
+is1t2i
+ist4ly
+is2tl
+�st4ly
+�s2tl
+4istral
+ist4r
+is1tra
+�stral
+�st4r
+�s1tra
+i2su
+�2su
+is5us
+�s5us
+4i3ta.
+i1ta
+�3ta.
+�1ta
+ita4bi
+i2tab
+�ta4bi
+�2tab
+i4tag
+�4tag
+4ita5m
+�ta5m
+i3ta2n
+�3ta2n
+i3tat
+�3tat
+2ite
+�te
+it3er1a
+�t3er1a
+i5ter1i
+�5ter1i
+it4es
+�t4es
+2ith
+�th
+i1ti
+�1ti
+4i1t2i1a
+�1t2i1a
+4i2tic
+�2tic
+it3i1ca
+�t3i1ca
+5i5tick1
+�5tick1
+i2t3ig
+�2t3ig
+it5il1l
+�t5il1l
+i2tim
+�2tim
+2i1t2io
+�1t2io
+4itis
+�tis
+i4ti2s4m
+�4ti2s4m
+i2t5o5m
+i1to
+�2t5o5m
+�1to
+4ito2n
+�to2n
+i4tram
+i1tra
+�4tram
+�1tra
+it5ry
+�t5ry
+4i4t3t2
+�4t3t2
+it3u1at
+i1tu
+itu1a
+�t3u1at
+�1tu
+�tu1a
+i5tud2
+�5tud2
+it3ul
+�t3ul
+4itz.
+i4tz
+�tz.
+�4tz
+i1u
+�1u
+2iv
+�v
+iv3el1l
+�v3el1l
+iv3en.
+�v3en.
+i4v3er.
+�4v3er.
+i4vers.
+ive4r1s2
+�4vers.
+�ve4r1s2
+iv5il.
+i2vil
+�v5il.
+�2vil
+iv5io
+�v5io
+iv1it
+�v1it
+i5vore
+�5vore
+iv3o3ro
+�v3o3ro
+i4v3ot
+�4v3ot
+4i5w
+�5w
+ix4o
+�x4o
+4iy
+�y
+4iz2a2r2
+iza1
+�z2a2r2
+�za1
+i2z1i4
+�2z1i4
+5izon1t
+i1zo
+izo2n
+�zon1t
+�1zo
+�zo2n
+5ja
+jac4q
+ja4p
+1je
+je4r5s2
+4jes4t2ie4
+jest2i
+4jes2ty
+jew3
+jo4p
+5judg
+3ka.
+k3ab
+k5ag
+kais4
+kai2
+kal4
+k1b
+k2ed
+1kee
+ke4g
+ke5l2i
+k3en4d
+k1er
+kes4
+k3e2st.
+ke4ty
+k3f
+k4ff
+k3�
+k3fl2
+kh4
+k1i
+5ki.
+5k2ic
+k4il1l
+kilo5
+k4im
+k4in.
+kin4de
+k4ind
+k5i5n2e2ss
+k2ine
+ki1nes
+kin4g
+k2i4p
+kis4
+k5is2h
+kk4
+k1l
+4k3ley
+4k1ly
+k1m
+k5nes
+1k2no
+ko5r
+kos2h4
+k3ou2
+kro5n
+4k1s2
+k4sc
+ks4l2
+k4s4y
+k5t
+k1w
+lab3ic
+flab3ic
+l4abo
+fl4abo
+l4a2ci4
+fl4a2ci4
+l4ade
+la2d
+fl4ade
+fla2d
+la3d2y
+fla3d2y
+lag4n
+flag4n
+la2m3o
+fla2m3o
+3l4and
+la2n
+fl4and
+fla2n
+lan4dl
+flan4dl
+lan5et
+flan5et
+lan4te
+lan1t
+flan4te
+flan1t
+lar4g2
+l2a2r
+flar4g2
+fl2a2r
+lar3i
+flar3i
+las4e
+flas4e
+la5ta2n
+la2ta
+fla5ta2n
+fla2ta
+4latel2i4
+flatel2i4
+4la1t2iv
+fla1t2iv
+4lav
+flav
+la4v4a
+fla4v4a
+2l1b
+fl1b
+lbin4
+flbin4
+4l1c2
+fl1c2
+lce4
+flce4
+l3ci
+fl3ci
+2ld
+fld
+l2de
+fl2de
+ld4ere
+fld4ere
+ld4er1i
+fld4er1i
+ldi4
+fldi4
+ld5is1
+fld5is1
+l3dr
+fl3dr
+l4dri
+fl4dri
+le2a
+fle2a
+le4bi
+l2e1b
+fle4bi
+fl2e1b
+le2ft5
+le1f
+fle2ft5
+fle1f
+5leg.
+fleg.
+5le4g1g2
+fle4g1g2
+le4mat
+le1ma
+fle4mat
+fle1ma
+lem5at1ic
+flem5at1ic
+4len.
+flen.
+3lenc
+flenc
+5le2ne.
+fle2ne.
+1len1t
+flen1t
+le3ph
+fle3ph
+le4pr2
+fle4pr2
+le2ra5b
+ler1a
+fle2ra5b
+fler1a
+ler4e
+fler4e
+3lerg2
+flerg2
+3l4er1i
+fl4er1i
+l4ero
+fl4ero
+les2
+le5s1co
+les2c
+fle5s1co
+fles2c
+5lesq
+flesq
+3l2e2ss
+5less.
+fless.
+l3e1va
+fl3e1va
+lev4er.
+lev1er
+flev4er.
+flev1er
+lev4er1a
+flev4er1a
+lev4e4r1s2
+flev4e4r1s2
+3ley
+fley
+4leye
+fleye
+2lf
+flf
+2l4ff
+fl4ff
+2l1�
+fl1�
+2lfl2
+fl2fl2
+l5fr
+fl5fr
+4l1g4
+fl1g4
+l5ga
+fl5ga
+lg2a2r3
+flg2a2r3
+l4ges
+fl4ges
+l1go3
+fl1go3
+2l3h
+fl3h
+li4ag
+l2i1a
+fli4ag
+fl2i1a
+li2am4
+fli2am4
+liar5iz
+li2a2r
+liar1i
+fliar5iz
+fli2a2r
+fliar1i
+li4as
+fli4as
+li4a1to
+fli4a1to
+li5bi
+fli5bi
+5lic2io
+l2i1ci
+flic2io
+fl2i1ci
+li4cor
+li1co
+fli4cor
+fli1co
+4li4c3s2
+fli4c3s2
+4lict.
+li2c1t
+flict.
+fli2c1t
+l4icu
+fl4icu
+l3i1cy
+fl3i1cy
+l3i1d2a
+l2id
+fl3i1d2a
+fl2id
+lid5er
+flid5er
+3li2di
+fli2di
+lif3er1
+flif3er1
+l4i4f1f
+l4i4ff
+fl4i4ff
+li4f4l2
+li4fl2
+fl2i4fl2
+5ligate
+l2ig
+li1ga
+fligate
+fl2ig
+fli1ga
+3ligh
+fligh
+li4gra
+li1gr
+fli4gra
+fli1gr
+3l4ik
+fl4ik
+4l4i4l
+fl4i4l
+lim4b2l2
+li4m1b
+flim4b2l2
+fli4m1b
+lim3i
+flim3i
+li4mo
+fli4mo
+l4i4m4p
+fl4i4m4p
+l4i1na
+fl4i1na
+1l4ine
+fl4ine
+lin3ea
+flin3ea
+l2in3i
+fl2in3i
+link5er
+l4i4nk2
+flink5er
+fl4i4nk2
+li5og
+l2io
+fli5og
+fl2io
+4l4iq
+fl4iq
+lis4p
+flis4p
+l1it
+fl1it
+l2it.
+fl2it.
+5lit3i1ca
+li1ti
+l4i2tic
+flit3i1ca
+fli1ti
+fl4i2tic
+l5i5ti4c3s2
+fl5i5ti4c3s2
+liv3er
+l2iv
+fliv3er
+fl2iv
+l1iz
+fl1iz
+4lj
+flj
+lka3
+flka3
+l3kal4
+fl3kal4
+lka4t
+flka4t
+l1l
+fl1l
+l4law
+fl4law
+l2le
+fl2le
+l5le2a
+fl5le2a
+l3lec
+fl3lec
+l3leg
+fl3leg
+l3lel
+fl3lel
+l3le4n
+fl3le4n
+l3le4t
+fl3le4t
+ll2i
+fll2i
+l2lin4
+fl2lin4
+l5l4i1na
+fl5l4i1na
+ll4o
+fll4o
+lloq2ui5
+llo1q
+lloqu2
+flloq2ui5
+fllo1q
+flloqu2
+l2l5out
+llou2
+fl2l5out
+fllou2
+l5low
+fl5low
+2lm
+flm
+l5met
+fl5met
+lm3ing
+flm3ing
+l4mo2d1
+l1mo
+fl4mo2d1
+fl1mo
+lmo2n4
+flmo2n4
+2l1n2
+fl1n2
+3lo.
+flo.
+lob5al
+flob5al
+lo4ci
+flo4ci
+4lof
+flof
+4lo4ff
+flo4ff
+4lo2�
+flo2�
+4lofl2
+fl2ofl2
+3log1ic
+flog1ic
+l5o1go
+fl5o1go
+3logu
+flogu
+lom3er
+lo2me
+flom3er
+flo2me
+5long
+lo2n
+flong
+flo2n
+lon4i
+flon4i
+l3o3niz
+fl3o3niz
+lood5
+loo2
+flood5
+floo2
+5lo4pe.
+flo4pe.
+lop3i
+flop3i
+l3o4p1m
+fl3o4p1m
+lo1ra4
+flo1ra4
+lo4ra1to
+flo4ra1to
+lo5r2ie4
+flo5r2ie4
+lor5ou2
+flor5ou2
+5los.
+flos.
+los5et
+flos5et
+5los5o3phiz
+lo2so
+los4op
+los2oph
+flos5o3phiz
+flo2so
+flos4op
+flos2oph
+5los5o1phy
+flos5o1phy
+los4t
+flos4t
+lo4ta
+flo4ta
+loun5d
+lou2
+floun5d
+flou2
+2lout
+flout
+4lov
+flov
+2lp
+flp
+lpa5b
+l1pa
+flpa5b
+fl1pa
+l3pha
+fl3pha
+l5phi
+fl5phi
+lp5ing
+lpi2n
+flp5ing
+flpi2n
+l3pit
+fl3pit
+l4p2l2
+fl4p2l2
+l5pr2
+fl5pr2
+4l1r
+fl1r
+2l1s2
+fl1s2
+l4sc
+fl4sc
+l2se
+fl2se
+l4s2ie4
+fl4s2ie4
+4lt
+flt
+lt5ag
+l1ta
+flt5ag
+fl1ta
+ltane5
+lta2n
+fltane5
+flta2n
+l1te
+fl1te
+lten4
+flten4
+lter1a4
+flter1a4
+lth3i
+flth3i
+l5ties.
+lt2ie4
+fl5ties.
+flt2ie4
+ltis4
+fltis4
+l1tr
+fl1tr
+l1tu2
+fl1tu2
+ltu1r3a
+fltu1r3a
+lu5a
+flu5a
+lu3br
+flu3br
+lu2ch4
+flu2ch4
+lu3ci
+flu3ci
+lu3en
+flu3en
+luf4
+fluf4
+lu4ff
+flu4ff
+lu1�
+flu1�
+lu3fl2
+fl2u3fl2
+lu5id
+l2ui2
+flu5id
+fl2ui2
+lu4ma
+flu4ma
+5lu1mi
+flu1mi
+l5umn.
+lu4m1n
+fl5umn.
+flu4m1n
+5lum3n4i1a
+flum3n4i1a
+lu3o
+flu3o
+luo3r
+fluo3r
+4lup
+flup
+lu2ss4
+l2us
+flu2ss4
+fl2us
+lus3te
+flus3te
+1lut
+flut
+l5ven
+fl5ven
+l5vet4
+fl5vet4
+2l1w
+fl1w
+1ly
+4lya
+flya
+4ly1b
+fly1b
+ly5me4
+fly5me4
+ly3no
+fly3no
+2lys4
+flys4
+l5y3s2e
+fl5y3s2e
+1ma
+2mab
+ma2ca
+ma5ch2ine
+ma2ch
+ma4ch1in
+ma4c4l4
+mag5in
+mag1i
+5mag1n
+2mah
+ma2id5
+mai2
+4ma2ld
+ma3l2ig
+mal1i
+ma5lin
+mal4l2i
+mal1l
+mal4ty
+ma4lt
+5ma3n4i1a
+ma2n
+man5is
+man3iz
+4map
+ma5ri2ne.
+m2a2r
+mar1i
+mar2in4e
+ma5r2iz
+mar4ly
+mar1l
+mar3v
+ma5sce
+mas4e
+mas1t
+5mate
+m4ath3
+ma3tis
+4mati3za1
+ma1tiz
+4m1b
+m1ba4t5
+m5bil
+m4b3ing
+mb2i4v
+4m5c
+4me.
+2med
+4med.
+5me3d4i3a
+m4edi
+me3d2ie4
+m5e5d2y
+me2g
+mel5o2n
+me4l4t
+me2m
+me1m1o3
+1men
+me1n4a
+men5ac
+men4de
+4mene
+men4i
+me2n1s4
+men1su5
+3men1t
+men4te
+me5o2n
+m5er1sa2
+me4r1s2
+2mes
+3mest2i
+me4ta
+met3a2l
+me1te
+me5thi
+m4etr
+5met3ric
+me5tr2ie4
+me3try
+me4v
+4m1f
+4m4ff
+4m1�
+4m1fl2
+2mh
+5mi.
+m2i3a
+mi1d4a
+m2id
+mid4g
+m2ig4
+3mil3i1a
+mil1i
+m5i5l2ie4
+m4il1l
+mi1n4a
+3m4ind
+m5i3nee
+m2ine
+m4ingl2
+min5gli
+m5ing1ly
+min4t
+m4in1u
+miot4
+m2io
+m2is
+mi4s4er.
+m4ise
+mis3er
+mis5l2
+mis4t2i
+m5i4stry
+mist4r
+4m2ith
+m2iz
+4mk
+4m1l
+m1m
+mma5ry
+m1ma
+mm2a2r
+4m1n
+m1n4a
+m4n1in
+mn4o
+1mo
+4mocr
+5moc5ra1tiz
+mo2d1
+mo4go
+mois2
+moi2
+mo4i5se
+4m2ok
+mo5lest
+moles2
+mo3me
+mon5et
+mo2n
+mon5ge
+mo3n4i3a
+mon4i2s1m
+mon1is
+mon4ist
+mo3niz
+monol4
+mo3ny.
+mo2r
+4mo5ra.
+mo1ra
+mos2
+mo5sey
+mo3sp
+m4oth3
+m5ouf
+mou2
+m5ou4ff
+m5ou1�
+m5ou3fl2
+3mo2us
+mo2v
+4m1p
+mpara5
+m1pa
+mp2a2r
+mpa5rab
+mp4a4r5i
+m3pe2t
+mphas4
+m2pi
+mp2i4a
+mp5ies
+mp2ie4
+m4p1i2n
+m5p4ir
+mp5is
+mpo3ri
+m1p4or
+mpos5ite
+m1pos
+m4po2us
+mpou2
+mpov5
+mp4tr
+m2p1t
+m2py
+4m3r
+4m1s2
+m4s2h
+m5si
+4mt
+1mu
+mul2a5r4
+mu1la
+5mu4lt
+mul1ti3
+3mum
+mun2
+4mup
+mu4u
+4mw
+1na
+2n1a2b
+n4abu
+4nac.
+na4ca
+n5a2c1t
+nag5er.
+nak4
+na4l1i
+na5l2i1a
+4na4lt
+na5mit
+n2a2n
+nan1ci4
+nan4it
+na4nk4
+nar3c
+n2a2r
+4nare
+nar3i
+nar4l
+n5ar1m
+n4as
+nas4c
+nas5t2i
+n2at
+na3ta2l
+na2ta
+nat5o5m2iz
+na2tom
+na1to
+n2au
+nau3se
+na2us
+3naut
+nav4e
+4n1b4
+nc2a2r5
+n1ca
+n4ces.
+n3cha
+n2ch
+n5cheo
+nche2
+n5ch4il2
+n3chis
+n2c1in
+n1ci
+n2c4it
+ncou1r5a
+n1co
+ncou2
+n1cr
+n1cu
+n4dai2
+n1d2a
+n5da2n
+n1de
+nd5e2st.
+ndes2
+ndi4b
+n5d2if
+n5d2i4ff
+n5d2i1�
+n5d2i3fl2
+n1dit
+n3diz
+n5du2c
+n1du
+ndu4r
+nd2we
+nd1w
+2ne.
+n3e2a2r
+n2e2b
+neb3u
+ne2c
+5neck1
+2ned
+ne4gat
+ne1ga
+ne4g5a1t2iv
+5nege
+ne4la
+nel5iz
+nel2i
+ne5mi
+ne4mo
+1nen
+4nene
+3neo
+ne4po
+ne2q
+n1er
+ne2ra5b
+ner1a
+n4er3a2r
+n2ere
+n4er5i
+ner4r4
+1nes
+2nes.
+4ne1sp
+2nest
+4nes4w2
+3net1ic
+ne4v
+n5eve
+ne4w
+n3f
+n4ff
+n3�
+n3fl2
+n4gab
+n1ga
+n3gel
+nge4n4e
+n1gen
+n5gere
+n3ger1i
+ng5ha
+n3gib
+ng1in
+n5git
+n4gla4
+ngl2
+ngov4
+n1go
+ng5s2h
+ngs2
+n1gu
+n4gum
+n2gy
+4n1h4
+nha4
+nhab3
+nhe4
+3n4i1a
+ni3a2n
+ni4ap
+ni3ba
+ni4b2l2
+n2i4d
+ni5di
+ni4er
+n2ie4
+ni2fi
+ni2�
+ni5ficat
+nifi1ca
+ni5�cat
+ni�1ca
+n5i1gr
+n2ig
+n4ik4
+n1im
+ni3m2iz
+nim1i
+n1in
+5ni2ne.
+n2ine
+nin4g
+n2i4o
+5n2is.
+nis4ta
+n2it
+n4ith
+3n2i1t2io
+ni1ti
+n3itor
+ni1to
+ni3tr
+n1j
+4nk2
+n5k2ero
+nk1er
+n3ket
+nk3in
+nk1i
+n1k1l
+4n1l
+n5m
+nme4
+nmet4
+4n1n2
+nne4
+nni3al
+n3n4i1a
+nn2i4v
+nob4l2
+no3ble
+n5o1c4l4
+4n3o2d
+3noe
+4nog
+no1ge4
+nois5i
+noi2
+no5l4i
+5nol1o1gis
+3nomic
+n5o5m2iz
+no4mo
+no3my
+no4n
+non4ag
+no1n1a
+non5i
+n5oniz
+4nop
+5nop5o5l2i
+no2r5ab
+no1ra
+no4rary
+nor2a2r
+4nos2c
+nos4e
+nos5t
+no5ta
+1nou2
+3noun
+nov3el3
+nowl3
+n1p4
+npi4
+npre4c
+npr2
+n1q
+n1r
+nru4
+2n1s2
+n2s5ab
+nsa2
+nsati4
+ns4c
+n2se
+n4s3e4s
+ns2id1
+ns2ig4
+n2s1l2
+n2s3m
+n4soc
+n1so
+ns4pe
+n5spi
+nsta5b2l2
+ns1ta
+ns2tab
+n1t
+n2ta4b
+n1ta
+nte4r3s2
+nt2i
+n5ti2b
+nti4er
+nt2ie4
+nti2f2
+nti4ff
+nti2�
+nti3fl2
+n3t2ine
+n2t1in
+n4t3ing
+nt2i4p
+ntrol5l2i
+ntrol1l
+n4t4s2
+ntu3me
+n1tu
+n3tum
+nu1a
+nu4d
+nu5en
+nuf4fe
+nu4f1f
+nuffe
+nu4ff
+n3ui4n
+n2ui2
+3nu3it
+n4um
+nu1me
+n5u1mi
+3nu4n
+n3uo
+nu3tr
+n1v2
+n1w4
+nym4
+nyp4
+4nz
+n3za1
+4oa
+oa2d3
+o5a5les2
+o2ale
+oard3
+o2a2r
+oas4e
+oast5e
+oat5i
+ob3a3b
+o5b2a2r
+o1be4l
+o1bi
+o2bin
+ob5ing
+o3br
+ob3ul
+o1ce
+o2ch4
+o3che4t
+oche2
+ocif3
+o1ci
+oci4ff
+oci1�
+oci3fl2
+o4cil
+o4clam
+o1c4l4
+o4cod
+o1co
+oc3rac
+oc5ra1tiz
+ocre3
+5ocrit
+ocri2
+octo2r5a
+o2c1t
+oc1to
+oc3u1la
+o5cure
+od5d1ed
+od1d4
+od3ic
+o1d2i3o
+o2do4
+od4or3
+o4d5uct.
+o1du
+odu2c
+odu2c1t
+o4d5uc4t1s2
+o4el
+o5eng
+o3er
+oe4ta
+o3ev
+o2fi
+o2�
+of5ite
+o�te
+of4i4t4t2
+o�4t4t2
+o2g5a5r
+o1ga
+o4g5a1t2iv
+o4ga1to
+o1ge
+o5gene
+o1gen
+o5geo
+o4ger
+o3g2ie4
+1o1gis
+og3it
+o4gl2
+o5g2ly
+3ogniz
+og1ni
+o4g4ro
+o1gr
+og2u5i2
+1o1gy
+2o2g5y3n
+o1h2
+ohab5
+oi2
+oic3es
+oi3der
+o2id
+oi4f1f4
+oi4ff4
+o2ig4
+oi5let
+o3ing
+oint5er
+oin1t
+o5i2s1m
+oi5so2n
+oi2so
+oist5en
+ois1te
+oi3ter
+o2ite
+o5j
+2ok
+o3ken
+ok5ie4
+ok1i
+o1la
+o4la2n
+ola2ss4
+o2l2d
+ol2d1e
+ol3er
+o3les2c
+oles2
+o3let
+ol4fi
+o2lf
+o2l4�
+ol2i
+o3l2i1a
+o3lice
+ol5id.
+ol2id
+o3li4f
+o3l4i4ff
+o3li4�
+o3li4fl2
+o5l4i4l
+ol3ing
+o5l2io
+o5l2is.
+ol3is2h
+o5l2ite
+ol1it
+o5l2i1t2io
+oli1ti
+o5l2iv
+oll2i4e4
+ol1l
+oll2i
+ol5o3giz
+olo4r
+ol5p2l2
+o2lp
+o4l2t
+ol3ub
+ol3ume
+ol3un
+o5l2us
+ol2v
+o2ly
+o2m5ah
+o1ma
+oma5l
+om5a1tiz
+om2be
+o4m1b
+om4b2l2
+o2me
+om3e1n4a
+o1men
+om5er2se
+ome4r1s2
+o4met
+om5e3try
+om4etr
+o3m2i3a
+om3ic.
+om3i1ca
+o5m2id
+om1in
+o5m2ini
+5ommend
+om1m
+om1men
+omo4ge
+o1mo
+o4mo2n
+om3pi
+o4m1p
+ompro5
+ompr2
+o2n
+o1n1a
+on4ac
+o3n2a2n
+on1c
+3oncil
+on1ci
+2ond
+on5do
+o3nen
+o2n5est
+o1nes
+on4gu
+on1ic
+o3n2i4o
+on1is
+o5ni1u
+on3key
+o4nk2
+on4odi
+o4n3o2d
+on3o3my
+o2n3s2
+on5spi4
+onspi1r5a
+onsp4ir
+on1su4
+onten4
+on1t
+on3t4i
+onti2f5
+onti4ff
+onti2�
+onti3fl2
+on5um
+on1va5
+on1v2
+oo2
+ood5e
+ood5i
+o2o4k
+oop3i
+o3ord
+oost5
+o2pa
+o2p2e5d
+op1er
+3oper1a
+4op4erag
+2oph
+o5pha2n
+o5ph4er
+op3ing
+opi2n
+o3pit
+o5po2n
+o4posi
+o1pos
+o1pr2
+op1u
+opy5
+o1q
+o1ra
+o5ra.
+o4r3ag
+or5al1iz
+oral1i
+or5an4ge
+ora2n
+or2ang
+ore5a
+o5re1a4l
+or3ei2
+or4e5s2h
+or5e2st.
+ores2t
+orew4
+or4gu
+org2
+4o5r2i3a
+or3i1ca
+o5ril
+or1in
+o1r2i1o
+or3i1ty
+o3ri1u
+or2mi
+or1m
+orn2e
+o5rof
+o5ro4ff
+o5ro2�
+o5rofl2
+or3oug
+orou2
+or5pe
+or1p
+3orrh4
+or1r4
+or4se
+o4rs2
+ors5en
+orst4
+or3thi
+or3thy
+or4ty
+o5rum
+o1ry
+os3al
+osa2
+os2c
+os4ce
+o3scop
+os1co
+4oscopi
+o5scr
+os4i4e4
+os5i1t2iv
+osi1ti
+os3i1to
+os3i1ty
+o5si4u
+os4l2
+o2so
+o2s4pa
+os4po
+os2ta
+o5stati
+os5til
+ost2i
+os5tit
+o4ta2n
+o1ta
+otele4g
+ot3er.
+ot5e4r1s2
+o4tes
+4oth
+oth5e1si
+oth2e
+oth1es
+oth3i4
+ot3ic.
+ot5i1ca
+o3tice
+o3tif2
+o3ti4ff
+o3ti1�
+o3ti3fl2
+o3tis
+oto5s2
+o1to
+ou2
+ou3b2l2
+ouch5i
+ou2ch
+ou5et
+ou4l
+ounc5er
+oun2d
+ou5v2
+ov4en
+over4ne
+ove4r3s2
+ov4ert
+o3vis
+o4vi1ti4
+o5v4ol
+ow3der
+ow3el
+ow5est3
+ow1i2
+own5i
+o4wo2
+oy1a
+1pa
+pa4ca
+pa4ce
+pa2c4t
+p4a2d
+5paga4n
+pa1ga
+p3agat
+p4ai2
+pa4i4n4
+p4al
+pa1n4a
+pa2n
+pan3el
+pan4ty
+pan1t
+pa3ny
+pa1p
+pa4pu
+para5b2l2
+p2a2r
+pa2rab
+par5age
+par5d2i
+3pare
+par5el
+p4a4r1i
+par4is
+pa2te
+pa5ter
+5pathic
+p4ath
+pa5thy
+pa4tric
+pa1tr
+pav4
+3pay
+4p1b
+pd4
+4pe.
+3pe4a
+pear4l
+pe2a2r
+pe2c
+2p2ed
+3pede
+3p4edi
+pe3d4i3a4
+ped4ic
+p4ee
+pee4d
+pek4
+pe4la
+pel2i4e4
+pel2i
+pe4n2a2n
+pe1na
+p4enc
+pen4th
+pen1t
+pe5o2n
+p4era.
+per1a
+pera5b2l2
+pe2ra4b
+p4erag
+p4er1i
+peri5st
+per2is
+per4mal
+per3m4
+per1ma
+per2me5
+p4ern
+p2er3o
+per3ti
+p4e5ru
+per1v
+pe2t
+pe5ten
+pe5tiz
+4pf
+4p4ff
+4p1�
+4pfl2
+4pg
+4ph.
+phar5i
+ph2a2r
+ph4e3no
+phe2n
+ph4er
+ph4es.
+ph1es
+ph1ic
+5ph2ie4
+ph5ing
+5phis1t2i
+3phiz
+p4h2l4
+3phob
+3phone
+pho2n
+5phoni
+pho4r
+4p4h1s2
+ph3t
+5phu
+1phy
+p2i3a
+pi2a2n4
+pi4c2ie4
+p2i1ci
+pi4cy
+p4id
+p5i1d2a
+pi3de
+5pi2di
+3piec
+p2ie4
+pi3en
+pi4grap
+p2ig
+pi1gr
+pi3lo
+pi2n
+p4in.
+p4ind4
+p4i1no
+3p2i1o
+pio2n4
+p3ith
+pi5tha
+pi2tu
+2p3k2
+1p2l2
+3pla2n
+plas5t
+pl2i3a
+pli5er
+pl2ie4
+4pl2ig
+pli4n
+ploi4
+plu4m
+plu4m4b
+4p1m
+2p3n
+po4c
+5pod.
+po5em
+po3et5
+5po4g
+poin2
+poi2
+5poin1t
+poly5t
+po2ly
+po4ni
+po2n
+po4p
+1p4or
+po4ry
+1pos
+po2s1s
+p4ot
+po4ta
+5poun
+pou2
+4p1p
+ppa5ra
+p1pa
+pp2a2r
+p2pe
+p4p2ed
+p5pel
+p3pen
+p3per
+p3pe2t
+ppo5s2ite
+p1pos
+pr2
+pray4e4
+5pre1c2i
+pre5co
+pre3e2m
+pre4f5ac
+pre1f
+pre1fa
+pre4la
+pr1e3r4
+p3re1s2e
+3pr2e2ss
+pre5ten
+pre3v2
+5pr2i4e4
+prin4t3
+pr2i4s
+pri2s3o
+p3ro1ca
+pr2oc
+prof5it
+pro2fi
+pro�t
+pro2�
+pro3l
+pros3e
+pro1t
+2p1s2
+p2se
+ps4h
+p4si1b
+2p1t
+p2t5a4b
+p1ta
+p2te
+p2th
+p1ti3m
+ptu4r
+p1tu
+p4tw4
+pub3
+pue4
+puf4
+pu4ff
+pu1�
+pu3fl2
+pu4l3c2
+pu4m
+pu2n
+pur4r4
+5p2us
+pu2t
+5pute
+put3er
+pu3tr
+put4t1ed
+pu4t3t2
+put4t1in
+p3w
+qu2
+qua5v4
+2que.
+3quer
+3quet
+2rab
+ra3bi
+rach4e2
+ra2ch
+r5a1c4l4
+raf5fi
+ra2f
+ra4f1f4
+raffi
+ra2f4t
+r2ai2
+ra4lo
+ram3et
+r2ami
+ra3ne5o
+ra2n
+ran4ge
+r2ang
+r4ani
+ra5no4
+rap3er
+3ra1phy
+rar5c
+r2a2r
+rare4
+rar5e1f
+rar5e4ff
+rar5e3�
+rar5e1fl2
+4raril
+rar1i
+r2as
+ratio2n4
+ra1t2io
+rau4t
+ra5vai2
+ra2va
+rav3el
+ra5z2ie4
+ra2z1i
+r1b
+r4bab
+r4bag
+rbi2
+r2b3i4f
+r2b3i4ff
+r2b3i4�
+r2b3i4fl2
+r2bin
+r5b2ine
+rb5ing.
+rb4o
+r1c
+r2ce
+r1cen4
+r3cha
+r2ch
+rch4er
+rche2
+r4ci4b
+r1ci
+r2c4it
+rcum3
+r4dal
+r1d2a
+rd2i
+r1d4i4a
+rdi4er
+rd2ie4
+rd1in4
+rd3ing
+2re.
+re1a4l
+re3a2n
+re5ar1r4
+re2a2r
+5rea2v
+re4aw
+r5ebrat
+r2e1b
+re3br
+rec5ol1l
+re2col
+re1co
+re4c5ompe
+reco4m1p
+re4cre
+re1cr
+2r2ed
+re1de
+re3dis1
+r4edi
+red5it
+re4fac
+re1f
+re1fa
+re2fe
+re5fer.
+refer1
+re3fi
+re3�
+re4fy
+reg3is
+re5it
+rei2
+re1l2i
+re5lu
+r4en4ta
+ren1t
+ren4te
+re1o
+re5pi2n
+re4posi
+re1po
+re1pos
+re1pu
+r1er4
+r4er1i
+r2ero4
+r4e5ru
+r4es.
+re4spi
+re1sp
+res4s5i4b
+r2e2ss
+res1si
+res2t
+re5s2ta2l
+res1ta
+r2e3st4r
+re4ter
+re4ti4z
+re3tri
+r4eu2
+re5u1t2i
+rev2
+re4val
+re1va
+rev3el
+r5ev5er.
+rev1er
+re5ve4r1s2
+re5vert
+re5vi4l
+re1vi
+rev5olu
+re4wh
+r1f
+r4ff
+r1�
+r1fl2
+r3fu4
+r4fy
+rg2
+rg3er
+r3get
+r3g1ic
+rgi4n
+rg3ing
+r5gis
+r5git
+r1gl2
+rgo4n2
+r1go
+r3gu
+rh4
+4rh.
+4rhal
+r2i3a
+ria4b
+ri4ag
+r4ib
+rib3a
+ric5as5
+ri1ca
+r4ice
+4r2i1ci
+5ri5c2id
+ri4c2ie4
+r4i1co
+rid5er
+r2id
+ri3enc
+r2ie4
+ri3en1t
+ri1er
+ri5et
+rig5a2n
+r2ig
+ri1ga
+5r4igi
+ril3iz
+ril1i
+5rima2n
+ri1ma
+rim5i
+3ri1mo
+rim4pe
+ri4m1p
+r2i1na
+5rina.
+r4in4d
+r2in4e
+rin4g
+r2i1o
+5riph
+r2ip
+riph5e
+ri2p2l2
+rip5lic
+r4iq
+r2is
+r4is.
+r2is4c
+r3is2h
+ris4p
+ri3ta3b
+ri1ta
+r5ited.
+r2ite
+ri2t1ed
+rit5er.
+rit5e4r1s2
+r4i2t3ic
+ri1ti
+ri2tu
+rit5ur
+riv5el
+r2iv
+riv3et
+riv3i
+r3j
+r3ket
+rk4le
+rk1l
+rk4lin
+r1l
+rle4
+r2led
+r4l2ig
+r4lis
+rl5is2h
+r3lo4
+r1m
+rma5c
+r1ma
+r2me
+r3men
+rm5e4r1s2
+rm3ing
+r4ming.
+r4m2io
+r3mit
+r4my
+r4n2a2r
+r1na
+r3nel
+r4n1er
+r5net
+r3ney
+r5nic
+r1nis4
+r3n2it
+r3n2iv
+rno4
+r4nou2
+r3nu
+rob3l2
+r2oc
+ro3cr
+ro4e
+ro1fe
+ro5fil
+ro2fi
+ro5�l
+ro2�
+r2ok2
+ro5k1er
+5role.
+rom5e1te
+ro2me
+ro4met
+rom4i
+ro4m4p
+ron4al
+ro2n
+ro1n1a
+ron4e
+ro5n4is
+ron4ta
+ron1t
+1room
+roo2
+5root
+ro3pel
+rop3ic
+ror3i
+ro5ro
+ro2s5per
+ro2s4s
+ro4th2e
+r4oth
+ro4ty
+ro4va
+rov5el
+rox5
+r1p
+r4pe4a
+r5pen1t
+rp5er.
+r3pe2t
+rp4h4
+rp3ing
+rpi2n
+r3po
+r1r4
+rre4c
+rre4f
+rr1e4ff
+rre4�
+rre4fl2
+r4re1o
+rre4s2t
+rr2i4o
+rr2i4v
+rro2n4
+rros4
+rrys4
+4rs2
+r1sa2
+rsa5ti
+rs4c
+r2se
+r3sec
+rse4cr
+r4s5er.
+rs3e4s
+r5se5v2
+r1s2h
+r5sha
+r1si
+r4si4b
+rso2n3
+r1so
+r1sp
+r5sw2
+rta2ch4
+r1ta
+r4tag
+r3t2e1b
+r3ten4d
+r1te5o
+r1ti
+r2t5i2b
+rt2i4d
+r4tier
+rt2ie4
+r3t2ig
+rtil3i
+rtil4l
+r4ti1ly
+r4tist
+r4t2iv
+r3tri
+rtr2oph4
+rt4s2h4
+r4t1s2
+ru3a
+ru3e4l
+ru3en
+ru4gl2
+ru3i4n
+r2ui2
+rum3p2l2
+ru4m2p
+ru2n
+ru4nk5
+run4ty
+run1t
+r5usc2
+r2us
+ru2t1i5n
+r4u1t2i
+rv4e
+rvel4i
+r3ven
+rv5er.
+r5vest
+rv4e2s
+r3vey
+r3vic
+r3v2i4v
+r3vo
+r1w
+ry4c
+5rynge
+ryn5g
+ry3t
+sa2
+2s1ab
+5sack1
+sac3ri2
+s3a2c1t
+5sai2
+sa4l2a2r4
+s4a2l4m
+sa5lo
+sa4l4t
+3sanc
+sa2n
+san4de
+s4and
+s1ap
+sa5ta
+5sa3t2io
+sa2t3u
+sau4
+sa5vor
+5saw
+4s5b
+scan4t5
+s1ca
+sca2n
+sca4p
+scav5
+s4ced
+4s3cei2
+s4ces
+s2ch2
+s4cho2
+3s4c2ie4
+s1ci
+5sc4in4d
+s2cin
+scle5
+s1c4l4
+s4cli
+scof4
+s1co
+sco4ff
+sco2�
+scofl2
+4scopy5
+scou1r5a
+scou2
+s1cu
+4s5d
+4se.
+se4a
+seas4
+sea5w
+se2c3o
+3se2c1t
+4s4ed
+se4d4e
+s5edl
+se2g
+se1g3r
+5sei2
+se1le
+5se2l2f
+5se2l4ff
+5se2l2�
+5se2l2fl2
+5selv
+4se1me
+se4mol
+se1mo
+sen5at
+se1na
+4senc
+sen4d
+s5e2ned
+sen5g
+s5en1in
+4sen4t1d
+sen1t
+4sen2tl
+se2p3a3
+4s1er.
+s4er1l
+s2er4o
+4ser3vo
+s1e4s
+s4e5s2h
+ses5t
+5se5um
+s4eu
+5sev
+sev3en
+sew4i2
+5sex
+4s3f
+4s4ff
+4s3�
+4s3fl2
+2s3g
+s2h
+2sh.
+sh1er
+5shev
+sh1in
+sh3io
+3sh2i4p
+sh2i2v5
+sho4
+sh5o2l2d
+sho2n3
+shor4
+short5
+4sh1w
+si1b
+s5ic3c
+3si2de.
+s2id
+5side4s2
+5si2di
+si5diz
+4sig1n4a
+s2ig
+sil4e
+4si1ly
+2s1in
+s2i1na
+5si2ne.
+s2ine
+s3ing
+1s2io
+5sio2n
+sio1n5a
+s4i2r
+si1r5a
+1sis
+3s2i1t2io
+si1ti
+5si1u
+1s2iv
+5siz
+sk2
+4ske
+s3ket
+sk5ine
+sk1i
+sk5in4g
+s1l2
+s3lat
+s2le
+sl2ith5
+sl1it
+2s1m
+s3ma
+smal1l3
+sma2n3
+smel4
+s5men
+5s4m2ith
+smo2l5d4
+s1mo
+s1n4
+1so
+so4ce
+so2ft3
+so4lab
+so1la
+so2l3d2
+so3lic
+sol2i
+5sol2v
+3som
+3s4on.
+so2n
+so1n1a4
+son4g
+s4op
+5soph1ic
+s2oph
+s5o3phiz
+s5o1phy
+sor5c
+sor5d
+4sov
+so5vi
+2s1pa
+5sp4ai2
+spa4n
+spen4d
+2s5peo
+2sper
+s2phe
+3sph4er
+spho5
+spil4
+sp5ing
+spi2n
+4s3p2i1o
+s4p1ly
+s1p2l2
+s4po2n
+s1p4or4
+4sp4ot
+squal4l
+squ2
+s1r
+2ss
+s1sa2
+ssas3
+s2s5c
+s3sel
+s5sen5g
+s4ses.
+ss1e4s
+s5set
+s1si
+s4s2ie4
+ssi4er
+s4s5i1ly
+s4s1l2
+ss4li
+s4s1n4
+sspen4d4
+ss2t
+ssu1r5a
+s1su
+ssu2r
+ss5w2
+2st.
+s2tag
+s1ta
+s2ta2l
+stam4i
+5st4and
+sta2n
+s4ta4p
+5stat.
+s4t1ed
+stern5i
+s5t2ero
+ste2w
+ste1w5a
+s3th2e
+st2i
+s4ti.
+s5t2i1a
+s1tic
+5s4tick1
+s4t2ie4
+s3tif2
+s3ti4ff
+s3ti1�
+s3ti3fl2
+st3ing
+s2t1in
+5st4ir
+s1tle
+s2tl
+5stock1
+s1to
+sto2m3a
+5stone
+sto2n
+s4top
+3store
+st4r
+s4tra2d
+s1tra
+5stra2tu
+s4tray
+s4tr2id
+4stry
+4st3w4
+s2ty
+1su
+su1al
+su4b3
+su2g3
+su5is
+s2ui2
+suit3
+s4ul
+su2m
+su1m3i
+su2n
+su2r
+4sv
+sw2
+4s1wo2
+s4y
+4sy1c
+3syl
+syn5o
+sy5rin
+1ta
+3ta.
+2tab
+ta5bles2
+tab2l2
+5tab5o5l1iz
+tabol2i
+4t4a2ci
+ta5do
+ta2d
+4ta2f4
+4ta4ff4
+4ta2�
+4ta2fl2
+tai5lo
+tai2
+ta2l
+ta5la
+tal5en
+t2ale
+tal3i
+4talk
+tal4lis
+tal1l
+tall2i
+ta5log
+ta5mo
+tan4de
+ta2n
+t4and
+1tan1ta3
+tan1t
+ta5per
+ta5p2l2
+tar4a
+t2a2r
+4tar1c
+4tare
+ta3r2iz
+tar1i
+tas4e
+ta5s4y
+4tat1ic
+ta4tur
+ta2tu
+taun4
+tav4
+2taw
+tax4is
+tax3i
+2t1b
+4tc
+t4ch
+tch5e4t
+tche2
+4t1d
+4te.
+te2ad4i
+tea2d1
+4tea2t
+te1ce4
+5te2c1t
+2t1ed
+t4e5di
+1tee
+teg4
+te5ger4
+te5gi
+3tel.
+tel2i4
+5te2l1s2
+te2ma2
+tem3at
+3ten2a2n
+te1na
+3tenc
+3tend
+4te1nes
+1ten1t
+ten4tag
+ten1ta
+1teo
+te4p
+te5pe
+ter3c
+5ter3d
+1ter1i
+ter5ies
+ter2ie4
+ter3is
+teri5za1
+5t4er3n2it
+ter5v
+4tes.
+4t2e2ss
+t3ess.
+teth5e
+3t4eu
+3tex
+4tey
+2t1f
+2t4ff
+2t1�
+2t1fl2
+4t1g
+2th.
+tha2n4
+th2e
+4thea
+th3eas
+the5a2t
+the3is
+thei2
+3the4t
+th5ic.
+th5i1ca
+4th4il2
+5th4i4nk2
+4t4h1l4
+th5ode
+5thod3ic
+4thoo2
+thor5it
+tho5riz
+2t4h1s2
+1t2i1a
+ti4ab
+ti4a1to
+2ti2b
+4tick1
+t4i1co
+t4ic1u
+5ti2di
+t2id
+3tien
+t2ie4
+tif2
+ti4ff
+ti1�
+ti3fl2
+ti5fy
+2t2ig
+5tigu
+til2l5in4
+til1l
+till2i
+1tim
+4ti4m1p
+tim5ul
+ti2mu
+2t1in
+t2i1na
+3ti2ne.
+t2ine
+3t2ini
+1t2io
+ti5oc
+tion5ee
+tio2n
+5tiq
+ti3sa2
+3t4ise
+ti2s4m
+ti5so
+tis4p
+5tisti1ca
+tis1t2i
+tis1tic
+ti3tl
+ti4u
+1t2iv
+ti1v4a
+1tiz
+ti3za1
+ti3ze4n
+ti2ze
+2tl
+t5la
+tla2n4
+3tle.
+3tled
+3tles.
+tles2
+t5let.
+t5lo
+4t1m
+tme4
+2t1n2
+1to
+to3b
+to5crat
+4to2do4
+2tof
+2to4ff
+2to2�
+2tofl2
+to2gr
+to5ic
+toi2
+to2ma
+to4m4b
+to3my
+ton4a4l1i
+to2n
+to1n1a
+to3n2at
+4tono
+4tony
+to2ra
+to3r2ie4
+tor5iz
+tos2
+5tour
+tou2
+4tout
+to3w2a2r
+4t1p
+1tra
+t2ra3b
+tra5ch
+tr4a2ci4
+tra2c4it
+trac4te
+tra2c1t
+tr2as4
+tra5ven
+trav5e2s5
+tre5f
+tr1e5ff
+tre5�
+tre5fl2
+tre4m
+trem5i
+5tr2i3a
+tri5ces
+tr4ice
+5tri3c2i1a
+t4r2i1ci
+4tri4c3s2
+2trim
+tr2i4v
+tro5m4i
+tron5i
+tro2n
+4trony
+tro5phe
+tr2oph
+tro3sp
+tro3v
+tr2u5i2
+tr2us4
+4t1s2
+t4sc
+ts2h4
+t4sw2
+4t3t2
+t4tes
+t5to
+t1tu4
+1tu
+tu1a
+tu3a2r
+tu4b4i
+tud2
+4tue
+4tuf4
+4tu4ff
+4tu1�
+4tu3fl2
+5t2u3i2
+3tum
+tu4nis
+tu1ni
+2t3up.
+3ture
+5turi
+tur3is
+tur5o
+tu5ry
+3t2us
+4tv
+tw4
+4t1wa
+twis4
+twi2
+4t1wo2
+1ty
+4tya
+2tyl
+type3
+ty5ph
+4tz
+t2z4e
+4uab
+uac4
+ua5na
+ua2n
+uan4i
+uar5an1t
+u2a2r
+uara2n
+uar2d
+uar3i
+uar3t
+u1at
+uav4
+ub4e
+u4bel
+u3ber
+u4b2ero
+u1b4i
+u4b5ing
+u3b4le.
+ub2l2
+u3ca
+uci4b
+u1ci
+u2c4it
+ucle3
+u1c4l4
+u3cr
+u3cu
+u4cy
+ud5d4
+ud3er
+ud5est
+udes2
+ude1v4
+u1dic
+ud3ied
+ud2ie4
+ud3ies
+ud5is1
+u5dit
+u4do2n
+u1do
+ud4si
+u2d1s2
+u4du
+u4ene
+ue2n1s4
+uen4te
+uen1t
+uer4il
+uer1i
+3u1fa
+u3f4l2
+u3fl2
+ugh3e2n
+ug5in
+2ui2
+uil5iz
+uil1i
+ui4n
+u1ing
+uir4m
+u4ir
+ui1ta4
+u2iv3
+ui4v4er.
+u5j
+4uk
+u1la
+ula5b
+u5lati
+ul2ch4
+u4l1c2
+5ulche2
+ul3der
+u2ld
+ul2de
+ul4e
+u1len
+ul4gi
+u4l1g4
+ul2i
+u5l2i1a
+ul3ing
+ul5is2h
+ul4l2a2r
+ul1l
+ul4li4b
+ull2i
+ul4lis
+4u2l3m
+u1l4o
+4u2l1s2
+uls5e4s
+ul2se
+ul1ti
+u4lt
+ul1tra3
+ul1tr
+4ul1tu2
+u3lu
+ul5ul
+ul5v
+u2m5ab
+u1ma
+um4bi
+u4m1b
+um4b1ly
+umb2l2
+u1mi
+u4m3ing
+umor5o
+u1mo
+umo2r
+u4m2p
+un2at4
+u1na
+u2ne
+un4er
+u1ni
+un4im
+u2n1in
+un5is2h
+un2i3v
+u2n3s4
+un4sw2
+un2t3a4b
+un1t
+un1ta
+un4ter.
+un4tes
+unu4
+un5y
+u4n5z
+u4o4rs2
+u5os
+u1ou2
+u1pe
+upe4r5s2
+u5p2i3a
+up3ing
+upi2n
+u3p2l2
+u4p3p
+upport5
+up1p4or
+up2t5i2b
+u2p1t
+up1tu4
+u1ra
+4ura.
+u4rag
+u4r2as
+ur4be
+ur1b
+ur1c4
+ur1d
+ure5a2t
+ur4fer1
+ur1f
+ur4fr
+u3rif
+u3ri4ff
+u3ri1�
+u3ri3fl2
+uri4fic
+uri1fi
+uri4�c
+ur1in
+u3r2i1o
+u1rit
+ur3iz
+ur2l
+url5ing.
+ur4no4
+uros4
+ur4pe
+ur1p
+ur4pi
+urs5er
+u4rs2
+ur2se
+ur5tes
+ur3th2e
+ur1ti4
+ur4t2ie4
+u3ru
+2us
+u5sa2d
+usa2
+u5sa2n
+us4ap
+usc2
+us3ci
+use5a
+u5s2i1a
+u3sic
+us4lin
+us1l2
+us1p
+us5s1l2
+u2ss
+us5tere
+us1t4r
+u2su
+usu2r4
+u2ta4b
+u1ta
+u3tat
+4u4te.
+4utel
+4uten
+uten4i
+4u1t2i
+uti5l2iz
+util1i
+u3t2ine
+u2t1in
+ut3ing
+utio1n5a
+u1t2io
+utio2n
+u4tis
+5u5tiz
+u4t1l
+u2t5of
+u1to
+u2t5o4ff
+u2t5o2�
+u2t5ofl2
+uto5g
+uto5mat1ic
+uto2ma
+u5to2n
+u4tou2
+u4t1s4
+u3u
+uu4m
+u1v2
+ux1u3
+u2z4e
+1va
+5va.
+2v1a4b
+vac5il
+v4a2ci
+vac3u
+vag4
+va4ge
+va5l2i4e4
+val1i
+val5o
+val1u
+va5mo
+va5niz
+va2n
+va5pi
+var5ied
+v2a2r
+var1i
+var2ie4
+3vat
+4ve.
+4ved
+veg3
+v3el.
+vel3l2i
+vel1l
+ve4lo
+v4e1ly
+ven3om
+v4eno
+v5enue
+v4erd
+5v2e2re.
+v4erel
+v3eren
+ver5enc
+v4eres
+ver3ie4
+ver1i
+vermi4n
+ver3m4
+3ver2se
+ve4r1s2
+ver3th
+v4e2s
+4ves.
+ves4te
+ve4te
+vet3er
+ve4ty
+vi5al1i
+v2i1a
+vi2al
+5vi2a2n
+5vi2de.
+v2id
+5vi2d1ed
+4v3i1den
+5vide4s2
+5vi2di
+v3if
+v3i4ff
+v3i1�
+v3i3fl2
+vi5gn
+v2ig
+v4ik4
+2vil
+5v2il1it
+vil1i
+v3i3l2iz
+v1in
+4vi4na
+v2inc
+v4in5d
+4ving
+vi1o3l
+v2io
+v3io4r
+vi1ou2
+v2i4p
+vi5ro
+v4ir
+vis3it
+vi3so
+vi3su
+4vi1ti
+vit3r
+4vi1ty
+3v2iv
+5vo.
+voi4
+3v2ok
+vo4la
+v5ole
+5vo4l2t
+3vol2v
+vom5i
+vo2r5ab
+vo1ra
+vori4
+vo4ry
+vo4ta
+4vo1tee
+4vv4
+v4y
+w5ab2l2
+2wac
+wa5ger
+wa2g5o
+wait5
+wai2
+w5al.
+wam4
+war4t
+w2a2r
+was4t
+wa1te
+wa5ver
+w1b
+wea5r2ie4
+we2a2r
+wear1i
+we4ath3
+wea2t
+we4d4n4
+weet3
+wee5v
+wel4l
+w1er
+west3
+w3ev
+whi4
+wi2
+wil2
+wil2l5in4
+wil1l
+will2i
+win4de
+w4ind
+win4g
+w4ir4
+3w4ise
+w2ith3
+wiz5
+w4k
+wl4es2
+wl3in
+w4no
+1wo2
+wom1
+wo5v4en
+w5p
+wra4
+wri4
+wri1ta4
+w3s2h
+ws4l2
+ws4pe
+w5s4t
+4wt
+wy4
+x1a
+xac5e
+x4a2go
+xam3
+x4ap
+xas5
+x3c2
+x1e
+xe4cu1to
+xe1cu
+xe3c4ut
+x2ed
+xer4i
+x2e5ro
+x1h
+xhi2
+xh4il5
+xhu4
+x3i
+x2i5a
+xi5c
+xi5di
+x2id
+x4ime
+xi5m2iz
+xim1i
+x3o
+x4ob
+x3p
+xp4an4d
+x1pa
+xpa2n
+xpec1to5
+xpe2c
+xpe2c1t
+x2p2e3d
+x1t2
+x3ti
+x1u
+xu3a
+xx4
+y5ac
+3y2a2r4
+y5at
+y1b
+y1c
+y2ce
+yc5er
+y3ch
+ych4e2
+ycom4
+y1co
+ycot4
+y1d
+y5ee
+y1er
+y4er1f
+y4er4ff
+y4er1�
+y4er1fl2
+yes4
+ye4t
+y5gi
+4y3h
+y1i
+y3la
+ylla5b2l2
+yl1l
+y3lo
+y5lu
+ymbol5
+y4m1b
+yme4
+ym1pa3
+y4m1p
+yn3c4hr4
+yn2ch
+yn5d
+yn5g
+yn5ic
+5ynx
+y1o4
+yo5d
+y4o5g
+yom4
+yo5net
+yo2n
+y4o2n3s2
+y4os
+y4p2ed
+yper5
+yp3i
+y3po
+y4po4c
+yp2ta
+y2p1t
+y5pu
+yra5m
+yr5i3a
+y3ro
+yr4r4
+ys4c
+y3s2e
+ys3i1ca
+y1s3io
+3y1sis
+y4so
+y2ss4
+ys1t
+ys3ta
+ysu2r4
+y1su
+y3thin
+yt3ic
+y1w
+za1
+z5a2b
+z2a2r2
+4zb
+2ze
+ze4n
+ze4p
+z1er
+z2e3ro
+zet4
+2z1i
+z4il
+z4is
+5zl
+4zm
+1zo
+zo4m
+zo5ol
+zoo2
+zte4
+4z1z2
+z4zy
+.as9s8o9c8i8a8te.
+.as1so
+.asso1ci
+.asso3c2i1a
+.as9s8o9c8i8a8t8es.
+.de8c9l8i9n8a9t8i8on.
+.de1c4l4
+.decl4i1na
+.declin2at
+.declina1t2io
+.declinatio2n
+.ob8l8i8g9a9t8o8ry.
+.ob2l2
+.obl2ig
+.obli1ga
+.obliga1to
+.obligato1ry
+.ph8i8l9a8n9t8h8r8o8p8ic.
+.ph4il2
+.phi1la
+.phila2n
+.philan1t
+.philant4hr4
+.philanthrop3ic
+.pr8e8s8e8nt.
+.p3re1s2e
+.presen1t
+.pr8e8s8e8n8ts.
+.presen4t4s2
+.pr8o8j8e8ct.
+.pro5j
+.pro1je
+.proje2c1t
+.pr8o8j8e8c8ts.
+.projec4t1s2
+.re8c9i9p8r8o8c9i9t8y.
+.re1c2i
+.rec2ip
+.recipr2
+.recipr2oc
+.re1cipro1ci
+.recipro2c1it
+.reciproci1ty
+.re9c8o8g9n8i9z8a8n8ce.
+.re1co
+.re2cog
+.rec3ogniz
+.recog1ni
+.recogniza1
+.recogniza2n
+.re8f9o8r9m8a9t8i8on.
+.re1f
+.re1fo
+.refo2r
+.refor1m
+.refor1ma
+.reforma1t2io
+.reformatio2n
+.re8t9r8i9b8u9t8i8on.
+.re3tri
+.retr4ib
+.retri3bu1t2io
+.retrib4u1t2i
+.retributio2n
+.ta9b8le.
+.2tab
+.tab2l2
+.ac8a8d9e9m8y.
+.a1ca
+.aca2d
+.acad4em
+.acade3my
+.ac8a8d9e9m8i8e8s.
+.academ2i4e4
+.ac9c8u9s8a9t8i8v8e.
+.ac3c
+.ac1c2us
+.accusa2
+.accusa1t2iv
+.ac8r8o9n8y8m.
+.acro2n
+.acronym4
+.ac8r8y8l9a8m8i8d8e.
+.acry3la
+.acrylam2id
+.ac8r8y8l9a8m8i8d8e8s.
+.acrylamide4s2
+.ac8r8y8l9a8l8d8e9h8y8d8e.
+.acryla2ld
+.acrylal2de
+.acrylalde1h4
+.acrylaldehy1d
+.ad8d9a9b8l8e.
+.ad1d2a
+.ad2d3a4b
+.addab2l2
+.ad8d9i9b8l8e.
+.addi1b2l2
+.ad8r8e8n9a9l8i8n8e.
+.a1dr
+.adre4
+.a5dren
+.adre1na
+.adrena4l1i
+.adrena1l4ine
+.ae8r8o9s8p8a8c8e.
+.ae4r
+.a2ero
+.aero2s4pa
+.aerospa4ce
+.af9t8e8r9t8h8o8u8g8h8t.
+.afterthou2
+.af9t8e8r9t8h8o8u8g8h8t8s.
+.afterthough4t1s2
+.ag8r8o8n9o9m8i8s8t.
+.a1gr
+.ag4ro
+.agro2n
+.agronom2is
+.ag8r8o8n9o9m8i8s8t8s.
+.agronomis4t1s2
+.al9g8e9b8r8a9i9c8a8l9l8y.
+.a4l1g4
+.alg2e1b
+.alge3br
+.algebr2ai2
+.algebrai1ca
+.algebraical1l
+.algebraical1ly
+.am9p8h8e8t9a9m8i8n8e.
+.a4m1p
+.amphe4t
+.amphe1ta
+.amphetam1in
+.amphetam2ine
+.am9p8h8e8t9a9m8i8n8e8s.
+.amphetami1nes
+.an9a9l8y8s8e.
+.3ana1ly
+.a1na
+.an4a2lys4
+.anal5y3s2e
+.an9a9l8y8s8e8d.
+.analy4s4ed
+.an8a8l8y9s8e8s.
+.analys1e4s
+.an9i8s8o9t8r8o8p9i8c.
+.ani2so
+.anisotrop3ic
+.an9i8s8o9t8r8o8p9i9c8a8l9l8y.
+.anisotropi1ca
+.anisotropical1l
+.anisotropical1ly
+.an9i8s8o8t9r8o9p8i8s8m.
+.anisotropi2s1m
+.an9i8s8o8t9r8o8p8y.
+.anisotropy5
+.an8o8m9a8l8y.
+.ano4
+.anoma5l
+.ano1ma
+.anoma1ly
+.an8o8m9a8l8i8e8s.
+.anomal1i
+.anomal2i4e4
+.an8t8i9d8e8r8i8v9a9t8i8v8e.
+.ant2id
+.antider1i
+.antider2i4v
+.antide4ri1va
+.antideri3vat
+.antider2iva1t2iv
+.an8t8i9d8e8r8i8v9a9t8i8v8e8s.
+.antiderivativ4e2s
+.an8t8i9h8o8l8o9m8o8r9p8h8i8c.
+.anti3h
+.antiholo1mo
+.antiholomo2r
+.antiholomor1p
+.antiholomorp4h4
+.antiholomorph1ic
+.an9t8i8n9o9m8y.
+.an2t1in
+.ant2i1no
+.antino3my
+.an9t8i8n9o9m8i8e8s.
+.antinom2ie4
+.an9t8i9n8u9c8l8e8a8r.
+.antin1u
+.antinucle3
+.antinu1c4l4
+.antinucle2a
+.antinucle2a2r
+.an9t8i9n8u9c8l8e9o8n.
+.antinucleo2n
+.an9t8i9r8e8v9o9l8u9t8i8o8n9a8r8y.
+.ant4ir
+.antirev2
+.antirev5olu
+.antirevo1lut
+.antirevol4u1t2i
+.antirevolutio1n5a
+.antirevolu1t2io
+.antirevolutio2n
+.antirevolution2a2r
+.ap8o8t8h9e9o9s8e8s.
+.ap4ot
+.ap4oth
+.apoth2e
+.apotheos4
+.apotheos1e4s
+.ap8o8t8h9e9o9s8i8s.
+.apotheo1sis
+.ap9p8e8n9d8i8x.
+.a4p1p
+.ap2pe
+.ap3pen
+.ar9c8h8i9m8e9d8e8a8n.
+.ar1c
+.ar2ch
+.archi2med
+.archimedea2n
+.ar9c8h8i9p8e8l9a8g8o.
+.arch2i4p
+.archipe4
+.archipe4la
+.archipela2go
+.ar9c8h8i9p8e8l9a9g8o8s.
+.ar9c8h8i8v8e.
+.arch2i2v
+.ar9c8h8i8v8e8s.
+.archiv4e2s
+.ar9c8h8i8v9i8n8g.
+.archiv1in
+.archi4ving
+.ar9c8h8i8v9i8s8t.
+.ar9c8h8i8v9i8s8t8s.
+.archivis4t1s2
+.ar9c8h8e9t8y8p9a8l.
+.arche2
+.arche4t
+.arche1ty
+.archety1pa
+.archetyp4al
+.ar9c8h8e9t8y8p9i9c8a8l.
+.archetyp3i
+.archetypi1ca
+.ar8c9t8a8n9g8e8n8t.
+.ar2c1t
+.arct5ang
+.arc1ta
+.arcta2n
+.arctan1gen
+.arctangen1t
+.ar8c9t8a8n9g8e8n8t8s.
+.arctangen4t4s2
+.as9s8i8g8n9a9b8l8e.
+.as1si
+.as4sig1n4a
+.ass2ig
+.assig2n1a2b
+.assignab2l2
+.as9s8i8g8n9o8r.
+.assig1no
+.as9s8i8g8n9o8r8s.
+.assigno4rs2
+.as9s8i8s8t9a8n8t9s8h8i8p.
+.as1sis
+.assis1ta
+.assista2n
+.assistan1t
+.assistan4t4s2
+.assistants2h4
+.assistant3sh2i4p
+.as9s8i8s8t9a8n8t9s8h8i8p8s.
+.assistantshi2p1s2
+.as8y8m8p9t8o9m8a8t8i8c.
+.as4y
+.asy4m1p
+.asym2p1t
+.asymp1to
+.asympto2ma
+.asymptomat1ic
+.as9y8m8p9t8o8t9i8c.
+.as8y8n9c8h8r8o9n8o8u8s.
+.asyn3c4hr4
+.asyn2ch
+.asynchro2n
+.asynchro1nou2
+.asynchrono2us
+.at8h9e8r9o9s8c8l8e9r8o9s8i8s.
+.4ath
+.ath2e
+.ath2ero
+.atheros2c
+.atheroscle5
+.atheros1c4l4
+.ath2eroscl4ero
+.atherosclero1sis
+.at9m8o8s9p8h8e8r8e.
+.a4t1m
+.at1mo
+.atmos2
+.atmo3sp
+.atmos2phe
+.atmo3sph4er
+.at9m8o8s9p8h8e8r8e8s.
+.at9t8r8i8b9u8t8e8d.
+.a4t3t2
+.attr4ib
+.attribu2t1ed
+.at9t8r8i8b9u8t9a8b8l8e.
+.attri4bu1ta
+.attribu2ta4b
+.attributab2l2
+.au9t8o9m8a9t8i8o8n.
+.au1to
+.auto2ma
+.automa1t2io
+.automatio2n
+.au9t8o8m9a9t8o8n.
+.au1toma1to
+.automato2n
+.au9t8o8m9a9t8a.
+.automa2ta
+.au9t8o9n8u8m9b8e8r9i8n8g.
+.au5to2n
+.auton5um
+.autonu4m1b
+.autonumber1i
+.autonumberin4g
+.au9t8o8n9o9m8o8u8s.
+.au4tono
+.autono4mo
+.autono3mo2us
+.autonomou2
+.au8t8o9r8o8u8n8d9i8n8g.
+.autorou2
+.autoroun2d
+.autoround1in
+.av9o8i8r9d8u9p8o8i8s.
+.avoi4
+.avo4ir
+.avoir1du
+.avoir4dup
+.avoi2rdupoi2
+.ba8n8d9l8e8a8d8e8r.
+.b4and
+.ban1dl
+.bandle2a
+.bandlea2d1
+.ba8n8d9l8e8a8d8e8r8s.
+.bandleade4r5s2
+.ba8n8k9r8u8p8t.
+.ba4nk2
+.bankru2p1t
+.ba8n8k9r8u8p8t9c8y.
+.bankrup4tc
+.bankrupt1cy
+.ba8n8k9r8u8p8t9c8i8e8s.
+.bankrupt1ci
+.bankruptc2ie4
+.ba8r9o8n8i8e8s.
+.b2a2r
+.ba5roni
+.baro2n
+.baron2ie4
+.ba8s8e9l8i8n8e9s8k8i8p.
+.basel2i
+.base1l4ine
+.baseli1nes
+.baselinesk2
+.baselinesk1i
+.baselinesk2i4p
+.ba9t8h8y8m9e9t8r8y.
+.1bat
+.b4ath
+.bathyme4
+.bathym4etr
+.bathyme3try
+.ba8t8h8y9s8c8a8p8h8e.
+.bathy2s
+.bathys4c
+.bathysca4p
+.bathys1ca
+.be8a8n9i8e8s.
+.bea2n
+.bea3nies
+.bean2ie4
+.be9h8a8v9i8o8u8r.
+.be1h4
+.behav1i
+.behavi1ou2
+.behav2io
+.behavi4our
+.be9h8a8v9i8o8u8r8s.
+.behaviou4rs2
+.be8v8i8e8s.
+.be1vi
+.bev2ie4
+.bi8b9l8i9o8g9r8a9p8h8y9s8t8y8l8e.
+.bi2b
+.bi1b2l2
+.bib3li
+.bibli5og
+.bibl2io
+.biblio2gr
+.biblio4g3ra1phy
+.bibliography2s
+.bibliographys1t
+.bibliographys2ty
+.bibliographys2tyl
+.bi9d8i8f9f8e8r9e8n9t8i8a8l.
+.b2i4d
+.bi2di
+.bid1if
+.bidi4f1f
+.bidiffer1
+.bidiffer3en1t
+.bidifferent2i
+.bidifferen1t2i1a
+.bidifferenti2al
+.bi9d8i8ff8e8r9e8n9t8i8a8l.
+.bid1i4ff
+.bidiffer1
+.bidiffer3en1t
+.bidifferent2i
+.bidifferen1t2i1a
+.bidifferenti2al
+.bi8g9g8e8s8t.
+.b2ig
+.bi4g1g2
+.big2ge
+.bi8l8l9a8b8l8e.
+.1bil
+.bill5ab
+.bil1l
+.billab2l2
+.bi8o9m8a8t8h9e9m8a8t9i8c8s.
+.b2io
+.bio4m
+.bio1ma
+.biom4ath3
+.biomath5em
+.biomath2e
+.bio1mathe1ma
+.biomathemat1ic
+.biomathemati4c3s2
+.bi8o9m8e8d9i9c8a8l.
+.bio2me
+.bio2med
+.biom4edi
+.biomed3i1ca
+.bi8o9m8e8d9i9c8i8n8e.
+.biomed2i1ci
+.biomedi2cin
+.biomedic2ine
+.bi8o9r8h8y8t8h8m8s.
+.biorh4
+.biorhyt4h1m
+.biorhyth4m1s2
+.bi8t9m8a8p.
+.bi2t
+.bi4t1m
+.bit1ma
+.bit4map
+.bi8t9m8a8p8s.
+.bitma2p1s2
+.bl8a8n8d9e8r.
+.b2l2
+.b3l4and
+.bla2n
+.blan1de
+.bl8a8n8d9e8s8t.
+.blande4s2
+.bl8i8n8d9e8r.
+.bl4ind
+.blin1de
+.bl8o8n8d8e8s.
+.b4lo
+.blo2n
+.bl2ond
+.blon1de
+.blondes2
+.bl8u8e9p8r8i8n8t.
+.bluepr2
+.blueprin4t3
+.bl8u8e9p8r8i8n8t8s.
+.blueprin4t4s2
+.bo9l8o8m9e9t8e8r.
+.bolo2me
+.bolo4met
+.bolome1te
+.bo8o8k9s8e8l8l9e8r.
+.3boo2
+.bo2o4k
+.boo4k1s2
+.booksel1l
+.booksel2le
+.bo8o8k9s8e8l8l9e8r8s.
+.bookselle4r1s2
+.bo8o8l9e8a8n.
+.boole2a
+.boolea2n
+.bo8o8l9e8a8n8s.
+.boolea2n1s2
+.bo8r9n8o9l8o8g9i9c8a8l.
+.borno4
+.borno3log1ic
+.bornologi1ca
+.bo8t9u9l8i8s8m.
+.bo1tu
+.botul2i
+.botuli2s1m
+.br8u8s8q8u8e8r.
+.br2us
+.brusqu2
+.brus3quer
+.bu8f9f8e8r.
+.buf4fer1
+.bu4f1f
+.bu8ff8e8r.
+.buffer1
+.bu4ff
+.bu8f9f8e8r8s.
+.buffe4r1s2
+.bu8ff8e8r8s.
+.buffe4r1s2
+.bu8s8i8e8r.
+.bus5ie4
+.b2us
+.bu8s8i8e8s8t.
+.busi1est
+.bu8s8s8i8n8g.
+.bu2ss
+.bus1si
+.bus2s1in
+.buss3ing
+.bu8t8t8e8d.
+.but2t1ed
+.bu8z8z9w8o8r8d.
+.bu4z1z2
+.buzz1wo2
+.bu8z8z9w8o8r8d8s.
+.buzzwor2d1s2
+.ca9c8o8p8h9o9n8y.
+.ca1co
+.cac2oph
+.cacopho5ny
+.cacopho2n
+.ca9c8o8p8h9o9n8i8e8s.
+.caco5phoni
+.cacophon2ie4
+.ca8l8l9e8r.
+.cal1l
+.cal2le
+.ca8l8l9e8r8s.
+.calle4r1s2
+.ca8m9e8r8a9m8e8n.
+.cam5er1a
+.camera1men
+.ca8r8t9w8h8e8e8l.
+.cartw4
+.ca8r8t9w8h8e8e8l8s.
+.cartwhee2l1s2
+.ca9t8a8r8r8h8s.
+.ca2ta
+.cat2a2r
+.catar1r4
+.catarrh4
+.catarr4h1s2
+.ca8t9a9s8t8r8o8p8h9i8c.
+.catas1t4r
+.catastr2oph
+.catastroph1ic
+.ca8t9a9s8t8r8o8p8h9i9c8a8l8l8y.
+.1catastrophi1ca
+.catastrophical1l
+.catastrophical1ly
+.ca8t9e9n8o8i8d.
+.cat4eno
+.catenoi2
+.cateno2id
+.ca8t9e9n8o8i8d8s.
+.catenoi2d1s2
+.ca8u9l8i9f8l8o8w9e8r.
+.cau4l2
+.caul2i
+.cauli4f4l2
+.cauliflow1er
+.ca8u9l8i9fl8o8w9e8r.
+.cauli4fl2
+.cauliflow1er
+.ch8a8p9a8r9r8a8l.
+.chap2a2r4
+.cha1pa
+.chapar1r4
+.ch8a8r9t8r8e8u8s8e.
+.ch2a2r
+.chartr4eu2
+.chartre2us4
+.ch8e8m8o9t8h8e8r9a8p8y.
+.che2
+.che1mo
+.chem4oth3
+.chemoth2e
+.chemoth4er1a
+.chemothera3p
+.ch8e8m8o9t8h8e8r9a9p8i8e8s.
+.chemotherap2ie4
+.ch8l8o8r8o9m8e8t8h9a8n8e.
+.c4h1l4
+.ch2lo
+.chloro2me
+.chloro4met
+.chlorometha2n4
+.ch8l8o8r8o9m8e8t8h9a8n8e8s.
+.chlorometha1nes
+.ch8o9l8e8s9t8e8r8i8c.
+.3cho2
+.c3hol4e
+.choles2
+.choles1ter1i
+.ci8g9a9r8e8t8t8e.
+.c2ig
+.ci1ga
+.cig2a2r
+.cigare4t3t2
+.ci8g9a9r8e8t8t8e8s.
+.cigaret4tes
+.ci8n8q8u8e9f8o8i8l.
+.2cin
+.cin1q
+.cinqu2
+.cinque1f
+.cinque1fo
+.cinquefoi2
+.co9a8s8s8o9c8i8a9t8i8v8e.
+.c4oa
+.coa2ss
+.coas1so
+.coasso1ci
+.coasso3c2i1a
+.coassoci4a1t2iv
+.co9g8n8a8c.
+.2cog
+.cog1n4a
+.co9g8n8a8c8s.
+.cogna4c3s2
+.co9k8e8r9n8e8l.
+.c2ok
+.cok1er
+.coker3nel
+.co9k8e8r9n8e8l8s.
+.cokerne2l1s2
+.co8l9l8i8n9e8a9t8i8o8n.
+.col1l
+.coll2i
+.col2lin4
+.col1l4ine
+.collin3ea
+.collinea2t
+.collinea1t2io
+.collineatio2n
+.co8l9u8m8n8s.
+.colu4m1n
+.colum2n1s2
+.co8m9p8a8r9a8n8d.
+.co4m1p
+.compara5
+.com1pa
+.comp2a2r
+.compara2n
+.compar4and
+.co8m9p8a8r9a8n8d8s.
+.comparan2d1s2
+.co8m9p8e8n9d8i8u8m.
+.compendi1u
+.co8m9p8o9n8e8n8t9w8i8s8e.
+.compo2n
+.compo3nen
+.componen1t
+.componentw4
+.componentwis4
+.componentwi2
+.component3w4ise
+.co8m8p9t8r8o8l9l8e8r.
+.comp4tr
+.com2p1t
+.comptrol1l
+.comptrol2le
+.co8m8p9t8r8o8l9l8e8r8s.
+.comptrolle4r1s2
+.co8n9f8o8r8m9a8b8l8e.
+.co2n
+.con3f
+.con1fo
+.confo2r
+.confor1m
+.confor1ma
+.confor2mab
+.conformab2l2
+.co8n9f8o8r8m9i8s8t.
+.confor2mi
+.conform2is
+.co8n9f8o8r8m9i8s8t8s.
+.conformis4t1s2
+.co8n9f8o8r8m9i8t8y.
+.confor3mit
+.conformi1ty
+.co8n9g8r8e8s8s.
+.con3g
+.con1gr
+.congr2e2ss
+.co8n9g8r8e8s8s8e8s.
+.congress1e4s
+.co8n9t8r8i8b9u8t8e.
+.con5t
+.contr4ib
+.co8n9t8r8i8b9u8t8e8s.
+.co8n9t8r8i8b9u8t8e8d.
+.contribu2t1ed
+.co9r8e9l8a9t8i8o8n.
+.core1la
+.corela1t2io
+.corelatio2n
+.co9r8e9l8a9t8i8o8n8s.
+.corelatio2n3s2
+.co9r8e9l8i9g8i8o8n9i8s8t.
+.core1l2i
+.corel2ig
+.corel4igi
+.coreli5g2io
+.coreligion3i
+.coreligio2n
+.coreligion1is
+.co9r8e9l8i9g8i8o8n9i8s8t8s.
+.coreligionis4t1s2
+.co9r8e9o8p9s8i8s.
+.core1o
+.coreo2p1s2
+.coreop1sis
+.co9r8e9s8p8o8n9d8e8n8t.
+.core1sp
+.cores4po2n
+.coresp2ond
+.corespon1de
+.corespon1den
+.coresponden1t
+.co9r8e9s8p8o8n9d8e8n8t8s.
+.coresponden4t4s2
+.co9s8e9c8a8n8t.
+.cos4e
+.cose1ca
+.coseca2n
+.cosecan1t
+.co9t8a8n9g8e8n8t.
+.co4ta2n
+.co1ta
+.cot2ang
+.cotan1gen
+.cotangen1t
+.co8u8r9s8e8s.
+.cou2
+.cou4rs2
+.cour2se
+.cours3e4s
+.co9w8o8r8k9e8r.
+.co4wo2
+.cowork1er
+.co9w8o8r8k9e8r8s.
+.coworke4r1s2
+.cr8a8n8k9c8a8s8e.
+.cra2n
+.cra4nk2
+.crank1ca
+.cr8a8n8k9s8h8a8f8t.
+.cran4k1s2
+.cranks2h
+.cranksha2f
+.cranksha2ft
+.cr8o8c9o9d8i8l8e.
+.cr2oc
+.cro4cod
+.cro1co
+.cr8o8c9o9d8i8l8e8s.
+.crocodiles2
+.cr8o8s8s9h8a8t8c8h.
+.cro2s4s
+.cross2h
+.crossha4tc
+.crosshat4ch
+.cr8o8s8s9h8a8t8c8h8e8d.
+.crosshatche2
+.crosshat4ch4ed
+.cr8o8s8s9o8v8e8r.
+.cros1so
+.cros4sov
+.cr8y8p9t8o9g8r8a8m.
+.cry2p1t
+.cryp1to
+.crypto2gr
+.cr8y8p9t8o9g8r8a8m8s.
+.cryptogra4m1s2
+.cu8f8f9l8i8n8k.
+.c4uf
+.cu4f1f
+.cuff4l2
+.cufflin4
+.cuffl4i4nk2
+.cu8ffl8i8n8k.
+.cuffl4i4nk2
+.cu8f8f9l8i8n8k8s.
+.cufflin4k1s2
+.cu8ffl8i8n8k8s.
+.cufflin4k1s2
+.cu9n8e8i9f8o8r8m.
+.3cun
+.cu2ne
+.cunei2
+.cunei1fo
+.cuneifo2r
+.cuneifor1m
+.cu8s9t8o8m9i8z9a9b8l8e.
+.1c2us
+.cus1to
+.custom2iz
+.customiza1
+.customiz5a2b
+.customizab2l2
+.cu8s9t8o8m9i8z8e.
+.customi2ze
+.cu8s9t8o8m9i8z8e8s.
+.cu8s9t8o8m9i8z8e8d.
+.da8c8h8s9h8u8n8d.
+.1d2a
+.da2ch4
+.dac4h1s2
+.dach4s2h
+.da8m9s8e8l9f8l8y.
+.da2m2
+.da4m1s2
+.dam5se2l2f
+.damself4l2
+.damself2ly5
+.da8m9s8e8l9fl8y.
+.dam5se2l2fl2
+.damselfly
+.da8m9s8e8l9f8l8i8e8s.
+.damselfl2ie4
+.da8m9s8e8l9fl8i8e8s.
+.damselfl2ie4
+.da8c8t8y8l9o9g8r8a8m.
+.da2c1t
+.dac1ty
+.dac2tyl
+.dacty3lo
+.dactylo1gr
+.da8c8t8y8l9o9g8r8a8p8h.
+.da8t8a9b8a8s8e.
+.3dat
+.da2ta
+.da2tab
+.da8t8a9b8a8s8e8s.
+.databas1e4s
+.da8t8a9p8a8t8h.
+.dat5ap
+.datap5at
+.data1pa
+.datap4ath
+.da8t8a9p8a8t8h8s.
+.datapa2t4h1s2
+.da8t8e9s8t8a8m8p.
+.dat3est
+.dates1ta
+.datesta4m1p
+.da8t8e9s8t8a8m8p8s.
+.datestam2p1s2
+.de9c8l8a8r9a8b8l8e.
+.de4cl2a2r
+.decla2rab
+.declarab2l2
+.de9f8i8n9i9t8i8v8e.
+.de1f
+.de1fi
+.de2fin
+.def2ini
+.defin2it
+.defini1ti
+.defini1t2iv
+.de9�8n9i9t8i8v8e.
+.de1�
+.de2�n
+.de�ni
+.de�n2it
+.de�ni1ti
+.de�ni1t2iv
+.de9l8e8c9t8a9b8l8e.
+.d5elec
+.dele2c1t
+.delec2ta4b
+.delec1ta
+.delectab2l2
+.de8m8i9s8e8m8i9q8u8a9v8e8r.
+.de4m2is
+.dem4ise
+.demisemi3qua
+.demisemiqu2
+.demisemiqua5v4
+.de8m8i9s8e8m8i9q8u8a9v8e8r8s.
+.demisemiquave4r1s2
+.de9m8o8c9r8a9t8i8s8m.
+.de4mocr
+.democrati2s4m
+.de8m8o8s.
+.demos2
+.de9r8i8v9a9t8i8v8e.
+.der2i4v
+.de4ri1va
+.deri3vat
+.der2iva1t2iv
+.de9r8i8v9a9t8i8v8e8s.
+.derivativ4e2s
+.di8a9l8e8c9t8i8c.
+.1d4i3a
+.di2al
+.di2ale
+.diale2c1t
+.di8a9l8e8c9t8i8c8s.
+.dialecti4c3s2
+.di8a9l8e8c9t8i9c8i8a8n.
+.dialect2i1ci
+.d2i1alecti3c2i1a
+.dialectici2a2n
+.di8a9l8e8c9t8i9c8i8a8n8s.
+.dialecticia2n1s2
+.di9c8h8l8o8r8o9m8e8t8h9a8n8e.
+.d4i2ch
+.dic4h1l4
+.dich2lo
+.dichloro2me
+.dichloro4met
+.dichlorometha2n4
+.di8f9f8r8a8c8t.
+.d1if
+.dif4fr
+.di4f1f
+.diffra2c1t
+.di8ff8r8a8c8t.
+.d1i4ff
+.diffr
+.diffra2c1t
+.di8f9f8r8a8c8t8s.
+.diffrac4t1s2
+.di8ff8r8a8c8t8s.
+.diffrac4t1s2
+.di8f9f8r8a8c9t8i8o8n.
+.diffrac1t2io
+.diffractio2n
+.di8ff8r8a8c9t8i8o8n.
+.diffrac1t2io
+.diffractio2n
+.di8f9f8r8a8c9t8i8o8n8s.
+.diffractio2n3s2
+.di8ff8r8a8c9t8i8o8n8s.
+.diffractio2n3s2
+.di8r8e8r.
+.d4ir2
+.di1re
+.dir1er4
+.di8r8e9n8e8s8s.
+.dire1nes
+.diren2e2ss
+.di8s9p8a8r9a8n8d.
+.dis1
+.dis1p
+.di2s1pa
+.disp2a2r
+.dispara2n
+.dispar4and
+.di8s9p8a8r9a8n8d8s.
+.disparan2d1s2
+.di8s9t8r8a8u8g8h8t9l8y.
+.d4is3t
+.dist4r
+.dis1tra
+.distraugh3
+.distraugh2tl
+.distraught1ly
+.di8s9t8r8i8b9u8t8e.
+.distr4ib
+.di8s9t8r8i8b9u8t8e8s.
+.di8s9t8r8i8b9u8t8e8d.
+.distribu2t1ed
+.do8u9b8l8e9s8p8a8c8e.
+.dou2
+.dou3b2l2
+.dou5ble1sp
+.doubles2
+.double2s1pa
+.doublespa4ce
+.do8u9b8l8e9s8p8a8c9i8n8g.
+.doublesp4a2ci
+.doublespa2c1in
+.doublespac1ing
+.do8l8l9i8s8h.
+.dol1l
+.doll2i
+.dollis2h
+.dr8i8f8t9a8g8e.
+.1dr
+.dr4i2ft
+.drif1ta
+.dr8i8v9e8r8s.
+.dr2iv
+.drive4r1s2
+.dr8o8m9e9d8a8r8y.
+.dro2me
+.dro2med
+.drom2e2d2a
+.drome4dary
+.dromed2a2r
+.dr8o8m9e9d8a8r8i8e8s.
+.dromedar1i
+.dromedar2ie4
+.du9o8p9o9l8i8s8t.
+.duopol2i
+.du9o8p9o9l8i8s8t8s.
+.duopolis4t1s2
+.du9o8p9o8l8y.
+.duopo2ly
+.dy8s9l8e8x8i8a.
+.d2y
+.dys1l2
+.dys2le
+.dyslex3i
+.dyslex2i5a
+.dy8s9l8e8c9t8i8c.
+.dysle2c1t
+.ea8s8t9e8n8d9e8r8s.
+.east3
+.eas3ten
+.eas3tend
+.easten1de
+.eastende4r5s2
+.ec8o9n8o8m9i8c8s.
+.e1co
+.eco2n
+.eco3nomic
+.economi4c3s2
+.ec8o8n9o9m8i8s8t.
+.econom2is
+.ec8o8n9o9m8i8s8t8s.
+.economis4t1s2
+.ei9g8e8n9c8l8a8s8s.
+.ei2
+.e2ig2
+.ei1gen
+.eigen1c4l4
+.eigencla2ss
+.ei9g8e8n9c8l8a8s8s8e8s.
+.eigenclass1e4s
+.ei9g8e8n9v8a8l9u8e.
+.eigen1v2
+.eigen1va
+.eigenval1u
+.ei9g8e8n9v8a8l9u8e8s.
+.el8e8c8t8r8o9m8e8c8h8a8n9i9c8a8l.
+.5elec
+.ele2c1t
+.electro2me
+.electrome2ch
+.electrome5cha4n1ic
+.electromecha2n
+.electromechani1ca
+.el8e8c8t8r8o9m8e8c8h8a8n8o9a8c8o8u8s8t8i8c.
+.electromechano4
+.electromechan4oa
+.electromechanoa1co
+.electromechanoacou2
+.electromechanoaco2us
+.electromechanoacoust2i
+.electromechanoacous1tic
+.el8i8t9i8s8t.
+.el2i
+.el1it
+.eli1ti
+.el4itis
+.el8i8t9i8s8t8s.
+.elitis4t1s2
+.en9t8r8e9p8r8e9n8e8u8r.
+.en1t
+.entrepr2
+.entrepren4eu
+.en9t8r8e9p8r8e9n8e8u8r9i8a8l.
+.entrepreneur2i3a
+.entrepreneuri2al
+.ep9i9n8e8p8h9r8i8n8e.
+.epi2n
+.ep2ine
+.epinep4hr4
+.ep2inephr2in4e
+.eq8u8i9v8a8r8i9a8n8t.
+.equ2iv3
+.equi1va
+.equiv2a2r
+.equivar1i
+.equivar3i2a2n
+.equivar2i3a
+.equivar4ian4t
+.eq8u8i9v8a8r8i9a8n8c8e.
+.equivar4ianc
+.et8h9a8n8e.
+.etha2n4
+.et8h9y8l9e8n8e.
+.ev8e8r9s8i9b8l8e.
+.ev1er
+.eve4r1s2
+.ever1si
+.ever4si4b
+.eversi1b2l2
+.ev8e8r8t.
+.ev8e8r8t8s.
+.ever4t1s2
+.ev8e8r8t9e8d.
+.ever2t1ed
+.ev8e8r8t9i8n8g.
+.ever1ti
+.ever2t1in
+.ex9q8u8i8s9i8t8e.
+.exqu2
+.exq2ui2
+.exquis2ite
+.ex9t8r8a9o8r9d8i9n8a8r8y.
+.ex1t2
+.ex1tra
+.extr4ao
+.extraord2i
+.extraord1in4
+.extraor1di1na
+.extraordin2a2r
+.fa8l8l9i8n8g.
+.1fa
+.fal1l
+.fall2i
+.fal2lin4
+.fe8r8m8i9o8n8s.
+.fer1
+.fer3m4
+.fer4m2io
+.fermio2n
+.fermio2n3s2
+.fi9n8i8t8e9l8y.
+.1fi
+.2fin
+.f2ini
+.fin2it
+.fin2ite
+.finite1ly
+.�9n8i8t8e9l8y.
+.1�
+.2�n
+.�ni
+.�n2it
+.�n2ite
+.�nite1ly
+.fl8a9g8e8l9l8u8m.
+.f4l2
+.flag5el1l
+.fl8a9g8e8l9l8u8m.
+.fl2
+.flag5el1l
+.fl8a9g8e8l9l8a.
+.flag4ella
+.fl8a9g8e8l9l8a.
+.flag4ella
+.fl8a8m9m8a9b8l8e8s.
+.flam1m
+.flam1ma
+.flam2mab
+.flammab2l2
+.flammables2
+.fl8a8m9m8a9b8l8e8s.
+.flam1m
+.flam1ma
+.flam2mab
+.flammab2l2
+.flammables2
+.fl8e8d8g9l8i8n8g.
+.fledgl2
+.fl8e8d8g9l8i8n8g.
+.fledgl2
+.fl8o8w9c8h8a8r8t.
+.flow2ch
+.flowch2a2r
+.fl8o8w9c8h8a8r8t.
+.flow2ch
+.flowch2a2r
+.fl8o8w9c8h8a8r8t8s.
+.flowchar4t1s2
+.fl8o8w9c8h8a8r8t8s.
+.flowchar4t1s2
+.fl8u8o8r8o9c8a8r9b8o8n.
+.flu3o
+.fluo3r
+.fluor2oc
+.fluoro1ca
+.fluoroc2a2r
+.fluorocar1b
+.fluorocarb4o
+.fluorocarbo2n
+.fl8u8o8r8o9c8a8r9b8o8n.
+.flu3o
+.fluo3r
+.fluor2oc
+.fluoro1ca
+.fluoroc2a2r
+.fluorocar1b
+.fluorocarb4o
+.fluorocarbo2n
+.fo8r9m8i9d8a9b8l8e.
+.for2mi
+.formi1d4a
+.form2id
+.formi2d3a4b
+.formidab2l2
+.fo8r9m8i9d8a9b8l8y.
+.formidab1ly
+.fo8r9s8y8t8h9i8a.
+.fo4rs2
+.fors4y
+.forsyth2i1a
+.fo8r8t8h9r8i8g8h8t.
+.fort4hr4
+.forthr2ig
+.fr8e8e9l8o8a8d8e8r.
+.freel4oa
+.freeloa2d3
+.fr8e8e9l8o8a8d8e8r8s.
+.freeloade4r5s2
+.fr8i8e8n8d9l8i8e8r.
+.fri2
+.fr2ie4
+.fr2ie4ndl2ie4
+.fr8i9v8o8l9i8t8y.
+.fr2iv
+.frivol2i
+.frivol1it
+.frivoli1ty
+.fr8i9v8o8l9i9t8i8e8s.
+.frivoli1ti
+.frivolit2ie4
+.fr8i8v9o9l8o8u8s.
+.frivolou2
+.frivolo2us
+.ga9l8a8c9t8i8c.
+.gala2c1t
+.ga8l9a8x8y.
+.ga8l9a8x9i8e8s.
+.galax3i
+.galax2ie4
+.ga8s9o8m9e9t8e8r.
+.ga1so
+.ga3som
+.gaso2me
+.gaso4met
+.gasome1te
+.ge9o9d8e8s9i8c.
+.geodes2
+.geode1si
+.geode2sic
+.ge9o9d8e8t9i8c.
+.geode1t
+.geodet1ic
+.ge8o9m8e8t9r8i8c.
+.ge3om
+.geo2me
+.geo4met
+.geom4etr
+.geo5met3ric
+.ge8o9m8e8t9r8i8c8s.
+.geome4tri4c3s2
+.ge9o9s8t8r8o8p8h8i8c.
+.geos4
+.geost4r
+.geostr2oph
+.geostroph1ic
+.ge8o9t8h8e8r9m8a8l.
+.ge4ot
+.ge4oth
+.geoth2e
+.geother3m4
+.geother1ma
+.ge9o8t9r8o9p8i8s8m.
+.geotropi2s1m
+.gn8o9m8o8n.
+.g1no
+.gno4mo
+.gno4mo2n
+.gn8o9m8o8n8s.
+.gnomo2n3s2
+.gr8a8n8d9u8n8c8l8e.
+.1gr
+.gra2n2
+.gr4and
+.gran1du
+.grandu4n
+.grandun1c4l4
+.gr8a8n8d9u8n8c8l8e8s.
+.granduncles2
+.gr8i8e8v9a8n8c8e.
+.gr2ie4
+.grie1va
+.grieva2n
+.gr8i8e8v9a8n8c8e8s.
+.gr8i8e8v9o8u8s.
+.grievou2
+.grievo2us
+.gr8i8e8v9o8u8s9l8y.
+.grievous1l2
+.grievous1ly
+.ha8i8r9s8t8y8l8e.
+.hai2
+.ha4ir
+.hai4rs2
+.hairs2ty
+.hairs2tyl
+.ha8i8r9s8t8y8l8e8s.
+.hairstyles2
+.ha8i8r9s8t8y8l9i8s8t.
+.ha8i8r9s8t8y8l9i8s8t8s.
+.hairstylis4t1s2
+.ha8l8f9s8p8a8c8e.
+.ha2lf
+.hal2f3s
+.half2s1pa
+.halfspa4ce
+.ha8l8f9s8p8a8c8e8s.
+.ha8l8f9w8a8y.
+.ha8r9b8i8n9g8e8r.
+.h2a2r
+.har1b
+.harbi2
+.har2bin
+.harb4inge
+.ha8r9b8i8n9g8e8r8s.
+.harbinge4r1s2
+.ha8r9l8e9q8u8i8n.
+.har4le4
+.har1l
+.harle1q
+.harlequ2
+.harleq2ui2
+.harlequi4n
+.ha8r9l8e9q8u8i8n8s.
+.harlequ2i2n1s2
+.ha8t8c8h9e8r8i8e8s.
+.ha4tc
+.hat4ch
+.hatche2
+.hatcher1i
+.hatcher2ie4
+.he8m8i9d8e8m8i9s8e8m8i9q8u8a9v8e8r.
+.hem2id
+.hemid4em
+.hemide4m2is
+.hemidem4ise
+.hemidemisemi3qua
+.hemidemisemiqu2
+.hemidemisemiqua5v4
+.he8m8i9d8e8m8i9s8e8m8i9q8u8a9v8e8r8s.
+.hemidemisemiquave4r1s2
+.he9m8o9g8l8o9b8i8n.
+.hemo4g
+.he1mo
+.hemo4gl2
+.hemo3glo
+.hemoglo1bi
+.hemoglo2bin
+.he9m8o9p8h8i8l9i8a.
+.hem2oph
+.hemoph4il2
+.hemophil1i
+.hemophil3i1a
+.he9m8o9p8h8i8l9i8a8c.
+.he9m8o9p8h8i8l9i8a8c8s.
+.hemophilia4c3s2
+.he8m8o9r8h8e9o8l9o8g8y.
+.hemo2r
+.hemorh4
+.hemorhe3ol
+.hemorheol1o1gy
+.he9p8a8t9i8c.
+.hep5
+.he2pa
+.hepat1ic
+.he8r9m8a8p8h9r8o9d8i8t8e.
+.her3m4
+.her1ma
+.her4map
+.hermap4hr4
+.hermaphrod2ite
+.he8r9m8a8p8h9r8o9d8i8t9i8c.
+.hermaphrod2i1ti
+.hermaphrod4i2tic
+.he9r8o8e8s.
+.hero4e
+.he8x8a9d8e8c9i9m8a8l.
+.hex1a
+.hexa2d
+.hexade1c2i
+.hexade2c3im
+.hexadeci1ma
+.ho9l8o9n8o9m8y.
+.holo2n
+.holon3o3my
+.ho9m8e8o9m8o8r9p8h8i8c.
+.ho2me3
+.homeo1mo
+.homeomo2r
+.homeomor1p
+.homeomorp4h4
+.homeomorph1ic
+.ho9m8e8o9m8o8r9p8h8i8s8m.
+.homeomorphi2s1m
+.ho9m8o9t8h8e8t8i8c.
+.ho1mo
+.hom4oth3
+.homoth2e
+.homo3the4t
+.homothet1ic
+.ho8r8s8e9r8a8d9i8s8h.
+.hor4se
+.ho4rs2
+.horser1a
+.horsera2d
+.horser2adi
+.horseradis1
+.horseradis2h
+.ho8t9b8e8d.
+.ho2t1b
+.hot4be2d
+.ho8t9b8e8d8s.
+.hotbe2d1s2
+.hy9d8r8o9t8h8e8r9m8a8l.
+.hy1d
+.hy1dr
+.hydro4th2e
+.hydr4oth
+.hydrother3m4
+.hydrother1ma
+.hy9p8o9t8h8a8l9a9m8u8s.
+.hy3po
+.hyp4ot
+.hyp4oth
+.hypotha3la
+.hypothala3m
+.hypothala1mu
+.hypothalam2us
+.id8e8a8l8s.
+.ide3a4l
+.idea2l1s2
+.id8e8o9g8r8a8p8h8s.
+.ideo2g
+.ideo1gr
+.ideogra4p4h1s2
+.id8i8o9s8y8n9c8r8a8s8y.
+.i2di
+.i1d3io
+.idi4os
+.idios4y
+.idiosyn1cr
+.idiosyncr2as
+.idios4yncras4y
+.id8i8o9s8y8n9c8r8a9s8i8e8s.
+.idiosyncras2ie4
+.id8i8o9s8y8n9c8r8a8t8i8c.
+.idiosyn5crat1ic
+.id8i8o9s8y8n9c8r8a8t9i9c8a8l9l8y.
+.idiosyncrati1ca
+.idiosyncratical1l
+.idiosyncratical1ly
+.ig9n8i8t9e8r.
+.2ig
+.ig1ni
+.ign2it
+.ign2ite
+.ig9n8i8t9e8r8s.
+.ignite4r1s2
+.ig9n8i9t8o8r.
+.ign3itor
+.igni1to
+.ig8n8o8r8e9s8p8a8c8e8s.
+.ig1no
+.ignore1sp
+.ignore2s1pa
+.ignorespa4ce
+.im9p8e8d9a8n8c8e.
+.im2p2ed
+.imp2e2d2a
+.impeda2n
+.im9p8e8d9a8n8c8e8s.
+.in9d8u9b8i9t8a9b8l8e.
+.4ind
+.in1du
+.indu1b4i
+.indubi2t
+.indubi1ta
+.indubi2tab
+.indubitab2l2
+.in9f8i8n9i8t8e9l8y.
+.in3f
+.in1fi
+.in2fin
+.inf2ini
+.infin2it
+.infin2ite
+.infinite1ly
+.in9�8n9i8t8e9l8y.
+.in3�
+.in2�n
+.in�ni
+.in�n2it
+.in�n2ite
+.in�nite1ly
+.in9f8i8n9i9t8e8s9i9m8a8l.
+.infinit4es
+.infinite1si
+.infinite2s5im
+.infinitesi1ma
+.in9�8n9i9t8e8s9i9m8a8l.
+.in�nit4es
+.in�nite1si
+.in�nite2s5im
+.in�nitesi1ma
+.in9f8r8a9s8t8r8u8c9t8u8r8e.
+.infr2as
+.infras1t4r
+.infrastru2c1t
+.infrastructu4r
+.infrastruc1tu
+.infrastruc3ture
+.in9f8r8a9s8t8r8u8c9t8u8r8e8s.
+.in9s8t8a8l8l9e8r.
+.ins2ta2l
+.ins1ta
+.instal1l
+.instal2le
+.in9s8t8a8l8l9e8r8s.
+.installe4r1s2
+.in9t8e8r9d8i8s9c8i9p8l8i9n8a8r8y.
+.in1t
+.in5ter3d
+.interd2i
+.interdis1
+.interd2is1c
+.interdis1ci
+.interdisc2ip
+.interdisci1p2l2
+.interdiscipli4n
+.interdiscipl4i1na
+.interdisciplin2a2r
+.in9t8e8r9g8a9l8a8c9t8i8c.
+.interg2
+.inter1ga
+.intergala2c1t
+.in9u8t8i8l8e.
+.in1u
+.in4u1t2i
+.in9u8t8i8l9i9t8y.
+.inutil1i
+.inut2il1it
+.inutili1ty
+.ir9r8e9d8u8c9i8b8l8e.
+.ir2r2ed
+.irre1du
+.irredu2c
+.irreduci4b
+.irredu1ci
+.irreduci1b2l2
+.ir9r8e9d8u8c9i8b8l8y.
+.irreducib1ly
+.ir9r8e8v9o9c8a9b8l8e.
+.irrev2
+.irre5voc
+.irrevo1ca
+.irrevoca1b2l2
+.is8o8t9r8o8p8y.
+.i2so
+.isotropy5
+.is8o9t8r8o8p9i8c.
+.isotrop3ic
+.it8i8n9e8r9a8r8y.
+.i1ti
+.i2t1in
+.it2ine
+.itin4er4a2r
+.itin1er
+.itiner1a
+.it8i8n9e8r9a8r9i8e8s.
+.itinerar1i
+.itinerar2ie4
+.je9r8e9m8i9a8d8s.
+.1je
+.jerem2i3a
+.jeremia2d
+.jeremia2d1s2
+.ke8y9n8o8t8e.
+.ke8y9n8o8t8e8s.
+.keyno4tes
+.ke8y9s8t8r8o8k8e.
+.keys4
+.keys1t
+.keyst4r
+.keystr2ok2
+.ke8y9s8t8r8o8k8e8s.
+.keystrokes4
+.ki8l8n9i8n8g.
+.k1i
+.k4i2l1n2
+.kiln1in
+.kilnin4g
+.la8c9i9e8s8t.
+.l4a2ci4
+.la3c2ie4
+.laci1est
+.la8m9e8n9t8a9b8l8e.
+.la1men
+.la3men1t
+.lamen2ta4b
+.lamen1ta
+.lamentab2l2
+.la8n8d9s8c8a8p9e8r.
+.3l4and
+.la2n
+.lan2d1s2
+.landsca4p
+.lands1ca
+.landsca5per
+.la8n8d9s8c8a8p9e8r8s.
+.landscape4r1s2
+.la8r9c8e9n8y.
+.l2a2r
+.lar1c
+.lar2ce
+.lar1cen4
+.la8r9c8e9n9i8s8t.
+.lar4ceni
+.le8a8f9h8o8p9p8e8r.
+.le2a
+.lea2f
+.lea4fh
+.leafho4p1p
+.leafhop2pe
+.leafhop3per
+.le8a8f9h8o8p9p8e8r8s.
+.leafhoppe4r1s2
+.le8t9t8e8r9s8p8a8c9i8n8g.
+.le4t3t2
+.lette4r1s2
+.letter1sp
+.letter2s1pa
+.lettersp4a2ci
+.letterspa2c1in
+.letterspac1ing
+.li8f8e9s8p8a8n.
+.life1sp
+.life2s1pa
+.lifespa4n
+.li8f8e9s8p8a8n8s.
+.lifespa2n1s2
+.li8f8e9s8t8y8l8e.
+.lifes2ty
+.lifes2tyl
+.li8f8e9s8t8y8l8e8s.
+.lifestyles2
+.li8g8h8t9w8e8i8g8h8t.
+.3ligh
+.lightw4
+.lightwei2
+.l2ightwe2ig2
+.li8m9o8u9s8i8n8e8s.
+.li4mo
+.li3mo2us
+.limou2
+.limou2s1in
+.limous2ine
+.limousi1nes
+.li8n8e9b8a8c8k8e8r.
+.1l4ine
+.lin2e2b
+.lineback1
+.lineback1er
+.li8n8e9s8p8a8c8i8n8g.
+.li1nes
+.li4ne1sp
+.line2s1pa
+.linesp4a2ci
+.linespa2c1in
+.linespac1ing
+.li9o8n9e8s8s.
+.lio2n
+.lio1nes
+.lion2e2ss
+.li8t8h9o9g8r8a8p8h8e8d.
+.l2ith
+.litho4g
+.litho1gr
+.lithograph4ed
+.li8t8h9o9g8r8a8p8h8s.
+.lithogra4p4h1s2
+.lo9b8o8t9o8m8y.
+.lobo4to
+.loboto3my
+.lo9b8o8t9o8m9i8z8e.
+.lobotom2iz
+.lobotomi2ze
+.lo8g8e8s.
+.lo1ge
+.lo8n8g9e8s8t.
+.5long
+.lo2n
+.lo9q8u8a8c9i8t8y.
+.lo1q
+.loqu2
+.loquac4
+.loqu4a2ci
+.loqua2c1it
+.loquaci1ty
+.lo8v8e9s8t8r8u8c8k.
+.4lov
+.lov4e2s
+.lov2est4r
+.lovestruc5
+.lovestruck1
+.ma8c8r8o9e8c8o9n8o8m8i8c8s.
+.macro4e
+.macroe1co
+.macroeco2n
+.macroeco3nomic
+.macroeconomi4c3s2
+.ma8l9a9p8r8o8p9i8s8m.
+.malapr2
+.malapropi2s1m
+.ma8l9a9p8r8o8p9i8s8m8s.
+.malaprop4is4m1s2
+.ma8n9s8l8a8u8g8h9t8e8r.
+.ma2n1s2
+.man2s1l2
+.manslaugh3
+.ma8n9u9s8c8r8i8p8t.
+.man2us
+.manusc2
+.manuscri2
+.manuscr2ip
+.manuscri2p1t
+.ma8r9g8i8n9a8l.
+.marg2
+.margi4n
+.margi1na
+.ma8t8h9e9m8a9t8i9c8i8a8n.
+.m4ath3
+.math5em
+.math2e
+.1mathe1ma
+.mathemat1ic
+.mathemat2i1ci
+.mathemati3c2i1a
+.mathematici2a2n
+.ma8t8h9e9m8a9t8i9c8i8a8n8s.
+.mathematicia2n1s2
+.ma8t8t8e8s.
+.mat5te
+.ma4t3t2
+.mat4tes
+.me8d9i8c9a8i8d.
+.2med
+.m4edi
+.med3i1ca
+.medicai2
+.medica2id
+.me8d8i9o8c8r8e.
+.me1d2io
+.mediocre3
+.me8d8i9o8c9r8i9t8i8e8s.
+.medi5ocrit
+.mediocri2
+.medio5cri1ti
+.mediocrit2ie4
+.me8g8a9l8i8t8h.
+.me2g
+.m4egal
+.me1ga
+.me3gal1i
+.megal1it
+.megal2ith
+.me8g8a9l8i8t8h8s.
+.megali2t4h1s2
+.me8t8a9b8o8l9i8c.
+.me4ta
+.me2ta4b
+.metabol3ic
+.metabol2i
+.me9t8a8b9o9l8i8s8m.
+.metaboli2s1m
+.me9t8a8b9o9l8i8s8m8s.
+.metabol4is4m1s2
+.me9t8a8b9o9l8i8t8e.
+.metabo5l2ite
+.metabol1it
+.me9t8a8b9o9l8i8t8e8s.
+.metabolit4es
+.me8t8a9l8a8n9g8u8a8g8e.
+.met3a2l
+.meta5la
+.metala2n
+.metal2ang
+.metalan1gu
+.metalangu4a
+.me8t8a9l8a8n9g8u8a8g8e8s.
+.me8t8a9p8h8o8r9i8c.
+.metapho4r
+.me8t8h9a8n8e.
+.metha2n4
+.me9t8r8o8p9o9l8i8s.
+.m4etr
+.metropol2i
+.me9t8r8o8p9o9l8i8s8e8s.
+.metropol4ise
+.metropolis1e4s
+.me8t9r8o9p8o8l9i9t8a8n.
+.metropol1it
+.metropoli3ta2n
+.metropoli1ta
+.me8t9r8o9p8o8l9i9t8a8n8s.
+.metropolita2n1s2
+.mi8c8r8o9e8c8o9n8o8m8i8c8s.
+.m4i1cr
+.micro4e
+.microe1co
+.microeco2n
+.microeco3nomic
+.microeconomi4c3s2
+.mi9c8r8o9f8i8c8h8e.
+.micro2fi
+.microf4i2ch
+.microfiche2
+.mi9c8r8o9�8c8h8e.
+.micro2�
+.micro�2ch
+.micro�che2
+.mi9c8r8o9f8i8c8h8e8s.
+.microfich1es
+.mi9c8r8o9�8c8h8e8s.
+.micro�ch1es
+.mi8c8r8o9o8r8g8a8n9i8s8m.
+.microo2
+.microorg2
+.microor1ga
+.microorgan5is
+.microorga2n
+.microorgani2s1m
+.mi8c8r8o9o8r8g8a8n9i8s8m8s.
+.microorgan4is4m1s2
+.mi8l8l9a8g8e.
+.m4il1l
+.mi8l9l8i9l8i8t8e8r.
+.mill2i
+.mil4l4i4l
+.millil1i
+.mill2il1it
+.millil2ite
+.mi8m8e8o9g8r8a8p8h8e8d.
+.mimeo2g
+.mimeo1gr
+.mimeograph4ed
+.mi8m8e8o9g8r8a8p8h8s.
+.mimeogra4p4h1s2
+.mi8m9i8c9r8i8e8s.
+.mim1i
+.mim4i1cr
+.mimicri2
+.mimicr2ie4
+.mi8n9i8s.
+.m2ini
+.min1is
+.mi8n8i9s8y8m9p8o9s8i8u8m.
+.minis4y
+.minisy4m1p
+.minisym1pos
+.minisympo5si4u
+.mi8n8i9s8y8m9p8o9s8i8a.
+.minisympos2i1a
+.mi9n8u8t9e8r.
+.m4in1u
+.mi9n8u8t9e8s8t.
+.mi8s9c8h8i8e9v8o8u8s9l8y.
+.m2is1c
+.mis3ch2
+.misch2ie4
+.mischievou2
+.mischievo2us
+.mischievous1l2
+.mischievous1ly
+.mi9s8e8r8s.
+.m4ise
+.mis3er
+.mise4r1s2
+.mi9s8o8g9a9m8y.
+.mi2so
+.miso1ga
+.miso2gam
+.mo8d9e8l9l8i8n8g.
+.mo2d1
+.model1l
+.modell2i
+.model2lin4
+.mo8l9e9c8u8l8e.
+.mole1cu
+.mole4cul
+.molecul4e
+.mo8l9e9c8u8l8e8s.
+.molecules2
+.mo8n9a8r8c8h8s.
+.mo1n1a
+.monar3c
+.mon2a2r
+.monar2ch
+.monarc4h1s2
+.mo8n8e8y9l8e8n9d8e8r.
+.moneylen1de
+.mo8n8e8y9l8e8n9d8e8r8s.
+.moneylende4r5s2
+.mo8n8o9c8h8r8o8m8e.
+.mono2ch4
+.monoc4hr4
+.monochro2me
+.mo8n8o9e8n9e8r9g8e8t8i8c.
+.mo3noe
+.monoen1er
+.monoenerg2
+.monoener3get
+.monoenerget1ic
+.mo8n9o8i8d.
+.monoi2
+.mono2id
+.mo8n8o9p8o8l8e.
+.mo4nop
+.mo8n8o9p8o8l8e8s.
+.monopoles2
+.mo9n8o8p9o8l8y.
+.monopo2ly
+.mo8n8o9s8p8l8i8n8e.
+.monos1p2l2
+.monospli4n
+.monosp1l4ine
+.mo8n8o9s8p8l8i8n8e8s.
+.monospli1nes
+.mo8n8o9s8t8r8o8f8i8c.
+.monos5t
+.monost4r
+.monostro2fi
+.mo8n8o9s8t8r8o8�8c.
+.monostro2�
+.mo9n8o8t9o9n8i8e8s.
+.mono1to
+.mo2noto2n
+.monoton2ie4
+.mo9n8o8t9o9n8o8u8s.
+.mono4tono
+.monoto1nou2
+.monotono2us
+.mo9r8o8n9i8s8m.
+.moro5n4is
+.moro2n
+.moroni2s1m
+.mo8s9q8u8i9t8o.
+.mos2
+.mosqu2
+.mosq2ui2
+.mosqui1to
+.mo8s9q8u8i9t8o8s.
+.mosquitos2
+.mo8s9q8u8i9t8o8e8s.
+.mu8d9r8o8o8m.
+.mu1dr
+.mud1room
+.mudroo2
+.mu8d9r8o8o8m8s.
+.mudroo4m1s2
+.mu8l9t8i9f8a8c9e8t8e8d.
+.5mu4lt
+.mul1ti3
+.multif2
+.multi1fa
+.multifa4ce
+.multifacet4
+.multiface2t1ed
+.mu8l9t8i9p8l8i8c9a8b8l8e.
+.mult2ip
+.multi1p2l2
+.multipli1ca
+.multiplica1b2l2
+.mu8l8t8i9u8s8e8r.
+.multi4u
+.multi2us
+.ne8o9f8i8e8l8d8s.
+.3neo
+.ne5of
+.neo2fi
+.neof2ie4
+.neofie2ld3
+.neofiel2d1s2
+.ne8o9�8e8l8d8s.
+.ne5o2�
+.neo�e4
+.neo�e2ld3
+.neo�el2d1s2
+.ne8o9n8a8z8i.
+.neo2n
+.neo1n1a
+.neona2z1i
+.ne8o9n8a8z8i8s.
+.neonaz4is
+.ne8p8h9e8w8s.
+.nephe4
+.ne8p8h9r8i8t8e.
+.nep4hr4
+.nephr2ite
+.ne8p8h9r8i8t8i8c.
+.nephr4i2t3ic
+.nephri1ti
+.ne8w9e8s8t.
+.ne4w
+.newest3
+.ne8w8s9l8e8t9t8e8r.
+.news4l2
+.news2le
+.newsle4t3t2
+.ne8w8s9l8e8t9t8e8r8s.
+.newslette4r1s2
+.ni8t8r8o9m8e8t8h9a8n8e.
+.n2it
+.ni3tr
+.nitro2me
+.nitro4met
+.nitrometha2n4
+.no9n8a8m8e.
+.no4n
+.no1n1a
+.no8n9a8r9i8t8h9m8e8t9i8c.
+.nonar3i
+.non2a2r
+.nonar2ith
+.nonarit4h1m
+.nonarithmet4
+.nonarithmet1ic
+.no8n9e8m8e8r9g8e8n8c8y.
+.none1me
+.nonemerg2
+.nonemer1gen
+.nonemergen1cy
+.no8n9e8q8u8i9v8a8r8i9a8n8c8e.
+.none2q
+.nonequ2
+.noneq2ui2
+.nonequ2iv3
+.nonequi1va
+.nonequiv2a2r
+.nonequivar1i
+.nonequivar3i2a2n
+.nonequivar2i3a
+.nonequivar4ianc
+.no8n8e9t8h8e9l8e8s8s.
+.noneth2e
+.nonethe1les2
+.nonethe3l2e2ss
+.no8n9e8u8c8l8i8d9e8a8n.
+.non4eu
+.noneu1c4l4
+.noneucl2id
+.noneuclidea2n
+.no8n9i8s8o9m8o8r9p8h8i8c.
+.non5i
+.non1is
+.noni2so
+.noni3som
+.noniso1mo
+.nonisomo2r
+.nonisomor1p
+.nonisomorp4h4
+.nonisomorph1ic
+.no8n9p8s8e8u8d8o9c8o8m9p8a8c8t.
+.non1p4
+.non2p1s2
+.nonp2se
+.nonps4eu
+.nonpseu1do
+.nonpseudo1co
+.nonpseudoco4m1p
+.nonpseudocom1pa
+.nonpseudocompa2c4t
+.no8n9s8m8o8o8t8h.
+.no2n3s2
+.non2s3m
+.nons1mo
+.nonsmoo2
+.nonsmo4oth
+.no8n9u8n8i9f8o8r8m.
+.no3nu4n
+.nonu1ni
+.nonuni1fo
+.nonunifo2r
+.nonunifor1m
+.no8n9u8n8i9f8o8r8m9l8y.
+.nonunifor4m1l
+.nonuniform1ly
+.no8r9e8p9i9n8e8p8h9r8i8n8e.
+.nore5pi2n
+.norep2ine
+.norepinep4hr4
+.norep2inephr2in4e
+.no8t9w8i8t8h9s8t8a8n8d9i8n8g.
+.notw4
+.notwi2
+.notw2ith3
+.notwi2t4h1s2
+.notwith5st4and
+.notwiths1ta
+.notwithsta2n
+.notwithstand1in
+.nu9c8l8e8o9t8i8d8e.
+.nucle3
+.nu1c4l4
+.nucle4ot
+.nucleot2id
+.nu9c8l8e8o9t8i8d8e8s.
+.nucleotide4s2
+.nu8t9c8r8a8c8k9e8r.
+.nu4tc
+.nutcrack1
+.nutcrack1er
+.nu8t9c8r8a8c8k9e8r8s.
+.nutcracke4r1s2
+.oe8r9s8t8e8d8s.
+.o3er
+.oe4r1s2
+.oers4t1ed
+.oerste2d1s2
+.of8f9l8i8n8e.
+.o4f1f
+.off4l2
+.offlin4
+.off1l4ine
+.offl8i8n8e.
+.offl2ine
+.of8f9l8o8a8d.
+.offl4oa
+.offloa2d3
+.offl8o8a8d.
+.offl4oa
+.offloa2d3
+.of8f9l8o8a8d8s.
+.offloa2d1s2
+.offl8o8a8d8s.
+.offloa2d1s2
+.of8f9l8o8a8d8e8d.
+.offloa2d1ed
+.offl8o8a8d8e8d.
+.offloa2d1ed
+.ol8i9g8o8p9o9l8i8s8t.
+.ol2i
+.ol2ig
+.oli2go
+.ol2igopol2i
+.ol8i9g8o8p9o9l8i8s8t8s.
+.oligopolis4t1s2
+.ol8i9g8o8p9o8l8y.
+.oligopo2ly
+.ol8i9g8o8p9o8l9i8e8s.
+.oligopol2ie4
+.op9e8r9a8n8d.
+.op1er
+.3oper1a
+.op4er4and
+.opera2n
+.op9e8r9a8n8d8s.
+.operan2d1s2
+.or8a8n8g9u8t8a8n.
+.ora2n
+.or2ang
+.oran1gu
+.oran4gu4t
+.orangu1ta
+.ora2nguta2n
+.or8a8n8g9u8t8a8n8s.
+.oranguta2n1s2
+.or9t8h8o9d8o8n9t8i8s8t.
+.ortho2do4
+.orthodo2n
+.orthodon3t4i
+.orthodon1t
+.or9t8h8o9d8o8n9t8i8s8t8s.
+.orthodontis4t1s2
+.or9t8h8o9k8e8r9a9t8o8l9o8g8y.
+.orth2ok
+.orthok1er
+.orthoker1a
+.orthokera1to
+.orthokeratol1o1gy
+.or8t8h8o9n8i8t8r8o9t8o8l8u8e8n8e.
+.ortho2n
+.orthon2it
+.orthoni3tr
+.orthonitro1to
+.orthonitrotolu3en
+.orthonitrotolu4ene
+.ov8e8r9v8i8e8w.
+.overv2ie4
+.ov8e8r9v8i8e8w8s.
+.ox9i8d9i8c.
+.ox3i
+.oxi5di
+.ox2id
+.pa8d9d8i8n8g.
+.1pa
+.p4a2d
+.pad4d1in
+.pad1d4
+.pa8i8n9l8e8s8s9l8y.
+.p4ai2
+.pa4i4n4
+.pa4i4n1l
+.painles2
+.pain3l2e2ss
+.painles4s1l2
+.painless1ly
+.pa8l9e8t8t8e.
+.p4al
+.p2ale
+.pale4t3t2
+.pa8l9e8t8t8e8s.
+.palet4tes
+.pa8r9a9b8o8l8a.
+.p2a2r
+.pa2rab
+.parabo1la
+.pa8r9a9b8o8l9i8c.
+.parabol3ic
+.parabol2i
+.pa9r8a8b9o9l8o8i8d.
+.paraboloi2
+.parabolo2id
+.pa8r9a9d8i8g8m.
+.para2d
+.par2adi
+.parad2ig
+.paradig1m
+.pa8r9a9d8i8g8m8s.
+.paradig4m1s2
+.pa8r8a9c8h8u8t8e.
+.para2ch
+.parachu4t
+.pa8r8a9c8h8u8t8e8s.
+.pa8r8a9d8i9m8e8t8h8y8l9b8e8n8z8e8n8e.
+.parad4imet
+.paradimethy2l1b
+.paradimethylb4e4n3z
+.paradimethylben2ze
+.paradimethylbenze4n
+.pa8r8a9f8l8u8o8r8o9t8o8l8u8e8n8e.
+.para2f
+.paraf4l2
+.paraflu3o
+.parafluo3r
+.parafluoro1to
+.parafluorotolu3en
+.parafluorotolu4ene
+.pa8r8a9fl8u8o8r8o9t8o8l8u8e8n8e.
+.para2fl2
+.paraflu3o
+.parafluo3r
+.parafluoro1to
+.parafluorotolu3en
+.parafluorotolu4ene
+.pa8r8a9g8r8a8p8h9e8r.
+.para1gr
+.parag5ra3ph4er
+.pa8r8a9l8e9g8a8l.
+.par3al
+.par2ale
+.paral4egal
+.parale1ga
+.pa8r9a8l9l8e8l9i8s8m.
+.paral1l
+.paral2le
+.paral3lel
+.parallel2i
+.paralle2lis
+.paralleli2s1m
+.pa8r8a9m8a8g9n8e8t9i8s8m.
+.par4a1ma
+.param3ag
+.para5mag1n
+.paramagneti2s4m
+.pa8r8a9m8e8d8i8c.
+.para2med
+.param4edi
+.pa8r8a9m8e8t8h8y8l9a8n8i8s8o8l8e.
+.param3et
+.paramethy3la
+.paramethyla2n
+.paramethylani2so
+.pa9r8a8m9e9t8r8i8z8e.
+.param4etr
+.parametri2ze
+.pa8r8a9m8i8l9i9t8a8r8y.
+.par2ami
+.paramil1i
+.param2il1it
+.paramili1ta
+.p2a2ramilit2a2r
+.pa8r8a9m8o8u8n8t.
+.para2mo
+.paramou2
+.paramoun1t
+.pa8t8h9o9g8e8n9i8c.
+.p4ath
+.pat4ho
+.patho4g
+.patho1ge4
+.patho1gen
+.pe8e8v9i8s8h.
+.p4ee
+.pee1vi
+.peevis2h
+.pe8e8v9i8s8h9n8e8s8s.
+.peevis2h1n
+.peevish1nes
+.peevishn2e2ss
+.pe8n9t8a9g8o8n.
+.pen1t
+.pen1ta
+.penta2go
+.pentago2n2
+.pe8n9t8a9g8o8n8s.
+.pentago2n3s2
+.pe9t8r8o9l8e9u8m.
+.petrol4eu
+.ph8e9n8o8m9e9n8o8n.
+.ph4e3no
+.phe2n
+.pheno2me
+.pheno1men
+.ph4enom4eno
+.phenomeno4n
+.ph8e8n8y8l9a8l8a9n8i8n8e.
+.pheny3la
+.phenylala2n
+.phenylala5n2ine
+.phenylalan1in
+.ph8i9l8a8t9e9l8i8s8t.
+.phi4latel2i4
+.philate2lis
+.ph8i9l8a8t9e9l8i8s8t8s.
+.philatelis4t1s2
+.ph8o9n8e8m8e.
+.3phone
+.pho2n
+.phone1me
+.ph8o9n8e8m8e8s.
+.phone2mes
+.ph8o9n8e9m8i8c.
+.phone5mi
+.ph8o8s9p8h8o8r9i8c.
+.phos1p
+.phospho5
+.phospho4r
+.ph8o9t8o9g8r8a8p8h8s.
+.pho1to
+.photo2gr
+.photogra4p4h1s2
+.ph8o9t8o9o8f8f9s8e8t.
+.photoo2
+.photoo4f1f
+.photoof2f3s
+.ph8o9t8o9o8ff9s8e8t.
+.photoo4ff
+.photooff3s
+.pi8c9a9d8o8r.
+.pi1ca
+.pica2d
+.pica1do
+.picad4or
+.pi8c9a9d8o8r8s.
+.picado4rs2
+.pi8p8e9l8i8n8e.
+.p2ip
+.pipe4
+.pipel2i
+.pipe1l4ine
+.pi8p8e9l8i8n8e8s.
+.pipeli1nes
+.pi8p8e9l8i8n9i8n8g.
+.pipel2in3i
+.pipelin1in
+.pipelinin4g
+.pi9r8a9n8h8a8s.
+.p4ir
+.pi1ra
+.pira2n
+.pira4n1h4
+.piranha4
+.pl8a8c8a9b8l8e.
+.1p2l2
+.pla1ca
+.placa1b2l2
+.pl8a8n8t9h8o8p9p8e8r.
+.3pla2n
+.plan1t
+.plantho4p1p
+.planthop2pe
+.planthop3per
+.pl8a8n8t9h8o8p9p8e8r8s.
+.planthoppe4r1s2
+.pl8e8a8s9a8n8c8e.
+.ple2a
+.pleasa2
+.plea3sanc
+.pleasa2n
+.pl8u8g9i8n.
+.plug5in
+.pl8u8g9i8n8s.
+.plu5g4i2n1s2
+.po8l9t8e8r9g8e8i8s8t.
+.po4l2t
+.pol1te
+.polterg2
+.poltergei2
+.po8l8y9e8n8e.
+.po2ly
+.po8l8y9e8t8h9y8l9e8n8e.
+.polye4t
+.po9l8y8g9a9m8i8s8t.
+.poly1ga
+.poly2gam
+.polygam2is
+.po9l8y8g9a9m8i8s8t8s.
+.polygamis4t1s2
+.po8l8y8g9o8n9i9z8a9t8i8o8n.
+.poly1go
+.polygo2n2
+.polygo3ni
+.polygoniza1
+.polygoniza1t2io
+.polygo2nizatio2n
+.po9l8y8p8h9o9n8o8u8s.
+.polypho2n
+.polypho1nou2
+.polyphono2us
+.po8l8y9s8t8y8r8e8n8e.
+.po2lys4
+.polys1t
+.polys2ty
+.po8m8e9g8r8a8n9a8t8e.
+.po2me
+.pome2g
+.pome1gr
+.pomegra2n2
+.pomegra1na
+.pomegran2at
+.po8r8o9e8l8a8s9t8i8c.
+.1p4or
+.poro4e
+.poro4el
+.poroe1la
+.poroelast2i
+.poroelas1tic
+.po8r9o8u8s.
+.porou2
+.poro2us
+.po8r9t8a9b8l8e.
+.por1ta
+.por2tab
+.portab2l2
+.po8s8t9a8m9b8l8e.
+.1pos
+.pos2ta
+.posta4m1b
+.postamb2l2
+.po8s8t9a8m9b8l8e8s.
+.postambles2
+.po8s8t9h8u9m8o8u8s.
+.posthu1mo
+.posthu3mo2us
+.posthumou2
+.po8s8t9s8c8r8i8p8t.
+.pos4t1s2
+.post4sc
+.postscri2
+.postscr2ip
+.postscri2p1t
+.po8s8t9s8c8r8i8p8t8s.
+.pos4t1s2crip4t1s2
+.po8s9t8u8r9a8l.
+.pos1tu
+.postu1ra
+.pr8e9a8m9b8l8e.
+.prea4m1b
+.preamb2l2
+.pr8e9a8m9b8l8e8s.
+.preambles2
+.pr8e9l8o8a8d8e8d.
+.prel4oa
+.preloa2d3
+.preloa2d1ed
+.pr8e9p8a8r9i8n8g.
+.pre2pa
+.prep4a4r1i
+.prep2a2r
+.preparin4g
+.pr8e9p8r8i8n8t.
+.pr2epr2
+.preprin4t3
+.pr8e9p8r8i8n8t8s.
+.preprin4t4s2
+.pr8e9p8r8o8c8e8s9s8o8r.
+.pre3pro
+.prepr2oc
+.prepro1ce
+.preproc2e2ss
+.preproces1so
+.pr8e9p8r8o8c8e8s9s8o8r8s.
+.preprocesso4rs2
+.pr8e9s8p8l8i8t9t8i8n8g.
+.pre1sp
+.pres1p2l2
+.prespl1it
+.prespl4i4t3t2
+.presplit2t1in
+.pr8e9w8r8a8p.
+.prewra4
+.pr8e9w8r8a8p8p8e8d.
+.prewra4p1p
+.prewrap2pe
+.prewrap4p2ed
+.pr8i8e8s8t9e8s8s8e8s.
+.5pr2i4e4
+.pri1est
+.pries4t2e2ss
+.priestess1e4s
+.pr8e8t9t8y9p8r8i8n9t8e8r.
+.pre4t3t2
+.pret1ty
+.pr2ettypr2
+.prettyprin4t3
+.pr8e8t9t8y9p8r8i8n9t8i8n8g.
+.prettyprint2i
+.prettyprin4t3ing
+.prettyprin2t1in
+.pr8o9c8e9d8u8r9a8l.
+.pr2oc
+.pro1ce
+.proce1du
+.procedu1ra
+.pr8o8c8e8s8s.
+.proc2e2ss
+.pr8o9c8u8r9a8n8c8e.
+.procu1ra
+.procura2n
+.pr8o8g9e9n8i8e8s.
+.pro1ge
+.pro1gen
+.proge5n2ie4
+.pr8o8g9e9n8y.
+.pro4geny
+.pr8o9g8r8a8m9m8a8b8l8e.
+.pro1gr
+.program1m
+.program1ma
+.program2mab
+.programmab2l2
+.pr8o8m9i9n8e8n8t.
+.prom4i
+.prom1in
+.prom2ine
+.promi1nen
+.prominen1t
+.pr8o9m8i8s9c8u9o8u8s.
+.prom2is
+.prom2is1c
+.promis1cu
+.promiscu1ou2
+.promiscuo2us
+.pr8o8m9i8s9s8o8r8y.
+.prom4i2s1s
+.promis1so
+.promisso1ry
+.pr8o8m9i8s8e.
+.prom4ise
+.pr8o8m9i8s8e8s.
+.promis1e4s
+.pr8o9p8e8l9l8e8r.
+.pro3pel
+.propel1l
+.propel2le
+.pr8o9p8e8l9l8e8r8s.
+.propelle4r1s2
+.pr8o9p8e8l9l8i8n8g.
+.propell2i
+.propel2lin4
+.pr8o9h8i8b9i9t8i8v8e.
+.pro1h2
+.prohibi2t
+.prohibi1ti
+.prohibi1t2iv
+.pr8o9h8i8b9i9t8i8v8e9l8y.
+.prohibitiv4e1ly
+.pr8o9s8c8i8u8t9t8o.
+.pros2c
+.pros1ci
+.prosci1u
+.prosciu4t3t2
+.prosciut5to
+.pr8o9t8e8s8t9e8r.
+.pro1t
+.pro4tes
+.pr8o9t8e8s8t9e8r8s.
+.proteste4r1s2
+.pr8o9t8e8s9t8o8r.
+.prot4es2to
+.pr8o9t8e8s9t8o8r8s.
+.protesto4rs2
+.pr8o9t8o9l8a8n9g8u8a8g8e.
+.pro1to
+.proto1la
+.proto4la2n
+.protol2ang
+.protolan1gu
+.protolangu4a
+.pr8o9t8o9t8y8p9a8l.
+.proto1ty
+.prototy1pa
+.prototyp4al
+.pr8o8v9i8n8c8e.
+.prov1in
+.prov2inc
+.pr8o8v9i8n8c8e8s.
+.pr8o9v8i8n9c8i8a8l.
+.provin1ci
+.provin3c2i1a
+.provinci2al
+.pr8o8w9e8s8s.
+.prow2e2ss
+.ps8e8u9d8o9d8i8f9f8e8r9e8n9t8i8a8l.
+.2p1s2
+.p2se
+.ps4eu
+.pseu1do
+.pseudod1if
+.pseudodi4f1f
+.pseudodiffer1
+.pseudodiffer3en1t
+.pseudodifferent2i
+.pseudodifferen1t2i1a
+.pseudodifferenti2al
+.ps8e8u9d8o9d8i8ff8e8r9e8n9t8i8a8l.
+.pseudod1i4ff
+.pseudodiffer1
+.pseudodiffer3en1t
+.pseudodifferent2i
+.pseudodifferen1t2i1a
+.pseudodifferenti2al
+.ps8e8u9d8o9f8i9n8i8t8e.
+.pseu2d5of
+.pseudo2fi
+.pseudo2fin
+.pseudof2ini
+.pseudofin2it
+.pseudofin2ite
+.ps8e8u9d8o9�9n8i8t8e.
+.pseu2d5o2�
+.pseudo2�n
+.pseudo�ni
+.pseudo�n2it
+.pseudo�n2ite
+.ps8e8u9d8o9f8i9n8i8t8e9l8y.
+.pseudofinite1ly
+.ps8e8u9d8o9�9n8i8t8e9l8y.
+.pseudo�nite1ly
+.ps8e8u9d8o9f8o8r8c8e8s.
+.pseudo1fo
+.pseudofo2r
+.pseudofor1c
+.pseudofor2ce
+.ps8e8u9d8o8g9r8a9p8h8e8r.
+.pseud4og
+.pseudo1gr
+.pseudog5ra3ph4er
+.ps8e8u9d8o9g8r8o8u8p.
+.pseudo4g4ro
+.pseudogrou2
+.ps8e8u9d8o9g8r8o8u8p8s.
+.2p1s2eudogrou2p1s2
+.ps8e8u9d8o9n8y8m.
+.pseu4do2n
+.pseudonym4
+.ps8e8u9d8o9n8y8m8s.
+.pseudony4m1s2
+.ps8e8u9d8o9w8o8r8d.
+.pseudo4wo2
+.ps8e8u9d8o9w8o8r8d8s.
+.pseudowor2d1s2
+.ps8y9c8h8e9d8e8l9i8c.
+.ps4y
+.p4sy1c
+.psy3ch
+.psych4e2
+.psy4ch4ed
+.psychedel2i
+.ps8y8c8h8s.
+.psyc4h1s2
+.pu9b8e8s9c8e8n8c8e.
+.pub3
+.pub4e
+.pu4bes4
+.pubes2c
+.pubes1cen
+.pubes3cenc
+.qu8a8d9d8i8n8g.
+.qu2
+.qua2d
+.quad4d1in
+.quad1d4
+.qu8a9d8r8a8t9i8c.
+.qua1dr
+.quadrat1ic
+.qu8a9d8r8a8t9i8c8s.
+.quadrati4c3s2
+.qu8a8d9r8a9t8u8r8e.
+.quadra2tu
+.quadra3ture
+.qu8a8d9r8i9p8l8e8g9i8c.
+.quadri2p2l2
+.quadr2ip
+.quadripleg4ic
+.qu8a8i8n8t9e8r.
+.quai2
+.qua4i4n
+.quain1t
+.qu8a8i8n8t9e8s8t.
+.qu8a9s8i9e8q8u8i8v9a9l8e8n8c8e.
+.quas2ie4
+.quasie1q
+.qu2asiequ2
+.quasieq2ui2
+.quasiequ2iv3
+.quasiequi1va
+.quasiequiv2ale
+.quasiequiva3lenc
+.qu8a9s8i9e8q8u8i8v9a9l8e8n8c8e8s.
+.qu8a9s8i9e8q8u8i8v9a9l8e8n8t.
+.quasiequiva1len1t
+.qu8a9s8i9h8y9p8o9n8o8r9m8a8l.
+.quasi3h
+.quasihy3po
+.quasihypo2n
+.quasihyponor1m
+.quasihyponor1ma
+.qu8a9s8i9r8a8d9i9c8a8l.
+.quas4i2r
+.quasi1r5a
+.quasira2d
+.quasir2adi
+.quasirad3i1ca
+.qu8a9s8i9r8e8s8i8d9u8a8l.
+.quasi4res
+.quasire1si
+.quasire2s2id
+.quasiresi2du
+.quasiresid1u1a
+.qu8a9s8i9s8m8o8o8t8h.
+.qua1sis
+.quasi2s1m
+.quasis1mo
+.quasismoo2
+.quasismo4oth
+.qu8a9s8i9s8t8a9t8i8o8n9a8r8y.
+.quasis1ta
+.quasistation5a2r
+.quasista1t2io
+.quasistatio2n
+.quasistatio1n1a
+.qu8a9s8i9t8o8p8o8s.
+.qu5a5si4t
+.quasi1to
+.quasito1pos
+.qu8a9s8i9t8r8i9a8n9g8u9l8a8r.
+.quasi5tr2i3a
+.quasitri2a2n
+.quasitri2ang
+.quasitrian1gu
+.quasitriangu1la
+.quasitriangul2a2r
+.qu8a9s8i9t8r8i8v9i8a8l.
+.quasitr2i4v
+.quasitriv3i
+.quasitriv2i1a
+.quasitrivi2al
+.qu8i8n9t8e8s9s8e8n8c8e.
+.q2ui2
+.qui4n
+.quin1t
+.quin4t2e2ss
+.quintes4senc
+.qu8i8n9t8e8s9s8e8n8c8e8s.
+.qu8i8n9t8e8s9s8e8n9t8i8a8l.
+.quin1tessen1t
+.quintessent2i
+.quintessen1t2i1a
+.quintessenti2al
+.ra8b9b8i8t9r8y.
+.2rab
+.ra2b1b
+.rabbi2t
+.rabbi3tr
+.rabbit5ry
+.ra9d8i9o8g9r8a9p8h8y.
+.ra2d
+.r2adi
+.ra3d2io
+.radio5g
+.radio2gr
+.radio4g3ra1phy
+.ra8f8f9i8s8h.
+.raf5fi
+.ra2f
+.ra4f1f4
+.raf2f5is
+.raffis2h
+.ra8ffi8s8h.
+.raffi
+.raffis
+.raffis2h
+.ra8f8f9i8s8h9l8y.
+.raffis4h1l4
+.raffish1ly
+.ra8ffi8s8h9l8y.
+.raffis4h1l4
+.raffish1ly
+.ra8m9s8h8a8c8k8l8e.
+.ra4m1s2
+.ram4s2h
+.ramshack1
+.ramshack1l
+.ra8v9e8n9o8u8s.
+.rav4e4no
+.rave1nou2
+.raveno2us
+.re9a8r8r8a8n8g8e9m8e8n8t.
+.re5ar1r4
+.re2a2r
+.rearran4ge
+.rearra2n
+.rearr2ang
+.rearrange1me
+.rearrange1men
+.rearrange3men1t
+.re9a8r8r8a8n8g8e9m8e8n8t8s.
+.rearrangemen4t4s2
+.re8c9i9p8r8o8c9i9t8i8e8s.
+.reciproci1ti
+.reciprocit2ie4
+.re8c9t8a8n9g8l8e.
+.rec4ta2n
+.re2c1t
+.rect5ang
+.rec1ta
+.rectan1gl2
+.rectan1gle
+.re8c9t8a8n9g8l8e8s.
+.rectangles2
+.re8c9t8a8n9g8u9l8a8r.
+.rectan1gu
+.rectangu1la
+.rectangul2a2r
+.re9d8i9r8e8c8t.
+.2r2ed
+.r4edi
+.red4ir2
+.redi1re
+.redire2c1t
+.re9d8i9r8e8c8t9i8o8n.
+.redirec1t2io
+.redirectio2n
+.re9d8u8c9i8b8l8e.
+.re1du
+.redu2c
+.reduci4b
+.redu1ci
+.reduci1b2l2
+.re9e8c8h8o.
+.ree2c
+.ree2ch
+.ree3cho2
+.re9p8h8r8a8s8e.
+.rep4hr4
+.rephr2as
+.re9p8h8r8a8s8e8s.
+.rephras1e4s
+.re9p8h8r8a8s8e8d.
+.rephra4s4ed
+.re9p8o9s8i9t8i8o8n.
+.re4posi
+.re1po
+.re1pos
+.repo3s2i1t2io
+.reposi1ti
+.repositio2n
+.re9p8o9s8i9t8i8o8n8s.
+.repositio2n3s2
+.re9p8r8i8n8t.
+.repr2
+.reprin4t3
+.re9p8r8i8n8t8s.
+.reprin4t4s2
+.re9s8t8o8r9a8b8l8e.
+.r4es2to
+.resto2ra
+.resto2rab
+.restorab2l2
+.re8t8r8o9f8i8t.
+.retro2fi
+.re8t8r8o9�8t.
+.retro2�
+.re8t8r8o9f8i8t9t8e8d.
+.retrof4i4t4t2
+.retrofit2t1ed
+.re8t8r8o9�8t9t8e8d.
+.retro�4t4t2
+.retro�t2t1ed
+.re9u8s9a8b8l8e.
+.r4eu2
+.re2us4
+.reusa2
+.reu2s1ab
+.reusab2l2
+.re9u8s8e.
+.re9w8i8r8e.
+.rewi2
+.rew4ir4
+.re9w8r8a8p.
+.rewra4
+.re9w8r8a8p8p8e8d.
+.rewra4p1p
+.rewrap2pe
+.rewrap4p2ed
+.re9w8r8i8t8e.
+.rewri4
+.rewr2ite
+.rh8i9n8o8c9e8r9o8s.
+.rh4
+.rh2i1no
+.rhi4no4c
+.rhino1ce
+.rhinoc2ero
+.ri8g8h8t9e8o8u8s.
+.righ1teo
+.righteou2
+.righteo2us
+.ri8g8h8t9e8o8u8s9n8e8s8s.
+.righteous1n4
+.righteous1nes
+.righteousn2e2ss
+.ri8n8g9l8e8a8d8e8r.
+.rin4g
+.ringl2
+.rin1gle
+.ringle2a
+.ringlea2d1
+.ri8n8g9l8e8a8d8e8r8s.
+.ringleade4r5s2
+.ro9b8o8t.
+.ro9b8o8t8s.
+.robo4t1s2
+.ro9b8o8t8i8c.
+.ro9b8o8t9i8c8s.
+.roboti4c3s2
+.ro8u8n8d9t8a8b8l8e.
+.rou2
+.roun2d
+.round1ta
+.round2tab
+.roundtab2l2
+.ro8u8n8d9t8a8b8l8e8s.
+.roundta5bles2
+.sa8l8e8s9c8l8e8r8k.
+.sa2
+.s2ale
+.sales2
+.sales2c
+.salescle5
+.sales1c4l4
+.sa8l8e8s9c8l8e8r8k8s.
+.salescler4k1s2
+.sa8l8e8s9w8o8m8a8n.
+.sales4w2
+.sale4s1wo2
+.saleswom1
+.saleswo1ma
+.saleswoma2n
+.sa8l8e8s9w8o8m8e8n.
+.saleswo2me
+.saleswo1men
+.sa8l9m8o9n8e8l9l8a.
+.s4a2l4m
+.salmo2n4
+.sal1mo
+.salmon4ella
+.salmonel1l
+.sa8l9t8a9t8i8o8n.
+.sa4l4t
+.sal1ta
+.salta1t2io
+.saltatio2n
+.sa8r9s8a9p8a8r9i8l9l8a.
+.s2a2r
+.sa2r4sa2
+.sa4rs2
+.sars1ap
+.s2a2rsap2a2r4
+.sarsa1pa
+.sarsap4a4r1i
+.sarsaparil1l
+.sa8u8e8r9k8r8a8u8t.
+.sau4
+.sauerkrau4t
+.sc8a8t9o9l8o8g9i9c8a8l.
+.s1ca
+.sca1to
+.scato3log1ic
+.s1catologi1ca
+.sc8h8e8d9u8l9i8n8g.
+.s2ch2
+.sche2
+.s4ch4ed
+.sche4dul
+.sche1du
+.schedul2i
+.schedul3ing
+.sc8h8i8z9o9p8h8r8e8n8i8c.
+.schi2z
+.schi1zo
+.schiz2oph
+.schizop4hr4
+.sc8h8n8a8u9z8e8r.
+.sc2h1n
+.sch1na
+.schn2au
+.schnau2z4e
+.schnauz1er
+.sc8h8o8o8l9c8h8i8l8d.
+.s4cho2
+.schoo2
+.schoo4l1c2
+.s2chool2ch
+.schoolch4il2
+.schoolchi2ld
+.sc8h8o8o8l9c8h8i8l8d9r8e8n.
+.schoolchil3dr
+.schoolchildre4
+.schoolchil5dren
+.sc8h8o8o8l9t8e8a8c8h8e8r.
+.schoo4l2t
+.school1te
+.s2chooltea2ch
+.schoolteache2
+.sc8h8o8o8l9t8e8a8c8h9e8r8s.
+.schoolteach3e4r1s2
+.sc8r8u9t8i9n8y.
+.scru2t1i5n
+.scr4u1t2i
+.scrut4iny
+.sc8y8t8h9i8n8g.
+.s1cy
+.scy3thin
+.se8l8l9e8r.
+.sel2le
+.se8l8l9e8r8s.
+.selle4r1s2
+.se8c9r8e9t8a8r9i8a8t.
+.se1cr
+.se4c3re1ta
+.secret2a2r
+.secretar1i
+.secretar2i3a
+.se8c9r8e9t8a8r9i8a8t8s.
+.secretaria4t1s2
+.se8m9a9p8h8o8r8e.
+.se1ma
+.se4map
+.semapho4r
+.se8m9a9p8h8o8r8e8s.
+.se9m8e8s9t8e8r.
+.4se1me
+.se2mes
+.se8m8i9d8e8f9i9n8i8t8e.
+.sem2id
+.semide1f
+.semidef5i5n2ite
+.semide1fi
+.semide2fin
+.semidef2ini
+.semidefin2it
+.se8m8i9d8e8�9n8i8t8e.
+.semide1�
+.semide�5n2ite
+.semide2�n
+.semide�ni
+.semide�n2it
+.se8m8i9d8i9r8e8c8t.
+.semi2di
+.semid4ir2
+.semidi1re
+.semidire2c1t
+.se8m8i9h8o9m8o9t8h8e8t9i8c.
+.semi3h
+.semiho1mo
+.semihom4oth3
+.semihomoth2e
+.semihomo3the4t
+.semihomothet1ic
+.se8m8i9r8i8n8g.
+.sem4ir
+.semir1i
+.semirin4g
+.se8m8i9r8i8n8g8s.
+.semirings2
+.se8m8i9s8i8m9p8l8e.
+.se4m2is
+.semisi4m1p
+.semisim1p2l2
+.se8m8i9s8k8i8l8l8e8d.
+.sem4is4k2
+.semisk1i
+.semisk4il1l
+.semiskil2le
+.se8r8o9e8p8i9d8e9m8i9o9l8o8g9i9c8a8l.
+.s2er4o
+.sero4e
+.seroep4id
+.seroepi3de
+.seroepid4em
+.seroepidem2io
+.seroepidemi1ol
+.seroepidemio3log1ic
+.seroepidemiologi1ca
+.se8r9v8o9m8e8c8h9a8n8i8s8m.
+.4ser3vo
+.servo2me
+.servome2ch
+.servomech5a5nis
+.servomecha2n
+.servomechani2s1m
+.se8r9v8o9m8e8c8h9a8n8i8s8m8s.
+.servomechan4is4m1s2
+.se8s9q8u8i9p8e9d8a9l8i8a8n.
+.s1e4s
+.sesqu2
+.sesq2ui2
+.sesqu2ip
+.sesquipe4
+.sesqui2p2ed
+.sesquip2e2d2a
+.sesquipedal1i
+.sesquipedal2i1a
+.sesquipedali2a2n
+.se8t9u8p.
+.se1tu
+.se8t9u8p8s.
+.setu2p1s2
+.se9v8e8r8e9l8y.
+.5sev
+.sev1er
+.sev4erel
+.severe1ly
+.sh8a8p8e9a8b8l8e.
+.sha3pe4a
+.shape1a4b
+.shapeab2l2
+.sh8o8e9s8t8r8i8n8g.
+.sho4
+.sho2est4r
+.shoestrin4g
+.sh8o8e9s8t8r8i8n8g8s.
+.shoestrings2
+.si8d8e9s8t8e8p.
+.5side4s2
+.s2id
+.sideste4p
+.si8d8e9s8t8e8p8s.
+.sideste2p1s2
+.si8d8e9s8w8i8p8e.
+.sides4w2
+.sideswi2
+.sidesw2ip
+.sideswipe4
+.sk8y9s8c8r8a8p8e8r.
+.sk2
+.skys4c
+.skyscrap3er
+.sk8y9s8c8r8a8p8e8r8s.
+.skyscrape4r1s2
+.sm8o8k8e9s8t8a8c8k.
+.2s1m
+.s1mo
+.s4m2ok
+.smokes4
+.smokes1ta
+.smokestack1
+.sm8o8k8e9s8t8a8c8k8s.
+.smokestac4k1s2
+.sn8o8r9k8e8l9i8n8g.
+.s1n4
+.snorke5l2i
+.snorke4l3ing
+.so9l8e9n8o8i8d.
+.1so
+.sol4eno
+.solenoi2
+.soleno2id
+.so9l8e9n8o8i8d8s.
+.solenoi2d1s2
+.so8l8u8t8e.
+.so1lut
+.so8l8u8t8e8s.
+.so8v9e8r9e8i8g8n.
+.4sov
+.soverei2
+.sovere2ig2
+.so8v9e8r9e8i8g8n8s.
+.sovereig2n1s2
+.sp8a9c8e8s.
+.2s1pa
+.spa4ce
+.sp8e9c8i8o8u8s.
+.spe2c
+.spe1c2i
+.spec2io
+.speciou2
+.specio2us
+.sp8e8l8l9e8r.
+.spel1l
+.spel2le
+.sp8e8l8l9e8r8s.
+.spelle4r1s2
+.sp8e8l8l9i8n8g.
+.spell2i
+.spel2lin4
+.sp8e9l8u8n8k9e8r.
+.spelu4nk2
+.spelunk1er
+.sp8e8n8d9t8h8r8i8f8t.
+.spen4d
+.spend2th
+.spendt4hr4
+.spendthr4i2ft
+.sp8h8e8r9o8i8d.
+.s2phe
+.3sph4er
+.sph2ero
+.spheroi2
+.sphero2id
+.sp8h8e8r9o8i8d9a8l.
+.spheroi1d2a
+.sp8h8i8n9g8e8s.
+.sph5ing
+.sph4inge
+.sp8i8c9i9l8y.
+.sp2i1ci
+.spici1ly
+.sp8i8n9o8r8s.
+.spi2n
+.sp4i1no
+.spino4rs2
+.sp8o8k8e8s9w8o8m8a8n.
+.sp2ok
+.spokes4
+.spokes4w2
+.spoke4s1wo2
+.spokeswom1
+.spokeswo1ma
+.spokeswoma2n
+.sp8o8k8e8s9w8o8m8e8n.
+.spokeswo2me
+.spokeswo1men
+.sp8o8r8t8s9c8a8s8t.
+.s1p4or4
+.spor4t1s2
+.sport4sc
+.sports1ca
+.sp8o8r8t8s9c8a8s8t9e8r.
+.sportscast5er
+.sp8o8r9t8i8v8e9l8y.
+.spor1ti
+.spor4t2iv
+.sportiv4e1ly
+.sp8o8r8t8s9w8e8a8r.
+.sport4sw2
+.sportswe2a2r
+.sp8o8r8t8s9w8r8i8t8e8r.
+.sportswri4
+.sportswr2ite
+.sp8o8r8t8s9w8r8i8t8e8r8s.
+.sportswrit5e4r1s2
+.sp8r8i8g8h8t9l8i8e8r.
+.spr2
+.spr2ig
+.sprigh2tl
+.sprightl2ie4
+.sq8u8e8a9m8i8s8h.
+.squ2
+.squeam2is
+.squeamis2h
+.st8a8n8d9a8l8o8n8e.
+.5st4and
+.sta2n
+.stan1d2a
+.standalo2n
+.st8a8r9t8l8i8n8g.
+.st2a2r
+.star2tl
+.st8a8r9t8l8i8n8g9l8y.
+.startlingl2
+.startling1ly
+.st8a9t8i8s9t8i8c8s.
+.statis1t2i
+.statis1tic
+.statisti4c3s2
+.st8e8a8l8t8h9i8l8y.
+.stea4l
+.stea4lt
+.stealth3i
+.steal4th4il2
+.stealthi1ly
+.st8e8e8p8l8e9c8h8a8s8e.
+.s1tee
+.stee4p1
+.stee1p2l2
+.steeple2ch
+.st8e8r8e8o9g8r8a8p8h9i8c.
+.stere1o
+.stereo2g
+.stereo1gr
+.stereo5graph1ic
+.stereogr4aphi
+.st8o9c8h8a8s9t8i8c.
+.s1to
+.sto2ch4
+.stochast2i
+.stochas1tic
+.st8r8a8n8g8e9n8e8s8s.
+.st4r
+.s1tra
+.stran4ge
+.stra2n
+.str2ang
+.strange4n4e
+.stran1gen
+.strange1nes
+.strangen2e2ss
+.st8r8a8p9h8a8n8g8e8r.
+.straph2an4g
+.straphang5er
+.strapha2n
+.st8r8a8t9a9g8e8m.
+.stra2ta
+.st8r8a8t9a9g8e8m8s.
+.stratage4m1s2
+.st8r8e8t8c8h9i9e8r.
+.stre4tc
+.stret4ch
+.stretch2ie4
+.st8r8i8p9t8e8a8s8e.
+.str2ip
+.stri2p1t
+.strip2te
+.st8r8o8n8g9h8o8l8d.
+.stro2n
+.strongho2l2d
+.st8r8o8n8g9e8s8t.
+.st8u9p8i8d9e8r.
+.s1tu
+.stup4id
+.stupi3de
+.st8u9p8i8d9e8s8t.
+.stupide4s2
+.su8b9d8i8f9f8e8r9e8n9t8i8a8l.
+.1su
+.su4b3
+.su4b1d
+.subd1if
+.subdi4f1f
+.subdiffer1
+.subdiffer3en1t
+.subdifferent2i
+.subdifferen1t2i1a
+.subdifferenti2al
+.su8b9d8i8ff8e8r9e8n9t8i8a8l.
+.subd1i4ff
+.subdiffer1
+.subdiffer3en1t
+.subdifferent2i
+.subdifferen1t2i1a
+.subdifferenti2al
+.su8b9e8x9p8r8e8s9s8i8o8n.
+.sub4e
+.sub1ex3p
+.subexpr2
+.subex3pr2e2ss
+.subexpres1si
+.subexpres1s2io
+.subexpres5sio2n
+.su8b9e8x9p8r8e8s9s8i8o8n8s.
+.subexpressio2n3s2
+.su8m9m8a9b8l8e.
+.su2m
+.sum1m
+.sum1ma
+.sum2mab
+.summab2l2
+.su8p8e8r9e8g8o.
+.su1pe
+.supere1go
+.su8p8e8r9e8g8o8s.
+.supere4gos
+.su9p8r8e8m9a9c8i8s8t.
+.supr2
+.supre4mac
+.supre1ma
+.suprem4a2ci
+.su9p8r8e8m9a9c8i8s8t8s.
+.supremacis4t1s2
+.su8r9v8e8i8l9l8a8n8c8e.
+.su2r
+.surv4e
+.survei2
+.surveil1l
+.surveilla2n
+.sw8i8m9m8i8n8g9l8y.
+.sw2
+.swi2
+.swim1m
+.swimm4ingl2
+.swimm5ing1ly
+.sy8m8p9t8o9m8a8t8i8c.
+.sy4m1p
+.sym2p1t
+.symp1to
+.sympto2ma
+.symptomat1ic
+.sy8n9c8h8r8o9m8e8s8h.
+.syn3c4hr4
+.syn2ch
+.synchro2me
+.synchro2mes
+.synchrom4es2h
+.sy8n9c8h8r8o9n8o8u8s.
+.synchro2n
+.synchro1nou2
+.synchrono2us
+.sy8n9c8h8r8o9t8r8o8n.
+.synchrotro2n
+.ta8f8f9r8a8i8l.
+.4ta2f4
+.ta4f1f4
+.taffr2ai2
+.ta8ff9r8a8i8l.
+.4ta4ff4
+.taffr2ai2
+.ta8l8k9a9t8i8v8e.
+.ta2l
+.4talk
+.talka3
+.talka4t
+.talka1t2iv
+.ta9p8e8s9t8r8y.
+.tap2est4r
+.tape4stry
+.ta9p8e8s9t8r8i8e8s.
+.tapestr2ie4
+.ta8r9p8a8u9l8i8n.
+.t2a2r
+.tar2p
+.tar1pa
+.tarpau4l2
+.tarpaul2i
+.ta8r9p8a8u9l8i8n8s.
+.tarpaul2i2n1s2
+.te9l8e8g9r8a9p8h8e8r.
+.tele1gr
+.teleg5ra3ph4er
+.te9l8e8g9r8a9p8h8e8r8s.
+.telegraphe4r1s2
+.te8l8e9k8i9n8e8t9i8c.
+.teleki4n
+.telek1i
+.telek2ine
+.teleki3net1ic
+.te8l8e9k8i9n8e8t9i8c8s.
+.telekineti4c3s2
+.te8l8e9r8o9b8o8t9i8c8s.
+.te4l1er
+.tel4ero
+.teler5ob
+.teleroboti4c3s2
+.te8l8l9e8r.
+.tel1l
+.tel2le
+.te8l8l9e8r8s.
+.telle4r1s2
+.te8m9p8o9r8a8r9i8l8y.
+.te4m1p
+.tem1p4or
+.tempo1ra
+.tempo4raril
+.tempor2a2r
+.temporar1i
+.temporari1ly
+.te8n9u8r8e.
+.te8s8t9b8e8d.
+.tes2t1b
+.test4be2d
+.te8x8t9w8i8d8t8h.
+.3tex
+.tex1t2
+.textw4
+.textwi2
+.textw2id
+.textwid2th
+.th8a8l9a9m8u8s.
+.tha3la
+.thala3m
+.thala1mu
+.thalam2us
+.th8e8r9m8o9e8l8a8s9t8i8c.
+.th2e
+.ther3m4
+.ther1mo
+.thermo4el
+.thermoe1la
+.thermoelast2i
+.thermoelas1tic
+.ti8m8e9s8t8a8m8p.
+.ti2mes
+.times1ta
+.timesta4m1p
+.ti8m8e9s8t8a8m8p8s.
+.timestam2p1s2
+.to8o8l9k8i8t.
+.too2
+.toolk1i
+.to8o8l9k8i8t8s.
+.toolki4t1s2
+.to8p8o9g8r8a8p8h9i9c8a8l.
+.to5po4g
+.topo1gr
+.topo5graph1ic
+.topogr4aphi
+.topographi1ca
+.to8q8u8e8s.
+.to1q
+.toqu2
+.tr8a8i9t8o8r9o8u8s.
+.1tra
+.tr2ai2
+.trai1to
+.traitorou2
+.traitoro2us
+.tr8a8n8s9c8e8i8v8e8r.
+.tra2n
+.tra2n1s2
+.trans4c
+.tran4s3cei2
+.transce2iv
+.tr8a8n8s9c8e8i8v8e8r8s.
+.transceive4r1s2
+.tr8a8n8s9g8r8e8s8s.
+.tran2s3g
+.trans1gr
+.transgr2e2ss
+.tr8a8n8s9v8e8r9s8a8l.
+.tran4sv
+.transve4r1s2
+.transver1sa2
+.tr8a8n8s9v8e8r9s8a8l8s.
+.transversa2l1s2
+.tr8a8n8s9v8e8s9t8i8t8e.
+.transv4e2s
+.transvest2i
+.transvest2ite
+.tr8a8n8s9v8e8s9t8i8t8e8s.
+.transvestit4es
+.tr8a9v8e8r8s9a9b8l8e.
+.trave4r1s2
+.traver1sa2
+.traver2s1ab
+.traversab2l2
+.tr8a9v8e8r9s8a8l.
+.tr8a9v8e8r9s8a8l8s.
+.traversa2l1s2
+.tr8i9e8t8h8y8l9a8m8i8n8e.
+.tri5et
+.tr2ie4
+.triethy3la
+.triethylam1in
+.triethylam2ine
+.tr8e8a8c8h9e8r8i8e8s.
+.trea2ch
+.treache2
+.treacher1i
+.treacher2ie4
+.tr8o8u9b8a9d8o8u8r.
+.trou2
+.trouba2d
+.trouba1do
+.trou2badou2
+.tu8r9k8e8y.
+.1tu
+.tu8r9k8e8y8s.
+.turkeys4
+.tu8r8n9a8r8o8u8n8d.
+.tur4n2a2r
+.tur1na
+.turnarou2
+.turnaroun2d
+.tu8r8n9a8r8o8u8n8d8s.
+.turnaroun2d1s2
+.ty8p9a8l.
+.1ty
+.ty1pa
+.typ4al
+.un9a8t9t8a8c8h8e8d.
+.un2at4
+.una4t3t2
+.unat1ta
+.unatta2ch
+.unattache2
+.unatta4ch4ed
+.un9e8r8r9i8n8g9l8y.
+.un4er
+.uner4r4
+.unerrin4g
+.unerringl2
+.unerring1ly
+.un9f8r8i8e8n8d9l8y.
+.un3f
+.unfri2
+.unfr2ie4
+.unfrien2d1ly
+.un9f8r8i8e8n8d9l8i9e8r.
+.unfr2ie4ndl2ie4
+.va8g8u8e8r.
+.1va
+.vag4
+.va5guer
+.va2gue
+.va8u8d8e9v8i8l8l8e.
+.vaude1v4
+.vaude2v3i4l
+.vaude1vi
+.vaudevil1l
+.vaudevil2le
+.vi8c9a8r8s.
+.v4ic2a2r
+.vi1ca
+.vica4rs2
+.vi8l9l8a8i8n9e8s8s.
+.2vil
+.vil1l
+.villai2
+.villa4i4n
+.villa2ine
+.villai5n2e2ss
+.villai1nes
+.vi8s9u8a8l.
+.vi3su
+.visu1al
+.vi8s9u8a8l9l8y.
+.visual1l
+.visual1ly
+.vi9v8i8p9a9r8o8u8s.
+.3v2iv
+.viv2i4p
+.vivi1pa
+.vivip2a2r
+.viviparou2
+.viviparo2us
+.vo8i8c8e9p8r8i8n8t.
+.voi4
+.voi3cep
+.voicepr2
+.voiceprin4t3
+.vs8p8a8c8e.
+.v2s1pa
+.vspa4ce
+.wa8d9d8i8n8g.
+.wa2d
+.wad4d1in
+.wad1d4
+.wa8l8l9f8l8o8w8e8r.
+.wal1l
+.wal2lf
+.wallf4l2
+.wallflow1er
+.wa8l8l9fl8o8w8e8r.
+.wal2lfl2
+.wallflow1er
+.wa8l8l9f8l8o8w9e8r8s.
+.wallflowe4r1s2
+.wa8l8l9fl8o8w9e8r8s.
+.wallflowe4r1s2
+.wa8r8m9e8s8t.
+.w2a2r
+.war1m
+.war2me
+.war2mes
+.wa8s8t8e9w8a8t8e8r.
+.was4t
+.waste2w
+.waste1w5a
+.wastewa1te
+.wa8v8e9g8u8i8d8e.
+.waveg3
+.waveg2ui2
+.wavegu2id
+.wa8v8e9g8u8i8d8e8s.
+.waveguide4s2
+.wa8v8e9l8e8t.
+.wa8v8e9l8e8t8s.
+.wavele4t1s2
+.we8b9l8i8k8e.
+.w2e1b
+.web2l2
+.web3l4ik
+.we8e8k9n8i8g8h8t.
+.weekn2ig
+.we8e8k9n8i8g8h8t8s.
+.weeknigh4t1s2
+.wh8e8e8l9c8h8a8i8r.
+.whee4l1c2
+.wheel2ch
+.wheelchai2
+.wheelcha4ir
+.wh8e8e8l9c8h8a8i8r8s.
+.wheelchai4rs2
+.wh8i8c8h9e8v8e8r.
+.whi4
+.wh4i2ch
+.whiche2
+.whichev1er
+.wh8i8t8e9s8i8d8e8d.
+.wh2ite
+.whit4es
+.white1si
+.white2s2id
+.whitesi2d1ed
+.wh8i8t8e9s8p8a8c8e.
+.white1sp
+.white2s1pa
+.whitespa4ce
+.wh8i8t8e9s8p8a8c8e8s.
+.wi8d8e9s8p8r8e8a8d.
+.w2id
+.wide4s2
+.wide1sp
+.wides4pre
+.widespr2
+.widesprea2d1
+.wi8n8g9s8p8a8n.
+.win4g
+.wings2
+.wing2s1pa
+.wingspa4n
+.wi8n8g9s8p8a8n8s.
+.wingspa2n1s2
+.wi8n8g9s8p8r8e8a8d.
+.wingspr2
+.wingsprea2d1
+.wi8t8c8h9c8r8a8f8t.
+.wi4tc
+.wit4ch
+.witchcra2f4t
+.witchcra2f
+.wo8r8d9s8p8a8c9i8n8g.
+.1wo2
+.wor2d1s2
+.words4p
+.word2s1pa
+.wordsp4a2ci
+.wordspa2c1in
+.wordspac1ing
+.wo8r8k9a8r8o8u8n8d.
+.work2a2r
+.workarou2
+.workaroun2d
+.wo8r8k9a8r8o8u8n8d8s.
+.workaroun2d1s2
+.wo8r8k9h8o8r8s8e.
+.workh4
+.workhor4se
+.workho4rs2
+.wo8r8k9h8o8r8s8e8s.
+.workhors3e4s
+.wr8a8p9a8r8o8u8n8d.
+.wra4
+.wrap2a2r4
+.wra1pa
+.wraparou2
+.wraparoun2d
+.wr8e8t8c8h9e8d.
+.wre4tc
+.wret4ch
+.wretche2
+.wret4ch4ed
+.wr8e8t8c8h9e8d9l8y.
+.wretche2d1ly
+.ye8s9t8e8r9y8e8a8r.
+.yes4
+.yesterye2a2r
+.al9g8e9b8r8a8i9s8c8h8e.
+.algebra2is1c
+.algebrais3ch2
+.algebraische2
+.al9l8e9g8h8e9n8y.
+.al1l
+.al2le
+.al3leg
+.alleghe2n
+.ar9k8a8n9s8a8s.
+.arka2n
+.arkan2sa2
+.arka2n1s2
+.at8p9a8s8e.
+.a4t1p
+.at1pa
+.at8p9a8s8e8s.
+.atpas1e4s
+.au8s9t8r8a8l9a8s8i8a8n.
+.a2us
+.aus1t4r
+.aus1tra
+.australas2i1a
+.australasi2a2n
+.au8t8o9m8a8t8i9s8i8e8r9t8e8r.
+.automa3tis
+.automatis2ie4
+.automatisiert3er
+.be9d8i8e9n8u8n8g.
+.4be2d
+.b4e3di
+.be5di3en
+.bed2ie4
+.bedie3nu4n
+.be8m8b8o.
+.4be5m
+.be4m5b
+.bi8b9l8i9o9g8r8a9p8h8i9s8c8h8e.
+.bibliogr4aphi
+.bibliograph2is1c
+.bibliographis3ch2
+.bibliographische2
+.bo8s9t8o8n.
+.5bos4
+.bos1to
+.bosto2n
+.br8o8w8n9i8a8n.
+.brown5i
+.brow3n4i1a
+.browni3a2n
+.br8u8n8s9w8i8c8k.
+.bru2n
+.bru2n3s4
+.brun4sw2
+.brunswi2
+.brunswick1
+.bu9d8a9p8e8s8t.
+.bu1d2a
+.ca8r9i8b9b8e8a8n.
+.car1i
+.car4ib
+.cari2b1b
+.carib2be
+.caribbea2n
+.ch8a8r8l8e8s9t8o8n.
+.char4le4
+.char1l
+.charles2
+.charl4es2to
+.charle3sto2n
+.ch8a8r9l8o8t8t8e8s9v8i8l8l8e.
+.char3lo4
+.charlo4t3t2
+.charlot4tes
+.charlotte4sv
+.charlottes2vil
+.charlottesvil1l
+.charlottesvil2le
+.co9l8u8m9b8i8a.
+.colum4bi
+.colu4m1b
+.columb2i1a
+.cz8e8c8h8o9s8l8o9v8a9k8i8a.
+.c2ze4
+.cze2ch
+.cze3cho2
+.czechos4l2
+.czechos4lov
+.czechoslo1va
+.czechoslovak1i
+.czechoslovak2i1a
+.de8l9a9w8a8r8e.
+.de1la
+.de4law
+.delaw2a2r
+.di8j8k9s8t8r8a.
+.di3j
+.dij4k1s2
+.dijkst4r
+.dijks1tra
+.du8a8n8e.
+.d1u1a
+.dua2n
+.dy9n8a9m8i9s8c8h8e.
+.5dyn
+.dy1na
+.dynam2is
+.dynam2is1c
+.dynamis3ch2
+.dynamische2
+.en8g9l8i8s8h.
+.engl2
+.englis2h
+.eu8l8e8r9i8a8n.
+.eul4e
+.eu3l4er1i
+.eule1r2i3a4
+.euleri2a2n
+.ev8a8n9s8t8o8n.
+.e1va
+.eva2n
+.evan4st
+.eva2n1s2
+.evans1to
+.evansto2n
+.fe8b9r8u9a8r8y.
+.f2e4b
+.fe3br
+.febru3a
+.febru2a2r
+.fe8s8t9s8c8h8r8i8f8t.
+.fes4t1s2
+.fest4sc
+.fests2ch2
+.festsc4hr4
+.festschr4i2ft
+.fl8o8r9i9d8a.
+.flor2id
+.flori1d2a
+.fl8o8r9i9d8a.
+.flor2id
+.flori1d2a
+.fl8o8r9i9d9i8a8n.
+.flori2di
+.florid5i2a2n
+.flori1d4i3a
+.fl8o8r9i9d9i8a8n.
+.flori2di
+.florid5i2a2n
+.flori1d4i3a
+.fo8r9s8c8h8u8n8g8s9i8n9s8t8i9t8u8t.
+.fors4c
+.fors2ch2
+.forschungs2
+.forschung2s1in
+.forschungs2i2n1s2
+.forschungsinst2i
+.forschungsinsti1tu
+.fr8e8e9b8s8d.
+.fre2e1b
+.free2b5s2
+.freeb4s5d
+.fu8n8k9t8s8i8o8n8a8l.
+.3fu
+.fu4nk2
+.funk5t
+.funk4t1s2
+.funkt1s2io
+.funkt5sio2n
+.funktsio1n5a
+.ga8u8s8s9i8a8n.
+.ga2us
+.gau2ss
+.gaus1si
+.gauss2i1a
+.gaussi2a2n
+.gh8o8s8t9s8c8r8i8p8t.
+.ghos4t1s2
+.ghost4sc
+.ghostscri2
+.ghostscr2ip
+.ghostscri2p1t
+.gh8o8s8t9v8i8e8w.
+.ghos4tv
+.ghostv2ie4
+.gr8a8s8s9m8a8n8n9i8a8n.
+.gr2as
+.gra2ss
+.gras2s1m
+.grass3ma
+.grassma2n3
+.grassma4n1n2
+.grassman3n4i1a
+.grassma2nni3a2n
+.gr8e8i8f8s9w8a8l8d.
+.grei2
+.grei2f3s
+.greifsw2
+.greifswa2ld
+.gr8o8t8h8e8n9d8i8e8c8k.
+.g4ro
+.gro4th2e
+.gr4oth
+.grothe2n
+.grothend2ie4
+.grothendieck1
+.gr8u8n8d9l8e8h9r8e8n.
+.gru2n
+.grundle1h4
+.grundle4hr4
+.ha9d8a9m8a8r8d.
+.ha2d
+.ha1d2a
+.hada2m2
+.had4a1ma
+.hadam2a2r
+.ha8i9f8a.
+.hai1fa
+.ha8m8i8l9t8o8n9i8a8n.
+.ha4m
+.hami4lt
+.hamil1to
+.hamilto2n
+.hamilto3n4i1a
+.hamiltoni3a2n
+.he8l9s8i8n8k8i.
+.he2l1s2
+.hel2s1in
+.hels4i4nk2
+.helsink1i
+.he8r9m8i8t9i8a8n.
+.her3mit
+.hermi1ti
+.herm4i1t2i1a
+.hermiti2a2n
+.hi8b8b8s.
+.hi2b1b
+.hib2b5s2
+.ho8k9k8a8i9d8o.
+.h2ok
+.hokk4
+.hokkai2
+.hokka2id
+.hokkai1do
+.ja8c9k8o8w9s8k8i.
+.5ja
+.jack1
+.jackowsk2
+.jackowsk1i
+.ja8n9u9a8r8y.
+.ja2n
+.jan3u1a
+.janu2a2r
+.ja9p8a9n8e8s8e.
+.ja4p
+.ja1pa
+.japa2n
+.japa1nes
+.japane1s2e
+.ka8d9o8m9t8s8e8v.
+.ka2d
+.ka1do
+.kado4mt
+.kadom4t1s2
+.kadomt5sev
+.ka8n9s8a8s.
+.ka2n
+.kan2sa2
+.ka2n1s2
+.ka8r8l8s9r8u8h8e.
+.k2a2r
+.kar1l
+.kar2l1s2
+.karls1r
+.ko8r9t8e9w8e8g.
+.ko5r
+.kr8i8s8h8n8a.
+.kr2is
+.kr3is2h
+.kris2h1n
+.krish1na
+.kr8i8s8h9n8a9i8s8m.
+.krishnai2
+.krishnai2s1m
+.kr8i8s8h9n8a8n.
+.krishn2a2n
+.la8n9c8a8s9t8e8r.
+.lan1ca
+.lancast5er
+.le9g8e8n8d8r8e.
+.le1gen
+.legen1dr
+.legendre4
+.le8i8c8e8s9t8e8r.
+.lei2
+.le5ic
+.leices5t
+.li8p9s8c8h8i8t8z.
+.l2ip
+.li2p1s2
+.lips2ch2
+.lips3chit
+.lipschi4tz
+.li8p9s8c8h8i8t8z9i8a8n.
+.lipschit2z1i
+.lipschitz2i1a
+.lipschitzi2a2n
+.lo8j9b8a8n.
+.lo5j
+.lojba2n
+.lo8u9i9s8i9a8n8a.
+.lou2
+.lo2ui2
+.louis2i1a
+.louisi2a2n
+.louisia1na
+.ma8c9o8s.
+.ma1co
+.ma8n9c8h8e8s9t8e8r.
+.man2ch
+.manche2
+.manch1es
+.ma8r9k8o8v9i8a8n.
+.marko5vi2a2n
+.markov2i1a
+.ma8r8k8t9o8b8e8r9d8o8r8f.
+.mark5t
+.mark1to
+.markto3b
+.marktober1do
+.marktoberd4or
+.marktoberdor1f
+.ma8s8s9a9c8h8u9s8e8t8t8s.
+.ma2ss
+.mas1sa2
+.massa2ch
+.massach2us
+.massachuse4t3t2
+.massachuset4t1s2
+.ma8x9w8e8l8l.
+.maxwel4l
+.mi9c8r8o9s8o8f8t.
+.micro2so
+.microso2ft3
+.mi8n9n8e9a8p9o9l8i8s.
+.m2i4n1n2
+.minne4
+.minneapol2i
+.mi8n9n8e9s8o8t8a.
+.min1nes
+.minne1so
+.minneso1ta
+.mo8s9c8o8w.
+.mos2c
+.mos1co
+.na8c8h9r8i8c8h8t8e8n.
+.1na
+.na2ch
+.nac4hr4
+.na2chr4i2ch
+.nachricht1en
+.na8s8h9v8i8l8l8e.
+.n4as
+.nas2h
+.nash2vil
+.nashvil1l
+.nashvil2le
+.ne8t9b8s8d.
+.ne2t1b
+.net2b5s2
+.netb4s5d
+.ne8t9s8c8a8p8e.
+.ne4t1s2
+.net4sc
+.netsca4p
+.nets1ca
+.ni8j9m8e9g8e8n.
+.ni3j
+.nijme2g
+.nijme1gen
+.no8e9t8h8e8r9i8a8n.
+.3noe
+.noeth2e
+.noether1i
+.noethe1r2i3a4
+.noetheri2a2n
+.no8o8r8d9w8i8j8k8e8r9h8o8u8t.
+.noo2
+.no3ord
+.noord1w
+.noordwi2
+.noordwi3j
+.noordwijk1er
+.noordwijker1h4
+.noordwijkerhou2
+.no9v8e8m9b8e8r.
+.nove4m5b
+.op8e8n9b8s8d.
+.ope4n1b4
+.open2b5s2
+.openb4s5d
+.op8e8n9o8f8f8i8c8e.
+.op4eno
+.openo4f1f
+.openof1fi
+.op8e8n9o8ffi8c8e.
+.pa8l8a9t8i8n8o.
+.pala2t1in
+.palat2i1no
+.pa9l8e8r9m8o.
+.paler3m4
+.paler1mo
+.pe9t8r8o8v9s8k8i.
+.petro3v
+.petrovsk2
+.petrovsk1i
+.pf8a8f8f9i8a8n.
+.4pf
+.p1fa
+.pfa2f
+.pfa4f1f4
+.pfaf1fi
+.pfaff2i3a
+.pfaffi2a2n
+.pf8a8ffi8a8n.
+.pfaffia2n
+.ph8i8l9a9d8e8l9p8h8i8a.
+.phi4l4ade
+.phila2d
+.philade2lp
+.philadel5phi
+.philadelph2i1a
+.ph8i8l9o9s8o8p8h9i9s8c8h8e.
+.philo2so
+.philos4op
+.philos2oph
+.philosoph2is1c
+.philosophis3ch2
+.philosophische2
+.po8i8n9c8a8r8e.
+.poin2
+.poi2
+.poinc2a2r5
+.poin1ca
+.po9t8e8n9t8i8a8l9g8l8e8i9c8h8u8n8g.
+.p4ot
+.po1ten1t
+.potent2i
+.poten1t2i1a
+.potenti2al
+.potentia4l1g4
+.potentialgl2
+.potential1gle
+.potentialglei2
+.potentialgle5ic
+.potentialgle4i2ch
+.ra9d8h8a9k8r8i8s8h9n8a8n.
+.rad1h2
+.radhakr2is
+.radhakr3is2h
+.radhakris2h1n
+.radhakrish1na
+.radhakrishn2a2n
+.ra8t8h8s9k8e8l9l8e8r.
+.r4ath
+.ra2t4h1s2
+.rathsk2
+.rath4ske
+.rathskel1l
+.rathskel2le
+.ri8e9m8a8n8n9i8a8n.
+.r2ie4
+.rie5ma2n
+.rie1ma
+.riema4n1n2
+.rieman3n4i1a
+.riema2nni3a2n
+.ry8d9b8e8r8g.
+.ry1d
+.ryd1b
+.rydberg2
+.sc8h8o8t9t8i8s8c8h8e.
+.scho4t3t2
+.schott2is1c
+.s2ch2ottis3ch2
+.schottische2
+.sc8h8r8o9d8i8n8g9e8r.
+.sc4hr4
+.schrod1in
+.schrod4inge
+.sc8h8w8a9b8a9c8h8e8r.
+.sch1w
+.s2chwaba2ch
+.schwabache2
+.sc8h8w8a8r8z9s8c8h8i8l8d.
+.schw2a2r
+.s2ch2warzs2ch2
+.schwarzsch4il2
+.schwarzschi2ld
+.se8p9t8e8m9b8e8r.
+.se2p1t
+.sep2te
+.septe4m5b
+.st8o8k8e8s9s8c8h8e.
+.st2ok
+.stokes4
+.stok2e2ss
+.stokes2s5c
+.stokess2ch2
+.stokessche2
+.st8u8t8t9g8a8r8t.
+.stu4t3t2
+.stut4t1g
+.stutt1ga
+.stuttg2a2r
+.su8s9q8u8e9h8a8n9n8a.
+.s2us
+.susqu2
+.susque1h4
+.susqueha2n
+.susqueha4n1n2
+.susquehan1na
+.ta8u9b8e8r9i8a8n.
+.tau4b
+.taub4e
+.tau3ber
+.tauber1i
+.taube1r2i3a4
+.tauberi2a2n
+.te8c8h9n8i9s8c8h8e.
+.te2ch
+.tec2h1n
+.techn2is1c
+.te2chnis3ch2
+.technische2
+.te8n9n8e8s9s8e8e.
+.t4e4n1n2
+.tenne4
+.ten1nes
+.tenn2e2ss
+.to9m8a9s8z8e8w9s8k8i.
+.to2ma
+.tomas2ze
+.tomaszewsk2
+.tomaszewsk1i
+.ty9p8o9g8r8a8p8h8i8q8u8e.
+.ty3po
+.ty5po4g
+.typo1gr
+.typogr4aphi
+.typographiqu2
+.uk8r8a8i8n9i8a8n.
+.4uk
+.ukr2ai2
+.ukra4i4n
+.ukra2ini
+.ukrai4n4i1a
+.ukraini3a2n
+.ve8r9a8l8l9g8e9m8e8i8n9e8r8t8e.
+.veral1l
+.veral4l1g4
+.verallge1me
+.verallgemei2
+.verallgeme2ine
+.verallgemein1er
+.ve8r9e8i8n9i9g8u8n8g.
+.vere3in
+.verei2
+.vere2ini
+.verein2ig
+.vereini3gun
+.ve8r9t8e8i9l8u8n9g8e8n.
+.vertei2
+.verteilun1gen
+.vi8i8i8t8h.
+.v4i5i4
+.v4i5i5i4
+.vii2ith
+.vi8i8t8h.
+.vi2ith
+.wa8h8r9s8c8h8e8i8n9l8i8c8h9k8e8i8t8s9t8h8e8o9r8i8e.
+.wa4hr4
+.wah4rs2
+.wahrs4c
+.wahrs2ch2
+.wahrsche2
+.wahrschei2
+.wahrsche4i4n1l
+.wahrs2cheinl4i2ch
+.wahrscheinlic4hk
+.wahrschei2nlichkei2
+.wahrscheinlichkei4t1s2
+.wahrscheinlichkeits3th2e
+.wahrscheinlichkeitsthe1o5r
+.wahrscheinlichkeitstheor2ie4
+.we8r9n8e8r.
+.w1er
+.wer4n1er
+.we8r9t8h8e8r9i8a8n.
+.werth2e
+.werther1i
+.werthe1r2i3a4
+.wertheri2a2n
+.wi8n9c8h8e8s9t8e8r.
+.win2ch
+.winche2
+.winch1es
+.wi8r8t9s8c8h8a8f8t.
+.w4ir4
+.wir4t1s2
+.wirt4sc
+.wirts2ch2
+.wirtscha2f
+.wirtscha2ft
+.wi8s9s8e8n9s8c8h8a8f8t9l8i8c8h.
+.w4i2s1s
+.wissen4
+.wisse2n1s2
+.wissens4c
+.wissens2ch2
+.wissenscha2f
+.wissenscha2ft
+.wissenschaf2tl
+.wissens2chaftl4i2ch
+.xv8i8i8i8t8h.
+.xv4i5i4
+.xv4i5i5i4
+.xvii2ith
+.xv8i8i8t8h.
+.xvi2ith
+.xx8i8i8i8r8d.
+.xx4
+.xx3i
+.xx4i5i4
+.xx4i5i5i4
+.xxii4ir
+.xx8i8i8n8d.
+.xxi4ind
+.yi8n8g9y8o8n8g.
+.y1i
+.yin2gy
+.yingy1o4
+.yingyo2n
+.sh8u9x8u8e.
+.shux1u3
+.ji9s8u8a8n.
+.ji2su
+.jisua2n
+.ze8a9l8a8n8d.
+.2ze
+.zea4l
+.zea3l4and
+.zeala2n
+.ze8i8t9s8c8h8r8i8f8t.
+.zei2
+.zei4t1s2
+.zeit4sc
+.zeits2ch2
+.zeitsc4hr4
+.zeitschr4i2ft
+.affin9i1ty
+.affin2it
+.affin9ity's
+.daffi9est
+.daffie
+.de9�9ance
+.de�1a
+.de�2a2n
+.de�anc
+.de9�9ance's
+.de9�9an4t
+.de9�9ant1ly
+.de�an2tl
+.de�c8i4t1s2
+.de4�c
+.d5e�1ci
+.de�2c1it
+.de9�l9ing
+.de�l4
+.de�l1i
+.�9ancé
+.�1a
+.�2a2n
+.�anc
+.�9ancé's
+.�9ancée
+.�9ancées
+.�9ancés
+.�l9i9buster
+.�l1i
+.�l2ib
+.�li5bust
+.�lib2us
+.�l9i9buster's
+.�l9i9bus9te2r2ed
+.�libus5tere
+.�l9i9bus9ter9in4g
+.�libus1ter1i
+.�l9i9buste4r1s2
+.�l9i9gree
+.�l2ig
+.�li5gre
+.�li1gr
+.�l9i9gree's
+.�l9i9greed
+.�l9i9gree9ing
+.�ligreei2
+.�l9i9gree2s4
+.�n8der
+.�nd
+.�n1de
+.�n8der's
+.�nd9e4r5s2
+.�n8n1er
+.�4n1n2
+.�nne4
+.�n8ni4er
+.�nn2ie4
+.�n8ni9est
+.�s8ticuff3s
+.�s1t2i
+.�s1tic
+.�st4ic1u
+.�stic4u4ff
+.fluffi9est
+.fluffie
+.fly9lea2f
+.fly
+.flyle2a
+.fly9leaf's
+.fly9leav4e2s
+.flylea2v
+.fly9sheet
+.flys4
+.flys2h
+.fly9speck1
+.flyspe2c
+.fly9speck's
+.fly9speck2ed
+.fly9speck9in4g
+.flyspeck3i
+.fly9spec4k1s2
+.fly9swat9ter
+.flysw2
+.flyswat5te
+.flyswa4t3t2
+.fly9swat9te4r1s2
+.huffi9est
+.huffie
+.iffi9est
+.iffie
+.puffi9est
+.puffie
+.re9�l9ing
+.re3�
+.re�l4
+.re�l1i
+.scruffi9est
+.scruffie
+.spiffi9est
+.spiffie
+.stuffi9est
+.stuffie
+.view�n8der
+.v2ie4
+.view1�
+.view2�n
+.view�nd
+.view�n1de
+.view�n8der's
+.view�nd9e4r5s2
+.affin9ityffis
+.de9�9anceffis
+.�9ancéffis
+.�l9i9busterffis
+.�l9i9greeffis
+.�n8derffis
+.fly9leafffis
+.fly9speckffis
+.view�n8derffis

From fe6d65424be6ae9770f77f7df2cb8b4ba4796b5c Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:14:51 +0100
Subject: [PATCH 131/314] bug 253317 - part 3.1 - build support to install
 hyphenation patterns. r=pike

---
 browser/installer/package-manifest.in |  1 +
 browser/locales/Makefile.in           |  2 +
 intl/Makefile.in                      |  1 +
 intl/locales/Makefile.in              | 61 +++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 intl/locales/Makefile.in

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 0f9eb90600f7..2ddb17d0777f 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -36,6 +36,7 @@
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 @BINPATH@/dictionaries/*
+@BINPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index d60c9a66577e..fed14a12177d 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -186,6 +186,7 @@ libs-%:
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 
@@ -217,6 +218,7 @@ clobber-zip:
 	  $(STAGEDIST)/defaults/pref/firefox-l10n.js
 	$(RM) -rf  $(STAGEDIST)/searchplugins \
 	  $(STAGEDIST)/dictionaries \
+	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD)
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 5b9e3b52d54b..a792d37f0e69 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
   locale \
+  locales \
   lwbrk \
   strres \
   unicharutil \
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
new file mode 100644
index 000000000000..d89ab05aa8e3
--- /dev/null
+++ b/intl/locales/Makefile.in
@@ -0,0 +1,61 @@
+# ***** 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 Hyphenation Component.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jonathan Kew <jfkthame@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 *****
+
+DEPTH          = ../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = intl/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
+
+PATTERN_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hyphenation/*.dic))
+ifneq ($(AB_CD),en-US)
+PATTERN_FILES += $(strip $(wildcard $(LOCALE_SRCDIR)/../en-US/hyphenation/*.dic))
+endif
+
+ifneq (,$(PATTERN_FILES))
+libs::
+	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(PATTERN_FILES) $(DESTDIR)$(mozappdir)/hyphenation
+endif

From 79231d281d28a42f0c78739f17f05a128c97cb17 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:29:45 +0100
Subject: [PATCH 132/314] bug 253317 - part 4 - implement nsHyphenationManager
 and nsHyphenator classes. r=smontagu sr=roc

---
 intl/Makefile.in                              |   1 +
 intl/build/Makefile.in                        |   1 +
 intl/hyphenation/Makefile.in                  |  48 ++++
 intl/hyphenation/public/Makefile.in           |  53 ++++
 .../hyphenation/public/nsHyphenationManager.h |  74 +++++
 intl/hyphenation/public/nsHyphenator.h        |  66 +++++
 intl/hyphenation/src/Makefile.in              |  56 ++++
 intl/hyphenation/src/hnjalloc.h               |  50 ++++
 intl/hyphenation/src/nsHyphenationManager.cpp | 256 ++++++++++++++++++
 intl/hyphenation/src/nsHyphenator.cpp         | 147 ++++++++++
 modules/libpref/src/init/all.js               |   5 +
 11 files changed, 757 insertions(+)
 create mode 100644 intl/hyphenation/Makefile.in
 create mode 100644 intl/hyphenation/public/Makefile.in
 create mode 100644 intl/hyphenation/public/nsHyphenationManager.h
 create mode 100644 intl/hyphenation/public/nsHyphenator.h
 create mode 100644 intl/hyphenation/src/Makefile.in
 create mode 100644 intl/hyphenation/src/hnjalloc.h
 create mode 100644 intl/hyphenation/src/nsHyphenationManager.cpp
 create mode 100644 intl/hyphenation/src/nsHyphenator.cpp

diff --git a/intl/Makefile.in b/intl/Makefile.in
index a792d37f0e69..b7b9c1678557 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -43,6 +43,7 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
+  hyphenation \
   locale \
   locales \
   lwbrk \
diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in
index 3e1189daa1e6..c0b2c77b74d7 100644
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -79,6 +79,7 @@ SHARED_LIBRARY_LIBS = \
 			../strres/src/$(LIB_PREFIX)strres_s.$(LIB_SUFFIX) \
 			../locale/src/$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX) \
 			../locale/src/$(LOCALE_DIR)/$(LIB_PREFIX)platlocale_s.$(LIB_SUFFIX) \
+			../hyphenation/src/$(HYPHENATION_DIR)/$(LIB_PREFIX)hyphenation_s.$(LIB_SUFFIX) \
 			$(NULL)
 
 EXTRA_DSO_LDOPTS = \
diff --git a/intl/hyphenation/Makefile.in b/intl/hyphenation/Makefile.in
new file mode 100644
index 000000000000..009111194e3d
--- /dev/null
+++ b/intl/hyphenation/Makefile.in
@@ -0,0 +1,48 @@
+# ***** 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 Hyphenation Service.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jonathan Kew <jfkthame@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 *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= hyphenation
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk
diff --git a/intl/hyphenation/public/Makefile.in b/intl/hyphenation/public/Makefile.in
new file mode 100644
index 000000000000..cc3843dd8201
--- /dev/null
+++ b/intl/hyphenation/public/Makefile.in
@@ -0,0 +1,53 @@
+# ***** 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 Hyphenation Service.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jonathan Kew <jfkthame@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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= hyphenation
+
+EXPORTS		= \
+		nsHyphenationManager.h \
+		nsHyphenator.h \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/intl/hyphenation/public/nsHyphenationManager.h b/intl/hyphenation/public/nsHyphenationManager.h
new file mode 100644
index 000000000000..9bf98e62f412
--- /dev/null
+++ b/intl/hyphenation/public/nsHyphenationManager.h
@@ -0,0 +1,74 @@
+/* ***** 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 Hyphenation Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@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 nsHyphenationManager_h__
+#define nsHyphenationManager_h__
+
+#include "nsInterfaceHashtable.h"
+#include "nsRefPtrHashtable.h"
+#include "nsHashKeys.h"
+
+class nsHyphenator;
+class nsIAtom;
+
+class nsHyphenationManager
+{
+public:
+  nsHyphenationManager();
+
+  already_AddRefed<nsHyphenator> GetHyphenator(nsIAtom *aLocale);
+
+  static nsHyphenationManager *Instance();
+
+  static void Shutdown();
+
+private:
+  ~nsHyphenationManager();
+
+protected:
+  void LoadPatternList();
+  void LoadPatternListFromDir(nsIFile *aDir);
+  void LoadAliases();
+
+  nsInterfaceHashtable<nsISupportsHashKey,nsIAtom> mHyphAliases;
+  nsInterfaceHashtable<nsISupportsHashKey,nsIFile> mPatternFiles;
+  nsRefPtrHashtable<nsISupportsHashKey,nsHyphenator> mHyphenators;
+
+  static nsHyphenationManager *sInstance;
+};
+
+#endif // nsHyphenationManager_h__
diff --git a/intl/hyphenation/public/nsHyphenator.h b/intl/hyphenation/public/nsHyphenator.h
new file mode 100644
index 000000000000..21983dd56069
--- /dev/null
+++ b/intl/hyphenation/public/nsHyphenator.h
@@ -0,0 +1,66 @@
+/* ***** 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 Hyphenation Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@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 nsHyphenator_h__
+#define nsHyphenator_h__
+
+#include "nsCOMPtr.h"
+#include "nsString.h"
+#include "nsTArray.h"
+
+class nsIUGenCategory;
+
+class nsHyphenator
+{
+public:
+  nsHyphenator(nsIFile *aFile);
+
+  NS_INLINE_DECL_REFCOUNTING(nsHyphenator)
+
+  PRBool IsValid();
+
+  nsresult Hyphenate(const nsAString& aText, nsTArray<PRPackedBool>& aHyphens);
+
+private:
+  ~nsHyphenator();
+
+protected:
+  void                      *mDict;
+  nsCOMPtr<nsIUGenCategory>  mCategories;
+};
+
+#endif // nsHyphenator_h__
diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in
new file mode 100644
index 000000000000..8d0af0b2531e
--- /dev/null
+++ b/intl/hyphenation/src/Makefile.in
@@ -0,0 +1,56 @@
+# ***** 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 Hyphenation Service.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jonathan Kew <jfkthame@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 *****
+
+DEPTH           = ../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE           = hyphenation
+LIBRARY_NAME     = hyphenation_s
+LIBXUL_LIBRARY   = 1
+
+CSRCS            = hyphen.c \
+                   $(NULL)
+
+CPPSRCS          = nsHyphenator.cpp \
+                   nsHyphenationManager.cpp \
+                   $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/intl/hyphenation/src/hnjalloc.h b/intl/hyphenation/src/hnjalloc.h
new file mode 100644
index 000000000000..fe14ff060116
--- /dev/null
+++ b/intl/hyphenation/src/hnjalloc.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * ***** 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 Foundation code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2005-2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@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 ***** */
+
+/*
+ * Simple replacement for hnjalloc.h from libhyphen-2.x, to use moz_x* memory
+ * allocation functions. Note that the hyphen.c code does *NOT* check for
+ * NULL from memory (re)allocation, so it is essential that we use the
+ * "infallible" moz_x* variants here.
+ */
+
+#include "mozilla/mozalloc.h"
+
+#define hnj_malloc(size)      moz_xmalloc(size)
+#define hnj_realloc(p, size)  moz_xrealloc(p, size)
+#define hnj_free(p)           moz_free(p)
+
diff --git a/intl/hyphenation/src/nsHyphenationManager.cpp b/intl/hyphenation/src/nsHyphenationManager.cpp
new file mode 100644
index 000000000000..71878794c4b2
--- /dev/null
+++ b/intl/hyphenation/src/nsHyphenationManager.cpp
@@ -0,0 +1,256 @@
+/* ***** 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 Hyphenation Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@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 "nsHyphenationManager.h"
+#include "nsHyphenator.h"
+#include "nsIAtom.h"
+#include "nsIFile.h"
+#include "nsIProperties.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIDirectoryEnumerator.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsUnicharUtils.h"
+#include "nsIPrefService.h"
+#include "nsIPrefBranch.h"
+
+#define INTL_HYPHENATIONALIAS_PREFIX "intl.hyphenation-alias."
+
+nsHyphenationManager *nsHyphenationManager::sInstance = nsnull;
+
+nsHyphenationManager*
+nsHyphenationManager::Instance()
+{
+  if (sInstance == nsnull) {
+    sInstance = new nsHyphenationManager();
+  }
+  return sInstance;
+}
+
+void
+nsHyphenationManager::Shutdown()
+{
+  delete sInstance;
+}
+
+nsHyphenationManager::nsHyphenationManager()
+{
+  mHyphAliases.Init();
+  mPatternFiles.Init();
+  mHyphenators.Init();
+  LoadPatternList();
+  LoadAliases();
+}
+
+nsHyphenationManager::~nsHyphenationManager()
+{
+  sInstance = nsnull;
+}
+
+already_AddRefed<nsHyphenator>
+nsHyphenationManager::GetHyphenator(nsIAtom *aLocale)
+{
+  nsRefPtr<nsHyphenator> hyph;
+  mHyphenators.Get(aLocale, getter_AddRefs(hyph));
+  if (hyph) {
+    return hyph.forget();
+  }
+  nsCOMPtr<nsIFile> file = mPatternFiles.Get(aLocale);
+  if (!file) {
+    nsCOMPtr<nsIAtom> alias = mHyphAliases.Get(aLocale);
+    if (alias) {
+      mHyphenators.Get(alias, getter_AddRefs(hyph));
+      if (hyph) {
+        return hyph.forget();
+      }
+      file = mPatternFiles.Get(alias);
+      if (file) {
+        aLocale = alias;
+      }
+    }
+    if (!file) {
+      // In the case of a locale such as "de-DE-1996", we try replacing
+      // successive trailing subtags with "-*" to find fallback patterns,
+      // so "de-DE-1996" -> "de-DE-*" (and then recursively -> "de-*")
+      nsAtomCString localeStr(aLocale);
+      if (StringEndsWith(localeStr, NS_LITERAL_CSTRING("-*"))) {
+        localeStr.Truncate(localeStr.Length() - 2);
+      }
+      PRInt32 i = localeStr.RFindChar('-');
+      if (i > 1) {
+        localeStr.Replace(i, localeStr.Length() - i, "-*");
+        nsCOMPtr<nsIAtom> fuzzyLocale = do_GetAtom(localeStr);
+        return GetHyphenator(fuzzyLocale);
+      } else {
+        return nsnull;
+      }
+    }
+  }
+  hyph = new nsHyphenator(file);
+  if (hyph->IsValid()) {
+    mHyphenators.Put(aLocale, hyph);
+    return hyph.forget();
+  }
+#ifdef DEBUG
+  nsCString msg;
+  file->GetNativePath(msg);
+  msg.Insert("failed to load patterns from ", 0);
+  NS_WARNING(msg.get());
+#endif
+  mPatternFiles.Remove(aLocale);
+  return nsnull;
+}
+
+void
+nsHyphenationManager::LoadPatternList()
+{
+  mPatternFiles.Clear();
+  mHyphenators.Clear();
+  
+  nsresult rv;
+  
+  nsCOMPtr<nsIProperties> dirSvc =
+    do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
+  if (!dirSvc) {
+    return;
+  }
+  
+  nsCOMPtr<nsIFile> greDir;
+  rv = dirSvc->Get(NS_GRE_DIR,
+                   NS_GET_IID(nsIFile), getter_AddRefs(greDir));
+  if (NS_SUCCEEDED(rv)) {
+    greDir->AppendNative(NS_LITERAL_CSTRING("hyphenation"));
+    LoadPatternListFromDir(greDir);
+  }
+  
+  nsCOMPtr<nsIFile> appDir;
+  rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR,
+                   NS_GET_IID(nsIFile), getter_AddRefs(appDir));
+  if (NS_SUCCEEDED(rv)) {
+    appDir->AppendNative(NS_LITERAL_CSTRING("hyphenation"));
+    PRBool equals;
+    if (NS_SUCCEEDED(appDir->Equals(greDir, &equals)) && !equals) {
+      LoadPatternListFromDir(appDir);
+    }
+  }
+}
+
+void
+nsHyphenationManager::LoadPatternListFromDir(nsIFile *aDir)
+{
+  nsresult rv;
+  
+  PRBool check = PR_FALSE;
+  rv = aDir->Exists(&check);
+  if (NS_FAILED(rv) || !check) {
+    return;
+  }
+  
+  rv = aDir->IsDirectory(&check);
+  if (NS_FAILED(rv) || !check) {
+    return;
+  }
+
+  nsCOMPtr<nsISimpleEnumerator> e;
+  rv = aDir->GetDirectoryEntries(getter_AddRefs(e));
+  if (NS_FAILED(rv)) {
+    return;
+  }
+  
+  nsCOMPtr<nsIDirectoryEnumerator> files(do_QueryInterface(e));
+  if (!files) {
+    return;
+  }
+  
+  nsCOMPtr<nsIFile> file;
+  while (NS_SUCCEEDED(files->GetNextFile(getter_AddRefs(file))) && file){
+    nsAutoString dictName;
+    file->GetLeafName(dictName);
+    NS_ConvertUTF16toUTF8 locale(dictName);
+    ToLowerCase(locale);
+    if (!StringEndsWith(locale, NS_LITERAL_CSTRING(".dic"))) {
+      continue;
+    }
+    if (StringBeginsWith(locale, NS_LITERAL_CSTRING("hyph_"))) {
+      locale.Cut(0, 5);
+    }
+    locale.SetLength(locale.Length() - 4); // strip ".dic"
+    for (PRUint32 i = 0; i < locale.Length(); ++i) {
+      if (locale[i] == '_') {
+        locale.Replace(i, 1, '-');
+      }
+    }
+#ifdef DEBUG
+    printf("adding hyphenation patterns for %s: %s\n", locale.get(),
+           NS_ConvertUTF16toUTF8(dictName).get());
+#endif
+    nsCOMPtr<nsIAtom> localeAtom = do_GetAtom(locale);
+    mPatternFiles.Put(localeAtom, file);
+  }
+}
+
+void
+nsHyphenationManager::LoadAliases()
+{
+  nsresult rv;
+  nsCOMPtr<nsIPrefBranch> prefBranch =
+    do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
+  if (NS_FAILED(rv)) {
+    return;
+  }
+  PRUint32 prefCount;
+  char **prefNames;
+  rv = prefBranch->GetChildList(INTL_HYPHENATIONALIAS_PREFIX,
+                                &prefCount, &prefNames);
+  if (NS_SUCCEEDED(rv) && prefCount > 0) {
+    for (PRUint32 i = 0; i < prefCount; ++i) {
+      char *prefValue;
+      rv = prefBranch->GetCharPref(prefNames[i], &prefValue);
+      if (NS_SUCCEEDED(rv)) {
+        nsCAutoString alias(prefNames[i]);
+        alias.Cut(0, strlen(INTL_HYPHENATIONALIAS_PREFIX));
+        ToLowerCase(alias);
+        nsCAutoString value(prefValue);
+        ToLowerCase(value);
+        nsCOMPtr<nsIAtom> aliasAtom = do_GetAtom(alias);
+        nsCOMPtr<nsIAtom> valueAtom = do_GetAtom(value);
+        mHyphAliases.Put(aliasAtom, valueAtom);
+        NS_Free(prefValue);
+      }
+    }
+    NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(prefCount, prefNames);
+  }
+}
diff --git a/intl/hyphenation/src/nsHyphenator.cpp b/intl/hyphenation/src/nsHyphenator.cpp
new file mode 100644
index 000000000000..132353bea809
--- /dev/null
+++ b/intl/hyphenation/src/nsHyphenator.cpp
@@ -0,0 +1,147 @@
+/* ***** 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 Hyphenation Service.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jonathan Kew <jfkthame@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 "nsHyphenator.h"
+#include "nsIFile.h"
+#include "nsUTF8Utils.h"
+#include "nsIUGenCategory.h"
+#include "nsUnicharUtilCIID.h"
+
+#include "hyphen.h"
+
+nsHyphenator::nsHyphenator(nsIFile *aFile)
+  : mDict(nsnull)
+{
+  nsCString path;
+  aFile->GetNativePath(path);
+  mDict = hnj_hyphen_load(path.get());
+#ifdef DEBUG
+  if (mDict) {
+    printf("loaded hyphenation patterns from %s\n", path.get());
+  }
+#endif
+  nsresult rv;
+  mCategories =
+    do_GetService(NS_UNICHARCATEGORY_CONTRACTID, &rv);
+  NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get category service");
+}
+
+nsHyphenator::~nsHyphenator()
+{
+  if (mDict != nsnull) {
+    hnj_hyphen_free((HyphenDict*)mDict);
+    mDict = nsnull;
+  }
+}
+
+PRBool
+nsHyphenator::IsValid()
+{
+  return (mDict != nsnull) && (mCategories != nsnull);
+}
+
+nsresult
+nsHyphenator::Hyphenate(const nsAString& aString,
+                        nsTArray<PRPackedBool>& aHyphens)
+{
+  if (!aHyphens.SetLength(aString.Length())) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  memset(aHyphens.Elements(), PR_FALSE, aHyphens.Length());
+
+  PRBool inWord = PR_FALSE;
+  PRUint32 wordStart = 0, wordLimit = 0;
+  for (PRUint32 i = 0; i < aString.Length(); i++) {
+    PRUnichar ch = aString[i];
+
+    nsIUGenCategory::nsUGenCategory cat = mCategories->Get(ch);
+    if (cat == nsIUGenCategory::kLetter || cat == nsIUGenCategory::kMark) {
+      if (!inWord) {
+        inWord = PR_TRUE;
+        wordStart = i;
+      }
+      wordLimit = i + 1;
+      if (i < aString.Length() - 1) {
+        continue;
+      }
+    }
+
+    if (inWord) {
+      NS_ConvertUTF16toUTF8 utf8(aString.BeginReading() + wordStart,
+                                 wordLimit - wordStart);
+      nsAutoTArray<char,200> utf8hyphens;
+      utf8hyphens.SetLength(utf8.Length() + 5);
+      char **rep = nsnull;
+      int *pos = nsnull;
+      int *cut = nsnull;
+      int err = hnj_hyphen_hyphenate2((HyphenDict*)mDict,
+                                      utf8.BeginReading(), utf8.Length(),
+                                      utf8hyphens.Elements(), nsnull,
+                                      &rep, &pos, &cut);
+      if (!err) {
+        PRUint32 utf16offset = wordStart;
+        const char *cp = utf8.BeginReading();
+        while (cp < utf8.EndReading()) {
+          if (UTF8traits::isASCII(*cp)) { // single-byte utf8 char
+            cp++;
+            utf16offset++;
+          } else if (UTF8traits::is2byte(*cp)) { // 2-byte sequence
+            cp += 2;
+            utf16offset++;
+          } else if (UTF8traits::is3byte(*cp)) { // 3-byte sequence
+            cp += 3;
+            utf16offset++;
+          } else { // must be a 4-byte sequence (no need to check validity,
+                   // as this was just created with NS_ConvertUTF16toUTF8)
+            NS_ASSERTION(UTF8traits::is4byte(*cp), "unexpected utf8 byte");
+            cp += 4;
+            utf16offset += 2;
+          }
+          NS_ASSERTION(cp <= utf8.EndReading(), "incomplete utf8 string?");
+          NS_ASSERTION(utf16offset <= aString.Length(), "length mismatch?");
+          if (utf8hyphens[cp - utf8.BeginReading() - 1] & 0x01) {
+            aHyphens[utf16offset - 1] = PR_TRUE;
+          }
+        }
+      }
+    }
+    
+    inWord = PR_FALSE;
+  }
+
+  return NS_OK;
+}
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 9942fdbe627f..c4cbde0ef49a 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1048,6 +1048,11 @@ pref("intl.uidirection.ar", "rtl");
 pref("intl.uidirection.he", "rtl");
 pref("intl.uidirection.fa", "rtl");
 
+// use en-US hyphenation by default for content tagged with plain lang="en"
+pref("intl.hyphenation-alias.en", "en-us");
+// and for other subtags of en-*, if no specific patterns are available
+pref("intl.hyphenation-alias.en-*", "en-us");
+
 pref("font.mathfont-family", "STIXNonUnicode, STIXSizeOneSym, STIXSize1, STIXGeneral, Standard Symbols L, DejaVu Sans, Cambria Math");
 
 // Some CJK fonts have bad underline offset, their CJK character glyphs are overlapped (or adjoined)  to its underline.

From 2b4f983b290b644202c115086635da5f7c1e4d38 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:29:54 +0100
Subject: [PATCH 133/314] bug 253317 - part 6 - reftests for automatic
 hyphenation. r=roc

---
 .../text/auto-hyphenation-1-notref.html       |  9 ++++++
 .../reftests/text/auto-hyphenation-1-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-1.html  | 10 +++++++
 layout/reftests/text/auto-hyphenation-1a.html | 10 +++++++
 .../reftests/text/auto-hyphenation-2-ref.html | 11 ++++++++
 layout/reftests/text/auto-hyphenation-2.html  | 12 ++++++++
 .../reftests/text/auto-hyphenation-3-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-3.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-4-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-4.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-5-ref.html | 28 +++++++++++++++++++
 layout/reftests/text/auto-hyphenation-5.html  | 28 +++++++++++++++++++
 .../reftests/text/auto-hyphenation-6-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-6.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-7-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-7.html  | 10 +++++++
 layout/reftests/text/reftest.list             | 10 +++++++
 17 files changed, 203 insertions(+)
 create mode 100644 layout/reftests/text/auto-hyphenation-1-notref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1a.html
 create mode 100644 layout/reftests/text/auto-hyphenation-2-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-2.html
 create mode 100644 layout/reftests/text/auto-hyphenation-3-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-3.html
 create mode 100644 layout/reftests/text/auto-hyphenation-4-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-4.html
 create mode 100644 layout/reftests/text/auto-hyphenation-5-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-5.html
 create mode 100644 layout/reftests/text/auto-hyphenation-6-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-6.html
 create mode 100644 layout/reftests/text/auto-hyphenation-7-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-7.html

diff --git a/layout/reftests/text/auto-hyphenation-1-notref.html b/layout/reftests/text/auto-hyphenation-1-notref.html
new file mode 100644
index 000000000000..99c4fb38b1e8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1-notref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1-ref.html b/layout/reftests/text/auto-hyphenation-1-ref.html
new file mode 100644
index 000000000000..1049e5e8cf48
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: manual;">
+su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1.html b/layout/reftests/text/auto-hyphenation-1.html
new file mode 100644
index 000000000000..99fdaff6c2f4
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- simple test for automatic hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1a.html b/layout/reftests/text/auto-hyphenation-1a.html
new file mode 100644
index 000000000000..97ee996b4d90
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1a.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- adding random <span>s should not affect hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+super<span>cali</span>frag<span>ili</span>sti<span>cex</span>pialidoc<span>i</span>ous
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-2-ref.html b/layout/reftests/text/auto-hyphenation-2-ref.html
new file mode 100644
index 000000000000..3cf09aa40bf6
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-2-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+<span style="-moz-hyphens:none">supercalifragilisticexpialidocious</span>
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-2.html b/layout/reftests/text/auto-hyphenation-2.html
new file mode 100644
index 000000000000..084c5d3d83a5
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-2.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<!-- mixed languages in a word should inhibit automatic hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+super<span lang="foo">cali</span>fragilisticexpialidocious
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-3-ref.html b/layout/reftests/text/auto-hyphenation-3-ref.html
new file mode 100644
index 000000000000..99c4fb38b1e8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-3-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-3.html b/layout/reftests/text/auto-hyphenation-3.html
new file mode 100644
index 000000000000..a1db92b1b5cb
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-3.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- check that -moz-hyphens:none prevents break at &shy; -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: none;">
+su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-4-ref.html b/layout/reftests/text/auto-hyphenation-4-ref.html
new file mode 100644
index 000000000000..81235c3ce671
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-4-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="x-unknown-language">
+<div style="width: 5em; -moz-hyphens: none;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-4.html b/layout/reftests/text/auto-hyphenation-4.html
new file mode 100644
index 000000000000..37f1a54157ef
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-4.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- check that hyphenation is not applied to unknown language -->
+<body lang="x-unknown-language">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-5-ref.html b/layout/reftests/text/auto-hyphenation-5-ref.html
new file mode 100644
index 000000000000..4c2d539a6b25
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-5-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+div {
+  margin:       10px;
+  width:        10px;
+  font-family:  monospace;
+  -moz-hyphens: manual;
+}
+</style>
+</head>
+<!-- test some hyphenations that involve overlapping patterns -->
+<body lang="en-us">
+<div>
+photo
+</div>
+<div>
+pho&shy;to&shy;graph
+</div>
+<div>
+pho&shy;tog&shy;ra&shy;pher
+</div>
+<div>
+pho&shy;to&shy;graph&shy;i&shy;cal
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text/auto-hyphenation-5.html b/layout/reftests/text/auto-hyphenation-5.html
new file mode 100644
index 000000000000..1330163e14f0
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-5.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+div {
+  margin:       10px;
+  width:        10px;
+  font-family:  monospace;
+  -moz-hyphens: auto;
+}
+</style>
+</head>
+<!-- test some hyphenations that involve overlapping patterns -->
+<body lang="en-us">
+<div>
+photo
+</div>
+<div>
+photograph
+</div>
+<div>
+photographer
+</div>
+<div>
+photographical
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text/auto-hyphenation-6-ref.html b/layout/reftests/text/auto-hyphenation-6-ref.html
new file mode 100644
index 000000000000..b099b46a910c
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-6-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: manual;">
+hy&shy;<span style="color:red">phen&shy;</span>ation
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-6.html b/layout/reftests/text/auto-hyphenation-6.html
new file mode 100644
index 000000000000..d3621f26c7fc
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-6.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- style changes don't break hyphenation -->
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: auto;">
+hy<span style="color:red">phen</span>ation
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-7-ref.html b/layout/reftests/text/auto-hyphenation-7-ref.html
new file mode 100644
index 000000000000..a55eafb54de4
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-7-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: manual;">
+h<span style="color:red">y&shy;phen&shy;a</span>tion
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-7.html b/layout/reftests/text/auto-hyphenation-7.html
new file mode 100644
index 000000000000..201c7f90f5a8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-7.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- style changes don't break hyphenation -->
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: auto;">
+h<span style="color:red">yphena</span>tion
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index bc13945284f0..de97a3f4deff 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -86,3 +86,13 @@ random-if(!cocoaWidget) == 577380.html 577380-ref.html
 HTTP(..) == arabic-shaping-1.html arabic-shaping-1-ref.html
 # check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
 random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.html
+# Tests for hyphenation with -moz-hyphens
+== auto-hyphenation-1.html auto-hyphenation-1-ref.html
+!= auto-hyphenation-1.html auto-hyphenation-1-notref.html
+== auto-hyphenation-1a.html auto-hyphenation-1-ref.html
+== auto-hyphenation-2.html auto-hyphenation-2-ref.html
+== auto-hyphenation-3.html auto-hyphenation-3-ref.html
+== auto-hyphenation-4.html auto-hyphenation-4-ref.html
+== auto-hyphenation-5.html auto-hyphenation-5-ref.html
+== auto-hyphenation-6.html auto-hyphenation-6-ref.html
+== auto-hyphenation-7.html auto-hyphenation-7-ref.html

From 38d1f83dd82528a4a8c8e3ddd94bbfb221d2c5eb Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 15:31:37 +0100
Subject: [PATCH 134/314] Backed out changeset a5877159c9a1 to investigate
 l10n-check orange

---
 browser/installer/package-manifest.in |  1 -
 browser/locales/Makefile.in           |  2 -
 intl/Makefile.in                      |  1 -
 intl/locales/Makefile.in              | 61 ---------------------------
 4 files changed, 65 deletions(-)
 delete mode 100644 intl/locales/Makefile.in

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 2ddb17d0777f..0f9eb90600f7 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -36,7 +36,6 @@
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 @BINPATH@/dictionaries/*
-@BINPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index fed14a12177d..d60c9a66577e 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -186,7 +186,6 @@ libs-%:
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 
@@ -218,7 +217,6 @@ clobber-zip:
 	  $(STAGEDIST)/defaults/pref/firefox-l10n.js
 	$(RM) -rf  $(STAGEDIST)/searchplugins \
 	  $(STAGEDIST)/dictionaries \
-	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD)
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index a792d37f0e69..5b9e3b52d54b 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
   locale \
-  locales \
   lwbrk \
   strres \
   unicharutil \
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
deleted file mode 100644
index d89ab05aa8e3..000000000000
--- a/intl/locales/Makefile.in
+++ /dev/null
@@ -1,61 +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 Hyphenation Component.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2011
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Jonathan Kew <jfkthame@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 *****
-
-DEPTH          = ../..
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = intl/locales
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
-
-PATTERN_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hyphenation/*.dic))
-ifneq ($(AB_CD),en-US)
-PATTERN_FILES += $(strip $(wildcard $(LOCALE_SRCDIR)/../en-US/hyphenation/*.dic))
-endif
-
-ifneq (,$(PATTERN_FILES))
-libs::
-	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(PATTERN_FILES) $(DESTDIR)$(mozappdir)/hyphenation
-endif

From 93d4931d15043930b493bc939580d5ccc33a1d01 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 15:33:03 +0100
Subject: [PATCH 135/314] Backed out changeset cf41ba95de85 because the tests
 will fail without the hyphenation dict

---
 .../text/auto-hyphenation-1-notref.html       |  9 ------
 .../reftests/text/auto-hyphenation-1-ref.html |  9 ------
 layout/reftests/text/auto-hyphenation-1.html  | 10 -------
 layout/reftests/text/auto-hyphenation-1a.html | 10 -------
 .../reftests/text/auto-hyphenation-2-ref.html | 11 --------
 layout/reftests/text/auto-hyphenation-2.html  | 12 --------
 .../reftests/text/auto-hyphenation-3-ref.html |  9 ------
 layout/reftests/text/auto-hyphenation-3.html  | 10 -------
 .../reftests/text/auto-hyphenation-4-ref.html |  9 ------
 layout/reftests/text/auto-hyphenation-4.html  | 10 -------
 .../reftests/text/auto-hyphenation-5-ref.html | 28 -------------------
 layout/reftests/text/auto-hyphenation-5.html  | 28 -------------------
 .../reftests/text/auto-hyphenation-6-ref.html |  9 ------
 layout/reftests/text/auto-hyphenation-6.html  | 10 -------
 .../reftests/text/auto-hyphenation-7-ref.html |  9 ------
 layout/reftests/text/auto-hyphenation-7.html  | 10 -------
 layout/reftests/text/reftest.list             | 10 -------
 17 files changed, 203 deletions(-)
 delete mode 100644 layout/reftests/text/auto-hyphenation-1-notref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-1-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-1.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-1a.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-2-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-2.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-3-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-3.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-4-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-4.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-5-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-5.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-6-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-6.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-7-ref.html
 delete mode 100644 layout/reftests/text/auto-hyphenation-7.html

diff --git a/layout/reftests/text/auto-hyphenation-1-notref.html b/layout/reftests/text/auto-hyphenation-1-notref.html
deleted file mode 100644
index 99c4fb38b1e8..000000000000
--- a/layout/reftests/text/auto-hyphenation-1-notref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 5em;">
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-1-ref.html b/layout/reftests/text/auto-hyphenation-1-ref.html
deleted file mode 100644
index 1049e5e8cf48..000000000000
--- a/layout/reftests/text/auto-hyphenation-1-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: manual;">
-su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-1.html b/layout/reftests/text/auto-hyphenation-1.html
deleted file mode 100644
index 99fdaff6c2f4..000000000000
--- a/layout/reftests/text/auto-hyphenation-1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- simple test for automatic hyphenation -->
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-1a.html b/layout/reftests/text/auto-hyphenation-1a.html
deleted file mode 100644
index 97ee996b4d90..000000000000
--- a/layout/reftests/text/auto-hyphenation-1a.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- adding random <span>s should not affect hyphenation -->
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
-super<span>cali</span>frag<span>ili</span>sti<span>cex</span>pialidoc<span>i</span>ous
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-2-ref.html b/layout/reftests/text/auto-hyphenation-2-ref.html
deleted file mode 100644
index 3cf09aa40bf6..000000000000
--- a/layout/reftests/text/auto-hyphenation-2-ref.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
-supercalifragilisticexpialidocious
-<span style="-moz-hyphens:none">supercalifragilisticexpialidocious</span>
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-2.html b/layout/reftests/text/auto-hyphenation-2.html
deleted file mode 100644
index 084c5d3d83a5..000000000000
--- a/layout/reftests/text/auto-hyphenation-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- mixed languages in a word should inhibit automatic hyphenation -->
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: auto;">
-supercalifragilisticexpialidocious
-super<span lang="foo">cali</span>fragilisticexpialidocious
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-3-ref.html b/layout/reftests/text/auto-hyphenation-3-ref.html
deleted file mode 100644
index 99c4fb38b1e8..000000000000
--- a/layout/reftests/text/auto-hyphenation-3-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 5em;">
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-3.html b/layout/reftests/text/auto-hyphenation-3.html
deleted file mode 100644
index a1db92b1b5cb..000000000000
--- a/layout/reftests/text/auto-hyphenation-3.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- check that -moz-hyphens:none prevents break at &shy; -->
-<body lang="en-us">
-<div style="width: 5em; -moz-hyphens: none;">
-su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-4-ref.html b/layout/reftests/text/auto-hyphenation-4-ref.html
deleted file mode 100644
index 81235c3ce671..000000000000
--- a/layout/reftests/text/auto-hyphenation-4-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="x-unknown-language">
-<div style="width: 5em; -moz-hyphens: none;">
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-4.html b/layout/reftests/text/auto-hyphenation-4.html
deleted file mode 100644
index 37f1a54157ef..000000000000
--- a/layout/reftests/text/auto-hyphenation-4.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- check that hyphenation is not applied to unknown language -->
-<body lang="x-unknown-language">
-<div style="width: 5em; -moz-hyphens: auto;">
-supercalifragilisticexpialidocious
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-5-ref.html b/layout/reftests/text/auto-hyphenation-5-ref.html
deleted file mode 100644
index 4c2d539a6b25..000000000000
--- a/layout/reftests/text/auto-hyphenation-5-ref.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style type="text/css">
-div {
-  margin:       10px;
-  width:        10px;
-  font-family:  monospace;
-  -moz-hyphens: manual;
-}
-</style>
-</head>
-<!-- test some hyphenations that involve overlapping patterns -->
-<body lang="en-us">
-<div>
-photo
-</div>
-<div>
-pho&shy;to&shy;graph
-</div>
-<div>
-pho&shy;tog&shy;ra&shy;pher
-</div>
-<div>
-pho&shy;to&shy;graph&shy;i&shy;cal
-</div>
-</body>
-</html>
diff --git a/layout/reftests/text/auto-hyphenation-5.html b/layout/reftests/text/auto-hyphenation-5.html
deleted file mode 100644
index 1330163e14f0..000000000000
--- a/layout/reftests/text/auto-hyphenation-5.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style type="text/css">
-div {
-  margin:       10px;
-  width:        10px;
-  font-family:  monospace;
-  -moz-hyphens: auto;
-}
-</style>
-</head>
-<!-- test some hyphenations that involve overlapping patterns -->
-<body lang="en-us">
-<div>
-photo
-</div>
-<div>
-photograph
-</div>
-<div>
-photographer
-</div>
-<div>
-photographical
-</div>
-</body>
-</html>
diff --git a/layout/reftests/text/auto-hyphenation-6-ref.html b/layout/reftests/text/auto-hyphenation-6-ref.html
deleted file mode 100644
index b099b46a910c..000000000000
--- a/layout/reftests/text/auto-hyphenation-6-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 0; -moz-hyphens: manual;">
-hy&shy;<span style="color:red">phen&shy;</span>ation
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-6.html b/layout/reftests/text/auto-hyphenation-6.html
deleted file mode 100644
index d3621f26c7fc..000000000000
--- a/layout/reftests/text/auto-hyphenation-6.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- style changes don't break hyphenation -->
-<body lang="en-us">
-<div style="width: 0; -moz-hyphens: auto;">
-hy<span style="color:red">phen</span>ation
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-7-ref.html b/layout/reftests/text/auto-hyphenation-7-ref.html
deleted file mode 100644
index a55eafb54de4..000000000000
--- a/layout/reftests/text/auto-hyphenation-7-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body lang="en-us">
-<div style="width: 0; -moz-hyphens: manual;">
-h<span style="color:red">y&shy;phen&shy;a</span>tion
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/auto-hyphenation-7.html b/layout/reftests/text/auto-hyphenation-7.html
deleted file mode 100644
index 201c7f90f5a8..000000000000
--- a/layout/reftests/text/auto-hyphenation-7.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!-- style changes don't break hyphenation -->
-<body lang="en-us">
-<div style="width: 0; -moz-hyphens: auto;">
-h<span style="color:red">yphena</span>tion
-</div>
-</body>
-</html>
-
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index de97a3f4deff..bc13945284f0 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -86,13 +86,3 @@ random-if(!cocoaWidget) == 577380.html 577380-ref.html
 HTTP(..) == arabic-shaping-1.html arabic-shaping-1-ref.html
 # check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
 random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.html
-# Tests for hyphenation with -moz-hyphens
-== auto-hyphenation-1.html auto-hyphenation-1-ref.html
-!= auto-hyphenation-1.html auto-hyphenation-1-notref.html
-== auto-hyphenation-1a.html auto-hyphenation-1-ref.html
-== auto-hyphenation-2.html auto-hyphenation-2-ref.html
-== auto-hyphenation-3.html auto-hyphenation-3-ref.html
-== auto-hyphenation-4.html auto-hyphenation-4-ref.html
-== auto-hyphenation-5.html auto-hyphenation-5-ref.html
-== auto-hyphenation-6.html auto-hyphenation-6-ref.html
-== auto-hyphenation-7.html auto-hyphenation-7-ref.html

From f9dd3196280bc1a7d01d684345a3e97564a065fb Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Wed, 4 May 2011 17:13:28 +0300
Subject: [PATCH 136/314] Bug 613634, make the 3rd paramater of
 add/removeEventListener optional, r=sicking

--HG--
extra : rebase_source : 9c720d865ed24e5b54cda287360b0fec508df359
---
 content/base/src/nsDocument.cpp               |  4 +-
 content/base/src/nsGenericElement.cpp         |  4 +-
 content/events/src/nsDOMEventTargetHelper.cpp |  6 +-
 content/events/test/Makefile.in               |  1 +
 content/events/test/test_bug613634.html       | 91 +++++++++++++++++++
 dom/base/nsGlobalWindow.cpp                   |  6 +-
 dom/base/nsWindowRoot.cpp                     |  4 +-
 dom/interfaces/events/nsIDOMEventTarget.idl   |  2 +-
 dom/interfaces/events/nsIDOMNSEventTarget.idl |  2 +-
 dom/src/threads/nsDOMWorker.cpp               |  4 +-
 dom/src/threads/nsDOMWorkerMessageHandler.cpp |  4 +-
 dom/src/threads/nsDOMWorkerXHR.cpp            |  2 +-
 12 files changed, 111 insertions(+), 19 deletions(-)
 create mode 100644 content/events/test/test_bug613634.html

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index d4a2f553156c..cdf837319695 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -6292,7 +6292,7 @@ nsDocument::AddEventListener(const nsAString& aType,
                              PRBool aUseCapture, PRBool aWantsUntrusted,
                              PRUint8 optional_argc)
 {
-  NS_ASSERTION(!aWantsUntrusted || optional_argc > 0,
+  NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
                "Won't check if this is chrome, you want to set "
                "aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
                "explicit by making optional_argc non-zero.");
@@ -6303,7 +6303,7 @@ nsDocument::AddEventListener(const nsAString& aType,
   PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
 
   if (aWantsUntrusted ||
-      (optional_argc == 0 && !nsContentUtils::IsChromeDoc(this))) {
+      (optional_argc < 2 && !nsContentUtils::IsChromeDoc(this))) {
     flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
   }
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 5a9b06461688..4e7754f68338 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2085,7 +2085,7 @@ nsDOMEventRTTearoff::AddEventListener(const nsAString& aType,
                                       PRBool aWantsUntrusted,
                                       PRUint8 optional_argc)
 {
-  NS_ASSERTION(!aWantsUntrusted || optional_argc > 0,
+  NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
                "Won't check if this is chrome, you want to set "
                "aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
                "explicit by making optional_argc non-zero.");
@@ -2097,7 +2097,7 @@ nsDOMEventRTTearoff::AddEventListener(const nsAString& aType,
   PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
 
   if (aWantsUntrusted ||
-      (optional_argc == 0 &&
+      (optional_argc < 2 &&
        !nsContentUtils::IsChromeDoc(mNode->GetOwnerDoc()))) {
     flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
   }
diff --git a/content/events/src/nsDOMEventTargetHelper.cpp b/content/events/src/nsDOMEventTargetHelper.cpp
index 836fb18cf8ca..c3ba88ec8ffa 100644
--- a/content/events/src/nsDOMEventTargetHelper.cpp
+++ b/content/events/src/nsDOMEventTargetHelper.cpp
@@ -95,7 +95,7 @@ nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
                                          nsIDOMEventListener* aListener,
                                          PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
@@ -119,7 +119,7 @@ nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
                                          PRBool aWantsUntrusted,
                                          PRUint8 optional_argc)
 {
-  NS_ASSERTION(!aWantsUntrusted || optional_argc > 0,
+  NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
                "Won't check if this is chrome, you want to set "
                "aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
                "explicit by making optional_argc non-zero.");
@@ -128,7 +128,7 @@ nsDOMEventTargetHelper::AddEventListener(const nsAString& aType,
   NS_ENSURE_STATE(elm);
   PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
 
-  if (optional_argc == 0) {
+  if (optional_argc < 2) {
     nsresult rv;
     nsIScriptContext* context = GetContextForEventHandlers(&rv);
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index 6534ff896549..b5e3915359d7 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -97,6 +97,7 @@ _TEST_FILES = \
 		test_bug593959.html \
 		test_bug591815.html \
 		test_bug605242.html \
+		test_bug613634.html \
 		test_bug607464.html \
 		test_bug624127.html \
 		test_bug641477.html \
diff --git a/content/events/test/test_bug613634.html b/content/events/test/test_bug613634.html
new file mode 100644
index 000000000000..7e651ed1a2c9
--- /dev/null
+++ b/content/events/test/test_bug613634.html
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=613634
+-->
+<head>
+  <title>Test for Bug 613634</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=613634">Mozilla Bug 613634</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 613634 **/
+
+var eventCount = 0;
+function l(e) {
+  if (e.eventPhase != Event.CAPTURING_PHASE) {
+    ++eventCount;
+  } else {
+    ok(false, "Listener shouldn't be called!");
+  }
+}
+
+var d1 = document.createElement("div");
+var d2 = document.createElement("div");
+
+d1.appendChild(d2);
+
+var x = new XMLHttpRequest();
+
+try {
+d1.addEventListener("foo", l);
+document.addEventListener("foo", l);
+window.addEventListener("foo", l);
+x.addEventListener("foo", l);
+} catch(ex) {
+  ok(false, "Shouldn't throw " + ex);
+}
+
+var ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+d2.dispatchEvent(ev);
+is(eventCount, 1, "Event listener should have been called!");
+
+ev = document.createEvent("Event");
+ev.initEvent("foo", false, false);
+d2.dispatchEvent(ev);
+is(eventCount, 1, "Event listener shouldn't have been called!");
+
+d1.removeEventListener("foo", l);
+ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+d2.dispatchEvent(ev);
+is(eventCount, 1, "Event listener shouldn't have been called!");
+
+
+ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+document.body.dispatchEvent(ev);
+is(eventCount, 3, "Event listener should have been called on document and window!");
+
+document.removeEventListener("foo", l);
+window.removeEventListener("foo", l, false);
+ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+document.body.dispatchEvent(ev);
+is(eventCount, 3, "Event listener shouldn't have been called on document and window!");
+
+ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+x.dispatchEvent(ev);
+is(eventCount, 4, "Event listener should have been called on XMLHttpRequest!");
+
+x.removeEventListener("foo", l);
+ev = document.createEvent("Event");
+ev.initEvent("foo", true, true);
+x.dispatchEvent(ev);
+is(eventCount, 4, "Event listener shouldn't have been called on XMLHttpRequest!");
+
+</script>
+</pre>
+</body>
+</html>
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 9752b681bd0f..c6b9231969e4 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7080,7 +7080,7 @@ nsGlobalWindow::AddEventListener(const nsAString& aType,
   FORWARD_TO_INNER_CREATE(AddEventListener, (aType, aListener, aUseCapture),
                           NS_ERROR_NOT_AVAILABLE);
 
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
@@ -7174,7 +7174,7 @@ nsGlobalWindow::AddEventListener(const nsAString& aType,
                                  PRBool aUseCapture, PRBool aWantsUntrusted,
                                  PRUint8 optional_argc)
 {
-  NS_ASSERTION(!aWantsUntrusted || optional_argc > 0,
+  NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
                "Won't check if this is chrome, you want to set "
                "aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
                "explicit by making optional_argc non-zero.");
@@ -7190,7 +7190,7 @@ nsGlobalWindow::AddEventListener(const nsAString& aType,
   PRInt32 flags = aUseCapture ? NS_EVENT_FLAG_CAPTURE : NS_EVENT_FLAG_BUBBLE;
 
   if (aWantsUntrusted ||
-      (optional_argc == 0 && !nsContentUtils::IsChromeDoc(mDoc))) {
+      (optional_argc < 2 && !nsContentUtils::IsChromeDoc(mDoc))) {
     flags |= NS_PRIV_EVENT_UNTRUSTED_PERMITTED;
   }
 
diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp
index ca96c27eabc5..19f5bbe7738a 100644
--- a/dom/base/nsWindowRoot.cpp
+++ b/dom/base/nsWindowRoot.cpp
@@ -97,7 +97,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsWindowRoot)
 NS_IMETHODIMP
 nsWindowRoot::AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
@@ -167,7 +167,7 @@ nsWindowRoot::AddEventListener(const nsAString& aType,
                                PRBool aUseCapture, PRBool aWantsUntrusted,
                                PRUint8 optional_argc)
 {
-  NS_ASSERTION(!aWantsUntrusted || optional_argc > 0,
+  NS_ASSERTION(!aWantsUntrusted || optional_argc > 1,
                "Won't check if this is chrome, you want to set "
                "aWantsUntrusted to PR_FALSE or make the aWantsUntrusted "
                "explicit by making optional_argc non-zero.");
diff --git a/dom/interfaces/events/nsIDOMEventTarget.idl b/dom/interfaces/events/nsIDOMEventTarget.idl
index 7c72496f01ec..3d7f3e240e62 100644
--- a/dom/interfaces/events/nsIDOMEventTarget.idl
+++ b/dom/interfaces/events/nsIDOMEventTarget.idl
@@ -101,7 +101,7 @@ interface nsIDOMEventTarget : nsISupports
    */
   void                     removeEventListener(in DOMString type,
                                                in nsIDOMEventListener listener,
-                                               in boolean useCapture);
+                                               [optional] in boolean useCapture);
 
   /**
    * This method allows the dispatch of events into the implementations 
diff --git a/dom/interfaces/events/nsIDOMNSEventTarget.idl b/dom/interfaces/events/nsIDOMNSEventTarget.idl
index 261b0f241a67..7dc65afd91a1 100644
--- a/dom/interfaces/events/nsIDOMNSEventTarget.idl
+++ b/dom/interfaces/events/nsIDOMNSEventTarget.idl
@@ -66,7 +66,7 @@ interface nsIDOMNSEventTarget : nsISupports
    */
   [optional_argc] void addEventListener(in DOMString type,
                                         in nsIDOMEventListener listener,
-                                        in boolean useCapture,
+                                        [optional] in boolean useCapture,
                                         [optional] in boolean wantsUntrusted);
 
   /**
diff --git a/dom/src/threads/nsDOMWorker.cpp b/dom/src/threads/nsDOMWorker.cpp
index 7bc9389b9f6c..8a3972119a92 100644
--- a/dom/src/threads/nsDOMWorker.cpp
+++ b/dom/src/threads/nsDOMWorker.cpp
@@ -1164,7 +1164,7 @@ nsDOMWorkerScope::AddEventListener(const nsAString& aType,
                                    nsIDOMEventListener* aListener,
                                    PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
@@ -2569,7 +2569,7 @@ nsDOMWorker::AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
                               PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
diff --git a/dom/src/threads/nsDOMWorkerMessageHandler.cpp b/dom/src/threads/nsDOMWorkerMessageHandler.cpp
index 942afc33687f..4feb0494ae24 100644
--- a/dom/src/threads/nsDOMWorkerMessageHandler.cpp
+++ b/dom/src/threads/nsDOMWorkerMessageHandler.cpp
@@ -254,7 +254,7 @@ nsDOMWorkerMessageHandler::AddEventListener(const nsAString& aType,
                                             nsIDOMEventListener* aListener,
                                             PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 /**
@@ -347,7 +347,7 @@ nsDOMWorkerMessageHandler::AddEventListener(const nsAString& aType,
                                             PRUint8 optional_argc)
 {
   // We don't support aWantsUntrusted yet.
-  NS_ENSURE_TRUE(optional_argc == 0, NS_ERROR_NOT_IMPLEMENTED);
+  NS_ENSURE_TRUE(optional_argc < 2, NS_ERROR_NOT_IMPLEMENTED);
 
   ListenerCollection* collection =
     const_cast<ListenerCollection*>(GetListenerCollection(aType));
diff --git a/dom/src/threads/nsDOMWorkerXHR.cpp b/dom/src/threads/nsDOMWorkerXHR.cpp
index dd02f50187b9..f152d975c5ac 100644
--- a/dom/src/threads/nsDOMWorkerXHR.cpp
+++ b/dom/src/threads/nsDOMWorkerXHR.cpp
@@ -286,7 +286,7 @@ nsDOMWorkerXHRUpload::AddEventListener(const nsAString& aType,
                                        nsIDOMEventListener* aListener,
                                        PRBool aUseCapture)
 {
-  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, aUseCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP

From 3b21c48a99d0df9bb2433fd5ed5fe9491deb0e57 Mon Sep 17 00:00:00 2001
From: Andrew McCreight <amccreight@mozilla.com>
Date: Fri, 22 Apr 2011 12:06:43 -0700
Subject: [PATCH 137/314] Bug 651273 revert nsXPConnect::Traverse changes to
 fix WANT_ALL_TRACES CC (r=peterv@propagandism.org)

--HG--
extra : rebase_source : 8d4c84b1f38bed77815243c2dfc69abf5e7adf20
---
 js/src/xpconnect/src/nsXPConnect.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/src/xpconnect/src/nsXPConnect.cpp b/js/src/xpconnect/src/nsXPConnect.cpp
index 0ecf71ec2111..4042adc85987 100644
--- a/js/src/xpconnect/src/nsXPConnect.cpp
+++ b/js/src/xpconnect/src/nsXPConnect.cpp
@@ -728,8 +728,7 @@ nsXPConnect::Traverse(void *p, nsCycleCollectionTraversalCallback &cb)
 #endif
     {
         // Normal codepath (matches non-DEBUG_CC codepath).
-        NS_ASSERTION(xpc_IsGrayGCThing(p), "Tried to traverse a non-gray object.");
-        type = markJSObject ? GCMarked : GCUnmarked;
+        type = !markJSObject && xpc_IsGrayGCThing(p) ? GCUnmarked : GCMarked;
     }
 
     if (cb.WantDebugInfo()) {

From 1469c232c2e031b02b758e33cb0f6369c6564e73 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Sat, 23 Apr 2011 04:05:11 +0800
Subject: [PATCH 138/314] Bug 632294 - Unify setActive... functions r=ian

---
 browser/base/content/tabview/drag.js          |  4 +-
 browser/base/content/tabview/groupitems.js    | 46 +++++-------
 browser/base/content/tabview/items.js         |  4 +-
 browser/base/content/tabview/tabitems.js      | 10 ++-
 browser/base/content/tabview/ui.js            | 72 ++++++++++++++-----
 .../test/tabview/browser_tabview_apptabs.js   |  2 +-
 .../test/tabview/browser_tabview_bug587231.js |  2 +-
 .../test/tabview/browser_tabview_bug587503.js |  6 +-
 .../test/tabview/browser_tabview_bug591706.js |  2 +-
 .../test/tabview/browser_tabview_bug595930.js |  2 +-
 .../test/tabview/browser_tabview_bug595943.js |  2 +-
 .../test/tabview/browser_tabview_bug595965.js |  2 +-
 .../test/tabview/browser_tabview_bug597980.js |  2 +-
 .../test/tabview/browser_tabview_bug599626.js |  2 +-
 .../test/tabview/browser_tabview_bug600812.js |  2 +-
 .../test/tabview/browser_tabview_bug608405.js |  2 +-
 .../test/tabview/browser_tabview_bug610208.js |  2 +-
 .../test/tabview/browser_tabview_bug610242.js |  4 +-
 .../test/tabview/browser_tabview_bug612470.js |  2 +-
 .../test/tabview/browser_tabview_bug613541.js |  2 +-
 .../test/tabview/browser_tabview_bug622835.js |  2 +-
 .../test/tabview/browser_tabview_bug622872.js |  2 +-
 .../test/tabview/browser_tabview_bug624265.js |  2 +-
 .../test/tabview/browser_tabview_bug624727.js |  2 +-
 .../test/tabview/browser_tabview_bug626368.js |  2 +-
 .../test/tabview/browser_tabview_bug627736.js |  2 +-
 .../test/tabview/browser_tabview_bug628270.js |  2 +-
 .../test/tabview/browser_tabview_bug635696.js |  4 +-
 .../test/tabview/browser_tabview_bug645653.js |  2 +-
 .../test/tabview/browser_tabview_expander.js  |  4 +-
 .../test/tabview/browser_tabview_group.js     |  4 +-
 .../test/tabview/browser_tabview_layout.js    |  4 +-
 .../browser_tabview_privatebrowsing.js        |  2 +-
 .../tabview/browser_tabview_undo_group.js     |  2 +-
 browser/base/content/test/tabview/head.js     |  2 +-
 35 files changed, 116 insertions(+), 94 deletions(-)

diff --git a/browser/base/content/tabview/drag.js b/browser/base/content/tabview/drag.js
index 08647922b82e..30eb30b74903 100644
--- a/browser/base/content/tabview/drag.js
+++ b/browser/base/content/tabview/drag.js
@@ -92,10 +92,10 @@ function Drag(item, event, isFauxDrag) {
       var tab = UI.getActiveTab();
       if (!tab || tab.parent != this.item) {
         if (this.item._children.length)
-          UI.setActiveTab(this.item._children[0]);
+          UI.setActive(this.item._children[0]);
       }
     } else if (this.item.isATabItem) {
-      UI.setActiveTab(this.item);
+      UI.setActive(this.item);
     }
   }
 };
diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 7b483a2179a4..b8c52632765b 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -708,12 +708,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     let closeCenter = this.getBounds().center();
     // Find closest tab to make active
     let closestTabItem = UI.getClosestTab(closeCenter);
-    UI.setActiveTab(closestTabItem);
-
-    if (closestTabItem && closestTabItem.parent)
-      GroupItems.setActiveGroupItem(closestTabItem.parent);
-    else
-      GroupItems.setActiveGroupItem(null);
+    UI.setActive(closestTabItem);
   },
 
   // ----------
@@ -744,9 +739,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     this.droppable(true);
     this.setTrenches(this.bounds);
 
-    GroupItems.setActiveGroupItem(this);
-    if (this._activeTab)
-      UI.setActiveTab(this._activeTab);
+    UI.setActive(this);
 
     iQ(this.container).show().animate({
       "-moz-transform": "scale(1)",
@@ -1012,10 +1005,8 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
           if (dontArrange)
             self._freezeItemSize(count);
 
-          if (self._children.length > 0 && self._activeTab) {
-            GroupItems.setActiveGroupItem(self);
-            UI.setActiveTab(self._activeTab);
-          }
+          if (self._children.length > 0 && self._activeTab)
+            UI.setActive(self);
         });
 
         item.setParent(this);
@@ -1027,11 +1018,11 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         if (iQ(item.container).hasClass("focus"))
           this.setActiveTab(item);
 
-        // if it matches the selected tab or no active tab and the browser 
+        // if it matches the selected tab or no active tab and the browser
         // tab is hidden, the active group item would be set.
-        if (item.tab == gBrowser.selectedTab || 
+        if (item.tab == gBrowser.selectedTab ||
             (!GroupItems.getActiveGroupItem() && !item.tab.hidden))
-          GroupItems.setActiveGroupItem(this);
+          UI.setActive(this);
       }
 
       if (!options.dontArrange)
@@ -1166,7 +1157,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         if (!Utils.isLeftClick(event))
           return;
 
-        GroupItems.setActiveGroupItem(self);
+        UI.setActive(self, { dontSetActiveTabInGroup: true });
         UI.goToTab(iQ(this).data("xulTab"));
       });
 
@@ -1523,8 +1514,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
   expand: function GroupItem_expand() {
     var self = this;
     // ___ we're stacked, and command is held down so expand
-    GroupItems.setActiveGroupItem(self);
-    UI.setActiveTab(this.getTopChild());
+    UI.setActive(this.getTopChild());
     
     var startBounds = this.getChild(0).getBounds();
     var $tray = iQ("<div>").css({
@@ -1740,7 +1730,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
       if (dropIndex !== false)
         options = {index: dropIndex};
       this.add(drag.info.$el, options);
-      GroupItems.setActiveGroupItem(this);
+      UI.setActive(this);
       dropIndex = false;
     };
     this.dropOptions.out = function GroupItem_dropOptions_out(event) {
@@ -1795,7 +1785,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
   // Function: newTab
   // Creates a new tab within this groupItem.
   newTab: function GroupItem_newTab(url) {
-    GroupItems.setActiveGroupItem(this);
+    UI.setActive(this, { dontSetActiveTabInGroup: true });
     let newTab = gBrowser.loadOneTab(url || "about:blank", {inBackground: true});
 
     // TabItems will have handled the new tab and added the tabItem property.
@@ -2170,7 +2160,7 @@ let GroupItems = {
       if (activeGroupId) {
         let activeGroupItem = this.groupItem(activeGroupId);
         if (activeGroupItem)
-          this.setActiveGroupItem(activeGroupItem);
+          UI.setActive(activeGroupItem);
       }
 
       this._inited = true;
@@ -2307,7 +2297,7 @@ let GroupItems = {
         if (targetGroupItem) {
           // add the new tabItem to the first group item
           targetGroupItem.add(tabItem);
-          this.setActiveGroupItem(targetGroupItem);
+          UI.setActive(targetGroupItem);
           return;
         } else {
           // find the first visible group item
@@ -2316,7 +2306,7 @@ let GroupItems = {
           });
           if (visibleGroupItems.length > 0) {
             visibleGroupItems[0].add(tabItem);
-            this.setActiveGroupItem(visibleGroupItems[0]);
+            UI.setActive(visibleGroupItems[0]);
             return;
           }
         }
@@ -2345,7 +2335,7 @@ let GroupItems = {
     newGroupItemBounds.inset(-40,-40);
     let newGroupItem = new GroupItem(tabItems, { bounds: newGroupItemBounds });
     newGroupItem.snap();
-    this.setActiveGroupItem(newGroupItem);
+    UI.setActive(newGroupItem);
   },
 
   // ----------
@@ -2405,11 +2395,7 @@ let GroupItems = {
   updateActiveGroupItemAndTabBar: function GroupItems_updateActiveGroupItemAndTabBar(tabItem) {
     Utils.assertThrow(tabItem && tabItem.isATabItem, "tabItem must be a TabItem");
 
-    let groupItem = tabItem.parent;
-    this.setActiveGroupItem(groupItem);
-    if (groupItem)
-      groupItem.setActiveTab(tabItem);
-
+    UI.setActive(tabItem);
     this._updateTabBar();
   },
 
diff --git a/browser/base/content/tabview/items.js b/browser/base/content/tabview/items.js
index 4495e1a9b39b..7702d1d05ceb 100644
--- a/browser/base/content/tabview/items.js
+++ b/browser/base/content/tabview/items.js
@@ -152,7 +152,7 @@ Item.prototype = {
       cancelClass: 'close stackExpander',
       start: function(e, ui) {
         if (this.isAGroupItem) {
-          GroupItems.setActiveGroupItem(this);
+          UI.setActive(this);
           this._unfreezeItemSize();
         }
         // if we start dragging a tab within a group, start with dropSpace on.
@@ -202,7 +202,7 @@ Item.prototype = {
       minHeight: 90,
       start: function(e,ui) {
         if (this.isAGroupItem)
-          GroupItems.setActiveGroupItem(this);
+          UI.setActive(this);
         resize.info = new Drag(this, e);
       },
       resize: function(e,ui) {
diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 5eca4949620a..13b490c95d82 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -361,7 +361,7 @@ TabItem.prototype = Utils.extend(new Item(), new Subscribable(), {
           // tab is hidden, the active group item would be set.
           if (self.tab == gBrowser.selectedTab ||
               (!GroupItems.getActiveGroupItem() && !self.tab.hidden))
-            GroupItems.setActiveGroupItem(self.parent);
+            UI.setActive(self.parent);
         }
       } else {
         // When duplicating a non-blank orphaned tab, create a group including both of them.
@@ -643,9 +643,7 @@ TabItem.prototype = Utils.extend(new Item(), new Subscribable(), {
     let $tabEl = this.$container;
     let $canvas = this.$canvas;
 
-    UI.setActiveTab(this);
-    GroupItems.setActiveGroupItem(this.parent);
-
+    UI.setActive(this);
     TabItems._update(this.tab, {force: true});
 
     // Zoom in!
@@ -714,7 +712,7 @@ TabItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         complete();
     };
 
-    UI.setActiveTab(this);
+    UI.setActive(this);
     TabItems._update(this.tab, {force: true});
 
     $tab.addClass("front");
@@ -1082,7 +1080,7 @@ let TabItems = {
       // note that it's ok to unlink an app tab; see .handleTabUnpin
 
       if (tab._tabViewTabItem == UI.getActiveOrphanTab())
-        UI.setActiveTab(null);
+        UI.setActive(null, { onlyRemoveActiveTab: true });
 
       this.unregister(tab._tabViewTabItem);
       tab._tabViewTabItem._sendToSubscribers("close");
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 38026e79d2c3..6ebc8add0438 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -193,7 +193,7 @@ let UI = {
                 (self._lastClickPositions.x + self.DBLCLICK_OFFSET) >= e.clientX &&
                 (self._lastClickPositions.y - self.DBLCLICK_OFFSET) <= e.clientY &&
                 (self._lastClickPositions.y + self.DBLCLICK_OFFSET) >= e.clientY) {
-              GroupItems.setActiveGroupItem(null);
+              self.setActive(null);
               TabItems.creatingNewOrphanTab = true;
 
               let newTab =
@@ -205,7 +205,7 @@ let UI = {
                          TabItems.tabWidth, TabItems.tabHeight);
               newTab._tabViewTabItem.setBounds(box, true);
               newTab._tabViewTabItem.pushAway(true);
-              UI.setActiveTab(newTab._tabViewTabItem);
+              self.setActive(newTab._tabViewTabItem);
 
               TabItems.creatingNewOrphanTab = false;
               newTab._tabViewTabItem.zoomIn(true);
@@ -349,7 +349,7 @@ let UI = {
         item.parent.remove(item);
       groupItem.add(item, {immediately: true});
     });
-    GroupItems.setActiveGroupItem(groupItem);
+    this.setActive(groupItem);
   },
 
   // ----------
@@ -381,7 +381,7 @@ let UI = {
   },
 
   // ----------
-  // Function: setActiveTab
+  // Function: _setActiveTab
   // Sets the currently active tab. The idea of a focused tab is useful
   // for keyboard navigation and returning to the last zoomed-in tab.
   // Hitting return/esc brings you to the focused tab, and using the
@@ -389,7 +389,7 @@ let UI = {
   //
   // Parameters:
   //  - Takes a <TabItem>
-  setActiveTab: function UI_setActiveTab(tabItem) {
+  _setActiveTab: function UI__setActiveTab(tabItem) {
     if (tabItem == this._activeTab)
       return;
 
@@ -403,7 +403,7 @@ let UI = {
       let self = this;
       this._activeTab.addSubscriber(this, "close", function(closedTabItem) {
         if (self._activeTab == closedTabItem)
-          self.setActiveTab(null);
+          self._setActiveTab(null);
       });
 
       this._activeTab.makeActive();
@@ -417,6 +417,44 @@ let UI = {
     return (this._activeTab && !this._activeTab.parent) ? this._activeTab : null;
   },
 
+  // ----------
+  // Function: setActive
+  // Sets the active tab item or group item
+  // Parameters:
+  //
+  // options
+  //  dontSetActiveTabInGroup bool for not setting active tab in group
+  //  onlyRemoveActiveGroup bool for removing active group
+  //  onlyRemoveActiveTab bool for removing active tab
+  setActive: function UI_setActive(item, options) {
+    if (item) {
+      if (item.isATabItem) {
+        if (item.parent)
+          GroupItems.setActiveGroupItem(item.parent);
+        else
+          GroupItems.setActiveGroupItem(null);
+        this._setActiveTab(item);
+      } else {
+        GroupItems.setActiveGroupItem(item);
+        if (!options || !options.dontSetActiveTabInGroup) {
+          let activeTab = item.getActiveTab()
+          if (activeTab)
+            this._setActiveTab(activeTab);
+        }
+      }
+    } else {
+      if (options) {
+        if (options.onlyRemoveActiveGroup)
+          GroupItems.setActiveGroupItem(null);
+        else if (options.onlyRemoveActiveTab)
+          this._setActiveTab(null);
+      } else {
+        GroupItems.setActiveGroupItem(null);
+        this._setActiveTab(null);
+      }
+    }
+  },
+
   // ----------
   // Function: isTabViewVisible
   // Returns true if the TabView UI is currently shown.
@@ -495,7 +533,7 @@ let UI = {
         if (!currentTab._tabViewTabItem) // if the tab's been destroyed
           item = null;
 
-        self.setActiveTab(item);
+        self.setActive(item);
 
         self._resize(true);
         dispatchEvent(event);
@@ -506,7 +544,7 @@ let UI = {
         TabItems.resumePainting();
       });
     } else {
-      self.setActiveTab(null);
+      self.setActive(null, { onlyRemoveActiveTab: true });
       dispatchEvent(event);
 
       // Flush pending updates
@@ -871,10 +909,10 @@ let UI = {
       // already in the tab bar.
       if (!GroupItems.getActiveGroupItem() && !UI.getActiveOrphanTab()) {
         for (let a = 0; a < gBrowser.tabs.length; a++) {
-          let theTab = gBrowser.tabs[a]; 
+          let theTab = gBrowser.tabs[a];
           if (!theTab.pinned) {
-            let tabItem = theTab._tabViewTabItem; 
-            GroupItems.setActiveGroupItem(tabItem.parent);
+            let tabItem = theTab._tabViewTabItem;
+            this.setActive(tabItem.parent);
             break;
           }
         }
@@ -1083,7 +1121,7 @@ let UI = {
         if (nextTab) {
           if (nextTab.isStacked && !nextTab.parent.expanded)
             nextTab = nextTab.parent.getChild(0);
-          self.setActiveTab(nextTab);
+          self.setActive(nextTab);
         }
       } else {
         switch(event.keyCode) {
@@ -1121,7 +1159,7 @@ let UI = {
                   else
                     newIndex = (currentIndex + 1);
                 }
-                self.setActiveTab(tabItems[newIndex]);
+                self.setActive(tabItems[newIndex]);
               }
             }
             break;
@@ -1156,7 +1194,7 @@ let UI = {
     const minMinSize = 15;
 
     let lastActiveGroupItem = GroupItems.getActiveGroupItem();
-    GroupItems.setActiveGroupItem(null);
+    this.setActive(null, { onlyRemoveActiveGroup: true });
 
     var startPos = { x: e.clientX, y: e.clientY };
     var phantom = iQ("<div>")
@@ -1225,6 +1263,7 @@ let UI = {
       e.preventDefault();
     }
 
+    let self = this;
     function collapse() {
       let center = phantom.bounds().center();
       phantom.animate({
@@ -1238,7 +1277,7 @@ let UI = {
           phantom.remove();
         }
       });
-      GroupItems.setActiveGroupItem(lastActiveGroupItem);
+      self.setActive(lastActiveGroupItem);
     }
 
     function finalize(e) {
@@ -1260,7 +1299,7 @@ let UI = {
         }
 
         var groupItem = new GroupItem(insideTabs,{bounds:bounds});
-        GroupItems.setActiveGroupItem(groupItem);
+        self.setActive(groupItem);
         phantom.remove();
         dragOutInfo = null;
         gTabView.firstUseExperienced = true;
@@ -1370,7 +1409,6 @@ let UI = {
   // These computations may be done using cached values. The cache can be
   // cleared with UI.clearShouldResizeItems().
   shouldResizeItems: function UI_shouldResizeItems() {
-
     let newPageBounds = Items.getPageBounds();
     
     // If we don't have cached cached values...
diff --git a/browser/base/content/test/tabview/browser_tabview_apptabs.js b/browser/base/content/test/tabview/browser_tabview_apptabs.js
index a8a63202b5ea..da50b91a29e2 100644
--- a/browser/base/content/test/tabview/browser_tabview_apptabs.js
+++ b/browser/base/content/test/tabview/browser_tabview_apptabs.js
@@ -25,7 +25,7 @@ function onTabViewWindowLoaded() {
   let groupItemOne = new contentWindow.GroupItem([],
       { bounds: box, title: "test1" });
   is(contentWindow.GroupItems.groupItems.length, 2, "we now have two groups");
-  contentWindow.GroupItems.setActiveGroupItem(groupItemOne);
+  contentWindow.UI.setActive(groupItemOne);
 
   // create a tab
   let xulTab = gBrowser.loadOneTab("about:blank");
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587231.js b/browser/base/content/test/tabview/browser_tabview_bug587231.js
index 208ced8a9137..ec46d5bb979b 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug587231.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug587231.js
@@ -80,7 +80,7 @@ function onTabViewWindowLoaded() {
 
     let currentTabs = contentWindow.TabItems.getItems();
     ok(currentTabs[0], "A tab item exists to make active");
-    contentWindow.UI.setActiveTab(currentTabs[0]);
+    contentWindow.UI.setActive(currentTabs[0]);
     
     window.addEventListener("tabviewhidden", finishTest, false);
     TabView.toggle();
diff --git a/browser/base/content/test/tabview/browser_tabview_bug587503.js b/browser/base/content/test/tabview/browser_tabview_bug587503.js
index c4579d83713a..a25995a22350 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug587503.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug587503.js
@@ -19,7 +19,7 @@ function onTabViewWindowLoaded(win) {
   let box = new contentWindow.Rect(100, 100, 400, 430);
   let group = new contentWindow.GroupItem([], { bounds: box });
   ok(group.isEmpty(), "This group is empty");
-  contentWindow.GroupItems.setActiveGroupItem(group);
+  contentWindow.UI.setActive(group);
   
   // Create a bunch of tabs in the group
   let tabs = [];
@@ -167,12 +167,12 @@ function simulateSlowDragDrop(srcElement, offsetX, offsetY, contentWindow, time)
 }
 
 function checkDropIndexAndDropSpace(item, group, offsetX, offsetY, contentWindow, callback, time) {
-  contentWindow.UI.setActiveTab(item);
+  contentWindow.UI.setActive(item);
   let dropSpaceActiveValues = [];
   let recordDropSpaceValue = function() {
     dropSpaceActiveValues.push(group._dropSpaceActive);
   };
-//  contentWindow.iQ(item.container).css({border: 'red 1px solid'});
+
   let onDrop = function() {
     item.container.removeEventListener('dragover', recordDropSpaceValue, false);
     item.container.removeEventListener('drop', onDrop, false);
diff --git a/browser/base/content/test/tabview/browser_tabview_bug591706.js b/browser/base/content/test/tabview/browser_tabview_bug591706.js
index 7cae653ecadf..9ddb9716616b 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug591706.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug591706.js
@@ -31,7 +31,7 @@ function onTabViewWindowLoaded() {
   let box = new contentWindow.Rect(10, 10, 300, 300);
   let group = new contentWindow.GroupItem([], { bounds: box });
   ok(group.isEmpty(), "This group is empty");
-  contentWindow.GroupItems.setActiveGroupItem(group);
+  contentWindow.UI.setActive(group);
   
   // Create a second tab in this new group
   let secondTab = gBrowser.loadOneTab("about:blank#2", {inBackground: true});
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595930.js b/browser/base/content/test/tabview/browser_tabview_bug595930.js
index 2d78a006f81c..a4fe90bf2bde 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug595930.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug595930.js
@@ -20,7 +20,7 @@ function onTabViewWindowLoaded() {
   let box1 = new contentWindow.Rect(310, 10, 300, 300);
   let group1 = new contentWindow.GroupItem([], { bounds: box1 });
   ok(group1.isEmpty(), "This group is empty");
-  contentWindow.GroupItems.setActiveGroupItem(group1);
+  contentWindow.UI.setActive(group1);
   let tab1 = gBrowser.loadOneTab("about:blank#1", {inBackground: true});
   let tab1Item = tab1._tabViewTabItem;
   ok(group1.getChildren().some(function(child) child == tab1Item), "The tab was made in our new group");
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595943.js b/browser/base/content/test/tabview/browser_tabview_bug595943.js
index 422b9d2b4af2..a0c9d7796638 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug595943.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug595943.js
@@ -27,7 +27,7 @@ function onTabViewWindowLoaded() {
   let box = new contentWindow.Rect(20, 20, 180, 180);
   let groupItem = new contentWindow.GroupItem([], { bounds: box });
   is(contentWindow.GroupItems.groupItems.length, 2, "we now have two groups");
-  contentWindow.GroupItems.setActiveGroupItem(groupItem);
+  contentWindow.UI.setActive(groupItem);
   
   // create a second tab
   let normalXulTab = gBrowser.loadOneTab("about:blank");
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595965.js b/browser/base/content/test/tabview/browser_tabview_bug595965.js
index d23258dd4dbb..9fd6dddb7cca 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug595965.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug595965.js
@@ -35,7 +35,7 @@ function onTabViewShown(win) {
   let groupItem = new contentWindow.GroupItem([],
       { bounds: box, title: "test1" });
   is(contentWindow.GroupItems.groupItems.length, 2, "we now have two groups");
-  contentWindow.GroupItems.setActiveGroupItem(groupItem);
+  contentWindow.UI.setActive(groupItem);
 
   // create a tab
   let xulTabs = [];
diff --git a/browser/base/content/test/tabview/browser_tabview_bug597980.js b/browser/base/content/test/tabview/browser_tabview_bug597980.js
index 59d84fdd9170..1d78502eceaf 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug597980.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug597980.js
@@ -25,7 +25,7 @@ function part1(win) {
   newGroup.add(newTab._tabViewTabItem, {immediately: true});
 
   // ensure active group item and tab
-  contentWindow.GroupItems.setActiveGroupItem(originalGroup);
+  contentWindow.UI.setActive(originalGroup);
   is(contentWindow.GroupItems.getActiveGroupItem(), originalGroup,
      "The original group is active");
   is(contentWindow.UI.getActiveTab(), originalTab._tabViewTabItem,
diff --git a/browser/base/content/test/tabview/browser_tabview_bug599626.js b/browser/base/content/test/tabview/browser_tabview_bug599626.js
index ea2e5f7f23ec..f43012b800e2 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug599626.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug599626.js
@@ -20,7 +20,7 @@ function onTabViewWindowLoaded() {
   // Create a group and make it active
   let box = new contentWindow.Rect(10, 10, 300, 300);
   let groupItemTwo = new contentWindow.GroupItem([], { bounds: box });
-  contentWindow.GroupItems.setActiveGroupItem(groupItemTwo);
+  contentWindow.UI.setActive(groupItemTwo);
 
   let testTab = 
     gBrowser.addTab(
diff --git a/browser/base/content/test/tabview/browser_tabview_bug600812.js b/browser/base/content/test/tabview/browser_tabview_bug600812.js
index 459b72e59006..24ef28bf1d53 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug600812.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug600812.js
@@ -8,7 +8,7 @@ function test() {
     let bounds = new cw.Rect(20, 20, 150, 150);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
 
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
     gBrowser.loadOneTab('about:blank', {inBackground: true});
 
     return groupItem;
diff --git a/browser/base/content/test/tabview/browser_tabview_bug608405.js b/browser/base/content/test/tabview/browser_tabview_bug608405.js
index 8958696f607c..e374e7c5169a 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug608405.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug608405.js
@@ -8,7 +8,7 @@ function test() {
     let bounds = new cw.Rect(20, 20, 200, 200);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
 
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
     gBrowser.loadOneTab('about:blank', {inBackground: true});
 
     return groupItem;
diff --git a/browser/base/content/test/tabview/browser_tabview_bug610208.js b/browser/base/content/test/tabview/browser_tabview_bug610208.js
index b4bb3fe73bbe..675474dd4225 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug610208.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug610208.js
@@ -38,7 +38,7 @@ function test() {
       ok(!originalBounds.equals(groupItem.getChild(0).getBounds()), testName + ': tabs changed their size');
 
       // cleanup
-      cw.GroupItems.setActiveGroupItem(groupItem);
+      cw.UI.setActive(groupItem);
       win.gBrowser.loadOneTab('about:blank', {inBackground: true});
       afterAllTabsLoaded(callback, win);
     }, 500);
diff --git a/browser/base/content/test/tabview/browser_tabview_bug610242.js b/browser/base/content/test/tabview/browser_tabview_bug610242.js
index c28897c76cdd..b237c4cb7567 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug610242.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug610242.js
@@ -21,7 +21,7 @@ function onTabViewWindowLoaded(win) {
   let box = new contentWindow.Rect(100, 100, 370, 370);
   let group = new contentWindow.GroupItem([], { bounds: box });
   ok(group.isEmpty(), "This group is empty");
-  contentWindow.GroupItems.setActiveGroupItem(group);
+  contentWindow.UI.setActive(group);
   is(contentWindow.GroupItems.getActiveGroupItem(), group, "new group is active");
   
   // Create a bunch of tabs in the group
@@ -41,7 +41,7 @@ function onTabViewWindowLoaded(win) {
 
     ok(group.isEmpty(), "The group is empty again");
 
-    contentWindow.GroupItems.setActiveGroupItem(currentGroup);
+    contentWindow.UI.setActive(currentGroup);
     isnot(contentWindow.GroupItems.getActiveGroupItem(), null, "There is an active group");
     is(win.gBrowser.tabs.length, 1, "There is only one tab left");
     is(win.gBrowser.visibleTabs.length, 1, "There is also only one visible tab");
diff --git a/browser/base/content/test/tabview/browser_tabview_bug612470.js b/browser/base/content/test/tabview/browser_tabview_bug612470.js
index 1516764c10a0..83f1b3e2f245 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug612470.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug612470.js
@@ -18,7 +18,7 @@ function test() {
     is(cw.GroupItems.groupItems.length, 1, "There's only one group");
 
     groupItem = createEmptyGroupItem(cw, 200, 200, 20);
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
 
     executeSoon(function () hideTabView(onHide, win));
   };
diff --git a/browser/base/content/test/tabview/browser_tabview_bug613541.js b/browser/base/content/test/tabview/browser_tabview_bug613541.js
index f38d5a66afad..0bb86da5f820 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug613541.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug613541.js
@@ -12,7 +12,7 @@ function test() {
   let createGroupItem = function (numTabs) {
     let bounds = new cw.Rect(20, 20, 200, 200);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
 
     for (let i=0; i<numTabs || 0; i++)
       gBrowser.loadOneTab('about:blank', {inBackground: true});
diff --git a/browser/base/content/test/tabview/browser_tabview_bug622835.js b/browser/base/content/test/tabview/browser_tabview_bug622835.js
index a0f1e3cf04e9..5d2dd0f27eb6 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug622835.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug622835.js
@@ -28,7 +28,7 @@ function onTabViewShown(win) {
     bounds: {left: 20, top: 20, width: 100, height: 100}
   });
 
-  contentWindow.GroupItems.setActiveGroupItem(groupItem);
+  contentWindow.UI.setActive(groupItem);
 
   // we need seven tabs at least to reproduce this
   for (var i=0; i<7; i++)
diff --git a/browser/base/content/test/tabview/browser_tabview_bug622872.js b/browser/base/content/test/tabview/browser_tabview_bug622872.js
index d8d39fc3f8d1..f10c5cb6957e 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug622872.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug622872.js
@@ -30,7 +30,7 @@ function part1(win) {
   ok(!originalGroup.getChildren().some(function(child) child == newTabItem),"The new tab was orphaned");
   newTabItem.pushAway();
   // activate this tab item
-  contentWindow.UI.setActiveTab(newTabItem);
+  contentWindow.UI.setActive(newTabItem);
 
   // PART 2: close this orphan tab (newTab)
   let part2 = function part2() {
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624265.js b/browser/base/content/test/tabview/browser_tabview_bug624265.js
index c82e3be7463e..d51fd64f630d 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug624265.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug624265.js
@@ -123,7 +123,7 @@ function test() {
     let cw = getContentWindow();
     let box = new cw.Rect(20, 20, 250, 200);
     let groupItem = new cw.GroupItem([], {bounds: box, immediately: true});
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
 
     gBrowser.selectedTab = gBrowser.loadOneTab('http://mochi.test:8888/#3', {inBackground: true});
     gBrowser.loadOneTab('http://mochi.test:8888/#4', {inBackground: true});
diff --git a/browser/base/content/test/tabview/browser_tabview_bug624727.js b/browser/base/content/test/tabview/browser_tabview_bug624727.js
index c14f5d228132..fa36ed567047 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug624727.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug624727.js
@@ -10,7 +10,7 @@ function test() {
   let createGroupItem = function () {
     let bounds = new cw.Rect(20, 20, 400, 200);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
 
     let groupItemId = groupItem.id;
     registerCleanupFunction(function() {
diff --git a/browser/base/content/test/tabview/browser_tabview_bug626368.js b/browser/base/content/test/tabview/browser_tabview_bug626368.js
index 875ba08c1402..842ba345374f 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug626368.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug626368.js
@@ -8,7 +8,7 @@ function test() {
     let bounds = new cw.Rect(20, 20, 150, 150);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
 
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
     gBrowser.loadOneTab('about:blank', {inBackground: true});
 
     return groupItem;
diff --git a/browser/base/content/test/tabview/browser_tabview_bug627736.js b/browser/base/content/test/tabview/browser_tabview_bug627736.js
index dc859bf8e270..0042359a6d11 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug627736.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug627736.js
@@ -20,7 +20,7 @@ function onTabViewWindowLoaded(win) {
       immediately: true,
       bounds: {left: 20, top: 20, width: 400, height: 400}
     });
-    contentWindow.GroupItems.setActiveGroupItem(group);
+    contentWindow.UI.setActive(group);
     win.gBrowser.loadOneTab('about:blank', {inBackground: true});
   
     is(group.getChildren().length, 1, "The group has one child now.");
diff --git a/browser/base/content/test/tabview/browser_tabview_bug628270.js b/browser/base/content/test/tabview/browser_tabview_bug628270.js
index 31a20e27f749..8872716687ac 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug628270.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug628270.js
@@ -9,7 +9,7 @@ function test() {
     let bounds = new cw.Rect(20, 20, 200, 200);
     let groupItem = new cw.GroupItem([], {bounds: bounds, immediately: true});
 
-    cw.GroupItems.setActiveGroupItem(groupItem);
+    cw.UI.setActive(groupItem);
     gBrowser.loadOneTab('http://mochi.test:8888/', {inBackground: true});
     gBrowser.loadOneTab('http://mochi.test:8888/', {inBackground: true});
 
diff --git a/browser/base/content/test/tabview/browser_tabview_bug635696.js b/browser/base/content/test/tabview/browser_tabview_bug635696.js
index 206d36f3f414..81d9017988ad 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug635696.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug635696.js
@@ -57,7 +57,7 @@ function test() {
     hideGroupItem(groupItem, function () {
       is(cw.UI.getActiveTab(), tabItem2, "tabItem2 is active");
       unhideGroupItem(groupItem, function () {
-        cw.UI.setActiveTab(tabItem);
+        cw.UI.setActive(tabItem);
         closeGroupItem(groupItem2, next);
       });
     });
@@ -71,7 +71,7 @@ function test() {
     hideGroupItem(groupItem, function () {
       is(cw.UI.getActiveTab(), tabItem2, "tabItem2 is active");
       unhideGroupItem(groupItem, function () {
-        cw.UI.setActiveTab(tabItem);
+        cw.UI.setActive(tabItem);
         tabItem2.close();
         next();
       });
diff --git a/browser/base/content/test/tabview/browser_tabview_bug645653.js b/browser/base/content/test/tabview/browser_tabview_bug645653.js
index 59c9aa332384..0bfe21771b6e 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug645653.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug645653.js
@@ -39,7 +39,7 @@ function test() {
 
     // close the group => orphan the tab
     originalGroupItem.close();
-    contentWindow.GroupItems.setActiveGroupItem(originalGroupItem);
+    contentWindow.UI.setActive(originalGroupItem);
     is(contentWindow.GroupItems.groupItems.length, 0, "There are not any groups now.");
 
     ok(TabView.isVisible(), "Tab View is still shown.");
diff --git a/browser/base/content/test/tabview/browser_tabview_expander.js b/browser/base/content/test/tabview/browser_tabview_expander.js
index 50f954f22374..ad40f7cd4373 100644
--- a/browser/base/content/test/tabview/browser_tabview_expander.js
+++ b/browser/base/content/test/tabview/browser_tabview_expander.js
@@ -24,7 +24,7 @@ function onTabViewWindowLoaded(win) {
   ok("length" in expander && expander.length == 1, "The group has an expander.");
 
   // procreate!
-  contentWindow.GroupItems.setActiveGroupItem(group);
+  contentWindow.UI.setActive(group);
   for (var i=0; i<7; i++) {
     win.gBrowser.loadOneTab('about:blank#' + i, {inBackground: true});
   }
@@ -173,7 +173,7 @@ function onTabViewWindowLoaded(win) {
 
       // In preparation for Stage 4, find that original tab and make it the active tab.
       let originalTabItem = originalTab._tabViewTabItem;
-      contentWindow.UI.setActiveTab(originalTabItem);
+      contentWindow.UI.setActive(originalTabItem);
 
       // now, try opening it up again.
       group.addSubscriber("test stage 4", "expanded", stage4expanded);
diff --git a/browser/base/content/test/tabview/browser_tabview_group.js b/browser/base/content/test/tabview/browser_tabview_group.js
index e8e5a9dc620d..587078e1e5d4 100644
--- a/browser/base/content/test/tabview/browser_tabview_group.js
+++ b/browser/base/content/test/tabview/browser_tabview_group.js
@@ -20,7 +20,7 @@ function onTabViewWindowLoaded() {
   is(contentWindow.GroupItems.groupItems.length, 1, "There is one group item on startup");
   originalGroupItem = contentWindow.GroupItems.groupItems[0];
   is(originalGroupItem.getChildren().length, 1, "There should be one Tab Item in that group.");
-  contentWindow.GroupItems.setActiveGroupItem(originalGroupItem);
+  contentWindow.UI.setActive(originalGroupItem);
 
   [originalTab] = gBrowser.visibleTabs;
 
@@ -104,7 +104,7 @@ function testGroupItemWithTabItem(contentWindow) {
       // visibility of tabview
       let tabItems = contentWindow.TabItems.getItems();
       ok(tabItems[0], "A tab item exists");
-      contentWindow.UI.setActiveTab(tabItems[0]);
+      contentWindow.UI.setActive(tabItems[0]);
 
       TabView.toggle();
     });
diff --git a/browser/base/content/test/tabview/browser_tabview_layout.js b/browser/base/content/test/tabview/browser_tabview_layout.js
index 6b4768497912..2778f60b1391 100644
--- a/browser/base/content/test/tabview/browser_tabview_layout.js
+++ b/browser/base/content/test/tabview/browser_tabview_layout.js
@@ -24,7 +24,7 @@ function onTabViewWindowLoaded() {
   is(contentWindow.GroupItems.groupItems.length, 1, "There is one group item on startup");
   originalGroupItem = contentWindow.GroupItems.groupItems[0];
   is(originalGroupItem.getChildren().length, 1, "There should be one Tab Item in that group.");
-  contentWindow.GroupItems.setActiveGroupItem(originalGroupItem);
+  contentWindow.UI.setActive(originalGroupItem);
 
   [originalTab] = gBrowser.visibleTabs;
 
@@ -45,7 +45,7 @@ function testEmptyGroupItem(contentWindow) {
      "The number of groups is increased by 1");
 
   // add four blank items
-  contentWindow.GroupItems.setActiveGroupItem(emptyGroupItem);
+  contentWindow.UI.setActive(emptyGroupItem);
 
   let numNewTabs = 4;
   let items = [];
diff --git a/browser/base/content/test/tabview/browser_tabview_privatebrowsing.js b/browser/base/content/test/tabview/browser_tabview_privatebrowsing.js
index 2ac2a32488d3..43b76ea2973d 100644
--- a/browser/base/content/test/tabview/browser_tabview_privatebrowsing.js
+++ b/browser/base/content/test/tabview/browser_tabview_privatebrowsing.js
@@ -40,7 +40,7 @@ function onTabViewLoadedAndShown() {
   });
   
   // make it the active group so new tabs will be added to it
-  contentWindow.GroupItems.setActiveGroupItem(groupItem);
+  contentWindow.UI.setActive(groupItem);
   
   // collect the group titles
   let count = contentWindow.GroupItems.groupItems.length;
diff --git a/browser/base/content/test/tabview/browser_tabview_undo_group.js b/browser/base/content/test/tabview/browser_tabview_undo_group.js
index e737655aaf13..f52157a15d54 100644
--- a/browser/base/content/test/tabview/browser_tabview_undo_group.js
+++ b/browser/base/content/test/tabview/browser_tabview_undo_group.js
@@ -123,7 +123,7 @@ function testCloseUndoGroup(contentWindow, groupItem) {
     // visibility of tabview
     let tabItems = contentWindow.TabItems.getItems();
     ok(tabItems[0], "A tab item exists");
-    contentWindow.UI.setActiveTab(tabItems[0]);
+    contentWindow.UI.setActive(tabItems[0]);
 
     TabView.toggle();
   });
diff --git a/browser/base/content/test/tabview/head.js b/browser/base/content/test/tabview/head.js
index 6f5351a1cfe3..83e0c1517de6 100644
--- a/browser/base/content/test/tabview/head.js
+++ b/browser/base/content/test/tabview/head.js
@@ -25,7 +25,7 @@ function createGroupItemWithTabs(win, width, height, padding, urls, animate) {
   is(contentWindow.GroupItems.groupItems.length, ++groupItemCount,
      "The number of groups is increased by 1");
   // add blank items
-  contentWindow.GroupItems.setActiveGroupItem(groupItem);
+  contentWindow.UI.setActive(groupItem);
   let t = 0;
   urls.forEach( function(url) {
     let newItem = win.gBrowser.loadOneTab(url)._tabViewTabItem;

From 705e9bc07a85da2f5eab4354a71f97229c97e9cd Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 4 May 2011 15:55:54 -0500
Subject: [PATCH 139/314] Bug 648935: Need to use the "remote stack depth view"
 when deciding whether to undefer, too. r=bsmedberg

---
 ipc/glue/RPCChannel.cpp | 18 +++++++++---------
 ipc/glue/RPCChannel.h   | 12 ++++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ipc/glue/RPCChannel.cpp b/ipc/glue/RPCChannel.cpp
index bab3cd345191..461c00a5fa2a 100644
--- a/ipc/glue/RPCChannel.cpp
+++ b/ipc/glue/RPCChannel.cpp
@@ -330,7 +330,7 @@ RPCChannel::MaybeUndeferIncall()
     RPC_ASSERT(mDeferred.top().rpc_remote_stack_depth_guess() <= stackDepth,
                "fatal logic error");
 
-    if (mDeferred.top().rpc_remote_stack_depth_guess() < stackDepth)
+    if (mDeferred.top().rpc_remote_stack_depth_guess() < RemoteViewOfStackDepth(stackDepth))
         return;
 
     // maybe time to process this message
@@ -435,6 +435,13 @@ RPCChannel::OnMaybeDequeueOne()
     return true;
 }
 
+size_t
+RPCChannel::RemoteViewOfStackDepth(size_t stackDepth) const
+{
+    AssertWorkerThread();
+    return stackDepth - mOutOfTurnReplies.size();
+}
+
 void
 RPCChannel::Incall(const Message& call, size_t stackDepth)
 {
@@ -445,14 +452,7 @@ RPCChannel::Incall(const Message& call, size_t stackDepth)
     // Race detection: see the long comment near
     // mRemoteStackDepthGuess in RPCChannel.h.  "Remote" stack depth
     // means our side, and "local" means other side.
-    //
-    // We compare the remote stack depth guess against the "remote
-    // view of stack depth" because of out-of-turn replies.  When we
-    // receive one, our actual RPC stack depth doesn't decrease, but
-    // the other side (that sent the reply) thinks it has.  So, just
-    // adjust down by the number of out-of-turn replies.
-    size_t remoteViewOfStackDepth = (stackDepth - mOutOfTurnReplies.size());
-    if (call.rpc_remote_stack_depth_guess() != remoteViewOfStackDepth) {
+    if (call.rpc_remote_stack_depth_guess() != RemoteViewOfStackDepth(stackDepth)) {
         // RPC in-calls have raced.
         // the "winner", if there is one, gets to defer processing of
         // the other side's in-call
diff --git a/ipc/glue/RPCChannel.h b/ipc/glue/RPCChannel.h
index 2c757f2c6607..451d50ff080e 100644
--- a/ipc/glue/RPCChannel.h
+++ b/ipc/glue/RPCChannel.h
@@ -207,6 +207,18 @@ protected:
      */
     bool OnMaybeDequeueOne();
 
+    /**
+     * The "remote view of stack depth" can be different than the
+     * actual stack depth when there are out-of-turn replies.  When we
+     * receive one, our actual RPC stack depth doesn't decrease, but
+     * the other side (that sent the reply) thinks it has.  So, the
+     * "view" returned here is |stackDepth| minus the number of
+     * out-of-turn replies.
+     *
+     * Only called from the worker thread.
+     */
+    size_t RemoteViewOfStackDepth(size_t stackDepth) const;
+
     void Incall(const Message& call, size_t stackDepth);
     void DispatchIncall(const Message& call);
 

From eb1da4388e1fd5813ed66d96b21c96a2eb3a5e70 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Wed, 4 May 2011 15:55:54 -0500
Subject: [PATCH 140/314] Test for bug 648935.

---
 ipc/ipdl/test/cxx/Makefile.in           |   1 +
 ipc/ipdl/test/cxx/PTestRacyUndefer.ipdl |  28 ++++++
 ipc/ipdl/test/cxx/TestRacyUndefer.cpp   | 115 ++++++++++++++++++++++++
 ipc/ipdl/test/cxx/TestRacyUndefer.h     |  76 ++++++++++++++++
 ipc/ipdl/test/cxx/ipdl.mk               |   1 +
 5 files changed, 221 insertions(+)
 create mode 100644 ipc/ipdl/test/cxx/PTestRacyUndefer.ipdl
 create mode 100644 ipc/ipdl/test/cxx/TestRacyUndefer.cpp
 create mode 100644 ipc/ipdl/test/cxx/TestRacyUndefer.h

diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in
index 12185328a8c3..948dea46d675 100644
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -75,6 +75,7 @@ IPDLTESTS = \
   TestRaceDeferral \
   TestRacyReentry  \
   TestRacyRPCReplies  \
+  TestRacyUndefer \
   TestSanity  \
   TestSelfManageRoot \
   TestShmem \
diff --git a/ipc/ipdl/test/cxx/PTestRacyUndefer.ipdl b/ipc/ipdl/test/cxx/PTestRacyUndefer.ipdl
new file mode 100644
index 000000000000..6b4c909d2baf
--- /dev/null
+++ b/ipc/ipdl/test/cxx/PTestRacyUndefer.ipdl
@@ -0,0 +1,28 @@
+
+namespace mozilla {
+namespace _ipdltest {
+
+
+rpc protocol PTestRacyUndefer {
+
+child:
+    async Start();
+
+    async AwakenSpam();
+    async AwakenRaceWinTwice();
+
+    rpc Race();
+
+    async __delete__();
+
+parent:
+
+    rpc Spam();
+    rpc RaceWinTwice();
+
+    async Done();
+};
+
+
+} // namespace mozilla
+} // namespace _ipdltest
diff --git a/ipc/ipdl/test/cxx/TestRacyUndefer.cpp b/ipc/ipdl/test/cxx/TestRacyUndefer.cpp
new file mode 100644
index 000000000000..8bdd804cc309
--- /dev/null
+++ b/ipc/ipdl/test/cxx/TestRacyUndefer.cpp
@@ -0,0 +1,115 @@
+#include "base/basictypes.h"
+
+#include "TestRacyUndefer.h"
+
+#include "IPDLUnitTests.h"      // fail etc.
+
+namespace mozilla {
+namespace _ipdltest {
+
+//-----------------------------------------------------------------------------
+// parent
+
+TestRacyUndeferParent::TestRacyUndeferParent()
+{
+    MOZ_COUNT_CTOR(TestRacyUndeferParent);
+}
+
+TestRacyUndeferParent::~TestRacyUndeferParent()
+{
+    MOZ_COUNT_DTOR(TestRacyUndeferParent);
+}
+
+void
+TestRacyUndeferParent::Main()
+{
+    if (!SendStart())
+        fail("sending Start");
+}
+
+bool
+TestRacyUndeferParent::AnswerSpam()
+{
+    static bool spammed = false;
+    static bool raced = false;
+    if (!spammed) {
+        spammed = true;
+
+        if (!SendAwakenSpam())
+            fail("sending AwakenSpam");
+    }
+    else if (!raced) {
+        raced = true;
+
+        if (!SendAwakenRaceWinTwice())
+            fail("sending WinRaceTwice");
+
+        if (!CallRace())
+            fail("calling Race1");
+    }
+    return true;
+}
+
+bool
+TestRacyUndeferParent::AnswerRaceWinTwice()
+{
+    return true;
+}
+
+bool
+TestRacyUndeferParent::RecvDone()
+{
+    Close();
+    return true;
+}
+
+
+//-----------------------------------------------------------------------------
+// child
+
+TestRacyUndeferChild::TestRacyUndeferChild()
+{
+    MOZ_COUNT_CTOR(TestRacyUndeferChild);
+}
+
+TestRacyUndeferChild::~TestRacyUndeferChild()
+{
+    MOZ_COUNT_DTOR(TestRacyUndeferChild);
+}
+
+bool
+TestRacyUndeferChild::RecvStart()
+{
+    if (!CallSpam())
+        fail("calling Spam");
+
+    if (!SendDone())
+        fail("sending Done");
+
+    return true;
+}
+
+bool
+TestRacyUndeferChild::RecvAwakenSpam()
+{
+    if (!CallSpam())
+        fail("calling Spam");
+    return true;
+}
+
+bool
+TestRacyUndeferChild::RecvAwakenRaceWinTwice()
+{
+    if (!CallRaceWinTwice())
+        fail("calling RaceWinTwice");
+    return true;
+}
+
+bool
+TestRacyUndeferChild::AnswerRace()
+{
+    return true;
+}
+
+} // namespace _ipdltest
+} // namespace mozilla
diff --git a/ipc/ipdl/test/cxx/TestRacyUndefer.h b/ipc/ipdl/test/cxx/TestRacyUndefer.h
new file mode 100644
index 000000000000..a7d2b513709b
--- /dev/null
+++ b/ipc/ipdl/test/cxx/TestRacyUndefer.h
@@ -0,0 +1,76 @@
+#ifndef mozilla__ipdltest_TestRacyUndefer_h
+#define mozilla__ipdltest_TestRacyUndefer_h 1
+
+#include "mozilla/_ipdltest/IPDLUnitTests.h"
+
+#include "mozilla/_ipdltest/PTestRacyUndeferParent.h"
+#include "mozilla/_ipdltest/PTestRacyUndeferChild.h"
+
+namespace mozilla {
+namespace _ipdltest {
+
+
+class TestRacyUndeferParent :
+    public PTestRacyUndeferParent
+{
+public:
+    TestRacyUndeferParent();
+    virtual ~TestRacyUndeferParent();
+
+    void Main();
+
+protected:    
+    NS_OVERRIDE
+    virtual bool AnswerSpam();
+
+    NS_OVERRIDE
+    virtual bool AnswerRaceWinTwice();
+
+    NS_OVERRIDE
+    virtual bool RecvDone();
+
+    NS_OVERRIDE
+    virtual void ActorDestroy(ActorDestroyReason why)
+    {
+        if (NormalShutdown != why)
+            fail("unexpected destruction!");  
+        passed("ok");
+        QuitParent();
+    }
+};
+
+
+class TestRacyUndeferChild :
+    public PTestRacyUndeferChild
+{
+public:
+    TestRacyUndeferChild();
+    virtual ~TestRacyUndeferChild();
+
+protected:
+    NS_OVERRIDE
+    virtual bool RecvStart();
+
+    NS_OVERRIDE
+    virtual bool RecvAwakenSpam();
+    NS_OVERRIDE
+    virtual bool RecvAwakenRaceWinTwice();
+
+    NS_OVERRIDE
+    virtual bool AnswerRace();
+
+    NS_OVERRIDE
+    virtual void ActorDestroy(ActorDestroyReason why)
+    {
+        if (NormalShutdown != why)
+            fail("unexpected destruction!");
+        QuitChild();
+    }
+};
+
+
+} // namespace _ipdltest
+} // namespace mozilla
+
+
+#endif // ifndef mozilla__ipdltest_TestRacyUndefer_h
diff --git a/ipc/ipdl/test/cxx/ipdl.mk b/ipc/ipdl/test/cxx/ipdl.mk
index 7ac17d9031d1..9b828f12a203 100644
--- a/ipc/ipdl/test/cxx/ipdl.mk
+++ b/ipc/ipdl/test/cxx/ipdl.mk
@@ -23,6 +23,7 @@ IPDLSRCS =					\
   PTestRaceDeferral.ipdl			\
   PTestRacyReentry.ipdl				\
   PTestRacyRPCReplies.ipdl			\
+  PTestRacyUndefer.ipdl				\
   PTestRPCErrorCleanup.ipdl			\
   PTestRPCRaces.ipdl				\
   PTestRPCShutdownRace.ipdl			\

From 5a3d8699b908837efb483f321e70d0f608b83ab0 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 4 May 2011 16:39:15 -0700
Subject: [PATCH 141/314] Back out cset bc80c46f185d (Bug 590181 part 2) on
 suspicion of causing linux reftest permaorange (bug 654858) when PGO is
 disabled. rs=glandium CLOSED TREE

---
 configure.in         | 4 ++--
 js/src/configure.in  | 4 ++--
 xpcom/io/Makefile.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index ab645a8f457c..6bbcb9755203 100644
--- a/configure.in
+++ b/configure.in
@@ -2188,9 +2188,9 @@ ia64*-hpux*)
         esac
         # If we're building with --enable-profiling, we need a frame pointer.
         if test -z "$MOZ_PROFILING"; then
-            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
+            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fomit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
         else
-            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
+            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-omit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
         fi
         MOZ_DEBUG_FLAGS="-g"
     fi
diff --git a/js/src/configure.in b/js/src/configure.in
index fb32aa308598..ab2046bee47a 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2107,9 +2107,9 @@ ia64*-hpux*)
         esac
         # If we're building with --enable-profiling, we need a frame pointer.
         if test -z "$MOZ_PROFILING"; then
-            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
+            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fomit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
         else
-            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
+            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-omit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
         fi
         MOZ_DEBUG_FLAGS="-g"
     fi
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index a9036fa164dd..61cd64aba28f 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -51,7 +51,7 @@ MOZILLA_INTERNAL_API = 1
 # work around bug 408258
 ifdef GNU_CC 
 ifneq ($(OS_ARCH), Darwin)
-MODULE_OPTIMIZE_FLAGS = -O3 -fno-strict-aliasing
+MODULE_OPTIMIZE_FLAGS = -Os -fno-strict-aliasing $(MOZ_OPTIMIZE_SIZE_TWEAK)
 endif
 endif
 

From a3e6737fd5bce67db45e7df208556b98656dca8c Mon Sep 17 00:00:00 2001
From: Trevor Saunders <trev.saunders@gmail.com>
Date: Sat, 23 Apr 2011 09:14:05 -0400
Subject: [PATCH 142/314] bug 652378 - dexpcom nsAccessible::GetDescription()
 r=surkov

From 474b06dc24586199d7abf30235b8202b595e9edd Mon Sep 17 00:00:00 2001
---
 accessible/src/atk/nsAccessibleWrap.cpp            |   10 +--
 accessible/src/base/nsAccessible.cpp               |   62 +++++++++++---------
 accessible/src/base/nsAccessible.h                 |    5 ++
 accessible/src/base/nsApplicationAccessible.cpp    |    5 +-
 accessible/src/base/nsApplicationAccessible.h      |    2 +-
 accessible/src/base/nsDocAccessible.cpp            |   15 ++---
 accessible/src/base/nsDocAccessible.h              |    2 +-
 accessible/src/html/nsHTMLImageMapAccessible.cpp   |    6 +-
 accessible/src/html/nsHTMLImageMapAccessible.h     |    2 +-
 accessible/src/html/nsHTMLSelectAccessible.cpp     |   13 ++--
 accessible/src/html/nsHTMLSelectAccessible.h       |    2 +-
 accessible/src/html/nsHTMLTableAccessible.cpp      |   19 +++----
 accessible/src/html/nsHTMLTableAccessible.h        |    2 +-
 accessible/src/mac/mozAccessible.mm                |    5 +-
 accessible/src/msaa/nsAccessibleWrap.cpp           |    4 +-
 accessible/src/xforms/nsXFormsAccessible.cpp       |   18 ++----
 accessible/src/xforms/nsXFormsAccessible.h         |    5 +-
 .../src/xforms/nsXFormsFormControlsAccessible.cpp  |   11 +--
 .../src/xforms/nsXFormsFormControlsAccessible.h    |    4 +-
 .../src/xforms/nsXFormsWidgetsAccessible.cpp       |    5 +-
 accessible/src/xforms/nsXFormsWidgetsAccessible.h  |    2 +-
 accessible/src/xul/nsXULComboboxAccessible.cpp     |   21 ++-----
 accessible/src/xul/nsXULComboboxAccessible.h       |    2 +-
 accessible/src/xul/nsXULListboxAccessible.h        |    2 +-
 accessible/src/xul/nsXULMenuAccessible.cpp         |    9 +--
 accessible/src/xul/nsXULMenuAccessible.h           |    2 +-
 26 files changed, 106 insertions(+), 129 deletions(-)
---
 accessible/src/atk/nsAccessibleWrap.cpp       | 10 ++--
 accessible/src/base/nsAccessible.cpp          | 60 ++++++++++---------
 accessible/src/base/nsAccessible.h            |  5 ++
 .../src/base/nsApplicationAccessible.cpp      |  5 +-
 accessible/src/base/nsApplicationAccessible.h |  2 +-
 accessible/src/base/nsDocAccessible.cpp       | 15 ++---
 accessible/src/base/nsDocAccessible.h         |  2 +-
 .../src/html/nsHTMLImageMapAccessible.cpp     |  6 +-
 .../src/html/nsHTMLImageMapAccessible.h       |  2 +-
 .../src/html/nsHTMLSelectAccessible.cpp       | 13 ++--
 accessible/src/html/nsHTMLSelectAccessible.h  |  2 +-
 accessible/src/html/nsHTMLTableAccessible.cpp | 19 +++---
 accessible/src/html/nsHTMLTableAccessible.h   |  2 +-
 accessible/src/mac/mozAccessible.mm           |  5 +-
 accessible/src/msaa/nsAccessibleWrap.cpp      |  4 +-
 accessible/src/xforms/nsXFormsAccessible.cpp  | 18 ++----
 accessible/src/xforms/nsXFormsAccessible.h    |  5 +-
 .../xforms/nsXFormsFormControlsAccessible.cpp | 11 ++--
 .../xforms/nsXFormsFormControlsAccessible.h   |  4 +-
 .../src/xforms/nsXFormsWidgetsAccessible.cpp  |  5 +-
 .../src/xforms/nsXFormsWidgetsAccessible.h    |  2 +-
 .../src/xul/nsXULComboboxAccessible.cpp       | 21 +++----
 accessible/src/xul/nsXULComboboxAccessible.h  |  2 +-
 accessible/src/xul/nsXULListboxAccessible.cpp |  9 +++
 accessible/src/xul/nsXULListboxAccessible.h   |  2 +-
 accessible/src/xul/nsXULMenuAccessible.cpp    |  9 +--
 accessible/src/xul/nsXULMenuAccessible.h      |  2 +-
 27 files changed, 114 insertions(+), 128 deletions(-)

diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp
index 5b8234148c27..19b6bc3f5212 100644
--- a/accessible/src/atk/nsAccessibleWrap.cpp
+++ b/accessible/src/atk/nsAccessibleWrap.cpp
@@ -718,20 +718,18 @@ const gchar *
 getDescriptionCB(AtkObject *aAtkObj)
 {
     nsAccessibleWrap *accWrap = GetAccessibleWrap(aAtkObj);
-    if (!accWrap) {
+    if (!accWrap || accWrap->IsDefunct())
         return nsnull;
-    }
 
     /* nsIAccessible is responsible for the non-NULL description */
     nsAutoString uniDesc;
-    nsresult rv = accWrap->GetDescription(uniDesc);
-    NS_ENSURE_SUCCESS(rv, nsnull);
+    accWrap->Description(uniDesc);
 
     NS_ConvertUTF8toUTF16 objDesc(aAtkObj->description);
-    if (!uniDesc.Equals(objDesc)) {
+    if (!uniDesc.Equals(objDesc))
         atk_object_set_description(aAtkObj,
                                    NS_ConvertUTF16toUTF8(uniDesc).get());
-    }
+
     return aAtkObj->description;
 }
 
diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index cfa89b13eb17..6b57eb928ec7 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -272,54 +272,60 @@ nsAccessible::GetName(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsAccessible::GetDescription(nsAString& aDescription)
+NS_IMETHODIMP
+nsAccessible::GetDescription(nsAString& aDescription)
 {
   if (IsDefunct())
     return NS_ERROR_FAILURE;
 
+  nsAutoString desc;
+  Description(desc);
+  aDescription.Assign(desc);
+
+  return NS_OK;
+}
+
+void
+nsAccessible::Description(nsString& aDescription)
+{
   // There are 4 conditions that make an accessible have no accDescription:
   // 1. it's a text node; or
   // 2. It has no DHTML describedby property
   // 3. it doesn't have an accName; or
   // 4. its title attribute already equals to its accName nsAutoString name; 
 
-  if (!mContent->IsNodeOfType(nsINode::eTEXT)) {
-    nsAutoString description;
-    nsresult rv = nsTextEquivUtils::
-      GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_describedby,
-                             description);
-    NS_ENSURE_SUCCESS(rv, rv);
+  if (mContent->IsNodeOfType(nsINode::eTEXT))
+    return;
 
-    if (description.IsEmpty()) {
-      PRBool isXUL = mContent->IsXUL();
-      if (isXUL) {
-        // Try XUL <description control="[id]">description text</description>
-        XULDescriptionIterator iter(GetDocAccessible(), mContent);
-        nsAccessible* descr = nsnull;
-        while ((descr = iter.Next())) {
-          nsTextEquivUtils::
-            AppendTextEquivFromContent(this, descr->GetContent(), &description);
-        }
+  nsTextEquivUtils::
+    GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_describedby,
+                           aDescription);
+
+  if (aDescription.IsEmpty()) {
+    PRBool isXUL = mContent->IsXUL();
+    if (isXUL) {
+      // Try XUL <description control="[id]">description text</description>
+      XULDescriptionIterator iter(GetDocAccessible(), mContent);
+      nsAccessible* descr = nsnull;
+      while ((descr = iter.Next()))
+        nsTextEquivUtils::AppendTextEquivFromContent(this, descr->GetContent(),
+                                                     &aDescription);
       }
-      if (description.IsEmpty()) {
+
+      if (aDescription.IsEmpty()) {
         nsIAtom *descAtom = isXUL ? nsAccessibilityAtoms::tooltiptext :
                                     nsAccessibilityAtoms::title;
-        if (mContent->GetAttr(kNameSpaceID_None, descAtom, description)) {
+        if (mContent->GetAttr(kNameSpaceID_None, descAtom, aDescription)) {
           nsAutoString name;
           GetName(name);
-          if (name.IsEmpty() || description == name) {
+          if (name.IsEmpty() || aDescription == name)
             // Don't use tooltip for a description if this object
             // has no name or the tooltip is the same as the name
-            description.Truncate();
-          }
+            aDescription.Truncate();
         }
       }
     }
-    description.CompressWhitespace();
-    aDescription = description;
-  }
-
-  return NS_OK;
+    aDescription.CompressWhitespace();
 }
 
 // mask values for ui.key.chromeAccess and ui.key.contentAccess
diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h
index 55f38e8823f1..53bf532be660 100644
--- a/accessible/src/base/nsAccessible.h
+++ b/accessible/src/base/nsAccessible.h
@@ -119,6 +119,11 @@ public:
   //////////////////////////////////////////////////////////////////////////////
   // Public methods
 
+  /**
+   * get the description of this accessible
+   */
+  virtual void Description(nsString& aDescription);
+
   /**
    * Returns the accessible name specified by ARIA.
    */
diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp
index 69aa9f5ec81b..4ada51e9febf 100644
--- a/accessible/src/base/nsApplicationAccessible.cpp
+++ b/accessible/src/base/nsApplicationAccessible.cpp
@@ -127,11 +127,10 @@ nsApplicationAccessible::GetValue(nsAString &aValue)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsApplicationAccessible::GetDescription(nsAString &aDescription)
+void
+nsApplicationAccessible::Description(nsString &aDescription)
 {
   aDescription.Truncate();
-  return NS_OK;
 }
 
 NS_IMETHODIMP
diff --git a/accessible/src/base/nsApplicationAccessible.h b/accessible/src/base/nsApplicationAccessible.h
index 5799d5569c62..e9d094d67930 100644
--- a/accessible/src/base/nsApplicationAccessible.h
+++ b/accessible/src/base/nsApplicationAccessible.h
@@ -92,7 +92,6 @@ public:
   NS_IMETHOD GetPreviousSibling(nsIAccessible **aPreviousSibling);
   NS_IMETHOD GetName(nsAString &aName);
   NS_IMETHOD GetValue(nsAString &aValue);
-  NS_IMETHOD GetDescription(nsAString &aDescription);
   NS_IMETHOD GetKeyboardShortcut(nsAString &aKeyboardShortcut);
   NS_IMETHOD GetAttributes(nsIPersistentProperties **aAttributes);
   NS_IMETHOD GroupPosition(PRInt32 *aGroupLevel, PRInt32 *aSimilarItemsInGroup,
@@ -123,6 +122,7 @@ public:
 
   // nsAccessible
   virtual void ApplyARIAState(PRUint64* aState);
+  virtual void Description(nsString& aDescription);
   virtual PRUint32 NativeRole();
   virtual PRUint64 State();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp
index 08ac96e66718..88a766be0d0e 100644
--- a/accessible/src/base/nsDocAccessible.cpp
+++ b/accessible/src/base/nsDocAccessible.cpp
@@ -273,21 +273,16 @@ nsDocAccessible::SetRoleMapEntry(nsRoleMapEntry* aRoleMapEntry)
   }
 }
 
-NS_IMETHODIMP 
-nsDocAccessible::GetDescription(nsAString& aDescription)
+void
+nsDocAccessible::Description(nsString& aDescription)
 {
   if (mParent)
-    mParent->GetDescription(aDescription);
+    mParent->Description(aDescription);
 
-  if (aDescription.IsEmpty()) {
-    nsAutoString description;
+  if (aDescription.IsEmpty())
     nsTextEquivUtils::
       GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_describedby,
-                             description);
-    aDescription = description;
-  }
-
-  return NS_OK;
+                             aDescription);
 }
 
 // nsAccessible public method
diff --git a/accessible/src/base/nsDocAccessible.h b/accessible/src/base/nsDocAccessible.h
index 7850891aed1c..c77a7c6d301f 100644
--- a/accessible/src/base/nsDocAccessible.h
+++ b/accessible/src/base/nsDocAccessible.h
@@ -93,7 +93,6 @@ public:
 
   // nsIAccessible
   NS_IMETHOD GetName(nsAString& aName);
-  NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD GetAttributes(nsIPersistentProperties **aAttributes);
   NS_IMETHOD GetFocusedChild(nsIAccessible **aFocusedChild);
   NS_IMETHOD TakeFocus(void);
@@ -114,6 +113,7 @@ public:
   virtual nsIDocument* GetDocumentNode() const { return mDocument; }
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
   virtual void ApplyARIAState(PRUint64* aState);
diff --git a/accessible/src/html/nsHTMLImageMapAccessible.cpp b/accessible/src/html/nsHTMLImageMapAccessible.cpp
index f1c7646a571b..4d356ad0902a 100644
--- a/accessible/src/html/nsHTMLImageMapAccessible.cpp
+++ b/accessible/src/html/nsHTMLImageMapAccessible.cpp
@@ -168,8 +168,8 @@ nsHTMLAreaAccessible::GetNameInternal(nsAString & aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHTMLAreaAccessible::GetDescription(nsAString& aDescription)
+void
+nsHTMLAreaAccessible::Description(nsString& aDescription)
 {
   aDescription.Truncate();
 
@@ -177,8 +177,6 @@ nsHTMLAreaAccessible::GetDescription(nsAString& aDescription)
   nsCOMPtr<nsIDOMHTMLAreaElement> area(do_QueryInterface(mContent));
   if (area) 
     area->GetShape(aDescription);
-
-  return NS_OK;
 }
 
 NS_IMETHODIMP
diff --git a/accessible/src/html/nsHTMLImageMapAccessible.h b/accessible/src/html/nsHTMLImageMapAccessible.h
index 82afd8088c11..86ac94a5937f 100644
--- a/accessible/src/html/nsHTMLImageMapAccessible.h
+++ b/accessible/src/html/nsHTMLImageMapAccessible.h
@@ -87,11 +87,11 @@ public:
   nsHTMLAreaAccessible(nsIContent *aContent, nsIWeakReference *aShell);
 
   // nsIAccessible
-  NS_IMETHOD GetDescription(nsAString& aDescription);
 
   NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint64 NativeState();
   virtual nsAccessible* GetChildAtPoint(PRInt32 aX, PRInt32 aY,
diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp
index ebdb40ad300e..0f8cffeca0c1 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -727,18 +727,19 @@ nsHTMLComboboxAccessible::NativeState()
   return state;
 }
 
-NS_IMETHODIMP nsHTMLComboboxAccessible::GetDescription(nsAString& aDescription)
+void
+nsHTMLComboboxAccessible::Description(nsString& aDescription)
 {
   aDescription.Truncate();
   // First check to see if combo box itself has a description, perhaps through
   // tooltip (title attribute) or via aria-describedby
-  nsAccessible::GetDescription(aDescription);
-  if (!aDescription.IsEmpty()) {
-    return NS_OK;
-  }
+  nsAccessible::Description(aDescription);
+  if (!aDescription.IsEmpty())
+    return;
   // Use description of currently focused option
   nsAccessible *option = GetFocusedOptionAccessible();
-  return option ? option->GetDescription(aDescription) : NS_OK;
+  if (option)
+    option->Description(aDescription);
 }
 
 nsAccessible *
diff --git a/accessible/src/html/nsHTMLSelectAccessible.h b/accessible/src/html/nsHTMLSelectAccessible.h
index 08e9df70574e..bc5bc244a218 100644
--- a/accessible/src/html/nsHTMLSelectAccessible.h
+++ b/accessible/src/html/nsHTMLSelectAccessible.h
@@ -184,7 +184,6 @@ public:
 
   // nsIAccessible
   NS_IMETHOD GetValue(nsAString& _retval);
-  NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD DoAction(PRUint8 index);
   NS_IMETHOD GetNumActions(PRUint8 *aNumActions);
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
@@ -193,6 +192,7 @@ public:
   virtual void Shutdown();
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
   virtual void InvalidateChildren();
diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp
index b877b6800166..e697b8dd90a8 100644
--- a/accessible/src/html/nsHTMLTableAccessible.cpp
+++ b/accessible/src/html/nsHTMLTableAccessible.cpp
@@ -1260,14 +1260,14 @@ nsHTMLTableAccessible::GetCellAt(PRInt32        aRowIndex,
   return rv;
 }
 
-NS_IMETHODIMP nsHTMLTableAccessible::GetDescription(nsAString& aDescription)
+void
+nsHTMLTableAccessible::Description(nsString& aDescription)
 {
   // Helpful for debugging layout vs. data tables
   aDescription.Truncate();
-  nsAccessible::GetDescription(aDescription);
-  if (!aDescription.IsEmpty()) {
-    return NS_OK;
-  }
+  nsAccessible::Description(aDescription);
+  if (!aDescription.IsEmpty())
+    return;
 
   nsCOMPtr<nsIAccessible> captionAccessible;
   GetCaption(getter_AddRefs(captionAccessible));
@@ -1276,10 +1276,9 @@ NS_IMETHODIMP nsHTMLTableAccessible::GetDescription(nsAString& aDescription)
     nsCOMPtr<nsIDOMNode> captionNode;
     captionAccessNode->GetDOMNode(getter_AddRefs(captionNode));
     nsCOMPtr<nsIContent> captionContent = do_QueryInterface(captionNode);
-    if (captionContent) {
-      nsTextEquivUtils::
-        AppendTextEquivFromContent(this, captionContent, &aDescription);
-    }
+    if (captionContent)
+      nsTextEquivUtils::AppendTextEquivFromContent(this, captionContent,
+                                                   &aDescription);
   }
 #ifdef SHOW_LAYOUT_HEURISTIC
   if (aDescription.IsEmpty()) {
@@ -1291,8 +1290,6 @@ NS_IMETHODIMP nsHTMLTableAccessible::GetDescription(nsAString& aDescription)
   printf("\nTABLE: %s\n", NS_ConvertUTF16toUTF8(mLayoutHeuristic).get());
 #endif
 #endif
-
-  return NS_OK;
 }
 
 PRBool
diff --git a/accessible/src/html/nsHTMLTableAccessible.h b/accessible/src/html/nsHTMLTableAccessible.h
index 76874fced2dd..94b20121b63b 100644
--- a/accessible/src/html/nsHTMLTableAccessible.h
+++ b/accessible/src/html/nsHTMLTableAccessible.h
@@ -131,11 +131,11 @@ public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_TABLEACCESSIBLE_IMPL_CID)
 
   // nsIAccessible
-  NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD GetRelationByType(PRUint32 aRelationType,
                                nsIAccessibleRelation **aRelation);
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/mac/mozAccessible.mm b/accessible/src/mac/mozAccessible.mm
index f414bca1feb0..655cb59c31e8 100644
--- a/accessible/src/mac/mozAccessible.mm
+++ b/accessible/src/mac/mozAccessible.mm
@@ -518,8 +518,11 @@ GetNativeFromGeckoAccessible(nsIAccessible *anAccessible)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
 
+  if (mGeckoAccessible->IsDefunct())
+    return nil;
+
   nsAutoString desc;
-  mGeckoAccessible->GetDescription (desc);
+  mGeckoAccessible->Description(desc);
   return desc.IsEmpty() ? nil : [NSString stringWithCharacters:desc.BeginReading() length:desc.Length()];
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NIL;
diff --git a/accessible/src/msaa/nsAccessibleWrap.cpp b/accessible/src/msaa/nsAccessibleWrap.cpp
index 64a989d00b40..3b2ff2f92eaf 100644
--- a/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -333,11 +333,11 @@ __try {
   *pszDescription = NULL;
 
   nsAccessible *xpAccessible = GetXPAccessibleFor(varChild);
-  if (!xpAccessible)
+  if (!xpAccessible || xpAccessible->IsDefunct())
     return E_FAIL;
 
   nsAutoString description;
-  xpAccessible->GetDescription(description);
+  xpAccessible->Description(description);
 
   *pszDescription = ::SysAllocStringLen(description.get(),
                                         description.Length());
diff --git a/accessible/src/xforms/nsXFormsAccessible.cpp b/accessible/src/xforms/nsXFormsAccessible.cpp
index f235daff0334..8085a75e556c 100644
--- a/accessible/src/xforms/nsXFormsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsAccessible.cpp
@@ -197,21 +197,15 @@ nsXFormsAccessible::GetNameInternal(nsAString& aName)
   return GetBoundChildElementValue(NS_LITERAL_STRING("label"), aName);
 }
 
-NS_IMETHODIMP
-nsXFormsAccessible::GetDescription(nsAString& aDescription)
+void
+nsXFormsAccessible::Description(nsString& aDescription)
 {
-  nsAutoString description;
-  nsresult rv = nsTextEquivUtils::
+  nsTextEquivUtils::
     GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_describedby,
-                           description);
+                           aDescription);
 
-  if (NS_SUCCEEDED(rv) && !description.IsEmpty()) {
-    aDescription = description;
-    return NS_OK;
-  }
-
-  // search the xforms:hint element
-  return GetBoundChildElementValue(NS_LITERAL_STRING("hint"), aDescription);
+  if (aDescription.IsEmpty())
+    GetBoundChildElementValue(NS_LITERAL_STRING("hint"), aDescription);
 }
 
 PRBool
diff --git a/accessible/src/xforms/nsXFormsAccessible.h b/accessible/src/xforms/nsXFormsAccessible.h
index d8aea7793656..85fef238b2c5 100644
--- a/accessible/src/xforms/nsXFormsAccessible.h
+++ b/accessible/src/xforms/nsXFormsAccessible.h
@@ -77,10 +77,9 @@ public:
   // Returns value of instance node that xforms element is bound to.
   NS_IMETHOD GetValue(nsAString& aValue);
 
-  // Returns value of child xforms 'hint' element.
-  NS_IMETHOD GetDescription(nsAString& aDescription);
-
   // nsAccessible
+  // Returns value of child xforms 'hint' element.
+  virtual void Description(nsString& aDescription);
 
   // Returns value of child xforms 'label' element.
   virtual nsresult GetNameInternal(nsAString& aName);
diff --git a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
index 189367323640..b4816bd5eaf8 100644
--- a/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
@@ -64,15 +64,12 @@ nsXFormsLabelAccessible::GetNameInternal(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXFormsLabelAccessible::GetDescription(nsAString& aDescription)
+void
+nsXFormsLabelAccessible::Description(nsString& aDescription)
 {
-  nsAutoString description;
-  nsresult rv = nsTextEquivUtils::
+  nsTextEquivUtils::
     GetTextEquivFromIDRefs(this, nsAccessibilityAtoms::aria_describedby,
-                           description);
-  aDescription = description;
-  return rv;
+                           aDescription);
 }
 
 
diff --git a/accessible/src/xforms/nsXFormsFormControlsAccessible.h b/accessible/src/xforms/nsXFormsFormControlsAccessible.h
index bce9fa421c67..9a127cd6c1a7 100644
--- a/accessible/src/xforms/nsXFormsFormControlsAccessible.h
+++ b/accessible/src/xforms/nsXFormsFormControlsAccessible.h
@@ -50,10 +50,8 @@ class nsXFormsLabelAccessible : public nsXFormsAccessible
 public:
   nsXFormsLabelAccessible(nsIContent *aContent, nsIWeakReference *aShell);
 
-  // nsIAccessible
-  NS_IMETHOD GetDescription(nsAString& aDescription);
-
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
 };
diff --git a/accessible/src/xforms/nsXFormsWidgetsAccessible.cpp b/accessible/src/xforms/nsXFormsWidgetsAccessible.cpp
index fda8a737bf9a..eada6a4cc8cc 100644
--- a/accessible/src/xforms/nsXFormsWidgetsAccessible.cpp
+++ b/accessible/src/xforms/nsXFormsWidgetsAccessible.cpp
@@ -177,11 +177,10 @@ nsXFormsComboboxPopupWidgetAccessible::GetNameInternal(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXFormsComboboxPopupWidgetAccessible::GetDescription(nsAString& aDescription)
+void
+nsXFormsComboboxPopupWidgetAccessible::Description(nsString& aDescription)
 {
   aDescription.Truncate();
-  return NS_OK;
 }
 
 void
diff --git a/accessible/src/xforms/nsXFormsWidgetsAccessible.h b/accessible/src/xforms/nsXFormsWidgetsAccessible.h
index ad670fbb2d9c..121580c07d1e 100644
--- a/accessible/src/xforms/nsXFormsWidgetsAccessible.h
+++ b/accessible/src/xforms/nsXFormsWidgetsAccessible.h
@@ -91,9 +91,9 @@ public:
 
   // nsIAccessible
   NS_IMETHOD GetValue(nsAString& aValue);
-  NS_IMETHOD GetDescription(nsAString& aDescription);
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/xul/nsXULComboboxAccessible.cpp b/accessible/src/xul/nsXULComboboxAccessible.cpp
index ba75670655a0..5e4e12f8b858 100644
--- a/accessible/src/xul/nsXULComboboxAccessible.cpp
+++ b/accessible/src/xul/nsXULComboboxAccessible.cpp
@@ -112,32 +112,25 @@ nsXULComboboxAccessible::GetValue(nsAString& aValue)
   return NS_ERROR_FAILURE;
 }
 
-NS_IMETHODIMP
-nsXULComboboxAccessible::GetDescription(nsAString& aDescription)
+void
+nsXULComboboxAccessible::Description(nsString& aDescription)
 {
   aDescription.Truncate();
-
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   // Use description of currently focused option
   nsCOMPtr<nsIDOMXULMenuListElement> menuListElm(do_QueryInterface(mContent));
   if (!menuListElm)
-    return NS_ERROR_FAILURE;
+    return;
 
   nsCOMPtr<nsIDOMXULSelectControlItemElement> focusedOptionItem;
   menuListElm->GetSelectedItem(getter_AddRefs(focusedOptionItem));
   nsCOMPtr<nsIContent> focusedOptionContent =
     do_QueryInterface(focusedOptionItem);
   if (focusedOptionContent) {
-    nsAccessible *focusedOption =
-      GetAccService()->GetAccessibleInWeakShell(focusedOptionContent, mWeakShell);
-    NS_ENSURE_TRUE(focusedOption, NS_ERROR_FAILURE);
-
-    return focusedOption->GetDescription(aDescription);
+    nsAccessible* focusedOptionAcc = GetAccService()->
+      GetAccessibleInWeakShell(focusedOptionContent, mWeakShell);
+    if (focusedOptionAcc)
+      focusedOptionAcc->Description(aDescription);
   }
-
-  return NS_OK;
 }
 
 PRBool
diff --git a/accessible/src/xul/nsXULComboboxAccessible.h b/accessible/src/xul/nsXULComboboxAccessible.h
index 4ad42feb3f06..493048f6afb0 100644
--- a/accessible/src/xul/nsXULComboboxAccessible.h
+++ b/accessible/src/xul/nsXULComboboxAccessible.h
@@ -55,12 +55,12 @@ public:
 
   // nsIAccessible
   NS_IMETHOD GetValue(nsAString& aValue);
-  NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD DoAction(PRUint8 aIndex);
   NS_IMETHOD GetNumActions(PRUint8 *aNumActions);
   NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
   virtual PRBool GetAllowsAnonChildAccessibles();
diff --git a/accessible/src/xul/nsXULListboxAccessible.cpp b/accessible/src/xul/nsXULListboxAccessible.cpp
index 5fee55cdb5bb..68ee2a060a0b 100644
--- a/accessible/src/xul/nsXULListboxAccessible.cpp
+++ b/accessible/src/xul/nsXULListboxAccessible.cpp
@@ -861,6 +861,15 @@ nsXULListitemAccessible::GetListAccessible()
   return GetAccService()->GetAccessibleInWeakShell(listContent, mWeakShell);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// nsXULListitemAccessible nsAccessible
+
+void
+nsXULListitemAccessible::Description(nsString& aDesc)
+{
+  nsAccessibleWrap::Description(aDesc);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsXULListitemAccessible. nsIAccessible
 
diff --git a/accessible/src/xul/nsXULListboxAccessible.h b/accessible/src/xul/nsXULListboxAccessible.h
index 2ce661cc19fb..5bc7f19a00a6 100644
--- a/accessible/src/xul/nsXULListboxAccessible.h
+++ b/accessible/src/xul/nsXULListboxAccessible.h
@@ -123,9 +123,9 @@ public:
   // nsIAccessible
   NS_IMETHOD GetActionName(PRUint8 index, nsAString& aName);
   // Don't use XUL menuitems's description attribute
-  NS_IMETHOD GetDescription(nsAString& aDesc) { return nsAccessibleWrap::GetDescription(aDesc); }
 
   // nsAccessible
+  virtual void Description(nsString& aDesc);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();
diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp
index 60d37d413791..6c869bd6aa29 100644
--- a/accessible/src/xul/nsXULMenuAccessible.cpp
+++ b/accessible/src/xul/nsXULMenuAccessible.cpp
@@ -378,16 +378,11 @@ nsXULMenuitemAccessible::GetNameInternal(nsAString& aName)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXULMenuitemAccessible::GetDescription(nsAString& aDescription)
+void
+nsXULMenuitemAccessible::Description(nsString& aDescription)
 {
-  if (IsDefunct())
-    return NS_ERROR_FAILURE;
-
   mContent->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::description,
                     aDescription);
-
-  return NS_OK;
 }
 
 //return menu accesskey: N or Alt+F
diff --git a/accessible/src/xul/nsXULMenuAccessible.h b/accessible/src/xul/nsXULMenuAccessible.h
index c51c65497b19..1946059839f3 100644
--- a/accessible/src/xul/nsXULMenuAccessible.h
+++ b/accessible/src/xul/nsXULMenuAccessible.h
@@ -82,7 +82,6 @@ public:
   nsXULMenuitemAccessible(nsIContent *aContent, nsIWeakReference *aShell);
 
   // nsIAccessible
-  NS_IMETHOD GetDescription(nsAString& aDescription);
   NS_IMETHOD GetKeyboardShortcut(nsAString& _retval);
   NS_IMETHOD GetDefaultKeyBinding(nsAString& aKeyBinding);
   NS_IMETHOD DoAction(PRUint8 index);
@@ -90,6 +89,7 @@ public:
   NS_IMETHOD GetNumActions(PRUint8 *_retval);
 
   // nsAccessible
+  virtual void Description(nsString& aDescription);
   virtual nsresult GetNameInternal(nsAString& aName);
   virtual PRUint32 NativeRole();
   virtual PRUint64 NativeState();

From 9ca8fbddbcc2ac4113899ba1c06141303803486a Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 3 May 2011 13:19:18 -0700
Subject: [PATCH 143/314] Pass whether we're in a string to
 ParseAndAppendEscape.  (Bug 384672, patch 1)  r=bzbarsky

This passes true for string tokens and for url() tokens containing
string, since that is what CSS 2.1 chapter 4's tokenization suggests.
---
 layout/style/nsCSSScanner.cpp | 10 +++++-----
 layout/style/nsCSSScanner.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index 9be202e130f4..6c85b14a5cd7 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -971,7 +971,7 @@ nsCSSScanner::NextURL(nsCSSToken& aToken)
     ch = Read();
     if (ch < 0) break;
     if (ch == CSS_ESCAPE) {
-      ParseAndAppendEscape(ident);
+      ParseAndAppendEscape(ident, PR_FALSE);
     } else if (IsWhitespace(ch)) {
       // Whitespace is allowed at the end of the URL
       EatWhiteSpace();
@@ -1003,7 +1003,7 @@ nsCSSScanner::NextURL(nsCSSToken& aToken)
 
 
 void
-nsCSSScanner::ParseAndAppendEscape(nsString& aOutput)
+nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
 {
   PRInt32 ch = Peek();
   if (ch < 0) {
@@ -1076,7 +1076,7 @@ PRBool
 nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
 {
   if (aChar == CSS_ESCAPE) {
-    ParseAndAppendEscape(aIdent);
+    ParseAndAppendEscape(aIdent, PR_FALSE);
   }
   else if (0 < aChar) {
     aIdent.Append(aChar);
@@ -1103,7 +1103,7 @@ nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
     aChar = Read();
     if (aChar < 0) break;
     if (aChar == CSS_ESCAPE) {
-      ParseAndAppendEscape(aIdent);
+      ParseAndAppendEscape(aIdent, PR_FALSE);
     } else if (IsIdent(aChar)) {
       aIdent.Append(PRUnichar(aChar));
     } else {
@@ -1367,7 +1367,7 @@ nsCSSScanner::ParseString(PRInt32 aStop, nsCSSToken& aToken)
       break;
     }
     if (ch == CSS_ESCAPE) {
-      ParseAndAppendEscape(aToken.mIdent);
+      ParseAndAppendEscape(aToken.mIdent, PR_TRUE);
     } else {
       aToken.mIdent.Append(ch);
     }
diff --git a/layout/style/nsCSSScanner.h b/layout/style/nsCSSScanner.h
index 882458ffd1d6..9f3b38a49f01 100644
--- a/layout/style/nsCSSScanner.h
+++ b/layout/style/nsCSSScanner.h
@@ -215,7 +215,7 @@ protected:
   PRBool LookAheadOrEOF(PRUnichar aChar); // expect either aChar or EOF
   void EatWhiteSpace();
   
-  void ParseAndAppendEscape(nsString& aOutput);
+  void ParseAndAppendEscape(nsString& aOutput, PRBool aInString);
   PRBool ParseIdent(PRInt32 aChar, nsCSSToken& aResult);
   PRBool ParseAtKeyword(PRInt32 aChar, nsCSSToken& aResult);
   PRBool ParseNumber(PRInt32 aChar, nsCSSToken& aResult);

From 87048f5536f114b3700f8acb81bb75ccdd17fba5 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 3 May 2011 13:19:19 -0700
Subject: [PATCH 144/314] Handle failure of GatherIdent, which can (starting
 with the next patch) fail when the character sequence is not an identifier. 
 Additionally, change the tokenization of a hash (#) followed by a non-name
 character or EOF to tokenize as DELIM (eCSSToken_Symbol) rather than as
 eCSSToken_Hash.  This only changes the behavior in the EOF case, because the
 only caller (color parsing) that accepts eCSSToken_Hash (rather than only
 eCSSToken_ID) checks the length. (Bug 384672, patch 2)  r=bzbarsky

---
 layout/style/nsCSSScanner.cpp         | 36 +++++++++++++++++++--------
 layout/style/test/test_selectors.html | 24 ++++++++++++++++++
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index 6c85b14a5cd7..f49157891428 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -1071,6 +1071,10 @@ nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
  * will be aIdent with all of the identifier characters appended
  * until the first non-identifier character is seen. The termination
  * character is unread for the future re-reading.
+ *
+ * Returns failure when the character sequence does not form an ident at
+ * all, in which case the caller is responsible for pushing back or
+ * otherwise handling aChar.  (This occurs only when aChar is '\'.)
  */
 PRBool
 nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
@@ -1117,19 +1121,24 @@ nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
 PRBool
 nsCSSScanner::ParseRef(PRInt32 aChar, nsCSSToken& aToken)
 {
-  aToken.mIdent.SetLength(0);
-  aToken.mType = eCSSToken_Ref;
+  // Fall back for when we don't have name characters following:
+  aToken.mType = eCSSToken_Symbol;
+  aToken.mSymbol = aChar;
+
   PRInt32 ch = Read();
   if (ch < 0) {
-    return PR_FALSE;
+    return PR_TRUE;
   }
   if (IsIdent(ch) || ch == CSS_ESCAPE) {
     // First char after the '#' is a valid ident char (or an escape),
     // so it makes sense to keep going
-    if (StartsIdent(ch, Peek())) {
-      aToken.mType = eCSSToken_ID;
+    nsCSSTokenType type =
+      StartsIdent(ch, Peek()) ? eCSSToken_ID : eCSSToken_Ref;
+    aToken.mIdent.SetLength(0);
+    if (GatherIdent(ch, aToken.mIdent)) {
+      aToken.mType = type;
+      return PR_TRUE;
     }
-    return GatherIdent(ch, aToken.mIdent);
   }
 
   // No ident chars after the '#'.  Just unread |ch| and get out of here.
@@ -1143,7 +1152,9 @@ nsCSSScanner::ParseIdent(PRInt32 aChar, nsCSSToken& aToken)
   nsString& ident = aToken.mIdent;
   ident.SetLength(0);
   if (!GatherIdent(aChar, ident)) {
-    return PR_FALSE;
+    aToken.mType = eCSSToken_Symbol;
+    aToken.mSymbol = aChar;
+    return PR_TRUE;
   }
 
   nsCSSTokenType tokenType = eCSSToken_Ident;
@@ -1167,7 +1178,11 @@ nsCSSScanner::ParseAtKeyword(PRInt32 aChar, nsCSSToken& aToken)
 {
   aToken.mIdent.SetLength(0);
   aToken.mType = eCSSToken_AtKeyword;
-  return GatherIdent(0, aToken.mIdent);
+  if (!GatherIdent(0, aToken.mIdent)) {
+    aToken.mType = eCSSToken_Symbol;
+    aToken.mSymbol = PRUnichar('@');
+  }
+  return PR_TRUE;
 }
 
 PRBool
@@ -1287,10 +1302,9 @@ nsCSSScanner::ParseNumber(PRInt32 c, nsCSSToken& aToken)
   // Look at character that terminated the number
   if (c >= 0) {
     if (StartsIdent(c, Peek())) {
-      if (!GatherIdent(c, ident)) {
-        return PR_FALSE;
+      if (GatherIdent(c, ident)) {
+        type = eCSSToken_Dimension;
       }
-      type = eCSSToken_Dimension;
     } else if ('%' == c) {
       type = eCSSToken_Percentage;
       value = value / 100.0f;
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index 44ea328849bd..c742059fc3b8 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -233,6 +233,18 @@ function run() {
         });
     }
 
+    function test_unparseable_via_api(selector)
+    {
+        try {
+          // Test that it is also unparseable when followed by EOF.
+          ifdoc.body.mozMatchesSelector(selector);
+          ok(false, "selector '" + selector + "' plus EOF is parse error");
+        } catch(ex) {
+          is(ex.code, DOMException.SYNTAX_ERR,
+             "selector '" + selector + "' plus EOF is parse error");
+        }
+    }
+
     function test_balanced_unparseable(selector)
     {
         var zi1 = ++gCounter;
@@ -248,6 +260,7 @@ function run() {
            "selector " + selector + " error was recovered from");
         ifdoc.body.innerHTML = "";
         style_text.data = "";
+        test_unparseable_via_api(selector);
     }
 
     function test_unbalanced_unparseable(selector)
@@ -263,6 +276,7 @@ function run() {
            "sheet should have no rules since " + selector + " is parse error");
         ifdoc.body.innerHTML = "";
         style_text.data = "";
+        test_unparseable_via_api(selector);
     }
 
 
@@ -891,6 +905,16 @@ function run() {
                           bodychildset([2, 3, 8]),
                           bodychildset([0, 1, 4, 5, 6, 7]));
 
+    // Test that we don't tokenize an empty HASH.
+    test_balanced_unparseable("#");
+    test_balanced_unparseable("# ");
+    test_balanced_unparseable("#, p");
+    test_balanced_unparseable("# , p");
+    test_balanced_unparseable("p #");
+    test_balanced_unparseable("p # ");
+    test_balanced_unparseable("p #, p");
+    test_balanced_unparseable("p # , p");
+
     run_deferred_tests();
 }
 

From 18e5edff9c2f5b04f842d08e4713dfa9c425eca2 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 3 May 2011 13:19:19 -0700
Subject: [PATCH 145/314] Allow ParseAndAppendEscape to fail when the stream
 does not contain an escape, and make callers handle this failure
 appropriately.  This changes our behavior when backslash immediately precedes
 end-of-stream.  (Bug 384672, patch 3)  r=bzbarsky

---
 layout/style/nsCSSScanner.cpp         | 44 ++++++++++++++++++++++-----
 layout/style/nsCSSScanner.h           |  4 +--
 layout/style/test/test_selectors.html |  3 ++
 3 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index f49157891428..beb88a709041 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -971,7 +971,11 @@ nsCSSScanner::NextURL(nsCSSToken& aToken)
     ch = Read();
     if (ch < 0) break;
     if (ch == CSS_ESCAPE) {
-      ParseAndAppendEscape(ident, PR_FALSE);
+      if (!ParseAndAppendEscape(ident, PR_FALSE)) {
+        ok = PR_FALSE;
+        Pushback(ch);
+        break;
+      }
     } else if (IsWhitespace(ch)) {
       // Whitespace is allowed at the end of the URL
       EatWhiteSpace();
@@ -1002,13 +1006,16 @@ nsCSSScanner::NextURL(nsCSSToken& aToken)
 }
 
 
-void
+/**
+ * Returns whether an escape was succesfully parsed; if it was not,
+ * the backslash needs to be its own symbol token.
+ */
+PRBool
 nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
 {
   PRInt32 ch = Peek();
   if (ch < 0) {
-    aOutput.Append(CSS_ESCAPE);
-    return;
+    return PR_FALSE;
   }
   if (IsHexDigit(ch)) {
     PRInt32 rv = 0;
@@ -1054,7 +1061,7 @@ nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
       if (IsWhitespace(ch))
         Pushback(ch);
     }
-    return;
+    return PR_TRUE;
   } 
   // "Any character except a hexidecimal digit can be escaped to
   // remove its special meaning by putting a backslash in front"
@@ -1063,6 +1070,8 @@ nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
   if ((ch > 0) && (ch != '\n')) {
     aOutput.Append(ch);
   }
+
+  return PR_TRUE;
 }
 
 /**
@@ -1080,7 +1089,9 @@ PRBool
 nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
 {
   if (aChar == CSS_ESCAPE) {
-    ParseAndAppendEscape(aIdent, PR_FALSE);
+    if (!ParseAndAppendEscape(aIdent, PR_FALSE)) {
+      return PR_FALSE;
+    }
   }
   else if (0 < aChar) {
     aIdent.Append(aChar);
@@ -1107,7 +1118,10 @@ nsCSSScanner::GatherIdent(PRInt32 aChar, nsString& aIdent)
     aChar = Read();
     if (aChar < 0) break;
     if (aChar == CSS_ESCAPE) {
-      ParseAndAppendEscape(aIdent, PR_FALSE);
+      if (!ParseAndAppendEscape(aIdent, PR_FALSE)) {
+        Pushback(aChar);
+        break;
+      }
     } else if (IsIdent(aChar)) {
       aIdent.Append(PRUnichar(aChar));
     } else {
@@ -1381,7 +1395,21 @@ nsCSSScanner::ParseString(PRInt32 aStop, nsCSSToken& aToken)
       break;
     }
     if (ch == CSS_ESCAPE) {
-      ParseAndAppendEscape(aToken.mIdent, PR_TRUE);
+      if (!ParseAndAppendEscape(aToken.mIdent, PR_TRUE)) {
+        aToken.mType = eCSSToken_Bad_String;
+        Pushback(ch);
+#ifdef CSS_REPORT_PARSE_ERRORS
+        // For strings, the only case where ParseAndAppendEscape will
+        // return false is when there's a backslash to start an escape
+        // immediately followed by end-of-stream.  In that case, the
+        // correct tokenization is badstring *followed* by a DELIM for
+        // the backslash, but as far as the author is concerned, it
+        // works pretty much the same as an unterminated string, so we
+        // use the same error message.
+        ReportUnexpectedToken(aToken, "SEUnterminatedString");
+#endif
+        break;
+      }
     } else {
       aToken.mIdent.Append(ch);
     }
diff --git a/layout/style/nsCSSScanner.h b/layout/style/nsCSSScanner.h
index 9f3b38a49f01..ed82e3dc7034 100644
--- a/layout/style/nsCSSScanner.h
+++ b/layout/style/nsCSSScanner.h
@@ -214,8 +214,8 @@ protected:
   PRBool LookAhead(PRUnichar aChar);
   PRBool LookAheadOrEOF(PRUnichar aChar); // expect either aChar or EOF
   void EatWhiteSpace();
-  
-  void ParseAndAppendEscape(nsString& aOutput, PRBool aInString);
+
+  PRBool ParseAndAppendEscape(nsString& aOutput, PRBool aInString);
   PRBool ParseIdent(PRInt32 aChar, nsCSSToken& aResult);
   PRBool ParseAtKeyword(PRInt32 aChar, nsCSSToken& aResult);
   PRBool ParseNumber(PRInt32 aChar, nsCSSToken& aResult);
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index c742059fc3b8..37d7dc6ac351 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -915,6 +915,9 @@ function run() {
     test_balanced_unparseable("p #, p");
     test_balanced_unparseable("p # , p");
 
+    // Test that a backslash alone is not treated as an escape.
+    test_unparseable_via_api("#\\");
+
     run_deferred_tests();
 }
 

From 85a254af54d9a78be2eabf4d69e23f241d747e94 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 3 May 2011 13:19:19 -0700
Subject: [PATCH 146/314] Only allow escaped newlines inside strings (which
 includes url() tokens that contain strings).  (Bug 384672, patch 4) 
 r=bzbarsky

---
 layout/style/nsCSSScanner.cpp          | 16 +++++++++++++---
 layout/style/test/test_parse_rule.html |  3 +--
 layout/style/test/test_parse_url.html  |  7 +++++++
 layout/style/test/test_selectors.html  |  7 +++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/layout/style/nsCSSScanner.cpp b/layout/style/nsCSSScanner.cpp
index beb88a709041..5124967e571e 100644
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@@ -1013,13 +1013,14 @@ nsCSSScanner::NextURL(nsCSSToken& aToken)
 PRBool
 nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
 {
-  PRInt32 ch = Peek();
+  PRInt32 ch = Read();
   if (ch < 0) {
     return PR_FALSE;
   }
   if (IsHexDigit(ch)) {
     PRInt32 rv = 0;
     int i;
+    Pushback(ch);
     for (i = 0; i < 6; i++) { // up to six digits
       ch = Read();
       if (ch < 0) {
@@ -1066,8 +1067,17 @@ nsCSSScanner::ParseAndAppendEscape(nsString& aOutput, PRBool aInString)
   // "Any character except a hexidecimal digit can be escaped to
   // remove its special meaning by putting a backslash in front"
   // -- CSS1 spec section 7.1
-  ch = Read();  // Consume the escaped character
-  if ((ch > 0) && (ch != '\n')) {
+  if (ch == '\n') {
+    if (!aInString) {
+      // Outside of strings (which includes url() that contains a
+      // string), escaped newlines aren't special, and just tokenize as
+      // eCSSToken_Symbol (DELIM).
+      Pushback(ch);
+      return PR_FALSE;
+    }
+    // In strings (and in url() containing a string), escaped newlines
+    // are just dropped to allow splitting over multiple lines.
+  } else {
     aOutput.Append(ch);
   }
 
diff --git a/layout/style/test/test_parse_rule.html b/layout/style/test/test_parse_rule.html
index 446c7f6aff6a..78cd8c36c9e0 100644
--- a/layout/style/test/test_parse_rule.html
+++ b/layout/style/test/test_parse_rule.html
@@ -131,8 +131,7 @@ base + "#a {color: rgb(255.0, 0, 0)}",
 "#a {color: rgb(0%, 49.999999999999%, 0%)}",
 ], prop: "color", pseudo: "",
 todo: {
-       "div[title~='weeqweqeweasd\\D\\A a']{color:green}" : 1,
-       "div {color:green}#a\\\n{color:red}" : 1
+       "div[title~='weeqweqeweasd\\D\\A a']{color:green}" : 1
       }
 },
 
diff --git a/layout/style/test/test_parse_url.html b/layout/style/test/test_parse_url.html
index e9b53bcdc7a5..ab1b9c4d2f7c 100644
--- a/layout/style/test/test_parse_url.html
+++ b/layout/style/test/test_parse_url.html
@@ -180,6 +180,13 @@ div.setAttribute("style", "color: url(/*); color: green");
 is(div.style.color, 'green',
    "URL tokenized correctly outside properties taking URLs");
 
+div.style.listStyleImage = 'url("foo\\\nbar1")';
+is(div.style.listStyleImage, 'url("foobar1")',
+   "escaped newline allowed in string form of URL");
+div.style.listStyleImage = 'url(foo\\\nbar2)';
+is(div.style.listStyleImage, 'url("foobar1")',
+   "escaped newline NOT allowed in NON-string form of URL");
+
 </script>
 </pre>
 </body>
diff --git a/layout/style/test/test_selectors.html b/layout/style/test/test_selectors.html
index 37d7dc6ac351..7eeadb719fdb 100644
--- a/layout/style/test/test_selectors.html
+++ b/layout/style/test/test_selectors.html
@@ -918,6 +918,13 @@ function run() {
     // Test that a backslash alone is not treated as an escape.
     test_unparseable_via_api("#\\");
 
+    // Test that newline escapes are only supported in strings.
+    test_balanced_unparseable("di\\\nv");
+    test_balanced_unparseable("div \\\n p");
+    test_balanced_unparseable("div\\\n p");
+    test_balanced_unparseable("div \\\np");
+    test_balanced_unparseable("div\\\np");
+
     run_deferred_tests();
 }
 

From 759fc4c56da0fdff1fb9f2ad3a62058678b8941d Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 3 May 2011 13:19:19 -0700
Subject: [PATCH 147/314] Fix the remaining todo test in test_parse_rule.html,
 which is invalid since ~= selectors never match anything containing spaces. 
 (Bug 384672, patch 5)  r=bzbarsky

---
 layout/style/test/test_parse_rule.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/layout/style/test/test_parse_rule.html b/layout/style/test/test_parse_rule.html
index 78cd8c36c9e0..338d65419240 100644
--- a/layout/style/test/test_parse_rule.html
+++ b/layout/style/test/test_parse_rule.html
@@ -48,7 +48,7 @@ base + "#a {color: rgb\n(255, 0, 0)}",
 "@threedee maroon url('asdf\n) ra('asdf\n); " + base,
 "@threedee {maroon url('asdf\n) ra('asdf\n);} " + base,
 "div[title='zxcv weeqweqeweasd\\D\\A a']{color:green}",
-"div[title~='weeqweqeweasd\\D\\A a']{color:green}",
+"div[title~='weeqweqeweasd']{color:green}",
 base + "#a\\\n{color:red}",
 base + "#a\v{color:red}",
 
@@ -129,10 +129,7 @@ base + "#a {color: rgb(255.0, 0, 0)}",
 "#a {color: rgb(0, 128, 0)}",
 "#a {color: rgb(0%, 50%, 0%)}",
 "#a {color: rgb(0%, 49.999999999999%, 0%)}",
-], prop: "color", pseudo: "",
-todo: {
-       "div[title~='weeqweqeweasd\\D\\A a']{color:green}" : 1
-      }
+], prop: "color", pseudo: ""
 },
 
 // Border tests

From 1c0c08630a5ad823994d74dfc4bad2cb647b7726 Mon Sep 17 00:00:00 2001
From: Johnny Stenback <jst@mozilla.com>
Date: Tue, 26 Apr 2011 11:36:38 -0700
Subject: [PATCH 148/314] Fix bug 649795. Crash when accessing mOwner which
 might not always be set.  r=bsmedberg

---
 dom/plugins/base/nsPluginStreamListenerPeer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/plugins/base/nsPluginStreamListenerPeer.cpp b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
index 5cdf9d4dc2ba..47c197801435 100644
--- a/dom/plugins/base/nsPluginStreamListenerPeer.cpp
+++ b/dom/plugins/base/nsPluginStreamListenerPeer.cpp
@@ -874,7 +874,7 @@ nsresult nsPluginStreamListenerPeer::ServeStreamAsFile(nsIRequest *request,
       window->window = widget->GetNativeData(NS_NATIVE_PLUGIN_PORT);
     }
 #endif
-    mOwner->SetWindow();
+    owner->SetWindow();
   }
   
   mSeekable = PR_FALSE;

From 1474a79df3123a3e4e3eba452732957520a86229 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 3 May 2011 01:59:46 +0200
Subject: [PATCH 149/314] Bug 636149 - Home Page -> Use Current Pages; Does not
 respect Tab groups; r=gavin

---
 browser/components/preferences/main.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 40969b46d103..8847a5614334 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -129,16 +129,10 @@ var gMainPane = {
 
     if (win) {
       var homePage = document.getElementById("browser.startup.homepage");
-      var browser = win.document.getElementById("content");
-
-      var newVal = browser.browsers[0].currentURI.spec;
-      if (browser.browsers.length > 1) {
-        // XXX using dangerous "|" joiner!
-        for (var i = 1; i < browser.browsers.length; i++)
-          newVal += "|" + browser.browsers[i].currentURI.spec;
-      }
-
-      homePage.value = newVal;
+      var tabs = win.gBrowser.visibleTabs;
+      function getTabURI(t) t.linkedBrowser.currentURI.spec;
+      // FIXME Bug 244192: using dangerous "|" joiner!
+      homePage.value = tabs.map(getTabURI).join("|");
     }
   },
 

From 330157d5ea6b209a6e4ea92eae2beb82f824efcd Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Tue, 3 May 2011 18:23:44 +0800
Subject: [PATCH 150/314] Bug 649347 - about: pages do not have favicons on the
 thumbnails [r=ian]

---
 browser/base/content/tabview/groupitems.js    | 23 +++++++++++++-----
 browser/base/content/tabview/tabitems.js      | 14 +++--------
 browser/base/content/tabview/ui.js            | 24 +++++++++++++++++++
 .../test/tabview/browser_tabview_bug600645.js |  2 +-
 .../test/tabview/browser_tabview_bug610242.js |  2 +-
 5 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index b8c52632765b..6ad132496b1d 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1145,9 +1145,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
   addAppTab: function GroupItem_addAppTab(xulTab, options) {
     let self = this;
 
-    // add the icon
-    let iconUrl = gFavIconService.getFaviconImageForPage(
-                    xulTab.linkedBrowser.currentURI).spec;
+    let iconUrl = GroupItems.getAppTabFavIconUrl(xulTab);
     let $appTab = iQ("<img>")
       .addClass("appTabIcon")
       .attr("src", iconUrl)
@@ -2011,8 +2009,7 @@ let GroupItems = {
     if (xulTab.ownerDocument.defaultView != gWindow || !xulTab.pinned)
       return;
 
-    let iconUrl = gFavIconService.getFaviconImageForPage(
-                    xulTab.linkedBrowser.currentURI).spec;
+    let iconUrl = this.getAppTabFavIconUrl(xulTab);
     this.groupItems.forEach(function(groupItem) {
       iQ(".appTabIcon", groupItem.$appTabTray).each(function(icon) {
         let $icon = iQ(icon);
@@ -2024,7 +2021,21 @@ let GroupItems = {
         return false;
       });
     });
-  },  
+  },
+
+  // ----------
+  // Function: getAppTabFavIconUrl
+  // Gets the fav icon url for app tab.
+  getAppTabFavIconUrl: function GroupItems__getAppTabFavIconUrl(xulTab) {
+    let iconUrl;
+
+    if (UI.shouldLoadFavIcon(xulTab.linkedBrowser))
+      iconUrl = UI.getFavIconUrlForTab(xulTab);
+    else
+      iconUrl = Utils.defaultFaviconURL;
+
+    return iconUrl;
+  },
 
   // ----------
   // Function: addAppTab
diff --git a/browser/base/content/tabview/tabitems.js b/browser/base/content/tabview/tabitems.js
index 13b490c95d82..24b467d63ccc 100644
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -983,9 +983,9 @@ let TabItems = {
       // Even if the page hasn't loaded, display the favicon and title
 
       // ___ icon
-      if (this.shouldLoadFavIcon(tab.linkedBrowser)) {
-        let iconUrl = gFavIconService.getFaviconImageForPage(
-                        tab.linkedBrowser.currentURI).spec;
+      if (UI.shouldLoadFavIcon(tab.linkedBrowser)) {
+        let iconUrl = UI.getFavIconUrlForTab(tab);
+
         if (tabItem.$favImage[0].src != iconUrl)
           tabItem.$favImage[0].src = iconUrl;
 
@@ -1048,14 +1048,6 @@ let TabItems = {
     }
   },
 
-  // ----------
-  // Function: shouldLoadFavIcon
-  // Takes a xul:browser and checks whether we should display a favicon for it.
-  shouldLoadFavIcon: function TabItems_shouldLoadFavIcon(browser) {
-    return !(browser.contentDocument instanceof window.ImageDocument) &&
-           gBrowser.shouldLoadFavIcon(browser.contentDocument.documentURIObject);
-  },
-
   // ----------
   // Function: link
   // Takes in a xul:tab, creates a TabItem for it and adds it to the scene. 
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 2963f88c9880..c73c980a53c5 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -1562,6 +1562,30 @@ let UI = {
     this._save();
     GroupItems.saveAll();
     TabItems.saveAll();
+  },
+
+  // ----------
+  // Function: shouldLoadFavIcon
+  // Takes a xul:browser and checks whether we should display a favicon for it.
+  shouldLoadFavIcon: function UI_shouldLoadFavIcon(browser) {
+    return !(browser.contentDocument instanceof window.ImageDocument) &&
+            (browser.currentURI.schemeIs("about") ||
+             gBrowser.shouldLoadFavIcon(browser.contentDocument.documentURIObject));
+  },
+
+  // ----------
+  // Function: getFavIconUrlForTab
+  // Gets fav icon url for the given xul:tab.
+  getFavIconUrlForTab: function UI_getFavIconUrlForTab(tab) {
+    let url;
+
+    // use the tab image if it doesn't start with http e.g. data:image/png, chrome://
+    if (tab.image && !(/^https?:/.test(tab.image)))
+      url = tab.image;
+    else
+      url = gFavIconService.getFaviconImageForPage(tab.linkedBrowser.currentURI).spec;
+
+    return url;
   }
 };
 
diff --git a/browser/base/content/test/tabview/browser_tabview_bug600645.js b/browser/base/content/test/tabview/browser_tabview_bug600645.js
index 295003ddd53b..f705807d32a9 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug600645.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug600645.js
@@ -38,7 +38,7 @@ function onTabViewWindowLoaded() {
     // code.
     executeSoon(function() {
       is($icon.attr("src"), contentWindow.Utils.defaultFaviconURL, 
-         "The icon is showing th default fav icon");
+         "The icon is showing the default fav icon");
 
       // clean up
       gBrowser.removeTab(newTab);
diff --git a/browser/base/content/test/tabview/browser_tabview_bug610242.js b/browser/base/content/test/tabview/browser_tabview_bug610242.js
index b237c4cb7567..97a643254cf3 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug610242.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug610242.js
@@ -71,7 +71,7 @@ function onTabViewWindowLoaded(win) {
     afterAllTabItemsUpdated(function() {
       check(datatext, "datatext", false);
       check(datahtml, "datahtml", false);
-      check(mozilla, "about:mozilla", false);
+      check(mozilla, "about:mozilla", true);
       check(html, "html", true);
       check(png, "png", false);
       check(svg, "svg", true);

From 22595309e708fd95b78861e4dd5d9ace26eabb23 Mon Sep 17 00:00:00 2001
From: Nick Hurley <hurley@mozilla.com>
Date: Tue, 3 May 2011 17:47:05 -0400
Subject: [PATCH 151/314] bug 648878 - move get(local|remote)(address|port) to
 httpchannelchild, r=jduell

---
 netwerk/ipc/NeckoMessageUtils.h             | 55 ++++++++++++++++++
 netwerk/protocol/http/HttpBaseChannel.cpp   | 62 +++++++++++++++++++++
 netwerk/protocol/http/HttpBaseChannel.h     | 10 ++++
 netwerk/protocol/http/HttpChannelChild.cpp  | 26 +++++++--
 netwerk/protocol/http/HttpChannelChild.h    |  8 ++-
 netwerk/protocol/http/HttpChannelParent.cpp |  4 +-
 netwerk/protocol/http/PHttpChannel.ipdl     |  6 +-
 netwerk/protocol/http/nsHttpChannel.cpp     | 60 --------------------
 netwerk/protocol/http/nsHttpChannel.h       |  7 ---
 9 files changed, 161 insertions(+), 77 deletions(-)

diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index 400645e857bd..c2d64444a804 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -47,6 +47,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsStringStream.h"
+#include "prio.h"
 
 namespace IPC {
 
@@ -325,6 +326,60 @@ struct ParamTraits<Permission>
   }
 };
 
+template<>
+struct ParamTraits<PRNetAddr>
+{
+  static void Write(Message* aMsg, const PRNetAddr &aParam)
+  {
+    WriteParam(aMsg, aParam.raw.family);
+    if (aParam.raw.family == PR_AF_UNSPEC) {
+      aMsg->WriteBytes(aParam.raw.data, sizeof(aParam.raw.data));
+    } else if (aParam.raw.family == PR_AF_INET) {
+      WriteParam(aMsg, aParam.inet.port);
+      WriteParam(aMsg, aParam.inet.ip);
+    } else if (aParam.raw.family == PR_AF_INET6) {
+      WriteParam(aMsg, aParam.ipv6.port);
+      WriteParam(aMsg, aParam.ipv6.flowinfo);
+      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[0]);
+      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[1]);
+      WriteParam(aMsg, aParam.ipv6.scope_id);
+    } else if (aParam.raw.family == PR_AF_LOCAL) {
+      aMsg->WriteBytes(aParam.local.path, sizeof(aParam.local.path));
+    }
+
+    /* If we get here without hitting any of the cases above, there's not much
+     * we can do but let the deserializer fail when it gets this message */
+  }
+
+  static bool Read(const Message* aMsg, void** aIter, PRNetAddr* aResult)
+  {
+    if (!ReadParam(aMsg, aIter, &aResult->raw.family))
+      return false;
+
+    if (aResult->raw.family == PR_AF_UNSPEC) {
+      return aMsg->ReadBytes(aIter,
+                             reinterpret_cast<const char**>(&aResult->raw.data),
+                             sizeof(aResult->raw.data));
+    } else if (aResult->raw.family == PR_AF_INET) {
+      return ReadParam(aMsg, aIter, &aResult->inet.port) &&
+             ReadParam(aMsg, aIter, &aResult->inet.ip);
+    } else if (aResult->raw.family == PR_AF_INET6) {
+      return ReadParam(aMsg, aIter, &aResult->ipv6.port) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.flowinfo) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[0]) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[1]) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.scope_id);
+    } else if (aResult->raw.family == PR_AF_LOCAL) {
+      return aMsg->ReadBytes(aIter,
+                             reinterpret_cast<const char**>(&aResult->local.path),
+                             sizeof(aResult->local.path));
+    }
+
+    /* We've been tricked by some socket family we don't know about! */
+    return false;
+  }
+};
+
 }
 
 #endif // mozilla_net_NeckoMessageUtils_h
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 1960ed546cd9..fd5f5cc6cb35 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -54,6 +54,8 @@
 #include "nsEscape.h"
 #include "nsPrintfCString.h"
 
+#include "prnetdb.h"
+
 namespace mozilla {
 namespace net {
 
@@ -1177,6 +1179,66 @@ HttpBaseChannel::SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+HttpBaseChannel::GetLocalAddress(nsACString& addr)
+{
+    if (mSelfAddr.raw.family == PR_AF_UNSPEC)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    addr.SetCapacity(64);
+    PR_NetAddrToString(&mSelfAddr, addr.BeginWriting(), 64);
+    addr.SetLength(strlen(addr.BeginReading()));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetLocalPort(PRInt32* port)
+{
+    NS_ENSURE_ARG_POINTER(port);
+
+    if (mSelfAddr.raw.family == PR_AF_INET) {
+        *port = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
+    }
+    else if (mSelfAddr.raw.family == PR_AF_INET6) {
+        *port = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
+    }
+    else
+        return NS_ERROR_NOT_AVAILABLE;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetRemoteAddress(nsACString& addr)
+{
+    if (mPeerAddr.raw.family == PR_AF_UNSPEC)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    addr.SetCapacity(64);
+    PR_NetAddrToString(&mPeerAddr, addr.BeginWriting(), 64);
+    addr.SetLength(strlen(addr.BeginReading()));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetRemotePort(PRInt32* port)
+{
+    NS_ENSURE_ARG_POINTER(port);
+
+    if (mPeerAddr.raw.family == PR_AF_INET) {
+        *port = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
+    }
+    else if (mPeerAddr.raw.family == PR_AF_INET6) {
+        *port = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
+    }
+    else
+        return NS_ERROR_NOT_AVAILABLE;
+
+    return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 5eba942cc829..73a5ac43c3f5 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -155,6 +155,10 @@ public:
   NS_IMETHOD GetChannelIsForDownload(PRBool *aChannelIsForDownload);
   NS_IMETHOD SetChannelIsForDownload(PRBool aChannelIsForDownload);
   NS_IMETHOD SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys);
+  NS_IMETHOD GetLocalAddress(nsACString& addr);
+  NS_IMETHOD GetLocalPort(PRInt32* port);
+  NS_IMETHOD GetRemoteAddress(nsACString& addr);
+  NS_IMETHOD GetRemotePort(PRInt32* port);
   inline void CleanRedirectCacheChainIfNecessary()
   {
       if (mRedirectedCachekeys) {
@@ -197,6 +201,9 @@ public:
     nsHttpResponseHead * GetResponseHead() const { return mResponseHead; }
     nsHttpRequestHead * GetRequestHead() { return &mRequestHead; }
 
+    const PRNetAddr& GetSelfAddr() { return mSelfAddr; }
+    const PRNetAddr& GetPeerAddr() { return mPeerAddr; }
+
 protected:
   nsresult ApplyContentConversions();
 
@@ -236,6 +243,9 @@ protected:
   nsCString                         mContentCharsetHint;
   nsCString                         mUserSetCookieHeader;
 
+  PRNetAddr                         mSelfAddr;
+  PRNetAddr                         mPeerAddr;
+
   // Resumable channel specific data
   nsCString                         mEntityID;
   PRUint64                          mStartPos;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 94031e6b1a73..b90746e5fadd 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -155,7 +155,9 @@ class StartRequestEvent : public ChannelEvent
                     const PRBool& cacheEntryAvailable,
                     const PRUint32& cacheExpirationTime,
                     const nsCString& cachedCharset,
-                    const nsCString& securityInfoSerialization)
+                    const nsCString& securityInfoSerialization,
+                    const PRNetAddr& selfAddr,
+                    const PRNetAddr& peerAddr)
   : mChild(child)
   , mResponseHead(responseHead)
   , mRequestHeaders(requestHeaders)
@@ -165,6 +167,8 @@ class StartRequestEvent : public ChannelEvent
   , mCacheExpirationTime(cacheExpirationTime)
   , mCachedCharset(cachedCharset)
   , mSecurityInfoSerialization(securityInfoSerialization)
+  , mSelfAddr(selfAddr)
+  , mPeerAddr(peerAddr)
   {}
 
   void Run() 
@@ -172,7 +176,7 @@ class StartRequestEvent : public ChannelEvent
     mChild->OnStartRequest(mResponseHead, mUseResponseHead, mRequestHeaders,
                            mIsFromCache, mCacheEntryAvailable,
                            mCacheExpirationTime, mCachedCharset,
-                           mSecurityInfoSerialization);
+                           mSecurityInfoSerialization, mSelfAddr, mPeerAddr);
   }
  private:
   HttpChannelChild* mChild;
@@ -184,6 +188,8 @@ class StartRequestEvent : public ChannelEvent
   PRUint32 mCacheExpirationTime;
   nsCString mCachedCharset;
   nsCString mSecurityInfoSerialization;
+  PRNetAddr mSelfAddr;
+  PRNetAddr mPeerAddr;
 };
 
 bool
@@ -209,18 +215,21 @@ HttpChannelChild::RecvOnStartRequest(const nsHttpResponseHead& responseHead,
                                      const PRBool& cacheEntryAvailable,
                                      const PRUint32& cacheExpirationTime,
                                      const nsCString& cachedCharset,
-                                     const nsCString& securityInfoSerialization)
+                                     const nsCString& securityInfoSerialization,
+                                     const PRNetAddr& selfAddr,
+                                     const PRNetAddr& peerAddr)
 {
   if (ShouldEnqueue()) {
     EnqueueEvent(new StartRequestEvent(this, responseHead, useResponseHead,
                                        requestHeaders,
                                        isFromCache, cacheEntryAvailable,
                                        cacheExpirationTime, cachedCharset,
-                                       securityInfoSerialization));
+                                       securityInfoSerialization, selfAddr,
+                                       peerAddr));
   } else {
     OnStartRequest(responseHead, useResponseHead, requestHeaders, isFromCache,
                    cacheEntryAvailable, cacheExpirationTime, cachedCharset,
-                   securityInfoSerialization);
+                   securityInfoSerialization, selfAddr, peerAddr);
   }
   return true;
 }
@@ -233,7 +242,9 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
                                  const PRBool& cacheEntryAvailable,
                                  const PRUint32& cacheExpirationTime,
                                  const nsCString& cachedCharset,
-                                 const nsCString& securityInfoSerialization)
+                                 const nsCString& securityInfoSerialization,
+                                 const PRNetAddr& selfAddr,
+                                 const PRNetAddr& peerAddr)
 {
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this));
 
@@ -271,6 +282,9 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
   rv = ApplyContentConversions();
   if (NS_FAILED(rv))
     Cancel(rv);
+
+  mSelfAddr = selfAddr;
+  mPeerAddr = peerAddr;
 }
 
 class TransportAndDataEvent : public ChannelEvent
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 8c61d9bcf004..2155f83ffbdf 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -134,7 +134,9 @@ protected:
                           const PRBool& cacheEntryAvailable,
                           const PRUint32& cacheExpirationTime,
                           const nsCString& cachedCharset,
-                          const nsCString& securityInfoSerialization);
+                          const nsCString& securityInfoSerialization,
+                          const PRNetAddr& selfAddr,
+                          const PRNetAddr& peerAddr);
   bool RecvOnTransportAndData(const nsresult& status,
                               const PRUint64& progress,
                               const PRUint64& progressMax,
@@ -182,7 +184,9 @@ private:
                       const PRBool& cacheEntryAvailable,
                       const PRUint32& cacheExpirationTime,
                       const nsCString& cachedCharset,
-                      const nsCString& securityInfoSerialization);
+                      const nsCString& securityInfoSerialization,
+                      const PRNetAddr& selfAddr,
+                      const PRNetAddr& peerAddr);
   void OnTransportAndData(const nsresult& status,
                           const PRUint64 progress,
                           const PRUint64& progressMax,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index 2745cbf72f1b..b8736beb0523 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -430,13 +430,15 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
     tuple->mMerge  = false;
   }
 
+  nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());
   if (mIPCClosed || 
       !SendOnStartRequest(responseHead ? *responseHead : nsHttpResponseHead(), 
                           !!responseHead,
                           headers,
                           isFromCache,
                           mCacheDescriptor ? PR_TRUE : PR_FALSE,
-                          expirationTime, cachedCharset, secInfoSerialization)) 
+                          expirationTime, cachedCharset, secInfoSerialization,
+                          httpChan->GetSelfAddr(), httpChan->GetPeerAddr())) 
   {
     return NS_ERROR_UNEXPECTED; 
   }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 8e79a775e887..b6b095d26677 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -43,12 +43,14 @@ include protocol PNecko;
 
 include "mozilla/net/PHttpChannelParams.h";
 include "mozilla/net/NeckoMessageUtils.h";
+include "prio.h";
 
 using RequestHeaderTuples;
 using nsHttpResponseHead;
 using nsHttpAtom;
 using IPC::URI;
 using IPC::InputStream;
+using PRNetAddr;
 
 namespace mozilla {
 namespace net {
@@ -131,7 +133,9 @@ child:
                  PRBool              cacheEntryAvailable,
                  PRUint32            cacheExpirationTime,
                  nsCString           cachedCharset,
-                 nsCString           securityInfoSerialization);
+                 nsCString           securityInfoSerialization,
+                 PRNetAddr           selfAddr,
+                 PRNetAddr           peerAddr);
 
   // Combines a single OnDataAvailable and its associated OnProgress &
   // OnStatus calls into one IPDL message
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 645f156329bb..3791bd7972c7 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3714,66 +3714,6 @@ nsHttpChannel::SetupFallbackChannel(const char *aFallbackKey)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHttpChannel::GetRemoteAddress(nsACString & _result)
-{
-    if (mPeerAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    _result.SetCapacity(64);
-    PR_NetAddrToString(&mPeerAddr, _result.BeginWriting(), 64);
-    _result.SetLength(strlen(_result.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetRemotePort(PRInt32 * _result)
-{
-    NS_ENSURE_ARG_POINTER(_result);
-
-    if (mPeerAddr.raw.family == PR_AF_INET) {
-        *_result = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
-    }
-    else if (mPeerAddr.raw.family == PR_AF_INET6) {
-        *_result = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetLocalAddress(nsACString & _result)
-{
-    if (mSelfAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    _result.SetCapacity(64);
-    PR_NetAddrToString(&mSelfAddr, _result.BeginWriting(), 64);
-    _result.SetLength(strlen(_result.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetLocalPort(PRInt32 * _result)
-{
-    NS_ENSURE_ARG_POINTER(_result);
-
-    if (mSelfAddr.raw.family == PR_AF_INET) {
-        *_result = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
-    }
-    else if (mSelfAddr.raw.family == PR_AF_INET6) {
-        *_result = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index b1682fbb4ca2..fcf013bfe0b7 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -137,10 +137,6 @@ public:
     NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *aContext);
     // nsIHttpChannelInternal
     NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey);
-    NS_IMETHOD GetLocalAddress(nsACString& addr);
-    NS_IMETHOD GetLocalPort(PRInt32* port);
-    NS_IMETHOD GetRemoteAddress(nsACString& addr);
-    NS_IMETHOD GetRemotePort(PRInt32* port);
     // nsISupportsPriority
     NS_IMETHOD SetPriority(PRInt32 value);
     // nsIResumableChannel
@@ -351,9 +347,6 @@ private:
     // the cache entry's expiration time. Otherwise, it is not(see bug 567360).
     PRUint32                          mRequestTimeInitialized : 1;
 
-    PRNetAddr                         mSelfAddr;
-    PRNetAddr                         mPeerAddr;
-
     nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
 
     nsCOMPtr<nsICryptoHash>        mHasher;

From 8b85800ca42ebf74c354eb03388e1bc840206eaa Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Tue, 3 May 2011 19:34:58 -0400
Subject: [PATCH 152/314] Backed out changeset 998b91ea0ffa (bug 648878)
 because it doesn't build on Windows.

---
 netwerk/ipc/NeckoMessageUtils.h             | 55 ------------------
 netwerk/protocol/http/HttpBaseChannel.cpp   | 62 ---------------------
 netwerk/protocol/http/HttpBaseChannel.h     | 10 ----
 netwerk/protocol/http/HttpChannelChild.cpp  | 26 ++-------
 netwerk/protocol/http/HttpChannelChild.h    |  8 +--
 netwerk/protocol/http/HttpChannelParent.cpp |  4 +-
 netwerk/protocol/http/PHttpChannel.ipdl     |  6 +-
 netwerk/protocol/http/nsHttpChannel.cpp     | 60 ++++++++++++++++++++
 netwerk/protocol/http/nsHttpChannel.h       |  7 +++
 9 files changed, 77 insertions(+), 161 deletions(-)

diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index c2d64444a804..400645e857bd 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -47,7 +47,6 @@
 #include "nsComponentManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsStringStream.h"
-#include "prio.h"
 
 namespace IPC {
 
@@ -326,60 +325,6 @@ struct ParamTraits<Permission>
   }
 };
 
-template<>
-struct ParamTraits<PRNetAddr>
-{
-  static void Write(Message* aMsg, const PRNetAddr &aParam)
-  {
-    WriteParam(aMsg, aParam.raw.family);
-    if (aParam.raw.family == PR_AF_UNSPEC) {
-      aMsg->WriteBytes(aParam.raw.data, sizeof(aParam.raw.data));
-    } else if (aParam.raw.family == PR_AF_INET) {
-      WriteParam(aMsg, aParam.inet.port);
-      WriteParam(aMsg, aParam.inet.ip);
-    } else if (aParam.raw.family == PR_AF_INET6) {
-      WriteParam(aMsg, aParam.ipv6.port);
-      WriteParam(aMsg, aParam.ipv6.flowinfo);
-      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[0]);
-      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[1]);
-      WriteParam(aMsg, aParam.ipv6.scope_id);
-    } else if (aParam.raw.family == PR_AF_LOCAL) {
-      aMsg->WriteBytes(aParam.local.path, sizeof(aParam.local.path));
-    }
-
-    /* If we get here without hitting any of the cases above, there's not much
-     * we can do but let the deserializer fail when it gets this message */
-  }
-
-  static bool Read(const Message* aMsg, void** aIter, PRNetAddr* aResult)
-  {
-    if (!ReadParam(aMsg, aIter, &aResult->raw.family))
-      return false;
-
-    if (aResult->raw.family == PR_AF_UNSPEC) {
-      return aMsg->ReadBytes(aIter,
-                             reinterpret_cast<const char**>(&aResult->raw.data),
-                             sizeof(aResult->raw.data));
-    } else if (aResult->raw.family == PR_AF_INET) {
-      return ReadParam(aMsg, aIter, &aResult->inet.port) &&
-             ReadParam(aMsg, aIter, &aResult->inet.ip);
-    } else if (aResult->raw.family == PR_AF_INET6) {
-      return ReadParam(aMsg, aIter, &aResult->ipv6.port) &&
-             ReadParam(aMsg, aIter, &aResult->ipv6.flowinfo) &&
-             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[0]) &&
-             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[1]) &&
-             ReadParam(aMsg, aIter, &aResult->ipv6.scope_id);
-    } else if (aResult->raw.family == PR_AF_LOCAL) {
-      return aMsg->ReadBytes(aIter,
-                             reinterpret_cast<const char**>(&aResult->local.path),
-                             sizeof(aResult->local.path));
-    }
-
-    /* We've been tricked by some socket family we don't know about! */
-    return false;
-  }
-};
-
 }
 
 #endif // mozilla_net_NeckoMessageUtils_h
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index fd5f5cc6cb35..1960ed546cd9 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -54,8 +54,6 @@
 #include "nsEscape.h"
 #include "nsPrintfCString.h"
 
-#include "prnetdb.h"
-
 namespace mozilla {
 namespace net {
 
@@ -1179,66 +1177,6 @@ HttpBaseChannel::SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-HttpBaseChannel::GetLocalAddress(nsACString& addr)
-{
-    if (mSelfAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    addr.SetCapacity(64);
-    PR_NetAddrToString(&mSelfAddr, addr.BeginWriting(), 64);
-    addr.SetLength(strlen(addr.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-HttpBaseChannel::GetLocalPort(PRInt32* port)
-{
-    NS_ENSURE_ARG_POINTER(port);
-
-    if (mSelfAddr.raw.family == PR_AF_INET) {
-        *port = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
-    }
-    else if (mSelfAddr.raw.family == PR_AF_INET6) {
-        *port = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-HttpBaseChannel::GetRemoteAddress(nsACString& addr)
-{
-    if (mPeerAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    addr.SetCapacity(64);
-    PR_NetAddrToString(&mPeerAddr, addr.BeginWriting(), 64);
-    addr.SetLength(strlen(addr.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-HttpBaseChannel::GetRemotePort(PRInt32* port)
-{
-    NS_ENSURE_ARG_POINTER(port);
-
-    if (mPeerAddr.raw.family == PR_AF_INET) {
-        *port = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
-    }
-    else if (mPeerAddr.raw.family == PR_AF_INET6) {
-        *port = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 73a5ac43c3f5..5eba942cc829 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -155,10 +155,6 @@ public:
   NS_IMETHOD GetChannelIsForDownload(PRBool *aChannelIsForDownload);
   NS_IMETHOD SetChannelIsForDownload(PRBool aChannelIsForDownload);
   NS_IMETHOD SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys);
-  NS_IMETHOD GetLocalAddress(nsACString& addr);
-  NS_IMETHOD GetLocalPort(PRInt32* port);
-  NS_IMETHOD GetRemoteAddress(nsACString& addr);
-  NS_IMETHOD GetRemotePort(PRInt32* port);
   inline void CleanRedirectCacheChainIfNecessary()
   {
       if (mRedirectedCachekeys) {
@@ -201,9 +197,6 @@ public:
     nsHttpResponseHead * GetResponseHead() const { return mResponseHead; }
     nsHttpRequestHead * GetRequestHead() { return &mRequestHead; }
 
-    const PRNetAddr& GetSelfAddr() { return mSelfAddr; }
-    const PRNetAddr& GetPeerAddr() { return mPeerAddr; }
-
 protected:
   nsresult ApplyContentConversions();
 
@@ -243,9 +236,6 @@ protected:
   nsCString                         mContentCharsetHint;
   nsCString                         mUserSetCookieHeader;
 
-  PRNetAddr                         mSelfAddr;
-  PRNetAddr                         mPeerAddr;
-
   // Resumable channel specific data
   nsCString                         mEntityID;
   PRUint64                          mStartPos;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index b90746e5fadd..94031e6b1a73 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -155,9 +155,7 @@ class StartRequestEvent : public ChannelEvent
                     const PRBool& cacheEntryAvailable,
                     const PRUint32& cacheExpirationTime,
                     const nsCString& cachedCharset,
-                    const nsCString& securityInfoSerialization,
-                    const PRNetAddr& selfAddr,
-                    const PRNetAddr& peerAddr)
+                    const nsCString& securityInfoSerialization)
   : mChild(child)
   , mResponseHead(responseHead)
   , mRequestHeaders(requestHeaders)
@@ -167,8 +165,6 @@ class StartRequestEvent : public ChannelEvent
   , mCacheExpirationTime(cacheExpirationTime)
   , mCachedCharset(cachedCharset)
   , mSecurityInfoSerialization(securityInfoSerialization)
-  , mSelfAddr(selfAddr)
-  , mPeerAddr(peerAddr)
   {}
 
   void Run() 
@@ -176,7 +172,7 @@ class StartRequestEvent : public ChannelEvent
     mChild->OnStartRequest(mResponseHead, mUseResponseHead, mRequestHeaders,
                            mIsFromCache, mCacheEntryAvailable,
                            mCacheExpirationTime, mCachedCharset,
-                           mSecurityInfoSerialization, mSelfAddr, mPeerAddr);
+                           mSecurityInfoSerialization);
   }
  private:
   HttpChannelChild* mChild;
@@ -188,8 +184,6 @@ class StartRequestEvent : public ChannelEvent
   PRUint32 mCacheExpirationTime;
   nsCString mCachedCharset;
   nsCString mSecurityInfoSerialization;
-  PRNetAddr mSelfAddr;
-  PRNetAddr mPeerAddr;
 };
 
 bool
@@ -215,21 +209,18 @@ HttpChannelChild::RecvOnStartRequest(const nsHttpResponseHead& responseHead,
                                      const PRBool& cacheEntryAvailable,
                                      const PRUint32& cacheExpirationTime,
                                      const nsCString& cachedCharset,
-                                     const nsCString& securityInfoSerialization,
-                                     const PRNetAddr& selfAddr,
-                                     const PRNetAddr& peerAddr)
+                                     const nsCString& securityInfoSerialization)
 {
   if (ShouldEnqueue()) {
     EnqueueEvent(new StartRequestEvent(this, responseHead, useResponseHead,
                                        requestHeaders,
                                        isFromCache, cacheEntryAvailable,
                                        cacheExpirationTime, cachedCharset,
-                                       securityInfoSerialization, selfAddr,
-                                       peerAddr));
+                                       securityInfoSerialization));
   } else {
     OnStartRequest(responseHead, useResponseHead, requestHeaders, isFromCache,
                    cacheEntryAvailable, cacheExpirationTime, cachedCharset,
-                   securityInfoSerialization, selfAddr, peerAddr);
+                   securityInfoSerialization);
   }
   return true;
 }
@@ -242,9 +233,7 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
                                  const PRBool& cacheEntryAvailable,
                                  const PRUint32& cacheExpirationTime,
                                  const nsCString& cachedCharset,
-                                 const nsCString& securityInfoSerialization,
-                                 const PRNetAddr& selfAddr,
-                                 const PRNetAddr& peerAddr)
+                                 const nsCString& securityInfoSerialization)
 {
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this));
 
@@ -282,9 +271,6 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
   rv = ApplyContentConversions();
   if (NS_FAILED(rv))
     Cancel(rv);
-
-  mSelfAddr = selfAddr;
-  mPeerAddr = peerAddr;
 }
 
 class TransportAndDataEvent : public ChannelEvent
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 2155f83ffbdf..8c61d9bcf004 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -134,9 +134,7 @@ protected:
                           const PRBool& cacheEntryAvailable,
                           const PRUint32& cacheExpirationTime,
                           const nsCString& cachedCharset,
-                          const nsCString& securityInfoSerialization,
-                          const PRNetAddr& selfAddr,
-                          const PRNetAddr& peerAddr);
+                          const nsCString& securityInfoSerialization);
   bool RecvOnTransportAndData(const nsresult& status,
                               const PRUint64& progress,
                               const PRUint64& progressMax,
@@ -184,9 +182,7 @@ private:
                       const PRBool& cacheEntryAvailable,
                       const PRUint32& cacheExpirationTime,
                       const nsCString& cachedCharset,
-                      const nsCString& securityInfoSerialization,
-                      const PRNetAddr& selfAddr,
-                      const PRNetAddr& peerAddr);
+                      const nsCString& securityInfoSerialization);
   void OnTransportAndData(const nsresult& status,
                           const PRUint64 progress,
                           const PRUint64& progressMax,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index b8736beb0523..2745cbf72f1b 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -430,15 +430,13 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
     tuple->mMerge  = false;
   }
 
-  nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());
   if (mIPCClosed || 
       !SendOnStartRequest(responseHead ? *responseHead : nsHttpResponseHead(), 
                           !!responseHead,
                           headers,
                           isFromCache,
                           mCacheDescriptor ? PR_TRUE : PR_FALSE,
-                          expirationTime, cachedCharset, secInfoSerialization,
-                          httpChan->GetSelfAddr(), httpChan->GetPeerAddr())) 
+                          expirationTime, cachedCharset, secInfoSerialization)) 
   {
     return NS_ERROR_UNEXPECTED; 
   }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index b6b095d26677..8e79a775e887 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -43,14 +43,12 @@ include protocol PNecko;
 
 include "mozilla/net/PHttpChannelParams.h";
 include "mozilla/net/NeckoMessageUtils.h";
-include "prio.h";
 
 using RequestHeaderTuples;
 using nsHttpResponseHead;
 using nsHttpAtom;
 using IPC::URI;
 using IPC::InputStream;
-using PRNetAddr;
 
 namespace mozilla {
 namespace net {
@@ -133,9 +131,7 @@ child:
                  PRBool              cacheEntryAvailable,
                  PRUint32            cacheExpirationTime,
                  nsCString           cachedCharset,
-                 nsCString           securityInfoSerialization,
-                 PRNetAddr           selfAddr,
-                 PRNetAddr           peerAddr);
+                 nsCString           securityInfoSerialization);
 
   // Combines a single OnDataAvailable and its associated OnProgress &
   // OnStatus calls into one IPDL message
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 3791bd7972c7..645f156329bb 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3714,6 +3714,66 @@ nsHttpChannel::SetupFallbackChannel(const char *aFallbackKey)
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsHttpChannel::GetRemoteAddress(nsACString & _result)
+{
+    if (mPeerAddr.raw.family == PR_AF_UNSPEC)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    _result.SetCapacity(64);
+    PR_NetAddrToString(&mPeerAddr, _result.BeginWriting(), 64);
+    _result.SetLength(strlen(_result.BeginReading()));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHttpChannel::GetRemotePort(PRInt32 * _result)
+{
+    NS_ENSURE_ARG_POINTER(_result);
+
+    if (mPeerAddr.raw.family == PR_AF_INET) {
+        *_result = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
+    }
+    else if (mPeerAddr.raw.family == PR_AF_INET6) {
+        *_result = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
+    }
+    else
+        return NS_ERROR_NOT_AVAILABLE;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHttpChannel::GetLocalAddress(nsACString & _result)
+{
+    if (mSelfAddr.raw.family == PR_AF_UNSPEC)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    _result.SetCapacity(64);
+    PR_NetAddrToString(&mSelfAddr, _result.BeginWriting(), 64);
+    _result.SetLength(strlen(_result.BeginReading()));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsHttpChannel::GetLocalPort(PRInt32 * _result)
+{
+    NS_ENSURE_ARG_POINTER(_result);
+
+    if (mSelfAddr.raw.family == PR_AF_INET) {
+        *_result = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
+    }
+    else if (mSelfAddr.raw.family == PR_AF_INET6) {
+        *_result = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
+    }
+    else
+        return NS_ERROR_NOT_AVAILABLE;
+
+    return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // nsHttpChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index fcf013bfe0b7..b1682fbb4ca2 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -137,6 +137,10 @@ public:
     NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *aContext);
     // nsIHttpChannelInternal
     NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey);
+    NS_IMETHOD GetLocalAddress(nsACString& addr);
+    NS_IMETHOD GetLocalPort(PRInt32* port);
+    NS_IMETHOD GetRemoteAddress(nsACString& addr);
+    NS_IMETHOD GetRemotePort(PRInt32* port);
     // nsISupportsPriority
     NS_IMETHOD SetPriority(PRInt32 value);
     // nsIResumableChannel
@@ -347,6 +351,9 @@ private:
     // the cache entry's expiration time. Otherwise, it is not(see bug 567360).
     PRUint32                          mRequestTimeInitialized : 1;
 
+    PRNetAddr                         mSelfAddr;
+    PRNetAddr                         mPeerAddr;
+
     nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
 
     nsCOMPtr<nsICryptoHash>        mHasher;

From 0f798033936dfe47c83e3220af0ca6fe89c96cad Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:29:54 +0100
Subject: [PATCH 153/314] bug 253317 - part 6 - reftests for automatic
 hyphenation. r=roc

---
 .../text/auto-hyphenation-1-notref.html       |  9 ++++++
 .../reftests/text/auto-hyphenation-1-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-1.html  | 10 +++++++
 layout/reftests/text/auto-hyphenation-1a.html | 10 +++++++
 .../reftests/text/auto-hyphenation-2-ref.html | 11 ++++++++
 layout/reftests/text/auto-hyphenation-2.html  | 12 ++++++++
 .../reftests/text/auto-hyphenation-3-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-3.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-4-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-4.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-5-ref.html | 28 +++++++++++++++++++
 layout/reftests/text/auto-hyphenation-5.html  | 28 +++++++++++++++++++
 .../reftests/text/auto-hyphenation-6-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-6.html  | 10 +++++++
 .../reftests/text/auto-hyphenation-7-ref.html |  9 ++++++
 layout/reftests/text/auto-hyphenation-7.html  | 10 +++++++
 layout/reftests/text/reftest.list             | 10 +++++++
 17 files changed, 203 insertions(+)
 create mode 100644 layout/reftests/text/auto-hyphenation-1-notref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1.html
 create mode 100644 layout/reftests/text/auto-hyphenation-1a.html
 create mode 100644 layout/reftests/text/auto-hyphenation-2-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-2.html
 create mode 100644 layout/reftests/text/auto-hyphenation-3-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-3.html
 create mode 100644 layout/reftests/text/auto-hyphenation-4-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-4.html
 create mode 100644 layout/reftests/text/auto-hyphenation-5-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-5.html
 create mode 100644 layout/reftests/text/auto-hyphenation-6-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-6.html
 create mode 100644 layout/reftests/text/auto-hyphenation-7-ref.html
 create mode 100644 layout/reftests/text/auto-hyphenation-7.html

diff --git a/layout/reftests/text/auto-hyphenation-1-notref.html b/layout/reftests/text/auto-hyphenation-1-notref.html
new file mode 100644
index 000000000000..99c4fb38b1e8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1-notref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1-ref.html b/layout/reftests/text/auto-hyphenation-1-ref.html
new file mode 100644
index 000000000000..1049e5e8cf48
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: manual;">
+su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1.html b/layout/reftests/text/auto-hyphenation-1.html
new file mode 100644
index 000000000000..99fdaff6c2f4
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- simple test for automatic hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-1a.html b/layout/reftests/text/auto-hyphenation-1a.html
new file mode 100644
index 000000000000..97ee996b4d90
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-1a.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- adding random <span>s should not affect hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+super<span>cali</span>frag<span>ili</span>sti<span>cex</span>pialidoc<span>i</span>ous
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-2-ref.html b/layout/reftests/text/auto-hyphenation-2-ref.html
new file mode 100644
index 000000000000..3cf09aa40bf6
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-2-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+<span style="-moz-hyphens:none">supercalifragilisticexpialidocious</span>
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-2.html b/layout/reftests/text/auto-hyphenation-2.html
new file mode 100644
index 000000000000..084c5d3d83a5
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-2.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<!-- mixed languages in a word should inhibit automatic hyphenation -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+super<span lang="foo">cali</span>fragilisticexpialidocious
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-3-ref.html b/layout/reftests/text/auto-hyphenation-3-ref.html
new file mode 100644
index 000000000000..99c4fb38b1e8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-3-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 5em;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-3.html b/layout/reftests/text/auto-hyphenation-3.html
new file mode 100644
index 000000000000..a1db92b1b5cb
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-3.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- check that -moz-hyphens:none prevents break at &shy; -->
+<body lang="en-us">
+<div style="width: 5em; -moz-hyphens: none;">
+su&shy;per&shy;cal&shy;ifrag&shy;ilis&shy;tic&shy;ex&shy;pi&shy;ali&shy;do&shy;cious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-4-ref.html b/layout/reftests/text/auto-hyphenation-4-ref.html
new file mode 100644
index 000000000000..81235c3ce671
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-4-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="x-unknown-language">
+<div style="width: 5em; -moz-hyphens: none;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-4.html b/layout/reftests/text/auto-hyphenation-4.html
new file mode 100644
index 000000000000..37f1a54157ef
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-4.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- check that hyphenation is not applied to unknown language -->
+<body lang="x-unknown-language">
+<div style="width: 5em; -moz-hyphens: auto;">
+supercalifragilisticexpialidocious
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-5-ref.html b/layout/reftests/text/auto-hyphenation-5-ref.html
new file mode 100644
index 000000000000..4c2d539a6b25
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-5-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+div {
+  margin:       10px;
+  width:        10px;
+  font-family:  monospace;
+  -moz-hyphens: manual;
+}
+</style>
+</head>
+<!-- test some hyphenations that involve overlapping patterns -->
+<body lang="en-us">
+<div>
+photo
+</div>
+<div>
+pho&shy;to&shy;graph
+</div>
+<div>
+pho&shy;tog&shy;ra&shy;pher
+</div>
+<div>
+pho&shy;to&shy;graph&shy;i&shy;cal
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text/auto-hyphenation-5.html b/layout/reftests/text/auto-hyphenation-5.html
new file mode 100644
index 000000000000..1330163e14f0
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-5.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style type="text/css">
+div {
+  margin:       10px;
+  width:        10px;
+  font-family:  monospace;
+  -moz-hyphens: auto;
+}
+</style>
+</head>
+<!-- test some hyphenations that involve overlapping patterns -->
+<body lang="en-us">
+<div>
+photo
+</div>
+<div>
+photograph
+</div>
+<div>
+photographer
+</div>
+<div>
+photographical
+</div>
+</body>
+</html>
diff --git a/layout/reftests/text/auto-hyphenation-6-ref.html b/layout/reftests/text/auto-hyphenation-6-ref.html
new file mode 100644
index 000000000000..b099b46a910c
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-6-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: manual;">
+hy&shy;<span style="color:red">phen&shy;</span>ation
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-6.html b/layout/reftests/text/auto-hyphenation-6.html
new file mode 100644
index 000000000000..d3621f26c7fc
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-6.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- style changes don't break hyphenation -->
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: auto;">
+hy<span style="color:red">phen</span>ation
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-7-ref.html b/layout/reftests/text/auto-hyphenation-7-ref.html
new file mode 100644
index 000000000000..a55eafb54de4
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-7-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: manual;">
+h<span style="color:red">y&shy;phen&shy;a</span>tion
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/auto-hyphenation-7.html b/layout/reftests/text/auto-hyphenation-7.html
new file mode 100644
index 000000000000..201c7f90f5a8
--- /dev/null
+++ b/layout/reftests/text/auto-hyphenation-7.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<!-- style changes don't break hyphenation -->
+<body lang="en-us">
+<div style="width: 0; -moz-hyphens: auto;">
+h<span style="color:red">yphena</span>tion
+</div>
+</body>
+</html>
+
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index bc13945284f0..de97a3f4deff 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -86,3 +86,13 @@ random-if(!cocoaWidget) == 577380.html 577380-ref.html
 HTTP(..) == arabic-shaping-1.html arabic-shaping-1-ref.html
 # check ligature in Arial Bold on Windows, for bug 644184; may fail on other platforms depending on fonts
 random-if(!winWidget) == arial-bold-lam-alef-1.html arial-bold-lam-alef-1-ref.html
+# Tests for hyphenation with -moz-hyphens
+== auto-hyphenation-1.html auto-hyphenation-1-ref.html
+!= auto-hyphenation-1.html auto-hyphenation-1-notref.html
+== auto-hyphenation-1a.html auto-hyphenation-1-ref.html
+== auto-hyphenation-2.html auto-hyphenation-2-ref.html
+== auto-hyphenation-3.html auto-hyphenation-3-ref.html
+== auto-hyphenation-4.html auto-hyphenation-4-ref.html
+== auto-hyphenation-5.html auto-hyphenation-5-ref.html
+== auto-hyphenation-6.html auto-hyphenation-6-ref.html
+== auto-hyphenation-7.html auto-hyphenation-7-ref.html

From f82c24614d3de084619a09042d2e18d5f4acbcb0 Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jfkthame@gmail.com>
Date: Wed, 4 May 2011 12:14:51 +0100
Subject: [PATCH 154/314] bug 253317 - part 3.1 - build support to install
 hyphenation patterns. r=pike

---
 browser/installer/package-manifest.in |  1 +
 browser/locales/Makefile.in           |  2 +
 intl/Makefile.in                      |  1 +
 intl/locales/Makefile.in              | 61 +++++++++++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 intl/locales/Makefile.in

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 0f9eb90600f7..2ddb17d0777f 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -36,6 +36,7 @@
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
 @BINPATH@/dictionaries/*
+@BINPATH@/hyphenation/*
 #ifdef XP_WIN32
 @BINPATH@/uninstall/helper.exe
 #endif
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index d60c9a66577e..fed14a12177d 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -186,6 +186,7 @@ libs-%:
 	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 
@@ -217,6 +218,7 @@ clobber-zip:
 	  $(STAGEDIST)/defaults/pref/firefox-l10n.js
 	$(RM) -rf  $(STAGEDIST)/searchplugins \
 	  $(STAGEDIST)/dictionaries \
+	  $(STAGEDIST)/hyphenation \
 	  $(STAGEDIST)/defaults/profile \
 	  $(STAGEDIST)/chrome/$(AB_CD)
 
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 0491a33e3978..b7b9c1678557 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
 PARALLEL_DIRS = \
   hyphenation \
   locale \
+  locales \
   lwbrk \
   strres \
   unicharutil \
diff --git a/intl/locales/Makefile.in b/intl/locales/Makefile.in
new file mode 100644
index 000000000000..6892d8b0fa4e
--- /dev/null
+++ b/intl/locales/Makefile.in
@@ -0,0 +1,61 @@
+# ***** 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 Hyphenation Component.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Jonathan Kew <jfkthame@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 *****
+
+DEPTH          = ../..
+topsrcdir      = @top_srcdir@
+srcdir         = @srcdir@
+VPATH          = @srcdir@
+relativesrcdir = intl/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+DEFINES += -DAB_CD=$(AB_CD)
+
+include $(topsrcdir)/config/rules.mk
+
+PATTERN_FILES = $(strip $(wildcard $(LOCALE_SRCDIR)/hyphenation/*.dic))
+ifneq ($(AB_CD),en-US)
+PATTERN_FILES += $(strip $(wildcard $(srcdir)/en-US/hyphenation/*.dic))
+endif
+
+ifneq (,$(PATTERN_FILES))
+libs::
+	$(INSTALL)  $(PATTERN_FILES) $(FINAL_TARGET)/hyphenation
+
+install::
+	$(SYSINSTALL) $(IFLAGS1) $(PATTERN_FILES) $(DESTDIR)$(mozappdir)/hyphenation
+endif

From ad4633017a5dfc666532fa6e009583fffdae3cbe Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 14:45:47 +0200
Subject: [PATCH 155/314] Bug 641720 - Make
 nsHTMLInputElement::GetRadioGroupContainer saner. r=sicking,bz

---
 .../html/content/src/nsHTMLInputElement.cpp   | 214 ++++++++----------
 content/html/content/src/nsHTMLInputElement.h |  13 +-
 2 files changed, 103 insertions(+), 124 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index bbc1f4523c9c..97355cc92c1b 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -909,12 +909,13 @@ nsHTMLInputElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
     }
 
     if (mType == NS_FORM_INPUT_RADIO && aName == nsGkAtoms::required) {
-      nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
+      nsIRadioGroupContainer* c = GetRadioGroupContainer();
       nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
         do_QueryInterface(c);
-      nsAutoString name;
 
-      if (container && GetNameIfExists(name)) {
+      if (container) {
+        nsAutoString name;
+        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
         container->RadioRequiredChanged(name, this);
       }
     }
@@ -1576,12 +1577,11 @@ nsHTMLInputElement::DoSetChecked(PRBool aChecked, PRBool aNotify,
     if (aChecked) {
       rv = RadioSetChecked(aNotify);
     } else {
-      nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+      nsIRadioGroupContainer* container = GetRadioGroupContainer();
       if (container) {
         nsAutoString name;
-        if (GetNameIfExists(name)) {
-          container->SetCurrentRadioButton(name, nsnull);
-        }
+        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+        container->SetCurrentRadioButton(name, nsnull);
       }
       // SetCheckedInternal is going to ask all radios to update their
       // validity state. We have to be sure the radio group container knows
@@ -1618,9 +1618,10 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   //
   // Let the group know that we are now the One True Radio Button
   //
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  nsAutoString name;
-  if (container && GetNameIfExists(name)) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (container) {
+    nsAutoString name;
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
     rv = container->SetCurrentRadioButton(name, this);
   }
 
@@ -1634,35 +1635,40 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   return rv;
 }
 
-/* virtual */ already_AddRefed<nsIRadioGroupContainer>
-nsHTMLInputElement::GetRadioGroupContainer()
+nsIRadioGroupContainer*
+nsHTMLInputElement::GetRadioGroupContainer() const
 {
-  nsIRadioGroupContainer* retval = nsnull;
-  if (mForm) {
-    CallQueryInterface(mForm, &retval);
-  } else {
-    nsIDocument* currentDoc = GetCurrentDoc();
-    if (currentDoc) {
-      CallQueryInterface(currentDoc, &retval);
-    }
+  NS_ASSERTION(mType == NS_FORM_INPUT_RADIO,
+               "GetRadioGroupContainer should only be called when type='radio'");
+
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
+  if (name.IsEmpty()) {
+    return nsnull;
   }
-  return retval;
+
+  if (mForm) {
+    return mForm;
+  }
+
+  nsIDocument* doc = GetCurrentDoc();
+  nsCOMPtr<nsIRadioGroupContainer> group = do_QueryInterface(doc);
+  return group.get();
 }
 
 already_AddRefed<nsIDOMHTMLInputElement>
 nsHTMLInputElement::GetSelectedRadioButton()
 {
   nsIDOMHTMLInputElement* selected;
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
 
   if (!container) {
     return nsnull;
   }
 
   nsAutoString name;
-  if (!GetNameIfExists(name)) {
-    return nsnull;
-  }
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
   container->GetCurrentRadioButton(name, &selected);
   return selected;
@@ -2279,29 +2285,28 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
               case NS_VK_DOWN:
               case NS_VK_RIGHT:
               // Arrow key pressed, focus+select prev/next radio button
-              nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+              nsIRadioGroupContainer* container = GetRadioGroupContainer();
               if (container) {
                 nsAutoString name;
-                if (GetNameIfExists(name)) {
-                  nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
-                  container->GetNextRadioButton(name, isMovingBack, this,
-                                                getter_AddRefs(selectedRadioButton));
-                  nsCOMPtr<nsIContent> radioContent =
-                    do_QueryInterface(selectedRadioButton);
-                  if (radioContent) {
-                    rv = selectedRadioButton->Focus();
+                GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+                nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
+                container->GetNextRadioButton(name, isMovingBack, this,
+                                              getter_AddRefs(selectedRadioButton));
+                nsCOMPtr<nsIContent> radioContent =
+                  do_QueryInterface(selectedRadioButton);
+                if (radioContent) {
+                  rv = selectedRadioButton->Focus();
+                  if (NS_SUCCEEDED(rv)) {
+                    nsEventStatus status = nsEventStatus_eIgnore;
+                    nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
+                                       NS_MOUSE_CLICK, nsnull,
+                                       nsMouseEvent::eReal);
+                    event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
+                    rv = nsEventDispatcher::Dispatch(radioContent,
+                                                     aVisitor.mPresContext,
+                                                     &event, nsnull, &status);
                     if (NS_SUCCEEDED(rv)) {
-                      nsEventStatus status = nsEventStatus_eIgnore;
-                      nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
-                                         NS_MOUSE_CLICK, nsnull,
-                                         nsMouseEvent::eReal);
-                      event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
-                      rv = nsEventDispatcher::Dispatch(radioContent,
-                                                       aVisitor.mPresContext,
-                                                       &event, nsnull, &status);
-                      if (NS_SUCCEEDED(rv)) {
-                        aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
-                      }
+                      aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
                     }
                   }
                 }
@@ -3406,69 +3411,40 @@ nsHTMLInputElement::AddedToRadioGroup()
   nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    if (GetNameIfExists(name)) {
-      container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+    container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
 
-      // We initialize the validity of the element to the validity of the group
-      // because we assume UpdateValueMissingState() will be called after.
-      nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
-        do_QueryInterface(container);
-      SetValidityState(VALIDITY_STATE_VALUE_MISSING,
-                       container2->GetValueMissingState(name));
-    }
+    // We initialize the validity of the element to the validity of the group
+    // because we assume UpdateValueMissingState() will be called after.
+    nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
+      do_QueryInterface(container);
+    SetValidityState(VALIDITY_STATE_VALUE_MISSING,
+                     container2->GetValueMissingState(name));
   }
 }
 
 void
 nsHTMLInputElement::WillRemoveFromRadioGroup()
 {
-  //
-  // If the input element is not in a form and
-  // not in a document, we just need to return.
-  //
-  if (!mForm && !(IsInDoc() && GetParent())) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (!container) {
     return;
   }
 
-  //
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
   // If this button was checked, we need to notify the group that there is no
   // longer a selected radio button
-  //
-  nsAutoString name;
-  PRBool gotName = PR_FALSE;
   if (GetChecked()) {
-    if (!gotName) {
-      if (!GetNameIfExists(name)) {
-        // If the name doesn't exist, nothing is going to happen anyway
-        return;
-      }
-      gotName = PR_TRUE;
-    }
-
-    nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-    if (container) {
-      container->SetCurrentRadioButton(name, nsnull);
-    }
+    container->SetCurrentRadioButton(name, nsnull);
   }
 
-  //
-  // Remove this radio from its group in the container
-  //
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  if (container) {
-    if (!gotName) {
-      if (!GetNameIfExists(name)) {
-        // If the name doesn't exist, nothing is going to happen anyway
-        return;
-      }
-      gotName = PR_TRUE;
-    }
-
-    UpdateValueMissingValidityStateForRadio(true);
-
-    container->RemoveFromRadioGroup(name,
-                                    static_cast<nsIFormControl*>(this));
-  }
+  // Remove this radio from its group in the container.
+  // We need to call UpdateValueMissingValidityStateForRadio before to make sure
+  // the group validity is updated (with this element being ignored).
+  UpdateValueMissingValidityStateForRadio(true);
+  container->RemoveFromRadioGroup(name, static_cast<nsIFormControl*>(this));
 }
 
 PRBool
@@ -3529,13 +3505,15 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 
   // Current radio button is not selected.
   // But make it tabbable if nothing in group is selected.
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  nsAutoString name;
-  if (!container || !GetNameIfExists(name)) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (!container) {
     *aIsFocusable = defaultFocusable;
     return PR_FALSE;
   }
 
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
   nsCOMPtr<nsIDOMHTMLInputElement> currentRadio;
   container->GetCurrentRadioButton(name, getter_AddRefs(currentRadio));
   if (currentRadio) {
@@ -3548,19 +3526,15 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 nsresult
 nsHTMLInputElement::VisitGroup(nsIRadioVisitor* aVisitor, PRBool aFlushContent)
 {
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    if (GetNameIfExists(name)) {
-      rv = container->WalkRadioGroup(name, aVisitor, aFlushContent);
-    } else {
-      aVisitor->Visit(this);
-    }
-  } else {
-    aVisitor->Visit(this);
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+    return container->WalkRadioGroup(name, aVisitor, aFlushContent);
   }
-  return rv;
+
+  aVisitor->Visit(this);
+  return NS_OK;
 }
 
 nsHTMLInputElement::ValueModeType
@@ -3839,15 +3813,21 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
                               : HasAttr(kNameSpaceID_None, nsGkAtoms::required);
   bool valueMissing = false;
 
-  nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
+  nsIRadioGroupContainer* c = GetRadioGroupContainer();
   nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
     do_QueryInterface(c);
+
+  if (!container) {
+    SetValidityState(VALIDITY_STATE_VALUE_MISSING, required && !selected);
+    return;
+  }
+
   nsAutoString name;
-  GetNameIfExists(name);
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
   // If the current radio is required and not ignored, we can assume the entire
   // group is required.
-  if (!required && container && !name.IsEmpty()) {
+  if (!required) {
     required = (aIgnoreSelf && HasAttr(kNameSpaceID_None, nsGkAtoms::required))
                  ? container->GetRequiredRadioCount(name) - 1
                  : container->GetRequiredRadioCount(name);
@@ -3855,18 +3835,14 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
 
   valueMissing = required && !selected;
 
-  if (container && !name.IsEmpty()) {
-    if (container->GetValueMissingState(name) != valueMissing) {
-      container->SetValueMissingState(name, valueMissing);
+  if (container->GetValueMissingState(name) != valueMissing) {
+    container->SetValueMissingState(name, valueMissing);
 
-      SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
-
-      nsCOMPtr<nsIRadioVisitor> visitor =
-        new nsRadioSetValueMissingState(this, valueMissing, notify);
-      VisitGroup(visitor, notify);
-    }
-  } else {
     SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
+
+    nsCOMPtr<nsIRadioVisitor> visitor =
+      new nsRadioSetValueMissingState(this, valueMissing, notify);
+    VisitGroup(visitor, notify);
   }
 }
 
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index ac084f39bab3..1e4cb376b943 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -225,11 +225,6 @@ public:
   }
   void AddedToRadioGroup();
   void WillRemoveFromRadioGroup();
-  /**
-   * Get the radio group container for this button (form or document)
-   * @return the radio group container (or null if no form or document)
-   */
-  virtual already_AddRefed<nsIRadioGroupContainer> GetRadioGroupContainer();
 
  /**
    * Helper function returning the currently selected button in the radio group.
@@ -577,6 +572,14 @@ protected:
     }
   }
 
+  /**
+   * Returns the radio group container if the element has one, null otherwise.
+   * The radio group container will be the form owner if there is one.
+   * The current document otherwise.
+   * @return the radio group container if the element has one, null otherwise.
+   */
+  nsIRadioGroupContainer* GetRadioGroupContainer() const;
+
   nsCOMPtr<nsIControllers> mControllers;
 
   /**

From e8c7102fb1afb046a9000b0fe4f0b797e1b8cb18 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 14:46:09 +0200
Subject: [PATCH 156/314] Bug 639490 - Remove
 nsHTMLInputElement::GetNameIfExists. r=sicking

---
 content/html/content/src/nsHTMLInputElement.cpp |  4 ++--
 content/html/content/src/nsHTMLInputElement.h   | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index 97355cc92c1b..a4357f18e493 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -3002,7 +3002,7 @@ nsHTMLInputElement::SubmitNamesValues(nsFormSubmission* aFormSubmission)
 
   // Get the name
   nsAutoString name;
-  PRBool nameThere = GetNameIfExists(name);
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
   // Submit .x, .y for input type=image
   if (mType == NS_FORM_INPUT_IMAGE) {
@@ -3040,7 +3040,7 @@ nsHTMLInputElement::SubmitNamesValues(nsFormSubmission* aFormSubmission)
   //
 
   // If name not there, don't submit
-  if (!nameThere) {
+  if (name.IsEmpty()) {
     return NS_OK;
   }
 
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index 1e4cb376b943..a9d31ba2548a 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -387,16 +387,6 @@ protected:
 
   nsresult GetSelectionRange(PRInt32* aSelectionStart, PRInt32* aSelectionEnd);
 
-  /**
-   * Get the name if it exists and return whether it did exist
-   * @param aName the name returned [OUT]
-   * @param true if the name is empty, false otherwise
-   */
-  PRBool GetNameIfExists(nsAString& aName) {
-    GetAttr(kNameSpaceID_None, nsGkAtoms::name, aName);
-    return !aName.IsEmpty();
-  }
-
   /**
    * Called when an attribute is about to be changed
    */

From fc2edaedef2d71bf997561ff0c7eee1e2f5f8045 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 14:53:06 +0200
Subject: [PATCH 157/314] Backout f68a9bfc9bfd (bug 641720).

---
 .../html/content/src/nsHTMLInputElement.cpp   | 212 ++++++++++--------
 content/html/content/src/nsHTMLInputElement.h |  13 +-
 2 files changed, 123 insertions(+), 102 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index a4357f18e493..bdee92cdcbbb 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -909,13 +909,12 @@ nsHTMLInputElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
     }
 
     if (mType == NS_FORM_INPUT_RADIO && aName == nsGkAtoms::required) {
-      nsIRadioGroupContainer* c = GetRadioGroupContainer();
+      nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
       nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
         do_QueryInterface(c);
+      nsAutoString name;
 
-      if (container) {
-        nsAutoString name;
-        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+      if (container && GetNameIfExists(name)) {
         container->RadioRequiredChanged(name, this);
       }
     }
@@ -1577,11 +1576,12 @@ nsHTMLInputElement::DoSetChecked(PRBool aChecked, PRBool aNotify,
     if (aChecked) {
       rv = RadioSetChecked(aNotify);
     } else {
-      nsIRadioGroupContainer* container = GetRadioGroupContainer();
+      nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
       if (container) {
         nsAutoString name;
-        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-        container->SetCurrentRadioButton(name, nsnull);
+        if (GetNameIfExists(name)) {
+          container->SetCurrentRadioButton(name, nsnull);
+        }
       }
       // SetCheckedInternal is going to ask all radios to update their
       // validity state. We have to be sure the radio group container knows
@@ -1618,10 +1618,9 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   //
   // Let the group know that we are now the One True Radio Button
   //
-  nsIRadioGroupContainer* container = GetRadioGroupContainer();
-  if (container) {
-    nsAutoString name;
-    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsAutoString name;
+  if (container && GetNameIfExists(name)) {
     rv = container->SetCurrentRadioButton(name, this);
   }
 
@@ -1635,40 +1634,35 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   return rv;
 }
 
-nsIRadioGroupContainer*
-nsHTMLInputElement::GetRadioGroupContainer() const
+/* virtual */ already_AddRefed<nsIRadioGroupContainer>
+nsHTMLInputElement::GetRadioGroupContainer()
 {
-  NS_ASSERTION(mType == NS_FORM_INPUT_RADIO,
-               "GetRadioGroupContainer should only be called when type='radio'");
-
-  nsAutoString name;
-  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-
-  if (name.IsEmpty()) {
-    return nsnull;
-  }
-
+  nsIRadioGroupContainer* retval = nsnull;
   if (mForm) {
-    return mForm;
+    CallQueryInterface(mForm, &retval);
+  } else {
+    nsIDocument* currentDoc = GetCurrentDoc();
+    if (currentDoc) {
+      CallQueryInterface(currentDoc, &retval);
+    }
   }
-
-  nsIDocument* doc = GetCurrentDoc();
-  nsCOMPtr<nsIRadioGroupContainer> group = do_QueryInterface(doc);
-  return group.get();
+  return retval;
 }
 
 already_AddRefed<nsIDOMHTMLInputElement>
 nsHTMLInputElement::GetSelectedRadioButton()
 {
   nsIDOMHTMLInputElement* selected;
-  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
 
   if (!container) {
     return nsnull;
   }
 
   nsAutoString name;
-  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+  if (!GetNameIfExists(name)) {
+    return nsnull;
+  }
 
   container->GetCurrentRadioButton(name, &selected);
   return selected;
@@ -2285,28 +2279,29 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
               case NS_VK_DOWN:
               case NS_VK_RIGHT:
               // Arrow key pressed, focus+select prev/next radio button
-              nsIRadioGroupContainer* container = GetRadioGroupContainer();
+              nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
               if (container) {
                 nsAutoString name;
-                GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-                nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
-                container->GetNextRadioButton(name, isMovingBack, this,
-                                              getter_AddRefs(selectedRadioButton));
-                nsCOMPtr<nsIContent> radioContent =
-                  do_QueryInterface(selectedRadioButton);
-                if (radioContent) {
-                  rv = selectedRadioButton->Focus();
-                  if (NS_SUCCEEDED(rv)) {
-                    nsEventStatus status = nsEventStatus_eIgnore;
-                    nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
-                                       NS_MOUSE_CLICK, nsnull,
-                                       nsMouseEvent::eReal);
-                    event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
-                    rv = nsEventDispatcher::Dispatch(radioContent,
-                                                     aVisitor.mPresContext,
-                                                     &event, nsnull, &status);
+                if (GetNameIfExists(name)) {
+                  nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
+                  container->GetNextRadioButton(name, isMovingBack, this,
+                                                getter_AddRefs(selectedRadioButton));
+                  nsCOMPtr<nsIContent> radioContent =
+                    do_QueryInterface(selectedRadioButton);
+                  if (radioContent) {
+                    rv = selectedRadioButton->Focus();
                     if (NS_SUCCEEDED(rv)) {
-                      aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
+                      nsEventStatus status = nsEventStatus_eIgnore;
+                      nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
+                                         NS_MOUSE_CLICK, nsnull,
+                                         nsMouseEvent::eReal);
+                      event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
+                      rv = nsEventDispatcher::Dispatch(radioContent,
+                                                       aVisitor.mPresContext,
+                                                       &event, nsnull, &status);
+                      if (NS_SUCCEEDED(rv)) {
+                        aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
+                      }
                     }
                   }
                 }
@@ -3411,40 +3406,69 @@ nsHTMLInputElement::AddedToRadioGroup()
   nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-    container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
+    if (GetNameIfExists(name)) {
+      container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
 
-    // We initialize the validity of the element to the validity of the group
-    // because we assume UpdateValueMissingState() will be called after.
-    nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
-      do_QueryInterface(container);
-    SetValidityState(VALIDITY_STATE_VALUE_MISSING,
-                     container2->GetValueMissingState(name));
+      // We initialize the validity of the element to the validity of the group
+      // because we assume UpdateValueMissingState() will be called after.
+      nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
+        do_QueryInterface(container);
+      SetValidityState(VALIDITY_STATE_VALUE_MISSING,
+                       container2->GetValueMissingState(name));
+    }
   }
 }
 
 void
 nsHTMLInputElement::WillRemoveFromRadioGroup()
 {
-  nsIRadioGroupContainer* container = GetRadioGroupContainer();
-  if (!container) {
+  //
+  // If the input element is not in a form and
+  // not in a document, we just need to return.
+  //
+  if (!mForm && !(IsInDoc() && GetParent())) {
     return;
   }
 
-  nsAutoString name;
-  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-
+  //
   // If this button was checked, we need to notify the group that there is no
   // longer a selected radio button
+  //
+  nsAutoString name;
+  PRBool gotName = PR_FALSE;
   if (GetChecked()) {
-    container->SetCurrentRadioButton(name, nsnull);
+    if (!gotName) {
+      if (!GetNameIfExists(name)) {
+        // If the name doesn't exist, nothing is going to happen anyway
+        return;
+      }
+      gotName = PR_TRUE;
+    }
+
+    nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+    if (container) {
+      container->SetCurrentRadioButton(name, nsnull);
+    }
   }
 
-  // Remove this radio from its group in the container.
-  // We need to call UpdateValueMissingValidityStateForRadio before to make sure
-  // the group validity is updated (with this element being ignored).
-  UpdateValueMissingValidityStateForRadio(true);
-  container->RemoveFromRadioGroup(name, static_cast<nsIFormControl*>(this));
+  //
+  // Remove this radio from its group in the container
+  //
+  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  if (container) {
+    if (!gotName) {
+      if (!GetNameIfExists(name)) {
+        // If the name doesn't exist, nothing is going to happen anyway
+        return;
+      }
+      gotName = PR_TRUE;
+    }
+
+    UpdateValueMissingValidityStateForRadio(true);
+
+    container->RemoveFromRadioGroup(name,
+                                    static_cast<nsIFormControl*>(this));
+  }
 }
 
 PRBool
@@ -3505,15 +3529,13 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 
   // Current radio button is not selected.
   // But make it tabbable if nothing in group is selected.
-  nsIRadioGroupContainer* container = GetRadioGroupContainer();
-  if (!container) {
+  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsAutoString name;
+  if (!container || !GetNameIfExists(name)) {
     *aIsFocusable = defaultFocusable;
     return PR_FALSE;
   }
 
-  nsAutoString name;
-  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-
   nsCOMPtr<nsIDOMHTMLInputElement> currentRadio;
   container->GetCurrentRadioButton(name, getter_AddRefs(currentRadio));
   if (currentRadio) {
@@ -3526,15 +3548,19 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 nsresult
 nsHTMLInputElement::VisitGroup(nsIRadioVisitor* aVisitor, PRBool aFlushContent)
 {
-  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
-    return container->WalkRadioGroup(name, aVisitor, aFlushContent);
+    if (GetNameIfExists(name)) {
+      rv = container->WalkRadioGroup(name, aVisitor, aFlushContent);
+    } else {
+      aVisitor->Visit(this);
+    }
+  } else {
+    aVisitor->Visit(this);
   }
-
-  aVisitor->Visit(this);
-  return NS_OK;
+  return rv;
 }
 
 nsHTMLInputElement::ValueModeType
@@ -3813,21 +3839,15 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
                               : HasAttr(kNameSpaceID_None, nsGkAtoms::required);
   bool valueMissing = false;
 
-  nsIRadioGroupContainer* c = GetRadioGroupContainer();
+  nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
   nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
     do_QueryInterface(c);
-
-  if (!container) {
-    SetValidityState(VALIDITY_STATE_VALUE_MISSING, required && !selected);
-    return;
-  }
-
   nsAutoString name;
-  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+  GetNameIfExists(name);
 
   // If the current radio is required and not ignored, we can assume the entire
   // group is required.
-  if (!required) {
+  if (!required && container && !name.IsEmpty()) {
     required = (aIgnoreSelf && HasAttr(kNameSpaceID_None, nsGkAtoms::required))
                  ? container->GetRequiredRadioCount(name) - 1
                  : container->GetRequiredRadioCount(name);
@@ -3835,14 +3855,18 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
 
   valueMissing = required && !selected;
 
-  if (container->GetValueMissingState(name) != valueMissing) {
-    container->SetValueMissingState(name, valueMissing);
+  if (container && !name.IsEmpty()) {
+    if (container->GetValueMissingState(name) != valueMissing) {
+      container->SetValueMissingState(name, valueMissing);
 
+      SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
+
+      nsCOMPtr<nsIRadioVisitor> visitor =
+        new nsRadioSetValueMissingState(this, valueMissing, notify);
+      VisitGroup(visitor, notify);
+    }
+  } else {
     SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
-
-    nsCOMPtr<nsIRadioVisitor> visitor =
-      new nsRadioSetValueMissingState(this, valueMissing, notify);
-    VisitGroup(visitor, notify);
   }
 }
 
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index a9d31ba2548a..10ce3b3335ae 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -225,6 +225,11 @@ public:
   }
   void AddedToRadioGroup();
   void WillRemoveFromRadioGroup();
+  /**
+   * Get the radio group container for this button (form or document)
+   * @return the radio group container (or null if no form or document)
+   */
+  virtual already_AddRefed<nsIRadioGroupContainer> GetRadioGroupContainer();
 
  /**
    * Helper function returning the currently selected button in the radio group.
@@ -562,14 +567,6 @@ protected:
     }
   }
 
-  /**
-   * Returns the radio group container if the element has one, null otherwise.
-   * The radio group container will be the form owner if there is one.
-   * The current document otherwise.
-   * @return the radio group container if the element has one, null otherwise.
-   */
-  nsIRadioGroupContainer* GetRadioGroupContainer() const;
-
   nsCOMPtr<nsIControllers> mControllers;
 
   /**

From 9f9b93131e292c43c1cb701c1d0c5b920a77ff27 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 14:49:59 +0200
Subject: [PATCH 158/314] Bug 641720 - Make
 nsHTMLInputElement::GetRadioGroupContainer saner. r=sicking,bz

---
 .../html/content/src/nsHTMLInputElement.cpp   | 213 ++++++++----------
 content/html/content/src/nsHTMLInputElement.h |  13 +-
 2 files changed, 102 insertions(+), 124 deletions(-)

diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp
index bdee92cdcbbb..c1c701140109 100644
--- a/content/html/content/src/nsHTMLInputElement.cpp
+++ b/content/html/content/src/nsHTMLInputElement.cpp
@@ -71,6 +71,7 @@
 #include "nsIEditor.h"
 #include "nsGUIEvent.h"
 #include "nsIIOService.h"
+#include "nsDocument.h"
 
 #include "nsPresState.h"
 #include "nsLayoutErrors.h"
@@ -909,12 +910,13 @@ nsHTMLInputElement::AfterSetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
     }
 
     if (mType == NS_FORM_INPUT_RADIO && aName == nsGkAtoms::required) {
-      nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
+      nsIRadioGroupContainer* c = GetRadioGroupContainer();
       nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
         do_QueryInterface(c);
-      nsAutoString name;
 
-      if (container && GetNameIfExists(name)) {
+      if (container) {
+        nsAutoString name;
+        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
         container->RadioRequiredChanged(name, this);
       }
     }
@@ -1576,12 +1578,11 @@ nsHTMLInputElement::DoSetChecked(PRBool aChecked, PRBool aNotify,
     if (aChecked) {
       rv = RadioSetChecked(aNotify);
     } else {
-      nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+      nsIRadioGroupContainer* container = GetRadioGroupContainer();
       if (container) {
         nsAutoString name;
-        if (GetNameIfExists(name)) {
-          container->SetCurrentRadioButton(name, nsnull);
-        }
+        GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+        container->SetCurrentRadioButton(name, nsnull);
       }
       // SetCheckedInternal is going to ask all radios to update their
       // validity state. We have to be sure the radio group container knows
@@ -1618,9 +1619,10 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   //
   // Let the group know that we are now the One True Radio Button
   //
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  nsAutoString name;
-  if (container && GetNameIfExists(name)) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (container) {
+    nsAutoString name;
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
     rv = container->SetCurrentRadioButton(name, this);
   }
 
@@ -1634,35 +1636,38 @@ nsHTMLInputElement::RadioSetChecked(PRBool aNotify)
   return rv;
 }
 
-/* virtual */ already_AddRefed<nsIRadioGroupContainer>
-nsHTMLInputElement::GetRadioGroupContainer()
+nsIRadioGroupContainer*
+nsHTMLInputElement::GetRadioGroupContainer() const
 {
-  nsIRadioGroupContainer* retval = nsnull;
-  if (mForm) {
-    CallQueryInterface(mForm, &retval);
-  } else {
-    nsIDocument* currentDoc = GetCurrentDoc();
-    if (currentDoc) {
-      CallQueryInterface(currentDoc, &retval);
-    }
+  NS_ASSERTION(mType == NS_FORM_INPUT_RADIO,
+               "GetRadioGroupContainer should only be called when type='radio'");
+
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
+  if (name.IsEmpty()) {
+    return nsnull;
   }
-  return retval;
+
+  if (mForm) {
+    return mForm;
+  }
+
+  return static_cast<nsDocument*>(GetCurrentDoc());
 }
 
 already_AddRefed<nsIDOMHTMLInputElement>
 nsHTMLInputElement::GetSelectedRadioButton()
 {
   nsIDOMHTMLInputElement* selected;
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
 
   if (!container) {
     return nsnull;
   }
 
   nsAutoString name;
-  if (!GetNameIfExists(name)) {
-    return nsnull;
-  }
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
   container->GetCurrentRadioButton(name, &selected);
   return selected;
@@ -2279,29 +2284,28 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
               case NS_VK_DOWN:
               case NS_VK_RIGHT:
               // Arrow key pressed, focus+select prev/next radio button
-              nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+              nsIRadioGroupContainer* container = GetRadioGroupContainer();
               if (container) {
                 nsAutoString name;
-                if (GetNameIfExists(name)) {
-                  nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
-                  container->GetNextRadioButton(name, isMovingBack, this,
-                                                getter_AddRefs(selectedRadioButton));
-                  nsCOMPtr<nsIContent> radioContent =
-                    do_QueryInterface(selectedRadioButton);
-                  if (radioContent) {
-                    rv = selectedRadioButton->Focus();
+                GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+                nsCOMPtr<nsIDOMHTMLInputElement> selectedRadioButton;
+                container->GetNextRadioButton(name, isMovingBack, this,
+                                              getter_AddRefs(selectedRadioButton));
+                nsCOMPtr<nsIContent> radioContent =
+                  do_QueryInterface(selectedRadioButton);
+                if (radioContent) {
+                  rv = selectedRadioButton->Focus();
+                  if (NS_SUCCEEDED(rv)) {
+                    nsEventStatus status = nsEventStatus_eIgnore;
+                    nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
+                                       NS_MOUSE_CLICK, nsnull,
+                                       nsMouseEvent::eReal);
+                    event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
+                    rv = nsEventDispatcher::Dispatch(radioContent,
+                                                     aVisitor.mPresContext,
+                                                     &event, nsnull, &status);
                     if (NS_SUCCEEDED(rv)) {
-                      nsEventStatus status = nsEventStatus_eIgnore;
-                      nsMouseEvent event(NS_IS_TRUSTED_EVENT(aVisitor.mEvent),
-                                         NS_MOUSE_CLICK, nsnull,
-                                         nsMouseEvent::eReal);
-                      event.inputSource = nsIDOMNSMouseEvent::MOZ_SOURCE_KEYBOARD;
-                      rv = nsEventDispatcher::Dispatch(radioContent,
-                                                       aVisitor.mPresContext,
-                                                       &event, nsnull, &status);
-                      if (NS_SUCCEEDED(rv)) {
-                        aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
-                      }
+                      aVisitor.mEventStatus = nsEventStatus_eConsumeNoDefault;
                     }
                   }
                 }
@@ -3406,69 +3410,40 @@ nsHTMLInputElement::AddedToRadioGroup()
   nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    if (GetNameIfExists(name)) {
-      container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+    container->AddToRadioGroup(name, static_cast<nsIFormControl*>(this));
 
-      // We initialize the validity of the element to the validity of the group
-      // because we assume UpdateValueMissingState() will be called after.
-      nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
-        do_QueryInterface(container);
-      SetValidityState(VALIDITY_STATE_VALUE_MISSING,
-                       container2->GetValueMissingState(name));
-    }
+    // We initialize the validity of the element to the validity of the group
+    // because we assume UpdateValueMissingState() will be called after.
+    nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container2 =
+      do_QueryInterface(container);
+    SetValidityState(VALIDITY_STATE_VALUE_MISSING,
+                     container2->GetValueMissingState(name));
   }
 }
 
 void
 nsHTMLInputElement::WillRemoveFromRadioGroup()
 {
-  //
-  // If the input element is not in a form and
-  // not in a document, we just need to return.
-  //
-  if (!mForm && !(IsInDoc() && GetParent())) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (!container) {
     return;
   }
 
-  //
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
   // If this button was checked, we need to notify the group that there is no
   // longer a selected radio button
-  //
-  nsAutoString name;
-  PRBool gotName = PR_FALSE;
   if (GetChecked()) {
-    if (!gotName) {
-      if (!GetNameIfExists(name)) {
-        // If the name doesn't exist, nothing is going to happen anyway
-        return;
-      }
-      gotName = PR_TRUE;
-    }
-
-    nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-    if (container) {
-      container->SetCurrentRadioButton(name, nsnull);
-    }
+    container->SetCurrentRadioButton(name, nsnull);
   }
 
-  //
-  // Remove this radio from its group in the container
-  //
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  if (container) {
-    if (!gotName) {
-      if (!GetNameIfExists(name)) {
-        // If the name doesn't exist, nothing is going to happen anyway
-        return;
-      }
-      gotName = PR_TRUE;
-    }
-
-    UpdateValueMissingValidityStateForRadio(true);
-
-    container->RemoveFromRadioGroup(name,
-                                    static_cast<nsIFormControl*>(this));
-  }
+  // Remove this radio from its group in the container.
+  // We need to call UpdateValueMissingValidityStateForRadio before to make sure
+  // the group validity is updated (with this element being ignored).
+  UpdateValueMissingValidityStateForRadio(true);
+  container->RemoveFromRadioGroup(name, static_cast<nsIFormControl*>(this));
 }
 
 PRBool
@@ -3529,13 +3504,15 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 
   // Current radio button is not selected.
   // But make it tabbable if nothing in group is selected.
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
-  nsAutoString name;
-  if (!container || !GetNameIfExists(name)) {
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
+  if (!container) {
     *aIsFocusable = defaultFocusable;
     return PR_FALSE;
   }
 
+  nsAutoString name;
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+
   nsCOMPtr<nsIDOMHTMLInputElement> currentRadio;
   container->GetCurrentRadioButton(name, getter_AddRefs(currentRadio));
   if (currentRadio) {
@@ -3548,19 +3525,15 @@ nsHTMLInputElement::IsHTMLFocusable(PRBool aWithMouse, PRBool *aIsFocusable, PRI
 nsresult
 nsHTMLInputElement::VisitGroup(nsIRadioVisitor* aVisitor, PRBool aFlushContent)
 {
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIRadioGroupContainer> container = GetRadioGroupContainer();
+  nsIRadioGroupContainer* container = GetRadioGroupContainer();
   if (container) {
     nsAutoString name;
-    if (GetNameIfExists(name)) {
-      rv = container->WalkRadioGroup(name, aVisitor, aFlushContent);
-    } else {
-      aVisitor->Visit(this);
-    }
-  } else {
-    aVisitor->Visit(this);
+    GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
+    return container->WalkRadioGroup(name, aVisitor, aFlushContent);
   }
-  return rv;
+
+  aVisitor->Visit(this);
+  return NS_OK;
 }
 
 nsHTMLInputElement::ValueModeType
@@ -3839,15 +3812,21 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
                               : HasAttr(kNameSpaceID_None, nsGkAtoms::required);
   bool valueMissing = false;
 
-  nsCOMPtr<nsIRadioGroupContainer> c = GetRadioGroupContainer();
+  nsIRadioGroupContainer* c = GetRadioGroupContainer();
   nsCOMPtr<nsIRadioGroupContainer_MOZILLA_2_0_BRANCH> container =
     do_QueryInterface(c);
+
+  if (!container) {
+    SetValidityState(VALIDITY_STATE_VALUE_MISSING, required && !selected);
+    return;
+  }
+
   nsAutoString name;
-  GetNameIfExists(name);
+  GetAttr(kNameSpaceID_None, nsGkAtoms::name, name);
 
   // If the current radio is required and not ignored, we can assume the entire
   // group is required.
-  if (!required && container && !name.IsEmpty()) {
+  if (!required) {
     required = (aIgnoreSelf && HasAttr(kNameSpaceID_None, nsGkAtoms::required))
                  ? container->GetRequiredRadioCount(name) - 1
                  : container->GetRequiredRadioCount(name);
@@ -3855,18 +3834,14 @@ nsHTMLInputElement::UpdateValueMissingValidityStateForRadio(bool aIgnoreSelf)
 
   valueMissing = required && !selected;
 
-  if (container && !name.IsEmpty()) {
-    if (container->GetValueMissingState(name) != valueMissing) {
-      container->SetValueMissingState(name, valueMissing);
+  if (container->GetValueMissingState(name) != valueMissing) {
+    container->SetValueMissingState(name, valueMissing);
 
-      SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
-
-      nsCOMPtr<nsIRadioVisitor> visitor =
-        new nsRadioSetValueMissingState(this, valueMissing, notify);
-      VisitGroup(visitor, notify);
-    }
-  } else {
     SetValidityState(VALIDITY_STATE_VALUE_MISSING, valueMissing);
+
+    nsCOMPtr<nsIRadioVisitor> visitor =
+      new nsRadioSetValueMissingState(this, valueMissing, notify);
+    VisitGroup(visitor, notify);
   }
 }
 
diff --git a/content/html/content/src/nsHTMLInputElement.h b/content/html/content/src/nsHTMLInputElement.h
index 10ce3b3335ae..a9d31ba2548a 100644
--- a/content/html/content/src/nsHTMLInputElement.h
+++ b/content/html/content/src/nsHTMLInputElement.h
@@ -225,11 +225,6 @@ public:
   }
   void AddedToRadioGroup();
   void WillRemoveFromRadioGroup();
-  /**
-   * Get the radio group container for this button (form or document)
-   * @return the radio group container (or null if no form or document)
-   */
-  virtual already_AddRefed<nsIRadioGroupContainer> GetRadioGroupContainer();
 
  /**
    * Helper function returning the currently selected button in the radio group.
@@ -567,6 +562,14 @@ protected:
     }
   }
 
+  /**
+   * Returns the radio group container if the element has one, null otherwise.
+   * The radio group container will be the form owner if there is one.
+   * The current document otherwise.
+   * @return the radio group container if the element has one, null otherwise.
+   */
+  nsIRadioGroupContainer* GetRadioGroupContainer() const;
+
   nsCOMPtr<nsIControllers> mControllers;
 
   /**

From 44b750c135dfd39b01ddcd29c72891ad87e4f709 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Wed, 4 May 2011 13:57:01 -0400
Subject: [PATCH 160/314] Bug 654167.  Fix drawing of thin 'border-style:
 double' border-collapsed borders.  r=roc

---
 layout/base/nsCSSRendering.cpp                              | 6 +++++-
 layout/reftests/table-bordercollapse/double_borders.html    | 6 ++++++
 .../reftests/table-bordercollapse/double_borders_ref.html   | 6 ++++++
 layout/reftests/table-bordercollapse/reftest.list           | 1 +
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 layout/reftests/table-bordercollapse/double_borders.html
 create mode 100644 layout/reftests/table-bordercollapse/double_borders_ref.html

diff --git a/layout/base/nsCSSRendering.cpp b/layout/base/nsCSSRendering.cpp
index 3981e9cefd36..dcb2e28b3816 100644
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -3315,7 +3315,11 @@ nsCSSRendering::DrawTableBorderSegment(nsRenderingContext&     aContext,
     }
     break;
   case NS_STYLE_BORDER_STYLE_DOUBLE:
-    if ((aBorder.width > 2) && (aBorder.height > 2)) {
+    // We can only do "double" borders if the thickness of the border
+    // is more than 2px.  Otherwise, we fall through to painting a
+    // solid border.
+    if ((aBorder.width > 2*twipsPerPixel || horizontal) &&
+        (aBorder.height > 2*twipsPerPixel || !horizontal)) {
       nscoord startBevel = (aStartBevelOffset > 0)
                             ? RoundFloatToPixel(0.333333f * (float)aStartBevelOffset, twipsPerPixel) : 0;
       nscoord endBevel =   (aEndBevelOffset > 0)
diff --git a/layout/reftests/table-bordercollapse/double_borders.html b/layout/reftests/table-bordercollapse/double_borders.html
new file mode 100644
index 000000000000..25c4e87f2b9e
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/double_borders.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<table style="border-collapse: collapse; border: 1px double blue">
+  <tr>
+    <td>This should have a blue border</td>
+  </tr>
+</table>
diff --git a/layout/reftests/table-bordercollapse/double_borders_ref.html b/layout/reftests/table-bordercollapse/double_borders_ref.html
new file mode 100644
index 000000000000..a323fdaa07b4
--- /dev/null
+++ b/layout/reftests/table-bordercollapse/double_borders_ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<table style="border-collapse: collapse; border: 1px solid blue">
+  <tr>
+    <td>This should have a blue border</td>
+  </tr>
+</table>
diff --git a/layout/reftests/table-bordercollapse/reftest.list b/layout/reftests/table-bordercollapse/reftest.list
index a16d7d274f96..0e0e5ba44e3b 100644
--- a/layout/reftests/table-bordercollapse/reftest.list
+++ b/layout/reftests/table-bordercollapse/reftest.list
@@ -93,3 +93,4 @@ fails-if(cocoaWidget) == bc_borderoffset2.html bc_borderoffset2_ref.html # bug 4
 == bordercolor-3.html bordercolor-3-ref.html
 == bordercolor-4.html bordercolor-4-ref.html
 == empty-toprow.html empty-toprow-ref.html
+== double_borders.html double_borders_ref.html

From 6dc2dfc41a687df0a7c7655dac77918e30d84feb Mon Sep 17 00:00:00 2001
From: Paul ADENOT <paul@paul.cx>
Date: Thu, 5 May 2011 12:18:06 +0200
Subject: [PATCH 161/314] Bug 654956 : Added private: statement in
 nsAudioStreamRemote. r=kinetik

---
 content/media/nsAudioStream.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
index 4bb5976c3126..2ac2e7a6009c 100644
--- a/content/media/nsAudioStream.cpp
+++ b/content/media/nsAudioStream.cpp
@@ -140,6 +140,7 @@ class nsAudioStreamRemote : public nsAudioStream
   PRBool IsPaused();
   PRInt32 GetMinWriteSamples();
 
+private:
   nsRefPtr<AudioChild> mAudioChild;
 
   SampleFormat mFormat;

From bf26c8a98e02995d63367bcb1fa671c38ed420be Mon Sep 17 00:00:00 2001
From: Nick Hurley <hurley@mozilla.com>
Date: Thu, 5 May 2011 11:45:59 -0400
Subject: [PATCH 162/314] bug 648878 - move get(local|remote)(address|port) to
 httpchannelchild r=jduell

---
 netwerk/ipc/NeckoMessageUtils.h             | 59 ++++++++++++++++++++
 netwerk/protocol/http/HttpBaseChannel.cpp   | 62 +++++++++++++++++++++
 netwerk/protocol/http/HttpBaseChannel.h     | 10 ++++
 netwerk/protocol/http/HttpChannelChild.cpp  | 26 +++++++--
 netwerk/protocol/http/HttpChannelChild.h    |  8 ++-
 netwerk/protocol/http/HttpChannelParent.cpp |  4 +-
 netwerk/protocol/http/PHttpChannel.ipdl     |  6 +-
 netwerk/protocol/http/nsHttpChannel.cpp     | 60 --------------------
 netwerk/protocol/http/nsHttpChannel.h       |  7 ---
 9 files changed, 165 insertions(+), 77 deletions(-)

diff --git a/netwerk/ipc/NeckoMessageUtils.h b/netwerk/ipc/NeckoMessageUtils.h
index 400645e857bd..a483a3493509 100644
--- a/netwerk/ipc/NeckoMessageUtils.h
+++ b/netwerk/ipc/NeckoMessageUtils.h
@@ -47,6 +47,7 @@
 #include "nsComponentManagerUtils.h"
 #include "nsNetUtil.h"
 #include "nsStringStream.h"
+#include "prio.h"
 
 namespace IPC {
 
@@ -325,6 +326,64 @@ struct ParamTraits<Permission>
   }
 };
 
+template<>
+struct ParamTraits<PRNetAddr>
+{
+  static void Write(Message* aMsg, const PRNetAddr &aParam)
+  {
+    WriteParam(aMsg, aParam.raw.family);
+    if (aParam.raw.family == PR_AF_UNSPEC) {
+      aMsg->WriteBytes(aParam.raw.data, sizeof(aParam.raw.data));
+    } else if (aParam.raw.family == PR_AF_INET) {
+      WriteParam(aMsg, aParam.inet.port);
+      WriteParam(aMsg, aParam.inet.ip);
+    } else if (aParam.raw.family == PR_AF_INET6) {
+      WriteParam(aMsg, aParam.ipv6.port);
+      WriteParam(aMsg, aParam.ipv6.flowinfo);
+      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[0]);
+      WriteParam(aMsg, aParam.ipv6.ip.pr_s6_addr64[1]);
+      WriteParam(aMsg, aParam.ipv6.scope_id);
+#if defined(XP_UNIX) || defined(XP_OS2)
+    } else if (aParam.raw.family == PR_AF_LOCAL) {
+      aMsg->WriteBytes(aParam.local.path, sizeof(aParam.local.path));
+#endif
+    }
+
+    /* If we get here without hitting any of the cases above, there's not much
+     * we can do but let the deserializer fail when it gets this message */
+  }
+
+  static bool Read(const Message* aMsg, void** aIter, PRNetAddr* aResult)
+  {
+    if (!ReadParam(aMsg, aIter, &aResult->raw.family))
+      return false;
+
+    if (aResult->raw.family == PR_AF_UNSPEC) {
+      return aMsg->ReadBytes(aIter,
+                             reinterpret_cast<const char**>(&aResult->raw.data),
+                             sizeof(aResult->raw.data));
+    } else if (aResult->raw.family == PR_AF_INET) {
+      return ReadParam(aMsg, aIter, &aResult->inet.port) &&
+             ReadParam(aMsg, aIter, &aResult->inet.ip);
+    } else if (aResult->raw.family == PR_AF_INET6) {
+      return ReadParam(aMsg, aIter, &aResult->ipv6.port) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.flowinfo) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[0]) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.ip.pr_s6_addr64[1]) &&
+             ReadParam(aMsg, aIter, &aResult->ipv6.scope_id);
+#if defined(XP_UNIX) || defined(XP_OS2)
+    } else if (aResult->raw.family == PR_AF_LOCAL) {
+      return aMsg->ReadBytes(aIter,
+                             reinterpret_cast<const char**>(&aResult->local.path),
+                             sizeof(aResult->local.path));
+#endif
+    }
+
+    /* We've been tricked by some socket family we don't know about! */
+    return false;
+  }
+};
+
 }
 
 #endif // mozilla_net_NeckoMessageUtils_h
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
index 1960ed546cd9..bdc278bb2c10 100644
--- a/netwerk/protocol/http/HttpBaseChannel.cpp
+++ b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -54,6 +54,8 @@
 #include "nsEscape.h"
 #include "nsPrintfCString.h"
 
+#include "prnetdb.h"
+
 namespace mozilla {
 namespace net {
 
@@ -1177,6 +1179,66 @@ HttpBaseChannel::SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+HttpBaseChannel::GetLocalAddress(nsACString& addr)
+{
+  if (mSelfAddr.raw.family == PR_AF_UNSPEC)
+    return NS_ERROR_NOT_AVAILABLE;
+
+  addr.SetCapacity(64);
+  PR_NetAddrToString(&mSelfAddr, addr.BeginWriting(), 64);
+  addr.SetLength(strlen(addr.BeginReading()));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetLocalPort(PRInt32* port)
+{
+  NS_ENSURE_ARG_POINTER(port);
+
+  if (mSelfAddr.raw.family == PR_AF_INET) {
+    *port = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
+  }
+  else if (mSelfAddr.raw.family == PR_AF_INET6) {
+    *port = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
+  }
+  else
+    return NS_ERROR_NOT_AVAILABLE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetRemoteAddress(nsACString& addr)
+{
+  if (mPeerAddr.raw.family == PR_AF_UNSPEC)
+    return NS_ERROR_NOT_AVAILABLE;
+
+  addr.SetCapacity(64);
+  PR_NetAddrToString(&mPeerAddr, addr.BeginWriting(), 64);
+  addr.SetLength(strlen(addr.BeginReading()));
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+HttpBaseChannel::GetRemotePort(PRInt32* port)
+{
+  NS_ENSURE_ARG_POINTER(port);
+
+  if (mPeerAddr.raw.family == PR_AF_INET) {
+    *port = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
+  }
+  else if (mPeerAddr.raw.family == PR_AF_INET6) {
+    *port = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
+  }
+  else
+    return NS_ERROR_NOT_AVAILABLE;
+
+  return NS_OK;
+}
+
 //-----------------------------------------------------------------------------
 // HttpBaseChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
index 5eba942cc829..73a5ac43c3f5 100644
--- a/netwerk/protocol/http/HttpBaseChannel.h
+++ b/netwerk/protocol/http/HttpBaseChannel.h
@@ -155,6 +155,10 @@ public:
   NS_IMETHOD GetChannelIsForDownload(PRBool *aChannelIsForDownload);
   NS_IMETHOD SetChannelIsForDownload(PRBool aChannelIsForDownload);
   NS_IMETHOD SetCacheKeysRedirectChain(nsTArray<nsCString> *cacheKeys);
+  NS_IMETHOD GetLocalAddress(nsACString& addr);
+  NS_IMETHOD GetLocalPort(PRInt32* port);
+  NS_IMETHOD GetRemoteAddress(nsACString& addr);
+  NS_IMETHOD GetRemotePort(PRInt32* port);
   inline void CleanRedirectCacheChainIfNecessary()
   {
       if (mRedirectedCachekeys) {
@@ -197,6 +201,9 @@ public:
     nsHttpResponseHead * GetResponseHead() const { return mResponseHead; }
     nsHttpRequestHead * GetRequestHead() { return &mRequestHead; }
 
+    const PRNetAddr& GetSelfAddr() { return mSelfAddr; }
+    const PRNetAddr& GetPeerAddr() { return mPeerAddr; }
+
 protected:
   nsresult ApplyContentConversions();
 
@@ -236,6 +243,9 @@ protected:
   nsCString                         mContentCharsetHint;
   nsCString                         mUserSetCookieHeader;
 
+  PRNetAddr                         mSelfAddr;
+  PRNetAddr                         mPeerAddr;
+
   // Resumable channel specific data
   nsCString                         mEntityID;
   PRUint64                          mStartPos;
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 94031e6b1a73..b90746e5fadd 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -155,7 +155,9 @@ class StartRequestEvent : public ChannelEvent
                     const PRBool& cacheEntryAvailable,
                     const PRUint32& cacheExpirationTime,
                     const nsCString& cachedCharset,
-                    const nsCString& securityInfoSerialization)
+                    const nsCString& securityInfoSerialization,
+                    const PRNetAddr& selfAddr,
+                    const PRNetAddr& peerAddr)
   : mChild(child)
   , mResponseHead(responseHead)
   , mRequestHeaders(requestHeaders)
@@ -165,6 +167,8 @@ class StartRequestEvent : public ChannelEvent
   , mCacheExpirationTime(cacheExpirationTime)
   , mCachedCharset(cachedCharset)
   , mSecurityInfoSerialization(securityInfoSerialization)
+  , mSelfAddr(selfAddr)
+  , mPeerAddr(peerAddr)
   {}
 
   void Run() 
@@ -172,7 +176,7 @@ class StartRequestEvent : public ChannelEvent
     mChild->OnStartRequest(mResponseHead, mUseResponseHead, mRequestHeaders,
                            mIsFromCache, mCacheEntryAvailable,
                            mCacheExpirationTime, mCachedCharset,
-                           mSecurityInfoSerialization);
+                           mSecurityInfoSerialization, mSelfAddr, mPeerAddr);
   }
  private:
   HttpChannelChild* mChild;
@@ -184,6 +188,8 @@ class StartRequestEvent : public ChannelEvent
   PRUint32 mCacheExpirationTime;
   nsCString mCachedCharset;
   nsCString mSecurityInfoSerialization;
+  PRNetAddr mSelfAddr;
+  PRNetAddr mPeerAddr;
 };
 
 bool
@@ -209,18 +215,21 @@ HttpChannelChild::RecvOnStartRequest(const nsHttpResponseHead& responseHead,
                                      const PRBool& cacheEntryAvailable,
                                      const PRUint32& cacheExpirationTime,
                                      const nsCString& cachedCharset,
-                                     const nsCString& securityInfoSerialization)
+                                     const nsCString& securityInfoSerialization,
+                                     const PRNetAddr& selfAddr,
+                                     const PRNetAddr& peerAddr)
 {
   if (ShouldEnqueue()) {
     EnqueueEvent(new StartRequestEvent(this, responseHead, useResponseHead,
                                        requestHeaders,
                                        isFromCache, cacheEntryAvailable,
                                        cacheExpirationTime, cachedCharset,
-                                       securityInfoSerialization));
+                                       securityInfoSerialization, selfAddr,
+                                       peerAddr));
   } else {
     OnStartRequest(responseHead, useResponseHead, requestHeaders, isFromCache,
                    cacheEntryAvailable, cacheExpirationTime, cachedCharset,
-                   securityInfoSerialization);
+                   securityInfoSerialization, selfAddr, peerAddr);
   }
   return true;
 }
@@ -233,7 +242,9 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
                                  const PRBool& cacheEntryAvailable,
                                  const PRUint32& cacheExpirationTime,
                                  const nsCString& cachedCharset,
-                                 const nsCString& securityInfoSerialization)
+                                 const nsCString& securityInfoSerialization,
+                                 const PRNetAddr& selfAddr,
+                                 const PRNetAddr& peerAddr)
 {
   LOG(("HttpChannelChild::RecvOnStartRequest [this=%x]\n", this));
 
@@ -271,6 +282,9 @@ HttpChannelChild::OnStartRequest(const nsHttpResponseHead& responseHead,
   rv = ApplyContentConversions();
   if (NS_FAILED(rv))
     Cancel(rv);
+
+  mSelfAddr = selfAddr;
+  mPeerAddr = peerAddr;
 }
 
 class TransportAndDataEvent : public ChannelEvent
diff --git a/netwerk/protocol/http/HttpChannelChild.h b/netwerk/protocol/http/HttpChannelChild.h
index 8c61d9bcf004..2155f83ffbdf 100644
--- a/netwerk/protocol/http/HttpChannelChild.h
+++ b/netwerk/protocol/http/HttpChannelChild.h
@@ -134,7 +134,9 @@ protected:
                           const PRBool& cacheEntryAvailable,
                           const PRUint32& cacheExpirationTime,
                           const nsCString& cachedCharset,
-                          const nsCString& securityInfoSerialization);
+                          const nsCString& securityInfoSerialization,
+                          const PRNetAddr& selfAddr,
+                          const PRNetAddr& peerAddr);
   bool RecvOnTransportAndData(const nsresult& status,
                               const PRUint64& progress,
                               const PRUint64& progressMax,
@@ -182,7 +184,9 @@ private:
                       const PRBool& cacheEntryAvailable,
                       const PRUint32& cacheExpirationTime,
                       const nsCString& cachedCharset,
-                      const nsCString& securityInfoSerialization);
+                      const nsCString& securityInfoSerialization,
+                      const PRNetAddr& selfAddr,
+                      const PRNetAddr& peerAddr);
   void OnTransportAndData(const nsresult& status,
                           const PRUint64 progress,
                           const PRUint64& progressMax,
diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp
index 2745cbf72f1b..b8736beb0523 100644
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -430,13 +430,15 @@ HttpChannelParent::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
     tuple->mMerge  = false;
   }
 
+  nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get());
   if (mIPCClosed || 
       !SendOnStartRequest(responseHead ? *responseHead : nsHttpResponseHead(), 
                           !!responseHead,
                           headers,
                           isFromCache,
                           mCacheDescriptor ? PR_TRUE : PR_FALSE,
-                          expirationTime, cachedCharset, secInfoSerialization)) 
+                          expirationTime, cachedCharset, secInfoSerialization,
+                          httpChan->GetSelfAddr(), httpChan->GetPeerAddr())) 
   {
     return NS_ERROR_UNEXPECTED; 
   }
diff --git a/netwerk/protocol/http/PHttpChannel.ipdl b/netwerk/protocol/http/PHttpChannel.ipdl
index 8e79a775e887..b6b095d26677 100644
--- a/netwerk/protocol/http/PHttpChannel.ipdl
+++ b/netwerk/protocol/http/PHttpChannel.ipdl
@@ -43,12 +43,14 @@ include protocol PNecko;
 
 include "mozilla/net/PHttpChannelParams.h";
 include "mozilla/net/NeckoMessageUtils.h";
+include "prio.h";
 
 using RequestHeaderTuples;
 using nsHttpResponseHead;
 using nsHttpAtom;
 using IPC::URI;
 using IPC::InputStream;
+using PRNetAddr;
 
 namespace mozilla {
 namespace net {
@@ -131,7 +133,9 @@ child:
                  PRBool              cacheEntryAvailable,
                  PRUint32            cacheExpirationTime,
                  nsCString           cachedCharset,
-                 nsCString           securityInfoSerialization);
+                 nsCString           securityInfoSerialization,
+                 PRNetAddr           selfAddr,
+                 PRNetAddr           peerAddr);
 
   // Combines a single OnDataAvailable and its associated OnProgress &
   // OnStatus calls into one IPDL message
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 645f156329bb..3791bd7972c7 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3714,66 +3714,6 @@ nsHttpChannel::SetupFallbackChannel(const char *aFallbackKey)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHttpChannel::GetRemoteAddress(nsACString & _result)
-{
-    if (mPeerAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    _result.SetCapacity(64);
-    PR_NetAddrToString(&mPeerAddr, _result.BeginWriting(), 64);
-    _result.SetLength(strlen(_result.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetRemotePort(PRInt32 * _result)
-{
-    NS_ENSURE_ARG_POINTER(_result);
-
-    if (mPeerAddr.raw.family == PR_AF_INET) {
-        *_result = (PRInt32)PR_ntohs(mPeerAddr.inet.port);
-    }
-    else if (mPeerAddr.raw.family == PR_AF_INET6) {
-        *_result = (PRInt32)PR_ntohs(mPeerAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetLocalAddress(nsACString & _result)
-{
-    if (mSelfAddr.raw.family == PR_AF_UNSPEC)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    _result.SetCapacity(64);
-    PR_NetAddrToString(&mSelfAddr, _result.BeginWriting(), 64);
-    _result.SetLength(strlen(_result.BeginReading()));
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::GetLocalPort(PRInt32 * _result)
-{
-    NS_ENSURE_ARG_POINTER(_result);
-
-    if (mSelfAddr.raw.family == PR_AF_INET) {
-        *_result = (PRInt32)PR_ntohs(mSelfAddr.inet.port);
-    }
-    else if (mSelfAddr.raw.family == PR_AF_INET6) {
-        *_result = (PRInt32)PR_ntohs(mSelfAddr.ipv6.port);
-    }
-    else
-        return NS_ERROR_NOT_AVAILABLE;
-
-    return NS_OK;
-}
-
 //-----------------------------------------------------------------------------
 // nsHttpChannel::nsISupportsPriority
 //-----------------------------------------------------------------------------
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index b1682fbb4ca2..fcf013bfe0b7 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -137,10 +137,6 @@ public:
     NS_IMETHOD AsyncOpen(nsIStreamListener *listener, nsISupports *aContext);
     // nsIHttpChannelInternal
     NS_IMETHOD SetupFallbackChannel(const char *aFallbackKey);
-    NS_IMETHOD GetLocalAddress(nsACString& addr);
-    NS_IMETHOD GetLocalPort(PRInt32* port);
-    NS_IMETHOD GetRemoteAddress(nsACString& addr);
-    NS_IMETHOD GetRemotePort(PRInt32* port);
     // nsISupportsPriority
     NS_IMETHOD SetPriority(PRInt32 value);
     // nsIResumableChannel
@@ -351,9 +347,6 @@ private:
     // the cache entry's expiration time. Otherwise, it is not(see bug 567360).
     PRUint32                          mRequestTimeInitialized : 1;
 
-    PRNetAddr                         mSelfAddr;
-    PRNetAddr                         mPeerAddr;
-
     nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
 
     nsCOMPtr<nsICryptoHash>        mHasher;

From 87199fb837b8802e0bc02414f10f1648cd1666ce Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Thu, 5 May 2011 01:55:23 +0200
Subject: [PATCH 163/314] Bug 649319 - tab focus when resizing or moving a
 group in panorama; f=raymond, r=ian

---
 browser/base/content/tabview/drag.js          | 13 ---
 browser/base/content/tabview/groupitems.js    |  3 +-
 browser/base/content/tabview/items.js         |  8 +-
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug649319.js | 88 +++++++++++++++++++
 5 files changed, 93 insertions(+), 20 deletions(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug649319.js

diff --git a/browser/base/content/tabview/drag.js b/browser/base/content/tabview/drag.js
index 30eb30b74903..f40fcac87eb6 100644
--- a/browser/base/content/tabview/drag.js
+++ b/browser/base/content/tabview/drag.js
@@ -85,19 +85,6 @@ function Drag(item, event, isFauxDrag) {
   this.safeWindowBounds = Items.getSafeWindowBounds();
 
   Trenches.activateOthersTrenches(this.el);
-
-  if (!isFauxDrag) {
-    // When a tab drag starts, make it the focused tab.
-    if (this.item.isAGroupItem) {
-      var tab = UI.getActiveTab();
-      if (!tab || tab.parent != this.item) {
-        if (this.item._children.length)
-          UI.setActive(this.item._children[0]);
-      }
-    } else if (this.item.isATabItem) {
-      UI.setActive(this.item);
-    }
-  }
 };
 
 Drag.prototype = {
diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 6ad132496b1d..8b096c085a8e 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1014,8 +1014,7 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         if (typeof item.setResizable == 'function')
           item.setResizable(false, options.immediately);
 
-        // if it is visually active, set it as the active tab.
-        if (iQ(item.container).hasClass("focus"))
+        if (item == UI.getActiveTab() || !this._activeTab)
           this.setActiveTab(item);
 
         // if it matches the selected tab or no active tab and the browser
diff --git a/browser/base/content/tabview/items.js b/browser/base/content/tabview/items.js
index 7702d1d05ceb..99add3765c34 100644
--- a/browser/base/content/tabview/items.js
+++ b/browser/base/content/tabview/items.js
@@ -151,10 +151,9 @@ Item.prototype = {
     this.dragOptions = {
       cancelClass: 'close stackExpander',
       start: function(e, ui) {
-        if (this.isAGroupItem) {
-          UI.setActive(this);
+        UI.setActive(this);
+        if (this.isAGroupItem)
           this._unfreezeItemSize();
-        }
         // if we start dragging a tab within a group, start with dropSpace on.
         else if (this.parent != null)
           this.parent._dropSpaceActive = true;
@@ -201,8 +200,7 @@ Item.prototype = {
       minWidth: 90,
       minHeight: 90,
       start: function(e,ui) {
-        if (this.isAGroupItem)
-          UI.setActive(this);
+        UI.setActive(this);
         resize.info = new Drag(this, e);
       },
       resize: function(e,ui) {
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index d80ddb817ca0..39656d720c7c 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -135,6 +135,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug648882.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_bug649307.js \
+                 browser_tabview_bug649319.js \
                  browser_tabview_bug651311.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649319.js b/browser/base/content/test/tabview/browser_tabview_bug649319.js
new file mode 100644
index 000000000000..fe69bcbd9ef4
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug649319.js
@@ -0,0 +1,88 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  waitForExplicitFinish();
+
+  newWindowWithTabView(function (win) {
+    registerCleanupFunction(function () win.close());
+    waitForFocus(function () testScenarios(win));
+  });
+}
+
+function testScenarios(win) {
+  let simulateDragDrop = function (target) {
+    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
+    EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
+    EventUtils.synthesizeMouse(target, 80, 20, {type: "mouseup"}, cw);
+  }
+
+  let dragOutOfGroup = function (target) {
+    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
+    EventUtils.synthesizeMouse(target, 600, 5, {type: "mousemove"}, cw);
+    EventUtils.synthesizeMouse(target, 600, 5, {type: "mouseup"}, cw);
+  }
+
+  let dragIntoGroup = function (target) {
+    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
+    EventUtils.synthesizeMouse(target, -200, 5, {type: "mousemove"}, cw);
+    EventUtils.synthesizeMouse(target, -200, 5, {type: "mouseup"}, cw);
+  }
+
+  let assertActiveOrphan = function (tabItem) {
+    ok(!cw.GroupItems.getActiveGroupItem(), "no groupItem is active");
+    is(cw.UI.getActiveTab(), tabItem, "orphan tab is active");
+    is(cw.UI.getActiveOrphanTab(), tabItem, "orphan tab is active");
+  }
+
+  let cw = win.TabView.getContentWindow();
+  let groupItem = cw.GroupItems.groupItems[0];
+  let groupItem2 = createGroupItemWithBlankTabs(win, 400, 300, 20, 4);
+
+  // move group
+  cw.UI.setActive(groupItem);
+  simulateDragDrop(groupItem2.container);
+  is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
+  is(cw.UI.getActiveTab(), groupItem2.getChild(0), "second groupItem's first tab is active");
+
+  // resize group
+  cw.UI.setActive(groupItem);
+  let tabItem = groupItem2.getChild(2);
+  groupItem2.setActiveTab(tabItem);
+  simulateDragDrop(groupItem2.$resizer[0]);
+  is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
+  is(cw.UI.getActiveTab(), tabItem, "second groupItem's third tab is active");
+
+  // create orphan
+  tabItem = groupItem2.getChild(0);
+  dragOutOfGroup(tabItem.container);
+
+  // move orphan
+  cw.UI.setActive(groupItem2);
+  simulateDragDrop(tabItem.container);
+  assertActiveOrphan(tabItem);
+
+  // resize orphan
+  cw.UI.setActive(groupItem2);
+  let $resizer = cw.iQ('.iq-resizable-handle', tabItem.container);
+  simulateDragDrop($resizer[0]);
+  assertActiveOrphan(tabItem);
+
+  // drag back into group
+  dragIntoGroup(tabItem.container);
+  cw.UI.setActive(groupItem);
+  cw.UI.setActive(groupItem2);
+  is(cw.UI.getActiveTab(), tabItem, "the dropped tab is active");
+
+  // hide + unhide groupItem
+  hideGroupItem(groupItem2, function () {
+    is(cw.GroupItems.getActiveGroupItem(), groupItem, "first groupItem is active");
+
+    unhideGroupItem(groupItem2, function () {
+      is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
+      is(cw.UI.getActiveTab(), tabItem, "the dropped tab is active");
+
+      finish();
+    });
+  });
+}

From cffd866d59f31413a5862214e3a35796631945ef Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Fri, 29 Apr 2011 15:05:19 +0200
Subject: [PATCH 164/314] Bug 653681 - TabMatcher._getTabsForOtherWindows()
 must not use nsIWindowMediator.getMostRecentWindow(); r=dao

---
 browser/base/content/tabview/search.js | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/browser/base/content/tabview/search.js b/browser/base/content/tabview/search.js
index b7d17ad62c3e..4afa0b1784d0 100644
--- a/browser/base/content/tabview/search.js
+++ b/browser/base/content/tabview/search.js
@@ -218,43 +218,39 @@ TabMatcher.prototype = {
   
   // ---------
   // Function: _getTabsForOtherWindows
-  // Returns an array of <TabItem>s and <xul:tabs>s representing that
-  // tabs from all windows but the currently focused window. <TabItem>s
-  // will be returned for windows in which Panorama has been activated at
-  // least once, while <xul:tab>s will be return for windows in which
-  // Panorama has never been activated.
-  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows(){
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    var enumerator = wm.getEnumerator("navigator:browser");    
-    var currentWindow = wm.getMostRecentWindow("navigator:browser");
-    
-    var allTabs = [];    
+  // Returns an array of <TabItem>s and <xul:tabs>s representing tabs
+  // from all windows but the current window. <TabItem>s will be returned
+  // for windows in which Panorama has been activated at least once, while
+  // <xul:tab>s will be returned for windows in which Panorama has never
+  // been activated.
+  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows() {
+    var enumerator = Services.wm.getEnumerator("navigator:browser");
+    var allTabs = [];
+
     while (enumerator.hasMoreElements()) {
       var win = enumerator.getNext();
-      // This function gets tabs from other windows: not the one you currently
-      // have focused.
-      if (win != currentWindow) {
+      // This function gets tabs from other windows, not from the current window
+      if (win != gWindow) {
         // If TabView is around iterate over all tabs, else get the currently
         // shown tabs...
-        
         let tvWindow = win.TabView.getContentWindow();
         if (tvWindow)
-          allTabs = allTabs.concat( tvWindow.TabItems.getItems() );
+          allTabs = allTabs.concat(tvWindow.TabItems.getItems());
         else
           // win.gBrowser.tabs isn't a proper array, so we can't use concat
-          for (var i=0; i<win.gBrowser.tabs.length; i++) allTabs.push( win.gBrowser.tabs[i] );
-      } 
+          for (let i = 0; i < win.gBrowser.tabs.length; i++)
+            allTabs.push(win.gBrowser.tabs[i]);
+      }
     }
-    return allTabs;    
+    return allTabs;
   },
   
   // ----------
   // Function: matchedTabsFromOtherWindows
   // Returns an array of <TabItem>s and <xul:tab>s that match the search term
-  // from all windows but the currently focused window. <TabItem>s will be
-  // returned for windows in which Panorama has been activated at least once,
-  // while <xul:tab>s will be return for windows in which Panorama has never
+  // from all windows but the current window. <TabItem>s will be returned for
+  // windows in which Panorama has been activated at least once, while
+  // <xul:tab>s will be returned for windows in which Panorama has never
   // been activated.
   // (new TabMatcher("app")).matchedTabsFromOtherWindows();
   matchedTabsFromOtherWindows: function TabMatcher_matchedTabsFromOtherWindows(){

From 40985caabc858ccd375c13302e0499fbed84e8d9 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Wed, 4 May 2011 00:36:05 +0200
Subject: [PATCH 165/314] Bug 654423 - Intermittent TEST-UNEXPECTED-FAIL |
 chrome://mochitests/content/browser/browser/base/content/test/tabview/browser_tabview_bug630102.js
 | application timed out; r=ehsan

---
 .../test/tabview/browser_tabview_bug630102.js | 72 ++++++++-----------
 1 file changed, 30 insertions(+), 42 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug630102.js b/browser/base/content/test/tabview/browser_tabview_bug630102.js
index e2a91b0d8c9d..fe2d64fc2e0c 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug630102.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug630102.js
@@ -2,63 +2,51 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  waitForExplicitFinish();
-
-  let originalTab = gBrowser.visibleTabs[0];
-  let newTab1 = gBrowser.addTab("about:blank", { skipAnimation: true });
-  let newTab2 = gBrowser.addTab("about:blank", { skipAnimation: true });
-  
-  gBrowser.pinTab(newTab1);
-  
-  let contentWindow;
-
-  let partOne = function() {
-    window.removeEventListener("tabviewshown", partOne, false);
-
-    contentWindow = document.getElementById("tab-view").contentWindow;
-    is(contentWindow.GroupItems.groupItems.length, 1, "There is only one group item");
+  let win, contentWindow, originalTab, newTab1, newTab2;
 
+  let partOne = function () {
     let groupItem = contentWindow.GroupItems.groupItems[0];
     let tabItems = groupItem.getChildren();
     is(tabItems.length, 2, "There are two tab items in that group item");
     is(tabItems[0].tab, originalTab, "The first tab item is linked to the first tab");
     is(tabItems[1].tab, newTab2, "The second tab item is linked to the second tab");
 
-    window.addEventListener("tabviewhidden", partTwo, false);
-    TabView.toggle();
+    hideTabView(partTwo, win);
   };
 
-  let partTwo = function() {
-    window.removeEventListener("tabviewhidden", partTwo, false);
-
-    gBrowser.unpinTab(newTab1);
-
-    window.addEventListener("tabviewshown", partThree, false);
-    TabView.toggle();
+  let partTwo = function () {
+    win.gBrowser.unpinTab(newTab1);
+    showTabView(partThree, win);
   };
 
-  let partThree = function() {
-    window.removeEventListener("tabviewshown", partThree, false);
-
+  let partThree = function () {
     let tabItems = contentWindow.GroupItems.groupItems[0].getChildren();
     is(tabItems.length, 3, "There are three tab items in that group item");
-    is(tabItems[0].tab, gBrowser.visibleTabs[0], "The first tab item is linked to the first tab");
-    is(tabItems[1].tab, gBrowser.visibleTabs[1], "The second tab item is linked to the second tab");
-    is(tabItems[2].tab, gBrowser.visibleTabs[2], "The third tab item is linked to the third tab");
-
-    window.addEventListener("tabviewhidden", endGame, false);
-    TabView.toggle();
-  };
-
-  let endGame = function() {
-    window.removeEventListener("tabviewhidden", endGame, false);
-
-    gBrowser.removeTab(newTab1);
-    gBrowser.removeTab(newTab2);
+    is(tabItems[0].tab, win.gBrowser.tabs[0], "The first tab item is linked to the first tab");
+    is(tabItems[1].tab, win.gBrowser.tabs[1], "The second tab item is linked to the second tab");
+    is(tabItems[2].tab, win.gBrowser.tabs[2], "The third tab item is linked to the third tab");
 
     finish();
   };
 
-  window.addEventListener("tabviewshown", partOne, false);
-  TabView.toggle();
+  let onLoad = function (tvwin) {
+    win = tvwin;
+    registerCleanupFunction(function () win.close());
+
+    for (let i = 0; i < 2; i++)
+      win.gBrowser.loadOneTab("about:blank", {inBackground: true});
+
+    [originalTab, newTab1, newTab2] = win.gBrowser.tabs;
+    win.gBrowser.pinTab(newTab1);
+  };
+
+  let onShow = function () {
+    contentWindow = win.TabView.getContentWindow();
+    is(contentWindow.GroupItems.groupItems.length, 1, "There is only one group item");
+
+    partOne();
+  };
+
+  waitForExplicitFinish();
+  newWindowWithTabView(onShow, onLoad);
 }

From 39cd5e1ba78b6a6015b4896773dcd28b3df4de8e Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 09:03:56 -0400
Subject: [PATCH 167/314] Bug 652459.  Temporarily disabling these tests to
 reopen CLOSED TREE.  a=davidb

---
 accessible/tests/mochitest/text/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/accessible/tests/mochitest/text/Makefile.in b/accessible/tests/mochitest/text/Makefile.in
index 15b33314a2c8..83946f4c46ce 100644
--- a/accessible/tests/mochitest/text/Makefile.in
+++ b/accessible/tests/mochitest/text/Makefile.in
@@ -50,8 +50,8 @@ _TEST_FILES = \
 		test_doc.html \
 		test_hypertext.html \
 		test_passwords.html \
-		test_singleline.html \
-		test_whitespaces.html \
+	$(warning test_singleline.html disabled due to bug 652459) \
+	$(warning test_whitespaces.html disabled due to bug 652459) \
 		test_words.html \
 		$(NULL)
 

From 7ba0454d70a3107c3456724276e92b1ebeeec8ab Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 16:33:36 +0200
Subject: [PATCH 168/314] Backout bug 345094, revision 77ce8faa1906, r=bsmith

---
 security/manager/ssl/crashtests/345094.html     | 13 -------------
 security/manager/ssl/crashtests/crashtests.list |  1 -
 security/nss/lib/util/nssb64d.c                 | 10 ++--------
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 security/manager/ssl/crashtests/345094.html

diff --git a/security/manager/ssl/crashtests/345094.html b/security/manager/ssl/crashtests/345094.html
deleted file mode 100644
index bb6532dfb448..000000000000
--- a/security/manager/ssl/crashtests/345094.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><script>
-function FUZZ(s) {
-  try { eval(s); } catch (e) {}
-}
-
-function boom() {
-  FUZZ("window.crypto.generateCRMFRequest(1048574, 1048578, 256, '', 2)")
-}
-</script>
-</head>
-<body onload="boom()">
-</body>
-</html>
diff --git a/security/manager/ssl/crashtests/crashtests.list b/security/manager/ssl/crashtests/crashtests.list
index 9bebb1058a15..e0939a841079 100644
--- a/security/manager/ssl/crashtests/crashtests.list
+++ b/security/manager/ssl/crashtests/crashtests.list
@@ -1,3 +1,2 @@
 asserts-if(browserIsRemote,1) load 327524-1.html # bug 582297
-load 345094.html
 asserts-if(browserIsRemote,1) load 398665-1.html # bug 582297
diff --git a/security/nss/lib/util/nssb64d.c b/security/nss/lib/util/nssb64d.c
index 12b53e528aea..51426f015fed 100644
--- a/security/nss/lib/util/nssb64d.c
+++ b/security/nss/lib/util/nssb64d.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -563,14 +562,9 @@ PL_Base64DecodeBuffer (const char *src, PRUint32 srclen, unsigned char *dest,
     PLBase64Decoder *data = NULL;
     PRStatus status;
 
-    if (srclen == 0) {
-	*output_destlen = 0;
-	if (dest == NULL) {
-	    /* PR_Malloc(0) is undefined */
-	    return (unsigned char *) PR_Malloc(1);
-	}
+    PR_ASSERT(srclen > 0);
+    if (srclen == 0)
 	return dest;
-    }
 
     /*
      * How much space could we possibly need for decoding this input?

From f24340e7336a9b499743d85f9993d29b326eeeed Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 16:35:11 +0200
Subject: [PATCH 169/314] Bug 642148 - Upgrade Mozilla to NSPR 4.8.8 beta 3 and
 NSS 3.12.10 beta 1, r=wtc, r=kaie

---
 nsprpub/TAG-INFO                              |    2 +-
 nsprpub/config/prdepend.h                     |    1 +
 nsprpub/configure                             |   48 +-
 nsprpub/configure.in                          |    2 +
 nsprpub/pr/include/prio.h                     |    3 +
 nsprpub/pr/include/prtypes.h                  |   22 +-
 nsprpub/pr/src/pthreads/ptio.c                |   34 +
 security/coreconf/Darwin.mk                   |    4 +-
 security/coreconf/coreconf.dep                |    2 -
 security/nss/TAG-INFO                         |    2 +-
 security/nss/cmd/addbuiltin/addbuiltin.c      |    6 +-
 security/nss/cmd/certutil/certutil.c          |  544 +-
 security/nss/cmd/lib/secutil.c                |   18 +-
 security/nss/cmd/lib/secutil.h                |    5 +-
 security/nss/cmd/selfserv/selfserv.c          |    8 +-
 security/nss/cmd/shlibsign/shlibsign.c        |    4 +-
 security/nss/cmd/strsclnt/strsclnt.c          |   38 +-
 security/nss/cmd/tstclnt/tstclnt.c            |   11 +-
 security/nss/lib/certdb/cert.h                |   35 +-
 security/nss/lib/certdb/stanpcertdb.c         |   15 +
 security/nss/lib/certhigh/certhigh.c          |    2 +-
 security/nss/lib/certhigh/certvfypkix.c       |   57 +
 security/nss/lib/ckfw/builtins/certdata.c     | 5421 +++++++++--------
 security/nss/lib/ckfw/builtins/certdata.txt   | 5120 +++++++++-------
 security/nss/lib/ckfw/builtins/nssckbi.h      |    4 +-
 security/nss/lib/cryptohi/seckey.c            |   37 +-
 security/nss/lib/freebl/blapit.h              |    6 +-
 security/nss/lib/freebl/mpi/mpi-config.h      |    4 +-
 security/nss/lib/freebl/mpi/mpi.c             |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_gas.s   |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_sun.s   |    4 +-
 security/nss/lib/freebl/nsslowhash.c          |    4 +-
 security/nss/lib/freebl/rsa.c                 |  335 +-
 security/nss/lib/freebl/sha512.c              |    4 +-
 security/nss/lib/freebl/stubs.c               |   54 +
 security/nss/lib/freebl/stubs.h               |    5 +
 .../libpkix/pkix/checker/pkix_crlchecker.c    |    3 +
 .../nss/lib/libpkix/pkix/top/pkix_build.c     |   34 +-
 .../pkix_pl_nss/module/pkix_pl_socket.c       |    6 +-
 .../pkix_pl_nss/pki/pkix_pl_infoaccess.c      |   75 +-
 security/nss/lib/nss/nss.def                  |    7 +
 security/nss/lib/nss/nss.h                    |    8 +-
 security/nss/lib/pk11wrap/Makefile            |    2 +
 security/nss/lib/pk11wrap/debug_module.c      |   27 +-
 security/nss/lib/pk11wrap/pk11load.c          |    9 +-
 security/nss/lib/pk11wrap/pk11pars.c          |   13 +
 security/nss/lib/pk11wrap/pk11priv.h          |    2 +
 security/nss/lib/pk11wrap/pk11slot.c          |   34 +-
 security/nss/lib/pk11wrap/pk11util.c          |   12 +
 security/nss/lib/pk11wrap/secmodi.h           |    2 +
 security/nss/lib/pki/pki3hack.c               |   94 +-
 security/nss/lib/pki/pki3hack.h               |    5 +-
 security/nss/lib/smime/cms.h                  |   55 +-
 security/nss/lib/smime/cmsasn1.c              |   22 +-
 security/nss/lib/smime/cmscinfo.c             |  123 +-
 security/nss/lib/smime/cmsdecode.c            |  143 +-
 security/nss/lib/smime/cmsdigdata.c           |   37 +-
 security/nss/lib/smime/cmsencdata.c           |   33 +-
 security/nss/lib/smime/cmsencode.c            |  185 +-
 security/nss/lib/smime/cmsenvdata.c           |   32 +-
 security/nss/lib/smime/cmslocal.h             |   45 +-
 security/nss/lib/smime/cmsmessage.c           |    8 +-
 security/nss/lib/smime/cmssigdata.c           |   34 +-
 security/nss/lib/smime/cmst.h                 |   36 +-
 security/nss/lib/smime/cmsudf.c               |  480 ++
 security/nss/lib/smime/cmsutil.c              |   11 +-
 security/nss/lib/smime/manifest.mn            |    1 +
 security/nss/lib/smime/smime.def              |   20 +
 security/nss/lib/smime/smime.h                |    4 +-
 security/nss/lib/softoken/pkcs11.c            |   45 +-
 security/nss/lib/softoken/rsawrapr.c          |   51 +-
 security/nss/lib/softoken/softkver.h          |    6 +-
 security/nss/lib/ssl/derive.c                 |   43 +-
 security/nss/lib/ssl/ssl.def                  |    6 +
 security/nss/lib/ssl/ssl.h                    |   11 +-
 security/nss/lib/ssl/ssl3con.c                |   42 +-
 security/nss/lib/ssl/ssl3ext.c                |   15 +-
 security/nss/lib/ssl/sslcon.c                 |    6 +-
 security/nss/lib/ssl/sslimpl.h                |    4 +-
 security/nss/lib/ssl/sslnonce.c               |    5 +-
 security/nss/lib/ssl/sslsecur.c               |   15 +-
 security/nss/lib/ssl/sslsnce.c                |  124 +-
 security/nss/lib/ssl/sslsock.c                |   10 +-
 security/nss/lib/sysinit/nsssysinit.c         |   40 +-
 security/nss/lib/util/nssutil.h               |    6 +-
 security/nss/lib/util/secasn1e.c              |    8 +-
 security/nss/tests/chains/ocspd-config/readme |   24 +-
 87 files changed, 8180 insertions(+), 5752 deletions(-)
 create mode 100644 security/nss/lib/smime/cmsudf.c

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 94e18b2923e4..e669ae2c34c7 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_8_8_BETA2
+NSPR_4_8_8_BETA3
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index df72c56882d2..55444c40b3aa 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -42,3 +42,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/configure b/nsprpub/configure
index d6ff36f7a10a..d92322f2601f 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,10 +3541,12 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
@@ -4739,17 +4741,17 @@ EOF
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4743: checking for machine/builtins.h" >&5
+echo "configure:4745: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4748 "configure"
+#line 4750 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5398,7 +5400,7 @@ case $target in
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5402: checking for dlopen in -ldl" >&5
+echo "configure:5404: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5406,7 +5408,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5410 "configure"
+#line 5412 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5417,7 +5419,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5434,17 +5436,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5438: checking for dlfcn.h" >&5
+echo "configure:5440: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5443 "configure"
+#line 5445 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5477,13 +5479,13 @@ esac
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5487 "configure"
+#line 5489 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -5501,7 +5503,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5505 "configure"
+#line 5507 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -5525,12 +5527,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5529: checking for $ac_func" >&5
+echo "configure:5531: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5534 "configure"
+#line 5536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5553,7 +5555,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5604,7 +5606,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5608: checking for $ac_word" >&5
+echo "configure:5610: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5663,7 +5665,7 @@ hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5667: checking for +Olit support" >&5
+echo "configure:5669: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5705,7 +5707,7 @@ wince*)
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5709: checking for pthread_create in -lpthreads" >&5
+echo "configure:5711: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5727,7 +5729,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5731: checking for pthread_create in -lpthread" >&5
+echo "configure:5733: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5749,7 +5751,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5753: checking for pthread_create in -lc_r" >&5
+echo "configure:5755: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5771,7 +5773,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5775: checking for pthread_create in -lc" >&5
+echo "configure:5777: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5889,7 +5891,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5912,7 +5914,7 @@ echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index bd502c893062..390940fa2977 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,10 +1144,12 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/pr/include/prio.h b/nsprpub/pr/include/prio.h
index 7ec3045e065c..1ee792b52e34 100644
--- a/nsprpub/pr/include/prio.h
+++ b/nsprpub/pr/include/prio.h
@@ -142,6 +142,9 @@ typedef enum PRTransmitFileFlags {
 #define PR_AF_INET6 100
 #endif
 
+#define PR_AF_INET_SDP 101
+#define PR_AF_INET6_SDP 102
+
 #ifndef PR_AF_UNSPEC
 #define PR_AF_UNSPEC 0
 #endif
diff --git a/nsprpub/pr/include/prtypes.h b/nsprpub/pr/include/prtypes.h
index b764b27e4af5..6b3cb5ae4c0f 100644
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -235,7 +235,7 @@ PR_BEGIN_EXTERN_C
 **              PRInt8
 ** DESCRIPTION:
 **  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char". 
+**      is equivalent to a plain "char".
 ************************************************************************/
 #if PR_BYTES_PER_BYTE == 1
 typedef unsigned char PRUint8;
@@ -274,7 +274,7 @@ typedef signed char PRInt8;
 ** TYPES:       PRUint16
 **              PRInt16
 ** DESCRIPTION:
-**  The int16 types are known to be 16 bits each. 
+**  The int16 types are known to be 16 bits each.
 ************************************************************************/
 #if PR_BYTES_PER_SHORT == 2
 typedef unsigned short PRUint16;
@@ -299,7 +299,7 @@ typedef short PRInt16;
 ** TYPES:       PRUint32
 **              PRInt32
 ** DESCRIPTION:
-**  The int32 types are known to be 32 bits each. 
+**  The int32 types are known to be 32 bits each.
 ************************************************************************/
 #if PR_BYTES_PER_INT == 4
 typedef unsigned int PRUint32;
@@ -372,7 +372,7 @@ typedef PRInt64 PRUint64;
 **  The PRIntn types are most appropriate for automatic variables. They are
 **      guaranteed to be at least 16 bits, though various architectures may
 **      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure. 
+**      never valid for fields of a structure.
 ************************************************************************/
 #if PR_BYTES_PER_INT >= 2
 typedef int PRIntn;
@@ -384,14 +384,14 @@ typedef unsigned int PRUintn;
 /************************************************************************
 ** TYPES:       PRFloat64
 ** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits. 
+**  NSPR's floating point type is always 64 bits.
 ************************************************************************/
 typedef double          PRFloat64;
 
 /************************************************************************
 ** TYPES:       PRSize
 ** DESCRIPTION:
-**  A type for representing the size of objects. 
+**  A type for representing the size of objects.
 ************************************************************************/
 typedef size_t PRSize;
 
@@ -399,7 +399,7 @@ typedef size_t PRSize;
 /************************************************************************
 ** TYPES:       PROffset32, PROffset64
 ** DESCRIPTION:
-**  A type for representing byte offsets from some location. 
+**  A type for representing byte offsets from some location.
 ************************************************************************/
 typedef PRInt32 PROffset32;
 typedef PRInt64 PROffset64;
@@ -408,7 +408,7 @@ typedef PRInt64 PROffset64;
 ** TYPES:       PRPtrDiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction. 
+**      for storing a pointer or pointer subtraction.
 ************************************************************************/
 typedef ptrdiff_t PRPtrdiff;
 
@@ -416,7 +416,7 @@ typedef ptrdiff_t PRPtrdiff;
 ** TYPES:       PRUptrdiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction. 
+**      for storing a pointer or pointer sutraction.
 ************************************************************************/
 #ifdef _WIN64
 typedef PRUint64 PRUptrdiff;
@@ -430,7 +430,7 @@ typedef unsigned long PRUptrdiff;
 **  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
 **      for clarity of target type in assignments and actual arguments. Use
 **      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions. 
+**      just as you would C int-valued conditions.
 ************************************************************************/
 typedef PRIntn PRBool;
 #define PR_TRUE 1
@@ -445,7 +445,7 @@ typedef PRIntn PRBool;
 typedef PRUint8 PRPackedBool;
 
 /*
-** Status code used by some routines that have a single point of failure or 
+** Status code used by some routines that have a single point of failure or
 ** special status return.
 */
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c
index 05ce808fd363..66921a4a65ec 100644
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -218,6 +218,20 @@ static PRBool _pr_ipv6_v6only_on_by_default;
 #error "Cannot determine architecture"
 #endif
 
+#if defined(SOLARIS)            
+#ifndef PROTO_SDP
+/* on solaris, SDP is a new type of protocol */
+#define PROTO_SDP   257
+#endif 
+#define _PR_HAVE_SDP
+#elif defined(LINUX)
+#ifndef AF_INET_SDP
+/* on linux, SDP is a new type of address family */
+#define AF_INET_SDP 27
+#endif
+#define _PR_HAVE_SDP
+#endif /* LINUX */
+
 static PRFileDesc *pt_SetMethods(
     PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
 
@@ -3462,6 +3476,12 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 
     if (PF_INET != domain
         && PR_AF_INET6 != domain
+#if defined(_PR_HAVE_SDP)
+        && PR_AF_INET_SDP != domain
+#if defined(SOLARIS)
+        && PR_AF_INET6_SDP != domain
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
         && PF_UNIX != domain)
     {
         PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
@@ -3474,6 +3494,20 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 		(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
 		return fd;
 	}
+#if defined(_PR_HAVE_SDP)
+#if defined(LINUX)
+    if (PR_AF_INET_SDP == domain)
+        domain = AF_INET_SDP;
+#elif defined(SOLARIS)
+    if (PR_AF_INET_SDP == domain) {
+        domain = AF_INET;
+        proto = PROTO_SDP;
+    } else if(PR_AF_INET6_SDP == domain) {
+        domain = AF_INET6;
+        proto = PROTO_SDP;
+    }
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
 #if defined(_PR_INET6_PROBE)
 	if (PR_AF_INET6 == domain)
 		domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET;
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk
index 9edf4d8476c5..110d89f2ae13 100644
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -54,13 +54,15 @@ ifdef USE_64
 CC              += -arch x86_64
 else
 OS_REL_CFLAGS	= -Di386
+CC              += -arch i386
 endif
 else
 OS_REL_CFLAGS	= -Dppc
+CC              += -arch ppc
 endif
 
 ifneq (,$(MACOS_SDK_DIR))
-    GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[  ]*//" | awk '{ print $$1 }')
+    GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
     GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
     GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
     GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
diff --git a/security/coreconf/coreconf.dep b/security/coreconf/coreconf.dep
index 74740bdcc314..b536cfc01b91 100644
--- a/security/coreconf/coreconf.dep
+++ b/security/coreconf/coreconf.dep
@@ -43,5 +43,3 @@
 
 #error "Do not include this header file."
 
-
-
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 6e9e9a3f0736..26c5e745e9fb 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_12_9_RTM
+NSS_3_12_10_BETA1
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index 693819ff0e1d..63422f893dc9 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -37,7 +37,7 @@
 /*
  * Tool for converting builtin CA certs.
  *
- * $Id: addbuiltin.c,v 1.14 2007/02/14 00:35:52 alexei.volkov.bugs%sun.com Exp $
+ * $Id: addbuiltin.c,v 1.14.68.1 2011/03/23 20:07:57 kaie%kuix.de Exp $
  */
 
 #include "nssrenam.h"
@@ -77,6 +77,8 @@ char *getTrustString(unsigned int trust)
 		return "CKT_NETSCAPE_TRUSTED_DELEGATOR";
 	} else if (trust & CERTDB_VALID_CA) {
 		return "CKT_NETSCAPE_VALID_DELEGATOR";
+	} else if (trust & CERTDB_VALID_PEER) {
+		return "CKT_NETSCAPE_VALID";
 	} else {
 		return "CKT_NETSCAPE_TRUST_UNKNOWN";
 	}
@@ -213,7 +215,7 @@ void printheader() {
 "#\n"
 "# ***** END LICENSE BLOCK *****\n"
      "#\n"
-     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14 $ $Date: 2007/02/14 00:35:52 $\"\n"
+     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14.68.1 $ $Date: 2011/03/23 20:07:57 $\"\n"
      "\n"
      "#\n"
      "# certdata.txt\n"
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c
index 459357888622..4b890446fde4 100644
--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -985,7 +985,7 @@ ListModules(void)
 }
 
 static void 
-Usage(char *progName)
+PrintSyntax(char *progName)
 {
 #define FPS fprintf(stderr, 
     FPS "Type %s -H for more detailed descriptions\n", progName);
@@ -1055,22 +1055,57 @@ Usage(char *progName)
     exit(1);
 }
 
-static void LongUsage(char *progName)
-{
+enum usage_level {
+    usage_all = 0, usage_selected = 1
+};
 
+static void luCommonDetailsAE();
+
+static void luA(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "A"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add a certificate to the database        (create if needed)\n",
-	"-A");
+        "-A");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    if (ul == usage_all) {
     FPS "%-20s\n", "   All options under -E apply");
+    }
+    else {
+        luCommonDetailsAE();
+    }
+}
+
+static void luB(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "B"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Run a series of certutil commands from a batch file\n", "-B");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the batch file\n", "   -i batch-file");
+}
+
+static void luE(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "E"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add an Email certificate to the database (create if needed)\n",
-	"-E");
+        "-E");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    luCommonDetailsAE();
+}
+
+static void luCommonDetailsAE()
+{
     FPS "%-20s Specify the nickname of the certificate to add\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Set the certificate trust attributes:\n",
-	"   -t trustargs");
+        "   -t trustargs");
     FPS "%-25s trustargs is of the form x,y,z where x is for SSL, y is for S/MIME,\n", "");
-    FPS "%-25s and z is for code signing\n", "");
+    FPS "%-25s and z is for code signing. Use ,, for no explicit trust.\n", "");
     FPS "%-25s p \t valid peer\n", "");
     FPS "%-25s P \t trusted peer (implies p)\n", "");
     FPS "%-25s c \t valid CA\n", "");
@@ -1080,39 +1115,46 @@ static void LongUsage(char *progName)
     FPS "%-25s w \t send warning\n", "");
     FPS "%-25s g \t make step-up cert\n", "");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s The input certificate is encoded in ASCII (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Specify the certificate file (default is stdin)\n",
-	"   -i input");
+        "   -i input");
     FPS "\n");
+}
 
+static void luC(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "C"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new binary certificate from a BINARY cert request\n",
-	"-C");
+        "-C");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the issuer cert\n",
-	"   -c issuer-name");
+        "   -c issuer-name");
     FPS "%-20s The BINARY certificate request file\n",
-	"   -i cert-request ");
+        "   -i cert-request ");
     FPS "%-20s Output binary cert to this file (default is stdout)\n",
-	"   -o output-cert");
+        "   -o output-cert");
     FPS "%-20s Self sign\n",
-	"   -x");
+        "   -x");
     FPS "%-20s Cert serial number\n",
-	"   -m serial-number");
+        "   -m serial-number");
     FPS "%-20s Time Warp\n",
-	"   -w warp-months");
+        "   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s \n"
               "%-20s Create key usage extension. Possible keywords:\n"
               "%-20s \"digitalSignature\", \"nonRepudiation\", \"keyEncipherment\",\n"
@@ -1120,11 +1162,11 @@ static void LongUsage(char *progName)
               "%-20s \"crlSigning\", \"critical\"\n",
         "   -1 | --keyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create basic constraint extension\n",
-	"   -2 ");
+        "   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-	"   -3 ");
+        "   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-	"   -4 ");
+        "   -4 ");
     FPS "%-20s \n"
               "%-20s Create netscape cert type extension. Possible keywords:\n"
               "%-20s \"sslClient\", \"sslServer\", \"smime\", \"objectSigning\",\n"
@@ -1135,41 +1177,48 @@ static void LongUsage(char *progName)
               "%-20s \"serverAuth\", \"clientAuth\",\"codeSigning\",\n"
               "%-20s \"emailProtection\", \"timeStamp\",\"ocspResponder\",\n"
               "%-20s \"stepUp\", \"critical\"\n",
-	"   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
+        "   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create an email subject alt name extension\n",
-	"   -7 emailAddrs");
+        "   -7 emailAddrs");
     FPS "%-20s Create an dns subject alt name extension\n",
-	"   -8 dnsNames");
+        "   -8 dnsNames");
     FPS "%-20s The input certificate request is encoded in ASCII (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "\n");
+}
 
+static void luG(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "G"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a new key pair\n",
-	"-G");
+        "-G");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
-	"   -k key-type");
+        "   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d) (not for ec)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
-	"   -k key-type");
+        "   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Set the public exponent value (3, 17, 65537) (rsa only)\n",
-	"   -y exp");
+        "   -y exp");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Specify the noise file to be used\n",
-	"   -z noisefile");
+        "   -z noisefile");
     FPS "%-20s read PQG value from pqgfile (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s One of nistp256, nistp384, nistp521\n", "");
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
     FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", "");
@@ -1192,167 +1241,239 @@ static void LongUsage(char *progName)
 #endif /* NSS_ECC_MORE_THAN_SUITE_B */
 #endif
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
 
+static void luD(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "D"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Delete a certificate from the database\n",
-	"-D");
+        "-D");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to delete\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
 
+}
+
+static void luU(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "U"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all modules\n", /*, or print out a single named module\n",*/
         "-U");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Module database directory (default is '~/.netscape')\n",
         "   -d moddir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
 
+}
+
+static void luK(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "K"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all private keys\n",
         "-K");
-          FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
-	"   -h token-name ");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
+        "   -h token-name ");
 
     FPS "%-20s Key type (\"all\" (default), \"dsa\","
 #ifdef NSS_ENABLE_ECC
                                                     " \"ec\","
 #endif
-                                                             " \"rsa\")\n",
-	"   -k key-type");
+                                                    " \"rsa\")\n",
+        "   -k key-type");
     FPS "%-20s The nickname of the key or associated certificate\n",
-	"   -n name");
+        "   -n name");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luL(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "L"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all certs, or print out a single named cert\n",
-	"-L");
+        "-L");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Pretty print named cert (list all if unspecified)\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s \n"
               "%-20s Pretty print cert with email address (list all if unspecified)\n",
-	"   --email email-address", "");
+        "   --email email-address", "");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "%-20s For single cert, print binary DER encoding\n",
-	"   -r");
+        "   -r");
     FPS "%-20s For single cert, print ASCII encoding (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "\n");
+}
 
+static void luM(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "M"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Modify trust attributes of certificate\n",
-	"-M");
+        "-M");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to modify\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-	"   -t trustargs");
+        "   -t trustargs");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
 
+static void luN(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "N"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new certificate database\n",
-	"-N");
+        "-N");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
+
+static void luT(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "T"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Reset the Key database or token\n",
-	"-T");
+        "-T");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Token to reset (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Set token's Site Security Officer password\n",
-	"   -0 SSO-password");
+        "   -0 SSO-password");
     FPS "\n");
+}
 
-    FPS "\n");
+static void luO(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "O"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Print the chain of a certificate\n",
-	"-O");
+        "-O");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to modify\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luR(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "R"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a certificate request (stdout)\n",
-	"-R");
+        "-R");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the subject name (using RFC1485)\n",
-	"   -s subject");
+        "   -s subject");
     FPS "%-20s Output the cert request to this file\n",
-	"   -o output-req");
+        "   -o output-req");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-	"   -k key-type-or-id");
+        "   -k key-type-or-id");
     FPS "%-20s or nickname of the cert key to use \n",
-	"");
+        "");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-	"");
+        "");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-	"   -p phone");
+        "   -p phone");
     FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s \n",
-	"   See -S for available extension options");
+        "   See -S for available extension options");
     FPS "\n");
+}
 
+static void luV(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "V"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Validate a certificate\n",
-	"-V");
+        "-V");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to Validate\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s validity time (\"YYMMDDHHMMSS[+HHMM|-HHMM|Z]\")\n",
-	"   -b time");
+        "   -b time");
     FPS "%-20s Check certificate signature \n",
-	"   -e ");   
+        "   -e ");   
     FPS "%-20s Specify certificate usage:\n", "   -u certusage");
     FPS "%-25s C \t SSL Client\n", "");
     FPS "%-25s V \t SSL Server\n", "");
@@ -1361,140 +1482,205 @@ static void LongUsage(char *progName)
     FPS "%-25s O \t OCSP status responder\n", "");   
     FPS "%-25s J \t Object signer\n", "");   
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luW(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "W"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Change the key database password\n",
-	"-W");
+        "-W");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s cert and key database directory\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Specify a file with the current password\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Specify a file with the new password in two lines\n",
-	"   -@ newpwfile");
+        "   -@ newpwfile");
+    FPS "\n");
+}
 
+static void luUpgradeMerge(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "upgrade-merge"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Upgrade an old database and merge it into a new one\n",
-	"--upgrade-merge");
+        "--upgrade-merge");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory to merge into (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory to upgrade from\n",
-	"   --source-dir certdir", "");
+        "   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the upgrade database\n",
-	"   --soruce-prefix dbprefix", "");
+        "   --soruce-prefix dbprefix", "");
     FPS "%-20s \n%-20s Unique identifier for the upgrade database\n",
-	"   --upgrade-id uniqueID", "");
+        "   --upgrade-id uniqueID", "");
     FPS "%-20s \n%-20s Name of the token while it is in upgrade state\n",
-	"   --upgrade-token-name name", "");
+        "   --upgrade-token-name name", "");
     FPS "%-20s Specify the password file for the upgrade database\n",
-	"   -@ pwfile");
+        "   -@ pwfile");
     FPS "\n");
+}
 
+static void luMerge(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "merge"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Merge source database into the target database\n",
-	"--merge");
+        "--merge");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory of target (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory of the source database\n",
-	"   --source-dir certdir", "");
+        "   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the source database\n",
-	"   --source-prefix dbprefix", "");
+        "   --source-prefix dbprefix", "");
     FPS "%-20s Specify the password file for the source database\n",
-	"   -@ pwfile");
+        "   -@ pwfile");
     FPS "\n");
+}
 
+static void luS(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "S"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Make a certificate and add to database\n",
         "-S");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the nickname of the cert\n",
         "   -n key-name");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
         "   -s subject");
     FPS "%-20s The nickname of the issuer cert\n",
-	"   -c issuer-name");
+        "   -c issuer-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-	"   -t trustargs");
+        "   -t trustargs");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-	"   -k key-type-or-id");
+        "   -k key-type-or-id");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-	"");
+        "");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Self sign\n",
-	"   -x");
+        "   -x");
     FPS "%-20s Cert serial number\n",
-	"   -m serial-number");
+        "   -m serial-number");
     FPS "%-20s Time Warp\n",
-	"   -w warp-months");
+        "   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-	"   -p phone");
+        "   -p phone");
     FPS "%-20s Create key usage extension\n",
-	"   -1 ");
+        "   -1 ");
     FPS "%-20s Create basic constraint extension\n",
-	"   -2 ");
+        "   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-	"   -3 ");
+        "   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-	"   -4 ");
+        "   -4 ");
     FPS "%-20s Create netscape cert type extension\n",
-	"   -5 ");
+        "   -5 ");
     FPS "%-20s Create extended key usage extension\n",
-	"   -6 ");
+        "   -6 ");
     FPS "%-20s Create an email subject alt name extension\n",
-	"   -7 emailAddrs ");
+        "   -7 emailAddrs ");
     FPS "%-20s Create a DNS subject alt name extension\n",
-	"   -8 DNS-names");
+        "   -8 DNS-names");
     FPS "%-20s Create an Authority Information Access extension\n",
-	"   --extAIA ");
+        "   --extAIA ");
     FPS "%-20s Create a Subject Information Access extension\n",
-	"   --extSIA ");
+        "   --extSIA ");
     FPS "%-20s Create a Certificate Policies extension\n",
-	"   --extCP ");
+        "   --extCP ");
     FPS "%-20s Create a Policy Mappings extension\n",
-	"   --extPM ");
+        "   --extPM ");
     FPS "%-20s Create a Policy Constraints extension\n",
-	"   --extPC ");
+        "   --extPC ");
     FPS "%-20s Create an Inhibit Any Policy extension\n",
-	"   --extIA ");
+        "   --extIA ");
     FPS "%-20s Create a subject key ID extension\n",
-	"   --extSKID ");
+        "   --extSKID ");
     FPS "\n");
+}
 
-    exit(1);
+static void LongUsage(char *progName, enum usage_level ul, const char *command)
+{
+    luA(ul, command);
+    luB(ul, command);
+    luE(ul, command);
+    luC(ul, command);
+    luG(ul, command);
+    luD(ul, command);
+    luU(ul, command);
+    luK(ul, command);
+    luL(ul, command);
+    luM(ul, command);
+    luN(ul, command);
+    luT(ul, command);
+    luO(ul, command);
+    luR(ul, command);
+    luV(ul, command);
+    luW(ul, command);
+    luUpgradeMerge(ul, command);
+    luMerge(ul, command);
+    luS(ul, command);
 #undef FPS
 }
 
+static void
+Usage(char *progName)
+{
+    PR_fprintf(PR_STDERR,
+        "%s - Utility to manipulate NSS certificate databases\n\n"
+        "Usage:  %s <command> -d <database-directory> <options>\n\n"
+        "Valid commands:\n", progName, progName);
+    LongUsage(progName, usage_selected, NULL);
+    PR_fprintf(PR_STDERR, "\n"
+        "%s -H <command> : Print available options for the given command\n"
+        "%s -H : Print complete help output of all commands and options\n"
+        "%s --syntax : Print a short summary of all commands and options\n",
+        progName, progName, progName);
+    exit(1);
+}
 
 static CERTCertificate *
 MakeV1Cert(	CERTCertDBHandle *	handle, 
@@ -1829,6 +2015,7 @@ enum {
     cmd_DeleteKey,
     cmd_GenKeyPair,
     cmd_PrintHelp,
+    cmd_PrintSyntax,
     cmd_ListKeys,
     cmd_ListCerts,
     cmd_ModifyCertTrust,
@@ -1843,7 +2030,8 @@ enum {
     cmd_Version,
     cmd_Batch,
     cmd_Merge,
-    cmd_UpgradeMerge /* test only */
+    cmd_UpgradeMerge, /* test only */
+    max_cmd
 };
 
 /*  Certutil options */
@@ -1901,7 +2089,8 @@ enum certutilOpts {
     opt_SourceDir,
     opt_SourcePrefix,
     opt_UpgradeID,
-    opt_UpgradeTokenName
+    opt_UpgradeTokenName,
+    opt_Help
 };
 
 static const
@@ -1913,7 +2102,9 @@ secuCommandFlag commands_init[] =
 	{ /* cmd_AddEmailCert        */  'E', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DeleteKey           */  'F', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_GenKeyPair          */  'G', PR_FALSE, 0, PR_FALSE },
-	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE },
+	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE, "help" },
+        { /* cmd_PrintSyntax         */   0,  PR_FALSE, 0, PR_FALSE,
+                                                   "syntax" },
 	{ /* cmd_ListKeys            */  'K', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListCerts           */  'L', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ModifyCertTrust     */  'M', PR_FALSE, 0, PR_FALSE },
@@ -2063,8 +2254,32 @@ certutil_main(int argc, char **argv, PRBool initialize)
     if (rv != SECSuccess)
 	Usage(progName);
 
-    if (certutil.commands[cmd_PrintHelp].activated)
-	LongUsage(progName);
+    if (certutil.commands[cmd_PrintSyntax].activated) {
+        PrintSyntax(progName);
+    }
+
+    if (certutil.commands[cmd_PrintHelp].activated) {
+        int i;
+        char buf[2];
+        const char *command = NULL;
+        for (i = 0; i < max_cmd; i++) {
+            if (i == cmd_PrintHelp)
+                continue;
+            if (certutil.commands[i].activated) {
+                if (certutil.commands[i].flag) {
+                    buf[0] = certutil.commands[i].flag;
+                    buf[1] = 0;
+                    command = buf;
+                }
+                else {
+                    command = certutil.commands[i].longform;
+                }
+                break;
+            }
+        }
+	LongUsage(progName, (command ? usage_selected : usage_all), command);
+        exit(1);
+    }
 
     if (certutil.options[opt_PasswordFile].arg) {
 	pwdata.source = PW_FROMFILE;
@@ -2247,7 +2462,6 @@ certutil_main(int argc, char **argv, PRBool initialize)
 	return 255;
     }
     if (commandsEntered == 0) {
-	PR_fprintf(PR_STDERR, "%s: you must enter a command!\n", progName);
 	Usage(progName);
     }
 
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index f2170e945c45..05f4ea0adf5f 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -981,7 +981,7 @@ SECU_PrintInteger(FILE *out, SECItem *i, char *m, int level)
 }
 
 static void
-secu_PrintRawString(FILE *out, SECItem *si, char *m, int level)
+secu_PrintRawString(FILE *out, SECItem *si, const char *m, int level)
 {
     int column;
     unsigned int i;
@@ -2094,23 +2094,25 @@ secu_PrintCRLDistPtsExtension(FILE *out, SECItem *value, char *msg, int level)
 	CRLDistributionPoint ** pPoints = dPoints->distPoints;
 	CRLDistributionPoint *  pPoint;
 	while (NULL != (pPoint = *pPoints++)) {
+	    SECU_Indent(out, level); fputs("Distribution point:\n", out);
 	    if (pPoint->distPointType == generalName && 
 	        pPoint->distPoint.fullName != NULL) {
 		secu_PrintGeneralNames(out, pPoint->distPoint.fullName, NULL,
-		                       level);
+		                       level + 1);
 	    } else if (pPoint->distPointType == relativeDistinguishedName &&
 	               pPoint->distPoint.relativeName.avas) {
 		SECU_PrintRDN(out, &pPoint->distPoint.relativeName, "RDN", 
-		              level);
+		              level + 1);
 	    } else if (pPoint->derDistPoint.data) {
-		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level);
+		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level + 1);
 	    }
 	    if (pPoint->reasons.data) {
 		secu_PrintDecodedBitString(out, &pPoint->reasons, "Reasons", 
-		                           level);
+		                           level + 1);
 	    }
 	    if (pPoint->crlIssuer) {
-		secu_PrintGeneralName(out, pPoint->crlIssuer, "Issuer", level);
+		secu_PrintGeneralName(out, pPoint->crlIssuer, "CRL issuer",
+				      level + 1);
 	    }
 	}
     } else {
@@ -2332,7 +2334,7 @@ SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
  * print those, so make a directory name out of the RDN, and print it.
  */
 void
-SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
+SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level)
 {
     CERTName name;
     CERTRDN *rdns[2];
@@ -2345,7 +2347,7 @@ SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
 }
 
 void
-SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
+SECU_PrintName(FILE *out, CERTName *name, const char *msg, int level)
 {
     char *nameStr = NULL;
     char *str;
diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h
index f3829d4e2622..8a6ab3cd6ba6 100644
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -309,8 +309,9 @@ extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value,
 extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
 				 char *msg, int level);
 
-extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level);
-extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level);
+extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg,
+                           int level);
+extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level);
 
 #ifdef SECU_GetPassword
 /* Convert a High public Key to a Low public Key */
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index d78881de2548..bd1d47b4cedc 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1491,14 +1491,18 @@ getBoundListenSocket(unsigned short port)
     PRStatus	       prStatus;
     PRNetAddr          addr;
     PRSocketOptionData opt;
+    PRUint16           socketDomain = PR_AF_INET;
 
     addr.inet.family = PR_AF_INET;
     addr.inet.ip     = PR_INADDR_ANY;
     addr.inet.port   = PR_htons(port);
 
-    listen_sock = PR_NewTCPSocket();
+    if (PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = PR_AF_INET_SDP;
+    }
+    listen_sock = PR_OpenTCPSocket(socketDomain);
     if (listen_sock == NULL) {
-	errExit("PR_NewTCPSocket");
+        errExit("PR_OpenTCPSocket error");
     }
 
     opt.option = PR_SockOpt_Nonblocking;
diff --git a/security/nss/cmd/shlibsign/shlibsign.c b/security/nss/cmd/shlibsign/shlibsign.c
index 6e93225190e4..722cb15a5b35 100644
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -46,7 +46,7 @@
  * compute the checksum for the NSS cryptographic boundary libraries
  * and compare the checksum with the value in .chk file.
  *
- * $Id: shlibsign.c,v 1.18 2008/11/20 15:44:12 glen.beasley%sun.com Exp $
+ * $Id: shlibsign.c,v 1.18.20.1 2011/04/08 04:04:27 wtc%google.com Exp $
  */
 
 #ifdef XP_UNIX
@@ -1012,7 +1012,7 @@ int main(int argc, char **argv)
     }
 
     /* open the target signature file */
-    fd = PR_OpenFile(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
+    fd = PR_Open(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
     if (fd == NULL ) {
         lperror(output_file);
         goto cleanup;
diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 786b6bcf7892..2e768ec4b775 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -360,7 +360,7 @@ printSecurityInfo(PRFileDesc *fd)
 
 #define MAX_THREADS 128
 
-typedef int startFn(void *a, void *b, int c);
+typedef int startFn(void *a, void *b, int c, int d);
 
 
 static PRInt32     numConnected;
@@ -374,6 +374,7 @@ typedef struct perThreadStr {
     startFn  *  startFunc;
     PRThread *  prThread;
     PRBool	inUse;
+    PRInt32     socketDomain;
 } perThread;
 
 perThread threads[MAX_THREADS];
@@ -429,7 +430,8 @@ thread_wrapper(void * arg)
         }
         PR_Unlock(threadLock);
         if (doop) {
-            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid);
+            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid,
+                                           slot->socketDomain);
             PRINTF("strsclnt: Thread in slot %d returned %d\n", 
                    slot->tid, slot->rv);
         }
@@ -444,7 +446,8 @@ launch_thread(
     startFn *	startFunc,
     void *	a,
     void *	b,
-    int         tid)
+    int         tid,
+    int         sockDom)
 {
     PRUint32 i;
     perThread * slot;
@@ -462,7 +465,8 @@ launch_thread(
     slot->a = a;
     slot->b = b;
     slot->tid = tid;
-
+    slot->socketDomain = sockDom;
+    
     slot->startFunc = startFunc;
 
     slot->prThread      = PR_CreateThread(PR_USER_THREAD,
@@ -585,7 +589,8 @@ int
 do_writes(
     void *       a,
     void *       b,
-    int          c)
+    int          c,
+    int          d)
 {
     PRFileDesc *	ssl_sock	= (PRFileDesc *)a;
     lockedVars *	lv 		= (lockedVars *)b;
@@ -627,7 +632,7 @@ handle_fdx_connection( PRFileDesc * ssl_sock, int connection)
     lockedVars_AddToCount(&lv, 1);
 
     /* Attempt to launch the writer thread. */
-    result = launch_thread(do_writes, ssl_sock, &lv, connection);
+    result = launch_thread(do_writes, ssl_sock, &lv, connection, -1 /*not used*/);
 
     if (result != SECSuccess) 
     	goto cleanup;
@@ -746,7 +751,8 @@ int
 do_connects(
     void *	a,
     void *	b,
-    int         tid)
+    int         tid,
+    PRInt32     socketDomain)
 {
     PRNetAddr  *        addr		= (PRNetAddr *)  a;
     PRFileDesc *        model_sock	= (PRFileDesc *) b;
@@ -760,7 +766,7 @@ do_connects(
 
 retry:
 
-    tcp_sock = PR_OpenTCPSocket(addr->raw.family);
+    tcp_sock = PR_OpenTCPSocket(socketDomain);
     if (tcp_sock == NULL) {
 	errExit("PR_OpenTCPSocket");
     }
@@ -1088,6 +1094,7 @@ client_main(
     int         rv;
     PRStatus    status;
     PRNetAddr   addr;
+    PRInt32    socketDomain;
 
     status = PR_StringToNetAddr(hostName, &addr);
     if (status == PR_SUCCESS) {
@@ -1115,6 +1122,13 @@ client_main(
 	}
     }
 
+    /* check if SDP is going to be used */
+    if (!PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = addr.raw.family;
+    } else {
+        socketDomain = PR_AF_INET_SDP;
+    }
+
     /* all suites except RSA_NULL_MD5 are enabled by Domestic Policy */
     NSS_SetDomesticPolicy();
 
@@ -1171,8 +1185,8 @@ client_main(
     }
 
     /* configure model SSL socket. */
-
-    model_sock = PR_OpenTCPSocket(addr.raw.family);
+    
+    model_sock = PR_OpenTCPSocket(socketDomain);
     if (model_sock == NULL) {
 	errExit("PR_OpenTCPSocket for model socket");
     }
@@ -1276,7 +1290,7 @@ client_main(
 
     if (!NoReuse) {
         remaining_connections = 1;
-	rv = launch_thread(do_connects, &addr, model_sock, 0);
+	rv = launch_thread(do_connects, &addr, model_sock, 0, socketDomain);
 	/* wait for the first connection to terminate, then launch the rest. */
 	reap_threads();
         remaining_connections = total_connections - 1 ;
@@ -1285,7 +1299,7 @@ client_main(
         active_threads  = PR_MIN(active_threads, remaining_connections);
 	/* Start up the threads */
 	for (i=0;i<active_threads;i++) {
-	    rv = launch_thread(do_connects, &addr, model_sock, i);
+	    rv = launch_thread(do_connects, &addr, model_sock, i, socketDomain);
 	}
 	reap_threads();
     }
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index 55684e685fa4..1e0453145f24 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -538,6 +538,7 @@ int main(int argc, char **argv)
     PLOptState *optstate;
     PLOptStatus optstatus;
     PRStatus prStatus;
+    PRUint16           socketDomain;
 
     progName = strrchr(argv[0], '/');
     if (!progName)
@@ -699,11 +700,17 @@ int main(int argc, char **argv)
 
     printHostNameAndAddr(host, &addr);
 
+    /* check if SDP is going to be used */
+    if (!PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = addr.raw.family;
+    } else {
+        socketDomain = PR_AF_INET_SDP;
+    }
     if (pingServerFirst) {
 	int iter = 0;
 	PRErrorCode err;
 	do {
-	    s = PR_OpenTCPSocket(addr.raw.family);
+	    s = PR_OpenTCPSocket(socketDomain);
 	    if (s == NULL) {
 		SECU_PrintError(progName, "Failed to create a TCP socket");
 	    }
@@ -741,7 +748,7 @@ int main(int argc, char **argv)
     }
 
     /* Create socket */
-    s = PR_OpenTCPSocket(addr.raw.family);
+    s = PR_OpenTCPSocket(socketDomain);
     if (s == NULL) {
 	SECU_PrintError(progName, "error creating socket");
 	return 1;
diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 2b74f972f45f..790abfb0213f 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.80.2.1 2010/09/24 13:31:57 kaie%kuix.de Exp $
+ * $Id: cert.h,v 1.80.2.3 2011/04/08 22:54:34 kaie%kuix.de Exp $
  */
 
 #ifndef _CERT_H_
@@ -1112,7 +1112,7 @@ extern CERTCertificateList *
 CERT_CertListFromCert(CERTCertificate *cert);
 
 extern CERTCertificateList *
-CERT_DupCertList(CERTCertificateList * oldList);
+CERT_DupCertList(const CERTCertificateList * oldList);
 
 extern void CERT_DestroyCertificateList(CERTCertificateList *list);
 
@@ -1665,26 +1665,33 @@ extern SECStatus CERT_PKIXVerifyCert(
 	CERTValInParam *paramsIn,
 	CERTValOutParam *paramsOut,
 	void *wincx);
-/*
- * This function changes the application defaults for the Verify function.
- * It should be called once at app initialization time, and only changes
- * if the default configuration changes.
- *
- * This changes the default values for the parameters specified. These
- * defaults can be overridden in CERT_PKIXVerifyCert() by explicitly 
- * setting the value in paramsIn.
- */
-extern SECStatus CERT_PKIXSetDefaults(CERTValInParam *paramsIn);
 
 /* Makes old cert validation APIs(CERT_VerifyCert, CERT_VerifyCertificate)
  * to use libpkix validation engine. The function should be called ones at
  * application initialization time.
  * Function is not thread safe.*/
-SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
+extern SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
 
 /* The function return PR_TRUE if cert validation should use
  * libpkix cert validation engine. */
-PRBool CERT_GetUsePKIXForValidation(void);
+extern PRBool CERT_GetUsePKIXForValidation(void);
+
+/*
+ * Allocate a parameter container of type CERTRevocationFlags,
+ * and allocate the inner arrays of the given sizes.
+ * To cleanup call CERT_DestroyCERTRevocationFlags.
+ */
+extern CERTRevocationFlags *
+CERT_AllocCERTRevocationFlags(
+    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
+    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods);
+
+/*
+ * Destroy the arrays inside flags,
+ * and destroy the object pointed to by flags, too.
+ */
+extern void
+CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags);
 
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 119a8da9fd42..56587ea8cf62 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -37,6 +37,7 @@
 #include "prtime.h"
 
 #include "cert.h"
+#include "certi.h"
 #include "certdb.h"
 #include "secitem.h"
 #include "secder.h"
@@ -86,12 +87,26 @@ SEC_DeletePermCertificate(CERTCertificate *cert)
     PRStatus nssrv;
     NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
     NSSCertificate *c = STAN_GetNSSCertificate(cert);
+    CERTCertTrust *certTrust;
 
     if (c == NULL) {
         /* error code is set */
         return SECFailure;
     }
 
+    certTrust = nssTrust_GetCERTCertTrustForCert(c, cert);
+    if (certTrust) {
+	NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
+	if (nssTrust) {
+	    nssrv = STAN_DeleteCertTrustMatchingSlot(c);
+	    if (nssrv != PR_SUCCESS) {
+    		CERT_MapStanError();
+    	    }
+	    /* This call always returns PR_SUCCESS! */
+	    (void) nssTrust_Destroy(nssTrust);
+	}
+    }
+
     /* get rid of the token instances */
     nssrv = NSSCertificate_DeleteStoredObject(c, NULL);
 
diff --git a/security/nss/lib/certhigh/certhigh.c b/security/nss/lib/certhigh/certhigh.c
index 83a4b01b2936..6081364ea1b9 100644
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -1176,7 +1176,7 @@ loser:
 }
 
 CERTCertificateList *
-CERT_DupCertList(CERTCertificateList * oldList)
+CERT_DupCertList(const CERTCertificateList * oldList)
 {
     CERTCertificateList *newList = NULL;
     PRArenaPool         *arena   = NULL;
diff --git a/security/nss/lib/certhigh/certvfypkix.c b/security/nss/lib/certhigh/certvfypkix.c
index 27557c86c638..282d69b4eb71 100644
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1986,6 +1986,63 @@ CERT_GetPKIXVerifyNistRevocationPolicy()
     return &certRev_PKIX_Verify_Nist_Policy;
 }
 
+CERTRevocationFlags *
+CERT_AllocCERTRevocationFlags(
+    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
+    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods)
+{
+    CERTRevocationFlags *flags;
+    
+    flags = PORT_New(CERTRevocationFlags);
+    if (!flags)
+        return(NULL);
+    
+    flags->leafTests.number_of_defined_methods = number_leaf_methods;
+    flags->leafTests.cert_rev_flags_per_method = 
+        PORT_NewArray(PRUint64, number_leaf_methods);
+
+    flags->leafTests.number_of_preferred_methods = number_leaf_pref_methods;
+    flags->leafTests.preferred_methods = 
+        PORT_NewArray(CERTRevocationMethodIndex, number_leaf_pref_methods);
+
+    flags->chainTests.number_of_defined_methods = number_chain_methods;
+    flags->chainTests.cert_rev_flags_per_method = 
+        PORT_NewArray(PRUint64, number_chain_methods);
+
+    flags->chainTests.number_of_preferred_methods = number_chain_pref_methods;
+    flags->chainTests.preferred_methods = 
+        PORT_NewArray(CERTRevocationMethodIndex, number_chain_pref_methods);
+    
+    if (!flags->leafTests.cert_rev_flags_per_method
+        || !flags->leafTests.preferred_methods
+        || !flags->chainTests.cert_rev_flags_per_method
+        || !flags->chainTests.preferred_methods) {
+        CERT_DestroyCERTRevocationFlags(flags);
+        return (NULL);
+    }
+    
+    return flags;
+}
+
+void CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags)
+{
+    if (!flags)
+	return;
+  
+    if (flags->leafTests.cert_rev_flags_per_method)
+        PORT_Free(flags->leafTests.cert_rev_flags_per_method);
+
+    if (flags->leafTests.preferred_methods)
+        PORT_Free(flags->leafTests.preferred_methods);
+    
+    if (flags->chainTests.cert_rev_flags_per_method)
+        PORT_Free(flags->chainTests.cert_rev_flags_per_method);
+
+    if (flags->chainTests.preferred_methods)
+        PORT_Free(flags->chainTests.preferred_methods);
+
+     PORT_Free(flags);
+}
 
 /*
  * CERT_PKIXVerifyCert
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index 924f36bb8f51..13a05ba435b9 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
@@ -52,6 +52,7 @@ static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 static const CK_TRUST ckt_netscape_untrusted = CKT_NETSCAPE_UNTRUSTED;
+static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
@@ -990,6 +991,36 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = {
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_315 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_316 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_317 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_318 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_319 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
 #ifdef DEBUG
 static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -998,7 +1029,7 @@ static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $", (PRUint32)164 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $", (PRUint32)164 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
@@ -1104,133 +1135,6 @@ static const NSSItem nss_builtins_items_3 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_4 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
-"\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164"
-"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155"
-"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206"
-"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055"
-"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056"
-"\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060"
-"\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071"
-"\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023"
-"\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145"
-"\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003"
-"\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032"
-"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040"
-"\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003"
-"\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151"
-"\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124"
-"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106"
-"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011"
-"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157"
-"\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141"
-"\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206"
-"\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211"
-"\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330"
-"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337"
-"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176"
-"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104"
-"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170"
-"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156"
-"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152"
-"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345"
-"\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006"
-"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015"
-"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
-"\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115"
-"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317"
-"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144"
-"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254"
-"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232"
-"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163"
-"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246"
-"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242"
-"\201"
-, (PRUint32)817 }
-};
-static const NSSItem nss_builtins_items_5 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
-  { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207"
-"\244\353\000\205"
-, (PRUint32)20 },
-  { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331"
-, (PRUint32)16 },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_6 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1320,7 +1224,7 @@ static const NSSItem nss_builtins_items_6 [] = {
 "\243\377\212\043\056\160\107"
 , (PRUint32)791 }
 };
-static const NSSItem nss_builtins_items_7 [] = {
+static const NSSItem nss_builtins_items_5 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1352,7 +1256,7 @@ static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_8 [] = {
+static const NSSItem nss_builtins_items_6 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1445,7 +1349,7 @@ static const NSSItem nss_builtins_items_8 [] = {
 "\246\015\246\043\371\273\313\246\007\024\102"
 , (PRUint32)811 }
 };
-static const NSSItem nss_builtins_items_9 [] = {
+static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1478,7 +1382,7 @@ static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_10 [] = {
+static const NSSItem nss_builtins_items_8 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1553,7 +1457,7 @@ static const NSSItem nss_builtins_items_10 [] = {
 "\254\007\167\070"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_11 [] = {
+static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1577,7 +1481,7 @@ static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_12 [] = {
+static const NSSItem nss_builtins_items_10 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1652,7 +1556,7 @@ static const NSSItem nss_builtins_items_12 [] = {
 "\241\223\004\273\206\237\072\133\103\172\303\212\145"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_13 [] = {
+static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1676,7 +1580,7 @@ static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_14 [] = {
+static const NSSItem nss_builtins_items_12 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1751,7 +1655,7 @@ static const NSSItem nss_builtins_items_14 [] = {
 "\307\177\033\033\326\006\040\002\130\241\303\242\003"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_15 [] = {
+static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1775,7 +1679,7 @@ static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_16 [] = {
+static const NSSItem nss_builtins_items_14 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1841,7 +1745,7 @@ static const NSSItem nss_builtins_items_16 [] = {
 "\224"
 , (PRUint32)577 }
 };
-static const NSSItem nss_builtins_items_17 [] = {
+static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1868,7 +1772,7 @@ static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_18 [] = {
+static const NSSItem nss_builtins_items_16 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1933,7 +1837,7 @@ static const NSSItem nss_builtins_items_18 [] = {
 "\360\210\321\345\170\215\245\052\117\366\227\015\027\167\312\330"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_19 [] = {
+static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1960,7 +1864,7 @@ static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_20 [] = {
+static const NSSItem nss_builtins_items_18 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2025,7 +1929,7 @@ static const NSSItem nss_builtins_items_20 [] = {
 "\300\175\267\162\234\311\066\072\153\237\116\250\377\144\015\144"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_21 [] = {
+static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2052,7 +1956,7 @@ static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_22 [] = {
+static const NSSItem nss_builtins_items_20 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2142,7 +2046,7 @@ static const NSSItem nss_builtins_items_22 [] = {
 "\017\061\134\350\362\331"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_23 [] = {
+static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2175,7 +2079,7 @@ static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_24 [] = {
+static const NSSItem nss_builtins_items_22 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2265,7 +2169,7 @@ static const NSSItem nss_builtins_items_24 [] = {
 "\214\022\173\305\104\264\256"
 , (PRUint32)775 }
 };
-static const NSSItem nss_builtins_items_25 [] = {
+static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2298,7 +2202,7 @@ static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_26 [] = {
+static const NSSItem nss_builtins_items_24 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2388,7 +2292,7 @@ static const NSSItem nss_builtins_items_26 [] = {
 "\240\235\235\151\221\375"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_27 [] = {
+static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2421,7 +2325,7 @@ static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_28 [] = {
+static const NSSItem nss_builtins_items_26 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2511,7 +2415,7 @@ static const NSSItem nss_builtins_items_28 [] = {
 "\117\312\200\221\266\051"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_29 [] = {
+static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2544,7 +2448,7 @@ static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_30 [] = {
+static const NSSItem nss_builtins_items_28 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2626,7 +2530,7 @@ static const NSSItem nss_builtins_items_30 [] = {
 "\125\342\374\110\311\051\046\151\340"
 , (PRUint32)889 }
 };
-static const NSSItem nss_builtins_items_31 [] = {
+static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2651,7 +2555,7 @@ static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_32 [] = {
+static const NSSItem nss_builtins_items_30 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2735,7 +2639,7 @@ static const NSSItem nss_builtins_items_32 [] = {
 "\152\374\176\102\070\100\144\022\367\236\201\341\223\056"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_33 [] = {
+static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2759,7 +2663,7 @@ static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_34 [] = {
+static const NSSItem nss_builtins_items_32 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2844,7 +2748,7 @@ static const NSSItem nss_builtins_items_34 [] = {
 "\161\202\053\231\317\072\267\365\055\162\310"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_35 [] = {
+static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2875,7 +2779,7 @@ static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_36 [] = {
+static const NSSItem nss_builtins_items_34 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2960,7 +2864,7 @@ static const NSSItem nss_builtins_items_36 [] = {
 "\276\355\164\114\274\133\325\142\037\103\335"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_37 [] = {
+static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2991,7 +2895,7 @@ static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_38 [] = {
+static const NSSItem nss_builtins_items_36 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3076,7 +2980,7 @@ static const NSSItem nss_builtins_items_38 [] = {
 "\040\017\105\176\153\242\177\243\214\025\356"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_39 [] = {
+static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3107,7 +3011,7 @@ static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_40 [] = {
+static const NSSItem nss_builtins_items_38 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3214,7 +3118,7 @@ static const NSSItem nss_builtins_items_40 [] = {
 "\113\336\006\226\161\054\362\333\266\037\244\357\077\356"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_41 [] = {
+static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3247,7 +3151,7 @@ static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_42 [] = {
+static const NSSItem nss_builtins_items_40 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3354,7 +3258,7 @@ static const NSSItem nss_builtins_items_42 [] = {
 "\311\130\020\371\252\357\132\266\317\113\113\337\052"
 , (PRUint32)1053 }
 };
-static const NSSItem nss_builtins_items_43 [] = {
+static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3387,7 +3291,7 @@ static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_44 [] = {
+static const NSSItem nss_builtins_items_42 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3494,7 +3398,7 @@ static const NSSItem nss_builtins_items_44 [] = {
 "\153\271\012\172\116\117\113\204\356\113\361\175\335\021"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_45 [] = {
+static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3527,7 +3431,7 @@ static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_46 [] = {
+static const NSSItem nss_builtins_items_44 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3634,7 +3538,7 @@ static const NSSItem nss_builtins_items_46 [] = {
 "\367\146\103\363\236\203\076\040\252\303\065\140\221\316"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_47 [] = {
+static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3667,7 +3571,7 @@ static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_48 [] = {
+static const NSSItem nss_builtins_items_46 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3785,7 +3689,7 @@ static const NSSItem nss_builtins_items_48 [] = {
 "\155\055\105\013\367\012\223\352\355\006\371\262"
 , (PRUint32)1244 }
 };
-static const NSSItem nss_builtins_items_49 [] = {
+static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3817,159 +3721,7 @@ static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_50 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"\002\004\070\003\221\356"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070"
-"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
-"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036"
-"\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027"
-"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201"
-"\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024"
-"\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164"
-"\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167"
-"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103"
-"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120"
-"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146"
-"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045"
-"\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071"
-"\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151"
-"\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052"
-"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145"
-"\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006"
-"\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000"
-"\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047"
-"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150"
-"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107"
-"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226"
-"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261"
-"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164"
-"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126"
-"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346"
-"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202"
-"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004"
-"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202"
-"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244"
-"\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
-"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
-"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240"
-"\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056"
-"\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057"
-"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125"
-"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062"
-"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061"
-"\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004"
-"\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312"
-"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004"
-"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231"
-"\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003"
-"\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000"
-"\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015"
-"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
-"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273"
-"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002"
-"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007"
-"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363"
-"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070"
-"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003"
-"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332"
-"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134"
-"\354"
-, (PRUint32)1265 }
-};
-static const NSSItem nss_builtins_items_51 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
-  { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125"
-"\262\371\365\200"
-, (PRUint32)20 },
-  { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364"
-, (PRUint32)16 },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"\002\004\070\003\221\356"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_52 [] = {
+static const NSSItem nss_builtins_items_48 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4077,7 +3829,7 @@ static const NSSItem nss_builtins_items_52 [] = {
 "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305"
 , (PRUint32)1120 }
 };
-static const NSSItem nss_builtins_items_53 [] = {
+static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4108,7 +3860,7 @@ static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_54 [] = {
+static const NSSItem nss_builtins_items_50 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4190,7 +3942,7 @@ static const NSSItem nss_builtins_items_54 [] = {
 "\347\201\035\031\303\044\102\352\143\071\251"
 , (PRUint32)891 }
 };
-static const NSSItem nss_builtins_items_55 [] = {
+static const NSSItem nss_builtins_items_51 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4215,7 +3967,7 @@ static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_56 [] = {
+static const NSSItem nss_builtins_items_52 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4283,7 +4035,7 @@ static const NSSItem nss_builtins_items_56 [] = {
 "\126\224\251\125"
 , (PRUint32)660 }
 };
-static const NSSItem nss_builtins_items_57 [] = {
+static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4308,7 +4060,7 @@ static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_58 [] = {
+static const NSSItem nss_builtins_items_54 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4375,7 +4127,7 @@ static const NSSItem nss_builtins_items_58 [] = {
 "\132\052\202\262\067\171"
 , (PRUint32)646 }
 };
-static const NSSItem nss_builtins_items_59 [] = {
+static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4400,7 +4152,7 @@ static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_60 [] = {
+static const NSSItem nss_builtins_items_56 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4475,7 +4227,7 @@ static const NSSItem nss_builtins_items_60 [] = {
 "\221\060\352\315"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_61 [] = {
+static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4499,7 +4251,7 @@ static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_62 [] = {
+static const NSSItem nss_builtins_items_58 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4593,7 +4345,7 @@ static const NSSItem nss_builtins_items_62 [] = {
 "\065\341\035\026\034\320\274\053\216\326\161\331"
 , (PRUint32)1052 }
 };
-static const NSSItem nss_builtins_items_63 [] = {
+static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4619,7 +4371,7 @@ static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_64 [] = {
+static const NSSItem nss_builtins_items_60 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4717,7 +4469,7 @@ static const NSSItem nss_builtins_items_64 [] = {
 "\027\132\173\320\274\307\217\116\206\004"
 , (PRUint32)1082 }
 };
-static const NSSItem nss_builtins_items_65 [] = {
+static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4744,7 +4496,7 @@ static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_66 [] = {
+static const NSSItem nss_builtins_items_62 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4838,7 +4590,7 @@ static const NSSItem nss_builtins_items_66 [] = {
 "\116\072\063\014\053\263\055\220\006"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_67 [] = {
+static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4864,7 +4616,7 @@ static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_68 [] = {
+static const NSSItem nss_builtins_items_64 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4959,7 +4711,7 @@ static const NSSItem nss_builtins_items_68 [] = {
 "\306\241"
 , (PRUint32)1058 }
 };
-static const NSSItem nss_builtins_items_69 [] = {
+static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4985,395 +4737,7 @@ static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_70 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
-"\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023"
-"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015"
-"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060"
-"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035"
-"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027"
-"\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015"
-"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213"
-"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060"
-"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040"
-"\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104"
-"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003"
-"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006"
-"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003"
-"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145"
-"\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123"
-"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047"
-"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237"
-"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032"
-"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376"
-"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235"
-"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213"
-"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137"
-"\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060"
-"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001"
-"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
-"\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067"
-"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302"
-"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357"
-"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333"
-"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220"
-"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354"
-"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003"
-"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031"
-"\011\254\211\111\323"
-, (PRUint32)677 }
-};
-static const NSSItem nss_builtins_items_71 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
-  { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105"
-"\010\116\326\126"
-, (PRUint32)20 },
-  { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040"
-, (PRUint32)16 },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_72 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"\002\004\070\233\021\074"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070"
-"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013"
-"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006"
-"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163"
-"\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156"
-"\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154"
-"\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043"
-"\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040"
-"\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151"
-"\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156"
-"\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145"
-"\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060"
-"\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132"
-"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060"
-"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004"
-"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162"
-"\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151"
-"\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125"
-"\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164"
-"\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144"
-"\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165"
-"\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145"
-"\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
-"\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316"
-"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265"
-"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236"
-"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201"
-"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113"
-"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002"
-"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266"
-"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332"
-"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202"
-"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370"
-"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035"
-"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317"
-"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023"
-"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075"
-"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165"
-"\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151"
-"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
-"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
-"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
-"\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105"
-"\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162"
-"\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060"
-"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060"
-"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062"
-"\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003"
-"\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043"
-"\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042"
-"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035"
-"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234"
-"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023"
-"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366"
-"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064"
-"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015"
-"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232"
-"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251"
-"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337"
-"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205"
-"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021"
-"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154"
-"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124"
-"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274"
-"\005\377\154\211\063\360\354\025\017"
-, (PRUint32)1177 }
-};
-static const NSSItem nss_builtins_items_73 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
-  { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366"
-"\045\072\110\223"
-, (PRUint32)20 },
-  { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231"
-, (PRUint32)16 },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"\002\004\070\233\021\074"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_74 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"\002\004\070\236\366\344"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070"
-"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
-"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006"
-"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163"
-"\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151"
-"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
-"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
-"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
-"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105"
-"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060"
-"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062"
-"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022"
-"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156"
-"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167"
-"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103"
-"\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151"
-"\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050"
-"\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056"
-"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006"
-"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145"
-"\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
-"\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264"
-"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162"
-"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255"
-"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124"
-"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064"
-"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045"
-"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374"
-"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047"
-"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001"
-"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206"
-"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335"
-"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201"
-"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003"
-"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164"
-"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145"
-"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142"
-"\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
-"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006"
-"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062"
-"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060"
-"\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035"
-"\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030"
-"\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067"
-"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004"
-"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105"
-"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005"
-"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007"
-"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060"
-"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001"
-"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016"
-"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022"
-"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024"
-"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276"
-"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277"
-"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172"
-"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103"
-"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235"
-"\316\145\146\227\256\046\136"
-, (PRUint32)1159 }
-};
-static const NSSItem nss_builtins_items_75 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
-  { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266"
-"\266\360\277\163"
-, (PRUint32)20 },
-  { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056"
-, (PRUint32)16 },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"\002\004\070\236\366\344"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_76 [] = {
+static const NSSItem nss_builtins_items_66 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5485,7 +4849,7 @@ static const NSSItem nss_builtins_items_76 [] = {
 "\036\177\132\264\074"
 , (PRUint32)1173 }
 };
-static const NSSItem nss_builtins_items_77 [] = {
+static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5516,285 +4880,7 @@ static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_78 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
-"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
-"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
-"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
-"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
-"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060"
-"\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065"
-"\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
-"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
-"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
-"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
-"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
-"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303"
-"\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224"
-"\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204"
-"\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027"
-"\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110"
-"\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141"
-"\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226"
-"\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037"
-"\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266"
-"\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217"
-"\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205"
-"\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070"
-"\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216"
-"\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241"
-"\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356"
-"\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267"
-"\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000"
-"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
-"\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330"
-"\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310"
-"\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
-"\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263"
-"\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247"
-"\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037"
-"\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122"
-"\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323"
-"\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017"
-"\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362"
-"\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005"
-"\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007"
-"\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247"
-"\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227"
-"\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213"
-"\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120"
-"\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026"
-"\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325"
-"\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260"
-"\071\050\150\016\163\335\045\232\336\022"
-, (PRUint32)1002 }
-};
-static const NSSItem nss_builtins_items_79 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
-  { (void *)"\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026"
-"\373\041\026\111"
-, (PRUint32)20 },
-  { (void *)"\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300"
-, (PRUint32)16 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_80 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)"\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
-"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
-"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
-"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
-"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
-"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060"
-"\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063"
-"\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
-"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
-"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
-"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
-"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
-"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010"
-"\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211"
-"\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115"
-"\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044"
-"\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133"
-"\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235"
-"\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127"
-"\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230"
-"\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374"
-"\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136"
-"\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231"
-"\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111"
-"\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206"
-"\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352"
-"\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256"
-"\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165"
-"\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361"
-"\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352"
-"\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116"
-"\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363"
-"\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303"
-"\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320"
-"\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141"
-"\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372"
-"\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242"
-"\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322"
-"\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143"
-"\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224"
-"\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014"
-"\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277"
-"\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332"
-"\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056"
-"\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000"
-"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
-"\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325"
-"\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116"
-"\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
-"\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056"
-"\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022"
-"\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307"
-"\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117"
-"\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066"
-"\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104"
-"\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352"
-"\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275"
-"\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022"
-"\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223"
-"\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060"
-"\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100"
-"\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277"
-"\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346"
-"\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145"
-"\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201"
-"\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212"
-"\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045"
-"\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020"
-"\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316"
-"\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234"
-"\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116"
-"\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261"
-"\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027"
-"\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223"
-"\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234"
-"\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056"
-"\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007"
-"\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207"
-"\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025"
-"\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371"
-"\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274"
-"\204\327\372\334\162\133\367\301\072\150"
-, (PRUint32)1514 }
-};
-static const NSSItem nss_builtins_items_81 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
-  { (void *)"\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272"
-"\204\254\010\172"
-, (PRUint32)20 },
-  { (void *)"\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277"
-, (PRUint32)16 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_82 [] = {
+static const NSSItem nss_builtins_items_68 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5872,7 +4958,7 @@ static const NSSItem nss_builtins_items_82 [] = {
 "\354\040\005\141\336"
 , (PRUint32)869 }
 };
-static const NSSItem nss_builtins_items_83 [] = {
+static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5896,7 +4982,7 @@ static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_84 [] = {
+static const NSSItem nss_builtins_items_70 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5974,7 +5060,7 @@ static const NSSItem nss_builtins_items_84 [] = {
 "\302\005\146\200\241\313\346\063"
 , (PRUint32)856 }
 };
-static const NSSItem nss_builtins_items_85 [] = {
+static const NSSItem nss_builtins_items_71 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5998,7 +5084,7 @@ static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_86 [] = {
+static const NSSItem nss_builtins_items_72 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6077,7 +5163,7 @@ static const NSSItem nss_builtins_items_86 [] = {
 "\342\042\051\256\175\203\100\250\272\154"
 , (PRUint32)874 }
 };
-static const NSSItem nss_builtins_items_87 [] = {
+static const NSSItem nss_builtins_items_73 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6101,7 +5187,7 @@ static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_88 [] = {
+static const NSSItem nss_builtins_items_74 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6212,7 +5298,7 @@ static const NSSItem nss_builtins_items_88 [] = {
 "\244\346\216\330\371\051\110\212\316\163\376\054"
 , (PRUint32)1388 }
 };
-static const NSSItem nss_builtins_items_89 [] = {
+static const NSSItem nss_builtins_items_75 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6236,7 +5322,7 @@ static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_90 [] = {
+static const NSSItem nss_builtins_items_76 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6347,7 +5433,7 @@ static const NSSItem nss_builtins_items_90 [] = {
 "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222"
 , (PRUint32)1392 }
 };
-static const NSSItem nss_builtins_items_91 [] = {
+static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6371,7 +5457,7 @@ static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_92 [] = {
+static const NSSItem nss_builtins_items_78 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6479,7 +5565,7 @@ static const NSSItem nss_builtins_items_92 [] = {
 "\152\372\246\070\254\037\304\204"
 , (PRUint32)1128 }
 };
-static const NSSItem nss_builtins_items_93 [] = {
+static const NSSItem nss_builtins_items_79 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6510,7 +5596,7 @@ static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_94 [] = {
+static const NSSItem nss_builtins_items_80 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6597,7 +5683,7 @@ static const NSSItem nss_builtins_items_94 [] = {
 "\200\072\231\355\165\314\106\173"
 , (PRUint32)936 }
 };
-static const NSSItem nss_builtins_items_95 [] = {
+static const NSSItem nss_builtins_items_81 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6623,7 +5709,7 @@ static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_96 [] = {
+static const NSSItem nss_builtins_items_82 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6742,7 +5828,7 @@ static const NSSItem nss_builtins_items_96 [] = {
 "\105\217\046\221\242\216\376\251"
 , (PRUint32)1448 }
 };
-static const NSSItem nss_builtins_items_97 [] = {
+static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6768,7 +5854,7 @@ static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_98 [] = {
+static const NSSItem nss_builtins_items_84 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6856,7 +5942,7 @@ static const NSSItem nss_builtins_items_98 [] = {
 "\222\340\134\366\007\017"
 , (PRUint32)934 }
 };
-static const NSSItem nss_builtins_items_99 [] = {
+static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6883,7 +5969,7 @@ static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_100 [] = {
+static const NSSItem nss_builtins_items_86 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6975,7 +6061,7 @@ static const NSSItem nss_builtins_items_100 [] = {
 "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_101 [] = {
+static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7006,7 +6092,7 @@ static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_102 [] = {
+static const NSSItem nss_builtins_items_88 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7098,7 +6184,7 @@ static const NSSItem nss_builtins_items_102 [] = {
 "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_103 [] = {
+static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7129,7 +6215,7 @@ static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_104 [] = {
+static const NSSItem nss_builtins_items_90 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7200,7 +6286,7 @@ static const NSSItem nss_builtins_items_104 [] = {
 "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163"
 , (PRUint32)784 }
 };
-static const NSSItem nss_builtins_items_105 [] = {
+static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7223,7 +6309,7 @@ static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_106 [] = {
+static const NSSItem nss_builtins_items_92 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7321,7 +6407,7 @@ static const NSSItem nss_builtins_items_106 [] = {
 "\225\351\066\226\230\156"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_107 [] = {
+static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7348,7 +6434,7 @@ static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_108 [] = {
+static const NSSItem nss_builtins_items_94 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7447,7 +6533,7 @@ static const NSSItem nss_builtins_items_108 [] = {
 "\354\375\051"
 , (PRUint32)1091 }
 };
-static const NSSItem nss_builtins_items_109 [] = {
+static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7474,7 +6560,7 @@ static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_110 [] = {
+static const NSSItem nss_builtins_items_96 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7575,7 +6661,7 @@ static const NSSItem nss_builtins_items_110 [] = {
 "\160\136\310\304\170\260\142"
 , (PRUint32)1095 }
 };
-static const NSSItem nss_builtins_items_111 [] = {
+static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7603,1302 +6689,7 @@ static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_112 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Chained CAs root", (PRUint32)21 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
-"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
-"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
-"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
-"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132"
-"\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060"
-"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
-"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
-"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
-"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
-"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111"
-"\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061"
-"\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065"
-"\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201"
-"\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067"
-"\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062"
-"\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301"
-"\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350"
-"\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000"
-"\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016"
-"\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064"
-"\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035"
-"\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371"
-"\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241"
-"\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060"
-"\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103"
-"\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123"
-"\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035"
-"\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004"
-"\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060"
-"\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006"
-"\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005"
-"\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006"
-"\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001"
-"\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067"
-"\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001"
-"\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060"
-"\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151"
-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102"
-"\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103"
-"\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146"
-"\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040"
-"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
-"\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004"
-"\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006"
-"\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164"
-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
-"\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103"
-"\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370"
-"\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167"
-"\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
-"\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150"
-"\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001"
-"\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060"
-"\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050"
-"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
-"\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171"
-"\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004"
-"\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056"
-"\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126"
-"\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053"
-"\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006"
-"\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315"
-"\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343"
-"\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243"
-"\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315"
-"\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242"
-"\001\177\046\304\143\365\045\102\136\142\275"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_113 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Chained CAs root", (PRUint32)21 },
-  { (void *)"\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256"
-"\347\137\322\127"
-, (PRUint32)20 },
-  { (void *)"\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_114 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE1 root", (PRUint32)16 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
-"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
-"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
-"\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060"
-"\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125"
-"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
-"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
-"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
-"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
-"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
-"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
-"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
-"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
-"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
-"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
-"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
-"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321"
-"\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022"
-"\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152"
-"\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165"
-"\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122"
-"\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161"
-"\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074"
-"\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020"
-"\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004"
-"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
-"\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233"
-"\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001"
-"\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254"
-"\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244"
-"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
-"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
-"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
-"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
-"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
-"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
-"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
-"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
-"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
-"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
-"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
-"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
-"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
-"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
-"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
-"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
-"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
-"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
-"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
-"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
-"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
-"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
-"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
-"\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
-"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
-"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
-"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
-"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
-"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206"
-"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
-"\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
-"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
-"\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110"
-"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061"
-"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
-"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
-"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056"
-"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006"
-"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
-"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
-"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320"
-"\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212"
-"\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305"
-"\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167"
-"\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143"
-"\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334"
-"\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105"
-"\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276"
-"\206\063\076\346\057\110\156\257\124\220\116\255\261\045"
-, (PRUint32)2030 }
-};
-static const NSSItem nss_builtins_items_115 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE1 root", (PRUint32)16 },
-  { (void *)"\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061"
-"\174\345\364\337"
-, (PRUint32)20 },
-  { (void *)"\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_116 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE3 root", (PRUint32)16 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
-"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
-"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
-"\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061"
-"\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125"
-"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
-"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
-"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
-"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
-"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
-"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
-"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
-"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
-"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
-"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
-"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
-"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033"
-"\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331"
-"\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052"
-"\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213"
-"\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230"
-"\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055"
-"\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043"
-"\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153"
-"\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004"
-"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
-"\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243"
-"\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001"
-"\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242"
-"\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244"
-"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
-"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
-"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
-"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
-"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
-"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
-"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
-"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
-"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
-"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
-"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
-"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
-"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
-"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
-"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
-"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
-"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
-"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
-"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
-"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
-"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
-"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
-"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
-"\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
-"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
-"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
-"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
-"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
-"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206"
-"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
-"\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
-"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
-"\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110"
-"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063"
-"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
-"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
-"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056"
-"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006"
-"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
-"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
-"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145"
-"\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103"
-"\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342"
-"\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227"
-"\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275"
-"\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247"
-"\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026"
-"\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262"
-"\257\175\310\352\351\324\126\331\016\023\262\305\105\120"
-, (PRUint32)2030 }
-};
-static const NSSItem nss_builtins_items_117 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE3 root", (PRUint32)16 },
-  { (void *)"\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365"
-"\015\317\161\134"
-, (PRUint32)20 },
-  { (void *)"\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_118 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
-"\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
-"\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067"
-"\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334"
-"\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374"
-"\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320"
-"\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122"
-"\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035"
-"\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306"
-"\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236"
-"\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174"
-"\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000"
-"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
-"\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073"
-"\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035"
-"\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241"
-"\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241"
-"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
-"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
-"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
-"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
-"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
-"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
-"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
-"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
-"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
-"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
-"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
-"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
-"\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103"
-"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
-"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
-"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
-"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143"
-"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
-"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
-"\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150"
-"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
-"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164"
-"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
-"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
-"\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154"
-"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
-"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
-"\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060"
-"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
-"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
-"\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200"
-"\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312"
-"\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304"
-"\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205"
-"\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304"
-"\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347"
-"\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213"
-"\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120"
-"\336\007\043\162\346\275\040\024\113\264\206"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_119 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
-  { (void *)"\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032"
-"\353\214\062\004"
-, (PRUint32)20 },
-  { (void *)"\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_120 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
-"\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
-"\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067"
-"\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366"
-"\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315"
-"\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202"
-"\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153"
-"\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324"
-"\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232"
-"\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165"
-"\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347"
-"\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000"
-"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
-"\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374"
-"\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035"
-"\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107"
-"\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241"
-"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
-"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
-"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
-"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
-"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
-"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
-"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
-"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
-"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
-"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
-"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
-"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
-"\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103"
-"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
-"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
-"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
-"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143"
-"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
-"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
-"\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150"
-"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
-"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164"
-"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
-"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
-"\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154"
-"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
-"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
-"\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060"
-"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
-"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
-"\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032"
-"\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374"
-"\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012"
-"\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010"
-"\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306"
-"\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044"
-"\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022"
-"\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265"
-"\311\024\025\014\343\007\203\233\046\165\357"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_121 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
-  { (void *)"\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342"
-"\101\104\276\156"
-, (PRUint32)20 },
-  { (void *)"\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_122 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Timestamping root", (PRUint32)22 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053"
-"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160"
-"\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006"
-"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155"
-"\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146"
-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
-"\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001"
-"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145"
-"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061"
-"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070"
-"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002"
-"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162"
-"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023"
-"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003"
-"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145"
-"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162"
-"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003"
-"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066"
-"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013"
-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
-"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060"
-"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001"
-"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015"
-"\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000"
-"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215"
-"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257"
-"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070"
-"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161"
-"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265"
-"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130"
-"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233"
-"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243"
-"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006"
-"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235"
-"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120"
-"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213"
-"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077"
-"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061"
-"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020"
-"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141"
-"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145"
-"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111"
-"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154"
-"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040"
-"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151"
-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103"
-"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065"
-"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040"
-"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003"
-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
-"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060"
-"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160"
-"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000"
-"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014"
-"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003"
-"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003"
-"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001"
-"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006"
-"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001"
-"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001"
-"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053"
-"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110"
-"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003"
-"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001"
-"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156"
-"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145"
-"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006"
-"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164"
-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
-"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001"
-"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057"
-"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060"
-"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164"
-"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206"
-"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124"
-"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154"
-"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065"
-"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163"
-"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145"
-"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056"
-"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102"
-"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151"
-"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170"
-"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163"
-"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240"
-"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143"
-"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
-"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155"
-"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005"
-"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005"
-"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163"
-"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314"
-"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203"
-"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067"
-"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077"
-"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114"
-"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210"
-"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001"
-"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324"
-"\207\112\137\334\357\351\126\360\012\014\350\165"
-, (PRUint32)2108 }
-};
-static const NSSItem nss_builtins_items_123 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Timestamping root", (PRUint32)22 },
-  { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313"
-"\361\266\304\322"
-, (PRUint32)20 },
-  { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_124 [] = {
+static const NSSItem nss_builtins_items_98 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9024,7 +6815,7 @@ static const NSSItem nss_builtins_items_124 [] = {
 "\112\164\066\371"
 , (PRUint32)1492 }
 };
-static const NSSItem nss_builtins_items_125 [] = {
+static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9052,7 +6843,7 @@ static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_126 [] = {
+static const NSSItem nss_builtins_items_100 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9168,7 +6959,7 @@ static const NSSItem nss_builtins_items_126 [] = {
 "\020\005\145\325\202\020\352\302\061\315\056"
 , (PRUint32)1467 }
 };
-static const NSSItem nss_builtins_items_127 [] = {
+static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9192,7 +6983,7 @@ static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_128 [] = {
+static const NSSItem nss_builtins_items_102 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9323,7 +7114,7 @@ static const NSSItem nss_builtins_items_128 [] = {
 "\332"
 , (PRUint32)1697 }
 };
-static const NSSItem nss_builtins_items_129 [] = {
+static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9347,7 +7138,7 @@ static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_130 [] = {
+static const NSSItem nss_builtins_items_104 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9427,7 +7218,7 @@ static const NSSItem nss_builtins_items_130 [] = {
 "\057\317\246\356\311\160\042\024\275\375\276\154\013\003"
 , (PRUint32)862 }
 };
-static const NSSItem nss_builtins_items_131 [] = {
+static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9452,7 +7243,7 @@ static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_132 [] = {
+static const NSSItem nss_builtins_items_106 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9525,7 +7316,7 @@ static const NSSItem nss_builtins_items_132 [] = {
 "\127\275\125\232"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_133 [] = {
+static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9548,7 +7339,7 @@ static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_134 [] = {
+static const NSSItem nss_builtins_items_108 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9621,7 +7412,7 @@ static const NSSItem nss_builtins_items_134 [] = {
 "\160\254\337\114"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_135 [] = {
+static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9644,7 +7435,7 @@ static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_136 [] = {
+static const NSSItem nss_builtins_items_110 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9730,7 +7521,7 @@ static const NSSItem nss_builtins_items_136 [] = {
 "\025\301\044\174\062\174\003\035\073\241\130\105\062\223"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_137 [] = {
+static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9755,7 +7546,7 @@ static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_138 [] = {
+static const NSSItem nss_builtins_items_112 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9846,7 +7637,7 @@ static const NSSItem nss_builtins_items_138 [] = {
 "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145"
 , (PRUint32)1071 }
 };
-static const NSSItem nss_builtins_items_139 [] = {
+static const NSSItem nss_builtins_items_113 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9870,7 +7661,7 @@ static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_140 [] = {
+static const NSSItem nss_builtins_items_114 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9974,7 +7765,7 @@ static const NSSItem nss_builtins_items_140 [] = {
 "\004\243\103\055\332\374\013\142\352\057\137\142\123"
 , (PRUint32)1309 }
 };
-static const NSSItem nss_builtins_items_141 [] = {
+static const NSSItem nss_builtins_items_115 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9997,7 +7788,7 @@ static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_142 [] = {
+static const NSSItem nss_builtins_items_116 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10103,7 +7894,7 @@ static const NSSItem nss_builtins_items_142 [] = {
 "\364\010"
 , (PRUint32)1122 }
 };
-static const NSSItem nss_builtins_items_143 [] = {
+static const NSSItem nss_builtins_items_117 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10133,7 +7924,7 @@ static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_144 [] = {
+static const NSSItem nss_builtins_items_118 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10247,7 +8038,7 @@ static const NSSItem nss_builtins_items_144 [] = {
 "\005\323\312\003\112\124"
 , (PRUint32)1190 }
 };
-static const NSSItem nss_builtins_items_145 [] = {
+static const NSSItem nss_builtins_items_119 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10279,7 +8070,7 @@ static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_146 [] = {
+static const NSSItem nss_builtins_items_120 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10386,7 +8177,7 @@ static const NSSItem nss_builtins_items_146 [] = {
 "\062\234\036\273\235\370\146\250"
 , (PRUint32)1144 }
 };
-static const NSSItem nss_builtins_items_147 [] = {
+static const NSSItem nss_builtins_items_121 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10416,7 +8207,7 @@ static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_148 [] = {
+static const NSSItem nss_builtins_items_122 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10522,7 +8313,7 @@ static const NSSItem nss_builtins_items_148 [] = {
 "\275\023\122\035\250\076\315\000\037\310"
 , (PRUint32)1130 }
 };
-static const NSSItem nss_builtins_items_149 [] = {
+static const NSSItem nss_builtins_items_123 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10552,7 +8343,7 @@ static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_150 [] = {
+static const NSSItem nss_builtins_items_124 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10661,7 +8452,7 @@ static const NSSItem nss_builtins_items_150 [] = {
 "\334"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_151 [] = {
+static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10689,7 +8480,7 @@ static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_152 [] = {
+static const NSSItem nss_builtins_items_126 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10796,7 +8587,7 @@ static const NSSItem nss_builtins_items_152 [] = {
 "\166\135\165\220\032\365\046\217\360"
 , (PRUint32)1225 }
 };
-static const NSSItem nss_builtins_items_153 [] = {
+static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10823,7 +8614,7 @@ static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_154 [] = {
+static const NSSItem nss_builtins_items_128 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10973,7 +8764,7 @@ static const NSSItem nss_builtins_items_154 [] = {
 "\306\224\107\351\050"
 , (PRUint32)1749 }
 };
-static const NSSItem nss_builtins_items_155 [] = {
+static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11005,7 +8796,7 @@ static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_156 [] = {
+static const NSSItem nss_builtins_items_130 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11148,7 +8939,7 @@ static const NSSItem nss_builtins_items_156 [] = {
 "\210"
 , (PRUint32)1665 }
 };
-static const NSSItem nss_builtins_items_157 [] = {
+static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11179,7 +8970,7 @@ static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_158 [] = {
+static const NSSItem nss_builtins_items_132 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11298,7 +9089,7 @@ static const NSSItem nss_builtins_items_158 [] = {
 "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110"
 , (PRUint32)1359 }
 };
-static const NSSItem nss_builtins_items_159 [] = {
+static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11327,7 +9118,7 @@ static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_160 [] = {
+static const NSSItem nss_builtins_items_134 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11447,7 +9238,7 @@ static const NSSItem nss_builtins_items_160 [] = {
 "\063\004\324"
 , (PRUint32)1363 }
 };
-static const NSSItem nss_builtins_items_161 [] = {
+static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11476,7 +9267,7 @@ static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_162 [] = {
+static const NSSItem nss_builtins_items_136 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11577,7 +9368,7 @@ static const NSSItem nss_builtins_items_162 [] = {
 "\264\003\045\274"
 , (PRUint32)1076 }
 };
-static const NSSItem nss_builtins_items_163 [] = {
+static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11606,7 +9397,7 @@ static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_164 [] = {
+static const NSSItem nss_builtins_items_138 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11699,7 +9490,7 @@ static const NSSItem nss_builtins_items_164 [] = {
 "\177\333\275\237"
 , (PRUint32)1028 }
 };
-static const NSSItem nss_builtins_items_165 [] = {
+static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11725,7 +9516,7 @@ static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_166 [] = {
+static const NSSItem nss_builtins_items_140 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11819,7 +9610,7 @@ static const NSSItem nss_builtins_items_166 [] = {
 "\037\027\224"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_167 [] = {
+static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11845,7 +9636,7 @@ static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_168 [] = {
+static const NSSItem nss_builtins_items_142 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12000,7 +9791,7 @@ static const NSSItem nss_builtins_items_168 [] = {
 "\152\263\364\210\034\200\015\374\162\212\350\203\136"
 , (PRUint32)1997 }
 };
-static const NSSItem nss_builtins_items_169 [] = {
+static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12027,7 +9818,7 @@ static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_170 [] = {
+static const NSSItem nss_builtins_items_144 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12140,7 +9931,7 @@ static const NSSItem nss_builtins_items_170 [] = {
 "\245\206\054\174\364\022"
 , (PRUint32)1398 }
 };
-static const NSSItem nss_builtins_items_171 [] = {
+static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12165,7 +9956,7 @@ static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_172 [] = {
+static const NSSItem nss_builtins_items_146 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12269,7 +10060,7 @@ static const NSSItem nss_builtins_items_172 [] = {
 "\252\341\247\063\366\375\112\037\366\331\140"
 , (PRUint32)1115 }
 };
-static const NSSItem nss_builtins_items_173 [] = {
+static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12298,7 +10089,7 @@ static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_174 [] = {
+static const NSSItem nss_builtins_items_148 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12393,7 +10184,7 @@ static const NSSItem nss_builtins_items_174 [] = {
 "\117\041\145\073\112\177\107\243\373"
 , (PRUint32)1001 }
 };
-static const NSSItem nss_builtins_items_175 [] = {
+static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12421,7 +10212,7 @@ static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_176 [] = {
+static const NSSItem nss_builtins_items_150 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12544,7 +10335,7 @@ static const NSSItem nss_builtins_items_176 [] = {
 "\060\032\365\232\154\364\016\123\371\072\133\321\034"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_177 [] = {
+static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12571,7 +10362,7 @@ static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_178 [] = {
+static const NSSItem nss_builtins_items_152 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12660,7 +10451,7 @@ static const NSSItem nss_builtins_items_178 [] = {
 "\346\120\262\247\372\012\105\057\242\360\362"
 , (PRUint32)955 }
 };
-static const NSSItem nss_builtins_items_179 [] = {
+static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12687,7 +10478,7 @@ static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_180 [] = {
+static const NSSItem nss_builtins_items_154 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12776,7 +10567,7 @@ static const NSSItem nss_builtins_items_180 [] = {
 "\225\155\336"
 , (PRUint32)947 }
 };
-static const NSSItem nss_builtins_items_181 [] = {
+static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12803,7 +10594,7 @@ static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_182 [] = {
+static const NSSItem nss_builtins_items_156 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12893,7 +10684,7 @@ static const NSSItem nss_builtins_items_182 [] = {
 "\370\351\056\023\243\167\350\037\112"
 , (PRUint32)969 }
 };
-static const NSSItem nss_builtins_items_183 [] = {
+static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12920,7 +10711,7 @@ static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_184 [] = {
+static const NSSItem nss_builtins_items_158 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13001,7 +10792,7 @@ static const NSSItem nss_builtins_items_184 [] = {
 "\227\277\242\216\264\124"
 , (PRUint32)918 }
 };
-static const NSSItem nss_builtins_items_185 [] = {
+static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13025,7 +10816,7 @@ static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_186 [] = {
+static const NSSItem nss_builtins_items_160 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13103,7 +10894,7 @@ static const NSSItem nss_builtins_items_186 [] = {
 "\013\004\216\007\333\051\266\012\356\235\202\065\065\020"
 , (PRUint32)846 }
 };
-static const NSSItem nss_builtins_items_187 [] = {
+static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13128,7 +10919,7 @@ static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_188 [] = {
+static const NSSItem nss_builtins_items_162 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13220,7 +11011,7 @@ static const NSSItem nss_builtins_items_188 [] = {
 "\363\267\240\247\315\345\172\063\066\152\372\232\053"
 , (PRUint32)1037 }
 };
-static const NSSItem nss_builtins_items_189 [] = {
+static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13246,7 +11037,7 @@ static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_190 [] = {
+static const NSSItem nss_builtins_items_164 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13348,7 +11139,7 @@ static const NSSItem nss_builtins_items_190 [] = {
 "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307"
 , (PRUint32)1023 }
 };
-static const NSSItem nss_builtins_items_191 [] = {
+static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13379,7 +11170,7 @@ static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_192 [] = {
+static const NSSItem nss_builtins_items_166 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13487,7 +11278,7 @@ static const NSSItem nss_builtins_items_192 [] = {
 "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102"
 , (PRUint32)1088 }
 };
-static const NSSItem nss_builtins_items_193 [] = {
+static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13519,7 +11310,7 @@ static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_194 [] = {
+static const NSSItem nss_builtins_items_168 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13636,7 +11427,7 @@ static const NSSItem nss_builtins_items_194 [] = {
 "\205\206\171\145\322"
 , (PRUint32)1477 }
 };
-static const NSSItem nss_builtins_items_195 [] = {
+static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13660,7 +11451,7 @@ static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_196 [] = {
+static const NSSItem nss_builtins_items_170 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13776,7 +11567,7 @@ static const NSSItem nss_builtins_items_196 [] = {
 "\111\044\133\311\260\320\127\301\372\076\172\341\227\311"
 , (PRUint32)1470 }
 };
-static const NSSItem nss_builtins_items_197 [] = {
+static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13800,7 +11591,7 @@ static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_198 [] = {
+static const NSSItem nss_builtins_items_172 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13917,7 +11708,7 @@ static const NSSItem nss_builtins_items_198 [] = {
 "\156"
 , (PRUint32)1473 }
 };
-static const NSSItem nss_builtins_items_199 [] = {
+static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13941,7 +11732,7 @@ static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_200 [] = {
+static const NSSItem nss_builtins_items_174 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14024,7 +11815,7 @@ static const NSSItem nss_builtins_items_200 [] = {
 "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131"
 , (PRUint32)896 }
 };
-static const NSSItem nss_builtins_items_201 [] = {
+static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14050,7 +11841,7 @@ static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_202 [] = {
+static const NSSItem nss_builtins_items_176 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14154,7 +11945,7 @@ static const NSSItem nss_builtins_items_202 [] = {
 "\215\126\214\150"
 , (PRUint32)1060 }
 };
-static const NSSItem nss_builtins_items_203 [] = {
+static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14185,7 +11976,7 @@ static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_204 [] = {
+static const NSSItem nss_builtins_items_178 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14304,7 +12095,7 @@ static const NSSItem nss_builtins_items_204 [] = {
 "\254\021\326\250\355\143\152"
 , (PRUint32)1239 }
 };
-static const NSSItem nss_builtins_items_205 [] = {
+static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14337,7 +12128,7 @@ static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_206 [] = {
+static const NSSItem nss_builtins_items_180 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14422,7 +12213,7 @@ static const NSSItem nss_builtins_items_206 [] = {
 "\113\035\236\054\302\270\150\274\355\002\356\061"
 , (PRUint32)956 }
 };
-static const NSSItem nss_builtins_items_207 [] = {
+static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14447,7 +12238,7 @@ static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_208 [] = {
+static const NSSItem nss_builtins_items_182 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14532,7 +12323,7 @@ static const NSSItem nss_builtins_items_208 [] = {
 "\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026"
 , (PRUint32)960 }
 };
-static const NSSItem nss_builtins_items_209 [] = {
+static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14557,7 +12348,7 @@ static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_210 [] = {
+static const NSSItem nss_builtins_items_184 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14657,7 +12448,7 @@ static const NSSItem nss_builtins_items_210 [] = {
 "\145"
 , (PRUint32)1057 }
 };
-static const NSSItem nss_builtins_items_211 [] = {
+static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14686,7 +12477,7 @@ static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_212 [] = {
+static const NSSItem nss_builtins_items_186 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14804,7 +12595,7 @@ static const NSSItem nss_builtins_items_212 [] = {
 "\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
 , (PRUint32)1422 }
 };
-static const NSSItem nss_builtins_items_213 [] = {
+static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14831,7 +12622,7 @@ static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_214 [] = {
+static const NSSItem nss_builtins_items_188 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14923,7 +12714,7 @@ static const NSSItem nss_builtins_items_214 [] = {
 "\244\140\114\260\125\240\240\173\127\262"
 , (PRUint32)1002 }
 };
-static const NSSItem nss_builtins_items_215 [] = {
+static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14950,7 +12741,7 @@ static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_216 [] = {
+static const NSSItem nss_builtins_items_190 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15059,7 +12850,7 @@ static const NSSItem nss_builtins_items_216 [] = {
 "\333"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_217 [] = {
+static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15087,7 +12878,7 @@ static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_218 [] = {
+static const NSSItem nss_builtins_items_192 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15161,7 +12952,7 @@ static const NSSItem nss_builtins_items_218 [] = {
 "\334\335\363\377\035\054\072\026\127\331\222\071\326"
 , (PRUint32)653 }
 };
-static const NSSItem nss_builtins_items_219 [] = {
+static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15190,7 +12981,7 @@ static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_220 [] = {
+static const NSSItem nss_builtins_items_194 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15282,7 +13073,7 @@ static const NSSItem nss_builtins_items_220 [] = {
 "\321\236\164\310\166\147"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_221 [] = {
+static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15307,7 +13098,7 @@ static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_222 [] = {
+static const NSSItem nss_builtins_items_196 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15404,7 +13195,7 @@ static const NSSItem nss_builtins_items_222 [] = {
 "\253\205\322\140\126\132"
 , (PRUint32)1030 }
 };
-static const NSSItem nss_builtins_items_223 [] = {
+static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15432,7 +13223,7 @@ static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_224 [] = {
+static const NSSItem nss_builtins_items_198 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15517,7 +13308,7 @@ static const NSSItem nss_builtins_items_224 [] = {
 "\164"
 , (PRUint32)897 }
 };
-static const NSSItem nss_builtins_items_225 [] = {
+static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15543,7 +13334,7 @@ static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_226 [] = {
+static const NSSItem nss_builtins_items_200 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15640,7 +13431,7 @@ static const NSSItem nss_builtins_items_226 [] = {
 "\374\276\337\012\015"
 , (PRUint32)1013 }
 };
-static const NSSItem nss_builtins_items_227 [] = {
+static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15669,7 +13460,7 @@ static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_228 [] = {
+static const NSSItem nss_builtins_items_202 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15780,7 +13571,7 @@ static const NSSItem nss_builtins_items_228 [] = {
 "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
 , (PRUint32)1151 }
 };
-static const NSSItem nss_builtins_items_229 [] = {
+static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15812,7 +13603,7 @@ static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_230 [] = {
+static const NSSItem nss_builtins_items_204 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15966,7 +13757,7 @@ static const NSSItem nss_builtins_items_230 [] = {
 "\103\307\003\340\067\116\135\012\334\131\040\045"
 , (PRUint32)1964 }
 };
-static const NSSItem nss_builtins_items_231 [] = {
+static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15994,7 +13785,7 @@ static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_232 [] = {
+static const NSSItem nss_builtins_items_206 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16075,7 +13866,7 @@ static const NSSItem nss_builtins_items_232 [] = {
 "\300\226\130\057\352\273\106\327\273\344\331\056"
 , (PRUint32)940 }
 };
-static const NSSItem nss_builtins_items_233 [] = {
+static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16098,7 +13889,7 @@ static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_234 [] = {
+static const NSSItem nss_builtins_items_208 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16232,7 +14023,7 @@ static const NSSItem nss_builtins_items_234 [] = {
 "\005\211\374\170\326\134\054\046\103\251"
 , (PRUint32)1642 }
 };
-static const NSSItem nss_builtins_items_235 [] = {
+static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16260,7 +14051,7 @@ static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_236 [] = {
+static const NSSItem nss_builtins_items_210 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16365,7 +14156,7 @@ static const NSSItem nss_builtins_items_236 [] = {
 "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_237 [] = {
+static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16392,7 +14183,7 @@ static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_238 [] = {
+static const NSSItem nss_builtins_items_212 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16497,7 +14288,7 @@ static const NSSItem nss_builtins_items_238 [] = {
 "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_239 [] = {
+static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16524,7 +14315,7 @@ static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_240 [] = {
+static const NSSItem nss_builtins_items_214 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16617,7 +14408,7 @@ static const NSSItem nss_builtins_items_240 [] = {
 "\230"
 , (PRUint32)993 }
 };
-static const NSSItem nss_builtins_items_241 [] = {
+static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16644,7 +14435,7 @@ static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_242 [] = {
+static const NSSItem nss_builtins_items_216 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16733,7 +14524,7 @@ static const NSSItem nss_builtins_items_242 [] = {
 "\126\144\127"
 , (PRUint32)931 }
 };
-static const NSSItem nss_builtins_items_243 [] = {
+static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16760,7 +14551,7 @@ static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_244 [] = {
+static const NSSItem nss_builtins_items_218 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16841,7 +14632,7 @@ static const NSSItem nss_builtins_items_244 [] = {
 "\000\147\240\161\000\202\110"
 , (PRUint32)919 }
 };
-static const NSSItem nss_builtins_items_245 [] = {
+static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16865,7 +14656,7 @@ static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_246 [] = {
+static const NSSItem nss_builtins_items_220 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16947,7 +14738,7 @@ static const NSSItem nss_builtins_items_246 [] = {
 "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
 , (PRUint32)943 }
 };
-static const NSSItem nss_builtins_items_247 [] = {
+static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16971,7 +14762,7 @@ static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_248 [] = {
+static const NSSItem nss_builtins_items_222 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17052,7 +14843,7 @@ static const NSSItem nss_builtins_items_248 [] = {
 "\246\210\070\316\125"
 , (PRUint32)933 }
 };
-static const NSSItem nss_builtins_items_249 [] = {
+static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17075,7 +14866,7 @@ static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_250 [] = {
+static const NSSItem nss_builtins_items_224 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17194,7 +14985,7 @@ static const NSSItem nss_builtins_items_250 [] = {
 "\201\370\021\234"
 , (PRUint32)1460 }
 };
-static const NSSItem nss_builtins_items_251 [] = {
+static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17220,7 +15011,7 @@ static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_252 [] = {
+static const NSSItem nss_builtins_items_226 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17354,7 +15145,7 @@ static const NSSItem nss_builtins_items_252 [] = {
 "\311\234\220\332\354\251\102\074\255\266\002"
 , (PRUint32)1307 }
 };
-static const NSSItem nss_builtins_items_253 [] = {
+static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17392,7 +15183,7 @@ static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_254 [] = {
+static const NSSItem nss_builtins_items_228 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17470,7 +15261,7 @@ static const NSSItem nss_builtins_items_254 [] = {
 "\366\324\357\277\114\210\150"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_255 [] = {
+static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17494,7 +15285,7 @@ static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_256 [] = {
+static const NSSItem nss_builtins_items_230 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17572,7 +15363,7 @@ static const NSSItem nss_builtins_items_256 [] = {
 "\246\347\313\100\003\335\171"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_257 [] = {
+static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17596,7 +15387,7 @@ static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_258 [] = {
+static const NSSItem nss_builtins_items_232 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17723,7 +15514,7 @@ static const NSSItem nss_builtins_items_258 [] = {
 "\320\352\111\242\034\215\122\024\246\012\223"
 , (PRUint32)1515 }
 };
-static const NSSItem nss_builtins_items_259 [] = {
+static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17751,7 +15542,7 @@ static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_260 [] = {
+static const NSSItem nss_builtins_items_234 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17825,7 +15616,7 @@ static const NSSItem nss_builtins_items_260 [] = {
 "\366\356\260\132\116\111\104\124\130\137\102\203"
 , (PRUint32)828 }
 };
-static const NSSItem nss_builtins_items_261 [] = {
+static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17848,7 +15639,7 @@ static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_262 [] = {
+static const NSSItem nss_builtins_items_236 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17924,7 +15715,7 @@ static const NSSItem nss_builtins_items_262 [] = {
 "\011\333\212\101\202\236\146\233\021"
 , (PRUint32)857 }
 };
-static const NSSItem nss_builtins_items_263 [] = {
+static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17947,7 +15738,7 @@ static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_264 [] = {
+static const NSSItem nss_builtins_items_238 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18030,7 +15821,7 @@ static const NSSItem nss_builtins_items_264 [] = {
 "\262\033\211\124"
 , (PRUint32)932 }
 };
-static const NSSItem nss_builtins_items_265 [] = {
+static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18054,7 +15845,7 @@ static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_266 [] = {
+static const NSSItem nss_builtins_items_240 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18154,7 +15945,7 @@ static const NSSItem nss_builtins_items_266 [] = {
 "\021\055"
 , (PRUint32)1026 }
 };
-static const NSSItem nss_builtins_items_267 [] = {
+static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18184,7 +15975,7 @@ static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_268 [] = {
+static const NSSItem nss_builtins_items_242 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18258,7 +16049,7 @@ static const NSSItem nss_builtins_items_268 [] = {
 "\367\130\077\056\162\002\127\243\217\241\024\056"
 , (PRUint32)652 }
 };
-static const NSSItem nss_builtins_items_269 [] = {
+static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18287,7 +16078,7 @@ static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_270 [] = {
+static const NSSItem nss_builtins_items_244 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18393,7 +16184,7 @@ static const NSSItem nss_builtins_items_270 [] = {
 "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
 , (PRUint32)1070 }
 };
-static const NSSItem nss_builtins_items_271 [] = {
+static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18425,7 +16216,7 @@ static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_272 [] = {
+static const NSSItem nss_builtins_items_246 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18504,7 +16295,7 @@ static const NSSItem nss_builtins_items_272 [] = {
 "\017\212"
 , (PRUint32)690 }
 };
-static const NSSItem nss_builtins_items_273 [] = {
+static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18534,7 +16325,7 @@ static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_274 [] = {
+static const NSSItem nss_builtins_items_248 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18649,7 +16440,7 @@ static const NSSItem nss_builtins_items_274 [] = {
 "\354\315\202\141\361\070\346\117\227\230\052\132\215"
 , (PRUint32)1213 }
 };
-static const NSSItem nss_builtins_items_275 [] = {
+static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18681,7 +16472,7 @@ static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_276 [] = {
+static const NSSItem nss_builtins_items_250 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18779,7 +16570,7 @@ static const NSSItem nss_builtins_items_276 [] = {
 "\055\247\330\206\052\335\056\020"
 , (PRUint32)904 }
 };
-static const NSSItem nss_builtins_items_277 [] = {
+static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18812,7 +16603,7 @@ static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_278 [] = {
+static const NSSItem nss_builtins_items_252 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18914,7 +16705,7 @@ static const NSSItem nss_builtins_items_278 [] = {
 "\330\316\304\143\165\077\131\107\261"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_279 [] = {
+static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18944,7 +16735,7 @@ static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_280 [] = {
+static const NSSItem nss_builtins_items_254 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19063,7 +16854,7 @@ static const NSSItem nss_builtins_items_280 [] = {
 "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
 , (PRUint32)1486 }
 };
-static const NSSItem nss_builtins_items_281 [] = {
+static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19088,7 +16879,7 @@ static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_282 [] = {
+static const NSSItem nss_builtins_items_256 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19178,7 +16969,7 @@ static const NSSItem nss_builtins_items_282 [] = {
 "\315\345\250"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_283 [] = {
+static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19202,7 +16993,7 @@ static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_284 [] = {
+static const NSSItem nss_builtins_items_258 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19307,7 +17098,7 @@ static const NSSItem nss_builtins_items_284 [] = {
 "\115\273\306\104\333\066\313\052\234\216"
 , (PRUint32)1258 }
 };
-static const NSSItem nss_builtins_items_285 [] = {
+static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19332,7 +17123,7 @@ static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_286 [] = {
+static const NSSItem nss_builtins_items_260 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19408,7 +17199,7 @@ static const NSSItem nss_builtins_items_286 [] = {
 "\002\153\331\132"
 , (PRUint32)820 }
 };
-static const NSSItem nss_builtins_items_287 [] = {
+static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19432,7 +17223,7 @@ static const NSSItem nss_builtins_items_287 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_288 [] = {
+static const NSSItem nss_builtins_items_262 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19514,7 +17305,7 @@ static const NSSItem nss_builtins_items_288 [] = {
 "\362"
 , (PRUint32)881 }
 };
-static const NSSItem nss_builtins_items_289 [] = {
+static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19539,7 +17330,7 @@ static const NSSItem nss_builtins_items_289 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_290 [] = {
+static const NSSItem nss_builtins_items_264 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19655,7 +17446,7 @@ static const NSSItem nss_builtins_items_290 [] = {
 "\113\076\053\070\007\125\230\136\244"
 , (PRUint32)1465 }
 };
-static const NSSItem nss_builtins_items_291 [] = {
+static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19679,7 +17470,7 @@ static const NSSItem nss_builtins_items_291 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_292 [] = {
+static const NSSItem nss_builtins_items_266 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19744,7 +17535,7 @@ static const NSSItem nss_builtins_items_292 [] = {
 "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_293 [] = {
+static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19771,7 +17562,7 @@ static const NSSItem nss_builtins_items_293 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_294 [] = {
+static const NSSItem nss_builtins_items_268 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19836,7 +17627,7 @@ static const NSSItem nss_builtins_items_294 [] = {
 "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_295 [] = {
+static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19863,7 +17654,7 @@ static const NSSItem nss_builtins_items_295 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_296 [] = {
+static const NSSItem nss_builtins_items_270 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19960,7 +17751,7 @@ static const NSSItem nss_builtins_items_296 [] = {
 "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
 , (PRUint32)1038 }
 };
-static const NSSItem nss_builtins_items_297 [] = {
+static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19988,7 +17779,7 @@ static const NSSItem nss_builtins_items_297 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_298 [] = {
+static const NSSItem nss_builtins_items_272 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20079,7 +17870,7 @@ static const NSSItem nss_builtins_items_298 [] = {
 "\336\102\343\055\202\361\017\345\372\227"
 , (PRUint32)954 }
 };
-static const NSSItem nss_builtins_items_299 [] = {
+static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20107,7 +17898,7 @@ static const NSSItem nss_builtins_items_299 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_300 [] = {
+static const NSSItem nss_builtins_items_274 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20186,7 +17977,7 @@ static const NSSItem nss_builtins_items_300 [] = {
 "\130\077\137"
 , (PRUint32)867 }
 };
-static const NSSItem nss_builtins_items_301 [] = {
+static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20210,7 +18001,7 @@ static const NSSItem nss_builtins_items_301 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_302 [] = {
+static const NSSItem nss_builtins_items_276 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20303,7 +18094,7 @@ static const NSSItem nss_builtins_items_302 [] = {
 "\045\361\224\264\146"
 , (PRUint32)997 }
 };
-static const NSSItem nss_builtins_items_303 [] = {
+static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20330,7 +18121,7 @@ static const NSSItem nss_builtins_items_303 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_304 [] = {
+static const NSSItem nss_builtins_items_278 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20454,7 +18245,7 @@ static const NSSItem nss_builtins_items_304 [] = {
 "\156\117\022\176\012\074\235\225"
 , (PRUint32)1560 }
 };
-static const NSSItem nss_builtins_items_305 [] = {
+static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20479,7 +18270,7 @@ static const NSSItem nss_builtins_items_305 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_306 [] = {
+static const NSSItem nss_builtins_items_280 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20598,7 +18389,7 @@ static const NSSItem nss_builtins_items_306 [] = {
 "\333\374\046\210\307"
 , (PRUint32)1525 }
 };
-static const NSSItem nss_builtins_items_307 [] = {
+static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20622,7 +18413,7 @@ static const NSSItem nss_builtins_items_307 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_308 [] = {
+static const NSSItem nss_builtins_items_282 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20778,7 +18569,7 @@ static const NSSItem nss_builtins_items_308 [] = {
 "\167\110\320"
 , (PRUint32)1875 }
 };
-static const NSSItem nss_builtins_items_309 [] = {
+static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20809,7 +18600,7 @@ static const NSSItem nss_builtins_items_309 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_310 [] = {
+static const NSSItem nss_builtins_items_284 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20962,7 +18753,7 @@ static const NSSItem nss_builtins_items_310 [] = {
 "\351\233\256\325\124\300\164\200\321\013\102\237\301"
 , (PRUint32)1869 }
 };
-static const NSSItem nss_builtins_items_311 [] = {
+static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20992,6 +18783,2574 @@ static const NSSItem nss_builtins_items_311 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
+static const NSSItem nss_builtins_items_286 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004"
+"\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154"
+"\141\056\157\162\147"
+, (PRUint32)229 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
+"\362\077\103"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000"
+"\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157"
+"\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202"
+"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253"
+"\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262"
+"\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241"
+"\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271"
+"\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307"
+"\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070"
+"\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262"
+"\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221"
+"\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033"
+"\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351"
+"\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316"
+"\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235"
+"\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345"
+"\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133"
+"\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100"
+"\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214"
+"\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002"
+"\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003"
+"\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230"
+"\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006"
+"\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160"
+"\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003"
+"\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035"
+"\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006"
+"\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040"
+"\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001"
+"\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007"
+"\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165"
+"\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120"
+"\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066"
+"\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143"
+"\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055"
+"\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141"
+"\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164"
+"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056"
+"\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161"
+"\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073"
+"\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160"
+"\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056"
+"\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123"
+"\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053"
+"\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057"
+"\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157"
+"\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144"
+"\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147"
+"\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172"
+"\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025"
+"\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276"
+"\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317"
+"\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111"
+"\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204"
+"\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163"
+"\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335"
+"\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043"
+"\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231"
+"\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312"
+"\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005"
+"\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142"
+"\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043"
+"\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236"
+"\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055"
+"\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171"
+"\242\355\264\324\265\145\103\267\223\106\212\323"
+, (PRUint32)1532 }
+};
+static const NSSItem nss_builtins_items_287 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
+  { (void *)"\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014"
+"\165\332\071\326"
+, (PRUint32)20 },
+  { (void *)"\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
+"\362\077\103"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_288 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Global Trustee", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155"
+"\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141"
+"\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006"
+"\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165"
+"\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107"
+"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060"
+"\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142"
+"\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160"
+"\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013"
+"\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060"
+"\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164"
+"\162\165\163\164\145\145"
+, (PRUint32)230 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
+"\070\057\260"
+, (PRUint32)19 },
+  { (void *)"\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000"
+"\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006"
+"\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006"
+"\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147"
+"\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107"
+"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060"
+"\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124"
+"\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023"
+"\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107"
+"\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156"
+"\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151"
+"\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023"
+"\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060"
+"\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001"
+"\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000"
+"\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266"
+"\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064"
+"\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235"
+"\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151"
+"\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013"
+"\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117"
+"\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330"
+"\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335"
+"\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164"
+"\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350"
+"\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164"
+"\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053"
+"\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250"
+"\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064"
+"\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315"
+"\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164"
+"\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232"
+"\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234"
+"\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225"
+"\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267"
+"\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026"
+"\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137"
+"\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157"
+"\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253"
+"\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301"
+"\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345"
+"\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030"
+"\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121"
+"\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156"
+"\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160"
+"\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214"
+"\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145"
+"\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006"
+"\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050"
+"\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035"
+"\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101"
+"\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006"
+"\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006"
+"\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125"
+"\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001"
+"\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035"
+"\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061"
+"\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005"
+"\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143"
+"\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103"
+"\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240"
+"\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056"
+"\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116"
+"\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167"
+"\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150"
+"\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157"
+"\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162"
+"\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060"
+"\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060"
+"\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164"
+"\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141"
+"\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164"
+"\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010"
+"\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057"
+"\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143"
+"\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147"
+"\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006"
+"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
+"\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305"
+"\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021"
+"\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011"
+"\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237"
+"\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306"
+"\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007"
+"\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201"
+"\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174"
+"\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240"
+"\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045"
+"\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346"
+"\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331"
+"\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215"
+"\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366"
+"\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265"
+"\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031"
+"\264"
+, (PRUint32)1761 }
+};
+static const NSSItem nss_builtins_items_289 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Global Trustee", (PRUint32)21 },
+  { (void *)"\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262"
+"\234\324\025\032"
+, (PRUint32)20 },
+  { (void *)"\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
+"\070\057\260"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_290 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus GMail", (PRUint32)12 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
+"\256\036"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004"
+"\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056"
+"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
+"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
+"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
+"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
+"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
+"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
+"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
+"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
+"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
+"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
+"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
+"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
+"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
+"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
+"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
+"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
+"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
+"\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
+"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006"
+"\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147"
+"\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155"
+"\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015"
+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001"
+"\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320"
+"\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336"
+"\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204"
+"\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300"
+"\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255"
+"\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023"
+"\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206"
+"\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342"
+"\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140"
+"\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211"
+"\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173"
+"\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135"
+"\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254"
+"\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305"
+"\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206"
+"\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247"
+"\111\043"
+, (PRUint32)1522 }
+};
+static const NSSItem nss_builtins_items_291 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus GMail", (PRUint32)12 },
+  { (void *)"\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044"
+"\223\003\017\227"
+, (PRUint32)20 },
+  { (void *)"\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
+"\256\036"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_292 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Google", (PRUint32)13 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
+"\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157"
+"\155"
+, (PRUint32)225 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
+"\130\174\006"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000"
+"\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056"
+"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
+"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
+"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
+"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
+"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
+"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
+"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
+"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
+"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
+"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
+"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
+"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
+"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
+"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
+"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
+"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
+"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
+"\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
+"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006"
+"\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157"
+"\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145"
+"\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001"
+"\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063"
+"\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027"
+"\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062"
+"\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260"
+"\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102"
+"\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302"
+"\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154"
+"\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065"
+"\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146"
+"\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126"
+"\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332"
+"\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155"
+"\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235"
+"\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061"
+"\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327"
+"\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363"
+"\172\244\047\023\326\117\364\151"
+, (PRUint32)1512 }
+};
+static const NSSItem nss_builtins_items_293 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Google", (PRUint32)13 },
+  { (void *)"\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101"
+"\100\105\146\026"
+, (PRUint32)20 },
+  { (void *)"\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
+"\130\174\006"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_294 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Skype", (PRUint32)12 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
+"\025\104\107"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
+"\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
+"\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206"
+"\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256"
+"\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040"
+"\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056"
+"\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121"
+"\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040"
+"\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377"
+"\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171"
+"\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210"
+"\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071"
+"\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047"
+"\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244"
+"\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155"
+"\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066"
+"\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100"
+"\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131"
+"\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000"
+"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
+"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
+"\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034"
+"\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017"
+"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
+"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
+"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
+"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
+"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
+"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
+"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
+"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
+"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
+"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
+"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
+"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
+"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
+"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
+"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
+"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
+"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
+"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
+"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
+"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
+"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
+"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
+"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
+"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
+"\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056"
+"\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132"
+"\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157"
+"\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172"
+"\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315"
+"\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345"
+"\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143"
+"\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153"
+"\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267"
+"\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255"
+"\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160"
+"\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116"
+"\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017"
+"\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225"
+"\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034"
+"\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224"
+"\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254"
+"\302\021\254"
+, (PRUint32)1523 }
+};
+static const NSSItem nss_builtins_items_295 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Skype", (PRUint32)12 },
+  { (void *)"\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045"
+"\004\372\043\311"
+, (PRUint32)20 },
+  { (void *)"\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
+"\025\104\107"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_296 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
+"\167\051\243"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
+"\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
+"\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075"
+"\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034"
+"\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243"
+"\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030"
+"\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041"
+"\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202"
+"\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161"
+"\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174"
+"\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302"
+"\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321"
+"\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337"
+"\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115"
+"\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072"
+"\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154"
+"\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245"
+"\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167"
+"\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000"
+"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
+"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
+"\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047"
+"\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017"
+"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
+"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
+"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
+"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
+"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
+"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
+"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
+"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
+"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
+"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
+"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
+"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
+"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
+"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
+"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
+"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
+"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
+"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
+"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
+"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
+"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
+"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
+"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
+"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056"
+"\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125"
+"\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310"
+"\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135"
+"\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326"
+"\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037"
+"\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120"
+"\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112"
+"\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210"
+"\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150"
+"\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326"
+"\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252"
+"\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111"
+"\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375"
+"\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007"
+"\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373"
+"\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325"
+"\147\024\060"
+, (PRUint32)1523 }
+};
+static const NSSItem nss_builtins_items_297 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
+  { (void *)"\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307"
+"\153\333\167\320"
+, (PRUint32)20 },
+  { (void *)"\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
+"\167\051\243"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_298 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
+"\302\051"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071"
+"\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
+"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
+"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
+"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
+"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
+"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
+"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
+"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
+"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
+"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
+"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
+"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
+"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
+"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
+"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
+"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
+"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
+"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
+"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
+"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
+"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341"
+"\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027"
+"\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371"
+"\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302"
+"\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254"
+"\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056"
+"\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161"
+"\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132"
+"\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122"
+"\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107"
+"\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143"
+"\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016"
+"\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105"
+"\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067"
+"\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264"
+"\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213"
+"\217\116\235\306\066\347\134\246\253\022\017\326\317"
+, (PRUint32)1501 }
+};
+static const NSSItem nss_builtins_items_299 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
+  { (void *)"\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317"
+"\112\134\263\255"
+, (PRUint32)20 },
+  { (void *)"\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
+"\302\051"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_300 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
+"\052\161"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076"
+"\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
+"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
+"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
+"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
+"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
+"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
+"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
+"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
+"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
+"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
+"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
+"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
+"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
+"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
+"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
+"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
+"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
+"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
+"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
+"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
+"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230"
+"\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116"
+"\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316"
+"\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060"
+"\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240"
+"\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272"
+"\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276"
+"\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307"
+"\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066"
+"\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152"
+"\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176"
+"\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325"
+"\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265"
+"\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146"
+"\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105"
+"\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003"
+"\130\113\161\203\237\146\346\254\171\110\376\376\107"
+, (PRUint32)1501 }
+};
+static const NSSItem nss_builtins_items_301 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
+  { (void *)"\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236"
+"\007\326\224\317"
+, (PRUint32)20 },
+  { (void *)"\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
+"\052\161"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_302 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus live.com", (PRUint32)15 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
+"\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157"
+"\155"
+, (PRUint32)225 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
+"\275\072\300"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000"
+"\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151"
+"\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357"
+"\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230"
+"\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323"
+"\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076"
+"\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005"
+"\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264"
+"\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053"
+"\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041"
+"\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252"
+"\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045"
+"\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125"
+"\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303"
+"\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127"
+"\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271"
+"\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160"
+"\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146"
+"\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001"
+"\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003"
+"\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006"
+"\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056"
+"\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157"
+"\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332"
+"\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257"
+"\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311"
+"\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137"
+"\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052"
+"\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254"
+"\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122"
+"\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015"
+"\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047"
+"\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177"
+"\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025"
+"\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002"
+"\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067"
+"\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364"
+"\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177"
+"\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
+, (PRUint32)1520 }
+};
+static const NSSItem nss_builtins_items_303 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus live.com", (PRUint32)15 },
+  { (void *)"\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024"
+"\160\212\262\276"
+, (PRUint32)20 },
+  { (void *)"\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
+"\275\072\300"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_304 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus kuix.de", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105"
+"\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065"
+"\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040"
+"\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011"
+"\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125"
+"\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061"
+"\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156"
+"\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106"
+"\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157"
+"\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004"
+"\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131"
+"\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101"
+"\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013"
+"\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123"
+"\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151"
+"\170\056\144\145"
+, (PRUint32)244 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
+"\350\260"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162"
+"\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061"
+"\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006"
+"\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004"
+"\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004"
+"\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060"
+"\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164"
+"\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164"
+"\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012"
+"\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040"
+"\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151"
+"\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171"
+"\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040"
+"\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101"
+"\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061"
+"\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157"
+"\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003"
+"\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
+"\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007"
+"\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123"
+"\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354"
+"\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337"
+"\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115"
+"\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224"
+"\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262"
+"\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271"
+"\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202"
+"\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060"
+"\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325"
+"\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026"
+"\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346"
+"\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377"
+"\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006"
+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
+"\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073"
+"\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053"
+"\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164"
+"\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155"
+"\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125"
+"\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164"
+"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143"
+"\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151"
+"\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154"
+"\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143"
+"\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124"
+"\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144"
+"\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005"
+"\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005"
+"\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124"
+"\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103"
+"\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060"
+"\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143"
+"\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125"
+"\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202"
+"\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222"
+"\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124"
+"\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311"
+"\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200"
+"\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056"
+"\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164"
+"\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366"
+"\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312"
+"\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213"
+"\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071"
+"\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160"
+"\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231"
+"\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226"
+"\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346"
+"\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260"
+"\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
+, (PRUint32)1392 }
+};
+static const NSSItem nss_builtins_items_305 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus kuix.de", (PRUint32)14 },
+  { (void *)"\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171"
+"\262\144\040\100"
+, (PRUint32)20 },
+  { (void *)"\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
+"\350\260"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_306 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023"
+"\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156"
+"\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040"
+"\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
+"\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060"
+"\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063"
+"\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007"
+"\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007"
+"\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030"
+"\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143"
+"\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004"
+"\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010"
+"\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203"
+"\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366"
+"\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116"
+"\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007"
+"\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215"
+"\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336"
+"\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062"
+"\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262"
+"\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353"
+"\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141"
+"\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051"
+"\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200"
+"\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221"
+"\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333"
+"\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033"
+"\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000"
+"\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004"
+"\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040"
+"\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001"
+"\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227"
+"\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145"
+"\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214"
+"\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256"
+"\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053"
+"\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337"
+"\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353"
+"\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355"
+"\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072"
+"\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350"
+"\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333"
+"\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075"
+"\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316"
+"\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006"
+"\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324"
+"\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210"
+"\342\342\104\276\134\367\352\034\365"
+, (PRUint32)969 }
+};
+static const NSSItem nss_builtins_items_307 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
+  { (void *)"\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302"
+"\124\375\346\213"
+, (PRUint32)20 },
+  { (void *)"\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_308 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
+"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
+"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060"
+"\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154"
+"\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141"
+"\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107"
+"\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060"
+"\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071"
+"\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125"
+"\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172"
+"\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143"
+"\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004"
+"\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143"
+"\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061"
+"\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151"
+"\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151"
+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055"
+"\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367"
+"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002"
+"\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133"
+"\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327"
+"\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040"
+"\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334"
+"\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133"
+"\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165"
+"\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161"
+"\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363"
+"\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315"
+"\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202"
+"\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373"
+"\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115"
+"\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244"
+"\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134"
+"\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164"
+"\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303"
+"\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006"
+"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016"
+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035"
+"\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060"
+"\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006"
+"\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001"
+"\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071"
+"\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324"
+"\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321"
+"\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147"
+"\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267"
+"\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323"
+"\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175"
+"\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340"
+"\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040"
+"\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316"
+"\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312"
+"\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011"
+"\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042"
+"\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365"
+"\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045"
+"\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151"
+"\364"
+, (PRUint32)993 }
+};
+static const NSSItem nss_builtins_items_309 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
+  { (void *)"\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071"
+"\324\347\017\016"
+, (PRUint32)20 },
+  { (void *)"\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226"
+, (PRUint32)16 },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_310 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
+"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
+"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060"
+"\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154"
+"\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040"
+"\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150"
+"\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071"
+"\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061"
+"\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060"
+"\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003"
+"\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021"
+"\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154"
+"\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162"
+"\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151"
+"\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004"
+"\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162"
+"\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
+"\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110"
+"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
+"\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276"
+"\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051"
+"\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136"
+"\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033"
+"\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266"
+"\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035"
+"\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203"
+"\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112"
+"\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256"
+"\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314"
+"\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336"
+"\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015"
+"\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105"
+"\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144"
+"\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237"
+"\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205"
+"\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060"
+"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377"
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
+"\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252"
+"\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060"
+"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202"
+"\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010"
+"\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055"
+"\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336"
+"\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301"
+"\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052"
+"\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056"
+"\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163"
+"\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320"
+"\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047"
+"\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035"
+"\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372"
+"\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046"
+"\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247"
+"\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060"
+"\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250"
+"\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215"
+"\261\050\272"
+, (PRUint32)1011 }
+};
+static const NSSItem nss_builtins_items_311 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
+  { (void *)"\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143"
+"\350\045\157\077"
+, (PRUint32)20 },
+  { (void *)"\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242"
+, (PRUint32)16 },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_312 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"\002\010\167\167\006\047\046\251\261\174"
+, (PRUint32)10 },
+  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167"
+"\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367"
+"\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
+"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
+"\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015"
+"\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063"
+"\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013"
+"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
+"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
+"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
+"\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151"
+"\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037"
+"\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303"
+"\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217"
+"\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065"
+"\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137"
+"\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053"
+"\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107"
+"\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326"
+"\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013"
+"\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005"
+"\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002"
+"\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265"
+"\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201"
+"\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120"
+"\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253"
+"\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334"
+"\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003"
+"\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077"
+"\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
+"\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000"
+"\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051"
+"\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006"
+"\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052"
+"\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324"
+"\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143"
+"\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045"
+"\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073"
+"\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355"
+"\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362"
+"\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302"
+"\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140"
+"\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162"
+"\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111"
+"\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002"
+"\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236"
+"\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
+, (PRUint32)848 }
+};
+static const NSSItem nss_builtins_items_313 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
+  { (void *)"\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054"
+"\307\262\170\267"
+, (PRUint32)20 },
+  { (void *)"\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267"
+, (PRUint32)16 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"\002\010\167\167\006\047\046\251\261\174"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_314 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Networking", (PRUint32)23 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"\002\010\174\117\004\071\034\324\231\055"
+, (PRUint32)10 },
+  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174"
+"\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367"
+"\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
+"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
+"\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015"
+"\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063"
+"\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013"
+"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
+"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
+"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
+"\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151"
+"\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240"
+"\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217"
+"\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362"
+"\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063"
+"\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241"
+"\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232"
+"\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253"
+"\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324"
+"\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113"
+"\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374"
+"\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275"
+"\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051"
+"\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024"
+"\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012"
+"\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106"
+"\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026"
+"\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003"
+"\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242"
+"\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264"
+"\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316"
+"\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116"
+"\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321"
+"\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356"
+"\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144"
+"\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145"
+"\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131"
+"\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025"
+"\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110"
+"\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056"
+"\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313"
+"\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221"
+"\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074"
+"\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064"
+"\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
+, (PRUint32)848 }
+};
+static const NSSItem nss_builtins_items_315 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Networking", (PRUint32)23 },
+  { (void *)"\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220"
+"\237\105\000\057"
+, (PRUint32)20 },
+  { (void *)"\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177"
+, (PRUint32)16 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"\002\010\174\117\004\071\034\324\231\055"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_316 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium", (PRUint32)20 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"\002\010\155\214\024\106\261\246\012\356"
+, (PRUint32)10 },
+  { (void *)"\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155"
+"\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367"
+"\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006"
+"\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163"
+"\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060"
+"\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062"
+"\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004"
+"\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034"
+"\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124"
+"\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042"
+"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003"
+"\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337"
+"\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232"
+"\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347"
+"\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020"
+"\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221"
+"\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013"
+"\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331"
+"\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047"
+"\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055"
+"\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322"
+"\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373"
+"\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273"
+"\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271"
+"\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167"
+"\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265"
+"\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173"
+"\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050"
+"\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076"
+"\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206"
+"\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043"
+"\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003"
+"\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222"
+"\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270"
+"\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225"
+"\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322"
+"\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000"
+"\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013"
+"\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032"
+"\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173"
+"\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270"
+"\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327"
+"\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273"
+"\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001"
+"\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004"
+"\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021"
+"\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015"
+"\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116"
+"\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166"
+"\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104"
+"\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101"
+"\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040"
+"\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254"
+"\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365"
+"\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101"
+"\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142"
+"\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262"
+"\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320"
+"\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070"
+"\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010"
+"\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234"
+"\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000"
+"\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175"
+"\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320"
+"\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106"
+"\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057"
+"\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005"
+"\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103"
+"\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112"
+"\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107"
+"\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110"
+"\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344"
+"\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274"
+"\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303"
+"\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027"
+"\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216"
+"\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317"
+"\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052"
+"\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236"
+"\051\340\266\270\011\150\031\034\030\103"
+, (PRUint32)1354 }
+};
+static const NSSItem nss_builtins_items_317 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium", (PRUint32)20 },
+  { (void *)"\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145"
+"\046\062\050\047"
+, (PRUint32)20 },
+  { (void *)"\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127"
+, (PRUint32)16 },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"\002\010\155\214\024\106\261\246\012\356"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_318 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"\002\010\164\227\045\212\307\077\172\124"
+, (PRUint32)10 },
+  { (void *)"\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164"
+"\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075"
+"\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146"
+"\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004"
+"\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120"
+"\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060"
+"\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061"
+"\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125"
+"\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061"
+"\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155"
+"\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103"
+"\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005"
+"\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003"
+"\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234"
+"\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350"
+"\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275"
+"\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117"
+"\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170"
+"\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006"
+"\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065"
+"\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003"
+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006"
+"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006"
+"\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060"
+"\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154"
+"\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306"
+"\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161"
+"\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210"
+"\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131"
+"\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002"
+"\214\171"
+, (PRUint32)514 }
+};
+static const NSSItem nss_builtins_items_319 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
+  { (void *)"\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312"
+"\353\377\303\273"
+, (PRUint32)20 },
+  { (void *)"\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115"
+, (PRUint32)16 },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"\002\010\164\227\045\212\307\077\172\124"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_320 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"\002\003\004\104\300"
+, (PRUint32)5 },
+  { (void *)"\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004"
+"\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005"
+"\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
+"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
+"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
+"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
+"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
+"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
+"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
+"\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063"
+"\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067"
+"\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
+"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
+"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
+"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
+"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
+"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
+"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
+"\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001"
+"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001"
+"\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001"
+"\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307"
+"\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227"
+"\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074"
+"\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314"
+"\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253"
+"\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060"
+"\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124"
+"\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256"
+"\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121"
+"\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314"
+"\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227"
+"\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333"
+"\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061"
+"\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151"
+"\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251"
+"\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003"
+"\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305"
+"\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125"
+"\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246"
+"\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162"
+"\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271"
+"\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067"
+"\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313"
+"\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201"
+"\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055"
+"\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274"
+"\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061"
+"\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076"
+"\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230"
+"\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132"
+"\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130"
+"\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110"
+"\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232"
+"\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106"
+"\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
+, (PRUint32)959 }
+};
+static const NSSItem nss_builtins_items_321 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
+  { (void *)"\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031"
+"\247\017\006\236"
+, (PRUint32)20 },
+  { (void *)"\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170"
+, (PRUint32)16 },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"\002\003\004\104\300"
+, (PRUint32)5 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
 
 builtinsInternalObject
 nss_builtins_data[] = {
@@ -21308,11 +21667,21 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
   { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
   { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },
-  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} }
+  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
+  { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
+  { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} },
+  { 11, nss_builtins_types_314, nss_builtins_items_314, {NULL} },
+  { 13, nss_builtins_types_315, nss_builtins_items_315, {NULL} },
+  { 11, nss_builtins_types_316, nss_builtins_items_316, {NULL} },
+  { 13, nss_builtins_types_317, nss_builtins_items_317, {NULL} },
+  { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
+  { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
+  { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
+  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 311+1;
+  nss_builtins_nObjects = 321+1;
 #else
-  nss_builtins_nObjects = 311;
+  nss_builtins_nObjects = 321;
 #endif /* DEBUG */
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 4694e7740ade..42e674b6c24f 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.6 $ $Date: 2010/12/02 23:26:35 $"
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.9 $ $Date: 2011/04/06 23:59:09 $"
 
 #
 # certdata.txt
@@ -207,143 +207,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Thawte Personal Freemail CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Personal Freemail CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003
-\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163
-\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023
-\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123
-\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156
-\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164
-\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155
-\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206
-\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055
-\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056
-\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060
-\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071
-\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023
-\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145
-\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003
-\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032
-\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040
-\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124
-\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106
-\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011
-\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157
-\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141
-\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211
-\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330
-\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337
-\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176
-\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104
-\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170
-\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156
-\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152
-\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345
-\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006
-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015
-\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
-\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115
-\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317
-\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144
-\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254
-\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232
-\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163
-\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246
-\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242
-\201
-END
-
-# Trust for Certificate "Thawte Personal Freemail CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Personal Freemail CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207
-\244\353\000\205
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Thawte Server CA"
 #
@@ -3151,168 +3014,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Entrust.net Secure Personal CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\003\221\356
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070
-\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
-\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036
-\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027
-\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201
-\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024
-\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164
-\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167
-\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103
-\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120
-\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146
-\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045
-\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071
-\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151
-\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052
-\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145
-\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000
-\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047
-\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150
-\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107
-\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226
-\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261
-\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164
-\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126
-\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346
-\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202
-\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004
-\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202
-\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244
-\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
-\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
-\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240
-\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056
-\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057
-\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125
-\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062
-\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061
-\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004
-\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026
-\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312
-\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004
-\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231
-\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003
-\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000
-\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015
-\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
-\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273
-\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002
-\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007
-\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363
-\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070
-\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003
-\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332
-\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134
-\354
-END
-
-# Trust for Certificate "Entrust.net Secure Personal CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125
-\262\371\365\200
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\003\221\356
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Entrust.net Premium 2048 Secure Server CA"
 #
@@ -4419,424 +4120,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Thawte Time Stamping CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Time Stamping CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023
-\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015
-\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060
-\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035
-\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027
-\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015
-\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213
-\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060
-\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040
-\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104
-\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003
-\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006
-\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003
-\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145
-\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123
-\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047
-\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237
-\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032
-\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376
-\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235
-\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213
-\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137
-\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060
-\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
-\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005
-\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067
-\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302
-\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357
-\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333
-\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220
-\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354
-\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003
-\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031
-\011\254\211\111\323
-END
-
-# Trust for Certificate "Thawte Time Stamping CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Time Stamping CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105
-\010\116\326\126
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Entrust.net Global Secure Server CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\233\021\074
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070
-\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013
-\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006
-\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163
-\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156
-\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154
-\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043
-\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040
-\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151
-\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156
-\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145
-\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060
-\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132
-\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060
-\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004
-\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162
-\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151
-\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125
-\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164
-\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144
-\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165
-\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145
-\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
-\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316
-\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265
-\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236
-\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201
-\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113
-\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002
-\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266
-\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332
-\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202
-\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370
-\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035
-\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317
-\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023
-\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075
-\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165
-\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151
-\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
-\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
-\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
-\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105
-\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162
-\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060
-\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060
-\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062
-\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003
-\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043
-\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042
-\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035
-\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234
-\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023
-\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366
-\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064
-\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015
-\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232
-\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251
-\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337
-\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205
-\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021
-\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154
-\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124
-\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274
-\005\377\154\211\063\360\354\025\017
-END
-
-# Trust for Certificate "Entrust.net Global Secure Server CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366
-\045\072\110\223
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\233\021\074
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Entrust.net Global Secure Personal CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\236\366\344
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070
-\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013
-\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006
-\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163
-\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151
-\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
-\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
-\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
-\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105
-\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060
-\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062
-\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022
-\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156
-\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167
-\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103
-\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151
-\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050
-\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056
-\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006
-\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145
-\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
-\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264
-\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162
-\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255
-\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124
-\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064
-\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045
-\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374
-\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047
-\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001
-\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206
-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335
-\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201
-\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003
-\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164
-\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145
-\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142
-\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
-\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006
-\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062
-\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060
-\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035
-\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030
-\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067
-\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004
-\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105
-\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005
-\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007
-\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060
-\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001
-\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016
-\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022
-\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024
-\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276
-\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277
-\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172
-\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103
-\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235
-\316\145\146\227\256\046\136
-END
-
-# Trust for Certificate "Entrust.net Global Secure Personal CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266
-\266\360\277\163
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\236\366\344
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Entrust Root Certification Authority"
 #
@@ -4990,304 +4273,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "AOL Time Warner Root Certification Authority 1"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
-\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
-\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
-\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
-\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060
-\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065
-\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
-\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
-\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
-\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
-\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
-\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303
-\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224
-\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204
-\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027
-\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110
-\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141
-\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226
-\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037
-\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266
-\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217
-\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205
-\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070
-\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216
-\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241
-\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356
-\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267
-\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000
-\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
-\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330
-\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026
-\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310
-\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
-\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263
-\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247
-\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037
-\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122
-\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323
-\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017
-\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362
-\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005
-\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007
-\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247
-\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227
-\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213
-\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120
-\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026
-\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325
-\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260
-\071\050\150\016\163\335\045\232\336\022
-END
-
-# Trust for Certificate "AOL Time Warner Root Certification Authority 1"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026
-\373\041\026\111
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AOL Time Warner Root Certification Authority 2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
-\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
-\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
-\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
-\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060
-\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063
-\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
-\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
-\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
-\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
-\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
-\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010
-\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211
-\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115
-\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044
-\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133
-\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235
-\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127
-\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230
-\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374
-\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136
-\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231
-\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111
-\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206
-\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352
-\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256
-\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165
-\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361
-\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352
-\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116
-\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363
-\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303
-\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320
-\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141
-\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372
-\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242
-\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322
-\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143
-\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224
-\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014
-\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277
-\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332
-\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056
-\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000
-\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
-\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325
-\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026
-\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116
-\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
-\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056
-\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022
-\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307
-\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117
-\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066
-\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104
-\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352
-\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275
-\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022
-\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223
-\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060
-\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100
-\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277
-\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346
-\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145
-\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201
-\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212
-\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045
-\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020
-\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316
-\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234
-\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116
-\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261
-\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027
-\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223
-\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234
-\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056
-\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007
-\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207
-\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025
-\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371
-\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274
-\204\327\372\334\162\133\367\301\072\150
-END
-
-# Trust for Certificate "AOL Time Warner Root Certification Authority 2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272
-\204\254\010\172
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "RSA Security 2048 v3"
 #
@@ -7247,1361 +6232,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "IPS Chained CAs root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Chained CAs root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
-\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
-\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
-\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
-\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132
-\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060
-\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
-\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
-\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
-\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
-\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111
-\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061
-\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065
-\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201
-\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067
-\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062
-\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301
-\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350
-\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000
-\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016
-\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064
-\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035
-\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371
-\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241
-\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060
-\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103
-\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123
-\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035
-\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004
-\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060
-\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006
-\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005
-\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006
-\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001
-\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067
-\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001
-\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060
-\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151
-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102
-\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103
-\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146
-\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040
-\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
-\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004
-\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006
-\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164
-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
-\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103
-\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370
-\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167
-\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
-\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150
-\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001
-\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060
-\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050
-\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
-\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171
-\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004
-\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056
-\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126
-\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053
-\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006
-\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315
-\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343
-\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243
-\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315
-\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242
-\001\177\046\304\143\365\045\102\136\142\275
-END
-
-# Trust for Certificate "IPS Chained CAs root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Chained CAs root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256
-\347\137\322\127
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASE1 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE1 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
-\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
-\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
-\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060
-\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125
-\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
-\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
-\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
-\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
-\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
-\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
-\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
-\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
-\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
-\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
-\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
-\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321
-\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022
-\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152
-\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165
-\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122
-\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161
-\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074
-\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020
-\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004
-\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
-\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233
-\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001
-\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254
-\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244
-\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
-\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
-\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
-\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
-\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
-\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
-\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
-\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
-\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
-\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
-\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
-\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
-\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
-\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
-\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
-\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
-\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
-\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
-\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
-\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
-\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
-\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
-\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
-\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151
-\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
-\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
-\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
-\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
-\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
-\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206
-\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
-\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140
-\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
-\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
-\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
-\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110
-\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061
-\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
-\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
-\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056
-\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006
-\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
-\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
-\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320
-\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212
-\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305
-\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167
-\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143
-\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334
-\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105
-\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276
-\206\063\076\346\057\110\156\257\124\220\116\255\261\045
-END
-
-# Trust for Certificate "IPS CLASE1 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE1 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061
-\174\345\364\337
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASE3 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE3 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
-\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
-\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
-\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061
-\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125
-\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
-\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
-\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
-\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
-\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
-\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
-\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
-\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
-\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
-\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
-\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
-\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033
-\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331
-\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052
-\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213
-\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230
-\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055
-\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043
-\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153
-\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004
-\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
-\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243
-\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001
-\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242
-\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244
-\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
-\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
-\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
-\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
-\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
-\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
-\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
-\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
-\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
-\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
-\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
-\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
-\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
-\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
-\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
-\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
-\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
-\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
-\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
-\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
-\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
-\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
-\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
-\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151
-\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
-\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
-\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
-\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
-\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
-\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206
-\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
-\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140
-\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
-\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
-\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
-\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110
-\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063
-\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
-\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
-\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056
-\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006
-\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
-\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
-\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145
-\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103
-\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342
-\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227
-\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275
-\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247
-\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026
-\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262
-\257\175\310\352\351\324\126\331\016\023\262\305\105\120
-END
-
-# Trust for Certificate "IPS CLASE3 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE3 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365
-\015\317\161\134
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASEA1 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA1 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
-\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
-\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067
-\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334
-\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374
-\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320
-\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122
-\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035
-\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306
-\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236
-\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174
-\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000
-\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
-\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073
-\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035
-\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241
-\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241
-\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
-\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
-\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
-\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
-\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
-\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
-\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
-\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
-\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
-\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
-\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
-\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
-\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103
-\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
-\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
-\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
-\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143
-\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
-\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
-\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150
-\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
-\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164
-\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
-\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
-\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154
-\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
-\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
-\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060
-\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
-\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
-\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200
-\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312
-\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304
-\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205
-\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304
-\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347
-\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213
-\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120
-\336\007\043\162\346\275\040\024\113\264\206
-END
-
-# Trust for Certificate "IPS CLASEA1 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA1 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032
-\353\214\062\004
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASEA3 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA3 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
-\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
-\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067
-\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366
-\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315
-\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202
-\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153
-\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324
-\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232
-\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165
-\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347
-\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000
-\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
-\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374
-\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035
-\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107
-\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241
-\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
-\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
-\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
-\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
-\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
-\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
-\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
-\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
-\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
-\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
-\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
-\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
-\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103
-\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
-\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
-\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
-\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143
-\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
-\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
-\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150
-\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
-\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164
-\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
-\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
-\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154
-\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
-\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
-\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060
-\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
-\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
-\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032
-\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374
-\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012
-\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010
-\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306
-\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044
-\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022
-\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265
-\311\024\025\014\343\007\203\233\046\165\357
-END
-
-# Trust for Certificate "IPS CLASEA3 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA3 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342
-\101\104\276\156
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS Timestamping root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Timestamping root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053
-\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160
-\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006
-\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155
-\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146
-\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164
-\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001
-\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145
-\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061
-\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070
-\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002
-\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162
-\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023
-\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003
-\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145
-\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162
-\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003
-\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066
-\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013
-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
-\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060
-\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001
-\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000
-\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215
-\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257
-\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070
-\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161
-\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265
-\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130
-\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233
-\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243
-\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006
-\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235
-\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120
-\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213
-\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077
-\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061
-\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020
-\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141
-\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145
-\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111
-\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154
-\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040
-\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151
-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103
-\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065
-\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040
-\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003
-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
-\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060
-\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160
-\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000
-\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014
-\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003
-\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003
-\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001
-\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006
-\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001
-\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001
-\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053
-\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110
-\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003
-\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001
-\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156
-\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145
-\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006
-\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164
-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
-\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001
-\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057
-\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060
-\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164
-\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206
-\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124
-\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154
-\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065
-\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163
-\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145
-\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056
-\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102
-\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151
-\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170
-\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163
-\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240
-\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143
-\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
-\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155
-\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005
-\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005
-\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163
-\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110
-\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314
-\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203
-\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067
-\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077
-\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114
-\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210
-\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001
-\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324
-\207\112\137\334\357\351\126\360\012\014\350\165
-END
-
-# Trust for Certificate "IPS Timestamping root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Timestamping root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313
-\361\266\304\322
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "QuoVadis Root CA"
 #
@@ -21636,3 +19266,2751 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Mozilla Addons"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Mozilla Addons"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004
+\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154
+\141\056\157\162\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
+\362\077\103
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000
+\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157
+\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202
+\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253
+\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262
+\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241
+\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271
+\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307
+\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070
+\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262
+\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221
+\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033
+\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351
+\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316
+\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235
+\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345
+\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133
+\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100
+\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214
+\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002
+\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003
+\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230
+\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006
+\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160
+\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003
+\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035
+\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006
+\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040
+\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001
+\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007
+\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165
+\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120
+\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066
+\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143
+\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055
+\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141
+\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164
+\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056
+\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161
+\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073
+\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160
+\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056
+\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123
+\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053
+\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057
+\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157
+\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144
+\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147
+\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172
+\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025
+\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276
+\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317
+\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111
+\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204
+\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163
+\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335
+\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043
+\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231
+\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312
+\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005
+\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142
+\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043
+\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236
+\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055
+\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171
+\242\355\264\324\265\145\103\267\223\106\212\323
+END
+
+# Trust for Certificate "Bogus Mozilla Addons"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Mozilla Addons"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014
+\165\332\071\326
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
+\362\077\103
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Global Trustee"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Global Trustee"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155
+\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141
+\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006
+\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165
+\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107
+\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060
+\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142
+\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160
+\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013
+\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060
+\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164
+\162\165\163\164\145\145
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
+\070\057\260
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000
+\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006
+\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006
+\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147
+\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107
+\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060
+\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124
+\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023
+\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107
+\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156
+\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151
+\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023
+\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060
+\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001
+\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000
+\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266
+\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064
+\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235
+\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151
+\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013
+\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117
+\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330
+\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335
+\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164
+\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350
+\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164
+\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053
+\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250
+\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064
+\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315
+\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164
+\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232
+\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234
+\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225
+\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267
+\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026
+\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137
+\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157
+\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253
+\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301
+\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345
+\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030
+\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121
+\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156
+\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160
+\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214
+\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145
+\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006
+\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050
+\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035
+\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101
+\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006
+\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006
+\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125
+\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001
+\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035
+\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061
+\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005
+\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143
+\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103
+\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240
+\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056
+\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116
+\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167
+\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150
+\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157
+\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162
+\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060
+\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060
+\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164
+\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141
+\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164
+\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010
+\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057
+\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143
+\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147
+\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006
+\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
+\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305
+\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021
+\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011
+\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237
+\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306
+\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007
+\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201
+\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174
+\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240
+\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045
+\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346
+\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331
+\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215
+\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366
+\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265
+\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031
+\264
+END
+
+# Trust for Certificate "Bogus Global Trustee"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Global Trustee"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262
+\234\324\025\032
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
+\070\057\260
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus GMail"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus GMail"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
+\256\036
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004
+\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056
+\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
+\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
+\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
+\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
+\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
+\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
+\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
+\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
+\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
+\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
+\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
+\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
+\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
+\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
+\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
+\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
+\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
+\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
+\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006
+\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147
+\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155
+\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001
+\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320
+\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336
+\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204
+\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300
+\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255
+\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023
+\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206
+\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342
+\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140
+\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211
+\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173
+\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135
+\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254
+\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305
+\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206
+\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247
+\111\043
+END
+
+# Trust for Certificate "Bogus GMail"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus GMail"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044
+\223\003\017\227
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
+\256\036
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Google"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Google"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
+\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157
+\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
+\130\174\006
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000
+\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056
+\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
+\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
+\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
+\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
+\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
+\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
+\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
+\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
+\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
+\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
+\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
+\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
+\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
+\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
+\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
+\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
+\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
+\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
+\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006
+\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157
+\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145
+\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001
+\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063
+\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027
+\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062
+\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260
+\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102
+\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302
+\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154
+\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065
+\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146
+\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126
+\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332
+\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155
+\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235
+\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061
+\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327
+\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363
+\172\244\047\023\326\117\364\151
+END
+
+# Trust for Certificate "Bogus Google"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Google"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101
+\100\105\146\026
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
+\130\174\006
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Skype"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Skype"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
+\025\104\107
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
+\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
+\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206
+\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256
+\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040
+\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056
+\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121
+\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040
+\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377
+\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171
+\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210
+\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071
+\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047
+\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244
+\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155
+\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066
+\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100
+\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131
+\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000
+\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
+\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
+\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
+\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034
+\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
+\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
+\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
+\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
+\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
+\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
+\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
+\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
+\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
+\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
+\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
+\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
+\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
+\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
+\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
+\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
+\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
+\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
+\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
+\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
+\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
+\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
+\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
+\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
+\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056
+\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132
+\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157
+\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172
+\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315
+\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345
+\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143
+\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153
+\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267
+\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255
+\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160
+\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116
+\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017
+\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225
+\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034
+\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224
+\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254
+\302\021\254
+END
+
+# Trust for Certificate "Bogus Skype"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Skype"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045
+\004\372\043\311
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
+\025\104\107
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 1"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
+\167\051\243
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
+\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
+\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075
+\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034
+\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243
+\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030
+\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041
+\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202
+\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161
+\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174
+\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302
+\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321
+\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337
+\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115
+\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072
+\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154
+\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245
+\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167
+\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000
+\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
+\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
+\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
+\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047
+\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
+\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
+\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
+\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
+\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
+\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
+\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
+\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
+\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
+\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
+\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
+\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
+\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
+\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
+\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
+\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
+\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
+\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
+\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
+\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
+\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
+\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
+\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
+\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056
+\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125
+\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310
+\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135
+\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326
+\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037
+\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120
+\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112
+\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210
+\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150
+\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326
+\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252
+\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111
+\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375
+\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007
+\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373
+\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325
+\147\024\060
+END
+
+# Trust for Certificate "Bogus Yahoo 1"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307
+\153\333\167\320
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
+\167\051\243
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
+\302\051
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071
+\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
+\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
+\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
+\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
+\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
+\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
+\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
+\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
+\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
+\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
+\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
+\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
+\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
+\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
+\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
+\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
+\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
+\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
+\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
+\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
+\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341
+\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027
+\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371
+\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302
+\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254
+\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056
+\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161
+\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132
+\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122
+\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107
+\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143
+\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016
+\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105
+\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067
+\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264
+\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213
+\217\116\235\306\066\347\134\246\253\022\017\326\317
+END
+
+# Trust for Certificate "Bogus Yahoo 2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317
+\112\134\263\255
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
+\302\051
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 3"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 3"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
+\052\161
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076
+\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
+\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
+\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
+\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
+\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
+\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
+\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
+\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
+\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
+\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
+\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
+\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
+\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
+\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
+\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
+\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
+\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
+\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
+\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
+\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
+\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230
+\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116
+\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316
+\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060
+\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240
+\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272
+\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276
+\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307
+\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066
+\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152
+\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176
+\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325
+\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265
+\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146
+\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105
+\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003
+\130\113\161\203\237\146\346\254\171\110\376\376\107
+END
+
+# Trust for Certificate "Bogus Yahoo 3"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 3"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236
+\007\326\224\317
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
+\052\161
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus live.com"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus live.com"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
+\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157
+\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
+\275\072\300
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000
+\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151
+\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357
+\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230
+\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323
+\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076
+\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005
+\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264
+\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053
+\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041
+\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252
+\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045
+\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125
+\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303
+\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127
+\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271
+\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160
+\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146
+\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001
+\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003
+\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006
+\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056
+\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157
+\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332
+\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257
+\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311
+\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137
+\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052
+\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254
+\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122
+\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015
+\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047
+\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177
+\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025
+\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002
+\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067
+\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364
+\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177
+\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352
+END
+
+# Trust for Certificate "Bogus live.com"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus live.com"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024
+\160\212\262\276
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
+\275\072\300
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus kuix.de"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus kuix.de"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105
+\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065
+\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040
+\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011
+\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125
+\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061
+\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156
+\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106
+\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157
+\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004
+\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131
+\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101
+\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013
+\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123
+\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151
+\170\056\144\145
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
+\350\260
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162
+\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061
+\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006
+\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004
+\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004
+\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060
+\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164
+\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164
+\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012
+\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040
+\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151
+\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171
+\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040
+\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101
+\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061
+\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157
+\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003
+\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
+\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007
+\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123
+\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354
+\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337
+\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115
+\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224
+\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262
+\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271
+\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202
+\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060
+\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325
+\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026
+\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346
+\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377
+\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006
+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
+\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073
+\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053
+\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164
+\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155
+\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125
+\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164
+\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143
+\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151
+\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154
+\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143
+\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124
+\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144
+\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005
+\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005
+\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164
+\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124
+\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103
+\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060
+\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143
+\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125
+\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202
+\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222
+\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124
+\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311
+\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200
+\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056
+\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164
+\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366
+\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312
+\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213
+\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071
+\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160
+\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231
+\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226
+\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346
+\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260
+\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221
+END
+
+# Trust for Certificate "Bogus kuix.de"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus kuix.de"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171
+\262\144\040\100
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
+\350\260
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Go Daddy Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023
+\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156
+\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040
+\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151
+\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
+\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060
+\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063
+\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007
+\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007
+\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030
+\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143
+\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004
+\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010
+\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203
+\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366
+\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116
+\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007
+\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215
+\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336
+\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062
+\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262
+\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353
+\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141
+\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051
+\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200
+\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221
+\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333
+\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033
+\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000
+\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004
+\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040
+\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227
+\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145
+\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214
+\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256
+\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053
+\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337
+\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353
+\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355
+\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072
+\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350
+\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333
+\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075
+\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316
+\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006
+\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324
+\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210
+\342\342\104\276\134\367\352\034\365
+END
+
+# Trust for Certificate "Go Daddy Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302
+\124\375\346\213
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Starfield Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
+\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
+\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060
+\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154
+\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
+\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107
+\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060
+\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071
+\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125
+\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172
+\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143
+\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004
+\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143
+\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061
+\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151
+\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151
+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055
+\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133
+\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327
+\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040
+\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334
+\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133
+\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165
+\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161
+\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363
+\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315
+\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202
+\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373
+\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115
+\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244
+\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134
+\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164
+\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303
+\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006
+\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016
+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035
+\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060
+\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006
+\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001
+\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071
+\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324
+\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321
+\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147
+\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267
+\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323
+\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175
+\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340
+\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040
+\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316
+\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312
+\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011
+\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042
+\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365
+\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045
+\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151
+\364
+END
+
+# Trust for Certificate "Starfield Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071
+\324\347\017\016
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Starfield Services Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
+\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
+\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060
+\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154
+\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040
+\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150
+\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071
+\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061
+\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003
+\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021
+\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154
+\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162
+\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151
+\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004
+\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162
+\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151
+\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
+\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110
+\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001
+\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276
+\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051
+\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136
+\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033
+\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266
+\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035
+\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203
+\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112
+\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256
+\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314
+\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336
+\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015
+\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105
+\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144
+\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237
+\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205
+\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
+\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252
+\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202
+\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010
+\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055
+\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336
+\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301
+\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052
+\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056
+\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163
+\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320
+\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047
+\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035
+\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372
+\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046
+\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247
+\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060
+\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250
+\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215
+\261\050\272
+END
+
+# Trust for Certificate "Starfield Services Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143
+\350\045\157\077
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Commercial"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Commercial"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\167\167\006\047\046\251\261\174
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167
+\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367
+\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
+\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
+\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015
+\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063
+\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
+\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
+\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
+\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151
+\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037
+\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303
+\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217
+\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065
+\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137
+\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053
+\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107
+\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326
+\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013
+\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005
+\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002
+\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265
+\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201
+\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120
+\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253
+\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334
+\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003
+\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077
+\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
+\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000
+\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051
+\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006
+\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052
+\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324
+\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143
+\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045
+\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073
+\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355
+\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362
+\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302
+\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140
+\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162
+\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111
+\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002
+\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236
+\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357
+END
+
+# Trust for Certificate "AffirmTrust Commercial"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Commercial"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054
+\307\262\170\267
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\167\167\006\047\046\251\261\174
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Networking"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Networking"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\174\117\004\071\034\324\231\055
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174
+\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367
+\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
+\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
+\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015
+\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063
+\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
+\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
+\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
+\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151
+\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240
+\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217
+\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362
+\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063
+\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241
+\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232
+\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253
+\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324
+\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113
+\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374
+\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275
+\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051
+\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024
+\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012
+\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106
+\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026
+\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003
+\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242
+\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264
+\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316
+\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116
+\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321
+\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356
+\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144
+\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145
+\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131
+\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025
+\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110
+\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056
+\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313
+\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221
+\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074
+\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064
+\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333
+END
+
+# Trust for Certificate "AffirmTrust Networking"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Networking"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220
+\237\105\000\057
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\174\117\004\071\034\324\231\055
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Premium"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\155\214\024\106\261\246\012\356
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155
+\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367
+\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006
+\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163
+\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060
+\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062
+\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004
+\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034
+\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124
+\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042
+\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
+\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337
+\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232
+\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347
+\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020
+\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221
+\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013
+\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331
+\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047
+\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055
+\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322
+\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373
+\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273
+\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271
+\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167
+\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265
+\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173
+\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050
+\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076
+\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206
+\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043
+\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003
+\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222
+\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270
+\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225
+\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322
+\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000
+\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013
+\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032
+\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173
+\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270
+\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327
+\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273
+\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001
+\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004
+\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021
+\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015
+\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116
+\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166
+\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104
+\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101
+\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040
+\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254
+\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365
+\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101
+\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142
+\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262
+\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320
+\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070
+\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010
+\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234
+\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000
+\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175
+\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320
+\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106
+\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057
+\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005
+\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103
+\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112
+\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107
+\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110
+\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344
+\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274
+\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303
+\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027
+\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216
+\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317
+\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052
+\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236
+\051\340\266\270\011\150\031\034\030\103
+END
+
+# Trust for Certificate "AffirmTrust Premium"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145
+\046\062\050\047
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\155\214\024\106\261\246\012\356
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Premium ECC"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium ECC"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\164\227\045\212\307\077\172\124
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164
+\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075
+\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002
+\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146
+\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004
+\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120
+\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060
+\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061
+\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125
+\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061
+\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155
+\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103
+\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005
+\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003
+\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234
+\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350
+\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275
+\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117
+\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170
+\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006
+\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065
+\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006
+\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006
+\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060
+\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154
+\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306
+\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161
+\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210
+\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131
+\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002
+\214\171
+END
+
+# Trust for Certificate "AffirmTrust Premium ECC"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium ECC"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312
+\353\377\303\273
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\164\227\045\212\307\077\172\124
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Certum Trusted Network CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certum Trusted Network CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\004\104\300
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004
+\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005
+\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
+\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
+\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
+\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
+\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
+\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
+\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
+\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063
+\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067
+\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
+\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
+\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
+\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
+\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
+\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
+\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
+\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001
+\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001
+\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001
+\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307
+\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227
+\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074
+\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314
+\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253
+\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060
+\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124
+\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256
+\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121
+\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314
+\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227
+\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333
+\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061
+\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151
+\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251
+\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003
+\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305
+\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125
+\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052
+\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246
+\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162
+\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271
+\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067
+\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313
+\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201
+\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055
+\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274
+\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061
+\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076
+\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230
+\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132
+\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130
+\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110
+\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232
+\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106
+\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054
+END
+
+# Trust for Certificate "Certum Trusted Network CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certum Trusted Network CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031
+\247\017\006\236
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\004\104\300
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index c9e57aaad063..3232c5f79a01 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 81
-#define NSS_BUILTINS_LIBRARY_VERSION "1.81"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 83
+#define NSS_BUILTINS_LIBRARY_VERSION "1.83"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index e326fc6963f1..3afc83541ef9 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -460,7 +460,7 @@ done:
  *    - If the cert does not have PQG parameters, obtain them from the issuer.
  *    - A valid cert chain cannot have a DSA or Fortezza cert without
  *      pqg parameters that has a parent that is not a DSA or Fortezza cert.
- *    - pqg paramters are stored in two different formats: the standard
+ *    - pqg parameters are stored in two different formats: the standard
  *      DER encoded format and the fortezza-only wrapped format.  The params
  *      should be copied from issuer to subject cert without modifying the
  *      formats.  The public key extraction code will deal with the different
@@ -1000,6 +1000,15 @@ seckey_GetKeyType (SECOidTag tag) {
       case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
 	keyType = ecKey;
 	break;
+      /* accommodate applications that hand us a signature type when they 
+	* should be handing us a cipher type */
+      case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION:
+	keyType = rsaKey;
+	break;
       default:
 	keyType = nullKey;
     }
@@ -1187,7 +1196,7 @@ CERT_ExtractPublicKey(CERTCertificate *cert)
 
 /*
  * Get the public key for the fortezza KMID. NOTE this requires the
- * PQG paramters to be set. We probably should have a fortezza call that 
+ * PQG parameters to be set. We probably should have a fortezza call that 
  * just extracts the kmid for us directly so this function can work
  * without having the whole cert chain
  */
@@ -2225,7 +2234,7 @@ SECKEY_DestroyPrivateKeyInfo(SECKEYPrivateKeyInfo *pvk,
 	    SECITEM_ZfreeItem(&pvk->version, PR_FALSE);
 	    SECITEM_ZfreeItem(&pvk->privateKey, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&pvk->algorithm, PR_FALSE);
-	    PORT_Memset((char *)pvk, 0, sizeof(pvk));
+	    PORT_Memset((char *)pvk, 0, sizeof(*pvk));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(pvk);
 	    }
@@ -2255,7 +2264,7 @@ SECKEY_DestroyEncryptedPrivateKeyInfo(SECKEYEncryptedPrivateKeyInfo *epki,
 	} else {
 	    SECITEM_ZfreeItem(&epki->encryptedData, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&epki->algorithm, PR_FALSE);
-	    PORT_Memset((char *)epki, 0, sizeof(epki));
+	    PORT_Memset((char *)epki, 0, sizeof(*epki));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(epki);
 	    }
@@ -2325,19 +2334,24 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     SECKEYPublicKey *pubk = NULL;
     SECStatus rv = SECFailure;
     SECItem newDerKey;
+    PRArenaPool *arena = NULL;
 
     if (!derKey) {
         return NULL;
     } 
 
-    pubk = PORT_ZNew(SECKEYPublicKey);
-    if(pubk == NULL) {
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (arena == NULL) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
         goto finish;
     }
-    pubk->arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-    if (NULL == pubk->arena) {
+
+    pubk = PORT_ArenaZNew(arena, SECKEYPublicKey);
+    if (pubk == NULL) {
         goto finish;
     }
+    pubk->arena = arena;
+
     rv = SECITEM_CopyItem(pubk->arena, &newDerKey, derKey);
     if (SECSuccess != rv) {
         goto finish;
@@ -2368,11 +2382,10 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     }
 
 finish:
-    if( rv != SECSuccess && pubk != NULL) {
-        if (pubk->arena) {
-            PORT_FreeArena(pubk->arena, PR_TRUE);
+    if (rv != SECSuccess) {
+        if (arena != NULL) {
+            PORT_FreeArena(arena, PR_TRUE);
         }
-        PORT_Free(pubk);
         pubk = NULL;
     }
     return pubk;
diff --git a/security/nss/lib/freebl/blapit.h b/security/nss/lib/freebl/blapit.h
index 704f514886d8..af4ed12b6033 100644
--- a/security/nss/lib/freebl/blapit.h
+++ b/security/nss/lib/freebl/blapit.h
@@ -38,7 +38,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: blapit.h,v 1.22 2008/12/17 06:09:12 nelson%bolyard.com Exp $ */
+/* $Id: blapit.h,v 1.22.22.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
 
 #ifndef _BLAPIT_H_
 #define _BLAPIT_H_
@@ -115,6 +115,10 @@
 #define AES_KEY_WRAP_BLOCK_SIZE  8  /* bytes */
 #define AES_BLOCK_SIZE          16  /* bytes */
 
+#define AES_128_KEY_LENGTH      16  /* bytes */
+#define AES_192_KEY_LENGTH      24  /* bytes */
+#define AES_256_KEY_LENGTH      32  /* bytes */
+
 #define CAMELLIA_BLOCK_SIZE          16  /* bytes */
 
 #define SEED_BLOCK_SIZE 16              /* bytes */
diff --git a/security/nss/lib/freebl/mpi/mpi-config.h b/security/nss/lib/freebl/mpi/mpi-config.h
index 00a0acfa0bd1..08e5c5cc2d03 100644
--- a/security/nss/lib/freebl/mpi/mpi-config.h
+++ b/security/nss/lib/freebl/mpi/mpi-config.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi-config.h,v 1.5 2004/04/25 15:03:10 gerv%gerv.net Exp $ */
+/* $Id: mpi-config.h,v 1.5.198.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
 
 #ifndef MPI_CONFIG_H_
 #define MPI_CONFIG_H_
@@ -100,7 +100,7 @@
 #endif
 
 #ifndef MP_MACRO
-#define MP_MACRO      0  /* use macros for frequent calls?      */
+#define MP_MACRO      1  /* use macros for frequent calls?      */
 #endif
 
 #ifndef MP_SQUARE
diff --git a/security/nss/lib/freebl/mpi/mpi.c b/security/nss/lib/freebl/mpi/mpi.c
index cfcfe60e5c17..25c96564040c 100644
--- a/security/nss/lib/freebl/mpi/mpi.c
+++ b/security/nss/lib/freebl/mpi/mpi.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi.c,v 1.47 2010/05/02 22:36:41 nelson%bolyard.com Exp $ */
+/* $Id: mpi.c,v 1.47.2.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
 
 #include "mpi-priv.h"
 #if defined(OSF1)
@@ -206,7 +206,6 @@ mp_err mp_copy(const mp_int *from, mp_int *to)
   if(from == to)
     return MP_OKAY;
 
-  ++mp_copies;
   { /* copy */
     mp_digit   *tmp;
 
@@ -2864,6 +2863,7 @@ void s_mp_copy(const mp_digit *sp, mp_digit *dp, mp_size count)
 #else
   memcpy(dp, sp, count * sizeof(mp_digit));
 #endif
+  ++mp_copies;
 
 } /* end s_mp_copy() */
 #endif
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
index 86e16e362966..ed0de47815b6 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
+.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
 
 # ------------------------------------------------------------------------
 #
@@ -415,7 +415,7 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
+.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
 
 # Magic indicating no need for an executable stack
 .section .note.GNU-stack, "", @progbits
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
index ac71074154de..242c631b1301 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
+.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
 
 / ------------------------------------------------------------------------
 /
@@ -415,4 +415,4 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
+.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c
index e0a2a21c1177..db5d99b75b2f 100644
--- a/security/nss/lib/freebl/nsslowhash.c
+++ b/security/nss/lib/freebl/nsslowhash.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nsslowhash.c,v 1.4 2009/06/09 23:34:06 rrelyea%redhat.com Exp $ */
+/* $Id: nsslowhash.c,v 1.4.8.1 2011/01/20 18:41:51 emaldona%redhat.com Exp $ */
 
 #include "stubs.h"
 #include "prtypes.h"
@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
 
     f = fopen("/proc/sys/crypto/fips_enabled", "r");
     if (!f)
-        return 1;
+        return 0;
 
     size = fread(&d, 1, 1, f);
     fclose(f);
diff --git a/security/nss/lib/freebl/rsa.c b/security/nss/lib/freebl/rsa.c
index 5c443ca05861..a8599771202e 100644
--- a/security/nss/lib/freebl/rsa.c
+++ b/security/nss/lib/freebl/rsa.c
@@ -37,7 +37,7 @@
 /*
  * RSA key generation, public key op, private key op.
  *
- * $Id: rsa.c,v 1.39.22.1 2010/11/16 19:06:38 rrelyea%redhat.com Exp $
+ * $Id: rsa.c,v 1.39.22.2 2011/03/30 18:39:44 rrelyea%redhat.com Exp $
  */
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -67,11 +67,23 @@
 */
 #define MAX_KEY_GEN_ATTEMPTS 10
 
+/* Blinding Parameters max cache size  */
+#define RSA_BLINDING_PARAMS_MAX_CACHE_SIZE 20
+
 /* exponent should not be greater than modulus */
 #define BAD_RSA_KEY_SIZE(modLen, expLen) \
     ((expLen) > (modLen) || (modLen) > RSA_MAX_MODULUS_BITS/8 || \
     (expLen) > RSA_MAX_EXPONENT_BITS/8)
 
+struct blindingParamsStr;
+typedef struct blindingParamsStr blindingParams;
+
+struct blindingParamsStr {
+    blindingParams *next;
+    mp_int         f, g;             /* blinding parameter                 */
+    int            counter;          /* number of remaining uses of (f, g) */
+};
+
 /*
 ** RSABlindingParamsStr
 **
@@ -85,9 +97,10 @@ struct RSABlindingParamsStr
     /* Blinding-specific parameters */
     PRCList   link;                  /* link to list of structs            */
     SECItem   modulus;               /* list element "key"                 */
-    mp_int    f, g;                  /* Blinding parameters                */
-    int       counter;               /* number of remaining uses of (f, g) */
+    blindingParams *free, *bp;       /* Blinding parameters queue          */
+    blindingParams array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE];
 };
+typedef struct RSABlindingParamsStr RSABlindingParams;
 
 /*
 ** RSABlindingParamsListStr
@@ -100,6 +113,8 @@ struct RSABlindingParamsStr
 struct RSABlindingParamsListStr
 {
     PZLock  *lock;   /* Lock for the list   */
+    PRCondVar *cVar; /* Condidtion Variable */
+    int  waitCount;  /* Number of threads waiting on cVar */
     PRCList  head;   /* Pointer to the list */
 };
 
@@ -271,7 +286,7 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return NULL;
     }
-    key = (RSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(RSAPrivateKey));
+    key = PORT_ArenaZNew(arena, RSAPrivateKey);
     if (!key) {
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	PORT_FreeArena(arena, PR_TRUE);
@@ -1026,18 +1041,25 @@ init_blinding_params_list(void)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return PR_FAILURE;
     }
+    blindingParamsList.cVar = PR_NewCondVar( blindingParamsList.lock );
+    if (!blindingParamsList.cVar) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	return PR_FAILURE;
+    }
+    blindingParamsList.waitCount = 0;
     PR_INIT_CLIST(&blindingParamsList.head);
     return PR_SUCCESS;
 }
 
 static SECStatus
-generate_blinding_params(struct RSABlindingParamsStr *rsabp, 
-                         RSAPrivateKey *key, mp_int *n, unsigned int modLen)
+generate_blinding_params(RSAPrivateKey *key, mp_int* f, mp_int* g, mp_int *n, 
+                         unsigned int modLen)
 {
     SECStatus rv = SECSuccess;
     mp_int e, k;
     mp_err err = MP_OKAY;
     unsigned char *kb = NULL;
+
     MP_DIGITS(&e) = 0;
     MP_DIGITS(&k) = 0;
     CHECK_MPI_OK( mp_init(&e) );
@@ -1054,11 +1076,9 @@ generate_blinding_params(struct RSABlindingParamsStr *rsabp,
     /* k < n */
     CHECK_MPI_OK( mp_mod(&k, n, &k) );
     /* f = k**e mod n */
-    CHECK_MPI_OK( mp_exptmod(&k, &e, n, &rsabp->f) );
+    CHECK_MPI_OK( mp_exptmod(&k, &e, n, f) );
     /* g = k**-1 mod n */
-    CHECK_MPI_OK( mp_invmod(&k, n, &rsabp->g) );
-    /* Initialize the counter for this (f, g) */
-    rsabp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
+    CHECK_MPI_OK( mp_invmod(&k, n, g) );
 cleanup:
     if (kb)
 	PORT_ZFree(kb, modLen);
@@ -1072,114 +1092,202 @@ cleanup:
 }
 
 static SECStatus
-init_blinding_params(struct RSABlindingParamsStr *rsabp, RSAPrivateKey *key,
+init_blinding_params(RSABlindingParams *rsabp, RSAPrivateKey *key,
                      mp_int *n, unsigned int modLen)
 {
+    blindingParams * bp = rsabp->array;
     SECStatus rv = SECSuccess;
     mp_err err = MP_OKAY;
-    MP_DIGITS(&rsabp->f) = 0;
-    MP_DIGITS(&rsabp->g) = 0;
-    /* initialize blinding parameters */
-    CHECK_MPI_OK( mp_init(&rsabp->f) );
-    CHECK_MPI_OK( mp_init(&rsabp->g) );
+    int i = 0;
+
+    /* Initialize the list pointer for the element */
+    PR_INIT_CLIST(&rsabp->link);
+    for (i = 0; i < RSA_BLINDING_PARAMS_MAX_CACHE_SIZE; ++i, ++bp) {
+    	bp->next = bp + 1;
+	MP_DIGITS(&bp->f) = 0;
+	MP_DIGITS(&bp->g) = 0;
+	bp->counter = 0;
+    }
+    /* The last bp->next value was initialized with out
+     * of rsabp->array pointer and must be set to NULL 
+     */ 
+    rsabp->array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE - 1].next = NULL;
+    
+    bp          = rsabp->array;
+    rsabp->bp   = NULL;
+    rsabp->free = bp;
+
     /* List elements are keyed using the modulus */
     SECITEM_CopyItem(NULL, &rsabp->modulus, &key->modulus);
-    CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
+
     return SECSuccess;
-cleanup:
-    mp_clear(&rsabp->f);
-    mp_clear(&rsabp->g);
-    if (err) {
-	MP_TO_SEC_ERROR(err);
-	rv = SECFailure;
-    }
-    return rv;
 }
 
 static SECStatus
 get_blinding_params(RSAPrivateKey *key, mp_int *n, unsigned int modLen,
                     mp_int *f, mp_int *g)
 {
-    SECStatus rv = SECSuccess;
-    mp_err err = MP_OKAY;
-    int cmp;
-    PRCList *el;
-    struct RSABlindingParamsStr *rsabp = NULL;
-    /* Init the list if neccessary (the init function is only called once!) */
-    if (blindingParamsList.lock == NULL) {
-        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
-        return SECFailure;
-    }
-    /* Acquire the list lock */
-    PZ_Lock(blindingParamsList.lock);
-    /* Walk the list looking for the private key */
-    for (el = PR_NEXT_LINK(&blindingParamsList.head);
-         el != &blindingParamsList.head;
-         el = PR_NEXT_LINK(el)) {
-	rsabp = (struct RSABlindingParamsStr *)el;
-	cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
-	if (cmp == 0) {
-	    /* Check the usage counter for the parameters */
-	    if (--rsabp->counter <= 0) {
-		/* Regenerate the blinding parameters */
-		CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
-	    }
-	    /* Return the parameters */
-	    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
-	    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
-	    /* Now that the params are located, release the list lock. */
-	    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
-	    return SECSuccess;
-	} else if (cmp > 0) {
-	    /* The key is not in the list.  Break to param creation. */
-	    break;
+    RSABlindingParams *rsabp           = NULL;
+    blindingParams    *bpUnlinked      = NULL;
+    blindingParams    *bp, *prevbp     = NULL;
+    PRCList           *el;
+    SECStatus          rv              = SECSuccess;
+    mp_err             err             = MP_OKAY;
+    int                cmp             = -1;
+    PRBool             holdingLock     = PR_FALSE;
+
+    do {
+	if (blindingParamsList.lock == NULL) {
+	    PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+	    return SECFailure;
 	}
-    }
-    /* At this point, the key is not in the list.  el should point to the
-    ** list element that this key should be inserted before.  NOTE: the list
-    ** lock is still held, so there cannot be a race condition here.
-    */
-    rsabp = (struct RSABlindingParamsStr *)
-              PORT_ZAlloc(sizeof(struct RSABlindingParamsStr));
-    if (!rsabp) {
-	PORT_SetError(SEC_ERROR_NO_MEMORY);
-	goto cleanup;
-    }
-    /* Initialize the list pointer for the element */
-    PR_INIT_CLIST(&rsabp->link);
-    /* Initialize the blinding parameters 
-    ** This ties up the list lock while doing some heavy, element-specific
-    ** operations, but we don't want to insert the element until it is valid,
-    ** which requires computing the blinding params.  If this proves costly,
-    ** it could be done after the list lock is released, and then if it fails
-    ** the lock would have to be reobtained and the invalid element removed.
-    */
-    rv = init_blinding_params(rsabp, key, n, modLen);
-    if (rv != SECSuccess) {
-	PORT_ZFree(rsabp, sizeof(struct RSABlindingParamsStr));
-	goto cleanup;
-    }
-    /* Insert the new element into the list
-    ** If inserting in the middle of the list, el points to the link
-    ** to insert before.  Otherwise, the link needs to be appended to
-    ** the end of the list, which is the same as inserting before the
-    ** head (since el would have looped back to the head).
-    */
-    PR_INSERT_BEFORE(&rsabp->link, el);
-    /* Return the parameters */
-    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
-    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
-    /* Release the list lock */
-    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
-    return SECSuccess;
+	/* Acquire the list lock */
+	PZ_Lock(blindingParamsList.lock);
+	holdingLock = PR_TRUE;
+
+	/* Walk the list looking for the private key */
+	for (el = PR_NEXT_LINK(&blindingParamsList.head);
+	     el != &blindingParamsList.head;
+	     el = PR_NEXT_LINK(el)) {
+	    rsabp = (RSABlindingParams *)el;
+	    cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
+	    if (cmp >= 0) {
+		/* The key is found or not in the list. */
+		break;
+	    }
+	}
+
+	if (cmp) {
+	    /* At this point, the key is not in the list.  el should point to 
+	    ** the list element before which this key should be inserted. 
+	    */
+	    rsabp = PORT_ZNew(RSABlindingParams);
+	    if (!rsabp) {
+		PORT_SetError(SEC_ERROR_NO_MEMORY);
+		goto cleanup;
+	    }
+
+	    rv = init_blinding_params(rsabp, key, n, modLen);
+	    if (rv != SECSuccess) {
+		PORT_ZFree(rsabp, sizeof(RSABlindingParams));
+		goto cleanup;
+	    }
+
+	    /* Insert the new element into the list
+	    ** If inserting in the middle of the list, el points to the link
+	    ** to insert before.  Otherwise, the link needs to be appended to
+	    ** the end of the list, which is the same as inserting before the
+	    ** head (since el would have looped back to the head).
+	    */
+	    PR_INSERT_BEFORE(&rsabp->link, el);
+	}
+
+	/* We've found (or created) the RSAblindingParams struct for this key.
+	 * Now, search its list of ready blinding params for a usable one.
+	 */
+	while (0 != (bp = rsabp->bp)) {
+	    if (--(bp->counter) > 0) {
+		/* Found a match and there are still remaining uses left */
+		/* Return the parameters */
+		CHECK_MPI_OK( mp_copy(&bp->f, f) );
+		CHECK_MPI_OK( mp_copy(&bp->g, g) );
+
+		PZ_Unlock(blindingParamsList.lock); 
+		return SECSuccess;
+	    }
+	    /* exhausted this one, give its values to caller, and
+	     * then retire it.
+	     */
+	    mp_exch(&bp->f, f);
+	    mp_exch(&bp->g, g);
+	    mp_clear( &bp->f );
+	    mp_clear( &bp->g );
+	    bp->counter = 0;
+	    /* Move to free list */
+	    rsabp->bp   = bp->next;
+	    bp->next    = rsabp->free;
+	    rsabp->free = bp;
+	    /* In case there're threads waiting for new blinding
+	     * value - notify 1 thread the value is ready
+	     */
+	    if (blindingParamsList.waitCount > 0) {
+		PR_NotifyCondVar( blindingParamsList.cVar );
+		blindingParamsList.waitCount--;
+	    }
+	    PZ_Unlock(blindingParamsList.lock); 
+	    return SECSuccess;
+	}
+	/* We did not find a usable set of blinding params.  Can we make one?
+	/* Find a free bp struct. */
+	prevbp = NULL;
+	if ((bp = rsabp->free) != NULL) {
+	    /* unlink this bp */
+	    rsabp->free  = bp->next;
+	    bp->next     = NULL;
+	    bpUnlinked   = bp;  /* In case we fail */
+
+	    PZ_Unlock(blindingParamsList.lock); 
+	    holdingLock = PR_FALSE;
+	    /* generate blinding parameter values for the current thread */
+	    CHECK_SEC_OK( generate_blinding_params(key, f, g, n, modLen ) );
+
+	    /* put the blinding parameter values into cache */
+	    CHECK_MPI_OK( mp_init( &bp->f) );
+	    CHECK_MPI_OK( mp_init( &bp->g) );
+	    CHECK_MPI_OK( mp_copy( f, &bp->f) );
+	    CHECK_MPI_OK( mp_copy( g, &bp->g) );
+
+	    /* Put this at head of queue of usable params. */
+	    PZ_Lock(blindingParamsList.lock);
+	    holdingLock = PR_TRUE;
+	    /* initialize RSABlindingParamsStr */
+	    bp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
+	    bp->next    = rsabp->bp;
+	    rsabp->bp   = bp;
+	    bpUnlinked  = NULL;
+	    /* In case there're threads waiting for new blinding value
+	     * just notify them the value is ready
+	     */
+	    if (blindingParamsList.waitCount > 0) {
+		PR_NotifyAllCondVar( blindingParamsList.cVar );
+		blindingParamsList.waitCount = 0;
+	    }
+	    PZ_Unlock(blindingParamsList.lock);
+	    return SECSuccess;
+	}
+	/* Here, there are no usable blinding parameters available,
+	 * and no free bp blocks, presumably because they're all 
+	 * actively having parameters generated for them.
+	 * So, we need to wait here and not eat up CPU until some 
+	 * change happens. 
+	 */
+	blindingParamsList.waitCount++;
+	PR_WaitCondVar( blindingParamsList.cVar, PR_INTERVAL_NO_TIMEOUT );
+	PZ_Unlock(blindingParamsList.lock); 
+	holdingLock = PR_FALSE;
+    } while (1);
+
 cleanup:
-    /* It is possible to reach this after the lock is already released.
-    ** Ignore the error in that case.
-    */
-    PZ_Unlock(blindingParamsList.lock);
+    /* It is possible to reach this after the lock is already released.  */
+    if (bpUnlinked) {
+	if (!holdingLock) {
+	    PZ_Lock(blindingParamsList.lock);
+	    holdingLock = PR_TRUE;
+	}
+	bp = bpUnlinked;
+	mp_clear( &bp->f );
+	mp_clear( &bp->g );
+	bp->counter = 0;
+    	/* Must put the unlinked bp back on the free list */
+	bp->next    = rsabp->free;
+	rsabp->free = bp;
+    }
+    if (holdingLock) {
+	PZ_Unlock(blindingParamsList.lock);
+	holdingLock = PR_FALSE;
+    }
     if (err) {
 	MP_TO_SEC_ERROR(err);
-	rv = SECFailure;
     }
     return SECFailure;
 }
@@ -1441,22 +1549,31 @@ SECStatus BL_Init(void)
 /* cleanup at shutdown */
 void RSA_Cleanup(void)
 {
+    blindingParams * bp = NULL;
     if (!coBPInit.initialized)
 	return;
 
-    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head))
-    {
-	struct RSABlindingParamsStr * rsabp = (struct RSABlindingParamsStr *)
-	    PR_LIST_HEAD(&blindingParamsList.head);
+    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head)) {
+	RSABlindingParams *rsabp = 
+	    (RSABlindingParams *)PR_LIST_HEAD(&blindingParamsList.head);
 	PR_REMOVE_LINK(&rsabp->link);
-	mp_clear(&rsabp->f);
-	mp_clear(&rsabp->g);
+	/* clear parameters cache */
+	while (rsabp->bp != NULL) {
+	    bp = rsabp->bp;
+	    rsabp->bp = rsabp->bp->next;
+	    mp_clear( &bp->f );
+	    mp_clear( &bp->g );
+	}
 	SECITEM_FreeItem(&rsabp->modulus,PR_FALSE);
 	PORT_Free(rsabp);
     }
 
-    if (blindingParamsList.lock)
-    {
+    if (blindingParamsList.cVar) {
+	PR_DestroyCondVar(blindingParamsList.cVar);
+	blindingParamsList.cVar = NULL;
+    }
+
+    if (blindingParamsList.lock) {
 	SKIP_AFTER_FORK(PZ_DestroyLock(blindingParamsList.lock));
 	blindingParamsList.lock = NULL;
     }
diff --git a/security/nss/lib/freebl/sha512.c b/security/nss/lib/freebl/sha512.c
index 91b446e59129..567586712bcb 100644
--- a/security/nss/lib/freebl/sha512.c
+++ b/security/nss/lib/freebl/sha512.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sha512.c,v 1.14.6.1 2010/11/18 18:32:52 kaie%kuix.de Exp $ */
+/* $Id: sha512.c,v 1.14.6.2 2011/03/30 22:45:05 wtc%google.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -135,7 +135,7 @@ static __inline__ PRUint32 swap4b(PRUint32 value)
 #define SHA_HTONL(x) swap4b(x)
 #define BYTESWAP4(x)  x = SHA_HTONL(x)
 
-#else /* neither windows nor Linux PC */
+#else
 #define SWAP4MASK  0x00FF00FF
 #define SHA_HTONL(x) (t1 = (x), t1 = (t1 << 16) | (t1 >> 16), \
                       ((t1 & SWAP4MASK) << 8) | ((t1 >> 8) & SWAP4MASK))
diff --git a/security/nss/lib/freebl/stubs.c b/security/nss/lib/freebl/stubs.c
index 7697533d88f3..02d3f04518c2 100644
--- a/security/nss/lib/freebl/stubs.c
+++ b/security/nss/lib/freebl/stubs.c
@@ -63,6 +63,7 @@
 #include <prsystem.h>
 #include <prinrval.h>
 #include <prtime.h>
+#include <prcvar.h>
 #include <secasn1.h>
 #include <secoid.h>
 #include <secdig.h>
@@ -150,11 +151,15 @@ STUB_DECLARE(void,PR_Assert,(const char *s, const char *file, PRIntn ln));
 STUB_DECLARE(PRStatus,PR_CallOnce,(PRCallOnceType *once, PRCallOnceFN func));
 STUB_DECLARE(PRStatus,PR_Close,(PRFileDesc *fd));
 STUB_DECLARE(void,PR_DestroyLock,(PRLock *lock));
+STUB_DECLARE(void,PR_DestroyCondVar,(PRCondVar *cvar));
 STUB_DECLARE(void,PR_Free,(void *ptr));
 STUB_DECLARE(char * ,PR_GetLibraryFilePathname,(const char *name,
 			PRFuncPtr addr));
 STUB_DECLARE(void,PR_Lock,(PRLock *lock));
+STUB_DECLARE(PRCondVar *,PR_NewCondVar,(PRLock *lock));
 STUB_DECLARE(PRLock *,PR_NewLock,(void));
+STUB_DECLARE(PRStatus,PR_NotifyCondVar,(PRCondVar *cvar));
+STUB_DECLARE(PRStatus,PR_NotifyAllCondVar,(PRCondVar *cvar));
 STUB_DECLARE(PRFileDesc *,PR_Open,(const char *name, PRIntn flags,
 			 PRIntn mode));
 STUB_DECLARE(PRInt32,PR_Read,(PRFileDesc *fd, void *buf, PRInt32 amount));
@@ -162,6 +167,8 @@ STUB_DECLARE(PROffset32,PR_Seek,(PRFileDesc *fd, PROffset32 offset,
 			PRSeekWhence whence));
 STUB_DECLARE(PRStatus,PR_Sleep,(PRIntervalTime ticks));
 STUB_DECLARE(PRStatus,PR_Unlock,(PRLock *lock));
+STUB_DECLARE(PRStatus,PR_WaitCondVar,(PRCondVar *cvar,
+			PRIntervalTime timeout));
 
 STUB_DECLARE(SECItem *,SECITEM_AllocItem_Util,(PRArenaPool *arena, 
 			SECItem *item,unsigned int len));
@@ -430,6 +437,48 @@ PR_DestroyLock_stub(PRLock *lock)
     return;
 }
 
+extern PRCondVar *
+PR_NewCondVar_stub(PRLock *lock)
+{
+    STUB_SAFE_CALL1(PR_NewCondVar, lock);
+    abort();
+    return NULL;
+}
+
+extern PRStatus
+PR_NotifyCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_NotifyCondVar, cvar);
+    abort();
+    return PR_FAILURE;
+}
+
+extern PRStatus
+PR_NotifyAllCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_NotifyAllCondVar, cvar);
+    abort();
+    return PR_FAILURE;
+}
+
+extern PRStatus
+PR_WaitCondVar_stub(PRCondVar *cvar, PRIntervalTime timeout)
+{
+    STUB_SAFE_CALL2(PR_WaitCondVar, cvar, timeout);
+    abort();
+    return PR_FAILURE;
+}
+
+
+
+extern void
+PR_DestroyCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_DestroyCondVar, cvar);
+    abort();
+    return;
+}
+
 /*
  * NOTE: this presupposes GCC 4.1
  */
@@ -507,6 +556,11 @@ freebl_InitNSPR(void *lib)
     STUB_FETCH_FUNCTION(PR_Assert);
     STUB_FETCH_FUNCTION(PR_Sleep);
     STUB_FETCH_FUNCTION(PR_CallOnce);
+    STUB_FETCH_FUNCTION(PR_NewCondVar);
+    STUB_FETCH_FUNCTION(PR_NotifyCondVar);
+    STUB_FETCH_FUNCTION(PR_NotifyAllCondVar);
+    STUB_FETCH_FUNCTION(PR_WaitCondVar);
+    STUB_FETCH_FUNCTION(PR_DestroyCondVar);
     STUB_FETCH_FUNCTION(PR_NewLock);
     STUB_FETCH_FUNCTION(PR_Unlock);
     STUB_FETCH_FUNCTION(PR_Lock);
diff --git a/security/nss/lib/freebl/stubs.h b/security/nss/lib/freebl/stubs.h
index 730ed4a647b4..d435634ff169 100644
--- a/security/nss/lib/freebl/stubs.h
+++ b/security/nss/lib/freebl/stubs.h
@@ -71,6 +71,7 @@
 
 #define NSS_SecureMemcmp NSS_SecureMemcmp_stub
 
+#define PR_DestroyCondVar PR_DestroyCondVar_stub
 #define PR_Assert  PR_Assert_stub
 #define PR_CallOnce  PR_CallOnce_stub
 #define PR_Close  PR_Close_stub
@@ -78,12 +79,16 @@
 #define PR_Free  PR_Free_stub
 #define PR_GetLibraryFilePathname  PR_GetLibraryFilePathname_stub
 #define PR_Lock  PR_Lock_stub
+#define PR_NewCondVar PR_NewCondVar_stub
 #define PR_NewLock  PR_NewLock_stub
+#define PR_NotifyCondVar PR_NotifyCondVar_stub
+#define PR_NotifyAllCondVar PR_NotifyAllCondVar_stub
 #define PR_Open  PR_Open_stub
 #define PR_Read  PR_Read_stub
 #define PR_Seek  PR_Seek_stub
 #define PR_Sleep  PR_Sleep_stub
 #define PR_Unlock  PR_Unlock_stub
+#define PR_WaitCondVar PR_WaitCondVar_stub
 
 extern int  FREEBL_InitStubs(void);
 
diff --git a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
index cf2fa55f4e3f..d7b7ae3e4b8d 100644
--- a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
+++ b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
@@ -399,6 +399,9 @@ pkix_CrlChecker_CheckExternal(
     if (!localStore) {
         PKIX_ERROR_FATAL(PKIX_CRLCHECKERNOLOCALCERTSTOREFOUND);
     }
+    PKIX_CHECK(
+        PKIX_PL_Cert_VerifyKeyUsage(issuer, PKIX_CRL_SIGN, plContext),
+        PKIX_CERTCHECKKEYUSAGEFAILED);
     PKIX_CHECK(
         PKIX_PL_Cert_GetCrlDp(cert, &dpList, plContext),
         PKIX_CERTGETCRLDPFAILED);
diff --git a/security/nss/lib/libpkix/pkix/top/pkix_build.c b/security/nss/lib/libpkix/pkix/top/pkix_build.c
index 1e5873cb6aa6..4045a76fd5ad 100755
--- a/security/nss/lib/libpkix/pkix/top/pkix_build.c
+++ b/security/nss/lib/libpkix/pkix/top/pkix_build.c
@@ -1981,6 +1981,18 @@ cleanup:
         PKIX_RETURN(BUILD);
 }
 
+/* Prepare 'state' for the AIA round. */
+static void
+pkix_PrepareForwardBuilderStateForAIA(
+        PKIX_ForwardBuilderState *state)
+{
+        PORT_Assert(state->useOnlyLocal == PKIX_TRUE);
+        state->useOnlyLocal = PKIX_FALSE;
+        state->certStoreIndex = 0;
+        state->numFanout = state->buildConstants.maxFanout;
+        state->status = BUILD_TRYAIA;
+}
+
 /*
  * FUNCTION: pkix_BuildForwardDepthFirstSearch
  * DESCRIPTION:
@@ -2101,6 +2113,7 @@ pkix_BuildForwardDepthFirstSearch(
         PKIX_Error *verifyError = NULL;
         PKIX_Error *finalError = NULL;
         void *nbio = NULL;
+        PKIX_UInt32 numIterations = 0;
 
         PKIX_ENTER(BUILD, "pkix_BuildForwardDepthFirstSearch");
         PKIX_NULLCHECK_THREE(pNBIOContext, state, pValResult);
@@ -2117,6 +2130,13 @@ pkix_BuildForwardDepthFirstSearch(
          * of this "while" clause our search has failed.
          */
         while (outOfOptions == PKIX_FALSE) {
+            /*
+             * The maximum number of iterations works around a bug that
+             * causes this while loop to never exit when AIA and cross
+             * certificates are involved.  See bug xxxxx.
+             */
+            if (numIterations++ > 250)
+                    PKIX_ERROR(PKIX_TIMECONSUMEDEXCEEDSRESOURCELIMITS);
 
             if (state->buildConstants.maxTime != 0) {
                     PKIX_DECREF(currTime);
@@ -2728,7 +2748,6 @@ pkix_BuildForwardDepthFirstSearch(
                      * chain, delete it and go to the certStores.
                      */
                     if (state->usingHintCerts == PKIX_TRUE) {
-
                             PKIX_DECREF(state->candidateCerts);
                             PKIX_CHECK(PKIX_List_Create
                                 (&state->candidateCerts, plContext),
@@ -2738,9 +2757,7 @@ pkix_BuildForwardDepthFirstSearch(
                             state->usingHintCerts = PKIX_FALSE;
                             state->status = BUILD_TRYAIA;
                             continue;
-
                     } else if (++(state->certIndex) < (state->numCerts)) {
-
                             if ((state->buildConstants.maxFanout != 0) &&
                                 (--(state->numFanout) == 0)) {
 
@@ -2775,16 +2792,12 @@ pkix_BuildForwardDepthFirstSearch(
              * parent cert, and see if there are any more to try.
              */
             if (state->useOnlyLocal == PKIX_TRUE) {
-                state->useOnlyLocal = PKIX_FALSE;
-                state->certStoreIndex = 0;
-                state->numFanout = state->buildConstants.maxFanout;
-                state->status = BUILD_TRYAIA;
+                pkix_PrepareForwardBuilderStateForAIA(state);
             } else do {
                 if (state->parentState == NULL) {
                         /* We are at the top level, and can't back up! */
                         outOfOptions = PKIX_TRUE;
                 } else {
-
                         /*
                          * Try the next cert, if any, for this parent.
                          * Otherwise keep backing up until we reach a
@@ -2848,10 +2861,7 @@ pkix_BuildForwardDepthFirstSearch(
                         }
                         if (state->useOnlyLocal == PKIX_TRUE) {
                             /* Clean up and go for AIA round. */
-                            state->useOnlyLocal = PKIX_FALSE;
-                            state->certStoreIndex = 0;
-                            state->numFanout = state->buildConstants.maxFanout;
-                            state->status = BUILD_TRYAIA;
+                            pkix_PrepareForwardBuilderStateForAIA(state);
                             break;
                         }
                 }
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index c29e361bfe5d..d5d3ea033cd4 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -1143,13 +1143,13 @@ pkix_pl_Socket_Poll(
 
         if ((pBytesWritten) &&
             ((sock->status == SOCKET_SENDPENDING) ||
-            (sock->status = SOCKET_SENDRCVPENDING))) {
+            (sock->status == SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags = PR_POLL_WRITE;
         }
 
         if ((pBytesRead) &&
-            ((sock->status = SOCKET_RCVPENDING) ||
-            (sock->status = SOCKET_SENDRCVPENDING))) {
+            ((sock->status == SOCKET_RCVPENDING) ||
+            (sock->status == SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags |= PR_POLL_READ;
         }
 
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
index a3a7d063b482..7e0a0e7d2f6e 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
@@ -573,10 +573,8 @@ pkix_pl_InfoAccess_ParseTokens(
         char terminator,
         void *plContext)
 {
-        PKIX_UInt32 len = 0;
         PKIX_UInt32 numFilters = 0;
         char *endPos = NULL;
-        char *p = NULL;
         char **filterP = NULL;
 
         PKIX_ENTER(INFOACCESS, "pkix_pl_InfoAccess_ParseTokens");
@@ -597,8 +595,8 @@ pkix_pl_InfoAccess_ParseTokens(
                 PKIX_ERROR(PKIX_LOCATIONSTRINGNOTPROPERLYTERMINATED);
         }
 
-        /* Last one doesn't have a "," as separator, although we allow it */
-        if (*(endPos-1) != ',') {
+        /* Last component doesn't need a separator, although we allow it */
+        if (endPos > *startPos && *(endPos-1) != separator) {
                 numFilters++;
         }
 
@@ -619,36 +617,23 @@ pkix_pl_InfoAccess_ParseTokens(
 
         while (numFilters) {
             if (*endPos == separator || *endPos == terminator) {
-                    len = endPos - *startPos;
-                    p = PORT_ArenaZAlloc(arena, len+1);
+                    PKIX_UInt32 len = endPos - *startPos;
+                    char *p = PORT_ArenaZAlloc(arena, len+1);
                     if (p == NULL) {
                         PKIX_ERROR(PKIX_PORTARENAALLOCFAILED);
                     }
 
+                    PORT_Memcpy(p, *startPos, len);
+                    p[len] = '\0';
+
                     *filterP = p;
-
-                    while (len) {
-                            if (**startPos == '%' &&
-                                strncmp(*startPos, "%20", 3) == 0) {
-                            /* replace %20 by blank */
-                                *p = ' ';
-                                *startPos += 3;
-                                len -= 3;
-                            } else {
-                                *p = **startPos;
-                                (*startPos)++;
-                                len--;
-                            }
-                            p++;
-                    }
-
-                    *p = '\0';
                     filterP++;
                     numFilters--;
 
                     separator = terminator;
 
                     if (endPos == '\0') {
+                        *startPos = endPos;
                         break;
                     } else {
                         endPos++;
@@ -666,6 +651,44 @@ cleanup:
         PKIX_RETURN(INFOACCESS);
 }
 
+static int
+pkix_pl_HexDigitToInt(
+        int ch)
+{
+        if (isdigit(ch)) {
+                ch = ch - '0';
+        } else if (isupper(ch)) {
+                ch = ch - 'A' + 10;
+        } else {
+                ch = ch - 'a' + 10;
+        }
+        return ch;
+}
+
+/*
+ * Convert the "%" hex hex escape sequences in the URL 'location' in place.
+ */
+static void
+pkix_pl_UnescapeURL(
+        char *location)
+{
+        const char *src;
+        char *dst;
+
+        for (src = dst = location; *src != '\0'; src++, dst++) {
+                if (*src == '%' && isxdigit((unsigned char)*(src+1)) &&
+                    isxdigit((unsigned char)*(src+2))) {
+                        *dst = pkix_pl_HexDigitToInt((unsigned char)*(src+1));
+                        *dst *= 16;
+                        *dst += pkix_pl_HexDigitToInt((unsigned char)*(src+2));
+                        src += 2;
+                } else {
+                        *dst = *src;
+                }
+        }
+        *dst = *src;  /* the terminating null */
+}
+
 /*
  * FUNCTION: pkix_pl_InfoAccess_ParseLocation
  * DESCRIPTION:
@@ -742,11 +765,7 @@ pkix_pl_InfoAccess_ParseLocation(
                 plContext),
                 PKIX_STRINGGETENCODEDFAILED);
 
-#if 0
-        /* For testing inside the firewall... */
-        locationAscii = "ldap://nss.red.iplanet.com:1389/cn=Good%20CA,o="
-                "Test%20Certificates,c=US?caCertificate;binary";
-#endif
+        pkix_pl_UnescapeURL(locationAscii);
 
         /* Skip "ldap:" */
         endPos = locationAscii;
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 6c4495d58f88..0373d80d5608 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -1013,3 +1013,10 @@ SECMOD_RestartModules;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12.10 {  # NSS 3.12.10 release
+;+    global:
+CERT_AllocCERTRevocationFlags;
+CERT_DestroyCERTRevocationFlags;
+;+    local:
+;+       *;
+;+};
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 2fc56bb27c5d..778d1ee11201 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.81.2.4 2011/01/06 18:04:16 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.81.2.5 2011/01/12 21:39:21 christophe.ravel.bugs%sun.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
@@ -66,12 +66,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.12.10.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
-#define NSS_VPATCH   9
+#define NSS_VPATCH   10
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile
index a3cca6ab0679..479086292db5 100644
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -78,6 +78,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export
 
+$(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c
+
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pk11slot.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
diff --git a/security/nss/lib/pk11wrap/debug_module.c b/security/nss/lib/pk11wrap/debug_module.c
index 0df3cfcb61c6..0b29647a6df1 100644
--- a/security/nss/lib/pk11wrap/debug_module.c
+++ b/security/nss/lib/pk11wrap/debug_module.c
@@ -92,6 +92,7 @@ STRING fmt_fwVersion[]            = "  firmware version: %d.%d";
 STRING fmt_hwVersion[]            = "  hardware version: %d.%d";
 STRING fmt_s_qsq_d[]              = "    %s = \"%s\" [%d]";
 STRING fmt_s_s_d[]                = "    %s = %s [%d]";
+STRING fmt_s_lu[]                 = "    %s = %lu";
 STRING fmt_invalid_handle[]       = " (CK_INVALID_HANDLE)";
 
 
@@ -110,6 +111,7 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_VALUE);
     CASE(CKA_OBJECT_ID);
     CASE(CKA_CERTIFICATE_TYPE);
+    CASE(CKA_CERTIFICATE_CATEGORY);
     CASE(CKA_ISSUER);
     CASE(CKA_SERIAL_NUMBER);
     CASE(CKA_AC_ISSUER);
@@ -144,7 +146,7 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_SUBPRIME);
     CASE(CKA_BASE);
     CASE(CKA_PRIME_BITS);
-    CASE(CKA_SUB_PRIME_BITS);
+    CASE(CKA_SUBPRIME_BITS);
     CASE(CKA_VALUE_BITS);
     CASE(CKA_VALUE_LEN);
     CASE(CKA_EXTRACTABLE);
@@ -666,6 +668,25 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	           atype, valstr, attr->ulValueLen));
 	    break;
 	}
+    case CKA_PIXEL_X:
+    case CKA_PIXEL_Y:
+    case CKA_RESOLUTION:
+    case CKA_CHAR_ROWS:
+    case CKA_CHAR_COLUMNS:
+    case CKA_BITS_PER_PIXEL:
+    case CKA_CERTIFICATE_CATEGORY:  /* should print as enum/string */
+    case CKA_JAVA_MIDP_SECURITY_DOMAIN:  /* should print as enum/string */
+    case CKA_MODULUS_BITS:
+    case CKA_PRIME_BITS:
+    case CKA_SUBPRIME_BITS:
+    case CKA_VALUE_BITS:
+    case CKA_VALUE_LEN:
+	if (attr->ulValueLen > 0 && attr->pValue) {
+	    CK_ULONG valueLen = *((CK_ULONG *)attr->pValue);
+	    /* XXX check for the special value CK_UNAVAILABLE_INFORMATION */
+	    PR_LOG(modlog, 4, (fmt_s_lu, atype, (PRUint32)valueLen));
+	    break;
+	}
     case CKA_LABEL:
     case CKA_NETSCAPE_EMAIL:
     case CKA_NETSCAPE_URL:
@@ -691,7 +712,8 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    	PORT_Free(asciiName);
 		break;
 	    }
-	    /* else fall through and treat like a binary buffer */
+	    /* else treat like a binary buffer */
+	    goto binary_buffer;
 	}
     case CKA_ID:
 	if (attr->ulValueLen > 0 && attr->pValue) {
@@ -713,6 +735,7 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    }
 	    /* else fall through and treat like a binary buffer */
 	}
+binary_buffer:
     case CKA_SERIAL_NUMBER:
     default:
 	if (attr->ulValueLen > 0 && attr->pValue) {
diff --git a/security/nss/lib/pk11wrap/pk11load.c b/security/nss/lib/pk11wrap/pk11load.c
index fd35491461f5..80850c11c6d4 100644
--- a/security/nss/lib/pk11wrap/pk11load.c
+++ b/security/nss/lib/pk11wrap/pk11load.c
@@ -178,8 +178,8 @@ secmod_handleReload(SECMODModule *oldModule, SECMODModule *newModule)
 	char *oldModuleSpec;
 
 	if (secmod_IsInternalKeySlot(newModule)) {
-	    pk11_SetInternalKeySlot(slot);
-	}
+	    pk11_SetInternalKeySlotIfFirst(slot);
+	} 
 	newID = slot->slotID;
 	PK11_FreeSlot(slot);
 	for (thisChild=children, thisID=ids; thisChild && *thisChild; 
@@ -550,6 +550,11 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
 	    /* look down the slot info table */
 	    PK11_LoadSlotList(mod->slots[i],mod->slotInfo,mod->slotInfoCount);
 	    SECMOD_SetRootCerts(mod->slots[i],mod);
+	    /* explicitly mark the internal slot as such if IsInternalKeySlot()
+	     * is set */
+	    if (secmod_IsInternalKeySlot(mod) && (i == (mod->isFIPS ? 0 : 1))) {
+		pk11_SetInternalKeySlotIfFirst(mod->slots[i]);
+	    } 
 	}
 	mod->slotCount = slotCount;
 	mod->slotInfoCount = 0;
diff --git a/security/nss/lib/pk11wrap/pk11pars.c b/security/nss/lib/pk11wrap/pk11pars.c
index 585508475302..5b50580b17ea 100644
--- a/security/nss/lib/pk11wrap/pk11pars.c
+++ b/security/nss/lib/pk11wrap/pk11pars.c
@@ -258,6 +258,19 @@ secmod_IsInternalKeySlot(SECMODModule *mod)
    return (flags & SECMOD_FLAG_INTERNAL_KEY_SLOT) ? PR_TRUE : PR_FALSE;
 }
 
+void
+secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val)
+{
+   char flags = (char) mod->internal;
+
+   if (val)  {
+	flags |= SECMOD_FLAG_INTERNAL_KEY_SLOT;
+   } else {
+	flags &= ~SECMOD_FLAG_INTERNAL_KEY_SLOT;
+   }
+   mod->internal = flags;
+}
+
 /* forward declarations */
 static int secmod_escapeSize(const char *string, char quote);
 static char *secmod_addEscape(const char *string, char quote);
diff --git a/security/nss/lib/pk11wrap/pk11priv.h b/security/nss/lib/pk11wrap/pk11priv.h
index 6f88e933052e..0ce3c5e9e561 100644
--- a/security/nss/lib/pk11wrap/pk11priv.h
+++ b/security/nss/lib/pk11wrap/pk11priv.h
@@ -115,6 +115,8 @@ void PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot);
 PRBool PK11_NeedPWInitForSlot(PK11SlotInfo *slot);
 SECStatus PK11_ReadSlotCerts(PK11SlotInfo *slot);
 void pk11_SetInternalKeySlot(PK11SlotInfo *slot);
+PK11SlotInfo *pk11_SwapInternalKeySlot(PK11SlotInfo *slot);
+void pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot);
 
 /*********************************************************************
  *       Mechanism Mapping functions
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c
index 2175ff30c1d4..65d807d0f30a 100644
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -1349,7 +1349,7 @@ pk11_isRootSlot(PK11SlotInfo *slot)
  * times as tokens are removed and re-inserted.
  */
 void
-PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot)
+PK11_InitSlot(SECMODModule *mod, CK_SLOT_ID slotID, PK11SlotInfo *slot)
 {
     SECStatus rv;
     char *tmp;
@@ -1726,6 +1726,12 @@ PK11_NeedUserInit(PK11SlotInfo *slot)
 }
 
 static PK11SlotInfo *pk11InternalKeySlot = NULL;
+
+/*
+ * Set a new default internal keyslot. If one has already been set, clear it.
+ * Passing NULL falls back to the NSS normally selected default internal key
+ * slot.
+ */
 void
 pk11_SetInternalKeySlot(PK11SlotInfo *slot)
 {
@@ -1735,6 +1741,32 @@ pk11_SetInternalKeySlot(PK11SlotInfo *slot)
    pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
 }
 
+/*
+ * Set a new default internal keyslot if the normal key slot has not already
+ * been overridden. Subsequent calls to this function will be ignored unless
+ * pk11_SetInternalKeySlot is used to clear the current default.
+ */
+void
+pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot)
+{
+   if (pk11InternalKeySlot) {
+	return;
+   }
+   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
+}
+
+/*
+ * Swap out a default internal keyslot.  Caller owns the Slot Reference
+ */
+PK11SlotInfo *
+pk11_SwapInternalKeySlot(PK11SlotInfo *slot)
+{
+   PK11SlotInfo *swap = pk11InternalKeySlot;
+
+   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
+   return swap;
+}
+
 
 /* get the internal key slot. FIPS has only one slot for both key slots and
  * default slots */
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index f8828d4652e2..03d3c09d993e 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -483,13 +483,25 @@ SECMOD_DeleteInternalModule(const char *name)
 				NULL, SECMOD_FIPS_FLAGS);
 	}
 	if (newModule) {
+	    PK11SlotInfo *slot;
 	    newModule->libraryParams = 
 	     PORT_ArenaStrdup(newModule->arena,mlp->module->libraryParams);
+	    /* if an explicit internal key slot has been set, reset it */
+	    slot = pk11_SwapInternalKeySlot(NULL);
+	    if (slot) {
+		secmod_SetInternalKeySlotFlag(newModule, PR_TRUE);
+	    }
 	    rv = SECMOD_AddModule(newModule);
 	    if (rv != SECSuccess) {
+		/* load failed, restore the internal key slot */
+		pk11_SetInternalKeySlot(slot);
 		SECMOD_DestroyModule(newModule);
 		newModule = NULL;
 	    }
+	    /* free the old explicit internal key slot, we now have a new one */
+	    if (slot) {
+		PK11_FreeSlot(slot);
+	    }
 	}
 	if (newModule == NULL) {
 	    SECMODModuleList *last = NULL,*mlp2;
diff --git a/security/nss/lib/pk11wrap/secmodi.h b/security/nss/lib/pk11wrap/secmodi.h
index b67e6df99a30..168d99719662 100644
--- a/security/nss/lib/pk11wrap/secmodi.h
+++ b/security/nss/lib/pk11wrap/secmodi.h
@@ -90,6 +90,8 @@ SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule);
 SECStatus SECMOD_UnloadModule(SECMODModule *);
 void SECMOD_SetInternalModule(SECMODModule *);
 PRBool secmod_IsInternalKeySlot(SECMODModule *);
+void secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val);
+
 
 /* tools for checking if we are loading the same database twice */
 typedef struct SECMODConfigListStr SECMODConfigList;
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
index 6830a7840991..b13a05ee1b14 100644
--- a/security/nss/lib/pki/pki3hack.c
+++ b/security/nss/lib/pki/pki3hack.c
@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100 $ $Date: 2010/05/18 19:38:40 $";
+static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100.2.1 $ $Date: 2011/03/26 16:55:01 $";
 #endif /* DEBUG */
 
 /*
@@ -1215,6 +1215,98 @@ done:
     return nssrv;
 }
 
+/*
+** Delete trust objects matching the given slot.
+** Returns error if a device fails to delete.
+**
+** This function has the side effect of moving the
+** surviving entries to the front of the object list
+** and nullifying the rest.
+*/
+static PRStatus
+DeleteCertTrustMatchingSlot(PK11SlotInfo *pk11slot, nssPKIObject *tObject)
+{
+    int numNotDestroyed = 0;     /* the ones skipped plus the failures */
+    int failureCount = 0;        /* actual deletion failures by devices */
+    int index;
+
+    nssPKIObject_Lock(tObject);
+    /* Keep going even if a module fails to delete. */
+    for (index = 0; index < tObject->numInstances; index++) {
+	nssCryptokiObject *instance = tObject->instances[index];
+	if (!instance) {
+	    continue;
+	}
+
+	/* ReadOnly and not matched treated the same */
+	if (PK11_IsReadOnly(instance->token->pk11slot) ||
+	    pk11slot != instance->token->pk11slot) {
+	    tObject->instances[numNotDestroyed++] = instance;
+	    continue;
+	}
+
+	/* Here we have found a matching one */
+	tObject->instances[index] = NULL;
+	if (nssToken_DeleteStoredObject(instance) == PR_SUCCESS) {
+	    nssCryptokiObject_Destroy(instance);
+	} else {
+	    tObject->instances[numNotDestroyed++] = instance;
+	    failureCount++;
+	}
+
+    }
+    if (numNotDestroyed == 0) {
+    	nss_ZFreeIf(tObject->instances);
+    	tObject->numInstances = 0;
+    } else {
+    	tObject->numInstances = numNotDestroyed;
+    }
+
+    nssPKIObject_Unlock(tObject);
+
+    return failureCount == 0 ? PR_SUCCESS : PR_FAILURE;
+}
+
+/*
+** Delete trust objects matching the slot of the given certificate.
+** Returns an error if any device fails to delete. 
+*/
+NSS_EXTERN PRStatus
+STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c)
+{
+    PRStatus nssrv = PR_SUCCESS;
+
+    NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
+    NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
+    /* caller made sure nssTrust isn't NULL */
+    nssPKIObject *tobject = &nssTrust->object;
+    nssPKIObject *cobject = &c->object;
+    int i;
+
+    /* Iterate through the cert and trust object instances looking for
+     * those with matching pk11 slots to delete. Even if some device
+     * can't delete we keep going. Keeping a status variable for the
+     * loop so that once it's failed the other gets set.
+     */
+    NSSRWLock_LockRead(td->tokensLock);
+    nssPKIObject_Lock(cobject);
+    for (i = 0; i < cobject->numInstances; i++) {
+	nssCryptokiObject *cInstance = cobject->instances[i];
+	if (cInstance && !PK11_IsReadOnly(cInstance->token->pk11slot)) {
+		PRStatus status;
+	    if (!tobject->numInstances || !tobject->instances) continue;
+	    status = DeleteCertTrustMatchingSlot(cInstance->token->pk11slot, tobject);
+	    if (status == PR_FAILURE) {
+	    	/* set the outer one but keep going */
+	    	nssrv = PR_FAILURE;
+	    }
+	}
+    }
+    nssPKIObject_Unlock(cobject);
+    NSSRWLock_UnlockRead(td->tokensLock);
+    return nssrv;
+}
+
 /* CERT_TraversePermCertsForSubject */
 NSS_IMPLEMENT PRStatus
 nssTrustDomain_TraverseCertificatesBySubject (
diff --git a/security/nss/lib/pki/pki3hack.h b/security/nss/lib/pki/pki3hack.h
index 3920f79c0938..b9ce7f7c6ff2 100644
--- a/security/nss/lib/pki/pki3hack.h
+++ b/security/nss/lib/pki/pki3hack.h
@@ -38,7 +38,7 @@
 #define PKINSS3HACK_H
 
 #ifdef DEBUG
-static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19 $ $Date: 2005/01/20 02:25:49 $";
+static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19.192.1 $ $Date: 2011/03/26 16:55:01 $";
 #endif /* DEBUG */
 
 #ifndef NSSDEVT_H
@@ -106,6 +106,9 @@ STAN_GetNSSCertificate(CERTCertificate *c);
 NSS_EXTERN CERTCertTrust * 
 nssTrust_GetCERTCertTrustForCert(NSSCertificate *c, CERTCertificate *cc);
 
+NSS_EXTERN PRStatus
+STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c);
+
 NSS_EXTERN PRStatus
 STAN_ChangeCertTrust(CERTCertificate *cc, CERTCertTrust *trust);
 
diff --git a/security/nss/lib/smime/cms.h b/security/nss/lib/smime/cms.h
index f993cf0c13a0..896408f72b5a 100644
--- a/security/nss/lib/smime/cms.h
+++ b/security/nss/lib/smime/cms.h
@@ -37,7 +37,7 @@
 /*
  * Interfaces of the CMS implementation.
  *
- * $Id: cms.h,v 1.23 2010/04/25 23:37:38 nelson%bolyard.com Exp $
+ * $Id: cms.h,v 1.23.2.3 2011/02/11 16:44:02 emaldona%redhat.com Exp $
  */
 
 #ifndef _CMS_H_
@@ -302,6 +302,14 @@ NSS_CMSContentInfo_SetContent_DigestedData(NSSCMSMessage *cmsg, NSSCMSContentInf
 extern SECStatus
 NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSEncryptedData *encd);
 
+/*
+ * turn off streaming for this content type.
+ * This could fail with SEC_ERROR_NO_MEMORY in memory constrained conditions.
+ */
+extern SECStatus
+NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream);
+
+
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -1128,6 +1136,51 @@ NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut,
                  PLArenaPool *arena);
 
 
+/************************************************************************
+ * 
+ ************************************************************************/
+
+/*
+ *  define new S/MIME content type entries
+ *
+ *  S/MIME uses the builtin PKCS7 oid types for encoding and decoding the
+ *  various S/MIME content. Some applications have their own content type
+ *  which is different from the standard content type defined by S/MIME.
+ *
+ *  This function allows you to register new content types. There are basically
+ *  Two different types of content, Wrappping content, and Data.
+ *
+ *  For data types, All the functions below can be zero or NULL excext 
+ *  type and is isData, which should be your oid tag and PR_FALSE respectively
+ *
+ *  For wrapping types, everything must be provided, or you will get encoder
+ *  failures.
+ *
+ *  If NSS doesn't already define the OID that you need, you can register 
+ *  your own with SECOID_AddEntry.
+ * 
+ *  Once you have defined your new content type, you can pass your new content
+ *  type to NSS_CMSContentInfo_SetContent().
+ * 
+ *  If you are using a wrapping type you can pass your own data structure in 
+ *  the ptr field, but it must contain and embedded NSSCMSGenericWrappingData 
+ *  structure as the first element. The size you pass to 
+ *  NSS_CMSType_RegisterContentType is the total size of your self defined 
+ *  data structure. NSS_CMSContentInfo_GetContent will return that data 
+ *  structure from the content info. Your ASN1Template will be evaluated 
+ *  against that data structure.
+ */
+SECStatus NSS_CMSType_RegisterContentType(SECOidTag type,
+                          SEC_ASN1Template *asn1Template, size_t size,
+                          NSSCMSGenericWrapperDataDestroy  destroy,
+                          NSSCMSGenericWrapperDataCallback decode_before,
+                          NSSCMSGenericWrapperDataCallback decode_after,
+                          NSSCMSGenericWrapperDataCallback decode_end,
+                          NSSCMSGenericWrapperDataCallback encode_start,
+                          NSSCMSGenericWrapperDataCallback encode_before,
+                          NSSCMSGenericWrapperDataCallback encode_after,
+                          PRBool isData);
+
 /************************************************************************/
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/smime/cmsasn1.c b/security/nss/lib/smime/cmsasn1.c
index 8d8e3e711639..d924528a594c 100644
--- a/security/nss/lib/smime/cmsasn1.c
+++ b/security/nss/lib/smime/cmsasn1.c
@@ -37,7 +37,7 @@
 /*
  * CMS ASN.1 templates
  *
- * $Id: cmsasn1.c,v 1.7 2010/06/06 22:36:35 nelson%bolyard.com Exp $
+ * $Id: cmsasn1.c,v 1.7.2.2 2011/02/01 00:33:23 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -479,6 +479,20 @@ const SEC_ASN1Template NSS_PointerToCMSEncryptedDataTemplate[] = {
     { SEC_ASN1_POINTER, 0, NSSCMSEncryptedDataTemplate }
 };
 
+const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[] = {
+    { SEC_ASN1_INLINE,
+	  offsetof(NSSCMSGenericWrapperData,contentInfo),
+	  NSSCMSEncapsulatedContentInfoTemplate },
+};
+
+SEC_ASN1_CHOOSER_IMPLEMENT(NSSCMSGenericWrapperDataTemplate);
+
+const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[] = {
+    { SEC_ASN1_POINTER, 0, NSSCMSGenericWrapperDataTemplate }
+};
+
+SEC_ASN1_CHOOSER_IMPLEMENT(NSS_PointerToCMSGenericWrapperDataTemplate);
+
 /* -----------------------------------------------------------------------------
  * FORTEZZA KEA
  */
@@ -547,15 +561,17 @@ nss_cms_choose_content_template(void *src_or_dest, PRBool encoding)
 {
     const SEC_ASN1Template *theTemplate;
     NSSCMSContentInfo *cinfo;
+    SECOidTag type;
 
     PORT_Assert (src_or_dest != NULL);
     if (src_or_dest == NULL)
 	return NULL;
 
     cinfo = (NSSCMSContentInfo *)src_or_dest;
-    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
+    type = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
+    switch (type) {
     default:
-	theTemplate = SEC_ASN1_GET(SEC_PointerToAnyTemplate);
+	theTemplate = NSS_CMSType_GetTemplate(type);
 	break;
     case SEC_OID_PKCS7_DATA:
 	theTemplate = SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
diff --git a/security/nss/lib/smime/cmscinfo.c b/security/nss/lib/smime/cmscinfo.c
index b1f1d1df7b6e..bd1cc85b6dae 100644
--- a/security/nss/lib/smime/cmscinfo.c
+++ b/security/nss/lib/smime/cmscinfo.c
@@ -37,7 +37,7 @@
 /*
  * CMS contentInfo methods.
  *
- * $Id: cmscinfo.c,v 1.7 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmscinfo.c,v 1.7.192.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -47,11 +47,37 @@
 #include "secoid.h"
 #include "secerr.h"
 
+
 /*
  * NSS_CMSContentInfo_Create - create a content info
  *
  * version is set in the _Finalize procedures for each content type
  */
+SECStatus
+NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo)
+{
+    if (cinfo->privateInfo) {
+	return SECSuccess;
+    }
+    cinfo->privateInfo = PORT_ZNew(NSSCMSContentInfoPrivate);
+    return (cinfo->privateInfo) ? SECSuccess : SECFailure;
+}
+
+
+static void
+nss_cmsContentInfo_private_destroy(NSSCMSContentInfoPrivate *privateInfo)
+{
+    if (privateInfo->digcx) {
+	/* must destroy digest objects */
+	NSS_CMSDigestContext_Cancel(privateInfo->digcx);
+	privateInfo->digcx = NULL;
+    }
+    if (privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(privateInfo->ciphcx);
+	privateInfo->ciphcx = NULL;
+    }
+    PORT_Free(privateInfo);
+}
 
 /*
  * NSS_CMSContentInfo_Destroy - destroy a CMS contentInfo and all of its sub-pieces.
@@ -76,23 +102,17 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 	NSS_CMSDigestedData_Destroy(cinfo->content.digestedData);
 	break;
       default:
+	NSS_CMSGenericWrapperData_Destroy(kind, cinfo->content.genericData);
 	/* XXX Anything else that needs to be "manually" freed/destroyed? */
 	break;
     }
-    if (cinfo->digcx) {
-	/* must destroy digest objects */
-	NSS_CMSDigestContext_Cancel(cinfo->digcx);
-	cinfo->digcx = NULL;
+    if (cinfo->privateInfo) {
+	nss_cmsContentInfo_private_destroy(cinfo->privateInfo);
+	cinfo->privateInfo = NULL;
     }
-    if (cinfo->bulkkey)
+    if (cinfo->bulkkey) {
 	PK11_FreeSymKey(cinfo->bulkkey);
-
-    if (cinfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(cinfo->ciphcx);
-	cinfo->ciphcx = NULL;
     }
-    
-    /* we live in a pool, so no need to worry about storage */
 }
 
 /*
@@ -101,31 +121,56 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 NSSCMSContentInfo *
 NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
 {
-    void * ptr                  = NULL;
     NSSCMSContentInfo * ccinfo  = NULL;
     SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
     switch (tag) {
     case SEC_OID_PKCS7_SIGNED_DATA:
-	ptr    = (void *)cinfo->content.signedData;
-	ccinfo = &(cinfo->content.signedData->contentInfo);
+	if (cinfo->content.signedData != NULL) {
+	    ccinfo = &(cinfo->content.signedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_ENVELOPED_DATA:
-	ptr    = (void *)cinfo->content.envelopedData;
-	ccinfo = &(cinfo->content.envelopedData->contentInfo);
+	if (cinfo->content.envelopedData != NULL) {
+	    ccinfo = &(cinfo->content.envelopedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_DIGESTED_DATA:
-	ptr    = (void *)cinfo->content.digestedData;
-	ccinfo = &(cinfo->content.digestedData->contentInfo);
+	if (cinfo->content.digestedData != NULL) {
+	    ccinfo = &(cinfo->content.digestedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
-	ptr    = (void *)cinfo->content.encryptedData;
-	ccinfo = &(cinfo->content.encryptedData->contentInfo);
+	if (cinfo->content.encryptedData != NULL) {
+	    ccinfo = &(cinfo->content.encryptedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_DATA:
     default:
+	if (NSS_CMSType_IsWrapper(tag)) {
+	    if (cinfo->content.genericData != NULL) {
+	       ccinfo = &(cinfo->content.genericData->contentInfo);
+	    }
+	}
 	break;
     }
-    return (ptr ? ccinfo : NULL);
+    if (ccinfo && !ccinfo->privateInfo) {
+	NSS_CMSContentInfo_Private_Init(ccinfo);
+    }
+    return ccinfo;
+}
+
+SECStatus
+NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
+{
+   SECStatus rv;
+
+   rv = NSS_CMSContentInfo_Private_Init(cinfo);
+   if (rv != SECSuccess) {
+	/* default is streaming, failure to get ccinfo will not effect this */
+	return dontStream ? SECFailure :  SECSuccess ;
+   }
+   cinfo->privateInfo->dontStream = dontStream;
+   return SECSuccess;
 }
 
 /*
@@ -147,7 +192,9 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, SEC
 
     cinfo->content.pointer = ptr;
 
-    if (type != SEC_OID_PKCS7_DATA) {
+    if (NSS_CMSType_IsData(type) && ptr) {
+	cinfo->rawContent = ptr;
+    } else {
 	/* as we always have some inner data,
 	 * we need to set it to something, just to fool the encoder enough to work on it
 	 * and get us into nss_cms_encoder_notify at that point */
@@ -174,9 +221,10 @@ NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo
 {
     if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
 	return SECFailure;
-    cinfo->rawContent = (detached) ? 
-			    NULL : (data) ? 
-				data : SECITEM_AllocItem(cmsg->poolp, NULL, 1);
+    if (detached) {
+        cinfo->rawContent = NULL;
+    }
+	
     return SECSuccess;
 }
 
@@ -204,6 +252,7 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
     return NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_ENCRYPTED_DATA, (void *)encd);
 }
 
+
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -223,7 +272,7 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	return cinfo->content.pointer;
     default:
-	return NULL;
+	return NSS_CMSType_IsWrapper(tag) ? cinfo->content.pointer : (NSS_CMSType_IsData(tag) ? cinfo->rawContent : NULL);
     }
 }
 
@@ -232,6 +281,7 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
  *
  * this is typically only called by NSS_CMSMessage_GetContent()
  */
+
 SECItem *
 NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
 {
@@ -240,26 +290,21 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
     SECItem           *pItem = NULL;
 
     tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    switch (tag) {
-    case SEC_OID_PKCS7_DATA:
-	/* end of recursion - every message has to have a data cinfo */
+    if (NSS_CMSType_IsData(tag)) {
 	pItem = cinfo->content.data; 
-	break;
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_SIGNED_DATA:
+    } else if (NSS_CMSType_IsWrapper(tag)) {
 	ccinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo);
-	if (ccinfo != NULL)
+	if (ccinfo != NULL) {
 	    pItem = NSS_CMSContentInfo_GetContent(ccinfo);
-	break;
-    default:
+	}
+    } else {
 	PORT_Assert(0);
-	break;
     }
+
     return pItem;
 }
 
+
 /*
  * NSS_CMSContentInfo_GetContentType{Tag,OID} - find out (saving pointer to lookup result
  * for future reference) and return the inner content type.
diff --git a/security/nss/lib/smime/cmsdecode.c b/security/nss/lib/smime/cmsdecode.c
index 1be5a3e352c8..79299dd793ed 100644
--- a/security/nss/lib/smime/cmsdecode.c
+++ b/security/nss/lib/smime/cmsdecode.c
@@ -37,7 +37,7 @@
 /*
  * CMS decoding.
  *
- * $Id: cmsdecode.c,v 1.9.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
+ * $Id: cmsdecode.c,v 1.9.66.4 2011/03/15 17:51:01 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -120,8 +120,7 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 #endif
 
     /* so what are we working on right now? */
-    switch (p7dcx->type) {
-    case SEC_OID_UNKNOWN:
+    if (p7dcx->type == SEC_OID_UNKNOWN) {
 	/*
 	 * right now, we are still decoding the OUTER (root) cinfo
 	 * As soon as we know the inner content type, set up the info,
@@ -136,8 +135,7 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 	    /* is this ready already ? need to alloc? */
 	    /* XXX yes we need to alloc -- continue here */
 	}
-	break;
-    case SEC_OID_PKCS7_DATA:
+    } else if (NSS_CMSType_IsData(p7dcx->type)) {
 	/* this can only happen if the outermost cinfo has DATA in it */
 	/* otherwise, we handle this type implicitely in the inner decoders */
 
@@ -150,86 +148,71 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 					  nss_cms_decoder_update_filter,
 					  p7dcx,
 					  (PRBool)(p7dcx->cb != NULL));
-	    break;
-	}
-
-	if (after && dest == &(rootcinfo->content.data)) {
+	} else if (after && dest == &(rootcinfo->content.data)) {
 	    /* remove the filter */
 	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
 	}
-	break;
+    } else if (NSS_CMSType_IsWrapper(p7dcx->type)) {
+	if (!before || dest != &(rootcinfo->content)) {
 
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+	    if (p7dcx->content.pointer == NULL)
+		p7dcx->content = rootcinfo->content;
 
-	if (before && dest == &(rootcinfo->content))
-	    break;     /* we're not there yet */
-
-	if (p7dcx->content.pointer == NULL)
-	    p7dcx->content = rootcinfo->content;
-
-	/* get this data type's inner contentInfo */
-	cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
+	    /* get this data type's inner contentInfo */
+	    cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
 	                                      p7dcx->type);
 
-	if (before && dest == &(cinfo->contentType)) {
-	    /* at this point, set up the &%$&$ back pointer */
-	    /* we cannot do it later, because the content itself is optional! */
-	    /* please give me C++ */
-	    switch (p7dcx->type) {
-	    case SEC_OID_PKCS7_SIGNED_DATA:
-		p7dcx->content.signedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_DIGESTED_DATA:
-		p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_ENVELOPED_DATA:
-		p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-		p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
-		break;
-	    default:
-		PORT_Assert(0);
-		break;
+	    if (before && dest == &(cinfo->contentType)) {
+	        /* at this point, set up the &%$&$ back pointer */
+	        /* we cannot do it later, because the content itself 
+		 * is optional! */
+		switch (p7dcx->type) {
+		case SEC_OID_PKCS7_SIGNED_DATA:
+		    p7dcx->content.signedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_DIGESTED_DATA:
+		    p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_ENVELOPED_DATA:
+		    p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_ENCRYPTED_DATA:
+		    p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
+		    break;
+		default:
+		    p7dcx->content.genericData->cmsg = p7dcx->cmsg;
+		    break;
+		}
 	    }
-	}
 
-	if (before && dest == &(cinfo->rawContent)) {
-	    /* we want the ASN.1 decoder to deliver the decoded bytes to us 
-	    ** from now on 
-	    */
-	    SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
+	    if (before && dest == &(cinfo->rawContent)) {
+		/* we want the ASN.1 decoder to deliver the decoded bytes to us 
+		 ** from now on 
+		 */
+		SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
 	                                 nss_cms_decoder_update_filter, 
 					 p7dcx, (PRBool)(p7dcx->cb != NULL));
 
 
-	    /* we're right in front of the data */
-	    if (nss_cms_before_data(p7dcx) != SECSuccess) {
-		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
-		/* stop all processing */
-		p7dcx->error = PORT_GetError();
+		/* we're right in front of the data */
+		if (nss_cms_before_data(p7dcx) != SECSuccess) {
+		    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
+		    /* stop all processing */
+		    p7dcx->error = PORT_GetError();
+		}
+	    }
+	    if (after && dest == &(cinfo->rawContent)) {
+		/* we're right after of the data */
+		if (nss_cms_after_data(p7dcx) != SECSuccess)
+		    p7dcx->error = PORT_GetError();
+
+		/* we don't need to see the contents anymore */
+		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
 	    }
 	}
-	if (after && dest == &(cinfo->rawContent)) {
-	    /* we're right after of the data */
-	    if (nss_cms_after_data(p7dcx) != SECSuccess)
-		p7dcx->error = PORT_GetError();
-
-	    /* we don't need to see the contents anymore */
-	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
-	}
-	break;
-
-#if 0 /* NIH */
-    case SEC_OID_PKCS7_AUTHENTICATED_DATA:
-#endif
-    default:
+    } else {
 	/* unsupported or unknown message type - fail  gracefully */
 	p7dcx->error = SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE;
-	break;
     }
 }
 
@@ -269,7 +252,8 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
 	                             p7dcx->content.encryptedData);
 	break;
     default:
-	return SECFailure;
+	rv = NSS_CMSGenericWrapperData_Decode_BeforeData(p7dcx->type,
+				p7dcx->content.genericData);
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -280,7 +264,7 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, p7dcx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    if (childtype == SEC_OID_PKCS7_DATA) {
+    if (NSS_CMSType_IsData(childtype)) {
 	cinfo->content.pointer = (void *) nss_cms_create_decoder_data(poolp);
 	if (cinfo->content.pointer == NULL)
 	    /* set memory error */
@@ -307,6 +291,9 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     if (childp7dcx->content.pointer == NULL)
 	goto loser;
 
+    /* give the parent a copy of the pointer so that it doesn't get lost */
+    cinfo->content.pointer = childp7dcx->content.pointer;
+
     /* start the child decoder */
     childp7dcx->dcx = SEC_ASN1DecoderStart(poolp, childp7dcx->content.pointer, 
                                            template);
@@ -395,7 +382,8 @@ nss_cms_after_data(NSSCMSDecoderContext *p7dcx)
 	/* do nothing */
 	break;
     default:
-	rv = SECFailure;
+	rv = NSS_CMSGenericWrapperData_Decode_AfterData(p7dcx->type,
+	                            p7dcx->content.genericData);
 	break;
     }
 done:
@@ -430,7 +418,8 @@ nss_cms_after_end(NSSCMSDecoderContext *p7dcx)
     case SEC_OID_PKCS7_DATA:
 	break;
     default:
-	rv = SECFailure;	/* we should not have got that far... */
+	rv = NSS_CMSGenericWrapperData_Decode_AfterEnd(p7dcx->type,
+	                               p7dcx->content.genericData);
 	break;
     }
     return rv;
@@ -469,7 +458,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	goto loser;
     }
 
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	/*
 	 * we are decrypting.
 	 * 
@@ -483,7 +472,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	unsigned int buflen;		/* length available for decrypted data */
 
 	/* find out about the length of decrypted data */
-	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->ciphcx, len, final);
+	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->privateInfo->ciphcx, len, final);
 
 	/*
 	 * it might happen that we did not provide enough data for a full
@@ -514,7 +503,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	 * any output (see above), but we still need to call NSS_CMSCipherContext_Decrypt to
 	 * keep track of incoming data
 	 */
-	rv = NSS_CMSCipherContext_Decrypt(cinfo->ciphcx, buf, &outlen, buflen,
+	rv = NSS_CMSCipherContext_Decrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
 			       data, len, final);
 	if (rv != SECSuccess) {
 	    p7dcx->error = PORT_GetError();
@@ -534,8 +523,8 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
     /*
      * Update the running digests with plaintext bytes (if we need to).
      */
-    if (cinfo->digcx)
-	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
+    if (cinfo->privateInfo && cinfo->privateInfo->digcx)
+	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
 
     /* at this point, we have the plain decoded & decrypted data 
     ** which is either more encoded DER (which we need to hand to the child 
diff --git a/security/nss/lib/smime/cmsdigdata.c b/security/nss/lib/smime/cmsdigdata.c
index 41eefe3c4da7..47f5a4ceb4f4 100644
--- a/security/nss/lib/smime/cmsdigdata.c
+++ b/security/nss/lib/smime/cmsdigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS digestedData methods.
  *
- * $Id: cmsdigdata.c,v 1.5 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmsdigdata.c,v 1.5.192.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -117,7 +117,8 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
     SECItem *dummy;
 
     version = NSS_CMS_DIGESTED_DATA_VERSION_DATA;
-    if (NSS_CMSContentInfo_GetContentTypeTag(&(digd->contentInfo)) != SEC_OID_PKCS7_DATA)
+    if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(
+							&(digd->contentInfo))))
 	version = NSS_CMS_DIGESTED_DATA_VERSION_ENCAP;
 
     dummy = SEC_ASN1EncodeInteger(digd->cmsg->poolp, &(digd->version), version);
@@ -134,11 +135,16 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Encode_BeforeData(NSSCMSDigestedData *digd)
 {
+    SECStatus rv =NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
+    if (rv != SECSuccess)  {
+	return SECFailure;
+    }
+
     /* set up the digests */
     if (digd->digestAlg.algorithm.len != 0 && digd->digest.len == 0) {
 	/* if digest is already there, do nothing */
-	digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-	if (digd->contentInfo.digcx == NULL)
+	digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+	if (digd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -156,12 +162,12 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
+    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->digest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.digcx = NULL;
+	digd->contentInfo.privateInfo->digcx = NULL;
     }
 
     return rv;
@@ -177,12 +183,19 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Decode_BeforeData(NSSCMSDigestedData *digd)
 {
+    SECStatus rv;
+
     /* is there a digest algorithm yet? */
     if (digd->digestAlg.algorithm.len == 0)
 	return SECFailure;
 
-    digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-    if (digd->contentInfo.digcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
+
+    digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+    if (digd->contentInfo.privateInfo->digcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -200,12 +213,12 @@ NSS_CMSDigestedData_Decode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
+    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->cdigest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.digcx = NULL;
+	digd->contentInfo.privateInfo->digcx = NULL;
     }
 
     return rv;
diff --git a/security/nss/lib/smime/cmsencdata.c b/security/nss/lib/smime/cmsencdata.c
index 6b6a5e1b6457..29d8e39dec9a 100644
--- a/security/nss/lib/smime/cmsencdata.c
+++ b/security/nss/lib/smime/cmsencdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS encryptedData methods.
  *
- * $Id: cmsencdata.c,v 1.11 2008/02/03 06:08:49 nelson%bolyard.com Exp $
+ * $Id: cmsencdata.c,v 1.11.56.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -181,6 +181,7 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
+    SECStatus rv;
 
     cinfo = &(encd->contentInfo);
 
@@ -192,12 +193,16 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     if (algid == NULL)
 	return SECFailure;
 
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* this may modify algid (with IVs generated in a token).
      * it is therefore essential that algid is a pointer to the "real" contentEncAlg,
      * not just to a copy */
-    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->ciphcx == NULL)
+    if (cinfo->privateInfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -209,9 +214,9 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
 SECStatus
 NSS_CMSEncryptedData_Encode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
-	encd->contentInfo.ciphcx = NULL;
+    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
+	encd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     /* nothing to do after data */
@@ -244,8 +249,14 @@ NSS_CMSEncryptedData_Decode_BeforeData(NSSCMSEncryptedData *encd)
 
     NSS_CMSContentInfo_SetBulkKey(cinfo, bulkkey);
 
-    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->ciphcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	goto loser;
+    }
+    rv = SECFailure;
+
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->privateInfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -264,9 +275,9 @@ loser:
 SECStatus
 NSS_CMSEncryptedData_Decode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
-	encd->contentInfo.ciphcx = NULL;
+    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
+	encd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmsencode.c b/security/nss/lib/smime/cmsencode.c
index 0ba5d4150eb2..7e6f036397d8 100644
--- a/security/nss/lib/smime/cmsencode.c
+++ b/security/nss/lib/smime/cmsencode.c
@@ -37,7 +37,7 @@
 /*
  * CMS encoding.
  *
- * $Id: cmsencode.c,v 1.6.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
+ * $Id: cmsencode.c,v 1.6.66.5 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -92,8 +92,23 @@ nss_cms_encoder_out(void *arg, const char *buf, unsigned long len,
 
 #ifdef CMSDEBUG
     int i;
+    const char *data_name = "unknown";
 
-    fprintf(stderr, "kind = %d, depth = %d, len = %d\n", data_kind, depth, len);
+    switch (data_kind) {
+    case SEC_ASN1_Identifier:
+        data_name = "identifier";
+        break;
+    case SEC_ASN1_Length:
+        data_name = "length";
+        break;
+    case SEC_ASN1_Contents:
+        data_name = "contents";
+        break;
+    case SEC_ASN1_EndOfContents:
+        data_name = "end-of-contents";
+        break;
+    }
+    fprintf(stderr, "kind = %s, depth = %d, len = %d\n", data_name, depth, len);
     for (i=0; i < len; i++) {
 	fprintf(stderr, " %02x%s", (unsigned int)buf[i] & 0xff, ((i % 16) == 15) ? "\n" : "");
     }
@@ -159,34 +174,17 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
      * Watch for the content field, at which point we want to instruct
      * the ASN.1 encoder to start taking bytes from the buffer.
      */
-    switch (p7ecx->type) {
-    default:
-    case SEC_OID_UNKNOWN:
-	/* we're still in the root message */
-	if (after && dest == &(rootcinfo->contentType)) {
-	    /* got the content type OID now - so find out the type tag */
-	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
-	    /* set up a pointer to our current content */
-	    p7ecx->content = rootcinfo->content;
-	}
-	break;
-
-    case SEC_OID_PKCS7_DATA:
-	if (before && dest == &(rootcinfo->rawContent)) {
+    if (NSS_CMSType_IsData(p7ecx->type)) {
+	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
+	if (before && dest == &(cinfo->rawContent)) {
 	    /* just set up encoder to grab from user - no encryption or digesting */
-	    if ((item = rootcinfo->content.data) != NULL)
+	    if ((item = cinfo->content.data) != NULL)
 		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
 	    else
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-	break;
-
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-
+    } else if (NSS_CMSType_IsWrapper(p7ecx->type)) {
 	/* when we know what the content is, we encode happily until we reach the inner content */
 	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
@@ -199,19 +197,32 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
 		p7ecx->error = PORT_GetError();
 	}
 	if (before && dest == &(cinfo->rawContent)) {
-	    if (childtype == SEC_OID_PKCS7_DATA && (item = cinfo->content.data) != NULL)
-		/* we have data - feed it in */
-		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
-	    else
-		/* else try to get it from user */
+	    if (p7ecx->childp7ecx == NULL) {
+		if ((NSS_CMSType_IsData(childtype) && (item = cinfo->content.data) != NULL)) {
+		    /* we are the innermost non-data and we have data - feed it in */
+		    (void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
+	        } else {
+		    /* else we'll have to get data from user */
+		    SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
+		}
+	    } else {
+	        /* if we have a nested encoder, wait for its data */
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
+	    }
 	}
 	if (after && dest == &(cinfo->rawContent)) {
 	    if (nss_cms_after_data(p7ecx) != SECSuccess)
 		p7ecx->error = PORT_GetError();
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-	break;
+    } else {
+	/* we're still in the root message */
+	if (after && dest == &(rootcinfo->contentType)) {
+	    /* got the content type OID now - so find out the type tag */
+	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
+	    /* set up a pointer to our current content */
+	    p7ecx->content = rootcinfo->content;
+	}
     }
 }
 
@@ -247,7 +258,11 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	rv = NSS_CMSEncryptedData_Encode_BeforeData(p7ecx->content.encryptedData);
 	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeData(p7ecx->type, p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -258,14 +273,7 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    switch (childtype) {
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-#if 0
-    case SEC_OID_PKCS7_DATA:		/* XXX here also??? maybe yes! */
-#endif
+    if (NSS_CMSType_IsWrapper(childtype)) {
 	/* in these cases, we need to set up a child encoder! */
 	/* create new encoder context */
 	childp7ecx = PORT_ZAlloc(sizeof(NSSCMSEncoderContext));
@@ -284,6 +292,8 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	childp7ecx->output.destpoolp = NULL;
 	childp7ecx->output.dest = NULL;
 	childp7ecx->cmsg = p7ecx->cmsg;
+	childp7ecx->ecxupdated = PR_FALSE;
+	childp7ecx->childp7ecx = NULL;
 
 	template = NSS_CMSUtil_GetTemplateByTypeTag(childtype);
 	if (template == NULL)
@@ -303,11 +313,8 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	    break;
-	case SEC_OID_PKCS7_DATA:
-	    rv = SECSuccess;
-	    break;
 	default:
-	    PORT_Assert(0);
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(childp7ecx->type, cinfo->content.genericData);
 	    break;
 	}
 	if (rv != SECSuccess)
@@ -321,17 +328,17 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	if (childp7ecx->ecx == NULL)
 	    goto loser;
 
-	childp7ecx->ecxupdated = PR_FALSE;
-
 	/*
 	 * Indicate that we are streaming.  We will be streaming until we
 	 * get past the contents bytes.
 	 */
-	SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
+        if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
+	    SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
 
 	/*
 	 * The notify function will watch for the contents field.
 	 */
+	p7ecx->childp7ecx = childp7ecx;
 	SEC_ASN1EncoderSetNotifyProc(childp7ecx->ecx, nss_cms_encoder_notify, childp7ecx);
 
 	/* please note that we are NOT calling SEC_ASN1EncoderUpdate here to kick off the */
@@ -339,22 +346,11 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	/* otherwise we'd be encoding data from a call of the notify function of the */
 	/* parent encoder (which would not work) */
 
-	/* this will kick off the encoding process & encode everything up to the content bytes,
-	 * at which point the notify function sets streaming mode (and possibly creates
-	 * another child encoder). */
-	if (SEC_ASN1EncoderUpdate(childp7ecx->ecx, NULL, 0) != SECSuccess)
-	    goto loser;
-
-	p7ecx->childp7ecx = childp7ecx;
-	break;
-
-    case SEC_OID_PKCS7_DATA:
+    } else if (NSS_CMSType_IsData(childtype)) {
 	p7ecx->childp7ecx = NULL;
-	break;
-    default:
+    } else {
 	/* we do not know this type */
 	p7ecx->error = SEC_ERROR_BAD_DER;
-	break;
     }
 
     return SECSuccess;
@@ -364,6 +360,7 @@ loser:
 	if (childp7ecx->ecx)
 	    SEC_ASN1EncoderFinish(childp7ecx->ecx);
 	PORT_Free(childp7ecx);
+	p7ecx->childp7ecx = NULL;
     }
     return SECFailure;
 }
@@ -387,11 +384,12 @@ nss_cms_after_data(NSSCMSEncoderContext *p7ecx)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	rv = NSS_CMSEncryptedData_Encode_AfterData(p7ecx->content.encryptedData);
 	break;
-    case SEC_OID_PKCS7_DATA:
-	/* do nothing */
-	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_AfterData(p7ecx->type, p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
 	break;
     }
     return rv;
@@ -432,23 +430,23 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
     }
 
     /* Update the running digest. */
-    if (len && cinfo->digcx != NULL)
-	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
+    if (len && cinfo->privateInfo && cinfo->privateInfo->digcx != NULL)
+	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
 
     /* Encrypt this chunk. */
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	unsigned int inlen;	/* length of data being encrypted */
 	unsigned int outlen;	/* length of encrypted data */
 	unsigned int buflen;	/* length available for encrypted data */
 
 	inlen = len;
-	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->ciphcx, inlen, final);
+	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->privateInfo->ciphcx, inlen, final);
 	if (buflen == 0) {
 	    /*
 	     * No output is expected, but the input data may be buffered
 	     * so we still have to call Encrypt.
 	     */
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, NULL, NULL, 0,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, NULL, NULL, 0,
 				   data, inlen, final);
 	    if (final) {
 		len = 0;
@@ -465,7 +463,7 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
 	if (buf == NULL) {
 	    rv = SECFailure;
 	} else {
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, buf, &outlen, buflen,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
 				   data, inlen, final);
 	    data = buf;
 	    len = outlen;
@@ -481,12 +479,12 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
      * (which will encode it, then hand it back to the user or the parent encoder)
      * We don't encode the data if we're innermost and we're told not to include the data
      */
-    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != NULL))
+    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != cinfo->content.pointer))
 	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, (const char *)data, len);
 
 done:
 
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	if (dest != NULL) {
 	    dest->data = buf;
 	    dest->len = len;
@@ -532,6 +530,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     NSSCMSEncoderContext *p7ecx;
     SECStatus rv;
     NSSCMSContentInfo *cinfo;
+    SECOidTag tag;
 
     NSS_CMSMessage_SetEncodingParams(cmsg, pwfn, pwfn_arg, decrypt_key_cb, decrypt_key_cb_arg,
 					detached_digestalgs, detached_digests);
@@ -551,7 +550,8 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 
     cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
 
-    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
+    tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
+    switch (tag) {
     case SEC_OID_PKCS7_SIGNED_DATA:
 	rv = NSS_CMSSignedData_Encode_BeforeStart(cinfo->content.signedData);
 	break;
@@ -565,7 +565,12 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 	rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(tag)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(tag, 
+						p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
 	break;
     }
     if (rv != SECSuccess) {
@@ -587,7 +592,8 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
      * Indicate that we are streaming.  We will be streaming until we
      * get past the contents bytes.
      */
-    SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
+    if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
+	SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
 
     /*
      * The notify function will watch for the contents field.
@@ -597,6 +603,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     /* this will kick off the encoding process & encode everything up to the content bytes,
      * at which point the notify function sets streaming mode (and possibly creates
      * a child encoder). */
+    p7ecx->ecxupdated = PR_TRUE;
     if (SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0) != SECSuccess) {
 	PORT_Free (p7ecx);
 	return NULL;
@@ -627,6 +634,13 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 
     /* hand data to the innermost decoder */
     if (p7ecx->childp7ecx) {
+	/* tell the child to start encoding, up to its first data byte, if it
+	 * hasn't started yet */
+	if (!p7ecx->childp7ecx->ecxupdated) {
+	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
+	    if (SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0) != SECSuccess)
+	        return SECFailure;
+	}
 	/* recursion here */
 	rv = NSS_CMSEncoder_Update(p7ecx->childp7ecx, data, len);
     } else {
@@ -640,7 +654,7 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 	}
 
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-	if (childtype != SEC_OID_PKCS7_DATA)
+	if (!NSS_CMSType_IsData(childtype))
 	    return SECFailure;
 	/* and we must not have preset data */
 	if (cinfo->content.data != NULL)
@@ -721,6 +735,16 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
      * while we are already in NSS_CMSEncoder_Finish, but that's allright.
      */
     if (p7ecx->childp7ecx) {
+	/* tell the child to start encoding, up to its first data byte, if it
+	 * hasn't yet */
+	if (!p7ecx->childp7ecx->ecxupdated) {
+	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
+	    rv = SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0);
+	    if (rv != SECSuccess) {
+		NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
+		goto loser;
+	    }
+	}
 	rv = NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
 	if (rv != SECSuccess)
 	    goto loser;
@@ -737,7 +761,6 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 
     p7ecx->childp7ecx = NULL;
 
-    /* find out about our inner content type - must be data */
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     if (!cinfo) {
 	/* The original programmer didn't expect this to happen */
@@ -745,14 +768,10 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 	rv = SECFailure;
 	goto loser;
     }
-    childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    if (childtype == SEC_OID_PKCS7_DATA && cinfo->content.data == NULL) {
-	SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
-	/* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
-	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
-    }
-
+    SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
     SEC_ASN1EncoderClearStreaming(p7ecx->ecx);
+    /* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
+    rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
 
     if (p7ecx->error)
 	rv = SECFailure;
diff --git a/security/nss/lib/smime/cmsenvdata.c b/security/nss/lib/smime/cmsenvdata.c
index 718844cd7084..1c0c20aade77 100644
--- a/security/nss/lib/smime/cmsenvdata.c
+++ b/security/nss/lib/smime/cmsenvdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS envelopedData methods.
  *
- * $Id: cmsenvdata.c,v 1.11 2005/10/03 22:01:57 relyea%netscape.com Exp $
+ * $Id: cmsenvdata.c,v 1.11.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -270,6 +270,7 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
+    SECStatus rv;
 
     cinfo = &(envd->contentInfo);
 
@@ -281,12 +282,16 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     if (algid == NULL)
 	return SECFailure;
 
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* this may modify algid (with IVs generated in a token).
      * it is essential that algid is a pointer to the contentEncAlg data, not a
      * pointer to a copy! */
-    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->ciphcx == NULL)
+    if (cinfo->privateInfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -298,9 +303,9 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
 SECStatus
 NSS_CMSEnvelopedData_Encode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
-	envd->contentInfo.ciphcx = NULL;
+    if (envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
+	envd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     /* nothing else to do after data */
@@ -380,8 +385,13 @@ NSS_CMSEnvelopedData_Decode_BeforeData(NSSCMSEnvelopedData *envd)
 
     bulkalg = NSS_CMSContentInfo_GetContentEncAlg(cinfo);
 
-    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->ciphcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	goto loser;
+    }
+    rv = SECFailure;
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->privateInfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -401,9 +411,9 @@ loser:
 SECStatus
 NSS_CMSEnvelopedData_Decode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd && envd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
-	envd->contentInfo.ciphcx = NULL;
+    if (envd && envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
+	envd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmslocal.h b/security/nss/lib/smime/cmslocal.h
index 0e1c09294a09..222f90a15d5f 100644
--- a/security/nss/lib/smime/cmslocal.h
+++ b/security/nss/lib/smime/cmslocal.h
@@ -42,7 +42,7 @@
  * you.  If that has a problem, then just move out what you need, changing
  * its name as appropriate!
  *
- * $Id: cmslocal.h,v 1.5 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmslocal.h,v 1.5.142.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #ifndef _CMSLOCAL_H_
@@ -54,9 +54,25 @@
 
 extern const SEC_ASN1Template NSSCMSContentInfoTemplate[];
 
+struct NSSCMSContentInfoPrivateStr {
+    NSSCMSCipherContext *ciphcx;
+    NSSCMSDigestContext *digcx;
+    PRBool  dontStream;
+};
+
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
+/*
+ * private content Info stuff
+ */
+
+/* initialize the private content info field. If this returns
+ * SECSuccess, the cinfo->private field is safe to dereference.
+ */
+SECStatus NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo);
+
+
 /***********************************************************************
  * cmscipher.c - en/decryption routines
  ***********************************************************************/
@@ -340,7 +356,34 @@ NSS_CMSAttributeArray_SetAttr(PLArenaPool *poolp, NSSCMSAttribute ***attrs, SECO
 extern SECStatus
 NSS_CMSSignedData_AddTempCertificate(NSSCMSSignedData *sigd, CERTCertificate *cert);
 
+
 /************************************************************************/
+
+/*
+ * local functions to handle user defined S/MIME content types
+ */
+
+
+PRBool NSS_CMSType_IsWrapper(SECOidTag type);
+PRBool NSS_CMSType_IsData(SECOidTag type);
+size_t NSS_CMSType_GetContentSize(SECOidTag type);
+const SEC_ASN1Template * NSS_CMSType_GetTemplate(SECOidTag type);
+
+void NSS_CMSGenericWrapperData_Destroy(SECOidTag type,
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+
 SEC_END_PROTOS
 
 #endif /* _CMSLOCAL_H_ */
diff --git a/security/nss/lib/smime/cmsmessage.c b/security/nss/lib/smime/cmsmessage.c
index 9168ec357442..cb45eba0bba6 100644
--- a/security/nss/lib/smime/cmsmessage.c
+++ b/security/nss/lib/smime/cmsmessage.c
@@ -37,7 +37,7 @@
 /*
  * CMS message methods.
  *
- * $Id: cmsmessage.c,v 1.6 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmsmessage.c,v 1.6.192.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -81,6 +81,7 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
 	    PORT_FreeArena(poolp, PR_FALSE);
 	return NULL;
     }
+    NSS_CMSContentInfo_Private_Init(&(cmsg->contentInfo));
 
     cmsg->poolp = poolp;
     cmsg->poolp_is_ours = poolp_is_ours;
@@ -234,11 +235,12 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
 
     /* descend into CMS message */
     for (cinfo = &(cmsg->contentInfo); cinfo != NULL; cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-	if (NSS_CMSContentInfo_GetContentTypeTag(cinfo) != SEC_OID_PKCS7_SIGNED_DATA)
+	if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(cinfo)))
 	    continue;	/* next level */
 	
 	if (NSS_CMSSignedData_ContainsCertsOrCrls(cinfo->content.signedData))
 	    return PR_TRUE;
+	/* callback here for generic wrappers? */
     }
     return PR_FALSE;
 }
@@ -259,6 +261,7 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    return PR_TRUE;
 	default:
+	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
@@ -289,6 +292,7 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
 		return PR_TRUE;
 	    break;
 	default:
+	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
diff --git a/security/nss/lib/smime/cmssigdata.c b/security/nss/lib/smime/cmssigdata.c
index 81ece5473dbe..5a1bb4cea8f9 100644
--- a/security/nss/lib/smime/cmssigdata.c
+++ b/security/nss/lib/smime/cmssigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS signedData methods.
  *
- * $Id: cmssigdata.c,v 1.29 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmssigdata.c,v 1.29.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -217,17 +217,22 @@ loser:
 SECStatus
 NSS_CMSSignedData_Encode_BeforeData(NSSCMSSignedData *sigd)
 {
+    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
+    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* set up the digests */
     if (sigd->digests && sigd->digests[0]) {
-	sigd->contentInfo.digcx = NULL; /* don't attempt to make new ones. */
+	sigd->contentInfo.privateInfo->digcx = NULL; /* don't attempt to make new ones. */
     } else if (sigd->digestAlgorithms != NULL) {
-	sigd->contentInfo.digcx = 
+	sigd->contentInfo.privateInfo->digcx =
 	        NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.digcx == NULL)
+	if (sigd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -267,11 +272,11 @@ NSS_CMSSignedData_Encode_AfterData(NSSCMSSignedData *sigd)
     cinfo = &(sigd->contentInfo);
 
     /* did we have digest calculation going on? */
-    if (cinfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->digcx, poolp, 
+    if (cinfo->privateInfo && cinfo->privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->privateInfo->digcx, poolp,
 	                                         &(sigd->digests));
 	/* error has been set by NSS_CMSDigestContext_FinishMultiple */
-	cinfo->digcx = NULL;
+	cinfo->privateInfo->digcx = NULL;
 	if (rv != SECSuccess)
 	    goto loser;		
     }
@@ -392,15 +397,20 @@ loser:
 SECStatus
 NSS_CMSSignedData_Decode_BeforeData(NSSCMSSignedData *sigd)
 {
+    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
+    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* set up the digests */
     if (sigd->digestAlgorithms != NULL && sigd->digests == NULL) {
 	/* if digests are already there, do nothing */
-	sigd->contentInfo.digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.digcx == NULL)
+	sigd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
+	if (sigd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -421,11 +431,11 @@ NSS_CMSSignedData_Decode_AfterData(NSSCMSSignedData *sigd)
     }
 
     /* did we have digest calculation going on? */
-    if (sigd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.digcx, 
+    if (sigd->contentInfo.privateInfo && sigd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.privateInfo->digcx,
 				       sigd->cmsg->poolp, &(sigd->digests));
 	/* error set by NSS_CMSDigestContext_FinishMultiple */
-	sigd->contentInfo.digcx = NULL;
+	sigd->contentInfo.privateInfo->digcx = NULL;
     }
     return rv;
 }
diff --git a/security/nss/lib/smime/cmst.h b/security/nss/lib/smime/cmst.h
index b5de52b109ba..11b772a3093c 100644
--- a/security/nss/lib/smime/cmst.h
+++ b/security/nss/lib/smime/cmst.h
@@ -37,7 +37,7 @@
 /*
  * Header for CMS types.
  *
- * $Id: cmst.h,v 1.10 2005/06/27 22:21:19 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmst.h,v 1.10.142.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #ifndef _CMST_H_
@@ -98,6 +98,8 @@ typedef struct NSSCMSRecipientInfoStr NSSCMSRecipientInfo;
 typedef struct NSSCMSDigestedDataStr NSSCMSDigestedData;
 typedef struct NSSCMSEncryptedDataStr NSSCMSEncryptedData;
 
+typedef struct NSSCMSGenericWrapperDataStr NSSCMSGenericWrapperData;
+
 typedef struct NSSCMSSMIMEKEAParametersStr NSSCMSSMIMEKEAParameters;
 
 typedef struct NSSCMSAttributeStr NSSCMSAttribute;
@@ -108,6 +110,21 @@ typedef struct NSSCMSEncoderContextStr NSSCMSEncoderContext;
 typedef struct NSSCMSCipherContextStr NSSCMSCipherContext;
 typedef struct NSSCMSDigestContextStr NSSCMSDigestContext;
 
+typedef struct NSSCMSContentInfoPrivateStr NSSCMSContentInfoPrivate;
+
+typedef SECStatus (*NSSCMSGenericWrapperDataCallback)
+						(NSSCMSGenericWrapperData *);
+typedef   void    (*NSSCMSGenericWrapperDataDestroy) 
+						(NSSCMSGenericWrapperData *);
+
+extern const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[];
+extern const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[];
+
+SEC_ASN1_CHOOSER_DECLARE(NSS_PointerToCMSGenericWrapperDataTemplate)
+SEC_ASN1_CHOOSER_DECLARE(NSSCMSGenericWrapperDataTemplate)
+
+
+
 /*
  * Type of function passed to NSSCMSDecode or NSSCMSDecoderStart.
  * If specified, this is where the content bytes (only) will be "sent"
@@ -142,6 +159,7 @@ union NSSCMSContentUnion {
     NSSCMSEncryptedData	*	encryptedData;
     NSSCMSEnvelopedData	*	envelopedData;
     NSSCMSSignedData *		signedData;
+    NSSCMSGenericWrapperData *	genericData;
     /* or anonymous pointer to something */
     void *			pointer;
 };
@@ -164,8 +182,8 @@ struct NSSCMSContentInfoStr {
 							 * (only used by creation code) */
     SECOidTag			contentEncAlgTag;	/* oid tag of encryption algorithm
 							 * (only used by creation code) */
-    NSSCMSCipherContext		*ciphcx;		/* context for en/decryption going on */
-    NSSCMSDigestContext		*digcx;			/* context for digesting going on */
+    NSSCMSContentInfoPrivate	*privateInfo;		/* place for NSS private info */
+    void		*reserved;			/* keep binary compatibility */
 };
 
 /* =============================================================================
@@ -186,6 +204,18 @@ struct NSSCMSMessageStr {
     void *		decrypt_key_cb_arg;
 };
 
+/* ============================================================================
+ * GENERIC WRAPPER
+ * 
+ * used for user defined types.
+ */
+struct NSSCMSGenericWrapperDataStr {
+    NSSCMSContentInfo	contentInfo;
+    /* ---- local; not part of encoding ------ */
+    NSSCMSMessage *	cmsg;
+    /* wrapperspecific data starts here */
+};
+
 /* =============================================================================
  * SIGNEDDATA
  */
diff --git a/security/nss/lib/smime/cmsudf.c b/security/nss/lib/smime/cmsudf.c
new file mode 100644
index 000000000000..025c0e36b0d8
--- /dev/null
+++ b/security/nss/lib/smime/cmsudf.c
@@ -0,0 +1,480 @@
+/* ***** 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 Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * 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 ***** */
+
+/*
+ * CMS User Define Types
+ *
+ * $Id: cmsudf.c,v 1.1.2.4 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ */
+
+#include "cmslocal.h"
+
+#include "prinit.h"
+#include "pk11func.h"
+#include "secitem.h"
+#include "secoid.h"
+#include "secerr.h"
+#include "nss.h"
+
+typedef struct nsscmstypeInfoStr nsscmstypeInfo;
+struct nsscmstypeInfoStr {
+    SECOidTag type;
+    SEC_ASN1Template *template;
+    size_t size;
+    PRBool isData;
+    NSSCMSGenericWrapperDataDestroy  destroy;
+    NSSCMSGenericWrapperDataCallback decode_before;
+    NSSCMSGenericWrapperDataCallback decode_after;
+    NSSCMSGenericWrapperDataCallback decode_end;
+    NSSCMSGenericWrapperDataCallback encode_start;
+    NSSCMSGenericWrapperDataCallback encode_before;
+    NSSCMSGenericWrapperDataCallback encode_after;
+};
+
+/* make sure the global tables are only initialized once */
+static PRCallOnceType nsscmstypeOnce;
+static PRCallOnceType nsscmstypeClearOnce;
+/* lock for adding a new entry */
+static PRLock *nsscmstypeAddLock;
+/* lock for the hash table */
+static PRLock *nsscmstypeHashLock;
+/* the hash table itself */
+static PLHashTable *nsscmstypeHash;
+/* arena to hold all the hash table data */
+static PRArenaPool *nsscmstypeArena;
+
+/*
+ * clean up our global tables
+ */
+SECStatus
+nss_cmstype_shutdown(void *appData, void *reserved)
+{
+    if (nsscmstypeHashLock) {
+	PR_Lock(nsscmstypeHashLock);
+    }
+    if (nsscmstypeHash) {
+	PL_HashTableDestroy(nsscmstypeHash);
+	nsscmstypeHash = NULL;
+    }
+    if (nsscmstypeArena) {
+	PORT_FreeArena(nsscmstypeArena, PR_FALSE);
+	nsscmstypeArena = NULL;
+    }
+    if (nsscmstypeAddLock) {
+	PR_DestroyLock(nsscmstypeAddLock);
+    }
+    if (nsscmstypeHashLock) {
+	PRLock *oldLock = nsscmstypeHashLock;
+	nsscmstypeHashLock = NULL;
+	PR_Unlock(oldLock);
+	PR_DestroyLock(oldLock);
+    }
+
+    /* don't clear out the PR_ONCE data if we failed our inital call */
+    if (appData == NULL) {
+    	nsscmstypeOnce = nsscmstypeClearOnce;
+    }
+    return SECSuccess;
+}
+
+static PLHashNumber
+nss_cmstype_hash_key(const void *key)
+{
+   return (PLHashNumber) key;
+}
+
+static PRIntn
+nss_cmstype_compare_keys(const void *v1, const void *v2)
+{
+   PLHashNumber value1 = (PLHashNumber) v1;
+   PLHashNumber value2 = (PLHashNumber) v2;
+
+   return (value1 == value2);
+}
+
+/*
+ * initialize our hash tables, called once on the first attemat to register
+ * a new SMIME type.
+ */
+static PRStatus
+nss_cmstype_init(void)
+{
+    SECStatus rv;
+        
+    nsscmstypeHashLock = PR_NewLock();
+    if (nsscmstypeHashLock == NULL) {
+	return PR_FAILURE;
+    }
+    nsscmstypeAddLock = PR_NewLock();
+    if (nsscmstypeHashLock == NULL) {
+	goto fail;
+    }
+    nsscmstypeHash = PL_NewHashTable(64, nss_cmstype_hash_key, 
+		nss_cmstype_compare_keys, PL_CompareValues, NULL, NULL);
+    if (nsscmstypeHash == NULL) {
+	goto fail;
+    }
+    nsscmstypeArena = PORT_NewArena(2048);
+    if (nsscmstypeArena == NULL) {
+	goto fail;
+    }
+    rv = NSS_RegisterShutdown(nss_cmstype_shutdown, NULL);
+    if (rv != SECSuccess) {
+	goto fail;
+    }
+    return PR_SUCCESS;
+
+fail:
+    nss_cmstype_shutdown(&nsscmstypeOnce, NULL);
+    return PR_FAILURE;
+}
+
+ 
+/*
+ * look up and registered SIME type
+ */
+static const nsscmstypeInfo *
+nss_cmstype_lookup(SECOidTag type)
+{
+    nsscmstypeInfo *typeInfo = NULL;;
+    if (!nsscmstypeHash) {
+	return NULL;
+    }
+    PR_Lock(nsscmstypeHashLock);
+    if (nsscmstypeHash) {
+	typeInfo = PL_HashTableLookupConst(nsscmstypeHash, (void *)type);
+    }
+    PR_Unlock(nsscmstypeHashLock);
+    return typeInfo;
+}
+
+/*
+ * add a new type to the SMIME type table
+ */
+static SECStatus
+nss_cmstype_add(SECOidTag type, nsscmstypeInfo *typeinfo)
+{
+    PLHashEntry *entry;
+
+    if (!nsscmstypeHash) {
+	/* assert? this shouldn't happen */
+	return SECFailure;
+    }
+    PR_Lock(nsscmstypeHashLock);
+    /* this is really paranoia. If we really are racing nsscmstypeHash, we'll
+     * also be racing nsscmstypeHashLock... */
+    if (!nsscmstypeHash) {
+	PR_Unlock(nsscmstypeHashLock);
+	return SECFailure;
+    }
+    entry = PL_HashTableAdd(nsscmstypeHash, (void *)type, typeinfo);
+    PR_Unlock(nsscmstypeHashLock);
+    return entry ? SECSuccess : SECFailure;
+}
+
+
+/* helper functions to manage new content types
+ */
+
+PRBool
+NSS_CMSType_IsWrapper(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = NULL;
+
+    switch (type) {
+    case SEC_OID_PKCS7_SIGNED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+	return PR_TRUE;
+    default:
+	typeInfo = nss_cmstype_lookup(type);
+	if (typeInfo && !typeInfo->isData) {
+	    return PR_TRUE;
+	}
+    }
+    return PR_FALSE;
+}
+
+PRBool
+NSS_CMSType_IsData(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = NULL;
+
+    switch (type) {
+    case SEC_OID_PKCS7_DATA:
+	return PR_TRUE;
+    default:
+	typeInfo = nss_cmstype_lookup(type);
+	if (typeInfo && typeInfo->isData) {
+	    return PR_TRUE;
+	}
+    }
+    return PR_FALSE;
+}
+
+const SEC_ASN1Template *
+NSS_CMSType_GetTemplate(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo && typeInfo->template) {
+	return typeInfo->template;
+    }
+    return SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
+}
+
+size_t
+NSS_CMSType_GetContentSize(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo) {
+	return typeInfo->size;
+    }
+    return sizeof(SECItem *);
+
+}
+
+void
+NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo && typeInfo->destroy) {
+	(*typeInfo->destroy)(gd);
+    }
+    
+}
+
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
+				     NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_before) {
+	    return (*typeInfo->decode_before)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+    
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
+				    NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_after) {
+	    return (*typeInfo->decode_after)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
+				   NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_end) {
+	    return (*typeInfo->decode_end)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
+				      NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_start) {
+	    return (*typeInfo->encode_start)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
+				     NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_before) {
+	    return (*typeInfo->encode_before)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
+				    NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_after) {
+	    return (*typeInfo->encode_after)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+
+SECStatus
+NSS_CMSType_RegisterContentType(SECOidTag type, 
+			SEC_ASN1Template *asn1Template, size_t size, 
+			NSSCMSGenericWrapperDataDestroy destroy,
+			NSSCMSGenericWrapperDataCallback decode_before,
+			NSSCMSGenericWrapperDataCallback decode_after,
+			NSSCMSGenericWrapperDataCallback decode_end,
+			NSSCMSGenericWrapperDataCallback encode_start,
+			NSSCMSGenericWrapperDataCallback encode_before,
+			NSSCMSGenericWrapperDataCallback encode_after,
+			PRBool isData)
+{
+    PRStatus rc;
+    SECStatus rv;
+    nsscmstypeInfo *typeInfo;
+    const nsscmstypeInfo *exists;
+
+    rc = PR_CallOnce( &nsscmstypeOnce, nss_cmstype_init);
+    if (rc == PR_FAILURE) {
+	return SECFailure;
+    }
+    PR_Lock(nsscmstypeAddLock);
+    exists = nss_cmstype_lookup(type);
+    if (exists) {
+	PR_Unlock(nsscmstypeAddLock);
+	/* already added */
+	return SECSuccess;
+    }
+    typeInfo = PORT_ArenaNew(nsscmstypeArena, nsscmstypeInfo);
+    typeInfo->type = type;
+    typeInfo->size = size;
+    typeInfo->isData = isData;
+    typeInfo->template = asn1Template;
+    typeInfo->destroy = destroy;
+    typeInfo->decode_before = decode_before;
+    typeInfo->decode_after = decode_after;
+    typeInfo->decode_end = decode_end;
+    typeInfo->encode_start = encode_start;
+    typeInfo->encode_before = encode_before;
+    typeInfo->encode_after = encode_after;
+    rv = nss_cmstype_add(type, typeInfo);
+    PR_Unlock(nsscmstypeAddLock);
+    return rv;
+}
+
diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c
index edbb71818e5f..a60255be9dae 100644
--- a/security/nss/lib/smime/cmsutil.c
+++ b/security/nss/lib/smime/cmsutil.c
@@ -38,7 +38,7 @@
 /*
  * CMS miscellaneous utility functions.
  *
- * $Id: cmsutil.c,v 1.15 2008/03/10 00:01:27 wtc%google.com Exp $
+ * $Id: cmsutil.c,v 1.15.54.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -243,8 +243,7 @@ NSS_CMSUtil_GetTemplateByTypeTag(SECOidTag type)
 	template = NSSCMSDigestedDataTemplate;
 	break;
     default:
-    case SEC_OID_PKCS7_DATA:
-	template = NULL;
+	template = NSS_CMSType_GetTemplate(type);
 	break;
     }
     return template;
@@ -269,8 +268,7 @@ NSS_CMSUtil_GetSizeByTypeTag(SECOidTag type)
 	size = sizeof(NSSCMSDigestedData);
 	break;
     default:
-    case SEC_OID_PKCS7_DATA:
-	size = 0;
+	size = NSS_CMSType_GetContentSize(type);
 	break;
     }
     return size;
@@ -300,6 +298,9 @@ NSS_CMSContent_GetContentInfo(void *msg, SECOidTag type)
 	break;
     default:
 	cinfo = NULL;
+	if (NSS_CMSType_IsWrapper(type)) {
+	    cinfo = &(c.genericData->contentInfo);
+	}
     }
     return cinfo;
 }
diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn
index a72b4137790f..1f5421f35e4e 100644
--- a/security/nss/lib/smime/manifest.mn
+++ b/security/nss/lib/smime/manifest.mn
@@ -69,6 +69,7 @@ CSRCS = \
 	cmsreclist.c \
 	cmssigdata.c \
 	cmssiginfo.c \
+	cmsudf.c \
 	cmsutil.c \
 	smimemessage.c \
 	smimeutil.c \
diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def
index 39ccc45bb658..993d108a28bb 100644
--- a/security/nss/lib/smime/smime.def
+++ b/security/nss/lib/smime/smime.def
@@ -273,3 +273,23 @@ SEC_PKCS12AddCertOrChainAndKey;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12.10 {   # NSS 3.12.10 release
+;+    global:
+NSS_CMSType_RegisterContentType;
+NSS_CMSContentInfo_SetDontStream;
+NSS_SMIMEUtil_CreateMSSMIMEEncKeyPrefs;
+;+#
+;+# Data objects
+;+#
+;+# Don't export these DATA symbols on Windows because they don't work right.
+;+# Use the SEC_ASN1_GET / SEC_ASN1_SUB / SEC_ASN1_XTRN macros to access them.
+;+#
+;+# See nssutil for other examples.
+;+#
+;;NSSCMSGenericWrapperDataTemplate DATA ;
+;;NSS_PointerToCMSGenericWrapperDataTemplate DATA ;
+NSS_Get_NSSCMSGenericWrapperDataTemplate;
+NSS_Get_NSS_PointerToCMSGenericWrapperDataTemplate;
+;+    local:
+;+       *;
+;+};
diff --git a/security/nss/lib/smime/smime.h b/security/nss/lib/smime/smime.h
index d7fbc8cdb8f5..0c112c9a10da 100644
--- a/security/nss/lib/smime/smime.h
+++ b/security/nss/lib/smime/smime.h
@@ -38,7 +38,7 @@
  * Header file for routines specific to S/MIME.  Keep things that are pure
  * pkcs7 out of here; this is for S/MIME policy, S/MIME interoperability, etc.
  *
- * $Id: smime.h,v 1.8 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: smime.h,v 1.8.192.1 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #ifndef _SECMIME_H_
@@ -83,7 +83,7 @@ extern SECStatus NSS_SMIMEUtil_EnableCipher(long which, int on);
  * Initialize the local recording of the S/MIME policy.
  * This function is called to allow/disallow a particular cipher.
  *
- * XXX This is for a the current module, I think, so local, static storage
+ * XXX This is for the current module, I think, so local, static storage
  * XXX is okay.  Is that correct, or could multiple uses of the same
  * XXX library expect to operate under different policies?
  *
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 737f7ea95ad8..7a2425c9a9d7 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -4315,7 +4315,7 @@ sftk_expandSearchList(SFTKSearchResults *search, int count)
 
 static CK_RV
 sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
-                        const CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
+                        const CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
 {
     CK_RV crv;
     int objectListSize = search->array_size-search->size;
@@ -4349,7 +4349,7 @@ sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
  */
 CK_RV
 sftk_emailhack(SFTKSlot *slot, SFTKDBHandle *handle, 
-    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
+    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
 {
     PRBool isCert = PR_FALSE;
     int emailIndex = -1;
@@ -4438,22 +4438,47 @@ loser:
     return crv;
 }
 	
+static void
+sftk_pruneSearch(CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
+			PRBool *searchCertDB, PRBool *searchKeyDB) {
+    CK_ULONG i;
+
+    *searchCertDB = PR_TRUE;
+    *searchKeyDB = PR_TRUE;
+    for (i = 0; i < ulCount; i++) {
+	if (pTemplate[i].type == CKA_CLASS && pTemplate[i].pValue != NULL) {
+	    CK_OBJECT_CLASS class = *((CK_OBJECT_CLASS*)pTemplate[i].pValue);
+	    if (class == CKO_PRIVATE_KEY || class == CKO_SECRET_KEY) {
+		*searchCertDB = PR_FALSE;
+	    } else {
+		*searchKeyDB = PR_FALSE;
+	    }
+	    break;
+	}
+    }
+}
 
 static CK_RV
 sftk_searchTokenList(SFTKSlot *slot, SFTKSearchResults *search,
-                        CK_ATTRIBUTE *pTemplate, CK_LONG ulCount,
+                        CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
                         PRBool *tokenOnly, PRBool isLoggedIn)
 {
-    CK_RV crv;
+    CK_RV crv = CKR_OK;
     CK_RV crv2;
-    SFTKDBHandle *certHandle = sftk_getCertDB(slot);
+    PRBool searchCertDB;
+    PRBool searchKeyDB;
+    
+    sftk_pruneSearch(pTemplate, ulCount, &searchCertDB, &searchKeyDB);
 
-    crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
-    crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
-    if (crv == CKR_OK) crv2 = crv;
-    sftk_freeDB(certHandle);
+    if (searchCertDB) {
+	SFTKDBHandle *certHandle = sftk_getCertDB(slot);
+	crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
+	crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
+	if (crv == CKR_OK) crv = crv2;
+	sftk_freeDB(certHandle);
+    }
 
-    if (crv == CKR_OK && isLoggedIn) {
+    if (crv == CKR_OK && isLoggedIn && searchKeyDB) {
 	SFTKDBHandle *keyHandle = sftk_getKeyDB(slot);
     	crv = sftk_searchDatabase(keyHandle, search, pTemplate, ulCount);
     	sftk_freeDB(keyHandle);
diff --git a/security/nss/lib/softoken/rsawrapr.c b/security/nss/lib/softoken/rsawrapr.c
index cda6d7527680..a40c265dcbff 100644
--- a/security/nss/lib/softoken/rsawrapr.c
+++ b/security/nss/lib/softoken/rsawrapr.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: rsawrapr.c,v 1.11 2006/10/23 21:24:38 wtchang%redhat.com Exp $ */
+/* $Id: rsawrapr.c,v 1.11.70.1 2011/04/07 22:54:48 wtc%google.com Exp $ */
 
 #include "blapi.h"
 #include "softoken.h"
@@ -193,7 +193,7 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
     unsigned char *block;
     unsigned char *bp;
     int padLen;
-    int i;
+    int i, j;
     SECStatus rv;
 
     block = (unsigned char *) PORT_Alloc(modulusLen);
@@ -246,28 +246,53 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
 	 * 0x00 || BT || Pad || 0x00 || ActualData
 	 *   1      1   padLen    1      data->len
 	 * Pad is all non-zero random bytes.
+	 *
+	 * Build the block left to right.
+	 * Fill the entire block from Pad to the end with random bytes.
+	 * Use the bytes after Pad as a supply of extra random bytes from 
+	 * which to find replacements for the zero bytes in Pad.
+	 * If we need more than that, refill the bytes after Pad with 
+	 * new random bytes as necessary.
 	 */
-	padLen = modulusLen - data->len - 3;
+	padLen = modulusLen - (data->len + 3);
 	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
 	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
 	    PORT_Free (block);
 	    return NULL;
 	}
-	for (i = 0; i < padLen; i++) {
-	    /* Pad with non-zero random data. */
-	    do {
-		rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
-	    } while (rv == SECSuccess && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
-	    if (rv != SECSuccess) {
-		sftk_fatalError = PR_TRUE;
-		PORT_Free (block);
-		return NULL;
+	j = modulusLen - 2;
+	rv = RNG_GenerateGlobalRandomBytes(bp, j);
+	if (rv == SECSuccess) {
+	    for (i = 0; i < padLen; ) {
+		unsigned char repl;
+		/* Pad with non-zero random data. */
+		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
+		    ++i;
+		    continue;
+		}
+		if (j <= padLen) {
+		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
+					  modulusLen - (2 + padLen));
+		    if (rv != SECSuccess)
+		    	break;
+		    j = modulusLen - 2;
+		}
+		do {
+		    repl = bp[--j];
+		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
+		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
+		    bp[i++] = repl;
+		}
 	    }
 	}
+	if (rv != SECSuccess) {
+	    sftk_fatalError = PR_TRUE;
+	    PORT_Free (block);
+	    return NULL;
+	}
 	bp += padLen;
 	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
 	PORT_Memcpy (bp, data->data, data->len);
-
 	break;
 
       /*
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index c11ff63e737a..45745075d307 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,11 +57,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.12.9.0" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.12.10.0" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   12
-#define SOFTOKEN_VPATCH   9
+#define SOFTOKEN_VPATCH   10
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/ssl/derive.c b/security/nss/lib/ssl/derive.c
index 84d7da014653..8088296a6110 100644
--- a/security/nss/lib/ssl/derive.c
+++ b/security/nss/lib/ssl/derive.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: derive.c,v 1.12 2008/06/06 01:16:31 wtc%google.com Exp $ */
+/* $Id: derive.c,v 1.12.40.1 2011/03/24 01:39:01 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "ssl.h" 	/* prereq to sslimpl.h */
 #include "certt.h"	/* prereq to sslimpl.h */
@@ -604,6 +604,9 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     PRBool	      testrsa_export = PR_FALSE;
     PRBool	      testecdh = PR_FALSE;
     PRBool	      testecdhe = PR_FALSE;
+#ifdef NSS_ENABLE_ECC
+    SECKEYECParams ecParams = { siBuffer, NULL, 0 };
+#endif
 
     if (!cert || !srvPrivkey || !ciphersuites || !pcanbypass) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -703,10 +706,15 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    /* now wrap it */
 	    enc_pms.len  = SECKEY_PublicKeyStrength(srvPubkey);
 	    enc_pms.data = (unsigned char*)PORT_Alloc(enc_pms.len);
+	    if (enc_pms.data == NULL) {
+	        PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
+	        break;
+	    }
 	    irv = PK11_PubWrapSymKey(CKM_RSA_PKCS, srvPubkey, pms, &enc_pms);
 	    if (irv != SECSuccess) 
 		break;
 	    PK11_FreeSymKey(pms);
+	    pms = NULL;
 	    /* now do the server side--check the triple bypass first */
 	    rv = PK11_PrivDecryptPKCS1(srvPrivkey, rsaPmsBuf, &outLen,
 				       sizeof rsaPmsBuf,
@@ -727,6 +735,16 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 		goto done;
 	    break;
 	}
+
+	/* Check for NULL to avoid double free. 
+	 * SECItem_FreeItem sets data NULL in secitem.c#265 
+	 */
+	if (enc_pms.data != NULL) {
+	    SECITEM_FreeItem(&enc_pms, PR_FALSE);
+        }
+	if (pms) {
+	    PK11_FreeSymKey(pms);
+        }
 #ifdef NSS_ENABLE_ECC
 	for (; (privKeytype == ecKey && ( testecdh || testecdhe)) ||
 	       (privKeytype == rsaKey && testecdhe); ) {
@@ -735,8 +753,7 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    SECKEYPrivateKey *keapriv;
 	    SECKEYPublicKey  *cpub = NULL; /* client's ephemeral ECDH keys */
 	    SECKEYPrivateKey *cpriv = NULL;
-	    SECKEYECParams    ecParams = { siBuffer, NULL, 0 },
-			      *pecParams;
+	    SECKEYECParams   *pecParams = NULL;
 
 	    if (privKeytype == ecKey && testecdhe) {
 		/* TLS_ECDHE_ECDSA */
@@ -821,13 +838,16 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    if (testecdhe) {
 		SECKEY_DestroyPrivateKey(keapriv);
 		SECKEY_DestroyPublicKey(keapub);
-		if (privKeytype == rsaKey)
-		    PORT_Free(ecParams.data);
 	    }
 	    if (rv == SECSuccess && *pcanbypass == PR_FALSE)
 		goto done;
 	    break;
 	}
+	/* Check for NULL to avoid double free. */
+	if (ecParams.data != NULL) {
+	    PORT_Free(ecParams.data);
+	    ecParams.data = NULL;
+	}
 #endif /* NSS_ENABLE_ECC */
 	if (pms)
 	    PK11_FreeSymKey(pms);
@@ -840,7 +860,18 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     if (pms)
 	PK11_FreeSymKey(pms);
 
-    SECITEM_FreeItem(&enc_pms, PR_FALSE);
+    /* Check for NULL to avoid double free. 
+     * SECItem_FreeItem sets data NULL in secitem.c#265 
+     */
+    if (enc_pms.data != NULL) {
+    	SECITEM_FreeItem(&enc_pms, PR_FALSE);
+    }
+#ifdef NSS_ENABLE_ECC
+    if (ecParams.data != NULL) {
+        PORT_Free(ecParams.data);
+        ecParams.data = NULL;
+    }
+#endif /* NSS_ENABLE_ECC */
 
     if (srvPubkey) {
     	SECKEY_DestroyPublicKey(srvPubkey);
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index d3f455c94eae..e2b9005d9652 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -152,3 +152,9 @@ SSL_SNISocketConfigHook;
 ;+    local:
 ;+*;
 ;+};
+;+NSS_3.12.10 {      # NSS 3.12.10 release
+;+    global:
+SSL_ConfigSecureServerWithCertChain;
+;+    local:
+;+*;
+;+};
diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h
index 4a9e89d60a98..1dcb4a0c9c8e 100644
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl.h,v 1.38.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: ssl.h,v 1.38.2.4 2011/04/08 05:44:32 wtc%google.com Exp $ */
 
 #ifndef __ssl_h_
 #define __ssl_h_
@@ -372,6 +372,15 @@ SSL_IMPORT SECStatus SSL_ConfigSecureServer(
 				PRFileDesc *fd, CERTCertificate *cert,
 				SECKEYPrivateKey *key, SSLKEAType kea);
 
+/*
+** Allows SSL socket configuration with caller-supplied certificate chain.
+** If certChainOpt is NULL, tries to find one.
+*/
+SSL_IMPORT SECStatus
+SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
+                                    const CERTCertificateList *certChainOpt,
+                                    SECKEYPrivateKey *key, SSLKEAType kea);
+
 /*
 ** Configure a secure server's session-id cache. Define the maximum number
 ** of entries in the cache, the longevity of the entires, and the directory
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 80489139c5ff..850a54ceeba6 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3con.c,v 1.142.2.4 2010/09/01 19:47:11 wtc%google.com Exp $ */
+/* $Id: ssl3con.c,v 1.142.2.5 2011/01/25 01:49:22 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
@@ -4837,14 +4837,8 @@ ssl3_SendCertificateVerify(sslSocket *ss)
 	sid->u.ssl3.clAuthValid      = PR_TRUE;
 	PK11_FreeSlot(slot);
     }
-    /* If we're doing RSA key exchange, we're all done with the private key
-     * here.  Diffie-Hellman key exchanges need the client's
-     * private key for the key exchange.
-     */
-    if (ss->ssl3.hs.kea_def->exchKeyType == kt_rsa) {
-	SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-	ss->ssl3.clientPrivateKey = NULL;
-    }
+    SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+    ss->ssl3.clientPrivateKey = NULL;
     if (rv != SECSuccess) {
 	goto done;	/* err code was set by ssl3_SignHashes */
     }
@@ -4899,6 +4893,20 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
+    /* clean up anything left from previous handshake. */
+    if (ss->ssl3.clientCertChain != NULL) {
+       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
+       ss->ssl3.clientCertChain = NULL;
+    }
+    if (ss->ssl3.clientCertificate != NULL) {
+       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
+       ss->ssl3.clientCertificate = NULL;
+    }
+    if (ss->ssl3.clientPrivateKey != NULL) {
+       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+       ss->ssl3.clientPrivateKey = NULL;
+    }
+
     temp = ssl3_ConsumeHandshakeNumber(ss, 2, &b, &length);
     if (temp < 0) {
     	goto loser; 	/* alert has been sent */
@@ -5454,19 +5462,9 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
-    /* clean up anything left from previous handshake. */
-    if (ss->ssl3.clientCertChain != NULL) {
-       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
-       ss->ssl3.clientCertChain = NULL;
-    }
-    if (ss->ssl3.clientCertificate != NULL) {
-       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
-       ss->ssl3.clientCertificate = NULL;
-    }
-    if (ss->ssl3.clientPrivateKey != NULL) {
-       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-       ss->ssl3.clientPrivateKey = NULL;
-    }
+    PORT_Assert(ss->ssl3.clientCertChain == NULL);
+    PORT_Assert(ss->ssl3.clientCertificate == NULL);
+    PORT_Assert(ss->ssl3.clientPrivateKey == NULL);
 
     isTLS = (PRBool)(ss->ssl3.prSpec->version > SSL_LIBRARY_VERSION_3_0);
     rv = ssl3_ConsumeHandshakeVariable(ss, &cert_types, 1, &b, &length);
diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c
index becbfe9c70c6..3a92fa0281a1 100644
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -41,7 +41,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* TLS extension code moved here from ssl3ecc.c */
-/* $Id: ssl3ext.c,v 1.14 2010/04/03 19:19:07 nelson%bolyard.com Exp $ */
+/* $Id: ssl3ext.c,v 1.14.2.2 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "nssrenam.h"
 #include "nss.h"
@@ -56,7 +56,7 @@ static unsigned char  key_name[SESS_TICKET_KEY_NAME_LEN];
 static PK11SymKey    *session_ticket_enc_key_pkcs11 = NULL;
 static PK11SymKey    *session_ticket_mac_key_pkcs11 = NULL;
 
-static unsigned char  session_ticket_enc_key[32];
+static unsigned char  session_ticket_enc_key[AES_256_KEY_LENGTH];
 static unsigned char  session_ticket_mac_key[SHA256_LENGTH];
 
 static PRBool         session_ticket_keys_initialized = PR_FALSE;
@@ -1266,14 +1266,17 @@ no_ticket:
 			SSL_GETPID(), ss->fd));
 	ssl3stats = SSL_GetStatistics();
 	SSL_AtomicIncrementLong(& ssl3stats->hch_sid_ticket_parse_failures );
-	if (sid) {
-	    ssl_FreeSID(sid);
-	    sid = NULL;
-	}
     }
     rv = SECSuccess;
 
 loser:
+	/* ss->sec.ci.sid == sid if it did NOT come here via goto statement
+	 * in that case do not free sid
+	 */
+	if (sid && (ss->sec.ci.sid != sid)) {
+	    ssl_FreeSID(sid);
+	    sid = NULL;
+	}
     if (decrypted_state != NULL) {
 	SECITEM_FreeItem(decrypted_state, PR_TRUE);
 	decrypted_state = NULL;
diff --git a/security/nss/lib/ssl/sslcon.c b/security/nss/lib/ssl/sslcon.c
index 4e345548b4b0..8f3bc06a8343 100644
--- a/security/nss/lib/ssl/sslcon.c
+++ b/security/nss/lib/ssl/sslcon.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslcon.c,v 1.40 2010/04/25 23:37:38 nelson%bolyard.com Exp $ */
+/* $Id: sslcon.c,v 1.40.2.1 2011/03/30 17:38:42 wtc%google.com Exp $ */
 
 #include "nssrenam.h"
 #include "cert.h"
@@ -3125,11 +3125,11 @@ ssl2_BeginClientHandshake(sslSocket *ss)
 	/* ssl3_SendClientHello will override this if it succeeds. */
 	ss->version       = SSL_LIBRARY_VERSION_3_0;
 
-	ssl_GetXmitBufLock(ss);    /***************************************/
 	ssl_GetSSL3HandshakeLock(ss);
+	ssl_GetXmitBufLock(ss);
 	rv =  ssl3_SendClientHello(ss);
+	ssl_ReleaseXmitBufLock(ss);
 	ssl_ReleaseSSL3HandshakeLock(ss);
-	ssl_ReleaseXmitBufLock(ss); /***************************************/
 
 	return rv;
     }
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index 9af471d88bc3..91070d35c07f 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslimpl.h,v 1.77.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: sslimpl.h,v 1.77.2.2 2011/03/16 18:55:38 alexei.volkov.bugs%sun.com Exp $ */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ -1515,7 +1515,7 @@ extern PRInt32 ssl3_SendServerNameXtn(sslSocket *ss, PRBool append,
  * fails to do so. If cert and keyPair are NULL - unconfigures
  * sslSocket of kea type.*/
 extern SECStatus ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                                        CERTCertificateList *certChain,
+                                        const CERTCertificateList *certChain,
                                         ssl3KeyPair *keyPair, SSLKEAType kea);
 /* Return key type for the cert */
 extern SSLKEAType ssl_FindCertKEAType(CERTCertificate * cert);
diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c
index 63dc5a28507b..024651073fcc 100644
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslnonce.c,v 1.25 2008/03/10 00:01:28 wtc%google.com Exp $ */
+/* $Id: sslnonce.c,v 1.25.54.1 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "cert.h"
 #include "pk11pub.h"
@@ -222,6 +222,9 @@ ssl_DestroySID(sslSessionID *sid)
     if (sid->u.ssl3.sessionTicket.ticket.data) {
 	SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE);
     }
+    if (sid->u.ssl3.srvName.data) {
+	SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
+    }
     
     PORT_ZFree(sid, sizeof(sslSessionID));
 }
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c
index a0cae5496801..a40dd4fc3195 100644
--- a/security/nss/lib/ssl/sslsecur.c
+++ b/security/nss/lib/ssl/sslsecur.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsecur.c,v 1.43.2.2 2010/08/26 18:06:55 wtc%google.com Exp $ */
+/* $Id: sslsecur.c,v 1.43.2.4 2011/04/08 05:25:21 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "keyhi.h"
@@ -674,7 +674,7 @@ static PRStatus serverCAListSetup(void *arg)
 
 SECStatus
 ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                       CERTCertificateList *certChain,
+                       const CERTCertificateList *certChain,
                        ssl3KeyPair *keyPair, SSLKEAType kea)
 {
     CERTCertificateList *localCertChain = NULL;
@@ -752,6 +752,15 @@ SECStatus
 SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
 		       SECKEYPrivateKey *key, SSL3KEAType kea)
 {
+
+    return SSL_ConfigSecureServerWithCertChain(fd, cert, NULL, key, kea);
+}
+
+SECStatus
+SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
+                                    const CERTCertificateList *certChainOpt,
+                                    SECKEYPrivateKey *key, SSL3KEAType kea)
+{
     sslSocket *ss;
     SECKEYPublicKey *pubKey = NULL;
     ssl3KeyPair *keyPair = NULL;
@@ -822,7 +831,7 @@ SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
         }
 	pubKey = NULL; /* adopted by serverKeyPair */
     }
-    if (ssl_ConfigSecureServer(ss, cert, NULL,
+    if (ssl_ConfigSecureServer(ss, cert, certChainOpt,
                                keyPair, kea) == SECFailure) {
         goto loser;
     }
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 6c73f25122eb..cd318df29da8 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsnce.c,v 1.54 2010/07/05 19:31:56 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslsnce.c,v 1.54.2.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
  * cache sids!
@@ -1863,17 +1863,25 @@ WrapTicketKey(SECKEYPublicKey *svrPubKey, PK11SymKey *symKey,
 }
 
 static PRBool
-GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
-                          unsigned char *keyName, PK11SymKey **aesKey,
-                          PK11SymKey **macKey)
+GenerateTicketKeys(void *pwArg, unsigned char *keyName, PK11SymKey **aesKey,
+                   PK11SymKey **macKey)
 {
     PK11SlotInfo *slot;
     CK_MECHANISM_TYPE mechanismArray[2];
     PK11SymKey *aesKeyTmp = NULL;
     PK11SymKey *macKeyTmp = NULL;
     cacheDesc *cache = &globalCache;
+    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
+    uint8 *ticketKeyNameSuffix;
 
-    if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
+    if (!cache->cacheMem) {
+        /* cache is not initalized. Use stack buffer */
+        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
+    } else {
+        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
+    }
+
+    if (PK11_GenerateRandom(ticketKeyNameSuffix,
 	    SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess) {
 	SSL_DBG(("%d: SSL[%s]: Unable to generate random key name bytes.",
 		    SSL_GETPID(), "unknown"));
@@ -1885,9 +1893,10 @@ GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
 
     slot = PK11_GetBestSlotMultiple(mechanismArray, 2, pwArg);
     if (slot) {
-	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL, 32, pwArg);
-	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL, SHA256_LENGTH,
-				pwArg);
+	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL,
+                                AES_256_KEY_LENGTH, pwArg);
+	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL,
+                                SHA256_LENGTH, pwArg);
 	PK11_FreeSlot(slot);
     }
 
@@ -1896,15 +1905,39 @@ GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
 		    SSL_GETPID(), "unknown"));
 	goto loser;
     }
+    PORT_Memcpy(keyName, ticketKeyNameSuffix, SESS_TICKET_KEY_VAR_NAME_LEN);
+    *aesKey = aesKeyTmp;
+    *macKey = macKeyTmp;
+    return PR_TRUE;
 
-    /* Export the keys to the shared cache in wrapped form. */
-    if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
-	goto loser;
-    if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
-	goto loser;
+loser:
+    if (aesKeyTmp)
+	PK11_FreeSymKey(aesKeyTmp);
+    if (macKeyTmp)
+	PK11_FreeSymKey(macKeyTmp);
+    return PR_FALSE;
+}
 
-    PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
-	SESS_TICKET_KEY_VAR_NAME_LEN);
+static PRBool
+GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
+                          unsigned char *keyName, PK11SymKey **aesKey,
+                          PK11SymKey **macKey)
+{
+    PK11SymKey *aesKeyTmp = NULL;
+    PK11SymKey *macKeyTmp = NULL;
+    cacheDesc *cache = &globalCache;
+
+    if (!GenerateTicketKeys(pwArg, keyName, &aesKeyTmp, &macKeyTmp)) {
+        goto loser;
+    }
+
+    if (cache->cacheMem) {
+        /* Export the keys to the shared cache in wrapped form. */
+        if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
+            goto loser;
+        if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
+            goto loser;
+    }
     *aesKey = aesKeyTmp;
     *macKey = macKeyTmp;
     return PR_TRUE;
@@ -1971,6 +2004,12 @@ ssl_GetSessionTicketKeysPKCS11(SECKEYPrivateKey *svrPrivKey,
     PRBool keysGenerated = PR_FALSE;
     cacheDesc *cache = &globalCache;
 
+    if (!cache->cacheMem) {
+        /* cache is uninitialized. Generate keys and return them
+         * without caching. */
+        return GenerateTicketKeys(pwArg, keyName, aesKey, macKey);
+    }
+
     now = LockSidCacheLock(cache->keyCacheLock, now);
     if (!now)
 	return rv;
@@ -2000,33 +2039,58 @@ ssl_GetSessionTicketKeys(unsigned char *keyName, unsigned char *encKey,
     PRBool rv = PR_FALSE;
     PRUint32 now = 0;
     cacheDesc *cache = &globalCache;
+    uint8 ticketMacKey[AES_256_KEY_LENGTH], ticketEncKey[SHA256_LENGTH];
+    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
+    uint8 *ticketMacKeyPtr, *ticketEncKeyPtr, *ticketKeyNameSuffix;
+    PRBool cacheIsEnabled = PR_TRUE;
 
-    /* Grab lock. */
-    now = LockSidCacheLock(cache->keyCacheLock, now);
-    if (!now)
-	return rv;
+    if (!cache->cacheMem) { /* cache is uninitialized */
+        cacheIsEnabled = PR_FALSE;
+        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
+        ticketEncKeyPtr = ticketEncKey;
+        ticketMacKeyPtr = ticketMacKey;
+    } else {
+        /* these values have constant memory locations in the cache.
+         * Ok to reference them without holding the lock. */
+        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
+        ticketEncKeyPtr = cache->ticketEncKey->bytes;
+        ticketMacKeyPtr = cache->ticketMacKey->bytes;
+    }
 
-    if (!*(cache->ticketKeysValid)) {
-	if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
+    if (cacheIsEnabled) {
+        /* Grab lock if initialized. */
+        now = LockSidCacheLock(cache->keyCacheLock, now);
+        if (!now)
+            return rv;
+    }
+    /* Going to regenerate keys on every call if cache was not
+     * initialized. */
+    if (!cacheIsEnabled || !*(cache->ticketKeysValid)) {
+	if (PK11_GenerateRandom(ticketKeyNameSuffix,
 		SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(cache->ticketEncKey->bytes, 32) != SECSuccess)
+	if (PK11_GenerateRandom(ticketEncKeyPtr,
+                                AES_256_KEY_LENGTH) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(cache->ticketMacKey->bytes,
-		SHA256_LENGTH) != SECSuccess)
+	if (PK11_GenerateRandom(ticketMacKeyPtr,
+                                SHA256_LENGTH) != SECSuccess)
 	    goto loser;
-	*(cache->ticketKeysValid) = 1;
+        if (cacheIsEnabled) {
+            *(cache->ticketKeysValid) = 1;
+        }
     }
 
     rv = PR_TRUE;
 
  loser:
-    UnlockSidCacheLock(cache->keyCacheLock);
+    if (cacheIsEnabled) {
+        UnlockSidCacheLock(cache->keyCacheLock);
+    }
     if (rv) {
-	PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
-	    SESS_TICKET_KEY_VAR_NAME_LEN);
-	PORT_Memcpy(encKey, cache->ticketEncKey->bytes, 32);
-	PORT_Memcpy(macKey, cache->ticketMacKey->bytes, SHA256_LENGTH);
+	PORT_Memcpy(keyName, ticketKeyNameSuffix,
+                    SESS_TICKET_KEY_VAR_NAME_LEN);
+	PORT_Memcpy(encKey, ticketEncKeyPtr, AES_256_KEY_LENGTH);
+	PORT_Memcpy(macKey, ticketMacKeyPtr, SHA256_LENGTH);
     }
     return rv;
 }
diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c
index bc770a16640f..7819440c8d91 100644
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsock.c,v 1.67.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: sslsock.c,v 1.67.2.2 2011/03/16 19:04:02 alexei.volkov.bugs%sun.com Exp $ */
 #include "seccomon.h"
 #include "cert.h"
 #include "keyhi.h"
@@ -1271,8 +1271,8 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
 {
     sslSocket * sm = NULL, *ss = NULL;
     int i;
-    sslServerCerts * mc = sm->serverCerts;
-    sslServerCerts * sc = ss->serverCerts;
+    sslServerCerts * mc = NULL;
+    sslServerCerts * sc = NULL;
 
     if (model == NULL) {
         PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
@@ -1301,7 +1301,9 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
     /* This int should be SSLKEAType, but CC on Irix complains,
      * during the for loop.
      */
-    for (i=kt_null; i < kt_kea_size; i++, mc++, sc++) {
+    for (i=kt_null; i < kt_kea_size; i++) {
+        mc = &(sm->serverCerts[i]);
+        sc = &(ss->serverCerts[i]);
         if (mc->serverCert && mc->serverCertChain) {
             if (sc->serverCert) {
                 CERT_DestroyCertificate(sc->serverCert);
diff --git a/security/nss/lib/sysinit/nsssysinit.c b/security/nss/lib/sysinit/nsssysinit.c
index 151c3c574b7c..883ed7833ad1 100644
--- a/security/nss/lib/sysinit/nsssysinit.c
+++ b/security/nss/lib/sysinit/nsssysinit.c
@@ -221,16 +221,16 @@ getFIPSMode(void)
  * 2 for the key slot, and
  * 3 for the crypto operations slot fips
  */
-#define ORDER_FLAGS "trustOrder=75 cipherOrder=100"
+#define CIPHER_ORDER_FLAGS "cipherOrder=100"
 #define SLOT_FLAGS \
 	"[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM" \
 	" askpw=any timeout=30 ]"
  
 static const char *nssDefaultFlags =
-	ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
+	CIPHER_ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
 
 static const char *nssDefaultFIPSFlags =
-	ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
+	CIPHER_ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
 
 /*
  * This function builds the list of databases and modules to load, and sets
@@ -270,7 +270,7 @@ get_list(char *filename, char *stripped_parameters)
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
-        "NSS=\"%sflags=internal%s\"",
+        "NSS=\"trustOrder=75 %sflags=internal%s\"",
         userdb, stripped_parameters, nssflags,
         isFIPS ? ",FIPS" : "");
 
@@ -284,30 +284,6 @@ get_list(char *filename, char *stripped_parameters)
 		userdb, stripped_parameters);
 	}
 
-#if 0
-	/* This doesn't actually work. If we register
-		both this and the sysdb (in either order)
-		then only one of them actually shows up */
-
-    /* Using a NULL filename as a Boolean flag to
-     * prevent registering both an application-defined
-     * db and the system db. rhbz #546211.
-     */
-    PORT_Assert(filename);
-    if (sysdb && PL_CompareStrings(filename, sysdb))
-	    filename = NULL;
-    else if (userdb && PL_CompareStrings(filename, userdb))
-	    filename = NULL;
-
-    if (filename && !userIsRoot()) {
-	    module_list[next++] = PR_smprintf(
-	      "library= "
-	      "module=\"NSS database\" "
-	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
-	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-    }
-#endif
-
     /* now the system database (always read only unless it's root) */
     if (sysdb) {
 	    const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
@@ -315,7 +291,7 @@ get_list(char *filename, char *stripped_parameters)
 	      "library= "
 	      "module=\"NSS system database\" "
 	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
-	      "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
+	      "NSS=\"trustOrder=80 %sflags=internal,critical\"",sysdb, readonly, nssflags);
     }
 
     /* that was the last module */
@@ -372,9 +348,9 @@ overlapstrcpy(char *target, char *src)
 
 /* determine what options the user was trying to open this database with */
 /* filename is the directory pointed to by configdir= */
-/* stripped is the rest of the paramters with configdir= stripped out */
+/* stripped is the rest of the parameters with configdir= stripped out */
 static SECStatus
-parse_paramters(char *parameters, char **filename, char **stripped)
+parse_parameters(char *parameters, char **filename, char **stripped)
 {
     char *sourcePrev;
     char *sourceCurr;
@@ -423,7 +399,7 @@ NSS_ReturnModuleSpecData(unsigned long function, char *parameters, void *args)
     char **retString = NULL;
     SECStatus rv;
 
-    rv = parse_paramters(parameters, &filename, &stripped);
+    rv = parse_parameters(parameters, &filename, &stripped);
     if (rv != SECSuccess) {
 	/* use defaults */
 	filename = getSystemDB();
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 4511007f050e..3fd74f510daf 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -51,11 +51,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.12.9.0"
+#define NSSUTIL_VERSION  "3.12.10.0 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   12
-#define NSSUTIL_VPATCH   9
+#define NSSUTIL_VPATCH   10
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 #endif /* __nssutil_h_ */
diff --git a/security/nss/lib/util/secasn1e.c b/security/nss/lib/util/secasn1e.c
index 3a4413fa41b5..4f058e2b4ed3 100644
--- a/security/nss/lib/util/secasn1e.c
+++ b/security/nss/lib/util/secasn1e.c
@@ -38,7 +38,7 @@
  * Support for ENcoding ASN.1 data based on BER/DER (Basic/Distinguished
  * Encoding Rules).
  *
- * $Id: secasn1e.c,v 1.21 2006/04/07 11:41:18 kaie%kuix.de Exp $
+ * $Id: secasn1e.c,v 1.21.66.1 2011/01/13 00:26:57 wtc%google.com Exp $
  */
 
 #include "secasn1.h"
@@ -1587,7 +1587,7 @@ SEC_ASN1EncodeItem (PRArenaPool *poolp, SECItem *dest, const void *src,
 
 static SECItem *
 sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
-		  PRBool make_unsigned)
+		  PRBool is_unsigned)
 {
     unsigned long copy;
     unsigned char sign;
@@ -1604,11 +1604,11 @@ sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
     } while (copy);
 
     /*
-     * If this is an unsigned encoding, and the high bit of the last
+     * If 'value' is non-negative, and the high bit of the last
      * byte we counted was set, we need to add one to the length so
      * we put a high-order zero byte in the encoding.
      */
-    if (sign && make_unsigned)
+    if (sign && (is_unsigned || (long)value >= 0))
 	len++;
 
     /*
diff --git a/security/nss/tests/chains/ocspd-config/readme b/security/nss/tests/chains/ocspd-config/readme
index f0e14a51a358..87a3594296b6 100644
--- a/security/nss/tests/chains/ocspd-config/readme
+++ b/security/nss/tests/chains/ocspd-config/readme
@@ -1,16 +1,18 @@
 This script is used to generate certificates used by ocspd.
 
 Some steps to run (only once - before all OCSP testing):
-1. Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
-2. Set environment variable to run only chains tests: export NSS_TESTS=all.sh
-3. Run tests: ./all.sh
-4. Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
-5. Copy ocspd-certs.sh and ocspd.conf.template to this directory
-6. Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
-   Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
+1.  Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
+2.  Set environment variable to run only chains tests: export NSS_TESTS=chains.sh
+3.  Set environment variable to have the correct URI in the certificates: export NSS_AIA_OCSP=http://dochinups.us.oracle.com
+4.  Run tests: ./all.sh
+5.  Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
+6.  Copy ocspd-certs.sh and ocspd.conf.template to this directory
+7.  Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
+    Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
        ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
-7. Copy config files and keys/certs/crls to ocspd etc directory:
-   cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
-   cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
-8. Start ocsp deamons on dochinups (for all configs).
+8.  Commit the new certificates that have been generated under ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
+9.  Copy config files and keys/certs/crls to ocspd etc directory:
+    cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
+    cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
+10. Start ocsp deamons on dochinups (for all configs).
 

From 90942cd440aec381b3ba2aa8f1f7656f5a97c952 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 11:49:42 +0200
Subject: [PATCH 170/314] backout bug 645459 from NSPR because of a build
 failure on OSX 64 bit

---
 nsprpub/configure    | 2 --
 nsprpub/configure.in | 2 --
 2 files changed, 4 deletions(-)

diff --git a/nsprpub/configure b/nsprpub/configure
index d92322f2601f..b38815afdedb 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,12 +3541,10 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 390940fa2977..bd502c893062 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,12 +1144,10 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC

From 72590094516639529ffdbcdf04ee2127899ed213 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 16:38:11 +0200
Subject: [PATCH 171/314] Bug 642144, Enable multiple roots for EV. (March 2011
 batch, depends on NSS 3.12.10), r=rrelyea, r=honzab

---
 .../manager/ssl/src/nsIdentityChecking.cpp    | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index f6c0e4ef8a73..1a3f38e72a1f 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -81,6 +81,12 @@ struct nsMyTrustedEVInfo
 };
 
 static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
+  /*
+   * IMPORTANT! When extending this list, 
+   * pairs of dotted_oid and oid_name should always be unique pairs.
+   * In other words, if you add another list, that uses the same dotted_oid
+   * as an existing entry, then please use the same oid_name.
+   */
   {
     // CN=WellsSecure Public Root Certificate Authority,OU=Wells Fargo Bank NA,O=Wells Fargo WellsSecure,C=US
     "2.16.840.1.114171.500.9",
@@ -297,6 +303,18 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
+  {
+    // CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US
+    "2.16.840.1.114413.1.7.23.3",
+    "Go Daddy EV OID a",
+    SEC_OID_UNKNOWN,
+    "47:BE:AB:C9:22:EA:E8:0E:78:78:34:62:A7:9F:45:C2:54:FD:E6:8B",
+    "MIGDMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
+    "dHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMTAvBgNVBAMTKEdv"
+    "IERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=",
+    "AA==",
+    nsnull
+  },
   {
     // E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O=\"ValiCert, Inc.\",L=ValiCert Validation Network
     "2.16.840.1.114413.1.7.23.3",
@@ -335,6 +353,19 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
+  {
+    // CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US
+    "2.16.840.1.114414.1.7.23.3",
+    "Go Daddy EV OID b",
+    SEC_OID_UNKNOWN,
+    "B5:1C:06:7C:EE:2B:0C:3D:F8:55:AB:2D:92:F4:FE:39:D4:E7:0F:0E",
+    "MIGPMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
+    "dHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEy"
+    "MDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0g"
+    "RzI=",
+    "AA==",
+    nsnull
+  },
   {
     // CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US
     "2.16.840.1.114412.2.1",
@@ -476,6 +507,84 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "YyUAAQACFI0zFQLkbPQ=",
     nsnull
   },
+  {
+    // CN=AffirmTrust Commercial,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.1",
+    "AffirmTrust EV OID a",
+    SEC_OID_UNKNOWN,
+    "F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7",
+    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
+    "QWZmaXJtVHJ1c3QgQ29tbWVyY2lhbA==",
+    "d3cGJyapsXw=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Networking,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.2",
+    "AffirmTrust EV OID b",
+    SEC_OID_UNKNOWN,
+    "29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F",
+    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
+    "QWZmaXJtVHJ1c3QgTmV0d29ya2luZw==",
+    "fE8EORzUmS0=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Premium,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.3",
+    "AffirmTrust EV OID c",
+    SEC_OID_UNKNOWN,
+    "D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27",
+    "MEExCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEcMBoGA1UEAwwT"
+    "QWZmaXJtVHJ1c3QgUHJlbWl1bQ==",
+    "bYwURrGmCu4=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.4",
+    "AffirmTrust EV OID d",
+    SEC_OID_UNKNOWN,
+    "B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB",
+    "MEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwX"
+    "QWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0M=",
+    "dJclisc/elQ=",
+    nsnull
+  },
+  {
+    // CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL
+    "1.2.616.1.113527.2.5.1.1",
+    "Certum EV OID",
+    SEC_OID_UNKNOWN,
+    "07:E0:32:E0:20:B7:2C:3F:19:2F:06:28:A2:59:3A:19:A7:0F:06:9E",
+    "MH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBT"
+    "LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAg"
+    "BgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0E=",
+    "BETA",
+    nsnull
+  },
+  {
+    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
+    "1.3.6.1.4.1.14777.6.1.1",
+    "Izenpe EV OID 1",
+    SEC_OID_UNKNOWN,
+    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
+    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
+    "SXplbnBlLmNvbQ==",
+    "ALC3WhZIX7/hy/WL1xnmfQ==",
+    nsnull
+  },
+  {
+    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
+    "1.3.6.1.4.1.14777.6.1.2",
+    "Izenpe EV OID 2",
+    SEC_OID_UNKNOWN,
+    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
+    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
+    "SXplbnBlLmNvbQ==",
+    "ALC3WhZIX7/hy/WL1xnmfQ==",
+    nsnull
+  },
   {
     // OU=Sample Certification Authority,O=\"Sample, Inc.\",C=US
     "0.0.0.0",

From 541b030199611544dd8954f619b1cc9fb4332b82 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 16:38:45 +0200
Subject: [PATCH 172/314] Bug 646460, Don't allow to override after treating
 certificates as revoked, r=bsmith

---
 security/manager/ssl/src/nsNSSIOLayer.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 6f5865a59377..6f7615523a1d 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -3340,6 +3340,13 @@ cancel_and_failure(nsNSSSocketInfo* infoObject)
 static SECStatus
 nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
 {
+  // cert was revoked, don't do anything else
+  // Calling cancel_and_failure is not necessary, and would be wrong,
+  // [for errors other than the ones explicitly handled below,] 
+  // because it suppresses error reporting.
+  if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
+    return SECFailure;
+
   nsNSSShutDownPreventionLock locker;
   nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
   if (!infoObject)

From f9a70a42911412c101299735f75266298e29b97f Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 173/314] Detect gcc c++0x headers brokenness and don't use
 -std=gnu++0x then.  r=bsmedberg

---
 configure.in | 50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 6bbcb9755203..cd9c29d404b1 100644
--- a/configure.in
+++ b/configure.in
@@ -2961,11 +2961,43 @@ else
     AC_MSG_RESULT(no)
 fi
 
+dnl ========================================================
+dnl C++ rtti
+dnl Should be smarter and check that the compiler does indeed have rtti
+dnl ========================================================
+
+MOZ_ARG_ENABLE_BOOL(cpp-rtti,
+[  --enable-cpp-rtti       Enable C++ RTTI ],
+[ _MOZ_USE_RTTI=1 ],
+[ _MOZ_USE_RTTI= ])
+
+if test "$_MOZ_USE_RTTI"; then
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
+else
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
+fi
+
+AC_SUBST(_MOZ_RTTI_FLAGS_ON)
+
+dnl Check whether we can use gcc's c++0x mode
 AC_LANG_CPLUSPLUS
 
 if test "$GNU_CXX"; then
     _SAVE_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+
+    if test -z "$_MOZ_USE_RTTI"; then
+        CXXFLAGS="$CXXFLAGS $_MOZ_RTTI_FLAGS"
+        AC_CACHE_CHECK(for gcc c++0x headers bug without rtti,
+            ac_cv_cxx0x_headers_bug,
+            [AC_TRY_COMPILE([#include <memory>], [],
+                            ac_cv_cxx0x_headers_bug="no",
+                            ac_cv_cxx0x_headers_bug="yes")])
+        CXXFLAGS="$_SAVE_CXXFLAGS"
+        if test "$ac_cv_cxx0x_headers_bug" = "no"; then
+            CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+        fi
+    fi
 fi
 
 dnl Check for usable char16_t (2 bytes, unsigned)
@@ -7929,24 +7961,6 @@ if test "$ac_nscap_nonconst_opeq_bug" = "yes" ; then
 fi
 fi # SKIP_COMPILER_CHECKS
 
-dnl ========================================================
-dnl C++ rtti
-dnl Should be smarter and check that the compiler does indeed have rtti
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(cpp-rtti,
-[  --enable-cpp-rtti       Enable C++ RTTI ],
-[ _MOZ_USE_RTTI=1 ],
-[ _MOZ_USE_RTTI= ])
-
-if test "$_MOZ_USE_RTTI"; then
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
-else
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
-fi
-
-AC_SUBST(_MOZ_RTTI_FLAGS_ON)
-
 dnl ========================================================
 dnl C++ exceptions (g++/VC/irix6/Sun only - for now)
 dnl Should be smarter and check that the compiler does indeed have exceptions

From 13f47fe40608406f696984f90186c430c5c438e3 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 174/314] Bug 652401.  Make sure to not have straggling
 JSContexts on the stack when notifying in the refresh driver.  r=smaug

---
 layout/base/nsRefreshDriver.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 11a045b6bef1..6cf4643fed6b 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -126,14 +126,22 @@ nsRefreshDriver::AdvanceTimeAndRefresh(PRInt64 aMilliseconds)
   mTestControllingRefreshes = true;
   mMostRecentRefreshEpochTime += aMilliseconds * 1000;
   mMostRecentRefresh += TimeDuration::FromMilliseconds(aMilliseconds);
-  Notify(nsnull);
+  nsCxPusher pusher;
+  if (pusher.PushNull()) {
+    Notify(nsnull);
+    pusher.Pop();
+  }
 }
 
 void
 nsRefreshDriver::RestoreNormalRefresh()
 {
   mTestControllingRefreshes = false;
-  Notify(nsnull); // will call UpdateMostRecentRefresh()
+  nsCxPusher pusher;
+  if (pusher.PushNull()) {
+    Notify(nsnull); // will call UpdateMostRecentRefresh()
+    pusher.Pop();
+  }
 }
 
 TimeStamp
@@ -279,6 +287,8 @@ nsRefreshDriver::Notify(nsITimer *aTimer)
 {
   NS_PRECONDITION(!mFrozen, "Why are we notified while frozen?");
   NS_PRECONDITION(mPresContext, "Why are we notified after disconnection?");
+  NS_PRECONDITION(!nsContentUtils::GetCurrentJSContext(),
+                  "Shouldn't have a JSContext on the stack");
 
   if (mTestControllingRefreshes && aTimer) {
     // Ignore real refreshes from our timer (but honor the others).

From 64487ba7d8cd7be06af175bfce7b63fe3a5502d3 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 175/314] Bug 349259.  Allow pages to override line-height on
 form controls, except for <select>.  r=dbaron

---
 layout/style/forms.css                 | 16 ++++++++--------
 layout/style/test/test_animations.html |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layout/style/forms.css b/layout/style/forms.css
index c23bc6894f2c..1c5f1bc3ca26 100644
--- a/layout/style/forms.css
+++ b/layout/style/forms.css
@@ -97,13 +97,7 @@ input {
   color: -moz-FieldText;
   font: -moz-field;
   text-rendering: optimizeLegibility;
-  /*
-   * Note that the "UA !important" tests in
-   * layout/style/test/test_animations.html depend on this rule, because
-   * they need some UA !important rule to test.  If this changes, use a
-   * different one there.
-   */
-  line-height: normal !important;
+  line-height: normal;
   text-align: start;
   text-transform: none;
   word-spacing: normal;
@@ -219,6 +213,12 @@ select {
   background-color: -moz-Combobox;
   color: -moz-ComboboxText;
   font: -moz-list;
+  /*
+   * Note that the "UA !important" tests in
+   * layout/style/test/test_animations.html depend on this rule, because
+   * they need some UA !important rule to test.  If this changes, use a
+   * different one there.
+   */
   line-height: normal !important;
   white-space: nowrap !important;
   word-wrap: normal !important;
@@ -537,7 +537,7 @@ input[type="submit"] {
   background-color: ButtonFace;
   color: ButtonText; 
   font: -moz-button;
-  line-height: normal !important;
+  line-height: normal;
   white-space: pre;
   cursor: default;
   -moz-box-sizing: border-box;
diff --git a/layout/style/test/test_animations.html b/layout/style/test/test_animations.html
index ccb7df0d24a0..8a59ff58fe0e 100644
--- a/layout/style/test/test_animations.html
+++ b/layout/style/test/test_animations.html
@@ -1203,12 +1203,12 @@ done_div();
 
 // Test that UA !important rules override animations.
 // This test depends on forms.css having a rule
-//   input { line-height: !important }
+//   select { line-height: !important }
 // If that rule changes, we should rewrite it to depend on a different rule.
-new_element("input", "");
+new_element("select", "");
 var default_line_height = cs.lineHeight;
 done_div();
-new_element("input", "-moz-animation: uaoverride 2s linear infinite");
+new_element("select", "-moz-animation: uaoverride 2s linear infinite");
 is(cs.lineHeight, default_line_height,
    "animations should not override UA !important at 0ms");
 is(cs.marginTop, "20px",

From 505c10358285062d1ba94dcb398c16b91efa5ac5 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 176/314] Bug 614171 part 1.  Switch away from Init() to using
 a constructor for nodeinfo.  r=sicking

---
 content/base/src/nsNodeInfo.cpp        | 32 ++++++++++----------------
 content/base/src/nsNodeInfo.h          | 22 ++++++++----------
 content/base/src/nsNodeInfoManager.cpp | 17 +++++++-------
 3 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp
index 38dda16400c5..71ba0f8e4d52 100644
--- a/content/base/src/nsNodeInfo.cpp
+++ b/content/base/src/nsNodeInfo.cpp
@@ -68,7 +68,8 @@ nsFixedSizeAllocator* nsNodeInfo::sNodeInfoPool = nsnull;
 
 // static
 nsNodeInfo*
-nsNodeInfo::Create()
+nsNodeInfo::Create(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
+                   nsNodeInfoManager *aOwnerManager)
 {
   if (!sNodeInfoPool) {
     sNodeInfoPool = new nsFixedSizeAllocator();
@@ -86,33 +87,26 @@ nsNodeInfo::Create()
 
   // Create a new one
   void* place = sNodeInfoPool->Alloc(sizeof(nsNodeInfo));
-  return place ? new (place) nsNodeInfo() : nsnull;
-}
-
-nsNodeInfo::nsNodeInfo()
-{
+  return place ?
+    new (place) nsNodeInfo(aName, aPrefix, aNamespaceID, aOwnerManager) :
+    nsnull;
 }
 
 nsNodeInfo::~nsNodeInfo()
 {
-  if (mOwnerManager) {
-    mOwnerManager->RemoveNodeInfo(this);
-    NS_RELEASE(mOwnerManager);
-  }
+  mOwnerManager->RemoveNodeInfo(this);
+  NS_RELEASE(mOwnerManager);
 
-  NS_IF_RELEASE(mInner.mName);
+  NS_RELEASE(mInner.mName);
   NS_IF_RELEASE(mInner.mPrefix);
 }
 
 
-nsresult
-nsNodeInfo::Init(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
-                 nsNodeInfoManager *aOwnerManager)
+nsNodeInfo::nsNodeInfo(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
+                       nsNodeInfoManager *aOwnerManager)
 {
-  NS_ENSURE_TRUE(!mInner.mName && !mInner.mPrefix && !mOwnerManager,
-                 NS_ERROR_ALREADY_INITIALIZED);
-  NS_ENSURE_ARG_POINTER(aName);
-  NS_ENSURE_ARG_POINTER(aOwnerManager);
+  NS_ABORT_IF_FALSE(aName, "Must have a name");
+  NS_ABORT_IF_FALSE(aOwnerManager, "Must have an owner manager");
 
   mInner.mName = aName;
   NS_ADDREF(mInner.mName);
@@ -124,8 +118,6 @@ nsNodeInfo::Init(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
 
   mOwnerManager = aOwnerManager;
   NS_ADDREF(mOwnerManager);
-
-  return NS_OK;
 }
 
 
diff --git a/content/base/src/nsNodeInfo.h b/content/base/src/nsNodeInfo.h
index 054584238890..cc512b2a7977 100644
--- a/content/base/src/nsNodeInfo.h
+++ b/content/base/src/nsNodeInfo.h
@@ -75,23 +75,21 @@ public:
   // nsNodeInfo
   // Create objects with Create
 public:
-  static nsNodeInfo *Create();
+  /*
+   * aName and aOwnerManager may not be null.
+   */
+  static nsNodeInfo *Create(nsIAtom *aName, nsIAtom *aPrefix,
+                            PRInt32 aNamespaceID,
+                            nsNodeInfoManager *aOwnerManager);
 private:
-  nsNodeInfo();
+  nsNodeInfo(); // Unimplemented
+  nsNodeInfo(const nsNodeInfo& aOther); // Unimplemented
+  nsNodeInfo(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
+             nsNodeInfoManager *aOwnerManager);
 protected:
   virtual ~nsNodeInfo();
 
 public:
-  /*
-   * Note! Init() must be called exactly once on every nsNodeInfo before
-   * the object is used, if Init() returns an error code the nsNodeInfo
-   * should not be used.
-   *
-   * aName and aOwnerManager may not be null.
-   */
-  nsresult Init(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
-                nsNodeInfoManager *aOwnerManager);
-
   /**
    * Call before shutdown to clear the cache and free memory for this class.
    */
diff --git a/content/base/src/nsNodeInfoManager.cpp b/content/base/src/nsNodeInfoManager.cpp
index d27924d23593..5b701e568868 100644
--- a/content/base/src/nsNodeInfoManager.cpp
+++ b/content/base/src/nsNodeInfoManager.cpp
@@ -223,16 +223,16 @@ nsNodeInfoManager::GetNodeInfo(nsIAtom *aName, nsIAtom *aPrefix,
     return nodeInfo;
   }
 
-  nsRefPtr<nsNodeInfo> newNodeInfo = nsNodeInfo::Create();
+  nsRefPtr<nsNodeInfo> newNodeInfo =
+    nsNodeInfo::Create(aName, aPrefix, aNamespaceID, this);
   NS_ENSURE_TRUE(newNodeInfo, nsnull);
   
-  nsresult rv = newNodeInfo->Init(aName, aPrefix, aNamespaceID, this);
-  NS_ENSURE_SUCCESS(rv, nsnull);
-
   PLHashEntry *he;
   he = PL_HashTableAdd(mNodeInfoHash, &newNodeInfo->mInner, newNodeInfo);
   NS_ENSURE_TRUE(he, nsnull);
 
+  // Have to do the swap thing, because already_AddRefed<nsNodeInfo>
+  // doesn't cast to already_AddRefed<nsINodeInfo>
   nsNodeInfo *nodeInfo = nsnull;
   newNodeInfo.swap(nodeInfo);
 
@@ -259,12 +259,13 @@ nsNodeInfoManager::GetNodeInfo(const nsAString& aName, nsIAtom *aPrefix,
     return NS_OK;
   }
 
-  nsRefPtr<nsNodeInfo> newNodeInfo = nsNodeInfo::Create();
-  NS_ENSURE_TRUE(newNodeInfo, nsnull);
   
   nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(aName);
-  nsresult rv = newNodeInfo->Init(nameAtom, aPrefix, aNamespaceID, this);
-  NS_ENSURE_SUCCESS(rv, rv);
+  NS_ENSURE_TRUE(nameAtom, NS_ERROR_OUT_OF_MEMORY);
+
+  nsRefPtr<nsNodeInfo> newNodeInfo =
+      nsNodeInfo::Create(nameAtom, aPrefix, aNamespaceID, this);
+  NS_ENSURE_TRUE(newNodeInfo, NS_ERROR_OUT_OF_MEMORY);
 
   PLHashEntry *he;
   he = PL_HashTableAdd(mNodeInfoHash, &newNodeInfo->mInner, newNodeInfo);

From e57286385c42d206f52d1fa1b8d1c1be549f7041 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 177/314] Bug 614171 part 2.  Cache the qualified name, in
 normal and corrected case, on the nsINodeInfo.  r=sicking

---
 content/base/public/nsINodeInfo.h             | 41 +++++++---
 content/base/src/nsGenericElement.cpp         |  4 +-
 content/base/src/nsNodeInfo.cpp               | 76 +++++--------------
 content/base/src/nsNodeInfo.h                 |  3 -
 .../html/content/src/nsGenericHTMLElement.cpp | 17 -----
 .../html/content/src/nsGenericHTMLElement.h   |  4 -
 6 files changed, 51 insertions(+), 94 deletions(-)

diff --git a/content/base/public/nsINodeInfo.h b/content/base/public/nsINodeInfo.h
index 7ebf44c993f0..db3fb7e2dd80 100644
--- a/content/base/public/nsINodeInfo.h
+++ b/content/base/public/nsINodeInfo.h
@@ -71,10 +71,10 @@ class nsIURI;
 class nsIPrincipal;
 
 // IID for the nsINodeInfo interface
-// 35e53115-b884-4cfc-aa95-bdf0aa5152cf
+// 4aa7526e-37d3-49e3-a566-f251b2ef2a21
 #define NS_INODEINFO_IID      \
-{ 0x35e53115, 0xb884, 0x4cfc, \
- { 0xaa, 0x95, 0xbd, 0xf0, 0xaa, 0x51, 0x52, 0xcf } }
+{ 0x4aa7526e, 0x37d3, 0x49e3, \
+ { 0xa5, 0x66, 0xf2, 0x51, 0xb2, 0xef, 0x2a, 0x21 } }
 
 class nsINodeInfo : public nsISupports
 {
@@ -117,7 +117,18 @@ public:
    * For the HTML element "<body>" this will return "body" and for the XML
    * element "<html:body>" this will return "html:body".
    */
-  virtual void GetQualifiedName(nsAString& aQualifiedName) const = 0;
+  void GetQualifiedName(nsAString& aQualifiedName) const {
+    aQualifiedName = mQualifiedName;
+  }
+
+  /*
+   * As above, but return the qualified name in corrected case as
+   * needed.  For example, for HTML elements in HTML documents, this
+   * will return an ASCII-uppercased version of the qualified name.
+   */
+  void GetQualifiedNameCorrectedCase(nsAString& aQualifiedName) const {
+    aQualifiedName = mQualifiedNameCorrectedCase;
+  }
 
   /*
    * Get the local name from this node as a string, GetLocalName() gets the
@@ -270,15 +281,12 @@ public:
     if (!GetPrefixAtom())
       return Equals(aNameAtom);
 
-    return QualifiedNameEqualsInternal(nsDependentAtomString(aNameAtom));
+    return aNameAtom->Equals(mQualifiedName);
   }
 
   PRBool QualifiedNameEquals(const nsAString& aQualifiedName) const
   {
-    if (!GetPrefixAtom())
-      return mInner.mName->Equals(aQualifiedName);
-
-    return QualifiedNameEqualsInternal(aQualifiedName);    
+    return mQualifiedName == aQualifiedName;
   }
 
   /*
@@ -290,9 +298,6 @@ public:
   }
 
 protected:
-  virtual PRBool
-    QualifiedNameEqualsInternal(const nsAString& aQualifiedName) const = 0;
-
   /*
    * nsNodeInfoInner is used for two things:
    *
@@ -339,6 +344,18 @@ protected:
 
   nsCOMPtr<nsIAtom> mIDAttributeAtom;
   nsNodeInfoManager* mOwnerManager; // Strong reference!
+
+  /*
+   * Members for various functions of mName+mPrefix that we can be
+   * asked to compute.
+   */
+
+  // Qualified name
+  nsString mQualifiedName;
+
+  // Qualified name in "corrected case"; this will depend on our
+  // document and on mNamespaceID.
+  nsString mQualifiedNameCorrectedCase;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINodeInfo, NS_INODEINFO_IID)
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 4e7754f68338..3cf1209380d6 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2169,7 +2169,7 @@ nsGenericElement::~nsGenericElement()
 NS_IMETHODIMP
 nsGenericElement::GetNodeName(nsAString& aNodeName)
 {
-  mNodeInfo->GetQualifiedName(aNodeName);
+  mNodeInfo->GetQualifiedNameCorrectedCase(aNodeName);
   return NS_OK;
 }
 
@@ -2376,7 +2376,7 @@ nsGenericElement::HasChildNodes(PRBool* aReturn)
 NS_IMETHODIMP
 nsGenericElement::GetTagName(nsAString& aTagName)
 {
-  mNodeInfo->GetQualifiedName(aTagName);
+  mNodeInfo->GetQualifiedNameCorrectedCase(aTagName);
   return NS_OK;
 }
 
diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp
index 71ba0f8e4d52..7370d6667be0 100644
--- a/content/base/src/nsNodeInfo.cpp
+++ b/content/base/src/nsNodeInfo.cpp
@@ -118,6 +118,26 @@ nsNodeInfo::nsNodeInfo(nsIAtom *aName, nsIAtom *aPrefix, PRInt32 aNamespaceID,
 
   mOwnerManager = aOwnerManager;
   NS_ADDREF(mOwnerManager);
+
+  // Now compute our cached members.
+
+  // Qualified name.  If we have no prefix, use ToString on
+  // mInner.mName so that we get to share its buffer.
+  if (aPrefix) {
+    aPrefix->ToString(mQualifiedName);
+    mQualifiedName.Append(PRUnichar(':'));
+    mQualifiedName.Append(nsDependentAtomString(mInner.mName));
+  } else {
+    mInner.mName->ToString(mQualifiedName);
+  }
+
+  // Qualified name in corrected case
+  if (aNamespaceID == kNameSpaceID_XHTML && GetDocument() &&
+      GetDocument()->IsHTML()) {
+    nsContentUtils::ASCIIToUpper(mQualifiedName, mQualifiedNameCorrectedCase);
+  } else {
+    mQualifiedNameCorrectedCase = mQualifiedName;
+  }
 }
 
 
@@ -172,24 +192,6 @@ NS_INTERFACE_MAP_END
 
 // nsINodeInfo
 
-void
-nsNodeInfo::GetQualifiedName(nsAString& aQualifiedName) const
-{
-  if (mInner.mPrefix) {
-    mInner.mPrefix->ToString(aQualifiedName);
-
-    aQualifiedName.Append(PRUnichar(':'));
-  } else {
-    aQualifiedName.Truncate();
-  }
-
-  nsAutoString name;
-  mInner.mName->ToString(name);
-
-  aQualifiedName.Append(name);
-}
-
-
 void
 nsNodeInfo::GetLocalName(nsAString& aLocalName) const
 {
@@ -273,44 +275,6 @@ nsNodeInfo::NamespaceEquals(const nsAString& aNamespaceURI) const
   return nsINodeInfo::NamespaceEquals(nsid);
 }
 
-PRBool
-nsNodeInfo::QualifiedNameEqualsInternal(const nsAString& aQualifiedName) const
-{
-  NS_PRECONDITION(mInner.mPrefix, "Must have prefix");
-  
-  nsAString::const_iterator start;
-  aQualifiedName.BeginReading(start);
-
-  nsAString::const_iterator colon(start);
-
-  nsDependentAtomString prefix(mInner.mPrefix);
-
-  if (prefix.Length() >= aQualifiedName.Length()) {
-    return PR_FALSE;
-  }
-
-  colon.advance(prefix.Length());
-
-  // If the character at the prefix length index is not a colon,
-  // aQualifiedName is not equal to this string.
-  if (*colon != ':') {
-    return PR_FALSE;
-  }
-
-  // Compare the prefix to the string from the start to the colon
-  if (!prefix.Equals(Substring(start, colon)))
-    return PR_FALSE;
-
-  ++colon; // Skip the ':'
-
-  nsAString::const_iterator end;
-  aQualifiedName.EndReading(end);
-
-  // Compare the local name to the string between the colon and the
-  // end of aQualifiedName
-  return mInner.mName->Equals(Substring(colon, end));
-}
-
 // static
 void
 nsNodeInfo::ClearCache()
diff --git a/content/base/src/nsNodeInfo.h b/content/base/src/nsNodeInfo.h
index cc512b2a7977..94b100e459cd 100644
--- a/content/base/src/nsNodeInfo.h
+++ b/content/base/src/nsNodeInfo.h
@@ -59,7 +59,6 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS(nsNodeInfo)
 
   // nsINodeInfo
-  virtual void GetQualifiedName(nsAString &aQualifiedName) const;
   virtual void GetLocalName(nsAString& aLocalName) const;
   virtual nsresult GetNamespaceURI(nsAString& aNameSpaceURI) const;
   virtual PRBool Equals(const nsAString& aName) const;
@@ -69,8 +68,6 @@ public:
   virtual PRBool Equals(const nsAString& aName, const nsAString& aPrefix,
                         PRInt32 aNamespaceID) const;
   virtual PRBool NamespaceEquals(const nsAString& aNamespaceURI) const;
-  virtual PRBool
-    QualifiedNameEqualsInternal(const nsAString& aQualifiedName) const;
 
   // nsNodeInfo
   // Create objects with Create
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 9355521ed2a2..0d91f6bd7d47 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -336,12 +336,6 @@ nsGenericHTMLElement::CopyInnerTo(nsGenericElement* aDst) const
   return NS_OK;
 }
 
-nsresult
-nsGenericHTMLElement::GetTagName(nsAString& aTagName)
-{
-  return GetNodeName(aTagName);
-}
-
 NS_IMETHODIMP
 nsGenericHTMLElement::SetAttribute(const nsAString& aName,
                                    const nsAString& aValue)
@@ -370,17 +364,6 @@ nsGenericHTMLElement::SetAttribute(const nsAString& aName,
                  aValue, PR_TRUE);
 }
 
-nsresult
-nsGenericHTMLElement::GetNodeName(nsAString& aNodeName)
-{
-  mNodeInfo->GetQualifiedName(aNodeName);
-
-  if (IsInHTMLDocument())
-    nsContentUtils::ASCIIToUpper(aNodeName);
-
-  return NS_OK;
-}
-
 // Implementation for nsIDOMHTMLElement
 nsresult
 nsGenericHTMLElement::GetId(nsAString& aId)
diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h
index 6a346b1d4e5a..9302eeac037d 100644
--- a/content/html/content/src/nsGenericHTMLElement.h
+++ b/content/html/content/src/nsGenericHTMLElement.h
@@ -102,13 +102,9 @@ public:
   // From nsGenericElement
   nsresult CopyInnerTo(nsGenericElement* aDest) const;
 
-  // Implementation for nsIDOMNode
-  NS_METHOD GetNodeName(nsAString& aNodeName);
-
   // Implementation for nsIDOMElement
   NS_METHOD SetAttribute(const nsAString& aName,
                          const nsAString& aValue);
-  NS_METHOD GetTagName(nsAString& aTagName);
 
   // nsIDOMHTMLElement methods. Note that these are non-virtual
   // methods, implementations are expected to forward calls to these

From b8ee95adec168d3ad82cf10e553cb2c241e121ad Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:33 -0400
Subject: [PATCH 178/314] Bug 614171 part 3.  deCOM qualified name getters a
 bit.  r=sicking

---
 accessible/src/base/nsAccessible.cpp                |  6 +++---
 content/base/public/nsINodeInfo.h                   |  8 ++++----
 content/base/src/nsAttrName.h                       |  2 +-
 content/base/src/nsContentUtils.cpp                 |  2 +-
 content/base/src/nsDOMAttribute.cpp                 |  2 +-
 content/base/src/nsGenericElement.cpp               | 11 ++++-------
 content/base/src/nsMappedAttributes.cpp             |  7 +------
 content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp |  9 +--------
 content/xul/document/src/nsXULDocument.cpp          |  7 +------
 9 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp
index 6b57eb928ec7..ade5ab95e057 100644
--- a/accessible/src/base/nsAccessible.cpp
+++ b/accessible/src/base/nsAccessible.cpp
@@ -197,10 +197,10 @@ nsAccessible::nsAccessible(nsIContent *aContent, nsIWeakReference *aShell) :
             (void*)shell.get());
     nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
     if (content) {
+      printf(" Con: %s@%p",
+             NS_ConvertUTF16toUTF8(content->NodeInfo()->QualifiedName()).get(),
+             (void *)content.get());
       nsAutoString buf;
-      if (content->NodeInfo())
-        content->NodeInfo()->GetQualifiedName(buf);
-      printf(" Con: %s@%p", NS_ConvertUTF16toUTF8(buf).get(), (void *)content.get());
       if (NS_SUCCEEDED(GetName(buf))) {
         printf(" Name:[%s]", NS_ConvertUTF16toUTF8(buf).get());
        }
diff --git a/content/base/public/nsINodeInfo.h b/content/base/public/nsINodeInfo.h
index db3fb7e2dd80..9bb4ab4cfb87 100644
--- a/content/base/public/nsINodeInfo.h
+++ b/content/base/public/nsINodeInfo.h
@@ -117,8 +117,8 @@ public:
    * For the HTML element "<body>" this will return "body" and for the XML
    * element "<html:body>" this will return "html:body".
    */
-  void GetQualifiedName(nsAString& aQualifiedName) const {
-    aQualifiedName = mQualifiedName;
+  const nsString& QualifiedName() const {
+    return mQualifiedName;
   }
 
   /*
@@ -126,8 +126,8 @@ public:
    * needed.  For example, for HTML elements in HTML documents, this
    * will return an ASCII-uppercased version of the qualified name.
    */
-  void GetQualifiedNameCorrectedCase(nsAString& aQualifiedName) const {
-    aQualifiedName = mQualifiedNameCorrectedCase;
+  const nsString& QualifiedNameCorrectedCase() const {
+    return mQualifiedNameCorrectedCase;
   }
 
   /*
diff --git a/content/base/src/nsAttrName.h b/content/base/src/nsAttrName.h
index b43d8547a908..0ffdc8a4272d 100644
--- a/content/base/src/nsAttrName.h
+++ b/content/base/src/nsAttrName.h
@@ -187,7 +187,7 @@ public:
       Atom()->ToString(aStr);
     }
     else {
-      NodeInfo()->GetQualifiedName(aStr);
+      aStr = NodeInfo()->QualifiedName();
     }
   }
 
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index fa3f89bd3d9a..95049f77b4c2 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -3933,7 +3933,7 @@ nsContentUtils::CreateContextualFragment(nsINode* aContextNode,
     nsString& tagName = *tagStack.AppendElement();
     NS_ENSURE_TRUE(&tagName, NS_ERROR_OUT_OF_MEMORY);
 
-    content->NodeInfo()->GetQualifiedName(tagName);
+    tagName = content->NodeInfo()->QualifiedName();
 
     // see if we need to add xmlns declarations
     PRUint32 count = content->GetAttrCount();
diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
index 4b2ae2f4665c..493428bca2f6 100644
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -203,7 +203,7 @@ nsDOMAttribute::SetOwnerDocument(nsIDocument* aDocument)
 NS_IMETHODIMP
 nsDOMAttribute::GetName(nsAString& aName)
 {
-  mNodeInfo->GetQualifiedName(aName);
+  aName = mNodeInfo->QualifiedName();
   return NS_OK;
 }
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 3cf1209380d6..c3fb1cc99100 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2169,7 +2169,7 @@ nsGenericElement::~nsGenericElement()
 NS_IMETHODIMP
 nsGenericElement::GetNodeName(nsAString& aNodeName)
 {
-  mNodeInfo->GetQualifiedNameCorrectedCase(aNodeName);
+  aNodeName = mNodeInfo->QualifiedNameCorrectedCase();
   return NS_OK;
 }
 
@@ -2376,7 +2376,7 @@ nsGenericElement::HasChildNodes(PRBool* aReturn)
 NS_IMETHODIMP
 nsGenericElement::GetTagName(nsAString& aTagName)
 {
-  mNodeInfo->GetQualifiedNameCorrectedCase(aTagName);
+  aTagName = mNodeInfo->QualifiedNameCorrectedCase();
   return NS_OK;
 }
 
@@ -5111,9 +5111,7 @@ nsGenericElement::List(FILE* out, PRInt32 aIndent,
 
   fputs(aPrefix.get(), out);
 
-  nsAutoString buf;
-  mNodeInfo->GetQualifiedName(buf);
-  fputs(NS_LossyConvertUTF16toASCII(buf).get(), out);
+  fputs(NS_LossyConvertUTF16toASCII(mNodeInfo->QualifiedName()).get(), out);
 
   fprintf(out, "@%p", (void *)this);
 
@@ -5201,8 +5199,7 @@ nsGenericElement::DumpContent(FILE* out, PRInt32 aIndent,
   PRInt32 indent;
   for (indent = aIndent; --indent >= 0; ) fputs("  ", out);
 
-  nsAutoString buf;
-  mNodeInfo->GetQualifiedName(buf);
+  const nsString& buf = mNodeInfo->QualifiedName();
   fputs("<", out);
   fputs(NS_LossyConvertUTF16toASCII(buf).get(), out);
 
diff --git a/content/base/src/nsMappedAttributes.cpp b/content/base/src/nsMappedAttributes.cpp
index c12243fda129..317b9ee91112 100644
--- a/content/base/src/nsMappedAttributes.cpp
+++ b/content/base/src/nsMappedAttributes.cpp
@@ -215,12 +215,7 @@ nsMappedAttributes::List(FILE* out, PRInt32 aIndent) const
     for (indent = aIndent; indent > 0; --indent)
       fputs("  ", out);
 
-    if (Attrs()[i].mName.IsAtom()) {
-      Attrs()[i].mName.Atom()->ToString(buffer);
-    }
-    else {
-      Attrs()[i].mName.NodeInfo()->GetQualifiedName(buffer);
-    }
+    Attrs()[i].mName.GetQualifiedName(buffer);
     fputs(NS_LossyConvertUTF16toASCII(buffer).get(), out);
 
     Attrs()[i].mValue.ToString(buffer);
diff --git a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 65fdbc019fe6..77c427f68fff 100644
--- a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -469,14 +469,7 @@ txXPathNodeUtils::getNodeName(const txXPathNode& aNode, nsAString& aName)
 
     if (aNode.isContent()) {
         if (aNode.mNode->IsElement()) {
-            nsINodeInfo* nodeInfo = aNode.Content()->NodeInfo();
-            nodeInfo->GetQualifiedName(aName);
-
-            // Check for html
-            if (aNode.Content()->IsHTML() &&
-                aNode.Content()->IsInHTMLDocument()) {
-                ToUpperCase(aName);
-            }
+            aName = aNode.Content()->NodeInfo()->QualifiedNameCorrectedCase();
             return;
         }
 
diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp
index bc53d5a5e8c8..6ffe838aa2e4 100644
--- a/content/xul/document/src/nsXULDocument.cpp
+++ b/content/xul/document/src/nsXULDocument.cpp
@@ -3682,14 +3682,9 @@ nsXULDocument::CreateElementFromPrototype(nsXULPrototypeElement* aPrototype,
 
 #ifdef PR_LOGGING
     if (PR_LOG_TEST(gXULLog, PR_LOG_NOTICE)) {
-        nsAutoString tagstr;
-        aPrototype->mNodeInfo->GetQualifiedName(tagstr);
-
-        nsCAutoString tagstrC;
-        tagstrC.AssignWithConversion(tagstr);
         PR_LOG(gXULLog, PR_LOG_NOTICE,
                ("xul: creating <%s> from prototype",
-                tagstrC.get()));
+                NS_ConvertUTF16toUTF8(aPrototype->mNodeInfo->QualifiedName()).get()));
     }
 #endif
 

From b0f79ba197741b1abacff39d8ee0b584a3225fc8 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:33 -0400
Subject: [PATCH 179/314] Bug 614171 part 4.  Eliminate
 nsINodeInfo::GetLocalName in favor of GetName.  r=sicking

---
 content/base/public/nsINodeInfo.h                | 16 ++--------------
 content/base/src/nsDOMAttribute.cpp              |  2 +-
 content/base/src/nsGenericElement.cpp            |  2 +-
 content/base/src/nsNodeInfo.cpp                  | 15 ---------------
 content/base/src/nsNodeInfo.h                    |  1 -
 content/base/src/nsXMLContentSerializer.cpp      |  4 ++--
 .../html/content/src/nsGenericHTMLElement.cpp    |  2 +-
 .../xslt/src/xpath/txMozillaXPathTreeWalker.cpp  |  2 +-
 8 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/content/base/public/nsINodeInfo.h b/content/base/public/nsINodeInfo.h
index 9bb4ab4cfb87..205fe5c11852 100644
--- a/content/base/public/nsINodeInfo.h
+++ b/content/base/public/nsINodeInfo.h
@@ -71,10 +71,9 @@ class nsIURI;
 class nsIPrincipal;
 
 // IID for the nsINodeInfo interface
-// 4aa7526e-37d3-49e3-a566-f251b2ef2a21
 #define NS_INODEINFO_IID      \
-{ 0x4aa7526e, 0x37d3, 0x49e3, \
- { 0xa5, 0x66, 0xf2, 0x51, 0xb2, 0xef, 0x2a, 0x21 } }
+{ 0xdfb15226, 0x79ad, 0x4c7c, \
+ { 0x9d, 0x73, 0x3d, 0xbc, 0x13, 0x17, 0x02, 0x74 } }
 
 class nsINodeInfo : public nsISupports
 {
@@ -130,17 +129,6 @@ public:
     return mQualifiedNameCorrectedCase;
   }
 
-  /*
-   * Get the local name from this node as a string, GetLocalName() gets the
-   * same string as GetName() but only if the node has a prefix and/or a
-   * namespace URI. If the node has neither a prefix nor a namespace URI the
-   * local name is a null string.
-   *
-   * For the HTML element "<body>" in a HTML document this will return a null
-   * string and for the XML element "<html:body>" this will return "body".
-   */
-  virtual void GetLocalName(nsAString& aLocalName) const = 0;
-
 #ifdef MOZILLA_INTERNAL_API
   /*
    * Get the prefix from this node as a string.
diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
index 493428bca2f6..9c3a234c7822 100644
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -470,7 +470,7 @@ nsDOMAttribute::GetPrefix(nsAString& aPrefix)
 NS_IMETHODIMP
 nsDOMAttribute::GetLocalName(nsAString& aLocalName)
 {
-  mNodeInfo->GetLocalName(aLocalName);
+  mNodeInfo->GetName(aLocalName);
   return NS_OK;
 }
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index c3fb1cc99100..6deee3dce6b4 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2176,7 +2176,7 @@ nsGenericElement::GetNodeName(nsAString& aNodeName)
 NS_IMETHODIMP
 nsGenericElement::GetLocalName(nsAString& aLocalName)
 {
-  mNodeInfo->GetLocalName(aLocalName);
+  mNodeInfo->GetName(aLocalName);
   return NS_OK;
 }
 
diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp
index 7370d6667be0..1bee1a78c216 100644
--- a/content/base/src/nsNodeInfo.cpp
+++ b/content/base/src/nsNodeInfo.cpp
@@ -192,21 +192,6 @@ NS_INTERFACE_MAP_END
 
 // nsINodeInfo
 
-void
-nsNodeInfo::GetLocalName(nsAString& aLocalName) const
-{
-#ifdef STRICT_DOM_LEVEL2_LOCALNAME
-  if (mInner.mNamespaceID > 0) {
-    mInner.mName->ToString(aLocalName);
-  } else {
-    SetDOMStringToNull(aLocalName);
-  }
-#else
-  mInner.mName->ToString(aLocalName);
-#endif
-}
-
-
 nsresult
 nsNodeInfo::GetNamespaceURI(nsAString& aNameSpaceURI) const
 {
diff --git a/content/base/src/nsNodeInfo.h b/content/base/src/nsNodeInfo.h
index 94b100e459cd..61a407930015 100644
--- a/content/base/src/nsNodeInfo.h
+++ b/content/base/src/nsNodeInfo.h
@@ -59,7 +59,6 @@ public:
   NS_DECL_CYCLE_COLLECTION_CLASS(nsNodeInfo)
 
   // nsINodeInfo
-  virtual void GetLocalName(nsAString& aLocalName) const;
   virtual nsresult GetNamespaceURI(nsAString& aNameSpaceURI) const;
   virtual PRBool Equals(const nsAString& aName) const;
   virtual PRBool Equals(const nsAString& aName,
diff --git a/content/base/src/nsXMLContentSerializer.cpp b/content/base/src/nsXMLContentSerializer.cpp
index 111541d65ad2..ed738fde1ee3 100644
--- a/content/base/src/nsXMLContentSerializer.cpp
+++ b/content/base/src/nsXMLContentSerializer.cpp
@@ -933,7 +933,7 @@ nsXMLContentSerializer::AppendElementStart(Element* aElement,
 
   nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
   aElement->NodeInfo()->GetPrefix(tagPrefix);
-  aElement->NodeInfo()->GetLocalName(tagLocalName);
+  aElement->NodeInfo()->GetName(tagLocalName);
   aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
 
   PRUint32 skipAttr = ScanNamespaceDeclarations(content,
@@ -1044,7 +1044,7 @@ nsXMLContentSerializer::AppendElementEnd(Element* aElement,
   nsAutoString tagPrefix, tagLocalName, tagNamespaceURI;
   
   aElement->NodeInfo()->GetPrefix(tagPrefix);
-  aElement->NodeInfo()->GetLocalName(tagLocalName);
+  aElement->NodeInfo()->GetName(tagLocalName);
   aElement->NodeInfo()->GetNamespaceURI(tagNamespaceURI);
 
 #ifdef DEBUG
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index 0d91f6bd7d47..0da5c474f1b8 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -136,7 +136,7 @@ static nsHashtable sGEUS_ElementCounts;
 void GEUS_ElementCreated(nsINodeInfo *aNodeInfo)
 {
   nsAutoString name;
-  aNodeInfo->GetLocalName(name);
+  aNodeInfo->GetName(name);
 
   nsStringKey key(name);
 
diff --git a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 77c427f68fff..7c74972f9dbb 100644
--- a/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -430,7 +430,7 @@ txXPathNodeUtils::getLocalName(const txXPathNode& aNode, nsAString& aLocalName)
     if (aNode.isContent()) {
         if (aNode.mNode->IsElement()) {
             nsINodeInfo* nodeInfo = aNode.Content()->NodeInfo();
-            nodeInfo->GetLocalName(aLocalName);
+            nodeInfo->GetName(aLocalName);
             return;
         }
 

From c72c9abf56802071d09854385620ddd5de5e5b10 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:26:33 -0400
Subject: [PATCH 180/314] Bug 614171 part 5.  Inline the cheap Equals() methods
 on nsINodeInfo.  r=sicking

---
 content/base/public/nsINodeInfo.h | 35 ++++++++++++++++++-------
 content/base/src/nsNodeInfo.cpp   | 43 -------------------------------
 content/base/src/nsNodeInfo.h     |  6 -----
 3 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/content/base/public/nsINodeInfo.h b/content/base/public/nsINodeInfo.h
index 205fe5c11852..2520899cbfc1 100644
--- a/content/base/public/nsINodeInfo.h
+++ b/content/base/public/nsINodeInfo.h
@@ -72,8 +72,8 @@ class nsIPrincipal;
 
 // IID for the nsINodeInfo interface
 #define NS_INODEINFO_IID      \
-{ 0xdfb15226, 0x79ad, 0x4c7c, \
- { 0x9d, 0x73, 0x3d, 0xbc, 0x13, 0x17, 0x02, 0x74 } }
+{ 0xc5188ea1, 0x0a9c, 0x43e6, \
+ { 0x95, 0x90, 0xcc, 0x43, 0x6b, 0xe9, 0xcf, 0xa0 } }
 
 class nsINodeInfo : public nsISupports
 {
@@ -254,13 +254,30 @@ public:
     return mInner.mNamespaceID == aNamespaceID;
   }
 
-  virtual PRBool Equals(const nsAString& aName) const = 0;
-  virtual PRBool Equals(const nsAString& aName,
-                        const nsAString& aPrefix) const = 0;
-  virtual PRBool Equals(const nsAString& aName,
-                        PRInt32 aNamespaceID) const = 0;
-  virtual PRBool Equals(const nsAString& aName, const nsAString& aPrefix,
-                        PRInt32 aNamespaceID) const = 0;
+  PRBool Equals(const nsAString& aName) const
+  {
+    return mInner.mName->Equals(aName);
+  }
+
+  PRBool Equals(const nsAString& aName, const nsAString& aPrefix) const
+  {
+    return mInner.mName->Equals(aName) &&
+      (mInner.mPrefix ? mInner.mPrefix->Equals(aPrefix) : aPrefix.IsEmpty());
+  }
+
+  PRBool Equals(const nsAString& aName, PRInt32 aNamespaceID) const
+  {
+    return mInner.mNamespaceID == aNamespaceID &&
+      mInner.mName->Equals(aName);
+  }
+
+  PRBool Equals(const nsAString& aName, const nsAString& aPrefix,
+                PRInt32 aNamespaceID) const
+  {
+    return mInner.mName->Equals(aName) && mInner.mNamespaceID == aNamespaceID &&
+      (mInner.mPrefix ? mInner.mPrefix->Equals(aPrefix) : aPrefix.IsEmpty());
+  }
+
   virtual PRBool NamespaceEquals(const nsAString& aNamespaceURI) const = 0;
 
   PRBool QualifiedNameEquals(nsIAtom* aNameAtom) const
diff --git a/content/base/src/nsNodeInfo.cpp b/content/base/src/nsNodeInfo.cpp
index 1bee1a78c216..911363322903 100644
--- a/content/base/src/nsNodeInfo.cpp
+++ b/content/base/src/nsNodeInfo.cpp
@@ -208,49 +208,6 @@ nsNodeInfo::GetNamespaceURI(nsAString& aNameSpaceURI) const
 }
 
 
-PRBool
-nsNodeInfo::Equals(const nsAString& aName) const
-{
-  return mInner.mName->Equals(aName);
-}
-
-
-PRBool
-nsNodeInfo::Equals(const nsAString& aName, const nsAString& aPrefix) const
-{
-  if (!mInner.mName->Equals(aName)) {
-    return PR_FALSE;
-  }
-
-  if (!mInner.mPrefix) {
-    return aPrefix.IsEmpty();
-  }
-
-  return mInner.mPrefix->Equals(aPrefix);
-}
-
-
-PRBool
-nsNodeInfo::Equals(const nsAString& aName, PRInt32 aNamespaceID) const
-{
-  return mInner.mNamespaceID == aNamespaceID &&
-    mInner.mName->Equals(aName);
-}
-
-
-PRBool
-nsNodeInfo::Equals(const nsAString& aName, const nsAString& aPrefix,
-                   PRInt32 aNamespaceID) const
-{
-  if (!mInner.mNamespaceID == aNamespaceID ||
-      !mInner.mName->Equals(aName))
-    return PR_FALSE;
-
-  return mInner.mPrefix ? mInner.mPrefix->Equals(aPrefix) :
-    aPrefix.IsEmpty();
-}
-
-
 PRBool
 nsNodeInfo::NamespaceEquals(const nsAString& aNamespaceURI) const
 {
diff --git a/content/base/src/nsNodeInfo.h b/content/base/src/nsNodeInfo.h
index 61a407930015..cee6d8df9914 100644
--- a/content/base/src/nsNodeInfo.h
+++ b/content/base/src/nsNodeInfo.h
@@ -60,12 +60,6 @@ public:
 
   // nsINodeInfo
   virtual nsresult GetNamespaceURI(nsAString& aNameSpaceURI) const;
-  virtual PRBool Equals(const nsAString& aName) const;
-  virtual PRBool Equals(const nsAString& aName,
-                        const nsAString& aPrefix) const;
-  virtual PRBool Equals(const nsAString& aName, PRInt32 aNamespaceID) const;
-  virtual PRBool Equals(const nsAString& aName, const nsAString& aPrefix,
-                        PRInt32 aNamespaceID) const;
   virtual PRBool NamespaceEquals(const nsAString& aNamespaceURI) const;
 
   // nsNodeInfo

From 0cfb1e8539cb4d8420c6b6e4c11731edbebf60e6 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 12:32:03 -0400
Subject: [PATCH 181/314] Backed out changeset 7a3898f131f3 because it doesn't
 list a bug number.

--HG--
extra : rebase_source : 54bdc3dee43b4945bc507fc1c180b5d0045a5d9b
---
 configure.in | 50 ++++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/configure.in b/configure.in
index cd9c29d404b1..6bbcb9755203 100644
--- a/configure.in
+++ b/configure.in
@@ -2961,43 +2961,11 @@ else
     AC_MSG_RESULT(no)
 fi
 
-dnl ========================================================
-dnl C++ rtti
-dnl Should be smarter and check that the compiler does indeed have rtti
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(cpp-rtti,
-[  --enable-cpp-rtti       Enable C++ RTTI ],
-[ _MOZ_USE_RTTI=1 ],
-[ _MOZ_USE_RTTI= ])
-
-if test "$_MOZ_USE_RTTI"; then
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
-else
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
-fi
-
-AC_SUBST(_MOZ_RTTI_FLAGS_ON)
-
-dnl Check whether we can use gcc's c++0x mode
 AC_LANG_CPLUSPLUS
 
 if test "$GNU_CXX"; then
     _SAVE_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-
-    if test -z "$_MOZ_USE_RTTI"; then
-        CXXFLAGS="$CXXFLAGS $_MOZ_RTTI_FLAGS"
-        AC_CACHE_CHECK(for gcc c++0x headers bug without rtti,
-            ac_cv_cxx0x_headers_bug,
-            [AC_TRY_COMPILE([#include <memory>], [],
-                            ac_cv_cxx0x_headers_bug="no",
-                            ac_cv_cxx0x_headers_bug="yes")])
-        CXXFLAGS="$_SAVE_CXXFLAGS"
-        if test "$ac_cv_cxx0x_headers_bug" = "no"; then
-            CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-        fi
-    fi
 fi
 
 dnl Check for usable char16_t (2 bytes, unsigned)
@@ -7961,6 +7929,24 @@ if test "$ac_nscap_nonconst_opeq_bug" = "yes" ; then
 fi
 fi # SKIP_COMPILER_CHECKS
 
+dnl ========================================================
+dnl C++ rtti
+dnl Should be smarter and check that the compiler does indeed have rtti
+dnl ========================================================
+
+MOZ_ARG_ENABLE_BOOL(cpp-rtti,
+[  --enable-cpp-rtti       Enable C++ RTTI ],
+[ _MOZ_USE_RTTI=1 ],
+[ _MOZ_USE_RTTI= ])
+
+if test "$_MOZ_USE_RTTI"; then
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
+else
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
+fi
+
+AC_SUBST(_MOZ_RTTI_FLAGS_ON)
+
 dnl ========================================================
 dnl C++ exceptions (g++/VC/irix6/Sun only - for now)
 dnl Should be smarter and check that the compiler does indeed have exceptions

From 851b26bc1341a392767d41bf4de7ffe0d5cb7d28 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 May 2011 12:26:32 -0400
Subject: [PATCH 182/314] Bug 654493.  Detect gcc c++0x headers brokenness and
 don't use -std=gnu++0x then.  r=bsmedberg

---
 configure.in | 50 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/configure.in b/configure.in
index 6bbcb9755203..cd9c29d404b1 100644
--- a/configure.in
+++ b/configure.in
@@ -2961,11 +2961,43 @@ else
     AC_MSG_RESULT(no)
 fi
 
+dnl ========================================================
+dnl C++ rtti
+dnl Should be smarter and check that the compiler does indeed have rtti
+dnl ========================================================
+
+MOZ_ARG_ENABLE_BOOL(cpp-rtti,
+[  --enable-cpp-rtti       Enable C++ RTTI ],
+[ _MOZ_USE_RTTI=1 ],
+[ _MOZ_USE_RTTI= ])
+
+if test "$_MOZ_USE_RTTI"; then
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
+else
+   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
+fi
+
+AC_SUBST(_MOZ_RTTI_FLAGS_ON)
+
+dnl Check whether we can use gcc's c++0x mode
 AC_LANG_CPLUSPLUS
 
 if test "$GNU_CXX"; then
     _SAVE_CXXFLAGS=$CXXFLAGS
     CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+
+    if test -z "$_MOZ_USE_RTTI"; then
+        CXXFLAGS="$CXXFLAGS $_MOZ_RTTI_FLAGS"
+        AC_CACHE_CHECK(for gcc c++0x headers bug without rtti,
+            ac_cv_cxx0x_headers_bug,
+            [AC_TRY_COMPILE([#include <memory>], [],
+                            ac_cv_cxx0x_headers_bug="no",
+                            ac_cv_cxx0x_headers_bug="yes")])
+        CXXFLAGS="$_SAVE_CXXFLAGS"
+        if test "$ac_cv_cxx0x_headers_bug" = "no"; then
+            CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+        fi
+    fi
 fi
 
 dnl Check for usable char16_t (2 bytes, unsigned)
@@ -7929,24 +7961,6 @@ if test "$ac_nscap_nonconst_opeq_bug" = "yes" ; then
 fi
 fi # SKIP_COMPILER_CHECKS
 
-dnl ========================================================
-dnl C++ rtti
-dnl Should be smarter and check that the compiler does indeed have rtti
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(cpp-rtti,
-[  --enable-cpp-rtti       Enable C++ RTTI ],
-[ _MOZ_USE_RTTI=1 ],
-[ _MOZ_USE_RTTI= ])
-
-if test "$_MOZ_USE_RTTI"; then
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_ON
-else
-   _MOZ_RTTI_FLAGS=$_MOZ_RTTI_FLAGS_OFF
-fi
-
-AC_SUBST(_MOZ_RTTI_FLAGS_ON)
-
 dnl ========================================================
 dnl C++ exceptions (g++/VC/irix6/Sun only - for now)
 dnl Should be smarter and check that the compiler does indeed have exceptions

From 0edb044afce9aa45e9442fee6314ed46c2653892 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 09:37:45 -0700
Subject: [PATCH 183/314] Bug 654904 - Fix tap highlight regression from bug
 653009 [r=wesj]

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

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 296975c1e0cd..fc026483b5a0 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1640,6 +1640,7 @@ const ContentTouchHandler = {
     document.addEventListener("TapLong", this, false);
     document.addEventListener("TapMove", this, false);
 
+    document.addEventListener("PanBegin", this, false);
     document.addEventListener("PopupChanged", this, false);
     document.addEventListener("CancelTouchSequence", this, false);
 
@@ -1665,6 +1666,9 @@ const ContentTouchHandler = {
       return;
 
     switch (aEvent.type) {
+      case "PanBegin":
+        getBrowser().messageManager.sendAsyncMessage("Browser:MouseCancel", {});
+        break;
       case "PopupChanged":
       case "CancelTouchSequence":
         this._clearPendingMessages();

From 65263b99b64898882af62326058b5ef43c5759fa Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 09:37:53 -0700
Subject: [PATCH 184/314] Bug 654127 (followup) - Cache
 "contentMightCaptureMouse" attribute per tab instead of globally [r=wesj]

---
 mobile/chrome/content/browser.js | 27 +++++++++++++--------------
 mobile/chrome/content/content.js |  3 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index fc026483b5a0..26773f810fae 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -362,6 +362,7 @@ var Browser = {
     }
 
     messageManager.addMessageListener("Browser:ViewportMetadata", this);
+    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
     messageManager.addMessageListener("Browser:FormSubmit", this);
     messageManager.addMessageListener("Browser:KeyPress", this);
     messageManager.addMessageListener("Browser:ZoomToPoint:Return", this);
@@ -1133,14 +1134,19 @@ var Browser = {
     let browser = aMessage.target;
 
     switch (aMessage.name) {
-      case "Browser:ViewportMetadata":
+      case "Browser:ViewportMetadata": {
         let tab = this.getTabForBrowser(browser);
         // Some browser such as iframes loaded dynamically into the chrome UI
         // does not have any assigned tab
         if (tab)
           tab.updateViewportMetadata(json);
         break;
-
+      }
+      case "Browser:CanCaptureMouse:Return": {
+        let tab = this.getTabForBrowser(browser);
+        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
+        break;
+      }
       case "Browser:FormSubmit":
         browser.lastLocation = null;
         break;
@@ -1541,7 +1547,7 @@ Browser.WebProgress.prototype = {
       aTab.updateThumbnail();
 
       browser.messageManager.addMessageListener("MozScrolledAreaChanged", aTab.scrolledAreaChanged);
-      ContentTouchHandler.updateContentCapture();
+      aTab.updateContentCapture();
     });
   }
 };
@@ -1657,7 +1663,6 @@ const ContentTouchHandler = {
     messageManager.addMessageListener("Browser:ContextMenu", this);
     messageManager.addMessageListener("Browser:Highlight", this);
     messageManager.addMessageListener("Browser:CaptureEvents", this);
-    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
   },
 
   handleEvent: function handleEvent(aEvent) {
@@ -1721,11 +1726,6 @@ const ContentTouchHandler = {
     }
   },
 
-  updateContentCapture: function() {
-    this._messageId++;
-    messageManager.sendAsyncMessage("Browser:CanCaptureMouse", { messageId: this._messageId });
-  },
-
   receiveMessage: function receiveMessage(aMessage) {
     let json = aMessage.json;
     if (json.messageId != this._messageId)
@@ -1760,11 +1760,6 @@ const ContentTouchHandler = {
           Elements.browsers.customDragger.contentMouseCapture = this.panningPrevented;
         break;
       }
-      case "Browser:CanCaptureMouse:Return": {
-        let tab = Browser.getTabForBrowser(aMessage.target);
-        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
-        break;
-      }
     }
   },
 
@@ -2961,6 +2956,10 @@ Tab.prototype = {
     return this._browser.getAttribute("type") == "content-primary";
   },
 
+  updateContentCapture: function() {
+    this._browser.messageManager.sendAsyncMessage("Browser:CanCaptureMouse", {});
+  },
+
   toString: function() {
     return "[Tab " + (this._browser ? this._browser.currentURI.spec : "(no browser)") + "]";
   }
diff --git a/mobile/chrome/content/content.js b/mobile/chrome/content/content.js
index 10e5cc3dc4a5..6d6379cb2da6 100644
--- a/mobile/chrome/content/content.js
+++ b/mobile/chrome/content/content.js
@@ -597,8 +597,7 @@ let Content = {
 
       case "Browser:CanCaptureMouse": {
         sendAsyncMessage("Browser:CanCaptureMouse:Return", {
-          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners,
-          messageId: json.messageId
+          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners
         });
         break;
       }

From e96f9b8981d86b02efe56b444c77378d927c803f Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 09:40:04 -0700
Subject: [PATCH 185/314] Bug 654736 - Remove WinCE code from XULRunner;
 r=mfinkle

---
 xulrunner/Makefile.in             |  2 +-
 xulrunner/app/Makefile.in         |  8 +---
 xulrunner/app/nsXULRunnerApp.cpp  |  2 +-
 xulrunner/stub/Makefile.in        |  6 +--
 xulrunner/stub/nsXULStub.cpp      | 77 +------------------------------
 xulrunner/tools/redit/Makefile.in |  8 ----
 6 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/xulrunner/Makefile.in b/xulrunner/Makefile.in
index 46406ba3ee67..0af55ea73f14 100644
--- a/xulrunner/Makefile.in
+++ b/xulrunner/Makefile.in
@@ -56,7 +56,7 @@ DIRS += installer/windows
 endif
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 PARALLEL_DIRS += tools/redit
 endif
 
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 477d4117f249..55fa9eea6d71 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -54,7 +54,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
 DEFINES += -DAB_CD=$(AB_CD)
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = xulrunner$(BIN_SUFFIX)
 else
 PROGRAM = xulrunner-bin$(BIN_SUFFIX)
@@ -116,12 +116,8 @@ include $(topsrcdir)/config/config.mk
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
@@ -175,7 +171,7 @@ endif
 endif
 endif
 
-ifneq (,$(filter-out OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 ifeq (unix, $(MOZ_FS_LAYOUT))
 
 xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index d7a29df7bbbc..7cc993f25875 100644
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -74,7 +74,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
   char *msg = PR_vsmprintf(fmt, ap);
   if (msg)
   {
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 675afe930a0b..37ac92efbc43 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -73,7 +73,7 @@ LIBS            += \
 		$(NULL)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = xulrunner-stub.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
@@ -94,12 +94,8 @@ endif
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 LIBS += $(JEMALLOC_LIBS)
 
diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
index 3ebbd81f315a..49ce073d4e67 100644
--- a/xulrunner/stub/nsXULStub.cpp
+++ b/xulrunner/stub/nsXULStub.cpp
@@ -86,7 +86,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
   char msg[2048];
 
   vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -191,43 +191,6 @@ XRE_CreateAppDataType XRE_CreateAppData;
 XRE_FreeAppDataType XRE_FreeAppData;
 XRE_mainType XRE_main;
 
-
-#ifdef WINCE
-void
-ForwardToWindow(HWND wnd) {
-  // For WinCE, we're stuck with providing our own argv[0] for the remote
-  // command-line.
-  WCHAR wPath[MAX_PATH] = L"dummy ";
-  WCHAR *wCmd = ::GetCommandLineW();
-  WCHAR wCwd[MAX_PATH];
-  _wgetcwd(wCwd, MAX_PATH);
-
-  // Construct a narrow UTF8 buffer <path> <commandline>\0<workingdir>\0
-  size_t len = wcslen(wPath) + wcslen(wCmd) + wcslen(wCwd) + 2;
-  WCHAR *wMsg = (WCHAR *)malloc(len * sizeof(*wMsg));
-  wcscpy(wMsg, wPath);
-  wcscpy(wMsg + wcslen(wPath), wCmd);                // The command line
-  wcscpy(wMsg + wcslen(wPath) + wcslen(wCmd) + 1, wCwd); // Working dir
-
-  // Then convert to UTF-8, assuming worst-case explosion of characters
-  char *msg = (char *)malloc(len * 4);
-  WideCharToMultiByte(CP_UTF8, 0, wMsg, len, msg, len * 4, NULL, NULL);
-
-  // We used to set dwData to zero, when we didn't send the working dir.
-  // Now we're using it as a version number.
-  COPYDATASTRUCT cds = { 1, len, (void *)msg };
-
-  // Bring the already running Mozilla process to the foreground.
-  // nsWindow will restore the window (if minimized) and raise it.
-  // for activating the existing window on wince we need "| 0x01"
-  // see http://msdn.microsoft.com/en-us/library/ms940024.aspx for details
-  ::SetForegroundWindow((HWND)(((ULONG) wnd) | 0x01));
-  ::SendMessage(wnd, WM_COPYDATA, 0, (LPARAM)&cds);
-  free(wMsg);
-  free(msg);
-}
-#endif
-
 int
 main(int argc, char **argv)
 {
@@ -399,41 +362,6 @@ main(int argc, char **argv)
     return 1;
   }
 
-#ifdef WINCE
-  // On Windows Mobile and WinCE, we can save a lot of time by not
-  // waiting for XUL and XPCOM to load up.  Let's see if we can find
-  // an existing app window to forward our command-line to now.
-
-  // Shouldn't attempt this if the -no-remote parameter has been provided.
-  bool noRemote = false;
-  for (int i = 1; i < argc; i++) {
-    if (IsArg(argv[i], "no-remote")) {
-      noRemote = true;
-      break;
-    }
-  }
-
-  if (!noRemote) {
-    char windowName[512];  // Is there a const for appname like VERSION_MAXLEN?
-    rv = parser.GetString("App", "Name", windowName, sizeof(windowName));
-    if (NS_FAILED(rv)) {
-      fprintf(stderr, "Couldn't figure out the application name\n");
-      return 1;
-    }
-
-    // Lookup the hidden message window created by nsNativeAppSupport
-    strncat(windowName, "MessageWindow", sizeof(windowName) - strlen(windowName));
-    WCHAR wWindowName[512];
-    MultiByteToWideChar(CP_UTF8, 0, windowName, -1, wWindowName, sizeof(wWindowName));
-    HWND wnd = ::FindWindowW(wWindowName, NULL);
-    if (wnd) {
-      // Forward the command-line and bail out
-      ForwardToWindow(wnd);
-      return 0;
-    }
-  }
-#endif
-
   if (!greFound) {
     Output(PR_FALSE,
            "Could not find the Mozilla runtime.\n");
@@ -483,8 +411,7 @@ main(int argc, char **argv)
   { // Scope COMPtr and AutoAppData
     nsCOMPtr<nsILocalFile> iniFile;
 #ifdef XP_WIN
-    // On Windows and Windows CE, iniPath is UTF-8 encoded,
-    // so we need to convert it.
+    // On Windows iniPath is UTF-8 encoded so we need to convert it.
     rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(iniPath), PR_FALSE,
                          getter_AddRefs(iniFile));
 #else
diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index e9e854e1cb09..1614d6837fcf 100644
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@@ -52,12 +52,4 @@ SDK_BINARY =  \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-HOST_CPPSRCS = redit.cpp
-HOST_PROGRAM = redit$(BIN_SUFFIX)
-SDK_BINARY   =  \
-	$(HOST_PROGRAM) \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

From c4db3710d0cd094e4d0c6814457c0be00abb80bf Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 09:40:21 -0700
Subject: [PATCH 186/314] Bug 654600 - Remove WinCE code from
 security/manager/Makefile.in; r=kaie

---
 security/manager/Makefile.in | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 8bde1ed128b9..5155c518d070 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -68,7 +68,7 @@ NSSDBM3_CHK =
 endif
 
 ifndef MOZ_NATIVE_NSS
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
@@ -162,11 +162,8 @@ ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
 export DLLFLAGS
 endif
 
-ifndef WINCE
-# why is this disabled on WINCE?  See bug 514295.
 # To get debug symbols from NSS
 export MOZ_DEBUG_SYMBOLS
-endif
 
 ifdef .PYMAKE
 NSSMAKE = $(GMAKE)
@@ -246,24 +243,6 @@ DEFAULT_GMAKE_FLAGS += PROGRAMS=
 
 ifdef CROSS_COMPILE
 
-ifdef WINCE
-DEFAULT_GMAKE_FLAGS += \
-	NATIVE_CC="$(HOST_CC)" \
-	CC="$(CC)" \
-	CCC="$(CC)" \
-	LINK="$(LD)" \
-	LD="$(LD) -DLL" \
-	AS="$(AS) -Cp -Sn -Zi -coff $(INCLUDES)" \
-	AR='$(AR) -NOLOG0 -OUT:$$@' \
-	RANLIB="echo" \
-	RC="$(RC) $(RCFLAGS)" \
-	OS_ARCH="$(OS_ARCH)" \
-	OS_TEST="$(OS_TEST)" \
-	CPU_ARCH="ARM" \
-	USE_MSYS=1 \
-	WINCE=1 \
-	$(NULL)
-else
 DEFAULT_GMAKE_FLAGS += \
 	NATIVE_CC="$(HOST_CC)" \
 	CC="$(CC)" \
@@ -277,7 +256,6 @@ DEFAULT_GMAKE_FLAGS += \
 	OS_TEST="$(OS_TEST)" \
 	CPU_ARCH="$(TARGET_CPU)" \
 	$(NULL)
-endif
 
 # Android has pthreads integrated into -lc, so OS_LIBS is set to nothing
 ifeq ($(OS_TARGET), Android)

From 3ff557dc8e73436d84d87ec24d6e093e0e54a5dd Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend>
Date: Wed, 4 May 2011 10:36:00 -0700
Subject: [PATCH 187/314] Bug 642795 - Remove support for finding system
 XULRunner in the standalone glue [r=mark.finkle]

---
 xulrunner/app/nsXULRunnerApp.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index 7cc993f25875..41bcfd2f7709 100644
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -174,14 +174,6 @@ static void Usage(const char *argv0)
            "  -h, --help                 show this message\n"
            "  -v, --version              show version\n"
            "  --gre-version              print the GRE version string on stdout\n"
-           "  --register-global          register this GRE in the machine registry\n"
-           "  --register-user            register this GRE in the user registry\n"
-           "  --unregister-global        unregister this GRE formerly registered with\n"
-           "                             --register-global\n"
-           "  --unregister-user          unregister this GRE formely registered with\n"
-           "                             --register-user\n"
-           "  --find-gre <version>       Find a GRE with version <version> and print\n"
-           "                             the path on stdout\n"
            "  --install-app <application> [<destination> [<directoryname>]]\n"
            "                             Install a XUL application.\n"
            "\n"

From df4707bd8ba7a1f8f384b46abb26a4d1a9f51be3 Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 4 May 2011 11:40:12 -0700
Subject: [PATCH 188/314] Bug 654752 - Make runtests.py work out of the box
 with Fennec [r=ctalbert]

---
 build/binary-location.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/binary-location.mk b/build/binary-location.mk
index 81e46f3d7bd1..aae6c249383d 100644
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -40,8 +40,12 @@
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
+ifeq ($(MOZ_BUILD_APP),mobile)
+PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
+else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
+endif
 
 TARGET_DIST = $(TARGET_DEPTH)/dist
 

From 9dc95549f6cce98b7b2b836d02a1bd314b8428fc Mon Sep 17 00:00:00 2001
From: Benjamin Stover <bstover@mozilla.com>
Date: Wed, 4 May 2011 13:25:24 -0700
Subject: [PATCH 189/314] Bug 654798 - Fennec browser chrome tests install to
 the wrong place [r=jmaher]

---
 mobile/chrome/tests/Makefile.in                           | 2 +-
 mobile/chrome/tests/addons/browser_install1_1/install.rdf | 2 +-
 mobile/chrome/tests/addons/browser_install1_3/install.rdf | 2 +-
 mobile/chrome/tests/browser_addons.js                     | 2 +-
 mobile/chrome/tests/browser_formsZoom.js                  | 2 --
 mobile/chrome/tests/browser_history.js                    | 2 +-
 mobile/chrome/tests/browser_install.xml                   | 4 ++--
 mobile/chrome/tests/browser_navigation.js                 | 1 -
 mobile/chrome/tests/browser_scroll.js                     | 3 +--
 mobile/chrome/tests/browser_scrollbar.js                  | 1 -
 mobile/chrome/tests/browser_thumbnails.js                 | 1 -
 mobile/chrome/tests/browser_title.sjs                     | 4 ++--
 mobile/chrome/tests/browser_upgrade.rdf                   | 2 +-
 mobile/chrome/tests/browser_viewport.js                   | 1 -
 mobile/chrome/tests/head.js                               | 2 +-
 15 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 7e7e1fd2f594..34eb8fbf9f14 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -39,7 +39,7 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = mobile/chrome
+relativesrcdir  = mobile/chrome/tests
 TESTXPI  = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 ADDONSRC = $(srcdir)/addons
 
diff --git a/mobile/chrome/tests/addons/browser_install1_1/install.rdf b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
index 49891b5988c4..0825d11aa0cb 100644
--- a/mobile/chrome/tests/addons/browser_install1_1/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>1.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
     <em:bootstrap>true</em:bootstrap>
 
     <em:targetApplication>
diff --git a/mobile/chrome/tests/addons/browser_install1_3/install.rdf b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
index 43052832baf6..2c10f4921628 100644
--- a/mobile/chrome/tests/addons/browser_install1_3/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>3.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
 
     <em:targetApplication>
       <Description>
diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 8ebd9d9a89ca..75299408b1f5 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -7,7 +7,7 @@ Components.utils.import("resource://gre/modules/AddonUpdateChecker.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
-const RELATIVE_DIR = "browser/mobile/chrome/";
+const RELATIVE_DIR = "browser/mobile/chrome/tests/";
 const TESTROOT     = "http://example.com/" + RELATIVE_DIR;
 const TESTROOT2    = "http://example.org/" + RELATIVE_DIR;
 const PREF_LOGGING_ENABLED            = "extensions.logging.enabled";
diff --git a/mobile/chrome/tests/browser_formsZoom.js b/mobile/chrome/tests/browser_formsZoom.js
index 145e918993bb..d78a26771690 100644
--- a/mobile/chrome/tests/browser_formsZoom.js
+++ b/mobile/chrome/tests/browser_formsZoom.js
@@ -1,6 +1,4 @@
 let testURL_01 = chromeRoot + "browser_formsZoom.html";
-
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_02 = baseURI + "browser_formsZoom.html";
 messageManager.loadFrameScript(baseURI + "remote_formsZoom.js", true);
 
diff --git a/mobile/chrome/tests/browser_history.js b/mobile/chrome/tests/browser_history.js
index 87a3ee03d1b8..dd4ad8061cea 100644
--- a/mobile/chrome/tests/browser_history.js
+++ b/mobile/chrome/tests/browser_history.js
@@ -2,7 +2,7 @@
  * Make sure history is being recorded when we visit websites.
  */
 
-var testURL_01 = "http://mochi.test:8888/browser/mobile/chrome/browser_blank_01.html";
+var testURL_01 = baseURI + "browser_blank_01.html";
 
 // A queue to order the tests and a handle for each test
 var gTests = [];
diff --git a/mobile/chrome/tests/browser_install.xml b/mobile/chrome/tests/browser_install.xml
index bb76898036bb..3e96873c2afd 100644
--- a/mobile/chrome/tests/browser_install.xml
+++ b/mobile/chrome/tests/browser_install.xml
@@ -25,7 +25,7 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_1.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_1.xpi</install>
   </addon>
 
   <addon>
@@ -53,6 +53,6 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_2.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_2.xpi</install>
   </addon>
 </searchresults>
diff --git a/mobile/chrome/tests/browser_navigation.js b/mobile/chrome/tests/browser_navigation.js
index ad5f4177c7df..aa69a0ff7615 100644
--- a/mobile/chrome/tests/browser_navigation.js
+++ b/mobile/chrome/tests/browser_navigation.js
@@ -1,7 +1,6 @@
 var testURL_01 = chromeRoot + "browser_blank_01.html";
 var testURL_02 = chromeRoot + "browser_blank_02.html";
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 var titleURL = baseURI + "browser_title.sjs?";
 var pngURL = "data:image/gif;base64,R0lGODlhCwALAIAAAAAA3pn/ZiH5BAEAAAEALAAAAAALAAsAAAIUhA+hkcuO4lmNVindo7qyrIXiGBYAOw==";
 
diff --git a/mobile/chrome/tests/browser_scroll.js b/mobile/chrome/tests/browser_scroll.js
index 08b03525e387..bb299e0d36e1 100644
--- a/mobile/chrome/tests/browser_scroll.js
+++ b/mobile/chrome/tests/browser_scroll.js
@@ -4,8 +4,7 @@
 var gTab;
 registerCleanupFunction(function() Browser.closeTab(gTab));
 
-const BASE_URL = "http://mochi.test:8888/browser/mobile/chrome/";
-const TEST_URL = BASE_URL + "browser_scroll.html";
+const TEST_URL = baseURI + "browser_scroll.html";
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index 3efbb7d9a7e8..be54149b9735 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -1,4 +1,3 @@
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_01 = baseURI + "browser_scrollbar.sjs?";
 
 let gCurrentTest = null;
diff --git a/mobile/chrome/tests/browser_thumbnails.js b/mobile/chrome/tests/browser_thumbnails.js
index 0787a76a5564..59ac82d731e0 100644
--- a/mobile/chrome/tests/browser_thumbnails.js
+++ b/mobile/chrome/tests/browser_thumbnails.js
@@ -37,7 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/browser_title.sjs b/mobile/chrome/tests/browser_title.sjs
index ba525cddac4c..a523c1de5de6 100644
--- a/mobile/chrome/tests/browser_title.sjs
+++ b/mobile/chrome/tests/browser_title.sjs
@@ -55,10 +55,10 @@ function handleRequest(request, response) {
       response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.title = 'This is not a french title'; }, false);</script>");
       break;
     case "redirect":
-      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title'></meta>");
+      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title'></meta>");
       break;
     case "location":
-      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title' ; }, false);</script>");
+      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title' ; }, false);</script>");
       break;
     default:
       break;
diff --git a/mobile/chrome/tests/browser_upgrade.rdf b/mobile/chrome/tests/browser_upgrade.rdf
index 507d574cc03b..bfde13200e03 100644
--- a/mobile/chrome/tests/browser_upgrade.rdf
+++ b/mobile/chrome/tests/browser_upgrade.rdf
@@ -14,7 +14,7 @@
                 <em:id>toolkit@mozilla.org</em:id>
                 <em:minVersion>0</em:minVersion>
                 <em:maxVersion>*</em:maxVersion>
-                <em:updateLink>http://example.com/browser/mobile/chrome/addons/browser_install1_3.xpi</em:updateLink>
+                <em:updateLink>http://example.com/browser/mobile/chrome/tests/addons/browser_install1_3.xpi</em:updateLink>
               </Description>
             </em:targetApplication>
           </Description>
diff --git a/mobile/chrome/tests/browser_viewport.js b/mobile/chrome/tests/browser_viewport.js
index c0cebe1b1fc4..bb95cc2eb6d2 100644
--- a/mobile/chrome/tests/browser_viewport.js
+++ b/mobile/chrome/tests/browser_viewport.js
@@ -38,7 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index 85133ce9028e..b2709c3f6996 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -83,6 +83,6 @@ let AsyncTests = {
 let chromeRoot = getRootDirectory(gTestPath);
 // For some security reasons (which?), loading remote_head using chromeRoot
 // instead of baseURI make the browser_formsZoom.js test fails.
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/tests/";
 messageManager.loadFrameScript(baseURI + "remote_head.js", true);
 messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);

From 11e14f3c4134f38cd288e814665c7baa448d4b62 Mon Sep 17 00:00:00 2001
From: Justin Lebar <jlebar@mozilla.com>
Date: Thu, 28 Apr 2011 15:49:16 +0200
Subject: [PATCH 190/314] Bug 590181 part 2 - Switch default gcc optimize
 options to -O3. r=ted.

---
 configure.in         | 4 ++--
 js/src/configure.in  | 4 ++--
 xpcom/io/Makefile.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index cd9c29d404b1..3a7e65e37825 100644
--- a/configure.in
+++ b/configure.in
@@ -2188,9 +2188,9 @@ ia64*-hpux*)
         esac
         # If we're building with --enable-profiling, we need a frame pointer.
         if test -z "$MOZ_PROFILING"; then
-            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fomit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
+            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
         else
-            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-omit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
+            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
         fi
         MOZ_DEBUG_FLAGS="-g"
     fi
diff --git a/js/src/configure.in b/js/src/configure.in
index ab2046bee47a..fb32aa308598 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2107,9 +2107,9 @@ ia64*-hpux*)
         esac
         # If we're building with --enable-profiling, we need a frame pointer.
         if test -z "$MOZ_PROFILING"; then
-            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fomit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
+            MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
         else
-            MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-omit-frame-pointer $MOZ_OPTIMIZE_SIZE_TWEAK"
+            MOZ_OPTIMIZE_FLAGS="-O3 -fno-omit-frame-pointer"
         fi
         MOZ_DEBUG_FLAGS="-g"
     fi
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
index 61cd64aba28f..a9036fa164dd 100644
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -51,7 +51,7 @@ MOZILLA_INTERNAL_API = 1
 # work around bug 408258
 ifdef GNU_CC 
 ifneq ($(OS_ARCH), Darwin)
-MODULE_OPTIMIZE_FLAGS = -Os -fno-strict-aliasing $(MOZ_OPTIMIZE_SIZE_TWEAK)
+MODULE_OPTIMIZE_FLAGS = -O3 -fno-strict-aliasing
 endif
 endif
 

From 17fce8312c51903b1135e0f18df558ff9a315708 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 5 May 2011 19:26:54 +0200
Subject: [PATCH 191/314] Bug 654975 - Remove -freorder-blocks-and-partition
 from PGO build options. r=ted

---
 config/nspr/Makefile.in | 6 ++++++
 config/nspr/build.mk    | 1 -
 configure.in            | 2 +-
 js/src/configure.in     | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in
index 66759af50233..55bd9acc8c97 100644
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -59,6 +59,9 @@ endif
 ABS_DIST = $(call core_abspath,$(DIST))
 
 libs::
+	# Temporary, until bug 655058 lands on nspr. When that happens, we can
+	# revert the config/nspr/* part of bug 654975.
+	$(MAKE) -C $(DEPTH)/nsprpub PROFILE_USE_CFLAGS="$(PROFILE_USE_CFLAGS)"
 	$(MAKE) -C $(DEPTH)/nsprpub install prefix=$(ABS_DIST)/sdk exec_prefix=$(ABS_DIST)/sdk bindir=$(ABS_DIST)/sdk/dummy includedir=$(ABS_DIST)/include libdir=$(ABS_DIST)/sdk/lib datadir=$(ABS_DIST)/sdk/dummy DESTDIR=
 	$(INSTALL) $(DEPTH)/nsprpub/config/nspr-config $(DIST)/sdk/bin
 	$(RM) -rf $(DIST)/sdk/dummy
@@ -73,3 +76,6 @@ install::
 	$(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
 	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
 	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
+
+clean distclean::
+	$(MAKE) -C $(DEPTH)/nsprpub $@
diff --git a/config/nspr/build.mk b/config/nspr/build.mk
index 4078d3dbcc60..487f1ed8ce5e 100644
--- a/config/nspr/build.mk
+++ b/config/nspr/build.mk
@@ -38,6 +38,5 @@
 TIERS += nspr
 
 ifndef MOZ_NATIVE_NSPR
-tier_nspr_staticdirs += nsprpub
 tier_nspr_dirs += config/nspr
 endif
diff --git a/configure.in b/configure.in
index 3a7e65e37825..656bf9189e1c 100644
--- a/configure.in
+++ b/configure.in
@@ -7833,7 +7833,7 @@ AC_MSG_RESULT([$result])
 
 if test $result = "yes"; then
   PROFILE_GEN_LDFLAGS="-fprofile-generate"
-  PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freorder-blocks-and-partition"
+  PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"
   PROFILE_USE_LDFLAGS="-fprofile-use"
 fi
 
diff --git a/js/src/configure.in b/js/src/configure.in
index fb32aa308598..73f2cdb10b51 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -5107,7 +5107,7 @@ AC_MSG_RESULT([$result])
 
 if test $result = "yes"; then
   PROFILE_GEN_LDFLAGS="-fprofile-generate"
-  PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freorder-blocks-and-partition"
+  PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"
   PROFILE_USE_LDFLAGS="-fprofile-use"
 fi
 

From 0223c36e2a5d2be20ef5dbd4a63ebc78b3570ad1 Mon Sep 17 00:00:00 2001
From: Axel Hecht <l10n@mozilla.com>
Date: Thu, 5 May 2011 20:04:17 +0200
Subject: [PATCH 192/314] bug 655078, add intl/locales to toolkit-makefiles.sh,
 bustage fix for bug 253317, r=ted

--HG--
extra : rebase_source : 4b86546079d73f53488f39cbc9ecd9f5b1c6a0f4
---
 toolkit/toolkit-makefiles.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh
index a16e2b5f3b65..b71b9a7127ef 100644
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -171,6 +171,7 @@ MAKEFILES_intl="
   intl/locale/src/os2/Makefile
   intl/locale/src/windows/Makefile
   intl/locale/tests/Makefile
+  intl/locales/Makefile
   intl/lwbrk/Makefile
   intl/lwbrk/idl/Makefile
   intl/lwbrk/src/Makefile

From 5728b278e427c21d0aa080fd7207301d8f3037f7 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 193/314] Bug 639842 - implement glxtest probe running as
 separate process - r=bsmedberg,joe

---
 toolkit/xre/Makefile.in     |   6 +
 toolkit/xre/glxtest.cpp     | 242 ++++++++++++++++++++++++++++++++++++
 toolkit/xre/nsAppRunner.cpp |  16 +++
 3 files changed, 264 insertions(+)
 create mode 100644 toolkit/xre/glxtest.cpp

diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 875e4cacb4ea..7771a7ee048f 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,6 +66,12 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
+ifdef MOZ_X11
+ifndef MOZ_PLATFORM_MAEMO
+CPPSRCS += glxtest.cpp
+endif
+endif
+
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
 CPPSRCS += EventTracer.cpp
 endif
diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
new file mode 100644
index 000000000000..7498d1cc7cc4
--- /dev/null
+++ b/toolkit/xre/glxtest.cpp
@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* ***** 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 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):
+ *
+ * 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 ***** */
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Explanation: See bug 639842. Safely getting GL driver info on X11 is hard, because the only way to do
+// that is to create a GL context and call glGetString(), but with bad drivers,
+// just creating a GL context may crash.
+//
+// This file implements the idea to do that in a separate process.
+//
+// The only non-static function here is fire_glxtest_process(). It creates a pipe, publishes its 'read' end as the
+// mozilla::widget::glxtest_pipe global variable, forks, and runs that GLX probe in the child process,
+// which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
+// to the 'write' end of the pipe.
+
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <dlfcn.h>
+#include "nscore.h"
+
+namespace mozilla {
+namespace widget {
+// the read end of the pipe, which will be used by GfxInfo
+extern int glxtest_pipe;
+// the PID of the glxtest process, to pass to waitpid()
+extern pid_t glxtest_pid;
+}
+}
+
+// the write end of the pipe, which we're going to write to
+static int write_end_of_the_pipe = -1;
+
+// C++ standard collides with C standard in that it doesn't allow casting void* to function pointer types.
+// So the work-around is to convert first to size_t.
+// http://www.trilithium.com/johan/2004/12/problem-with-dlsym/
+template<typename func_ptr_type>
+static func_ptr_type cast(void *ptr)
+{
+  return reinterpret_cast<func_ptr_type>(
+           reinterpret_cast<size_t>(ptr)
+         );
+}
+
+static void fatal_error(const char *str)
+{
+  write(write_end_of_the_pipe, str, strlen(str));
+  write(write_end_of_the_pipe, "\n", 1);
+  exit(EXIT_FAILURE);
+}
+
+static int
+x_error_handler(Display *, XErrorEvent *ev)
+{
+  enum { bufsize = 1024 };
+  char buf[bufsize];
+  int length = snprintf(buf, bufsize,
+                        "X error occurred in GLX probe, error_code=%d, request_code=%d, minor_code=%d\n",
+                        ev->error_code,
+                        ev->request_code,
+                        ev->minor_code);
+  write(write_end_of_the_pipe, buf, length);
+  exit(EXIT_FAILURE);
+  return 0;
+}
+
+static void glxtest()
+{
+  ///// Open libGL and load needed symbols /////
+  void *libgl = dlopen("libGL.so.1", RTLD_LAZY);
+  if (!libgl)
+    fatal_error("Unable to load libGL.so.1");
+
+  typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+  PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+
+  typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+  PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+
+  typedef XVisualInfo* (* PFNGLXGETVISUALFROMFBCONFIG) (Display *, GLXFBConfig);
+  PFNGLXGETVISUALFROMFBCONFIG glXGetVisualFromFBConfig = cast<PFNGLXGETVISUALFROMFBCONFIG>(dlsym(libgl, "glXGetVisualFromFBConfig"));
+
+  typedef GLXPixmap (* PFNGLXCREATEPIXMAP) (Display *, GLXFBConfig, Pixmap, const int *);
+  PFNGLXCREATEPIXMAP glXCreatePixmap = cast<PFNGLXCREATEPIXMAP>(dlsym(libgl, "glXCreatePixmap"));
+
+  typedef GLXContext (* PFNGLXCREATENEWCONTEXT) (Display *, GLXFBConfig, int, GLXContext, Bool);
+  PFNGLXCREATENEWCONTEXT glXCreateNewContext = cast<PFNGLXCREATENEWCONTEXT>(dlsym(libgl, "glXCreateNewContext"));
+
+  typedef Bool (* PFNGLXMAKECURRENT) (Display*, GLXDrawable, GLXContext);
+  PFNGLXMAKECURRENT glXMakeCurrent = cast<PFNGLXMAKECURRENT>(dlsym(libgl, "glXMakeCurrent"));
+
+  typedef void (* PFNGLXDESTROYPIXMAP) (Display *, GLXPixmap);
+  PFNGLXDESTROYPIXMAP glXDestroyPixmap = cast<PFNGLXDESTROYPIXMAP>(dlsym(libgl, "glXDestroyPixmap"));
+
+  typedef void (* PFNGLXDESTROYCONTEXT) (Display*, GLXContext);
+  PFNGLXDESTROYCONTEXT glXDestroyContext = cast<PFNGLXDESTROYCONTEXT>(dlsym(libgl, "glXDestroyContext"));
+
+  typedef GLubyte* (* PFNGLGETSTRING) (GLenum);
+  PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+
+  if (!glXQueryExtension ||
+      !glXChooseFBConfig ||
+      !glXGetVisualFromFBConfig ||
+      !glXCreatePixmap ||
+      !glXCreateNewContext ||
+      !glXMakeCurrent ||
+      !glXDestroyPixmap ||
+      !glXDestroyContext ||
+      !glGetString)
+  {
+    fatal_error("Unable to find required symbols in libGL.so.1");
+  }
+  ///// Open a connection to the X server /////
+  Display *dpy = XOpenDisplay(NULL);
+  if (!dpy)
+    fatal_error("Unable to open a connection to the X server");
+  
+  ///// Check that the GLX extension is present /////
+  if (!glXQueryExtension(dpy, NULL, NULL))
+    fatal_error("GLX extension missing");
+
+  XSetErrorHandler(x_error_handler);
+
+  ///// Get a FBConfig and a visual /////
+  int attribs[] = {
+    GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT,
+    GLX_X_RENDERABLE, True,
+    0
+  };
+  int numReturned;
+  GLXFBConfig *fbConfigs = glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &numReturned );
+  XVisualInfo *vInfo = glXGetVisualFromFBConfig(dpy, fbConfigs[0]);
+
+  ///// Get a Pixmap and a GLXPixmap /////
+  Pixmap pixmap = XCreatePixmap(dpy, RootWindow(dpy, vInfo->screen), 4, 4, 32);
+  GLXPixmap glxpixmap = glXCreatePixmap(dpy, fbConfigs[0], pixmap, NULL);
+
+  ///// Get a GL context and make it current //////
+  GLXContext context = glXCreateNewContext(dpy, fbConfigs[0], GLX_RGBA_TYPE, NULL, True);
+  glXMakeCurrent(dpy, glxpixmap, context);
+
+  ///// Get GL vendor/renderer/versions strings /////
+  enum { bufsize = 1024 };
+  char buf[bufsize];
+  const GLubyte *vendorString = glGetString(GL_VENDOR);
+  const GLubyte *rendererString = glGetString(GL_RENDERER);
+  const GLubyte *versionString = glGetString(GL_VERSION);
+  
+  if (!vendorString || !rendererString || !versionString)
+    fatal_error("glGetString returned null");
+
+  int length = snprintf(buf, bufsize,
+                        "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\n",
+                        vendorString,
+                        rendererString,
+                        versionString);
+  if (length >= bufsize)
+    fatal_error("GL strings length too large for buffer size");
+
+  ///// Check that no X error happened /////
+  // In case of X errors, our X error handler will exit() now.
+  // We really want to make sure that the system is able to create a GL context without generating X errors,
+  // as these would crash the application.
+  XSync(dpy, False);
+  
+  ///// Finally write data to the pipe /////
+  write(write_end_of_the_pipe, buf, length);
+
+  ///// Clean up. Indeed, the parent process might fail to kill us (e.g. if it doesn't need to check GL info)
+  ///// so we might be staying alive for longer than expected, so it's important to consume as little memory as
+  ///// possible.
+  glXDestroyContext(dpy, context);
+  glXDestroyPixmap(dpy, glxpixmap);
+  XFreePixmap(dpy, pixmap);
+  XCloseDisplay(dpy);
+  dlclose(libgl);
+}
+
+void fire_glxtest_process()
+{
+  int pfd[2];
+  if (pipe(pfd) == -1) {
+      perror("pipe");
+      exit(EXIT_FAILURE);
+  }
+  pid_t pid = fork();
+  if (pid < 0) {
+      perror("fork");
+      exit(EXIT_FAILURE);
+  }
+  if (pid == 0) {
+      close(pfd[0]);
+      write_end_of_the_pipe = pfd[1];
+      glxtest();
+      close(pfd[1]);
+      exit(EXIT_SUCCESS);
+  }
+
+  close(pfd[1]);
+  mozilla::widget::glxtest_pipe = pfd[0];
+  mozilla::widget::glxtest_pid = pid;
+}
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 6dd1338626d0..afaf8cdac9c9 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2727,6 +2727,12 @@ static DWORD InitDwriteBG(LPVOID lpdwThreadParam)
 
 PRTime gXRE_mainTimestamp = 0;
 
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
+void fire_glxtest_process();
+#endif
+#endif
+
 int
 XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
@@ -2747,6 +2753,16 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     NS_BREAK();
 #endif
 
+  // see bug 639842
+  // it's very important to fire this process BEFORE we set up error handling.
+  // indeed, this process is expected to be crashy, and we don't want the user to see its crashes.
+  // That's the whole reason for doing this in a separate process.
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
+  fire_glxtest_process();
+#endif
+#endif
+
   SetupErrorHandling(argv[0]);
 
 #ifdef CAIRO_HAS_DWRITE_FONT

From 150729780a96b764b9962f0b7c1ac9cf0283b2f1 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 194/314] Bug 639842 and Bug 645407 - implement GfxInfoX11,
 using the info from the glxtest probe - r=bsmedberg,joe,karl * * * try: -b do
 -p linux,linux64,android-r7,maemo5-gtk,maemo5-qt -u mochitest-1 -t none

---
 widget/src/gtk2/nsWidgetFactory.cpp |  10 +
 widget/src/qt/nsWidgetFactory.cpp   |  30 ++-
 widget/src/xpwidgets/GfxInfoX11.cpp | 369 ++++++++++++++++++++++++++++
 widget/src/xpwidgets/GfxInfoX11.h   |  89 +++++++
 widget/src/xpwidgets/Makefile.in    |   5 +
 5 files changed, 500 insertions(+), 3 deletions(-)
 create mode 100644 widget/src/xpwidgets/GfxInfoX11.cpp
 create mode 100644 widget/src/xpwidgets/GfxInfoX11.h

diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp
index e556bb34955d..19641db09d97 100644
--- a/widget/src/gtk2/nsWidgetFactory.cpp
+++ b/widget/src/gtk2/nsWidgetFactory.cpp
@@ -69,6 +69,7 @@
 
 #if defined(MOZ_X11)
 #include "nsIdleServiceGTK.h"
+#include "GfxInfoX11.h"
 #endif
 
 #ifdef NATIVE_THEME_SUPPORT
@@ -138,6 +139,12 @@ nsNativeThemeGTKConstructor(nsISupports *aOuter, REFNSIID aIID,
 
 #if defined(MOZ_X11)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceGTK)
+namespace mozilla {
+namespace widget {
+// This constructor should really be shared with all platforms.
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
+}
+}
 #endif
 
 #ifdef NS_PRINTING
@@ -257,6 +264,7 @@ NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_CID);
 #if defined(MOZ_X11)
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
 #endif
 
 
@@ -292,6 +300,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_IMAGE_TO_PIXBUF_CID, false, NULL, nsImageToPixbufConstructor },
 #if defined(MOZ_X11)
     { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGTKConstructor },
+    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
 #endif
     { NULL }
 };
@@ -328,6 +337,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widget/image-to-gdk-pixbuf;1", &kNS_IMAGE_TO_PIXBUF_CID },
 #if defined(MOZ_X11)
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
+    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
 #endif
     { NULL }
 };
diff --git a/widget/src/qt/nsWidgetFactory.cpp b/widget/src/qt/nsWidgetFactory.cpp
index c7cc1d3868f1..8f1e81079422 100644
--- a/widget/src/qt/nsWidgetFactory.cpp
+++ b/widget/src/qt/nsWidgetFactory.cpp
@@ -70,6 +70,10 @@
 #include "nsFilePickerProxy.h"
 #include "nsXULAppAPI.h"
 
+#if defined(MOZ_X11)
+#include "GfxInfoX11.h"
+#endif
+
 // from nsWindow.cpp
 extern PRBool gDisableNativeTheme;
 
@@ -115,6 +119,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceQt, Init)
 #endif
 
+#if defined(MOZ_X11)
+namespace mozilla {
+namespace widget {
+// This constructor should really be shared with all platforms.
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
+}
+}
+#endif
+
+
 static nsresult
 nsNativeThemeQtConstructor(nsISupports *aOuter, REFNSIID aIID,
                             void **aResult)
@@ -163,7 +177,11 @@ NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
-#endif 
+#endif
+
+#if defined(MOZ_X11)
+NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
+#endif
 
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_WINDOW_CID, false, NULL, nsWindowConstructor },
@@ -189,7 +207,10 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_PRINTSESSION_CID, false, NULL, nsPrintSessionConstructor },
     { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecQtConstructor },
     { &kNS_PRINTDIALOGSERVICE_CID, false, NULL, nsPrintDialogServiceQtConstructor },
-#endif 
+#endif
+#if defined(MOZ_X11)
+    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
+#endif
     { NULL }
 };
 
@@ -217,7 +238,10 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
     { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
     { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID },
-#endif 
+#endif
+#if defined(MOZ_X11)
+    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
+#endif
     { NULL }
 };
 
diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp
new file mode 100644
index 000000000000..4e0ed47c26c8
--- /dev/null
+++ b/widget/src/xpwidgets/GfxInfoX11.cpp
@@ -0,0 +1,369 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* ***** 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 Code.
+ *
+ * The Initial Developer of the Original Code is
+ *   The Mozilla Foundation
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * 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 ***** */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include "nsCRTGlue.h"
+#include "prenv.h"
+
+#include "GfxInfoX11.h"
+
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+#include "nsExceptionHandler.h"
+#include "nsICrashReporter.h"
+#endif
+
+namespace mozilla {
+namespace widget {
+
+// these global variables will be set when firing the glxtest process
+int glxtest_pipe = 0;
+pid_t glxtest_pid = 0;
+
+nsresult
+GfxInfo::Init()
+{
+    mMajorVersion = 0;
+    mMinorVersion = 0;
+    mIsMesa = false;
+    mIsNVIDIA = false;
+    mIsFGLRX = false;
+    return GfxInfoBase::Init();
+}
+
+void
+GfxInfo::GetData()
+{
+    // to understand this function, see bug 639842. We retrieve the OpenGL driver information in a
+    // separate process to protect against bad drivers.
+
+    // if glxtest_pipe == 0, that means that we already read the information
+    if (!glxtest_pipe)
+        return;
+
+    enum { buf_size = 1024 };
+    char buf[buf_size];
+    ssize_t bytesread = read(glxtest_pipe,
+                             &buf,
+                             buf_size-1); // -1 because we'll append a zero
+    close(glxtest_pipe);
+    glxtest_pipe = 0;
+
+    // bytesread < 0 would mean that the above read() call failed. This should never happen.
+    if (bytesread < 0)
+        bytesread = 0;
+
+    // let buf be a zero-terminated string
+    buf[bytesread] = 0;
+
+    // Wait for the glxtest process to finish. This serves 2 purposes:
+    // * avoid having a zombie glxtest process laying around
+    // * get the glxtest process status info.
+    int glxtest_status = 0;
+    bool wait_for_glxtest_process = true;
+    bool waiting_for_glxtest_process_failed = false;
+    while(wait_for_glxtest_process) {
+        wait_for_glxtest_process = false;
+        if (waitpid(glxtest_pid, &glxtest_status, 0) == -1) {
+            if (errno == EINTR)
+                wait_for_glxtest_process = true;
+            else
+                waiting_for_glxtest_process_failed = true;
+        }
+    }
+
+    bool exited_with_error_code = !waiting_for_glxtest_process_failed &&
+                                  WIFEXITED(glxtest_status) && 
+                                  WEXITSTATUS(glxtest_status) != EXIT_SUCCESS;
+    bool received_signal = !waiting_for_glxtest_process_failed &&
+                           WIFSIGNALED(glxtest_status);
+
+    bool error = waiting_for_glxtest_process_failed || exited_with_error_code || received_signal;
+
+    nsCString *stringToFill = nsnull;
+    char *bufptr = buf;
+    if (!error) {
+        while(true) {
+            char *line = NS_strtok("\n", &bufptr);
+            if (!line)
+                break;
+            if (stringToFill) {
+                stringToFill->Assign(line);
+                stringToFill = nsnull;
+            }
+            else if(!strcmp(line, "VENDOR"))
+                stringToFill = &mVendor;
+            else if(!strcmp(line, "RENDERER"))
+                stringToFill = &mRenderer;
+            else if(!strcmp(line, "VERSION"))
+                stringToFill = &mVersion;
+        }
+    }
+
+    const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
+    if (spoofedVendor)
+        mVendor.Assign(spoofedVendor);
+    const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
+    if (spoofedRenderer)
+        mRenderer.Assign(spoofedRenderer);
+    const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
+    if (spoofedVersion)
+        mVersion.Assign(spoofedVersion);
+
+    if (error ||
+        mVendor.IsEmpty() ||
+        mRenderer.IsEmpty() ||
+        mVersion.IsEmpty())
+    {
+        mAdapterDescription.AppendLiteral("GLXtest process failed");
+        if (waiting_for_glxtest_process_failed)
+            mAdapterDescription.AppendLiteral(" (waitpid failed)");
+        if (exited_with_error_code)
+            mAdapterDescription.AppendPrintf(" (exited with status %d)", WEXITSTATUS(glxtest_status));
+        if (received_signal)
+            mAdapterDescription.AppendPrintf(" (received signal %d)", WTERMSIG(glxtest_status));
+        if (bytesread) {
+            mAdapterDescription.AppendLiteral(": ");
+            mAdapterDescription.Append(nsDependentCString(buf));
+            mAdapterDescription.AppendLiteral("\n");
+        }
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+        CrashReporter::AppendAppNotesToCrashReport(mAdapterDescription);
+#endif
+        return;
+    }
+
+    mAdapterDescription.Append(mVendor);
+    mAdapterDescription.AppendLiteral(" -- ");
+    mAdapterDescription.Append(mRenderer);
+
+    nsCAutoString note;
+    note.Append("OpenGL: ");
+    note.Append(mAdapterDescription);
+    note.Append(" -- ");
+    note.Append(mVersion);
+    note.Append("\n");
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+    CrashReporter::AppendAppNotesToCrashReport(note);
+#endif
+
+    // determine driver type (vendor) and where in the version string
+    // the actual driver version numbers should be expected to be found (whereToReadVersionNumbers)
+    const char *whereToReadVersionNumbers = nsnull;
+    const char *Mesa_in_version_string = strstr(mVersion.get(), "Mesa");
+    if (Mesa_in_version_string) {
+        mIsMesa = true;
+        // with Mesa, the version string contains "Mesa major.minor" and that's all the version information we get:
+        // there is no actual driver version info.
+        whereToReadVersionNumbers = Mesa_in_version_string + strlen("Mesa");
+    } else if (strstr(mVendor.get(), "NVIDIA Corporation")) {
+        mIsNVIDIA = true;
+        // with the NVIDIA driver, the version string contains "NVIDIA major.minor"
+        // note that here the vendor and version strings behave differently, that's why we don't put this above
+        // alongside Mesa_in_version_string.
+        const char *NVIDIA_in_version_string = strstr(mVersion.get(), "NVIDIA");
+        if (NVIDIA_in_version_string)
+            whereToReadVersionNumbers = NVIDIA_in_version_string + strlen("NVIDIA");
+    } else if (strstr(mVendor.get(), "ATI Technologies Inc")) {
+        mIsFGLRX = true;
+        // with the FGLRX driver, the version string only gives a OpenGL version :/ so let's return that.
+        // that can at least give a rough idea of how old the driver is.
+        whereToReadVersionNumbers = mVersion.get();
+    }
+
+    // read major.minor version numbers
+    if (whereToReadVersionNumbers) {
+        // copy into writable buffer, for tokenization
+        strncpy(buf, whereToReadVersionNumbers, buf_size);
+        bufptr = buf;
+
+        // now try to read major.minor version numbers. In case of failure, gracefully exit: these numbers have
+        // been initialized as 0 anyways
+        char *token = NS_strtok(".", &bufptr);
+        if (token) {
+            mMajorVersion = strtol(token, 0, 10);
+            token = NS_strtok(".", &bufptr);
+            if (token)
+                mMinorVersion = strtol(token, 0, 10);
+        }
+    }
+}
+
+static inline PRUint64 version(PRUint32 major, PRUint32 minor)
+{
+    return (PRUint64(major) << 32) + PRUint64(minor);
+}
+
+nsresult
+GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo /* = nsnull */)
+{
+    GetData();
+    *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
+    aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
+
+#ifdef MOZ_PLATFORM_MAEMO
+    // on Maemo, the glxtest probe doesn't build, and we don't really need GfxInfo anyway
+    return NS_OK;
+#endif
+
+    // whitelist the linux test slaves' current configuration.
+    // this is necessary as they're still using the slightly outdated 190.42 driver.
+    // this isn't a huge risk, as at least this is the exact setting in which we do continuous testing,
+    // and this only affects GeForce 9400 cards on linux on this precise driver version, which is very few users.
+    // We do the same thing on Windows XP, see in widget/src/windows/GfxInfo.cpp
+    if (mIsNVIDIA &&
+        !strcmp(mRenderer.get(), "GeForce 9400/PCI/SSE2") &&
+        !strcmp(mVersion.get(), "3.2.0 NVIDIA 190.42"))
+    {
+        return NS_OK;
+    }
+
+    if (mIsMesa) {
+        if (version(mMajorVersion, mMinorVersion) < version(7,10)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("Mesa 7.10");
+        }
+        else if (strstr(mRenderer.get(), "Gallium")) {
+            // see bug 624935
+            // and http://marc.info/?l=mesa3d-dev&m=126525088903956&w=2
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("<NOT Gallium>");
+        }
+    } else if (mIsNVIDIA) {
+        if (version(mMajorVersion, mMinorVersion) < version(257,21)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("NVIDIA 257.21");
+        }
+    } else if (mIsFGLRX) {
+        // FGLRX does not report a driver version number, so we have the OpenGL version instead.
+        // by requiring OpenGL 3, we effectively require recent drivers.
+        if (version(mMajorVersion, mMinorVersion) < version(3, 0)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+        }
+    } else {
+        // like on windows, let's block unknown vendors. Think of virtual machines.
+        // Also, this case is hit whenever the GLXtest probe failed to get driver info or crashed.
+        *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
+    }
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+GfxInfo::GetD2DEnabled(PRBool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+GfxInfo::GetDWriteEnabled(PRBool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString DWriteVersion; */
+NS_IMETHODIMP
+GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDescription; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
+{
+  GetData();
+  AppendASCIItoUTF16(mAdapterDescription, aAdapterDescription);
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterRAM; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
+{
+  aAdapterRAM.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriver; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
+{
+  aAdapterDriver.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverVersion; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
+{
+  GetData();
+  CopyASCIItoUTF16(mVersion, aAdapterDriverVersion);
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverDate; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
+{
+  aAdapterDriverDate.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long adapterVendorID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID(PRUint32 *aAdapterVendorID)
+{
+  *aAdapterVendorID = 0;
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long adapterDeviceID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID(PRUint32 *aAdapterDeviceID)
+{
+  *aAdapterDeviceID = 0;
+  return NS_OK;
+}
+
+
+} // end namespace widget
+} // end namespace mozilla
diff --git a/widget/src/xpwidgets/GfxInfoX11.h b/widget/src/xpwidgets/GfxInfoX11.h
new file mode 100644
index 000000000000..f0457b3a4f20
--- /dev/null
+++ b/widget/src/xpwidgets/GfxInfoX11.h
@@ -0,0 +1,89 @@
+/* vim: se cin sw=2 ts=2 et : */
+/* -*- 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * 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 ***** */
+
+#ifndef __GfxInfoX11_h__
+#define __GfxInfoX11_h__
+
+#include "GfxInfoBase.h"
+
+namespace mozilla {
+namespace widget {
+
+class GfxInfo : public GfxInfoBase
+{
+public:
+
+  // We only declare the subset of nsIGfxInfo that we actually implement. The
+  // rest is brought forward from GfxInfoBase.
+  NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
+  NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
+  NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDeviceID(PRUint32 *aAdapterDeviceID);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
+  using GfxInfoBase::GetFeatureStatus;
+  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
+  using GfxInfoBase::GetWebGLParameter;
+
+  virtual nsresult Init();
+
+protected:
+
+  virtual nsresult GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo = nsnull);
+
+private:
+  nsCString mVendor;
+  nsCString mRenderer;
+  nsCString mVersion;
+  nsCString mAdapterDescription;
+  bool mIsMesa, mIsNVIDIA, mIsFGLRX;
+  int mMajorVersion, mMinorVersion;
+
+  void AddCrashReportAnnotations();
+  void GetData();
+};
+
+} // namespace widget
+} // namespace mozilla
+
+#endif /* __GfxInfoX11_h__ */
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 1b101db2ce9a..8e73b77a0495 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -75,6 +75,11 @@ CPPSRCS		= \
 		nsFilePickerProxy.cpp \
 		$(NULL)
 
+ifdef MOZ_X11
+CPPSRCS		+= \
+		GfxInfoX11.cpp
+endif
+
 ifneq (,$(filter os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif

From 7c6c27aa61b2e33ed3ff40428bbec8c4975ea4ca Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 195/314] Bug 645407 - remove old blacklisting - r=karlt

---
 gfx/thebes/GLContextProviderGLX.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index dc0e584a7643..5a53afe70aa2 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -216,17 +216,6 @@ GLXLibrary::EnsureInitialized()
         serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
         serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
 
-        PRBool IsDriverBlacklisted = !serverVendor ||   // it's been reported that a VNC X server was returning serverVendor=null
-                                     !serverVersionStr ||
-                                     strcmp(serverVendor, "NVIDIA Corporation");
-
-        if (IsDriverBlacklisted && !ignoreBlacklist)
-        {
-          printf("[GLX] your GL driver is currently blocked. If you would like to bypass this, "
-                  "define the MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
-          return PR_FALSE;
-        }
-
         if (!GLXVersionCheck(1, 1))
             // Not possible to query for extensions.
             return PR_FALSE;

From 13bc7c85d2d1abcad0c9250d03bb7442bae39fb4 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 196/314] Bug 642502 - skip fields with 0/empty/null values -
 r=jrmuizel

---
 toolkit/content/aboutSupport.js | 54 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 212aa5aa1824..dc9e292b68da 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -166,6 +166,23 @@ function populateGraphicsSection() {
     return elem;
   }
 
+  function pushInfoRow(table, name, value)
+  {
+    if(value) {
+      table.push(createParentElement("tr", [
+        createHeader(bundle.GetStringFromName(name)),
+        createElement("td", value),
+      ]));
+    }
+  }
+
+  function hexValueToString(value)
+  {
+    return value
+           ? String('0000' + value.toString(16)).slice(-4)
+           : null;
+  }
+
   let bundle = Services.strings.createBundle("chrome://global/locale/aboutSupport.properties");
   let graphics_tbody = document.getElementById("graphics-tbody");
 
@@ -177,36 +194,13 @@ function populateGraphicsSection() {
 
   if (gfxInfo) {
     let trGraphics = [];
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDescription")),
-      createElement("td", gfxInfo.adapterDescription),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterVendorID")),
-      // pad with zeros. (printf would be nicer)
-      createElement("td", String('0000'+gfxInfo.adapterVendorID.toString(16)).slice(-4)),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDeviceID")),
-      // pad with zeros. (printf would be nicer)
-      createElement("td", String('0000'+gfxInfo.adapterDeviceID.toString(16)).slice(-4)),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterRAM")),
-      createElement("td", gfxInfo.adapterRAM),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDrivers")),
-      createElement("td", gfxInfo.adapterDriver),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("driverVersion")),
-      createElement("td", gfxInfo.adapterDriverVersion),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("driverDate")),
-      createElement("td", gfxInfo.adapterDriverDate),
-    ]));
+    pushInfoRow(trGraphics, "adapterDescription", gfxInfo.adapterDescription);
+    pushInfoRow(trGraphics, "adapterVendorID", hexValueToString(gfxInfo.adapterVendorID));
+    pushInfoRow(trGraphics, "adapterDeviceID", hexValueToString(gfxInfo.adapterDeviceID));
+    pushInfoRow(trGraphics, "adapterRAM", gfxInfo.adapterRAM);
+    pushInfoRow(trGraphics, "adapterDrivers", gfxInfo.adapterDriver);
+    pushInfoRow(trGraphics, "driverVersion", gfxInfo.adapterDriverVersion);
+    pushInfoRow(trGraphics, "driverDate", gfxInfo.adapterDriverDate);
 
     var d2dEnabled = false;
     try {

From 1ee952addb9a25a4fac534aac6397a50bff92ac5 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 197/314] Bug 642502 - about:support improvements -
 r=gavin.sharp

---
 toolkit/content/aboutSupport.js               | 138 +++++++++++-------
 .../chrome/global/aboutSupport.properties     |  11 +-
 2 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index dc9e292b68da..6c149ace5c71 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -176,6 +176,47 @@ function populateGraphicsSection() {
     }
   }
 
+  function errorMessageForFeature(feature) {
+    var errorMessage;
+    var status;
+    try {
+      status = gfxInfo.getFeatureStatus(feature);
+    } catch(e) {}
+    switch (status) {
+      case gfxInfo.FEATURE_BLOCKED_DEVICE:
+      case gfxInfo.FEATURE_DISCOURAGED:
+        errorMessage = bundle.GetStringFromName("blockedGfxCard");
+        break;
+      case gfxInfo.FEATURE_BLOCKED_OS_VERSION:
+        errorMessage = bundle.GetStringFromName("blockedOSVersion");
+        break;
+      case gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION:
+        var suggestedDriverVersion;
+        try {
+          suggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(feature);
+        } catch(e) {}
+        if (suggestedDriverVersion)
+          errorMessage = bundle.formatStringFromName("tryNewerDriver", [suggestedDriverVersion], 1);
+        else
+          errorMessage = bundle.GetStringFromName("blockedDriver");
+        break;
+    }
+    return errorMessage;
+  }
+
+  function pushFeatureInfoRow(table, name, feature, isEnabled, message) {
+    message = message || isEnabled;
+    if (!isEnabled) {
+      var errorMessage = errorMessageForFeature(feature);
+      if (errorMessage)
+        message = errorMessage;
+    }
+    table.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName(name)),
+      createElement("td", message),
+    ]));
+  }
+
   function hexValueToString(value)
   {
     return value
@@ -202,64 +243,49 @@ function populateGraphicsSection() {
     pushInfoRow(trGraphics, "driverVersion", gfxInfo.adapterDriverVersion);
     pushInfoRow(trGraphics, "driverDate", gfxInfo.adapterDriverDate);
 
-    var d2dEnabled = false;
-    try {
-      d2dEnabled = gfxInfo.D2DEnabled;
-    } catch(e) {}
-    var d2dMessage = d2dEnabled;
-    if (!d2dEnabled) {
-      var d2dStatus = -1; // different from any status value defined in the IDL
+#ifdef XP_WIN
+    var version = Cc["@mozilla.org/system-info;1"]
+                  .getService(Ci.nsIPropertyBag2)
+                  .getProperty("version");
+    var isWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
+    if (isWindowsVistaOrHigher) {
+      var d2dEnabled = "false";
       try {
-        d2dStatus = gfxInfo.getFeatureStatus(gfxInfo.FEATURE_DIRECT2D);
-      } catch(e) {
-        window.dump(e + '\n');
-      }  
-      if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DEVICE ||
-          d2dStatus == gfxInfo.FEATURE_DISCOURAGED)
-      {
-        d2dMessage = bundle.GetStringFromName("blockedGraphicsCard");
-      }
-      else if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION)
-      {
-        var d2dSuggestedDriverVersion = null;
-        try {
-          d2dSuggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(gfxInfo.FEATURE_DIRECT2D);
-        } catch(e) {
-          window.dump(e + '\n');
-        }
-        if (d2dSuggestedDriverVersion) {
-          d2dMessage = bundle.GetStringFromName("tryNewerDriverVersion").replace("%1", d2dSuggestedDriverVersion);
-        }
-      }
-    }
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("direct2DEnabled")),
-      createElement("td", d2dMessage),
-    ]));
+        d2dEnabled = gfxInfo.D2DEnabled;
+      } catch(e) {}
+      pushFeatureInfoRow(trGraphics, "direct2DEnabled", gfxInfo.FEATURE_DIRECT2D, d2dEnabled);
 
-    var dwEnabled = false;
-    var dwriteEnabledStr = dwEnabled.toString();
-    var dwriteVersion;
-    try {
-      dwEnabled = gfxInfo.DWriteEnabled;
-      dwriteVersion = gfxInfo.DWriteVersion;
-      dwriteEnabledStr = dwEnabled.toString() + " (" + dwriteVersion + ")";
-    } catch(e) {}
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("directWriteEnabled")),
-      createElement("td", dwriteEnabledStr),
-    ]));
+      var dwEnabled = "false";
+      try {
+        dwEnabled = gfxInfo.DWriteEnabled + " (" + gfxInfo.DWriteVersion + ")";
+      } catch(e) {}
+      trGraphics.push(createParentElement("tr", [
+        createHeader(bundle.GetStringFromName("directWriteEnabled")),
+        createElement("td", dwEnabled),
+      ]));
+    }
+#endif
 
     var webglrenderer;
+    var webglenabled;
     try {
       webglrenderer = gfxInfo.getWebGLParameter("full-renderer");
+      webglenabled = true;
     } catch (e) {
-      webglrenderer = "(WebGL unavailable)";
+      webglrenderer = false;
+      webglenabled = false;
     }
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("webglRenderer")),
-      createElement("td", webglrenderer)
-    ]));
+#ifdef XP_WIN
+    // If ANGLE is not available but OpenGL is, we want to report on the OpenGL feature, because that's what's going to get used.
+    // In all other cases we want to report on the ANGLE feature.
+    var webglfeature = gfxInfo.FEATURE_WEBGL_ANGLE;
+    if (gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_ANGLE)  != gfxInfo.FEATURE_NO_INFO &&
+        gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_OPENGL) == gfxInfo.FEATURE_NO_INFO)
+      webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
+#else
+    var webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
+#endif
+    pushFeatureInfoRow(trGraphics, "webglRenderer", webglfeature, webglenabled, webglrenderer);
 
     appendChildren(graphics_tbody, trGraphics);
    
@@ -290,8 +316,18 @@ function populateGraphicsSection() {
   }
 
   let msg = acceleratedWindows + "/" + totalWindows;
-  if (acceleratedWindows)
+  if (acceleratedWindows) {
     msg += " " + mgrType;
+  } else {
+#ifdef XP_WIN
+    var feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS;
+#else
+    var feature = gfxInfo.FEATURE_OPENGL_LAYERS;
+#endif
+    var errMsg = errorMessageForFeature(feature);
+    if (errMsg)
+      msg += ". " + errMsg;
+  }
 
   appendChildren(graphics_tbody, [
     createParentElement("tr", [
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 0d9fa3ce62a3..723559d15c56 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -8,11 +8,16 @@
 acceleratedWindows = GPU Accelerated Windows
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-# The %1 here is a placeholder, leave unchanged, it will get replaced by the driver version string.
-tryNewerDriverVersion = Blocked on your graphics driver. Try updating your graphics driver to version %1 or newer.
+blockedDriver = Blocked for your graphics driver version.
+
+# LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
+tryNewerDriver = Blocked for your graphics driver version. Try updating your graphics driver to version %S or newer.
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedGraphicsCard = Blocked on your graphics card because of unresolved driver issues.
+blockedGfxCard = Blocked for your graphics card because of unresolved driver issues.
+
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+blockedOSVersion = Blocked for your operating system version.
 
 direct2DEnabled = Direct2D Enabled
 directWriteEnabled = DirectWrite Enabled

From 59f8fad8a223b3b39c3f068cffd6fea0e5afe92d Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 198/314] Bug 645407 - remove useless GLX checks - r=karlt

---
 gfx/thebes/GLContextProviderGLX.cpp | 49 +++++++----------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index 5a53afe70aa2..f56cbda77cf7 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -180,52 +180,25 @@ GLXLibrary::EnsureInitialized()
     }
 
     Display *display = DefaultXDisplay();
-    PRBool ignoreBlacklist = PR_GetEnv("MOZ_GLX_IGNORE_BLACKLIST") != nsnull;
-    if (!ignoreBlacklist) {
-        // ATI's libGL (at least the one provided with 11.2 drivers) segfaults
-        // when querying server info if the server does not have the
-        // ATIFGLEXTENSION extension.
-        const char *clientVendor = xGetClientString(display, GLX_VENDOR);
-        if (clientVendor && strcmp(clientVendor, "ATI") == 0) {
-            printf("[GLX] The ATI proprietary libGL.so.1 is currently "
-                   "blacklisted to avoid crashes that happen in some "
-                   "situations. If you would like to bypass this, set the "
-                   "MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
-            return PR_FALSE;
-        }
-    }
 
     int screen = DefaultScreen(display);
     const char *serverVendor = NULL;
     const char *serverVersionStr = NULL;
     const char *extensionsStr = NULL;
 
-    // This scope is covered by a ScopedXErrorHandler to catch X errors in GLX
-    // calls.  See bug 632867 comment 3: Mesa versions up to 7.10 cause a
-    // BadLength error during the first GLX call that communicates with the
-    // server when the server GLX version < 1.3.
-    {
-        ScopedXErrorHandler xErrorHandler;
-
-        if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
-            gGLXMajorVersion = 0;
-            gGLXMinorVersion = 0;
-            return PR_FALSE;
-        }
-
-        serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
-        serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
-
-        if (!GLXVersionCheck(1, 1))
-            // Not possible to query for extensions.
-            return PR_FALSE;
-
-        extensionsStr = xQueryExtensionsString(display, screen);
-
-        if (xErrorHandler.GetError())
-          return PR_FALSE;
+    if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
+        gGLXMajorVersion = 0;
+        gGLXMinorVersion = 0;
+        return PR_FALSE;
     }
 
+    serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
+    serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
+
+    if (!GLXVersionCheck(1, 1))
+        // Not possible to query for extensions.
+        return PR_FALSE;
+
     LibrarySymbolLoader::SymLoadStruct *sym13;
     if (!GLXVersionCheck(1, 3)) {
         // Even if we don't have 1.3, we might have equivalent extensions

From 983b4e69576e6d5c67f0d902c8224931b6657359 Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Thu, 28 Apr 2011 16:13:03 -0400
Subject: [PATCH 199/314] Bug 653364 - HashChange event should have isTrusted
 property. r=bz

--HG--
extra : rebase_source : 6829b06980ed01c38e0cc5b88a9428fc784c1bb0
---
 dom/base/nsDOMClassInfo.cpp                   |  2 +-
 dom/tests/mochitest/general/Makefile.in       |  1 +
 .../mochitest/general/test_bug628069_1.html   |  1 +
 .../mochitest/general/test_bug628069_2.html   |  1 +
 .../mochitest/general/test_bug653364.html     | 39 +++++++++++++++++++
 .../mochitest/whatwg/test_bug500328.html      |  1 +
 6 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 dom/tests/mochitest/general/test_bug653364.html

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index e2ba752a2cf3..0b27643b9d86 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -2620,7 +2620,7 @@ nsDOMClassInfo::Init()
 
   DOM_CLASSINFO_MAP_BEGIN(HashChangeEvent, nsIDOMHashChangeEvent)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMHashChangeEvent)
-    DOM_CLASSINFO_DOCUMENT_MAP_ENTRIES
+    DOM_CLASSINFO_EVENT_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
   if (nsDOMTouchEvent::PrefEnabled()) {
diff --git a/dom/tests/mochitest/general/Makefile.in b/dom/tests/mochitest/general/Makefile.in
index 5fec6fa98313..bbd52c0f3f13 100644
--- a/dom/tests/mochitest/general/Makefile.in
+++ b/dom/tests/mochitest/general/Makefile.in
@@ -54,6 +54,7 @@ _TEST_FILES = \
 		test_bug628069_2.html \
 		file_bug628069.html \
 		test_bug631440.html \
+		test_bug653364.html \
 		test_consoleAPI.html \
 		test_domWindowUtils.html \
 		test_domWindowUtils_scrollXY.html \
diff --git a/dom/tests/mochitest/general/test_bug628069_1.html b/dom/tests/mochitest/general/test_bug628069_1.html
index 9f1b04b9838d..8ba4c6927a93 100644
--- a/dom/tests/mochitest/general/test_bug628069_1.html
+++ b/dom/tests/mochitest/general/test_bug628069_1.html
@@ -41,6 +41,7 @@ function childLoad() {
 function childHashchange(e) {
   is(e.oldURL, gOrigURL, 'event.oldURL');
   is(e.newURL, gOrigURL + '#hash', 'event.newURL');
+  is(e.isTrusted, true, 'Hashchange event should be trusted.');
   popup.close();
   SimpleTest.finish();
 }
diff --git a/dom/tests/mochitest/general/test_bug628069_2.html b/dom/tests/mochitest/general/test_bug628069_2.html
index 9e6c82743b8f..89da0ed2b55d 100644
--- a/dom/tests/mochitest/general/test_bug628069_2.html
+++ b/dom/tests/mochitest/general/test_bug628069_2.html
@@ -27,6 +27,7 @@ document.addEventListener("hashChange", function(e) {
   gotHashChange = 1;
   is(e.oldURL, "oldURL");
   is(e.newURL, "newURL");
+  is(e.isTrusted, false, "Hashchange event shouldn't be trusted.");
 }, true);
 
 let hc = document.createEvent("HashChangeEvent");
diff --git a/dom/tests/mochitest/general/test_bug653364.html b/dom/tests/mochitest/general/test_bug653364.html
new file mode 100644
index 000000000000..e10da384cbd2
--- /dev/null
+++ b/dom/tests/mochitest/general/test_bug653364.html
@@ -0,0 +1,39 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=653364
+-->
+<head>
+  <title>Test for Bug 653364</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=653364">Mozilla Bug 653364</a>
+<p id="display"></p>
+<div id="content">
+  <iframe id="frame" style="height:100px; width:100px; border:0"></iframe>
+  <div id="status" style="display: none"></div>
+</div>
+<pre id="test">
+<script type="application/javascript;version=1.7">
+
+/** Test for Bug 653364 **/
+
+gotPopState = 0;
+document.addEventListener("popState", function(e) {
+  gotPopState = 1;
+  is(e.state.foo, 'bar', "PopState event should have state we set.");
+  is(e.isTrusted, false, "PopState event shouldn't be trusted.");
+}, true);
+
+let ps = document.createEvent("PopStateEvent");
+ps.initPopStateEvent("popState", true, false, {'foo': 'bar'});
+document.documentElement.dispatchEvent(ps);
+is(gotPopState, 1, 'Document received PopState event.');
+
+</script>
+</body>
+</html>
diff --git a/dom/tests/mochitest/whatwg/test_bug500328.html b/dom/tests/mochitest/whatwg/test_bug500328.html
index 1f6a2f77bb87..95fdf5241dbc 100644
--- a/dom/tests/mochitest/whatwg/test_bug500328.html
+++ b/dom/tests/mochitest/whatwg/test_bug500328.html
@@ -274,6 +274,7 @@ function runTest() {
 
   statusMsg("Awake after going back to page 1.");
   popstateExpected("Going back to page 1 should trigger a popstate.");
+  is(gLastPopStateEvent.isTrusted, true, 'Popstate event should be trusted.');
   is(JSON.stringify(gLastPopStateEvent.state), JSON.stringify(testObj1),
      "Wrong state object popped after going back to page 1.");
   ok(gLastPopStateEvent.state === iframeCw.history.state,

From d69231f5703724a02f19d69d098f2d97f1a85588 Mon Sep 17 00:00:00 2001
From: Marina Samuel <msamuel@mozilla.com>
Date: Fri, 29 Apr 2011 01:20:35 -0700
Subject: [PATCH 200/314] Bug 621517 - Sync UI: Add a Device wizard
 pixel-shifts while validating J-PAKE pin. r=rnewman

---
 browser/base/content/syncAddDevice.xul | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/syncAddDevice.xul b/browser/base/content/syncAddDevice.xul
index ccc051d5a306..24ae401d740e 100644
--- a/browser/base/content/syncAddDevice.xul
+++ b/browser/base/content/syncAddDevice.xul
@@ -77,11 +77,11 @@
              value="&addDevice.showMeHow.label;"
              href="https://services.mozilla.com/sync/help/add-device"/>
     </description>
-    <spacer flex="1"/>
+    <separator class="groove-thin"/>
     <description>
       &addDevice.dialog.enterCode.label;
     </description>
-    <spacer flex="1"/>
+    <separator class="groove-thin"/>
     <vbox align="center">
       <textbox id="pin1"
                class="pin"
@@ -99,7 +99,7 @@
                onfocus="this.select();" 
               />
     </vbox>
-    <spacer flex="1"/>
+    <separator class="groove-thin"/>
     <vbox id="add-device-throbber" align="center" hidden="true">
       <image/>
     </vbox>

From 81975c5596eed650d6d3b72ccaadd3aff8e2587f Mon Sep 17 00:00:00 2001
From: Marina Samuel <msamuel@mozilla.com>
Date: Fri, 29 Apr 2011 01:21:06 -0700
Subject: [PATCH 201/314] Bug 645883 - "Deactivate this device" should not
 default to action. r=rnewman

---
 browser/components/preferences/sync.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/components/preferences/sync.js b/browser/components/preferences/sync.js
index e9abc46dfc64..40e696634437 100644
--- a/browser/components/preferences/sync.js
+++ b/browser/components/preferences/sync.js
@@ -110,7 +110,8 @@ let gSyncPane = {
   startOver: function (showDialog) {
     if (showDialog) {
       let flags = Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING +
-                  Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL;
+                  Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL + 
+                  Services.prompt.BUTTON_POS_1_DEFAULT;
       let buttonChoice =
         Services.prompt.confirmEx(window,
                                   this._stringBundle.GetStringFromName("stopUsingAccount.title"),

From 3a3f7a80ceaf3f3362903e5173783136200912fc Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 9 May 2011 09:31:09 -0700
Subject: [PATCH 202/314] Bug 655731 - Don't play the firstrun animation if
 sidebars are already visible [r=wesj]

---
 mobile/chrome/content/firstrun/firstrun.xhtml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/chrome/content/firstrun/firstrun.xhtml b/mobile/chrome/content/firstrun/firstrun.xhtml
index 5fbdfe2128e3..3693693da02c 100644
--- a/mobile/chrome/content/firstrun/firstrun.xhtml
+++ b/mobile/chrome/content/firstrun/firstrun.xhtml
@@ -122,7 +122,14 @@
         }
         
         function startDiscovery() {
-          let doc = getChromeWin().document;
+          let win = getChromeWin();
+          let [leftWidth, rightWidth] = win.Browser.computeSidebarVisibility();
+          if (leftWidth > 0 || rightWidth > 0) {
+            endDiscovery();
+            return;
+          }
+
+          let doc = win.document;
           let broadcaster = doc.getElementById("bcast_uidiscovery");
 
           doc.addEventListener("animationend", endDiscovery, false);

From d34bad99c4afe8eb9d346a9532ac251b80e5ca41 Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Fri, 29 Apr 2011 15:05:19 +0200
Subject: [PATCH 203/314] Bug 653681 - TabMatcher._getTabsForOtherWindows()
 must not use nsIWindowMediator.getMostRecentWindow(); r=dao

---
 browser/base/content/tabview/search.js | 42 ++++++++++++--------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/browser/base/content/tabview/search.js b/browser/base/content/tabview/search.js
index b7d17ad62c3e..4afa0b1784d0 100644
--- a/browser/base/content/tabview/search.js
+++ b/browser/base/content/tabview/search.js
@@ -218,43 +218,39 @@ TabMatcher.prototype = {
   
   // ---------
   // Function: _getTabsForOtherWindows
-  // Returns an array of <TabItem>s and <xul:tabs>s representing that
-  // tabs from all windows but the currently focused window. <TabItem>s
-  // will be returned for windows in which Panorama has been activated at
-  // least once, while <xul:tab>s will be return for windows in which
-  // Panorama has never been activated.
-  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows(){
-    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                       .getService(Components.interfaces.nsIWindowMediator);
-    var enumerator = wm.getEnumerator("navigator:browser");    
-    var currentWindow = wm.getMostRecentWindow("navigator:browser");
-    
-    var allTabs = [];    
+  // Returns an array of <TabItem>s and <xul:tabs>s representing tabs
+  // from all windows but the current window. <TabItem>s will be returned
+  // for windows in which Panorama has been activated at least once, while
+  // <xul:tab>s will be returned for windows in which Panorama has never
+  // been activated.
+  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows() {
+    var enumerator = Services.wm.getEnumerator("navigator:browser");
+    var allTabs = [];
+
     while (enumerator.hasMoreElements()) {
       var win = enumerator.getNext();
-      // This function gets tabs from other windows: not the one you currently
-      // have focused.
-      if (win != currentWindow) {
+      // This function gets tabs from other windows, not from the current window
+      if (win != gWindow) {
         // If TabView is around iterate over all tabs, else get the currently
         // shown tabs...
-        
         let tvWindow = win.TabView.getContentWindow();
         if (tvWindow)
-          allTabs = allTabs.concat( tvWindow.TabItems.getItems() );
+          allTabs = allTabs.concat(tvWindow.TabItems.getItems());
         else
           // win.gBrowser.tabs isn't a proper array, so we can't use concat
-          for (var i=0; i<win.gBrowser.tabs.length; i++) allTabs.push( win.gBrowser.tabs[i] );
-      } 
+          for (let i = 0; i < win.gBrowser.tabs.length; i++)
+            allTabs.push(win.gBrowser.tabs[i]);
+      }
     }
-    return allTabs;    
+    return allTabs;
   },
   
   // ----------
   // Function: matchedTabsFromOtherWindows
   // Returns an array of <TabItem>s and <xul:tab>s that match the search term
-  // from all windows but the currently focused window. <TabItem>s will be
-  // returned for windows in which Panorama has been activated at least once,
-  // while <xul:tab>s will be return for windows in which Panorama has never
+  // from all windows but the current window. <TabItem>s will be returned for
+  // windows in which Panorama has been activated at least once, while
+  // <xul:tab>s will be returned for windows in which Panorama has never
   // been activated.
   // (new TabMatcher("app")).matchedTabsFromOtherWindows();
   matchedTabsFromOtherWindows: function TabMatcher_matchedTabsFromOtherWindows(){

From cc7e36b18a02e639050382ba24b4c6ee81d47005 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Fri, 29 Apr 2011 10:57:59 -0700
Subject: [PATCH 204/314] Bug 653307: Adjust reCAPTCHA NoScript hack in Sync.
 r=philiKON

---
 browser/base/content/syncSetup.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/syncSetup.js b/browser/base/content/syncSetup.js
index 514d2d6f99a6..7f2ef409fb7c 100644
--- a/browser/base/content/syncSetup.js
+++ b/browser/base/content/syncSetup.js
@@ -56,6 +56,11 @@ const OPTIONS_PAGE                  = 6;
 const OPTIONS_CONFIRM_PAGE          = 7;
 const SETUP_SUCCESS_PAGE            = 8;
 
+// Broader than we'd like, but after this changed from api-secure.recaptcha.net
+// we had no choice. At least we only do this for the duration of setup.
+// See discussion in Bugs 508112 and 653307.
+const RECAPTCHA_DOMAIN = "https://www.google.com";
+
 Cu.import("resource://services-sync/main.js");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
@@ -69,7 +74,6 @@ var gSyncSetup = {
   captchaBrowser: null,
   wizard: null,
   _disabledSites: [],
-  _remoteSites: [Weave.Service.serverURL, "https://api-secure.recaptcha.net"],
 
   status: {
     password: false,
@@ -77,6 +81,8 @@ var gSyncSetup = {
     server: false
   },
 
+  get _remoteSites() [Weave.Service.serverURL, RECAPTCHA_DOMAIN],
+
   get _usingMainServers() {
     if (this._settingUpNew)
       return document.getElementById("server").selectedIndex == 0;

From 63cf42e132914ebd59f491f7a71a3cf5291bb797 Mon Sep 17 00:00:00 2001
From: Marina Samuel <msamuel@mozilla.com>
Date: Mon, 2 May 2011 09:26:31 -0700
Subject: [PATCH 205/314] Bug 652483 - Sync UI: When printing or saving a sync
 key, the dialog prompts you to change it. r=philikon

---
 browser/base/content/syncGenericChange.js                       | 2 +-
 browser/base/content/syncGenericChange.xul                      | 2 +-
 .../locales/en-US/chrome/browser/syncGenericChange.properties   | 2 +-
 browser/locales/en-US/chrome/browser/syncSetup.dtd              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/syncGenericChange.js b/browser/base/content/syncGenericChange.js
index 2cd16f6c3e38..90ab64197fdc 100644
--- a/browser/base/content/syncGenericChange.js
+++ b/browser/base/content/syncGenericChange.js
@@ -111,7 +111,7 @@ let Change = {
              pp = Weave.Utils.hyphenatePassphrase(pp);
           this._passphraseBox.value = pp;
           this._passphraseBox.focus();
-          document.title = this._str("change.synckey.title");
+          document.title = this._str("change.synckey2.title");
           introText.textContent = this._str("change.synckey.introText2");
           warningText.textContent = this._str("change.synckey2.warningText");
           this._dialog.getButton("finish").label
diff --git a/browser/base/content/syncGenericChange.xul b/browser/base/content/syncGenericChange.xul
index 1e76c16520d6..391a29c26221 100644
--- a/browser/base/content/syncGenericChange.xul
+++ b/browser/base/content/syncGenericChange.xul
@@ -100,7 +100,7 @@
           <spacer flex="1"/>
           <label id="generatePassphraseButton"
                  hidden="true"
-                 value="&syncKeyGenerate.label;"
+                 value="&syncGenerateNewKey.label;"
                  class="text-link inline-link"
                  onclick="event.stopPropagation();
                           Change.doGeneratePassphrase();"/>
diff --git a/browser/locales/en-US/chrome/browser/syncGenericChange.properties b/browser/locales/en-US/chrome/browser/syncGenericChange.properties
index c7da1ac1b0cb..32310a307a7c 100644
--- a/browser/locales/en-US/chrome/browser/syncGenericChange.properties
+++ b/browser/locales/en-US/chrome/browser/syncGenericChange.properties
@@ -8,7 +8,7 @@ change.password.status.error = There was an error changing your password.
 change.password2.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your Sync Key.
 change.password.warningText = Note: All of your other devices will be unable to connect to your account once you change this password.
 
-change.synckey.title = Change your Sync Key
+change.synckey2.title = My Sync Key
 change.synckey.acceptButton = Change Sync Key
 change.synckey.label = Changing Sync Key and uploading local data, please wait…
 change.synckey2.error = There was an error while changing your Sync Key!
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.dtd b/browser/locales/en-US/chrome/browser/syncSetup.dtd
index c8023bbf599d..020ac966e263 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -43,7 +43,7 @@
 <!ENTITY setup.newSyncKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Sync Key which is necessary to decrypt your data is not uploaded.">
 <!ENTITY syncKeyEntry.label        "Your Sync Key">
 <!ENTITY syncKeyEntry.accesskey    "K">
-<!ENTITY syncKeyGenerate.label     "Generate">
+<!ENTITY syncGenerateNewKey.label  "Generate a new key">
 <!ENTITY syncKeyBackup.description "Your Sync Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Sync Key.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Print…">

From 7eaaea7cc7cabc291dd57a45d3d6a14d5d45ffd3 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 2 May 2011 18:43:44 -0700
Subject: [PATCH 206/314] Audit for places in style rule code that need to
 check for a null sheet.  (Bug 634373)  r=bzbarsky

---
 layout/style/StyleRule.cpp                    |   9 +-
 layout/style/nsCSSRules.cpp                   |  21 +++-
 layout/style/test/Makefile.in                 |   1 +
 .../style/test/test_rules_out_of_sheets.html  | 116 ++++++++++++++++++
 4 files changed, 139 insertions(+), 8 deletions(-)
 create mode 100644 layout/style/test/test_rules_out_of_sheets.html

diff --git a/layout/style/StyleRule.cpp b/layout/style/StyleRule.cpp
index 73c8ef7ebd58..905d152aac8f 100644
--- a/layout/style/StyleRule.cpp
+++ b/layout/style/StyleRule.cpp
@@ -1378,10 +1378,13 @@ StyleRule::DeclarationChanged(Declaration* aDecl,
   NS_ADDREF(clone); // for return
 
   if (aHandleContainer) {
-    NS_ASSERTION(mSheet, "rule must be in a sheet");
     if (mParentRule) {
-      mSheet->ReplaceRuleInGroup(mParentRule, this, clone);
-    } else {
+      if (mSheet) {
+        mSheet->ReplaceRuleInGroup(mParentRule, this, clone);
+      } else {
+        mParentRule->ReplaceStyleRule(this, clone);
+      }
+    } else if (mSheet) {
       mSheet->ReplaceStyleRule(this, clone);
     }
   }
diff --git a/layout/style/nsCSSRules.cpp b/layout/style/nsCSSRules.cpp
index 6d0b9d7f45a8..48eb670d365e 100644
--- a/layout/style/nsCSSRules.cpp
+++ b/layout/style/nsCSSRules.cpp
@@ -544,6 +544,7 @@ GroupRule::GroupRule(const GroupRule& aCopy)
 
 GroupRule::~GroupRule()
 {
+  NS_ABORT_IF_FALSE(!mSheet, "SetStyleSheet should have been called");
   mRules.EnumerateForwards(SetParentRuleReference, nsnull);
   if (mRuleCollection) {
     mRuleCollection->DropReference();
@@ -1908,7 +1909,9 @@ nsCSSKeyframeRule::SetKeyText(const nsAString& aKeyText)
     // for now, we don't do anything if the parse fails
   }
 
-  mSheet->SetModifiedByChildRule();
+  if (mSheet) {
+    mSheet->SetModifiedByChildRule();
+  }
 
   return NS_OK;
 }
@@ -1928,7 +1931,9 @@ nsCSSKeyframeRule::ChangeDeclaration(mozilla::css::Declaration* aDeclaration)
 {
   mDeclaration = aDeclaration;
 
-  mSheet->SetModifiedByChildRule();
+  if (mSheet) {
+    mSheet->SetModifiedByChildRule();
+  }
 }
 
 // -------------------------------------------
@@ -2043,7 +2048,9 @@ nsCSSKeyframesRule::SetName(const nsAString& aName)
 {
   mName = aName;
 
-  mSheet->SetModifiedByChildRule();
+  if (mSheet) {
+    mSheet->SetModifiedByChildRule();
+  }
 
   return NS_OK;
 }
@@ -2068,7 +2075,9 @@ nsCSSKeyframesRule::InsertRule(const nsAString& aRule)
     parser.ParseKeyframeRule(aRule, nsnull, 0);
   if (rule) {
     mRules.AppendObject(rule);
-    mSheet->SetModifiedByChildRule();
+    if (mSheet) {
+      mSheet->SetModifiedByChildRule();
+    }
   }
 
   return NS_OK;
@@ -2105,7 +2114,9 @@ nsCSSKeyframesRule::DeleteRule(const nsAString& aKey)
   PRUint32 index = FindRuleIndexForKey(aKey);
   if (index != RULE_NOT_FOUND) {
     mRules.RemoveObjectAt(index);
-    mSheet->SetModifiedByChildRule();
+    if (mSheet) {
+      mSheet->SetModifiedByChildRule();
+    }
   }
   return NS_OK;
 }
diff --git a/layout/style/test/Makefile.in b/layout/style/test/Makefile.in
index 0059a2d77ae4..325cfa376676 100644
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -168,6 +168,7 @@ _TEST_FILES =	test_acid3_test46.html \
 		test_priority_preservation.html \
 		test_property_syntax_errors.html \
 		test_rem_unit.html \
+		test_rules_out_of_sheets.html \
 		test_selectors.html \
 		test_selectors_on_anonymous_content.html \
 		test_shorthand_property_getters.html \
diff --git a/layout/style/test/test_rules_out_of_sheets.html b/layout/style/test/test_rules_out_of_sheets.html
new file mode 100644
index 000000000000..7b3b557df759
--- /dev/null
+++ b/layout/style/test/test_rules_out_of_sheets.html
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=634373
+-->
+<head>
+  <title>Test for Bug 634373</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=634373">Mozilla Bug 634373</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 634373 **/
+
+function make_rule_and_remove_sheet(text, getter) {
+  var style = document.createElement("style");
+  style.setAttribute("type", "text/css");
+  style.appendChild(document.createTextNode(text));
+  document.head.appendChild(style);
+  var result = style.sheet.cssRules[0];
+  if (getter) {
+    result = getter(result);
+  }
+  document.head.removeChild(style);
+  style = null;
+  SpecialPowers.DOMWindowUtils.garbageCollect();
+  return result;
+}
+
+var gDisplayCS = getComputedStyle(document.getElementById("display"), "");
+
+function keep_rule_alive_by_matching(rule) {
+  // It's the caller's job to guarantee that the rule matches a p.
+  // This just causes a style flush, which in turn keeps the rule alive
+  // until the next style flush.
+  var color = gDisplayCS.color;
+  return rule;
+}
+
+function get_rule_and_child(rule) {
+  return [rule, rule.cssRules[0]];
+}
+
+function get_only_child(rule) {
+  return rule.cssRules[0];
+}
+
+var rule;
+
+// In this case, the rule goes away immediately, so we're testing
+// the DOM wrapper's handling of a null rule, rather than the rule's
+// handling of a null sheet.
+rule = make_rule_and_remove_sheet("p { color: blue }");
+rule.style.color = "";
+try {
+  rule.style.color = "fuchsia";
+} catch(ex) {}
+
+rule = make_rule_and_remove_sheet("p { color: blue }",
+                                  keep_rule_alive_by_matching);
+try {
+  rule.style.color = "";
+} catch(ex) {}
+try {
+  rule.style.color = "fuchsia";
+} catch(ex) {}
+
+rule = make_rule_and_remove_sheet("@media screen { p { color: blue } }",
+                                   get_rule_and_child);
+rule[1].style.color = "";
+try {
+  rule[1].style.color = "fuchsia";
+} catch(ex) {}
+
+// In this case, the rule goes away immediately, so we're testing
+// the DOM wrapper's handling of a null rule, rather than the rule's
+// handling of a null sheet.
+rule = make_rule_and_remove_sheet("@media screen { p { color: blue } }",
+                                   get_only_child);
+rule.style.color = "";
+try {
+  rule.style.color = "fuchsia";
+} catch(ex) {}
+
+rule = make_rule_and_remove_sheet("@media screen { p { color: blue } }",
+                                  function(rule) {
+                                    return keep_rule_alive_by_matching(
+                                             get_only_child(rule));
+                                  });
+try {
+  rule.style.color = "";
+} catch(ex) {}
+try {
+  rule.style.color = "fuchsia";
+} catch(ex) {}
+
+rule = make_rule_and_remove_sheet("@-moz-keyframes a { from { color: blue } }");
+rule.insertRule("from { color: fuchsia}");
+rule.deleteRule("from");
+rule.name = "b";
+rule.cssRules[0].keyText = "50%";
+
+ok(true, "didn't crash");
+
+</script>
+</pre>
+</body>
+</html>

From abb3b86d3dd468f5f4c2915e32104b7b976ac30e Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 2 May 2011 18:43:45 -0700
Subject: [PATCH 207/314] Make XPCOM_CC_DRAW_GRAPHS work at shutdown (in
 addition to working for non-shutdown collections).  (Bug 652056, patch 3) 
 r=peterv

---
 xpcom/base/nsCycleCollector.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 285c637b3597..608fa34faa05 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2771,6 +2771,13 @@ nsCycleCollector::Shutdown()
     // Here we want to run a final collection and then permanently
     // disable the collector because the program is shutting down.
 
+#ifdef DEBUG_CC
+    if (sCollector->mParams.mDrawGraphs) {
+        nsCOMPtr<nsICycleCollectorListener> listener =
+            new nsCycleCollectorLogger();
+        Collect(SHUTDOWN_COLLECTIONS(mParams), listener);
+    } else
+#endif
     Collect(SHUTDOWN_COLLECTIONS(mParams), nsnull);
 
 #ifdef DEBUG_CC

From c51a4c6569dec825e6697d93fc9af4004f2c34e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Mon, 2 May 2011 19:50:18 +0200
Subject: [PATCH 208/314] Bug 451833 - Highlight the domain name in the address
 bar. r=roc,sdwilsh ui-r=faaborg

--HG--
extra : rebase_source : 1010ad246e94e271a0efaaca13356aff5d4b3bc3
---
 browser/app/profile/firefox.js                |  2 +
 browser/base/content/test/Makefile.in         |  1 +
 .../base/content/test/browser_urlHighlight.js | 58 +++++++++++++++++++
 browser/base/content/urlbarBindings.xml       | 44 ++++++++++++++
 .../base/public/nsISelectionController.idl    |  5 +-
 layout/generic/nsFrame.cpp                    |  3 +-
 layout/generic/nsSelection.cpp                |  2 +
 layout/generic/nsTextFrameThebes.cpp          | 16 +++++
 toolkit/content/widgets/autocomplete.xml      |  2 +
 9 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 browser/base/content/test/browser_urlHighlight.js

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 55642b935c0b..1eb32ef82c85 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -299,6 +299,8 @@ pref("browser.urlbar.match.url", "@");
 // 2 = only bookmarks, 3 = visited bookmarks, 1+16 = history matching in the url
 pref("browser.urlbar.default.behavior", 0);
 
+pref("browser.urlbar.formatting.enabled", true);
+
 // Number of milliseconds to wait for the http headers (and thus
 // the Content-Disposition filename) before giving up and falling back to 
 // picking a filename without that info in hand so that the user sees some
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 286cb74dba5f..ebc9bbc1162c 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -215,6 +215,7 @@ _BROWSER_FILES = \
                  browser_tabfocus.js \
                  browser_tabs_isActive.js \
                  browser_tabs_owner.js \
+                 browser_urlHighlight.js \
                  browser_visibleFindSelection.js \
                  browser_visibleTabs.js \
                  browser_visibleTabs_contextMenu.js \
diff --git a/browser/base/content/test/browser_urlHighlight.js b/browser/base/content/test/browser_urlHighlight.js
new file mode 100644
index 000000000000..f4e4723e5a74
--- /dev/null
+++ b/browser/base/content/test/browser_urlHighlight.js
@@ -0,0 +1,58 @@
+function testVal(aExpected) {
+  gURLBar.value = aExpected.replace(/[<>]/g, "");
+
+  let selectionController = gURLBar.editor.selectionController;
+  let selection = selectionController.getSelection(selectionController.SELECTION_URLSECONDARY);
+  let value = gURLBar.editor.rootElement.textContent;
+  let result = "";
+  for (let i = 0; i < selection.rangeCount; i++) {
+    let range = selection.getRangeAt(i).toString();
+    let pos = value.indexOf(range);
+    result += value.substring(0, pos) + "<" + range + ">";
+    value = value.substring(pos + range.length);
+  }
+  result += value;
+  is(result, aExpected);
+}
+
+function test() {
+  const prefname = "browser.urlbar.formatting.enabled";
+
+  registerCleanupFunction(function () {
+    Services.prefs.clearUserPref(prefname);
+    URLBarSetURI();
+  });
+
+  Services.prefs.setBoolPref(prefname, true);
+
+  testVal("<http://>mozilla.org");
+  testVal("<http://>mozilla.org</>");
+  testVal("<http://>mözilla.org</>");
+  testVal("<http://>mozilla.imaginatory</>");
+  testVal("<http://www.>mozilla.org</>");
+  testVal("<http://sub.>mozilla.org</>");
+  testVal("<http://sub1.sub2.sub3.>mozilla.org</>");
+  testVal("<http://ftp.>mozilla.org</>");
+  testVal("<ftp://ftp.>mozilla.org</>");
+
+  testVal("<https://sub.>mozilla.org</>");
+  testVal("<https://sub1.sub2.sub3.>mozilla.org</>");
+  testVal("<https://user:pass@sub1.sub2.sub3.>mozilla.org</>");
+  testVal("<https://user:pass@>mozilla.org</>");
+
+  testVal("<http://>mozilla.org</file.ext>");
+  testVal("<http://>mozilla.org</sub/file.ext>");
+  testVal("<http://>mozilla.org</sub/file.ext?foo>");
+  testVal("<http://>mozilla.org</sub/file.ext?foo&bar>");
+  testVal("<http://>mozilla.org</sub/file.ext?foo&bar#top>");
+
+  testVal("<http://sub.>mozilla.org<:666/file.ext>");
+
+  testVal("mailto:admin@mozilla.org");
+  testVal("gopher://mozilla.org/");
+  testVal("about:config");
+
+  Services.prefs.setBoolPref(prefname, false);
+
+  testVal("http://mozilla.org/");
+}
diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml
index fd30267165a4..c442f0c8deaf 100644
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -90,6 +90,7 @@
         this.doubleClickSelectsAll = this._prefs.getBoolPref("doubleClickSelectsAll");
         this.completeDefaultIndex = this._prefs.getBoolPref("autoFill");
         this.timeout = this._prefs.getIntPref("delay");
+        this._formattingEnabled = this._prefs.getBoolPref("formatting.enabled");
 
         this._urlTooltip = document.getElementById("urlTooltip");
 
@@ -179,6 +180,46 @@
         ]]></body>
       </method>
 
+      <field name="_formattingEnabled">true</field>
+      <method name="formatValue">
+        <body><![CDATA[
+          if (!this._formattingEnabled)
+            return;
+
+          let controller = this.editor.selectionController;
+          let selection = controller.getSelection(controller.SELECTION_URLSECONDARY);
+          selection.removeAllRanges();
+
+          let textNode = this.editor.rootElement.firstChild;
+          let value = textNode.textContent;
+          let matchedURL = value.match(/^((?:http|https|ftp):\/\/(?:[^\/]+@)?)([^\/:]+)/);
+          if (!matchedURL)
+            return;
+
+          let [, preDomain, domain] = matchedURL;
+          let baseDomain = domain;
+          try {
+            baseDomain = Services.eTLD.getBaseDomainFromHost(domain);
+          } catch (e) {}
+          let segments = function (s) s.replace(/[^.]*/g, "").length + 1;
+          let subSegments = segments(domain) - segments(baseDomain);
+          let subDomain = domain.match(new RegExp("(?:[^.]*\.){" + subSegments + "}"))[0];
+
+          let range = document.createRange();
+          range.setStart(textNode, 0);
+          range.setEnd(textNode, preDomain.length + subDomain.length);
+          selection.addRange(range);
+
+          let startRest = preDomain.length + domain.length;
+          if (startRest < value.length) {
+            range = document.createRange();
+            range.setStart(textNode, startRest);
+            range.setEnd(textNode, value.length);
+            selection.addRange(range);
+          }
+        ]]></body>
+      </method>
+
       <method name="handleRevert">
         <body><![CDATA[
           var isScrolling = this.popupOpen;
@@ -494,6 +535,9 @@
               case "delay":
                 this.timeout = this._prefs.getIntPref(aData);
                 break;
+              case "formatting.enabled":
+                this._formattingEnabled = this._prefs.getBoolPref(aData);
+                break;
             }
           }
         ]]></body>
diff --git a/content/base/public/nsISelectionController.idl b/content/base/public/nsISelectionController.idl
index 3d37e4ab981f..f12f37d341fe 100644
--- a/content/base/public/nsISelectionController.idl
+++ b/content/base/public/nsISelectionController.idl
@@ -51,7 +51,7 @@ interface nsIDOMNode;
 interface nsISelection;
 interface nsISelectionDisplay;
 
-[scriptable, uuid(ff11fa25-788f-444f-8f69-dcdf14348fb3)]
+[scriptable, uuid(e0dd9365-470b-4ee8-b644-54add1c4c73f)]
 interface nsISelectionController : nsISelectionDisplay
 {
    const short SELECTION_NONE=0;
@@ -63,7 +63,8 @@ interface nsISelectionController : nsISelectionDisplay
    const short SELECTION_IME_SELECTEDCONVERTEDTEXT=32;
    const short SELECTION_ACCESSIBILITY=64; // For accessibility API usage
    const short SELECTION_FIND=128;
-   const short NUM_SELECTIONTYPES=9;
+   const short SELECTION_URLSECONDARY=256;
+   const short NUM_SELECTIONTYPES=10;
 
    const short SELECTION_ANCHOR_REGION = 0;
    const short SELECTION_FOCUS_REGION = 1;
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 3125f9dd0c85..7ffcfa1805c4 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2216,10 +2216,11 @@ nsFrame::HandlePress(nsPresContext* aPresContext,
       // If the user clicked inside a selection, then just
       // return without doing anything. We will handle placing
       // the caret later on when the mouse is released. We ignore
-      // the spellcheck and find selections.
+      // the spellcheck, find and url formatting selections.
       //
       if (curDetail->mType != nsISelectionController::SELECTION_SPELLCHECK &&
           curDetail->mType != nsISelectionController::SELECTION_FIND &&
+          curDetail->mType != nsISelectionController::SELECTION_URLSECONDARY &&
           curDetail->mStart <= offsets.StartOffset() &&
           offsets.EndOffset() <= curDetail->mEnd)
       {
diff --git a/layout/generic/nsSelection.cpp b/layout/generic/nsSelection.cpp
index 8b79c0fc7f15..e4b850f7b881 100644
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -536,6 +536,7 @@ GetIndexFromSelectionType(SelectionType aType)
     case nsISelectionController::SELECTION_IME_SELECTEDCONVERTEDTEXT: return 5; break;
     case nsISelectionController::SELECTION_ACCESSIBILITY: return 6; break;
     case nsISelectionController::SELECTION_FIND: return 7; break;
+    case nsISelectionController::SELECTION_URLSECONDARY: return 8; break;
     default:
       return -1; break;
     }
@@ -556,6 +557,7 @@ GetSelectionTypeFromIndex(PRInt8 aIndex)
     case 5: return nsISelectionController::SELECTION_IME_SELECTEDCONVERTEDTEXT; break;
     case 6: return nsISelectionController::SELECTION_ACCESSIBILITY; break;
     case 7: return nsISelectionController::SELECTION_FIND; break;
+    case 8: return nsISelectionController::SELECTION_URLSECONDARY; break;
     default:
       return nsISelectionController::SELECTION_NORMAL; break;
   }
diff --git a/layout/generic/nsTextFrameThebes.cpp b/layout/generic/nsTextFrameThebes.cpp
index edfa147c6978..502182aef3eb 100644
--- a/layout/generic/nsTextFrameThebes.cpp
+++ b/layout/generic/nsTextFrameThebes.cpp
@@ -309,6 +309,7 @@ public:
                             nscolor* aBackColor);
   void GetHighlightColors(nscolor* aForeColor,
                           nscolor* aBackColor);
+  void GetURLSecondaryColor(nscolor* aForeColor);
   void GetIMESelectionColors(PRInt32  aIndex,
                              nscolor* aForeColor,
                              nscolor* aBackColor);
@@ -3261,6 +3262,17 @@ nsTextPaintStyle::GetHighlightColors(nscolor* aForeColor,
   *aBackColor = backColor;
 }
 
+void
+nsTextPaintStyle::GetURLSecondaryColor(nscolor* aForeColor)
+{
+  NS_ASSERTION(aForeColor, "aForeColor is null");
+
+  nsILookAndFeel* look = mPresContext->LookAndFeel();
+  nscolor foreColor;
+  look->GetColor(nsILookAndFeel::eColor_graytext, foreColor);
+  *aForeColor = foreColor;
+}
+
 void
 nsTextPaintStyle::GetIMESelectionColors(PRInt32  aIndex,
                                         nscolor* aForeColor,
@@ -4572,6 +4584,10 @@ static PRBool GetSelectionTextColors(SelectionType aType,
     case nsISelectionController::SELECTION_FIND:
       aTextPaintStyle.GetHighlightColors(aForeground, aBackground);
       return PR_TRUE;
+    case nsISelectionController::SELECTION_URLSECONDARY:
+      aTextPaintStyle.GetURLSecondaryColor(aForeground);
+      *aBackground = NS_RGBA(0,0,0,0);
+      return PR_TRUE;
     case nsISelectionController::SELECTION_IME_RAWINPUT:
     case nsISelectionController::SELECTION_IME_SELECTEDRAWTEXT:
     case nsISelectionController::SELECTION_IME_CONVERTEDTEXT:
diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 62b174432a66..252c2011e4c5 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -281,6 +281,8 @@
             val = this.onBeforeValueSet(val);
 
           this.inputField.value = val;
+          if (typeof this.formatValue == "function")
+            this.formatValue();
           this.mIgnoreInput = false;
           var event = document.createEvent('Events');
           event.initEvent('ValueChange', true, true);

From 4377d199b3864e99fd543f59cb1d0d3ecc698e45 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Mon, 2 May 2011 22:07:38 +0300
Subject: [PATCH 209/314] Bug 642176 - add Erik Vold to the contributors list
 for workspace.xul; r=rcampbell

---
 browser/base/content/workspace.xul | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/base/content/workspace.xul b/browser/base/content/workspace.xul
index a8b97cb6a853..332b5075679a 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/workspace.xul
@@ -23,6 +23,7 @@
    - Contributor(s):
    -   Rob Campbell <robcee@mozilla.com> (original author)
    -   Mihai Sucan <mihai.sucan@gmail.com>
+   -   Erik Vold <erikvvold@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

From 66ee07052cc5c283c324b2f0dcab2ac9b1d3cc0a Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 3 May 2011 10:30:22 +0200
Subject: [PATCH 210/314] Bug 651975 - Replace mmap with file reading in pyxpt.
 r=ted

---
 xpcom/typelib/xpt/tools/xpt.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xpcom/typelib/xpt/tools/xpt.py b/xpcom/typelib/xpt/tools/xpt.py
index 0de9451a0623..cea8ab1274a0 100644
--- a/xpcom/typelib/xpt/tools/xpt.py
+++ b/xpcom/typelib/xpt/tools/xpt.py
@@ -66,7 +66,6 @@ InterfaceType()        - construct a new object representing a type that
 """
 
 from __future__ import with_statement
-import mmap
 import os, sys
 import struct
 
@@ -1051,7 +1050,7 @@ class Typelib(object):
         """
         with open(filename, "r+b") as f:
             st = os.fstat(f.fileno())
-            map = mmap.mmap(f.fileno(), st.st_size)
+            map = f.read(st.st_size)
             data = Typelib._header.unpack(map[:Typelib._header.size])
             if data[0] != XPT_MAGIC:
                 raise FileFormatError, "Bad magic: %s" % data[0]
@@ -1090,7 +1089,6 @@ class Typelib(object):
                 xpt.interfaces.append(iface)
             for iface in xpt.interfaces:
                 iface.read_descriptor(xpt, map, data_pool_offset)
-            map.close()
         return xpt
     
     def __repr__(self):

From 08bf24c935cfece8850ecd1571940bb21494ddee Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 3 May 2011 10:33:30 +0200
Subject: [PATCH 211/314] Bug 654082 - Add C++0x support to the libstdc++
 compatibility hack. r=tglek

---
 build/stdc++compat.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/stdc++compat.cpp b/build/stdc++compat.cpp
index 0de5ed30ce9a..ae6e83d9776a 100644
--- a/build/stdc++compat.cpp
+++ b/build/stdc++compat.cpp
@@ -54,10 +54,19 @@ namespace std {
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)
     /* Instantiate these templates to avoid GLIBCXX_3.4.14 symbol versions
      * in debug builds */
-    template char *basic_string<char, char_traits<char>, allocator<char> >::_S_construct_aux_2(size_type, char, allocator<char> const&);
-    template wchar_t *basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >::_S_construct_aux_2(size_type, wchar_t, allocator<wchar_t> const&);
-#endif
-#endif
+    template char *string::_S_construct_aux_2(size_type, char, allocator<char> const&);
+#ifdef _GLIBCXX_USE_WCHAR_T
+    template wchar_t *wstring::_S_construct_aux_2(size_type, wchar_t, allocator<wchar_t> const&);
+#endif /* _GLIBCXX_USE_WCHAR_T */
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+    template string::basic_string(string&&);
+    template string& string::operator=(string&&);
+    template wstring::basic_string(wstring&&);
+    template wstring& wstring::operator=(wstring&&);
+    template wstring& wstring::assign(wstring&&);
+#endif /* __GXX_EXPERIMENTAL_CXX0X__ */
+#endif /* (__GNUC__ == 4) && (__GNUC_MINOR__ >= 5) */
+#endif /* DEBUG */
 }
 
 namespace std __attribute__((visibility("default"))) {

From 3f475ae179a57440b3f2909c11fb05a70429f65c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 3 May 2011 10:35:21 +0200
Subject: [PATCH 212/314] Bug 650304 - Use gcc C++0x mode by default, when it
 works as expected. r=bsmedberg

---
 configure.in | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configure.in b/configure.in
index d74b025b6cfe..acfbef4168e1 100644
--- a/configure.in
+++ b/configure.in
@@ -2963,6 +2963,11 @@ fi
 
 AC_LANG_CPLUSPLUS
 
+if test "$GNU_CXX"; then
+    _SAVE_CXXFLAGS=$CXXFLAGS
+    CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+fi
+
 dnl Check for usable char16_t (2 bytes, unsigned)
 dnl (we might not need the unsignedness check anymore)
 AC_CACHE_CHECK(for usable char16_t (2 bytes, unsigned),
@@ -2978,6 +2983,8 @@ AC_CACHE_CHECK(for usable char16_t (2 bytes, unsigned),
 if test "$ac_cv_have_usable_char16_t" = "yes"; then
     AC_DEFINE(HAVE_CPP_CHAR16_T)
     HAVE_CPP_CHAR16_T=1
+else
+    CXXFLAGS="$_SAVE_CXXFLAGS"
 fi
 
 dnl Check for usable wchar_t (2 bytes, unsigned)

From 01db317427d97d0b9d133076f8460ed7d2e78fc6 Mon Sep 17 00:00:00 2001
From: "Zane U. Ji" <ZaneUJi@gmail.com>
Date: Tue, 3 May 2011 14:32:40 +0100
Subject: [PATCH 213/314] Bug 236872 - Changing Auto-Detection Scheme breaks
 the message display output; r=enndeakin

---
 toolkit/content/charsetOverlay.js | 147 ++++++++++++++----------------
 1 file changed, 66 insertions(+), 81 deletions(-)

diff --git a/toolkit/content/charsetOverlay.js b/toolkit/content/charsetOverlay.js
index b9a082317299..ae802a549304 100644
--- a/toolkit/content/charsetOverlay.js
+++ b/toolkit/content/charsetOverlay.js
@@ -1,55 +1,76 @@
-function MultiplexHandler(event)
+function MultiplexHandler(aEvent)
 {
-    var node = event.target;
-    var name = node.getAttribute('name');
-
-    if (name == 'detectorGroup') {
-        SetForcedDetector(true);
-        SelectDetector(event, false);
-    } else if (name == 'charsetGroup') {
-        var charset = node.getAttribute('id');
-        charset = charset.substring('charset.'.length, charset.length)
-        SetForcedCharset(charset);
-    } else if (name == 'charsetCustomize') {
-        //do nothing - please remove this else statement, once the charset prefs moves to the pref window
-    } else {
-        SetForcedCharset(node.getAttribute('id'));
-    }
+    MultiplexHandlerEx(
+        aEvent,
+        function Browser_SelectDetector(event) {
+            BrowserSetForcedDetector(true/*Reload from history*/);
+            /* window.content.location.reload() will re-download everything */
+            SelectDetector(event, null);
+        },
+        function Browser_SetForcedCharset(charset, isPredefined) {
+            BrowserSetForcedCharacterSet(charset);
+        }
+    );
 }
 
-function MailMultiplexHandler(event)
+function MailMultiplexHandler(aEvent)
 {
-    var node = event.target;
-    var name = node.getAttribute('name');
-
-    if (name == 'detectorGroup') {
-        SelectDetector(event, true);
-    } else if (name == 'charsetGroup') {
-        var charset = node.getAttribute('id');
-        charset = charset.substring('charset.'.length, charset.length)
-        MessengerSetForcedCharacterSet(charset);
-    } else if (name == 'charsetCustomize') {
-        //do nothing - please remove this else statement, once the charset prefs moves to the pref window
-    } else {
-        MessengerSetForcedCharacterSet(node.getAttribute('id'));
-    }
+    MultiplexHandlerEx(
+        aEvent,
+        function Mail_SelectDetector(event) {
+            SelectDetector(
+                event,
+                function Mail_Reload() {
+                    messenger.setDocumentCharset(msgWindow.mailCharacterSet);
+                }
+            );
+        },
+        function Mail_SetForcedCharset(charset, isPredefined) {
+            MessengerSetForcedCharacterSet(charset);
+        }
+    );
 }
 
-function ComposerMultiplexHandler(event)
+function ComposerMultiplexHandler(aEvent)
 {
-    var node = event.target;
-    var name = node.getAttribute('name');
+    MultiplexHandlerEx(
+        aEvent,
+        function Composer_SelectDetector(event) {
+            SelectDetector(
+                event,
+                function Composer_Reload() {
+                    EditorLoadUrl(GetDocumentUrl());
+                }
+            );
+        },
+        function Composer_SetForcedCharset(charset, isPredefined) {
+            if ((!isPredefined) && charset.length > 0) {
+                gCharsetMenu.SetCurrentComposerCharset(charset);
+            }
+            EditorSetDocumentCharacterSet(charset);
+        }
+    );
+}
 
-    if (name == 'detectorGroup') {
-        ComposerSelectDetector(event, true);
-    } else if (name == 'charsetGroup') {
-        var charset = node.getAttribute('id');
-        charset = charset.substring('charset.'.length, charset.length)
-        EditorSetDocumentCharacterSet(charset);
-    } else if (name == 'charsetCustomize') {
-        //do nothing - please remove this else statement, once the charset prefs moves to the pref window
-    } else {
-        SetForcedEditorCharset(node.getAttribute('id'));
+function MultiplexHandlerEx(aEvent, aSelectDetector, aSetForcedCharset)
+{
+    try {
+        var node = aEvent.target;
+        var name = node.getAttribute('name');
+
+        if (name == 'detectorGroup') {
+            aSelectDetector(aEvent);
+        } else if (name == 'charsetGroup') {
+            var charset = node.getAttribute('id');
+            charset = charset.substring('charset.'.length, charset.length)
+            aSetForcedCharset(charset, true);
+        } else if (name == 'charsetCustomize') {
+            //do nothing - please remove this else statement, once the charset prefs moves to the pref window
+        } else {
+            aSetForcedCharset(node.getAttribute('id'), false);
+        }
+    } catch(ex) {
+        alert(ex);
     }
 }
 
@@ -72,49 +93,13 @@ function SelectDetector(event, doReload)
         str.data = prefvalue;
         pref.setComplexValue("intl.charset.detector",
                              Components.interfaces.nsISupportsString, str);
-        if (doReload) window.content.location.reload();
+        if (typeof doReload == "function") doReload();
     }
     catch (ex) {
         dump("Failed to set the intl.charset.detector preference.\n");
     }
 }
 
-function ComposerSelectDetector(event)
-{
-    //dump("Charset Detector menu item pressed: " + event.target.getAttribute('id') + "\n");
-
-    var uri =  event.target.getAttribute("id");
-    var prefvalue = uri.substring('chardet.'.length, uri.length);
-    if ("off" == prefvalue) { // "off" is special value to turn off the detectors
-        prefvalue = "";
-    }
-
-    try {
-        var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                             .getService(Components.interfaces.nsIPrefBranch);
-        var str =  Components.classes["@mozilla.org/supports-string;1"]
-                             .createInstance(Components.interfaces.nsISupportsString);
-
-        str.data = prefvalue;
-        pref.setComplexValue("intl.charset.detector",
-                             Components.interfaces.nsISupportsString, str);
-        EditorLoadUrl(GetDocumentUrl());    
-    }
-    catch (ex) {
-        dump("Failed to set the intl.charset.detector preference.\n");
-    }
-}
-
-function SetForcedDetector(doReload)
-{
-    BrowserSetForcedDetector(doReload);
-}
-
-function SetForcedCharset(charset)
-{
-    BrowserSetForcedCharacterSet(charset);
-}
-
 var gPrevCharset = null;
 function UpdateCurrentCharset()
 {

From 4c8c9bf766f931b5eaae70048c4490d930d38ffd Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 3 May 2011 10:35:20 -0400
Subject: [PATCH 214/314] bug 654312 - include urls of remote pages in content
 crash reports r=mfinkle

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

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 8171f8e2414a..56e1aa81a1ca 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2416,10 +2416,11 @@ var ContentCrashObserver = {
 
     // Spin through the open tabs and resurrect the out-of-process tabs. Resurrection
     // does not auto-reload the content. We delay load the content as needed.
+    let URLs = []
     Browser.tabs.forEach(function(aTab) {
       if (aTab.browser.getAttribute("remote") == "true")
-        aTab.resurrect();
-    })
+        URLs.push(aTab.resurrect().data.entries[0].url);
+    });
 
     let dumpID = aSubject.hasKey("dumpID") ? aSubject.getProperty("dumpID") : null;
 
@@ -2463,8 +2464,24 @@ var ContentCrashObserver = {
       }
 
       // Submit the report, if we have one and the user wants to submit it
-      if (submit.value && dumpID)
+      if (submit.value && dumpID) {
+        let directoryService = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
+        let extra = directoryService.get("UAppData", Ci.nsIFile);
+        extra.append("Crash Reports");
+        extra.append("pending");
+        extra.append(dumpID + ".extra");
+        let foStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
+        try {
+          // use 0x02 | 0x10 to open file for appending.
+          foStream.init(extra, 0x02 |  0x10, 0666, 0); 
+          let data = "URL=" + URLs.join(" ") + "\n";
+          foStream.write(data, data.length);
+          foStream.close();
+        } catch (x) {
+          dump (x);
+        }
         self.CrashSubmit.submit(dumpID, Elements.stack, null, null);
+      }
     }, 0, this);
   }
 };
@@ -2741,6 +2758,8 @@ Tab.prototype = {
     browser.__SS_data = session.data;
     browser.__SS_extdata = session.extra;
     browser.__SS_restore = true;
+
+    return session;
   },
 
   _createBrowser: function _createBrowser(aURI, aInsertBefore) {

From a68b012a57cfd1cb4cfe86326a5cbe0aaafe5d43 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 3 May 2011 11:55:42 -0400
Subject: [PATCH 215/314] bug 654444 - Only include URL of active tab in
 content crash reports r=mfinkle

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

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 56e1aa81a1ca..b82a8fcbbbf3 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -2416,13 +2416,13 @@ var ContentCrashObserver = {
 
     // Spin through the open tabs and resurrect the out-of-process tabs. Resurrection
     // does not auto-reload the content. We delay load the content as needed.
-    let URLs = []
     Browser.tabs.forEach(function(aTab) {
       if (aTab.browser.getAttribute("remote") == "true")
-        URLs.push(aTab.resurrect().data.entries[0].url);
+        aTab.resurrect();
     });
 
     let dumpID = aSubject.hasKey("dumpID") ? aSubject.getProperty("dumpID") : null;
+    let crashedURL = Browser.selectedTab.browser.__SS_data.entries[0].url;
 
     // Execute the UI prompt after the notification has had a chance to return and close the child process
     setTimeout(function(self) {
@@ -2474,7 +2474,7 @@ var ContentCrashObserver = {
         try {
           // use 0x02 | 0x10 to open file for appending.
           foStream.init(extra, 0x02 |  0x10, 0666, 0); 
-          let data = "URL=" + URLs.join(" ") + "\n";
+          let data = "URL=" + crashedURL + "\n";
           foStream.write(data, data.length);
           foStream.close();
         } catch (x) {
@@ -2758,8 +2758,6 @@ Tab.prototype = {
     browser.__SS_data = session.data;
     browser.__SS_extdata = session.extra;
     browser.__SS_restore = true;
-
-    return session;
   },
 
   _createBrowser: function _createBrowser(aURI, aInsertBefore) {

From f19fd0912b6069db75a72af2468879135c76baed Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Tue, 3 May 2011 10:12:02 -0700
Subject: [PATCH 216/314] Bug 654122 - window.scrollTo on pageload does not
 always hide Fennec urlbar [r=stechz]

---
 mobile/chrome/content/browser.js        |  9 ++++-----
 mobile/chrome/tests/browser_scroll.html | 16 ++++++++++++++++
 mobile/chrome/tests/browser_scroll.js   | 19 +++++++++++++++++++
 mobile/chrome/tests/head.js             |  8 ++++++++
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 mobile/chrome/tests/browser_scroll.html
 create mode 100644 mobile/chrome/tests/browser_scroll.js

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index b82a8fcbbbf3..272f4ff04aa5 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1174,12 +1174,10 @@ var Browser = {
 
       case "scroll":
         if (browser == this.selectedBrowser) {
-          let view = browser.getRootView();
-          let position = view.getPosition();
-          if (position.x != 0)
+          if (json.x != 0)
             this.hideSidebars();
 
-          if (position.y != 0)
+          if (json.y != 0)
             this.hideTitlebar();
         }
         break;
@@ -1532,7 +1530,8 @@ Browser.WebProgress.prototype = {
         let json = aMessage.json;
         browser.getRootView().scrollTo(Math.floor(json.x * browser.scale),
                                        Math.floor(json.y * browser.scale));
-        Browser.pageScrollboxScroller.scrollTo(0, 0);
+        if (json.x == 0 && json.y == 0)
+          Browser.pageScrollboxScroller.scrollTo(0, 0);
       }
 
       aTab.scrolledAreaChanged();
diff --git a/mobile/chrome/tests/browser_scroll.html b/mobile/chrome/tests/browser_scroll.html
new file mode 100644
index 000000000000..e0f816a9617c
--- /dev/null
+++ b/mobile/chrome/tests/browser_scroll.html
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>scrollTo test</title>
+  <meta name="viewport" content="width=device-width">
+  <script>
+    function run() {
+      window.scrollTo(0,1);
+    }
+  </script>
+</head>
+<body onload="run()" style="height:2000px">
+  <h1>scrollTo test</h1>
+  <p>The urlbar should scroll out of view after this page loads.</p>
+</body>
+</html>
diff --git a/mobile/chrome/tests/browser_scroll.js b/mobile/chrome/tests/browser_scroll.js
new file mode 100644
index 000000000000..08b03525e387
--- /dev/null
+++ b/mobile/chrome/tests/browser_scroll.js
@@ -0,0 +1,19 @@
+// Test behavior of window.scrollTo during page load (bug 654122).
+"use strict";
+
+var gTab;
+registerCleanupFunction(function() Browser.closeTab(gTab));
+
+const BASE_URL = "http://mochi.test:8888/browser/mobile/chrome/";
+const TEST_URL = BASE_URL + "browser_scroll.html";
+
+function test() {
+  waitForExplicitFinish();
+  gTab = Browser.addTab(TEST_URL, true);
+  onMessageOnce(gTab.browser.messageManager, "Browser:FirstPaint", function() {
+    executeSoon(function() {
+      let rect = Elements.browsers.getBoundingClientRect();
+      is(rect.top, 0, "Titlebar is hidden.");
+    });
+  });
+}
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index ff877e9c369e..85133ce9028e 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -34,6 +34,14 @@ function waitForAndContinue(callback, test, timeout) {
   setTimeout(waitForAndContinue, 50, callback, test, timeout);
 };
 
+// Listen for the specified message once, then remove the listener.
+function onMessageOnce(aMessageManager, aName, aCallback) {
+  aMessageManager.addMessageListener(aName, function onMessage(aMessage) {
+    aMessageManager.removeMessageListener(aName, onMessage);
+    aCallback(aMessage);
+  });
+}
+
 function makeURI(spec) {
   return Services.io.newURI(spec, null, null);
 };

From 733a326bda73e8c4a9d712b7f1dbb994bf6ff472 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Tue, 3 May 2011 10:24:01 -0700
Subject: [PATCH 217/314] Bug 654346: Fix C++-style comments in mfbt headers
 included by .c files, to fix build warnings. r=cjones comment-only=DONTBUILD

---
 mfbt/Types.h | 2 +-
 mfbt/Util.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mfbt/Types.h b/mfbt/Types.h
index 36156a5451df..7551e85f2de6 100644
--- a/mfbt/Types.h
+++ b/mfbt/Types.h
@@ -88,4 +88,4 @@
 #define MOZ_BEGIN_EXTERN_C     JS_BEGIN_EXTERN_C
 #define MOZ_END_EXTERN_C       JS_END_EXTERN_C
 
-#endif  // mozilla_Types_h_
+#endif  /* mozilla_Types_h_ */
diff --git a/mfbt/Util.h b/mfbt/Util.h
index 7317bb774db6..f50cae7f7696 100644
--- a/mfbt/Util.h
+++ b/mfbt/Util.h
@@ -74,7 +74,7 @@ MOZ_END_EXTERN_C
 
 # define MOZ_ASSERT(expr_) ((void)0)
 
-#endif  // DEBUG
+#endif  /* DEBUG */
 
 #ifdef __cplusplus
 

From 380315c85365f8dc14608551748a9bf641cddade Mon Sep 17 00:00:00 2001
From: Anas Husseini <linux.anas@gmail.com>
Date: Tue, 3 May 2011 20:21:20 +0200
Subject: [PATCH 218/314] Bug 653370 - [RTL] Fix computeSidebarVisibility() so
 that it doesn't confuse tabs panel with controls panel [r=vingtetun]
 DONTBUILD (mobile only)

---
 mobile/chrome/content/browser.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 272f4ff04aa5..296975c1e0cd 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -923,8 +923,6 @@ var Browser = {
     if (!dy) dy = 0;
 
     let [leftSidebar, rightSidebar] = [Elements.tabs.getBoundingClientRect(), Elements.controls.getBoundingClientRect()];
-    if (leftSidebar.left > rightSidebar.left)
-      [rightSidebar, leftSidebar] = [leftSidebar, rightSidebar]; // switch in RTL case
 
     let visibleRect = new Rect(0, 0, window.innerWidth, 1);
     let leftRect = new Rect(Math.round(leftSidebar.left) - Math.round(dx), 0, Math.round(leftSidebar.width), 1);
@@ -959,18 +957,23 @@ var Browser = {
 
     let snappedX = 0;
 
+    // determine browser dir first to know which direction to snap to
+    let chromeReg = Cc["@mozilla.org/chrome/chrome-registry;1"].
+                      getService(Ci.nsIXULChromeRegistry);
+    let dirVal = chromeReg.isLocaleRTL("global") ? -1 : 1;
+
     if (leftvis != 0 && leftvis != 1) {
       if (leftvis >= 0.6666) {
-        snappedX = -((1 - leftvis) * leftw);
+        snappedX = -((1 - leftvis) * leftw) * dirVal;
       } else {
-        snappedX = leftvis * leftw;
+        snappedX = leftvis * leftw * dirVal;
       }
     }
     else if (ritevis != 0 && ritevis != 1) {
       if (ritevis >= 0.6666) {
-        snappedX = (1 - ritevis) * ritew;
+        snappedX = (1 - ritevis) * ritew * dirVal;
       } else {
-        snappedX = -ritevis * ritew;
+        snappedX = -ritevis * ritew * dirVal;
       }
     }
 

From ae903a9fb3a928eeaae8de9de9758ffb9273b1b5 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 3 May 2011 20:22:05 +0200
Subject: [PATCH 219/314] Bug 650817 - Search engines list misinterprets tap
 and pan [r=mfinkle] DONTBUILD (mobile only)

---
 mobile/chrome/content/common-ui.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index c88846ed9489..1e9dfc29337c 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -41,8 +41,14 @@ const kBrowserFormZoomLevelMax = 2.0;
 
 var BrowserSearch = {
   get _popup() {
+    let popup = document.getElementById("search-engines-popup");
+    popup.addEventListener("TapSingle", function(aEvent) {
+      popup.hidden = true;
+      BrowserUI.doOpenSearch(aEvent.target.getAttribute("label"));
+    }, false);
+
     delete this._popup;
-    return this._popup = document.getElementById("search-engines-popup");
+    return this._popup = popup;
   },
 
   get _list() {
@@ -75,10 +81,6 @@ var BrowserSearch = {
       button.setAttribute("crop", "end");
       button.setAttribute("pack", "start");
       button.setAttribute("image", aEngine.iconURI ? aEngine.iconURI.spec : null);
-      button.onclick = function() {
-        popup.hidden = true;
-        BrowserUI.doOpenSearch(aEngine.name);
-      }
       list.appendChild(button);
     });
 

From fe08e462c539f49d47a51ee36a27a78a4d7d17a4 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Tue, 3 May 2011 20:23:00 +0200
Subject: [PATCH 220/314] Bug 650820 - Adding a search engine without an icon
 thrown an error [r=mfinkle] DONTBUILD (mobile only)

---
 mobile/chrome/content/common-ui.js     | 2 +-
 mobile/components/AutoCompleteCache.js | 3 ++-
 mobile/themes/core/browser.css         | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/chrome/content/common-ui.js b/mobile/chrome/content/common-ui.js
index 1e9dfc29337c..e470e8742309 100644
--- a/mobile/chrome/content/common-ui.js
+++ b/mobile/chrome/content/common-ui.js
@@ -80,7 +80,7 @@ var BrowserSearch = {
       button.setAttribute("label", aEngine.name);
       button.setAttribute("crop", "end");
       button.setAttribute("pack", "start");
-      button.setAttribute("image", aEngine.iconURI ? aEngine.iconURI.spec : null);
+      button.setAttribute("image", aEngine.iconURI ? aEngine.iconURI.spec : "");
       list.appendChild(button);
     });
 
diff --git a/mobile/components/AutoCompleteCache.js b/mobile/components/AutoCompleteCache.js
index e71a782a1557..0c176d29326a 100644
--- a/mobile/components/AutoCompleteCache.js
+++ b/mobile/components/AutoCompleteCache.js
@@ -323,7 +323,8 @@ AutoCompleteCache.prototype = {
         for (let i = 0; i < this.searchEngines.length; i++) {
           let engine = this.searchEngines[i];
           let url = engine.getSubmission(aResult.searchString).uri.spec;
-          aResult.appendMatch(url, engine.name, engine.iconURI.spec, "search");
+          let iconURI = engine.iconURI;
+          aResult.appendMatch(url, engine.name, iconURI ? iconURI.spec : "", "search");
         }
         aResult.setSearchResult(Ci.nsIAutoCompleteResult.RESULT_SUCCESS);
       }
diff --git a/mobile/themes/core/browser.css b/mobile/themes/core/browser.css
index 4f5bce67c509..5da7204fa86a 100644
--- a/mobile/themes/core/browser.css
+++ b/mobile/themes/core/browser.css
@@ -1183,6 +1183,10 @@ pageaction:not([image]) > hbox >.pageaction-image {
   height: 32px;
 }
 
+#search-engines-list > .action-button[image=""] > .button-box > .button-icon {
+  list-style-image: url("chrome://browser/skin/images/favicon-default-32.png");
+}
+
 /* Preferences window   ---------------------------------------------------- */
 .setting {
   padding-left: @padding_xnormal@;

From 8f6979cc61c83ac7e7a86ee167000b7f15c680ee Mon Sep 17 00:00:00 2001
From: Tim Taubert <tim.taubert@gmx.de>
Date: Tue, 3 May 2011 20:30:08 +0200
Subject: [PATCH 221/314] Bug 595020 - Group name isn't displayed in title
 before TabView is loaded the first time; r=dao

---
 browser/base/content/browser-tabview.js       | 28 ++++++--
 browser/base/content/tabview/storage.js       |  9 +++
 browser/base/content/tabview/ui.js            |  1 +
 browser/base/content/test/tabview/Makefile.in |  1 +
 .../test/tabview/browser_tabview_bug595020.js | 66 +++++++++++++++++++
 5 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 browser/base/content/test/tabview/browser_tabview_bug595020.js

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 3020c7a58385..1a2c1b895c9d 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -44,7 +44,9 @@ let TabView = {
   _browserKeyHandlerInitialized: false,
   _isFrameLoading: false,
   _initFrameCallbacks: [],
+  _lastSessionGroupName: null,
   VISIBILITY_IDENTIFIER: "tabview-visibility",
+  LAST_SESSION_GROUP_NAME_IDENTIFIER: "tabview-last-session-group-name",
 
   // ----------
   get windowTitle() {
@@ -98,6 +100,10 @@ let TabView = {
         };
         gBrowser.tabContainer.addEventListener(
           "TabShow", this._tabShowEventListener, true);
+
+       // grab the last used group title
+       this._lastSessionGroupName = sessionstore.getWindowValue(window,
+         this.LAST_SESSION_GROUP_NAME_IDENTIFIER);
       }
     }
   },
@@ -216,18 +222,28 @@ let TabView = {
   },
   
   getActiveGroupName: function TabView_getActiveGroupName() {
+    if (!this._window)
+      return this._lastSessionGroupName;
+
     // We get the active group this way, instead of querying
     // GroupItems.getActiveGroupItem() because the tabSelect event
     // will not have happened by the time the browser tries to
     // update the title.
+    let groupItem = null;
     let activeTab = window.gBrowser.selectedTab;
-    if (activeTab._tabViewTabItem && activeTab._tabViewTabItem.parent){
-      let groupName = activeTab._tabViewTabItem.parent.getTitle();
-      if (groupName)
-        return groupName;
+    let activeTabItem = activeTab._tabViewTabItem;
+
+    if (activeTab.pinned) {
+      // It's an app tab, so it won't have a .tabItem. However, its .parent
+      // will already be set as the active group. 
+      groupItem = this._window.GroupItems.getActiveGroupItem();
+    } else if (activeTabItem) {
+      groupItem = activeTabItem.parent;
     }
-    return null;
-  },  
+
+    // groupItem may still be null, if the active tab is an orphan.
+    return groupItem ? groupItem.getTitle() : "";
+  },
 
   // ----------
   updateContextMenu: function(tab, popup) {
diff --git a/browser/base/content/tabview/storage.js b/browser/base/content/tabview/storage.js
index 3a18dda10aea..65d4aa857d59 100644
--- a/browser/base/content/tabview/storage.js
+++ b/browser/base/content/tabview/storage.js
@@ -381,6 +381,15 @@ let Storage = {
       win, win.TabView.VISIBILITY_IDENTIFIER, data);
   },
 
+  // ----------
+  // Function: saveActiveGroupName
+  // Saves the active group's name for the given window.
+  saveActiveGroupName: function Storage_saveActiveGroupName(win) {
+    let groupName = win.TabView.getActiveGroupName();
+    this._sessionStore.setWindowValue(
+      win, win.TabView.LAST_SESSION_GROUP_NAME_IDENTIFIER, groupName);
+  },
+
   // ----------
   // Function: saveData
   // Generic routine for saving data to a window.
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 6ebc8add0438..2963f88c9880 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -258,6 +258,7 @@ let UI = {
       function domWinClosedObserver(subject, topic, data) {
         if (topic == "domwindowclosed" && subject == gWindow) {
           self.isDOMWindowClosing = true;
+          Storage.saveActiveGroupName(gWindow);
           if (self.isTabViewVisible())
             GroupItems.removeHiddenGroups();
           TabItems.saveAll(true);
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 29ffd7f45d6e..d80ddb817ca0 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -59,6 +59,7 @@ _BROWSER_FILES = \
                  browser_tabview_bug590606.js \
                  browser_tabview_bug591706.js \
                  browser_tabview_bug594958.js \
+                 browser_tabview_bug595020.js \
                  browser_tabview_bug595191.js \
                  browser_tabview_bug595436.js \
                  browser_tabview_bug595518.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595020.js b/browser/base/content/test/tabview/browser_tabview_bug595020.js
new file mode 100644
index 000000000000..d6c2a40ced2a
--- /dev/null
+++ b/browser/base/content/test/tabview/browser_tabview_bug595020.js
@@ -0,0 +1,66 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
+
+let stateStartup = {windows:[
+  {tabs:[{entries:[{url:"about:home"}]}], extData:{"tabview-last-session-group-name":"title"}}
+]};
+
+function test() {
+  let assertWindowTitle = function (win, title) {
+    let browser = win.gBrowser.tabs[0].linkedBrowser;
+    let winTitle = win.gBrowser.getWindowTitleForBrowser(browser);
+    is(winTitle.indexOf(title), 0, "title starts with '" + title + "'");
+  };
+
+  let testGroupNameChange = function (win) {
+    showTabView(function () {
+      let cw = win.TabView.getContentWindow();
+      let groupItem = cw.GroupItems.groupItems[0];
+      groupItem.setTitle("new-title");
+
+      hideTabView(function () {
+        assertWindowTitle(win, "new-title");
+        waitForFocus(finish);
+      }, win);
+    }, win);
+  };
+
+  waitForExplicitFinish();
+
+  newWindowWithState(stateStartup, function (win) {
+    registerCleanupFunction(function () win.close());
+    assertWindowTitle(win, "title");
+    testGroupNameChange(win);
+  });
+}
+
+function newWindowWithState(state, callback) {
+  let opts = "chrome,all,dialog=no,height=800,width=800";
+  let win = window.openDialog(getBrowserURL(), "_blank", opts);
+
+  whenWindowLoaded(win, function () {
+    ss.setWindowState(win, JSON.stringify(state), true);
+  });
+
+  whenWindowStateReady(win, function () {
+    win.close();
+    win = ss.undoCloseWindow(0);
+    whenWindowLoaded(win, function () callback(win));
+  });
+}
+
+function whenWindowLoaded(win, callback) {
+  win.addEventListener("load", function onLoad() {
+    win.removeEventListener("load", onLoad, false);
+    executeSoon(callback);
+  }, false);
+}
+
+function whenWindowStateReady(win, callback) {
+  win.addEventListener("SSWindowStateReady", function onReady() {
+    win.removeEventListener("SSWindowStateReady", onReady, false);
+    executeSoon(callback);
+  }, false);
+}

From 77a4558c1618256eaa4d380f7ab14358882b5e09 Mon Sep 17 00:00:00 2001
From: Wes Johnston <wjohnston@mozilla.com>
Date: Tue, 3 May 2011 11:34:55 -0700
Subject: [PATCH 222/314] Bug 605965 - Fix test and add check for addons before
 adding them. r=mfinkle

---
 mobile/chrome/content/extensions.js   | 16 ++----
 mobile/chrome/tests/browser_addons.js | 76 ++++++++++++---------------
 2 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/mobile/chrome/content/extensions.js b/mobile/chrome/content/extensions.js
index b7f2e6de0ee9..b800cdb60c16 100644
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -59,11 +59,6 @@ XPCOMUtils.defineLazyGetter(this, "AddonRepository", function() {
   return AddonRepository;
 });
 
-XPCOMUtils.defineLazyGetter(this, "AddonLogger", function() {
-  Cu.import("resource://gre/modules/AddonLogging.jsm");
-  return LogManager.getLogger("FennecExtensions");
-});
-
 var ExtensionsView = {
   _strings: {},
   _list: null,
@@ -329,7 +324,9 @@ var ExtensionsView = {
       let strings = Strings.browser;
       let anyUpdateable = false;
       for (let i = 0; i < items.length; i++) {
-        let listitem = self._createLocalAddon(items[i]);
+        let listitem = self.getElementForAddon(items[i].id)
+        if (!listitem)
+          listitem = self._createLocalAddon(items[i]);
         if ((items[i].permissions & AddonManager.PERM_CAN_UPGRADE) > 0)
           anyUpdateable = true;
 
@@ -374,7 +371,6 @@ var ExtensionsView = {
   },
 
   addItem : function ev_addItem(aItem, aPosition) {
-    AddonLogger.log("Adding item: " + aItem.id);
     if (aPosition == "repo")
       return this._list.appendChild(aItem);
     else if (aPosition == "local")
@@ -453,7 +449,6 @@ var ExtensionsView = {
   uninstall: function ev_uninstall(aItem) {
     let opType;
     if (aItem.getAttribute("type") == "search") {
-      AddonLogger.log("Removing search engine.");
       // Make sure the engine isn't hidden before removing it, to make sure it's
       // visible if the user later re-adds it (works around bug 341833)
       aItem._engine.hidden = false;
@@ -461,10 +456,7 @@ var ExtensionsView = {
       // the search-engine-modified observer in browser.js will take care of
       // updating the list
     } else {
-      AddonLogger.log("Removing extension.");
-
       if (!aItem.addon) {
-        AddonLogger.log("No addon object, early return.");
         this._list.removeChild(aItem);
         return;
       }
@@ -473,7 +465,6 @@ var ExtensionsView = {
       opType = this._getOpTypeForOperations(aItem.addon.pendingOperations);
 
       if (aItem.addon.pendingOperations & AddonManager.PENDING_UNINSTALL) {
-        AddonLogger.log("Add-on is not restartless. Keeping in list.");
         this.showRestart();
 
         // A disabled addon doesn't need a restart so it has no pending ops and
@@ -483,7 +474,6 @@ var ExtensionsView = {
 
         aItem.setAttribute("opType", opType);
       } else {
-        AddonLogger.log("Add-on is restartless. Removed from list.");
         this._list.removeChild(aItem);
       }
     }
diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 49f1e89a7ff5..8ebd9d9a89ca 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -360,54 +360,48 @@ function testPrompt(aTitle, aMessage, aButtons, aCallback) {
 // Installs an addon via the urlbar.
 function installFromURLBar(aAddon) {
   return function() {
-    loadUrl(gTestURL, function() {
-      loadUrl(aAddon.sourceURL, null, false);
-      let elt = get_addon_element(aAddon.id);
-      ok(!elt, "Addon element is not present before installation");
-      if (elt)
-        info("unexpectedly found element in: " + elt.parentNode.id);
-      checkInstallAlert(true, function() {
-        checkDownloadNotification(function() {
-          checkInstallPopup(aAddon.name, function() {
-            checkInstallNotification(!aAddon.bootstrapped, function() {
-              open_manager(true, function() {
-                isRestartShown(!aAddon.bootstrapped, false, function() {
-                  let elt = get_addon_element(aAddon.id);
-                  info("elt.id is " + aAddon.id);
-                  if (aAddon.bootstrapped) {
-                    checkAddonListing(aAddon, elt, "local");
-                    var button = document.getAnonymousElementByAttribute(elt, "anonid", "uninstall-button");
-                    ok(!!button, "Extension has uninstall button");
+    AddonManager.addInstallListener({
+      onInstallEnded: function (install) {
+        AddonManager.removeInstallListener(this);
+        checkInstallNotification(!aAddon.bootstrapped, function() {
+          open_manager(true, function() {
+            isRestartShown(!aAddon.bootstrapped, false, function() {
+              let elt = get_addon_element(aAddon.id);
+              if (aAddon.bootstrapped) {
+                checkAddonListing(aAddon, elt, "local");
+                var button = document.getAnonymousElementByAttribute(elt, "anonid", "uninstall-button");
+                ok(!!button, "Extension has uninstall button");
 
-                    var updateButton = document.getElementById("addons-update-all");
-                    is(updateButton.disabled, false, "Update button is enabled");
+                var updateButton = document.getElementById("addons-update-all");
+                is(updateButton.disabled, false, "Update button is enabled");
 
-                    ExtensionsView.uninstall(elt);
-                    waitForAndContinue(function() {
-                      let elt = get_addon_element(aAddon.id);
-                      ok(!elt, "Addon element removed during uninstall");
-                      Browser.closeTab(gCurrentTab);
-                      close_manager(run_next_test);
-                    }, function() {
-                      let elt = get_addon_element(aAddon.id);
-                      info("Looking for element with id " + aAddon.id + ": " + elt);
-                      return !elt;
-                    });
-                  } else {
-                    ok(!elt, "Extension not in list");
-                    AddonManager.getAllInstalls(function(aInstalls) {
-                      for(var i = 0; i < aInstalls.length; i++) {
-                        aInstalls[i].cancel();
-                      }
-                      Browser.closeTab(gCurrentTab);
-                      close_manager(run_next_test);
-                    });
+                ExtensionsView.uninstall(elt);
+
+                elt = get_addon_element(aAddon.id);
+                ok(!elt, "Addon element removed during uninstall");
+                Browser.closeTab(gCurrentTab);
+                close_manager(run_next_test);
+              } else {
+                ok(!elt, "Extension not in list");
+                AddonManager.getAllInstalls(function(aInstalls) {
+                  for(var i = 0; i < aInstalls.length; i++) {
+                    aInstalls[i].cancel();
                   }
+                  Browser.closeTab(gCurrentTab);
+                  close_manager(run_next_test);
                 });
-              });
+              }
             });
           });
         });
+      }
+    });
+    loadUrl(gTestURL, function() {
+      loadUrl(aAddon.sourceURL, null, false);
+      checkInstallAlert(true, function() {
+        checkDownloadNotification(function() {
+          checkInstallPopup(aAddon.name, function() { });
+        });
       });
     }, true);
   };

From 55d55e48ae5d4baf1ee4a7bf707125a2df2a1ac1 Mon Sep 17 00:00:00 2001
From: Jono S Xia <jdicarlo@mozilla.com>
Date: Tue, 3 May 2011 12:41:28 -0700
Subject: [PATCH 223/314] Bug 603009: Catch and report all exceptions thrown
 during test pilot study execution. r=dtownsend Bug 646122: Holding on to
 Exception objects causes crash in garbage collector. r=dtownsend Bug 645092:
 Stop using [deprecated] Storage methods (testpilot). r=mfinkle DONTBUILD as
 it is NPOTB on m-c

---
 .../content/debug.html                        | 18 +++-
 .../modules/experiment_data_store.js          | 95 ++++++++++++++-----
 .../modules/remote-experiment-loader.js       | 13 +++
 .../modules/tasks.js                          | 64 ++++++++++---
 4 files changed, 152 insertions(+), 38 deletions(-)

diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/debug.html b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/debug.html
index 9257fbd3f92e..96537350da09 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/debug.html
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/debug.html
@@ -20,7 +20,20 @@
 
   function reloadAllExperiments() {
     Components.utils.import("resource://testpilot/modules/setup.js");
-    TestPilotSetup.reloadRemoteExperiments();
+    TestPilotSetup.reloadRemoteExperiments(function(success) {
+      let errors = TestPilotSetup._remoteExperimentLoader.getLoadErrors();
+      let str;
+      if (errors.length > 0) {
+        str = "<ul>";
+        for each (let errStr in errors) {
+          str += "<li>" + errStr + "</li>";          
+        }
+        str += "</ul>";
+      } else {
+        str = "All experiments reloaded, no errors.";
+      }
+      document.getElementById("debug").innerHTML = str;
+    });
   }
 
   function runUnitTests() {
@@ -81,8 +94,7 @@
     var path = codeStore.resolveModule(null, filename);
     var textArea = document.getElementById("experiment-code-area");
     codeStore.setLocalOverride(path, textArea.value);
-    reloadAllExperiments(function(success) {
-      document.getElementById("debug").innerHTML = "Success? " + success;});
+    reloadAllExperiments();
   }
 
   function showMetaData() {
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/experiment_data_store.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/experiment_data_store.js
index 02e92ad0c56f..06e84221f44d 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/experiment_data_store.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/experiment_data_store.js
@@ -54,6 +54,8 @@ const TYPE_INT_32 = 0;
 const TYPE_DOUBLE = 1;
 const TYPE_STRING = 2;
 
+const EXCEPTION_TABLE_NAME = "exceptions";
+
 function ExperimentDataStore(fileName, tableName, columns) {
   this._init(fileName, tableName, columns);
 }
@@ -87,9 +89,17 @@ ExperimentDataStore.prototype = {
                   + schemaClauses.join(", ") + ");";
     // CreateTable creates the table only if it does not already exist:
     try {
-      this._connection = DbUtils.createTable(this._connection,
-                                             this._tableName,
-                                             schema);
+      DbUtils.createTable(this._connection, this._tableName, schema);
+    } catch(e) {
+      logger.warn("Error in createTable: " + e + "\n");
+    }
+
+    // Create a second table for storing exceptions for this study.  It has a fixed
+    // name and schema:
+    let exceptionTableSchema = "CREATE TABLE " + EXCEPTION_TABLE_NAME +
+      " (time INTEGER, trace TEXT);";
+    try {
+      DbUtils.createTable(this._connection, "exceptions", exceptionTableSchema);
     } catch(e) {
       logger.warn("Error in createTable: " + e + "\n");
     }
@@ -150,8 +160,21 @@ ExperimentDataStore.prototype = {
     insStmt.finalize();
   },
 
+  logException: function EDS_logException(exception) {
+    let insertSql = "INSERT INTO " + EXCEPTION_TABLE_NAME + " VALUES (?1, ?2);";
+    let insStmt =  this._createStatement(insertSql);
+    // Even though the SQL says ?1 and ?2, the param indices count from 0.
+    insStmt.params[0] = Date.now();
+    let txt = exception.message ? exception.message : exception.toString();
+    insStmt.params[1] = txt;
+    insStmt.executeAsync();
+    insStmt.finalize(); // TODO Is this the right thing to do when calling asynchronously?
+  },
+
   getJSONRows: function EDS_getJSONRows(callback) {
-        let selectSql = "SELECT * FROM " + this._tableName;
+    // TODO why do both this function and getAllDataAsJSON exist when they both do
+    // the same thing?
+    let selectSql = "SELECT * FROM " + this._tableName;
     let selStmt = this._createStatement(selectSql);
     let records = [];
     let self = this;
@@ -255,33 +278,61 @@ ExperimentDataStore.prototype = {
     selStmt.finalize();
   },
 
-  wipeAllData: function EDS_wipeAllData(callback) {
-    let logger = Log4Moz.repository.getLogger("TestPilot.Database");
-    logger.trace("ExperimentDataStore.wipeAllData called.\n");
-    let wipeSql = "DELETE FROM " + this._tableName;
-    let wipeStmt = this._createStatement(wipeSql);
-    wipeStmt.executeAsync({
+  getExceptionsAsJson: function(callback) {
+    let selectSql = "SELECT * FROM " + EXCEPTION_TABLE_NAME;
+    let selStmt = this._createStatement(selectSql);
+    let records = [];
+    let self = this;
+
+    selStmt.executeAsync({
       handleResult: function(aResultSet) {
-      },
-      handleError: function(aError) {
-        if (callback) {
-          callback(false);
+        for (let row = aResultSet.getNextRow(); row;
+             row = aResultSet.getNextRow()) {
+          records.push({ time: row.getDouble(0),
+                         exception: row.getString(1)});
         }
       },
+      handleError: function(aError) {
+        callback(records);
+      },
+      handleCompletion: function(aReason) {
+        callback(records);
+      }
+    });
+  },
+
+  wipeAllData: function EDS_wipeAllData(callback) {
+    // Wipe both the data table and the exception table; call callback when both
+    // are wiped.
+    let logger = Log4Moz.repository.getLogger("TestPilot.Database");
+    logger.trace("ExperimentDataStore.wipeAllData called.\n");
+    let wipeDataStmt = this._createStatement("DELETE FROM " + this._tableName);
+    let wipeExcpStmt = this._createStatement("DELETE FROM " + EXCEPTION_TABLE_NAME);
+
+    let numberWiped = 0;
+    let onComplete = function() {
+      numberWiped ++;
+      if (numberWiped == 2 && callback) {
+        callback();
+      }
+    };
+    wipeDataStmt.executeAsync({
+      handleResult: function(aResultSet) {},
+      handleError: function(aError) { onComplete(); },
       handleCompletion: function(aReason) {
         if (aReason == Ci.mozIStorageStatementCallback.REASON_FINISHED) {
           logger.trace("ExperimentDataStore.wipeAllData complete.\n");
-          if (callback) {
-            callback(true);
-          }
-        } else {
-          if (callback) {
-            callback(false);
-          }
         }
+        onComplete();
       }
     });
-    wipeStmt.finalize();
+    wipeExcpStmt.executeAsync({
+      handleResult: function(aResultSet) {},
+      handleError: function(aError) {  onComplete(); },
+      handleCompletion: function(aReason) { onComplete(); }
+    });
+    wipeDataStmt.finalize();
+    wipeExcpStmt.finalize();
   },
 
   nukeTable: function EDS_nukeTable() {
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/remote-experiment-loader.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/remote-experiment-loader.js
index 2824736e2eab..6a4a086ac1bb 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/remote-experiment-loader.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/remote-experiment-loader.js
@@ -219,6 +219,7 @@ exports.RemoteExperimentLoader.prototype = {
     this._studyResults = [];
     this._legacyStudies = [];
     this._experimentFileNames = [];
+    this._loadErrors = [];
   },
 
   getLocalizedStudyInfo: function(studiesIndex) {
@@ -504,12 +505,20 @@ exports.RemoteExperimentLoader.prototype = {
      * the module name and value = the module object. */
     this._logger.trace("GetExperiments called.");
     let remoteExperiments = {};
+    this._loadErrors = [];
     for each (filename in this._experimentFileNames) {
       this._logger.debug("GetExperiments is loading " + filename);
       try {
         remoteExperiments[filename] = this._loader.require(filename);
         this._logger.info("Loaded " + filename + " OK.");
       } catch(e) {
+      /* Turn the load-time errors into strings and store them, so we can display
+       * them on a debug page or include them with a data upload!  (Don't store
+       * exception objects directly as that causes garbage collector problems-
+       * aka bug 646122) */
+      let errStr = e.name + " on line " + e.lineNumber + " of file " +
+        e.fileName + ": " + e.message;
+        this._loadErrors.push(errStr);
         this._logger.warn("Error loading " + filename);
         this._logger.warn(e);
       }
@@ -523,6 +532,10 @@ exports.RemoteExperimentLoader.prototype = {
 
   getLegacyStudies: function() {
     return this._legacyStudies;
+  },
+
+  getLoadErrors: function() {
+    return this._loadErrors;
   }
 };
 
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
index 04b5735c778d..31db0d2a17e6 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
@@ -487,29 +487,44 @@ TestPilotExperiment.prototype = {
   onNewWindow: function TestPilotExperiment_onNewWindow(window) {
     this._logger.trace("Experiment.onNewWindow called.");
     if (this.experimentIsRunning()) {
-      this._handlers.onNewWindow(window);
+      try {
+        this._handlers.onNewWindow(window);
+      } catch(e) {
+        this._dataStore.logException("onNewWindow: " + e);
+      }
     }
   },
 
   onWindowClosed: function TestPilotExperiment_onWindowClosed(window) {
     this._logger.trace("Experiment.onWindowClosed called.");
     if (this.experimentIsRunning()) {
-      this._handlers.onWindowClosed(window);
+      try {
+        this._handlers.onWindowClosed(window);
+      } catch(e) {
+        this._dataStore.logException("onWindowClosed: " + e);
+      }
     }
   },
 
   onAppStartup: function TestPilotExperiment_onAppStartup() {
     this._logger.trace("Experiment.onAppStartup called.");
     if (this.experimentIsRunning()) {
-      this._handlers.onAppStartup();
+      try {
+        this._handlers.onAppStartup();
+      } catch(e) {
+        this._dataStore.logException("onAppStartup: " + e);
+      }
     }
   },
 
   onAppShutdown: function TestPilotExperiment_onAppShutdown() {
     this._logger.trace("Experiment.onAppShutdown called.");
-    // TODO the caller for this is not yet implemented
     if (this.experimentIsRunning()) {
-      this._handlers.onAppShutdown();
+      try {
+        this._handlers.onAppShutdown();
+      } catch(e) {
+        this._dataStore.logException("onAppShutdown: " + e);
+      }
     }
   },
 
@@ -518,7 +533,11 @@ TestPilotExperiment.prototype = {
     // Make sure not to call this if it's already been called:
     if (this.experimentIsRunning() && !this._startedUpHandlers) {
       this._logger.trace("  ... starting up handlers!");
-      this._handlers.onExperimentStartup(this._dataStore);
+      try {
+        this._handlers.onExperimentStartup(this._dataStore);
+      } catch(e) {
+        this._dataStore.logException("onExperimentStartup: " + e);
+      }
       this._startedUpHandlers = true;
     }
   },
@@ -526,7 +545,11 @@ TestPilotExperiment.prototype = {
   onExperimentShutdown: function TestPilotExperiment_onShutdown() {
     this._logger.trace("Experiment.onExperimentShutdown called.");
     if (this.experimentIsRunning() && this._startedUpHandlers) {
-      this._handlers.onExperimentShutdown();
+      try {
+        this._handlers.onExperimentShutdown();
+      } catch(e) {
+        this._dataStore.logException("onExperimentShutdown: " + e);
+      }
       this._startedUpHandlers = false;
     }
   },
@@ -534,21 +557,33 @@ TestPilotExperiment.prototype = {
   doExperimentCleanup: function TestPilotExperiment_doExperimentCleanup() {
     if (this._handlers.doExperimentCleanup) {
       this._logger.trace("Doing experiment cleanup.");
-      this._handlers.doExperimentCleanup();
+      try {
+        this._handlers.doExperimentCleanup();
+      } catch(e) {
+        this._dataStore.logException("doExperimentCleanup: " + e);
+      }
     }
   },
 
   onEnterPrivateBrowsing: function TestPilotExperiment_onEnterPrivate() {
     this._logger.trace("Task is entering private browsing.");
     if (this.experimentIsRunning()) {
-      this._handlers.onEnterPrivateBrowsing();
+      try {
+        this._handlers.onEnterPrivateBrowsing();
+      } catch(e) {
+        this._dataStore.logException("onEnterPrivateBrowsing: " + e);
+      }
     }
   },
 
   onExitPrivateBrowsing: function TestPilotExperiment_onExitPrivate() {
     this._logger.trace("Task is exiting private browsing.");
     if (this.experimentIsRunning()) {
-      this._handlers.onExitPrivateBrowsing();
+      try {
+        this._handlers.onExitPrivateBrowsing();
+      } catch(e) {
+        this._dataStore.logException("onExitPrivateBrowsing: " + e);
+      }
     }
   },
 
@@ -778,9 +813,12 @@ TestPilotExperiment.prototype = {
         }
       }
       self._dataStore.getJSONRows(function(rows) {
-                                    json.events = rows;
-                                    callback( JSON.stringify(json) );
-                                  });
+        json.events = rows;
+        self._dataStore.getExceptionsAsJson(function(errs) {
+          json.exceptions = errs;
+          callback( JSON.stringify(json) );
+        });
+      });
     });
   },
 

From 5191666ce28d027b676f1274e08f33f24cbf2e31 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Tue, 3 May 2011 12:41:40 -0700
Subject: [PATCH 224/314] Bug 654530: Sync in-tree test pilot with AMO version.
 r=dtownsend DONTBUILD as it is NPOTB on m-c

---
 .../content/all-studies-window.xul            |  4 +--
 .../content/browser.css                       | 11 ++++--
 .../content/browser.js                        |  1 +
 .../content/experiment-page.js                | 12 ++-----
 .../content/screen.css                        | 36 +++++++++----------
 .../content/status.html                       |  4 +--
 .../content/welcome.html                      |  7 ++--
 .../testpilot@labs.mozilla.com/install.rdf    |  2 +-
 .../modules/dbutils.js                        |  4 +--
 .../modules/setup.js                          |  2 +-
 10 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
index abd5f029167a..bdafa635c01b 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/all-studies-window.xul
@@ -75,12 +75,12 @@
 
       <prefpane id="finished-studies-pane" class="tp-tab-panel">
         <richlistbox id="finished-studies-listbox" class="tp-study-list"
-          disabled="true" />
+          disabled="true"/>
       </prefpane>
 
       <prefpane id="study-results-pane" class="tp-tab-panel">
         <richlistbox id="study-results-listbox" class="tp-study-list"
-          disabled="true" />
+          disabled="true"/>
       </prefpane>
 
       <prefpane id="settings-pane" class="tp-tab-panel">
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.css b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.css
index 9cb1ed7ee4e5..f73098c22456 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.css
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.css
@@ -38,11 +38,16 @@
  -moz-border-image: url(chrome://testpilot-os/skin/notification-tail-up.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
 }
 
+/* tail-down uses the old styling; it doesn't look as good as the new styling,
+   but the new styling doesn't work on 3.6.
+   TODO: If someone is using 3.7.* or 4.* but is NOT on the beta channel and
+   installed Test Pilot from AMO, they should get the new styling, similar
+   to .tail-up! */
 .tail-down {
- -moz-border-image: url(chrome://testpilot-os/skin/notification-tail-down.png) 26 56 22 18 / 26px 56px 22px 18px round stretch;
+ -moz-border-image: url(chrome://testpilot/skin/notification-tail-down.png) 26 50 22 18 / 26px 50px 22px 18px repeat;
+ color: white;
 }
 
-
 .pilot-notification-popup-container {
   -moz-appearance: none;
   margin-right: -42px;
@@ -172,7 +177,7 @@ image.study-result {
     color: white;
     font-weight: bold;
     padding: 2px;
-    border-radius: 10000px;
+    -moz-border-radius: 100%;
     margin-right: 25px;
     margin-bottom: 13px;
 }
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.js
index 22498e7f4c35..762dde16695a 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/browser.js
@@ -128,6 +128,7 @@ var TestPilotMenuUtils;
       let menuPopup = document.getElementById("pilot-menu-popup");
       let menuButton = document.getElementById(attachPointId);
 
+      // TODO failing here with "menuPopup is null" for Tracy
       if (menuPopup.parentNode != menuButton)
         menuButton.appendChild(menuPopup);
 
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
index 5400171c40b0..338065fbf37d 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/experiment-page.js
@@ -405,15 +405,9 @@ var stringBundle;
 
   function onStatusPageLoad() {
     setStrings(PAGE_TYPE_STATUS);
-    /* If an experiment ID (eid) is provided in the url params, show status
-     * for that experiment.  If not, show the main menu with status for all
-     * installed experiments. */
-    let eidString = getUrlParam("eid");
-    if (eidString == "") {
-      showStatusMenuPage();
-    } else {
-      loadExperimentPage();
-    }
+    /* An experiment ID (eid) must be provided in the url params. Show status
+     * for that experiment.*/
+    loadExperimentPage();
   }
 
   function setStrings(pageType) {
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/screen.css b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/screen.css
index 52974dba6260..17a8970576bd 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/screen.css
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/screen.css
@@ -102,16 +102,16 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	font-size: 16px;
 	padding: 8px 12px;
 	color: rgba(0, 0, 0, 0.8);
-	border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
 	-webkit-border-radius: 0.5em;
-	box-shadow: 
+	-moz-box-shadow: 
 		inset rgba(0, 0, 0, 0.2) 0 1px 1px,
 		inset rgba(255, 255, 255, 1) 0 3px 1px,
 		inset rgba(255, 255, 255, 0.3) 0 16px 0px,
 		inset rgba(0, 0, 0, 0.2) 0 -1px 1px,
 		inset rgba(0, 0, 0, 0.1) 0 -2px 1px, 
 		rgba(255, 255, 255, 1) 0 1px,
-		rgba(133, 153, 166, 0.3) 0px 1px 8.5px;
+		rgba(133, 153, 166, 0.3) 0px 1px 12px;
 	background-color: #e7eaec;
 	//display: inline;
 }
@@ -122,16 +122,16 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	padding: 8px 12px;
 	width: 240px;
 	color: rgba(0, 0, 0, 0.8);
-	border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
 	-webkit-border-radius: 0.5em;
-	box-shadow: 
+	-moz-box-shadow: 
 		inset rgba(0, 0, 0, 0.2) 0 1px 1px,
 		inset rgba(255, 255, 255, 1) 0 3px 1px,
 		inset rgba(255, 255, 255, 0.3) 0 16px 0px,
 		inset rgba(0, 0, 0, 0.2) 0 -1px 1px,
 		inset rgba(0, 0, 0, 0.1) 0 -2px 1px, 
 		rgba(255, 255, 255, 1) 0 1px,
-		rgba(133, 153, 166, 0.3) 0px 1px 8.5px;
+		rgba(133, 153, 166, 0.3) 0px 1px 12px;
 	background-color: #e7eaec;
 	//display: inline;
 }
@@ -143,13 +143,13 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	padding: 8px 24px;
 	margin: 24px auto;
 	color: rgba(0, 0, 0, 0.8);
-	border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
 	-webkit-border-radius: 0.5em;
 	background: rgba(220, 240, 247, 0.8) url('chrome://testpilot/skin/callout.png') no-repeat top center;
-	box-shadow: 
-		inset rgba(185, 221, 234, 0.2) 0 -10px 8.5px,
+	-moz-box-shadow: 
+		inset rgba(185, 221, 234, 0.2) 0 -10px 12px,
 		inset rgba(185, 221, 234, 1) 0 0px 1px,
-		inset rgba(255, 255, 255, 0.2) 0 10px 8.5px;
+		inset rgba(255, 255, 255, 0.2) 0 10px 12px;
 	//display: inline;
 }
 
@@ -161,13 +161,13 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	padding: 8px 24px;
 	margin: 8px auto;
 	color: rgba(0, 0, 0, 0.8);
-	border-radius: 0.5em;
+	-moz-border-radius: 0.5em;
 	-webkit-border-radius: 0.5em;
 	background: rgba(220, 240, 247, 0.8) url('chrome://testpilot/skin/callout.png') no-repeat top center;
-	box-shadow: 
-		inset rgba(185, 221, 234, 0.2) 0 -10px 8.5px,
+	-moz-box-shadow: 
+		inset rgba(185, 221, 234, 0.2) 0 -10px 12px,
 		inset rgba(185, 221, 234, 1) 0 0px 1px,
-		inset rgba(255, 255, 255, 0.2) 0 10px 8.5px;
+		inset rgba(255, 255, 255, 0.2) 0 10px 12px;
 	//display: inline;
 }
 
@@ -197,7 +197,7 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	padding: 4px 40px;
 	width: 800px;
 	text-align: left;
-	border-radius: 0.25em;
+	-moz-border-radius: 0.25em;
 	-webkit-border-radius: 0.25em;
 	border-top: 1px solid #adb6ba;
 	border-left: 1px solid #adb6ba;
@@ -223,8 +223,8 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 	font-size: 14px;
 	text-shadow: 1px 1px 1px rgba(173, 182, 186, 1);
 	background-color: rgba(173, 182, 186, 0.3);
-	box-shadow: 
-		inset rgba(0, 0, 0, 0.2) 0 -10px 8.5px;
+	-moz-box-shadow: 
+		inset rgba(0, 0, 0, 0.2) 0 -10px 12px;
 	padding: 9px 8px 8px 8px;
 }
 
@@ -255,4 +255,4 @@ src: url('chrome://testpilot/skin/fonts/DroidSans-Bold.ttf') format('truetype');
 
 p.embiggened {
     font-size: 14px;
-}
+}
\ No newline at end of file
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/status.html b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/status.html
index 67a30ead1b7e..25f8203a3659 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/status.html
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/status.html
@@ -28,9 +28,7 @@
           <div class="home_callout">
 	    <img class="homeIcon"
 	      src="chrome://testpilot/skin/images/home_comments.png">
-	    <a id="comments-and-discussions-link"
-	      onclick="
-	        openLink('http://groups.google.com/group/mozilla-labs-testpilot');">
+	    <a id="comments-and-discussions-link" onclick="openLink('http://groups.google.com/group/mozilla-labs-testpilot');">
 	    </a>
 	  </div><br>
           <div class="home_callout">
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/welcome.html b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/welcome.html
index 6e1997aaaee5..ddc5304fb682 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/welcome.html
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/welcome.html
@@ -24,6 +24,11 @@
             <span id="please-take-text"></span>&nbsp;
             <a class="function-link" id="background-survey-text"
               onclick="TestPilotWelcomePage.openPilotSurvey();"></a>!</p>
+           <p class="embiggened">
+            <a class="function-link" id="privacy-policy-link"
+               style="text-decoration: underline"
+               href="http://www.mozilla.com/en-US/privacy-policy.html"></a>
+          </p>
           <p class="embiggened">
             <a class="function-link" id="open-studies-window-link"
               onclick="TestPilotWindowUtils.openAllStudiesWindow();"></a>
@@ -45,8 +50,6 @@
     </div>
     <div id="footer">
       <img class="mozLogo" src="chrome://testpilot/skin/mozilla-logo.png">
-        <a href="http://www.mozilla.com/en-US/privacy-policy.html"
-          id="privacy-policy-link"></a> &nbsp; &nbsp;
         <a href="http://www.mozilla.com/en-US/about/legal.html"
           id="legal-notices-link"></a>
     </div>
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf b/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
index ea8afed6f2e1..c3b9d9a71d97 100755
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/install.rdf
@@ -4,7 +4,7 @@
      xmlns:em="http://www.mozilla.org/2004/em-rdf#">
   <Description about="urn:mozilla:install-manifest">
     <em:id>testpilot@labs.mozilla.com</em:id>
-    <em:version>1.0.9</em:version>
+    <em:version>1.1.1</em:version>
     <em:type>2</em:type>
 
     <!-- Target Application this extension can install into, 
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/dbutils.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/dbutils.js
index 8371a2d2dbc7..9595d8315b1c 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/dbutils.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/dbutils.js
@@ -75,9 +75,9 @@ DbUtils.createTable = function createTable(connection, tableName, schema){
   logger.debug("File is " + file + "\n");
   try{
     if(!connection.tableExists(tableName)){
+      // TODO why don't we use connection.createTable here??
       connection.executeSimpleSQL(schema);
-    }
-    else{
+    } else{
       logger.debug("database table: " + tableName + " already exists\n");
     }
   }
diff --git a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
index bae62681bfda..a22c23bea73b 100644
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
@@ -259,13 +259,13 @@ let TestPilotSetup = {
 
         if (currVersion != self.version) {
           if(!self._isBetaChannel()) {
+            // Don't show first run page in ffx4 beta version.
             self._prefs.setValue(VERSION_PREF, self.version);
             let browser = self._getFrontBrowserWindow().getBrowser();
             let url = self._prefs.getValue(FIRST_RUN_PREF, "");
             let tab = browser.addTab(url);
             browser.selectedTab = tab;
           }
-          // Don't show first run page in ffx4 beta version.
         }
 
         // Install tasks. (This requires knowing the version, so it is

From 24bbe820a91331857ad21d04e480de0155099c86 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 225/314] Bug 639842 - implement glxtest probe running as
 separate process - r=bsmedberg,joe

---
 toolkit/xre/Makefile.in     |   6 +
 toolkit/xre/glxtest.cpp     | 242 ++++++++++++++++++++++++++++++++++++
 toolkit/xre/nsAppRunner.cpp |  16 +++
 3 files changed, 264 insertions(+)
 create mode 100644 toolkit/xre/glxtest.cpp

diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 875e4cacb4ea..7771a7ee048f 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,6 +66,12 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
+ifdef MOZ_X11
+ifndef MOZ_PLATFORM_MAEMO
+CPPSRCS += glxtest.cpp
+endif
+endif
+
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
 CPPSRCS += EventTracer.cpp
 endif
diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
new file mode 100644
index 000000000000..7498d1cc7cc4
--- /dev/null
+++ b/toolkit/xre/glxtest.cpp
@@ -0,0 +1,242 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* ***** 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 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):
+ *
+ * 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 ***** */
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Explanation: See bug 639842. Safely getting GL driver info on X11 is hard, because the only way to do
+// that is to create a GL context and call glGetString(), but with bad drivers,
+// just creating a GL context may crash.
+//
+// This file implements the idea to do that in a separate process.
+//
+// The only non-static function here is fire_glxtest_process(). It creates a pipe, publishes its 'read' end as the
+// mozilla::widget::glxtest_pipe global variable, forks, and runs that GLX probe in the child process,
+// which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
+// to the 'write' end of the pipe.
+
+#include <cstdio>
+#include <cstdlib>
+#include <unistd.h>
+#include <GL/gl.h>
+#include <GL/glx.h>
+#include <dlfcn.h>
+#include "nscore.h"
+
+namespace mozilla {
+namespace widget {
+// the read end of the pipe, which will be used by GfxInfo
+extern int glxtest_pipe;
+// the PID of the glxtest process, to pass to waitpid()
+extern pid_t glxtest_pid;
+}
+}
+
+// the write end of the pipe, which we're going to write to
+static int write_end_of_the_pipe = -1;
+
+// C++ standard collides with C standard in that it doesn't allow casting void* to function pointer types.
+// So the work-around is to convert first to size_t.
+// http://www.trilithium.com/johan/2004/12/problem-with-dlsym/
+template<typename func_ptr_type>
+static func_ptr_type cast(void *ptr)
+{
+  return reinterpret_cast<func_ptr_type>(
+           reinterpret_cast<size_t>(ptr)
+         );
+}
+
+static void fatal_error(const char *str)
+{
+  write(write_end_of_the_pipe, str, strlen(str));
+  write(write_end_of_the_pipe, "\n", 1);
+  exit(EXIT_FAILURE);
+}
+
+static int
+x_error_handler(Display *, XErrorEvent *ev)
+{
+  enum { bufsize = 1024 };
+  char buf[bufsize];
+  int length = snprintf(buf, bufsize,
+                        "X error occurred in GLX probe, error_code=%d, request_code=%d, minor_code=%d\n",
+                        ev->error_code,
+                        ev->request_code,
+                        ev->minor_code);
+  write(write_end_of_the_pipe, buf, length);
+  exit(EXIT_FAILURE);
+  return 0;
+}
+
+static void glxtest()
+{
+  ///// Open libGL and load needed symbols /////
+  void *libgl = dlopen("libGL.so.1", RTLD_LAZY);
+  if (!libgl)
+    fatal_error("Unable to load libGL.so.1");
+
+  typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
+  PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
+
+  typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
+  PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
+
+  typedef XVisualInfo* (* PFNGLXGETVISUALFROMFBCONFIG) (Display *, GLXFBConfig);
+  PFNGLXGETVISUALFROMFBCONFIG glXGetVisualFromFBConfig = cast<PFNGLXGETVISUALFROMFBCONFIG>(dlsym(libgl, "glXGetVisualFromFBConfig"));
+
+  typedef GLXPixmap (* PFNGLXCREATEPIXMAP) (Display *, GLXFBConfig, Pixmap, const int *);
+  PFNGLXCREATEPIXMAP glXCreatePixmap = cast<PFNGLXCREATEPIXMAP>(dlsym(libgl, "glXCreatePixmap"));
+
+  typedef GLXContext (* PFNGLXCREATENEWCONTEXT) (Display *, GLXFBConfig, int, GLXContext, Bool);
+  PFNGLXCREATENEWCONTEXT glXCreateNewContext = cast<PFNGLXCREATENEWCONTEXT>(dlsym(libgl, "glXCreateNewContext"));
+
+  typedef Bool (* PFNGLXMAKECURRENT) (Display*, GLXDrawable, GLXContext);
+  PFNGLXMAKECURRENT glXMakeCurrent = cast<PFNGLXMAKECURRENT>(dlsym(libgl, "glXMakeCurrent"));
+
+  typedef void (* PFNGLXDESTROYPIXMAP) (Display *, GLXPixmap);
+  PFNGLXDESTROYPIXMAP glXDestroyPixmap = cast<PFNGLXDESTROYPIXMAP>(dlsym(libgl, "glXDestroyPixmap"));
+
+  typedef void (* PFNGLXDESTROYCONTEXT) (Display*, GLXContext);
+  PFNGLXDESTROYCONTEXT glXDestroyContext = cast<PFNGLXDESTROYCONTEXT>(dlsym(libgl, "glXDestroyContext"));
+
+  typedef GLubyte* (* PFNGLGETSTRING) (GLenum);
+  PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
+
+  if (!glXQueryExtension ||
+      !glXChooseFBConfig ||
+      !glXGetVisualFromFBConfig ||
+      !glXCreatePixmap ||
+      !glXCreateNewContext ||
+      !glXMakeCurrent ||
+      !glXDestroyPixmap ||
+      !glXDestroyContext ||
+      !glGetString)
+  {
+    fatal_error("Unable to find required symbols in libGL.so.1");
+  }
+  ///// Open a connection to the X server /////
+  Display *dpy = XOpenDisplay(NULL);
+  if (!dpy)
+    fatal_error("Unable to open a connection to the X server");
+  
+  ///// Check that the GLX extension is present /////
+  if (!glXQueryExtension(dpy, NULL, NULL))
+    fatal_error("GLX extension missing");
+
+  XSetErrorHandler(x_error_handler);
+
+  ///// Get a FBConfig and a visual /////
+  int attribs[] = {
+    GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT,
+    GLX_X_RENDERABLE, True,
+    0
+  };
+  int numReturned;
+  GLXFBConfig *fbConfigs = glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &numReturned );
+  XVisualInfo *vInfo = glXGetVisualFromFBConfig(dpy, fbConfigs[0]);
+
+  ///// Get a Pixmap and a GLXPixmap /////
+  Pixmap pixmap = XCreatePixmap(dpy, RootWindow(dpy, vInfo->screen), 4, 4, 32);
+  GLXPixmap glxpixmap = glXCreatePixmap(dpy, fbConfigs[0], pixmap, NULL);
+
+  ///// Get a GL context and make it current //////
+  GLXContext context = glXCreateNewContext(dpy, fbConfigs[0], GLX_RGBA_TYPE, NULL, True);
+  glXMakeCurrent(dpy, glxpixmap, context);
+
+  ///// Get GL vendor/renderer/versions strings /////
+  enum { bufsize = 1024 };
+  char buf[bufsize];
+  const GLubyte *vendorString = glGetString(GL_VENDOR);
+  const GLubyte *rendererString = glGetString(GL_RENDERER);
+  const GLubyte *versionString = glGetString(GL_VERSION);
+  
+  if (!vendorString || !rendererString || !versionString)
+    fatal_error("glGetString returned null");
+
+  int length = snprintf(buf, bufsize,
+                        "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\n",
+                        vendorString,
+                        rendererString,
+                        versionString);
+  if (length >= bufsize)
+    fatal_error("GL strings length too large for buffer size");
+
+  ///// Check that no X error happened /////
+  // In case of X errors, our X error handler will exit() now.
+  // We really want to make sure that the system is able to create a GL context without generating X errors,
+  // as these would crash the application.
+  XSync(dpy, False);
+  
+  ///// Finally write data to the pipe /////
+  write(write_end_of_the_pipe, buf, length);
+
+  ///// Clean up. Indeed, the parent process might fail to kill us (e.g. if it doesn't need to check GL info)
+  ///// so we might be staying alive for longer than expected, so it's important to consume as little memory as
+  ///// possible.
+  glXDestroyContext(dpy, context);
+  glXDestroyPixmap(dpy, glxpixmap);
+  XFreePixmap(dpy, pixmap);
+  XCloseDisplay(dpy);
+  dlclose(libgl);
+}
+
+void fire_glxtest_process()
+{
+  int pfd[2];
+  if (pipe(pfd) == -1) {
+      perror("pipe");
+      exit(EXIT_FAILURE);
+  }
+  pid_t pid = fork();
+  if (pid < 0) {
+      perror("fork");
+      exit(EXIT_FAILURE);
+  }
+  if (pid == 0) {
+      close(pfd[0]);
+      write_end_of_the_pipe = pfd[1];
+      glxtest();
+      close(pfd[1]);
+      exit(EXIT_SUCCESS);
+  }
+
+  close(pfd[1]);
+  mozilla::widget::glxtest_pipe = pfd[0];
+  mozilla::widget::glxtest_pid = pid;
+}
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 6dd1338626d0..afaf8cdac9c9 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2727,6 +2727,12 @@ static DWORD InitDwriteBG(LPVOID lpdwThreadParam)
 
 PRTime gXRE_mainTimestamp = 0;
 
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
+void fire_glxtest_process();
+#endif
+#endif
+
 int
 XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
@@ -2747,6 +2753,16 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     NS_BREAK();
 #endif
 
+  // see bug 639842
+  // it's very important to fire this process BEFORE we set up error handling.
+  // indeed, this process is expected to be crashy, and we don't want the user to see its crashes.
+  // That's the whole reason for doing this in a separate process.
+#ifdef MOZ_X11
+#ifndef MOZ_PLATFORM_MAEMO
+  fire_glxtest_process();
+#endif
+#endif
+
   SetupErrorHandling(argv[0]);
 
 #ifdef CAIRO_HAS_DWRITE_FONT

From a328ce07143c0bdedc26117705a47bdb9d07db36 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 226/314] Bug 639842 and Bug 645407 - implement GfxInfoX11,
 using the info from the glxtest probe - r=bsmedberg,joe,karl * * * try: -b do
 -p linux,linux64,android-r7,maemo5-gtk,maemo5-qt -u mochitest-1 -t none

---
 widget/src/gtk2/nsWidgetFactory.cpp |  10 +
 widget/src/qt/nsWidgetFactory.cpp   |  30 ++-
 widget/src/xpwidgets/GfxInfoX11.cpp | 369 ++++++++++++++++++++++++++++
 widget/src/xpwidgets/GfxInfoX11.h   |  89 +++++++
 widget/src/xpwidgets/Makefile.in    |   5 +
 5 files changed, 500 insertions(+), 3 deletions(-)
 create mode 100644 widget/src/xpwidgets/GfxInfoX11.cpp
 create mode 100644 widget/src/xpwidgets/GfxInfoX11.h

diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp
index e556bb34955d..19641db09d97 100644
--- a/widget/src/gtk2/nsWidgetFactory.cpp
+++ b/widget/src/gtk2/nsWidgetFactory.cpp
@@ -69,6 +69,7 @@
 
 #if defined(MOZ_X11)
 #include "nsIdleServiceGTK.h"
+#include "GfxInfoX11.h"
 #endif
 
 #ifdef NATIVE_THEME_SUPPORT
@@ -138,6 +139,12 @@ nsNativeThemeGTKConstructor(nsISupports *aOuter, REFNSIID aIID,
 
 #if defined(MOZ_X11)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceGTK)
+namespace mozilla {
+namespace widget {
+// This constructor should really be shared with all platforms.
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
+}
+}
 #endif
 
 #ifdef NS_PRINTING
@@ -257,6 +264,7 @@ NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_CID);
 #if defined(MOZ_X11)
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
+NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
 #endif
 
 
@@ -292,6 +300,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_IMAGE_TO_PIXBUF_CID, false, NULL, nsImageToPixbufConstructor },
 #if defined(MOZ_X11)
     { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGTKConstructor },
+    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
 #endif
     { NULL }
 };
@@ -328,6 +337,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widget/image-to-gdk-pixbuf;1", &kNS_IMAGE_TO_PIXBUF_CID },
 #if defined(MOZ_X11)
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
+    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
 #endif
     { NULL }
 };
diff --git a/widget/src/qt/nsWidgetFactory.cpp b/widget/src/qt/nsWidgetFactory.cpp
index c7cc1d3868f1..8f1e81079422 100644
--- a/widget/src/qt/nsWidgetFactory.cpp
+++ b/widget/src/qt/nsWidgetFactory.cpp
@@ -70,6 +70,10 @@
 #include "nsFilePickerProxy.h"
 #include "nsXULAppAPI.h"
 
+#if defined(MOZ_X11)
+#include "GfxInfoX11.h"
+#endif
+
 // from nsWindow.cpp
 extern PRBool gDisableNativeTheme;
 
@@ -115,6 +119,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceQt, Init)
 #endif
 
+#if defined(MOZ_X11)
+namespace mozilla {
+namespace widget {
+// This constructor should really be shared with all platforms.
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
+}
+}
+#endif
+
+
 static nsresult
 nsNativeThemeQtConstructor(nsISupports *aOuter, REFNSIID aIID,
                             void **aResult)
@@ -163,7 +177,11 @@ NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
-#endif 
+#endif
+
+#if defined(MOZ_X11)
+NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
+#endif
 
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_WINDOW_CID, false, NULL, nsWindowConstructor },
@@ -189,7 +207,10 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_PRINTSESSION_CID, false, NULL, nsPrintSessionConstructor },
     { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecQtConstructor },
     { &kNS_PRINTDIALOGSERVICE_CID, false, NULL, nsPrintDialogServiceQtConstructor },
-#endif 
+#endif
+#if defined(MOZ_X11)
+    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
+#endif
     { NULL }
 };
 
@@ -217,7 +238,10 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
     { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
     { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID },
-#endif 
+#endif
+#if defined(MOZ_X11)
+    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
+#endif
     { NULL }
 };
 
diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp
new file mode 100644
index 000000000000..4e0ed47c26c8
--- /dev/null
+++ b/widget/src/xpwidgets/GfxInfoX11.cpp
@@ -0,0 +1,369 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=8 et :
+ */
+/* ***** 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 Code.
+ *
+ * The Initial Developer of the Original Code is
+ *   The Mozilla Foundation
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * 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 ***** */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include "nsCRTGlue.h"
+#include "prenv.h"
+
+#include "GfxInfoX11.h"
+
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+#include "nsExceptionHandler.h"
+#include "nsICrashReporter.h"
+#endif
+
+namespace mozilla {
+namespace widget {
+
+// these global variables will be set when firing the glxtest process
+int glxtest_pipe = 0;
+pid_t glxtest_pid = 0;
+
+nsresult
+GfxInfo::Init()
+{
+    mMajorVersion = 0;
+    mMinorVersion = 0;
+    mIsMesa = false;
+    mIsNVIDIA = false;
+    mIsFGLRX = false;
+    return GfxInfoBase::Init();
+}
+
+void
+GfxInfo::GetData()
+{
+    // to understand this function, see bug 639842. We retrieve the OpenGL driver information in a
+    // separate process to protect against bad drivers.
+
+    // if glxtest_pipe == 0, that means that we already read the information
+    if (!glxtest_pipe)
+        return;
+
+    enum { buf_size = 1024 };
+    char buf[buf_size];
+    ssize_t bytesread = read(glxtest_pipe,
+                             &buf,
+                             buf_size-1); // -1 because we'll append a zero
+    close(glxtest_pipe);
+    glxtest_pipe = 0;
+
+    // bytesread < 0 would mean that the above read() call failed. This should never happen.
+    if (bytesread < 0)
+        bytesread = 0;
+
+    // let buf be a zero-terminated string
+    buf[bytesread] = 0;
+
+    // Wait for the glxtest process to finish. This serves 2 purposes:
+    // * avoid having a zombie glxtest process laying around
+    // * get the glxtest process status info.
+    int glxtest_status = 0;
+    bool wait_for_glxtest_process = true;
+    bool waiting_for_glxtest_process_failed = false;
+    while(wait_for_glxtest_process) {
+        wait_for_glxtest_process = false;
+        if (waitpid(glxtest_pid, &glxtest_status, 0) == -1) {
+            if (errno == EINTR)
+                wait_for_glxtest_process = true;
+            else
+                waiting_for_glxtest_process_failed = true;
+        }
+    }
+
+    bool exited_with_error_code = !waiting_for_glxtest_process_failed &&
+                                  WIFEXITED(glxtest_status) && 
+                                  WEXITSTATUS(glxtest_status) != EXIT_SUCCESS;
+    bool received_signal = !waiting_for_glxtest_process_failed &&
+                           WIFSIGNALED(glxtest_status);
+
+    bool error = waiting_for_glxtest_process_failed || exited_with_error_code || received_signal;
+
+    nsCString *stringToFill = nsnull;
+    char *bufptr = buf;
+    if (!error) {
+        while(true) {
+            char *line = NS_strtok("\n", &bufptr);
+            if (!line)
+                break;
+            if (stringToFill) {
+                stringToFill->Assign(line);
+                stringToFill = nsnull;
+            }
+            else if(!strcmp(line, "VENDOR"))
+                stringToFill = &mVendor;
+            else if(!strcmp(line, "RENDERER"))
+                stringToFill = &mRenderer;
+            else if(!strcmp(line, "VERSION"))
+                stringToFill = &mVersion;
+        }
+    }
+
+    const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
+    if (spoofedVendor)
+        mVendor.Assign(spoofedVendor);
+    const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
+    if (spoofedRenderer)
+        mRenderer.Assign(spoofedRenderer);
+    const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
+    if (spoofedVersion)
+        mVersion.Assign(spoofedVersion);
+
+    if (error ||
+        mVendor.IsEmpty() ||
+        mRenderer.IsEmpty() ||
+        mVersion.IsEmpty())
+    {
+        mAdapterDescription.AppendLiteral("GLXtest process failed");
+        if (waiting_for_glxtest_process_failed)
+            mAdapterDescription.AppendLiteral(" (waitpid failed)");
+        if (exited_with_error_code)
+            mAdapterDescription.AppendPrintf(" (exited with status %d)", WEXITSTATUS(glxtest_status));
+        if (received_signal)
+            mAdapterDescription.AppendPrintf(" (received signal %d)", WTERMSIG(glxtest_status));
+        if (bytesread) {
+            mAdapterDescription.AppendLiteral(": ");
+            mAdapterDescription.Append(nsDependentCString(buf));
+            mAdapterDescription.AppendLiteral("\n");
+        }
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+        CrashReporter::AppendAppNotesToCrashReport(mAdapterDescription);
+#endif
+        return;
+    }
+
+    mAdapterDescription.Append(mVendor);
+    mAdapterDescription.AppendLiteral(" -- ");
+    mAdapterDescription.Append(mRenderer);
+
+    nsCAutoString note;
+    note.Append("OpenGL: ");
+    note.Append(mAdapterDescription);
+    note.Append(" -- ");
+    note.Append(mVersion);
+    note.Append("\n");
+#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+    CrashReporter::AppendAppNotesToCrashReport(note);
+#endif
+
+    // determine driver type (vendor) and where in the version string
+    // the actual driver version numbers should be expected to be found (whereToReadVersionNumbers)
+    const char *whereToReadVersionNumbers = nsnull;
+    const char *Mesa_in_version_string = strstr(mVersion.get(), "Mesa");
+    if (Mesa_in_version_string) {
+        mIsMesa = true;
+        // with Mesa, the version string contains "Mesa major.minor" and that's all the version information we get:
+        // there is no actual driver version info.
+        whereToReadVersionNumbers = Mesa_in_version_string + strlen("Mesa");
+    } else if (strstr(mVendor.get(), "NVIDIA Corporation")) {
+        mIsNVIDIA = true;
+        // with the NVIDIA driver, the version string contains "NVIDIA major.minor"
+        // note that here the vendor and version strings behave differently, that's why we don't put this above
+        // alongside Mesa_in_version_string.
+        const char *NVIDIA_in_version_string = strstr(mVersion.get(), "NVIDIA");
+        if (NVIDIA_in_version_string)
+            whereToReadVersionNumbers = NVIDIA_in_version_string + strlen("NVIDIA");
+    } else if (strstr(mVendor.get(), "ATI Technologies Inc")) {
+        mIsFGLRX = true;
+        // with the FGLRX driver, the version string only gives a OpenGL version :/ so let's return that.
+        // that can at least give a rough idea of how old the driver is.
+        whereToReadVersionNumbers = mVersion.get();
+    }
+
+    // read major.minor version numbers
+    if (whereToReadVersionNumbers) {
+        // copy into writable buffer, for tokenization
+        strncpy(buf, whereToReadVersionNumbers, buf_size);
+        bufptr = buf;
+
+        // now try to read major.minor version numbers. In case of failure, gracefully exit: these numbers have
+        // been initialized as 0 anyways
+        char *token = NS_strtok(".", &bufptr);
+        if (token) {
+            mMajorVersion = strtol(token, 0, 10);
+            token = NS_strtok(".", &bufptr);
+            if (token)
+                mMinorVersion = strtol(token, 0, 10);
+        }
+    }
+}
+
+static inline PRUint64 version(PRUint32 major, PRUint32 minor)
+{
+    return (PRUint64(major) << 32) + PRUint64(minor);
+}
+
+nsresult
+GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo /* = nsnull */)
+{
+    GetData();
+    *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
+    aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
+
+#ifdef MOZ_PLATFORM_MAEMO
+    // on Maemo, the glxtest probe doesn't build, and we don't really need GfxInfo anyway
+    return NS_OK;
+#endif
+
+    // whitelist the linux test slaves' current configuration.
+    // this is necessary as they're still using the slightly outdated 190.42 driver.
+    // this isn't a huge risk, as at least this is the exact setting in which we do continuous testing,
+    // and this only affects GeForce 9400 cards on linux on this precise driver version, which is very few users.
+    // We do the same thing on Windows XP, see in widget/src/windows/GfxInfo.cpp
+    if (mIsNVIDIA &&
+        !strcmp(mRenderer.get(), "GeForce 9400/PCI/SSE2") &&
+        !strcmp(mVersion.get(), "3.2.0 NVIDIA 190.42"))
+    {
+        return NS_OK;
+    }
+
+    if (mIsMesa) {
+        if (version(mMajorVersion, mMinorVersion) < version(7,10)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("Mesa 7.10");
+        }
+        else if (strstr(mRenderer.get(), "Gallium")) {
+            // see bug 624935
+            // and http://marc.info/?l=mesa3d-dev&m=126525088903956&w=2
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("<NOT Gallium>");
+        }
+    } else if (mIsNVIDIA) {
+        if (version(mMajorVersion, mMinorVersion) < version(257,21)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+            aSuggestedDriverVersion.AssignLiteral("NVIDIA 257.21");
+        }
+    } else if (mIsFGLRX) {
+        // FGLRX does not report a driver version number, so we have the OpenGL version instead.
+        // by requiring OpenGL 3, we effectively require recent drivers.
+        if (version(mMajorVersion, mMinorVersion) < version(3, 0)) {
+            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
+        }
+    } else {
+        // like on windows, let's block unknown vendors. Think of virtual machines.
+        // Also, this case is hit whenever the GLXtest probe failed to get driver info or crashed.
+        *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
+    }
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP
+GfxInfo::GetD2DEnabled(PRBool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+GfxInfo::GetDWriteEnabled(PRBool *aEnabled)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString DWriteVersion; */
+NS_IMETHODIMP
+GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
+{
+  return NS_ERROR_FAILURE;
+}
+
+/* readonly attribute DOMString adapterDescription; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
+{
+  GetData();
+  AppendASCIItoUTF16(mAdapterDescription, aAdapterDescription);
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterRAM; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
+{
+  aAdapterRAM.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriver; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
+{
+  aAdapterDriver.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverVersion; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
+{
+  GetData();
+  CopyASCIItoUTF16(mVersion, aAdapterDriverVersion);
+  return NS_OK;
+}
+
+/* readonly attribute DOMString adapterDriverDate; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
+{
+  aAdapterDriverDate.AssignLiteral("");
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long adapterVendorID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterVendorID(PRUint32 *aAdapterVendorID)
+{
+  *aAdapterVendorID = 0;
+  return NS_OK;
+}
+
+/* readonly attribute unsigned long adapterDeviceID; */
+NS_IMETHODIMP
+GfxInfo::GetAdapterDeviceID(PRUint32 *aAdapterDeviceID)
+{
+  *aAdapterDeviceID = 0;
+  return NS_OK;
+}
+
+
+} // end namespace widget
+} // end namespace mozilla
diff --git a/widget/src/xpwidgets/GfxInfoX11.h b/widget/src/xpwidgets/GfxInfoX11.h
new file mode 100644
index 000000000000..f0457b3a4f20
--- /dev/null
+++ b/widget/src/xpwidgets/GfxInfoX11.h
@@ -0,0 +1,89 @@
+/* vim: se cin sw=2 ts=2 et : */
+/* -*- 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 mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * 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 ***** */
+
+#ifndef __GfxInfoX11_h__
+#define __GfxInfoX11_h__
+
+#include "GfxInfoBase.h"
+
+namespace mozilla {
+namespace widget {
+
+class GfxInfo : public GfxInfoBase
+{
+public:
+
+  // We only declare the subset of nsIGfxInfo that we actually implement. The
+  // rest is brought forward from GfxInfoBase.
+  NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
+  NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
+  NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDeviceID(PRUint32 *aAdapterDeviceID);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
+  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
+  using GfxInfoBase::GetFeatureStatus;
+  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
+  using GfxInfoBase::GetWebGLParameter;
+
+  virtual nsresult Init();
+
+protected:
+
+  virtual nsresult GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo = nsnull);
+
+private:
+  nsCString mVendor;
+  nsCString mRenderer;
+  nsCString mVersion;
+  nsCString mAdapterDescription;
+  bool mIsMesa, mIsNVIDIA, mIsFGLRX;
+  int mMajorVersion, mMinorVersion;
+
+  void AddCrashReportAnnotations();
+  void GetData();
+};
+
+} // namespace widget
+} // namespace mozilla
+
+#endif /* __GfxInfoX11_h__ */
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 1b101db2ce9a..8e73b77a0495 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -75,6 +75,11 @@ CPPSRCS		= \
 		nsFilePickerProxy.cpp \
 		$(NULL)
 
+ifdef MOZ_X11
+CPPSRCS		+= \
+		GfxInfoX11.cpp
+endif
+
 ifneq (,$(filter os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif

From 1a69afa143cfdc9daee4cd3eefc8ffcf57cc136b Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 227/314] Bug 645407 - remove old blacklisting - r=karlt

---
 gfx/thebes/GLContextProviderGLX.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index dc0e584a7643..5a53afe70aa2 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -216,17 +216,6 @@ GLXLibrary::EnsureInitialized()
         serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
         serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
 
-        PRBool IsDriverBlacklisted = !serverVendor ||   // it's been reported that a VNC X server was returning serverVendor=null
-                                     !serverVersionStr ||
-                                     strcmp(serverVendor, "NVIDIA Corporation");
-
-        if (IsDriverBlacklisted && !ignoreBlacklist)
-        {
-          printf("[GLX] your GL driver is currently blocked. If you would like to bypass this, "
-                  "define the MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
-          return PR_FALSE;
-        }
-
         if (!GLXVersionCheck(1, 1))
             // Not possible to query for extensions.
             return PR_FALSE;

From 7fb21db0532da2ec98bf2e84a66757e7872c644c Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 228/314] Bug 642502 - skip fields with 0/empty/null values -
 r=jrmuizel

---
 toolkit/content/aboutSupport.js | 54 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 212aa5aa1824..dc9e292b68da 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -166,6 +166,23 @@ function populateGraphicsSection() {
     return elem;
   }
 
+  function pushInfoRow(table, name, value)
+  {
+    if(value) {
+      table.push(createParentElement("tr", [
+        createHeader(bundle.GetStringFromName(name)),
+        createElement("td", value),
+      ]));
+    }
+  }
+
+  function hexValueToString(value)
+  {
+    return value
+           ? String('0000' + value.toString(16)).slice(-4)
+           : null;
+  }
+
   let bundle = Services.strings.createBundle("chrome://global/locale/aboutSupport.properties");
   let graphics_tbody = document.getElementById("graphics-tbody");
 
@@ -177,36 +194,13 @@ function populateGraphicsSection() {
 
   if (gfxInfo) {
     let trGraphics = [];
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDescription")),
-      createElement("td", gfxInfo.adapterDescription),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterVendorID")),
-      // pad with zeros. (printf would be nicer)
-      createElement("td", String('0000'+gfxInfo.adapterVendorID.toString(16)).slice(-4)),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDeviceID")),
-      // pad with zeros. (printf would be nicer)
-      createElement("td", String('0000'+gfxInfo.adapterDeviceID.toString(16)).slice(-4)),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterRAM")),
-      createElement("td", gfxInfo.adapterRAM),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("adapterDrivers")),
-      createElement("td", gfxInfo.adapterDriver),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("driverVersion")),
-      createElement("td", gfxInfo.adapterDriverVersion),
-    ]));
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("driverDate")),
-      createElement("td", gfxInfo.adapterDriverDate),
-    ]));
+    pushInfoRow(trGraphics, "adapterDescription", gfxInfo.adapterDescription);
+    pushInfoRow(trGraphics, "adapterVendorID", hexValueToString(gfxInfo.adapterVendorID));
+    pushInfoRow(trGraphics, "adapterDeviceID", hexValueToString(gfxInfo.adapterDeviceID));
+    pushInfoRow(trGraphics, "adapterRAM", gfxInfo.adapterRAM);
+    pushInfoRow(trGraphics, "adapterDrivers", gfxInfo.adapterDriver);
+    pushInfoRow(trGraphics, "driverVersion", gfxInfo.adapterDriverVersion);
+    pushInfoRow(trGraphics, "driverDate", gfxInfo.adapterDriverDate);
 
     var d2dEnabled = false;
     try {

From 97d2feb9aae1cba4be3f01915f44e518d8258160 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 229/314] Bug 642502 - about:support improvements -
 r=gavin.sharp

---
 toolkit/content/aboutSupport.js               | 138 +++++++++++-------
 .../chrome/global/aboutSupport.properties     |  11 +-
 2 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index dc9e292b68da..6c149ace5c71 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -176,6 +176,47 @@ function populateGraphicsSection() {
     }
   }
 
+  function errorMessageForFeature(feature) {
+    var errorMessage;
+    var status;
+    try {
+      status = gfxInfo.getFeatureStatus(feature);
+    } catch(e) {}
+    switch (status) {
+      case gfxInfo.FEATURE_BLOCKED_DEVICE:
+      case gfxInfo.FEATURE_DISCOURAGED:
+        errorMessage = bundle.GetStringFromName("blockedGfxCard");
+        break;
+      case gfxInfo.FEATURE_BLOCKED_OS_VERSION:
+        errorMessage = bundle.GetStringFromName("blockedOSVersion");
+        break;
+      case gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION:
+        var suggestedDriverVersion;
+        try {
+          suggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(feature);
+        } catch(e) {}
+        if (suggestedDriverVersion)
+          errorMessage = bundle.formatStringFromName("tryNewerDriver", [suggestedDriverVersion], 1);
+        else
+          errorMessage = bundle.GetStringFromName("blockedDriver");
+        break;
+    }
+    return errorMessage;
+  }
+
+  function pushFeatureInfoRow(table, name, feature, isEnabled, message) {
+    message = message || isEnabled;
+    if (!isEnabled) {
+      var errorMessage = errorMessageForFeature(feature);
+      if (errorMessage)
+        message = errorMessage;
+    }
+    table.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName(name)),
+      createElement("td", message),
+    ]));
+  }
+
   function hexValueToString(value)
   {
     return value
@@ -202,64 +243,49 @@ function populateGraphicsSection() {
     pushInfoRow(trGraphics, "driverVersion", gfxInfo.adapterDriverVersion);
     pushInfoRow(trGraphics, "driverDate", gfxInfo.adapterDriverDate);
 
-    var d2dEnabled = false;
-    try {
-      d2dEnabled = gfxInfo.D2DEnabled;
-    } catch(e) {}
-    var d2dMessage = d2dEnabled;
-    if (!d2dEnabled) {
-      var d2dStatus = -1; // different from any status value defined in the IDL
+#ifdef XP_WIN
+    var version = Cc["@mozilla.org/system-info;1"]
+                  .getService(Ci.nsIPropertyBag2)
+                  .getProperty("version");
+    var isWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
+    if (isWindowsVistaOrHigher) {
+      var d2dEnabled = "false";
       try {
-        d2dStatus = gfxInfo.getFeatureStatus(gfxInfo.FEATURE_DIRECT2D);
-      } catch(e) {
-        window.dump(e + '\n');
-      }  
-      if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DEVICE ||
-          d2dStatus == gfxInfo.FEATURE_DISCOURAGED)
-      {
-        d2dMessage = bundle.GetStringFromName("blockedGraphicsCard");
-      }
-      else if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION)
-      {
-        var d2dSuggestedDriverVersion = null;
-        try {
-          d2dSuggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(gfxInfo.FEATURE_DIRECT2D);
-        } catch(e) {
-          window.dump(e + '\n');
-        }
-        if (d2dSuggestedDriverVersion) {
-          d2dMessage = bundle.GetStringFromName("tryNewerDriverVersion").replace("%1", d2dSuggestedDriverVersion);
-        }
-      }
-    }
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("direct2DEnabled")),
-      createElement("td", d2dMessage),
-    ]));
+        d2dEnabled = gfxInfo.D2DEnabled;
+      } catch(e) {}
+      pushFeatureInfoRow(trGraphics, "direct2DEnabled", gfxInfo.FEATURE_DIRECT2D, d2dEnabled);
 
-    var dwEnabled = false;
-    var dwriteEnabledStr = dwEnabled.toString();
-    var dwriteVersion;
-    try {
-      dwEnabled = gfxInfo.DWriteEnabled;
-      dwriteVersion = gfxInfo.DWriteVersion;
-      dwriteEnabledStr = dwEnabled.toString() + " (" + dwriteVersion + ")";
-    } catch(e) {}
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("directWriteEnabled")),
-      createElement("td", dwriteEnabledStr),
-    ]));
+      var dwEnabled = "false";
+      try {
+        dwEnabled = gfxInfo.DWriteEnabled + " (" + gfxInfo.DWriteVersion + ")";
+      } catch(e) {}
+      trGraphics.push(createParentElement("tr", [
+        createHeader(bundle.GetStringFromName("directWriteEnabled")),
+        createElement("td", dwEnabled),
+      ]));
+    }
+#endif
 
     var webglrenderer;
+    var webglenabled;
     try {
       webglrenderer = gfxInfo.getWebGLParameter("full-renderer");
+      webglenabled = true;
     } catch (e) {
-      webglrenderer = "(WebGL unavailable)";
+      webglrenderer = false;
+      webglenabled = false;
     }
-    trGraphics.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName("webglRenderer")),
-      createElement("td", webglrenderer)
-    ]));
+#ifdef XP_WIN
+    // If ANGLE is not available but OpenGL is, we want to report on the OpenGL feature, because that's what's going to get used.
+    // In all other cases we want to report on the ANGLE feature.
+    var webglfeature = gfxInfo.FEATURE_WEBGL_ANGLE;
+    if (gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_ANGLE)  != gfxInfo.FEATURE_NO_INFO &&
+        gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_OPENGL) == gfxInfo.FEATURE_NO_INFO)
+      webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
+#else
+    var webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
+#endif
+    pushFeatureInfoRow(trGraphics, "webglRenderer", webglfeature, webglenabled, webglrenderer);
 
     appendChildren(graphics_tbody, trGraphics);
    
@@ -290,8 +316,18 @@ function populateGraphicsSection() {
   }
 
   let msg = acceleratedWindows + "/" + totalWindows;
-  if (acceleratedWindows)
+  if (acceleratedWindows) {
     msg += " " + mgrType;
+  } else {
+#ifdef XP_WIN
+    var feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS;
+#else
+    var feature = gfxInfo.FEATURE_OPENGL_LAYERS;
+#endif
+    var errMsg = errorMessageForFeature(feature);
+    if (errMsg)
+      msg += ". " + errMsg;
+  }
 
   appendChildren(graphics_tbody, [
     createParentElement("tr", [
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 0d9fa3ce62a3..723559d15c56 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -8,11 +8,16 @@
 acceleratedWindows = GPU Accelerated Windows
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-# The %1 here is a placeholder, leave unchanged, it will get replaced by the driver version string.
-tryNewerDriverVersion = Blocked on your graphics driver. Try updating your graphics driver to version %1 or newer.
+blockedDriver = Blocked for your graphics driver version.
+
+# LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
+tryNewerDriver = Blocked for your graphics driver version. Try updating your graphics driver to version %S or newer.
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedGraphicsCard = Blocked on your graphics card because of unresolved driver issues.
+blockedGfxCard = Blocked for your graphics card because of unresolved driver issues.
+
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+blockedOSVersion = Blocked for your operating system version.
 
 direct2DEnabled = Direct2D Enabled
 directWriteEnabled = DirectWrite Enabled

From fd50b07015c9b9ce17a99a139a5fdca96298ca73 Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 16:07:17 -0400
Subject: [PATCH 230/314] Bug 645407 - remove useless GLX checks - r=karlt

---
 gfx/thebes/GLContextProviderGLX.cpp | 49 +++++++----------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index 5a53afe70aa2..f56cbda77cf7 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -180,52 +180,25 @@ GLXLibrary::EnsureInitialized()
     }
 
     Display *display = DefaultXDisplay();
-    PRBool ignoreBlacklist = PR_GetEnv("MOZ_GLX_IGNORE_BLACKLIST") != nsnull;
-    if (!ignoreBlacklist) {
-        // ATI's libGL (at least the one provided with 11.2 drivers) segfaults
-        // when querying server info if the server does not have the
-        // ATIFGLEXTENSION extension.
-        const char *clientVendor = xGetClientString(display, GLX_VENDOR);
-        if (clientVendor && strcmp(clientVendor, "ATI") == 0) {
-            printf("[GLX] The ATI proprietary libGL.so.1 is currently "
-                   "blacklisted to avoid crashes that happen in some "
-                   "situations. If you would like to bypass this, set the "
-                   "MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
-            return PR_FALSE;
-        }
-    }
 
     int screen = DefaultScreen(display);
     const char *serverVendor = NULL;
     const char *serverVersionStr = NULL;
     const char *extensionsStr = NULL;
 
-    // This scope is covered by a ScopedXErrorHandler to catch X errors in GLX
-    // calls.  See bug 632867 comment 3: Mesa versions up to 7.10 cause a
-    // BadLength error during the first GLX call that communicates with the
-    // server when the server GLX version < 1.3.
-    {
-        ScopedXErrorHandler xErrorHandler;
-
-        if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
-            gGLXMajorVersion = 0;
-            gGLXMinorVersion = 0;
-            return PR_FALSE;
-        }
-
-        serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
-        serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
-
-        if (!GLXVersionCheck(1, 1))
-            // Not possible to query for extensions.
-            return PR_FALSE;
-
-        extensionsStr = xQueryExtensionsString(display, screen);
-
-        if (xErrorHandler.GetError())
-          return PR_FALSE;
+    if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
+        gGLXMajorVersion = 0;
+        gGLXMinorVersion = 0;
+        return PR_FALSE;
     }
 
+    serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
+    serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
+
+    if (!GLXVersionCheck(1, 1))
+        // Not possible to query for extensions.
+        return PR_FALSE;
+
     LibrarySymbolLoader::SymLoadStruct *sym13;
     if (!GLXVersionCheck(1, 3)) {
         // Even if we don't have 1.3, we might have equivalent extensions

From d740fe1212dfa4325a61981048ad6ea36394651b Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Tue, 3 May 2011 17:18:44 -0400
Subject: [PATCH 231/314] backout bug 645407, bug 639842, bug 642502

---
 gfx/thebes/GLContextProviderGLX.cpp           |  60 ++-
 toolkit/content/aboutSupport.js               | 192 ++++-----
 .../chrome/global/aboutSupport.properties     |  11 +-
 toolkit/xre/Makefile.in                       |   6 -
 toolkit/xre/glxtest.cpp                       | 242 ------------
 toolkit/xre/nsAppRunner.cpp                   |  16 -
 widget/src/gtk2/nsWidgetFactory.cpp           |  10 -
 widget/src/qt/nsWidgetFactory.cpp             |  30 +-
 widget/src/xpwidgets/GfxInfoX11.cpp           | 369 ------------------
 widget/src/xpwidgets/GfxInfoX11.h             |  89 -----
 widget/src/xpwidgets/Makefile.in              |   5 -
 11 files changed, 136 insertions(+), 894 deletions(-)
 delete mode 100644 toolkit/xre/glxtest.cpp
 delete mode 100644 widget/src/xpwidgets/GfxInfoX11.cpp
 delete mode 100644 widget/src/xpwidgets/GfxInfoX11.h

diff --git a/gfx/thebes/GLContextProviderGLX.cpp b/gfx/thebes/GLContextProviderGLX.cpp
index f56cbda77cf7..dc0e584a7643 100644
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -180,25 +180,63 @@ GLXLibrary::EnsureInitialized()
     }
 
     Display *display = DefaultXDisplay();
+    PRBool ignoreBlacklist = PR_GetEnv("MOZ_GLX_IGNORE_BLACKLIST") != nsnull;
+    if (!ignoreBlacklist) {
+        // ATI's libGL (at least the one provided with 11.2 drivers) segfaults
+        // when querying server info if the server does not have the
+        // ATIFGLEXTENSION extension.
+        const char *clientVendor = xGetClientString(display, GLX_VENDOR);
+        if (clientVendor && strcmp(clientVendor, "ATI") == 0) {
+            printf("[GLX] The ATI proprietary libGL.so.1 is currently "
+                   "blacklisted to avoid crashes that happen in some "
+                   "situations. If you would like to bypass this, set the "
+                   "MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
+            return PR_FALSE;
+        }
+    }
 
     int screen = DefaultScreen(display);
     const char *serverVendor = NULL;
     const char *serverVersionStr = NULL;
     const char *extensionsStr = NULL;
 
-    if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
-        gGLXMajorVersion = 0;
-        gGLXMinorVersion = 0;
-        return PR_FALSE;
+    // This scope is covered by a ScopedXErrorHandler to catch X errors in GLX
+    // calls.  See bug 632867 comment 3: Mesa versions up to 7.10 cause a
+    // BadLength error during the first GLX call that communicates with the
+    // server when the server GLX version < 1.3.
+    {
+        ScopedXErrorHandler xErrorHandler;
+
+        if (!xQueryVersion(display, &gGLXMajorVersion, &gGLXMinorVersion)) {
+            gGLXMajorVersion = 0;
+            gGLXMinorVersion = 0;
+            return PR_FALSE;
+        }
+
+        serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
+        serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
+
+        PRBool IsDriverBlacklisted = !serverVendor ||   // it's been reported that a VNC X server was returning serverVendor=null
+                                     !serverVersionStr ||
+                                     strcmp(serverVendor, "NVIDIA Corporation");
+
+        if (IsDriverBlacklisted && !ignoreBlacklist)
+        {
+          printf("[GLX] your GL driver is currently blocked. If you would like to bypass this, "
+                  "define the MOZ_GLX_IGNORE_BLACKLIST environment variable.\n");
+          return PR_FALSE;
+        }
+
+        if (!GLXVersionCheck(1, 1))
+            // Not possible to query for extensions.
+            return PR_FALSE;
+
+        extensionsStr = xQueryExtensionsString(display, screen);
+
+        if (xErrorHandler.GetError())
+          return PR_FALSE;
     }
 
-    serverVendor = xQueryServerString(display, screen, GLX_VENDOR);
-    serverVersionStr = xQueryServerString(display, screen, GLX_VERSION);
-
-    if (!GLXVersionCheck(1, 1))
-        // Not possible to query for extensions.
-        return PR_FALSE;
-
     LibrarySymbolLoader::SymLoadStruct *sym13;
     if (!GLXVersionCheck(1, 3)) {
         // Even if we don't have 1.3, we might have equivalent extensions
diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
index 6c149ace5c71..212aa5aa1824 100644
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -166,64 +166,6 @@ function populateGraphicsSection() {
     return elem;
   }
 
-  function pushInfoRow(table, name, value)
-  {
-    if(value) {
-      table.push(createParentElement("tr", [
-        createHeader(bundle.GetStringFromName(name)),
-        createElement("td", value),
-      ]));
-    }
-  }
-
-  function errorMessageForFeature(feature) {
-    var errorMessage;
-    var status;
-    try {
-      status = gfxInfo.getFeatureStatus(feature);
-    } catch(e) {}
-    switch (status) {
-      case gfxInfo.FEATURE_BLOCKED_DEVICE:
-      case gfxInfo.FEATURE_DISCOURAGED:
-        errorMessage = bundle.GetStringFromName("blockedGfxCard");
-        break;
-      case gfxInfo.FEATURE_BLOCKED_OS_VERSION:
-        errorMessage = bundle.GetStringFromName("blockedOSVersion");
-        break;
-      case gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION:
-        var suggestedDriverVersion;
-        try {
-          suggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(feature);
-        } catch(e) {}
-        if (suggestedDriverVersion)
-          errorMessage = bundle.formatStringFromName("tryNewerDriver", [suggestedDriverVersion], 1);
-        else
-          errorMessage = bundle.GetStringFromName("blockedDriver");
-        break;
-    }
-    return errorMessage;
-  }
-
-  function pushFeatureInfoRow(table, name, feature, isEnabled, message) {
-    message = message || isEnabled;
-    if (!isEnabled) {
-      var errorMessage = errorMessageForFeature(feature);
-      if (errorMessage)
-        message = errorMessage;
-    }
-    table.push(createParentElement("tr", [
-      createHeader(bundle.GetStringFromName(name)),
-      createElement("td", message),
-    ]));
-  }
-
-  function hexValueToString(value)
-  {
-    return value
-           ? String('0000' + value.toString(16)).slice(-4)
-           : null;
-  }
-
   let bundle = Services.strings.createBundle("chrome://global/locale/aboutSupport.properties");
   let graphics_tbody = document.getElementById("graphics-tbody");
 
@@ -235,57 +177,95 @@ function populateGraphicsSection() {
 
   if (gfxInfo) {
     let trGraphics = [];
-    pushInfoRow(trGraphics, "adapterDescription", gfxInfo.adapterDescription);
-    pushInfoRow(trGraphics, "adapterVendorID", hexValueToString(gfxInfo.adapterVendorID));
-    pushInfoRow(trGraphics, "adapterDeviceID", hexValueToString(gfxInfo.adapterDeviceID));
-    pushInfoRow(trGraphics, "adapterRAM", gfxInfo.adapterRAM);
-    pushInfoRow(trGraphics, "adapterDrivers", gfxInfo.adapterDriver);
-    pushInfoRow(trGraphics, "driverVersion", gfxInfo.adapterDriverVersion);
-    pushInfoRow(trGraphics, "driverDate", gfxInfo.adapterDriverDate);
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("adapterDescription")),
+      createElement("td", gfxInfo.adapterDescription),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("adapterVendorID")),
+      // pad with zeros. (printf would be nicer)
+      createElement("td", String('0000'+gfxInfo.adapterVendorID.toString(16)).slice(-4)),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("adapterDeviceID")),
+      // pad with zeros. (printf would be nicer)
+      createElement("td", String('0000'+gfxInfo.adapterDeviceID.toString(16)).slice(-4)),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("adapterRAM")),
+      createElement("td", gfxInfo.adapterRAM),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("adapterDrivers")),
+      createElement("td", gfxInfo.adapterDriver),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("driverVersion")),
+      createElement("td", gfxInfo.adapterDriverVersion),
+    ]));
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("driverDate")),
+      createElement("td", gfxInfo.adapterDriverDate),
+    ]));
 
-#ifdef XP_WIN
-    var version = Cc["@mozilla.org/system-info;1"]
-                  .getService(Ci.nsIPropertyBag2)
-                  .getProperty("version");
-    var isWindowsVistaOrHigher = (parseFloat(version) >= 6.0);
-    if (isWindowsVistaOrHigher) {
-      var d2dEnabled = "false";
+    var d2dEnabled = false;
+    try {
+      d2dEnabled = gfxInfo.D2DEnabled;
+    } catch(e) {}
+    var d2dMessage = d2dEnabled;
+    if (!d2dEnabled) {
+      var d2dStatus = -1; // different from any status value defined in the IDL
       try {
-        d2dEnabled = gfxInfo.D2DEnabled;
-      } catch(e) {}
-      pushFeatureInfoRow(trGraphics, "direct2DEnabled", gfxInfo.FEATURE_DIRECT2D, d2dEnabled);
-
-      var dwEnabled = "false";
-      try {
-        dwEnabled = gfxInfo.DWriteEnabled + " (" + gfxInfo.DWriteVersion + ")";
-      } catch(e) {}
-      trGraphics.push(createParentElement("tr", [
-        createHeader(bundle.GetStringFromName("directWriteEnabled")),
-        createElement("td", dwEnabled),
-      ]));
+        d2dStatus = gfxInfo.getFeatureStatus(gfxInfo.FEATURE_DIRECT2D);
+      } catch(e) {
+        window.dump(e + '\n');
+      }  
+      if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DEVICE ||
+          d2dStatus == gfxInfo.FEATURE_DISCOURAGED)
+      {
+        d2dMessage = bundle.GetStringFromName("blockedGraphicsCard");
+      }
+      else if (d2dStatus == gfxInfo.FEATURE_BLOCKED_DRIVER_VERSION)
+      {
+        var d2dSuggestedDriverVersion = null;
+        try {
+          d2dSuggestedDriverVersion = gfxInfo.getFeatureSuggestedDriverVersion(gfxInfo.FEATURE_DIRECT2D);
+        } catch(e) {
+          window.dump(e + '\n');
+        }
+        if (d2dSuggestedDriverVersion) {
+          d2dMessage = bundle.GetStringFromName("tryNewerDriverVersion").replace("%1", d2dSuggestedDriverVersion);
+        }
+      }
     }
-#endif
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("direct2DEnabled")),
+      createElement("td", d2dMessage),
+    ]));
+
+    var dwEnabled = false;
+    var dwriteEnabledStr = dwEnabled.toString();
+    var dwriteVersion;
+    try {
+      dwEnabled = gfxInfo.DWriteEnabled;
+      dwriteVersion = gfxInfo.DWriteVersion;
+      dwriteEnabledStr = dwEnabled.toString() + " (" + dwriteVersion + ")";
+    } catch(e) {}
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("directWriteEnabled")),
+      createElement("td", dwriteEnabledStr),
+    ]));
 
     var webglrenderer;
-    var webglenabled;
     try {
       webglrenderer = gfxInfo.getWebGLParameter("full-renderer");
-      webglenabled = true;
     } catch (e) {
-      webglrenderer = false;
-      webglenabled = false;
+      webglrenderer = "(WebGL unavailable)";
     }
-#ifdef XP_WIN
-    // If ANGLE is not available but OpenGL is, we want to report on the OpenGL feature, because that's what's going to get used.
-    // In all other cases we want to report on the ANGLE feature.
-    var webglfeature = gfxInfo.FEATURE_WEBGL_ANGLE;
-    if (gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_ANGLE)  != gfxInfo.FEATURE_NO_INFO &&
-        gfxInfo.getFeatureStatus(gfxInfo.FEATURE_WEBGL_OPENGL) == gfxInfo.FEATURE_NO_INFO)
-      webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
-#else
-    var webglfeature = gfxInfo.FEATURE_WEBGL_OPENGL;
-#endif
-    pushFeatureInfoRow(trGraphics, "webglRenderer", webglfeature, webglenabled, webglrenderer);
+    trGraphics.push(createParentElement("tr", [
+      createHeader(bundle.GetStringFromName("webglRenderer")),
+      createElement("td", webglrenderer)
+    ]));
 
     appendChildren(graphics_tbody, trGraphics);
    
@@ -316,18 +296,8 @@ function populateGraphicsSection() {
   }
 
   let msg = acceleratedWindows + "/" + totalWindows;
-  if (acceleratedWindows) {
+  if (acceleratedWindows)
     msg += " " + mgrType;
-  } else {
-#ifdef XP_WIN
-    var feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS;
-#else
-    var feature = gfxInfo.FEATURE_OPENGL_LAYERS;
-#endif
-    var errMsg = errorMessageForFeature(feature);
-    if (errMsg)
-      msg += ". " + errMsg;
-  }
 
   appendChildren(graphics_tbody, [
     createParentElement("tr", [
diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.properties b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
index 723559d15c56..0d9fa3ce62a3 100644
--- a/toolkit/locales/en-US/chrome/global/aboutSupport.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutSupport.properties
@@ -8,16 +8,11 @@
 acceleratedWindows = GPU Accelerated Windows
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedDriver = Blocked for your graphics driver version.
-
-# LOCALIZATION NOTE The %S here is a placeholder, leave unchanged, it will get replaced by the driver version string.
-tryNewerDriver = Blocked for your graphics driver version. Try updating your graphics driver to version %S or newer.
+# The %1 here is a placeholder, leave unchanged, it will get replaced by the driver version string.
+tryNewerDriverVersion = Blocked on your graphics driver. Try updating your graphics driver to version %1 or newer.
 
 # LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedGfxCard = Blocked for your graphics card because of unresolved driver issues.
-
-# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
-blockedOSVersion = Blocked for your operating system version.
+blockedGraphicsCard = Blocked on your graphics card because of unresolved driver issues.
 
 direct2DEnabled = Direct2D Enabled
 directWriteEnabled = DirectWrite Enabled
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 7771a7ee048f..875e4cacb4ea 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -66,12 +66,6 @@ CPPSRCS = \
   nsSigHandlers.cpp \
   $(NULL)
 
-ifdef MOZ_X11
-ifndef MOZ_PLATFORM_MAEMO
-CPPSRCS += glxtest.cpp
-endif
-endif
-
 ifdef MOZ_INSTRUMENT_EVENT_LOOP
 CPPSRCS += EventTracer.cpp
 endif
diff --git a/toolkit/xre/glxtest.cpp b/toolkit/xre/glxtest.cpp
deleted file mode 100644
index 7498d1cc7cc4..000000000000
--- a/toolkit/xre/glxtest.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=8 et :
- */
-/* ***** 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 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):
- *
- * 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 ***** */
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Explanation: See bug 639842. Safely getting GL driver info on X11 is hard, because the only way to do
-// that is to create a GL context and call glGetString(), but with bad drivers,
-// just creating a GL context may crash.
-//
-// This file implements the idea to do that in a separate process.
-//
-// The only non-static function here is fire_glxtest_process(). It creates a pipe, publishes its 'read' end as the
-// mozilla::widget::glxtest_pipe global variable, forks, and runs that GLX probe in the child process,
-// which runs the glxtest() static function. This creates a X connection, a GLX context, calls glGetString, and writes that
-// to the 'write' end of the pipe.
-
-#include <cstdio>
-#include <cstdlib>
-#include <unistd.h>
-#include <GL/gl.h>
-#include <GL/glx.h>
-#include <dlfcn.h>
-#include "nscore.h"
-
-namespace mozilla {
-namespace widget {
-// the read end of the pipe, which will be used by GfxInfo
-extern int glxtest_pipe;
-// the PID of the glxtest process, to pass to waitpid()
-extern pid_t glxtest_pid;
-}
-}
-
-// the write end of the pipe, which we're going to write to
-static int write_end_of_the_pipe = -1;
-
-// C++ standard collides with C standard in that it doesn't allow casting void* to function pointer types.
-// So the work-around is to convert first to size_t.
-// http://www.trilithium.com/johan/2004/12/problem-with-dlsym/
-template<typename func_ptr_type>
-static func_ptr_type cast(void *ptr)
-{
-  return reinterpret_cast<func_ptr_type>(
-           reinterpret_cast<size_t>(ptr)
-         );
-}
-
-static void fatal_error(const char *str)
-{
-  write(write_end_of_the_pipe, str, strlen(str));
-  write(write_end_of_the_pipe, "\n", 1);
-  exit(EXIT_FAILURE);
-}
-
-static int
-x_error_handler(Display *, XErrorEvent *ev)
-{
-  enum { bufsize = 1024 };
-  char buf[bufsize];
-  int length = snprintf(buf, bufsize,
-                        "X error occurred in GLX probe, error_code=%d, request_code=%d, minor_code=%d\n",
-                        ev->error_code,
-                        ev->request_code,
-                        ev->minor_code);
-  write(write_end_of_the_pipe, buf, length);
-  exit(EXIT_FAILURE);
-  return 0;
-}
-
-static void glxtest()
-{
-  ///// Open libGL and load needed symbols /////
-  void *libgl = dlopen("libGL.so.1", RTLD_LAZY);
-  if (!libgl)
-    fatal_error("Unable to load libGL.so.1");
-
-  typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
-  PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
-
-  typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
-  PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
-
-  typedef XVisualInfo* (* PFNGLXGETVISUALFROMFBCONFIG) (Display *, GLXFBConfig);
-  PFNGLXGETVISUALFROMFBCONFIG glXGetVisualFromFBConfig = cast<PFNGLXGETVISUALFROMFBCONFIG>(dlsym(libgl, "glXGetVisualFromFBConfig"));
-
-  typedef GLXPixmap (* PFNGLXCREATEPIXMAP) (Display *, GLXFBConfig, Pixmap, const int *);
-  PFNGLXCREATEPIXMAP glXCreatePixmap = cast<PFNGLXCREATEPIXMAP>(dlsym(libgl, "glXCreatePixmap"));
-
-  typedef GLXContext (* PFNGLXCREATENEWCONTEXT) (Display *, GLXFBConfig, int, GLXContext, Bool);
-  PFNGLXCREATENEWCONTEXT glXCreateNewContext = cast<PFNGLXCREATENEWCONTEXT>(dlsym(libgl, "glXCreateNewContext"));
-
-  typedef Bool (* PFNGLXMAKECURRENT) (Display*, GLXDrawable, GLXContext);
-  PFNGLXMAKECURRENT glXMakeCurrent = cast<PFNGLXMAKECURRENT>(dlsym(libgl, "glXMakeCurrent"));
-
-  typedef void (* PFNGLXDESTROYPIXMAP) (Display *, GLXPixmap);
-  PFNGLXDESTROYPIXMAP glXDestroyPixmap = cast<PFNGLXDESTROYPIXMAP>(dlsym(libgl, "glXDestroyPixmap"));
-
-  typedef void (* PFNGLXDESTROYCONTEXT) (Display*, GLXContext);
-  PFNGLXDESTROYCONTEXT glXDestroyContext = cast<PFNGLXDESTROYCONTEXT>(dlsym(libgl, "glXDestroyContext"));
-
-  typedef GLubyte* (* PFNGLGETSTRING) (GLenum);
-  PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
-
-  if (!glXQueryExtension ||
-      !glXChooseFBConfig ||
-      !glXGetVisualFromFBConfig ||
-      !glXCreatePixmap ||
-      !glXCreateNewContext ||
-      !glXMakeCurrent ||
-      !glXDestroyPixmap ||
-      !glXDestroyContext ||
-      !glGetString)
-  {
-    fatal_error("Unable to find required symbols in libGL.so.1");
-  }
-  ///// Open a connection to the X server /////
-  Display *dpy = XOpenDisplay(NULL);
-  if (!dpy)
-    fatal_error("Unable to open a connection to the X server");
-  
-  ///// Check that the GLX extension is present /////
-  if (!glXQueryExtension(dpy, NULL, NULL))
-    fatal_error("GLX extension missing");
-
-  XSetErrorHandler(x_error_handler);
-
-  ///// Get a FBConfig and a visual /////
-  int attribs[] = {
-    GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT,
-    GLX_X_RENDERABLE, True,
-    0
-  };
-  int numReturned;
-  GLXFBConfig *fbConfigs = glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &numReturned );
-  XVisualInfo *vInfo = glXGetVisualFromFBConfig(dpy, fbConfigs[0]);
-
-  ///// Get a Pixmap and a GLXPixmap /////
-  Pixmap pixmap = XCreatePixmap(dpy, RootWindow(dpy, vInfo->screen), 4, 4, 32);
-  GLXPixmap glxpixmap = glXCreatePixmap(dpy, fbConfigs[0], pixmap, NULL);
-
-  ///// Get a GL context and make it current //////
-  GLXContext context = glXCreateNewContext(dpy, fbConfigs[0], GLX_RGBA_TYPE, NULL, True);
-  glXMakeCurrent(dpy, glxpixmap, context);
-
-  ///// Get GL vendor/renderer/versions strings /////
-  enum { bufsize = 1024 };
-  char buf[bufsize];
-  const GLubyte *vendorString = glGetString(GL_VENDOR);
-  const GLubyte *rendererString = glGetString(GL_RENDERER);
-  const GLubyte *versionString = glGetString(GL_VERSION);
-  
-  if (!vendorString || !rendererString || !versionString)
-    fatal_error("glGetString returned null");
-
-  int length = snprintf(buf, bufsize,
-                        "VENDOR\n%s\nRENDERER\n%s\nVERSION\n%s\n",
-                        vendorString,
-                        rendererString,
-                        versionString);
-  if (length >= bufsize)
-    fatal_error("GL strings length too large for buffer size");
-
-  ///// Check that no X error happened /////
-  // In case of X errors, our X error handler will exit() now.
-  // We really want to make sure that the system is able to create a GL context without generating X errors,
-  // as these would crash the application.
-  XSync(dpy, False);
-  
-  ///// Finally write data to the pipe /////
-  write(write_end_of_the_pipe, buf, length);
-
-  ///// Clean up. Indeed, the parent process might fail to kill us (e.g. if it doesn't need to check GL info)
-  ///// so we might be staying alive for longer than expected, so it's important to consume as little memory as
-  ///// possible.
-  glXDestroyContext(dpy, context);
-  glXDestroyPixmap(dpy, glxpixmap);
-  XFreePixmap(dpy, pixmap);
-  XCloseDisplay(dpy);
-  dlclose(libgl);
-}
-
-void fire_glxtest_process()
-{
-  int pfd[2];
-  if (pipe(pfd) == -1) {
-      perror("pipe");
-      exit(EXIT_FAILURE);
-  }
-  pid_t pid = fork();
-  if (pid < 0) {
-      perror("fork");
-      exit(EXIT_FAILURE);
-  }
-  if (pid == 0) {
-      close(pfd[0]);
-      write_end_of_the_pipe = pfd[1];
-      glxtest();
-      close(pfd[1]);
-      exit(EXIT_SUCCESS);
-  }
-
-  close(pfd[1]);
-  mozilla::widget::glxtest_pipe = pfd[0];
-  mozilla::widget::glxtest_pid = pid;
-}
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index afaf8cdac9c9..6dd1338626d0 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2727,12 +2727,6 @@ static DWORD InitDwriteBG(LPVOID lpdwThreadParam)
 
 PRTime gXRE_mainTimestamp = 0;
 
-#ifdef MOZ_X11
-#ifndef MOZ_PLATFORM_MAEMO
-void fire_glxtest_process();
-#endif
-#endif
-
 int
 XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
 {
@@ -2753,16 +2747,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     NS_BREAK();
 #endif
 
-  // see bug 639842
-  // it's very important to fire this process BEFORE we set up error handling.
-  // indeed, this process is expected to be crashy, and we don't want the user to see its crashes.
-  // That's the whole reason for doing this in a separate process.
-#ifdef MOZ_X11
-#ifndef MOZ_PLATFORM_MAEMO
-  fire_glxtest_process();
-#endif
-#endif
-
   SetupErrorHandling(argv[0]);
 
 #ifdef CAIRO_HAS_DWRITE_FONT
diff --git a/widget/src/gtk2/nsWidgetFactory.cpp b/widget/src/gtk2/nsWidgetFactory.cpp
index 19641db09d97..e556bb34955d 100644
--- a/widget/src/gtk2/nsWidgetFactory.cpp
+++ b/widget/src/gtk2/nsWidgetFactory.cpp
@@ -69,7 +69,6 @@
 
 #if defined(MOZ_X11)
 #include "nsIdleServiceGTK.h"
-#include "GfxInfoX11.h"
 #endif
 
 #ifdef NATIVE_THEME_SUPPORT
@@ -139,12 +138,6 @@ nsNativeThemeGTKConstructor(nsISupports *aOuter, REFNSIID aIID,
 
 #if defined(MOZ_X11)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIdleServiceGTK)
-namespace mozilla {
-namespace widget {
-// This constructor should really be shared with all platforms.
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-}
-}
 #endif
 
 #ifdef NS_PRINTING
@@ -264,7 +257,6 @@ NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
 NS_DEFINE_NAMED_CID(NS_IMAGE_TO_PIXBUF_CID);
 #if defined(MOZ_X11)
 NS_DEFINE_NAMED_CID(NS_IDLE_SERVICE_CID);
-NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
 #endif
 
 
@@ -300,7 +292,6 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_IMAGE_TO_PIXBUF_CID, false, NULL, nsImageToPixbufConstructor },
 #if defined(MOZ_X11)
     { &kNS_IDLE_SERVICE_CID, false, NULL, nsIdleServiceGTKConstructor },
-    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
 #endif
     { NULL }
 };
@@ -337,7 +328,6 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/widget/image-to-gdk-pixbuf;1", &kNS_IMAGE_TO_PIXBUF_CID },
 #if defined(MOZ_X11)
     { "@mozilla.org/widget/idleservice;1", &kNS_IDLE_SERVICE_CID },
-    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
 #endif
     { NULL }
 };
diff --git a/widget/src/qt/nsWidgetFactory.cpp b/widget/src/qt/nsWidgetFactory.cpp
index 8f1e81079422..c7cc1d3868f1 100644
--- a/widget/src/qt/nsWidgetFactory.cpp
+++ b/widget/src/qt/nsWidgetFactory.cpp
@@ -70,10 +70,6 @@
 #include "nsFilePickerProxy.h"
 #include "nsXULAppAPI.h"
 
-#if defined(MOZ_X11)
-#include "GfxInfoX11.h"
-#endif
-
 // from nsWindow.cpp
 extern PRBool gDisableNativeTheme;
 
@@ -119,16 +115,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintSession, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrintDialogServiceQt, Init)
 #endif
 
-#if defined(MOZ_X11)
-namespace mozilla {
-namespace widget {
-// This constructor should really be shared with all platforms.
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(GfxInfo, Init)
-}
-}
-#endif
-
-
 static nsresult
 nsNativeThemeQtConstructor(nsISupports *aOuter, REFNSIID aIID,
                             void **aResult)
@@ -177,11 +163,7 @@ NS_DEFINE_NAMED_CID(NS_PRINTER_ENUMERATOR_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTSESSION_CID);
 NS_DEFINE_NAMED_CID(NS_DEVICE_CONTEXT_SPEC_CID);
 NS_DEFINE_NAMED_CID(NS_PRINTDIALOGSERVICE_CID);
-#endif
-
-#if defined(MOZ_X11)
-NS_DEFINE_NAMED_CID(NS_GFXINFO_CID);
-#endif
+#endif 
 
 static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_WINDOW_CID, false, NULL, nsWindowConstructor },
@@ -207,10 +189,7 @@ static const mozilla::Module::CIDEntry kWidgetCIDs[] = {
     { &kNS_PRINTSESSION_CID, false, NULL, nsPrintSessionConstructor },
     { &kNS_DEVICE_CONTEXT_SPEC_CID, false, NULL, nsDeviceContextSpecQtConstructor },
     { &kNS_PRINTDIALOGSERVICE_CID, false, NULL, nsPrintDialogServiceQtConstructor },
-#endif
-#if defined(MOZ_X11)
-    { &kNS_GFXINFO_CID, false, NULL, mozilla::widget::GfxInfoConstructor },
-#endif
+#endif 
     { NULL }
 };
 
@@ -238,10 +217,7 @@ static const mozilla::Module::ContractIDEntry kWidgetContracts[] = {
     { "@mozilla.org/gfx/printsession;1", &kNS_PRINTSESSION_CID },
     { "@mozilla.org/gfx/devicecontextspec;1", &kNS_DEVICE_CONTEXT_SPEC_CID },
     { NS_PRINTDIALOGSERVICE_CONTRACTID, &kNS_PRINTDIALOGSERVICE_CID },
-#endif
-#if defined(MOZ_X11)
-    { "@mozilla.org/gfx/info;1", &kNS_GFXINFO_CID },
-#endif
+#endif 
     { NULL }
 };
 
diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp
deleted file mode 100644
index 4e0ed47c26c8..000000000000
--- a/widget/src/xpwidgets/GfxInfoX11.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: sw=2 ts=8 et :
- */
-/* ***** 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 Code.
- *
- * The Initial Developer of the Original Code is
- *   The Mozilla Foundation
- * Portions created by the Initial Developer are Copyright (C) 2011
- * 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 ***** */
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include "nsCRTGlue.h"
-#include "prenv.h"
-
-#include "GfxInfoX11.h"
-
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
-#include "nsExceptionHandler.h"
-#include "nsICrashReporter.h"
-#endif
-
-namespace mozilla {
-namespace widget {
-
-// these global variables will be set when firing the glxtest process
-int glxtest_pipe = 0;
-pid_t glxtest_pid = 0;
-
-nsresult
-GfxInfo::Init()
-{
-    mMajorVersion = 0;
-    mMinorVersion = 0;
-    mIsMesa = false;
-    mIsNVIDIA = false;
-    mIsFGLRX = false;
-    return GfxInfoBase::Init();
-}
-
-void
-GfxInfo::GetData()
-{
-    // to understand this function, see bug 639842. We retrieve the OpenGL driver information in a
-    // separate process to protect against bad drivers.
-
-    // if glxtest_pipe == 0, that means that we already read the information
-    if (!glxtest_pipe)
-        return;
-
-    enum { buf_size = 1024 };
-    char buf[buf_size];
-    ssize_t bytesread = read(glxtest_pipe,
-                             &buf,
-                             buf_size-1); // -1 because we'll append a zero
-    close(glxtest_pipe);
-    glxtest_pipe = 0;
-
-    // bytesread < 0 would mean that the above read() call failed. This should never happen.
-    if (bytesread < 0)
-        bytesread = 0;
-
-    // let buf be a zero-terminated string
-    buf[bytesread] = 0;
-
-    // Wait for the glxtest process to finish. This serves 2 purposes:
-    // * avoid having a zombie glxtest process laying around
-    // * get the glxtest process status info.
-    int glxtest_status = 0;
-    bool wait_for_glxtest_process = true;
-    bool waiting_for_glxtest_process_failed = false;
-    while(wait_for_glxtest_process) {
-        wait_for_glxtest_process = false;
-        if (waitpid(glxtest_pid, &glxtest_status, 0) == -1) {
-            if (errno == EINTR)
-                wait_for_glxtest_process = true;
-            else
-                waiting_for_glxtest_process_failed = true;
-        }
-    }
-
-    bool exited_with_error_code = !waiting_for_glxtest_process_failed &&
-                                  WIFEXITED(glxtest_status) && 
-                                  WEXITSTATUS(glxtest_status) != EXIT_SUCCESS;
-    bool received_signal = !waiting_for_glxtest_process_failed &&
-                           WIFSIGNALED(glxtest_status);
-
-    bool error = waiting_for_glxtest_process_failed || exited_with_error_code || received_signal;
-
-    nsCString *stringToFill = nsnull;
-    char *bufptr = buf;
-    if (!error) {
-        while(true) {
-            char *line = NS_strtok("\n", &bufptr);
-            if (!line)
-                break;
-            if (stringToFill) {
-                stringToFill->Assign(line);
-                stringToFill = nsnull;
-            }
-            else if(!strcmp(line, "VENDOR"))
-                stringToFill = &mVendor;
-            else if(!strcmp(line, "RENDERER"))
-                stringToFill = &mRenderer;
-            else if(!strcmp(line, "VERSION"))
-                stringToFill = &mVersion;
-        }
-    }
-
-    const char *spoofedVendor = PR_GetEnv("MOZ_GFX_SPOOF_GL_VENDOR");
-    if (spoofedVendor)
-        mVendor.Assign(spoofedVendor);
-    const char *spoofedRenderer = PR_GetEnv("MOZ_GFX_SPOOF_GL_RENDERER");
-    if (spoofedRenderer)
-        mRenderer.Assign(spoofedRenderer);
-    const char *spoofedVersion = PR_GetEnv("MOZ_GFX_SPOOF_GL_VERSION");
-    if (spoofedVersion)
-        mVersion.Assign(spoofedVersion);
-
-    if (error ||
-        mVendor.IsEmpty() ||
-        mRenderer.IsEmpty() ||
-        mVersion.IsEmpty())
-    {
-        mAdapterDescription.AppendLiteral("GLXtest process failed");
-        if (waiting_for_glxtest_process_failed)
-            mAdapterDescription.AppendLiteral(" (waitpid failed)");
-        if (exited_with_error_code)
-            mAdapterDescription.AppendPrintf(" (exited with status %d)", WEXITSTATUS(glxtest_status));
-        if (received_signal)
-            mAdapterDescription.AppendPrintf(" (received signal %d)", WTERMSIG(glxtest_status));
-        if (bytesread) {
-            mAdapterDescription.AppendLiteral(": ");
-            mAdapterDescription.Append(nsDependentCString(buf));
-            mAdapterDescription.AppendLiteral("\n");
-        }
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
-        CrashReporter::AppendAppNotesToCrashReport(mAdapterDescription);
-#endif
-        return;
-    }
-
-    mAdapterDescription.Append(mVendor);
-    mAdapterDescription.AppendLiteral(" -- ");
-    mAdapterDescription.Append(mRenderer);
-
-    nsCAutoString note;
-    note.Append("OpenGL: ");
-    note.Append(mAdapterDescription);
-    note.Append(" -- ");
-    note.Append(mVersion);
-    note.Append("\n");
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
-    CrashReporter::AppendAppNotesToCrashReport(note);
-#endif
-
-    // determine driver type (vendor) and where in the version string
-    // the actual driver version numbers should be expected to be found (whereToReadVersionNumbers)
-    const char *whereToReadVersionNumbers = nsnull;
-    const char *Mesa_in_version_string = strstr(mVersion.get(), "Mesa");
-    if (Mesa_in_version_string) {
-        mIsMesa = true;
-        // with Mesa, the version string contains "Mesa major.minor" and that's all the version information we get:
-        // there is no actual driver version info.
-        whereToReadVersionNumbers = Mesa_in_version_string + strlen("Mesa");
-    } else if (strstr(mVendor.get(), "NVIDIA Corporation")) {
-        mIsNVIDIA = true;
-        // with the NVIDIA driver, the version string contains "NVIDIA major.minor"
-        // note that here the vendor and version strings behave differently, that's why we don't put this above
-        // alongside Mesa_in_version_string.
-        const char *NVIDIA_in_version_string = strstr(mVersion.get(), "NVIDIA");
-        if (NVIDIA_in_version_string)
-            whereToReadVersionNumbers = NVIDIA_in_version_string + strlen("NVIDIA");
-    } else if (strstr(mVendor.get(), "ATI Technologies Inc")) {
-        mIsFGLRX = true;
-        // with the FGLRX driver, the version string only gives a OpenGL version :/ so let's return that.
-        // that can at least give a rough idea of how old the driver is.
-        whereToReadVersionNumbers = mVersion.get();
-    }
-
-    // read major.minor version numbers
-    if (whereToReadVersionNumbers) {
-        // copy into writable buffer, for tokenization
-        strncpy(buf, whereToReadVersionNumbers, buf_size);
-        bufptr = buf;
-
-        // now try to read major.minor version numbers. In case of failure, gracefully exit: these numbers have
-        // been initialized as 0 anyways
-        char *token = NS_strtok(".", &bufptr);
-        if (token) {
-            mMajorVersion = strtol(token, 0, 10);
-            token = NS_strtok(".", &bufptr);
-            if (token)
-                mMinorVersion = strtol(token, 0, 10);
-        }
-    }
-}
-
-static inline PRUint64 version(PRUint32 major, PRUint32 minor)
-{
-    return (PRUint64(major) << 32) + PRUint64(minor);
-}
-
-nsresult
-GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo /* = nsnull */)
-{
-    GetData();
-    *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
-    aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
-
-#ifdef MOZ_PLATFORM_MAEMO
-    // on Maemo, the glxtest probe doesn't build, and we don't really need GfxInfo anyway
-    return NS_OK;
-#endif
-
-    // whitelist the linux test slaves' current configuration.
-    // this is necessary as they're still using the slightly outdated 190.42 driver.
-    // this isn't a huge risk, as at least this is the exact setting in which we do continuous testing,
-    // and this only affects GeForce 9400 cards on linux on this precise driver version, which is very few users.
-    // We do the same thing on Windows XP, see in widget/src/windows/GfxInfo.cpp
-    if (mIsNVIDIA &&
-        !strcmp(mRenderer.get(), "GeForce 9400/PCI/SSE2") &&
-        !strcmp(mVersion.get(), "3.2.0 NVIDIA 190.42"))
-    {
-        return NS_OK;
-    }
-
-    if (mIsMesa) {
-        if (version(mMajorVersion, mMinorVersion) < version(7,10)) {
-            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
-            aSuggestedDriverVersion.AssignLiteral("Mesa 7.10");
-        }
-        else if (strstr(mRenderer.get(), "Gallium")) {
-            // see bug 624935
-            // and http://marc.info/?l=mesa3d-dev&m=126525088903956&w=2
-            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
-            aSuggestedDriverVersion.AssignLiteral("<NOT Gallium>");
-        }
-    } else if (mIsNVIDIA) {
-        if (version(mMajorVersion, mMinorVersion) < version(257,21)) {
-            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
-            aSuggestedDriverVersion.AssignLiteral("NVIDIA 257.21");
-        }
-    } else if (mIsFGLRX) {
-        // FGLRX does not report a driver version number, so we have the OpenGL version instead.
-        // by requiring OpenGL 3, we effectively require recent drivers.
-        if (version(mMajorVersion, mMinorVersion) < version(3, 0)) {
-            *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION;
-        }
-    } else {
-        // like on windows, let's block unknown vendors. Think of virtual machines.
-        // Also, this case is hit whenever the GLXtest probe failed to get driver info or crashed.
-        *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
-    }
-  return NS_OK;
-}
-
-
-NS_IMETHODIMP
-GfxInfo::GetD2DEnabled(PRBool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-GfxInfo::GetDWriteEnabled(PRBool *aEnabled)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString DWriteVersion; */
-NS_IMETHODIMP
-GfxInfo::GetDWriteVersion(nsAString & aDwriteVersion)
-{
-  return NS_ERROR_FAILURE;
-}
-
-/* readonly attribute DOMString adapterDescription; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDescription(nsAString & aAdapterDescription)
-{
-  GetData();
-  AppendASCIItoUTF16(mAdapterDescription, aAdapterDescription);
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterRAM; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterRAM(nsAString & aAdapterRAM)
-{
-  aAdapterRAM.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriver; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriver(nsAString & aAdapterDriver)
-{
-  aAdapterDriver.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverVersion; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverVersion(nsAString & aAdapterDriverVersion)
-{
-  GetData();
-  CopyASCIItoUTF16(mVersion, aAdapterDriverVersion);
-  return NS_OK;
-}
-
-/* readonly attribute DOMString adapterDriverDate; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDriverDate(nsAString & aAdapterDriverDate)
-{
-  aAdapterDriverDate.AssignLiteral("");
-  return NS_OK;
-}
-
-/* readonly attribute unsigned long adapterVendorID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterVendorID(PRUint32 *aAdapterVendorID)
-{
-  *aAdapterVendorID = 0;
-  return NS_OK;
-}
-
-/* readonly attribute unsigned long adapterDeviceID; */
-NS_IMETHODIMP
-GfxInfo::GetAdapterDeviceID(PRUint32 *aAdapterDeviceID)
-{
-  *aAdapterDeviceID = 0;
-  return NS_OK;
-}
-
-
-} // end namespace widget
-} // end namespace mozilla
diff --git a/widget/src/xpwidgets/GfxInfoX11.h b/widget/src/xpwidgets/GfxInfoX11.h
deleted file mode 100644
index f0457b3a4f20..000000000000
--- a/widget/src/xpwidgets/GfxInfoX11.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* vim: se cin sw=2 ts=2 et : */
-/* -*- 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 mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * 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 ***** */
-
-#ifndef __GfxInfoX11_h__
-#define __GfxInfoX11_h__
-
-#include "GfxInfoBase.h"
-
-namespace mozilla {
-namespace widget {
-
-class GfxInfo : public GfxInfoBase
-{
-public:
-
-  // We only declare the subset of nsIGfxInfo that we actually implement. The
-  // rest is brought forward from GfxInfoBase.
-  NS_SCRIPTABLE NS_IMETHOD GetD2DEnabled(PRBool *aD2DEnabled);
-  NS_SCRIPTABLE NS_IMETHOD GetDWriteEnabled(PRBool *aDWriteEnabled);
-  NS_SCRIPTABLE NS_IMETHOD GetDWriteVersion(nsAString & aDwriteVersion);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterDescription(nsAString & aAdapterDescription);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriver(nsAString & aAdapterDriver);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterVendorID(PRUint32 *aAdapterVendorID);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterDeviceID(PRUint32 *aAdapterDeviceID);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterRAM(nsAString & aAdapterRAM);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverVersion(nsAString & aAdapterDriverVersion);
-  NS_SCRIPTABLE NS_IMETHOD GetAdapterDriverDate(nsAString & aAdapterDriverDate);
-  using GfxInfoBase::GetFeatureStatus;
-  using GfxInfoBase::GetFeatureSuggestedDriverVersion;
-  using GfxInfoBase::GetWebGLParameter;
-
-  virtual nsresult Init();
-
-protected:
-
-  virtual nsresult GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo = nsnull);
-
-private:
-  nsCString mVendor;
-  nsCString mRenderer;
-  nsCString mVersion;
-  nsCString mAdapterDescription;
-  bool mIsMesa, mIsNVIDIA, mIsFGLRX;
-  int mMajorVersion, mMinorVersion;
-
-  void AddCrashReportAnnotations();
-  void GetData();
-};
-
-} // namespace widget
-} // namespace mozilla
-
-#endif /* __GfxInfoX11_h__ */
diff --git a/widget/src/xpwidgets/Makefile.in b/widget/src/xpwidgets/Makefile.in
index 8e73b77a0495..1b101db2ce9a 100644
--- a/widget/src/xpwidgets/Makefile.in
+++ b/widget/src/xpwidgets/Makefile.in
@@ -75,11 +75,6 @@ CPPSRCS		= \
 		nsFilePickerProxy.cpp \
 		$(NULL)
 
-ifdef MOZ_X11
-CPPSRCS		+= \
-		GfxInfoX11.cpp
-endif
-
 ifneq (,$(filter os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsBaseClipboard.cpp
 endif

From 020b76968f26093bf801e6c0d3097b93267cec3f Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Tue, 3 May 2011 17:12:58 -0700
Subject: [PATCH 232/314] Bug 633653 - revamp about:memory. 
 r=vlad,sdwilsh,dvander,gavin,ehsan,edwsmith;  sr=benjamin.

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp |   5 +-
 dom/ipc/ContentChild.cpp                      |   4 +-
 gfx/thebes/gfxASurface.cpp                    |  50 +-
 gfx/thebes/gfxWindowsPlatform.cpp             |   6 +-
 ipc/glue/SharedMemory.cpp                     |  10 +-
 js/src/assembler/jit/ExecutableAllocator.cpp  |  16 +
 js/src/assembler/jit/ExecutableAllocator.h    |  91 ++-
 .../assembler/jit/ExecutableAllocatorOS2.cpp  |   4 +-
 .../jit/ExecutableAllocatorPosix.cpp          |   6 +-
 .../jit/ExecutableAllocatorSymbian.cpp        |   4 +-
 .../assembler/jit/ExecutableAllocatorWin.cpp  |   4 +-
 js/src/jscntxt.h                              |   5 +-
 js/src/jscompartment.cpp                      |   8 +
 js/src/jscompartment.h                        |  11 +
 js/src/jstracer.cpp                           |  28 +
 js/src/jstracer.h                             |   2 +
 js/src/methodjit/Compiler.cpp                 |  42 +-
 js/src/methodjit/MethodJIT.cpp                |   4 +-
 js/src/methodjit/MethodJIT.h                  |   2 -
 js/src/nanojit/Allocator.cpp                  |  12 +
 js/src/nanojit/Allocator.h                    |   3 +
 js/src/nanojit/CodeAlloc.cpp                  |  13 +-
 js/src/nanojit/CodeAlloc.h                    |   3 +
 js/src/shell/js.cpp                           |  26 +-
 js/src/xpconnect/src/xpcjsruntime.cpp         | 151 +++-
 layout/base/nsPresShell.cpp                   |   9 +-
 modules/libpr0n/src/imgLoader.cpp             |  32 +-
 storage/src/mozStorageConnection.cpp          |  27 +-
 storage/src/mozStorageService.cpp             |  14 +-
 toolkit/components/aboutmemory/Makefile.in    |   4 +
 .../aboutmemory/content/aboutMemory.css       |  50 +-
 .../aboutmemory/content/aboutMemory.js        | 668 ++++++++++++++----
 .../aboutmemory/content/aboutMemory.xhtml     |  46 +-
 .../components/aboutmemory/tests/Makefile.in  |  51 ++
 .../aboutmemory/tests/chrome/Makefile.in      |  53 ++
 .../tests/chrome/test_aboutmemory.xul         | 267 +++++++
 xpcom/base/nsIMemoryReporter.idl              |  34 +-
 xpcom/base/nsMemoryReporterManager.cpp        | 352 +++++----
 38 files changed, 1602 insertions(+), 515 deletions(-)
 create mode 100644 toolkit/components/aboutmemory/tests/Makefile.in
 create mode 100644 toolkit/components/aboutmemory/tests/chrome/Makefile.in
 create mode 100644 toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 49c4af92fde6..d65147e5bfa1 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -173,8 +173,9 @@ static PRInt64 GetCanvasMemoryUsed(void *) {
 }
 
 NS_MEMORY_REPORTER_IMPLEMENT(CanvasMemory,
-                             "content/canvas/2d_pixel_bytes",
-                             "Total memory used by 2D canvas (width * height * 4)",
+                             "heap-used/content/canvas/2d-pixel-bytes",
+                             "Memory used by 2D canvases. Each canvas "
+                             "requires (width * height * 4) bytes.",
                              GetCanvasMemoryUsed,
                              NULL)
 
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index 7f99ae6edfef..d631d6aa7764 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -319,7 +319,9 @@ ContentChild::RecvPMemoryReportRequestConstructor(PMemoryReportRequestChild* chi
       report->GetDescription(getter_Copies(desc));
       report->GetMemoryUsed(&memoryUsed);
 
-      MemoryReport memreport(nsPrintfCString("Content Process - %d - ", getpid()),
+      static const int maxLength = 31;   // big enough; pid is only a few chars
+      MemoryReport memreport(nsPrintfCString(maxLength, "Content (%d)",
+                                             getpid()),
                              path,
                              desc,
                              memoryUsed);
diff --git a/gfx/thebes/gfxASurface.cpp b/gfx/thebes/gfxASurface.cpp
index 08f499fed805..a9ab802de835 100644
--- a/gfx/thebes/gfxASurface.cpp
+++ b/gfx/thebes/gfxASurface.cpp
@@ -521,30 +521,30 @@ gfxASurface::MovePixels(const nsIntRect& aSourceRect,
 /** Memory reporting **/
 
 static const char *sSurfaceNamesForSurfaceType[] = {
-    "gfx/surface/image",
-    "gfx/surface/pdf",
-    "gfx/surface/ps",
-    "gfx/surface/xlib",
-    "gfx/surface/xcb",
-    "gfx/surface/glitz",
-    "gfx/surface/quartz",
-    "gfx/surface/win32",
-    "gfx/surface/beos",
-    "gfx/surface/directfb",
-    "gfx/surface/svg",
-    "gfx/surface/os2",
-    "gfx/surface/win32printing",
-    "gfx/surface/quartzimage",
-    "gfx/surface/script",
-    "gfx/surface/qpainter",
-    "gfx/surface/recording",
-    "gfx/surface/vg",
-    "gfx/surface/gl",
-    "gfx/surface/drm",
-    "gfx/surface/tee",
-    "gfx/surface/xml",
-    "gfx/surface/skia",
-    "gfx/surface/d2d"
+    "heap-used/gfx/surface/image",
+    "heap-used/gfx/surface/pdf",
+    "heap-used/gfx/surface/ps",
+    "heap-used/gfx/surface/xlib",
+    "heap-used/gfx/surface/xcb",
+    "heap-used/gfx/surface/glitz",
+    "heap-used/gfx/surface/quartz",
+    "heap-used/gfx/surface/win32",
+    "heap-used/gfx/surface/beos",
+    "heap-used/gfx/surface/directfb",
+    "heap-used/gfx/surface/svg",
+    "heap-used/gfx/surface/os2",
+    "heap-used/gfx/surface/win32printing",
+    "heap-used/gfx/surface/quartzimage",
+    "heap-used/gfx/surface/script",
+    "heap-used/gfx/surface/qpainter",
+    "heap-used/gfx/surface/recording",
+    "heap-used/gfx/surface/vg",
+    "heap-used/gfx/surface/gl",
+    "heap-used/gfx/surface/drm",
+    "heap-used/gfx/surface/tee",
+    "heap-used/gfx/surface/xml",
+    "heap-used/gfx/surface/skia",
+    "heap-used/gfx/surface/d2d"
 };
 
 PR_STATIC_ASSERT(NS_ARRAY_LENGTH(sSurfaceNamesForSurfaceType) == gfxASurface::SurfaceTypeMax);
@@ -558,7 +558,7 @@ SurfaceMemoryReporterPathForType(gfxASurface::gfxSurfaceType aType)
 {
     if (aType < 0 ||
         aType >= gfxASurface::SurfaceTypeMax)
-        return "gfx/surface/unknown";
+        return "heap-used/gfx/surface/unknown";
 
     return sSurfaceNamesForSurfaceType[aType];
 }
diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp
index d4d3589cf963..fe31539831af 100644
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -96,12 +96,12 @@ public:
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD GetPath(char **memoryPath) {
-        *memoryPath = strdup("gfx/d2d/surfacecache");
+        *memoryPath = strdup("gfx-d2d-surfacecache");
         return NS_OK;
     }
 
     NS_IMETHOD GetDescription(char **desc) {
-        *desc = strdup("Memory used by Direct2D internal surface cache.");
+        *desc = strdup("Memory used by the Direct2D internal surface cache.");
         return NS_OK;
     }
 
@@ -123,7 +123,7 @@ public:
     NS_DECL_ISUPPORTS
 
     NS_IMETHOD GetPath(char **memoryPath) {
-        *memoryPath = strdup("gfx/d2d/surfacevram");
+        *memoryPath = strdup("gfx-d2d-surfacevram");
         return NS_OK;
     }
 
diff --git a/ipc/glue/SharedMemory.cpp b/ipc/glue/SharedMemory.cpp
index ab3cdcf8b621..a28520b1eb28 100644
--- a/ipc/glue/SharedMemory.cpp
+++ b/ipc/glue/SharedMemory.cpp
@@ -52,13 +52,15 @@ static PRInt64 GetShmemAllocated(void*) { return gShmemAllocated; }
 static PRInt64 GetShmemMapped(void*) { return gShmemMapped; }
 
 NS_MEMORY_REPORTER_IMPLEMENT(ShmemAllocated,
-                             "shmem/allocated",
-                             "Shmem bytes accessible (not necessarily mapped)",
+                             "shmem-allocated",
+                             "Memory shared with other processes that is "
+                             "accessible (but not necessarily mapped).",
                              GetShmemAllocated,
                              nsnull)
 NS_MEMORY_REPORTER_IMPLEMENT(ShmemMapped,
-                             "shmem/mapped",
-                             "Shmem bytes mapped into address space",
+                             "shmem-mapped",
+                             "Memory shared with other processes that is "
+                             "mapped into the address space.",
                              GetShmemMapped,
                              nsnull)
 
diff --git a/js/src/assembler/jit/ExecutableAllocator.cpp b/js/src/assembler/jit/ExecutableAllocator.cpp
index 8c1eebc68135..14c747915ff1 100644
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -32,6 +32,22 @@ namespace JSC {
 size_t ExecutableAllocator::pageSize = 0;
 size_t ExecutableAllocator::largeAllocSize = 0;
 
+ExecutablePool::~ExecutablePool()
+{
+    m_allocator->releasePoolPages(this);
+}
+
+size_t
+ExecutableAllocator::getCodeSize() const
+{
+    size_t n = 0;
+    for (ExecPoolHashSet::Range r = m_pools.all(); !r.empty(); r.popFront()) {
+        ExecutablePool* pool = r.front();
+        n += pool->m_allocation.size;
+    }
+    return n;
+}
+
 }
 
 #endif // HAVE(ASSEMBLER)
diff --git a/js/src/assembler/jit/ExecutableAllocator.h b/js/src/assembler/jit/ExecutableAllocator.h
index 8be6cd47b68d..02b4f8a6d487 100644
--- a/js/src/assembler/jit/ExecutableAllocator.h
+++ b/js/src/assembler/jit/ExecutableAllocator.h
@@ -31,6 +31,7 @@
 #include "assembler/wtf/Assertions.h"
 
 #include "jsapi.h"
+#include "jshashtable.h"
 #include "jsprvtd.h"
 #include "jsvector.h"
 #include "jslock.h"
@@ -78,6 +79,8 @@ extern  "C" void sync_instruction_memory(caddr_t v, u_int len);
 
 namespace JSC {
 
+  class ExecutableAllocator;
+
   // These are reference-counted. A new one starts with a count of 1. 
   class ExecutablePool {
 
@@ -92,6 +95,7 @@ private:
 #endif
     };
 
+    ExecutableAllocator* m_allocator;
     char* m_freePtr;
     char* m_end;
     Allocation m_allocation;
@@ -126,17 +130,12 @@ private:
         ++m_refCount;
     }
 
-private:
-    ExecutablePool(Allocation a)
-      : m_freePtr(a.pages), m_end(m_freePtr + a.size), m_allocation(a), m_refCount(1),
-        m_destroy(false), m_gcNumber(0)
+    ExecutablePool(ExecutableAllocator* allocator, Allocation a)
+      : m_allocator(allocator), m_freePtr(a.pages), m_end(m_freePtr + a.size), m_allocation(a),
+        m_refCount(1), m_destroy(false), m_gcNumber(0)
     { }
 
-    ~ExecutablePool()
-    {
-        if (m_allocation.pages)
-            ExecutablePool::systemRelease(m_allocation);
-    }
+    ~ExecutablePool();
 
     void* alloc(size_t n)
     {
@@ -150,14 +149,10 @@ private:
         JS_ASSERT(m_end >= m_freePtr);
         return m_end - m_freePtr;
     }
-
-    // On OOM, this will return an Allocation where pages is NULL.
-    static Allocation systemAlloc(size_t n);
-    static void systemRelease(const Allocation& alloc);
 };
 
 class ExecutableAllocator {
-    enum ProtectionSeting { Writable, Executable };
+    enum ProtectionSetting { Writable, Executable };
 
 public:
     ExecutableAllocator()
@@ -175,13 +170,14 @@ public:
             largeAllocSize = pageSize * 16;
         }
 
-        JS_ASSERT(m_smallAllocationPools.empty());
+        JS_ASSERT(m_smallPools.empty());
     }
 
     ~ExecutableAllocator()
     {
-        for (size_t i = 0; i < m_smallAllocationPools.length(); i++)
-            m_smallAllocationPools[i]->release(/* willDestroy = */true);
+        for (size_t i = 0; i < m_smallPools.length(); i++)
+            m_smallPools[i]->release(/* willDestroy = */true);
+        JS_ASSERT(m_pools.empty());     // if this asserts we have a pool leak
     }
 
     // alloc() returns a pointer to some memory, and also (by reference) a
@@ -209,6 +205,14 @@ public:
         return result;
     }
 
+    void releasePoolPages(ExecutablePool *pool) {
+        JS_ASSERT(pool->m_allocation.pages);
+        systemRelease(pool->m_allocation);
+        m_pools.remove(m_pools.lookup(pool));   // this asserts if |pool| is not in m_pools
+    }
+
+    size_t getCodeSize() const;
+
 private:
     static size_t pageSize;
     static size_t largeAllocSize;
@@ -233,20 +237,34 @@ private:
         return size;
     }
 
+    // On OOM, this will return an Allocation where pages is NULL.
+    static ExecutablePool::Allocation systemAlloc(size_t n);
+    static void systemRelease(const ExecutablePool::Allocation& alloc);
+
     ExecutablePool* createPool(size_t n)
     {
         size_t allocSize = roundUpAllocationSize(n, pageSize);
         if (allocSize == OVERSIZE_ALLOCATION)
             return NULL;
+
+        if (!m_pools.initialized() && !m_pools.init())
+            return NULL;
+
 #ifdef DEBUG_STRESS_JSC_ALLOCATOR
-        ExecutablePool::Allocation a = ExecutablePool::systemAlloc(size_t(4294967291));
+        ExecutablePool::Allocation a = systemAlloc(size_t(4294967291));
 #else
-        ExecutablePool::Allocation a = ExecutablePool::systemAlloc(allocSize);
+        ExecutablePool::Allocation a = systemAlloc(allocSize);
 #endif
         if (!a.pages)
             return NULL;
 
-        return js::OffTheBooks::new_<ExecutablePool>(a);
+        ExecutablePool *pool = js::OffTheBooks::new_<ExecutablePool>(this, a);
+        if (!pool) {
+            systemRelease(a);
+            return NULL;
+        }
+        m_pools.put(pool);
+        return pool;
     }
 
     ExecutablePool* poolForSize(size_t n)
@@ -258,8 +276,8 @@ private:
         // allocation fitting in a small pool, and (b) it minimizes the
         // potential waste when a small pool is next abandoned.
         ExecutablePool *minPool = NULL;
-        for (size_t i = 0; i < m_smallAllocationPools.length(); i++) {
-            ExecutablePool *pool = m_smallAllocationPools[i];
+        for (size_t i = 0; i < m_smallPools.length(); i++) {
+            ExecutablePool *pool = m_smallPools[i];
             if (n <= pool->available() && (!minPool || pool->available() < minPool->available()))
                 minPool = pool;
         }
@@ -279,26 +297,26 @@ private:
             return NULL;
   	    // At this point, local |pool| is the owner.
 
-        if (m_smallAllocationPools.length() < maxSmallPools) {
+        if (m_smallPools.length() < maxSmallPools) {
             // We haven't hit the maximum number of live pools;  add the new pool.
-            m_smallAllocationPools.append(pool);
+            m_smallPools.append(pool);
             pool->addRef();
         } else {
             // Find the pool with the least space.
             int iMin = 0;
-            for (size_t i = 1; i < m_smallAllocationPools.length(); i++)
-                if (m_smallAllocationPools[i]->available() <
-                    m_smallAllocationPools[iMin]->available())
+            for (size_t i = 1; i < m_smallPools.length(); i++)
+                if (m_smallPools[i]->available() <
+                    m_smallPools[iMin]->available())
                 {
                     iMin = i;
                 }
 
             // If the new allocator will result in more free space than the small
             // pool with the least space, then we will use it instead
-            ExecutablePool *minPool = m_smallAllocationPools[iMin];
+            ExecutablePool *minPool = m_smallPools[iMin];
             if ((pool->available() - n) > minPool->available()) {
                 minPool->release();
-                m_smallAllocationPools[iMin] = pool;
+                m_smallPools[iMin] = pool;
                 pool->addRef();
             }
         }
@@ -411,12 +429,21 @@ public:
 private:
 
 #if ENABLE_ASSEMBLER_WX_EXCLUSIVE
-    static void reprotectRegion(void*, size_t, ProtectionSeting);
+    static void reprotectRegion(void*, size_t, ProtectionSetting);
 #endif
 
+    // These are strong references;  they keep pools alive.
     static const size_t maxSmallPools = 4;
-    typedef js::Vector<ExecutablePool *, maxSmallPools, js::SystemAllocPolicy > SmallExecPoolVector;
-    SmallExecPoolVector m_smallAllocationPools;
+    typedef js::Vector<ExecutablePool *, maxSmallPools, js::SystemAllocPolicy> SmallExecPoolVector;
+    SmallExecPoolVector m_smallPools;
+
+    // All live pools are recorded here, just for stats purposes.  These are
+    // weak references;  they don't keep pools alive.  When a pool is destroyed
+    // its reference is removed from m_pools.
+    typedef js::HashSet<ExecutablePool *, js::DefaultHasher<ExecutablePool *>, js::SystemAllocPolicy>
+            ExecPoolHashSet;
+    ExecPoolHashSet m_pools;    // All pools, just for stats purposes.
+
     static size_t determinePageSize();
 };
 
diff --git a/js/src/assembler/jit/ExecutableAllocatorOS2.cpp b/js/src/assembler/jit/ExecutableAllocatorOS2.cpp
index 03089bd8adca..ef9e27d92b47 100644
--- a/js/src/assembler/jit/ExecutableAllocatorOS2.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorOS2.cpp
@@ -38,7 +38,7 @@ size_t ExecutableAllocator::determinePageSize()
     return 4096u;
 }
 
-ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
+ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
 {
     void* allocation = NULL;
     if (DosAllocMem(&allocation, n, OBJ_ANY|PAG_COMMIT|PAG_READ|PAG_WRITE) &&
@@ -48,7 +48,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
     return alloc;
 }
 
-void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
+void ExecutableAllocator::systemRelease(const ExecutablePool::Allocation& alloc)
 {
     DosFreeMem(alloc.pages);
 }
diff --git a/js/src/assembler/jit/ExecutableAllocatorPosix.cpp b/js/src/assembler/jit/ExecutableAllocatorPosix.cpp
index b67e21e67892..50efd932e02a 100644
--- a/js/src/assembler/jit/ExecutableAllocatorPosix.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorPosix.cpp
@@ -38,7 +38,7 @@ size_t ExecutableAllocator::determinePageSize()
     return getpagesize();
 }
 
-ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
+ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
 {
     void* allocation = mmap(NULL, n, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
     if (allocation == MAP_FAILED)
@@ -47,14 +47,14 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
     return alloc;
 }
 
-void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
+void ExecutableAllocator::systemRelease(const ExecutablePool::Allocation& alloc)
 { 
     int result = munmap(alloc.pages, alloc.size);
     ASSERT_UNUSED(result, !result);
 }
 
 #if WTF_ENABLE_ASSEMBLER_WX_EXCLUSIVE
-void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSetting setting)
 {
     if (!pageSize)
         intializePageSize();
diff --git a/js/src/assembler/jit/ExecutableAllocatorSymbian.cpp b/js/src/assembler/jit/ExecutableAllocatorSymbian.cpp
index 73e3358a91f9..c66fa80fff12 100644
--- a/js/src/assembler/jit/ExecutableAllocatorSymbian.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorSymbian.cpp
@@ -47,7 +47,7 @@ size_t ExecutableAllocator::determinePageSize()
 #endif
 }
 
-ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
+ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
 {
     RChunk* codeChunk = new RChunk();
 
@@ -58,7 +58,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
     return alloc;
 }
 
-void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
+void ExecutableAllocator::systemRelease(const ExecutablePool::Allocation& alloc)
 { 
     alloc.chunk->Close();
     delete alloc.chunk;
diff --git a/js/src/assembler/jit/ExecutableAllocatorWin.cpp b/js/src/assembler/jit/ExecutableAllocatorWin.cpp
index 9d24b46ab1da..f5775608f36f 100644
--- a/js/src/assembler/jit/ExecutableAllocatorWin.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorWin.cpp
@@ -39,14 +39,14 @@ size_t ExecutableAllocator::determinePageSize()
     return system_info.dwPageSize;
 }
 
-ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t n)
+ExecutablePool::Allocation ExecutableAllocator::systemAlloc(size_t n)
 {
     void *allocation = VirtualAlloc(0, n, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
     ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocation), n};
     return alloc;
 }
 
-void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
+void ExecutableAllocator::systemRelease(const ExecutablePool::Allocation& alloc)
 { 
     VirtualFree(alloc.pages, 0, MEM_RELEASE); 
 }
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 4461ff3dd080..b068f1251449 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -702,9 +702,10 @@ struct JSRuntime {
     JSPreWrapCallback    preWrapObjectCallback;
 
 #ifdef JS_METHODJIT
-    uint32               mjitMemoryUsed;
+    /* This measures the size of JITScripts, native maps and IC structs. */
+    size_t               mjitDataSize;
 #endif
-    uint32               stringMemoryUsed;
+    size_t               stringMemoryUsed;
 
     JSRuntime();
     ~JSRuntime();
diff --git a/js/src/jscompartment.cpp b/js/src/jscompartment.cpp
index 60d44e1611df..b6335a013975 100644
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -165,6 +165,14 @@ JSCompartment::init()
 #endif
 }
 
+#ifdef JS_METHODJIT
+size_t
+JSCompartment::getMjitCodeSize() const
+{
+    return jaegerCompartment->execAlloc()->getCodeSize();
+}
+#endif
+
 bool
 JSCompartment::arenaListsAreEmpty()
 {
diff --git a/js/src/jscompartment.h b/js/src/jscompartment.h
index 92194b396d43..9b9c1dceb84c 100644
--- a/js/src/jscompartment.h
+++ b/js/src/jscompartment.h
@@ -285,6 +285,10 @@ struct TraceMonitor {
     void mark(JSTracer *trc);
 
     bool outOfMemory() const;
+
+    JS_FRIEND_API(void) getCodeAllocStats(size_t &total, size_t &frag_size, size_t &free_size) const;
+    JS_FRIEND_API(size_t) getVMAllocatorsMainSize() const;
+    JS_FRIEND_API(size_t) getVMAllocatorsReserveSize() const;
 };
 
 namespace mjit {
@@ -409,6 +413,13 @@ struct JS_FRIEND_API(JSCompartment) {
 
 #ifdef JS_METHODJIT
     js::mjit::JaegerCompartment  *jaegerCompartment;
+    /*
+     * This function is here so that xpconnect/src/xpcjsruntime.cpp doesn't
+     * need to see the declaration of JaegerCompartment, which would require
+     * #including MethodJIT.h into xpconnect/src/xpcjsruntime.cpp, which is
+     * difficult due to reasons explained in bug 483677.
+     */
+    size_t getMjitCodeSize() const;
 #endif
 
     /*
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index ec67ba19a588..0567f51d05b8 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -2461,6 +2461,34 @@ TraceMonitor::outOfMemory() const
            traceAlloc->outOfMemory();
 }
 
+void
+TraceMonitor::getCodeAllocStats(size_t &total, size_t &frag_size, size_t &free_size) const
+{
+    if (codeAlloc) {
+        codeAlloc->getStats(total, frag_size, free_size);
+    } else {
+        total = 0;
+        frag_size = 0;
+        free_size = 0;
+    }
+}
+
+size_t
+TraceMonitor::getVMAllocatorsMainSize() const
+{
+    return dataAlloc->getBytesAllocated() +
+           traceAlloc->getBytesAllocated() +
+           tempAlloc->getBytesAllocated();
+}
+
+size_t
+TraceMonitor::getVMAllocatorsReserveSize() const
+{
+    return dataAlloc->mReserveSize +
+           traceAlloc->mReserveSize +
+           tempAlloc->mReserveSize;
+}
+
 /*
  * This function destroys the recorder after a successful recording, possibly
  * starting a suspended outer recorder.
diff --git a/js/src/jstracer.h b/js/src/jstracer.h
index 004015e20d5d..8985dd9fd937 100644
--- a/js/src/jstracer.h
+++ b/js/src/jstracer.h
@@ -409,6 +409,7 @@ public:
       : mOutOfMemory(false)
       , mSize(0)
       , mReserve(reserve)
+      , mReserveSize(reserveSize)
       , mReserveCurr(uintptr_t(reserve))
       , mReserveLimit(uintptr_t(reserve + reserveSize))
       , mRt(rt)
@@ -470,6 +471,7 @@ public:
 
     /* See nanojit::Allocator::allocChunk() for details on these. */
     char* mReserve;
+    size_t mReserveSize;
     uintptr_t mReserveCurr;
     uintptr_t mReserveLimit;
 
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index f480869fb0f8..dc89f99476ee 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -404,24 +404,24 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
 #endif
     JaegerSpew(JSpew_Insns, "## Fast code (masm) size = %u, Slow code (stubcc) size = %u.\n", masm.size(), stubcc.size());
 
-    size_t totalSize = masm.size() +
-                       stubcc.size() +
-                       doubleList.length() * sizeof(double) +
-                       jumpTableOffsets.length() * sizeof(void *);
+    size_t codeSize = masm.size() +
+                      stubcc.size() +
+                      doubleList.length() * sizeof(double) +
+                      jumpTableOffsets.length() * sizeof(void *);
 
     JSC::ExecutablePool *execPool;
     uint8 *result =
-        (uint8 *)script->compartment->jaegerCompartment->execAlloc()->alloc(totalSize, &execPool);
+        (uint8 *)script->compartment->jaegerCompartment->execAlloc()->alloc(codeSize, &execPool);
     if (!result) {
         js_ReportOutOfMemory(cx);
         return Compile_Error;
     }
     JS_ASSERT(execPool);
-    JSC::ExecutableAllocator::makeWritable(result, totalSize);
+    JSC::ExecutableAllocator::makeWritable(result, codeSize);
     masm.executableCopy(result);
     stubcc.masm.executableCopy(result + masm.size());
     
-    JSC::LinkBuffer fullCode(result, totalSize);
+    JSC::LinkBuffer fullCode(result, codeSize);
     JSC::LinkBuffer stubCode(result + masm.size(), stubcc.size());
 
     size_t nNmapLive = 0;
@@ -432,23 +432,23 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
     }
 
     /* Please keep in sync with JITScript::scriptDataSize! */
-    size_t totalBytes = sizeof(JITScript) +
-                        sizeof(NativeMapEntry) * nNmapLive +
+    size_t dataSize = sizeof(JITScript) +
+                      sizeof(NativeMapEntry) * nNmapLive +
 #if defined JS_MONOIC
-                        sizeof(ic::GetGlobalNameIC) * getGlobalNames.length() +
-                        sizeof(ic::SetGlobalNameIC) * setGlobalNames.length() +
-                        sizeof(ic::CallICInfo) * callICs.length() +
-                        sizeof(ic::EqualityICInfo) * equalityICs.length() +
-                        sizeof(ic::TraceICInfo) * traceICs.length() +
+                      sizeof(ic::GetGlobalNameIC) * getGlobalNames.length() +
+                      sizeof(ic::SetGlobalNameIC) * setGlobalNames.length() +
+                      sizeof(ic::CallICInfo) * callICs.length() +
+                      sizeof(ic::EqualityICInfo) * equalityICs.length() +
+                      sizeof(ic::TraceICInfo) * traceICs.length() +
 #endif
 #if defined JS_POLYIC
-                        sizeof(ic::PICInfo) * pics.length() +
-                        sizeof(ic::GetElementIC) * getElemICs.length() +
-                        sizeof(ic::SetElementIC) * setElemICs.length() +
+                       sizeof(ic::PICInfo) * pics.length() +
+                       sizeof(ic::GetElementIC) * getElemICs.length() +
+                       sizeof(ic::SetElementIC) * setElemICs.length() +
 #endif
-                        sizeof(CallSite) * callSites.length();
+                       sizeof(CallSite) * callSites.length();
 
-    uint8 *cursor = (uint8 *)cx->calloc_(totalBytes);
+    uint8 *cursor = (uint8 *)cx->calloc_(dataSize);
     if (!cursor) {
         execPool->release();
         js_ReportOutOfMemory(cx);
@@ -808,12 +808,12 @@ mjit::Compiler::finishThisUp(JITScript **jitp)
         to.initialize(codeOffset, from.pc - script->code, from.id);
     }
 
-    JS_ASSERT(size_t(cursor - (uint8*)jit) == totalBytes);
+    JS_ASSERT(size_t(cursor - (uint8*)jit) == dataSize);
 
     *jitp = jit;
 
     /* We tolerate a race in the stats. */
-    cx->runtime->mjitMemoryUsed += totalSize + totalBytes;
+    cx->runtime->mjitDataSize += dataSize;
 
     return Compile_Okay;
 }
diff --git a/js/src/methodjit/MethodJIT.cpp b/js/src/methodjit/MethodJIT.cpp
index 8a96b86dfab7..a0f5834942b7 100644
--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -909,7 +909,7 @@ mjit::ReleaseScriptCode(JSContext *cx, JSScript *script)
     JITScript *jscr;
 
     if ((jscr = script->jitNormal)) {
-        cx->runtime->mjitMemoryUsed -= jscr->scriptDataSize() + jscr->mainCodeSize();
+        cx->runtime->mjitDataSize -= jscr->scriptDataSize();
 
         jscr->~JITScript();
         cx->free_(jscr);
@@ -918,7 +918,7 @@ mjit::ReleaseScriptCode(JSContext *cx, JSScript *script)
     }
 
     if ((jscr = script->jitCtor)) {
-        cx->runtime->mjitMemoryUsed -= jscr->scriptDataSize() + jscr->mainCodeSize();
+        cx->runtime->mjitDataSize -= jscr->scriptDataSize();
 
         jscr->~JITScript();
         cx->free_(jscr);
diff --git a/js/src/methodjit/MethodJIT.h b/js/src/methodjit/MethodJIT.h
index 5b4dd457de16..bcfb4b8f7eb1 100644
--- a/js/src/methodjit/MethodJIT.h
+++ b/js/src/methodjit/MethodJIT.h
@@ -415,8 +415,6 @@ struct JITScript {
 
     size_t scriptDataSize();
 
-    size_t mainCodeSize() { return code.m_size; } /* doesn't account for fragmentation */
-
     jsbytecode *nativeToPC(void *returnAddress) const;
 
   private:
diff --git a/js/src/nanojit/Allocator.cpp b/js/src/nanojit/Allocator.cpp
index 3c8764123950..b592ac8ccc1c 100644
--- a/js/src/nanojit/Allocator.cpp
+++ b/js/src/nanojit/Allocator.cpp
@@ -89,6 +89,7 @@ namespace nanojit
         if (mem) {
             Chunk* chunk = (Chunk*) mem;
             chunk->prev = current_chunk;
+            chunk->size = chunkbytes;
             current_chunk = chunk;
             current_top = (char*)chunk->data;
             current_limit = (char*)mem + chunkbytes;
@@ -98,6 +99,17 @@ namespace nanojit
             return false;
         }
     }
+
+    size_t Allocator::getBytesAllocated()
+    {
+        size_t n = 0;
+        Chunk *c = current_chunk;
+        while (c) {
+            n += c->size;
+            c = c->prev;
+        }
+        return n;
+    }
 }
 
 #endif // FEATURE_NANOJIT
diff --git a/js/src/nanojit/Allocator.h b/js/src/nanojit/Allocator.h
index 8aab15f60c8c..2cf15edc1f15 100644
--- a/js/src/nanojit/Allocator.h
+++ b/js/src/nanojit/Allocator.h
@@ -90,6 +90,8 @@ namespace nanojit
             return p;
         }
 
+        size_t getBytesAllocated();
+
     protected:
         void* allocSlow(size_t nbytes, bool fallible = false);
         bool fill(size_t minbytes, bool fallible);
@@ -97,6 +99,7 @@ namespace nanojit
         class Chunk {
         public:
             Chunk* prev;
+            size_t size;
             int64_t data[1]; // int64_t forces 8-byte alignment.
         };
 
diff --git a/js/src/nanojit/CodeAlloc.cpp b/js/src/nanojit/CodeAlloc.cpp
index 3875e7a0599a..b28ccabc7e2f 100644
--- a/js/src/nanojit/CodeAlloc.cpp
+++ b/js/src/nanojit/CodeAlloc.cpp
@@ -98,10 +98,10 @@ namespace nanojit
         return (int)((x + 512) >> 10);
     }
 
-    void CodeAlloc::logStats() {
-        size_t total = 0;
-        size_t frag_size = 0;
-        size_t free_size = 0;
+    void CodeAlloc::getStats(size_t& total, size_t& frag_size, size_t& free_size) {
+        total = 0;
+        frag_size = 0;
+        free_size = 0;
         int free_count = 0;
         for (CodeList* hb = heapblocks; hb != 0; hb = hb->next) {
             total += bytesPerAlloc;
@@ -114,6 +114,11 @@ namespace nanojit
                 }
             }
         }
+    }
+
+    void CodeAlloc::logStats() {
+        size_t total, frag_size, free_size;
+        getStats(total, frag_size, free_size);
         avmplus::AvmLog("code-heap: %dk free %dk fragmented %d\n",
             round(total), round(free_size), frag_size);
     }
diff --git a/js/src/nanojit/CodeAlloc.h b/js/src/nanojit/CodeAlloc.h
index b5cb2c634e45..077d1d6ae68f 100644
--- a/js/src/nanojit/CodeAlloc.h
+++ b/js/src/nanojit/CodeAlloc.h
@@ -217,6 +217,9 @@ namespace nanojit
         /** return the total number of bytes held by this CodeAlloc. */
         size_t size();
 
+        /** get stats about heap usage */
+        void getStats(size_t& total, size_t& frag_size, size_t& free_size);
+
         /** print out stats about heap usage */
         void logStats();
 
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 1cb4d14379bd..83aed3f13bad 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4570,10 +4570,26 @@ Deserialize(JSContext *cx, uintN argc, jsval *vp)
 }
 
 JSBool
-MJitStats(JSContext *cx, uintN argc, jsval *vp)
+MJitCodeStats(JSContext *cx, uintN argc, jsval *vp)
 {
 #ifdef JS_METHODJIT
-     JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed));
+    JSRuntime *rt = cx->runtime;
+    AutoLockGC lock(rt);
+    size_t n = 0;
+    for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c)
+        n += (*c)->getMjitCodeSize();
+    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(n));
+#else
+    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+#endif
+    return true;
+}
+
+JSBool
+MJitDataStats(JSContext *cx, uintN argc, jsval *vp)
+{
+#ifdef JS_METHODJIT
+     JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitDataSize));
 #else
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
 #endif
@@ -4733,7 +4749,8 @@ static JSFunctionSpec shell_functions[] = {
     JS_FN("serialize",      Serialize,      1,0),
     JS_FN("deserialize",    Deserialize,    1,0),
 #ifdef JS_METHODJIT
-    JS_FN("mjitstats",      MJitStats,      0,0),
+    JS_FN("mjitcodestats",  MJitCodeStats,  0,0),
+    JS_FN("mjitdatastats",  MJitDataStats,  0,0),
 #endif
     JS_FN("stringstats",    StringStats,    0,0),
     JS_FN("newGlobal",      NewGlobal,      1,0),
@@ -4867,7 +4884,8 @@ static const char *const shell_help_messages[] = {
 "serialize(sd)            Serialize sd using JS_WriteStructuredClone. Returns a TypedArray.",
 "deserialize(a)           Deserialize data generated by serialize.",
 #ifdef JS_METHODJIT
-"mjitstats()              Return stats on mjit memory usage.",
+"mjitcodestats()          Return stats on mjit code memory usage.",
+"mjitdatastats()          Return stats on mjit data memory usage.",
 #endif
 "stringstats()            Return stats on string memory usage.",
 "newGlobal(kind)          Return a new global object, in the current\n"
diff --git a/js/src/xpconnect/src/xpcjsruntime.cpp b/js/src/xpconnect/src/xpcjsruntime.cpp
index 09d4994ee41c..c460615b5b09 100644
--- a/js/src/xpconnect/src/xpcjsruntime.cpp
+++ b/js/src/xpconnect/src/xpcjsruntime.cpp
@@ -1278,43 +1278,140 @@ protected:
 
 static XPConnectGCChunkAllocator gXPCJSChunkAllocator;
 
-NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSRuntimeGCChunks,
-                             "js/gc-heap",
-                             "Main JS GC heap",
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSGCHeap,
+                             "heap-used/js/gc-heap",
+                             "Memory used by the garbage-collected JavaScript "
+                             "heap.",
                              XPConnectGCChunkAllocator::GetGCChunkBytesInUse,
                              &gXPCJSChunkAllocator)
 
-/* FIXME: use API provided by bug 623271 */
-#include "jscntxt.h"
-
 static PRInt64
-GetJSMethodJitCodeMemoryInUse(void *data)
+GetPerCompartmentSize(PRInt64 (*f)(JSCompartment *c))
 {
     JSRuntime *rt = nsXPConnect::GetRuntimeInstance()->GetJSRuntime();
-#ifdef JS_METHODJIT
-    return rt->mjitMemoryUsed;
-#else
-    return 0;
-#endif
+    js::AutoLockGC lock(rt);
+    PRInt64 n = 0;
+    for (JSCompartment **c = rt->compartments.begin(); c != rt->compartments.end(); ++c)
+        n += f(*c);
+    return n;
 }
 
-NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSMethodJitCode,
-                             "js/mjit-code",
-                             "Memory in use by method-JIT for compiled code",
-                             GetJSMethodJitCodeMemoryInUse,
-                             NULL)
+#ifdef JS_METHODJIT
 
 static PRInt64
-GetJSStringMemoryInUse(void *data)
+GetCompartmentMjitCodeSize(JSCompartment *c)
+{
+    return c->getMjitCodeSize();
+}
+
+static PRInt64
+GetJSMjitCode(void *data)
+{
+    return GetPerCompartmentSize(GetCompartmentMjitCodeSize);
+}
+
+static PRInt64
+GetJSMJitData(void *data)
+{
+    JSRuntime *rt = nsXPConnect::GetRuntimeInstance()->GetJSRuntime();
+    return rt->mjitDataSize;
+}
+
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSMjitCode,
+                             "mapped/js/mjit-code",
+                             "Memory mapped by the method JIT to hold "
+                             "generated code.",
+                             GetJSMjitCode,
+                             NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSMjitData,
+                             "heap-used/js/mjit-data",
+                             "Memory allocated by the method JIT for the "
+                             "following data: JITScripts, native maps, and "
+                             "inline cache structs.",
+                             GetJSMJitData,
+                             NULL)
+#endif  // JS_METHODJIT
+
+#ifdef JS_TRACER
+
+static PRInt64
+GetCompartmentTjitCode(JSCompartment *c)
+{
+    js::TraceMonitor &tm = c->traceMonitor;
+    if (tm.codeAlloc) {
+        size_t total, frag_size, free_size;
+        tm.getCodeAllocStats(total, frag_size, free_size);
+        return total;
+    }
+    return 0;
+}
+
+static PRInt64
+GetCompartmentTjitDataAllocatorsMain(JSCompartment *c)
+{
+    js::TraceMonitor &tm = c->traceMonitor;
+    return tm.dataAlloc ? tm.getVMAllocatorsMainSize() : 0;
+}
+
+static PRInt64
+GetCompartmentTjitDataAllocatorsReserve(JSCompartment *c)
+{
+    js::TraceMonitor &tm = c->traceMonitor;
+    return tm.dataAlloc ? tm.getVMAllocatorsReserveSize() : 0;
+}
+
+static PRInt64
+GetJSTjitCode(void *data)
+{
+    return GetPerCompartmentSize(GetCompartmentTjitCode);
+}
+
+static PRInt64
+GetJSTjitDataAllocatorsMain(void *data)
+{
+    return GetPerCompartmentSize(GetCompartmentTjitDataAllocatorsMain);
+}
+
+static PRInt64
+GetJSTjitDataAllocatorsReserve(void *data)
+{
+    return GetPerCompartmentSize(GetCompartmentTjitDataAllocatorsReserve);
+}
+
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSTjitCode,
+                             "mapped/js/tjit-code",
+                             "Memory mapped by the trace JIT to hold "
+                             "generated code.",
+                             GetJSTjitCode,
+                             NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSTjitDataAllocatorsMain,
+                             "heap-used/js/tjit-data/allocators/main",
+                             "Memory allocated by the trace JIT's "
+                             "VMAllocators.",
+                             GetJSTjitDataAllocatorsMain,
+                             NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSTjitDataAllocatorsReserve,
+                             "heap-used/js/tjit-data/allocators/reserve",
+                             "Memory allocated by the trace JIT and held in "
+                             "reserve for VMAllocators in case of OOM.",
+                             GetJSTjitDataAllocatorsReserve,
+                             NULL)
+#endif  // JS_TRACER
+
+static PRInt64
+GetJSStringData(void *data)
 {
     JSRuntime *rt = nsXPConnect::GetRuntimeInstance()->GetJSRuntime();
     return rt->stringMemoryUsed;
 }
 
-NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSStringMemory,
-                             "js/string-data",
-                             "Memory in use for string data",
-                             GetJSStringMemoryInUse,
+NS_MEMORY_REPORTER_IMPLEMENT(XPConnectJSStringData,
+                             "heap-used/js/string-data",
+                             "Memory allocated for JavaScript string data.",
+                             GetJSStringData,
                              NULL)
 
 XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
@@ -1382,9 +1479,13 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect)
 
         mJSRuntime->setCustomGCChunkAllocator(&gXPCJSChunkAllocator);
 
-        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSRuntimeGCChunks));
-        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSStringMemory));
-        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMethodJitCode));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSGCHeap));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSStringData));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitCode));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSMjitData));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitCode));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsMain));
+        NS_RegisterMemoryReporter(new NS_MEMORY_REPORTER_NAME(XPConnectJSTjitDataAllocatorsReserve));
     }
 
     if(!JS_DHashTableInit(&mJSHolders, JS_DHashGetStubOps(), nsnull,
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 055d315cc5db..2ac47ce126d5 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -1646,14 +1646,15 @@ NS_NewPresShell(nsIPresShell** aInstancePtrResult)
 nsTHashtable<PresShell::PresShellPtrKey> *nsIPresShell::sLiveShells = 0;
 
 NS_MEMORY_REPORTER_IMPLEMENT(LayoutPresShell,
-                             "layout/all",
-                             "Memory in use by layout PresShell, PresContext, and other related areas.",
+                             "heap-used/layout/all",
+                             "Memory used by layout PresShell, PresContext, "
+                             "and other related areas.",
                              PresShell::SizeOfLayoutMemoryReporter,
                              nsnull)
 
 NS_MEMORY_REPORTER_IMPLEMENT(LayoutBidi,
-                             "layout/bidi",
-                             "Memory in use by layout Bidi processor.",
+                             "heap-used/layout/bidi",
+                             "Memory used by layout Bidi processor.",
                              PresShell::SizeOfBidiMemoryReporter,
                              nsnull)
 
diff --git a/modules/libpr0n/src/imgLoader.cpp b/modules/libpr0n/src/imgLoader.cpp
index 9bfe3a97cc77..6e0f7fc33368 100644
--- a/modules/libpr0n/src/imgLoader.cpp
+++ b/modules/libpr0n/src/imgLoader.cpp
@@ -160,21 +160,21 @@ public:
   NS_IMETHOD GetPath(char **memoryPath)
   {
     if (mType == ChromeUsedRaw) {
-      *memoryPath = strdup("images/chrome/used/raw");
+      *memoryPath = strdup("heap-used/images/chrome/used/raw");
     } else if (mType == ChromeUsedUncompressed) {
-      *memoryPath = strdup("images/chrome/used/uncompressed");
+      *memoryPath = strdup("heap-used/images/chrome/used/uncompressed");
     } else if (mType == ChromeUnusedRaw) {
-      *memoryPath = strdup("images/chrome/unused/raw");
+      *memoryPath = strdup("heap-used/images/chrome/unused/raw");
     } else if (mType == ChromeUnusedUncompressed) {
-      *memoryPath = strdup("images/chrome/unused/uncompressed");
+      *memoryPath = strdup("heap-used/images/chrome/unused/uncompressed");
     } else if (mType == ContentUsedRaw) {
-      *memoryPath = strdup("images/content/used/raw");
+      *memoryPath = strdup("heap-used/images/content/used/raw");
     } else if (mType == ContentUsedUncompressed) {
-      *memoryPath = strdup("images/content/used/uncompressed");
+      *memoryPath = strdup("heap-used/images/content/used/uncompressed");
     } else if (mType == ContentUnusedRaw) {
-      *memoryPath = strdup("images/content/unused/raw");
+      *memoryPath = strdup("heap-used/images/content/unused/raw");
     } else if (mType == ContentUnusedUncompressed) {
-      *memoryPath = strdup("images/content/unused/uncompressed");
+      *memoryPath = strdup("heap-used/images/content/unused/uncompressed");
     }
     return NS_OK;
   }
@@ -182,21 +182,21 @@ public:
   NS_IMETHOD GetDescription(char **desc)
   {
     if (mType == ChromeUsedRaw) {
-      *desc = strdup("Memory used by in-use chrome images, compressed data");
+      *desc = strdup("Memory used by in-use chrome images (compressed data).");
     } else if (mType == ChromeUsedUncompressed) {
-      *desc = strdup("Memory used by in-use chrome images, uncompressed data");
+      *desc = strdup("Memory used by in-use chrome images (uncompressed data).");
     } else if (mType == ChromeUnusedRaw) {
-      *desc = strdup("Memory used by not in-use chrome images, compressed data");
+      *desc = strdup("Memory used by not in-use chrome images (compressed data).");
     } else if (mType == ChromeUnusedUncompressed) {
-      *desc = strdup("Memory used by not in-use chrome images, uncompressed data");
+      *desc = strdup("Memory used by not in-use chrome images (uncompressed data).");
     } else if (mType == ContentUsedRaw) {
-      *desc = strdup("Memory used by in-use content images, compressed data");
+      *desc = strdup("Memory used by in-use content images (compressed data).");
     } else if (mType == ContentUsedUncompressed) {
-      *desc = strdup("Memory used by in-use content images, uncompressed data");
+      *desc = strdup("Memory used by in-use content images (uncompressed data).");
     } else if (mType == ContentUnusedRaw) {
-      *desc = strdup("Memory used by not in-use content images, compressed data");
+      *desc = strdup("Memory used by not in-use content images (compressed data).");
     } else if (mType == ContentUnusedUncompressed) {
-      *desc = strdup("Memory used by not in-use content images, uncompressed data");
+      *desc = strdup("Memory used by not in-use content images (uncompressed data).");
     }
     return NS_OK;
   }
diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp
index 4864bedbd51a..968d858b0d47 100644
--- a/storage/src/mozStorageConnection.cpp
+++ b/storage/src/mozStorageConnection.cpp
@@ -353,20 +353,20 @@ public:
   {
     nsCString path;
 
-    path.AppendLiteral("storage/");
+    path.AppendLiteral("heap-used/storage/");
     path.Append(mDBConn.getFilename());
 
     if (mType == LookAside_Used) {
-      path.AppendLiteral("/LookAside_Used");
+      path.AppendLiteral("/lookaside-used");
     }
     else if (mType == Cache_Used) {
-      path.AppendLiteral("/Cache_Used");
+      path.AppendLiteral("/cache-used");
     }
     else if (mType == Schema_Used) {
-      path.AppendLiteral("/Schema_Used");
+      path.AppendLiteral("/schema-used");
     }
     else if (mType == Stmt_Used) {
-      path.AppendLiteral("/Stmt_Used");
+      path.AppendLiteral("/stmt-used");
     }
 
     *memoryPath = ::ToNewCString(path);
@@ -376,16 +376,16 @@ public:
   NS_IMETHOD GetDescription(char **desc)
   {
     if (mType == LookAside_Used) {
-      *desc = ::strdup("Number of lookaside memory slots currently checked out");
+      *desc = ::strdup("Number of lookaside memory slots currently checked out.");
     }
     else if (mType == Cache_Used) {
-      *desc = ::strdup("Approximate number of bytes of heap memory used by all pager caches");
+      *desc = ::strdup("Memory (approximate) used by all pager caches.");
     }
     else if (mType == Schema_Used) {
-      *desc = ::strdup("Approximate number of bytes of heap memory used to store the schema for all databases associated with the connection");
+      *desc = ::strdup("Memory (approximate) used to store the schema for all databases associated with the connection");
     }
     else if (mType == Stmt_Used) {
-      *desc = ::strdup("Approximate number of bytes of heap and lookaside memory used by all prepared statements");
+      *desc = ::strdup("Memory (approximate) used by all prepared statements");
     }
     return NS_OK;
   }
@@ -576,10 +576,16 @@ Connection::initialize(nsIFile *aDatabaseFile,
   }
 
   nsRefPtr<nsIMemoryReporter> reporter;
+#if 0
+  // FIXME: Bug 649867 explains why this is disabled.
   reporter =
     new StorageMemoryReporter(*this, StorageMemoryReporter::LookAside_Used);
   mMemoryReporters.AppendElement(reporter);
+#endif
 
+  // FIXME: These reporters overlap with storage/sqlite/pagecache and
+  // storage/sqlite/other, and therefore double-count some memory.  See bug
+  // 653630 for details.
   reporter =
     new StorageMemoryReporter(*this, StorageMemoryReporter::Cache_Used);
   mMemoryReporters.AppendElement(reporter);
@@ -588,7 +594,8 @@ Connection::initialize(nsIFile *aDatabaseFile,
     new StorageMemoryReporter(*this, StorageMemoryReporter::Schema_Used);
   mMemoryReporters.AppendElement(reporter);
 
-  reporter = new StorageMemoryReporter(*this, StorageMemoryReporter::Stmt_Used);
+  reporter =
+    new StorageMemoryReporter(*this, StorageMemoryReporter::Stmt_Used);
   mMemoryReporters.AppendElement(reporter);
 
   for (PRUint32 i = 0; i < mMemoryReporters.Length(); i++) {
diff --git a/storage/src/mozStorageService.cpp b/storage/src/mozStorageService.cpp
index d4be01607071..3bb81464aa64 100644
--- a/storage/src/mozStorageService.cpp
+++ b/storage/src/mozStorageService.cpp
@@ -151,14 +151,20 @@ GetStorageSQLiteOtherMemoryUsed(void *)
 }
 
 NS_MEMORY_REPORTER_IMPLEMENT(StorageSQLitePageCacheMemoryUsed,
-                             "storage/sqlite/pagecache",
-                             "Memory in use by SQLite for the page cache",
+                             "heap-used/storage/sqlite/pagecache",
+                             "Memory used by SQLite for the page cache. "
+                             "This overlaps with the per-connection cache-used "
+                             "figure, thus over-counting some bytes.  Bug "
+                             "653630 has the details.",
                              GetStorageSQLitePageCacheMemoryUsed,
                              nsnull)
 
 NS_MEMORY_REPORTER_IMPLEMENT(StorageSQLiteOtherMemoryUsed,
-                             "storage/sqlite/other",
-                             "Memory in use by SQLite for other various reasons",
+                             "heap-used/storage/sqlite/other",
+                             "Memory used by SQLite for other various reasons."
+                             "This overlaps with the per-connection stmt-used "
+                             "and schema-used figures, thus over-counting some "
+                             "bytes.  Bug 653630 has the details.",
                              GetStorageSQLiteOtherMemoryUsed,
                              nsnull)
 
diff --git a/toolkit/components/aboutmemory/Makefile.in b/toolkit/components/aboutmemory/Makefile.in
index d2c5e56db050..44617e19dd64 100644
--- a/toolkit/components/aboutmemory/Makefile.in
+++ b/toolkit/components/aboutmemory/Makefile.in
@@ -43,4 +43,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef ENABLE_TESTS
+DIRS += tests
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.css b/toolkit/components/aboutmemory/content/aboutMemory.css
index 167043265036..be4668187a36 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.css
+++ b/toolkit/components/aboutmemory/content/aboutMemory.css
@@ -13,13 +13,13 @@
  *
  * The Original Code is about:memory.
  *
- * The Initial Developer of the Original Code is
- *   Mozilla Corporation
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2009
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *   Vladimir Vukicevic <vladimir@pobox.com>
+ *   Nicholas Nethercote <nnethercote@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
@@ -35,46 +35,24 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-html {
-  background: -moz-Dialog;
-  color: -moz-DialogText;
+.mrValue {
+  font-weight: bold;
+  color: #400;
 }
 
-body {
-  margin: 0;
-  padding: 0 1em;
-  font: message-box;
+.mrPerc {
 }
 
-h1 {
-    font-weight: bold;
-    font-size: x-large;
+.mrName {
+  font-style: italic;
+  color: #004;
 }
 
-label {
-    -moz-user-select: text;
+.treeLine {
+  color: #888;
 }
 
-h2 {
-    margin-top: 0;
-    font-weight: bold;
-    font-size: large;
-}
-
-.memBox {
-    max-width: 30em;
-    background: -moz-Field;
-    color: -moz-FieldText;
-    margin-top: 25px;
-    padding: 5px;
-    border: 1px solid -moz-FieldText;
-    border-radius: 10px 10px;
-}
-
-.memValue {
-    text-align: right;
-}
-
-.memOverview table {
-    font-size: 120%;
+.option {
+  font-size: 80%;
+  -moz-user-select: none;  /* no need to include this when cutting+pasting */
 }
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index 4ab84d74c769..95fbb73d0596 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -14,13 +14,13 @@
  *
  * The Original Code is about:memory
  *
- * The Initial Developer of the Original Code is
- * the Mozilla Foundation.
+ * The Initial Developer of the Original Code is the Mozilla Foundation.
  * Portions created by the Initial Developer are Copyright (C) 2009
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *   Vladimir Vukicevic <vladimir@pobox.com>
+ *   Nicholas Nethercote <nnethercote@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
@@ -36,180 +36,564 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+"use strict";
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
-var gMemReporters = { };
+// Must use .href here instead of .search because "about:memory" is a
+// non-standard URL.
+var gVerbose = (location.href.split(/[\?,]/).indexOf("verbose") !== -1);
 
-function $(n) {
-    return document.getElementById(n);
+function onLoad()
+{
+  var os = Cc["@mozilla.org/observer-service;1"].
+      getService(Ci.nsIObserverService);
+  os.notifyObservers(null, "child-memory-reporter-request", null);
+
+  os.addObserver(ChildMemoryListener, "child-memory-reporter-update", false);
+
+  update();
 }
 
-function makeTableCell(content, c) {
-    var td = document.createElement("td");
-    if (typeof content == "string")
-      content = document.createTextNode(content);
-    td.appendChild(content);
-    if (c)
-        td.setAttribute("class", c);
-
-    return td;
+function onUnload()
+{
+  var os = Cc["@mozilla.org/observer-service;1"].
+      getService(Ci.nsIObserverService);
+  os.removeObserver(ChildMemoryListener, "child-memory-reporter-update");
 }
 
-function makeAbbrNode(str, title) {
-    var abbr = document.createElement("abbr");
-    var text = document.createTextNode(str);
-    abbr.appendChild(text);
-    abbr.setAttribute("title", title);
-
-    return abbr;
+function ChildMemoryListener(aSubject, aTopic, aData)
+{
+  update();
 }
 
-function makeTableRow() {
-    var row = document.createElement("tr");
-
-    for (var i = 0; i < arguments.length; ++i) {
-        var arg = arguments[i];
-        if (typeof(arg) == "string") {
-            row.appendChild(makeTableCell(arg));
-        } else if (arg.__proto__ == Array.prototype) {
-            row.appendChild(makeTableCell(makeAbbrNode(arg[0], arg[1])));
-        } else {
-            row.appendChild(arg);
-        }
-    }
-
-    return row;
-}
-
-function setTextContent(node, s) {
-    while (node.lastChild)
-        node.removeChild(node.lastChild);
-
-    node.appendChild(document.createTextNode(s));
-}
-
-function formatNumber(n) {
-    var s = "";
-    var neg = false;
-    if (n < 0) {
-        neg = true;
-        n = -n;
-    }
-
-    do {
-        var k = n % 1000;
-        if (n > 999) {
-            if (k > 99)
-                s = k + s;
-            else if (k > 9)
-                s = "0" + k + s;
-            else
-                s = "00" + k + s;
-        } else {
-            s = k + s;
-        }
-
-        n = Math.floor(n / 1000);
-        if (n > 0)
-            s = "," + s;
-    } while (n > 0);
-
-    return s;
+function $(n)
+{
+  return document.getElementById(n);
 }
 
 /**
- * Updates the content of the document with the most current memory information.
+ * Top-level function that does the work of generating the page.
  */
-function updateMemoryStatus()
+function update()
 {
-    // if we have the standard reporters for mapped/allocated, put
-    // those at the top
-    if ("malloc/mapped" in gMemReporters &&
-        "malloc/allocated" in gMemReporters)
-    {
-        // committed is the total amount of memory that we've touched, that is that we have
-        // some kind of backing store for
-        setTextContent($("memMappedValue"),
-                       formatNumber(gMemReporters["malloc/mapped"][0].memoryUsed));
+  // First, clear the page contents.  Necessary because update() might be
+  // called more than once due to ChildMemoryListener.
+  var content = $("content");
+  content.parentNode.replaceChild(content.cloneNode(false), content);
+  content = $("content");
 
-        // allocated is the amount of committed memory that we're actively using (i.e., that isn't free)
-        setTextContent($("memInUseValue"),
-                       formatNumber(gMemReporters["malloc/allocated"][0].memoryUsed));
+  var mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
+      getService(Ci.nsIMemoryReporterManager);
+
+  // Process each memory reporter:
+  // - Make a copy of it into a sub-table indexed by its process.  Each copy
+  //   looks like this:
+  //
+  //     interface Tmr {
+  //       _tpath: string;
+  //       _description: string;
+  //       _memoryUsed: number;
+  //     }
+  //
+  // - The .path property is renamed ._tpath ("truncated path") in the copy
+  //   because the process name and ':' (if present) are removed.
+  // - Note that copying mr.memoryUsed (which calls a C++ function under the
+  //   IDL covers) to tmr._memoryUsed for every reporter now means that the
+  //   results as consistent as possible -- measurements are made all at
+  //   once before most of the memory required to generate this page is
+  //   allocated.
+  var tmrTable = {};
+  var e = mgr.enumerateReporters();
+  while (e.hasMoreElements()) {
+    var mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    var process;
+    var tmr = {};
+    var i = mr.path.indexOf(':');
+    if (i === -1) {
+      process = "Main";
+      tmr._tpath = mr.path;
     } else {
-        $("memOverview").style.display = "none";
+      process = mr.path.slice(0, i);
+      tmr._tpath = mr.path.slice(i + 1);
     }
+    tmr._description = mr.description;
+    tmr._memoryUsed  = mr.memoryUsed;
 
-    var mo = $("memOtherRows");
-    while (mo.lastChild)
-        mo.removeChild(mo.lastChild);
-
-    var otherCount = 0;
-
-    for each (var reporters in gMemReporters) {
-        // There may be more than one reporter for each path.  We take the sum
-        // of them all for each description.
-        var total = 0;
-        reporters.forEach(function(reporter) {
-          total += reporter.memoryUsed;
-        });
-
-        var row = makeTableRow([reporters[0].path, reporters[0].description],
-                               makeTableCell(formatNumber(total), "memValue"));
-
-        mo.appendChild(row);
-
-        otherCount++;
+    if (!tmrTable[process]) {
+      tmrTable[process] = {};
     }
-
-    if (otherCount == 0) {
-        var row = makeTableRow("No other information available.");
-        mo.appendChild(row);
+    var tmrs = tmrTable[process];
+    if (tmrs[tmr._tpath]) {
+      // Already an entry;  must be a duplicated reporter.  This can
+      // happen legitimately.  Sum the sizes.
+      tmrs[tmr._tpath]._memoryUsed += tmr._memoryUsed;
+    } else {
+      tmrs[tmr._tpath] = tmr;
     }
+  }
+
+  // Generate output for one process at a time.  Always start with the
+  // Main process.
+  var text = genProcessText("Main", tmrTable["Main"]);
+  for (var process in tmrTable) {
+    if (process !== "Main") {
+      text += genProcessText(process, tmrTable[process]);
+    }
+  }
+
+  // Generate verbosity option link at the bottom.
+  text += gVerbose
+        ? "<span class='option'><a href='about:memory'>Less verbose</a></span>"
+        : "<span class='option'><a href='about:memory?verbose'>More verbose</a></span>";
+
+  var div = document.createElement("div");
+  div.innerHTML = text;
+  content.appendChild(div);
 }
 
 /**
- * Updates gMemReporters to contain all the known memory reporters.
+ * Generates the text for a single process.
+ *
+ * @param aProcess
+ *        The name of the process
+ * @param aTmrs
+ *        Table of Tmrs for this process
+ * @return The generated text
  */
-function updateMemoryReporters()
+function genProcessText(aProcess, aTmrs)
 {
-    gMemReporters = [];
-
-    var mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
-              getService(Ci.nsIMemoryReporterManager);
-
-    var e = mgr.enumerateReporters();
-    while (e.hasMoreElements()) {
-        var reporter = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
-        if (!gMemReporters[reporter.path]) {
-          gMemReporters[reporter.path] = [];
+  /**
+   * From a list of memory reporters, builds a tree that mirrors the tree
+   * structure that will be shown as output.
+   *
+   * @param aTreeName
+   *        The name of the tree;  either "mapped" or "heap-used"
+   * @param aTreeRootTpath
+   *        The tpath of the top node in the tree
+   * @param aTreeRootDesc
+   *        The description of the top node in the tree
+   * @param aOtherDescTail
+   *        Extra description for the end of the "aTreeName/other" entry
+   * @param aOmitThresholdPerc
+   *        The threshold percentage;  entries that account for less than
+   *        this fraction are aggregated
+   * @return The built tree.  The tree nodes have this structure:
+   *         interface Node {
+   *           _name: string;
+   *           _description: string;
+   *           _memoryUsed: number;
+   *           _kids: [Node];
+   *         }
+   */
+  function buildTree(aTreeName, aTreeRootTpath, aTreeRootDesc, aOtherDescTail,
+                     aOmitThresholdPerc)
+  {
+    function findKid(aName, aKids)
+    {
+      for (var i = 0; i < aKids.length; i++) {
+        if (aKids[i]._name === aName) {
+          return aKids[i];
         }
-        gMemReporters[reporter.path].push(reporter);
+      }
+      return undefined;
     }
+
+    // We want to process all reporters that begin with 'aTreeName'.
+    // First we build the tree but only filling in '_name' and '_kids'.
+    var t = { _name:aTreeName, _kids:[] };
+    for (var _tpath in aTmrs) {
+      var tmr = aTmrs[_tpath];
+      if (tmr._tpath.slice(0, aTreeName.length + 1) === aTreeName + "/") {
+        var names = tmr._tpath.slice(aTreeName.length + 1).split('/');
+        var u = t;
+        for (var i = 0; i < names.length; i++) {
+          var name = names[i];
+          var uMatch = findKid(name, u._kids);
+          if (uMatch) {
+            u = uMatch;
+          } else {
+            var v = { _name:name, _kids:[] };
+            u._kids.push(v);
+            u = v;
+          }
+        }
+      }
+    }
+
+    // Next, fill in '_description' and '_memoryUsed' for each node.  For
+    // interior nodes, '_memoryUsed' is computed by summing child nodes.
+    function fillInTree(aT, aPretpath)
+    {
+      var tpath = aPretpath ? aPretpath + '/' + aT._name : aT._name;
+      if (aT._kids.length === 0) {
+        aT._memoryUsed = getBytes(aTmrs, tpath);
+        aT._description = getDescription(aTmrs, tpath);
+      } else {
+        var bytes = 0;
+        for (var i = 0; i < aT._kids.length; i++) {
+          // Allow for -1 (ie. "unknown"), treat it like 0.
+          var b = fillInTree(aT._kids[i], tpath);
+          bytes += (b === -1 ? 0 : b);
+        }
+        aT._memoryUsed = bytes;
+        aT._description = "The sum of all entries below " + tpath + ".";
+      }
+      return aT._memoryUsed;
+    }
+    fillInTree(t, "");
+
+    // Add the "aTreeName/other" node, which is derived from existing
+    // nodes, then update the root node accordingly.  (But don't do this
+    // if the root node byte count is -1, ie. unknown).
+    var nonOtherBytes = t._memoryUsed;
+    var treeBytes = getBytes(aTmrs, aTreeRootTpath);
+    if (treeBytes !== -1) {
+      var otherBytes = treeBytes - nonOtherBytes;
+      var other = {
+        _name:"other",
+        _description:"All unclassified " + aTreeName + " memory." +
+                     aOtherDescTail,
+        _memoryUsed:otherBytes,
+        _kids:[]
+      };
+      t._kids.push(other);
+    }
+    t._memoryUsed = treeBytes;
+    t._description = aTreeRootDesc;
+
+    function shouldOmit(aBytes)
+    {
+      return !gVerbose &&
+             treeBytes !== -1 &&
+             (100 * aBytes / treeBytes) < aOmitThresholdPerc;
+    }
+
+    /**
+     * Sort all kid nodes from largest to smallest and aggregate
+     * insignificant nodes.
+     *
+     * @param aT
+     *        The tree
+     */
+    function filterTree(aT)
+    {
+      var cmpTmrs = function(a, b) { return b._memoryUsed - a._memoryUsed };
+      aT._kids.sort(cmpTmrs);
+
+      for (var i = 0; i < aT._kids.length; i++) {
+        if (shouldOmit(aT._kids[i]._memoryUsed)) {
+          // This sub-tree is below the significance threshold
+          // Remove it and all remaining (smaller) sub-trees, and
+          // replace them with a single aggregate node.
+          var i0 = i;
+          var aggBytes = 0;
+          var aggNames = [];
+          for ( ; i < aT._kids.length; i++) {
+            aggBytes += aT._kids[i]._memoryUsed;
+            aggNames.push(aT._kids[i]._name);
+          }
+          aT._kids.splice(i0);
+          var n = i - i0;
+          var tmrSub = {
+            _name: "(" + n + " omitted)",
+            _description: "Omitted sub-trees: " + aggNames.join(", ") + ".",
+            _memoryUsed: aggBytes,
+            _kids:[]
+          };
+          aT._kids[i0] = tmrSub;
+          break;
+        }
+        filterTree(aT._kids[i]);
+      }
+    }
+    filterTree(t);
+
+    return t;
+  }
+
+  var mappedOtherDescTail =
+      " This includes code and data segments, and thread stacks."
+  var mappedRootDesc = getDescription(aTmrs, "mapped");
+  // The threshold used here is much lower than the one for the heap-used
+  // tree, because the "mapped" total size is so much bigger relative to
+  // the interesting entries in the "mapped" tree.
+  var mappedTree = buildTree("mapped", "mapped", mappedRootDesc,
+                             mappedOtherDescTail, 0.01);
+
+  var heapUsedOtherDescTail = "";
+  var heapUsedRootDesc = "See mapped/heap/used above.";
+  var heapUsedTree = buildTree("heap-used", "mapped/heap/used",
+                               heapUsedRootDesc, heapUsedOtherDescTail, 0.1);
+
+  // Nb: the newlines give nice spacing if we cut+paste into a text buffer.
+  var text = "";
+  text += "<h1>" + aProcess + " Process</h1>\n\n";
+  text += genTreeText(mappedTree, "Mapped Memory");
+  text += genTreeText(heapUsedTree, "Used Heap Memory");
+  text += genOtherText(aTmrs);
+  text += "<hr></hr>";
+  return text;
 }
 
-function ChildMemoryListener(subject, topic, data) {
-  updateMemoryReporters();
-  updateMemoryStatus();
-}
-
-
-function doLoad()
+/**
+ * Converts a byte count to an appropriate string representation.
+ *
+ * @param aBytes
+ *        The byte count
+ * @return The string representation
+ */
+function formatBytes(aBytes)
 {
-    var os = Components.classes["@mozilla.org/observer-service;1"].
-        getService(Components.interfaces.nsIObserverService);
-    os.notifyObservers(null, "child-memory-reporter-request", null);
+  var unit = gVerbose ? "B" : "MB";
 
-    os.addObserver(ChildMemoryListener, "child-memory-reporter-update", false);
+  if (aBytes === -1) {
+    return "??? " + unit;
+  }
 
-    updateMemoryReporters();
-    updateMemoryStatus();
+  function formatInt(aN)
+  {
+    var neg = false;
+    if (aN < 0) {
+      neg = true;
+      aN = -aN;
+    }
+    var s = "";
+    while (true) {
+      var k = aN % 1000;
+      aN = Math.floor(aN / 1000);
+      if (aN > 0) {
+        if (k < 10) {
+          s = ",00" + k + s;
+        } else if (k < 100) {
+          s = ",0" + k + s;
+        } else {
+          s = "," + k + s;
+        }
+      } else {
+        s = k + s;
+        break;
+      }
+    }
+    return neg ? "-" + s : s;
+  }
+
+  var s;
+  if (gVerbose) {
+    s = formatInt(aBytes) + " " + unit;
+  } else {
+    var mbytes = (aBytes / (1024 * 1024)).toFixed(2);
+    var a = String(mbytes).split(".");
+    s = formatInt(a[0]) + "." + a[1] + " " + unit;
+  }
+  return s;
 }
 
-function doUnload()
+/**
+ * Right-justifies a string in a field of a given width, padding as necessary
+ *
+ * @param aS
+ *        The string
+ * @param aN
+ *        The field width
+ * @param aC
+ *        The char used to pad
+ * @return The string representation
+ */
+function pad(aS, aN, aC)
 {
-    var os = Components.classes["@mozilla.org/observer-service;1"].
-        getService(Components.interfaces.nsIObserverService);
-    os.removeObserver(ChildMemoryListener, "child-memory-reporter-update");
-    
+  var padding = "";
+  var n2 = aN - aS.length;
+  for (var i = 0; i < n2; i++) {
+    padding += aC;
+  }
+  return padding + aS;
 }
+
+/**
+ * Gets the byte count for a particular memory reporter.
+ *
+ * @param aTmrs
+ *        Table of Tmrs for this process
+ * @param aTpath
+ *        The tpath of the memory reporter
+ * @return The byte count
+ */
+function getBytes(aTmrs, aTpath)
+{
+  var tmr = aTmrs[aTpath];
+  if (tmr) {
+    var bytes = tmr._memoryUsed;
+    tmr.done = true;
+    return bytes;
+  }
+  // Nb: this should never occur;  "mapped" and "mapped/heap/used" should
+  // always be registered, and all other tpaths have been extracted from
+  // aTmrs and so the lookup will succeed.  Return an obviously wrong
+  // number that will likely be noticed.
+  return -2 * 1024 * 1024;
+}
+
+/**
+ * Gets the description for a particular memory reporter.
+ *
+ * @param aTmrs
+ *        Table of Tmrs for this process
+ * @param aTpath
+ *        The tpath of the memory reporter
+ * @return The description
+ */
+function getDescription(aTmrs, aTpath)
+{
+  var r = aTmrs[aTpath];
+  return r ? r._description : "???";
+}
+
+function genMrValueText(aValue)
+{
+  return "<span class='mrValue'>" + aValue + "</span>";
+}
+
+function genMrNameText(aDesc, aName)
+{
+  return "-- <span class='mrName' title=\"" + aDesc + "\">" +
+         aName + "</span>\n";
+}
+
+/**
+ * Generates the text for a particular tree, including its heading.
+ *
+ * @param aT
+ *        The tree
+ * @param aTreeName
+ *        The tree's name
+ * @return The generated text
+ */
+function genTreeText(aT, aTreeName)
+{
+  var treeBytes = aT._memoryUsed;
+  var treeBytesLength = formatBytes(treeBytes).length;
+
+  /**
+   * Generates the text for a particular tree, without a heading.
+   *
+   * @param aT
+   *        The tree
+   * @param aIndentGuide
+   *        Records what indentation is required for this tree.  It has one
+   *        entry per level of indentation.  For each entry, ._isLastKid
+   *        records whether the node in question is the last child, and
+   *        ._depth records how many chars of indentation are required.
+   * @param aParentBytesLength
+   *        The length of the formatted byte count of the top node in the tree
+   * @return The generated text
+   */
+  function genTreeText2(aT, aIndentGuide, aParentBytesLength)
+  {
+    function repeatStr(aC, aN)
+    {
+      var s = "";
+      for (var i = 0; i < aN; i++) {
+        s += aC;
+      }
+      return s;
+    }
+
+    // Generate the indent.  There's a subset of the Unicode "light"
+    // box-drawing chars that are widely implemented in terminals, and
+    // this code sticks to that subset to maximize the chance that
+    // cutting and pasting about:memory output to a terminal will work
+    // correctly:
+    const kHorizontal       = "\u2500",
+          kVertical         = "\u2502",
+          kUpAndRight       = "\u2514",
+          kVerticalAndRight = "\u251c";
+    var indent = "<span class='treeLine'>";
+    if (aIndentGuide.length > 0) {
+      for (var i = 0; i < aIndentGuide.length - 1; i++) {
+        indent += aIndentGuide[i]._isLastKid ? " " : kVertical;
+        indent += repeatStr(" ", aIndentGuide[i]._depth - 1);
+      }
+      indent += aIndentGuide[i]._isLastKid ? kUpAndRight : kVerticalAndRight;
+      indent += repeatStr(kHorizontal, aIndentGuide[i]._depth - 1);
+    }
+
+    // Indent more if this entry is narrower than its parent, and update
+    // aIndentGuide accordingly.
+    var tMemoryUsedStr = formatBytes(aT._memoryUsed);
+    var tBytesLength = tMemoryUsedStr.length;
+    var extraIndentLength = Math.max(aParentBytesLength - tBytesLength, 0);
+    if (extraIndentLength > 0) {
+      for (var i = 0; i < extraIndentLength; i++) {
+        indent += kHorizontal;
+      }
+      aIndentGuide[aIndentGuide.length - 1]._depth += extraIndentLength;
+    }
+    indent += "</span>";
+
+    // Generate the percentage.
+    var perc = "";
+    if (treeBytes !== -1) {
+      if (aT._memoryUsed === treeBytes) {
+        perc = "100.0";
+      } else {
+        perc = (100 * aT._memoryUsed / treeBytes).toFixed(2);
+        perc = pad(perc, 5, '0');
+      }
+      perc = "<span class='mrPerc'>(" + perc + "%)</span> ";
+    }
+
+    var text = indent + genMrValueText(tMemoryUsedStr) + " " + perc +
+               genMrNameText(aT._description, aT._name);
+
+    for (var i = 0; i < aT._kids.length; i++) {
+      // 3 is the standard depth, the callee adjusts it if necessary.
+      aIndentGuide.push({ _isLastKid:(i === aT._kids.length - 1), _depth:3 });
+      text += genTreeText2(aT._kids[i], aIndentGuide, tBytesLength);
+      aIndentGuide.pop();
+    }
+    return text;
+  }
+
+  var text = genTreeText2(aT, [], treeBytesLength);
+  // Nb: the newlines give nice spacing if we cut+paste into a text buffer.
+  return "<h2>" + aTreeName + "</h2>\n<pre>" + text + "</pre>\n";
+}
+
+/**
+ * Generates the text for the "Other Measurements" section.
+ *
+ * @param aTmrs
+ *        Table of Tmrs for this process
+ * @return The generated text
+ */
+function genOtherText(aTmrs)
+{
+  // Get the biggest not-yet-printed value, to determine the field width
+  // for all these entries.  These should all be "other" values, assuming
+  // all paths are well-formed.
+  var maxBytes = 0;
+  for (var tpath in aTmrs) {
+    var tmr = aTmrs[tpath];
+    if (!tmr.done && tmr._memoryUsed > maxBytes) {
+      maxBytes = tmr._memoryUsed;
+    }
+  }
+
+  // Generate text for the not-yet-yet-printed values.
+  var maxBytesLength = formatBytes(maxBytes).length;
+  var text = "";
+  for (var tpath in aTmrs) {
+    var tmr = aTmrs[tpath];
+    if (!tmr.done) {
+      text += genMrValueText(
+                pad(formatBytes(tmr._memoryUsed), maxBytesLength, ' ')) + " ";
+      text += genMrNameText(tmr._description, tmr._tpath);
+    }
+  }
+
+  // Nb: the newlines give nice spacing if we cut+paste into a text buffer.
+  return "<h2>Other Measurements</h2>\n<pre>" + text + "</pre>\n";
+}
+
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.xhtml b/toolkit/components/aboutmemory/content/aboutMemory.xhtml
index 011d5c865538..ce2d9df8fa88 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.xhtml
+++ b/toolkit/components/aboutmemory/content/aboutMemory.xhtml
@@ -21,6 +21,7 @@
    -
    - Contributor(s):
    -   Vladimir Vukicevic <vladimir@pobox.com>
+   -   Nicholas Nethercote <nnethercote@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
@@ -39,45 +40,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>about:memory</title>
-
-    <link rel="stylesheet" href="chrome://global/skin/aboutMemory.css"
-          type="text/css"/>
-
-    <script type="text/javascript"
-            src="chrome://global/content/aboutMemory.js"/>
+    <link rel="stylesheet" href="chrome://global/skin/aboutMemory.css" type="text/css"/>
+    <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
+    <script type="text/javascript" src="chrome://global/content/aboutMemory.js"/>
   </head>
 
-  <body onload="doLoad()" onunload="doUnload()">
-    <h1>Memory Usage</h1>
-
-    <div id="memOverview" class="memOverview memBox">
-      <h2>Overview</h2>
-      <table border="0">
-	<tbody>
-	  <tr>
-            <td width="100%">Memory mapped:</td>
-            <td id="memMappedValue" class="memValue"></td>
-          </tr>
-	  <tr>
-            <td>Memory in use:</td>
-            <td id="memInUseValue" class="memValue"></td>
-          </tr>
-	</tbody>
-      </table>
-    </div>
-
-    <div id="memOther" class="memOther memBox">
-      <h2>Other Information</h2>
-      <table border="0">
-	<thead>
-	  <tr>
-            <th style="text-align: left" width="100%">Description</th>
-            <th>Value</th>
-          </tr>
-	</thead>
-	<tbody id="memOtherRows">
-	</tbody>
-      </table>
-    </div>
-  </body>
+  <!-- No newline before the div element!  This avoids extraneous spaces when
+       pasting the entire output after selecting it with Ctrl-a. -->
+  <body onload="onLoad()" onunload="onUnload()"><div id="content"></div></body>
 </html>
diff --git a/toolkit/components/aboutmemory/tests/Makefile.in b/toolkit/components/aboutmemory/tests/Makefile.in
new file mode 100644
index 000000000000..6822383ccd8f
--- /dev/null
+++ b/toolkit/components/aboutmemory/tests/Makefile.in
@@ -0,0 +1,51 @@
+#
+# ***** 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.org.
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#     Boris Zbarsky <bzbarsky@mit.edu>  (Original author)
+#
+# 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	= toolkit/components/aboutmemory/tests
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = \
+	chrome \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/aboutmemory/tests/chrome/Makefile.in b/toolkit/components/aboutmemory/tests/chrome/Makefile.in
new file mode 100644
index 000000000000..c6d22296d108
--- /dev/null
+++ b/toolkit/components/aboutmemory/tests/chrome/Makefile.in
@@ -0,0 +1,53 @@
+#
+# ***** 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.org.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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  = toolkit/components/aboutmemory/tests/chrome
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_CHROME_FILES	= \
+		test_aboutmemory.xul \
+		$(NULL)
+
+libs:: $(_CHROME_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
+
diff --git a/toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul b/toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul
new file mode 100644
index 000000000000..04a4c852caa4
--- /dev/null
+++ b/toolkit/components/aboutmemory/tests/chrome/test_aboutmemory.xul
@@ -0,0 +1,267 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<window title="about:memory"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://mochikit/content/MochiKit/packed.js"/>
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml"></body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+  const Cc = Components.classes;
+  const Ci = Components.interfaces;
+  var mgr = Cc["@mozilla.org/memory-reporter-manager;1"].
+            getService(Ci.nsIMemoryReporterManager);
+
+  // Remove all the real reporters;  save them to restore at the end.
+  var e = mgr.enumerateReporters(); 
+  var realReporters = [];
+  while (e.hasMoreElements()) {
+    var mr = e.getNext().QueryInterface(Ci.nsIMemoryReporter);
+    mgr.unregisterReporter(mr);
+    realReporters.push(mr);
+  }
+
+  // Setup various fake-but-deterministic reporters.
+  const KB = 1024;
+  const MB = KB * KB;
+  fakeReporters = [
+    { path: "mapped",               memoryUsed: 1000 * MB },
+    { path: "mapped/heap/used",     memoryUsed:  500 * MB },
+    { path: "mapped/heap/unused",   memoryUsed:  100 * MB },
+    { path: "mapped/a",             memoryUsed:  222 * MB },
+    { path: "heap-used/a",          memoryUsed:   99 * MB },
+    { path: "heap-used/b/a",        memoryUsed:   80 * MB },
+    { path: "heap-used/b/b",        memoryUsed:   75 * MB },
+    { path: "heap-used/b/c/a",      memoryUsed:   44 * MB },
+    { path: "heap-used/b/c/b",      memoryUsed:   33 * MB }, // aggregated
+    { path: "heap-used/c",          memoryUsed:  123 * MB },
+    { path: "heap-used/d",          memoryUsed:  499 * KB }, // aggregated
+    { path: "heap-used/e",          memoryUsed:  100 * KB }, // aggregated
+    { path: "heap-used/f/g/h/i",    memoryUsed:   20 * MB },
+    { path: "other1",               memoryUsed:  111 * MB },
+    { path: "other2",               memoryUsed:  222 * MB },
+
+    { path: "2nd:mapped",           memoryUsed: 1000 * MB },
+    { path: "2nd:mapped/heap/used", memoryUsed:  500 * MB },
+    { path: "2nd:mapped/a/b/c",     memoryUsed:  499 * MB },
+    { path: "2nd:heap-used/a",      memoryUsed:  400 * MB },
+    { path: "2nd:other1",           memoryUsed:  777 * MB },
+
+    // -1 means "don't know";  this should be handled gracefully for
+    // "mapped" and "mapped/heap/used".
+    { path: "3rd:mapped",           memoryUsed: -1        },
+    { path: "3rd:mapped/heap/used", memoryUsed: -1        },
+    { path: "3rd:mapped/a/b",       memoryUsed:  333 * MB },
+    { path: "3rd:heap-used/a/b",    memoryUsed:  444 * MB },
+    { path: "3rd:other1",           memoryUsed:  555 * MB }
+  ];
+  for (var i = 0; i < fakeReporters.length; i++) {
+    mgr.registerReporter(fakeReporters[i]);
+  }
+  ]]>
+  </script>
+
+  <iframe id="amFrame"  src="about:memory"></iframe>
+  <iframe id="amvFrame" src="about:memory?verbose"></iframe>
+
+  <script type="application/javascript">
+  <![CDATA[
+  var amExpectedText =
+"\
+Main Process\n\
+\n\
+Mapped Memory\n\
+1,000.00 MB (100.0%) -- mapped\n\
+├────600.00 MB (60.00%) -- heap\n\
+│    ├──500.00 MB (50.00%) -- used\n\
+│    └──100.00 MB (10.00%) -- unused\n\
+├────222.00 MB (22.20%) -- a\n\
+└────178.00 MB (17.80%) -- other\n\
+\n\
+Used Heap Memory\n\
+500.00 MB (100.0%) -- heap-used\n\
+├──232.00 MB (46.40%) -- b\n\
+│  ├───80.00 MB (16.00%) -- a\n\
+│  ├───77.00 MB (15.40%) -- c\n\
+│  │   ├──44.00 MB (08.80%) -- a\n\
+│  │   └──33.00 MB (06.60%) -- b\n\
+│  └───75.00 MB (15.00%) -- b\n\
+├──123.00 MB (24.60%) -- c\n\
+├───99.00 MB (19.80%) -- a\n\
+├───25.42 MB (05.08%) -- other\n\
+├───20.00 MB (04.00%) -- f\n\
+│   └──20.00 MB (04.00%) -- g\n\
+│      └──20.00 MB (04.00%) -- h\n\
+│         └──20.00 MB (04.00%) -- i\n\
+└────0.58 MB (00.12%) -- (2 omitted)\n\
+\n\
+Other Measurements\n\
+111.00 MB -- other1\n\
+222.00 MB -- other2\n\
+\n\
+2nd Process\n\
+\n\
+Mapped Memory\n\
+1,000.00 MB (100.0%) -- mapped\n\
+├────500.00 MB (50.00%) -- heap\n\
+│    └──500.00 MB (50.00%) -- used\n\
+├────499.00 MB (49.90%) -- a\n\
+│    └──499.00 MB (49.90%) -- b\n\
+│       └──499.00 MB (49.90%) -- c\n\
+└──────1.00 MB (00.10%) -- other\n\
+\n\
+Used Heap Memory\n\
+500.00 MB (100.0%) -- heap-used\n\
+├──400.00 MB (80.00%) -- a\n\
+└──100.00 MB (20.00%) -- other\n\
+\n\
+Other Measurements\n\
+777.00 MB -- other1\n\
+\n\
+3rd Process\n\
+\n\
+Mapped Memory\n\
+??? MB -- mapped\n\
+├──333.00 MB -- a\n\
+│  └──333.00 MB -- b\n\
+└──0.00 MB -- heap\n\
+   └───??? MB -- used\n\
+\n\
+Used Heap Memory\n\
+??? MB -- heap-used\n\
+└──444.00 MB -- a\n\
+   └──444.00 MB -- b\n\
+\n\
+Other Measurements\n\
+555.00 MB -- other1\n\
+\n\
+";
+
+  var amvExpectedText =
+"\
+Main Process\n\
+\n\
+Mapped Memory\n\
+1,048,576,000 B (100.0%) -- mapped\n\
+├────629,145,600 B (60.00%) -- heap\n\
+│    ├──524,288,000 B (50.00%) -- used\n\
+│    └──104,857,600 B (10.00%) -- unused\n\
+├────232,783,872 B (22.20%) -- a\n\
+└────186,646,528 B (17.80%) -- other\n\
+\n\
+Used Heap Memory\n\
+524,288,000 B (100.0%) -- heap-used\n\
+├──243,269,632 B (46.40%) -- b\n\
+│  ├───83,886,080 B (16.00%) -- a\n\
+│  ├───80,740,352 B (15.40%) -- c\n\
+│  │   ├──46,137,344 B (08.80%) -- a\n\
+│  │   └──34,603,008 B (06.60%) -- b\n\
+│  └───78,643,200 B (15.00%) -- b\n\
+├──128,974,848 B (24.60%) -- c\n\
+├──103,809,024 B (19.80%) -- a\n\
+├───26,649,600 B (05.08%) -- other\n\
+├───20,971,520 B (04.00%) -- f\n\
+│   └──20,971,520 B (04.00%) -- g\n\
+│      └──20,971,520 B (04.00%) -- h\n\
+│         └──20,971,520 B (04.00%) -- i\n\
+├──────510,976 B (00.10%) -- d\n\
+└──────102,400 B (00.02%) -- e\n\
+\n\
+Other Measurements\n\
+116,391,936 B -- other1\n\
+232,783,872 B -- other2\n\
+\n\
+2nd Process\n\
+\n\
+Mapped Memory\n\
+1,048,576,000 B (100.0%) -- mapped\n\
+├────524,288,000 B (50.00%) -- heap\n\
+│    └──524,288,000 B (50.00%) -- used\n\
+├────523,239,424 B (49.90%) -- a\n\
+│    └──523,239,424 B (49.90%) -- b\n\
+│       └──523,239,424 B (49.90%) -- c\n\
+└──────1,048,576 B (00.10%) -- other\n\
+\n\
+Used Heap Memory\n\
+524,288,000 B (100.0%) -- heap-used\n\
+├──419,430,400 B (80.00%) -- a\n\
+└──104,857,600 B (20.00%) -- other\n\
+\n\
+Other Measurements\n\
+814,743,552 B -- other1\n\
+\n\
+3rd Process\n\
+\n\
+Mapped Memory\n\
+??? B -- mapped\n\
+├──349,175,808 B -- a\n\
+│  └──349,175,808 B -- b\n\
+└────0 B -- heap\n\
+     └──??? B -- used\n\
+\n\
+Used Heap Memory\n\
+??? B -- heap-used\n\
+└──465,567,744 B -- a\n\
+   └──465,567,744 B -- b\n\
+\n\
+Other Measurements\n\
+581,959,680 B -- other1\n\
+\n\
+"
+
+  function finish()
+  {
+    // Unregister fake reporters, re-register the real reporters, just in
+    // case subsequent tests rely on them.
+    for (var i = 0; i < fakeReporters.length; i++) {
+      mgr.unregisterReporter(fakeReporters[i]);
+    }
+    for (var i = 0; i < realReporters.length; i++) {
+      mgr.registerReporter(realReporters[i]);
+    }
+    SimpleTest.finish();
+  }
+
+  // Cut+paste the entire page and check that the cut text matches what we
+  // expect.  This tests the output in general and also that the cutting and
+  // pasting works as expected.
+  function test(aFrame, aExpectedText, aNext) {
+    document.querySelector("#" + aFrame).focus();
+    SimpleTest.waitForClipboard(aExpectedText,
+      function() {
+        synthesizeKey("A", {accelKey: true});
+        synthesizeKey("C", {accelKey: true});
+      },
+      aNext,
+      function() {
+        ok(false, "pasted text doesn't match for " + aFrame);
+        finish();
+      }
+    );
+  }
+
+  addLoadEvent(function() {
+    test(
+      "amFrame",
+      amExpectedText,
+      function() {
+        test(
+          "amvFrame",
+          amvExpectedText,
+          function() {
+            finish()
+          }
+        )
+      }
+    );
+  });
+  SimpleTest.waitForExplicitFinish();
+  ]]>
+  </script>
+</window>
diff --git a/xpcom/base/nsIMemoryReporter.idl b/xpcom/base/nsIMemoryReporter.idl
index d29bf8260ddb..53f6c5ab83d7 100644
--- a/xpcom/base/nsIMemoryReporter.idl
+++ b/xpcom/base/nsIMemoryReporter.idl
@@ -44,9 +44,39 @@ interface nsISimpleEnumerator;
 interface nsIMemoryReporter : nsISupports
 {
   /*
-   * The path that this memory usage should be reported under.
+   * The path that this memory usage should be reported under.  Paths can
+   * begin with a process name plus a colon, eg "Content:", but this is not
+   * necessary for the main process.  After the process name, paths are
+   * '/'-delimited, eg. "a/b/c".  There are three categories of paths.
    *
-   * Normally "/"-delimited for organization.
+   * - Paths starting with "mapped" represent non-overlapping regions of mapped
+   *   memory.  Each one can be viewed as representing a path in a tree from
+   *   the root node ("mapped") to a leaf node.  The one exception is the
+   *   special "mapped" path which represents the root of that tree.  So, for
+   *   example, "mapped/heap/used", "mapped/heap/unused",
+   *   "mapped/js/mjit-code", mapped/js/tjit-code", plus the special "mapped"
+   *   path, define this tree:
+   *
+   *     mapped
+   *     |--heap
+   *     |  |--used
+   *     |  \--unused
+   *     \--js
+   *        |--mjit-code
+   *        \--tjit-code
+   *
+   *   "mapped/heap" would not be a valid path in this example because "heap"
+   *   is not a leaf node.
+   *
+   * - Paths starting with "heap-used" represent non-overlapping regions of
+   *   used heap memory.  The "mapped" rules above apply equally here.  The
+   *   exceptional path for this tree is "mapped/heap/used" (and so this tree
+   *   is a sub-tree of the "mapped" tree).  When shown in about:memory, this
+   *   tree's root node is given the synonym "heap-used".
+   *
+   * - All other paths represent cross-cuttings memory regions, ie. ones that
+   *   may overlap arbitrarily with regions in the "mapped" and "heap-used"
+   *   trees.
    */
   readonly attribute string path;
 
diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp
index 63d152164d03..de4cac0ac928 100644
--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -41,6 +41,135 @@
 #include "nsMemoryReporterManager.h"
 #include "nsArrayEnumerator.h"
 
+#if defined(XP_LINUX)
+
+#include <unistd.h>
+static PRInt64 GetProcSelfStatmField(int n)
+{
+    // There are more than two fields, but we're only interested in the first
+    // two.
+    static const int MAX_FIELD = 2;
+    size_t fields[MAX_FIELD];
+    NS_ASSERTION(n < MAX_FIELD, "bad field number");
+    FILE *f = fopen("/proc/self/statm", "r");
+    if (f) {
+        int nread = fscanf(f, "%lu %lu", &fields[0], &fields[1]);
+        fclose(f);
+        return (PRInt64) ((nread == MAX_FIELD) ? fields[n]*getpagesize() : -1);
+    }
+    return (PRInt64) -1;
+}
+
+static PRInt64 GetMapped(void *)
+{
+    return GetProcSelfStatmField(0);
+}
+
+static PRInt64 GetResident(void *)
+{
+    return GetProcSelfStatmField(1);
+}
+
+#elif defined(XP_MACOSX)
+
+#include <mach/mach_init.h>
+#include <mach/task.h>
+
+static bool GetTaskBasicInfo(struct task_basic_info *ti)
+{
+    mach_msg_type_number_t count = TASK_BASIC_INFO_COUNT;
+    kern_return_t kr = task_info(mach_task_self(), TASK_BASIC_INFO,
+                                 (task_info_t)ti, &count);
+    return kr == KERN_SUCCESS;
+}
+
+// Getting a sensible "mapped" number on Mac is difficult.  The following is
+// easy and (I think) corresponds to the VSIZE figure reported by 'top' and
+// 'ps', but that includes shared memory and so is always absurdly high.  This
+// doesn't really matter as the "mapped" figure is never that useful.
+static PRInt64 GetMapped(void *)
+{
+    task_basic_info ti;
+    return (PRInt64) (GetTaskBasicInfo(&ti) ? ti.virtual_size : -1);
+}
+
+static PRInt64 GetResident(void *)
+{
+    task_basic_info ti;
+    return (PRInt64) (GetTaskBasicInfo(&ti) ? ti.resident_size : -1);
+}
+
+#elif defined(XP_WIN)
+
+#include <windows.h>
+#include <psapi.h>
+
+static PRInt64 GetMapped(void *)
+{
+#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
+  PROCESS_MEMORY_COUNTERS_EX pmcex;
+  pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
+
+  if (!GetProcessMemoryInfo(GetCurrentProcess(),
+                            (PPROCESS_MEMORY_COUNTERS) &pmcex, sizeof(pmcex)))
+      return (PRInt64) -1;
+
+  return pmcex.PrivateUsage;
+#else
+  return (PRInt64) -1;
+#endif
+}
+
+static PRInt64 GetResident(void *)
+{
+  PROCESS_MEMORY_COUNTERS pmc;
+  pmc.cb = sizeof(PROCESS_MEMORY_COUNTERS);
+
+  if (!GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)))
+      return (PRInt64) -1;
+
+  return pmc.WorkingSetSize;
+}
+
+#else
+
+static PRInt64 GetMapped(void *)
+{
+    return (PRInt64) -1;
+}
+
+static PRInt64 GetResident(void *)
+{
+    return (PRInt64) -1;
+}
+
+#endif
+
+// aboutMemory.js requires that this reporter always be registered, even if the
+// byte count returned is always -1.
+NS_MEMORY_REPORTER_IMPLEMENT(Mapped,
+    "mapped",
+    "Memory mapped by the process. Note that 'resident' is a better measure "
+    "of memory resources used by the process. "
+    "On Windows (XP SP2 or later only) this is the private usage and does not "
+    "include memory shared with other processes. "
+    "On Mac and Linux this is the vsize figure as reported by 'top' or 'ps' "
+    "and includes memory shared with other processes;  on Mac the amount of "
+    "shared memory can be very high and so this figure is of limited use.",
+    GetMapped,
+    NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(Resident,
+    "resident",
+    "Memory mapped by the process that is present in physical memory, "
+    "also known as the resident set size (RSS).  This is the best single "
+    "figure to use when considering the memory resources used by the process, "
+    "but it depends both on other processes being run and details of the OS "
+    "kernel and so is best used for comparing the memory usage of a single "
+    "process at different points in time.",
+    GetResident,
+    NULL)
+
 /**
  ** memory reporter implementation for jemalloc and OSX malloc,
  ** to obtain info on total memory in use (that we know about,
@@ -66,145 +195,128 @@ extern void jemalloc_stats(jemalloc_stats_t* stats)
 #endif  // MOZ_MEMORY
 
 #if HAVE_JEMALLOC_STATS
-#  define HAVE_MALLOC_REPORTERS 1
 
-PRInt64 getMallocMapped(void *) {
-    jemalloc_stats_t stats;
-    jemalloc_stats(&stats);
-    return (PRInt64) stats.mapped;
-}
-
-PRInt64 getMallocAllocated(void *) {
+static PRInt64 GetMappedHeapUsed(void *)
+{
     jemalloc_stats_t stats;
     jemalloc_stats(&stats);
     return (PRInt64) stats.allocated;
 }
 
-PRInt64 getMallocCommitted(void *) {
+static PRInt64 GetMappedHeapUnused(void *)
+{
+    jemalloc_stats_t stats;
+    jemalloc_stats(&stats);
+    return (PRInt64) (stats.mapped - stats.allocated);
+}
+
+static PRInt64 GetHeapCommitted(void *)
+{
     jemalloc_stats_t stats;
     jemalloc_stats(&stats);
     return (PRInt64) stats.committed;
 }
 
-PRInt64 getMallocDirty(void *) {
+static PRInt64 GetHeapDirty(void *)
+{
     jemalloc_stats_t stats;
     jemalloc_stats(&stats);
     return (PRInt64) stats.dirty;
 }
 
+NS_MEMORY_REPORTER_IMPLEMENT(HeapCommitted,
+                             "heap-committed",
+                             "Memory mapped by the heap allocator that is "
+                             "committed, i.e. in physical memory or paged to "
+                             "disk.",
+                             GetHeapCommitted,
+                             NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(HeapDirty,
+                             "heap-dirty",
+                             "Memory mapped by the heap allocator that is "
+                             "committed but unused.",
+                             GetHeapDirty,
+                             NULL)
+
 #elif defined(XP_MACOSX) && !defined(MOZ_MEMORY)
-#define HAVE_MALLOC_REPORTERS 1
 #include <malloc/malloc.h>
 
-static PRInt64 getMallocAllocated(void *) {
+static PRInt64 GetMappedHeapUsed(void *)
+{
     struct mstats stats = mstats();
     return (PRInt64) stats.bytes_used;
 }
 
-static PRInt64 getMallocMapped(void *) {
+static PRInt64 GetMappedHeapUnused(void *)
+{
     struct mstats stats = mstats();
-    return (PRInt64) stats.bytes_total;
+    return (PRInt64) (stats.bytes_total - stats.bytes_used);
 }
 
-static PRInt64 getMallocDefaultCommitted(void *) {
+static PRInt64 GetHeapZone0Committed(void *)
+{
     malloc_statistics_t stats;
     malloc_zone_statistics(malloc_default_zone(), &stats);
     return stats.size_in_use;
 }
 
-static PRInt64 getMallocDefaultAllocated(void *) {
+static PRInt64 GetHeapZone0Used(void *)
+{
     malloc_statistics_t stats;
     malloc_zone_statistics(malloc_default_zone(), &stats);
     return stats.size_allocated;
 }
 
-#endif
-
-
-#ifdef HAVE_MALLOC_REPORTERS
-NS_MEMORY_REPORTER_IMPLEMENT(MallocAllocated,
-                             "malloc/allocated",
-                             "Malloc bytes allocated (in use by application)",
-                             getMallocAllocated,
+NS_MEMORY_REPORTER_IMPLEMENT(HeapZone0Committed,
+                             "heap-zone0-committed",
+                             "Memory mapped by the heap allocator that is "
+                             "committed in the default zone.",
+                             GetHeapZone0Committed,
                              NULL)
 
-NS_MEMORY_REPORTER_IMPLEMENT(MallocMapped,
-                             "malloc/mapped",
-                             "Malloc bytes mapped (not necessarily committed)",
-                             getMallocMapped,
+NS_MEMORY_REPORTER_IMPLEMENT(HeapZone0Used,
+                             "heap-zone0-used",
+                             "Memory mapped by the heap allocator in the "
+                             "default zone that is available for use by the "
+                             "application.",
+                             GetHeapZone0Used,
                              NULL)
-
-#if defined(HAVE_JEMALLOC_STATS)
-NS_MEMORY_REPORTER_IMPLEMENT(MallocCommitted,
-                             "malloc/committed",
-                             "Malloc bytes committed (readable/writable)",
-                             getMallocCommitted,
-                             NULL)
-
-NS_MEMORY_REPORTER_IMPLEMENT(MallocDirty,
-                             "malloc/dirty",
-                             "Malloc bytes dirty (committed unused pages)",
-                             getMallocDirty,
-                             NULL)
-#elif defined(XP_MACOSX) && !defined(MOZ_MEMORY)
-NS_MEMORY_REPORTER_IMPLEMENT(MallocDefaultCommitted,
-                             "malloc/zone0/committed",
-                             "Malloc bytes committed (r/w) in default zone",
-                             getMallocDefaultCommitted,
-                             NULL)
-
-NS_MEMORY_REPORTER_IMPLEMENT(MallocDefaultAllocated,
-                             "malloc/zone0/allocated",
-                             "Malloc bytes allocated (in use) in default zone",
-                             getMallocDefaultAllocated,
-                             NULL)
-#endif
-
-#endif
-
-#ifdef XP_WIN
-#include <windows.h>
-#include <psapi.h>
-
-static PRInt64 GetWin32PrivateBytes(void *) {
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
-  PROCESS_MEMORY_COUNTERS_EX pmcex;
-  pmcex.cb = sizeof(PROCESS_MEMORY_COUNTERS_EX);
-
-  if (!GetProcessMemoryInfo(GetCurrentProcess(),
-                            (PPROCESS_MEMORY_COUNTERS) &pmcex,
-                            sizeof(PROCESS_MEMORY_COUNTERS_EX)))
-    return 0;
-
-  return pmcex.PrivateUsage;
 #else
-  return 0;
-#endif
+
+static PRInt64 GetMappedHeapUsed(void *)
+{
+    return (PRInt64) -1;
 }
 
-static PRInt64 GetWin32WorkingSetSize(void *) {
-  PROCESS_MEMORY_COUNTERS pmc;
-  pmc.cb = sizeof(PROCESS_MEMORY_COUNTERS);
-
-  if (!GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc)))
-      return 0;
-
-  return pmc.WorkingSetSize;
+static PRInt64 GetMappedHeapUnused(void *)
+{
+    return (PRInt64) -1;
 }
 
-NS_MEMORY_REPORTER_IMPLEMENT(Win32WorkingSetSize,
-                             "win32/workingset",
-                             "Win32 working set size",
-                             GetWin32WorkingSetSize,
-                             nsnull);
-
-NS_MEMORY_REPORTER_IMPLEMENT(Win32PrivateBytes,
-                             "win32/privatebytes",
-                             "Win32 private bytes (cannot be shared with other processes).  (Available only on Windows XP SP2 or later.)",
-                             GetWin32PrivateBytes,
-                             nsnull);
 #endif
 
+// aboutMemory.js requires that this reporter always be registered, even if the
+// byte count returned is always -1.
+NS_MEMORY_REPORTER_IMPLEMENT(MappedHeapUsed,
+    "mapped/heap/used",
+    "Memory mapped by the heap allocator that is available for use by the "
+    "application.  This may exceed the amount of memory requested by the "
+    "application due to the allocator rounding up request sizes.  "
+    "(The exact amount requested is not measured.) "
+    "This is usually the best figure for developers to focus on when trying "
+    "to reduce memory consumption.",
+    GetMappedHeapUsed,
+    NULL)
+
+NS_MEMORY_REPORTER_IMPLEMENT(MappedHeapUnused,
+    "mapped/heap/unused",
+    "Memory mapped by the heap allocator and not available for use by the "
+    "application.  This can grow large if the heap allocator is holding onto "
+    "memory that the application has freed.",
+    GetMappedHeapUnused,
+    NULL)
+
 /**
  ** nsMemoryReporterManager implementation
  **/
@@ -218,32 +330,20 @@ nsMemoryReporterManager::Init()
     if (!jemalloc_stats)
         return NS_ERROR_FAILURE;
 #endif
-    /*
-     * Register our core reporters
-     */
+
 #define REGISTER(_x)  RegisterReporter(new NS_MEMORY_REPORTER_NAME(_x))
 
-    /*
-     * Register our core jemalloc/malloc reporters
-     */
-#ifdef HAVE_MALLOC_REPORTERS
-    REGISTER(MallocAllocated);
-    REGISTER(MallocMapped);
+    REGISTER(Mapped);
+    REGISTER(MappedHeapUsed);
+    REGISTER(MappedHeapUnused);
+    REGISTER(Resident);
 
 #if defined(HAVE_JEMALLOC_STATS)
-    REGISTER(MallocCommitted);
-    REGISTER(MallocDirty);
+    REGISTER(HeapCommitted);
+    REGISTER(HeapDirty);
 #elif defined(XP_MACOSX) && !defined(MOZ_MEMORY)
-    REGISTER(MallocDefaultCommitted);
-    REGISTER(MallocDefaultAllocated);
-#endif
-#endif
-
-#ifdef XP_WIN
-#if MOZ_WINSDK_TARGETVER >= MOZ_NTDDI_LONGHORN
-    REGISTER(Win32PrivateBytes);
-#endif
-    REGISTER(Win32WorkingSetSize);
+    REGISTER(HeapZone0Committed);
+    REGISTER(HeapZone0Used);
 #endif
 
     return NS_OK;
@@ -262,7 +362,7 @@ NS_IMETHODIMP
 nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator **result)
 {
     nsresult rv;
-    mozilla::MutexAutoLock autoLock(mMutex); 
+    mozilla::MutexAutoLock autoLock(mMutex);
     rv = NS_NewArrayEnumerator(result, mReporters);
     return rv;
 }
@@ -270,7 +370,7 @@ nsMemoryReporterManager::EnumerateReporters(nsISimpleEnumerator **result)
 NS_IMETHODIMP
 nsMemoryReporterManager::RegisterReporter(nsIMemoryReporter *reporter)
 {
-    mozilla::MutexAutoLock autoLock(mMutex); 
+    mozilla::MutexAutoLock autoLock(mMutex);
     if (mReporters.IndexOf(reporter) != -1)
         return NS_ERROR_FAILURE;
 
@@ -281,7 +381,7 @@ nsMemoryReporterManager::RegisterReporter(nsIMemoryReporter *reporter)
 NS_IMETHODIMP
 nsMemoryReporterManager::UnregisterReporter(nsIMemoryReporter *reporter)
 {
-    mozilla::MutexAutoLock autoLock(mMutex); 
+    mozilla::MutexAutoLock autoLock(mMutex);
     if (!mReporters.RemoveObject(reporter))
         return NS_ERROR_FAILURE;
 
@@ -295,11 +395,11 @@ nsMemoryReporter::nsMemoryReporter(nsCString& prefix,
                                    nsCString& desc,
                                    PRInt64 memoryUsed)
 : mDesc(desc)
-, mMemoryUsed(memoryUsed) 
+, mMemoryUsed(memoryUsed)
 {
   if (!prefix.IsEmpty()) {
-    mPath.Append(prefix);
-    mPath.Append(NS_LITERAL_CSTRING(" - "));
+      mPath.Append(prefix);
+      mPath.Append(NS_LITERAL_CSTRING(":"));
   }
   mPath.Append(path);
 }
@@ -310,20 +410,20 @@ nsMemoryReporter::~nsMemoryReporter()
 
 NS_IMETHODIMP nsMemoryReporter::GetPath(char **aPath)
 {
-  *aPath = strdup(mPath.get());
-  return NS_OK;
+    *aPath = strdup(mPath.get());
+    return NS_OK;
 }
 
 NS_IMETHODIMP nsMemoryReporter::GetDescription(char **aDescription)
 {
-  *aDescription = strdup(mDesc.get());
-  return NS_OK;
+    *aDescription = strdup(mDesc.get());
+    return NS_OK;
 }
 
 NS_IMETHODIMP nsMemoryReporter::GetMemoryUsed(PRInt64 *aMemoryUsed)
 {
-  *aMemoryUsed = mMemoryUsed;
-  return NS_OK;
+    *aMemoryUsed = mMemoryUsed;
+    return NS_OK;
 }
 
 

From 9cdd5562f3123de053626db7de1a3fe80b758e4a Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Wed, 4 May 2011 14:43:48 +1200
Subject: [PATCH 233/314] Bug 600020 - Don't dispatch error events for media
 loads on cancelled channels. r=roc

---
 content/html/content/src/nsHTMLMediaElement.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp
index a517677a8bd5..3ac83ee2fe0c 100644
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -254,7 +254,8 @@ class nsHTMLMediaElement::MediaLoadListener : public nsIStreamListener,
 
 public:
   MediaLoadListener(nsHTMLMediaElement* aElement)
-    : mElement(aElement)
+    : mElement(aElement),
+      mLoadID(aElement->GetCurrentLoadID())
   {
     NS_ABORT_IF_FALSE(mElement, "Must pass an element to call back");
   }
@@ -262,6 +263,7 @@ public:
 private:
   nsRefPtr<nsHTMLMediaElement> mElement;
   nsCOMPtr<nsIStreamListener> mNextListener;
+  PRUint32 mLoadID;
 };
 
 NS_IMPL_ISUPPORTS5(nsHTMLMediaElement::MediaLoadListener, nsIRequestObserver,
@@ -288,6 +290,13 @@ NS_IMETHODIMP nsHTMLMediaElement::MediaLoadListener::OnStartRequest(nsIRequest*
   nsRefPtr<nsHTMLMediaElement> element;
   element.swap(mElement);
 
+  if (mLoadID != element->GetCurrentLoadID()) {
+    // The channel has been cancelled before we had a chance to create
+    // a decoder. Abort, don't dispatch an "error" event, as the new load
+    // may not be in an error state.
+    return NS_BINDING_ABORTED;
+  }
+
   // Don't continue to load if the request failed or has been canceled.
   nsresult rv;
   nsresult status;

From 3c5ae26d4a1a873058a9eee0dda2a03e0d3e5d2f Mon Sep 17 00:00:00 2001
From: Henri Sivonen <hsivonen@iki.fi>
Date: Wed, 4 May 2011 09:35:14 +0300
Subject: [PATCH 234/314] Bug 654106 - Avoid registering a script observer in
 the fragment parsing case. r=bzbarsky.

---
 content/base/src/nsContentSink.cpp  | 38 ++++++++++++++++-------------
 content/base/src/nsContentSink.h    |  2 ++
 parser/html/nsHtml5Parser.cpp       |  4 +--
 parser/html/nsHtml5TreeOpExecutor.h |  4 ---
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/content/base/src/nsContentSink.cpp b/content/base/src/nsContentSink.cpp
index 3400cc5d0c57..df13763a5e73 100644
--- a/content/base/src/nsContentSink.cpp
+++ b/content/base/src/nsContentSink.cpp
@@ -287,25 +287,28 @@ nsContentSink::Init(nsIDocument* aDoc,
 
   mDocumentURI = aURI;
   mDocShell = do_QueryInterface(aContainer);
-  if (mDocShell) {
-    PRUint32 loadType = 0;
-    mDocShell->GetLoadType(&loadType);
-    mDocument->SetChangeScrollPosWhenScrollingToRef(
-      (loadType & nsIDocShell::LOAD_CMD_HISTORY) == 0);
+  mScriptLoader = mDocument->ScriptLoader();
+
+  if (!mFragmentMode) {
+    if (mDocShell) {
+      PRUint32 loadType = 0;
+      mDocShell->GetLoadType(&loadType);
+      mDocument->SetChangeScrollPosWhenScrollingToRef(
+        (loadType & nsIDocShell::LOAD_CMD_HISTORY) == 0);
+    }
+
+    // use this to avoid a circular reference sink->document->scriptloader->sink
+    nsCOMPtr<nsIScriptLoaderObserver> proxy =
+      new nsScriptLoaderObserverProxy(this);
+    NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY);
+
+    mScriptLoader->AddObserver(proxy);
+
+    ProcessHTTPHeaders(aChannel);
   }
 
-  // use this to avoid a circular reference sink->document->scriptloader->sink
-  nsCOMPtr<nsIScriptLoaderObserver> proxy =
-      new nsScriptLoaderObserverProxy(this);
-  NS_ENSURE_TRUE(proxy, NS_ERROR_OUT_OF_MEMORY);
-
-  mScriptLoader = mDocument->ScriptLoader();
-  mScriptLoader->AddObserver(proxy);
-
   mCSSLoader = aDoc->CSSLoader();
 
-  ProcessHTTPHeaders(aChannel);
-
   mNodeInfoManager = aDoc->NodeInfoManager();
 
   mBackoffCount = sBackoffCount;
@@ -315,10 +318,11 @@ nsContentSink::Init(nsIDocument* aDoc,
     FavorPerformanceHint(!mDynamicLowerValue, 0);
   }
 
-  mCanInterruptParser = sCanInterruptParser;
+  // prevent DropParserAndPerfHint from unblocking onload in the fragment
+  // case
+  mCanInterruptParser = !mFragmentMode && sCanInterruptParser;
 
   return NS_OK;
-
 }
 
 NS_IMETHODIMP
diff --git a/content/base/src/nsContentSink.h b/content/base/src/nsContentSink.h
index 441493ed58e3..470b46bbd13e 100644
--- a/content/base/src/nsContentSink.h
+++ b/content/base/src/nsContentSink.h
@@ -343,6 +343,8 @@ protected:
   // shouldn't be performing any more content model notifications,
   // since we're not longer updating our child counts.
   PRUint8 mIsDocumentObserver : 1;
+  // True if this is a fragment parser
+  PRUint8 mFragmentMode : 1;
   
   //
   // -- Can interrupt parsing members --
diff --git a/parser/html/nsHtml5Parser.cpp b/parser/html/nsHtml5Parser.cpp
index 510beaa5eb20..72edba0cbe3a 100644
--- a/parser/html/nsHtml5Parser.cpp
+++ b/parser/html/nsHtml5Parser.cpp
@@ -497,6 +497,8 @@ nsHtml5Parser::ParseHtml5Fragment(const nsAString& aSourceBuffer,
   nsIURI* uri = doc->GetDocumentURI();
   NS_ENSURE_TRUE(uri, NS_ERROR_NOT_AVAILABLE);
 
+  mExecutor->EnableFragmentMode(aPreventScriptExecution);
+
   Initialize(doc, uri, nsnull, nsnull);
 
   mExecutor->SetParser(this);
@@ -516,8 +518,6 @@ nsHtml5Parser::ParseHtml5Fragment(const nsAString& aSourceBuffer,
   }
 #endif
 
-  mExecutor->EnableFragmentMode(aPreventScriptExecution);
-  
   NS_PRECONDITION(!mExecutor->HasStarted(),
                   "Tried to start parse without initializing the parser.");
   mTreeBuilder->setScriptingEnabled(mExecutor->IsScriptEnabled());
diff --git a/parser/html/nsHtml5TreeOpExecutor.h b/parser/html/nsHtml5TreeOpExecutor.h
index eb018b4ed7da..7d45f8663dcc 100644
--- a/parser/html/nsHtml5TreeOpExecutor.h
+++ b/parser/html/nsHtml5TreeOpExecutor.h
@@ -124,8 +124,6 @@ class nsHtml5TreeOpExecutor : public nsContentSink,
 
     PRBool                        mCallContinueInterruptedParsingIfEnabled;
 
-    PRBool                        mFragmentMode;
-
     PRBool                        mPreventScriptExecution;
 
   public:
@@ -241,8 +239,6 @@ class nsHtml5TreeOpExecutor : public nsContentSink,
      */
     void EnableFragmentMode(PRBool aPreventScriptExecution) {
       mFragmentMode = PR_TRUE;
-      mCanInterruptParser = PR_FALSE; // prevent DropParserAndPerfHint
-                                      // from unblocking onload
       mPreventScriptExecution = aPreventScriptExecution;
     }
     

From 42df24b2c81a6d3f4c8f3ab89acd94ee4662ba32 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Wed, 4 May 2011 09:25:50 +0200
Subject: [PATCH 235/314] Bug 654463 - Remove WinCE code from content/* ;
 r=sicking

---
 .../canvas/src/nsCanvasRenderingContext2D.cpp | 131 +-----------------
 content/svg/content/src/nsSVGFilters.cpp      |   2 -
 content/xbl/builtin/Makefile.in               |   2 +-
 content/xslt/src/xslt/txEXSLTFunctions.cpp    |   4 -
 4 files changed, 2 insertions(+), 137 deletions(-)

diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp
index d65147e5bfa1..a927cdfa2432 100644
--- a/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -3229,105 +3229,6 @@ nsCanvasRenderingContext2D::IsPointInPath(float x, float y, PRBool *retVal)
     return NS_OK;
 }
 
-#ifdef WINCE
-/* A simple bitblt for self copies that ensures that we don't overwrite any
- * area before we've read from it. */
-static void
-bitblt(gfxImageSurface *s, int src_x, int src_y, int width, int height,
-                int dest_x, int dest_y) {
-    unsigned char *data = s->Data();
-    int stride = s->Stride()/4;
-    int x, y;
-    unsigned int *dest = (unsigned int *)data;
-    unsigned int *src  = (unsigned int *)data;
-
-    int surface_width  = s->Width();
-    int surface_height = s->Height();
-
-    /* clip to the surface size */
-    if (src_x < 0) {
-        dest_x += -src_x;
-        width  -= -src_x;
-        src_x = 0;
-    }
-    if (src_y < 0) {
-        dest_y += -src_y;
-        height -= -src_y;
-        src_y = 0;
-    }
-    if (dest_x < 0) {
-        src_x += -dest_x;
-        width -= -dest_x;
-        dest_x = 0;
-    }
-    if (dest_y < 0) {
-        src_y  += -dest_y;
-        height -= -dest_y;
-        dest_y  = 0;
-    }
-
-    /*XXX: we might want to check for overflow? */
-    if (src_x + width > surface_width)
-        width = surface_width - src_x;
-    if (dest_x + width > surface_width)
-        width = surface_width - dest_x;
-    if (src_y + height > surface_height)
-        height = surface_height - src_y;
-    if (dest_y + height > surface_height)
-        height = surface_height - dest_y;
-
-    if (dest_x < src_x) {
-        if (dest_y < src_y) {
-            dest = dest + dest_y*stride + dest_x;
-            src  = src  +  src_y*stride + src_x;
-            /* copy right to left, top to bottom */
-            for (y=0; y<height; y++) {
-                for (x=0; x<width; x++) {
-                    *dest++ = *src++;
-                }
-                dest += stride - width;
-                src  += stride - width;
-            }
-        } else {
-            dest = dest + (dest_y+height-1)*stride + dest_x;
-            src  = src  + (src_y +height-1)*stride + src_x;
-            /* copy right to left, bottom to top */
-            for (y=0; y<height; y++) {
-                for (x=0; x<width; x++) {
-                    *dest++ = *src++;
-                }
-                dest += -stride - width;
-                src  += -stride - width;
-            }
-        }
-    } else {
-        if (dest_y < src_y) {
-            dest = dest + dest_y*stride + (dest_x+width-1);
-            src  = src  +  src_y*stride + (src_x +width-1);
-            /* copy left to right, top to bottom */
-            for (y=0; y<height; y++) {
-                for (x=0; x<width; x++) {
-                    *dest-- = *src--;
-                }
-                dest += stride + width;
-                src  += stride + width;
-            }
-        } else {
-            dest = dest + (dest_y+height-1)*stride + (dest_x+width-1);
-            src  = src  + (src_y +height-1)*stride + (src_x +width-1);
-            /* copy left to right, bottom to top */
-            for (y=0; y<height; y++) {
-                for (x=0; x<width; x++) {
-                    *dest-- = *src--;
-                }
-                dest += -stride + width;
-                src  += -stride + width;
-            }
-        }
-    }
-}
-#endif
-
 //
 // image
 //
@@ -3369,8 +3270,7 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
             return res.mIsStillLoading ? NS_OK : NS_ERROR_NOT_AVAILABLE;
         }
 
-#ifndef WINCE
-        // On non-CE, force a copy if we're using drawImage with our destination
+        // Force a copy if we're using drawImage with our destination
         // as a source to work around some Cairo self-copy semantics issues.
         if (res.mSurface == mSurface) {
             sfeFlags |= nsLayoutUtils::SFE_WANT_NEW_SURFACE;
@@ -3378,7 +3278,6 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
             if (!res.mSurface)
                 return NS_ERROR_NOT_AVAILABLE;
         }
-#endif
 
         imgsurf = res.mSurface.forget();
         imgSize = res.mSize;
@@ -3467,34 +3366,6 @@ nsCanvasRenderingContext2D::DrawImage(nsIDOMElement *imgElt, float a1,
 
     matrix.Translate(gfxPoint(sx, sy));
     matrix.Scale(sw/dw, sh/dh);
-#ifdef WINCE
-    /* cairo doesn't have consistent semantics for drawing a surface onto
-     * itself. Specifically, pixman will not preserve the contents when doing
-     * the copy. So to get the desired semantics a temporary copy would be needed.
-     * Instead we optimize opaque self copies here */
-    {
-        nsRefPtr<gfxASurface> csurf = mThebes->CurrentSurface();
-        if (csurf == imgsurf) {
-            if (imgsurf->GetType() == gfxASurface::SurfaceTypeImage) {
-                gfxImageSurface *surf = static_cast<gfxImageSurface*>(imgsurf.get());
-                gfxContext::GraphicsOperator op = mThebes->CurrentOperator();
-                PRBool opaque, unscaled;
-
-                opaque  = surf->Format() == gfxASurface::ImageFormatARGB32 &&
-                    (op == gfxContext::OPERATOR_SOURCE);
-                opaque |= surf->Format() == gfxASurface::ImageFormatRGB24  &&
-                    (op == gfxContext::OPERATOR_SOURCE || op == gfxContext::OPERATOR_OVER);
-
-                unscaled = sw == dw && sh == dh;
-
-                if (opaque && unscaled) {
-                    bitblt(surf, sx, sy, sw, sh, dx, dy);
-                    return NS_OK;
-                }
-            }
-        }
-    }
-#endif
 
     pattern = new gfxPattern(imgsurf);
     pattern->SetMatrix(matrix);
diff --git a/content/svg/content/src/nsSVGFilters.cpp b/content/svg/content/src/nsSVGFilters.cpp
index 0447478ef23b..212b4019df48 100644
--- a/content/svg/content/src/nsSVGFilters.cpp
+++ b/content/svg/content/src/nsSVGFilters.cpp
@@ -72,10 +72,8 @@
 
 #if defined(XP_WIN) 
 // Prevent Windows redefining LoadImage
-#ifndef WINCE
 #undef LoadImage
 #endif
-#endif
 
 #define NUM_ENTRIES_IN_4x5_MATRIX 20
 
diff --git a/content/xbl/builtin/Makefile.in b/content/xbl/builtin/Makefile.in
index 157465ce1c83..aaa2ddf87d69 100644
--- a/content/xbl/builtin/Makefile.in
+++ b/content/xbl/builtin/Makefile.in
@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 DIRS	= win
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
diff --git a/content/xslt/src/xslt/txEXSLTFunctions.cpp b/content/xslt/src/xslt/txEXSLTFunctions.cpp
index 1589795b39ea..549c22157c28 100644
--- a/content/xslt/src/xslt/txEXSLTFunctions.cpp
+++ b/content/xslt/src/xslt/txEXSLTFunctions.cpp
@@ -248,10 +248,6 @@ static txEXSLTFunctionDescriptor descriptTable[] =
 
 };
 
-#ifdef WINCE // WINCE defines this.
-#undef DIFFERENCE
-#endif
-
 class txEXSLTFunctionCall : public FunctionCall
 {
 public:

From 2839a37fa0ca6ae775d64aee6993671c46ddab90 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 4 May 2011 09:26:41 +0200
Subject: [PATCH 236/314] Bug 650505 - Get rid of ComputedCSSStyleDeclaration.
 r=dbaron,jst,peterv

---
 dom/base/nsDOMClassInfo.cpp         |  8 --------
 dom/base/nsDOMClassInfoClasses.h    |  1 -
 layout/style/nsComputedDOMStyle.cpp | 12 ++----------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 1d62908fbff1..e2ba752a2cf3 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -908,8 +908,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(CSSStyleDeclaration, nsCSSStyleDeclSH,
                            ARRAY_SCRIPTABLE_FLAGS)
-  NS_DEFINE_CLASSINFO_DATA(ComputedCSSStyleDeclaration, nsCSSStyleDeclSH,
-                           ARRAY_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(ROCSSPrimitiveValue, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
@@ -3004,12 +3002,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSS2Properties)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ComputedCSSStyleDeclaration,
-                                      nsIDOMCSSStyleDeclaration)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSStyleDeclaration)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSS2Properties)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ROCSSPrimitiveValue,
                                       nsIDOMCSSPrimitiveValue)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSPrimitiveValue)
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index f667289ee2b7..21d07d1c06f5 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -156,7 +156,6 @@ DOMCI_CLASS(MediaList)
 DOMCI_CLASS(StyleSheetList)
 DOMCI_CLASS(CSSStyleSheet)
 DOMCI_CLASS(CSSStyleDeclaration)
-DOMCI_CLASS(ComputedCSSStyleDeclaration)
 DOMCI_CLASS(ROCSSPrimitiveValue)
 
 // Range classes
diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp
index c3568b8ed031..b86b4977e61e 100644
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -161,19 +161,11 @@ nsComputedDOMStyle::Shutdown()
 
 NS_IMPL_CYCLE_COLLECTION_1(nsComputedDOMStyle, mContent)
 
-DOMCI_DATA(ComputedCSSStyleDeclaration, nsComputedDOMStyle)
-
 // QueryInterface implementation for nsComputedDOMStyle
-NS_INTERFACE_TABLE_HEAD(nsComputedDOMStyle)
-  NS_INTERFACE_TABLE3(nsComputedDOMStyle,
-                      nsICSSDeclaration,
-                      nsIDOMCSSStyleDeclaration,
-                      nsIDOMCSS2Properties)
-  NS_INTERFACE_TABLE_TO_MAP_SEGUE
+NS_INTERFACE_MAP_BEGIN(nsComputedDOMStyle)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRIES_CYCLE_COLLECTION(nsComputedDOMStyle)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(ComputedCSSStyleDeclaration)
-NS_INTERFACE_MAP_END
+NS_INTERFACE_MAP_END_INHERITING(nsDOMCSSDeclaration)
 
 
 static void doDestroyComputedDOMStyle(nsComputedDOMStyle *aComputedStyle)

From 4aba8d4f2834fb264d75a851526dadaebc695510 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 4 May 2011 09:27:19 +0200
Subject: [PATCH 237/314] Bug 654372: Fix nsWebBrowserPersist constructor init
 list order to fix build warning. r=ehsan

---
 .../components/webbrowserpersist/src/nsWebBrowserPersist.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
index 1607b87dd7d3..98b3d59dc415 100644
--- a/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -242,9 +242,9 @@ nsWebBrowserPersist::nsWebBrowserPersist() :
     mSerializingOutput(PR_FALSE),
     mPersistFlags(kDefaultPersistFlags),
     mPersistResult(NS_OK),
-    mWrapColumn(72),
     mTotalCurrentProgress(0),
     mTotalMaxProgress(0),
+    mWrapColumn(72),
     mEncodingFlags(0)
 {
 }

From 250cb69c171f58c522be2dd5e710fc04709bde84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 4 May 2011 09:29:31 +0200
Subject: [PATCH 238/314] Bug 558585 - Window flashes white when a new tab is
 made, despite settings. r=gavin

---
 browser/base/content/tabbrowser.css | 2 +-
 browser/base/content/tabbrowser.xml | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.css b/browser/base/content/tabbrowser.css
index 35c406d16b6e..a3f03fae5ced 100644
--- a/browser/base/content/tabbrowser.css
+++ b/browser/base/content/tabbrowser.css
@@ -35,7 +35,7 @@
 }
 
 tabpanels {
-  background-color: white;
+  background-color: transparent;
 }
 
 .tab-drop-indicator {
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 710678dcdb92..8decfd4d8b6d 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -2456,6 +2456,11 @@
           this.mTabListeners[0] = tabListener;
           this.mTabFilters[0] = filter;
           this.init();
+
+          this.style.backgroundColor =
+            Services.prefs.getBoolPref("browser.display.use_system_colors") ?
+              "-moz-default-background-color" :
+              Services.prefs.getCharPref("browser.display.background_color");
         ]]>
       </constructor>
 

From 6320673fdd4c1d9fa815f63debbdd14a29c327a0 Mon Sep 17 00:00:00 2001
From: Ginn Chen <ginn.chen@oracle.com>
Date: Wed, 4 May 2011 15:39:12 +0800
Subject: [PATCH 239/314] Bug 654653 Some CXXFLAGS are missing for non GNU_CXX
 compiler r=glandium

---
 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index acfbef4168e1..ab645a8f457c 100644
--- a/configure.in
+++ b/configure.in
@@ -2983,7 +2983,7 @@ AC_CACHE_CHECK(for usable char16_t (2 bytes, unsigned),
 if test "$ac_cv_have_usable_char16_t" = "yes"; then
     AC_DEFINE(HAVE_CPP_CHAR16_T)
     HAVE_CPP_CHAR16_T=1
-else
+elif test "$GNU_CXX"; then
     CXXFLAGS="$_SAVE_CXXFLAGS"
 fi
 

From 3e0416be8e6aafbbb18f8723500210711e2b4b05 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 11:49:38 +0200
Subject: [PATCH 240/314] Bug 642148 - Upgrade Mozilla to NSPR 4.8.8 beta 3 and
 NSS 3.12.10 beta 1, r=wtc, r=kaie

---
 nsprpub/TAG-INFO                              |    2 +-
 nsprpub/config/prdepend.h                     |    1 +
 nsprpub/configure                             |   48 +-
 nsprpub/configure.in                          |    2 +
 nsprpub/pr/include/prio.h                     |    3 +
 nsprpub/pr/include/prtypes.h                  |   22 +-
 nsprpub/pr/src/pthreads/ptio.c                |   34 +
 security/coreconf/Darwin.mk                   |    4 +-
 security/coreconf/coreconf.dep                |    2 -
 security/nss/TAG-INFO                         |    2 +-
 security/nss/cmd/addbuiltin/addbuiltin.c      |    6 +-
 security/nss/cmd/certutil/certutil.c          |  544 +-
 security/nss/cmd/lib/secutil.c                |   18 +-
 security/nss/cmd/lib/secutil.h                |    5 +-
 security/nss/cmd/selfserv/selfserv.c          |    8 +-
 security/nss/cmd/shlibsign/shlibsign.c        |    4 +-
 security/nss/cmd/strsclnt/strsclnt.c          |   38 +-
 security/nss/cmd/tstclnt/tstclnt.c            |   11 +-
 security/nss/lib/certdb/cert.h                |   35 +-
 security/nss/lib/certdb/stanpcertdb.c         |   15 +
 security/nss/lib/certhigh/certhigh.c          |    2 +-
 security/nss/lib/certhigh/certvfypkix.c       |   57 +
 security/nss/lib/ckfw/builtins/certdata.c     | 5421 +++++++++--------
 security/nss/lib/ckfw/builtins/certdata.txt   | 5120 +++++++++-------
 security/nss/lib/ckfw/builtins/nssckbi.h      |    4 +-
 security/nss/lib/cryptohi/seckey.c            |   37 +-
 security/nss/lib/freebl/blapit.h              |    6 +-
 security/nss/lib/freebl/mpi/mpi-config.h      |    4 +-
 security/nss/lib/freebl/mpi/mpi.c             |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_gas.s   |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_sun.s   |    4 +-
 security/nss/lib/freebl/nsslowhash.c          |    4 +-
 security/nss/lib/freebl/rsa.c                 |  335 +-
 security/nss/lib/freebl/sha512.c              |    4 +-
 security/nss/lib/freebl/stubs.c               |   54 +
 security/nss/lib/freebl/stubs.h               |    5 +
 .../libpkix/pkix/checker/pkix_crlchecker.c    |    3 +
 .../nss/lib/libpkix/pkix/top/pkix_build.c     |   34 +-
 .../pkix_pl_nss/module/pkix_pl_socket.c       |    6 +-
 .../pkix_pl_nss/pki/pkix_pl_infoaccess.c      |   75 +-
 security/nss/lib/nss/nss.def                  |    7 +
 security/nss/lib/nss/nss.h                    |    8 +-
 security/nss/lib/pk11wrap/Makefile            |    2 +
 security/nss/lib/pk11wrap/debug_module.c      |   27 +-
 security/nss/lib/pk11wrap/pk11load.c          |    9 +-
 security/nss/lib/pk11wrap/pk11pars.c          |   13 +
 security/nss/lib/pk11wrap/pk11priv.h          |    2 +
 security/nss/lib/pk11wrap/pk11slot.c          |   34 +-
 security/nss/lib/pk11wrap/pk11util.c          |   12 +
 security/nss/lib/pk11wrap/secmodi.h           |    2 +
 security/nss/lib/pki/pki3hack.c               |   94 +-
 security/nss/lib/pki/pki3hack.h               |    5 +-
 security/nss/lib/smime/cms.h                  |   55 +-
 security/nss/lib/smime/cmsasn1.c              |   22 +-
 security/nss/lib/smime/cmscinfo.c             |  123 +-
 security/nss/lib/smime/cmsdecode.c            |  143 +-
 security/nss/lib/smime/cmsdigdata.c           |   37 +-
 security/nss/lib/smime/cmsencdata.c           |   33 +-
 security/nss/lib/smime/cmsencode.c            |  185 +-
 security/nss/lib/smime/cmsenvdata.c           |   32 +-
 security/nss/lib/smime/cmslocal.h             |   45 +-
 security/nss/lib/smime/cmsmessage.c           |    8 +-
 security/nss/lib/smime/cmssigdata.c           |   34 +-
 security/nss/lib/smime/cmst.h                 |   36 +-
 security/nss/lib/smime/cmsudf.c               |  480 ++
 security/nss/lib/smime/cmsutil.c              |   11 +-
 security/nss/lib/smime/manifest.mn            |    1 +
 security/nss/lib/smime/smime.def              |   20 +
 security/nss/lib/smime/smime.h                |    4 +-
 security/nss/lib/softoken/pkcs11.c            |   45 +-
 security/nss/lib/softoken/rsawrapr.c          |   51 +-
 security/nss/lib/softoken/softkver.h          |    6 +-
 security/nss/lib/ssl/derive.c                 |   43 +-
 security/nss/lib/ssl/ssl.def                  |    6 +
 security/nss/lib/ssl/ssl.h                    |   11 +-
 security/nss/lib/ssl/ssl3con.c                |   42 +-
 security/nss/lib/ssl/ssl3ext.c                |   15 +-
 security/nss/lib/ssl/sslcon.c                 |    6 +-
 security/nss/lib/ssl/sslimpl.h                |    4 +-
 security/nss/lib/ssl/sslnonce.c               |    5 +-
 security/nss/lib/ssl/sslsecur.c               |   15 +-
 security/nss/lib/ssl/sslsnce.c                |  124 +-
 security/nss/lib/ssl/sslsock.c                |   10 +-
 security/nss/lib/sysinit/nsssysinit.c         |   40 +-
 security/nss/lib/util/nssb64d.c               |   10 +-
 security/nss/lib/util/nssutil.h               |    6 +-
 security/nss/lib/util/secasn1e.c              |    8 +-
 security/nss/tests/chains/ocspd-config/readme |   24 +-
 security/nss/tests/libpkix/certs/OCSPCA1.cert |  Bin 585 -> 583 bytes
 security/nss/tests/libpkix/certs/OCSPCA1.p12  |  Bin 1700 -> 1692 bytes
 security/nss/tests/libpkix/certs/OCSPCA2.cert |  Bin 585 -> 583 bytes
 security/nss/tests/libpkix/certs/OCSPCA2.p12  |  Bin 1700 -> 1692 bytes
 security/nss/tests/libpkix/certs/OCSPCA3.cert |  Bin 585 -> 583 bytes
 security/nss/tests/libpkix/certs/OCSPCA3.p12  |  Bin 1700 -> 1692 bytes
 .../nss/tests/libpkix/certs/OCSPEE11.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE12.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE13.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE14.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE15.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE21.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE22.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE23.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE31.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE32.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPEE33.cert     |  Bin 563 -> 561 bytes
 .../nss/tests/libpkix/certs/OCSPRoot.cert     |  Bin 549 -> 549 bytes
 security/nss/tests/libpkix/certs/OCSPRoot.p12 |  Bin 1662 -> 1662 bytes
 .../nss/tests/libpkix/certs/PayPalEE.cert     |  Bin 1615 -> 1615 bytes
 108 files changed, 8182 insertions(+), 5760 deletions(-)
 create mode 100644 security/nss/lib/smime/cmsudf.c

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 94e18b2923e4..ca2fd86685e0 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_8_8_BETA2
+NSPR_4_8_8_BETA3
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index df72c56882d2..55444c40b3aa 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -42,3 +42,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/configure b/nsprpub/configure
index d6ff36f7a10a..d92322f2601f 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,10 +3541,12 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
@@ -4739,17 +4741,17 @@ EOF
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4743: checking for machine/builtins.h" >&5
+echo "configure:4745: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4748 "configure"
+#line 4750 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5398,7 +5400,7 @@ case $target in
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5402: checking for dlopen in -ldl" >&5
+echo "configure:5404: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5406,7 +5408,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5410 "configure"
+#line 5412 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5417,7 +5419,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5434,17 +5436,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5438: checking for dlfcn.h" >&5
+echo "configure:5440: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5443 "configure"
+#line 5445 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5477,13 +5479,13 @@ esac
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5487 "configure"
+#line 5489 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -5501,7 +5503,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5505 "configure"
+#line 5507 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -5525,12 +5527,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5529: checking for $ac_func" >&5
+echo "configure:5531: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5534 "configure"
+#line 5536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5553,7 +5555,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5604,7 +5606,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5608: checking for $ac_word" >&5
+echo "configure:5610: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5663,7 +5665,7 @@ hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5667: checking for +Olit support" >&5
+echo "configure:5669: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5705,7 +5707,7 @@ wince*)
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5709: checking for pthread_create in -lpthreads" >&5
+echo "configure:5711: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5727,7 +5729,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5731: checking for pthread_create in -lpthread" >&5
+echo "configure:5733: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5749,7 +5751,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5753: checking for pthread_create in -lc_r" >&5
+echo "configure:5755: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5771,7 +5773,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5775: checking for pthread_create in -lc" >&5
+echo "configure:5777: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5889,7 +5891,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5912,7 +5914,7 @@ echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index bd502c893062..390940fa2977 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,10 +1144,12 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/pr/include/prio.h b/nsprpub/pr/include/prio.h
index 7ec3045e065c..1ee792b52e34 100644
--- a/nsprpub/pr/include/prio.h
+++ b/nsprpub/pr/include/prio.h
@@ -142,6 +142,9 @@ typedef enum PRTransmitFileFlags {
 #define PR_AF_INET6 100
 #endif
 
+#define PR_AF_INET_SDP 101
+#define PR_AF_INET6_SDP 102
+
 #ifndef PR_AF_UNSPEC
 #define PR_AF_UNSPEC 0
 #endif
diff --git a/nsprpub/pr/include/prtypes.h b/nsprpub/pr/include/prtypes.h
index b764b27e4af5..6b3cb5ae4c0f 100644
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -235,7 +235,7 @@ PR_BEGIN_EXTERN_C
 **              PRInt8
 ** DESCRIPTION:
 **  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char". 
+**      is equivalent to a plain "char".
 ************************************************************************/
 #if PR_BYTES_PER_BYTE == 1
 typedef unsigned char PRUint8;
@@ -274,7 +274,7 @@ typedef signed char PRInt8;
 ** TYPES:       PRUint16
 **              PRInt16
 ** DESCRIPTION:
-**  The int16 types are known to be 16 bits each. 
+**  The int16 types are known to be 16 bits each.
 ************************************************************************/
 #if PR_BYTES_PER_SHORT == 2
 typedef unsigned short PRUint16;
@@ -299,7 +299,7 @@ typedef short PRInt16;
 ** TYPES:       PRUint32
 **              PRInt32
 ** DESCRIPTION:
-**  The int32 types are known to be 32 bits each. 
+**  The int32 types are known to be 32 bits each.
 ************************************************************************/
 #if PR_BYTES_PER_INT == 4
 typedef unsigned int PRUint32;
@@ -372,7 +372,7 @@ typedef PRInt64 PRUint64;
 **  The PRIntn types are most appropriate for automatic variables. They are
 **      guaranteed to be at least 16 bits, though various architectures may
 **      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure. 
+**      never valid for fields of a structure.
 ************************************************************************/
 #if PR_BYTES_PER_INT >= 2
 typedef int PRIntn;
@@ -384,14 +384,14 @@ typedef unsigned int PRUintn;
 /************************************************************************
 ** TYPES:       PRFloat64
 ** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits. 
+**  NSPR's floating point type is always 64 bits.
 ************************************************************************/
 typedef double          PRFloat64;
 
 /************************************************************************
 ** TYPES:       PRSize
 ** DESCRIPTION:
-**  A type for representing the size of objects. 
+**  A type for representing the size of objects.
 ************************************************************************/
 typedef size_t PRSize;
 
@@ -399,7 +399,7 @@ typedef size_t PRSize;
 /************************************************************************
 ** TYPES:       PROffset32, PROffset64
 ** DESCRIPTION:
-**  A type for representing byte offsets from some location. 
+**  A type for representing byte offsets from some location.
 ************************************************************************/
 typedef PRInt32 PROffset32;
 typedef PRInt64 PROffset64;
@@ -408,7 +408,7 @@ typedef PRInt64 PROffset64;
 ** TYPES:       PRPtrDiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction. 
+**      for storing a pointer or pointer subtraction.
 ************************************************************************/
 typedef ptrdiff_t PRPtrdiff;
 
@@ -416,7 +416,7 @@ typedef ptrdiff_t PRPtrdiff;
 ** TYPES:       PRUptrdiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction. 
+**      for storing a pointer or pointer sutraction.
 ************************************************************************/
 #ifdef _WIN64
 typedef PRUint64 PRUptrdiff;
@@ -430,7 +430,7 @@ typedef unsigned long PRUptrdiff;
 **  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
 **      for clarity of target type in assignments and actual arguments. Use
 **      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions. 
+**      just as you would C int-valued conditions.
 ************************************************************************/
 typedef PRIntn PRBool;
 #define PR_TRUE 1
@@ -445,7 +445,7 @@ typedef PRIntn PRBool;
 typedef PRUint8 PRPackedBool;
 
 /*
-** Status code used by some routines that have a single point of failure or 
+** Status code used by some routines that have a single point of failure or
 ** special status return.
 */
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c
index 05ce808fd363..66921a4a65ec 100644
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -218,6 +218,20 @@ static PRBool _pr_ipv6_v6only_on_by_default;
 #error "Cannot determine architecture"
 #endif
 
+#if defined(SOLARIS)            
+#ifndef PROTO_SDP
+/* on solaris, SDP is a new type of protocol */
+#define PROTO_SDP   257
+#endif 
+#define _PR_HAVE_SDP
+#elif defined(LINUX)
+#ifndef AF_INET_SDP
+/* on linux, SDP is a new type of address family */
+#define AF_INET_SDP 27
+#endif
+#define _PR_HAVE_SDP
+#endif /* LINUX */
+
 static PRFileDesc *pt_SetMethods(
     PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
 
@@ -3462,6 +3476,12 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 
     if (PF_INET != domain
         && PR_AF_INET6 != domain
+#if defined(_PR_HAVE_SDP)
+        && PR_AF_INET_SDP != domain
+#if defined(SOLARIS)
+        && PR_AF_INET6_SDP != domain
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
         && PF_UNIX != domain)
     {
         PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
@@ -3474,6 +3494,20 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 		(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
 		return fd;
 	}
+#if defined(_PR_HAVE_SDP)
+#if defined(LINUX)
+    if (PR_AF_INET_SDP == domain)
+        domain = AF_INET_SDP;
+#elif defined(SOLARIS)
+    if (PR_AF_INET_SDP == domain) {
+        domain = AF_INET;
+        proto = PROTO_SDP;
+    } else if(PR_AF_INET6_SDP == domain) {
+        domain = AF_INET6;
+        proto = PROTO_SDP;
+    }
+#endif /* SOLARIS */
+#endif /* _PR_HAVE_SDP */
 #if defined(_PR_INET6_PROBE)
 	if (PR_AF_INET6 == domain)
 		domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET;
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk
index 9edf4d8476c5..110d89f2ae13 100644
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -54,13 +54,15 @@ ifdef USE_64
 CC              += -arch x86_64
 else
 OS_REL_CFLAGS	= -Di386
+CC              += -arch i386
 endif
 else
 OS_REL_CFLAGS	= -Dppc
+CC              += -arch ppc
 endif
 
 ifneq (,$(MACOS_SDK_DIR))
-    GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[  ]*//" | awk '{ print $$1 }')
+    GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
     GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
     GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
     GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
diff --git a/security/coreconf/coreconf.dep b/security/coreconf/coreconf.dep
index 74740bdcc314..b536cfc01b91 100644
--- a/security/coreconf/coreconf.dep
+++ b/security/coreconf/coreconf.dep
@@ -43,5 +43,3 @@
 
 #error "Do not include this header file."
 
-
-
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 6e9e9a3f0736..26c5e745e9fb 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_12_9_RTM
+NSS_3_12_10_BETA1
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index 693819ff0e1d..63422f893dc9 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -37,7 +37,7 @@
 /*
  * Tool for converting builtin CA certs.
  *
- * $Id: addbuiltin.c,v 1.14 2007/02/14 00:35:52 alexei.volkov.bugs%sun.com Exp $
+ * $Id: addbuiltin.c,v 1.14.68.1 2011/03/23 20:07:57 kaie%kuix.de Exp $
  */
 
 #include "nssrenam.h"
@@ -77,6 +77,8 @@ char *getTrustString(unsigned int trust)
 		return "CKT_NETSCAPE_TRUSTED_DELEGATOR";
 	} else if (trust & CERTDB_VALID_CA) {
 		return "CKT_NETSCAPE_VALID_DELEGATOR";
+	} else if (trust & CERTDB_VALID_PEER) {
+		return "CKT_NETSCAPE_VALID";
 	} else {
 		return "CKT_NETSCAPE_TRUST_UNKNOWN";
 	}
@@ -213,7 +215,7 @@ void printheader() {
 "#\n"
 "# ***** END LICENSE BLOCK *****\n"
      "#\n"
-     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14 $ $Date: 2007/02/14 00:35:52 $\"\n"
+     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14.68.1 $ $Date: 2011/03/23 20:07:57 $\"\n"
      "\n"
      "#\n"
      "# certdata.txt\n"
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c
index 459357888622..4b890446fde4 100644
--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -985,7 +985,7 @@ ListModules(void)
 }
 
 static void 
-Usage(char *progName)
+PrintSyntax(char *progName)
 {
 #define FPS fprintf(stderr, 
     FPS "Type %s -H for more detailed descriptions\n", progName);
@@ -1055,22 +1055,57 @@ Usage(char *progName)
     exit(1);
 }
 
-static void LongUsage(char *progName)
-{
+enum usage_level {
+    usage_all = 0, usage_selected = 1
+};
 
+static void luCommonDetailsAE();
+
+static void luA(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "A"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add a certificate to the database        (create if needed)\n",
-	"-A");
+        "-A");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    if (ul == usage_all) {
     FPS "%-20s\n", "   All options under -E apply");
+    }
+    else {
+        luCommonDetailsAE();
+    }
+}
+
+static void luB(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "B"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Run a series of certutil commands from a batch file\n", "-B");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the batch file\n", "   -i batch-file");
+}
+
+static void luE(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "E"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add an Email certificate to the database (create if needed)\n",
-	"-E");
+        "-E");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    luCommonDetailsAE();
+}
+
+static void luCommonDetailsAE()
+{
     FPS "%-20s Specify the nickname of the certificate to add\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Set the certificate trust attributes:\n",
-	"   -t trustargs");
+        "   -t trustargs");
     FPS "%-25s trustargs is of the form x,y,z where x is for SSL, y is for S/MIME,\n", "");
-    FPS "%-25s and z is for code signing\n", "");
+    FPS "%-25s and z is for code signing. Use ,, for no explicit trust.\n", "");
     FPS "%-25s p \t valid peer\n", "");
     FPS "%-25s P \t trusted peer (implies p)\n", "");
     FPS "%-25s c \t valid CA\n", "");
@@ -1080,39 +1115,46 @@ static void LongUsage(char *progName)
     FPS "%-25s w \t send warning\n", "");
     FPS "%-25s g \t make step-up cert\n", "");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s The input certificate is encoded in ASCII (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Specify the certificate file (default is stdin)\n",
-	"   -i input");
+        "   -i input");
     FPS "\n");
+}
 
+static void luC(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "C"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new binary certificate from a BINARY cert request\n",
-	"-C");
+        "-C");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the issuer cert\n",
-	"   -c issuer-name");
+        "   -c issuer-name");
     FPS "%-20s The BINARY certificate request file\n",
-	"   -i cert-request ");
+        "   -i cert-request ");
     FPS "%-20s Output binary cert to this file (default is stdout)\n",
-	"   -o output-cert");
+        "   -o output-cert");
     FPS "%-20s Self sign\n",
-	"   -x");
+        "   -x");
     FPS "%-20s Cert serial number\n",
-	"   -m serial-number");
+        "   -m serial-number");
     FPS "%-20s Time Warp\n",
-	"   -w warp-months");
+        "   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s \n"
               "%-20s Create key usage extension. Possible keywords:\n"
               "%-20s \"digitalSignature\", \"nonRepudiation\", \"keyEncipherment\",\n"
@@ -1120,11 +1162,11 @@ static void LongUsage(char *progName)
               "%-20s \"crlSigning\", \"critical\"\n",
         "   -1 | --keyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create basic constraint extension\n",
-	"   -2 ");
+        "   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-	"   -3 ");
+        "   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-	"   -4 ");
+        "   -4 ");
     FPS "%-20s \n"
               "%-20s Create netscape cert type extension. Possible keywords:\n"
               "%-20s \"sslClient\", \"sslServer\", \"smime\", \"objectSigning\",\n"
@@ -1135,41 +1177,48 @@ static void LongUsage(char *progName)
               "%-20s \"serverAuth\", \"clientAuth\",\"codeSigning\",\n"
               "%-20s \"emailProtection\", \"timeStamp\",\"ocspResponder\",\n"
               "%-20s \"stepUp\", \"critical\"\n",
-	"   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
+        "   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create an email subject alt name extension\n",
-	"   -7 emailAddrs");
+        "   -7 emailAddrs");
     FPS "%-20s Create an dns subject alt name extension\n",
-	"   -8 dnsNames");
+        "   -8 dnsNames");
     FPS "%-20s The input certificate request is encoded in ASCII (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "\n");
+}
 
+static void luG(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "G"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a new key pair\n",
-	"-G");
+        "-G");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
-	"   -k key-type");
+        "   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d) (not for ec)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
-	"   -k key-type");
+        "   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Set the public exponent value (3, 17, 65537) (rsa only)\n",
-	"   -y exp");
+        "   -y exp");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Specify the noise file to be used\n",
-	"   -z noisefile");
+        "   -z noisefile");
     FPS "%-20s read PQG value from pqgfile (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s One of nistp256, nistp384, nistp521\n", "");
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
     FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", "");
@@ -1192,167 +1241,239 @@ static void LongUsage(char *progName)
 #endif /* NSS_ECC_MORE_THAN_SUITE_B */
 #endif
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
 
+static void luD(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "D"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Delete a certificate from the database\n",
-	"-D");
+        "-D");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to delete\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
 
+}
+
+static void luU(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "U"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all modules\n", /*, or print out a single named module\n",*/
         "-U");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Module database directory (default is '~/.netscape')\n",
         "   -d moddir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
 
+}
+
+static void luK(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "K"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all private keys\n",
         "-K");
-          FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
-	"   -h token-name ");
+    if (ul == usage_selected && !is_my_command)
+        return;
+    FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
+        "   -h token-name ");
 
     FPS "%-20s Key type (\"all\" (default), \"dsa\","
 #ifdef NSS_ENABLE_ECC
                                                     " \"ec\","
 #endif
-                                                             " \"rsa\")\n",
-	"   -k key-type");
+                                                    " \"rsa\")\n",
+        "   -k key-type");
     FPS "%-20s The nickname of the key or associated certificate\n",
-	"   -n name");
+        "   -n name");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luL(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "L"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all certs, or print out a single named cert\n",
-	"-L");
+        "-L");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Pretty print named cert (list all if unspecified)\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s \n"
               "%-20s Pretty print cert with email address (list all if unspecified)\n",
-	"   --email email-address", "");
+        "   --email email-address", "");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "%-20s For single cert, print binary DER encoding\n",
-	"   -r");
+        "   -r");
     FPS "%-20s For single cert, print ASCII encoding (RFC1113)\n",
-	"   -a");
+        "   -a");
     FPS "\n");
+}
 
+static void luM(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "M"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Modify trust attributes of certificate\n",
-	"-M");
+        "-M");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to modify\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-	"   -t trustargs");
+        "   -t trustargs");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
 
+static void luN(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "N"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new certificate database\n",
-	"-N");
+        "-N");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "\n");
+}
+
+static void luT(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "T"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Reset the Key database or token\n",
-	"-T");
+        "-T");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Token to reset (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Set token's Site Security Officer password\n",
-	"   -0 SSO-password");
+        "   -0 SSO-password");
     FPS "\n");
+}
 
-    FPS "\n");
+static void luO(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "O"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Print the chain of a certificate\n",
-	"-O");
+        "-O");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to modify\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luR(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "R"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a certificate request (stdout)\n",
-	"-R");
+        "-R");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the subject name (using RFC1485)\n",
-	"   -s subject");
+        "   -s subject");
     FPS "%-20s Output the cert request to this file\n",
-	"   -o output-req");
+        "   -o output-req");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-	"   -k key-type-or-id");
+        "   -k key-type-or-id");
     FPS "%-20s or nickname of the cert key to use \n",
-	"");
+        "");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-	"");
+        "");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-	"   -d keydir");
+        "   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-	"   -p phone");
+        "   -p phone");
     FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s \n",
-	"   See -S for available extension options");
+        "   See -S for available extension options");
     FPS "\n");
+}
 
+static void luV(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "V"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Validate a certificate\n",
-	"-V");
+        "-V");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s The nickname of the cert to Validate\n",
-	"   -n cert-name");
+        "   -n cert-name");
     FPS "%-20s validity time (\"YYMMDDHHMMSS[+HHMM|-HHMM|Z]\")\n",
-	"   -b time");
+        "   -b time");
     FPS "%-20s Check certificate signature \n",
-	"   -e ");   
+        "   -e ");   
     FPS "%-20s Specify certificate usage:\n", "   -u certusage");
     FPS "%-25s C \t SSL Client\n", "");
     FPS "%-25s V \t SSL Server\n", "");
@@ -1361,140 +1482,205 @@ static void LongUsage(char *progName)
     FPS "%-25s O \t OCSP status responder\n", "");   
     FPS "%-25s J \t Object signer\n", "");   
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-	"   -a");
+        "   -a");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-	"   -X");
+        "   -X");
     FPS "\n");
+}
 
+static void luW(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "W"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Change the key database password\n",
-	"-W");
+        "-W");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s cert and key database directory\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Specify a file with the current password\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Specify a file with the new password in two lines\n",
-	"   -@ newpwfile");
+        "   -@ newpwfile");
+    FPS "\n");
+}
 
+static void luUpgradeMerge(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "upgrade-merge"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Upgrade an old database and merge it into a new one\n",
-	"--upgrade-merge");
+        "--upgrade-merge");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory to merge into (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory to upgrade from\n",
-	"   --source-dir certdir", "");
+        "   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the upgrade database\n",
-	"   --soruce-prefix dbprefix", "");
+        "   --soruce-prefix dbprefix", "");
     FPS "%-20s \n%-20s Unique identifier for the upgrade database\n",
-	"   --upgrade-id uniqueID", "");
+        "   --upgrade-id uniqueID", "");
     FPS "%-20s \n%-20s Name of the token while it is in upgrade state\n",
-	"   --upgrade-token-name name", "");
+        "   --upgrade-token-name name", "");
     FPS "%-20s Specify the password file for the upgrade database\n",
-	"   -@ pwfile");
+        "   -@ pwfile");
     FPS "\n");
+}
 
+static void luMerge(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "merge"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Merge source database into the target database\n",
-	"--merge");
+        "--merge");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Cert database directory of target (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory of the source database\n",
-	"   --source-dir certdir", "");
+        "   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the source database\n",
-	"   --source-prefix dbprefix", "");
+        "   --source-prefix dbprefix", "");
     FPS "%-20s Specify the password file for the source database\n",
-	"   -@ pwfile");
+        "   -@ pwfile");
     FPS "\n");
+}
 
+static void luS(enum usage_level ul, const char *command)
+{
+    int is_my_command = (command && 0 == strcmp(command, "S"));
+    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Make a certificate and add to database\n",
         "-S");
+    if (ul == usage_selected && !is_my_command)
+        return;
     FPS "%-20s Specify the nickname of the cert\n",
         "   -n key-name");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
         "   -s subject");
     FPS "%-20s The nickname of the issuer cert\n",
-	"   -c issuer-name");
+        "   -c issuer-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-	"   -t trustargs");
+        "   -t trustargs");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-	"   -k key-type-or-id");
+        "   -k key-type-or-id");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-	"   -h token-name");
+        "   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-	"   -q pqgfile");
+        "   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-	"   -q curve-name");
+        "   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-	"");
+        "");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Self sign\n",
-	"   -x");
+        "   -x");
     FPS "%-20s Cert serial number\n",
-	"   -m serial-number");
+        "   -m serial-number");
     FPS "%-20s Time Warp\n",
-	"   -w warp-months");
+        "   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-	"   -f pwfile");
+        "   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-	"   -d certdir");
+        "   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-	"   -P dbprefix");
+        "   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-	"   -p phone");
+        "   -p phone");
     FPS "%-20s Create key usage extension\n",
-	"   -1 ");
+        "   -1 ");
     FPS "%-20s Create basic constraint extension\n",
-	"   -2 ");
+        "   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-	"   -3 ");
+        "   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-	"   -4 ");
+        "   -4 ");
     FPS "%-20s Create netscape cert type extension\n",
-	"   -5 ");
+        "   -5 ");
     FPS "%-20s Create extended key usage extension\n",
-	"   -6 ");
+        "   -6 ");
     FPS "%-20s Create an email subject alt name extension\n",
-	"   -7 emailAddrs ");
+        "   -7 emailAddrs ");
     FPS "%-20s Create a DNS subject alt name extension\n",
-	"   -8 DNS-names");
+        "   -8 DNS-names");
     FPS "%-20s Create an Authority Information Access extension\n",
-	"   --extAIA ");
+        "   --extAIA ");
     FPS "%-20s Create a Subject Information Access extension\n",
-	"   --extSIA ");
+        "   --extSIA ");
     FPS "%-20s Create a Certificate Policies extension\n",
-	"   --extCP ");
+        "   --extCP ");
     FPS "%-20s Create a Policy Mappings extension\n",
-	"   --extPM ");
+        "   --extPM ");
     FPS "%-20s Create a Policy Constraints extension\n",
-	"   --extPC ");
+        "   --extPC ");
     FPS "%-20s Create an Inhibit Any Policy extension\n",
-	"   --extIA ");
+        "   --extIA ");
     FPS "%-20s Create a subject key ID extension\n",
-	"   --extSKID ");
+        "   --extSKID ");
     FPS "\n");
+}
 
-    exit(1);
+static void LongUsage(char *progName, enum usage_level ul, const char *command)
+{
+    luA(ul, command);
+    luB(ul, command);
+    luE(ul, command);
+    luC(ul, command);
+    luG(ul, command);
+    luD(ul, command);
+    luU(ul, command);
+    luK(ul, command);
+    luL(ul, command);
+    luM(ul, command);
+    luN(ul, command);
+    luT(ul, command);
+    luO(ul, command);
+    luR(ul, command);
+    luV(ul, command);
+    luW(ul, command);
+    luUpgradeMerge(ul, command);
+    luMerge(ul, command);
+    luS(ul, command);
 #undef FPS
 }
 
+static void
+Usage(char *progName)
+{
+    PR_fprintf(PR_STDERR,
+        "%s - Utility to manipulate NSS certificate databases\n\n"
+        "Usage:  %s <command> -d <database-directory> <options>\n\n"
+        "Valid commands:\n", progName, progName);
+    LongUsage(progName, usage_selected, NULL);
+    PR_fprintf(PR_STDERR, "\n"
+        "%s -H <command> : Print available options for the given command\n"
+        "%s -H : Print complete help output of all commands and options\n"
+        "%s --syntax : Print a short summary of all commands and options\n",
+        progName, progName, progName);
+    exit(1);
+}
 
 static CERTCertificate *
 MakeV1Cert(	CERTCertDBHandle *	handle, 
@@ -1829,6 +2015,7 @@ enum {
     cmd_DeleteKey,
     cmd_GenKeyPair,
     cmd_PrintHelp,
+    cmd_PrintSyntax,
     cmd_ListKeys,
     cmd_ListCerts,
     cmd_ModifyCertTrust,
@@ -1843,7 +2030,8 @@ enum {
     cmd_Version,
     cmd_Batch,
     cmd_Merge,
-    cmd_UpgradeMerge /* test only */
+    cmd_UpgradeMerge, /* test only */
+    max_cmd
 };
 
 /*  Certutil options */
@@ -1901,7 +2089,8 @@ enum certutilOpts {
     opt_SourceDir,
     opt_SourcePrefix,
     opt_UpgradeID,
-    opt_UpgradeTokenName
+    opt_UpgradeTokenName,
+    opt_Help
 };
 
 static const
@@ -1913,7 +2102,9 @@ secuCommandFlag commands_init[] =
 	{ /* cmd_AddEmailCert        */  'E', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DeleteKey           */  'F', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_GenKeyPair          */  'G', PR_FALSE, 0, PR_FALSE },
-	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE },
+	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE, "help" },
+        { /* cmd_PrintSyntax         */   0,  PR_FALSE, 0, PR_FALSE,
+                                                   "syntax" },
 	{ /* cmd_ListKeys            */  'K', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListCerts           */  'L', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ModifyCertTrust     */  'M', PR_FALSE, 0, PR_FALSE },
@@ -2063,8 +2254,32 @@ certutil_main(int argc, char **argv, PRBool initialize)
     if (rv != SECSuccess)
 	Usage(progName);
 
-    if (certutil.commands[cmd_PrintHelp].activated)
-	LongUsage(progName);
+    if (certutil.commands[cmd_PrintSyntax].activated) {
+        PrintSyntax(progName);
+    }
+
+    if (certutil.commands[cmd_PrintHelp].activated) {
+        int i;
+        char buf[2];
+        const char *command = NULL;
+        for (i = 0; i < max_cmd; i++) {
+            if (i == cmd_PrintHelp)
+                continue;
+            if (certutil.commands[i].activated) {
+                if (certutil.commands[i].flag) {
+                    buf[0] = certutil.commands[i].flag;
+                    buf[1] = 0;
+                    command = buf;
+                }
+                else {
+                    command = certutil.commands[i].longform;
+                }
+                break;
+            }
+        }
+	LongUsage(progName, (command ? usage_selected : usage_all), command);
+        exit(1);
+    }
 
     if (certutil.options[opt_PasswordFile].arg) {
 	pwdata.source = PW_FROMFILE;
@@ -2247,7 +2462,6 @@ certutil_main(int argc, char **argv, PRBool initialize)
 	return 255;
     }
     if (commandsEntered == 0) {
-	PR_fprintf(PR_STDERR, "%s: you must enter a command!\n", progName);
 	Usage(progName);
     }
 
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index f2170e945c45..05f4ea0adf5f 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -981,7 +981,7 @@ SECU_PrintInteger(FILE *out, SECItem *i, char *m, int level)
 }
 
 static void
-secu_PrintRawString(FILE *out, SECItem *si, char *m, int level)
+secu_PrintRawString(FILE *out, SECItem *si, const char *m, int level)
 {
     int column;
     unsigned int i;
@@ -2094,23 +2094,25 @@ secu_PrintCRLDistPtsExtension(FILE *out, SECItem *value, char *msg, int level)
 	CRLDistributionPoint ** pPoints = dPoints->distPoints;
 	CRLDistributionPoint *  pPoint;
 	while (NULL != (pPoint = *pPoints++)) {
+	    SECU_Indent(out, level); fputs("Distribution point:\n", out);
 	    if (pPoint->distPointType == generalName && 
 	        pPoint->distPoint.fullName != NULL) {
 		secu_PrintGeneralNames(out, pPoint->distPoint.fullName, NULL,
-		                       level);
+		                       level + 1);
 	    } else if (pPoint->distPointType == relativeDistinguishedName &&
 	               pPoint->distPoint.relativeName.avas) {
 		SECU_PrintRDN(out, &pPoint->distPoint.relativeName, "RDN", 
-		              level);
+		              level + 1);
 	    } else if (pPoint->derDistPoint.data) {
-		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level);
+		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level + 1);
 	    }
 	    if (pPoint->reasons.data) {
 		secu_PrintDecodedBitString(out, &pPoint->reasons, "Reasons", 
-		                           level);
+		                           level + 1);
 	    }
 	    if (pPoint->crlIssuer) {
-		secu_PrintGeneralName(out, pPoint->crlIssuer, "Issuer", level);
+		secu_PrintGeneralName(out, pPoint->crlIssuer, "CRL issuer",
+				      level + 1);
 	    }
 	}
     } else {
@@ -2332,7 +2334,7 @@ SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
  * print those, so make a directory name out of the RDN, and print it.
  */
 void
-SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
+SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level)
 {
     CERTName name;
     CERTRDN *rdns[2];
@@ -2345,7 +2347,7 @@ SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
 }
 
 void
-SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
+SECU_PrintName(FILE *out, CERTName *name, const char *msg, int level)
 {
     char *nameStr = NULL;
     char *str;
diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h
index f3829d4e2622..8a6ab3cd6ba6 100644
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -309,8 +309,9 @@ extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value,
 extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
 				 char *msg, int level);
 
-extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level);
-extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level);
+extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg,
+                           int level);
+extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level);
 
 #ifdef SECU_GetPassword
 /* Convert a High public Key to a Low public Key */
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index d78881de2548..bd1d47b4cedc 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1491,14 +1491,18 @@ getBoundListenSocket(unsigned short port)
     PRStatus	       prStatus;
     PRNetAddr          addr;
     PRSocketOptionData opt;
+    PRUint16           socketDomain = PR_AF_INET;
 
     addr.inet.family = PR_AF_INET;
     addr.inet.ip     = PR_INADDR_ANY;
     addr.inet.port   = PR_htons(port);
 
-    listen_sock = PR_NewTCPSocket();
+    if (PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = PR_AF_INET_SDP;
+    }
+    listen_sock = PR_OpenTCPSocket(socketDomain);
     if (listen_sock == NULL) {
-	errExit("PR_NewTCPSocket");
+        errExit("PR_OpenTCPSocket error");
     }
 
     opt.option = PR_SockOpt_Nonblocking;
diff --git a/security/nss/cmd/shlibsign/shlibsign.c b/security/nss/cmd/shlibsign/shlibsign.c
index 6e93225190e4..722cb15a5b35 100644
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -46,7 +46,7 @@
  * compute the checksum for the NSS cryptographic boundary libraries
  * and compare the checksum with the value in .chk file.
  *
- * $Id: shlibsign.c,v 1.18 2008/11/20 15:44:12 glen.beasley%sun.com Exp $
+ * $Id: shlibsign.c,v 1.18.20.1 2011/04/08 04:04:27 wtc%google.com Exp $
  */
 
 #ifdef XP_UNIX
@@ -1012,7 +1012,7 @@ int main(int argc, char **argv)
     }
 
     /* open the target signature file */
-    fd = PR_OpenFile(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
+    fd = PR_Open(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
     if (fd == NULL ) {
         lperror(output_file);
         goto cleanup;
diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 786b6bcf7892..2e768ec4b775 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -360,7 +360,7 @@ printSecurityInfo(PRFileDesc *fd)
 
 #define MAX_THREADS 128
 
-typedef int startFn(void *a, void *b, int c);
+typedef int startFn(void *a, void *b, int c, int d);
 
 
 static PRInt32     numConnected;
@@ -374,6 +374,7 @@ typedef struct perThreadStr {
     startFn  *  startFunc;
     PRThread *  prThread;
     PRBool	inUse;
+    PRInt32     socketDomain;
 } perThread;
 
 perThread threads[MAX_THREADS];
@@ -429,7 +430,8 @@ thread_wrapper(void * arg)
         }
         PR_Unlock(threadLock);
         if (doop) {
-            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid);
+            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid,
+                                           slot->socketDomain);
             PRINTF("strsclnt: Thread in slot %d returned %d\n", 
                    slot->tid, slot->rv);
         }
@@ -444,7 +446,8 @@ launch_thread(
     startFn *	startFunc,
     void *	a,
     void *	b,
-    int         tid)
+    int         tid,
+    int         sockDom)
 {
     PRUint32 i;
     perThread * slot;
@@ -462,7 +465,8 @@ launch_thread(
     slot->a = a;
     slot->b = b;
     slot->tid = tid;
-
+    slot->socketDomain = sockDom;
+    
     slot->startFunc = startFunc;
 
     slot->prThread      = PR_CreateThread(PR_USER_THREAD,
@@ -585,7 +589,8 @@ int
 do_writes(
     void *       a,
     void *       b,
-    int          c)
+    int          c,
+    int          d)
 {
     PRFileDesc *	ssl_sock	= (PRFileDesc *)a;
     lockedVars *	lv 		= (lockedVars *)b;
@@ -627,7 +632,7 @@ handle_fdx_connection( PRFileDesc * ssl_sock, int connection)
     lockedVars_AddToCount(&lv, 1);
 
     /* Attempt to launch the writer thread. */
-    result = launch_thread(do_writes, ssl_sock, &lv, connection);
+    result = launch_thread(do_writes, ssl_sock, &lv, connection, -1 /*not used*/);
 
     if (result != SECSuccess) 
     	goto cleanup;
@@ -746,7 +751,8 @@ int
 do_connects(
     void *	a,
     void *	b,
-    int         tid)
+    int         tid,
+    PRInt32     socketDomain)
 {
     PRNetAddr  *        addr		= (PRNetAddr *)  a;
     PRFileDesc *        model_sock	= (PRFileDesc *) b;
@@ -760,7 +766,7 @@ do_connects(
 
 retry:
 
-    tcp_sock = PR_OpenTCPSocket(addr->raw.family);
+    tcp_sock = PR_OpenTCPSocket(socketDomain);
     if (tcp_sock == NULL) {
 	errExit("PR_OpenTCPSocket");
     }
@@ -1088,6 +1094,7 @@ client_main(
     int         rv;
     PRStatus    status;
     PRNetAddr   addr;
+    PRInt32    socketDomain;
 
     status = PR_StringToNetAddr(hostName, &addr);
     if (status == PR_SUCCESS) {
@@ -1115,6 +1122,13 @@ client_main(
 	}
     }
 
+    /* check if SDP is going to be used */
+    if (!PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = addr.raw.family;
+    } else {
+        socketDomain = PR_AF_INET_SDP;
+    }
+
     /* all suites except RSA_NULL_MD5 are enabled by Domestic Policy */
     NSS_SetDomesticPolicy();
 
@@ -1171,8 +1185,8 @@ client_main(
     }
 
     /* configure model SSL socket. */
-
-    model_sock = PR_OpenTCPSocket(addr.raw.family);
+    
+    model_sock = PR_OpenTCPSocket(socketDomain);
     if (model_sock == NULL) {
 	errExit("PR_OpenTCPSocket for model socket");
     }
@@ -1276,7 +1290,7 @@ client_main(
 
     if (!NoReuse) {
         remaining_connections = 1;
-	rv = launch_thread(do_connects, &addr, model_sock, 0);
+	rv = launch_thread(do_connects, &addr, model_sock, 0, socketDomain);
 	/* wait for the first connection to terminate, then launch the rest. */
 	reap_threads();
         remaining_connections = total_connections - 1 ;
@@ -1285,7 +1299,7 @@ client_main(
         active_threads  = PR_MIN(active_threads, remaining_connections);
 	/* Start up the threads */
 	for (i=0;i<active_threads;i++) {
-	    rv = launch_thread(do_connects, &addr, model_sock, i);
+	    rv = launch_thread(do_connects, &addr, model_sock, i, socketDomain);
 	}
 	reap_threads();
     }
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index 55684e685fa4..1e0453145f24 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -538,6 +538,7 @@ int main(int argc, char **argv)
     PLOptState *optstate;
     PLOptStatus optstatus;
     PRStatus prStatus;
+    PRUint16           socketDomain;
 
     progName = strrchr(argv[0], '/');
     if (!progName)
@@ -699,11 +700,17 @@ int main(int argc, char **argv)
 
     printHostNameAndAddr(host, &addr);
 
+    /* check if SDP is going to be used */
+    if (!PR_GetEnv("NSS_USE_SDP")) {
+        socketDomain = addr.raw.family;
+    } else {
+        socketDomain = PR_AF_INET_SDP;
+    }
     if (pingServerFirst) {
 	int iter = 0;
 	PRErrorCode err;
 	do {
-	    s = PR_OpenTCPSocket(addr.raw.family);
+	    s = PR_OpenTCPSocket(socketDomain);
 	    if (s == NULL) {
 		SECU_PrintError(progName, "Failed to create a TCP socket");
 	    }
@@ -741,7 +748,7 @@ int main(int argc, char **argv)
     }
 
     /* Create socket */
-    s = PR_OpenTCPSocket(addr.raw.family);
+    s = PR_OpenTCPSocket(socketDomain);
     if (s == NULL) {
 	SECU_PrintError(progName, "error creating socket");
 	return 1;
diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 2b74f972f45f..790abfb0213f 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.80.2.1 2010/09/24 13:31:57 kaie%kuix.de Exp $
+ * $Id: cert.h,v 1.80.2.3 2011/04/08 22:54:34 kaie%kuix.de Exp $
  */
 
 #ifndef _CERT_H_
@@ -1112,7 +1112,7 @@ extern CERTCertificateList *
 CERT_CertListFromCert(CERTCertificate *cert);
 
 extern CERTCertificateList *
-CERT_DupCertList(CERTCertificateList * oldList);
+CERT_DupCertList(const CERTCertificateList * oldList);
 
 extern void CERT_DestroyCertificateList(CERTCertificateList *list);
 
@@ -1665,26 +1665,33 @@ extern SECStatus CERT_PKIXVerifyCert(
 	CERTValInParam *paramsIn,
 	CERTValOutParam *paramsOut,
 	void *wincx);
-/*
- * This function changes the application defaults for the Verify function.
- * It should be called once at app initialization time, and only changes
- * if the default configuration changes.
- *
- * This changes the default values for the parameters specified. These
- * defaults can be overridden in CERT_PKIXVerifyCert() by explicitly 
- * setting the value in paramsIn.
- */
-extern SECStatus CERT_PKIXSetDefaults(CERTValInParam *paramsIn);
 
 /* Makes old cert validation APIs(CERT_VerifyCert, CERT_VerifyCertificate)
  * to use libpkix validation engine. The function should be called ones at
  * application initialization time.
  * Function is not thread safe.*/
-SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
+extern SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
 
 /* The function return PR_TRUE if cert validation should use
  * libpkix cert validation engine. */
-PRBool CERT_GetUsePKIXForValidation(void);
+extern PRBool CERT_GetUsePKIXForValidation(void);
+
+/*
+ * Allocate a parameter container of type CERTRevocationFlags,
+ * and allocate the inner arrays of the given sizes.
+ * To cleanup call CERT_DestroyCERTRevocationFlags.
+ */
+extern CERTRevocationFlags *
+CERT_AllocCERTRevocationFlags(
+    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
+    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods);
+
+/*
+ * Destroy the arrays inside flags,
+ * and destroy the object pointed to by flags, too.
+ */
+extern void
+CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags);
 
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 119a8da9fd42..56587ea8cf62 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -37,6 +37,7 @@
 #include "prtime.h"
 
 #include "cert.h"
+#include "certi.h"
 #include "certdb.h"
 #include "secitem.h"
 #include "secder.h"
@@ -86,12 +87,26 @@ SEC_DeletePermCertificate(CERTCertificate *cert)
     PRStatus nssrv;
     NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
     NSSCertificate *c = STAN_GetNSSCertificate(cert);
+    CERTCertTrust *certTrust;
 
     if (c == NULL) {
         /* error code is set */
         return SECFailure;
     }
 
+    certTrust = nssTrust_GetCERTCertTrustForCert(c, cert);
+    if (certTrust) {
+	NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
+	if (nssTrust) {
+	    nssrv = STAN_DeleteCertTrustMatchingSlot(c);
+	    if (nssrv != PR_SUCCESS) {
+    		CERT_MapStanError();
+    	    }
+	    /* This call always returns PR_SUCCESS! */
+	    (void) nssTrust_Destroy(nssTrust);
+	}
+    }
+
     /* get rid of the token instances */
     nssrv = NSSCertificate_DeleteStoredObject(c, NULL);
 
diff --git a/security/nss/lib/certhigh/certhigh.c b/security/nss/lib/certhigh/certhigh.c
index 83a4b01b2936..6081364ea1b9 100644
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -1176,7 +1176,7 @@ loser:
 }
 
 CERTCertificateList *
-CERT_DupCertList(CERTCertificateList * oldList)
+CERT_DupCertList(const CERTCertificateList * oldList)
 {
     CERTCertificateList *newList = NULL;
     PRArenaPool         *arena   = NULL;
diff --git a/security/nss/lib/certhigh/certvfypkix.c b/security/nss/lib/certhigh/certvfypkix.c
index 27557c86c638..282d69b4eb71 100644
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1986,6 +1986,63 @@ CERT_GetPKIXVerifyNistRevocationPolicy()
     return &certRev_PKIX_Verify_Nist_Policy;
 }
 
+CERTRevocationFlags *
+CERT_AllocCERTRevocationFlags(
+    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
+    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods)
+{
+    CERTRevocationFlags *flags;
+    
+    flags = PORT_New(CERTRevocationFlags);
+    if (!flags)
+        return(NULL);
+    
+    flags->leafTests.number_of_defined_methods = number_leaf_methods;
+    flags->leafTests.cert_rev_flags_per_method = 
+        PORT_NewArray(PRUint64, number_leaf_methods);
+
+    flags->leafTests.number_of_preferred_methods = number_leaf_pref_methods;
+    flags->leafTests.preferred_methods = 
+        PORT_NewArray(CERTRevocationMethodIndex, number_leaf_pref_methods);
+
+    flags->chainTests.number_of_defined_methods = number_chain_methods;
+    flags->chainTests.cert_rev_flags_per_method = 
+        PORT_NewArray(PRUint64, number_chain_methods);
+
+    flags->chainTests.number_of_preferred_methods = number_chain_pref_methods;
+    flags->chainTests.preferred_methods = 
+        PORT_NewArray(CERTRevocationMethodIndex, number_chain_pref_methods);
+    
+    if (!flags->leafTests.cert_rev_flags_per_method
+        || !flags->leafTests.preferred_methods
+        || !flags->chainTests.cert_rev_flags_per_method
+        || !flags->chainTests.preferred_methods) {
+        CERT_DestroyCERTRevocationFlags(flags);
+        return (NULL);
+    }
+    
+    return flags;
+}
+
+void CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags)
+{
+    if (!flags)
+	return;
+  
+    if (flags->leafTests.cert_rev_flags_per_method)
+        PORT_Free(flags->leafTests.cert_rev_flags_per_method);
+
+    if (flags->leafTests.preferred_methods)
+        PORT_Free(flags->leafTests.preferred_methods);
+    
+    if (flags->chainTests.cert_rev_flags_per_method)
+        PORT_Free(flags->chainTests.cert_rev_flags_per_method);
+
+    if (flags->chainTests.preferred_methods)
+        PORT_Free(flags->chainTests.preferred_methods);
+
+     PORT_Free(flags);
+}
 
 /*
  * CERT_PKIXVerifyCert
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index 924f36bb8f51..13a05ba435b9 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
@@ -52,6 +52,7 @@ static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 static const CK_TRUST ckt_netscape_untrusted = CKT_NETSCAPE_UNTRUSTED;
+static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
@@ -990,6 +991,36 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = {
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_315 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_316 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_317 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_318 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_319 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
+};
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
+ CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
+};
 #ifdef DEBUG
 static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -998,7 +1029,7 @@ static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $", (PRUint32)164 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $", (PRUint32)164 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
@@ -1104,133 +1135,6 @@ static const NSSItem nss_builtins_items_3 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_4 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
-"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
-"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
-"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
-"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
-"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
-"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
-"\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164"
-"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155"
-"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206"
-"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055"
-"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056"
-"\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060"
-"\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071"
-"\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023"
-"\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145"
-"\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003"
-"\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032"
-"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040"
-"\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003"
-"\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151"
-"\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124"
-"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106"
-"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011"
-"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157"
-"\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141"
-"\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206"
-"\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211"
-"\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330"
-"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337"
-"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176"
-"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104"
-"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170"
-"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156"
-"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152"
-"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345"
-"\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006"
-"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015"
-"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
-"\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115"
-"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317"
-"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144"
-"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254"
-"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232"
-"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163"
-"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246"
-"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242"
-"\201"
-, (PRUint32)817 }
-};
-static const NSSItem nss_builtins_items_5 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
-  { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207"
-"\244\353\000\205"
-, (PRUint32)20 },
-  { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331"
-, (PRUint32)16 },
-  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
-"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
-"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
-"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
-"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
-"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
-"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
-"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
-"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
-"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
-"\056\143\157\155"
-, (PRUint32)212 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_6 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1320,7 +1224,7 @@ static const NSSItem nss_builtins_items_6 [] = {
 "\243\377\212\043\056\160\107"
 , (PRUint32)791 }
 };
-static const NSSItem nss_builtins_items_7 [] = {
+static const NSSItem nss_builtins_items_5 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1352,7 +1256,7 @@ static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_8 [] = {
+static const NSSItem nss_builtins_items_6 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1445,7 +1349,7 @@ static const NSSItem nss_builtins_items_8 [] = {
 "\246\015\246\043\371\273\313\246\007\024\102"
 , (PRUint32)811 }
 };
-static const NSSItem nss_builtins_items_9 [] = {
+static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1478,7 +1382,7 @@ static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_10 [] = {
+static const NSSItem nss_builtins_items_8 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1553,7 +1457,7 @@ static const NSSItem nss_builtins_items_10 [] = {
 "\254\007\167\070"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_11 [] = {
+static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1577,7 +1481,7 @@ static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_12 [] = {
+static const NSSItem nss_builtins_items_10 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1652,7 +1556,7 @@ static const NSSItem nss_builtins_items_12 [] = {
 "\241\223\004\273\206\237\072\133\103\172\303\212\145"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_13 [] = {
+static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1676,7 +1580,7 @@ static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_14 [] = {
+static const NSSItem nss_builtins_items_12 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1751,7 +1655,7 @@ static const NSSItem nss_builtins_items_14 [] = {
 "\307\177\033\033\326\006\040\002\130\241\303\242\003"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_15 [] = {
+static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1775,7 +1679,7 @@ static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_16 [] = {
+static const NSSItem nss_builtins_items_14 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1841,7 +1745,7 @@ static const NSSItem nss_builtins_items_16 [] = {
 "\224"
 , (PRUint32)577 }
 };
-static const NSSItem nss_builtins_items_17 [] = {
+static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1868,7 +1772,7 @@ static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_18 [] = {
+static const NSSItem nss_builtins_items_16 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1933,7 +1837,7 @@ static const NSSItem nss_builtins_items_18 [] = {
 "\360\210\321\345\170\215\245\052\117\366\227\015\027\167\312\330"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_19 [] = {
+static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1960,7 +1864,7 @@ static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_20 [] = {
+static const NSSItem nss_builtins_items_18 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2025,7 +1929,7 @@ static const NSSItem nss_builtins_items_20 [] = {
 "\300\175\267\162\234\311\066\072\153\237\116\250\377\144\015\144"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_21 [] = {
+static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2052,7 +1956,7 @@ static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_22 [] = {
+static const NSSItem nss_builtins_items_20 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2142,7 +2046,7 @@ static const NSSItem nss_builtins_items_22 [] = {
 "\017\061\134\350\362\331"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_23 [] = {
+static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2175,7 +2079,7 @@ static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_24 [] = {
+static const NSSItem nss_builtins_items_22 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2265,7 +2169,7 @@ static const NSSItem nss_builtins_items_24 [] = {
 "\214\022\173\305\104\264\256"
 , (PRUint32)775 }
 };
-static const NSSItem nss_builtins_items_25 [] = {
+static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2298,7 +2202,7 @@ static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_26 [] = {
+static const NSSItem nss_builtins_items_24 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2388,7 +2292,7 @@ static const NSSItem nss_builtins_items_26 [] = {
 "\240\235\235\151\221\375"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_27 [] = {
+static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2421,7 +2325,7 @@ static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_28 [] = {
+static const NSSItem nss_builtins_items_26 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2511,7 +2415,7 @@ static const NSSItem nss_builtins_items_28 [] = {
 "\117\312\200\221\266\051"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_29 [] = {
+static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2544,7 +2448,7 @@ static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_30 [] = {
+static const NSSItem nss_builtins_items_28 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2626,7 +2530,7 @@ static const NSSItem nss_builtins_items_30 [] = {
 "\125\342\374\110\311\051\046\151\340"
 , (PRUint32)889 }
 };
-static const NSSItem nss_builtins_items_31 [] = {
+static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2651,7 +2555,7 @@ static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_32 [] = {
+static const NSSItem nss_builtins_items_30 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2735,7 +2639,7 @@ static const NSSItem nss_builtins_items_32 [] = {
 "\152\374\176\102\070\100\144\022\367\236\201\341\223\056"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_33 [] = {
+static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2759,7 +2663,7 @@ static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_34 [] = {
+static const NSSItem nss_builtins_items_32 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2844,7 +2748,7 @@ static const NSSItem nss_builtins_items_34 [] = {
 "\161\202\053\231\317\072\267\365\055\162\310"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_35 [] = {
+static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2875,7 +2779,7 @@ static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_36 [] = {
+static const NSSItem nss_builtins_items_34 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2960,7 +2864,7 @@ static const NSSItem nss_builtins_items_36 [] = {
 "\276\355\164\114\274\133\325\142\037\103\335"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_37 [] = {
+static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2991,7 +2895,7 @@ static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_38 [] = {
+static const NSSItem nss_builtins_items_36 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3076,7 +2980,7 @@ static const NSSItem nss_builtins_items_38 [] = {
 "\040\017\105\176\153\242\177\243\214\025\356"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_39 [] = {
+static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3107,7 +3011,7 @@ static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_40 [] = {
+static const NSSItem nss_builtins_items_38 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3214,7 +3118,7 @@ static const NSSItem nss_builtins_items_40 [] = {
 "\113\336\006\226\161\054\362\333\266\037\244\357\077\356"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_41 [] = {
+static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3247,7 +3151,7 @@ static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_42 [] = {
+static const NSSItem nss_builtins_items_40 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3354,7 +3258,7 @@ static const NSSItem nss_builtins_items_42 [] = {
 "\311\130\020\371\252\357\132\266\317\113\113\337\052"
 , (PRUint32)1053 }
 };
-static const NSSItem nss_builtins_items_43 [] = {
+static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3387,7 +3291,7 @@ static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_44 [] = {
+static const NSSItem nss_builtins_items_42 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3494,7 +3398,7 @@ static const NSSItem nss_builtins_items_44 [] = {
 "\153\271\012\172\116\117\113\204\356\113\361\175\335\021"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_45 [] = {
+static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3527,7 +3431,7 @@ static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_46 [] = {
+static const NSSItem nss_builtins_items_44 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3634,7 +3538,7 @@ static const NSSItem nss_builtins_items_46 [] = {
 "\367\146\103\363\236\203\076\040\252\303\065\140\221\316"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_47 [] = {
+static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3667,7 +3571,7 @@ static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_48 [] = {
+static const NSSItem nss_builtins_items_46 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3785,7 +3689,7 @@ static const NSSItem nss_builtins_items_48 [] = {
 "\155\055\105\013\367\012\223\352\355\006\371\262"
 , (PRUint32)1244 }
 };
-static const NSSItem nss_builtins_items_49 [] = {
+static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3817,159 +3721,7 @@ static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_50 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"\002\004\070\003\221\356"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070"
-"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
-"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036"
-"\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027"
-"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201"
-"\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024"
-"\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164"
-"\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167"
-"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103"
-"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120"
-"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146"
-"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045"
-"\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071"
-"\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151"
-"\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052"
-"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145"
-"\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006"
-"\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000"
-"\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047"
-"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150"
-"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107"
-"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226"
-"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261"
-"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164"
-"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126"
-"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346"
-"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202"
-"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004"
-"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202"
-"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244"
-"\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
-"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
-"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
-"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
-"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240"
-"\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056"
-"\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057"
-"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125"
-"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062"
-"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061"
-"\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004"
-"\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312"
-"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004"
-"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231"
-"\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003"
-"\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000"
-"\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015"
-"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
-"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273"
-"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002"
-"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007"
-"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363"
-"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070"
-"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003"
-"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332"
-"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134"
-"\354"
-, (PRUint32)1265 }
-};
-static const NSSItem nss_builtins_items_51 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
-  { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125"
-"\262\371\365\200"
-, (PRUint32)20 },
-  { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364"
-, (PRUint32)16 },
-  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
-"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
-"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
-"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
-"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
-"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
-"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
-"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
-"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)204 },
-  { (void *)"\002\004\070\003\221\356"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_52 [] = {
+static const NSSItem nss_builtins_items_48 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4077,7 +3829,7 @@ static const NSSItem nss_builtins_items_52 [] = {
 "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305"
 , (PRUint32)1120 }
 };
-static const NSSItem nss_builtins_items_53 [] = {
+static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4108,7 +3860,7 @@ static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_54 [] = {
+static const NSSItem nss_builtins_items_50 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4190,7 +3942,7 @@ static const NSSItem nss_builtins_items_54 [] = {
 "\347\201\035\031\303\044\102\352\143\071\251"
 , (PRUint32)891 }
 };
-static const NSSItem nss_builtins_items_55 [] = {
+static const NSSItem nss_builtins_items_51 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4215,7 +3967,7 @@ static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_56 [] = {
+static const NSSItem nss_builtins_items_52 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4283,7 +4035,7 @@ static const NSSItem nss_builtins_items_56 [] = {
 "\126\224\251\125"
 , (PRUint32)660 }
 };
-static const NSSItem nss_builtins_items_57 [] = {
+static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4308,7 +4060,7 @@ static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_58 [] = {
+static const NSSItem nss_builtins_items_54 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4375,7 +4127,7 @@ static const NSSItem nss_builtins_items_58 [] = {
 "\132\052\202\262\067\171"
 , (PRUint32)646 }
 };
-static const NSSItem nss_builtins_items_59 [] = {
+static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4400,7 +4152,7 @@ static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_60 [] = {
+static const NSSItem nss_builtins_items_56 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4475,7 +4227,7 @@ static const NSSItem nss_builtins_items_60 [] = {
 "\221\060\352\315"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_61 [] = {
+static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4499,7 +4251,7 @@ static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_62 [] = {
+static const NSSItem nss_builtins_items_58 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4593,7 +4345,7 @@ static const NSSItem nss_builtins_items_62 [] = {
 "\065\341\035\026\034\320\274\053\216\326\161\331"
 , (PRUint32)1052 }
 };
-static const NSSItem nss_builtins_items_63 [] = {
+static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4619,7 +4371,7 @@ static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_64 [] = {
+static const NSSItem nss_builtins_items_60 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4717,7 +4469,7 @@ static const NSSItem nss_builtins_items_64 [] = {
 "\027\132\173\320\274\307\217\116\206\004"
 , (PRUint32)1082 }
 };
-static const NSSItem nss_builtins_items_65 [] = {
+static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4744,7 +4496,7 @@ static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_66 [] = {
+static const NSSItem nss_builtins_items_62 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4838,7 +4590,7 @@ static const NSSItem nss_builtins_items_66 [] = {
 "\116\072\063\014\053\263\055\220\006"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_67 [] = {
+static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4864,7 +4616,7 @@ static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_68 [] = {
+static const NSSItem nss_builtins_items_64 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4959,7 +4711,7 @@ static const NSSItem nss_builtins_items_68 [] = {
 "\306\241"
 , (PRUint32)1058 }
 };
-static const NSSItem nss_builtins_items_69 [] = {
+static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4985,395 +4737,7 @@ static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_70 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-"\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
-"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
-"\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023"
-"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015"
-"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060"
-"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035"
-"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027"
-"\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015"
-"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213"
-"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060"
-"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040"
-"\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104"
-"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003"
-"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006"
-"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003"
-"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145"
-"\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123"
-"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047"
-"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237"
-"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032"
-"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376"
-"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235"
-"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213"
-"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137"
-"\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060"
-"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001"
-"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
-"\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067"
-"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302"
-"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357"
-"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333"
-"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220"
-"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354"
-"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003"
-"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031"
-"\011\254\211\111\323"
-, (PRUint32)677 }
-};
-static const NSSItem nss_builtins_items_71 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
-  { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105"
-"\010\116\326\126"
-, (PRUint32)20 },
-  { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040"
-, (PRUint32)16 },
-  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
-"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
-"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
-"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
-"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
-"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
-"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
-, (PRUint32)142 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_72 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"\002\004\070\233\021\074"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070"
-"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013"
-"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006"
-"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163"
-"\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156"
-"\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154"
-"\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043"
-"\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040"
-"\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151"
-"\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156"
-"\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145"
-"\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060"
-"\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132"
-"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060"
-"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
-"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004"
-"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156"
-"\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162"
-"\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151"
-"\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125"
-"\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164"
-"\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144"
-"\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165"
-"\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145"
-"\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
-"\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316"
-"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265"
-"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236"
-"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201"
-"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113"
-"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002"
-"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266"
-"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332"
-"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202"
-"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370"
-"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035"
-"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317"
-"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023"
-"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075"
-"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165"
-"\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151"
-"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
-"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
-"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
-"\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105"
-"\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162"
-"\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060"
-"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060"
-"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062"
-"\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003"
-"\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043"
-"\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042"
-"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035"
-"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234"
-"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023"
-"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366"
-"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064"
-"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015"
-"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232"
-"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251"
-"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337"
-"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205"
-"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021"
-"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154"
-"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124"
-"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274"
-"\005\377\154\211\063\360\354\025\017"
-, (PRUint32)1177 }
-};
-static const NSSItem nss_builtins_items_73 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
-  { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366"
-"\045\072\110\223"
-, (PRUint32)20 },
-  { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231"
-, (PRUint32)16 },
-  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
-"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
-"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
-"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
-"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
-"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
-"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
-"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
-"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171"
-, (PRUint32)189 },
-  { (void *)"\002\004\070\233\021\074"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_74 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"\002\004\070\236\366\344"
-, (PRUint32)6 },
-  { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070"
-"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004"
-"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
-"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006"
-"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163"
-"\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151"
-"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
-"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
-"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
-"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
-"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105"
-"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060"
-"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062"
-"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022"
-"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156"
-"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167"
-"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103"
-"\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
-"\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151"
-"\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050"
-"\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056"
-"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006"
-"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145"
-"\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
-"\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264"
-"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162"
-"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255"
-"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124"
-"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064"
-"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045"
-"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374"
-"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047"
-"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001"
-"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206"
-"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335"
-"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201"
-"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003"
-"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164"
-"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145"
-"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137"
-"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
-"\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142"
-"\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
-"\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145"
-"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
-"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
-"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
-"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006"
-"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062"
-"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060"
-"\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035"
-"\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030"
-"\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067"
-"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004"
-"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105"
-"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005"
-"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007"
-"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060"
-"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001"
-"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016"
-"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022"
-"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024"
-"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276"
-"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277"
-"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172"
-"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103"
-"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235"
-"\316\145\146\227\256\046\136"
-, (PRUint32)1159 }
-};
-static const NSSItem nss_builtins_items_75 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
-  { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266"
-"\266\360\277\163"
-, (PRUint32)20 },
-  { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056"
-, (PRUint32)16 },
-  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
-"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
-"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
-"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
-"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
-"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
-"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
-"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
-"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
-"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171"
-, (PRUint32)183 },
-  { (void *)"\002\004\070\236\366\344"
-, (PRUint32)6 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_76 [] = {
+static const NSSItem nss_builtins_items_66 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5485,7 +4849,7 @@ static const NSSItem nss_builtins_items_76 [] = {
 "\036\177\132\264\074"
 , (PRUint32)1173 }
 };
-static const NSSItem nss_builtins_items_77 [] = {
+static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5516,285 +4880,7 @@ static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_78 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
-"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
-"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
-"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
-"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
-"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060"
-"\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065"
-"\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
-"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
-"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
-"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
-"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
-"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303"
-"\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224"
-"\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204"
-"\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027"
-"\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110"
-"\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141"
-"\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226"
-"\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037"
-"\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266"
-"\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217"
-"\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205"
-"\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070"
-"\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216"
-"\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241"
-"\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356"
-"\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267"
-"\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000"
-"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
-"\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330"
-"\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310"
-"\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
-"\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263"
-"\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247"
-"\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037"
-"\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122"
-"\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323"
-"\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017"
-"\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362"
-"\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005"
-"\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007"
-"\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247"
-"\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227"
-"\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213"
-"\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120"
-"\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026"
-"\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325"
-"\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260"
-"\071\050\150\016\163\335\045\232\336\022"
-, (PRUint32)1002 }
-};
-static const NSSItem nss_builtins_items_79 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
-  { (void *)"\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026"
-"\373\041\026\111"
-, (PRUint32)20 },
-  { (void *)"\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300"
-, (PRUint32)16 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\061"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_80 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)"\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
-"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
-"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
-"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
-"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
-"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060"
-"\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063"
-"\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
-"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
-"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
-"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
-"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
-"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
-"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010"
-"\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211"
-"\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115"
-"\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044"
-"\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133"
-"\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235"
-"\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127"
-"\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230"
-"\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374"
-"\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136"
-"\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231"
-"\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111"
-"\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206"
-"\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352"
-"\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256"
-"\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165"
-"\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361"
-"\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352"
-"\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116"
-"\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363"
-"\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303"
-"\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320"
-"\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141"
-"\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372"
-"\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242"
-"\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322"
-"\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143"
-"\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224"
-"\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014"
-"\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277"
-"\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332"
-"\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056"
-"\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000"
-"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
-"\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325"
-"\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026"
-"\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116"
-"\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
-"\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056"
-"\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022"
-"\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307"
-"\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117"
-"\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066"
-"\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104"
-"\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352"
-"\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275"
-"\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022"
-"\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223"
-"\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060"
-"\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100"
-"\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277"
-"\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346"
-"\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145"
-"\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201"
-"\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212"
-"\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045"
-"\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020"
-"\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316"
-"\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234"
-"\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116"
-"\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261"
-"\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027"
-"\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223"
-"\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234"
-"\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056"
-"\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007"
-"\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207"
-"\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025"
-"\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371"
-"\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274"
-"\204\327\372\334\162\133\367\301\072\150"
-, (PRUint32)1514 }
-};
-static const NSSItem nss_builtins_items_81 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
-  { (void *)"\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272"
-"\204\254\010\172"
-, (PRUint32)20 },
-  { (void *)"\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277"
-, (PRUint32)16 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
-"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
-"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
-"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
-"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
-"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
-"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
-"\162\151\164\171\040\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\001"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_82 [] = {
+static const NSSItem nss_builtins_items_68 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5872,7 +4958,7 @@ static const NSSItem nss_builtins_items_82 [] = {
 "\354\040\005\141\336"
 , (PRUint32)869 }
 };
-static const NSSItem nss_builtins_items_83 [] = {
+static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5896,7 +4982,7 @@ static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_84 [] = {
+static const NSSItem nss_builtins_items_70 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5974,7 +5060,7 @@ static const NSSItem nss_builtins_items_84 [] = {
 "\302\005\146\200\241\313\346\063"
 , (PRUint32)856 }
 };
-static const NSSItem nss_builtins_items_85 [] = {
+static const NSSItem nss_builtins_items_71 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5998,7 +5084,7 @@ static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_86 [] = {
+static const NSSItem nss_builtins_items_72 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6077,7 +5163,7 @@ static const NSSItem nss_builtins_items_86 [] = {
 "\342\042\051\256\175\203\100\250\272\154"
 , (PRUint32)874 }
 };
-static const NSSItem nss_builtins_items_87 [] = {
+static const NSSItem nss_builtins_items_73 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6101,7 +5187,7 @@ static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_88 [] = {
+static const NSSItem nss_builtins_items_74 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6212,7 +5298,7 @@ static const NSSItem nss_builtins_items_88 [] = {
 "\244\346\216\330\371\051\110\212\316\163\376\054"
 , (PRUint32)1388 }
 };
-static const NSSItem nss_builtins_items_89 [] = {
+static const NSSItem nss_builtins_items_75 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6236,7 +5322,7 @@ static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_90 [] = {
+static const NSSItem nss_builtins_items_76 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6347,7 +5433,7 @@ static const NSSItem nss_builtins_items_90 [] = {
 "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222"
 , (PRUint32)1392 }
 };
-static const NSSItem nss_builtins_items_91 [] = {
+static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6371,7 +5457,7 @@ static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_92 [] = {
+static const NSSItem nss_builtins_items_78 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6479,7 +5565,7 @@ static const NSSItem nss_builtins_items_92 [] = {
 "\152\372\246\070\254\037\304\204"
 , (PRUint32)1128 }
 };
-static const NSSItem nss_builtins_items_93 [] = {
+static const NSSItem nss_builtins_items_79 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6510,7 +5596,7 @@ static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_94 [] = {
+static const NSSItem nss_builtins_items_80 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6597,7 +5683,7 @@ static const NSSItem nss_builtins_items_94 [] = {
 "\200\072\231\355\165\314\106\173"
 , (PRUint32)936 }
 };
-static const NSSItem nss_builtins_items_95 [] = {
+static const NSSItem nss_builtins_items_81 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6623,7 +5709,7 @@ static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_96 [] = {
+static const NSSItem nss_builtins_items_82 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6742,7 +5828,7 @@ static const NSSItem nss_builtins_items_96 [] = {
 "\105\217\046\221\242\216\376\251"
 , (PRUint32)1448 }
 };
-static const NSSItem nss_builtins_items_97 [] = {
+static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6768,7 +5854,7 @@ static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_98 [] = {
+static const NSSItem nss_builtins_items_84 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6856,7 +5942,7 @@ static const NSSItem nss_builtins_items_98 [] = {
 "\222\340\134\366\007\017"
 , (PRUint32)934 }
 };
-static const NSSItem nss_builtins_items_99 [] = {
+static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6883,7 +5969,7 @@ static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_100 [] = {
+static const NSSItem nss_builtins_items_86 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6975,7 +6061,7 @@ static const NSSItem nss_builtins_items_100 [] = {
 "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_101 [] = {
+static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7006,7 +6092,7 @@ static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_102 [] = {
+static const NSSItem nss_builtins_items_88 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7098,7 +6184,7 @@ static const NSSItem nss_builtins_items_102 [] = {
 "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_103 [] = {
+static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7129,7 +6215,7 @@ static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_104 [] = {
+static const NSSItem nss_builtins_items_90 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7200,7 +6286,7 @@ static const NSSItem nss_builtins_items_104 [] = {
 "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163"
 , (PRUint32)784 }
 };
-static const NSSItem nss_builtins_items_105 [] = {
+static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7223,7 +6309,7 @@ static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_106 [] = {
+static const NSSItem nss_builtins_items_92 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7321,7 +6407,7 @@ static const NSSItem nss_builtins_items_106 [] = {
 "\225\351\066\226\230\156"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_107 [] = {
+static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7348,7 +6434,7 @@ static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_108 [] = {
+static const NSSItem nss_builtins_items_94 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7447,7 +6533,7 @@ static const NSSItem nss_builtins_items_108 [] = {
 "\354\375\051"
 , (PRUint32)1091 }
 };
-static const NSSItem nss_builtins_items_109 [] = {
+static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7474,7 +6560,7 @@ static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_110 [] = {
+static const NSSItem nss_builtins_items_96 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7575,7 +6661,7 @@ static const NSSItem nss_builtins_items_110 [] = {
 "\160\136\310\304\170\260\142"
 , (PRUint32)1095 }
 };
-static const NSSItem nss_builtins_items_111 [] = {
+static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7603,1302 +6689,7 @@ static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_112 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Chained CAs root", (PRUint32)21 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
-"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
-"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
-"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
-"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132"
-"\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060"
-"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
-"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
-"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
-"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
-"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
-"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111"
-"\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061"
-"\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065"
-"\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201"
-"\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067"
-"\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062"
-"\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301"
-"\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350"
-"\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000"
-"\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016"
-"\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064"
-"\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035"
-"\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371"
-"\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241"
-"\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060"
-"\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103"
-"\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123"
-"\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035"
-"\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004"
-"\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060"
-"\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006"
-"\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005"
-"\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006"
-"\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001"
-"\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067"
-"\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001"
-"\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060"
-"\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151"
-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102"
-"\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103"
-"\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146"
-"\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040"
-"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
-"\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004"
-"\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006"
-"\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164"
-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
-"\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103"
-"\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370"
-"\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167"
-"\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
-"\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150"
-"\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001"
-"\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060"
-"\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050"
-"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
-"\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171"
-"\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004"
-"\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056"
-"\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126"
-"\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053"
-"\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006"
-"\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315"
-"\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343"
-"\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243"
-"\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315"
-"\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242"
-"\001\177\046\304\143\365\045\102\136\142\275"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_113 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Chained CAs root", (PRUint32)21 },
-  { (void *)"\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256"
-"\347\137\322\127"
-, (PRUint32)20 },
-  { (void *)"\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
-"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
-"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
-"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
-"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
-"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
-"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-, (PRUint32)288 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_114 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE1 root", (PRUint32)16 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
-"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
-"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
-"\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060"
-"\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125"
-"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
-"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
-"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
-"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
-"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
-"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
-"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
-"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
-"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
-"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
-"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
-"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321"
-"\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022"
-"\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152"
-"\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165"
-"\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122"
-"\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161"
-"\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074"
-"\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020"
-"\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004"
-"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
-"\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233"
-"\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001"
-"\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254"
-"\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244"
-"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
-"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
-"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
-"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
-"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
-"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
-"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
-"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
-"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
-"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
-"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
-"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
-"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
-"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
-"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
-"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
-"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
-"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
-"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
-"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
-"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
-"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
-"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
-"\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
-"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
-"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
-"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
-"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
-"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206"
-"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
-"\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
-"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
-"\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110"
-"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061"
-"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
-"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
-"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056"
-"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006"
-"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
-"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
-"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320"
-"\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212"
-"\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305"
-"\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167"
-"\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143"
-"\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334"
-"\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105"
-"\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276"
-"\206\063\076\346\057\110\156\257\124\220\116\255\261\045"
-, (PRUint32)2030 }
-};
-static const NSSItem nss_builtins_items_115 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE1 root", (PRUint32)16 },
-  { (void *)"\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061"
-"\174\345\364\337"
-, (PRUint32)20 },
-  { (void *)"\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_116 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE3 root", (PRUint32)16 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
-"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
-"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
-"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
-"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
-"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
-"\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061"
-"\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125"
-"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
-"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
-"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
-"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
-"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
-"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
-"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
-"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
-"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
-"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
-"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
-"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
-"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
-"\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033"
-"\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331"
-"\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052"
-"\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213"
-"\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230"
-"\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055"
-"\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043"
-"\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153"
-"\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004"
-"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
-"\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243"
-"\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001"
-"\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242"
-"\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244"
-"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
-"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
-"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
-"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
-"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
-"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
-"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
-"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
-"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
-"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
-"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
-"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
-"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
-"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
-"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
-"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
-"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
-"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
-"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
-"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
-"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
-"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
-"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
-"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
-"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
-"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
-"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
-"\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
-"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
-"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
-"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
-"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
-"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206"
-"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
-"\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140"
-"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
-"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
-"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
-"\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110"
-"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063"
-"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
-"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
-"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056"
-"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
-"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
-"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
-"\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006"
-"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
-"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
-"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145"
-"\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103"
-"\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342"
-"\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227"
-"\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275"
-"\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247"
-"\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026"
-"\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262"
-"\257\175\310\352\351\324\126\331\016\023\262\305\105\120"
-, (PRUint32)2030 }
-};
-static const NSSItem nss_builtins_items_117 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASE3 root", (PRUint32)16 },
-  { (void *)"\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365"
-"\015\317\161\134"
-, (PRUint32)20 },
-  { (void *)"\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
-"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
-"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163"
-, (PRUint32)278 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_118 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
-"\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
-"\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067"
-"\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334"
-"\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374"
-"\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320"
-"\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122"
-"\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035"
-"\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306"
-"\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236"
-"\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174"
-"\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000"
-"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
-"\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073"
-"\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035"
-"\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241"
-"\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241"
-"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
-"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
-"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
-"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
-"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
-"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
-"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
-"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
-"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
-"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
-"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
-"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
-"\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103"
-"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
-"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
-"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
-"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143"
-"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
-"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
-"\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150"
-"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
-"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164"
-"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
-"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
-"\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154"
-"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
-"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
-"\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060"
-"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
-"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
-"\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200"
-"\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312"
-"\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304"
-"\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205"
-"\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304"
-"\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347"
-"\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213"
-"\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120"
-"\336\007\043\162\346\275\040\024\113\264\206"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_119 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
-  { (void *)"\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032"
-"\353\214\062\004"
-, (PRUint32)20 },
-  { (void *)"\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_120 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
-"\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103"
-"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
-"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
-"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
-"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
-"\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067"
-"\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
-"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366"
-"\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315"
-"\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202"
-"\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153"
-"\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324"
-"\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232"
-"\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165"
-"\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347"
-"\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000"
-"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
-"\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374"
-"\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035"
-"\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107"
-"\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241"
-"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
-"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
-"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
-"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
-"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
-"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
-"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
-"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
-"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
-"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
-"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
-"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
-"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
-"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
-"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
-"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
-"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
-"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
-"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
-"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
-"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
-"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
-"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
-"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
-"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
-"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
-"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
-"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
-"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
-"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
-"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
-"\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103"
-"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
-"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
-"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
-"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
-"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143"
-"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
-"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
-"\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150"
-"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
-"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
-"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
-"\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164"
-"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
-"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
-"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
-"\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154"
-"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
-"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
-"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
-"\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060"
-"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
-"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
-"\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005"
-"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
-"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
-"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032"
-"\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374"
-"\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012"
-"\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010"
-"\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306"
-"\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044"
-"\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022"
-"\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265"
-"\311\024\025\014\343\007\203\233\046\165\357"
-, (PRUint32)2043 }
-};
-static const NSSItem nss_builtins_items_121 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
-  { (void *)"\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342"
-"\101\104\276\156"
-, (PRUint32)20 },
-  { (void *)"\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
-"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
-"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
-"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
-"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
-"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163"
-, (PRUint32)280 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_122 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Timestamping root", (PRUint32)22 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123"
-"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
-"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
-"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
-"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
-"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
-"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
-"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
-"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053"
-"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160"
-"\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157"
-"\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006"
-"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155"
-"\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146"
-"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
-"\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001"
-"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145"
-"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061"
-"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070"
-"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002"
-"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162"
-"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023"
-"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003"
-"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145"
-"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162"
-"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003"
-"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066"
-"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013"
-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
-"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060"
-"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124"
-"\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164"
-"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
-"\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001"
-"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015"
-"\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000"
-"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215"
-"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257"
-"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070"
-"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161"
-"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265"
-"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130"
-"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233"
-"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243"
-"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006"
-"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235"
-"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120"
-"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213"
-"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077"
-"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061"
-"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020"
-"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141"
-"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145"
-"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111"
-"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154"
-"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040"
-"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151"
-"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103"
-"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065"
-"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040"
-"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040"
-"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
-"\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003"
-"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
-"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060"
-"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160"
-"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000"
-"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014"
-"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003"
-"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003"
-"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001"
-"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006"
-"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001"
-"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001"
-"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053"
-"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110"
-"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003"
-"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151"
-"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004"
-"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
-"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001"
-"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156"
-"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145"
-"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006"
-"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164"
-"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
-"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001"
-"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057"
-"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060"
-"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164"
-"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206"
-"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072"
-"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
-"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124"
-"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154"
-"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065"
-"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163"
-"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145"
-"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056"
-"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102"
-"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167"
-"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
-"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151"
-"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170"
-"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057"
-"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
-"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163"
-"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240"
-"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143"
-"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
-"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155"
-"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005"
-"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005"
-"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163"
-"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314"
-"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203"
-"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067"
-"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077"
-"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114"
-"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210"
-"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001"
-"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324"
-"\207\112\137\334\357\351\126\360\012\014\350\165"
-, (PRUint32)2108 }
-};
-static const NSSItem nss_builtins_items_123 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"IPS Timestamping root", (PRUint32)22 },
-  { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313"
-"\361\266\304\322"
-, (PRUint32)20 },
-  { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233"
-, (PRUint32)16 },
-  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
-"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
-"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
-"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
-"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
-"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
-"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
-"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
-"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
-"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
-"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
-"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
-"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
-"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
-"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
-"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
-"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
-"\145\163"
-, (PRUint32)290 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_124 [] = {
+static const NSSItem nss_builtins_items_98 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9024,7 +6815,7 @@ static const NSSItem nss_builtins_items_124 [] = {
 "\112\164\066\371"
 , (PRUint32)1492 }
 };
-static const NSSItem nss_builtins_items_125 [] = {
+static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9052,7 +6843,7 @@ static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_126 [] = {
+static const NSSItem nss_builtins_items_100 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9168,7 +6959,7 @@ static const NSSItem nss_builtins_items_126 [] = {
 "\020\005\145\325\202\020\352\302\061\315\056"
 , (PRUint32)1467 }
 };
-static const NSSItem nss_builtins_items_127 [] = {
+static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9192,7 +6983,7 @@ static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_128 [] = {
+static const NSSItem nss_builtins_items_102 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9323,7 +7114,7 @@ static const NSSItem nss_builtins_items_128 [] = {
 "\332"
 , (PRUint32)1697 }
 };
-static const NSSItem nss_builtins_items_129 [] = {
+static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9347,7 +7138,7 @@ static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_130 [] = {
+static const NSSItem nss_builtins_items_104 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9427,7 +7218,7 @@ static const NSSItem nss_builtins_items_130 [] = {
 "\057\317\246\356\311\160\042\024\275\375\276\154\013\003"
 , (PRUint32)862 }
 };
-static const NSSItem nss_builtins_items_131 [] = {
+static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9452,7 +7243,7 @@ static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_132 [] = {
+static const NSSItem nss_builtins_items_106 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9525,7 +7316,7 @@ static const NSSItem nss_builtins_items_132 [] = {
 "\127\275\125\232"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_133 [] = {
+static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9548,7 +7339,7 @@ static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_134 [] = {
+static const NSSItem nss_builtins_items_108 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9621,7 +7412,7 @@ static const NSSItem nss_builtins_items_134 [] = {
 "\160\254\337\114"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_135 [] = {
+static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9644,7 +7435,7 @@ static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_136 [] = {
+static const NSSItem nss_builtins_items_110 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9730,7 +7521,7 @@ static const NSSItem nss_builtins_items_136 [] = {
 "\025\301\044\174\062\174\003\035\073\241\130\105\062\223"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_137 [] = {
+static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9755,7 +7546,7 @@ static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_138 [] = {
+static const NSSItem nss_builtins_items_112 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9846,7 +7637,7 @@ static const NSSItem nss_builtins_items_138 [] = {
 "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145"
 , (PRUint32)1071 }
 };
-static const NSSItem nss_builtins_items_139 [] = {
+static const NSSItem nss_builtins_items_113 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9870,7 +7661,7 @@ static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_140 [] = {
+static const NSSItem nss_builtins_items_114 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9974,7 +7765,7 @@ static const NSSItem nss_builtins_items_140 [] = {
 "\004\243\103\055\332\374\013\142\352\057\137\142\123"
 , (PRUint32)1309 }
 };
-static const NSSItem nss_builtins_items_141 [] = {
+static const NSSItem nss_builtins_items_115 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9997,7 +7788,7 @@ static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_142 [] = {
+static const NSSItem nss_builtins_items_116 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10103,7 +7894,7 @@ static const NSSItem nss_builtins_items_142 [] = {
 "\364\010"
 , (PRUint32)1122 }
 };
-static const NSSItem nss_builtins_items_143 [] = {
+static const NSSItem nss_builtins_items_117 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10133,7 +7924,7 @@ static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_144 [] = {
+static const NSSItem nss_builtins_items_118 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10247,7 +8038,7 @@ static const NSSItem nss_builtins_items_144 [] = {
 "\005\323\312\003\112\124"
 , (PRUint32)1190 }
 };
-static const NSSItem nss_builtins_items_145 [] = {
+static const NSSItem nss_builtins_items_119 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10279,7 +8070,7 @@ static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_146 [] = {
+static const NSSItem nss_builtins_items_120 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10386,7 +8177,7 @@ static const NSSItem nss_builtins_items_146 [] = {
 "\062\234\036\273\235\370\146\250"
 , (PRUint32)1144 }
 };
-static const NSSItem nss_builtins_items_147 [] = {
+static const NSSItem nss_builtins_items_121 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10416,7 +8207,7 @@ static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_148 [] = {
+static const NSSItem nss_builtins_items_122 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10522,7 +8313,7 @@ static const NSSItem nss_builtins_items_148 [] = {
 "\275\023\122\035\250\076\315\000\037\310"
 , (PRUint32)1130 }
 };
-static const NSSItem nss_builtins_items_149 [] = {
+static const NSSItem nss_builtins_items_123 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10552,7 +8343,7 @@ static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_150 [] = {
+static const NSSItem nss_builtins_items_124 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10661,7 +8452,7 @@ static const NSSItem nss_builtins_items_150 [] = {
 "\334"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_151 [] = {
+static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10689,7 +8480,7 @@ static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_152 [] = {
+static const NSSItem nss_builtins_items_126 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10796,7 +8587,7 @@ static const NSSItem nss_builtins_items_152 [] = {
 "\166\135\165\220\032\365\046\217\360"
 , (PRUint32)1225 }
 };
-static const NSSItem nss_builtins_items_153 [] = {
+static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10823,7 +8614,7 @@ static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_154 [] = {
+static const NSSItem nss_builtins_items_128 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10973,7 +8764,7 @@ static const NSSItem nss_builtins_items_154 [] = {
 "\306\224\107\351\050"
 , (PRUint32)1749 }
 };
-static const NSSItem nss_builtins_items_155 [] = {
+static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11005,7 +8796,7 @@ static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_156 [] = {
+static const NSSItem nss_builtins_items_130 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11148,7 +8939,7 @@ static const NSSItem nss_builtins_items_156 [] = {
 "\210"
 , (PRUint32)1665 }
 };
-static const NSSItem nss_builtins_items_157 [] = {
+static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11179,7 +8970,7 @@ static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_158 [] = {
+static const NSSItem nss_builtins_items_132 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11298,7 +9089,7 @@ static const NSSItem nss_builtins_items_158 [] = {
 "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110"
 , (PRUint32)1359 }
 };
-static const NSSItem nss_builtins_items_159 [] = {
+static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11327,7 +9118,7 @@ static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_160 [] = {
+static const NSSItem nss_builtins_items_134 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11447,7 +9238,7 @@ static const NSSItem nss_builtins_items_160 [] = {
 "\063\004\324"
 , (PRUint32)1363 }
 };
-static const NSSItem nss_builtins_items_161 [] = {
+static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11476,7 +9267,7 @@ static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_162 [] = {
+static const NSSItem nss_builtins_items_136 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11577,7 +9368,7 @@ static const NSSItem nss_builtins_items_162 [] = {
 "\264\003\045\274"
 , (PRUint32)1076 }
 };
-static const NSSItem nss_builtins_items_163 [] = {
+static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11606,7 +9397,7 @@ static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_164 [] = {
+static const NSSItem nss_builtins_items_138 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11699,7 +9490,7 @@ static const NSSItem nss_builtins_items_164 [] = {
 "\177\333\275\237"
 , (PRUint32)1028 }
 };
-static const NSSItem nss_builtins_items_165 [] = {
+static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11725,7 +9516,7 @@ static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_166 [] = {
+static const NSSItem nss_builtins_items_140 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11819,7 +9610,7 @@ static const NSSItem nss_builtins_items_166 [] = {
 "\037\027\224"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_167 [] = {
+static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11845,7 +9636,7 @@ static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_168 [] = {
+static const NSSItem nss_builtins_items_142 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12000,7 +9791,7 @@ static const NSSItem nss_builtins_items_168 [] = {
 "\152\263\364\210\034\200\015\374\162\212\350\203\136"
 , (PRUint32)1997 }
 };
-static const NSSItem nss_builtins_items_169 [] = {
+static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12027,7 +9818,7 @@ static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_170 [] = {
+static const NSSItem nss_builtins_items_144 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12140,7 +9931,7 @@ static const NSSItem nss_builtins_items_170 [] = {
 "\245\206\054\174\364\022"
 , (PRUint32)1398 }
 };
-static const NSSItem nss_builtins_items_171 [] = {
+static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12165,7 +9956,7 @@ static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_172 [] = {
+static const NSSItem nss_builtins_items_146 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12269,7 +10060,7 @@ static const NSSItem nss_builtins_items_172 [] = {
 "\252\341\247\063\366\375\112\037\366\331\140"
 , (PRUint32)1115 }
 };
-static const NSSItem nss_builtins_items_173 [] = {
+static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12298,7 +10089,7 @@ static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_174 [] = {
+static const NSSItem nss_builtins_items_148 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12393,7 +10184,7 @@ static const NSSItem nss_builtins_items_174 [] = {
 "\117\041\145\073\112\177\107\243\373"
 , (PRUint32)1001 }
 };
-static const NSSItem nss_builtins_items_175 [] = {
+static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12421,7 +10212,7 @@ static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_176 [] = {
+static const NSSItem nss_builtins_items_150 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12544,7 +10335,7 @@ static const NSSItem nss_builtins_items_176 [] = {
 "\060\032\365\232\154\364\016\123\371\072\133\321\034"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_177 [] = {
+static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12571,7 +10362,7 @@ static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_178 [] = {
+static const NSSItem nss_builtins_items_152 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12660,7 +10451,7 @@ static const NSSItem nss_builtins_items_178 [] = {
 "\346\120\262\247\372\012\105\057\242\360\362"
 , (PRUint32)955 }
 };
-static const NSSItem nss_builtins_items_179 [] = {
+static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12687,7 +10478,7 @@ static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_180 [] = {
+static const NSSItem nss_builtins_items_154 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12776,7 +10567,7 @@ static const NSSItem nss_builtins_items_180 [] = {
 "\225\155\336"
 , (PRUint32)947 }
 };
-static const NSSItem nss_builtins_items_181 [] = {
+static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12803,7 +10594,7 @@ static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_182 [] = {
+static const NSSItem nss_builtins_items_156 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12893,7 +10684,7 @@ static const NSSItem nss_builtins_items_182 [] = {
 "\370\351\056\023\243\167\350\037\112"
 , (PRUint32)969 }
 };
-static const NSSItem nss_builtins_items_183 [] = {
+static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12920,7 +10711,7 @@ static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_184 [] = {
+static const NSSItem nss_builtins_items_158 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13001,7 +10792,7 @@ static const NSSItem nss_builtins_items_184 [] = {
 "\227\277\242\216\264\124"
 , (PRUint32)918 }
 };
-static const NSSItem nss_builtins_items_185 [] = {
+static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13025,7 +10816,7 @@ static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_186 [] = {
+static const NSSItem nss_builtins_items_160 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13103,7 +10894,7 @@ static const NSSItem nss_builtins_items_186 [] = {
 "\013\004\216\007\333\051\266\012\356\235\202\065\065\020"
 , (PRUint32)846 }
 };
-static const NSSItem nss_builtins_items_187 [] = {
+static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13128,7 +10919,7 @@ static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_188 [] = {
+static const NSSItem nss_builtins_items_162 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13220,7 +11011,7 @@ static const NSSItem nss_builtins_items_188 [] = {
 "\363\267\240\247\315\345\172\063\066\152\372\232\053"
 , (PRUint32)1037 }
 };
-static const NSSItem nss_builtins_items_189 [] = {
+static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13246,7 +11037,7 @@ static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_190 [] = {
+static const NSSItem nss_builtins_items_164 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13348,7 +11139,7 @@ static const NSSItem nss_builtins_items_190 [] = {
 "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307"
 , (PRUint32)1023 }
 };
-static const NSSItem nss_builtins_items_191 [] = {
+static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13379,7 +11170,7 @@ static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_192 [] = {
+static const NSSItem nss_builtins_items_166 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13487,7 +11278,7 @@ static const NSSItem nss_builtins_items_192 [] = {
 "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102"
 , (PRUint32)1088 }
 };
-static const NSSItem nss_builtins_items_193 [] = {
+static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13519,7 +11310,7 @@ static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_194 [] = {
+static const NSSItem nss_builtins_items_168 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13636,7 +11427,7 @@ static const NSSItem nss_builtins_items_194 [] = {
 "\205\206\171\145\322"
 , (PRUint32)1477 }
 };
-static const NSSItem nss_builtins_items_195 [] = {
+static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13660,7 +11451,7 @@ static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_196 [] = {
+static const NSSItem nss_builtins_items_170 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13776,7 +11567,7 @@ static const NSSItem nss_builtins_items_196 [] = {
 "\111\044\133\311\260\320\127\301\372\076\172\341\227\311"
 , (PRUint32)1470 }
 };
-static const NSSItem nss_builtins_items_197 [] = {
+static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13800,7 +11591,7 @@ static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_198 [] = {
+static const NSSItem nss_builtins_items_172 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13917,7 +11708,7 @@ static const NSSItem nss_builtins_items_198 [] = {
 "\156"
 , (PRUint32)1473 }
 };
-static const NSSItem nss_builtins_items_199 [] = {
+static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13941,7 +11732,7 @@ static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_200 [] = {
+static const NSSItem nss_builtins_items_174 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14024,7 +11815,7 @@ static const NSSItem nss_builtins_items_200 [] = {
 "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131"
 , (PRUint32)896 }
 };
-static const NSSItem nss_builtins_items_201 [] = {
+static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14050,7 +11841,7 @@ static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_202 [] = {
+static const NSSItem nss_builtins_items_176 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14154,7 +11945,7 @@ static const NSSItem nss_builtins_items_202 [] = {
 "\215\126\214\150"
 , (PRUint32)1060 }
 };
-static const NSSItem nss_builtins_items_203 [] = {
+static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14185,7 +11976,7 @@ static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_204 [] = {
+static const NSSItem nss_builtins_items_178 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14304,7 +12095,7 @@ static const NSSItem nss_builtins_items_204 [] = {
 "\254\021\326\250\355\143\152"
 , (PRUint32)1239 }
 };
-static const NSSItem nss_builtins_items_205 [] = {
+static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14337,7 +12128,7 @@ static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_206 [] = {
+static const NSSItem nss_builtins_items_180 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14422,7 +12213,7 @@ static const NSSItem nss_builtins_items_206 [] = {
 "\113\035\236\054\302\270\150\274\355\002\356\061"
 , (PRUint32)956 }
 };
-static const NSSItem nss_builtins_items_207 [] = {
+static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14447,7 +12238,7 @@ static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_208 [] = {
+static const NSSItem nss_builtins_items_182 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14532,7 +12323,7 @@ static const NSSItem nss_builtins_items_208 [] = {
 "\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026"
 , (PRUint32)960 }
 };
-static const NSSItem nss_builtins_items_209 [] = {
+static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14557,7 +12348,7 @@ static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_210 [] = {
+static const NSSItem nss_builtins_items_184 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14657,7 +12448,7 @@ static const NSSItem nss_builtins_items_210 [] = {
 "\145"
 , (PRUint32)1057 }
 };
-static const NSSItem nss_builtins_items_211 [] = {
+static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14686,7 +12477,7 @@ static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_212 [] = {
+static const NSSItem nss_builtins_items_186 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14804,7 +12595,7 @@ static const NSSItem nss_builtins_items_212 [] = {
 "\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
 , (PRUint32)1422 }
 };
-static const NSSItem nss_builtins_items_213 [] = {
+static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14831,7 +12622,7 @@ static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_214 [] = {
+static const NSSItem nss_builtins_items_188 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14923,7 +12714,7 @@ static const NSSItem nss_builtins_items_214 [] = {
 "\244\140\114\260\125\240\240\173\127\262"
 , (PRUint32)1002 }
 };
-static const NSSItem nss_builtins_items_215 [] = {
+static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14950,7 +12741,7 @@ static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_216 [] = {
+static const NSSItem nss_builtins_items_190 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15059,7 +12850,7 @@ static const NSSItem nss_builtins_items_216 [] = {
 "\333"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_217 [] = {
+static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15087,7 +12878,7 @@ static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_218 [] = {
+static const NSSItem nss_builtins_items_192 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15161,7 +12952,7 @@ static const NSSItem nss_builtins_items_218 [] = {
 "\334\335\363\377\035\054\072\026\127\331\222\071\326"
 , (PRUint32)653 }
 };
-static const NSSItem nss_builtins_items_219 [] = {
+static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15190,7 +12981,7 @@ static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_220 [] = {
+static const NSSItem nss_builtins_items_194 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15282,7 +13073,7 @@ static const NSSItem nss_builtins_items_220 [] = {
 "\321\236\164\310\166\147"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_221 [] = {
+static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15307,7 +13098,7 @@ static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_222 [] = {
+static const NSSItem nss_builtins_items_196 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15404,7 +13195,7 @@ static const NSSItem nss_builtins_items_222 [] = {
 "\253\205\322\140\126\132"
 , (PRUint32)1030 }
 };
-static const NSSItem nss_builtins_items_223 [] = {
+static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15432,7 +13223,7 @@ static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_224 [] = {
+static const NSSItem nss_builtins_items_198 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15517,7 +13308,7 @@ static const NSSItem nss_builtins_items_224 [] = {
 "\164"
 , (PRUint32)897 }
 };
-static const NSSItem nss_builtins_items_225 [] = {
+static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15543,7 +13334,7 @@ static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_226 [] = {
+static const NSSItem nss_builtins_items_200 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15640,7 +13431,7 @@ static const NSSItem nss_builtins_items_226 [] = {
 "\374\276\337\012\015"
 , (PRUint32)1013 }
 };
-static const NSSItem nss_builtins_items_227 [] = {
+static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15669,7 +13460,7 @@ static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_228 [] = {
+static const NSSItem nss_builtins_items_202 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15780,7 +13571,7 @@ static const NSSItem nss_builtins_items_228 [] = {
 "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
 , (PRUint32)1151 }
 };
-static const NSSItem nss_builtins_items_229 [] = {
+static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15812,7 +13603,7 @@ static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_230 [] = {
+static const NSSItem nss_builtins_items_204 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15966,7 +13757,7 @@ static const NSSItem nss_builtins_items_230 [] = {
 "\103\307\003\340\067\116\135\012\334\131\040\045"
 , (PRUint32)1964 }
 };
-static const NSSItem nss_builtins_items_231 [] = {
+static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15994,7 +13785,7 @@ static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_232 [] = {
+static const NSSItem nss_builtins_items_206 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16075,7 +13866,7 @@ static const NSSItem nss_builtins_items_232 [] = {
 "\300\226\130\057\352\273\106\327\273\344\331\056"
 , (PRUint32)940 }
 };
-static const NSSItem nss_builtins_items_233 [] = {
+static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16098,7 +13889,7 @@ static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_234 [] = {
+static const NSSItem nss_builtins_items_208 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16232,7 +14023,7 @@ static const NSSItem nss_builtins_items_234 [] = {
 "\005\211\374\170\326\134\054\046\103\251"
 , (PRUint32)1642 }
 };
-static const NSSItem nss_builtins_items_235 [] = {
+static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16260,7 +14051,7 @@ static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_236 [] = {
+static const NSSItem nss_builtins_items_210 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16365,7 +14156,7 @@ static const NSSItem nss_builtins_items_236 [] = {
 "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_237 [] = {
+static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16392,7 +14183,7 @@ static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_238 [] = {
+static const NSSItem nss_builtins_items_212 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16497,7 +14288,7 @@ static const NSSItem nss_builtins_items_238 [] = {
 "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_239 [] = {
+static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16524,7 +14315,7 @@ static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_240 [] = {
+static const NSSItem nss_builtins_items_214 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16617,7 +14408,7 @@ static const NSSItem nss_builtins_items_240 [] = {
 "\230"
 , (PRUint32)993 }
 };
-static const NSSItem nss_builtins_items_241 [] = {
+static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16644,7 +14435,7 @@ static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_242 [] = {
+static const NSSItem nss_builtins_items_216 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16733,7 +14524,7 @@ static const NSSItem nss_builtins_items_242 [] = {
 "\126\144\127"
 , (PRUint32)931 }
 };
-static const NSSItem nss_builtins_items_243 [] = {
+static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16760,7 +14551,7 @@ static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_244 [] = {
+static const NSSItem nss_builtins_items_218 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16841,7 +14632,7 @@ static const NSSItem nss_builtins_items_244 [] = {
 "\000\147\240\161\000\202\110"
 , (PRUint32)919 }
 };
-static const NSSItem nss_builtins_items_245 [] = {
+static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16865,7 +14656,7 @@ static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_246 [] = {
+static const NSSItem nss_builtins_items_220 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16947,7 +14738,7 @@ static const NSSItem nss_builtins_items_246 [] = {
 "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
 , (PRUint32)943 }
 };
-static const NSSItem nss_builtins_items_247 [] = {
+static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16971,7 +14762,7 @@ static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_248 [] = {
+static const NSSItem nss_builtins_items_222 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17052,7 +14843,7 @@ static const NSSItem nss_builtins_items_248 [] = {
 "\246\210\070\316\125"
 , (PRUint32)933 }
 };
-static const NSSItem nss_builtins_items_249 [] = {
+static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17075,7 +14866,7 @@ static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_250 [] = {
+static const NSSItem nss_builtins_items_224 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17194,7 +14985,7 @@ static const NSSItem nss_builtins_items_250 [] = {
 "\201\370\021\234"
 , (PRUint32)1460 }
 };
-static const NSSItem nss_builtins_items_251 [] = {
+static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17220,7 +15011,7 @@ static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_252 [] = {
+static const NSSItem nss_builtins_items_226 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17354,7 +15145,7 @@ static const NSSItem nss_builtins_items_252 [] = {
 "\311\234\220\332\354\251\102\074\255\266\002"
 , (PRUint32)1307 }
 };
-static const NSSItem nss_builtins_items_253 [] = {
+static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17392,7 +15183,7 @@ static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_254 [] = {
+static const NSSItem nss_builtins_items_228 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17470,7 +15261,7 @@ static const NSSItem nss_builtins_items_254 [] = {
 "\366\324\357\277\114\210\150"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_255 [] = {
+static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17494,7 +15285,7 @@ static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_256 [] = {
+static const NSSItem nss_builtins_items_230 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17572,7 +15363,7 @@ static const NSSItem nss_builtins_items_256 [] = {
 "\246\347\313\100\003\335\171"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_257 [] = {
+static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17596,7 +15387,7 @@ static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_258 [] = {
+static const NSSItem nss_builtins_items_232 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17723,7 +15514,7 @@ static const NSSItem nss_builtins_items_258 [] = {
 "\320\352\111\242\034\215\122\024\246\012\223"
 , (PRUint32)1515 }
 };
-static const NSSItem nss_builtins_items_259 [] = {
+static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17751,7 +15542,7 @@ static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_260 [] = {
+static const NSSItem nss_builtins_items_234 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17825,7 +15616,7 @@ static const NSSItem nss_builtins_items_260 [] = {
 "\366\356\260\132\116\111\104\124\130\137\102\203"
 , (PRUint32)828 }
 };
-static const NSSItem nss_builtins_items_261 [] = {
+static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17848,7 +15639,7 @@ static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_262 [] = {
+static const NSSItem nss_builtins_items_236 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17924,7 +15715,7 @@ static const NSSItem nss_builtins_items_262 [] = {
 "\011\333\212\101\202\236\146\233\021"
 , (PRUint32)857 }
 };
-static const NSSItem nss_builtins_items_263 [] = {
+static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17947,7 +15738,7 @@ static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_264 [] = {
+static const NSSItem nss_builtins_items_238 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18030,7 +15821,7 @@ static const NSSItem nss_builtins_items_264 [] = {
 "\262\033\211\124"
 , (PRUint32)932 }
 };
-static const NSSItem nss_builtins_items_265 [] = {
+static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18054,7 +15845,7 @@ static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_266 [] = {
+static const NSSItem nss_builtins_items_240 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18154,7 +15945,7 @@ static const NSSItem nss_builtins_items_266 [] = {
 "\021\055"
 , (PRUint32)1026 }
 };
-static const NSSItem nss_builtins_items_267 [] = {
+static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18184,7 +15975,7 @@ static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_268 [] = {
+static const NSSItem nss_builtins_items_242 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18258,7 +16049,7 @@ static const NSSItem nss_builtins_items_268 [] = {
 "\367\130\077\056\162\002\127\243\217\241\024\056"
 , (PRUint32)652 }
 };
-static const NSSItem nss_builtins_items_269 [] = {
+static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18287,7 +16078,7 @@ static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_270 [] = {
+static const NSSItem nss_builtins_items_244 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18393,7 +16184,7 @@ static const NSSItem nss_builtins_items_270 [] = {
 "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
 , (PRUint32)1070 }
 };
-static const NSSItem nss_builtins_items_271 [] = {
+static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18425,7 +16216,7 @@ static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_272 [] = {
+static const NSSItem nss_builtins_items_246 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18504,7 +16295,7 @@ static const NSSItem nss_builtins_items_272 [] = {
 "\017\212"
 , (PRUint32)690 }
 };
-static const NSSItem nss_builtins_items_273 [] = {
+static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18534,7 +16325,7 @@ static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_274 [] = {
+static const NSSItem nss_builtins_items_248 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18649,7 +16440,7 @@ static const NSSItem nss_builtins_items_274 [] = {
 "\354\315\202\141\361\070\346\117\227\230\052\132\215"
 , (PRUint32)1213 }
 };
-static const NSSItem nss_builtins_items_275 [] = {
+static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18681,7 +16472,7 @@ static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_276 [] = {
+static const NSSItem nss_builtins_items_250 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18779,7 +16570,7 @@ static const NSSItem nss_builtins_items_276 [] = {
 "\055\247\330\206\052\335\056\020"
 , (PRUint32)904 }
 };
-static const NSSItem nss_builtins_items_277 [] = {
+static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18812,7 +16603,7 @@ static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_278 [] = {
+static const NSSItem nss_builtins_items_252 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18914,7 +16705,7 @@ static const NSSItem nss_builtins_items_278 [] = {
 "\330\316\304\143\165\077\131\107\261"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_279 [] = {
+static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18944,7 +16735,7 @@ static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_280 [] = {
+static const NSSItem nss_builtins_items_254 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19063,7 +16854,7 @@ static const NSSItem nss_builtins_items_280 [] = {
 "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
 , (PRUint32)1486 }
 };
-static const NSSItem nss_builtins_items_281 [] = {
+static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19088,7 +16879,7 @@ static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_282 [] = {
+static const NSSItem nss_builtins_items_256 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19178,7 +16969,7 @@ static const NSSItem nss_builtins_items_282 [] = {
 "\315\345\250"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_283 [] = {
+static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19202,7 +16993,7 @@ static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_284 [] = {
+static const NSSItem nss_builtins_items_258 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19307,7 +17098,7 @@ static const NSSItem nss_builtins_items_284 [] = {
 "\115\273\306\104\333\066\313\052\234\216"
 , (PRUint32)1258 }
 };
-static const NSSItem nss_builtins_items_285 [] = {
+static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19332,7 +17123,7 @@ static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_286 [] = {
+static const NSSItem nss_builtins_items_260 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19408,7 +17199,7 @@ static const NSSItem nss_builtins_items_286 [] = {
 "\002\153\331\132"
 , (PRUint32)820 }
 };
-static const NSSItem nss_builtins_items_287 [] = {
+static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19432,7 +17223,7 @@ static const NSSItem nss_builtins_items_287 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_288 [] = {
+static const NSSItem nss_builtins_items_262 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19514,7 +17305,7 @@ static const NSSItem nss_builtins_items_288 [] = {
 "\362"
 , (PRUint32)881 }
 };
-static const NSSItem nss_builtins_items_289 [] = {
+static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19539,7 +17330,7 @@ static const NSSItem nss_builtins_items_289 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_290 [] = {
+static const NSSItem nss_builtins_items_264 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19655,7 +17446,7 @@ static const NSSItem nss_builtins_items_290 [] = {
 "\113\076\053\070\007\125\230\136\244"
 , (PRUint32)1465 }
 };
-static const NSSItem nss_builtins_items_291 [] = {
+static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19679,7 +17470,7 @@ static const NSSItem nss_builtins_items_291 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_292 [] = {
+static const NSSItem nss_builtins_items_266 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19744,7 +17535,7 @@ static const NSSItem nss_builtins_items_292 [] = {
 "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_293 [] = {
+static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19771,7 +17562,7 @@ static const NSSItem nss_builtins_items_293 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_294 [] = {
+static const NSSItem nss_builtins_items_268 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19836,7 +17627,7 @@ static const NSSItem nss_builtins_items_294 [] = {
 "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_295 [] = {
+static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19863,7 +17654,7 @@ static const NSSItem nss_builtins_items_295 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_296 [] = {
+static const NSSItem nss_builtins_items_270 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19960,7 +17751,7 @@ static const NSSItem nss_builtins_items_296 [] = {
 "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
 , (PRUint32)1038 }
 };
-static const NSSItem nss_builtins_items_297 [] = {
+static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -19988,7 +17779,7 @@ static const NSSItem nss_builtins_items_297 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_298 [] = {
+static const NSSItem nss_builtins_items_272 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20079,7 +17870,7 @@ static const NSSItem nss_builtins_items_298 [] = {
 "\336\102\343\055\202\361\017\345\372\227"
 , (PRUint32)954 }
 };
-static const NSSItem nss_builtins_items_299 [] = {
+static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20107,7 +17898,7 @@ static const NSSItem nss_builtins_items_299 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_300 [] = {
+static const NSSItem nss_builtins_items_274 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20186,7 +17977,7 @@ static const NSSItem nss_builtins_items_300 [] = {
 "\130\077\137"
 , (PRUint32)867 }
 };
-static const NSSItem nss_builtins_items_301 [] = {
+static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20210,7 +18001,7 @@ static const NSSItem nss_builtins_items_301 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_302 [] = {
+static const NSSItem nss_builtins_items_276 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20303,7 +18094,7 @@ static const NSSItem nss_builtins_items_302 [] = {
 "\045\361\224\264\146"
 , (PRUint32)997 }
 };
-static const NSSItem nss_builtins_items_303 [] = {
+static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20330,7 +18121,7 @@ static const NSSItem nss_builtins_items_303 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_304 [] = {
+static const NSSItem nss_builtins_items_278 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20454,7 +18245,7 @@ static const NSSItem nss_builtins_items_304 [] = {
 "\156\117\022\176\012\074\235\225"
 , (PRUint32)1560 }
 };
-static const NSSItem nss_builtins_items_305 [] = {
+static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20479,7 +18270,7 @@ static const NSSItem nss_builtins_items_305 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_306 [] = {
+static const NSSItem nss_builtins_items_280 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20598,7 +18389,7 @@ static const NSSItem nss_builtins_items_306 [] = {
 "\333\374\046\210\307"
 , (PRUint32)1525 }
 };
-static const NSSItem nss_builtins_items_307 [] = {
+static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20622,7 +18413,7 @@ static const NSSItem nss_builtins_items_307 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_308 [] = {
+static const NSSItem nss_builtins_items_282 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20778,7 +18569,7 @@ static const NSSItem nss_builtins_items_308 [] = {
 "\167\110\320"
 , (PRUint32)1875 }
 };
-static const NSSItem nss_builtins_items_309 [] = {
+static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20809,7 +18600,7 @@ static const NSSItem nss_builtins_items_309 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_310 [] = {
+static const NSSItem nss_builtins_items_284 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20962,7 +18753,7 @@ static const NSSItem nss_builtins_items_310 [] = {
 "\351\233\256\325\124\300\164\200\321\013\102\237\301"
 , (PRUint32)1869 }
 };
-static const NSSItem nss_builtins_items_311 [] = {
+static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -20992,6 +18783,2574 @@ static const NSSItem nss_builtins_items_311 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
+static const NSSItem nss_builtins_items_286 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004"
+"\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154"
+"\141\056\157\162\147"
+, (PRUint32)229 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
+"\362\077\103"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000"
+"\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157"
+"\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202"
+"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253"
+"\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262"
+"\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241"
+"\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271"
+"\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307"
+"\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070"
+"\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262"
+"\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221"
+"\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033"
+"\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351"
+"\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316"
+"\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235"
+"\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345"
+"\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133"
+"\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100"
+"\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214"
+"\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002"
+"\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003"
+"\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230"
+"\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006"
+"\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160"
+"\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003"
+"\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035"
+"\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006"
+"\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040"
+"\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001"
+"\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007"
+"\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165"
+"\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120"
+"\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066"
+"\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143"
+"\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055"
+"\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141"
+"\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164"
+"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056"
+"\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161"
+"\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073"
+"\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160"
+"\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056"
+"\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123"
+"\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053"
+"\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057"
+"\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157"
+"\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144"
+"\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147"
+"\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172"
+"\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025"
+"\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276"
+"\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317"
+"\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111"
+"\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204"
+"\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163"
+"\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335"
+"\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043"
+"\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231"
+"\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312"
+"\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005"
+"\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142"
+"\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043"
+"\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236"
+"\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055"
+"\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171"
+"\242\355\264\324\265\145\103\267\223\106\212\323"
+, (PRUint32)1532 }
+};
+static const NSSItem nss_builtins_items_287 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
+  { (void *)"\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014"
+"\165\332\071\326"
+, (PRUint32)20 },
+  { (void *)"\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
+"\362\077\103"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_288 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Global Trustee", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155"
+"\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141"
+"\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006"
+"\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165"
+"\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107"
+"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060"
+"\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142"
+"\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160"
+"\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013"
+"\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060"
+"\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164"
+"\162\165\163\164\145\145"
+, (PRUint32)230 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
+"\070\057\260"
+, (PRUint32)19 },
+  { (void *)"\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000"
+"\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006"
+"\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006"
+"\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147"
+"\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107"
+"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060"
+"\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124"
+"\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023"
+"\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107"
+"\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156"
+"\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151"
+"\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023"
+"\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060"
+"\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001"
+"\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000"
+"\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266"
+"\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064"
+"\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235"
+"\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151"
+"\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013"
+"\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117"
+"\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330"
+"\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335"
+"\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164"
+"\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350"
+"\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164"
+"\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053"
+"\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250"
+"\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064"
+"\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315"
+"\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164"
+"\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232"
+"\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234"
+"\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225"
+"\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267"
+"\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026"
+"\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137"
+"\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157"
+"\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253"
+"\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301"
+"\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345"
+"\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030"
+"\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121"
+"\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156"
+"\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160"
+"\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214"
+"\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145"
+"\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006"
+"\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050"
+"\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035"
+"\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101"
+"\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006"
+"\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006"
+"\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125"
+"\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001"
+"\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035"
+"\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061"
+"\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005"
+"\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143"
+"\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103"
+"\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240"
+"\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056"
+"\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116"
+"\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167"
+"\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150"
+"\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157"
+"\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162"
+"\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060"
+"\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060"
+"\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164"
+"\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141"
+"\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164"
+"\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010"
+"\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057"
+"\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143"
+"\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147"
+"\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006"
+"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
+"\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305"
+"\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021"
+"\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011"
+"\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237"
+"\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306"
+"\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007"
+"\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201"
+"\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174"
+"\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240"
+"\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045"
+"\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346"
+"\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331"
+"\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215"
+"\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366"
+"\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265"
+"\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031"
+"\264"
+, (PRUint32)1761 }
+};
+static const NSSItem nss_builtins_items_289 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Global Trustee", (PRUint32)21 },
+  { (void *)"\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262"
+"\234\324\025\032"
+, (PRUint32)20 },
+  { (void *)"\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
+"\070\057\260"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_290 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus GMail", (PRUint32)12 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
+"\256\036"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004"
+"\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056"
+"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
+"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
+"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
+"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
+"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
+"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
+"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
+"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
+"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
+"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
+"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
+"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
+"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
+"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
+"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
+"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
+"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
+"\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
+"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006"
+"\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147"
+"\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155"
+"\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015"
+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001"
+"\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320"
+"\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336"
+"\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204"
+"\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300"
+"\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255"
+"\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023"
+"\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206"
+"\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342"
+"\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140"
+"\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211"
+"\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173"
+"\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135"
+"\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254"
+"\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305"
+"\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206"
+"\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247"
+"\111\043"
+, (PRUint32)1522 }
+};
+static const NSSItem nss_builtins_items_291 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus GMail", (PRUint32)12 },
+  { (void *)"\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044"
+"\223\003\017\227"
+, (PRUint32)20 },
+  { (void *)"\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
+"\256\036"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_292 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Google", (PRUint32)13 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
+"\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157"
+"\155"
+, (PRUint32)225 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
+"\130\174\006"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000"
+"\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056"
+"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
+"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
+"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
+"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
+"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
+"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
+"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
+"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
+"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
+"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
+"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
+"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
+"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
+"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
+"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
+"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
+"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
+"\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
+"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006"
+"\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157"
+"\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145"
+"\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001"
+"\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063"
+"\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027"
+"\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062"
+"\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260"
+"\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102"
+"\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302"
+"\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154"
+"\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065"
+"\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146"
+"\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126"
+"\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332"
+"\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155"
+"\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235"
+"\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061"
+"\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327"
+"\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363"
+"\172\244\047\023\326\117\364\151"
+, (PRUint32)1512 }
+};
+static const NSSItem nss_builtins_items_293 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Google", (PRUint32)13 },
+  { (void *)"\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101"
+"\100\105\146\026"
+, (PRUint32)20 },
+  { (void *)"\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
+"\130\174\006"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_294 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Skype", (PRUint32)12 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
+"\025\104\107"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
+"\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
+"\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206"
+"\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256"
+"\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040"
+"\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056"
+"\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121"
+"\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040"
+"\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377"
+"\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171"
+"\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210"
+"\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071"
+"\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047"
+"\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244"
+"\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155"
+"\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066"
+"\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100"
+"\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131"
+"\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000"
+"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
+"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
+"\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034"
+"\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017"
+"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
+"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
+"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
+"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
+"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
+"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
+"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
+"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
+"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
+"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
+"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
+"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
+"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
+"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
+"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
+"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
+"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
+"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
+"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
+"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
+"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
+"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
+"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
+"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
+"\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056"
+"\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132"
+"\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157"
+"\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172"
+"\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315"
+"\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345"
+"\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143"
+"\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153"
+"\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267"
+"\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255"
+"\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160"
+"\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116"
+"\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017"
+"\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225"
+"\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034"
+"\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224"
+"\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254"
+"\302\021\254"
+, (PRUint32)1523 }
+};
+static const NSSItem nss_builtins_items_295 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Skype", (PRUint32)12 },
+  { (void *)"\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045"
+"\004\372\043\311"
+, (PRUint32)20 },
+  { (void *)"\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
+"\025\104\107"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_296 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
+"\167\051\243"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
+"\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
+"\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075"
+"\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034"
+"\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243"
+"\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030"
+"\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041"
+"\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202"
+"\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161"
+"\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174"
+"\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302"
+"\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321"
+"\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337"
+"\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115"
+"\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072"
+"\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154"
+"\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245"
+"\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167"
+"\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000"
+"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
+"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
+"\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047"
+"\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017"
+"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
+"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
+"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
+"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
+"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
+"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
+"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
+"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
+"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
+"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
+"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
+"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
+"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
+"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
+"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
+"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
+"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
+"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
+"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
+"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
+"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
+"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
+"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
+"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056"
+"\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
+"\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125"
+"\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310"
+"\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135"
+"\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326"
+"\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037"
+"\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120"
+"\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112"
+"\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210"
+"\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150"
+"\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326"
+"\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252"
+"\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111"
+"\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375"
+"\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007"
+"\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373"
+"\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325"
+"\147\024\060"
+, (PRUint32)1523 }
+};
+static const NSSItem nss_builtins_items_297 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
+  { (void *)"\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307"
+"\153\333\167\320"
+, (PRUint32)20 },
+  { (void *)"\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
+"\167\051\243"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_298 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
+"\302\051"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071"
+"\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
+"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
+"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
+"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
+"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
+"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
+"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
+"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
+"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
+"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
+"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
+"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
+"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
+"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
+"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
+"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
+"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
+"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
+"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
+"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
+"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341"
+"\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027"
+"\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371"
+"\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302"
+"\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254"
+"\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056"
+"\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161"
+"\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132"
+"\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122"
+"\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107"
+"\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143"
+"\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016"
+"\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105"
+"\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067"
+"\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264"
+"\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213"
+"\217\116\235\306\066\347\134\246\253\022\017\326\317"
+, (PRUint32)1501 }
+};
+static const NSSItem nss_builtins_items_299 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
+  { (void *)"\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317"
+"\112\134\263\255"
+, (PRUint32)20 },
+  { (void *)"\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
+"\302\051"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_300 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
+"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
+"\157\155"
+, (PRUint32)226 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
+"\052\161"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076"
+"\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
+"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
+"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
+"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
+"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
+"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
+"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
+"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
+"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
+"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
+"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
+"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
+"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
+"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
+"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
+"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
+"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
+"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
+"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
+"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
+"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
+"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
+"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
+"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
+"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
+"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
+"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
+"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
+"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
+"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
+"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
+"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
+"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
+"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
+"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230"
+"\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116"
+"\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316"
+"\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060"
+"\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240"
+"\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272"
+"\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276"
+"\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307"
+"\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066"
+"\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152"
+"\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176"
+"\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325"
+"\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265"
+"\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146"
+"\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105"
+"\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003"
+"\130\113\161\203\237\146\346\254\171\110\376\376\107"
+, (PRUint32)1501 }
+};
+static const NSSItem nss_builtins_items_301 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
+  { (void *)"\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236"
+"\007\326\224\317"
+, (PRUint32)20 },
+  { (void *)"\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
+"\052\161"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_302 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus live.com", (PRUint32)15 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
+"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
+"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
+"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
+"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
+"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
+"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
+"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
+"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
+"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
+"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
+"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
+"\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157"
+"\155"
+, (PRUint32)225 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
+"\275\072\300"
+, (PRUint32)19 },
+  { (void *)"\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000"
+"\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
+"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
+"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
+"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
+"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
+"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
+"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
+"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
+"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
+"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
+"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
+"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
+"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
+"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
+"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
+"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
+"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
+"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
+"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
+"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
+"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
+"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
+"\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151"
+"\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
+"\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357"
+"\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230"
+"\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323"
+"\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076"
+"\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005"
+"\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264"
+"\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053"
+"\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041"
+"\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252"
+"\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045"
+"\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125"
+"\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303"
+"\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127"
+"\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271"
+"\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160"
+"\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146"
+"\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001"
+"\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004"
+"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
+"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
+"\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003"
+"\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001"
+"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
+"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
+"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
+"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
+"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
+"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
+"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
+"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
+"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
+"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
+"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
+"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
+"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
+"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
+"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
+"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
+"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
+"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
+"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
+"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
+"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006"
+"\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056"
+"\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157"
+"\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332"
+"\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257"
+"\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311"
+"\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137"
+"\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052"
+"\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254"
+"\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122"
+"\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015"
+"\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047"
+"\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177"
+"\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025"
+"\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002"
+"\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067"
+"\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364"
+"\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177"
+"\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
+, (PRUint32)1520 }
+};
+static const NSSItem nss_builtins_items_303 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus live.com", (PRUint32)15 },
+  { (void *)"\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024"
+"\160\212\262\276"
+, (PRUint32)20 },
+  { (void *)"\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
+"\275\072\300"
+, (PRUint32)19 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_304 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus kuix.de", (PRUint32)14 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105"
+"\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065"
+"\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040"
+"\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011"
+"\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125"
+"\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061"
+"\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156"
+"\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106"
+"\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157"
+"\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004"
+"\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131"
+"\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101"
+"\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013"
+"\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123"
+"\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151"
+"\170\056\144\145"
+, (PRUint32)244 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
+"\350\260"
+, (PRUint32)18 },
+  { (void *)"\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162"
+"\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060"
+"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
+"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
+"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
+"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
+"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
+"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
+"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
+"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
+"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
+"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
+"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
+"\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061"
+"\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006"
+"\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004"
+"\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004"
+"\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060"
+"\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164"
+"\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164"
+"\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012"
+"\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040"
+"\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151"
+"\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171"
+"\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040"
+"\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101"
+"\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061"
+"\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157"
+"\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003"
+"\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
+"\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007"
+"\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123"
+"\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354"
+"\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337"
+"\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115"
+"\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224"
+"\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262"
+"\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271"
+"\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202"
+"\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060"
+"\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325"
+"\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026"
+"\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346"
+"\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377"
+"\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006"
+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
+"\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073"
+"\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053"
+"\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164"
+"\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155"
+"\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125"
+"\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164"
+"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143"
+"\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151"
+"\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154"
+"\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143"
+"\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124"
+"\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144"
+"\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005"
+"\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005"
+"\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164"
+"\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124"
+"\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103"
+"\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060"
+"\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143"
+"\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125"
+"\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202"
+"\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222"
+"\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124"
+"\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311"
+"\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200"
+"\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056"
+"\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164"
+"\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366"
+"\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312"
+"\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213"
+"\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071"
+"\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160"
+"\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231"
+"\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226"
+"\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346"
+"\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260"
+"\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
+, (PRUint32)1392 }
+};
+static const NSSItem nss_builtins_items_305 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Bogus kuix.de", (PRUint32)14 },
+  { (void *)"\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171"
+"\262\144\040\100"
+, (PRUint32)20 },
+  { (void *)"\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007"
+, (PRUint32)16 },
+  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
+"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
+"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
+"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
+"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
+"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
+"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
+"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
+"\164\055\110\141\162\144\167\141\162\145"
+, (PRUint32)154 },
+  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
+"\350\260"
+, (PRUint32)18 },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_306 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023"
+"\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156"
+"\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040"
+"\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
+"\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060"
+"\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063"
+"\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007"
+"\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007"
+"\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030"
+"\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143"
+"\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004"
+"\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010"
+"\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203"
+"\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366"
+"\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116"
+"\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007"
+"\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215"
+"\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336"
+"\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062"
+"\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262"
+"\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353"
+"\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141"
+"\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051"
+"\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200"
+"\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221"
+"\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333"
+"\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033"
+"\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000"
+"\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004"
+"\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040"
+"\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001"
+"\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227"
+"\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145"
+"\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214"
+"\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256"
+"\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053"
+"\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337"
+"\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353"
+"\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355"
+"\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072"
+"\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350"
+"\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333"
+"\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075"
+"\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316"
+"\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006"
+"\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324"
+"\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210"
+"\342\342\104\276\134\367\352\034\365"
+, (PRUint32)969 }
+};
+static const NSSItem nss_builtins_items_307 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
+  { (void *)"\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302"
+"\124\375\346\213"
+, (PRUint32)20 },
+  { (void *)"\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
+"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
+"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
+"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
+"\171\040\055\040\107\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_308 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
+"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
+"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060"
+"\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154"
+"\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141"
+"\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107"
+"\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060"
+"\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071"
+"\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125"
+"\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172"
+"\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143"
+"\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004"
+"\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143"
+"\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061"
+"\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151"
+"\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151"
+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055"
+"\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367"
+"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002"
+"\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133"
+"\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327"
+"\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040"
+"\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334"
+"\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133"
+"\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165"
+"\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161"
+"\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363"
+"\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315"
+"\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202"
+"\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373"
+"\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115"
+"\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244"
+"\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134"
+"\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164"
+"\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303"
+"\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006"
+"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016"
+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035"
+"\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060"
+"\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006"
+"\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001"
+"\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071"
+"\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324"
+"\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321"
+"\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147"
+"\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267"
+"\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323"
+"\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175"
+"\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340"
+"\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040"
+"\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316"
+"\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312"
+"\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011"
+"\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042"
+"\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365"
+"\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045"
+"\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151"
+"\364"
+, (PRUint32)993 }
+};
+static const NSSItem nss_builtins_items_309 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
+  { (void *)"\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071"
+"\324\347\017\016"
+, (PRUint32)20 },
+  { (void *)"\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226"
+, (PRUint32)16 },
+  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
+"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
+"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
+"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
+"\107\062"
+, (PRUint32)146 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_310 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
+"\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
+"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
+"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
+"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
+"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060"
+"\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154"
+"\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040"
+"\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150"
+"\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071"
+"\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061"
+"\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060"
+"\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003"
+"\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021"
+"\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154"
+"\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162"
+"\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151"
+"\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004"
+"\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162"
+"\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
+"\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110"
+"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
+"\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276"
+"\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051"
+"\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136"
+"\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033"
+"\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266"
+"\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035"
+"\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203"
+"\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112"
+"\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256"
+"\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314"
+"\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336"
+"\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015"
+"\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105"
+"\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144"
+"\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237"
+"\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205"
+"\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060"
+"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377"
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
+"\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252"
+"\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060"
+"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202"
+"\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010"
+"\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055"
+"\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336"
+"\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301"
+"\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052"
+"\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056"
+"\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163"
+"\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320"
+"\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047"
+"\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035"
+"\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372"
+"\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046"
+"\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247"
+"\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060"
+"\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250"
+"\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215"
+"\261\050\272"
+, (PRUint32)1011 }
+};
+static const NSSItem nss_builtins_items_311 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
+  { (void *)"\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143"
+"\350\045\157\077"
+, (PRUint32)20 },
+  { (void *)"\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242"
+, (PRUint32)16 },
+  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
+"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
+"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
+"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
+"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
+"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
+"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
+"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
+"\150\157\162\151\164\171\040\055\040\107\062"
+, (PRUint32)155 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_312 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"\002\010\167\167\006\047\046\251\261\174"
+, (PRUint32)10 },
+  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167"
+"\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367"
+"\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
+"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
+"\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015"
+"\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063"
+"\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013"
+"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
+"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
+"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
+"\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151"
+"\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037"
+"\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303"
+"\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217"
+"\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065"
+"\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137"
+"\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053"
+"\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107"
+"\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326"
+"\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013"
+"\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005"
+"\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002"
+"\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265"
+"\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201"
+"\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120"
+"\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253"
+"\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334"
+"\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003"
+"\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077"
+"\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
+"\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000"
+"\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051"
+"\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006"
+"\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052"
+"\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324"
+"\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143"
+"\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045"
+"\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073"
+"\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355"
+"\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362"
+"\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302"
+"\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140"
+"\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162"
+"\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111"
+"\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002"
+"\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236"
+"\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
+, (PRUint32)848 }
+};
+static const NSSItem nss_builtins_items_313 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
+  { (void *)"\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054"
+"\307\262\170\267"
+, (PRUint32)20 },
+  { (void *)"\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267"
+, (PRUint32)16 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
+"\145\162\143\151\141\154"
+, (PRUint32)70 },
+  { (void *)"\002\010\167\167\006\047\046\251\261\174"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_314 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Networking", (PRUint32)23 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"\002\010\174\117\004\071\034\324\231\055"
+, (PRUint32)10 },
+  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174"
+"\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367"
+"\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
+"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
+"\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015"
+"\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063"
+"\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013"
+"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
+"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
+"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
+"\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151"
+"\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
+"\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240"
+"\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217"
+"\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362"
+"\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063"
+"\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241"
+"\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232"
+"\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253"
+"\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324"
+"\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113"
+"\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374"
+"\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275"
+"\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051"
+"\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024"
+"\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012"
+"\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106"
+"\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026"
+"\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003"
+"\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242"
+"\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
+"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
+"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
+"\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264"
+"\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316"
+"\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116"
+"\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321"
+"\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356"
+"\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144"
+"\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145"
+"\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131"
+"\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025"
+"\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110"
+"\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056"
+"\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313"
+"\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221"
+"\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074"
+"\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064"
+"\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
+, (PRUint32)848 }
+};
+static const NSSItem nss_builtins_items_315 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Networking", (PRUint32)23 },
+  { (void *)"\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220"
+"\237\105\000\057"
+, (PRUint32)20 },
+  { (void *)"\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177"
+, (PRUint32)16 },
+  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
+"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
+"\157\162\153\151\156\147"
+, (PRUint32)70 },
+  { (void *)"\002\010\174\117\004\071\034\324\231\055"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_316 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium", (PRUint32)20 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"\002\010\155\214\024\106\261\246\012\356"
+, (PRUint32)10 },
+  { (void *)"\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155"
+"\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367"
+"\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
+"\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006"
+"\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163"
+"\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060"
+"\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062"
+"\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006"
+"\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004"
+"\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034"
+"\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124"
+"\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042"
+"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003"
+"\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337"
+"\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232"
+"\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347"
+"\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020"
+"\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221"
+"\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013"
+"\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331"
+"\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047"
+"\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055"
+"\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322"
+"\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373"
+"\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273"
+"\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271"
+"\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167"
+"\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265"
+"\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173"
+"\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050"
+"\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076"
+"\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206"
+"\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043"
+"\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003"
+"\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222"
+"\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270"
+"\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225"
+"\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322"
+"\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000"
+"\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013"
+"\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032"
+"\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173"
+"\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270"
+"\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327"
+"\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273"
+"\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001"
+"\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004"
+"\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021"
+"\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015"
+"\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116"
+"\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166"
+"\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104"
+"\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101"
+"\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040"
+"\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254"
+"\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365"
+"\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101"
+"\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142"
+"\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262"
+"\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320"
+"\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070"
+"\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010"
+"\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234"
+"\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000"
+"\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175"
+"\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320"
+"\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106"
+"\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057"
+"\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005"
+"\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103"
+"\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112"
+"\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107"
+"\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110"
+"\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344"
+"\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274"
+"\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303"
+"\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027"
+"\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216"
+"\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317"
+"\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052"
+"\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236"
+"\051\340\266\270\011\150\031\034\030\103"
+, (PRUint32)1354 }
+};
+static const NSSItem nss_builtins_items_317 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium", (PRUint32)20 },
+  { (void *)"\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145"
+"\046\062\050\047"
+, (PRUint32)20 },
+  { (void *)"\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127"
+, (PRUint32)16 },
+  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155"
+, (PRUint32)67 },
+  { (void *)"\002\010\155\214\024\106\261\246\012\356"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_318 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"\002\010\164\227\045\212\307\077\172\124"
+, (PRUint32)10 },
+  { (void *)"\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164"
+"\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075"
+"\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146"
+"\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004"
+"\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120"
+"\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060"
+"\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061"
+"\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011"
+"\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125"
+"\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061"
+"\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155"
+"\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103"
+"\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005"
+"\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003"
+"\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234"
+"\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350"
+"\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275"
+"\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117"
+"\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170"
+"\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006"
+"\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065"
+"\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003"
+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006"
+"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006"
+"\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060"
+"\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154"
+"\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306"
+"\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161"
+"\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210"
+"\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131"
+"\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002"
+"\214\171"
+, (PRUint32)514 }
+};
+static const NSSItem nss_builtins_items_319 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
+  { (void *)"\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312"
+"\353\377\303\273"
+, (PRUint32)20 },
+  { (void *)"\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115"
+, (PRUint32)16 },
+  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
+"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
+"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
+"\151\165\155\040\105\103\103"
+, (PRUint32)71 },
+  { (void *)"\002\010\164\227\045\212\307\077\172\124"
+, (PRUint32)10 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_320 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"\002\003\004\104\300"
+, (PRUint32)5 },
+  { (void *)"\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004"
+"\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005"
+"\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
+"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
+"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
+"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
+"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
+"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
+"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
+"\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063"
+"\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067"
+"\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
+"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
+"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
+"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
+"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
+"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
+"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
+"\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001"
+"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001"
+"\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001"
+"\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307"
+"\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227"
+"\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074"
+"\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314"
+"\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253"
+"\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060"
+"\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124"
+"\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256"
+"\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121"
+"\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314"
+"\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227"
+"\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333"
+"\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061"
+"\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151"
+"\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251"
+"\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125"
+"\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003"
+"\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305"
+"\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125"
+"\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246"
+"\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162"
+"\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271"
+"\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067"
+"\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313"
+"\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201"
+"\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055"
+"\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274"
+"\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061"
+"\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076"
+"\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230"
+"\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132"
+"\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130"
+"\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110"
+"\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232"
+"\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106"
+"\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
+, (PRUint32)959 }
+};
+static const NSSItem nss_builtins_items_321 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
+  { (void *)"\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031"
+"\247\017\006\236"
+, (PRUint32)20 },
+  { (void *)"\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170"
+, (PRUint32)16 },
+  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
+"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
+"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
+"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
+"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
+"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
+"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
+, (PRUint32)128 },
+  { (void *)"\002\003\004\104\300"
+, (PRUint32)5 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
 
 builtinsInternalObject
 nss_builtins_data[] = {
@@ -21308,11 +21667,21 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
   { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
   { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },
-  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} }
+  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
+  { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
+  { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} },
+  { 11, nss_builtins_types_314, nss_builtins_items_314, {NULL} },
+  { 13, nss_builtins_types_315, nss_builtins_items_315, {NULL} },
+  { 11, nss_builtins_types_316, nss_builtins_items_316, {NULL} },
+  { 13, nss_builtins_types_317, nss_builtins_items_317, {NULL} },
+  { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
+  { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
+  { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
+  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 311+1;
+  nss_builtins_nObjects = 321+1;
 #else
-  nss_builtins_nObjects = 311;
+  nss_builtins_nObjects = 321;
 #endif /* DEBUG */
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 4694e7740ade..42e674b6c24f 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.6 $ $Date: 2010/12/02 23:26:35 $"
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.9 $ $Date: 2011/04/06 23:59:09 $"
 
 #
 # certdata.txt
@@ -207,143 +207,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Thawte Personal Freemail CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Personal Freemail CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
-\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003
-\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163
-\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023
-\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123
-\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156
-\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164
-\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155
-\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206
-\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055
-\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056
-\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060
-\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071
-\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023
-\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145
-\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003
-\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032
-\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040
-\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003
-\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
-\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124
-\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106
-\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011
-\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157
-\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141
-\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206
-\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211
-\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330
-\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337
-\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176
-\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104
-\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170
-\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156
-\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152
-\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345
-\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006
-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015
-\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
-\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115
-\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317
-\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144
-\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254
-\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232
-\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163
-\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246
-\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242
-\201
-END
-
-# Trust for Certificate "Thawte Personal Freemail CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Personal Freemail CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207
-\244\353\000\205
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
-\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
-\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
-\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
-\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
-\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
-\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
-\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
-\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
-\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
-\056\143\157\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Thawte Server CA"
 #
@@ -3151,168 +3014,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Entrust.net Secure Personal CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\003\221\356
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070
-\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
-\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036
-\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027
-\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201
-\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024
-\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164
-\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167
-\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103
-\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120
-\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146
-\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045
-\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071
-\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151
-\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052
-\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145
-\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006
-\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000
-\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047
-\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150
-\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107
-\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226
-\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261
-\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164
-\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126
-\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346
-\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202
-\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004
-\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202
-\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244
-\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
-\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
-\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
-\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
-\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240
-\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056
-\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057
-\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125
-\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062
-\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061
-\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004
-\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026
-\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312
-\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004
-\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231
-\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003
-\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000
-\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015
-\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
-\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273
-\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002
-\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007
-\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363
-\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070
-\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003
-\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332
-\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134
-\354
-END
-
-# Trust for Certificate "Entrust.net Secure Personal CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125
-\262\371\365\200
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
-\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
-\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
-\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
-\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
-\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
-\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
-\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
-\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\003\221\356
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Entrust.net Premium 2048 Secure Server CA"
 #
@@ -4419,424 +4120,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "Thawte Time Stamping CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Time Stamping CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061
-\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
-\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023
-\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015
-\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060
-\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035
-\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027
-\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015
-\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213
-\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060
-\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040
-\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104
-\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003
-\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006
-\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003
-\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145
-\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123
-\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047
-\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237
-\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032
-\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376
-\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235
-\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213
-\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137
-\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060
-\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
-\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005
-\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067
-\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302
-\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357
-\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333
-\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220
-\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354
-\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003
-\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031
-\011\254\211\111\323
-END
-
-# Trust for Certificate "Thawte Time Stamping CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Thawte Time Stamping CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105
-\010\116\326\126
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
-\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
-\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
-\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
-\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
-\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
-\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Entrust.net Global Secure Server CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\233\021\074
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070
-\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013
-\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006
-\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163
-\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156
-\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154
-\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043
-\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040
-\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151
-\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156
-\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145
-\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060
-\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132
-\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060
-\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164
-\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004
-\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156
-\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162
-\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151
-\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125
-\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164
-\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144
-\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165
-\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145
-\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
-\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316
-\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265
-\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236
-\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201
-\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113
-\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002
-\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266
-\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332
-\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202
-\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370
-\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035
-\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317
-\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023
-\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075
-\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165
-\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151
-\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
-\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
-\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
-\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105
-\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162
-\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060
-\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060
-\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062
-\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003
-\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043
-\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042
-\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035
-\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234
-\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023
-\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366
-\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064
-\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015
-\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232
-\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251
-\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337
-\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205
-\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021
-\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154
-\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124
-\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274
-\005\377\154\211\063\360\354\025\017
-END
-
-# Trust for Certificate "Entrust.net Global Secure Server CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366
-\045\072\110\223
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
-\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
-\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
-\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
-\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
-\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
-\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
-\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
-\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\233\021\074
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Entrust.net Global Secure Personal CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\236\366\344
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070
-\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004
-\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013
-\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006
-\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163
-\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151
-\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
-\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
-\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
-\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
-\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105
-\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060
-\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062
-\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022
-\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156
-\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167
-\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103
-\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171
-\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151
-\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050
-\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056
-\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006
-\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145
-\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
-\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264
-\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162
-\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255
-\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124
-\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064
-\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045
-\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374
-\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047
-\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001
-\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206
-\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335
-\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201
-\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003
-\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164
-\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145
-\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137
-\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
-\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142
-\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051
-\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145
-\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
-\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
-\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
-\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006
-\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062
-\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060
-\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035
-\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030
-\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067
-\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004
-\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105
-\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005
-\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007
-\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060
-\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001
-\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016
-\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022
-\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024
-\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276
-\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277
-\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172
-\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103
-\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235
-\316\145\146\227\256\046\136
-END
-
-# Trust for Certificate "Entrust.net Global Secure Personal CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266
-\266\360\277\163
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
-\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
-\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
-\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
-\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
-\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
-\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
-\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
-\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
-\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\004\070\236\366\344
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "Entrust Root Certification Authority"
 #
@@ -4990,304 +4273,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "AOL Time Warner Root Certification Authority 1"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
-\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
-\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
-\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
-\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060
-\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065
-\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
-\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
-\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
-\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
-\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
-\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303
-\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224
-\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204
-\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027
-\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110
-\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141
-\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226
-\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037
-\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266
-\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217
-\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205
-\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070
-\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216
-\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241
-\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356
-\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267
-\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000
-\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
-\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330
-\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026
-\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310
-\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
-\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263
-\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247
-\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037
-\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122
-\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323
-\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017
-\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362
-\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005
-\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007
-\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247
-\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227
-\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213
-\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120
-\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026
-\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325
-\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260
-\071\050\150\016\163\335\045\232\336\022
-END
-
-# Trust for Certificate "AOL Time Warner Root Certification Authority 1"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026
-\373\041\026\111
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\061
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AOL Time Warner Root Certification Authority 2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
-\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
-\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
-\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
-\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
-\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060
-\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063
-\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
-\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
-\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
-\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
-\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
-\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
-\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010
-\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211
-\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115
-\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044
-\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133
-\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235
-\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127
-\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230
-\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374
-\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136
-\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231
-\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111
-\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206
-\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352
-\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256
-\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165
-\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361
-\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352
-\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116
-\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363
-\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303
-\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320
-\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141
-\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372
-\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242
-\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322
-\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143
-\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224
-\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014
-\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277
-\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332
-\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056
-\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000
-\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
-\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325
-\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026
-\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116
-\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
-\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056
-\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022
-\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307
-\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117
-\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066
-\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104
-\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352
-\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275
-\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022
-\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223
-\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060
-\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100
-\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277
-\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346
-\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145
-\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201
-\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212
-\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045
-\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020
-\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316
-\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234
-\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116
-\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261
-\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027
-\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223
-\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234
-\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056
-\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007
-\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207
-\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025
-\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371
-\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274
-\204\327\372\334\162\133\367\301\072\150
-END
-
-# Trust for Certificate "AOL Time Warner Root Certification Authority 2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272
-\204\254\010\172
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
-\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
-\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
-\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
-\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
-\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
-\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
-\162\151\164\171\040\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\001
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "RSA Security 2048 v3"
 #
@@ -7247,1361 +6232,6 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
-#
-# Certificate "IPS Chained CAs root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Chained CAs root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
-\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
-\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
-\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
-\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132
-\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060
-\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
-\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
-\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
-\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
-\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
-\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111
-\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061
-\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065
-\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201
-\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067
-\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062
-\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301
-\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350
-\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000
-\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016
-\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064
-\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035
-\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371
-\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241
-\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060
-\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103
-\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123
-\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035
-\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004
-\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060
-\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006
-\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005
-\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006
-\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001
-\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067
-\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001
-\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060
-\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151
-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102
-\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103
-\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146
-\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040
-\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
-\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004
-\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006
-\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164
-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
-\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103
-\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370
-\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167
-\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
-\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150
-\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001
-\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060
-\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050
-\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
-\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171
-\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004
-\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056
-\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126
-\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053
-\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006
-\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315
-\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343
-\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243
-\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315
-\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242
-\001\177\046\304\143\365\045\102\136\142\275
-END
-
-# Trust for Certificate "IPS Chained CAs root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Chained CAs root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256
-\347\137\322\127
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
-\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
-\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
-\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
-\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
-\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
-\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASE1 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE1 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
-\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
-\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
-\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060
-\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125
-\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
-\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
-\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
-\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
-\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
-\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
-\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
-\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
-\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
-\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
-\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
-\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321
-\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022
-\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152
-\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165
-\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122
-\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161
-\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074
-\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020
-\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004
-\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
-\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233
-\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001
-\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254
-\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244
-\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
-\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
-\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
-\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
-\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
-\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
-\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
-\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
-\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
-\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
-\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
-\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
-\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
-\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
-\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
-\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
-\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
-\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
-\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
-\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
-\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
-\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
-\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
-\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151
-\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
-\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
-\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
-\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
-\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
-\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206
-\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
-\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140
-\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
-\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
-\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
-\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110
-\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061
-\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
-\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
-\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056
-\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006
-\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
-\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
-\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320
-\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212
-\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305
-\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167
-\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143
-\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334
-\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105
-\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276
-\206\063\076\346\057\110\156\257\124\220\116\255\261\045
-END
-
-# Trust for Certificate "IPS CLASE1 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE1 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061
-\174\345\364\337
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASE3 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE3 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
-\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
-\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
-\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
-\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
-\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
-\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061
-\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125
-\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
-\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
-\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
-\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
-\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
-\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
-\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
-\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
-\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
-\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
-\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
-\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
-\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
-\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033
-\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331
-\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052
-\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213
-\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230
-\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055
-\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043
-\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153
-\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004
-\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
-\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243
-\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001
-\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242
-\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244
-\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
-\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
-\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
-\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
-\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
-\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
-\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
-\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
-\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
-\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
-\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
-\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
-\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
-\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
-\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
-\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
-\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
-\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
-\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
-\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
-\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
-\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
-\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
-\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
-\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
-\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
-\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
-\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151
-\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
-\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
-\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
-\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
-\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
-\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206
-\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
-\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140
-\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
-\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
-\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
-\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110
-\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063
-\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
-\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
-\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056
-\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
-\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
-\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
-\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006
-\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
-\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
-\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145
-\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103
-\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342
-\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227
-\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275
-\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247
-\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026
-\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262
-\257\175\310\352\351\324\126\331\016\023\262\305\105\120
-END
-
-# Trust for Certificate "IPS CLASE3 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASE3 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365
-\015\317\161\134
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
-\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
-\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASEA1 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA1 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
-\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
-\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067
-\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334
-\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374
-\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320
-\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122
-\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035
-\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306
-\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236
-\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174
-\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000
-\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
-\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073
-\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035
-\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241
-\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241
-\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
-\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
-\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
-\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
-\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
-\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
-\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
-\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
-\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
-\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
-\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
-\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
-\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103
-\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
-\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
-\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
-\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143
-\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
-\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
-\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150
-\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
-\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164
-\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
-\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
-\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154
-\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
-\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
-\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060
-\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
-\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
-\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200
-\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312
-\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304
-\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205
-\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304
-\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347
-\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213
-\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120
-\336\007\043\162\346\275\040\024\113\264\206
-END
-
-# Trust for Certificate "IPS CLASEA1 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA1 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032
-\353\214\062\004
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS CLASEA3 root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA3 root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
-\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103
-\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
-\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
-\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
-\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
-\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067
-\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
-\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366
-\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315
-\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202
-\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153
-\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324
-\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232
-\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165
-\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347
-\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000
-\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
-\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374
-\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035
-\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107
-\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241
-\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
-\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
-\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
-\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
-\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
-\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
-\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
-\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
-\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
-\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
-\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
-\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
-\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
-\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
-\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
-\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
-\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
-\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
-\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
-\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
-\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
-\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
-\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
-\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
-\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
-\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
-\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
-\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
-\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
-\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
-\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
-\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103
-\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
-\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
-\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
-\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
-\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143
-\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
-\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
-\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150
-\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
-\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
-\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
-\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164
-\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
-\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
-\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
-\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154
-\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
-\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
-\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
-\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060
-\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
-\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
-\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005
-\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
-\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
-\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032
-\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374
-\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012
-\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010
-\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306
-\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044
-\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022
-\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265
-\311\024\025\014\343\007\203\233\046\165\357
-END
-
-# Trust for Certificate "IPS CLASEA3 root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS CLASEA3 root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342
-\101\104\276\156
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
-\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
-\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
-\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
-\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
-\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "IPS Timestamping root"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Timestamping root"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123
-\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
-\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
-\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
-\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
-\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
-\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
-\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
-\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053
-\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160
-\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157
-\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006
-\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155
-\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146
-\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164
-\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001
-\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145
-\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061
-\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070
-\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002
-\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162
-\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023
-\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003
-\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145
-\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162
-\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003
-\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066
-\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013
-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
-\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060
-\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124
-\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164
-\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
-\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001
-\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000
-\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215
-\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257
-\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070
-\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161
-\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265
-\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130
-\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233
-\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243
-\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006
-\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235
-\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120
-\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213
-\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077
-\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061
-\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020
-\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141
-\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145
-\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111
-\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154
-\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040
-\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151
-\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103
-\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065
-\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040
-\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040
-\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
-\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003
-\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
-\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060
-\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160
-\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000
-\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014
-\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003
-\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003
-\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001
-\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006
-\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001
-\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001
-\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053
-\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110
-\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003
-\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151
-\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004
-\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
-\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001
-\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156
-\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145
-\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006
-\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164
-\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
-\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001
-\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057
-\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060
-\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164
-\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206
-\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072
-\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
-\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124
-\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154
-\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065
-\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163
-\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145
-\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056
-\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102
-\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167
-\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
-\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151
-\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170
-\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057
-\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
-\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163
-\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240
-\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143
-\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
-\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155
-\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005
-\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005
-\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163
-\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110
-\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314
-\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203
-\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067
-\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077
-\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114
-\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210
-\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001
-\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324
-\207\112\137\334\357\351\126\360\012\014\350\165
-END
-
-# Trust for Certificate "IPS Timestamping root"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "IPS Timestamping root"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313
-\361\266\304\322
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
-\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
-\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
-\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
-\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
-\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
-\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
-\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
-\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
-\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
-\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
-\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
-\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
-\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
-\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
-\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
-\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
-\145\163
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
 #
 # Certificate "QuoVadis Root CA"
 #
@@ -21636,3 +19266,2751 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Mozilla Addons"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Mozilla Addons"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004
+\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154
+\141\056\157\162\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
+\362\077\103
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000
+\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157
+\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202
+\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253
+\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262
+\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241
+\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271
+\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307
+\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070
+\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262
+\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221
+\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033
+\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351
+\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316
+\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235
+\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345
+\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133
+\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100
+\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214
+\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002
+\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003
+\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230
+\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006
+\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160
+\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003
+\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035
+\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006
+\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040
+\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001
+\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007
+\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165
+\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120
+\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066
+\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143
+\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055
+\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141
+\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164
+\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056
+\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161
+\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073
+\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160
+\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056
+\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123
+\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053
+\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057
+\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157
+\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144
+\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147
+\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172
+\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025
+\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276
+\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317
+\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111
+\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204
+\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163
+\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335
+\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043
+\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231
+\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312
+\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005
+\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142
+\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043
+\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236
+\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055
+\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171
+\242\355\264\324\265\145\103\267\223\106\212\323
+END
+
+# Trust for Certificate "Bogus Mozilla Addons"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Mozilla Addons"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014
+\165\332\071\326
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
+\362\077\103
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Global Trustee"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Global Trustee"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155
+\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141
+\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006
+\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165
+\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107
+\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060
+\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142
+\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160
+\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013
+\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060
+\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164
+\162\165\163\164\145\145
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
+\070\057\260
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000
+\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006
+\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006
+\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147
+\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107
+\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060
+\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124
+\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023
+\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107
+\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156
+\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151
+\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023
+\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060
+\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001
+\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000
+\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266
+\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064
+\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235
+\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151
+\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013
+\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117
+\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330
+\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335
+\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164
+\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350
+\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164
+\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053
+\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250
+\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064
+\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315
+\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164
+\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232
+\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234
+\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225
+\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267
+\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026
+\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137
+\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157
+\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253
+\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301
+\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345
+\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030
+\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121
+\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156
+\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160
+\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214
+\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145
+\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006
+\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050
+\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035
+\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101
+\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006
+\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006
+\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125
+\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001
+\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035
+\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061
+\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005
+\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143
+\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103
+\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240
+\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056
+\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116
+\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167
+\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150
+\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157
+\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162
+\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060
+\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060
+\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164
+\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141
+\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164
+\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010
+\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057
+\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143
+\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147
+\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006
+\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
+\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305
+\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021
+\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011
+\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237
+\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306
+\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007
+\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201
+\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174
+\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240
+\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045
+\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346
+\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331
+\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215
+\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366
+\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265
+\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031
+\264
+END
+
+# Trust for Certificate "Bogus Global Trustee"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Global Trustee"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262
+\234\324\025\032
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
+\070\057\260
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus GMail"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus GMail"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
+\256\036
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004
+\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056
+\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
+\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
+\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
+\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
+\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
+\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
+\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
+\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
+\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
+\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
+\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
+\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
+\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
+\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
+\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
+\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
+\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
+\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
+\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006
+\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147
+\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155
+\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001
+\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320
+\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336
+\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204
+\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300
+\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255
+\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023
+\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206
+\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342
+\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140
+\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211
+\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173
+\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135
+\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254
+\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305
+\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206
+\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247
+\111\043
+END
+
+# Trust for Certificate "Bogus GMail"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus GMail"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044
+\223\003\017\227
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
+\256\036
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Google"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Google"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
+\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157
+\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
+\130\174\006
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000
+\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056
+\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
+\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
+\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
+\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
+\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
+\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
+\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
+\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
+\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
+\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
+\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
+\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
+\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
+\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
+\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
+\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
+\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
+\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
+\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006
+\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157
+\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145
+\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001
+\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063
+\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027
+\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062
+\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260
+\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102
+\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302
+\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154
+\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065
+\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146
+\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126
+\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332
+\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155
+\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235
+\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061
+\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327
+\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363
+\172\244\047\023\326\117\364\151
+END
+
+# Trust for Certificate "Bogus Google"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Google"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101
+\100\105\146\026
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
+\130\174\006
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Skype"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Skype"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
+\025\104\107
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
+\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
+\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206
+\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256
+\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040
+\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056
+\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121
+\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040
+\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377
+\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171
+\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210
+\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071
+\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047
+\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244
+\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155
+\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066
+\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100
+\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131
+\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000
+\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
+\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
+\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
+\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034
+\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
+\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
+\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
+\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
+\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
+\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
+\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
+\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
+\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
+\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
+\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
+\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
+\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
+\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
+\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
+\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
+\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
+\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
+\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
+\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
+\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
+\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
+\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
+\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
+\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056
+\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132
+\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157
+\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172
+\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315
+\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345
+\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143
+\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153
+\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267
+\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255
+\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160
+\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116
+\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017
+\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225
+\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034
+\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224
+\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254
+\302\021\254
+END
+
+# Trust for Certificate "Bogus Skype"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Skype"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045
+\004\372\043\311
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
+\025\104\107
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 1"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
+\167\051\243
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
+\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
+\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075
+\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034
+\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243
+\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030
+\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041
+\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202
+\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161
+\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174
+\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302
+\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321
+\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337
+\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115
+\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072
+\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154
+\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245
+\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167
+\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000
+\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
+\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
+\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
+\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047
+\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017
+\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
+\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
+\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
+\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
+\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
+\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
+\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
+\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
+\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
+\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
+\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
+\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
+\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
+\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
+\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
+\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
+\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
+\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
+\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
+\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
+\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
+\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
+\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
+\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056
+\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
+\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125
+\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310
+\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135
+\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326
+\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037
+\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120
+\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112
+\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210
+\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150
+\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326
+\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252
+\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111
+\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375
+\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007
+\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373
+\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325
+\147\024\060
+END
+
+# Trust for Certificate "Bogus Yahoo 1"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307
+\153\333\167\320
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
+\167\051\243
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
+\302\051
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071
+\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
+\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
+\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
+\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
+\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
+\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
+\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
+\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
+\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
+\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
+\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
+\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
+\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
+\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
+\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
+\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
+\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
+\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
+\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
+\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
+\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341
+\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027
+\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371
+\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302
+\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254
+\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056
+\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161
+\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132
+\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122
+\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107
+\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143
+\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016
+\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105
+\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067
+\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264
+\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213
+\217\116\235\306\066\347\134\246\253\022\017\326\317
+END
+
+# Trust for Certificate "Bogus Yahoo 2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317
+\112\134\263\255
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
+\302\051
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus Yahoo 3"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 3"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
+\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
+\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
+\052\161
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076
+\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
+\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
+\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
+\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
+\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
+\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
+\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
+\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
+\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
+\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
+\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
+\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
+\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
+\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
+\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
+\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
+\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
+\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
+\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
+\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
+\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
+\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
+\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
+\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
+\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
+\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
+\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
+\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
+\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
+\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
+\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
+\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
+\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
+\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
+\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230
+\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116
+\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316
+\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060
+\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240
+\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272
+\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276
+\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307
+\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066
+\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152
+\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176
+\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325
+\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265
+\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146
+\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105
+\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003
+\130\113\161\203\237\146\346\254\171\110\376\376\107
+END
+
+# Trust for Certificate "Bogus Yahoo 3"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus Yahoo 3"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236
+\007\326\224\317
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
+\052\161
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus live.com"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus live.com"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
+\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
+\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
+\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
+\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
+\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
+\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
+\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
+\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
+\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
+\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
+\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
+\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157
+\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
+\275\072\300
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000
+\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
+\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
+\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
+\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
+\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
+\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
+\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
+\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
+\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
+\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
+\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
+\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
+\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
+\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
+\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
+\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
+\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
+\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
+\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
+\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
+\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
+\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
+\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151
+\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
+\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357
+\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230
+\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323
+\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076
+\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005
+\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264
+\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053
+\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041
+\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252
+\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045
+\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125
+\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303
+\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127
+\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271
+\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160
+\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146
+\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001
+\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004
+\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
+\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
+\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003
+\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001
+\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
+\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
+\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
+\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
+\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
+\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
+\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
+\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
+\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
+\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
+\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
+\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
+\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
+\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
+\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
+\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
+\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
+\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
+\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
+\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
+\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
+\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006
+\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056
+\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157
+\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332
+\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257
+\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311
+\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137
+\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052
+\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254
+\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122
+\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015
+\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047
+\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177
+\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025
+\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002
+\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067
+\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364
+\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177
+\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352
+END
+
+# Trust for Certificate "Bogus live.com"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus live.com"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024
+\160\212\262\276
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
+\275\072\300
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Bogus kuix.de"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus kuix.de"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105
+\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065
+\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040
+\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011
+\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125
+\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061
+\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156
+\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106
+\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157
+\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004
+\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131
+\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101
+\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013
+\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123
+\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151
+\170\056\144\145
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
+\350\260
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162
+\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060
+\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
+\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
+\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
+\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
+\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
+\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
+\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
+\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
+\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
+\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
+\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
+\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061
+\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006
+\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004
+\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004
+\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060
+\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164
+\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164
+\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012
+\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040
+\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151
+\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171
+\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040
+\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101
+\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061
+\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157
+\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003
+\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
+\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007
+\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123
+\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354
+\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337
+\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115
+\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224
+\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262
+\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271
+\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202
+\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060
+\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325
+\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026
+\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346
+\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377
+\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006
+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
+\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073
+\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053
+\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164
+\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155
+\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125
+\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164
+\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143
+\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151
+\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154
+\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143
+\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124
+\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144
+\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005
+\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005
+\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164
+\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124
+\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103
+\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060
+\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143
+\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125
+\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202
+\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222
+\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124
+\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311
+\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200
+\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056
+\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164
+\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366
+\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312
+\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213
+\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071
+\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160
+\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231
+\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226
+\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346
+\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260
+\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221
+END
+
+# Trust for Certificate "Bogus kuix.de"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Bogus kuix.de"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171
+\262\144\040\100
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
+\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
+\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
+\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
+\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
+\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
+\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
+\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
+\164\055\110\141\162\144\167\141\162\145
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
+\350\260
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Go Daddy Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023
+\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156
+\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040
+\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151
+\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
+\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060
+\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063
+\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007
+\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007
+\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030
+\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143
+\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004
+\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010
+\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203
+\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366
+\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116
+\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007
+\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215
+\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336
+\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062
+\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262
+\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353
+\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141
+\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051
+\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200
+\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221
+\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333
+\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033
+\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000
+\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004
+\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040
+\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001
+\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227
+\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145
+\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214
+\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256
+\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053
+\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337
+\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353
+\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355
+\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072
+\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350
+\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333
+\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075
+\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316
+\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006
+\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324
+\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210
+\342\342\104\276\134\367\352\034\365
+END
+
+# Trust for Certificate "Go Daddy Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302
+\124\375\346\213
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
+\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
+\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
+\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
+\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Starfield Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
+\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
+\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060
+\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154
+\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
+\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107
+\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060
+\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071
+\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125
+\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172
+\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143
+\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004
+\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143
+\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061
+\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151
+\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151
+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055
+\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367
+\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
+\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133
+\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327
+\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040
+\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334
+\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133
+\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165
+\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161
+\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363
+\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315
+\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202
+\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373
+\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115
+\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244
+\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134
+\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164
+\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303
+\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006
+\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016
+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035
+\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060
+\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006
+\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001
+\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071
+\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324
+\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321
+\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147
+\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267
+\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323
+\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175
+\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340
+\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040
+\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316
+\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312
+\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011
+\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042
+\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365
+\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045
+\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151
+\364
+END
+
+# Trust for Certificate "Starfield Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071
+\324\347\017\016
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
+\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
+\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
+\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
+\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Starfield Services Root Certificate Authority - G2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
+\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
+\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
+\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
+\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
+\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060
+\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154
+\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040
+\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150
+\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071
+\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061
+\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060
+\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003
+\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021
+\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154
+\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162
+\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151
+\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004
+\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162
+\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151
+\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
+\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110
+\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001
+\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276
+\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051
+\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136
+\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033
+\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266
+\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035
+\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203
+\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112
+\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256
+\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314
+\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336
+\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015
+\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105
+\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144
+\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237
+\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205
+\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060
+\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
+\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252
+\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060
+\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202
+\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010
+\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055
+\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336
+\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301
+\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052
+\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056
+\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163
+\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320
+\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047
+\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035
+\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372
+\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046
+\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247
+\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060
+\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250
+\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215
+\261\050\272
+END
+
+# Trust for Certificate "Starfield Services Root Certificate Authority - G2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143
+\350\045\157\077
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
+\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
+\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
+\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
+\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
+\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
+\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
+\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
+\150\157\162\151\164\171\040\055\040\107\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Commercial"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Commercial"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\167\167\006\047\046\251\261\174
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167
+\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367
+\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
+\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
+\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015
+\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063
+\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
+\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
+\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
+\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151
+\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037
+\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303
+\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217
+\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065
+\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137
+\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053
+\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107
+\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326
+\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013
+\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005
+\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002
+\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265
+\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201
+\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120
+\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253
+\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334
+\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003
+\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077
+\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
+\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000
+\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051
+\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006
+\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052
+\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324
+\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143
+\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045
+\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073
+\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355
+\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362
+\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302
+\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140
+\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162
+\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111
+\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002
+\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236
+\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357
+END
+
+# Trust for Certificate "AffirmTrust Commercial"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Commercial"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054
+\307\262\170\267
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
+\145\162\143\151\141\154
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\167\167\006\047\046\251\261\174
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Networking"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Networking"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\174\117\004\071\034\324\231\055
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174
+\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367
+\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
+\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
+\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015
+\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063
+\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013
+\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
+\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
+\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
+\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151
+\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
+\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240
+\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217
+\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362
+\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063
+\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241
+\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232
+\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253
+\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324
+\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113
+\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374
+\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275
+\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051
+\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024
+\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012
+\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106
+\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026
+\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003
+\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242
+\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
+\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
+\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
+\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264
+\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316
+\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116
+\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321
+\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356
+\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144
+\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145
+\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131
+\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025
+\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110
+\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056
+\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313
+\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221
+\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074
+\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064
+\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333
+END
+
+# Trust for Certificate "AffirmTrust Networking"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Networking"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220
+\237\105\000\057
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
+\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
+\157\162\153\151\156\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\174\117\004\071\034\324\231\055
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Premium"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\155\214\024\106\261\246\012\356
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155
+\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367
+\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
+\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006
+\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163
+\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060
+\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062
+\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006
+\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004
+\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034
+\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124
+\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042
+\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
+\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337
+\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232
+\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347
+\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020
+\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221
+\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013
+\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331
+\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047
+\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055
+\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322
+\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373
+\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273
+\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271
+\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167
+\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265
+\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173
+\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050
+\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076
+\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206
+\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043
+\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003
+\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222
+\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270
+\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225
+\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322
+\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000
+\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013
+\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032
+\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173
+\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270
+\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327
+\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273
+\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001
+\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004
+\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021
+\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015
+\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116
+\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166
+\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104
+\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101
+\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040
+\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254
+\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365
+\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101
+\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142
+\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262
+\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320
+\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070
+\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010
+\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234
+\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000
+\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175
+\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320
+\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106
+\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057
+\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005
+\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103
+\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112
+\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107
+\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110
+\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344
+\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274
+\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303
+\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027
+\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216
+\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317
+\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052
+\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236
+\051\340\266\270\011\150\031\034\030\103
+END
+
+# Trust for Certificate "AffirmTrust Premium"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145
+\046\062\050\047
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\155\214\024\106\261\246\012\356
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AffirmTrust Premium ECC"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium ECC"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\164\227\045\212\307\077\172\124
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164
+\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075
+\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002
+\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146
+\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004
+\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120
+\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060
+\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061
+\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011
+\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125
+\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061
+\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155
+\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103
+\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005
+\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003
+\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234
+\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350
+\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275
+\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117
+\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170
+\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006
+\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065
+\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003
+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006
+\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006
+\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060
+\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154
+\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306
+\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161
+\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210
+\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131
+\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002
+\214\171
+END
+
+# Trust for Certificate "AffirmTrust Premium ECC"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AffirmTrust Premium ECC"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312
+\353\377\303\273
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
+\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
+\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
+\151\165\155\040\105\103\103
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\010\164\227\045\212\307\077\172\124
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Certum Trusted Network CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certum Trusted Network CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\004\104\300
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004
+\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005
+\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
+\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
+\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
+\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
+\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
+\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
+\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
+\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063
+\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067
+\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
+\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
+\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
+\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
+\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
+\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
+\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
+\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001
+\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001
+\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001
+\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307
+\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227
+\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074
+\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314
+\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253
+\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060
+\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124
+\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256
+\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121
+\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314
+\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227
+\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333
+\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061
+\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151
+\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251
+\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125
+\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003
+\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305
+\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125
+\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052
+\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246
+\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162
+\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271
+\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067
+\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313
+\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201
+\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055
+\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274
+\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061
+\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076
+\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230
+\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132
+\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130
+\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110
+\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232
+\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106
+\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054
+END
+
+# Trust for Certificate "Certum Trusted Network CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Certum Trusted Network CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031
+\247\017\006\236
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
+\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
+\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
+\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
+\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
+\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
+\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\003\004\104\300
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index c9e57aaad063..3232c5f79a01 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 81
-#define NSS_BUILTINS_LIBRARY_VERSION "1.81"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 83
+#define NSS_BUILTINS_LIBRARY_VERSION "1.83"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index e326fc6963f1..3afc83541ef9 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -460,7 +460,7 @@ done:
  *    - If the cert does not have PQG parameters, obtain them from the issuer.
  *    - A valid cert chain cannot have a DSA or Fortezza cert without
  *      pqg parameters that has a parent that is not a DSA or Fortezza cert.
- *    - pqg paramters are stored in two different formats: the standard
+ *    - pqg parameters are stored in two different formats: the standard
  *      DER encoded format and the fortezza-only wrapped format.  The params
  *      should be copied from issuer to subject cert without modifying the
  *      formats.  The public key extraction code will deal with the different
@@ -1000,6 +1000,15 @@ seckey_GetKeyType (SECOidTag tag) {
       case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
 	keyType = ecKey;
 	break;
+      /* accommodate applications that hand us a signature type when they 
+	* should be handing us a cipher type */
+      case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION:
+      case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION:
+	keyType = rsaKey;
+	break;
       default:
 	keyType = nullKey;
     }
@@ -1187,7 +1196,7 @@ CERT_ExtractPublicKey(CERTCertificate *cert)
 
 /*
  * Get the public key for the fortezza KMID. NOTE this requires the
- * PQG paramters to be set. We probably should have a fortezza call that 
+ * PQG parameters to be set. We probably should have a fortezza call that 
  * just extracts the kmid for us directly so this function can work
  * without having the whole cert chain
  */
@@ -2225,7 +2234,7 @@ SECKEY_DestroyPrivateKeyInfo(SECKEYPrivateKeyInfo *pvk,
 	    SECITEM_ZfreeItem(&pvk->version, PR_FALSE);
 	    SECITEM_ZfreeItem(&pvk->privateKey, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&pvk->algorithm, PR_FALSE);
-	    PORT_Memset((char *)pvk, 0, sizeof(pvk));
+	    PORT_Memset((char *)pvk, 0, sizeof(*pvk));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(pvk);
 	    }
@@ -2255,7 +2264,7 @@ SECKEY_DestroyEncryptedPrivateKeyInfo(SECKEYEncryptedPrivateKeyInfo *epki,
 	} else {
 	    SECITEM_ZfreeItem(&epki->encryptedData, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&epki->algorithm, PR_FALSE);
-	    PORT_Memset((char *)epki, 0, sizeof(epki));
+	    PORT_Memset((char *)epki, 0, sizeof(*epki));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(epki);
 	    }
@@ -2325,19 +2334,24 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     SECKEYPublicKey *pubk = NULL;
     SECStatus rv = SECFailure;
     SECItem newDerKey;
+    PRArenaPool *arena = NULL;
 
     if (!derKey) {
         return NULL;
     } 
 
-    pubk = PORT_ZNew(SECKEYPublicKey);
-    if(pubk == NULL) {
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (arena == NULL) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
         goto finish;
     }
-    pubk->arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-    if (NULL == pubk->arena) {
+
+    pubk = PORT_ArenaZNew(arena, SECKEYPublicKey);
+    if (pubk == NULL) {
         goto finish;
     }
+    pubk->arena = arena;
+
     rv = SECITEM_CopyItem(pubk->arena, &newDerKey, derKey);
     if (SECSuccess != rv) {
         goto finish;
@@ -2368,11 +2382,10 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     }
 
 finish:
-    if( rv != SECSuccess && pubk != NULL) {
-        if (pubk->arena) {
-            PORT_FreeArena(pubk->arena, PR_TRUE);
+    if (rv != SECSuccess) {
+        if (arena != NULL) {
+            PORT_FreeArena(arena, PR_TRUE);
         }
-        PORT_Free(pubk);
         pubk = NULL;
     }
     return pubk;
diff --git a/security/nss/lib/freebl/blapit.h b/security/nss/lib/freebl/blapit.h
index 704f514886d8..af4ed12b6033 100644
--- a/security/nss/lib/freebl/blapit.h
+++ b/security/nss/lib/freebl/blapit.h
@@ -38,7 +38,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: blapit.h,v 1.22 2008/12/17 06:09:12 nelson%bolyard.com Exp $ */
+/* $Id: blapit.h,v 1.22.22.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
 
 #ifndef _BLAPIT_H_
 #define _BLAPIT_H_
@@ -115,6 +115,10 @@
 #define AES_KEY_WRAP_BLOCK_SIZE  8  /* bytes */
 #define AES_BLOCK_SIZE          16  /* bytes */
 
+#define AES_128_KEY_LENGTH      16  /* bytes */
+#define AES_192_KEY_LENGTH      24  /* bytes */
+#define AES_256_KEY_LENGTH      32  /* bytes */
+
 #define CAMELLIA_BLOCK_SIZE          16  /* bytes */
 
 #define SEED_BLOCK_SIZE 16              /* bytes */
diff --git a/security/nss/lib/freebl/mpi/mpi-config.h b/security/nss/lib/freebl/mpi/mpi-config.h
index 00a0acfa0bd1..08e5c5cc2d03 100644
--- a/security/nss/lib/freebl/mpi/mpi-config.h
+++ b/security/nss/lib/freebl/mpi/mpi-config.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi-config.h,v 1.5 2004/04/25 15:03:10 gerv%gerv.net Exp $ */
+/* $Id: mpi-config.h,v 1.5.198.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
 
 #ifndef MPI_CONFIG_H_
 #define MPI_CONFIG_H_
@@ -100,7 +100,7 @@
 #endif
 
 #ifndef MP_MACRO
-#define MP_MACRO      0  /* use macros for frequent calls?      */
+#define MP_MACRO      1  /* use macros for frequent calls?      */
 #endif
 
 #ifndef MP_SQUARE
diff --git a/security/nss/lib/freebl/mpi/mpi.c b/security/nss/lib/freebl/mpi/mpi.c
index cfcfe60e5c17..25c96564040c 100644
--- a/security/nss/lib/freebl/mpi/mpi.c
+++ b/security/nss/lib/freebl/mpi/mpi.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi.c,v 1.47 2010/05/02 22:36:41 nelson%bolyard.com Exp $ */
+/* $Id: mpi.c,v 1.47.2.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
 
 #include "mpi-priv.h"
 #if defined(OSF1)
@@ -206,7 +206,6 @@ mp_err mp_copy(const mp_int *from, mp_int *to)
   if(from == to)
     return MP_OKAY;
 
-  ++mp_copies;
   { /* copy */
     mp_digit   *tmp;
 
@@ -2864,6 +2863,7 @@ void s_mp_copy(const mp_digit *sp, mp_digit *dp, mp_size count)
 #else
   memcpy(dp, sp, count * sizeof(mp_digit));
 #endif
+  ++mp_copies;
 
 } /* end s_mp_copy() */
 #endif
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
index 86e16e362966..ed0de47815b6 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
+.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
 
 # ------------------------------------------------------------------------
 #
@@ -415,7 +415,7 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
+.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
 
 # Magic indicating no need for an executable stack
 .section .note.GNU-stack, "", @progbits
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
index ac71074154de..242c631b1301 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
+.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
 
 / ------------------------------------------------------------------------
 /
@@ -415,4 +415,4 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
+.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c
index e0a2a21c1177..db5d99b75b2f 100644
--- a/security/nss/lib/freebl/nsslowhash.c
+++ b/security/nss/lib/freebl/nsslowhash.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nsslowhash.c,v 1.4 2009/06/09 23:34:06 rrelyea%redhat.com Exp $ */
+/* $Id: nsslowhash.c,v 1.4.8.1 2011/01/20 18:41:51 emaldona%redhat.com Exp $ */
 
 #include "stubs.h"
 #include "prtypes.h"
@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
 
     f = fopen("/proc/sys/crypto/fips_enabled", "r");
     if (!f)
-        return 1;
+        return 0;
 
     size = fread(&d, 1, 1, f);
     fclose(f);
diff --git a/security/nss/lib/freebl/rsa.c b/security/nss/lib/freebl/rsa.c
index 5c443ca05861..a8599771202e 100644
--- a/security/nss/lib/freebl/rsa.c
+++ b/security/nss/lib/freebl/rsa.c
@@ -37,7 +37,7 @@
 /*
  * RSA key generation, public key op, private key op.
  *
- * $Id: rsa.c,v 1.39.22.1 2010/11/16 19:06:38 rrelyea%redhat.com Exp $
+ * $Id: rsa.c,v 1.39.22.2 2011/03/30 18:39:44 rrelyea%redhat.com Exp $
  */
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -67,11 +67,23 @@
 */
 #define MAX_KEY_GEN_ATTEMPTS 10
 
+/* Blinding Parameters max cache size  */
+#define RSA_BLINDING_PARAMS_MAX_CACHE_SIZE 20
+
 /* exponent should not be greater than modulus */
 #define BAD_RSA_KEY_SIZE(modLen, expLen) \
     ((expLen) > (modLen) || (modLen) > RSA_MAX_MODULUS_BITS/8 || \
     (expLen) > RSA_MAX_EXPONENT_BITS/8)
 
+struct blindingParamsStr;
+typedef struct blindingParamsStr blindingParams;
+
+struct blindingParamsStr {
+    blindingParams *next;
+    mp_int         f, g;             /* blinding parameter                 */
+    int            counter;          /* number of remaining uses of (f, g) */
+};
+
 /*
 ** RSABlindingParamsStr
 **
@@ -85,9 +97,10 @@ struct RSABlindingParamsStr
     /* Blinding-specific parameters */
     PRCList   link;                  /* link to list of structs            */
     SECItem   modulus;               /* list element "key"                 */
-    mp_int    f, g;                  /* Blinding parameters                */
-    int       counter;               /* number of remaining uses of (f, g) */
+    blindingParams *free, *bp;       /* Blinding parameters queue          */
+    blindingParams array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE];
 };
+typedef struct RSABlindingParamsStr RSABlindingParams;
 
 /*
 ** RSABlindingParamsListStr
@@ -100,6 +113,8 @@ struct RSABlindingParamsStr
 struct RSABlindingParamsListStr
 {
     PZLock  *lock;   /* Lock for the list   */
+    PRCondVar *cVar; /* Condidtion Variable */
+    int  waitCount;  /* Number of threads waiting on cVar */
     PRCList  head;   /* Pointer to the list */
 };
 
@@ -271,7 +286,7 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return NULL;
     }
-    key = (RSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(RSAPrivateKey));
+    key = PORT_ArenaZNew(arena, RSAPrivateKey);
     if (!key) {
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	PORT_FreeArena(arena, PR_TRUE);
@@ -1026,18 +1041,25 @@ init_blinding_params_list(void)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return PR_FAILURE;
     }
+    blindingParamsList.cVar = PR_NewCondVar( blindingParamsList.lock );
+    if (!blindingParamsList.cVar) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	return PR_FAILURE;
+    }
+    blindingParamsList.waitCount = 0;
     PR_INIT_CLIST(&blindingParamsList.head);
     return PR_SUCCESS;
 }
 
 static SECStatus
-generate_blinding_params(struct RSABlindingParamsStr *rsabp, 
-                         RSAPrivateKey *key, mp_int *n, unsigned int modLen)
+generate_blinding_params(RSAPrivateKey *key, mp_int* f, mp_int* g, mp_int *n, 
+                         unsigned int modLen)
 {
     SECStatus rv = SECSuccess;
     mp_int e, k;
     mp_err err = MP_OKAY;
     unsigned char *kb = NULL;
+
     MP_DIGITS(&e) = 0;
     MP_DIGITS(&k) = 0;
     CHECK_MPI_OK( mp_init(&e) );
@@ -1054,11 +1076,9 @@ generate_blinding_params(struct RSABlindingParamsStr *rsabp,
     /* k < n */
     CHECK_MPI_OK( mp_mod(&k, n, &k) );
     /* f = k**e mod n */
-    CHECK_MPI_OK( mp_exptmod(&k, &e, n, &rsabp->f) );
+    CHECK_MPI_OK( mp_exptmod(&k, &e, n, f) );
     /* g = k**-1 mod n */
-    CHECK_MPI_OK( mp_invmod(&k, n, &rsabp->g) );
-    /* Initialize the counter for this (f, g) */
-    rsabp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
+    CHECK_MPI_OK( mp_invmod(&k, n, g) );
 cleanup:
     if (kb)
 	PORT_ZFree(kb, modLen);
@@ -1072,114 +1092,202 @@ cleanup:
 }
 
 static SECStatus
-init_blinding_params(struct RSABlindingParamsStr *rsabp, RSAPrivateKey *key,
+init_blinding_params(RSABlindingParams *rsabp, RSAPrivateKey *key,
                      mp_int *n, unsigned int modLen)
 {
+    blindingParams * bp = rsabp->array;
     SECStatus rv = SECSuccess;
     mp_err err = MP_OKAY;
-    MP_DIGITS(&rsabp->f) = 0;
-    MP_DIGITS(&rsabp->g) = 0;
-    /* initialize blinding parameters */
-    CHECK_MPI_OK( mp_init(&rsabp->f) );
-    CHECK_MPI_OK( mp_init(&rsabp->g) );
+    int i = 0;
+
+    /* Initialize the list pointer for the element */
+    PR_INIT_CLIST(&rsabp->link);
+    for (i = 0; i < RSA_BLINDING_PARAMS_MAX_CACHE_SIZE; ++i, ++bp) {
+    	bp->next = bp + 1;
+	MP_DIGITS(&bp->f) = 0;
+	MP_DIGITS(&bp->g) = 0;
+	bp->counter = 0;
+    }
+    /* The last bp->next value was initialized with out
+     * of rsabp->array pointer and must be set to NULL 
+     */ 
+    rsabp->array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE - 1].next = NULL;
+    
+    bp          = rsabp->array;
+    rsabp->bp   = NULL;
+    rsabp->free = bp;
+
     /* List elements are keyed using the modulus */
     SECITEM_CopyItem(NULL, &rsabp->modulus, &key->modulus);
-    CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
+
     return SECSuccess;
-cleanup:
-    mp_clear(&rsabp->f);
-    mp_clear(&rsabp->g);
-    if (err) {
-	MP_TO_SEC_ERROR(err);
-	rv = SECFailure;
-    }
-    return rv;
 }
 
 static SECStatus
 get_blinding_params(RSAPrivateKey *key, mp_int *n, unsigned int modLen,
                     mp_int *f, mp_int *g)
 {
-    SECStatus rv = SECSuccess;
-    mp_err err = MP_OKAY;
-    int cmp;
-    PRCList *el;
-    struct RSABlindingParamsStr *rsabp = NULL;
-    /* Init the list if neccessary (the init function is only called once!) */
-    if (blindingParamsList.lock == NULL) {
-        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
-        return SECFailure;
-    }
-    /* Acquire the list lock */
-    PZ_Lock(blindingParamsList.lock);
-    /* Walk the list looking for the private key */
-    for (el = PR_NEXT_LINK(&blindingParamsList.head);
-         el != &blindingParamsList.head;
-         el = PR_NEXT_LINK(el)) {
-	rsabp = (struct RSABlindingParamsStr *)el;
-	cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
-	if (cmp == 0) {
-	    /* Check the usage counter for the parameters */
-	    if (--rsabp->counter <= 0) {
-		/* Regenerate the blinding parameters */
-		CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
-	    }
-	    /* Return the parameters */
-	    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
-	    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
-	    /* Now that the params are located, release the list lock. */
-	    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
-	    return SECSuccess;
-	} else if (cmp > 0) {
-	    /* The key is not in the list.  Break to param creation. */
-	    break;
+    RSABlindingParams *rsabp           = NULL;
+    blindingParams    *bpUnlinked      = NULL;
+    blindingParams    *bp, *prevbp     = NULL;
+    PRCList           *el;
+    SECStatus          rv              = SECSuccess;
+    mp_err             err             = MP_OKAY;
+    int                cmp             = -1;
+    PRBool             holdingLock     = PR_FALSE;
+
+    do {
+	if (blindingParamsList.lock == NULL) {
+	    PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+	    return SECFailure;
 	}
-    }
-    /* At this point, the key is not in the list.  el should point to the
-    ** list element that this key should be inserted before.  NOTE: the list
-    ** lock is still held, so there cannot be a race condition here.
-    */
-    rsabp = (struct RSABlindingParamsStr *)
-              PORT_ZAlloc(sizeof(struct RSABlindingParamsStr));
-    if (!rsabp) {
-	PORT_SetError(SEC_ERROR_NO_MEMORY);
-	goto cleanup;
-    }
-    /* Initialize the list pointer for the element */
-    PR_INIT_CLIST(&rsabp->link);
-    /* Initialize the blinding parameters 
-    ** This ties up the list lock while doing some heavy, element-specific
-    ** operations, but we don't want to insert the element until it is valid,
-    ** which requires computing the blinding params.  If this proves costly,
-    ** it could be done after the list lock is released, and then if it fails
-    ** the lock would have to be reobtained and the invalid element removed.
-    */
-    rv = init_blinding_params(rsabp, key, n, modLen);
-    if (rv != SECSuccess) {
-	PORT_ZFree(rsabp, sizeof(struct RSABlindingParamsStr));
-	goto cleanup;
-    }
-    /* Insert the new element into the list
-    ** If inserting in the middle of the list, el points to the link
-    ** to insert before.  Otherwise, the link needs to be appended to
-    ** the end of the list, which is the same as inserting before the
-    ** head (since el would have looped back to the head).
-    */
-    PR_INSERT_BEFORE(&rsabp->link, el);
-    /* Return the parameters */
-    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
-    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
-    /* Release the list lock */
-    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
-    return SECSuccess;
+	/* Acquire the list lock */
+	PZ_Lock(blindingParamsList.lock);
+	holdingLock = PR_TRUE;
+
+	/* Walk the list looking for the private key */
+	for (el = PR_NEXT_LINK(&blindingParamsList.head);
+	     el != &blindingParamsList.head;
+	     el = PR_NEXT_LINK(el)) {
+	    rsabp = (RSABlindingParams *)el;
+	    cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
+	    if (cmp >= 0) {
+		/* The key is found or not in the list. */
+		break;
+	    }
+	}
+
+	if (cmp) {
+	    /* At this point, the key is not in the list.  el should point to 
+	    ** the list element before which this key should be inserted. 
+	    */
+	    rsabp = PORT_ZNew(RSABlindingParams);
+	    if (!rsabp) {
+		PORT_SetError(SEC_ERROR_NO_MEMORY);
+		goto cleanup;
+	    }
+
+	    rv = init_blinding_params(rsabp, key, n, modLen);
+	    if (rv != SECSuccess) {
+		PORT_ZFree(rsabp, sizeof(RSABlindingParams));
+		goto cleanup;
+	    }
+
+	    /* Insert the new element into the list
+	    ** If inserting in the middle of the list, el points to the link
+	    ** to insert before.  Otherwise, the link needs to be appended to
+	    ** the end of the list, which is the same as inserting before the
+	    ** head (since el would have looped back to the head).
+	    */
+	    PR_INSERT_BEFORE(&rsabp->link, el);
+	}
+
+	/* We've found (or created) the RSAblindingParams struct for this key.
+	 * Now, search its list of ready blinding params for a usable one.
+	 */
+	while (0 != (bp = rsabp->bp)) {
+	    if (--(bp->counter) > 0) {
+		/* Found a match and there are still remaining uses left */
+		/* Return the parameters */
+		CHECK_MPI_OK( mp_copy(&bp->f, f) );
+		CHECK_MPI_OK( mp_copy(&bp->g, g) );
+
+		PZ_Unlock(blindingParamsList.lock); 
+		return SECSuccess;
+	    }
+	    /* exhausted this one, give its values to caller, and
+	     * then retire it.
+	     */
+	    mp_exch(&bp->f, f);
+	    mp_exch(&bp->g, g);
+	    mp_clear( &bp->f );
+	    mp_clear( &bp->g );
+	    bp->counter = 0;
+	    /* Move to free list */
+	    rsabp->bp   = bp->next;
+	    bp->next    = rsabp->free;
+	    rsabp->free = bp;
+	    /* In case there're threads waiting for new blinding
+	     * value - notify 1 thread the value is ready
+	     */
+	    if (blindingParamsList.waitCount > 0) {
+		PR_NotifyCondVar( blindingParamsList.cVar );
+		blindingParamsList.waitCount--;
+	    }
+	    PZ_Unlock(blindingParamsList.lock); 
+	    return SECSuccess;
+	}
+	/* We did not find a usable set of blinding params.  Can we make one?
+	/* Find a free bp struct. */
+	prevbp = NULL;
+	if ((bp = rsabp->free) != NULL) {
+	    /* unlink this bp */
+	    rsabp->free  = bp->next;
+	    bp->next     = NULL;
+	    bpUnlinked   = bp;  /* In case we fail */
+
+	    PZ_Unlock(blindingParamsList.lock); 
+	    holdingLock = PR_FALSE;
+	    /* generate blinding parameter values for the current thread */
+	    CHECK_SEC_OK( generate_blinding_params(key, f, g, n, modLen ) );
+
+	    /* put the blinding parameter values into cache */
+	    CHECK_MPI_OK( mp_init( &bp->f) );
+	    CHECK_MPI_OK( mp_init( &bp->g) );
+	    CHECK_MPI_OK( mp_copy( f, &bp->f) );
+	    CHECK_MPI_OK( mp_copy( g, &bp->g) );
+
+	    /* Put this at head of queue of usable params. */
+	    PZ_Lock(blindingParamsList.lock);
+	    holdingLock = PR_TRUE;
+	    /* initialize RSABlindingParamsStr */
+	    bp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
+	    bp->next    = rsabp->bp;
+	    rsabp->bp   = bp;
+	    bpUnlinked  = NULL;
+	    /* In case there're threads waiting for new blinding value
+	     * just notify them the value is ready
+	     */
+	    if (blindingParamsList.waitCount > 0) {
+		PR_NotifyAllCondVar( blindingParamsList.cVar );
+		blindingParamsList.waitCount = 0;
+	    }
+	    PZ_Unlock(blindingParamsList.lock);
+	    return SECSuccess;
+	}
+	/* Here, there are no usable blinding parameters available,
+	 * and no free bp blocks, presumably because they're all 
+	 * actively having parameters generated for them.
+	 * So, we need to wait here and not eat up CPU until some 
+	 * change happens. 
+	 */
+	blindingParamsList.waitCount++;
+	PR_WaitCondVar( blindingParamsList.cVar, PR_INTERVAL_NO_TIMEOUT );
+	PZ_Unlock(blindingParamsList.lock); 
+	holdingLock = PR_FALSE;
+    } while (1);
+
 cleanup:
-    /* It is possible to reach this after the lock is already released.
-    ** Ignore the error in that case.
-    */
-    PZ_Unlock(blindingParamsList.lock);
+    /* It is possible to reach this after the lock is already released.  */
+    if (bpUnlinked) {
+	if (!holdingLock) {
+	    PZ_Lock(blindingParamsList.lock);
+	    holdingLock = PR_TRUE;
+	}
+	bp = bpUnlinked;
+	mp_clear( &bp->f );
+	mp_clear( &bp->g );
+	bp->counter = 0;
+    	/* Must put the unlinked bp back on the free list */
+	bp->next    = rsabp->free;
+	rsabp->free = bp;
+    }
+    if (holdingLock) {
+	PZ_Unlock(blindingParamsList.lock);
+	holdingLock = PR_FALSE;
+    }
     if (err) {
 	MP_TO_SEC_ERROR(err);
-	rv = SECFailure;
     }
     return SECFailure;
 }
@@ -1441,22 +1549,31 @@ SECStatus BL_Init(void)
 /* cleanup at shutdown */
 void RSA_Cleanup(void)
 {
+    blindingParams * bp = NULL;
     if (!coBPInit.initialized)
 	return;
 
-    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head))
-    {
-	struct RSABlindingParamsStr * rsabp = (struct RSABlindingParamsStr *)
-	    PR_LIST_HEAD(&blindingParamsList.head);
+    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head)) {
+	RSABlindingParams *rsabp = 
+	    (RSABlindingParams *)PR_LIST_HEAD(&blindingParamsList.head);
 	PR_REMOVE_LINK(&rsabp->link);
-	mp_clear(&rsabp->f);
-	mp_clear(&rsabp->g);
+	/* clear parameters cache */
+	while (rsabp->bp != NULL) {
+	    bp = rsabp->bp;
+	    rsabp->bp = rsabp->bp->next;
+	    mp_clear( &bp->f );
+	    mp_clear( &bp->g );
+	}
 	SECITEM_FreeItem(&rsabp->modulus,PR_FALSE);
 	PORT_Free(rsabp);
     }
 
-    if (blindingParamsList.lock)
-    {
+    if (blindingParamsList.cVar) {
+	PR_DestroyCondVar(blindingParamsList.cVar);
+	blindingParamsList.cVar = NULL;
+    }
+
+    if (blindingParamsList.lock) {
 	SKIP_AFTER_FORK(PZ_DestroyLock(blindingParamsList.lock));
 	blindingParamsList.lock = NULL;
     }
diff --git a/security/nss/lib/freebl/sha512.c b/security/nss/lib/freebl/sha512.c
index 91b446e59129..567586712bcb 100644
--- a/security/nss/lib/freebl/sha512.c
+++ b/security/nss/lib/freebl/sha512.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sha512.c,v 1.14.6.1 2010/11/18 18:32:52 kaie%kuix.de Exp $ */
+/* $Id: sha512.c,v 1.14.6.2 2011/03/30 22:45:05 wtc%google.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -135,7 +135,7 @@ static __inline__ PRUint32 swap4b(PRUint32 value)
 #define SHA_HTONL(x) swap4b(x)
 #define BYTESWAP4(x)  x = SHA_HTONL(x)
 
-#else /* neither windows nor Linux PC */
+#else
 #define SWAP4MASK  0x00FF00FF
 #define SHA_HTONL(x) (t1 = (x), t1 = (t1 << 16) | (t1 >> 16), \
                       ((t1 & SWAP4MASK) << 8) | ((t1 >> 8) & SWAP4MASK))
diff --git a/security/nss/lib/freebl/stubs.c b/security/nss/lib/freebl/stubs.c
index 7697533d88f3..02d3f04518c2 100644
--- a/security/nss/lib/freebl/stubs.c
+++ b/security/nss/lib/freebl/stubs.c
@@ -63,6 +63,7 @@
 #include <prsystem.h>
 #include <prinrval.h>
 #include <prtime.h>
+#include <prcvar.h>
 #include <secasn1.h>
 #include <secoid.h>
 #include <secdig.h>
@@ -150,11 +151,15 @@ STUB_DECLARE(void,PR_Assert,(const char *s, const char *file, PRIntn ln));
 STUB_DECLARE(PRStatus,PR_CallOnce,(PRCallOnceType *once, PRCallOnceFN func));
 STUB_DECLARE(PRStatus,PR_Close,(PRFileDesc *fd));
 STUB_DECLARE(void,PR_DestroyLock,(PRLock *lock));
+STUB_DECLARE(void,PR_DestroyCondVar,(PRCondVar *cvar));
 STUB_DECLARE(void,PR_Free,(void *ptr));
 STUB_DECLARE(char * ,PR_GetLibraryFilePathname,(const char *name,
 			PRFuncPtr addr));
 STUB_DECLARE(void,PR_Lock,(PRLock *lock));
+STUB_DECLARE(PRCondVar *,PR_NewCondVar,(PRLock *lock));
 STUB_DECLARE(PRLock *,PR_NewLock,(void));
+STUB_DECLARE(PRStatus,PR_NotifyCondVar,(PRCondVar *cvar));
+STUB_DECLARE(PRStatus,PR_NotifyAllCondVar,(PRCondVar *cvar));
 STUB_DECLARE(PRFileDesc *,PR_Open,(const char *name, PRIntn flags,
 			 PRIntn mode));
 STUB_DECLARE(PRInt32,PR_Read,(PRFileDesc *fd, void *buf, PRInt32 amount));
@@ -162,6 +167,8 @@ STUB_DECLARE(PROffset32,PR_Seek,(PRFileDesc *fd, PROffset32 offset,
 			PRSeekWhence whence));
 STUB_DECLARE(PRStatus,PR_Sleep,(PRIntervalTime ticks));
 STUB_DECLARE(PRStatus,PR_Unlock,(PRLock *lock));
+STUB_DECLARE(PRStatus,PR_WaitCondVar,(PRCondVar *cvar,
+			PRIntervalTime timeout));
 
 STUB_DECLARE(SECItem *,SECITEM_AllocItem_Util,(PRArenaPool *arena, 
 			SECItem *item,unsigned int len));
@@ -430,6 +437,48 @@ PR_DestroyLock_stub(PRLock *lock)
     return;
 }
 
+extern PRCondVar *
+PR_NewCondVar_stub(PRLock *lock)
+{
+    STUB_SAFE_CALL1(PR_NewCondVar, lock);
+    abort();
+    return NULL;
+}
+
+extern PRStatus
+PR_NotifyCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_NotifyCondVar, cvar);
+    abort();
+    return PR_FAILURE;
+}
+
+extern PRStatus
+PR_NotifyAllCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_NotifyAllCondVar, cvar);
+    abort();
+    return PR_FAILURE;
+}
+
+extern PRStatus
+PR_WaitCondVar_stub(PRCondVar *cvar, PRIntervalTime timeout)
+{
+    STUB_SAFE_CALL2(PR_WaitCondVar, cvar, timeout);
+    abort();
+    return PR_FAILURE;
+}
+
+
+
+extern void
+PR_DestroyCondVar_stub(PRCondVar *cvar)
+{
+    STUB_SAFE_CALL1(PR_DestroyCondVar, cvar);
+    abort();
+    return;
+}
+
 /*
  * NOTE: this presupposes GCC 4.1
  */
@@ -507,6 +556,11 @@ freebl_InitNSPR(void *lib)
     STUB_FETCH_FUNCTION(PR_Assert);
     STUB_FETCH_FUNCTION(PR_Sleep);
     STUB_FETCH_FUNCTION(PR_CallOnce);
+    STUB_FETCH_FUNCTION(PR_NewCondVar);
+    STUB_FETCH_FUNCTION(PR_NotifyCondVar);
+    STUB_FETCH_FUNCTION(PR_NotifyAllCondVar);
+    STUB_FETCH_FUNCTION(PR_WaitCondVar);
+    STUB_FETCH_FUNCTION(PR_DestroyCondVar);
     STUB_FETCH_FUNCTION(PR_NewLock);
     STUB_FETCH_FUNCTION(PR_Unlock);
     STUB_FETCH_FUNCTION(PR_Lock);
diff --git a/security/nss/lib/freebl/stubs.h b/security/nss/lib/freebl/stubs.h
index 730ed4a647b4..d435634ff169 100644
--- a/security/nss/lib/freebl/stubs.h
+++ b/security/nss/lib/freebl/stubs.h
@@ -71,6 +71,7 @@
 
 #define NSS_SecureMemcmp NSS_SecureMemcmp_stub
 
+#define PR_DestroyCondVar PR_DestroyCondVar_stub
 #define PR_Assert  PR_Assert_stub
 #define PR_CallOnce  PR_CallOnce_stub
 #define PR_Close  PR_Close_stub
@@ -78,12 +79,16 @@
 #define PR_Free  PR_Free_stub
 #define PR_GetLibraryFilePathname  PR_GetLibraryFilePathname_stub
 #define PR_Lock  PR_Lock_stub
+#define PR_NewCondVar PR_NewCondVar_stub
 #define PR_NewLock  PR_NewLock_stub
+#define PR_NotifyCondVar PR_NotifyCondVar_stub
+#define PR_NotifyAllCondVar PR_NotifyAllCondVar_stub
 #define PR_Open  PR_Open_stub
 #define PR_Read  PR_Read_stub
 #define PR_Seek  PR_Seek_stub
 #define PR_Sleep  PR_Sleep_stub
 #define PR_Unlock  PR_Unlock_stub
+#define PR_WaitCondVar PR_WaitCondVar_stub
 
 extern int  FREEBL_InitStubs(void);
 
diff --git a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
index cf2fa55f4e3f..d7b7ae3e4b8d 100644
--- a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
+++ b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
@@ -399,6 +399,9 @@ pkix_CrlChecker_CheckExternal(
     if (!localStore) {
         PKIX_ERROR_FATAL(PKIX_CRLCHECKERNOLOCALCERTSTOREFOUND);
     }
+    PKIX_CHECK(
+        PKIX_PL_Cert_VerifyKeyUsage(issuer, PKIX_CRL_SIGN, plContext),
+        PKIX_CERTCHECKKEYUSAGEFAILED);
     PKIX_CHECK(
         PKIX_PL_Cert_GetCrlDp(cert, &dpList, plContext),
         PKIX_CERTGETCRLDPFAILED);
diff --git a/security/nss/lib/libpkix/pkix/top/pkix_build.c b/security/nss/lib/libpkix/pkix/top/pkix_build.c
index 1e5873cb6aa6..4045a76fd5ad 100755
--- a/security/nss/lib/libpkix/pkix/top/pkix_build.c
+++ b/security/nss/lib/libpkix/pkix/top/pkix_build.c
@@ -1981,6 +1981,18 @@ cleanup:
         PKIX_RETURN(BUILD);
 }
 
+/* Prepare 'state' for the AIA round. */
+static void
+pkix_PrepareForwardBuilderStateForAIA(
+        PKIX_ForwardBuilderState *state)
+{
+        PORT_Assert(state->useOnlyLocal == PKIX_TRUE);
+        state->useOnlyLocal = PKIX_FALSE;
+        state->certStoreIndex = 0;
+        state->numFanout = state->buildConstants.maxFanout;
+        state->status = BUILD_TRYAIA;
+}
+
 /*
  * FUNCTION: pkix_BuildForwardDepthFirstSearch
  * DESCRIPTION:
@@ -2101,6 +2113,7 @@ pkix_BuildForwardDepthFirstSearch(
         PKIX_Error *verifyError = NULL;
         PKIX_Error *finalError = NULL;
         void *nbio = NULL;
+        PKIX_UInt32 numIterations = 0;
 
         PKIX_ENTER(BUILD, "pkix_BuildForwardDepthFirstSearch");
         PKIX_NULLCHECK_THREE(pNBIOContext, state, pValResult);
@@ -2117,6 +2130,13 @@ pkix_BuildForwardDepthFirstSearch(
          * of this "while" clause our search has failed.
          */
         while (outOfOptions == PKIX_FALSE) {
+            /*
+             * The maximum number of iterations works around a bug that
+             * causes this while loop to never exit when AIA and cross
+             * certificates are involved.  See bug xxxxx.
+             */
+            if (numIterations++ > 250)
+                    PKIX_ERROR(PKIX_TIMECONSUMEDEXCEEDSRESOURCELIMITS);
 
             if (state->buildConstants.maxTime != 0) {
                     PKIX_DECREF(currTime);
@@ -2728,7 +2748,6 @@ pkix_BuildForwardDepthFirstSearch(
                      * chain, delete it and go to the certStores.
                      */
                     if (state->usingHintCerts == PKIX_TRUE) {
-
                             PKIX_DECREF(state->candidateCerts);
                             PKIX_CHECK(PKIX_List_Create
                                 (&state->candidateCerts, plContext),
@@ -2738,9 +2757,7 @@ pkix_BuildForwardDepthFirstSearch(
                             state->usingHintCerts = PKIX_FALSE;
                             state->status = BUILD_TRYAIA;
                             continue;
-
                     } else if (++(state->certIndex) < (state->numCerts)) {
-
                             if ((state->buildConstants.maxFanout != 0) &&
                                 (--(state->numFanout) == 0)) {
 
@@ -2775,16 +2792,12 @@ pkix_BuildForwardDepthFirstSearch(
              * parent cert, and see if there are any more to try.
              */
             if (state->useOnlyLocal == PKIX_TRUE) {
-                state->useOnlyLocal = PKIX_FALSE;
-                state->certStoreIndex = 0;
-                state->numFanout = state->buildConstants.maxFanout;
-                state->status = BUILD_TRYAIA;
+                pkix_PrepareForwardBuilderStateForAIA(state);
             } else do {
                 if (state->parentState == NULL) {
                         /* We are at the top level, and can't back up! */
                         outOfOptions = PKIX_TRUE;
                 } else {
-
                         /*
                          * Try the next cert, if any, for this parent.
                          * Otherwise keep backing up until we reach a
@@ -2848,10 +2861,7 @@ pkix_BuildForwardDepthFirstSearch(
                         }
                         if (state->useOnlyLocal == PKIX_TRUE) {
                             /* Clean up and go for AIA round. */
-                            state->useOnlyLocal = PKIX_FALSE;
-                            state->certStoreIndex = 0;
-                            state->numFanout = state->buildConstants.maxFanout;
-                            state->status = BUILD_TRYAIA;
+                            pkix_PrepareForwardBuilderStateForAIA(state);
                             break;
                         }
                 }
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index c29e361bfe5d..d5d3ea033cd4 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -1143,13 +1143,13 @@ pkix_pl_Socket_Poll(
 
         if ((pBytesWritten) &&
             ((sock->status == SOCKET_SENDPENDING) ||
-            (sock->status = SOCKET_SENDRCVPENDING))) {
+            (sock->status == SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags = PR_POLL_WRITE;
         }
 
         if ((pBytesRead) &&
-            ((sock->status = SOCKET_RCVPENDING) ||
-            (sock->status = SOCKET_SENDRCVPENDING))) {
+            ((sock->status == SOCKET_RCVPENDING) ||
+            (sock->status == SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags |= PR_POLL_READ;
         }
 
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
index a3a7d063b482..7e0a0e7d2f6e 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
@@ -573,10 +573,8 @@ pkix_pl_InfoAccess_ParseTokens(
         char terminator,
         void *plContext)
 {
-        PKIX_UInt32 len = 0;
         PKIX_UInt32 numFilters = 0;
         char *endPos = NULL;
-        char *p = NULL;
         char **filterP = NULL;
 
         PKIX_ENTER(INFOACCESS, "pkix_pl_InfoAccess_ParseTokens");
@@ -597,8 +595,8 @@ pkix_pl_InfoAccess_ParseTokens(
                 PKIX_ERROR(PKIX_LOCATIONSTRINGNOTPROPERLYTERMINATED);
         }
 
-        /* Last one doesn't have a "," as separator, although we allow it */
-        if (*(endPos-1) != ',') {
+        /* Last component doesn't need a separator, although we allow it */
+        if (endPos > *startPos && *(endPos-1) != separator) {
                 numFilters++;
         }
 
@@ -619,36 +617,23 @@ pkix_pl_InfoAccess_ParseTokens(
 
         while (numFilters) {
             if (*endPos == separator || *endPos == terminator) {
-                    len = endPos - *startPos;
-                    p = PORT_ArenaZAlloc(arena, len+1);
+                    PKIX_UInt32 len = endPos - *startPos;
+                    char *p = PORT_ArenaZAlloc(arena, len+1);
                     if (p == NULL) {
                         PKIX_ERROR(PKIX_PORTARENAALLOCFAILED);
                     }
 
+                    PORT_Memcpy(p, *startPos, len);
+                    p[len] = '\0';
+
                     *filterP = p;
-
-                    while (len) {
-                            if (**startPos == '%' &&
-                                strncmp(*startPos, "%20", 3) == 0) {
-                            /* replace %20 by blank */
-                                *p = ' ';
-                                *startPos += 3;
-                                len -= 3;
-                            } else {
-                                *p = **startPos;
-                                (*startPos)++;
-                                len--;
-                            }
-                            p++;
-                    }
-
-                    *p = '\0';
                     filterP++;
                     numFilters--;
 
                     separator = terminator;
 
                     if (endPos == '\0') {
+                        *startPos = endPos;
                         break;
                     } else {
                         endPos++;
@@ -666,6 +651,44 @@ cleanup:
         PKIX_RETURN(INFOACCESS);
 }
 
+static int
+pkix_pl_HexDigitToInt(
+        int ch)
+{
+        if (isdigit(ch)) {
+                ch = ch - '0';
+        } else if (isupper(ch)) {
+                ch = ch - 'A' + 10;
+        } else {
+                ch = ch - 'a' + 10;
+        }
+        return ch;
+}
+
+/*
+ * Convert the "%" hex hex escape sequences in the URL 'location' in place.
+ */
+static void
+pkix_pl_UnescapeURL(
+        char *location)
+{
+        const char *src;
+        char *dst;
+
+        for (src = dst = location; *src != '\0'; src++, dst++) {
+                if (*src == '%' && isxdigit((unsigned char)*(src+1)) &&
+                    isxdigit((unsigned char)*(src+2))) {
+                        *dst = pkix_pl_HexDigitToInt((unsigned char)*(src+1));
+                        *dst *= 16;
+                        *dst += pkix_pl_HexDigitToInt((unsigned char)*(src+2));
+                        src += 2;
+                } else {
+                        *dst = *src;
+                }
+        }
+        *dst = *src;  /* the terminating null */
+}
+
 /*
  * FUNCTION: pkix_pl_InfoAccess_ParseLocation
  * DESCRIPTION:
@@ -742,11 +765,7 @@ pkix_pl_InfoAccess_ParseLocation(
                 plContext),
                 PKIX_STRINGGETENCODEDFAILED);
 
-#if 0
-        /* For testing inside the firewall... */
-        locationAscii = "ldap://nss.red.iplanet.com:1389/cn=Good%20CA,o="
-                "Test%20Certificates,c=US?caCertificate;binary";
-#endif
+        pkix_pl_UnescapeURL(locationAscii);
 
         /* Skip "ldap:" */
         endPos = locationAscii;
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 6c4495d58f88..0373d80d5608 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -1013,3 +1013,10 @@ SECMOD_RestartModules;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12.10 {  # NSS 3.12.10 release
+;+    global:
+CERT_AllocCERTRevocationFlags;
+CERT_DestroyCERTRevocationFlags;
+;+    local:
+;+       *;
+;+};
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 2fc56bb27c5d..778d1ee11201 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.81.2.4 2011/01/06 18:04:16 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.81.2.5 2011/01/12 21:39:21 christophe.ravel.bugs%sun.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
@@ -66,12 +66,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.12.10.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
-#define NSS_VPATCH   9
+#define NSS_VPATCH   10
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_FALSE
+#define NSS_BETA     PR_TRUE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile
index a3cca6ab0679..479086292db5 100644
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -78,6 +78,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export
 
+$(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c
+
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pk11slot.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
diff --git a/security/nss/lib/pk11wrap/debug_module.c b/security/nss/lib/pk11wrap/debug_module.c
index 0df3cfcb61c6..0b29647a6df1 100644
--- a/security/nss/lib/pk11wrap/debug_module.c
+++ b/security/nss/lib/pk11wrap/debug_module.c
@@ -92,6 +92,7 @@ STRING fmt_fwVersion[]            = "  firmware version: %d.%d";
 STRING fmt_hwVersion[]            = "  hardware version: %d.%d";
 STRING fmt_s_qsq_d[]              = "    %s = \"%s\" [%d]";
 STRING fmt_s_s_d[]                = "    %s = %s [%d]";
+STRING fmt_s_lu[]                 = "    %s = %lu";
 STRING fmt_invalid_handle[]       = " (CK_INVALID_HANDLE)";
 
 
@@ -110,6 +111,7 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_VALUE);
     CASE(CKA_OBJECT_ID);
     CASE(CKA_CERTIFICATE_TYPE);
+    CASE(CKA_CERTIFICATE_CATEGORY);
     CASE(CKA_ISSUER);
     CASE(CKA_SERIAL_NUMBER);
     CASE(CKA_AC_ISSUER);
@@ -144,7 +146,7 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_SUBPRIME);
     CASE(CKA_BASE);
     CASE(CKA_PRIME_BITS);
-    CASE(CKA_SUB_PRIME_BITS);
+    CASE(CKA_SUBPRIME_BITS);
     CASE(CKA_VALUE_BITS);
     CASE(CKA_VALUE_LEN);
     CASE(CKA_EXTRACTABLE);
@@ -666,6 +668,25 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	           atype, valstr, attr->ulValueLen));
 	    break;
 	}
+    case CKA_PIXEL_X:
+    case CKA_PIXEL_Y:
+    case CKA_RESOLUTION:
+    case CKA_CHAR_ROWS:
+    case CKA_CHAR_COLUMNS:
+    case CKA_BITS_PER_PIXEL:
+    case CKA_CERTIFICATE_CATEGORY:  /* should print as enum/string */
+    case CKA_JAVA_MIDP_SECURITY_DOMAIN:  /* should print as enum/string */
+    case CKA_MODULUS_BITS:
+    case CKA_PRIME_BITS:
+    case CKA_SUBPRIME_BITS:
+    case CKA_VALUE_BITS:
+    case CKA_VALUE_LEN:
+	if (attr->ulValueLen > 0 && attr->pValue) {
+	    CK_ULONG valueLen = *((CK_ULONG *)attr->pValue);
+	    /* XXX check for the special value CK_UNAVAILABLE_INFORMATION */
+	    PR_LOG(modlog, 4, (fmt_s_lu, atype, (PRUint32)valueLen));
+	    break;
+	}
     case CKA_LABEL:
     case CKA_NETSCAPE_EMAIL:
     case CKA_NETSCAPE_URL:
@@ -691,7 +712,8 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    	PORT_Free(asciiName);
 		break;
 	    }
-	    /* else fall through and treat like a binary buffer */
+	    /* else treat like a binary buffer */
+	    goto binary_buffer;
 	}
     case CKA_ID:
 	if (attr->ulValueLen > 0 && attr->pValue) {
@@ -713,6 +735,7 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    }
 	    /* else fall through and treat like a binary buffer */
 	}
+binary_buffer:
     case CKA_SERIAL_NUMBER:
     default:
 	if (attr->ulValueLen > 0 && attr->pValue) {
diff --git a/security/nss/lib/pk11wrap/pk11load.c b/security/nss/lib/pk11wrap/pk11load.c
index fd35491461f5..80850c11c6d4 100644
--- a/security/nss/lib/pk11wrap/pk11load.c
+++ b/security/nss/lib/pk11wrap/pk11load.c
@@ -178,8 +178,8 @@ secmod_handleReload(SECMODModule *oldModule, SECMODModule *newModule)
 	char *oldModuleSpec;
 
 	if (secmod_IsInternalKeySlot(newModule)) {
-	    pk11_SetInternalKeySlot(slot);
-	}
+	    pk11_SetInternalKeySlotIfFirst(slot);
+	} 
 	newID = slot->slotID;
 	PK11_FreeSlot(slot);
 	for (thisChild=children, thisID=ids; thisChild && *thisChild; 
@@ -550,6 +550,11 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
 	    /* look down the slot info table */
 	    PK11_LoadSlotList(mod->slots[i],mod->slotInfo,mod->slotInfoCount);
 	    SECMOD_SetRootCerts(mod->slots[i],mod);
+	    /* explicitly mark the internal slot as such if IsInternalKeySlot()
+	     * is set */
+	    if (secmod_IsInternalKeySlot(mod) && (i == (mod->isFIPS ? 0 : 1))) {
+		pk11_SetInternalKeySlotIfFirst(mod->slots[i]);
+	    } 
 	}
 	mod->slotCount = slotCount;
 	mod->slotInfoCount = 0;
diff --git a/security/nss/lib/pk11wrap/pk11pars.c b/security/nss/lib/pk11wrap/pk11pars.c
index 585508475302..5b50580b17ea 100644
--- a/security/nss/lib/pk11wrap/pk11pars.c
+++ b/security/nss/lib/pk11wrap/pk11pars.c
@@ -258,6 +258,19 @@ secmod_IsInternalKeySlot(SECMODModule *mod)
    return (flags & SECMOD_FLAG_INTERNAL_KEY_SLOT) ? PR_TRUE : PR_FALSE;
 }
 
+void
+secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val)
+{
+   char flags = (char) mod->internal;
+
+   if (val)  {
+	flags |= SECMOD_FLAG_INTERNAL_KEY_SLOT;
+   } else {
+	flags &= ~SECMOD_FLAG_INTERNAL_KEY_SLOT;
+   }
+   mod->internal = flags;
+}
+
 /* forward declarations */
 static int secmod_escapeSize(const char *string, char quote);
 static char *secmod_addEscape(const char *string, char quote);
diff --git a/security/nss/lib/pk11wrap/pk11priv.h b/security/nss/lib/pk11wrap/pk11priv.h
index 6f88e933052e..0ce3c5e9e561 100644
--- a/security/nss/lib/pk11wrap/pk11priv.h
+++ b/security/nss/lib/pk11wrap/pk11priv.h
@@ -115,6 +115,8 @@ void PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot);
 PRBool PK11_NeedPWInitForSlot(PK11SlotInfo *slot);
 SECStatus PK11_ReadSlotCerts(PK11SlotInfo *slot);
 void pk11_SetInternalKeySlot(PK11SlotInfo *slot);
+PK11SlotInfo *pk11_SwapInternalKeySlot(PK11SlotInfo *slot);
+void pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot);
 
 /*********************************************************************
  *       Mechanism Mapping functions
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c
index 2175ff30c1d4..65d807d0f30a 100644
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -1349,7 +1349,7 @@ pk11_isRootSlot(PK11SlotInfo *slot)
  * times as tokens are removed and re-inserted.
  */
 void
-PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot)
+PK11_InitSlot(SECMODModule *mod, CK_SLOT_ID slotID, PK11SlotInfo *slot)
 {
     SECStatus rv;
     char *tmp;
@@ -1726,6 +1726,12 @@ PK11_NeedUserInit(PK11SlotInfo *slot)
 }
 
 static PK11SlotInfo *pk11InternalKeySlot = NULL;
+
+/*
+ * Set a new default internal keyslot. If one has already been set, clear it.
+ * Passing NULL falls back to the NSS normally selected default internal key
+ * slot.
+ */
 void
 pk11_SetInternalKeySlot(PK11SlotInfo *slot)
 {
@@ -1735,6 +1741,32 @@ pk11_SetInternalKeySlot(PK11SlotInfo *slot)
    pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
 }
 
+/*
+ * Set a new default internal keyslot if the normal key slot has not already
+ * been overridden. Subsequent calls to this function will be ignored unless
+ * pk11_SetInternalKeySlot is used to clear the current default.
+ */
+void
+pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot)
+{
+   if (pk11InternalKeySlot) {
+	return;
+   }
+   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
+}
+
+/*
+ * Swap out a default internal keyslot.  Caller owns the Slot Reference
+ */
+PK11SlotInfo *
+pk11_SwapInternalKeySlot(PK11SlotInfo *slot)
+{
+   PK11SlotInfo *swap = pk11InternalKeySlot;
+
+   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
+   return swap;
+}
+
 
 /* get the internal key slot. FIPS has only one slot for both key slots and
  * default slots */
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index f8828d4652e2..03d3c09d993e 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -483,13 +483,25 @@ SECMOD_DeleteInternalModule(const char *name)
 				NULL, SECMOD_FIPS_FLAGS);
 	}
 	if (newModule) {
+	    PK11SlotInfo *slot;
 	    newModule->libraryParams = 
 	     PORT_ArenaStrdup(newModule->arena,mlp->module->libraryParams);
+	    /* if an explicit internal key slot has been set, reset it */
+	    slot = pk11_SwapInternalKeySlot(NULL);
+	    if (slot) {
+		secmod_SetInternalKeySlotFlag(newModule, PR_TRUE);
+	    }
 	    rv = SECMOD_AddModule(newModule);
 	    if (rv != SECSuccess) {
+		/* load failed, restore the internal key slot */
+		pk11_SetInternalKeySlot(slot);
 		SECMOD_DestroyModule(newModule);
 		newModule = NULL;
 	    }
+	    /* free the old explicit internal key slot, we now have a new one */
+	    if (slot) {
+		PK11_FreeSlot(slot);
+	    }
 	}
 	if (newModule == NULL) {
 	    SECMODModuleList *last = NULL,*mlp2;
diff --git a/security/nss/lib/pk11wrap/secmodi.h b/security/nss/lib/pk11wrap/secmodi.h
index b67e6df99a30..168d99719662 100644
--- a/security/nss/lib/pk11wrap/secmodi.h
+++ b/security/nss/lib/pk11wrap/secmodi.h
@@ -90,6 +90,8 @@ SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule);
 SECStatus SECMOD_UnloadModule(SECMODModule *);
 void SECMOD_SetInternalModule(SECMODModule *);
 PRBool secmod_IsInternalKeySlot(SECMODModule *);
+void secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val);
+
 
 /* tools for checking if we are loading the same database twice */
 typedef struct SECMODConfigListStr SECMODConfigList;
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
index 6830a7840991..b13a05ee1b14 100644
--- a/security/nss/lib/pki/pki3hack.c
+++ b/security/nss/lib/pki/pki3hack.c
@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100 $ $Date: 2010/05/18 19:38:40 $";
+static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100.2.1 $ $Date: 2011/03/26 16:55:01 $";
 #endif /* DEBUG */
 
 /*
@@ -1215,6 +1215,98 @@ done:
     return nssrv;
 }
 
+/*
+** Delete trust objects matching the given slot.
+** Returns error if a device fails to delete.
+**
+** This function has the side effect of moving the
+** surviving entries to the front of the object list
+** and nullifying the rest.
+*/
+static PRStatus
+DeleteCertTrustMatchingSlot(PK11SlotInfo *pk11slot, nssPKIObject *tObject)
+{
+    int numNotDestroyed = 0;     /* the ones skipped plus the failures */
+    int failureCount = 0;        /* actual deletion failures by devices */
+    int index;
+
+    nssPKIObject_Lock(tObject);
+    /* Keep going even if a module fails to delete. */
+    for (index = 0; index < tObject->numInstances; index++) {
+	nssCryptokiObject *instance = tObject->instances[index];
+	if (!instance) {
+	    continue;
+	}
+
+	/* ReadOnly and not matched treated the same */
+	if (PK11_IsReadOnly(instance->token->pk11slot) ||
+	    pk11slot != instance->token->pk11slot) {
+	    tObject->instances[numNotDestroyed++] = instance;
+	    continue;
+	}
+
+	/* Here we have found a matching one */
+	tObject->instances[index] = NULL;
+	if (nssToken_DeleteStoredObject(instance) == PR_SUCCESS) {
+	    nssCryptokiObject_Destroy(instance);
+	} else {
+	    tObject->instances[numNotDestroyed++] = instance;
+	    failureCount++;
+	}
+
+    }
+    if (numNotDestroyed == 0) {
+    	nss_ZFreeIf(tObject->instances);
+    	tObject->numInstances = 0;
+    } else {
+    	tObject->numInstances = numNotDestroyed;
+    }
+
+    nssPKIObject_Unlock(tObject);
+
+    return failureCount == 0 ? PR_SUCCESS : PR_FAILURE;
+}
+
+/*
+** Delete trust objects matching the slot of the given certificate.
+** Returns an error if any device fails to delete. 
+*/
+NSS_EXTERN PRStatus
+STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c)
+{
+    PRStatus nssrv = PR_SUCCESS;
+
+    NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
+    NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
+    /* caller made sure nssTrust isn't NULL */
+    nssPKIObject *tobject = &nssTrust->object;
+    nssPKIObject *cobject = &c->object;
+    int i;
+
+    /* Iterate through the cert and trust object instances looking for
+     * those with matching pk11 slots to delete. Even if some device
+     * can't delete we keep going. Keeping a status variable for the
+     * loop so that once it's failed the other gets set.
+     */
+    NSSRWLock_LockRead(td->tokensLock);
+    nssPKIObject_Lock(cobject);
+    for (i = 0; i < cobject->numInstances; i++) {
+	nssCryptokiObject *cInstance = cobject->instances[i];
+	if (cInstance && !PK11_IsReadOnly(cInstance->token->pk11slot)) {
+		PRStatus status;
+	    if (!tobject->numInstances || !tobject->instances) continue;
+	    status = DeleteCertTrustMatchingSlot(cInstance->token->pk11slot, tobject);
+	    if (status == PR_FAILURE) {
+	    	/* set the outer one but keep going */
+	    	nssrv = PR_FAILURE;
+	    }
+	}
+    }
+    nssPKIObject_Unlock(cobject);
+    NSSRWLock_UnlockRead(td->tokensLock);
+    return nssrv;
+}
+
 /* CERT_TraversePermCertsForSubject */
 NSS_IMPLEMENT PRStatus
 nssTrustDomain_TraverseCertificatesBySubject (
diff --git a/security/nss/lib/pki/pki3hack.h b/security/nss/lib/pki/pki3hack.h
index 3920f79c0938..b9ce7f7c6ff2 100644
--- a/security/nss/lib/pki/pki3hack.h
+++ b/security/nss/lib/pki/pki3hack.h
@@ -38,7 +38,7 @@
 #define PKINSS3HACK_H
 
 #ifdef DEBUG
-static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19 $ $Date: 2005/01/20 02:25:49 $";
+static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19.192.1 $ $Date: 2011/03/26 16:55:01 $";
 #endif /* DEBUG */
 
 #ifndef NSSDEVT_H
@@ -106,6 +106,9 @@ STAN_GetNSSCertificate(CERTCertificate *c);
 NSS_EXTERN CERTCertTrust * 
 nssTrust_GetCERTCertTrustForCert(NSSCertificate *c, CERTCertificate *cc);
 
+NSS_EXTERN PRStatus
+STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c);
+
 NSS_EXTERN PRStatus
 STAN_ChangeCertTrust(CERTCertificate *cc, CERTCertTrust *trust);
 
diff --git a/security/nss/lib/smime/cms.h b/security/nss/lib/smime/cms.h
index f993cf0c13a0..896408f72b5a 100644
--- a/security/nss/lib/smime/cms.h
+++ b/security/nss/lib/smime/cms.h
@@ -37,7 +37,7 @@
 /*
  * Interfaces of the CMS implementation.
  *
- * $Id: cms.h,v 1.23 2010/04/25 23:37:38 nelson%bolyard.com Exp $
+ * $Id: cms.h,v 1.23.2.3 2011/02/11 16:44:02 emaldona%redhat.com Exp $
  */
 
 #ifndef _CMS_H_
@@ -302,6 +302,14 @@ NSS_CMSContentInfo_SetContent_DigestedData(NSSCMSMessage *cmsg, NSSCMSContentInf
 extern SECStatus
 NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSEncryptedData *encd);
 
+/*
+ * turn off streaming for this content type.
+ * This could fail with SEC_ERROR_NO_MEMORY in memory constrained conditions.
+ */
+extern SECStatus
+NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream);
+
+
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -1128,6 +1136,51 @@ NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut,
                  PLArenaPool *arena);
 
 
+/************************************************************************
+ * 
+ ************************************************************************/
+
+/*
+ *  define new S/MIME content type entries
+ *
+ *  S/MIME uses the builtin PKCS7 oid types for encoding and decoding the
+ *  various S/MIME content. Some applications have their own content type
+ *  which is different from the standard content type defined by S/MIME.
+ *
+ *  This function allows you to register new content types. There are basically
+ *  Two different types of content, Wrappping content, and Data.
+ *
+ *  For data types, All the functions below can be zero or NULL excext 
+ *  type and is isData, which should be your oid tag and PR_FALSE respectively
+ *
+ *  For wrapping types, everything must be provided, or you will get encoder
+ *  failures.
+ *
+ *  If NSS doesn't already define the OID that you need, you can register 
+ *  your own with SECOID_AddEntry.
+ * 
+ *  Once you have defined your new content type, you can pass your new content
+ *  type to NSS_CMSContentInfo_SetContent().
+ * 
+ *  If you are using a wrapping type you can pass your own data structure in 
+ *  the ptr field, but it must contain and embedded NSSCMSGenericWrappingData 
+ *  structure as the first element. The size you pass to 
+ *  NSS_CMSType_RegisterContentType is the total size of your self defined 
+ *  data structure. NSS_CMSContentInfo_GetContent will return that data 
+ *  structure from the content info. Your ASN1Template will be evaluated 
+ *  against that data structure.
+ */
+SECStatus NSS_CMSType_RegisterContentType(SECOidTag type,
+                          SEC_ASN1Template *asn1Template, size_t size,
+                          NSSCMSGenericWrapperDataDestroy  destroy,
+                          NSSCMSGenericWrapperDataCallback decode_before,
+                          NSSCMSGenericWrapperDataCallback decode_after,
+                          NSSCMSGenericWrapperDataCallback decode_end,
+                          NSSCMSGenericWrapperDataCallback encode_start,
+                          NSSCMSGenericWrapperDataCallback encode_before,
+                          NSSCMSGenericWrapperDataCallback encode_after,
+                          PRBool isData);
+
 /************************************************************************/
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/smime/cmsasn1.c b/security/nss/lib/smime/cmsasn1.c
index 8d8e3e711639..d924528a594c 100644
--- a/security/nss/lib/smime/cmsasn1.c
+++ b/security/nss/lib/smime/cmsasn1.c
@@ -37,7 +37,7 @@
 /*
  * CMS ASN.1 templates
  *
- * $Id: cmsasn1.c,v 1.7 2010/06/06 22:36:35 nelson%bolyard.com Exp $
+ * $Id: cmsasn1.c,v 1.7.2.2 2011/02/01 00:33:23 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -479,6 +479,20 @@ const SEC_ASN1Template NSS_PointerToCMSEncryptedDataTemplate[] = {
     { SEC_ASN1_POINTER, 0, NSSCMSEncryptedDataTemplate }
 };
 
+const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[] = {
+    { SEC_ASN1_INLINE,
+	  offsetof(NSSCMSGenericWrapperData,contentInfo),
+	  NSSCMSEncapsulatedContentInfoTemplate },
+};
+
+SEC_ASN1_CHOOSER_IMPLEMENT(NSSCMSGenericWrapperDataTemplate);
+
+const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[] = {
+    { SEC_ASN1_POINTER, 0, NSSCMSGenericWrapperDataTemplate }
+};
+
+SEC_ASN1_CHOOSER_IMPLEMENT(NSS_PointerToCMSGenericWrapperDataTemplate);
+
 /* -----------------------------------------------------------------------------
  * FORTEZZA KEA
  */
@@ -547,15 +561,17 @@ nss_cms_choose_content_template(void *src_or_dest, PRBool encoding)
 {
     const SEC_ASN1Template *theTemplate;
     NSSCMSContentInfo *cinfo;
+    SECOidTag type;
 
     PORT_Assert (src_or_dest != NULL);
     if (src_or_dest == NULL)
 	return NULL;
 
     cinfo = (NSSCMSContentInfo *)src_or_dest;
-    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
+    type = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
+    switch (type) {
     default:
-	theTemplate = SEC_ASN1_GET(SEC_PointerToAnyTemplate);
+	theTemplate = NSS_CMSType_GetTemplate(type);
 	break;
     case SEC_OID_PKCS7_DATA:
 	theTemplate = SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
diff --git a/security/nss/lib/smime/cmscinfo.c b/security/nss/lib/smime/cmscinfo.c
index b1f1d1df7b6e..bd1cc85b6dae 100644
--- a/security/nss/lib/smime/cmscinfo.c
+++ b/security/nss/lib/smime/cmscinfo.c
@@ -37,7 +37,7 @@
 /*
  * CMS contentInfo methods.
  *
- * $Id: cmscinfo.c,v 1.7 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmscinfo.c,v 1.7.192.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -47,11 +47,37 @@
 #include "secoid.h"
 #include "secerr.h"
 
+
 /*
  * NSS_CMSContentInfo_Create - create a content info
  *
  * version is set in the _Finalize procedures for each content type
  */
+SECStatus
+NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo)
+{
+    if (cinfo->privateInfo) {
+	return SECSuccess;
+    }
+    cinfo->privateInfo = PORT_ZNew(NSSCMSContentInfoPrivate);
+    return (cinfo->privateInfo) ? SECSuccess : SECFailure;
+}
+
+
+static void
+nss_cmsContentInfo_private_destroy(NSSCMSContentInfoPrivate *privateInfo)
+{
+    if (privateInfo->digcx) {
+	/* must destroy digest objects */
+	NSS_CMSDigestContext_Cancel(privateInfo->digcx);
+	privateInfo->digcx = NULL;
+    }
+    if (privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(privateInfo->ciphcx);
+	privateInfo->ciphcx = NULL;
+    }
+    PORT_Free(privateInfo);
+}
 
 /*
  * NSS_CMSContentInfo_Destroy - destroy a CMS contentInfo and all of its sub-pieces.
@@ -76,23 +102,17 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 	NSS_CMSDigestedData_Destroy(cinfo->content.digestedData);
 	break;
       default:
+	NSS_CMSGenericWrapperData_Destroy(kind, cinfo->content.genericData);
 	/* XXX Anything else that needs to be "manually" freed/destroyed? */
 	break;
     }
-    if (cinfo->digcx) {
-	/* must destroy digest objects */
-	NSS_CMSDigestContext_Cancel(cinfo->digcx);
-	cinfo->digcx = NULL;
+    if (cinfo->privateInfo) {
+	nss_cmsContentInfo_private_destroy(cinfo->privateInfo);
+	cinfo->privateInfo = NULL;
     }
-    if (cinfo->bulkkey)
+    if (cinfo->bulkkey) {
 	PK11_FreeSymKey(cinfo->bulkkey);
-
-    if (cinfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(cinfo->ciphcx);
-	cinfo->ciphcx = NULL;
     }
-    
-    /* we live in a pool, so no need to worry about storage */
 }
 
 /*
@@ -101,31 +121,56 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 NSSCMSContentInfo *
 NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
 {
-    void * ptr                  = NULL;
     NSSCMSContentInfo * ccinfo  = NULL;
     SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
     switch (tag) {
     case SEC_OID_PKCS7_SIGNED_DATA:
-	ptr    = (void *)cinfo->content.signedData;
-	ccinfo = &(cinfo->content.signedData->contentInfo);
+	if (cinfo->content.signedData != NULL) {
+	    ccinfo = &(cinfo->content.signedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_ENVELOPED_DATA:
-	ptr    = (void *)cinfo->content.envelopedData;
-	ccinfo = &(cinfo->content.envelopedData->contentInfo);
+	if (cinfo->content.envelopedData != NULL) {
+	    ccinfo = &(cinfo->content.envelopedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_DIGESTED_DATA:
-	ptr    = (void *)cinfo->content.digestedData;
-	ccinfo = &(cinfo->content.digestedData->contentInfo);
+	if (cinfo->content.digestedData != NULL) {
+	    ccinfo = &(cinfo->content.digestedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
-	ptr    = (void *)cinfo->content.encryptedData;
-	ccinfo = &(cinfo->content.encryptedData->contentInfo);
+	if (cinfo->content.encryptedData != NULL) {
+	    ccinfo = &(cinfo->content.encryptedData->contentInfo);
+	}
 	break;
     case SEC_OID_PKCS7_DATA:
     default:
+	if (NSS_CMSType_IsWrapper(tag)) {
+	    if (cinfo->content.genericData != NULL) {
+	       ccinfo = &(cinfo->content.genericData->contentInfo);
+	    }
+	}
 	break;
     }
-    return (ptr ? ccinfo : NULL);
+    if (ccinfo && !ccinfo->privateInfo) {
+	NSS_CMSContentInfo_Private_Init(ccinfo);
+    }
+    return ccinfo;
+}
+
+SECStatus
+NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
+{
+   SECStatus rv;
+
+   rv = NSS_CMSContentInfo_Private_Init(cinfo);
+   if (rv != SECSuccess) {
+	/* default is streaming, failure to get ccinfo will not effect this */
+	return dontStream ? SECFailure :  SECSuccess ;
+   }
+   cinfo->privateInfo->dontStream = dontStream;
+   return SECSuccess;
 }
 
 /*
@@ -147,7 +192,9 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, SEC
 
     cinfo->content.pointer = ptr;
 
-    if (type != SEC_OID_PKCS7_DATA) {
+    if (NSS_CMSType_IsData(type) && ptr) {
+	cinfo->rawContent = ptr;
+    } else {
 	/* as we always have some inner data,
 	 * we need to set it to something, just to fool the encoder enough to work on it
 	 * and get us into nss_cms_encoder_notify at that point */
@@ -174,9 +221,10 @@ NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo
 {
     if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
 	return SECFailure;
-    cinfo->rawContent = (detached) ? 
-			    NULL : (data) ? 
-				data : SECITEM_AllocItem(cmsg->poolp, NULL, 1);
+    if (detached) {
+        cinfo->rawContent = NULL;
+    }
+	
     return SECSuccess;
 }
 
@@ -204,6 +252,7 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
     return NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_ENCRYPTED_DATA, (void *)encd);
 }
 
+
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -223,7 +272,7 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	return cinfo->content.pointer;
     default:
-	return NULL;
+	return NSS_CMSType_IsWrapper(tag) ? cinfo->content.pointer : (NSS_CMSType_IsData(tag) ? cinfo->rawContent : NULL);
     }
 }
 
@@ -232,6 +281,7 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
  *
  * this is typically only called by NSS_CMSMessage_GetContent()
  */
+
 SECItem *
 NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
 {
@@ -240,26 +290,21 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
     SECItem           *pItem = NULL;
 
     tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    switch (tag) {
-    case SEC_OID_PKCS7_DATA:
-	/* end of recursion - every message has to have a data cinfo */
+    if (NSS_CMSType_IsData(tag)) {
 	pItem = cinfo->content.data; 
-	break;
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_SIGNED_DATA:
+    } else if (NSS_CMSType_IsWrapper(tag)) {
 	ccinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo);
-	if (ccinfo != NULL)
+	if (ccinfo != NULL) {
 	    pItem = NSS_CMSContentInfo_GetContent(ccinfo);
-	break;
-    default:
+	}
+    } else {
 	PORT_Assert(0);
-	break;
     }
+
     return pItem;
 }
 
+
 /*
  * NSS_CMSContentInfo_GetContentType{Tag,OID} - find out (saving pointer to lookup result
  * for future reference) and return the inner content type.
diff --git a/security/nss/lib/smime/cmsdecode.c b/security/nss/lib/smime/cmsdecode.c
index 1be5a3e352c8..79299dd793ed 100644
--- a/security/nss/lib/smime/cmsdecode.c
+++ b/security/nss/lib/smime/cmsdecode.c
@@ -37,7 +37,7 @@
 /*
  * CMS decoding.
  *
- * $Id: cmsdecode.c,v 1.9.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
+ * $Id: cmsdecode.c,v 1.9.66.4 2011/03/15 17:51:01 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -120,8 +120,7 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 #endif
 
     /* so what are we working on right now? */
-    switch (p7dcx->type) {
-    case SEC_OID_UNKNOWN:
+    if (p7dcx->type == SEC_OID_UNKNOWN) {
 	/*
 	 * right now, we are still decoding the OUTER (root) cinfo
 	 * As soon as we know the inner content type, set up the info,
@@ -136,8 +135,7 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 	    /* is this ready already ? need to alloc? */
 	    /* XXX yes we need to alloc -- continue here */
 	}
-	break;
-    case SEC_OID_PKCS7_DATA:
+    } else if (NSS_CMSType_IsData(p7dcx->type)) {
 	/* this can only happen if the outermost cinfo has DATA in it */
 	/* otherwise, we handle this type implicitely in the inner decoders */
 
@@ -150,86 +148,71 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 					  nss_cms_decoder_update_filter,
 					  p7dcx,
 					  (PRBool)(p7dcx->cb != NULL));
-	    break;
-	}
-
-	if (after && dest == &(rootcinfo->content.data)) {
+	} else if (after && dest == &(rootcinfo->content.data)) {
 	    /* remove the filter */
 	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
 	}
-	break;
+    } else if (NSS_CMSType_IsWrapper(p7dcx->type)) {
+	if (!before || dest != &(rootcinfo->content)) {
 
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+	    if (p7dcx->content.pointer == NULL)
+		p7dcx->content = rootcinfo->content;
 
-	if (before && dest == &(rootcinfo->content))
-	    break;     /* we're not there yet */
-
-	if (p7dcx->content.pointer == NULL)
-	    p7dcx->content = rootcinfo->content;
-
-	/* get this data type's inner contentInfo */
-	cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
+	    /* get this data type's inner contentInfo */
+	    cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
 	                                      p7dcx->type);
 
-	if (before && dest == &(cinfo->contentType)) {
-	    /* at this point, set up the &%$&$ back pointer */
-	    /* we cannot do it later, because the content itself is optional! */
-	    /* please give me C++ */
-	    switch (p7dcx->type) {
-	    case SEC_OID_PKCS7_SIGNED_DATA:
-		p7dcx->content.signedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_DIGESTED_DATA:
-		p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_ENVELOPED_DATA:
-		p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
-		break;
-	    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-		p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
-		break;
-	    default:
-		PORT_Assert(0);
-		break;
+	    if (before && dest == &(cinfo->contentType)) {
+	        /* at this point, set up the &%$&$ back pointer */
+	        /* we cannot do it later, because the content itself 
+		 * is optional! */
+		switch (p7dcx->type) {
+		case SEC_OID_PKCS7_SIGNED_DATA:
+		    p7dcx->content.signedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_DIGESTED_DATA:
+		    p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_ENVELOPED_DATA:
+		    p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
+		    break;
+		case SEC_OID_PKCS7_ENCRYPTED_DATA:
+		    p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
+		    break;
+		default:
+		    p7dcx->content.genericData->cmsg = p7dcx->cmsg;
+		    break;
+		}
 	    }
-	}
 
-	if (before && dest == &(cinfo->rawContent)) {
-	    /* we want the ASN.1 decoder to deliver the decoded bytes to us 
-	    ** from now on 
-	    */
-	    SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
+	    if (before && dest == &(cinfo->rawContent)) {
+		/* we want the ASN.1 decoder to deliver the decoded bytes to us 
+		 ** from now on 
+		 */
+		SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
 	                                 nss_cms_decoder_update_filter, 
 					 p7dcx, (PRBool)(p7dcx->cb != NULL));
 
 
-	    /* we're right in front of the data */
-	    if (nss_cms_before_data(p7dcx) != SECSuccess) {
-		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
-		/* stop all processing */
-		p7dcx->error = PORT_GetError();
+		/* we're right in front of the data */
+		if (nss_cms_before_data(p7dcx) != SECSuccess) {
+		    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
+		    /* stop all processing */
+		    p7dcx->error = PORT_GetError();
+		}
+	    }
+	    if (after && dest == &(cinfo->rawContent)) {
+		/* we're right after of the data */
+		if (nss_cms_after_data(p7dcx) != SECSuccess)
+		    p7dcx->error = PORT_GetError();
+
+		/* we don't need to see the contents anymore */
+		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
 	    }
 	}
-	if (after && dest == &(cinfo->rawContent)) {
-	    /* we're right after of the data */
-	    if (nss_cms_after_data(p7dcx) != SECSuccess)
-		p7dcx->error = PORT_GetError();
-
-	    /* we don't need to see the contents anymore */
-	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
-	}
-	break;
-
-#if 0 /* NIH */
-    case SEC_OID_PKCS7_AUTHENTICATED_DATA:
-#endif
-    default:
+    } else {
 	/* unsupported or unknown message type - fail  gracefully */
 	p7dcx->error = SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE;
-	break;
     }
 }
 
@@ -269,7 +252,8 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
 	                             p7dcx->content.encryptedData);
 	break;
     default:
-	return SECFailure;
+	rv = NSS_CMSGenericWrapperData_Decode_BeforeData(p7dcx->type,
+				p7dcx->content.genericData);
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -280,7 +264,7 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, p7dcx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    if (childtype == SEC_OID_PKCS7_DATA) {
+    if (NSS_CMSType_IsData(childtype)) {
 	cinfo->content.pointer = (void *) nss_cms_create_decoder_data(poolp);
 	if (cinfo->content.pointer == NULL)
 	    /* set memory error */
@@ -307,6 +291,9 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     if (childp7dcx->content.pointer == NULL)
 	goto loser;
 
+    /* give the parent a copy of the pointer so that it doesn't get lost */
+    cinfo->content.pointer = childp7dcx->content.pointer;
+
     /* start the child decoder */
     childp7dcx->dcx = SEC_ASN1DecoderStart(poolp, childp7dcx->content.pointer, 
                                            template);
@@ -395,7 +382,8 @@ nss_cms_after_data(NSSCMSDecoderContext *p7dcx)
 	/* do nothing */
 	break;
     default:
-	rv = SECFailure;
+	rv = NSS_CMSGenericWrapperData_Decode_AfterData(p7dcx->type,
+	                            p7dcx->content.genericData);
 	break;
     }
 done:
@@ -430,7 +418,8 @@ nss_cms_after_end(NSSCMSDecoderContext *p7dcx)
     case SEC_OID_PKCS7_DATA:
 	break;
     default:
-	rv = SECFailure;	/* we should not have got that far... */
+	rv = NSS_CMSGenericWrapperData_Decode_AfterEnd(p7dcx->type,
+	                               p7dcx->content.genericData);
 	break;
     }
     return rv;
@@ -469,7 +458,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	goto loser;
     }
 
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	/*
 	 * we are decrypting.
 	 * 
@@ -483,7 +472,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	unsigned int buflen;		/* length available for decrypted data */
 
 	/* find out about the length of decrypted data */
-	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->ciphcx, len, final);
+	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->privateInfo->ciphcx, len, final);
 
 	/*
 	 * it might happen that we did not provide enough data for a full
@@ -514,7 +503,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	 * any output (see above), but we still need to call NSS_CMSCipherContext_Decrypt to
 	 * keep track of incoming data
 	 */
-	rv = NSS_CMSCipherContext_Decrypt(cinfo->ciphcx, buf, &outlen, buflen,
+	rv = NSS_CMSCipherContext_Decrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
 			       data, len, final);
 	if (rv != SECSuccess) {
 	    p7dcx->error = PORT_GetError();
@@ -534,8 +523,8 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
     /*
      * Update the running digests with plaintext bytes (if we need to).
      */
-    if (cinfo->digcx)
-	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
+    if (cinfo->privateInfo && cinfo->privateInfo->digcx)
+	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
 
     /* at this point, we have the plain decoded & decrypted data 
     ** which is either more encoded DER (which we need to hand to the child 
diff --git a/security/nss/lib/smime/cmsdigdata.c b/security/nss/lib/smime/cmsdigdata.c
index 41eefe3c4da7..47f5a4ceb4f4 100644
--- a/security/nss/lib/smime/cmsdigdata.c
+++ b/security/nss/lib/smime/cmsdigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS digestedData methods.
  *
- * $Id: cmsdigdata.c,v 1.5 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmsdigdata.c,v 1.5.192.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -117,7 +117,8 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
     SECItem *dummy;
 
     version = NSS_CMS_DIGESTED_DATA_VERSION_DATA;
-    if (NSS_CMSContentInfo_GetContentTypeTag(&(digd->contentInfo)) != SEC_OID_PKCS7_DATA)
+    if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(
+							&(digd->contentInfo))))
 	version = NSS_CMS_DIGESTED_DATA_VERSION_ENCAP;
 
     dummy = SEC_ASN1EncodeInteger(digd->cmsg->poolp, &(digd->version), version);
@@ -134,11 +135,16 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Encode_BeforeData(NSSCMSDigestedData *digd)
 {
+    SECStatus rv =NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
+    if (rv != SECSuccess)  {
+	return SECFailure;
+    }
+
     /* set up the digests */
     if (digd->digestAlg.algorithm.len != 0 && digd->digest.len == 0) {
 	/* if digest is already there, do nothing */
-	digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-	if (digd->contentInfo.digcx == NULL)
+	digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+	if (digd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -156,12 +162,12 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
+    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->digest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.digcx = NULL;
+	digd->contentInfo.privateInfo->digcx = NULL;
     }
 
     return rv;
@@ -177,12 +183,19 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Decode_BeforeData(NSSCMSDigestedData *digd)
 {
+    SECStatus rv;
+
     /* is there a digest algorithm yet? */
     if (digd->digestAlg.algorithm.len == 0)
 	return SECFailure;
 
-    digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-    if (digd->contentInfo.digcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
+
+    digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+    if (digd->contentInfo.privateInfo->digcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -200,12 +213,12 @@ NSS_CMSDigestedData_Decode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
+    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->cdigest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.digcx = NULL;
+	digd->contentInfo.privateInfo->digcx = NULL;
     }
 
     return rv;
diff --git a/security/nss/lib/smime/cmsencdata.c b/security/nss/lib/smime/cmsencdata.c
index 6b6a5e1b6457..29d8e39dec9a 100644
--- a/security/nss/lib/smime/cmsencdata.c
+++ b/security/nss/lib/smime/cmsencdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS encryptedData methods.
  *
- * $Id: cmsencdata.c,v 1.11 2008/02/03 06:08:49 nelson%bolyard.com Exp $
+ * $Id: cmsencdata.c,v 1.11.56.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -181,6 +181,7 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
+    SECStatus rv;
 
     cinfo = &(encd->contentInfo);
 
@@ -192,12 +193,16 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     if (algid == NULL)
 	return SECFailure;
 
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* this may modify algid (with IVs generated in a token).
      * it is therefore essential that algid is a pointer to the "real" contentEncAlg,
      * not just to a copy */
-    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->ciphcx == NULL)
+    if (cinfo->privateInfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -209,9 +214,9 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
 SECStatus
 NSS_CMSEncryptedData_Encode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
-	encd->contentInfo.ciphcx = NULL;
+    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
+	encd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     /* nothing to do after data */
@@ -244,8 +249,14 @@ NSS_CMSEncryptedData_Decode_BeforeData(NSSCMSEncryptedData *encd)
 
     NSS_CMSContentInfo_SetBulkKey(cinfo, bulkkey);
 
-    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->ciphcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	goto loser;
+    }
+    rv = SECFailure;
+
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->privateInfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -264,9 +275,9 @@ loser:
 SECStatus
 NSS_CMSEncryptedData_Decode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
-	encd->contentInfo.ciphcx = NULL;
+    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
+	encd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmsencode.c b/security/nss/lib/smime/cmsencode.c
index 0ba5d4150eb2..7e6f036397d8 100644
--- a/security/nss/lib/smime/cmsencode.c
+++ b/security/nss/lib/smime/cmsencode.c
@@ -37,7 +37,7 @@
 /*
  * CMS encoding.
  *
- * $Id: cmsencode.c,v 1.6.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
+ * $Id: cmsencode.c,v 1.6.66.5 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -92,8 +92,23 @@ nss_cms_encoder_out(void *arg, const char *buf, unsigned long len,
 
 #ifdef CMSDEBUG
     int i;
+    const char *data_name = "unknown";
 
-    fprintf(stderr, "kind = %d, depth = %d, len = %d\n", data_kind, depth, len);
+    switch (data_kind) {
+    case SEC_ASN1_Identifier:
+        data_name = "identifier";
+        break;
+    case SEC_ASN1_Length:
+        data_name = "length";
+        break;
+    case SEC_ASN1_Contents:
+        data_name = "contents";
+        break;
+    case SEC_ASN1_EndOfContents:
+        data_name = "end-of-contents";
+        break;
+    }
+    fprintf(stderr, "kind = %s, depth = %d, len = %d\n", data_name, depth, len);
     for (i=0; i < len; i++) {
 	fprintf(stderr, " %02x%s", (unsigned int)buf[i] & 0xff, ((i % 16) == 15) ? "\n" : "");
     }
@@ -159,34 +174,17 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
      * Watch for the content field, at which point we want to instruct
      * the ASN.1 encoder to start taking bytes from the buffer.
      */
-    switch (p7ecx->type) {
-    default:
-    case SEC_OID_UNKNOWN:
-	/* we're still in the root message */
-	if (after && dest == &(rootcinfo->contentType)) {
-	    /* got the content type OID now - so find out the type tag */
-	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
-	    /* set up a pointer to our current content */
-	    p7ecx->content = rootcinfo->content;
-	}
-	break;
-
-    case SEC_OID_PKCS7_DATA:
-	if (before && dest == &(rootcinfo->rawContent)) {
+    if (NSS_CMSType_IsData(p7ecx->type)) {
+	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
+	if (before && dest == &(cinfo->rawContent)) {
 	    /* just set up encoder to grab from user - no encryption or digesting */
-	    if ((item = rootcinfo->content.data) != NULL)
+	    if ((item = cinfo->content.data) != NULL)
 		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
 	    else
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-	break;
-
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-
+    } else if (NSS_CMSType_IsWrapper(p7ecx->type)) {
 	/* when we know what the content is, we encode happily until we reach the inner content */
 	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
@@ -199,19 +197,32 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
 		p7ecx->error = PORT_GetError();
 	}
 	if (before && dest == &(cinfo->rawContent)) {
-	    if (childtype == SEC_OID_PKCS7_DATA && (item = cinfo->content.data) != NULL)
-		/* we have data - feed it in */
-		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
-	    else
-		/* else try to get it from user */
+	    if (p7ecx->childp7ecx == NULL) {
+		if ((NSS_CMSType_IsData(childtype) && (item = cinfo->content.data) != NULL)) {
+		    /* we are the innermost non-data and we have data - feed it in */
+		    (void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
+	        } else {
+		    /* else we'll have to get data from user */
+		    SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
+		}
+	    } else {
+	        /* if we have a nested encoder, wait for its data */
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
+	    }
 	}
 	if (after && dest == &(cinfo->rawContent)) {
 	    if (nss_cms_after_data(p7ecx) != SECSuccess)
 		p7ecx->error = PORT_GetError();
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-	break;
+    } else {
+	/* we're still in the root message */
+	if (after && dest == &(rootcinfo->contentType)) {
+	    /* got the content type OID now - so find out the type tag */
+	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
+	    /* set up a pointer to our current content */
+	    p7ecx->content = rootcinfo->content;
+	}
     }
 }
 
@@ -247,7 +258,11 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	rv = NSS_CMSEncryptedData_Encode_BeforeData(p7ecx->content.encryptedData);
 	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeData(p7ecx->type, p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -258,14 +273,7 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    switch (childtype) {
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-#if 0
-    case SEC_OID_PKCS7_DATA:		/* XXX here also??? maybe yes! */
-#endif
+    if (NSS_CMSType_IsWrapper(childtype)) {
 	/* in these cases, we need to set up a child encoder! */
 	/* create new encoder context */
 	childp7ecx = PORT_ZAlloc(sizeof(NSSCMSEncoderContext));
@@ -284,6 +292,8 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	childp7ecx->output.destpoolp = NULL;
 	childp7ecx->output.dest = NULL;
 	childp7ecx->cmsg = p7ecx->cmsg;
+	childp7ecx->ecxupdated = PR_FALSE;
+	childp7ecx->childp7ecx = NULL;
 
 	template = NSS_CMSUtil_GetTemplateByTypeTag(childtype);
 	if (template == NULL)
@@ -303,11 +313,8 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	    break;
-	case SEC_OID_PKCS7_DATA:
-	    rv = SECSuccess;
-	    break;
 	default:
-	    PORT_Assert(0);
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(childp7ecx->type, cinfo->content.genericData);
 	    break;
 	}
 	if (rv != SECSuccess)
@@ -321,17 +328,17 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	if (childp7ecx->ecx == NULL)
 	    goto loser;
 
-	childp7ecx->ecxupdated = PR_FALSE;
-
 	/*
 	 * Indicate that we are streaming.  We will be streaming until we
 	 * get past the contents bytes.
 	 */
-	SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
+        if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
+	    SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
 
 	/*
 	 * The notify function will watch for the contents field.
 	 */
+	p7ecx->childp7ecx = childp7ecx;
 	SEC_ASN1EncoderSetNotifyProc(childp7ecx->ecx, nss_cms_encoder_notify, childp7ecx);
 
 	/* please note that we are NOT calling SEC_ASN1EncoderUpdate here to kick off the */
@@ -339,22 +346,11 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	/* otherwise we'd be encoding data from a call of the notify function of the */
 	/* parent encoder (which would not work) */
 
-	/* this will kick off the encoding process & encode everything up to the content bytes,
-	 * at which point the notify function sets streaming mode (and possibly creates
-	 * another child encoder). */
-	if (SEC_ASN1EncoderUpdate(childp7ecx->ecx, NULL, 0) != SECSuccess)
-	    goto loser;
-
-	p7ecx->childp7ecx = childp7ecx;
-	break;
-
-    case SEC_OID_PKCS7_DATA:
+    } else if (NSS_CMSType_IsData(childtype)) {
 	p7ecx->childp7ecx = NULL;
-	break;
-    default:
+    } else {
 	/* we do not know this type */
 	p7ecx->error = SEC_ERROR_BAD_DER;
-	break;
     }
 
     return SECSuccess;
@@ -364,6 +360,7 @@ loser:
 	if (childp7ecx->ecx)
 	    SEC_ASN1EncoderFinish(childp7ecx->ecx);
 	PORT_Free(childp7ecx);
+	p7ecx->childp7ecx = NULL;
     }
     return SECFailure;
 }
@@ -387,11 +384,12 @@ nss_cms_after_data(NSSCMSEncoderContext *p7ecx)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	rv = NSS_CMSEncryptedData_Encode_AfterData(p7ecx->content.encryptedData);
 	break;
-    case SEC_OID_PKCS7_DATA:
-	/* do nothing */
-	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_AfterData(p7ecx->type, p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
 	break;
     }
     return rv;
@@ -432,23 +430,23 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
     }
 
     /* Update the running digest. */
-    if (len && cinfo->digcx != NULL)
-	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
+    if (len && cinfo->privateInfo && cinfo->privateInfo->digcx != NULL)
+	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
 
     /* Encrypt this chunk. */
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	unsigned int inlen;	/* length of data being encrypted */
 	unsigned int outlen;	/* length of encrypted data */
 	unsigned int buflen;	/* length available for encrypted data */
 
 	inlen = len;
-	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->ciphcx, inlen, final);
+	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->privateInfo->ciphcx, inlen, final);
 	if (buflen == 0) {
 	    /*
 	     * No output is expected, but the input data may be buffered
 	     * so we still have to call Encrypt.
 	     */
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, NULL, NULL, 0,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, NULL, NULL, 0,
 				   data, inlen, final);
 	    if (final) {
 		len = 0;
@@ -465,7 +463,7 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
 	if (buf == NULL) {
 	    rv = SECFailure;
 	} else {
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, buf, &outlen, buflen,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
 				   data, inlen, final);
 	    data = buf;
 	    len = outlen;
@@ -481,12 +479,12 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
      * (which will encode it, then hand it back to the user or the parent encoder)
      * We don't encode the data if we're innermost and we're told not to include the data
      */
-    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != NULL))
+    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != cinfo->content.pointer))
 	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, (const char *)data, len);
 
 done:
 
-    if (cinfo->ciphcx != NULL) {
+    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
 	if (dest != NULL) {
 	    dest->data = buf;
 	    dest->len = len;
@@ -532,6 +530,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     NSSCMSEncoderContext *p7ecx;
     SECStatus rv;
     NSSCMSContentInfo *cinfo;
+    SECOidTag tag;
 
     NSS_CMSMessage_SetEncodingParams(cmsg, pwfn, pwfn_arg, decrypt_key_cb, decrypt_key_cb_arg,
 					detached_digestalgs, detached_digests);
@@ -551,7 +550,8 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 
     cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
 
-    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
+    tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
+    switch (tag) {
     case SEC_OID_PKCS7_SIGNED_DATA:
 	rv = NSS_CMSSignedData_Encode_BeforeStart(cinfo->content.signedData);
 	break;
@@ -565,7 +565,12 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 	rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	break;
     default:
-	rv = SECFailure;
+        if (NSS_CMSType_IsWrapper(tag)) {
+	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(tag, 
+						p7ecx->content.genericData);
+	} else {
+	    rv = SECFailure;
+	}
 	break;
     }
     if (rv != SECSuccess) {
@@ -587,7 +592,8 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
      * Indicate that we are streaming.  We will be streaming until we
      * get past the contents bytes.
      */
-    SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
+    if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
+	SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
 
     /*
      * The notify function will watch for the contents field.
@@ -597,6 +603,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     /* this will kick off the encoding process & encode everything up to the content bytes,
      * at which point the notify function sets streaming mode (and possibly creates
      * a child encoder). */
+    p7ecx->ecxupdated = PR_TRUE;
     if (SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0) != SECSuccess) {
 	PORT_Free (p7ecx);
 	return NULL;
@@ -627,6 +634,13 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 
     /* hand data to the innermost decoder */
     if (p7ecx->childp7ecx) {
+	/* tell the child to start encoding, up to its first data byte, if it
+	 * hasn't started yet */
+	if (!p7ecx->childp7ecx->ecxupdated) {
+	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
+	    if (SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0) != SECSuccess)
+	        return SECFailure;
+	}
 	/* recursion here */
 	rv = NSS_CMSEncoder_Update(p7ecx->childp7ecx, data, len);
     } else {
@@ -640,7 +654,7 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 	}
 
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-	if (childtype != SEC_OID_PKCS7_DATA)
+	if (!NSS_CMSType_IsData(childtype))
 	    return SECFailure;
 	/* and we must not have preset data */
 	if (cinfo->content.data != NULL)
@@ -721,6 +735,16 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
      * while we are already in NSS_CMSEncoder_Finish, but that's allright.
      */
     if (p7ecx->childp7ecx) {
+	/* tell the child to start encoding, up to its first data byte, if it
+	 * hasn't yet */
+	if (!p7ecx->childp7ecx->ecxupdated) {
+	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
+	    rv = SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0);
+	    if (rv != SECSuccess) {
+		NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
+		goto loser;
+	    }
+	}
 	rv = NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
 	if (rv != SECSuccess)
 	    goto loser;
@@ -737,7 +761,6 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 
     p7ecx->childp7ecx = NULL;
 
-    /* find out about our inner content type - must be data */
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     if (!cinfo) {
 	/* The original programmer didn't expect this to happen */
@@ -745,14 +768,10 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 	rv = SECFailure;
 	goto loser;
     }
-    childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    if (childtype == SEC_OID_PKCS7_DATA && cinfo->content.data == NULL) {
-	SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
-	/* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
-	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
-    }
-
+    SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
     SEC_ASN1EncoderClearStreaming(p7ecx->ecx);
+    /* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
+    rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
 
     if (p7ecx->error)
 	rv = SECFailure;
diff --git a/security/nss/lib/smime/cmsenvdata.c b/security/nss/lib/smime/cmsenvdata.c
index 718844cd7084..1c0c20aade77 100644
--- a/security/nss/lib/smime/cmsenvdata.c
+++ b/security/nss/lib/smime/cmsenvdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS envelopedData methods.
  *
- * $Id: cmsenvdata.c,v 1.11 2005/10/03 22:01:57 relyea%netscape.com Exp $
+ * $Id: cmsenvdata.c,v 1.11.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -270,6 +270,7 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
+    SECStatus rv;
 
     cinfo = &(envd->contentInfo);
 
@@ -281,12 +282,16 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     if (algid == NULL)
 	return SECFailure;
 
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* this may modify algid (with IVs generated in a token).
      * it is essential that algid is a pointer to the contentEncAlg data, not a
      * pointer to a copy! */
-    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->ciphcx == NULL)
+    if (cinfo->privateInfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -298,9 +303,9 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
 SECStatus
 NSS_CMSEnvelopedData_Encode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
-	envd->contentInfo.ciphcx = NULL;
+    if (envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
+	envd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     /* nothing else to do after data */
@@ -380,8 +385,13 @@ NSS_CMSEnvelopedData_Decode_BeforeData(NSSCMSEnvelopedData *envd)
 
     bulkalg = NSS_CMSContentInfo_GetContentEncAlg(cinfo);
 
-    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->ciphcx == NULL)
+    rv = NSS_CMSContentInfo_Private_Init(cinfo);
+    if (rv != SECSuccess) {
+	goto loser;
+    }
+    rv = SECFailure;
+    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->privateInfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -401,9 +411,9 @@ loser:
 SECStatus
 NSS_CMSEnvelopedData_Decode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd && envd->contentInfo.ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
-	envd->contentInfo.ciphcx = NULL;
+    if (envd && envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
+	envd->contentInfo.privateInfo->ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmslocal.h b/security/nss/lib/smime/cmslocal.h
index 0e1c09294a09..222f90a15d5f 100644
--- a/security/nss/lib/smime/cmslocal.h
+++ b/security/nss/lib/smime/cmslocal.h
@@ -42,7 +42,7 @@
  * you.  If that has a problem, then just move out what you need, changing
  * its name as appropriate!
  *
- * $Id: cmslocal.h,v 1.5 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmslocal.h,v 1.5.142.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #ifndef _CMSLOCAL_H_
@@ -54,9 +54,25 @@
 
 extern const SEC_ASN1Template NSSCMSContentInfoTemplate[];
 
+struct NSSCMSContentInfoPrivateStr {
+    NSSCMSCipherContext *ciphcx;
+    NSSCMSDigestContext *digcx;
+    PRBool  dontStream;
+};
+
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
+/*
+ * private content Info stuff
+ */
+
+/* initialize the private content info field. If this returns
+ * SECSuccess, the cinfo->private field is safe to dereference.
+ */
+SECStatus NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo);
+
+
 /***********************************************************************
  * cmscipher.c - en/decryption routines
  ***********************************************************************/
@@ -340,7 +356,34 @@ NSS_CMSAttributeArray_SetAttr(PLArenaPool *poolp, NSSCMSAttribute ***attrs, SECO
 extern SECStatus
 NSS_CMSSignedData_AddTempCertificate(NSSCMSSignedData *sigd, CERTCertificate *cert);
 
+
 /************************************************************************/
+
+/*
+ * local functions to handle user defined S/MIME content types
+ */
+
+
+PRBool NSS_CMSType_IsWrapper(SECOidTag type);
+PRBool NSS_CMSType_IsData(SECOidTag type);
+size_t NSS_CMSType_GetContentSize(SECOidTag type);
+const SEC_ASN1Template * NSS_CMSType_GetTemplate(SECOidTag type);
+
+void NSS_CMSGenericWrapperData_Destroy(SECOidTag type,
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+SECStatus NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
+					NSSCMSGenericWrapperData *gd);
+
 SEC_END_PROTOS
 
 #endif /* _CMSLOCAL_H_ */
diff --git a/security/nss/lib/smime/cmsmessage.c b/security/nss/lib/smime/cmsmessage.c
index 9168ec357442..cb45eba0bba6 100644
--- a/security/nss/lib/smime/cmsmessage.c
+++ b/security/nss/lib/smime/cmsmessage.c
@@ -37,7 +37,7 @@
 /*
  * CMS message methods.
  *
- * $Id: cmsmessage.c,v 1.6 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: cmsmessage.c,v 1.6.192.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -81,6 +81,7 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
 	    PORT_FreeArena(poolp, PR_FALSE);
 	return NULL;
     }
+    NSS_CMSContentInfo_Private_Init(&(cmsg->contentInfo));
 
     cmsg->poolp = poolp;
     cmsg->poolp_is_ours = poolp_is_ours;
@@ -234,11 +235,12 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
 
     /* descend into CMS message */
     for (cinfo = &(cmsg->contentInfo); cinfo != NULL; cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-	if (NSS_CMSContentInfo_GetContentTypeTag(cinfo) != SEC_OID_PKCS7_SIGNED_DATA)
+	if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(cinfo)))
 	    continue;	/* next level */
 	
 	if (NSS_CMSSignedData_ContainsCertsOrCrls(cinfo->content.signedData))
 	    return PR_TRUE;
+	/* callback here for generic wrappers? */
     }
     return PR_FALSE;
 }
@@ -259,6 +261,7 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    return PR_TRUE;
 	default:
+	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
@@ -289,6 +292,7 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
 		return PR_TRUE;
 	    break;
 	default:
+	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
diff --git a/security/nss/lib/smime/cmssigdata.c b/security/nss/lib/smime/cmssigdata.c
index 81ece5473dbe..5a1bb4cea8f9 100644
--- a/security/nss/lib/smime/cmssigdata.c
+++ b/security/nss/lib/smime/cmssigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS signedData methods.
  *
- * $Id: cmssigdata.c,v 1.29 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmssigdata.c,v 1.29.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -217,17 +217,22 @@ loser:
 SECStatus
 NSS_CMSSignedData_Encode_BeforeData(NSSCMSSignedData *sigd)
 {
+    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
+    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* set up the digests */
     if (sigd->digests && sigd->digests[0]) {
-	sigd->contentInfo.digcx = NULL; /* don't attempt to make new ones. */
+	sigd->contentInfo.privateInfo->digcx = NULL; /* don't attempt to make new ones. */
     } else if (sigd->digestAlgorithms != NULL) {
-	sigd->contentInfo.digcx = 
+	sigd->contentInfo.privateInfo->digcx =
 	        NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.digcx == NULL)
+	if (sigd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -267,11 +272,11 @@ NSS_CMSSignedData_Encode_AfterData(NSSCMSSignedData *sigd)
     cinfo = &(sigd->contentInfo);
 
     /* did we have digest calculation going on? */
-    if (cinfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->digcx, poolp, 
+    if (cinfo->privateInfo && cinfo->privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->privateInfo->digcx, poolp,
 	                                         &(sigd->digests));
 	/* error has been set by NSS_CMSDigestContext_FinishMultiple */
-	cinfo->digcx = NULL;
+	cinfo->privateInfo->digcx = NULL;
 	if (rv != SECSuccess)
 	    goto loser;		
     }
@@ -392,15 +397,20 @@ loser:
 SECStatus
 NSS_CMSSignedData_Decode_BeforeData(NSSCMSSignedData *sigd)
 {
+    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
+    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
+    if (rv != SECSuccess) {
+	return SECFailure;
+    }
     /* set up the digests */
     if (sigd->digestAlgorithms != NULL && sigd->digests == NULL) {
 	/* if digests are already there, do nothing */
-	sigd->contentInfo.digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.digcx == NULL)
+	sigd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
+	if (sigd->contentInfo.privateInfo->digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -421,11 +431,11 @@ NSS_CMSSignedData_Decode_AfterData(NSSCMSSignedData *sigd)
     }
 
     /* did we have digest calculation going on? */
-    if (sigd->contentInfo.digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.digcx, 
+    if (sigd->contentInfo.privateInfo && sigd->contentInfo.privateInfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.privateInfo->digcx,
 				       sigd->cmsg->poolp, &(sigd->digests));
 	/* error set by NSS_CMSDigestContext_FinishMultiple */
-	sigd->contentInfo.digcx = NULL;
+	sigd->contentInfo.privateInfo->digcx = NULL;
     }
     return rv;
 }
diff --git a/security/nss/lib/smime/cmst.h b/security/nss/lib/smime/cmst.h
index b5de52b109ba..11b772a3093c 100644
--- a/security/nss/lib/smime/cmst.h
+++ b/security/nss/lib/smime/cmst.h
@@ -37,7 +37,7 @@
 /*
  * Header for CMS types.
  *
- * $Id: cmst.h,v 1.10 2005/06/27 22:21:19 julien.pierre.bugs%sun.com Exp $
+ * $Id: cmst.h,v 1.10.142.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #ifndef _CMST_H_
@@ -98,6 +98,8 @@ typedef struct NSSCMSRecipientInfoStr NSSCMSRecipientInfo;
 typedef struct NSSCMSDigestedDataStr NSSCMSDigestedData;
 typedef struct NSSCMSEncryptedDataStr NSSCMSEncryptedData;
 
+typedef struct NSSCMSGenericWrapperDataStr NSSCMSGenericWrapperData;
+
 typedef struct NSSCMSSMIMEKEAParametersStr NSSCMSSMIMEKEAParameters;
 
 typedef struct NSSCMSAttributeStr NSSCMSAttribute;
@@ -108,6 +110,21 @@ typedef struct NSSCMSEncoderContextStr NSSCMSEncoderContext;
 typedef struct NSSCMSCipherContextStr NSSCMSCipherContext;
 typedef struct NSSCMSDigestContextStr NSSCMSDigestContext;
 
+typedef struct NSSCMSContentInfoPrivateStr NSSCMSContentInfoPrivate;
+
+typedef SECStatus (*NSSCMSGenericWrapperDataCallback)
+						(NSSCMSGenericWrapperData *);
+typedef   void    (*NSSCMSGenericWrapperDataDestroy) 
+						(NSSCMSGenericWrapperData *);
+
+extern const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[];
+extern const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[];
+
+SEC_ASN1_CHOOSER_DECLARE(NSS_PointerToCMSGenericWrapperDataTemplate)
+SEC_ASN1_CHOOSER_DECLARE(NSSCMSGenericWrapperDataTemplate)
+
+
+
 /*
  * Type of function passed to NSSCMSDecode or NSSCMSDecoderStart.
  * If specified, this is where the content bytes (only) will be "sent"
@@ -142,6 +159,7 @@ union NSSCMSContentUnion {
     NSSCMSEncryptedData	*	encryptedData;
     NSSCMSEnvelopedData	*	envelopedData;
     NSSCMSSignedData *		signedData;
+    NSSCMSGenericWrapperData *	genericData;
     /* or anonymous pointer to something */
     void *			pointer;
 };
@@ -164,8 +182,8 @@ struct NSSCMSContentInfoStr {
 							 * (only used by creation code) */
     SECOidTag			contentEncAlgTag;	/* oid tag of encryption algorithm
 							 * (only used by creation code) */
-    NSSCMSCipherContext		*ciphcx;		/* context for en/decryption going on */
-    NSSCMSDigestContext		*digcx;			/* context for digesting going on */
+    NSSCMSContentInfoPrivate	*privateInfo;		/* place for NSS private info */
+    void		*reserved;			/* keep binary compatibility */
 };
 
 /* =============================================================================
@@ -186,6 +204,18 @@ struct NSSCMSMessageStr {
     void *		decrypt_key_cb_arg;
 };
 
+/* ============================================================================
+ * GENERIC WRAPPER
+ * 
+ * used for user defined types.
+ */
+struct NSSCMSGenericWrapperDataStr {
+    NSSCMSContentInfo	contentInfo;
+    /* ---- local; not part of encoding ------ */
+    NSSCMSMessage *	cmsg;
+    /* wrapperspecific data starts here */
+};
+
 /* =============================================================================
  * SIGNEDDATA
  */
diff --git a/security/nss/lib/smime/cmsudf.c b/security/nss/lib/smime/cmsudf.c
new file mode 100644
index 000000000000..025c0e36b0d8
--- /dev/null
+++ b/security/nss/lib/smime/cmsudf.c
@@ -0,0 +1,480 @@
+/* ***** 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 Netscape security libraries.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1994-2000
+ * 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 ***** */
+
+/*
+ * CMS User Define Types
+ *
+ * $Id: cmsudf.c,v 1.1.2.4 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ */
+
+#include "cmslocal.h"
+
+#include "prinit.h"
+#include "pk11func.h"
+#include "secitem.h"
+#include "secoid.h"
+#include "secerr.h"
+#include "nss.h"
+
+typedef struct nsscmstypeInfoStr nsscmstypeInfo;
+struct nsscmstypeInfoStr {
+    SECOidTag type;
+    SEC_ASN1Template *template;
+    size_t size;
+    PRBool isData;
+    NSSCMSGenericWrapperDataDestroy  destroy;
+    NSSCMSGenericWrapperDataCallback decode_before;
+    NSSCMSGenericWrapperDataCallback decode_after;
+    NSSCMSGenericWrapperDataCallback decode_end;
+    NSSCMSGenericWrapperDataCallback encode_start;
+    NSSCMSGenericWrapperDataCallback encode_before;
+    NSSCMSGenericWrapperDataCallback encode_after;
+};
+
+/* make sure the global tables are only initialized once */
+static PRCallOnceType nsscmstypeOnce;
+static PRCallOnceType nsscmstypeClearOnce;
+/* lock for adding a new entry */
+static PRLock *nsscmstypeAddLock;
+/* lock for the hash table */
+static PRLock *nsscmstypeHashLock;
+/* the hash table itself */
+static PLHashTable *nsscmstypeHash;
+/* arena to hold all the hash table data */
+static PRArenaPool *nsscmstypeArena;
+
+/*
+ * clean up our global tables
+ */
+SECStatus
+nss_cmstype_shutdown(void *appData, void *reserved)
+{
+    if (nsscmstypeHashLock) {
+	PR_Lock(nsscmstypeHashLock);
+    }
+    if (nsscmstypeHash) {
+	PL_HashTableDestroy(nsscmstypeHash);
+	nsscmstypeHash = NULL;
+    }
+    if (nsscmstypeArena) {
+	PORT_FreeArena(nsscmstypeArena, PR_FALSE);
+	nsscmstypeArena = NULL;
+    }
+    if (nsscmstypeAddLock) {
+	PR_DestroyLock(nsscmstypeAddLock);
+    }
+    if (nsscmstypeHashLock) {
+	PRLock *oldLock = nsscmstypeHashLock;
+	nsscmstypeHashLock = NULL;
+	PR_Unlock(oldLock);
+	PR_DestroyLock(oldLock);
+    }
+
+    /* don't clear out the PR_ONCE data if we failed our inital call */
+    if (appData == NULL) {
+    	nsscmstypeOnce = nsscmstypeClearOnce;
+    }
+    return SECSuccess;
+}
+
+static PLHashNumber
+nss_cmstype_hash_key(const void *key)
+{
+   return (PLHashNumber) key;
+}
+
+static PRIntn
+nss_cmstype_compare_keys(const void *v1, const void *v2)
+{
+   PLHashNumber value1 = (PLHashNumber) v1;
+   PLHashNumber value2 = (PLHashNumber) v2;
+
+   return (value1 == value2);
+}
+
+/*
+ * initialize our hash tables, called once on the first attemat to register
+ * a new SMIME type.
+ */
+static PRStatus
+nss_cmstype_init(void)
+{
+    SECStatus rv;
+        
+    nsscmstypeHashLock = PR_NewLock();
+    if (nsscmstypeHashLock == NULL) {
+	return PR_FAILURE;
+    }
+    nsscmstypeAddLock = PR_NewLock();
+    if (nsscmstypeHashLock == NULL) {
+	goto fail;
+    }
+    nsscmstypeHash = PL_NewHashTable(64, nss_cmstype_hash_key, 
+		nss_cmstype_compare_keys, PL_CompareValues, NULL, NULL);
+    if (nsscmstypeHash == NULL) {
+	goto fail;
+    }
+    nsscmstypeArena = PORT_NewArena(2048);
+    if (nsscmstypeArena == NULL) {
+	goto fail;
+    }
+    rv = NSS_RegisterShutdown(nss_cmstype_shutdown, NULL);
+    if (rv != SECSuccess) {
+	goto fail;
+    }
+    return PR_SUCCESS;
+
+fail:
+    nss_cmstype_shutdown(&nsscmstypeOnce, NULL);
+    return PR_FAILURE;
+}
+
+ 
+/*
+ * look up and registered SIME type
+ */
+static const nsscmstypeInfo *
+nss_cmstype_lookup(SECOidTag type)
+{
+    nsscmstypeInfo *typeInfo = NULL;;
+    if (!nsscmstypeHash) {
+	return NULL;
+    }
+    PR_Lock(nsscmstypeHashLock);
+    if (nsscmstypeHash) {
+	typeInfo = PL_HashTableLookupConst(nsscmstypeHash, (void *)type);
+    }
+    PR_Unlock(nsscmstypeHashLock);
+    return typeInfo;
+}
+
+/*
+ * add a new type to the SMIME type table
+ */
+static SECStatus
+nss_cmstype_add(SECOidTag type, nsscmstypeInfo *typeinfo)
+{
+    PLHashEntry *entry;
+
+    if (!nsscmstypeHash) {
+	/* assert? this shouldn't happen */
+	return SECFailure;
+    }
+    PR_Lock(nsscmstypeHashLock);
+    /* this is really paranoia. If we really are racing nsscmstypeHash, we'll
+     * also be racing nsscmstypeHashLock... */
+    if (!nsscmstypeHash) {
+	PR_Unlock(nsscmstypeHashLock);
+	return SECFailure;
+    }
+    entry = PL_HashTableAdd(nsscmstypeHash, (void *)type, typeinfo);
+    PR_Unlock(nsscmstypeHashLock);
+    return entry ? SECSuccess : SECFailure;
+}
+
+
+/* helper functions to manage new content types
+ */
+
+PRBool
+NSS_CMSType_IsWrapper(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = NULL;
+
+    switch (type) {
+    case SEC_OID_PKCS7_SIGNED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+	return PR_TRUE;
+    default:
+	typeInfo = nss_cmstype_lookup(type);
+	if (typeInfo && !typeInfo->isData) {
+	    return PR_TRUE;
+	}
+    }
+    return PR_FALSE;
+}
+
+PRBool
+NSS_CMSType_IsData(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = NULL;
+
+    switch (type) {
+    case SEC_OID_PKCS7_DATA:
+	return PR_TRUE;
+    default:
+	typeInfo = nss_cmstype_lookup(type);
+	if (typeInfo && typeInfo->isData) {
+	    return PR_TRUE;
+	}
+    }
+    return PR_FALSE;
+}
+
+const SEC_ASN1Template *
+NSS_CMSType_GetTemplate(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo && typeInfo->template) {
+	return typeInfo->template;
+    }
+    return SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
+}
+
+size_t
+NSS_CMSType_GetContentSize(SECOidTag type)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo) {
+	return typeInfo->size;
+    }
+    return sizeof(SECItem *);
+
+}
+
+void
+NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
+
+    if (typeInfo && typeInfo->destroy) {
+	(*typeInfo->destroy)(gd);
+    }
+    
+}
+
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
+				     NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_before) {
+	    return (*typeInfo->decode_before)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+    
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
+				    NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_after) {
+	    return (*typeInfo->decode_after)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
+				   NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->decode_end) {
+	    return (*typeInfo->decode_end)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
+				      NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_start) {
+	    return (*typeInfo->encode_start)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
+				     NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_before) {
+	    return (*typeInfo->encode_before)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+SECStatus
+NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
+				    NSSCMSGenericWrapperData *gd)
+{
+    const nsscmstypeInfo *typeInfo;
+
+    /* short cut common case */
+    if (type == SEC_OID_PKCS7_DATA) {
+	return SECSuccess;
+    }
+
+    typeInfo = nss_cmstype_lookup(type);
+    if (typeInfo) {
+	if  (typeInfo->encode_after) {
+	    return (*typeInfo->encode_after)(gd);
+	}
+	/* decoder ops optional for data tags */
+	if (typeInfo->isData) {
+	    return SECSuccess;
+	}
+    }
+    /* expected a function, but none existed */
+    return SECFailure;
+}
+
+
+SECStatus
+NSS_CMSType_RegisterContentType(SECOidTag type, 
+			SEC_ASN1Template *asn1Template, size_t size, 
+			NSSCMSGenericWrapperDataDestroy destroy,
+			NSSCMSGenericWrapperDataCallback decode_before,
+			NSSCMSGenericWrapperDataCallback decode_after,
+			NSSCMSGenericWrapperDataCallback decode_end,
+			NSSCMSGenericWrapperDataCallback encode_start,
+			NSSCMSGenericWrapperDataCallback encode_before,
+			NSSCMSGenericWrapperDataCallback encode_after,
+			PRBool isData)
+{
+    PRStatus rc;
+    SECStatus rv;
+    nsscmstypeInfo *typeInfo;
+    const nsscmstypeInfo *exists;
+
+    rc = PR_CallOnce( &nsscmstypeOnce, nss_cmstype_init);
+    if (rc == PR_FAILURE) {
+	return SECFailure;
+    }
+    PR_Lock(nsscmstypeAddLock);
+    exists = nss_cmstype_lookup(type);
+    if (exists) {
+	PR_Unlock(nsscmstypeAddLock);
+	/* already added */
+	return SECSuccess;
+    }
+    typeInfo = PORT_ArenaNew(nsscmstypeArena, nsscmstypeInfo);
+    typeInfo->type = type;
+    typeInfo->size = size;
+    typeInfo->isData = isData;
+    typeInfo->template = asn1Template;
+    typeInfo->destroy = destroy;
+    typeInfo->decode_before = decode_before;
+    typeInfo->decode_after = decode_after;
+    typeInfo->decode_end = decode_end;
+    typeInfo->encode_start = encode_start;
+    typeInfo->encode_before = encode_before;
+    typeInfo->encode_after = encode_after;
+    rv = nss_cmstype_add(type, typeInfo);
+    PR_Unlock(nsscmstypeAddLock);
+    return rv;
+}
+
diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c
index edbb71818e5f..a60255be9dae 100644
--- a/security/nss/lib/smime/cmsutil.c
+++ b/security/nss/lib/smime/cmsutil.c
@@ -38,7 +38,7 @@
 /*
  * CMS miscellaneous utility functions.
  *
- * $Id: cmsutil.c,v 1.15 2008/03/10 00:01:27 wtc%google.com Exp $
+ * $Id: cmsutil.c,v 1.15.54.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
  */
 
 #include "cmslocal.h"
@@ -243,8 +243,7 @@ NSS_CMSUtil_GetTemplateByTypeTag(SECOidTag type)
 	template = NSSCMSDigestedDataTemplate;
 	break;
     default:
-    case SEC_OID_PKCS7_DATA:
-	template = NULL;
+	template = NSS_CMSType_GetTemplate(type);
 	break;
     }
     return template;
@@ -269,8 +268,7 @@ NSS_CMSUtil_GetSizeByTypeTag(SECOidTag type)
 	size = sizeof(NSSCMSDigestedData);
 	break;
     default:
-    case SEC_OID_PKCS7_DATA:
-	size = 0;
+	size = NSS_CMSType_GetContentSize(type);
 	break;
     }
     return size;
@@ -300,6 +298,9 @@ NSS_CMSContent_GetContentInfo(void *msg, SECOidTag type)
 	break;
     default:
 	cinfo = NULL;
+	if (NSS_CMSType_IsWrapper(type)) {
+	    cinfo = &(c.genericData->contentInfo);
+	}
     }
     return cinfo;
 }
diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn
index a72b4137790f..1f5421f35e4e 100644
--- a/security/nss/lib/smime/manifest.mn
+++ b/security/nss/lib/smime/manifest.mn
@@ -69,6 +69,7 @@ CSRCS = \
 	cmsreclist.c \
 	cmssigdata.c \
 	cmssiginfo.c \
+	cmsudf.c \
 	cmsutil.c \
 	smimemessage.c \
 	smimeutil.c \
diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def
index 39ccc45bb658..993d108a28bb 100644
--- a/security/nss/lib/smime/smime.def
+++ b/security/nss/lib/smime/smime.def
@@ -273,3 +273,23 @@ SEC_PKCS12AddCertOrChainAndKey;
 ;+    local:
 ;+       *;
 ;+};
+;+NSS_3.12.10 {   # NSS 3.12.10 release
+;+    global:
+NSS_CMSType_RegisterContentType;
+NSS_CMSContentInfo_SetDontStream;
+NSS_SMIMEUtil_CreateMSSMIMEEncKeyPrefs;
+;+#
+;+# Data objects
+;+#
+;+# Don't export these DATA symbols on Windows because they don't work right.
+;+# Use the SEC_ASN1_GET / SEC_ASN1_SUB / SEC_ASN1_XTRN macros to access them.
+;+#
+;+# See nssutil for other examples.
+;+#
+;;NSSCMSGenericWrapperDataTemplate DATA ;
+;;NSS_PointerToCMSGenericWrapperDataTemplate DATA ;
+NSS_Get_NSSCMSGenericWrapperDataTemplate;
+NSS_Get_NSS_PointerToCMSGenericWrapperDataTemplate;
+;+    local:
+;+       *;
+;+};
diff --git a/security/nss/lib/smime/smime.h b/security/nss/lib/smime/smime.h
index d7fbc8cdb8f5..0c112c9a10da 100644
--- a/security/nss/lib/smime/smime.h
+++ b/security/nss/lib/smime/smime.h
@@ -38,7 +38,7 @@
  * Header file for routines specific to S/MIME.  Keep things that are pure
  * pkcs7 out of here; this is for S/MIME policy, S/MIME interoperability, etc.
  *
- * $Id: smime.h,v 1.8 2004/04/25 15:03:16 gerv%gerv.net Exp $
+ * $Id: smime.h,v 1.8.192.1 2011/02/11 03:57:50 emaldona%redhat.com Exp $
  */
 
 #ifndef _SECMIME_H_
@@ -83,7 +83,7 @@ extern SECStatus NSS_SMIMEUtil_EnableCipher(long which, int on);
  * Initialize the local recording of the S/MIME policy.
  * This function is called to allow/disallow a particular cipher.
  *
- * XXX This is for a the current module, I think, so local, static storage
+ * XXX This is for the current module, I think, so local, static storage
  * XXX is okay.  Is that correct, or could multiple uses of the same
  * XXX library expect to operate under different policies?
  *
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 737f7ea95ad8..7a2425c9a9d7 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -4315,7 +4315,7 @@ sftk_expandSearchList(SFTKSearchResults *search, int count)
 
 static CK_RV
 sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
-                        const CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
+                        const CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
 {
     CK_RV crv;
     int objectListSize = search->array_size-search->size;
@@ -4349,7 +4349,7 @@ sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
  */
 CK_RV
 sftk_emailhack(SFTKSlot *slot, SFTKDBHandle *handle, 
-    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
+    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
 {
     PRBool isCert = PR_FALSE;
     int emailIndex = -1;
@@ -4438,22 +4438,47 @@ loser:
     return crv;
 }
 	
+static void
+sftk_pruneSearch(CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
+			PRBool *searchCertDB, PRBool *searchKeyDB) {
+    CK_ULONG i;
+
+    *searchCertDB = PR_TRUE;
+    *searchKeyDB = PR_TRUE;
+    for (i = 0; i < ulCount; i++) {
+	if (pTemplate[i].type == CKA_CLASS && pTemplate[i].pValue != NULL) {
+	    CK_OBJECT_CLASS class = *((CK_OBJECT_CLASS*)pTemplate[i].pValue);
+	    if (class == CKO_PRIVATE_KEY || class == CKO_SECRET_KEY) {
+		*searchCertDB = PR_FALSE;
+	    } else {
+		*searchKeyDB = PR_FALSE;
+	    }
+	    break;
+	}
+    }
+}
 
 static CK_RV
 sftk_searchTokenList(SFTKSlot *slot, SFTKSearchResults *search,
-                        CK_ATTRIBUTE *pTemplate, CK_LONG ulCount,
+                        CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
                         PRBool *tokenOnly, PRBool isLoggedIn)
 {
-    CK_RV crv;
+    CK_RV crv = CKR_OK;
     CK_RV crv2;
-    SFTKDBHandle *certHandle = sftk_getCertDB(slot);
+    PRBool searchCertDB;
+    PRBool searchKeyDB;
+    
+    sftk_pruneSearch(pTemplate, ulCount, &searchCertDB, &searchKeyDB);
 
-    crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
-    crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
-    if (crv == CKR_OK) crv2 = crv;
-    sftk_freeDB(certHandle);
+    if (searchCertDB) {
+	SFTKDBHandle *certHandle = sftk_getCertDB(slot);
+	crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
+	crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
+	if (crv == CKR_OK) crv = crv2;
+	sftk_freeDB(certHandle);
+    }
 
-    if (crv == CKR_OK && isLoggedIn) {
+    if (crv == CKR_OK && isLoggedIn && searchKeyDB) {
 	SFTKDBHandle *keyHandle = sftk_getKeyDB(slot);
     	crv = sftk_searchDatabase(keyHandle, search, pTemplate, ulCount);
     	sftk_freeDB(keyHandle);
diff --git a/security/nss/lib/softoken/rsawrapr.c b/security/nss/lib/softoken/rsawrapr.c
index cda6d7527680..a40c265dcbff 100644
--- a/security/nss/lib/softoken/rsawrapr.c
+++ b/security/nss/lib/softoken/rsawrapr.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: rsawrapr.c,v 1.11 2006/10/23 21:24:38 wtchang%redhat.com Exp $ */
+/* $Id: rsawrapr.c,v 1.11.70.1 2011/04/07 22:54:48 wtc%google.com Exp $ */
 
 #include "blapi.h"
 #include "softoken.h"
@@ -193,7 +193,7 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
     unsigned char *block;
     unsigned char *bp;
     int padLen;
-    int i;
+    int i, j;
     SECStatus rv;
 
     block = (unsigned char *) PORT_Alloc(modulusLen);
@@ -246,28 +246,53 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
 	 * 0x00 || BT || Pad || 0x00 || ActualData
 	 *   1      1   padLen    1      data->len
 	 * Pad is all non-zero random bytes.
+	 *
+	 * Build the block left to right.
+	 * Fill the entire block from Pad to the end with random bytes.
+	 * Use the bytes after Pad as a supply of extra random bytes from 
+	 * which to find replacements for the zero bytes in Pad.
+	 * If we need more than that, refill the bytes after Pad with 
+	 * new random bytes as necessary.
 	 */
-	padLen = modulusLen - data->len - 3;
+	padLen = modulusLen - (data->len + 3);
 	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
 	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
 	    PORT_Free (block);
 	    return NULL;
 	}
-	for (i = 0; i < padLen; i++) {
-	    /* Pad with non-zero random data. */
-	    do {
-		rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
-	    } while (rv == SECSuccess && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
-	    if (rv != SECSuccess) {
-		sftk_fatalError = PR_TRUE;
-		PORT_Free (block);
-		return NULL;
+	j = modulusLen - 2;
+	rv = RNG_GenerateGlobalRandomBytes(bp, j);
+	if (rv == SECSuccess) {
+	    for (i = 0; i < padLen; ) {
+		unsigned char repl;
+		/* Pad with non-zero random data. */
+		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
+		    ++i;
+		    continue;
+		}
+		if (j <= padLen) {
+		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
+					  modulusLen - (2 + padLen));
+		    if (rv != SECSuccess)
+		    	break;
+		    j = modulusLen - 2;
+		}
+		do {
+		    repl = bp[--j];
+		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
+		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
+		    bp[i++] = repl;
+		}
 	    }
 	}
+	if (rv != SECSuccess) {
+	    sftk_fatalError = PR_TRUE;
+	    PORT_Free (block);
+	    return NULL;
+	}
 	bp += padLen;
 	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
 	PORT_Memcpy (bp, data->data, data->len);
-
 	break;
 
       /*
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index c11ff63e737a..45745075d307 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,11 +57,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.12.9.0" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION  "3.12.10.0" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   12
-#define SOFTOKEN_VPATCH   9
+#define SOFTOKEN_VPATCH   10
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_FALSE
+#define SOFTOKEN_BETA     PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/ssl/derive.c b/security/nss/lib/ssl/derive.c
index 84d7da014653..8088296a6110 100644
--- a/security/nss/lib/ssl/derive.c
+++ b/security/nss/lib/ssl/derive.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: derive.c,v 1.12 2008/06/06 01:16:31 wtc%google.com Exp $ */
+/* $Id: derive.c,v 1.12.40.1 2011/03/24 01:39:01 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "ssl.h" 	/* prereq to sslimpl.h */
 #include "certt.h"	/* prereq to sslimpl.h */
@@ -604,6 +604,9 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     PRBool	      testrsa_export = PR_FALSE;
     PRBool	      testecdh = PR_FALSE;
     PRBool	      testecdhe = PR_FALSE;
+#ifdef NSS_ENABLE_ECC
+    SECKEYECParams ecParams = { siBuffer, NULL, 0 };
+#endif
 
     if (!cert || !srvPrivkey || !ciphersuites || !pcanbypass) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -703,10 +706,15 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    /* now wrap it */
 	    enc_pms.len  = SECKEY_PublicKeyStrength(srvPubkey);
 	    enc_pms.data = (unsigned char*)PORT_Alloc(enc_pms.len);
+	    if (enc_pms.data == NULL) {
+	        PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
+	        break;
+	    }
 	    irv = PK11_PubWrapSymKey(CKM_RSA_PKCS, srvPubkey, pms, &enc_pms);
 	    if (irv != SECSuccess) 
 		break;
 	    PK11_FreeSymKey(pms);
+	    pms = NULL;
 	    /* now do the server side--check the triple bypass first */
 	    rv = PK11_PrivDecryptPKCS1(srvPrivkey, rsaPmsBuf, &outLen,
 				       sizeof rsaPmsBuf,
@@ -727,6 +735,16 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 		goto done;
 	    break;
 	}
+
+	/* Check for NULL to avoid double free. 
+	 * SECItem_FreeItem sets data NULL in secitem.c#265 
+	 */
+	if (enc_pms.data != NULL) {
+	    SECITEM_FreeItem(&enc_pms, PR_FALSE);
+        }
+	if (pms) {
+	    PK11_FreeSymKey(pms);
+        }
 #ifdef NSS_ENABLE_ECC
 	for (; (privKeytype == ecKey && ( testecdh || testecdhe)) ||
 	       (privKeytype == rsaKey && testecdhe); ) {
@@ -735,8 +753,7 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    SECKEYPrivateKey *keapriv;
 	    SECKEYPublicKey  *cpub = NULL; /* client's ephemeral ECDH keys */
 	    SECKEYPrivateKey *cpriv = NULL;
-	    SECKEYECParams    ecParams = { siBuffer, NULL, 0 },
-			      *pecParams;
+	    SECKEYECParams   *pecParams = NULL;
 
 	    if (privKeytype == ecKey && testecdhe) {
 		/* TLS_ECDHE_ECDSA */
@@ -821,13 +838,16 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    if (testecdhe) {
 		SECKEY_DestroyPrivateKey(keapriv);
 		SECKEY_DestroyPublicKey(keapub);
-		if (privKeytype == rsaKey)
-		    PORT_Free(ecParams.data);
 	    }
 	    if (rv == SECSuccess && *pcanbypass == PR_FALSE)
 		goto done;
 	    break;
 	}
+	/* Check for NULL to avoid double free. */
+	if (ecParams.data != NULL) {
+	    PORT_Free(ecParams.data);
+	    ecParams.data = NULL;
+	}
 #endif /* NSS_ENABLE_ECC */
 	if (pms)
 	    PK11_FreeSymKey(pms);
@@ -840,7 +860,18 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     if (pms)
 	PK11_FreeSymKey(pms);
 
-    SECITEM_FreeItem(&enc_pms, PR_FALSE);
+    /* Check for NULL to avoid double free. 
+     * SECItem_FreeItem sets data NULL in secitem.c#265 
+     */
+    if (enc_pms.data != NULL) {
+    	SECITEM_FreeItem(&enc_pms, PR_FALSE);
+    }
+#ifdef NSS_ENABLE_ECC
+    if (ecParams.data != NULL) {
+        PORT_Free(ecParams.data);
+        ecParams.data = NULL;
+    }
+#endif /* NSS_ENABLE_ECC */
 
     if (srvPubkey) {
     	SECKEY_DestroyPublicKey(srvPubkey);
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index d3f455c94eae..e2b9005d9652 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -152,3 +152,9 @@ SSL_SNISocketConfigHook;
 ;+    local:
 ;+*;
 ;+};
+;+NSS_3.12.10 {      # NSS 3.12.10 release
+;+    global:
+SSL_ConfigSecureServerWithCertChain;
+;+    local:
+;+*;
+;+};
diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h
index 4a9e89d60a98..1dcb4a0c9c8e 100644
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl.h,v 1.38.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: ssl.h,v 1.38.2.4 2011/04/08 05:44:32 wtc%google.com Exp $ */
 
 #ifndef __ssl_h_
 #define __ssl_h_
@@ -372,6 +372,15 @@ SSL_IMPORT SECStatus SSL_ConfigSecureServer(
 				PRFileDesc *fd, CERTCertificate *cert,
 				SECKEYPrivateKey *key, SSLKEAType kea);
 
+/*
+** Allows SSL socket configuration with caller-supplied certificate chain.
+** If certChainOpt is NULL, tries to find one.
+*/
+SSL_IMPORT SECStatus
+SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
+                                    const CERTCertificateList *certChainOpt,
+                                    SECKEYPrivateKey *key, SSLKEAType kea);
+
 /*
 ** Configure a secure server's session-id cache. Define the maximum number
 ** of entries in the cache, the longevity of the entires, and the directory
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 80489139c5ff..850a54ceeba6 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3con.c,v 1.142.2.4 2010/09/01 19:47:11 wtc%google.com Exp $ */
+/* $Id: ssl3con.c,v 1.142.2.5 2011/01/25 01:49:22 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
@@ -4837,14 +4837,8 @@ ssl3_SendCertificateVerify(sslSocket *ss)
 	sid->u.ssl3.clAuthValid      = PR_TRUE;
 	PK11_FreeSlot(slot);
     }
-    /* If we're doing RSA key exchange, we're all done with the private key
-     * here.  Diffie-Hellman key exchanges need the client's
-     * private key for the key exchange.
-     */
-    if (ss->ssl3.hs.kea_def->exchKeyType == kt_rsa) {
-	SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-	ss->ssl3.clientPrivateKey = NULL;
-    }
+    SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+    ss->ssl3.clientPrivateKey = NULL;
     if (rv != SECSuccess) {
 	goto done;	/* err code was set by ssl3_SignHashes */
     }
@@ -4899,6 +4893,20 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
+    /* clean up anything left from previous handshake. */
+    if (ss->ssl3.clientCertChain != NULL) {
+       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
+       ss->ssl3.clientCertChain = NULL;
+    }
+    if (ss->ssl3.clientCertificate != NULL) {
+       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
+       ss->ssl3.clientCertificate = NULL;
+    }
+    if (ss->ssl3.clientPrivateKey != NULL) {
+       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+       ss->ssl3.clientPrivateKey = NULL;
+    }
+
     temp = ssl3_ConsumeHandshakeNumber(ss, 2, &b, &length);
     if (temp < 0) {
     	goto loser; 	/* alert has been sent */
@@ -5454,19 +5462,9 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
-    /* clean up anything left from previous handshake. */
-    if (ss->ssl3.clientCertChain != NULL) {
-       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
-       ss->ssl3.clientCertChain = NULL;
-    }
-    if (ss->ssl3.clientCertificate != NULL) {
-       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
-       ss->ssl3.clientCertificate = NULL;
-    }
-    if (ss->ssl3.clientPrivateKey != NULL) {
-       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-       ss->ssl3.clientPrivateKey = NULL;
-    }
+    PORT_Assert(ss->ssl3.clientCertChain == NULL);
+    PORT_Assert(ss->ssl3.clientCertificate == NULL);
+    PORT_Assert(ss->ssl3.clientPrivateKey == NULL);
 
     isTLS = (PRBool)(ss->ssl3.prSpec->version > SSL_LIBRARY_VERSION_3_0);
     rv = ssl3_ConsumeHandshakeVariable(ss, &cert_types, 1, &b, &length);
diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c
index becbfe9c70c6..3a92fa0281a1 100644
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -41,7 +41,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* TLS extension code moved here from ssl3ecc.c */
-/* $Id: ssl3ext.c,v 1.14 2010/04/03 19:19:07 nelson%bolyard.com Exp $ */
+/* $Id: ssl3ext.c,v 1.14.2.2 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "nssrenam.h"
 #include "nss.h"
@@ -56,7 +56,7 @@ static unsigned char  key_name[SESS_TICKET_KEY_NAME_LEN];
 static PK11SymKey    *session_ticket_enc_key_pkcs11 = NULL;
 static PK11SymKey    *session_ticket_mac_key_pkcs11 = NULL;
 
-static unsigned char  session_ticket_enc_key[32];
+static unsigned char  session_ticket_enc_key[AES_256_KEY_LENGTH];
 static unsigned char  session_ticket_mac_key[SHA256_LENGTH];
 
 static PRBool         session_ticket_keys_initialized = PR_FALSE;
@@ -1266,14 +1266,17 @@ no_ticket:
 			SSL_GETPID(), ss->fd));
 	ssl3stats = SSL_GetStatistics();
 	SSL_AtomicIncrementLong(& ssl3stats->hch_sid_ticket_parse_failures );
-	if (sid) {
-	    ssl_FreeSID(sid);
-	    sid = NULL;
-	}
     }
     rv = SECSuccess;
 
 loser:
+	/* ss->sec.ci.sid == sid if it did NOT come here via goto statement
+	 * in that case do not free sid
+	 */
+	if (sid && (ss->sec.ci.sid != sid)) {
+	    ssl_FreeSID(sid);
+	    sid = NULL;
+	}
     if (decrypted_state != NULL) {
 	SECITEM_FreeItem(decrypted_state, PR_TRUE);
 	decrypted_state = NULL;
diff --git a/security/nss/lib/ssl/sslcon.c b/security/nss/lib/ssl/sslcon.c
index 4e345548b4b0..8f3bc06a8343 100644
--- a/security/nss/lib/ssl/sslcon.c
+++ b/security/nss/lib/ssl/sslcon.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslcon.c,v 1.40 2010/04/25 23:37:38 nelson%bolyard.com Exp $ */
+/* $Id: sslcon.c,v 1.40.2.1 2011/03/30 17:38:42 wtc%google.com Exp $ */
 
 #include "nssrenam.h"
 #include "cert.h"
@@ -3125,11 +3125,11 @@ ssl2_BeginClientHandshake(sslSocket *ss)
 	/* ssl3_SendClientHello will override this if it succeeds. */
 	ss->version       = SSL_LIBRARY_VERSION_3_0;
 
-	ssl_GetXmitBufLock(ss);    /***************************************/
 	ssl_GetSSL3HandshakeLock(ss);
+	ssl_GetXmitBufLock(ss);
 	rv =  ssl3_SendClientHello(ss);
+	ssl_ReleaseXmitBufLock(ss);
 	ssl_ReleaseSSL3HandshakeLock(ss);
-	ssl_ReleaseXmitBufLock(ss); /***************************************/
 
 	return rv;
     }
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index 9af471d88bc3..91070d35c07f 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslimpl.h,v 1.77.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: sslimpl.h,v 1.77.2.2 2011/03/16 18:55:38 alexei.volkov.bugs%sun.com Exp $ */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ -1515,7 +1515,7 @@ extern PRInt32 ssl3_SendServerNameXtn(sslSocket *ss, PRBool append,
  * fails to do so. If cert and keyPair are NULL - unconfigures
  * sslSocket of kea type.*/
 extern SECStatus ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                                        CERTCertificateList *certChain,
+                                        const CERTCertificateList *certChain,
                                         ssl3KeyPair *keyPair, SSLKEAType kea);
 /* Return key type for the cert */
 extern SSLKEAType ssl_FindCertKEAType(CERTCertificate * cert);
diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c
index 63dc5a28507b..024651073fcc 100644
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslnonce.c,v 1.25 2008/03/10 00:01:28 wtc%google.com Exp $ */
+/* $Id: sslnonce.c,v 1.25.54.1 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
 
 #include "cert.h"
 #include "pk11pub.h"
@@ -222,6 +222,9 @@ ssl_DestroySID(sslSessionID *sid)
     if (sid->u.ssl3.sessionTicket.ticket.data) {
 	SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE);
     }
+    if (sid->u.ssl3.srvName.data) {
+	SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
+    }
     
     PORT_ZFree(sid, sizeof(sslSessionID));
 }
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c
index a0cae5496801..a40dd4fc3195 100644
--- a/security/nss/lib/ssl/sslsecur.c
+++ b/security/nss/lib/ssl/sslsecur.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsecur.c,v 1.43.2.2 2010/08/26 18:06:55 wtc%google.com Exp $ */
+/* $Id: sslsecur.c,v 1.43.2.4 2011/04/08 05:25:21 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "keyhi.h"
@@ -674,7 +674,7 @@ static PRStatus serverCAListSetup(void *arg)
 
 SECStatus
 ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                       CERTCertificateList *certChain,
+                       const CERTCertificateList *certChain,
                        ssl3KeyPair *keyPair, SSLKEAType kea)
 {
     CERTCertificateList *localCertChain = NULL;
@@ -752,6 +752,15 @@ SECStatus
 SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
 		       SECKEYPrivateKey *key, SSL3KEAType kea)
 {
+
+    return SSL_ConfigSecureServerWithCertChain(fd, cert, NULL, key, kea);
+}
+
+SECStatus
+SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
+                                    const CERTCertificateList *certChainOpt,
+                                    SECKEYPrivateKey *key, SSL3KEAType kea)
+{
     sslSocket *ss;
     SECKEYPublicKey *pubKey = NULL;
     ssl3KeyPair *keyPair = NULL;
@@ -822,7 +831,7 @@ SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
         }
 	pubKey = NULL; /* adopted by serverKeyPair */
     }
-    if (ssl_ConfigSecureServer(ss, cert, NULL,
+    if (ssl_ConfigSecureServer(ss, cert, certChainOpt,
                                keyPair, kea) == SECFailure) {
         goto loser;
     }
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index 6c73f25122eb..cd318df29da8 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsnce.c,v 1.54 2010/07/05 19:31:56 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslsnce.c,v 1.54.2.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
  * cache sids!
@@ -1863,17 +1863,25 @@ WrapTicketKey(SECKEYPublicKey *svrPubKey, PK11SymKey *symKey,
 }
 
 static PRBool
-GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
-                          unsigned char *keyName, PK11SymKey **aesKey,
-                          PK11SymKey **macKey)
+GenerateTicketKeys(void *pwArg, unsigned char *keyName, PK11SymKey **aesKey,
+                   PK11SymKey **macKey)
 {
     PK11SlotInfo *slot;
     CK_MECHANISM_TYPE mechanismArray[2];
     PK11SymKey *aesKeyTmp = NULL;
     PK11SymKey *macKeyTmp = NULL;
     cacheDesc *cache = &globalCache;
+    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
+    uint8 *ticketKeyNameSuffix;
 
-    if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
+    if (!cache->cacheMem) {
+        /* cache is not initalized. Use stack buffer */
+        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
+    } else {
+        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
+    }
+
+    if (PK11_GenerateRandom(ticketKeyNameSuffix,
 	    SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess) {
 	SSL_DBG(("%d: SSL[%s]: Unable to generate random key name bytes.",
 		    SSL_GETPID(), "unknown"));
@@ -1885,9 +1893,10 @@ GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
 
     slot = PK11_GetBestSlotMultiple(mechanismArray, 2, pwArg);
     if (slot) {
-	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL, 32, pwArg);
-	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL, SHA256_LENGTH,
-				pwArg);
+	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL,
+                                AES_256_KEY_LENGTH, pwArg);
+	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL,
+                                SHA256_LENGTH, pwArg);
 	PK11_FreeSlot(slot);
     }
 
@@ -1896,15 +1905,39 @@ GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
 		    SSL_GETPID(), "unknown"));
 	goto loser;
     }
+    PORT_Memcpy(keyName, ticketKeyNameSuffix, SESS_TICKET_KEY_VAR_NAME_LEN);
+    *aesKey = aesKeyTmp;
+    *macKey = macKeyTmp;
+    return PR_TRUE;
 
-    /* Export the keys to the shared cache in wrapped form. */
-    if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
-	goto loser;
-    if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
-	goto loser;
+loser:
+    if (aesKeyTmp)
+	PK11_FreeSymKey(aesKeyTmp);
+    if (macKeyTmp)
+	PK11_FreeSymKey(macKeyTmp);
+    return PR_FALSE;
+}
 
-    PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
-	SESS_TICKET_KEY_VAR_NAME_LEN);
+static PRBool
+GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
+                          unsigned char *keyName, PK11SymKey **aesKey,
+                          PK11SymKey **macKey)
+{
+    PK11SymKey *aesKeyTmp = NULL;
+    PK11SymKey *macKeyTmp = NULL;
+    cacheDesc *cache = &globalCache;
+
+    if (!GenerateTicketKeys(pwArg, keyName, &aesKeyTmp, &macKeyTmp)) {
+        goto loser;
+    }
+
+    if (cache->cacheMem) {
+        /* Export the keys to the shared cache in wrapped form. */
+        if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
+            goto loser;
+        if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
+            goto loser;
+    }
     *aesKey = aesKeyTmp;
     *macKey = macKeyTmp;
     return PR_TRUE;
@@ -1971,6 +2004,12 @@ ssl_GetSessionTicketKeysPKCS11(SECKEYPrivateKey *svrPrivKey,
     PRBool keysGenerated = PR_FALSE;
     cacheDesc *cache = &globalCache;
 
+    if (!cache->cacheMem) {
+        /* cache is uninitialized. Generate keys and return them
+         * without caching. */
+        return GenerateTicketKeys(pwArg, keyName, aesKey, macKey);
+    }
+
     now = LockSidCacheLock(cache->keyCacheLock, now);
     if (!now)
 	return rv;
@@ -2000,33 +2039,58 @@ ssl_GetSessionTicketKeys(unsigned char *keyName, unsigned char *encKey,
     PRBool rv = PR_FALSE;
     PRUint32 now = 0;
     cacheDesc *cache = &globalCache;
+    uint8 ticketMacKey[AES_256_KEY_LENGTH], ticketEncKey[SHA256_LENGTH];
+    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
+    uint8 *ticketMacKeyPtr, *ticketEncKeyPtr, *ticketKeyNameSuffix;
+    PRBool cacheIsEnabled = PR_TRUE;
 
-    /* Grab lock. */
-    now = LockSidCacheLock(cache->keyCacheLock, now);
-    if (!now)
-	return rv;
+    if (!cache->cacheMem) { /* cache is uninitialized */
+        cacheIsEnabled = PR_FALSE;
+        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
+        ticketEncKeyPtr = ticketEncKey;
+        ticketMacKeyPtr = ticketMacKey;
+    } else {
+        /* these values have constant memory locations in the cache.
+         * Ok to reference them without holding the lock. */
+        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
+        ticketEncKeyPtr = cache->ticketEncKey->bytes;
+        ticketMacKeyPtr = cache->ticketMacKey->bytes;
+    }
 
-    if (!*(cache->ticketKeysValid)) {
-	if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
+    if (cacheIsEnabled) {
+        /* Grab lock if initialized. */
+        now = LockSidCacheLock(cache->keyCacheLock, now);
+        if (!now)
+            return rv;
+    }
+    /* Going to regenerate keys on every call if cache was not
+     * initialized. */
+    if (!cacheIsEnabled || !*(cache->ticketKeysValid)) {
+	if (PK11_GenerateRandom(ticketKeyNameSuffix,
 		SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(cache->ticketEncKey->bytes, 32) != SECSuccess)
+	if (PK11_GenerateRandom(ticketEncKeyPtr,
+                                AES_256_KEY_LENGTH) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(cache->ticketMacKey->bytes,
-		SHA256_LENGTH) != SECSuccess)
+	if (PK11_GenerateRandom(ticketMacKeyPtr,
+                                SHA256_LENGTH) != SECSuccess)
 	    goto loser;
-	*(cache->ticketKeysValid) = 1;
+        if (cacheIsEnabled) {
+            *(cache->ticketKeysValid) = 1;
+        }
     }
 
     rv = PR_TRUE;
 
  loser:
-    UnlockSidCacheLock(cache->keyCacheLock);
+    if (cacheIsEnabled) {
+        UnlockSidCacheLock(cache->keyCacheLock);
+    }
     if (rv) {
-	PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
-	    SESS_TICKET_KEY_VAR_NAME_LEN);
-	PORT_Memcpy(encKey, cache->ticketEncKey->bytes, 32);
-	PORT_Memcpy(macKey, cache->ticketMacKey->bytes, SHA256_LENGTH);
+	PORT_Memcpy(keyName, ticketKeyNameSuffix,
+                    SESS_TICKET_KEY_VAR_NAME_LEN);
+	PORT_Memcpy(encKey, ticketEncKeyPtr, AES_256_KEY_LENGTH);
+	PORT_Memcpy(macKey, ticketMacKeyPtr, SHA256_LENGTH);
     }
     return rv;
 }
diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c
index bc770a16640f..7819440c8d91 100644
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsock.c,v 1.67.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
+/* $Id: sslsock.c,v 1.67.2.2 2011/03/16 19:04:02 alexei.volkov.bugs%sun.com Exp $ */
 #include "seccomon.h"
 #include "cert.h"
 #include "keyhi.h"
@@ -1271,8 +1271,8 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
 {
     sslSocket * sm = NULL, *ss = NULL;
     int i;
-    sslServerCerts * mc = sm->serverCerts;
-    sslServerCerts * sc = ss->serverCerts;
+    sslServerCerts * mc = NULL;
+    sslServerCerts * sc = NULL;
 
     if (model == NULL) {
         PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
@@ -1301,7 +1301,9 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
     /* This int should be SSLKEAType, but CC on Irix complains,
      * during the for loop.
      */
-    for (i=kt_null; i < kt_kea_size; i++, mc++, sc++) {
+    for (i=kt_null; i < kt_kea_size; i++) {
+        mc = &(sm->serverCerts[i]);
+        sc = &(ss->serverCerts[i]);
         if (mc->serverCert && mc->serverCertChain) {
             if (sc->serverCert) {
                 CERT_DestroyCertificate(sc->serverCert);
diff --git a/security/nss/lib/sysinit/nsssysinit.c b/security/nss/lib/sysinit/nsssysinit.c
index 151c3c574b7c..883ed7833ad1 100644
--- a/security/nss/lib/sysinit/nsssysinit.c
+++ b/security/nss/lib/sysinit/nsssysinit.c
@@ -221,16 +221,16 @@ getFIPSMode(void)
  * 2 for the key slot, and
  * 3 for the crypto operations slot fips
  */
-#define ORDER_FLAGS "trustOrder=75 cipherOrder=100"
+#define CIPHER_ORDER_FLAGS "cipherOrder=100"
 #define SLOT_FLAGS \
 	"[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM" \
 	" askpw=any timeout=30 ]"
  
 static const char *nssDefaultFlags =
-	ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
+	CIPHER_ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
 
 static const char *nssDefaultFIPSFlags =
-	ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
+	CIPHER_ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
 
 /*
  * This function builds the list of databases and modules to load, and sets
@@ -270,7 +270,7 @@ get_list(char *filename, char *stripped_parameters)
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
-        "NSS=\"%sflags=internal%s\"",
+        "NSS=\"trustOrder=75 %sflags=internal%s\"",
         userdb, stripped_parameters, nssflags,
         isFIPS ? ",FIPS" : "");
 
@@ -284,30 +284,6 @@ get_list(char *filename, char *stripped_parameters)
 		userdb, stripped_parameters);
 	}
 
-#if 0
-	/* This doesn't actually work. If we register
-		both this and the sysdb (in either order)
-		then only one of them actually shows up */
-
-    /* Using a NULL filename as a Boolean flag to
-     * prevent registering both an application-defined
-     * db and the system db. rhbz #546211.
-     */
-    PORT_Assert(filename);
-    if (sysdb && PL_CompareStrings(filename, sysdb))
-	    filename = NULL;
-    else if (userdb && PL_CompareStrings(filename, userdb))
-	    filename = NULL;
-
-    if (filename && !userIsRoot()) {
-	    module_list[next++] = PR_smprintf(
-	      "library= "
-	      "module=\"NSS database\" "
-	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
-	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
-    }
-#endif
-
     /* now the system database (always read only unless it's root) */
     if (sysdb) {
 	    const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
@@ -315,7 +291,7 @@ get_list(char *filename, char *stripped_parameters)
 	      "library= "
 	      "module=\"NSS system database\" "
 	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
-	      "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
+	      "NSS=\"trustOrder=80 %sflags=internal,critical\"",sysdb, readonly, nssflags);
     }
 
     /* that was the last module */
@@ -372,9 +348,9 @@ overlapstrcpy(char *target, char *src)
 
 /* determine what options the user was trying to open this database with */
 /* filename is the directory pointed to by configdir= */
-/* stripped is the rest of the paramters with configdir= stripped out */
+/* stripped is the rest of the parameters with configdir= stripped out */
 static SECStatus
-parse_paramters(char *parameters, char **filename, char **stripped)
+parse_parameters(char *parameters, char **filename, char **stripped)
 {
     char *sourcePrev;
     char *sourceCurr;
@@ -423,7 +399,7 @@ NSS_ReturnModuleSpecData(unsigned long function, char *parameters, void *args)
     char **retString = NULL;
     SECStatus rv;
 
-    rv = parse_paramters(parameters, &filename, &stripped);
+    rv = parse_parameters(parameters, &filename, &stripped);
     if (rv != SECSuccess) {
 	/* use defaults */
 	filename = getSystemDB();
diff --git a/security/nss/lib/util/nssb64d.c b/security/nss/lib/util/nssb64d.c
index 12b53e528aea..51426f015fed 100644
--- a/security/nss/lib/util/nssb64d.c
+++ b/security/nss/lib/util/nssb64d.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -563,14 +562,9 @@ PL_Base64DecodeBuffer (const char *src, PRUint32 srclen, unsigned char *dest,
     PLBase64Decoder *data = NULL;
     PRStatus status;
 
-    if (srclen == 0) {
-	*output_destlen = 0;
-	if (dest == NULL) {
-	    /* PR_Malloc(0) is undefined */
-	    return (unsigned char *) PR_Malloc(1);
-	}
+    PR_ASSERT(srclen > 0);
+    if (srclen == 0)
 	return dest;
-    }
 
     /*
      * How much space could we possibly need for decoding this input?
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 4511007f050e..3fd74f510daf 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -51,11 +51,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.12.9.0"
+#define NSSUTIL_VERSION  "3.12.10.0 Beta"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   12
-#define NSSUTIL_VPATCH   9
+#define NSSUTIL_VPATCH   10
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_FALSE
+#define NSSUTIL_BETA     PR_TRUE
 
 #endif /* __nssutil_h_ */
diff --git a/security/nss/lib/util/secasn1e.c b/security/nss/lib/util/secasn1e.c
index 3a4413fa41b5..4f058e2b4ed3 100644
--- a/security/nss/lib/util/secasn1e.c
+++ b/security/nss/lib/util/secasn1e.c
@@ -38,7 +38,7 @@
  * Support for ENcoding ASN.1 data based on BER/DER (Basic/Distinguished
  * Encoding Rules).
  *
- * $Id: secasn1e.c,v 1.21 2006/04/07 11:41:18 kaie%kuix.de Exp $
+ * $Id: secasn1e.c,v 1.21.66.1 2011/01/13 00:26:57 wtc%google.com Exp $
  */
 
 #include "secasn1.h"
@@ -1587,7 +1587,7 @@ SEC_ASN1EncodeItem (PRArenaPool *poolp, SECItem *dest, const void *src,
 
 static SECItem *
 sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
-		  PRBool make_unsigned)
+		  PRBool is_unsigned)
 {
     unsigned long copy;
     unsigned char sign;
@@ -1604,11 +1604,11 @@ sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
     } while (copy);
 
     /*
-     * If this is an unsigned encoding, and the high bit of the last
+     * If 'value' is non-negative, and the high bit of the last
      * byte we counted was set, we need to add one to the length so
      * we put a high-order zero byte in the encoding.
      */
-    if (sign && make_unsigned)
+    if (sign && (is_unsigned || (long)value >= 0))
 	len++;
 
     /*
diff --git a/security/nss/tests/chains/ocspd-config/readme b/security/nss/tests/chains/ocspd-config/readme
index f0e14a51a358..87a3594296b6 100644
--- a/security/nss/tests/chains/ocspd-config/readme
+++ b/security/nss/tests/chains/ocspd-config/readme
@@ -1,16 +1,18 @@
 This script is used to generate certificates used by ocspd.
 
 Some steps to run (only once - before all OCSP testing):
-1. Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
-2. Set environment variable to run only chains tests: export NSS_TESTS=all.sh
-3. Run tests: ./all.sh
-4. Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
-5. Copy ocspd-certs.sh and ocspd.conf.template to this directory
-6. Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
-   Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
+1.  Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
+2.  Set environment variable to run only chains tests: export NSS_TESTS=chains.sh
+3.  Set environment variable to have the correct URI in the certificates: export NSS_AIA_OCSP=http://dochinups.us.oracle.com
+4.  Run tests: ./all.sh
+5.  Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
+6.  Copy ocspd-certs.sh and ocspd.conf.template to this directory
+7.  Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
+    Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
        ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
-7. Copy config files and keys/certs/crls to ocspd etc directory:
-   cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
-   cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
-8. Start ocsp deamons on dochinups (for all configs).
+8.  Commit the new certificates that have been generated under ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
+9.  Copy config files and keys/certs/crls to ocspd etc directory:
+    cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
+    cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
+10. Start ocsp deamons on dochinups (for all configs).
 
diff --git a/security/nss/tests/libpkix/certs/OCSPCA1.cert b/security/nss/tests/libpkix/certs/OCSPCA1.cert
index 8fb20c696dbf4133b4674abddf20eb885cab2b88..6d24954120b014028dbf2ff2ddba4ebd91a63b82 100644
GIT binary patch
delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3?-@ab80+1b1R}T>Z7>xdMfkB7e5!
zy}c;cy>kuU=AVkv!P?iIeknNU_y@F=vtLbJw)A<+gmr~alVge=)~d}-xO9=XNJee>
zB*Xb(Y?Cs(-y}**UT!|&0dw<B`3K*3++x4D^vdCvHP=IC)#~1u@3OnDzjf}vIC-z)
zST*4&*9G&V*n@Z-=K9v=eXu?i+{nbt$iTQb#30CkpN%<GR+y3TKMSh?GmtW{XXDUj
zV`ODzXJlkCHZU~Mhw%*<+mtg(N(!v>^;7bbGcxl^3ySqhi}mu05|eXMC$D9csrO%<
z%K68s&PMivbnVhJRvd*z$1WK+q%zj1RR<cV#>6`vKUmMm@$Z|e>+Qbkf>YjSgSghJ
zoS(Ku@rC1CISISzQF{eTJm&ONo|s&HdF5i=?sZ%Ai<!3Wayz_wSzO<*O@XC{E}#8l
hyDi^rO=$D3>~|fk7N3~C7x3M64ts3<`iCmx3;>O+oRR<l

delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<Xcjab81H1b1R}T>YB&dw7H9@U5E8
z(&Kq#iM#PnR~Do8S?b#~9~`*tv@_N&qHs%>(stWwnbvuyzU}G%7PRfjfi`6s`6<O~
znYpK&Y?>4BJn3>)vCz5K!HHQW2bX``>!jW4KFKg6=iI~{g<hxMy?eZ<dT-qN9W~Y7
z%BsQ>v{;Tm`75xCBSv?A%Bllyp{`8Kj0}v6!wf<U_}Q34WrZ0T|Ff_fFas$AM>Y;^
zHbz!fc1A`PQv+iILm1zHu}w9jq@=(~Uq2;3IU_T#w4hk8C^bbdvmhriFSTUyYDSs*
z73&>$8SFe<@u)}4-*e7^C36$A|6UgND_ZwP^?v3pU-MH(T7C$`GpjxO|H||!Q_tdC
z+v{H(oz}|WIam7SB}EDGuEZ7dH#i0B=P$2ZsUWJ;@a&iQ*J9h!cD7glTMmEsU$(z;
l#iLWcvX6s(R-Qia&-B?^o=@gMHDdd!n76(D;WmqL4gk(Zqpbh{

diff --git a/security/nss/tests/libpkix/certs/OCSPCA1.p12 b/security/nss/tests/libpkix/certs/OCSPCA1.p12
index 4ec3cf5bca6db42ab33cf698d1d69942170ea217..990cbb6f7cf4efa12a50d186721d0dbc5583ee0d 100644
GIT binary patch
delta 1491
zcmV;^1uXic4V(>-8399)8b*J3fnH<b80uhbM;c_Q=`|?=0RaSp0)VryfKw6miMwO+
zhE>2wnuhThT806VA!`F(pu-)LfMrcI--YzFi55PTFCAXA=0Y*KAmkVEuS88un8kM#
zsFC&zohE=_Hv3^8_yIY55m#ZNHOgx2Vd$n$j1Qj1(PbPA^#+g)*bRSFPKo#h?eD--
zySi4kK;v=)nETaSXOo?vA!r^qu=oPtA!7X>;#)zsIIOL6ZP8?M^%r6F8M2JS(Mj#v
z&sizEh(M74;IOZ#wDs%)iyK~t`}+_#sx3N>^xcTLcUO(KOHvJVZx9WkCbvW*sC{--
z{Yw%nV`4KW{zfo}m+OB|H%1*WM!m&FyZ`}+))j)3le)O=B{Q%WEmelCdHvYTsJfvN
zDP(|*214^VITccRf2B1*9=<M-LezlrN0fEBuZuDQX>lRJ^q#QIQa}nmjIUSlL%ePj
z{z?VHaRVp~I#$hLv@Ew+q_VtJ*i&rVNaK-1HGP30wg*O0fW&`ZHOufo@wczI1kCdU
z$QNu`lgw!A^Ez-W`>R3KfV56Hibwra#0+<!QLqNK&BzBHqMdSIKu^k&4x1el@@^Rn
zp|o}5Te`Dw_Di@M);>SL)%BH~VjqYRepjs(I502?um3ZTlnrA?x6xNXb7su=!DYY2
zniuT`QfBc}FMof?Bo7e;C@715d>P}^L4$CB)Xig59&oWEn3c|H|J4U{);77lb|_-b
z-G=3bf(krP0o<Pim3$zxDsJ?64+u5P^IH)KZI-l=l#2+uml9xBq$iwbKb=9Jhlz>O
z7`yNauZaCzkDFY`IKa2*`h&kID897N*Y2V58;C+X!b}{uO1z`l9i(;w!wC3VOm!9o
z76r?J5@nSQh&l0-_X08$*jn*F7yx6d>BBKlZ>>&xoPfB9lRX1De<luae&iRPF3S8R
zHuS-dD*^!lpnwE|0=T!2#-xWP9xa(gmm^_Qy#7lIR#U&Wff_niUhZJ7n9mTCt4mc!
zC>6duQOlX>6no}pxkD4z9+@7=Uj@TmLlW}vA#0tjg=-sV`e%$gGo!CaSQ(_&ISBUm
zv|kGuTG1Ozq66vqe}8PaTkpoH*SeHM{>BFH=|nV5jyy|kkE=hBu(tj*dtdV_mac1G
z8OHg*88Dm0Z-=D4Sv)0EmT}d^rW^*ybul3>X^4ScrJ-2X<l+@|(%DJ7xN7;Jf@uW4
zQqI0T#gu|ysYieOewvw<g>`I;>d1VrZyYXq<g1k}E0IX9e>ujs^T-@9H1~7BVmQx+
zTN_MgE%i+>uH#z$XTaGMp(`Tg%fPLVYj=XPa1BjTM_thWjl?TV^h@gr$+UEEuTjfq
zlOu^w2MTpuS`otaNdOhmDX{cdjX>Xyx+D@$5EVv1ZQ43Won|lrA#MttoHRko1sIU3
zn=A@BJAF%fe<xynBOa7mko;+q&EeP|Zn=<91q|j3t!fF?S`cDminIObi}WP;hN)*O
zv*R%8RT)jf&a&x!D^?eT?H8?HSTL`>&96L!=JvwFngG-7LzJ^^=IuoZ%OY*=AtEdm
zE9W;7?V00R{E+|IIogR4%Dfdi9()TQ=r8(uIM;MZf2f#9`r^s|wq<2;sB=@A!^sYM
zgN?he;pq~h(w%F|1{kGd;$;;fB+JkMd0M=jZOSU+ij^S9+_urP^#@qJlvE4)0eiiM
zdmxy>5;~sQiGYuNnC{ZOpqg`N{2{0=_aV+cSWlGM$xsI4N#>ud4EY^+zWqpWhoSL0
zMv%4IU>5U0Bu87r_TQYwR357Dsh5QyOT+i?Ecsdn;H0M%?R(pWy&S}JnYY$oFm0|0
z0zC@cS|)M?@;*P6GQas&B;k9-3sD_;1It?FB1R{GWg_DmbQwMb2#OD9B{PQ7sFPU+
tBPhiCw(o>3_g{syB1vqo;TZ?1&oKlL&fTqebM%$^Yj1#tWhsT}008Be%X<I-

delta 1499
zcmV<11tj{M4Wtc_839X?8b*ICdr2GY;E}oEZt|=7TfBe*0RaSp0)YHXoOP9*zmZDr
z-$biwv#Cn3;MSmi)|Rng4huXl0Z7C=NujgjYHv?33V6&7QGep((0|G<V@c?#&ZQC8
zw0;`lKxkHw=C<}+AMWPjScEKrx(yMcG<_T!U?m~}UQ_p>!$cn+*lvGmP|{hHlX}9S
zTA=IqejKN9sr$z{-ljoU))f#Ds%`C`oO&)39=as<0j}vyvfQJCznk$gzKcE;4qzEZ
zZAQ*iGeN7s=P~fO0A8A&iROK2VO}+yXGgU@DIl~%>R+H;PUc+oe3C9+_Z3eBSdxQ>
zhf~I<p5s$xnaiyi{WE`8zYaT~DLA^(zWC`hdkAewGrN>LrOz@TTEaCum&@sxURnze
zu;W$)#ZK`dBe5~{Nr)wZQ}TpsJO<9vRp@!jnO;KHpV$>5mJfAkG!7b3IKb`(8zf7G
zLl2&a><ecUqc#gf>gzK<KH_fVYB`;#0Qzz!y901G{(^_f=ZSy(2tT&cRScvPUsom{
zA{96OdPDiBusk$Gm^2KH1J6n7>!X^sJ+9vLfe(B)VRGd<t#LL>R6!=<e6K_#RU@;Y
zR4-uP&Mo4)AViH!r0lkEr>62?0F{J;&NHt{WPp<%+0XYJ-mgb?qoV>uzhi93oa|sW
z&Wy>xeu_3d>zIGo@|>Rt7C@7OXU1FG2#rxkiFtY|hBuBr<zf21Yi0557(iu*weEo>
zZ_sclsBv<^8Gs7=bX6|D=19}kQey-zdy9SnmjGHs838(d-b&5`0pbw3OoCb~&|FA>
zYlvvFtd~JS24GeXySh?P@B7E~dYF&w*icC%ZZI2pXFMG1+5gTgpnBe-iWPV_6C(VL
zYc+`iJlvd>O1|`y_X08$Q7=11ZP2E80VV(e5fZlytKFABlRX1De~Y)hLwdMK%xhLJ
zAmnqd-2wptpnwE|0>GCxfLReyBAH@6`h*l}ja6YoFAnUmOi4s?w6ZzZQWSJNszlh8
zDU#`~t1oPJCB=1D9o28*1s9T(Ur}WS0V2fmd>vzUGt-FyCm46yDBcbGx=$JskpRX-
z(6}>}NFZ>D#{4Y%e`+Q-h#(t<vVYwSp=8Y?pfAsyjU}}oH&7|vZ$O_<wNSc9Pw7T>
z`9BH?Lr$np?H`f^;ZO+9=ch?XzE!6Ws;^C~yv5c@5vBM2Fvd4XP1zRP?Ibj^{FP`L
zdwLKQC*WR*<fT3(g~OI8+D!DHp-Bh;X0NJFGEl=P_p_s`e>q%}$<_u!x_vX%P43Z#
zdR*GP(9!J@v2qBSmuaWBprrF$nD)%0&tHkGQUtq(E^juJ|1|(@+veL2o}6Q4<x>bC
z=IZdDU~%`uZLRkZUlf#FoDF!vHMsi@O_oefOoZ34n(U;A><nvIiBD!eG>6Nds9!g5
z-wqluqzHQNf8s_!v>yOdD7?D3D;NgJMbW!+^aY&aDGCW0-ztX}f3dRlG1jfIs4vjP
z>CP+8=w*o%G{_5F6gb>5tmo@Ce)Ekb1Y(<5K83m%4AN@2-AXw;8H9wijj1P&p1F3M
zzIv9w+PAw#SV4n%uSFZmtVBjxG{k&SpY=AYe0D}+e<MRv?BXd(qHXa;&EnKg-+Wjd
zK26k>=B6%Rz#Fy**`*5noSv(F`99C%6y`$9dQEQ~WQDT~Rj}qJvipe1sub0Z;O=%D
z`BK9u>|zs1QNB`UyRp=Fp~Vv^2c8=-(RI26z0mt-|CjM2*+!pQ3r`c1(~8x&%=Rr_
zx{&-RX!8@oz+%CH#BDNLM#{Z=QSbzA8Uts4c@qb8aguF3KSa4WVtQNQdH;*1TmDCo
zI9#~486h*tb*wg02gfW*544_qE}b=Z^X#^K5g3j-COoqYyz09{$xUZmXSj0&2sx>=
zM+hRJSd&o(BPaowW6iy~LsQTkDUE~ZC{HBwvZ(|R4x3BvvwOCUn=?lWL)6{r0071+
B#!vtN

diff --git a/security/nss/tests/libpkix/certs/OCSPCA2.cert b/security/nss/tests/libpkix/certs/OCSPCA2.cert
index b8b6369786a78e902ade06850e59b90462f77509..63504742aa807a8b3a2eb83aa08d79a417e3ac38 100644
GIT binary patch
delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3>yjab80+1b1R}T>Yc&W7@Wt&T;**
zzp^oX>Bm=Uy3+MkTJ^%GKb~qhv+?w)Cy!?>c*6ekRL7U*3qMq9zObv!S{;9EhlucR
z-gOcs7gl*&)xDc+X;;{6e{7=Ls(mthl9`287inCGdVlckPw!0mt*S=shR#_xpSox&
z^!k_z*oR$h-?6c3#bYI_`2oVyg0q>J85tNChZqDI@Ut<8$_g_w{%2t|U<OhK_G}#5
zY>cd|?2L>o#s-E4`Y^r$W1DhDNlAf~zJ5x6az<ueX+g1GX|Y~@QDSmV>g2VIGWBtr
zc_&uoK0D4RywRw+UVqtli?A~%IW*my3Rk?YI)1RF?Zvaing0VH9?mW=yc4Sv<LCP9
zbm8sOd2JeZ`9(^k6SN!OPhOEcajlugj+Z8$d<_>1PW!|@&)K%@Sy<rqX~%<j9d~(O
iIDAu-Lte~?*)1qTz9}m!|F&K81eayAw*6YqxEcV1!k=pZ

delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<Yn@ab81H1b1R}T>Z5TuYSgwluz(j
zb6}+#1D}1@%s8d(HaV>qLgl2`R&nI4e0X`E^k@Du;iP{n6|B?TITxmzypuX|RMf;e
zB<JwNx4Mf?XS`j(bN*}Cx}dX0Cyu_kb?pBHn?D`Wi@$rWn!?>Tt)rwe{KLA9`}a(e
zdU)&Cl}{P^ht5o673<X&c>g@_Y3Ok#W=00a#bE{^2K;Qyp|Zk^jQ?3!4VZzHfg>A-
zHX9==D?1}2i>ZOJfgy}<z}TjmQBqQ1rLUiopPZ4IS6Wc4SCpEfmsyaLn3q~Ic{QU<
zy|Pk$2aC26-xmkIMz$d3)ZmG2Qw+YI&b;ZpHqWj*OKU6pSMx}pFF7)^OAbDKCR<i}
z%|+JV^n20H1GUE<P06#77BTRZJ9EZ7)goZhDX;a<Kdrp294mZX*J9z{69-!EY+hXU
lWYNd@>2006X8-s;ML=xH(xWd8KgBUlKWOKyF!2uKQUI3XqND%-

diff --git a/security/nss/tests/libpkix/certs/OCSPCA2.p12 b/security/nss/tests/libpkix/certs/OCSPCA2.p12
index 8703675436f6bd155131cda0a35a728b4b3c555f..cfa2b368cfdde553270023af9c2819b95c61ec0b 100644
GIT binary patch
delta 1491
zcmV;^1uXic4V(>-8399)8b*JmVekCE6*Fk(nnVSNdyxqO0RaSp0)TitTueFM?vd#d
z$qM(AR3-5i$3gzo<wspvBH<t!3DHhbW`LsC`mBvY(5w4uML&z?<A(V~X<TDN1^E2z
z$*}^8q8tN5gD84QxSq@}d;&5~gQra8M7!xtS$6jE>S3GPi-&|dxHx}C%@loT6~XEC
z4t8Ob$XCe<!==CSSCC)-A!3HYhTBuiOX+@)^BMyqhHCtX*qoYytHZs1@0jhVW3Axf
z8jCWvJ|O#t;)rBd<$3=k$!gIuot*DvYFq}suHYB6x?FVx4_fOarVRYIqe9yDysXnV
zq`9<`$CMY+7Boj<nwfuc;8tfh<CT5p*N)Z9erREuc^n5mDY5<0dIjkRT%qEymFbfC
zUgXz?+Mp}6beM4YJ0L6<LVhYq{XS)0B#EgJdp5I{wwv_;GDd~XWN~(HCEELfPpq3_
zDG*%hU(T;@qRt7ibcsdN32ngZ=P7f|K2fPzM1-5xvNr91t51KlL&H4uiZ(I8h*vVt
za@h%L@DYVJgA*&r?ml5@Isd&?+enlryFY73Y{|uD)IWJi1usP`%SU3S4f)WD-PB72
zo^wgwht;3w8b<&5bA>|1LSRHaLqM@V$AplRV0|hux@DD=4HlbP-jd5y0Ac#bM8$!4
z_i!5}_vl}vsBVARCSGlbl1q-Tiki)4H){I1{-HnWn!WooMJp&w+3kj(=goet@|hEC
zgY-d?sA5Zqd8dUr+9v{%vH5TjH4(50#|-OQIPgL=0Uwc%hJ(VtP3*{98;MN1u0$@n
z0@12jhTZ_gcBrtNmG|p~lg#2RK}Bt1S%qZ09klWd5+fYf5dmzoIl^(WLmTvr6eb_=
zD1sF21K|K$d^{kN_X08$Ch_&AOj)KnIzgDBD20pgBgZgylRX1De>A}>V?@s$0MWfW
z_8goKDgprkpnwE|0=V)?CnxO+G@K6H-d|<Jex3n6V1`@4Sq>;(>=Hz1A|r#Gn-H;W
zOt&k}BX5KTE)LJ?W_a0KrdoK&FW<Z^f9Pt)6#$x#tA=rt<Lks^<i@PukH`~B4r6P)
zk|Kn^slI;zrDl-ve|5W&_IPS-@ZanXG3({!$(U@mvdL{1Bhg61>Mkz%t!uUdi<izb
zGe#J9x1JeunJCVE)gsXg)TQFsa?qM9BD3&11_oq=ddrnSm=H_+3=EP>*^TBc59c+B
z)15s;r~0$2X*Pdi1o(p$f1p&V)jt|nTK(<R$^Ssa9Ky8Ie>Fd;@0Bl!%(#qN=-}BF
z<Zl_MiFEM#T2FuD3YW0N;0s>m$Q+&q#v}E$e*~!%$x%zHG(uq|KOj8h>d)t)1GwJ`
zo1rUui17u3+8yV?3vg%Z$LiL7*U)cP1-_f^t~{`tYM{oenv#~g-8<m)`U~Vv9vGIO
zB%KA$?4gr3e+AcUmc~%}eZqnA5?6h}FAIQ$a{cy5rpP(JONrS;u^3v@f=k!#Z}t!_
z>hTU`c=bIRLX5Y<TN${;UH<n+ur6lZA3{#|Slq89yDOTNe7HH@FRKf_;YTURU%;M+
zU`A{I>0!y30OB8_wcI*PsE%g+;787l(bS#TFf#MBf0N@HS&M<BWntbbd#REBGGz14
zYK4@}mXw;P73%AXA^zXVNeN{i)@`tz1iQtiFst$5cQ-<4pvoa(U2pK=UUYtg1myij
z(QlfubpO_I^5=gWN9XaR4m4Ey73xa?fP!+U?vLmj;+88_tHcU@5|h&(MJeOURPTvn
zThc4lVD)}R{@}@Z4VK!n$%l2>8VWawH<8PruVkjLik7w|%IhV8R1WNJ@n&0{)x6f9
zeuj|2@ilsdF_-J25jF32hVc;wh5?avq`Vp2aL7qfv9Ig|4fI$92m>RV#aWRa?UPvs
tBPf_HY^V^l$U@J{OUW@v!0pF*6ruzW;ySP48lLSZ>Lm}K$oFFM005}u^Be#G

delta 1499
zcmV<11tj{M4Wtc_839X?8b*H|0kL*vOK1nxjx~4<`s*wL0RaSp0)R5Ta~DwEeZi-i
zjN)Nfwq*vdL1+@PYM=!<s2k$eYFdH`G&uP^nc7-xHC}26OMgxXiwg>|%56D50KFv3
z+3(!~G4#0b1Qa$fW=@iPBo`@qZgud`HGQ6GWjxIB6zj4??^-o36qtVpBd)-eJV3Xp
z;J_`(7%#ZdWdH>2IaM~q4t|wgOwRGx_wruWM1CI@YBwku6C<ODyq4(tVl&4(;3rsQ
zTn|u|Ptq+7`RUc8An8IL2&crFexP8t!yk1nSdVOt<Ppnoe}F^p$Gh-X<vk5oX!4H3
z5EK`k<I<BK$?FgKU}JwGGw_LwZWm5imbe<E55WqNKYb#Evdfr#lDQanCGMSgs5bRG
zqLTIU{_K4()<`E4Hb3w(0<^7lqZiN;a~;#_g<n3&Ow1FuW;sM=k_TSC(<}()Zh;-P
zXo6FI`-*RT5wT8B1ia99Pzu`-1VA`&9Si_#<M`WTbES44?1+CT#O*)E%0mWMB8U}(
zYL-Sc=3(uNtEDKHGibKesW;t{B5CUC&sAhXG#C<y62D7GBH0?*WNB+5a`w!4k2FZz
zxUTd<WVWy*E9+q$R-maXl3y7G?jfN&9#33B%)w=`+R`0Hj&}BSew=kC?s+%EHG-1i
z+e#fjC^#8J=E{FRaI;HgYpOYH>!@mvWR&`8j3$<V;8?L6OLCda!f4*Ur1ViralG+e
z*xqL1-4BGR9K1x5oh}@Y9i9K*JnXEdij+DpP|4p?_V)+u5x{^TCxnlubG{L@)Ley)
zUu@BV_x|O74d1mnkrnOQ#%AQx<Cji;(JoiB*aTEm*Jm8<{Eh?<7Js2=KQrDAlXarN
z?9RKu9<Seca%vcp_X08$Nj^I<fm;Z-+0Gy!j%5mpoimzHlRX1De=Mycdj~L)GgxBl
z-mcRXJOTj$pnwE|0>FAjgOseXq1uBDivJdJ!mOS&tY*BJ0b%vEn@Wfjkm-(jFH$@i
z61}%(%`k8|HUu|3Yvw98sTno!*If3k+iQK5>lA+Hq3L3c2sg%(Cz!WCq-X+>a$v-r
z)dKeQ3&c<aK428;f8&CzKeH7Mj2p)m=fhwQy?RQiqYiuP%5r$0l{xziD4+Q#sd5!+
zQ6HCuHFV22fGM~CM|X8)W#dR&Qbn`8r5%5i*bsQ0;q^26iF^lc4nW6<T!L_6KWR~8
zb&pe`bKUn4YvVmGVyXYT_lmyr)<K;yO@H4E^bj`_O6MT|e?E`S<Ge#9^>TKTlEKED
zwLI7mC2h+eXN<BO;hLc=Y-@yHF*$kh*mwm0+LL(s0%B=)e4k?=_p84!4F$WcKK1_$
zULI5KFn&>{z3AN6fgb!xH^TnkMw?JIhAi9tWwWZ@DNQ>H^=fC3jtec)&SV}D0JOCW
zaK@o4`VX5le*qc%vr8AUq-)u(%~gZfnx!d+#NiRWKkwT2g{J)dm}81T1SOm7VoJw6
zh#(dLcL!e)*9U7e>eNOLq3f)70A2+XUWC6RwTXKJvRvp>5)f00m#v;i0|bw)^uVjA
zVmr~<Lrq(&bl04@u&AwnRaUb=s|S501VDwa2y#p$f8(*{9bTDe0n3<Z0%$0$ertGT
zg8iO1fG-Wrl&WxSuF&oQk^?iaOcgtlbco3NfNOq6W`Lebudf<?7b0Y0)T^4jV6m*&
zq5FXDPN@3&T#yPNg2B(ho#PeE77r|yX(B#lYj@5BwrSctF#?o0FP}yJ$oyPGcHscg
zy_kv9XsXKJhh+G#sj!tmp}L2J$y1D!ks-_ct_dIXipa!#ip<o!WJB)dHfITe!?s1`
zoXb1$<BdGBusO#`rvv*5E9w6ee|fBofe#B|e}T3AlIvgCr`IGY&3@96TgvqW2*Uc>
zl9<wus*_O$BPhftc}U_6{sSJ;yP8z9+Ky0l`UeCMfHPu?3!%C1s3EGa01Kc+005OE
B(6ayl

diff --git a/security/nss/tests/libpkix/certs/OCSPCA3.cert b/security/nss/tests/libpkix/certs/OCSPCA3.cert
index c0bbc3905e65e13b2edce358204c833bba156228..a4ebf27df6f5c71f5ebfd368f3d10c576cf36934 100644
GIT binary patch
delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3>yjab80+1b1R}T>ZKFO%;8c_$R4z
zum@%H?m0d)yS3-YbgSK*0y`AXtn0nIqC$jk^@1Qbu6eg*BK?YrkH#$3dwui5^VSy~
zim@Mc+Un->UhLR8W8&@~U*E_ckamsS5*C{4lanj7ck<6v9yOo6l@o3oB}#N@E65&X
z-0ve8E|t{DvSsc9)4#oMuBNjFdowXJGB7R<F$gl?XJZbP6=r1o&%$cJ45SR~**LV>
z7+G1_85voO4GazRVSEF|Hsy?xk^(Dz{gnLVjLf{!f?~bWV!iyL#N?dR$!i&9>V4+7
z_(uP@EBM1ZBTJ;+F?h<~>r<KS{wsfwsLk*eIJvfbhU^7#xi9g%a{jx%y2f}r+h{`*
z^BM6^yF!~UN$R}z*VFZySeLzot*mqVw29IiSdYyysgdrm@Od)lfkTY?qnM&f`&DaX
hPchB@VE1{~1;@aL9Z~x8!z4Y^D?HX8d7;4g2>|lKnOpz>

delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<XEbab81H1b1R}T>XQ}J6U22;;o(*
zM@-olT=eC`@h0h(@PA>Si*${(_m#Zlki9RN@ZHw?(hhEh!d~awyZ*fvb!Ew7xw!V<
zU#V_W*|q&AIrqd0sIYacXVZ<*?RMPsD*LggV4=vN$dhIfn;c%fx0XA($Bw)C9hd!~
z0~^1;_BgRdMA}^?#Pzy<&y+Kv>zSAt85kFb8H5<{voVLt3NtePXJIv922uu&Y#iEb
zjI6BejEpR%2F3=4Funm}n`%Z$Nr9EVeoB6FMrK}VL9t#@YKmTFK~7>`YRTl)j577r
zT(|Gt^^$5i{kY@Rn<+MnHkVzJ-}P#;{nWUQ4_<kxkH5xftzXz|!ntIBPGFmrn0zGb
z@r2*&=FAUzveSEC1|P%fUwtk+nGZ21hOOw3EIU2_Oi;64=O#97i7#>Dd@J_*{Fs~}
jao*Ear><#r=`H3ZX3c_6PvnJ6SRQ4}Q0sEMl~EG_WPh7)

diff --git a/security/nss/tests/libpkix/certs/OCSPCA3.p12 b/security/nss/tests/libpkix/certs/OCSPCA3.p12
index 2337174e33a1b0dc4deed7fd0355596e6bcd98db..90bb3b3b25e54fecd1ed3ce83ab5085bd10b7025 100644
GIT binary patch
delta 1491
zcmV;^1uXic4V(>-8399)8b*J*+C1#x%$%LBz?a?e+mBlU0RaSp0)Sns)Bn0oi+Q#f
zcqVfoLUGriO_SJ$c?10W)q#2HvkYEwf4<x&krH34+qqRAv}asVO(?#)Jt5+iR8Cxj
zybEnJQ`rmR57xt1Lg-^Jz52i3S{qQF#8iv?#|YP8oo}`O>Ai&_ML2(6yZ(-3S!rnF
zhA{2%OMmEDn4s|y+ddG6Dt*$iG@qH555?Ug_x|%~eL2~pH1z;=L*@3&OU~Cf_pF57
zcjTT|9{qH>A$!wuWs-)A_g15wYx%Xde9SvbF397E=pxKZ366nARnZhseZxqr11-><
zjzs_wOfgBYfWJeiEY*J&s{?96Q5)I@^&Y)f`0K-#LpEx#=x-@{0Kg3Uam_)nvH)Ha
zke9h)$O`u3{5LaDa~uPh)Z_|u+9jSA6&%V^$um35J;ov&oCVmQk`Rq~n*$QL!(Lo<
zM(<0N243*#{N6k>MYE_8g#RlJ(#hKulr*rljB>@Z^yz~(b$)-oqXjbyN^Rt@817Vq
zD5$m6SmT1CCZe&GC1z-vkYH6YP3~}Uv0;JwMX4X}sLm=;f@o`HF|#pJ%IcKY1Gn?=
zTRurfTz4&2%Pr8{P<?l!98>WOt0@??K1(93=x`pL!$ab!Lur5w3%E|O$W_oJg`r3&
zl`y}7OfyW$`T>6qQ3n#NA*mM%oe^;a6K-TKQM_(jN9O4y%HJ>njb8>If(#y{A7Mp<
z*i9~?aOZ1&n3h^ug%Ak>GcDDV(MW>n&;j|NOmzWVNs+|9fdM<=)n~IJVJA47b4HMa
zmKHS-F-^%(nu4iTSrYlPoA{dFqKWaHyY!lvMIve4X3ZQSH!h@t9;mgYHtNKzm;<g!
zko~1&Umrpn$t7Tu_X08$VD9}%D|IyICT~b7mpm%|atd*hlRX1DfAHRk*nky3;-4=e
zX!3izq5=T{pnwE|0=Qk)L?$cV#NFf}QYugAkHq=J%DqPH%9y*x_~qRKW@q?@<P`I|
zuDNmWiQo<trg{;h)>ar6S`>PI-(h;9U-WDeQogrCD|+$xpLc2_l&{AisM%rNGzzTZ
zR(;yG9>GUuFkKwdf92FRoUp_f-g$nB5b{F-#9LN&Rif0aZjL6))aYDQ2k?k@*83YB
z;R(3OeOg=qc2-24M%=><>v~cO+Q`U+Wj$%^M`E4cUV~4f{%skA6pZQmN#tf^E+KC7
zt^TF#Po+cvTmNgg$~_XtCQL$jFes@SbLj6rz9FHghiIP^e<|bQ>M=6D(35*bRQasu
zzl7?^^GZBY?;layr+R{ImboBYQhh42504d*hb0d{{m?}ukG%7RVf48yv<W<VABVFE
zySH0YmYRFZp((rCdu(Cbfykp$k#h{*sC`@v2Btzynvd(Iv7gjgL_z}K2-gZgN%xNU
z=W`-#A^mz3e@_RXmL+=oN{?cS<i<)Z$f3M-V6r6;^;r}zM&=G%_&qy9V5BmuL$D`1
z?nF*Da3f7wU{uWQHQ1o=`vv~!er1|nax}crFv1|a!Q4q^uDjI_f1}4|GHI8@AV^Y+
z{v~!(RHAZge_6+s0wHh=MZ~iX;(&>>PSJuue$*A+e^|UfCX@bEywKkB8cOavuFkH$
z>W$2kq1WZDHovH3|7hd8T{wQh0jU8Gxl9kUU(iMZo^EQt<VpU-T9@3$ci(myjx<6@
z0!Z9rWh{GXvjg=ecW90)PqCTR33Ojp3o#IuJh23hKKhGRa9*L>(LEzF2m&P)u%T)3
zXgFNzU<}^Xe*H>zX!3%5B7+WY-&DaPZs@6vPS<p7E{itgq>vFz(DNDpf5>iFrKN&%
z$4j9P;(R;|4?8h(Xe4m12fTwod!FGyW+J&wj}(ZaXIXEvns~Pa2zir(pH`S<0Fzk;
tBPdAtce5~a{VP9tl5z+=d@&BvYgPmhhT1VL!F!Cp3xn|5Gk($q006>)(w6`L

delta 1499
zcmV<11tj{M4Wtc_839X?8b*J{CS&hqQj~<F2>>7UM1<V}0RaSp0)SB+Xm7icG)Y_1
z{U*u#{xeq61ip6!0eXlZx{!NFQM5GZQoea&Z`AhI*j7H4xYPvU;>$CH={{N$t=W{t
zPOgK;d-S}Zrd6n6{_(~NyTN<*08#Ml720PRbt-c4nV9*Q=WG*B?#_Q)LWxR{{dGx9
z`}`bY@Y)TttHK-di^S*)f`5~#;vh2li5a)vy$QW9a0;i*sT5?b>4<8muj5Q){Dqm`
z0cST}{wyVgu?3gem?&jm6L$QjfcYKp>ks6{Ikp)jN%c*py3lsFaXgdikh8>_{Seb#
zy!zPFm;t3dWB#3_y<2~ys3~T5#>tb@arf=AZZx9VZt#|=61x)ddGt|INnSs@_5pNV
zQbZJ+R(FP4=h`3Obw8a;;ns8>(rJlNPK4}v#;YiJvXKvmhb{@R1>ZOR?W&of>XS2l
z&fXMvS!VS}VWXQ6QSvvT@@@?AL9lw-9S+FRodj7>dX!_b>?42O9P||FLJRWYj>~%W
zOn-?U@EpA2He8fdSX?8$FFYuQn7RZqGm1zEWu!@~rKk;~pcn%}Kox(+b74mO1*<*Z
z7cFMUG)r$cHRC#$mZ*7{nCEgUd2hkTaY&tGbO**#VIxp9!ZNClovwp})W2InJtxYT
zV_x9AJy4&dL#Tfp9s0YRnC1X>ROXec#VUX9Xi7MmAh2iEI|mF`d`Uio(Wp%u^M+;K
z!aO6iWodjIV@wsB5#C=coq%#wnA9J?`N*j9N00EyvSW<d<wonCxLWs6t96E{EWZLi
zG4)@&PuB+Iq9@*p&tRX~CJ21{I?NvU_b<J#vHX@rcikL}**-QK>qFxR2!mt=Kn;WS
z=>)cTx27coUTB|__X08$nMQK!fleNRON4rS2dpm-k9H~klRX1Df70#eHJ=Zo-0MpI
zJ^jDr-~s^wpnwE|0>Gz4<N2wQ<f)o(wWj^C%T?sn?4BofB~a4`w3(qu3a)#0Yo1*U
zqoJ4xhLAr30`@h0Q2er&X`(mcEo-gYguWktB)Yg780Ai_&^q_Y?kjGHR9NYwKc2B;
zo7rT-m?CC`)Tqm=e~B64R`$)8USCOXICVA3-`KI`z(Kh=pbNYquTVkQ=rPv4H9KZ%
zT%nzqCwAdtDh@G4QT4xePFlJvh__sgcvFMOuK`rd$*VFQ4)Lg7ehX2RaPw8nvC(+}
zjiEM2YmE(O@?A}FA4Ds(EaLxUeIh=;zR5DJPWl^{>x1|df8=3brDj)-rYK&4=0WMA
zuDLIUy6`zPzK7y0>e~FG+=r`NO}FM^?^pcaG<-lHPI(S|xotq{i+rQ}Qx(CB^V>`^
z+ZylOmc9zQFGBi(;_4izfH_sSb^v*`DntMuHI(Q0-B2KZT4uv&uo`N*Vw#l1cy<M%
z0=aDz7PVDse>Lz=u9ep)L(5&yaY_ok*MSd%6>yj=e;Twl)RtedZNf;=fH`+lZuMW(
zN}}pxcGth4D1hoTv6PbXo2Xw=4i%mKWH;h$_2ki31904M$~ald;+|0VoL;~E<|Eu|
zMP(x7WJ6?+3*CY&poZ|=WM<`Hss2lQqrtFlU-<aje^cxK*Ol`Z_>Ha!l=)YmX{rl`
zHk&knJ5pmT0sKDJ!mMMr$92e3n(wOAXsHK&0{Obnfn~$l%2LWQu)Al<>TnSNCE+YL
z_dd}chL)csFQoe$45JzBeKU>5z%+{<t{SeFdApFAJVU9$fR-%y9ec03I9--mhhTqE
z3Kc+@XihyaxQ@YiIhs)%T{$YLF6lfPP86_3MQ_6>a#S+DAQCxkhPIU=U|cJxPH^if
z41`C*>KLkW&1%*nLRh<T#jIypsHNwJ@mtH0fKAq<PRw8dTPO0XrO4s7JPk|)2+7)w
z%Xycue3MZIBPcXF1Tv&+uJO0E@ujKvQ2dMPUd03us=BIHVZOzF5b?tbIf6Z%001DU
B@#O#j

diff --git a/security/nss/tests/libpkix/certs/OCSPEE11.cert b/security/nss/tests/libpkix/certs/OCSPEE11.cert
index 9b02a6a4bd5681b8a73e32faedf271e514366a36..7c00550d6895dd1906cdd1479e2e300cf5e2b3cb 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>yjab80+1b1RxSpD^G`-p&+3zObf
zeOex8ZLAb4`!=ZPU!Svf=03AYjh(W&1&!H~#t)^9|LqaY>Th&dP%%S3%QC6<*wo`!
z@7#2qv8Y_W%ar>zfA1vgvipMfS_Jve1r~mheq|Q@(X4&JPLT`dIZyHroI4a8{%7G6
z?kic&-c~{n>pWwe7WzvX9@<gw%f!scz_{4iz|p{-jYFG_k(HI5k&(sNz|cS+#y4PW
zQ_d(UDX`MlPsvZt$jmD(DAp@2*2^zSOwLKwOU}==GBN{d;AP{~YV&CO&dUfig@L)T
zk)dgB(2<?(6B0BgPvbbSSTI)O`t&PvH|8v<ZH!R$eCnX+8^37@Z`)?Zr#!Q|g%xh(
zGVQ5}Sh`jyW5>OftK5^zzkJxg?QWiG{?DVTD(c&wRK1(K?Y3C`mA!g<qPQpSzOr}E
nBW`!)c+(Fp_A|DNpX=tnvCk^3x_sTiMLZLQA6@#HYf=gT&8ME)

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`IZ8ab81H1b1RxSpCWezFW5j$vE}q
ze=$%B51Lwj=}~BZtn_0iO^$p11-I@n_FAQ{mrVHbc?#>Je@yLG)?ZqD&ENJ_+Up+s
z!udzV{M5vlz@2h=G6`32ymm;kVo<xTR1}>0_0E~;pZ9ZZ*ZCp#@W&gg9gO>o|F3&>
zxyLGPe&~vQzH8+gC!P_>m6J%V_he#bWMEwEYT#_($i|_~#>mRb&dA7OYG7<&2;&<t
zwy9>6loVL$>!;)=XJqD;78L6hrKad*7UU%6rIzR==jU1(nHd-w@Un4gwRyCC=Vb(%
z!@%6w$l$;J)sDMGE35bV=1&Wr@?zut(nA4N$|~s+8Ny3G)QKnheK_}S&fTV*i(DDs
zv;8JimW0^tt4U1%@hZq(#O=w?SLO4#UuK%l-yk(FdP#P&%{0kdYPUidu3vP0I<2(S
qIQd_IuKaB6oey<y?<(DQdgt_*?E<^*)h<!LFSuk&&6~haoo4_cEu@wJ

diff --git a/security/nss/tests/libpkix/certs/OCSPEE12.cert b/security/nss/tests/libpkix/certs/OCSPEE12.cert
index b4478e9c15db6ab06b9215d11444b4666209214e..d46c26a191a219440becbc2fd95123ad657de05b 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpB{`1*+m)hSR)_
z{|9X_Ra5M+3J=uUz34==mDKbI5B~g(k9njM=iYe{7w>vGseFy)HLsUjYiqrp-W1;b
z(5SuW!`dqKd*$63>$aN*mV{a^c)lp*fNfCh3fH%}AKYq;I#zu!V}9(udeWwkju~&;
z=O#W16OL?Su{d`i`0%mhvJ|iSzf8=G42+AN4IB;Z**LV>7+G1_85voO4GazRVSEF|
zHsy?xk^(Dz{gnLVjLf{!f?~bWV!iyL#N?b*z2y8{D<d<Y23|H!tu~Lg@4SpaQy7>V
z8ySvQc{crjS)8<fmrh(#pYaNFv$gBjb2_Z<Udgg;zt}8?JMr%n*M1ND#57ql<WcPQ
zfNN&kc=;Rk_5_|(bSZO9y4qLGG|4nY@a5EN^)lD)+0?F{vwv$jBR{9X`$~@8-0Ig}
mdq0WQ6PnMoORv!VuJOY~E(szLCu^i9yzIXwIxAuK$;$v5JDgwu

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`HNzab81H1b1RxSp9<a9ScIXJ>0aT
z_($8Lo|BwB-3$|F-_j5Nx#z^|rCI;gd9Jg*{Bmil>Gq)ClXa)RWZx*WP1dje1%u(%
ztEw$4Y|6H#lq<dyOXB?9BJ<h*$V4l19q;>>54fE^WALMVTi61{3t#Uh$+M+%#x!N@
ze3yCQ!q0QJ3>8xol?wLT{9Cg8ZGANpGb01zVpjua14lLvZ8k<$R(3{47E=Rb149_!
zfU!+Aqokz3N?$)EKRF{aue6|8uP8M|FS8&gF)y`5FF8Ng%E-*X(14eXQ>)FR?K>|c
z&>RNl#zqE}lscPTcP1EqPy29N<W*<S&!x&or}tY;PP;OzWck^`M7FPQR_0u=oTvY}
za&C@c+bfG5o$vM8zP$>Kd-qAWwm9$krEmLfW$*o8#_ww@cTV!%>}v<-@BcJ!j-}w!
sv-O#FhgaPW`SWqM`mV<^9tn3$8w#uJ9j+P4<$o3HzPg$Jvd4-H03u7P{{R30

diff --git a/security/nss/tests/libpkix/certs/OCSPEE13.cert b/security/nss/tests/libpkix/certs/OCSPEE13.cert
index de675893572fa238504cfe03466a9d6ca65ea638..5f819af3b2e98bae5ce23acd7cd819692167850f 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpDjb7ps0S_Z0q}
z@uc^J`_`bvygS|A>woq>xbfH8wTYU~Uhd(@c|5Z)!O1e<G5>0Q-+6vhjFz^n7qhOo
z_S#_<>uTLyhmEY>xUrpbeR$J%M)bi;R~9NJ*#6!2a6xnWC62zL;A-A)PRSRFPCmH0
z)ayc=Xkpd#yCUZgnb>7LIFa+;tzMRinUR5Uv9p1rfjt|CHX9==D?1}2i?M;Bfj*3H
zz}TjoQBqQ1rLUiopPZ4IS6Wc4S6Zx>UzC`fld6}TpKE1g2GqdI#;Mij(e|B}5oihn
zb7LbzW<;NM_@iZ7LK%O*O1lcC)=Xzyl$_Nx(PUB3!;RD5{k<9QbS>QQ=(@NG%ePK5
zky~x+XurKT_}jXFIZL&28#={ruQ{8u>vBQY;m`9$_Q*}DWAX83)w&rrLHxQ&^Yyyd
oDQe$8UDM~aX?vAjdGqOM{~r+{F0~9wA7&k#UAXnrL&KIY0HeaDy#N3J

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`Gyjab81H1b1RxSpC1nTRmk0`AyVs
zZ~TAcC_}gQ+6RWE8@DLCv{g51C_WX8>*QHnxuSvN*z|8_+YegmM4z%`?`>49IPgW{
z<G){<Y!~aFc<FAlE!Fe2+NByRfj{a;yLs!>4&Rh^&*8hLxV_Wx@?N<txv0XlwG8vb
z6%Y5bzguDdRMm;Q_FG8J&lfrMQ<<0<85kG48aNv`vT<m$F|x9<GcvN68W<ZG!uSS^
zZK@e1B?VUc`YHLz8JT&d1;u(rsVRDy1v!a%sU>>J`MFj`W(I}^ylk9WZ60mkc^QG`
zFfcbZGAt`hJ@;4pXv{1J-tBWNn`NxlH|<=0Pssb{eeO#O@>LVr(zZ_8a?~p>YU}j9
zd^)P@CK}f-Raf!S^Y>_5QFJ0YMA*P=<BU^le|)V_l8*?!#36dIqxao<7Y&=pkD(Fo
pI8(W%taE<fez52C`8RIDn$C{8Dx$qi#qXqdUAn#|;`GElD*>oPo6Z0L

diff --git a/security/nss/tests/libpkix/certs/OCSPEE14.cert b/security/nss/tests/libpkix/certs/OCSPEE14.cert
index be73602a15277a674d12ea82daca431732053f9a..5c171689d16f368a759d75bffa74dd9be9c71f03 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpDiVYylcu>?fXF
z;h*%%F#M=a@cq{sEz`9bpT+$3UCP9eVj^sM^3mdnU#{gYn#{ap!6s?-{MTof>d!dE
zcwOX_`t*v8P0GSzu9`F2TUIh1`}J_Te%tc3FB#uv%GefVuNQrN-&Z#{CR4uW@2R($
z_x-buv29E0xN~jS8t)B<EPwyJS})4P%*epF*xA6*z@Cjmn~jl`m7S51#n`~mKp)08
zU~E&)C@Cqh($`PPPtM59D=jG2D=pT`FG@_#N!3fv&$Ti#18U%9<J4;NX#38~2sDL(
zxv`PKq;1=c+a>?X&*bDW`f*Knn53`wFy?2X`P8e)N8eU)wXchRdhpLfZ-LGaA<K1z
z4UGjSPvxB%TV1o^FVBy{`5RI~liUBwL|Db_Kc@Kl?ajZo%O1TiR*}dNsLIM>DcS6C
od(rHs)6K$F4|X<9R`7A`iJx+{w6h?<_vdGsdDlyhyk)Bg00oJnfdBvi

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`I}Oab81H1b1RxSpAgO&+lyDlW}sp
z^X2`K<mdCPj9y%fTe@xTpVS5FE?biYc37!xIdM^P(T6qmS+~}xMx3-XId+vhJMZG|
z-?Q$&H_Lf0uv9w6y|T&i#sA92jbZxw`{us(TYLO)Wrfn?e8weP7q2jmR_R}T@6&zl
z{ufJ=yqZ7OmMlx+eB@!!8`s(Muzo%hGb01zVpjua14lLvZ8k<$R(3{47E=Rb149_!
zfU!+Aqokz3N?$)EKRF{aue6|8uP8M|FS8&gF)y`5FF8Ng%E-*X(14eXQ>)FR?K>|c
z&>RNl#zqFtz!$02Oa7dR+uXTl=KW6L%o|g53NsHn{dUTJ8IpfI@%X2B-WM~@B<61q
zzOECb$7p17_$l)S#;>2I*C|KXbgWwU@v+R5&l&Uc(_FXCT0J9BUp?mk1P4Q(wM^bh
s#}xR^?+g7b)+ae}#;3^FevA2j%z521_rbRFm4;b-?Hdg3uRoOq08V|VQvd(}

diff --git a/security/nss/tests/libpkix/certs/OCSPEE15.cert b/security/nss/tests/libpkix/certs/OCSPEE15.cert
index 54374a8199106f6cec54d9d4efc6fea5f160f70c..2ad03804723ff1d7340bc920dd94072f2ff15a7b 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpB(srXTB~*kyZ!
z733471KJDA{%8JdJ6vI8V=^(-C-K($B|d!b9d+MtoGQ6!jzQw3Z~flJ;!fGzG3P5T
z+aA7ucl!TFfe&W9*}}DQMw!^!lD=wRt9?%oO1UX-pLg_$`?BqV;hhDF4zIoE<T(m&
zy>C@)Td>LH@(Ho_)sBU`s^=-z>oPGjGB7T7HgGhsXXDUjV`ODzXJlkCHZU~Mhw%*<
z+mtg(N(!v>^;7bbGcxl^3ySqhi}mu05|eXM^^)^*t&B`9Ee&|tIJMe5+P?EL0!?9H
zZfs;|^x49DYfk>@>c20hhibk2(YU5drr>A#=D#~$=3KK*e-jkHwEpwzB-b;ZKKCU1
zYurQEO?`NFPvG@z{;N}W3z~=i`7=FVL2NDC%r$>~&pR9t?7#fss#4=8#V5+CQ*G2_
pF0GunEj#4#x5#pjR~08NZMe#nBhk5<A^vE`9p>48w|=W#2mrYorE&lO

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`H-@ab81H1b1RxSpBKw>+H+C_f}L%
zTxgq;y<+de|36MEK0m(AJUm6)>EEdZiL+<(u`r$ablA{*k%{%L_G2H5Kd8?xVNL%q
zeS2H$o4s$Ndw0aGx>%C6q?T`m!Q?cN+yl9-@9v*ErgZ+RT)n{`zQwm0cKoec9rARt
zSL+OiV0Ontj5>QFqvGRCs)T14)Tc8sGcqtPb~SJ|aAf1qW@BV!WoKk$F*PtYFof|9
z7~51cN=gc>^z~EnlQS~&N(+khic(YbG7EAN^HNLnlJj$|j7%*p4S3l&wc0$|zVk8y
z&0%0}Y-Ffa>{RP#_qH}(*!sTRx7+4$%;Yoin@?)h?%cE>p)4ygz&NLZXNK0!tN`zi
zrx*Xz2>ZWOkms#xe2s)y{{`9R$z}h)zj+YYSasF(+aA%McVa}UTs1Ddo4(&BEAnl|
qw7{yIrUim0TP|7^I$Yl1a%N9g--*9-y?0-@xp7J2S|i3v>q7v|pQPUa

diff --git a/security/nss/tests/libpkix/certs/OCSPEE21.cert b/security/nss/tests/libpkix/certs/OCSPEE21.cert
index f4548db7f0972cc6322d23555daecde6d822cd8b..c4a98fa213e86a92b98a7ea8947f8ddb71eb2a74 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpCsei@mpqzq2rN
zVsE?3&T&=dqci*a={Jo!7PeJ<YUkRM<`dQK8v0$}tFZLrqCJet&#u@`t+Kv(KlyeJ
zn<s0gdEO=~hg}P&21=AHGv>K4<zwRCe@*?1H2)uwnbpI5P*f+Pf@gv7T+y$FvaYtq
z>LFrB#B{Ho{OBd_GQr5ux5uV_E)z2&1LI<614jdUHV$nzMpjmKMn)E6149FS7~g=g
zO*x~aq`*pFKP5joBQvkGpjfZ8STDaQF*zqyFF8Ng%E-*X$bgrPQ>)FR?K>|c&=dyd
z#zqD~oyaNSVk!p~eKvIYz+KmH&T3WIN9o*6o3eAxbBadxR>Ygeem)|T);Z~Q^QHTH
ze6HML`g+y!+|J+S$vht!)B{zo_quh~?5^o?iduANX29!${oMfu+>^ef)XX_`ep{pe
m%icLvMy9flc;4l(dCWB`t?6mKA7WI@9jlgTq_D$BR15%vPL`Pf

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`IxGab81H1b1RxSpBMu!jA2GrmZwd
z=VMotW6kuq>b1(a>bL*Tj|H(zkwKQr7kE#o7uxtN=H<ljf+I6!A}YS+Ueu`;+Pvd#
z^8u-^r~1_Hxdx>FK40@-{bS!}zmBK`CgiTUvU6w2BTqwDu|tK=C%t~G`D32;SO3S$
z?Bon<O`_aqwcTfKU-eDSK|yDJy)+XuBLm}NR|97QM>Y;^Hbz!fc1A`PQv+iILm1zH
zu}w9jq@=(~Uq2;3IU_T#w4hk8C^bbdvmhriFSSH3IX~CR$jrdVfR~L^tIebBJ1-;9
z90umbMuwAb=HKEdJzMqlel@?4%mkC@k3VinP2TwX`;wHhEvHfwpMBu>-7C?&^888h
zBLYT-wrO`J${l-Vm@_lfaN*)P@*%4(y4>IPOYe_EigwD8S$46J?<GIn2nhM-vHXaa
rK*FYzr-Z(C?7erO-%y~TS^LJ8U5`%o{7m-R^f~wSibt-phDtL5CSs>j

diff --git a/security/nss/tests/libpkix/certs/OCSPEE22.cert b/security/nss/tests/libpkix/certs/OCSPEE22.cert
index 8ea88a67dccd1e86813b0c6bfc408ebf11ec1f8b..7839c47ee939f16ec49db0e8b07726b4695b977d 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpDNfjsu>2p<fIp
zl=3VJRlmul<e2(o;nCyo*>z@oDH5<(S|YbyRL_`!&FIgI*>?;5a<;0s@n{K#KiA%P
z&sI5o-G-3Y+#(7&u`T6Kk8P7r_FLUk{J%d^b3<T`CD*|VCZ5h(l`A6(*zZgh5<Yq0
zQbyxZ^D9hJ2cAFrRHd+`c2Q9MYbIt!2FAtC295^yY#iEbjI6BejEpSC28IUuFunm}
zn{q};Nr9EVeoB6FMrK}VL9t$Gv0i>rVscKZUUGh}m64f&kpV9or&gOs+jm|@peYQ@
zjg1WRb8k#|SABNfL&5YVsZ5F~!lxF<oou`y?QIvh>FxBH;sx<F^S4N@JzTwAZsw{c
zmD$Ng^Fxliy$vwfP^2}7#W_|ol|6XYL#1XdPaCnOs)hfzZU5#|INxP4!>1P~d6Zv&
o`cj!T=Ykl=UZZD|{O0cD()w1)lXmCft5rUS7EHRd)u3+z07GP&ZvX%Q

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-v$Dab81H1b1RxSpAJ~KKtawxn8Ws
ztbc7baXz-Uop@==#dFf;(RGUVTb#8wiC$zma8Bbz{g2C0K@ow6x7HZdmL$pbuo>~4
zUDEt+XGoFpwD7ZECWmf3@MYJ8pjXdxyeiE%ZC8_flf$y^&&Swki|xYiSXc~qbcP<?
zTgmf5{Ky8m-IE(WamaM{oz6H=Z^*>V$iTSR)xg=nk&Q!}jggg=osp5n)WF!l5XLuP
zY*WoBDJihh*H6h$&dAIwEhyG2N=?zrEXYaBOD)k$&d;?nGBYqT;AP{~YV&CO&dUfi
zhk?1Vks*`erRJ5x7x%8L-qU%~C(Ot!Zuy`78AXbAr<o_b%8f|mIKfkYXJ15Jm1vIs
z3gf$;A0Ic*d$4`J+3vs0;Vt)$TuWLY&-d(I_ky(Ni_<mpT{q-gPq~(!voJ-wYo-|g
q6VY%RuRhKFtuHUmOIn~|%jdhubN-TPZu9d^C0KR2B7#n{83F*~y_~54

diff --git a/security/nss/tests/libpkix/certs/OCSPEE23.cert b/security/nss/tests/libpkix/certs/OCSPEE23.cert
index 3ac0521994917aa9153ba983c12c37a0678c6965..2293b8b5879b082fa31bdd6dacf96018a237cb91 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpBy4$en9h@7imL
z?r7b9WuHK=yGN>)W9hR?F`e-<gZBT|mFCcY$e?fB=+h%Oty%f@lkbadv>yCee8DB;
z+WI4>GTk*KuLmDxve!MnOhfbVN4-_a-yM!te7^1Fr^-B6E+<^fWu{+?LB6t!rhHpo
zNF={l@`(lJ_lgeoRY;#)$tzf2%*4#dz_{4iz|p{-jYFG_k(HI5k&(sNz|cS+#y4PW
zQ_d(UDX`MlPsvZt$jmD(DAp@2*2^zSOwLKwOU}==GBUNaG~i|9)N1o+`_9V<G=+h=
zv5`UY(ab6>zu#L=sJooM^YX-mmlo<PXFh%!``)pU-HB1^S6=*qGtM$osxDnUb@+fc
zv-=0n=PYwqr8_&<)Ll{TU-L>rd)xV4#&2wXaL;VuTF-N3|E4&(X~Kc*3#<CyFUjij
n*!%WrWj(`^<=pZg`mVi6s%rQk5-ZM|VNoieC3+>-N<I$&Gbfpk

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-uq&ab81H1b1RxSpB7StoaLF>X;%b
z@+5?^+uv6!rfE!UT@jOayV3Gh^OFb6sZUn_D8FfuK6mcHe;j9fc6YJ8Y*@$HaUf=G
z?IQm6G;N>5cY}8XY-ie@l%=0t_(k_hwGew>ZB<jBR@h^<Y3BSJZZAt^Z@KhrL879`
zM%nr}{*_OAXGE;ep3Jc3dS^sEI}<Y_1LI;>17`zAHV$nzMpjmKMn)D>17ib27~g=g
zO*NyWq`*pFKP5joBQvkGpjfXcHAOG8ASW>|wL~vDKiA60)Y8&`myJ`a&7<u*FC)+#
z2Ij^_hU7JiL|@!XJsVrixNXnzjr$8PdDZprd)U<UeMbxPuJ?&etG|0St?P|ll+hEg
zxghGzjn<D}Zb)TJ_UgJhyT4*-WX*ng=RLc1QqEj%{ysOitmT|*<_S;J?{apob}y{X
ps7o$rp8D&z=0UIAW$wJ(9Y^D5HCKnb2{<gN$x50NT0K=(3;=`yq4@v+

diff --git a/security/nss/tests/libpkix/certs/OCSPEE31.cert b/security/nss/tests/libpkix/certs/OCSPEE31.cert
index a6fad98ed82dad3e22b9fe7402ee057892db7402..3814a5408708eed168d183a6f259ce350699cd1f 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@Z8ab80+1b1RxSp6-wMdq3Ddstbj
zj$U8dl6Nnw?cFxNfNMLRmQ`q`XZC59+3G0t?#psf@jg9u^W>*3GyDEsv{<N=>GWQ-
zU3T@#ue~cvFLizQjPh>wVNxh@FkL9P>?c$2?_HUvzMC~|mX0+^wo#N@e&gJxf1xUj
z_aEE;KgD=A{B8aF+$}6TcfC{Ui<y`i85kEk8#o%+vvFv%F|x9<GcvLm8yFhs!}tb_
zZOR!XB?VUc`YHLz8JT&d1;u)$#d`TgiOD&sddc~@Rz@Ii@v?DhwRyCC=Vb(%!ob|v
z$RPH?y#A%ee%TFk)Hi++J7!SUYI;*6@nGhnQtQv{xhI%+#jB^>-kdQv$1Z2avc}L^
zqS8-(FYSC_7}4c*!}q)M{=-if^qpO@+t?)8%K6>ir?=)Voh@gs9MEXK$YS5FdDC?r
mxwYF2Hr!Eco!H7Zb<UrCf1(;1r2LoGEtA^gmpA=K<8uJPP@#eV

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-w>jab81H1b1RxSpA;0EkW!v)_2_R
zo?{)>zIDFpucK>YWkj|-cTZYA*->f2+?*}TX4qWsN%j;7$lrOLbArjYAK!&Jl=P>4
z`qtm}b4^dP@VEA;8~(=>Z>cV*II}Erp4)!y;|w~<MejY=NAXp?Ua-MO)HlvT;W2;o
zzgZ$;%8}<%p1-X7VmfQiu1zd5^{GtEj0}v6T@9QK9N9Ru*%(<_*%=vGObv_;3}Ji&
z#x~WAl9B=|ef^aD<c!R`(t={WqSO?<%z~W6ywnoC<osMKBQu~DUN%mxHjlRNyo^9|
z7?>Ly8O)3ie_ze`Iqs-t?fFpo^5A6kUB1<)R&ZTE5*-@nVw?DrwKw*8%dtgO?WLFY
zHMo17d-Kq|uaU`oiQ<#3jq7G>gbQA|KVfd!(Us|M&m{5lS7wR#ChC_z{B^{}W~N(|
p+LhYAns>V=J>9TZM&JI`X=jhM2X4OHlq>gR>IIJyM~xRE+W`<CqP_qC

diff --git a/security/nss/tests/libpkix/certs/OCSPEE32.cert b/security/nss/tests/libpkix/certs/OCSPEE32.cert
index a07893081c77902716a6099f827d591198e88dba..434dad7f358f264ed049b107cb23a32ef0f23b78 100644
GIT binary patch
delta 397
zcmdnYvXO<upovM>powwXM2;9qLjz+26GIb2b3@Z8ab80+ICo-gc>SK;qCO$ZQ;QD%
zdD{DP^_C647OwHUs`*~6*pxH;w~?G*>Ew@ve^17)m~{5YiQc6gn;-7b6aJ@Rbx2!E
zaC>d}M#Zh}|CHVyscm=f*Y_x!6|1_*;zUQ|Kf#-SwRc^Pe*eqxy^GZQ%gJurn>jek
zPkd!hk#b-EQqFC1&xIE6pm?i<dV3~jMh3>k&IXPK_G}#5Y>cd|?2L>o#s-E4`Y^r$
zW1DhDNlAf~zJ5x6az<ueX+g1GX|Y~@QDSmVs$Oz_u9XqUSG;VTT5TR}-+38<rZ6x!
zHZnMQ+up5w7P8D+{;Ipes#&#>QIfiU5ADpD-@o<Q%b8OuBjR7m+_jHmext?v@{`h?
zWzC{*6bnU8WM3-ReOtAtQFN00^sAgct3@8YXei`&VQ#Mevj4O3d!DPRHaFOLkF*vD
nvwL=(w)p9>+c)j>tB)10l31hnZLHX~wfOU`M=Ehr|Mmj_V0EJ=

delta 399
zcmdnUvYCa$povM}powwDM2;9q0|OI7BST{&V-wRTab81HICo-gc>O!obb-Tsc1JHt
ztMBMPF_FW2#^2v5w|AVscc@lR<I9w~v->pqy=Fv7KGu$@cUToyRX1-9(?zcnmkwMp
z+U}|@m$>4b^P(AB(=2Z6VO+3!p~9qR2VdBqILT2a+Wb^Kuv`1b@~U|u4WES8zR0`H
zH)Z9Vy*a$AbC2_Ek3VwdM-Wd!O8r45W=00a#jXa<299hT+H8!htn7@8ET#s=28J-c
z0b`qLMoCG5mA-yTesV@;UTHzGUQud_US>f~VqR*AUUGh}m5~`x3ojd|R+~rLcV0%I
zISkB=jSOnMt1M+o5*L*_etw{6&(3u0FPqtvlNRedRV?3ckjzRnUmf5tC$`@3uY;}L
z;p5Nm{8x&7z4iE-+KkVC4tHOQn0TALH`e0IEN7v@%?JJFi*IAN!yd-&5+C*Z<2zpe
r`^NjVKWi<$lKWte#*3ViZC_ij&8nLBXPuG#H!n@|g*$$yKd%4)!gr*5

diff --git a/security/nss/tests/libpkix/certs/OCSPEE33.cert b/security/nss/tests/libpkix/certs/OCSPEE33.cert
index 6fb2af875a77d0c8aac0e0465d6c8a19d17c03d1..b0a95eb030fe2d6baf00949b6c7228b9c789e32e 100644
GIT binary patch
delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@Z8ab80+1b1RxSp7cv-FosYD`h$@
z<ZSoEmCUbu&SAfI{+_>Yq!YFqs0jRR=(-iDrhVx~yK&{c0%`yEKUF#t<+|F6m&%^c
ze;nC=dh+$(i&PKptm%$cdHC4SI^ag_0%zOSiRID9MDw{PNfh01sJ^2i_d}d-WBpU_
zGN<RoNpZg>B+ZBnzHYxXBZI3xnTeT^fpM|3fun&v8;3R<BP%OABO{BkfuVsujBmi$
zrkqhyQedU8pOT-Pk(pOoP^?#4te0Pun4FWUmz<w#Wn^k;X~4_IsnzDu_MMjzXbJ;!
zV<Usbf31|nMIZkpN*+;V7MR-oDuRu3rBC(ie>~buy|?5nKE&tjUEcKb(wQVRk!xx7
zjy>!;@o8ZOk6F}G?{Y5hSfy6&-#0<9;{A=OTROb^%Wn5tlzh{>8?e@c*Y$d}LWEC#
moOk|*Ni3|3=FW>uuF~|%TOA#9#JOQh?%w?hQ|6r5s{#PB^O=MI

delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-xczab81H1b1RxSpAmYmJ-dWcV?NW
zZt)h*S+X&SPv!RcS@B7w@nVZk`JV26zlM3X<C){1^1Ku;&%5Swcv)Vy=Ebk~bo^iM
z<Ko*F6xAPcXwu2jTuHICXxaa>EIw4vyOUbx9>lI=ks^3Us{G<KqjmTFkLx`$+?n;+
zr?HJ^hp*(3v_{+7V+^@|+mH9w2Qx7<GB7T7HE=d?WaH3gV`ODzXJlkCH83_Xgz*g+
z+f*}3N(!v>^;7bbGcxl^3ySrMQd9IY3vv?kQcLub^K-3?Of4-9c-c6$+C196^D+X>
zVPI}-Waw@w)q1-2@!nhc5<Kb=Gm=+`Kd_IReMzeI@W(RQN6v}&Vh^lytoeWZ!ZfYt
z%oSUbo^ShKTT~M?`L+4g|9#E^&8zZ$r&f5{XwH$fRw}niW$C)(RGVjapZV5WvtL%h
p(dmv;Vh-CBr9C*dOGD(h{KPQHs|o39O6E$xwpAGF?}^gZ1OS=~oiP9a

diff --git a/security/nss/tests/libpkix/certs/OCSPRoot.cert b/security/nss/tests/libpkix/certs/OCSPRoot.cert
index a60364bc620cdb9f6c70c3ed6d3599fa3eb86272..2e5d6ee851033007294bd565b275e442d9b4cc69 100644
GIT binary patch
delta 323
zcmV-J0lfaD1f>KMFoFUhFoFS!paTK{0s;gQApD<^6Hy#7Ff%YTF*GqZF)>;g4>B+|
zF)%YQG%++WH!(4hfLnjRp9QK+yYxyt<Co5+LiiW`XTg{R((625ga(c0p>6Z#6!faD
zg|hWI-1?Gn6qB6a)HiAy6SGP>4Nh--6#b(5YXbVrTe5m~gT9K5q8}e(%kN_Sj`Szp
zRipeyK6exX!NEFYv4Gd5E#{9=-)dV;VdJt#K{md2d}I8tO>+U`lUo5we~jm%DvT=(
zyTGBE48okYl(W^qW|A$<?a3SNRP$B=r>=zuE(%~fTcLYXnHjSXR?<YaiQc=9<}wko
zaohbXb!Hh8w~&Nvk6MOCIf(w@bMqmO{sAHQv+H_(F|h=@ng|d)^FB$Dke~mY4)<t`
VTMg8#&>fUZolD9avh1Uh0r!i#m9qc<

delta 323
zcmV-J0lfaD1f>KMFoFUhFoFS!paTK{0s;gWkn#eN6Hy#6Ff=hTF*7nVGBjEk4>B+|
zFfcSRGBGnUGcq)hfLnjU99f!zsfZN+l7R%W-5m_)LB^_8<&qrTbh#Z#-pjViqGkQ4
z;4`Y7E<ks&KMx}aRWg*{`>$`Dv*HsX*+^$GD*5l5a@kE@HL+x1^VhZ4gz{qEsf`~r
zrX!_nOZc5-`Ip#+9>t}NDpSJRZ)qi=qC;Ro7H0+!fV{H<{AB^dlUo5we}=}8Aa#Ep
zsHO<6|6z)@??~Fi79i(8u}#J6#f1Ojd9g7sT+@j%ofv^iM(%^B6g<~e#dN@lxlX3-
zNp~KPQmgKt7@zRzvMyRkQ4QR2vj)$}W5gk@OV6h#dg(dOelqIJ_a~w#EH(<*%X>$J
VgQkEo2MoIEN*z52FgOw@0Y#2*kVgOj

diff --git a/security/nss/tests/libpkix/certs/OCSPRoot.p12 b/security/nss/tests/libpkix/certs/OCSPRoot.p12
index bcb0a075e9eb3eca07c522436e65202d8652a49e..2cd0e7b31dc22c5296a3faf6e524be95f8885606 100644
GIT binary patch
delta 1454
zcmV;f1yTC`4E_v|V1J#PR87#x=2x6rk_DVSq(TA#0R(~qfY(MU>;#?~4)l%^WyR)F
z2sVe&I;sX39_haz4^V92MMbmDF-0Bjv{Qn8x+UhHeR8Yaspdmp+4Ya1(C0*xKNDxU
z)P;{ka0v`(;om<A+&scFP-qsh>XtTfNs&FpZ3eXLEX!U@aDS`omqm;0B*SPIkrbp#
zIxveVKI&^v*}pRkez2;iyf){@E+MkqJ8P3LAV<(A$f=+(eQNw9ikSge!CAfrj5FaI
z=oyD{D+m8O^`g<%NRujLUb=vcpL!tflF~@+_x4Gjo1L_=!jhEQQGY78t$t`A_HjqX
zBDXhem#DC&vVTKVlxt0ExY3ii4v;_97hzO%S&<3?N7vl!#&{BT51iq38%zsEb38wo
z9n+0Af%(;Icos{saQ0OjI>e%sYOq$UlY`Q2P!vQ|YpQ!?<sN{){hID&z<?VEM>xWR
zxrLP5N}^|bRt_s9$5i)zia6UBzf1C_gz2Y0bQNAN`+uURcbW`Op@I=(+>wB+WZ)+@
z24fuc`u+6vf=^UCG*gw9upj-#HR=j6Y|cceU=w-i@pc>slOm3GVu(PV1J^^5f_ta|
zmA7I|pf?<LV_J^vGG5_2=R2j0teT+}X*dW!94SnXcWE^5%QM0;0FDOdr+UKhC_*?G
zm_^Dt>VFi@S4Gm2sq3J;IN&E0Fl2%t7*pj!tqznh1;rmsa7i|qAj=Qsr1UxJJ$-LN
zjS8JsOLp3~>c*l7NH>)^kQio>P+tlzSg3SQvH*j|;ZwsU>aU_?M=rbpa${)?g2i|?
zc{AN=p>KhpcMkEnVk~%?K82gI?3St)0VCjeRvdMD*_<-1W;Q_`Brnhm^VVPb09fCj
z8@5OIq_~s!0yGrdfRv|7C=a{kO?&!sx8iUM2Z>vgKLa^`2(B9W)E;gp31g#vtcBRi
z0s#S_fCPd9m^j)~)^zc~g9K`|IXeP1gXFeBWhLJ|J4kG?wn@Z`77dp*j>K+l{SX&i
zv8d}9p?0{hQk(*0{G_x3pROcAMh2(yQA9QL*8nXR{fWi&_*kWw-(CJ{_~)M7oSK(;
zC2QL^8n!WimtouA(ZKTf$I0Grfysog5%yuSxM)L0eL?Mx)?V~-%0J2)lmay?Z`35%
z*n&fnLk1zAK+Y+e^EA=g7W27%{Yn<cs_o81t?LY^?%rj{&%cOj2VDEJ(V#o10(Tbb
zyjO!px=*lobOac9#CkZUa_|om5ZND#kOB<YKI{a4$?(8BL#{bH-XD9x%G+Z@Zhz<B
z*_rX}*ke^j7#oblYUR}-M!?1T?JO|#K4cYqRupaUyw32KO{%$mto`(u38eh_A-~+1
z$gOo~2)9n*sRqW<!7E}*7BfLC^iYtGvvteoOLWdh21Pjzh#L%Tt>MA%kCM?*znauh
zGN3JgEo%YaP%|=OZx4lb?D%Lj4o>OB3?p{J1G`-7daiHt&nrEVmU(EkqFik5<aA*M
z(T!GOjy@bNhO)t?dm<AlQ^n7&UgXa=s|RMK(+fx>`N^hnKj-w#B7_na={zl{qeVEh
z0A6UPYL|jd8<h`6r~(<J5)EZy+h@*z#D<c8Yv!o98&iU0EsTGoS`IqYZCw30GbLxy
zUs)Nyh^O+KAdCHrKh?gR`|SG10(#iU|9iH$PSgO7jZu3(eqOP_cxPQcVT}U)BYdvn
zW|b+Mn}s%r92Rw|JZF<D?%3s+-of#qgG><=+ObqlDnp1p87KL{@F>>ZOeXkr<}^@1
z(+=fnnnbnHzA+Y4j&QZ!rmE&&n|o?c2<*%jnOxf=(Q91a!FASMIA360x)xtHLy6<6
zYbyi@5@oP|Jq9O7lQRY*D6@v9J^mdEqXhgg6S`d|6YXIpN(2z(F3haP?01BgKP(j%
I=Iyos0Co4h6#xJL

delta 1454
zcmV;f1yTC`4E_v|V1IHKrx1zUXCt;g>Ee}dQxgIK0R(~qfL$qi&{Az4H=IkhY{NoV
zoVAFEM@M7je`#)~kUjHLpJ5y|b&xf6qV9WFRI{`2++uJsQ6K|M==meObK8IDS9rkk
zm_6A6s7#O*CPVc^VYb#cQ#RyoS=AF|Wwe?<TdMB$12E~IPJgv9_3ryeT!w+xr<Y}p
zoor&s#O=gj5=Wly-VWM^YXan*4{~~GC*p^v67|4ht55K2VVuIx^Mx`UAYFEeZb9@j
zSNsgCPKtTO`nx^cn1VL00&4x}ip~fq7F)HpsKKg@SW+>1TKPf*^Q1v_trlvpQj5Zu
zf3Xi92`q4wrGH_&mMI)$HSP|7jjr@B1`C|);&m;khG3_hc)gi*G;19}Qw~7KeKu}(
zM5m5dtC`9MMrI<Ho789nsEEw{4P>(8Z<?Ma>}_G<qm5KD&+7<@>{%GcY<Mn!kaM62
z@}A>#z8VU2tUeYoezZ+Qs`dWW*0#8ly8&RYz=hn+Sbr}d`YS<Kkko)iEcoSA;pF-|
zdsuWC*inKLip@Z-`^BX&abh^buWy~HvRVpw*nk5n&pUG8v*}E4YV}S(??~-564$Fb
z%`^4f>+*qn*K<dG9KvhU@Gt41_f=R6Df{Taz^_{L<XSlo_dO|P-2emb^d*6db};xl
z#4*=*xPK8uev2P+Diqaku9dYufC*UM!l7%zcm_NN$7PpJ*Bt5@(gFLW#U^4)R`4K!
zkYN2>6C%rj@p?D^s`r7MriZ-u*4TwAJP!F683Kvp`(VaBh18dIVX8j;9}2>%Xjr&@
zN-M%7r{dk)v>oVR7pr!1sxY=JwfNfwSOVqd#2i}+9)NR{c=Upzj@fNI5P}`R`;}F;
z39yQW5uTIx0yGpF-5a85JHxStxXl|RZ~@hR>7B=uKLa^`QLbzBm~g8m#F*Lph#Pe{
z0s#S_fCPd9m_Ks4$uo(q_15Aeq(Fpu2+Ow4uUuI6oV!%wHgQfKw%PW{$_1Sn;e|pk
zSFP!ZC>mjXQQX&@5-1SIS~SNgvBaZIlb_Yu1Iimp#Zt&@4u!zXx*V}u{XB_oj|HQ;
z-(&qYUAgRkr3CKsm{Haw%HVKPtD}y_xb=8{Y?xE7O`DIDKG}#7E9sRT?h#&hs`&_0
zh$%@IO?0T#N|MWo-ey3V*;{`9Q@KSt@x!UbXMh+ym_T}DXX_jAr#S6IL;r;lS{g#P
z(z{`=;OF`ZU{Uk;)#P?!=#Zj)I5C(tPwS=MPDP)8y>bwgf60EEEh_HM10QU+b@wuK
z7QJKWfLb_m?QM5yaM=68{{6gER~APRIhht@7ph0)uLjCdSENXw!Kyt%Aq{7<lr)(?
zbYXyja?p-G-ZO84S1=j~g40yScd`rB+r-(zgIp$0sy$b|9$|ebb-gGQu}<`*r$;iv
z7Qq&O5}<g7ARHF;8TybJtmkRQBZSy~SMT&X;uG$ZNht$+8xUzKCNB6}NjNwR1gu;+
zK6`GtDr((rzI>I*Tc*@@uclKcNV*j?LKNamK3^1JQQM`9<e7}pNFl>>nxmc*QM`-q
zJ{M52+iz7g1%DS334LoV_3*`xynYijoO1(ziZ>BCnDz>cseu$nO4CFM-fbhMH`Uc&
z_qh5;t$+Tk&O$S?w9u<w=?j|qm=2?NZUu9MZP9pfDtwj)`N;L0XJ@-=Z~=Jov)@ip
zE$}pVbu~h0SSy_SULz|wj7gFkV@Ee<beXC0OuE{<EV?i6R~Vd6J(ILGyBBua*fohj
zyTp}&d|(XgTK99e7(Dq>&td%_!k=@_sA6pBQ9d%YT_iNZWmXO_vQ*!EmmZDtp-L7g
zLQDh*b1Am{nsj3QlQRY*DDDVXvh?jor#V|M_+O5+%eGynP6QC4p485c3_2K|-xUwq
I6C`i|0MY))z5oCK

diff --git a/security/nss/tests/libpkix/certs/PayPalEE.cert b/security/nss/tests/libpkix/certs/PayPalEE.cert
index cca202a47e5203645bec5173ab9e53daa0fe3d5b..152efd3cd85c67f33c350f319fe025b542c17946 100644
GIT binary patch
delta 674
zcmV;T0$u&j49^T7FoFh4FoFd$paTK{0s;^&Glx%a;?y3~|Nk}iq{$eOAJGsoFf%eU
zFfcGMFfdvd4KXv40YDxdFdGH~RRj+c6i{+$c42g7AWw2<VQy)9VRUJ4Zj)RAj2jv-
z7zP7X1Pc@qP+@scVQe5!a&KgHV{~b6Zj%K9I)9zBH?2_pvqeVQH(STKe^ys%jH^Nj
zRSr#GX(<#e0b$NB!EeGIBP;pXEb>s@xF^Tv>|x0qO0<@`7)eMXBmAgPc^p-r*5x3e
zGs4yvxE-uil8geKQ7Vi|Fgq_%^eXtvD(0$V1P#X(vmPDY)0o(ibr!P29X{$G@qz|?
zn193R*(c8&i=pbBQergEjbHHpceXdLb#-o@^3*noz_0WE<1jQJzLmo{_YbGQ3(LCL
z0$Zh`v{B3l;ps}lk|t6a$=YMk?0$`_(MM58b`(?;!nnf+8xO<pP`I^#&#Yp?NX-2v
z964cG5(6S(wa#p|$F@tSLBQo^vW$*eN&<ghlRpC^6fvsZ3{|v_;#Gv@pn2ODJe*3o
zMYDDT*#Uow$72HdGV$nO;0+1fK>GV6bOlcPa;s}CLaNQ8+$_Jr!sz^fO3d)G+E~Gi
z{8C(?(G-Cx3?qNguT~eeac_32H@dovhA+~x<q1>HMxKmoR=q1)fND7D=5obEg4Q0o
z!nCml@vD+$6IZJD8klCXt~%g9@RYSzw5--4YqWn3Vy6l%XhOG>lSCxsA@}xX`TVuL
zm(<H8{)tqjn;}OFhV#2%<;|IA-Av;ImzSVN-eNQ|E|*k=NNzsKRo1IM257oF=emZ_
z$Gkl`!A6nJPOq@{1VeEuu=d@gxE_tZY4w27*JaCP<Rd#<qPlRbCP2u4-}y4CZs)pi
I^8Er(G)Boi;s5{u

delta 674
zcmV;T0$u&j49^T7FoFh4FoFd$paTK{0s;_sA^jZx=@4?lPe5~B_hCViAJGsnFf%bR
zFfcGMFfdvd4KXp20YDrZFc}5|RRj+c5>_!TFf1TLY+-eCWgs;!C}Js-UIC09955ON
z162eI6cb5qW^ZzBVRUJ4ZXi>6b97~GbCU%EI)AUGcpuoWw=P1fq4;_aCIe%+0s+s1
zm24KeQ$vjZS0DwKQ!2Yttbc|Eu<wPgG}|15$!EG&IB=xQ9@Bi8v!@g1tFfD2rUN@_
zxy&yzx-Hz{xs@rpicsX=cXoNmlX_*s#i2>gUKLe&w}2a6M)B3Yq(Yh>mQ(AlapPp$
zPk%|ew~@+lCPcBvZ5r)<pRG6{-SI+D9JYsXQW8ZlB62y8f_H!klczGPKJ1v2ak=oW
zg?m<m^J<@K5Gt+t{Sg(=92Km7Q$t0}k0xNMWFbLsYk``@S{2`W&z^;P3Y(lxh&m-u
zpvy7u`{~Bm6z_I{4AXRPaoYMXV5F0=eF8#}lRpC^6skBUxB9>QWE9+SRz(<YO{-_i
zc(Zl`*#Unn(KsUX^f2R}M=3RkBKOHTwjaZi@v#t^a~Gte16D4XlNSa{e^a@Ka`j;_
zq)7A%U!!&E(m7#p1esJagh{}P!9r-J*w1q$yz43Mcbcq`$xsd6`Z9D|p@}K3RRotV
zfhmaobdMci!+N9kT#v#&_{HlBj8lIUPJCa4F06l>b`VXu7qA4%UUbAYkZL&W(4!Ya
z{j$nIG$k74?PZ%%?$lky%>14EsycI%@|D2TX7CU3@BqquFrAZ9HIXO1?dwYY78&^B
z@_*Rercel8R|X98e{MJ@$06NRRh2?<QAC1e3JFg|-qMqYYQ~ll8d#VFvxo_nJKWcg
ID(eDr$vpEg0ssI2


From bee71b1f5612587cff2008c2ba2ce376ed23893f Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 11:49:42 +0200
Subject: [PATCH 241/314] backout bug 645459 from NSPR because of a build
 failure on OSX 64 bit

---
 nsprpub/configure    | 2 --
 nsprpub/configure.in | 2 --
 2 files changed, 4 deletions(-)

diff --git a/nsprpub/configure b/nsprpub/configure
index d92322f2601f..b38815afdedb 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,12 +3541,10 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 390940fa2977..bd502c893062 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,12 +1144,10 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC

From eeb9c2e7f86929b22e5cfd3ad205e2eeb20b712a Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 11:54:04 +0200
Subject: [PATCH 242/314] Bug 646460, Don't allow to override after treating
 certificates as revoked, r=bsmith

---
 security/manager/ssl/src/nsNSSIOLayer.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 6f5865a59377..6f7615523a1d 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -3340,6 +3340,13 @@ cancel_and_failure(nsNSSSocketInfo* infoObject)
 static SECStatus
 nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
 {
+  // cert was revoked, don't do anything else
+  // Calling cancel_and_failure is not necessary, and would be wrong,
+  // [for errors other than the ones explicitly handled below,] 
+  // because it suppresses error reporting.
+  if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
+    return SECFailure;
+
   nsNSSShutDownPreventionLock locker;
   nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
   if (!infoObject)

From f4f8e210a55f136712aacae88eed39ce5aaf3fd8 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 11:55:28 +0200
Subject: [PATCH 243/314] Bug 642144, Enable multiple roots for EV. (March 2011
 batch, depends on NSS 3.12.10), r=rrelyea, r=honzab

---
 .../manager/ssl/src/nsIdentityChecking.cpp    | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index f6c0e4ef8a73..1a3f38e72a1f 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -81,6 +81,12 @@ struct nsMyTrustedEVInfo
 };
 
 static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
+  /*
+   * IMPORTANT! When extending this list, 
+   * pairs of dotted_oid and oid_name should always be unique pairs.
+   * In other words, if you add another list, that uses the same dotted_oid
+   * as an existing entry, then please use the same oid_name.
+   */
   {
     // CN=WellsSecure Public Root Certificate Authority,OU=Wells Fargo Bank NA,O=Wells Fargo WellsSecure,C=US
     "2.16.840.1.114171.500.9",
@@ -297,6 +303,18 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
+  {
+    // CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US
+    "2.16.840.1.114413.1.7.23.3",
+    "Go Daddy EV OID a",
+    SEC_OID_UNKNOWN,
+    "47:BE:AB:C9:22:EA:E8:0E:78:78:34:62:A7:9F:45:C2:54:FD:E6:8B",
+    "MIGDMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
+    "dHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMTAvBgNVBAMTKEdv"
+    "IERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=",
+    "AA==",
+    nsnull
+  },
   {
     // E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O=\"ValiCert, Inc.\",L=ValiCert Validation Network
     "2.16.840.1.114413.1.7.23.3",
@@ -335,6 +353,19 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
+  {
+    // CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US
+    "2.16.840.1.114414.1.7.23.3",
+    "Go Daddy EV OID b",
+    SEC_OID_UNKNOWN,
+    "B5:1C:06:7C:EE:2B:0C:3D:F8:55:AB:2D:92:F4:FE:39:D4:E7:0F:0E",
+    "MIGPMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
+    "dHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEy"
+    "MDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0g"
+    "RzI=",
+    "AA==",
+    nsnull
+  },
   {
     // CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US
     "2.16.840.1.114412.2.1",
@@ -476,6 +507,84 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "YyUAAQACFI0zFQLkbPQ=",
     nsnull
   },
+  {
+    // CN=AffirmTrust Commercial,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.1",
+    "AffirmTrust EV OID a",
+    SEC_OID_UNKNOWN,
+    "F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7",
+    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
+    "QWZmaXJtVHJ1c3QgQ29tbWVyY2lhbA==",
+    "d3cGJyapsXw=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Networking,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.2",
+    "AffirmTrust EV OID b",
+    SEC_OID_UNKNOWN,
+    "29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F",
+    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
+    "QWZmaXJtVHJ1c3QgTmV0d29ya2luZw==",
+    "fE8EORzUmS0=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Premium,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.3",
+    "AffirmTrust EV OID c",
+    SEC_OID_UNKNOWN,
+    "D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27",
+    "MEExCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEcMBoGA1UEAwwT"
+    "QWZmaXJtVHJ1c3QgUHJlbWl1bQ==",
+    "bYwURrGmCu4=",
+    nsnull
+  },
+  {
+    // CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US
+    "1.3.6.1.4.1.34697.2.4",
+    "AffirmTrust EV OID d",
+    SEC_OID_UNKNOWN,
+    "B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB",
+    "MEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwX"
+    "QWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0M=",
+    "dJclisc/elQ=",
+    nsnull
+  },
+  {
+    // CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL
+    "1.2.616.1.113527.2.5.1.1",
+    "Certum EV OID",
+    SEC_OID_UNKNOWN,
+    "07:E0:32:E0:20:B7:2C:3F:19:2F:06:28:A2:59:3A:19:A7:0F:06:9E",
+    "MH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBT"
+    "LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAg"
+    "BgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0E=",
+    "BETA",
+    nsnull
+  },
+  {
+    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
+    "1.3.6.1.4.1.14777.6.1.1",
+    "Izenpe EV OID 1",
+    SEC_OID_UNKNOWN,
+    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
+    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
+    "SXplbnBlLmNvbQ==",
+    "ALC3WhZIX7/hy/WL1xnmfQ==",
+    nsnull
+  },
+  {
+    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
+    "1.3.6.1.4.1.14777.6.1.2",
+    "Izenpe EV OID 2",
+    SEC_OID_UNKNOWN,
+    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
+    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
+    "SXplbnBlLmNvbQ==",
+    "ALC3WhZIX7/hy/WL1xnmfQ==",
+    nsnull
+  },
   {
     // OU=Sample Certification Authority,O=\"Sample, Inc.\",C=US
     "0.0.0.0",

From 50eef2c98bb985f0743342e8bf55cc95e70c0bfb Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 13:01:23 +0200
Subject: [PATCH 244/314] Backed out changeset a2b1affead67

---
 .../manager/ssl/src/nsIdentityChecking.cpp    | 109 ------------------
 1 file changed, 109 deletions(-)

diff --git a/security/manager/ssl/src/nsIdentityChecking.cpp b/security/manager/ssl/src/nsIdentityChecking.cpp
index 1a3f38e72a1f..f6c0e4ef8a73 100644
--- a/security/manager/ssl/src/nsIdentityChecking.cpp
+++ b/security/manager/ssl/src/nsIdentityChecking.cpp
@@ -81,12 +81,6 @@ struct nsMyTrustedEVInfo
 };
 
 static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
-  /*
-   * IMPORTANT! When extending this list, 
-   * pairs of dotted_oid and oid_name should always be unique pairs.
-   * In other words, if you add another list, that uses the same dotted_oid
-   * as an existing entry, then please use the same oid_name.
-   */
   {
     // CN=WellsSecure Public Root Certificate Authority,OU=Wells Fargo Bank NA,O=Wells Fargo WellsSecure,C=US
     "2.16.840.1.114171.500.9",
@@ -303,18 +297,6 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
-  {
-    // CN=Go Daddy Root Certificate Authority - G2,O="GoDaddy.com, Inc.",L=Scottsdale,ST=Arizona,C=US
-    "2.16.840.1.114413.1.7.23.3",
-    "Go Daddy EV OID a",
-    SEC_OID_UNKNOWN,
-    "47:BE:AB:C9:22:EA:E8:0E:78:78:34:62:A7:9F:45:C2:54:FD:E6:8B",
-    "MIGDMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
-    "dHRzZGFsZTEaMBgGA1UEChMRR29EYWRkeS5jb20sIEluYy4xMTAvBgNVBAMTKEdv"
-    "IERhZGR5IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0gRzI=",
-    "AA==",
-    nsnull
-  },
   {
     // E=info@valicert.com,CN=http://www.valicert.com/,OU=ValiCert Class 2 Policy Validation Authority,O=\"ValiCert, Inc.\",L=ValiCert Validation Network
     "2.16.840.1.114413.1.7.23.3",
@@ -353,19 +335,6 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "AA==",
     nsnull
   },
-  {
-    // CN=Starfield Root Certificate Authority - G2,O="Starfield Technologies, Inc.",L=Scottsdale,ST=Arizona,C=US
-    "2.16.840.1.114414.1.7.23.3",
-    "Go Daddy EV OID b",
-    SEC_OID_UNKNOWN,
-    "B5:1C:06:7C:EE:2B:0C:3D:F8:55:AB:2D:92:F4:FE:39:D4:E7:0F:0E",
-    "MIGPMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHQXJpem9uYTETMBEGA1UEBxMKU2Nv"
-    "dHRzZGFsZTElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEy"
-    "MDAGA1UEAxMpU3RhcmZpZWxkIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IC0g"
-    "RzI=",
-    "AA==",
-    nsnull
-  },
   {
     // CN=DigiCert High Assurance EV Root CA,OU=www.digicert.com,O=DigiCert Inc,C=US
     "2.16.840.1.114412.2.1",
@@ -507,84 +476,6 @@ static struct nsMyTrustedEVInfo myTrustedEVInfos[] = {
     "YyUAAQACFI0zFQLkbPQ=",
     nsnull
   },
-  {
-    // CN=AffirmTrust Commercial,O=AffirmTrust,C=US
-    "1.3.6.1.4.1.34697.2.1",
-    "AffirmTrust EV OID a",
-    SEC_OID_UNKNOWN,
-    "F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7",
-    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
-    "QWZmaXJtVHJ1c3QgQ29tbWVyY2lhbA==",
-    "d3cGJyapsXw=",
-    nsnull
-  },
-  {
-    // CN=AffirmTrust Networking,O=AffirmTrust,C=US
-    "1.3.6.1.4.1.34697.2.2",
-    "AffirmTrust EV OID b",
-    SEC_OID_UNKNOWN,
-    "29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F",
-    "MEQxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEfMB0GA1UEAwwW"
-    "QWZmaXJtVHJ1c3QgTmV0d29ya2luZw==",
-    "fE8EORzUmS0=",
-    nsnull
-  },
-  {
-    // CN=AffirmTrust Premium,O=AffirmTrust,C=US
-    "1.3.6.1.4.1.34697.2.3",
-    "AffirmTrust EV OID c",
-    SEC_OID_UNKNOWN,
-    "D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27",
-    "MEExCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEcMBoGA1UEAwwT"
-    "QWZmaXJtVHJ1c3QgUHJlbWl1bQ==",
-    "bYwURrGmCu4=",
-    nsnull
-  },
-  {
-    // CN=AffirmTrust Premium ECC,O=AffirmTrust,C=US
-    "1.3.6.1.4.1.34697.2.4",
-    "AffirmTrust EV OID d",
-    SEC_OID_UNKNOWN,
-    "B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB",
-    "MEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwX"
-    "QWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0M=",
-    "dJclisc/elQ=",
-    nsnull
-  },
-  {
-    // CN=Certum Trusted Network CA,OU=Certum Certification Authority,O=Unizeto Technologies S.A.,C=PL
-    "1.2.616.1.113527.2.5.1.1",
-    "Certum EV OID",
-    SEC_OID_UNKNOWN,
-    "07:E0:32:E0:20:B7:2C:3F:19:2F:06:28:A2:59:3A:19:A7:0F:06:9E",
-    "MH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBT"
-    "LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAg"
-    "BgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0E=",
-    "BETA",
-    nsnull
-  },
-  {
-    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
-    "1.3.6.1.4.1.14777.6.1.1",
-    "Izenpe EV OID 1",
-    SEC_OID_UNKNOWN,
-    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
-    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
-    "SXplbnBlLmNvbQ==",
-    "ALC3WhZIX7/hy/WL1xnmfQ==",
-    nsnull
-  },
-  {
-    // CN=Izenpe.com,O=IZENPE S.A.,C=ES
-    "1.3.6.1.4.1.14777.6.1.2",
-    "Izenpe EV OID 2",
-    SEC_OID_UNKNOWN,
-    "2F:78:3D:25:52:18:A7:4A:65:39:71:B5:2C:A2:9C:45:15:6F:E9:19",
-    "MDgxCzAJBgNVBAYTAkVTMRQwEgYDVQQKDAtJWkVOUEUgUy5BLjETMBEGA1UEAwwK"
-    "SXplbnBlLmNvbQ==",
-    "ALC3WhZIX7/hy/WL1xnmfQ==",
-    nsnull
-  },
   {
     // OU=Sample Certification Authority,O=\"Sample, Inc.\",C=US
     "0.0.0.0",

From 35230e301c4657994cbadfbf8db09f5c4efd5509 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 13:05:15 +0200
Subject: [PATCH 245/314] backout 68941:5b8ade677818

---
 security/manager/ssl/src/nsNSSIOLayer.cpp | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 6f7615523a1d..6f5865a59377 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -3340,13 +3340,6 @@ cancel_and_failure(nsNSSSocketInfo* infoObject)
 static SECStatus
 nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
 {
-  // cert was revoked, don't do anything else
-  // Calling cancel_and_failure is not necessary, and would be wrong,
-  // [for errors other than the ones explicitly handled below,] 
-  // because it suppresses error reporting.
-  if (PR_GetError() == SEC_ERROR_REVOKED_CERTIFICATE)
-    return SECFailure;
-
   nsNSSShutDownPreventionLock locker;
   nsNSSSocketInfo* infoObject = (nsNSSSocketInfo *)arg;
   if (!infoObject)

From 79dd62a1a313764d86365469fc3ba67302df8484 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 13:05:57 +0200
Subject: [PATCH 246/314] backout c89356582dc9

---
 nsprpub/configure    | 2 ++
 nsprpub/configure.in | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/nsprpub/configure b/nsprpub/configure
index b38815afdedb..d92322f2601f 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,10 +3541,12 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index bd502c893062..390940fa2977 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,10 +1144,12 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
+                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
+            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC

From 43ae211055c4c92213c5171171085f95ea3a2353 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Wed, 4 May 2011 13:06:30 +0200
Subject: [PATCH 247/314] backout d30b2e9c999a

---
 nsprpub/TAG-INFO                              |    2 +-
 nsprpub/config/prdepend.h                     |    1 -
 nsprpub/configure                             |   48 +-
 nsprpub/configure.in                          |    2 -
 nsprpub/pr/include/prio.h                     |    3 -
 nsprpub/pr/include/prtypes.h                  |   22 +-
 nsprpub/pr/src/pthreads/ptio.c                |   34 -
 security/coreconf/Darwin.mk                   |    4 +-
 security/coreconf/coreconf.dep                |    2 +
 security/nss/TAG-INFO                         |    2 +-
 security/nss/cmd/addbuiltin/addbuiltin.c      |    6 +-
 security/nss/cmd/certutil/certutil.c          |  544 +-
 security/nss/cmd/lib/secutil.c                |   18 +-
 security/nss/cmd/lib/secutil.h                |    5 +-
 security/nss/cmd/selfserv/selfserv.c          |    8 +-
 security/nss/cmd/shlibsign/shlibsign.c        |    4 +-
 security/nss/cmd/strsclnt/strsclnt.c          |   38 +-
 security/nss/cmd/tstclnt/tstclnt.c            |   11 +-
 security/nss/lib/certdb/cert.h                |   35 +-
 security/nss/lib/certdb/stanpcertdb.c         |   15 -
 security/nss/lib/certhigh/certhigh.c          |    2 +-
 security/nss/lib/certhigh/certvfypkix.c       |   57 -
 security/nss/lib/ckfw/builtins/certdata.c     | 5421 ++++++++---------
 security/nss/lib/ckfw/builtins/certdata.txt   | 5120 +++++++---------
 security/nss/lib/ckfw/builtins/nssckbi.h      |    4 +-
 security/nss/lib/cryptohi/seckey.c            |   37 +-
 security/nss/lib/freebl/blapit.h              |    6 +-
 security/nss/lib/freebl/mpi/mpi-config.h      |    4 +-
 security/nss/lib/freebl/mpi/mpi.c             |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_gas.s   |    4 +-
 security/nss/lib/freebl/mpi/mpi_amd64_sun.s   |    4 +-
 security/nss/lib/freebl/nsslowhash.c          |    4 +-
 security/nss/lib/freebl/rsa.c                 |  331 +-
 security/nss/lib/freebl/sha512.c              |    4 +-
 security/nss/lib/freebl/stubs.c               |   54 -
 security/nss/lib/freebl/stubs.h               |    5 -
 .../libpkix/pkix/checker/pkix_crlchecker.c    |    3 -
 .../nss/lib/libpkix/pkix/top/pkix_build.c     |   34 +-
 .../pkix_pl_nss/module/pkix_pl_socket.c       |    6 +-
 .../pkix_pl_nss/pki/pkix_pl_infoaccess.c      |   75 +-
 security/nss/lib/nss/nss.def                  |    7 -
 security/nss/lib/nss/nss.h                    |    8 +-
 security/nss/lib/pk11wrap/Makefile            |    2 -
 security/nss/lib/pk11wrap/debug_module.c      |   27 +-
 security/nss/lib/pk11wrap/pk11load.c          |    9 +-
 security/nss/lib/pk11wrap/pk11pars.c          |   13 -
 security/nss/lib/pk11wrap/pk11priv.h          |    2 -
 security/nss/lib/pk11wrap/pk11slot.c          |   34 +-
 security/nss/lib/pk11wrap/pk11util.c          |   12 -
 security/nss/lib/pk11wrap/secmodi.h           |    2 -
 security/nss/lib/pki/pki3hack.c               |   94 +-
 security/nss/lib/pki/pki3hack.h               |    5 +-
 security/nss/lib/smime/cms.h                  |   55 +-
 security/nss/lib/smime/cmsasn1.c              |   22 +-
 security/nss/lib/smime/cmscinfo.c             |  123 +-
 security/nss/lib/smime/cmsdecode.c            |  143 +-
 security/nss/lib/smime/cmsdigdata.c           |   37 +-
 security/nss/lib/smime/cmsencdata.c           |   33 +-
 security/nss/lib/smime/cmsencode.c            |  185 +-
 security/nss/lib/smime/cmsenvdata.c           |   32 +-
 security/nss/lib/smime/cmslocal.h             |   45 +-
 security/nss/lib/smime/cmsmessage.c           |    8 +-
 security/nss/lib/smime/cmssigdata.c           |   34 +-
 security/nss/lib/smime/cmst.h                 |   36 +-
 security/nss/lib/smime/cmsudf.c               |  480 --
 security/nss/lib/smime/cmsutil.c              |   11 +-
 security/nss/lib/smime/manifest.mn            |    1 -
 security/nss/lib/smime/smime.def              |   20 -
 security/nss/lib/smime/smime.h                |    4 +-
 security/nss/lib/softoken/pkcs11.c            |   45 +-
 security/nss/lib/softoken/rsawrapr.c          |   51 +-
 security/nss/lib/softoken/softkver.h          |    6 +-
 security/nss/lib/ssl/derive.c                 |   43 +-
 security/nss/lib/ssl/ssl.def                  |    6 -
 security/nss/lib/ssl/ssl.h                    |   11 +-
 security/nss/lib/ssl/ssl3con.c                |   42 +-
 security/nss/lib/ssl/ssl3ext.c                |   15 +-
 security/nss/lib/ssl/sslcon.c                 |    6 +-
 security/nss/lib/ssl/sslimpl.h                |    4 +-
 security/nss/lib/ssl/sslnonce.c               |    5 +-
 security/nss/lib/ssl/sslsecur.c               |   15 +-
 security/nss/lib/ssl/sslsnce.c                |  124 +-
 security/nss/lib/ssl/sslsock.c                |   10 +-
 security/nss/lib/sysinit/nsssysinit.c         |   40 +-
 security/nss/lib/util/nssb64d.c               |   10 +-
 security/nss/lib/util/nssutil.h               |    6 +-
 security/nss/lib/util/secasn1e.c              |    8 +-
 security/nss/tests/chains/ocspd-config/readme |   24 +-
 security/nss/tests/libpkix/certs/OCSPCA1.cert |  Bin 583 -> 585 bytes
 security/nss/tests/libpkix/certs/OCSPCA1.p12  |  Bin 1692 -> 1700 bytes
 security/nss/tests/libpkix/certs/OCSPCA2.cert |  Bin 583 -> 585 bytes
 security/nss/tests/libpkix/certs/OCSPCA2.p12  |  Bin 1692 -> 1700 bytes
 security/nss/tests/libpkix/certs/OCSPCA3.cert |  Bin 583 -> 585 bytes
 security/nss/tests/libpkix/certs/OCSPCA3.p12  |  Bin 1692 -> 1700 bytes
 .../nss/tests/libpkix/certs/OCSPEE11.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE12.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE13.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE14.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE15.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE21.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE22.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE23.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE31.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE32.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPEE33.cert     |  Bin 561 -> 563 bytes
 .../nss/tests/libpkix/certs/OCSPRoot.cert     |  Bin 549 -> 549 bytes
 security/nss/tests/libpkix/certs/OCSPRoot.p12 |  Bin 1662 -> 1662 bytes
 .../nss/tests/libpkix/certs/PayPalEE.cert     |  Bin 1615 -> 1615 bytes
 108 files changed, 5758 insertions(+), 8180 deletions(-)
 delete mode 100644 security/nss/lib/smime/cmsudf.c

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index ca2fd86685e0..94e18b2923e4 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_8_8_BETA3
+NSPR_4_8_8_BETA2
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index 55444c40b3aa..df72c56882d2 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -42,4 +42,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/nsprpub/configure b/nsprpub/configure
index d92322f2601f..d6ff36f7a10a 100755
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3541,12 +3541,10 @@ EOF
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
@@ -4741,17 +4739,17 @@ EOF
         _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
         ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
-echo "configure:4745: checking for machine/builtins.h" >&5
+echo "configure:4743: checking for machine/builtins.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4750 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 #include <machine/builtins.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5400,7 +5398,7 @@ case $target in
     ;;
 *)
     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:5404: checking for dlopen in -ldl" >&5
+echo "configure:5402: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5408,7 +5406,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5412 "configure"
+#line 5410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5419,7 +5417,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:5423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5436,17 +5434,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:5440: checking for dlfcn.h" >&5
+echo "configure:5438: checking for dlfcn.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5445 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5479,13 +5477,13 @@ esac
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:5483: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:5481: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 5489 "configure"
+#line 5487 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -5503,7 +5501,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 5507 "configure"
+#line 5505 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -5527,12 +5525,12 @@ fi
 for ac_func in lchown strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5531: checking for $ac_func" >&5
+echo "configure:5529: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5536 "configure"
+#line 5534 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5555,7 +5553,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5606,7 +5604,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5610: checking for $ac_word" >&5
+echo "configure:5608: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CCACHE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5665,7 +5663,7 @@ hpux*)
 if test -z "$GNU_CC"; then
 
     echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
-echo "configure:5669: checking for +Olit support" >&5
+echo "configure:5667: checking for +Olit support" >&5
 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5707,7 +5705,7 @@ wince*)
 *)
     
 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
-echo "configure:5711: checking for pthread_create in -lpthreads" >&5
+echo "configure:5709: checking for pthread_create in -lpthreads" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5729,7 +5727,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:5733: checking for pthread_create in -lpthread" >&5
+echo "configure:5731: checking for pthread_create in -lpthread" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5751,7 +5749,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:5755: checking for pthread_create in -lc_r" >&5
+echo "configure:5753: checking for pthread_create in -lc_r" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5773,7 +5771,7 @@ echo "
         echo "$ac_t""no" 1>&6
         
 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
-echo "configure:5777: checking for pthread_create in -lc" >&5
+echo "configure:5775: checking for pthread_create in -lc" >&5
 echo "
     #include <pthread.h> 
     void *foo(void *v) { return v; } 
@@ -5891,7 +5889,7 @@ if test -n "$USE_PTHREADS"; then
       rm -f conftest*
    ac_cv_have_dash_pthread=no
    echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
-echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
+echo "configure:5893: checking whether ${CC-cc} accepts -pthread" >&5
    echo 'int main() { return 0; }' | cat > conftest.c
    ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
    if test $? -eq 0; then
@@ -5914,7 +5912,7 @@ echo "configure:5895: checking whether ${CC-cc} accepts -pthread" >&5
 			    ac_cv_have_dash_pthreads=no
     if test "$ac_cv_have_dash_pthread" = "no"; then
 	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
-echo "configure:5918: checking whether ${CC-cc} accepts -pthreads" >&5
+echo "configure:5916: checking whether ${CC-cc} accepts -pthreads" >&5
     	echo 'int main() { return 0; }' | cat > conftest.c
 	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
     	if test $? -eq 0; then
diff --git a/nsprpub/configure.in b/nsprpub/configure.in
index 390940fa2977..bd502c893062 100644
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -1144,12 +1144,10 @@ case "$target" in
                 CC="$CC -arch x86_64"
             else        
                 CPU_ARCH=i386
-                CC="$CC -arch i386"
             fi
             ;;
         *)
             CPU_ARCH=ppc
-            CC="$CC -arch ppc"
             ;;
     esac
     DSO_CFLAGS=-fPIC
diff --git a/nsprpub/pr/include/prio.h b/nsprpub/pr/include/prio.h
index 1ee792b52e34..7ec3045e065c 100644
--- a/nsprpub/pr/include/prio.h
+++ b/nsprpub/pr/include/prio.h
@@ -142,9 +142,6 @@ typedef enum PRTransmitFileFlags {
 #define PR_AF_INET6 100
 #endif
 
-#define PR_AF_INET_SDP 101
-#define PR_AF_INET6_SDP 102
-
 #ifndef PR_AF_UNSPEC
 #define PR_AF_UNSPEC 0
 #endif
diff --git a/nsprpub/pr/include/prtypes.h b/nsprpub/pr/include/prtypes.h
index 6b3cb5ae4c0f..b764b27e4af5 100644
--- a/nsprpub/pr/include/prtypes.h
+++ b/nsprpub/pr/include/prtypes.h
@@ -235,7 +235,7 @@ PR_BEGIN_EXTERN_C
 **              PRInt8
 ** DESCRIPTION:
 **  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char".
+**      is equivalent to a plain "char". 
 ************************************************************************/
 #if PR_BYTES_PER_BYTE == 1
 typedef unsigned char PRUint8;
@@ -274,7 +274,7 @@ typedef signed char PRInt8;
 ** TYPES:       PRUint16
 **              PRInt16
 ** DESCRIPTION:
-**  The int16 types are known to be 16 bits each.
+**  The int16 types are known to be 16 bits each. 
 ************************************************************************/
 #if PR_BYTES_PER_SHORT == 2
 typedef unsigned short PRUint16;
@@ -299,7 +299,7 @@ typedef short PRInt16;
 ** TYPES:       PRUint32
 **              PRInt32
 ** DESCRIPTION:
-**  The int32 types are known to be 32 bits each.
+**  The int32 types are known to be 32 bits each. 
 ************************************************************************/
 #if PR_BYTES_PER_INT == 4
 typedef unsigned int PRUint32;
@@ -372,7 +372,7 @@ typedef PRInt64 PRUint64;
 **  The PRIntn types are most appropriate for automatic variables. They are
 **      guaranteed to be at least 16 bits, though various architectures may
 **      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure.
+**      never valid for fields of a structure. 
 ************************************************************************/
 #if PR_BYTES_PER_INT >= 2
 typedef int PRIntn;
@@ -384,14 +384,14 @@ typedef unsigned int PRUintn;
 /************************************************************************
 ** TYPES:       PRFloat64
 ** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
+**  NSPR's floating point type is always 64 bits. 
 ************************************************************************/
 typedef double          PRFloat64;
 
 /************************************************************************
 ** TYPES:       PRSize
 ** DESCRIPTION:
-**  A type for representing the size of objects.
+**  A type for representing the size of objects. 
 ************************************************************************/
 typedef size_t PRSize;
 
@@ -399,7 +399,7 @@ typedef size_t PRSize;
 /************************************************************************
 ** TYPES:       PROffset32, PROffset64
 ** DESCRIPTION:
-**  A type for representing byte offsets from some location.
+**  A type for representing byte offsets from some location. 
 ************************************************************************/
 typedef PRInt32 PROffset32;
 typedef PRInt64 PROffset64;
@@ -408,7 +408,7 @@ typedef PRInt64 PROffset64;
 ** TYPES:       PRPtrDiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer subtraction.
+**      for storing a pointer or pointer subtraction. 
 ************************************************************************/
 typedef ptrdiff_t PRPtrdiff;
 
@@ -416,7 +416,7 @@ typedef ptrdiff_t PRPtrdiff;
 ** TYPES:       PRUptrdiff
 ** DESCRIPTION:
 **  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
+**      for storing a pointer or pointer sutraction. 
 ************************************************************************/
 #ifdef _WIN64
 typedef PRUint64 PRUptrdiff;
@@ -430,7 +430,7 @@ typedef unsigned long PRUptrdiff;
 **  Use PRBool for variables and parameter types. Use PR_FALSE and PR_TRUE
 **      for clarity of target type in assignments and actual arguments. Use
 **      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions.
+**      just as you would C int-valued conditions. 
 ************************************************************************/
 typedef PRIntn PRBool;
 #define PR_TRUE 1
@@ -445,7 +445,7 @@ typedef PRIntn PRBool;
 typedef PRUint8 PRPackedBool;
 
 /*
-** Status code used by some routines that have a single point of failure or
+** Status code used by some routines that have a single point of failure or 
 ** special status return.
 */
 typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
diff --git a/nsprpub/pr/src/pthreads/ptio.c b/nsprpub/pr/src/pthreads/ptio.c
index 66921a4a65ec..05ce808fd363 100644
--- a/nsprpub/pr/src/pthreads/ptio.c
+++ b/nsprpub/pr/src/pthreads/ptio.c
@@ -218,20 +218,6 @@ static PRBool _pr_ipv6_v6only_on_by_default;
 #error "Cannot determine architecture"
 #endif
 
-#if defined(SOLARIS)            
-#ifndef PROTO_SDP
-/* on solaris, SDP is a new type of protocol */
-#define PROTO_SDP   257
-#endif 
-#define _PR_HAVE_SDP
-#elif defined(LINUX)
-#ifndef AF_INET_SDP
-/* on linux, SDP is a new type of address family */
-#define AF_INET_SDP 27
-#endif
-#define _PR_HAVE_SDP
-#endif /* LINUX */
-
 static PRFileDesc *pt_SetMethods(
     PRIntn osfd, PRDescType type, PRBool isAcceptedSocket, PRBool imported);
 
@@ -3476,12 +3462,6 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 
     if (PF_INET != domain
         && PR_AF_INET6 != domain
-#if defined(_PR_HAVE_SDP)
-        && PR_AF_INET_SDP != domain
-#if defined(SOLARIS)
-        && PR_AF_INET6_SDP != domain
-#endif /* SOLARIS */
-#endif /* _PR_HAVE_SDP */
         && PF_UNIX != domain)
     {
         PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
@@ -3494,20 +3474,6 @@ PR_IMPLEMENT(PRFileDesc*) PR_Socket(PRInt32 domain, PRInt32 type, PRInt32 proto)
 		(void)PR_SetError(PR_ADDRESS_NOT_SUPPORTED_ERROR, 0);
 		return fd;
 	}
-#if defined(_PR_HAVE_SDP)
-#if defined(LINUX)
-    if (PR_AF_INET_SDP == domain)
-        domain = AF_INET_SDP;
-#elif defined(SOLARIS)
-    if (PR_AF_INET_SDP == domain) {
-        domain = AF_INET;
-        proto = PROTO_SDP;
-    } else if(PR_AF_INET6_SDP == domain) {
-        domain = AF_INET6;
-        proto = PROTO_SDP;
-    }
-#endif /* SOLARIS */
-#endif /* _PR_HAVE_SDP */
 #if defined(_PR_INET6_PROBE)
 	if (PR_AF_INET6 == domain)
 		domain = _pr_ipv6_is_present() ? AF_INET6 : AF_INET;
diff --git a/security/coreconf/Darwin.mk b/security/coreconf/Darwin.mk
index 110d89f2ae13..9edf4d8476c5 100644
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -54,15 +54,13 @@ ifdef USE_64
 CC              += -arch x86_64
 else
 OS_REL_CFLAGS	= -Di386
-CC              += -arch i386
 endif
 else
 OS_REL_CFLAGS	= -Dppc
-CC              += -arch ppc
 endif
 
 ifneq (,$(MACOS_SDK_DIR))
-    GCC_VERSION_FULL := $(shell $(CC) -dumpversion)
+    GCC_VERSION_FULL := $(shell $(CC) -v 2>&1 | grep "gcc version" | sed -e "s/^.*gcc version[  ]*//" | awk '{ print $$1 }')
     GCC_VERSION_MAJOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$1 }')
     GCC_VERSION_MINOR := $(shell echo $(GCC_VERSION_FULL) | awk -F. '{ print $$2 }')
     GCC_VERSION = $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR)
diff --git a/security/coreconf/coreconf.dep b/security/coreconf/coreconf.dep
index b536cfc01b91..74740bdcc314 100644
--- a/security/coreconf/coreconf.dep
+++ b/security/coreconf/coreconf.dep
@@ -43,3 +43,5 @@
 
 #error "Do not include this header file."
 
+
+
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index 26c5e745e9fb..6e9e9a3f0736 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_12_10_BETA1
+NSS_3_12_9_RTM
diff --git a/security/nss/cmd/addbuiltin/addbuiltin.c b/security/nss/cmd/addbuiltin/addbuiltin.c
index 63422f893dc9..693819ff0e1d 100644
--- a/security/nss/cmd/addbuiltin/addbuiltin.c
+++ b/security/nss/cmd/addbuiltin/addbuiltin.c
@@ -37,7 +37,7 @@
 /*
  * Tool for converting builtin CA certs.
  *
- * $Id: addbuiltin.c,v 1.14.68.1 2011/03/23 20:07:57 kaie%kuix.de Exp $
+ * $Id: addbuiltin.c,v 1.14 2007/02/14 00:35:52 alexei.volkov.bugs%sun.com Exp $
  */
 
 #include "nssrenam.h"
@@ -77,8 +77,6 @@ char *getTrustString(unsigned int trust)
 		return "CKT_NETSCAPE_TRUSTED_DELEGATOR";
 	} else if (trust & CERTDB_VALID_CA) {
 		return "CKT_NETSCAPE_VALID_DELEGATOR";
-	} else if (trust & CERTDB_VALID_PEER) {
-		return "CKT_NETSCAPE_VALID";
 	} else {
 		return "CKT_NETSCAPE_TRUST_UNKNOWN";
 	}
@@ -215,7 +213,7 @@ void printheader() {
 "#\n"
 "# ***** END LICENSE BLOCK *****\n"
      "#\n"
-     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14.68.1 $ $Date: 2011/03/23 20:07:57 $\"\n"
+     "CVS_ID \"@(#) $RCSfile: addbuiltin.c,v $ $Revision: 1.14 $ $Date: 2007/02/14 00:35:52 $\"\n"
      "\n"
      "#\n"
      "# certdata.txt\n"
diff --git a/security/nss/cmd/certutil/certutil.c b/security/nss/cmd/certutil/certutil.c
index 4b890446fde4..459357888622 100644
--- a/security/nss/cmd/certutil/certutil.c
+++ b/security/nss/cmd/certutil/certutil.c
@@ -985,7 +985,7 @@ ListModules(void)
 }
 
 static void 
-PrintSyntax(char *progName)
+Usage(char *progName)
 {
 #define FPS fprintf(stderr, 
     FPS "Type %s -H for more detailed descriptions\n", progName);
@@ -1055,57 +1055,22 @@ PrintSyntax(char *progName)
     exit(1);
 }
 
-enum usage_level {
-    usage_all = 0, usage_selected = 1
-};
-
-static void luCommonDetailsAE();
-
-static void luA(enum usage_level ul, const char *command)
+static void LongUsage(char *progName)
 {
-    int is_my_command = (command && 0 == strcmp(command, "A"));
-    if (ul == usage_all || !command || is_my_command)
+
     FPS "%-15s Add a certificate to the database        (create if needed)\n",
-        "-A");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    if (ul == usage_all) {
+	"-A");
     FPS "%-20s\n", "   All options under -E apply");
-    }
-    else {
-        luCommonDetailsAE();
-    }
-}
-
-static void luB(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "B"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Run a series of certutil commands from a batch file\n", "-B");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Specify the batch file\n", "   -i batch-file");
-}
-
-static void luE(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "E"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Add an Email certificate to the database (create if needed)\n",
-        "-E");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    luCommonDetailsAE();
-}
-
-static void luCommonDetailsAE()
-{
+	"-E");
     FPS "%-20s Specify the nickname of the certificate to add\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Set the certificate trust attributes:\n",
-        "   -t trustargs");
+	"   -t trustargs");
     FPS "%-25s trustargs is of the form x,y,z where x is for SSL, y is for S/MIME,\n", "");
-    FPS "%-25s and z is for code signing. Use ,, for no explicit trust.\n", "");
+    FPS "%-25s and z is for code signing\n", "");
     FPS "%-25s p \t valid peer\n", "");
     FPS "%-25s P \t trusted peer (implies p)\n", "");
     FPS "%-25s c \t valid CA\n", "");
@@ -1115,46 +1080,39 @@ static void luCommonDetailsAE()
     FPS "%-25s w \t send warning\n", "");
     FPS "%-25s g \t make step-up cert\n", "");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s The input certificate is encoded in ASCII (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Specify the certificate file (default is stdin)\n",
-        "   -i input");
+	"   -i input");
     FPS "\n");
-}
 
-static void luC(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "C"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new binary certificate from a BINARY cert request\n",
-        "-C");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-C");
     FPS "%-20s The nickname of the issuer cert\n",
-        "   -c issuer-name");
+	"   -c issuer-name");
     FPS "%-20s The BINARY certificate request file\n",
-        "   -i cert-request ");
+	"   -i cert-request ");
     FPS "%-20s Output binary cert to this file (default is stdout)\n",
-        "   -o output-cert");
+	"   -o output-cert");
     FPS "%-20s Self sign\n",
-        "   -x");
+	"   -x");
     FPS "%-20s Cert serial number\n",
-        "   -m serial-number");
+	"   -m serial-number");
     FPS "%-20s Time Warp\n",
-        "   -w warp-months");
+	"   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s \n"
               "%-20s Create key usage extension. Possible keywords:\n"
               "%-20s \"digitalSignature\", \"nonRepudiation\", \"keyEncipherment\",\n"
@@ -1162,11 +1120,11 @@ static void luC(enum usage_level ul, const char *command)
               "%-20s \"crlSigning\", \"critical\"\n",
         "   -1 | --keyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create basic constraint extension\n",
-        "   -2 ");
+	"   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-        "   -3 ");
+	"   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-        "   -4 ");
+	"   -4 ");
     FPS "%-20s \n"
               "%-20s Create netscape cert type extension. Possible keywords:\n"
               "%-20s \"sslClient\", \"sslServer\", \"smime\", \"objectSigning\",\n"
@@ -1177,48 +1135,41 @@ static void luC(enum usage_level ul, const char *command)
               "%-20s \"serverAuth\", \"clientAuth\",\"codeSigning\",\n"
               "%-20s \"emailProtection\", \"timeStamp\",\"ocspResponder\",\n"
               "%-20s \"stepUp\", \"critical\"\n",
-        "   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
+	"   -6 | --extKeyUsage keyword,keyword,...", "", "", "", "");
     FPS "%-20s Create an email subject alt name extension\n",
-        "   -7 emailAddrs");
+	"   -7 emailAddrs");
     FPS "%-20s Create an dns subject alt name extension\n",
-        "   -8 dnsNames");
+	"   -8 dnsNames");
     FPS "%-20s The input certificate request is encoded in ASCII (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "\n");
-}
 
-static void luG(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "G"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a new key pair\n",
-        "-G");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-G");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
-        "   -k key-type");
+	"   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d) (not for ec)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
-        "   -k key-type");
+	"   -k key-type");
     FPS "%-20s Key size in bits, (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Set the public exponent value (3, 17, 65537) (rsa only)\n",
-        "   -y exp");
+	"   -y exp");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Specify the noise file to be used\n",
-        "   -z noisefile");
+	"   -z noisefile");
     FPS "%-20s read PQG value from pqgfile (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s One of nistp256, nistp384, nistp521\n", "");
 #ifdef NSS_ECC_MORE_THAN_SUITE_B
     FPS "%-20s sect163k1, nistk163, sect163r1, sect163r2,\n", "");
@@ -1241,239 +1192,167 @@ static void luG(enum usage_level ul, const char *command)
 #endif /* NSS_ECC_MORE_THAN_SUITE_B */
 #endif
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
-}
 
-static void luD(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "D"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Delete a certificate from the database\n",
-        "-D");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-D");
     FPS "%-20s The nickname of the cert to delete\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
 
-}
-
-static void luU(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "U"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all modules\n", /*, or print out a single named module\n",*/
         "-U");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Module database directory (default is '~/.netscape')\n",
         "   -d moddir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
 
-}
-
-static void luK(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "K"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all private keys\n",
         "-K");
-    if (ul == usage_selected && !is_my_command)
-        return;
-    FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
-        "   -h token-name ");
+          FPS "%-20s Name of token to search (\"all\" for all tokens)\n",
+	"   -h token-name ");
 
     FPS "%-20s Key type (\"all\" (default), \"dsa\","
 #ifdef NSS_ENABLE_ECC
                                                     " \"ec\","
 #endif
-                                                    " \"rsa\")\n",
-        "   -k key-type");
+                                                             " \"rsa\")\n",
+	"   -k key-type");
     FPS "%-20s The nickname of the key or associated certificate\n",
-        "   -n name");
+	"   -n name");
     FPS "%-20s Specify the password file\n",
         "   -f password-file");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luL(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "L"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s List all certs, or print out a single named cert\n",
-        "-L");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-L");
     FPS "%-20s Pretty print named cert (list all if unspecified)\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s \n"
               "%-20s Pretty print cert with email address (list all if unspecified)\n",
-        "   --email email-address", "");
+	"   --email email-address", "");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "%-20s For single cert, print binary DER encoding\n",
-        "   -r");
+	"   -r");
     FPS "%-20s For single cert, print ASCII encoding (RFC1113)\n",
-        "   -a");
+	"   -a");
     FPS "\n");
-}
 
-static void luM(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "M"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Modify trust attributes of certificate\n",
-        "-M");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-M");
     FPS "%-20s The nickname of the cert to modify\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-        "   -t trustargs");
+	"   -t trustargs");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
-}
 
-static void luN(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "N"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Create a new certificate database\n",
-        "-N");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-N");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "\n");
-}
-
-static void luT(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "T"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Reset the Key database or token\n",
-        "-T");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-T");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Token to reset (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
     FPS "%-20s Set token's Site Security Officer password\n",
-        "   -0 SSO-password");
+	"   -0 SSO-password");
     FPS "\n");
-}
 
-static void luO(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "O"));
-    if (ul == usage_all || !command || is_my_command)
+    FPS "\n");
     FPS "%-15s Print the chain of a certificate\n",
-        "-O");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-O");
     FPS "%-20s The nickname of the cert to modify\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luR(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "R"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Generate a certificate request (stdout)\n",
-        "-R");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-R");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
-        "   -s subject");
+	"   -s subject");
     FPS "%-20s Output the cert request to this file\n",
-        "   -o output-req");
+	"   -o output-req");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-        "   -k key-type-or-id");
+	"   -k key-type-or-id");
     FPS "%-20s or nickname of the cert key to use \n",
-        "");
+	"");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-        "");
+	"");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Key database directory (default is ~/.netscape)\n",
-        "   -d keydir");
+	"   -d keydir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-        "   -p phone");
+	"   -p phone");
     FPS "%-20s Output the cert request in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s \n",
-        "   See -S for available extension options");
+	"   See -S for available extension options");
     FPS "\n");
-}
 
-static void luV(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "V"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Validate a certificate\n",
-        "-V");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-V");
     FPS "%-20s The nickname of the cert to Validate\n",
-        "   -n cert-name");
+	"   -n cert-name");
     FPS "%-20s validity time (\"YYMMDDHHMMSS[+HHMM|-HHMM|Z]\")\n",
-        "   -b time");
+	"   -b time");
     FPS "%-20s Check certificate signature \n",
-        "   -e ");   
+	"   -e ");   
     FPS "%-20s Specify certificate usage:\n", "   -u certusage");
     FPS "%-25s C \t SSL Client\n", "");
     FPS "%-25s V \t SSL Server\n", "");
@@ -1482,205 +1361,140 @@ static void luV(enum usage_level ul, const char *command)
     FPS "%-25s O \t OCSP status responder\n", "");   
     FPS "%-25s J \t Object signer\n", "");   
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Input the certificate in ASCII (RFC1113); default is binary\n",
-        "   -a");
+	"   -a");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s force the database to open R/W\n",
-        "   -X");
+	"   -X");
     FPS "\n");
-}
 
-static void luW(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "W"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Change the key database password\n",
-        "-W");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"-W");
     FPS "%-20s cert and key database directory\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Specify a file with the current password\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Specify a file with the new password in two lines\n",
-        "   -@ newpwfile");
-    FPS "\n");
-}
+	"   -@ newpwfile");
 
-static void luUpgradeMerge(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "upgrade-merge"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Upgrade an old database and merge it into a new one\n",
-        "--upgrade-merge");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"--upgrade-merge");
     FPS "%-20s Cert database directory to merge into (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory to upgrade from\n",
-        "   --source-dir certdir", "");
+	"   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the upgrade database\n",
-        "   --soruce-prefix dbprefix", "");
+	"   --soruce-prefix dbprefix", "");
     FPS "%-20s \n%-20s Unique identifier for the upgrade database\n",
-        "   --upgrade-id uniqueID", "");
+	"   --upgrade-id uniqueID", "");
     FPS "%-20s \n%-20s Name of the token while it is in upgrade state\n",
-        "   --upgrade-token-name name", "");
+	"   --upgrade-token-name name", "");
     FPS "%-20s Specify the password file for the upgrade database\n",
-        "   -@ pwfile");
+	"   -@ pwfile");
     FPS "\n");
-}
 
-static void luMerge(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "merge"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Merge source database into the target database\n",
-        "--merge");
-    if (ul == usage_selected && !is_my_command)
-        return;
+	"--merge");
     FPS "%-20s Cert database directory of target (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix of the target database\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the password file for the target database\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s \n%-20s Cert database directory of the source database\n",
-        "   --source-dir certdir", "");
+	"   --source-dir certdir", "");
     FPS "%-20s \n%-20s Cert & Key database prefix of the source database\n",
-        "   --source-prefix dbprefix", "");
+	"   --source-prefix dbprefix", "");
     FPS "%-20s Specify the password file for the source database\n",
-        "   -@ pwfile");
+	"   -@ pwfile");
     FPS "\n");
-}
 
-static void luS(enum usage_level ul, const char *command)
-{
-    int is_my_command = (command && 0 == strcmp(command, "S"));
-    if (ul == usage_all || !command || is_my_command)
     FPS "%-15s Make a certificate and add to database\n",
         "-S");
-    if (ul == usage_selected && !is_my_command)
-        return;
     FPS "%-20s Specify the nickname of the cert\n",
         "   -n key-name");
     FPS "%-20s Specify the subject name (using RFC1485)\n",
         "   -s subject");
     FPS "%-20s The nickname of the issuer cert\n",
-        "   -c issuer-name");
+	"   -c issuer-name");
     FPS "%-20s Set the certificate trust attributes (see -A above)\n",
-        "   -t trustargs");
+	"   -t trustargs");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Type of key pair to generate (\"dsa\", \"ec\", \"rsa\" (default))\n",
 #else
     FPS "%-20s Type of key pair to generate (\"dsa\", \"rsa\" (default))\n",
 #endif /* NSS_ENABLE_ECC */
-        "   -k key-type-or-id");
+	"   -k key-type-or-id");
     FPS "%-20s Name of token in which to generate key (default is internal)\n",
-        "   -h token-name");
+	"   -h token-name");
     FPS "%-20s Key size in bits, RSA keys only (min %d, max %d, default %d)\n",
-        "   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
+	"   -g key-size", MIN_KEY_BITS, MAX_KEY_BITS, DEFAULT_KEY_BITS);
     FPS "%-20s Name of file containing PQG parameters (dsa only)\n",
-        "   -q pqgfile");
+	"   -q pqgfile");
 #ifdef NSS_ENABLE_ECC
     FPS "%-20s Elliptic curve name (ec only)\n",
-        "   -q curve-name");
+	"   -q curve-name");
     FPS "%-20s See the \"-G\" option for a full list of supported names.\n",
-        "");
+	"");
 #endif /* NSS_ENABLE_ECC */
     FPS "%-20s Self sign\n",
-        "   -x");
+	"   -x");
     FPS "%-20s Cert serial number\n",
-        "   -m serial-number");
+	"   -m serial-number");
     FPS "%-20s Time Warp\n",
-        "   -w warp-months");
+	"   -w warp-months");
     FPS "%-20s Months valid (default is 3)\n",
         "   -v months-valid");
     FPS "%-20s Specify the password file\n",
-        "   -f pwfile");
+	"   -f pwfile");
     FPS "%-20s Cert database directory (default is ~/.netscape)\n",
-        "   -d certdir");
+	"   -d certdir");
     FPS "%-20s Cert & Key database prefix\n",
-        "   -P dbprefix");
+	"   -P dbprefix");
     FPS "%-20s Specify the contact phone number (\"123-456-7890\")\n",
-        "   -p phone");
+	"   -p phone");
     FPS "%-20s Create key usage extension\n",
-        "   -1 ");
+	"   -1 ");
     FPS "%-20s Create basic constraint extension\n",
-        "   -2 ");
+	"   -2 ");
     FPS "%-20s Create authority key ID extension\n",
-        "   -3 ");
+	"   -3 ");
     FPS "%-20s Create crl distribution point extension\n",
-        "   -4 ");
+	"   -4 ");
     FPS "%-20s Create netscape cert type extension\n",
-        "   -5 ");
+	"   -5 ");
     FPS "%-20s Create extended key usage extension\n",
-        "   -6 ");
+	"   -6 ");
     FPS "%-20s Create an email subject alt name extension\n",
-        "   -7 emailAddrs ");
+	"   -7 emailAddrs ");
     FPS "%-20s Create a DNS subject alt name extension\n",
-        "   -8 DNS-names");
+	"   -8 DNS-names");
     FPS "%-20s Create an Authority Information Access extension\n",
-        "   --extAIA ");
+	"   --extAIA ");
     FPS "%-20s Create a Subject Information Access extension\n",
-        "   --extSIA ");
+	"   --extSIA ");
     FPS "%-20s Create a Certificate Policies extension\n",
-        "   --extCP ");
+	"   --extCP ");
     FPS "%-20s Create a Policy Mappings extension\n",
-        "   --extPM ");
+	"   --extPM ");
     FPS "%-20s Create a Policy Constraints extension\n",
-        "   --extPC ");
+	"   --extPC ");
     FPS "%-20s Create an Inhibit Any Policy extension\n",
-        "   --extIA ");
+	"   --extIA ");
     FPS "%-20s Create a subject key ID extension\n",
-        "   --extSKID ");
+	"   --extSKID ");
     FPS "\n");
-}
 
-static void LongUsage(char *progName, enum usage_level ul, const char *command)
-{
-    luA(ul, command);
-    luB(ul, command);
-    luE(ul, command);
-    luC(ul, command);
-    luG(ul, command);
-    luD(ul, command);
-    luU(ul, command);
-    luK(ul, command);
-    luL(ul, command);
-    luM(ul, command);
-    luN(ul, command);
-    luT(ul, command);
-    luO(ul, command);
-    luR(ul, command);
-    luV(ul, command);
-    luW(ul, command);
-    luUpgradeMerge(ul, command);
-    luMerge(ul, command);
-    luS(ul, command);
+    exit(1);
 #undef FPS
 }
 
-static void
-Usage(char *progName)
-{
-    PR_fprintf(PR_STDERR,
-        "%s - Utility to manipulate NSS certificate databases\n\n"
-        "Usage:  %s <command> -d <database-directory> <options>\n\n"
-        "Valid commands:\n", progName, progName);
-    LongUsage(progName, usage_selected, NULL);
-    PR_fprintf(PR_STDERR, "\n"
-        "%s -H <command> : Print available options for the given command\n"
-        "%s -H : Print complete help output of all commands and options\n"
-        "%s --syntax : Print a short summary of all commands and options\n",
-        progName, progName, progName);
-    exit(1);
-}
 
 static CERTCertificate *
 MakeV1Cert(	CERTCertDBHandle *	handle, 
@@ -2015,7 +1829,6 @@ enum {
     cmd_DeleteKey,
     cmd_GenKeyPair,
     cmd_PrintHelp,
-    cmd_PrintSyntax,
     cmd_ListKeys,
     cmd_ListCerts,
     cmd_ModifyCertTrust,
@@ -2030,8 +1843,7 @@ enum {
     cmd_Version,
     cmd_Batch,
     cmd_Merge,
-    cmd_UpgradeMerge, /* test only */
-    max_cmd
+    cmd_UpgradeMerge /* test only */
 };
 
 /*  Certutil options */
@@ -2089,8 +1901,7 @@ enum certutilOpts {
     opt_SourceDir,
     opt_SourcePrefix,
     opt_UpgradeID,
-    opt_UpgradeTokenName,
-    opt_Help
+    opt_UpgradeTokenName
 };
 
 static const
@@ -2102,9 +1913,7 @@ secuCommandFlag commands_init[] =
 	{ /* cmd_AddEmailCert        */  'E', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_DeleteKey           */  'F', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_GenKeyPair          */  'G', PR_FALSE, 0, PR_FALSE },
-	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE, "help" },
-        { /* cmd_PrintSyntax         */   0,  PR_FALSE, 0, PR_FALSE,
-                                                   "syntax" },
+	{ /* cmd_PrintHelp           */  'H', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListKeys            */  'K', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ListCerts           */  'L', PR_FALSE, 0, PR_FALSE },
 	{ /* cmd_ModifyCertTrust     */  'M', PR_FALSE, 0, PR_FALSE },
@@ -2254,32 +2063,8 @@ certutil_main(int argc, char **argv, PRBool initialize)
     if (rv != SECSuccess)
 	Usage(progName);
 
-    if (certutil.commands[cmd_PrintSyntax].activated) {
-        PrintSyntax(progName);
-    }
-
-    if (certutil.commands[cmd_PrintHelp].activated) {
-        int i;
-        char buf[2];
-        const char *command = NULL;
-        for (i = 0; i < max_cmd; i++) {
-            if (i == cmd_PrintHelp)
-                continue;
-            if (certutil.commands[i].activated) {
-                if (certutil.commands[i].flag) {
-                    buf[0] = certutil.commands[i].flag;
-                    buf[1] = 0;
-                    command = buf;
-                }
-                else {
-                    command = certutil.commands[i].longform;
-                }
-                break;
-            }
-        }
-	LongUsage(progName, (command ? usage_selected : usage_all), command);
-        exit(1);
-    }
+    if (certutil.commands[cmd_PrintHelp].activated)
+	LongUsage(progName);
 
     if (certutil.options[opt_PasswordFile].arg) {
 	pwdata.source = PW_FROMFILE;
@@ -2462,6 +2247,7 @@ certutil_main(int argc, char **argv, PRBool initialize)
 	return 255;
     }
     if (commandsEntered == 0) {
+	PR_fprintf(PR_STDERR, "%s: you must enter a command!\n", progName);
 	Usage(progName);
     }
 
diff --git a/security/nss/cmd/lib/secutil.c b/security/nss/cmd/lib/secutil.c
index 05f4ea0adf5f..f2170e945c45 100644
--- a/security/nss/cmd/lib/secutil.c
+++ b/security/nss/cmd/lib/secutil.c
@@ -981,7 +981,7 @@ SECU_PrintInteger(FILE *out, SECItem *i, char *m, int level)
 }
 
 static void
-secu_PrintRawString(FILE *out, SECItem *si, const char *m, int level)
+secu_PrintRawString(FILE *out, SECItem *si, char *m, int level)
 {
     int column;
     unsigned int i;
@@ -2094,25 +2094,23 @@ secu_PrintCRLDistPtsExtension(FILE *out, SECItem *value, char *msg, int level)
 	CRLDistributionPoint ** pPoints = dPoints->distPoints;
 	CRLDistributionPoint *  pPoint;
 	while (NULL != (pPoint = *pPoints++)) {
-	    SECU_Indent(out, level); fputs("Distribution point:\n", out);
 	    if (pPoint->distPointType == generalName && 
 	        pPoint->distPoint.fullName != NULL) {
 		secu_PrintGeneralNames(out, pPoint->distPoint.fullName, NULL,
-		                       level + 1);
+		                       level);
 	    } else if (pPoint->distPointType == relativeDistinguishedName &&
 	               pPoint->distPoint.relativeName.avas) {
 		SECU_PrintRDN(out, &pPoint->distPoint.relativeName, "RDN", 
-		              level + 1);
+		              level);
 	    } else if (pPoint->derDistPoint.data) {
-		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level + 1);
+		SECU_PrintAny(out, &pPoint->derDistPoint, "Point", level);
 	    }
 	    if (pPoint->reasons.data) {
 		secu_PrintDecodedBitString(out, &pPoint->reasons, "Reasons", 
-		                           level + 1);
+		                           level);
 	    }
 	    if (pPoint->crlIssuer) {
-		secu_PrintGeneralName(out, pPoint->crlIssuer, "CRL issuer",
-				      level + 1);
+		secu_PrintGeneralName(out, pPoint->crlIssuer, "Issuer", level);
 	    }
 	}
     } else {
@@ -2334,7 +2332,7 @@ SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
  * print those, so make a directory name out of the RDN, and print it.
  */
 void
-SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level)
+SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level)
 {
     CERTName name;
     CERTRDN *rdns[2];
@@ -2347,7 +2345,7 @@ SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level)
 }
 
 void
-SECU_PrintName(FILE *out, CERTName *name, const char *msg, int level)
+SECU_PrintName(FILE *out, CERTName *name, char *msg, int level)
 {
     char *nameStr = NULL;
     char *str;
diff --git a/security/nss/cmd/lib/secutil.h b/security/nss/cmd/lib/secutil.h
index 8a6ab3cd6ba6..f3829d4e2622 100644
--- a/security/nss/cmd/lib/secutil.h
+++ b/security/nss/cmd/lib/secutil.h
@@ -309,9 +309,8 @@ extern void SECU_PrintPrivKeyUsagePeriodExtension(FILE *out, SECItem *value,
 extern void SECU_PrintExtensions(FILE *out, CERTCertExtension **extensions,
 				 char *msg, int level);
 
-extern void SECU_PrintName(FILE *out, CERTName *name, const char *msg,
-                           int level);
-extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, const char *msg, int level);
+extern void SECU_PrintName(FILE *out, CERTName *name, char *msg, int level);
+extern void SECU_PrintRDN(FILE *out, CERTRDN *rdn, char *msg, int level);
 
 #ifdef SECU_GetPassword
 /* Convert a High public Key to a Low public Key */
diff --git a/security/nss/cmd/selfserv/selfserv.c b/security/nss/cmd/selfserv/selfserv.c
index bd1d47b4cedc..d78881de2548 100644
--- a/security/nss/cmd/selfserv/selfserv.c
+++ b/security/nss/cmd/selfserv/selfserv.c
@@ -1491,18 +1491,14 @@ getBoundListenSocket(unsigned short port)
     PRStatus	       prStatus;
     PRNetAddr          addr;
     PRSocketOptionData opt;
-    PRUint16           socketDomain = PR_AF_INET;
 
     addr.inet.family = PR_AF_INET;
     addr.inet.ip     = PR_INADDR_ANY;
     addr.inet.port   = PR_htons(port);
 
-    if (PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = PR_AF_INET_SDP;
-    }
-    listen_sock = PR_OpenTCPSocket(socketDomain);
+    listen_sock = PR_NewTCPSocket();
     if (listen_sock == NULL) {
-        errExit("PR_OpenTCPSocket error");
+	errExit("PR_NewTCPSocket");
     }
 
     opt.option = PR_SockOpt_Nonblocking;
diff --git a/security/nss/cmd/shlibsign/shlibsign.c b/security/nss/cmd/shlibsign/shlibsign.c
index 722cb15a5b35..6e93225190e4 100644
--- a/security/nss/cmd/shlibsign/shlibsign.c
+++ b/security/nss/cmd/shlibsign/shlibsign.c
@@ -46,7 +46,7 @@
  * compute the checksum for the NSS cryptographic boundary libraries
  * and compare the checksum with the value in .chk file.
  *
- * $Id: shlibsign.c,v 1.18.20.1 2011/04/08 04:04:27 wtc%google.com Exp $
+ * $Id: shlibsign.c,v 1.18 2008/11/20 15:44:12 glen.beasley%sun.com Exp $
  */
 
 #ifdef XP_UNIX
@@ -1012,7 +1012,7 @@ int main(int argc, char **argv)
     }
 
     /* open the target signature file */
-    fd = PR_Open(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
+    fd = PR_OpenFile(output_file,PR_WRONLY|PR_CREATE_FILE|PR_TRUNCATE,0666);
     if (fd == NULL ) {
         lperror(output_file);
         goto cleanup;
diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c
index 2e768ec4b775..786b6bcf7892 100644
--- a/security/nss/cmd/strsclnt/strsclnt.c
+++ b/security/nss/cmd/strsclnt/strsclnt.c
@@ -360,7 +360,7 @@ printSecurityInfo(PRFileDesc *fd)
 
 #define MAX_THREADS 128
 
-typedef int startFn(void *a, void *b, int c, int d);
+typedef int startFn(void *a, void *b, int c);
 
 
 static PRInt32     numConnected;
@@ -374,7 +374,6 @@ typedef struct perThreadStr {
     startFn  *  startFunc;
     PRThread *  prThread;
     PRBool	inUse;
-    PRInt32     socketDomain;
 } perThread;
 
 perThread threads[MAX_THREADS];
@@ -430,8 +429,7 @@ thread_wrapper(void * arg)
         }
         PR_Unlock(threadLock);
         if (doop) {
-            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid,
-                                           slot->socketDomain);
+            slot->rv = (* slot->startFunc)(slot->a, slot->b, slot->tid);
             PRINTF("strsclnt: Thread in slot %d returned %d\n", 
                    slot->tid, slot->rv);
         }
@@ -446,8 +444,7 @@ launch_thread(
     startFn *	startFunc,
     void *	a,
     void *	b,
-    int         tid,
-    int         sockDom)
+    int         tid)
 {
     PRUint32 i;
     perThread * slot;
@@ -465,8 +462,7 @@ launch_thread(
     slot->a = a;
     slot->b = b;
     slot->tid = tid;
-    slot->socketDomain = sockDom;
-    
+
     slot->startFunc = startFunc;
 
     slot->prThread      = PR_CreateThread(PR_USER_THREAD,
@@ -589,8 +585,7 @@ int
 do_writes(
     void *       a,
     void *       b,
-    int          c,
-    int          d)
+    int          c)
 {
     PRFileDesc *	ssl_sock	= (PRFileDesc *)a;
     lockedVars *	lv 		= (lockedVars *)b;
@@ -632,7 +627,7 @@ handle_fdx_connection( PRFileDesc * ssl_sock, int connection)
     lockedVars_AddToCount(&lv, 1);
 
     /* Attempt to launch the writer thread. */
-    result = launch_thread(do_writes, ssl_sock, &lv, connection, -1 /*not used*/);
+    result = launch_thread(do_writes, ssl_sock, &lv, connection);
 
     if (result != SECSuccess) 
     	goto cleanup;
@@ -751,8 +746,7 @@ int
 do_connects(
     void *	a,
     void *	b,
-    int         tid,
-    PRInt32     socketDomain)
+    int         tid)
 {
     PRNetAddr  *        addr		= (PRNetAddr *)  a;
     PRFileDesc *        model_sock	= (PRFileDesc *) b;
@@ -766,7 +760,7 @@ do_connects(
 
 retry:
 
-    tcp_sock = PR_OpenTCPSocket(socketDomain);
+    tcp_sock = PR_OpenTCPSocket(addr->raw.family);
     if (tcp_sock == NULL) {
 	errExit("PR_OpenTCPSocket");
     }
@@ -1094,7 +1088,6 @@ client_main(
     int         rv;
     PRStatus    status;
     PRNetAddr   addr;
-    PRInt32    socketDomain;
 
     status = PR_StringToNetAddr(hostName, &addr);
     if (status == PR_SUCCESS) {
@@ -1122,13 +1115,6 @@ client_main(
 	}
     }
 
-    /* check if SDP is going to be used */
-    if (!PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = addr.raw.family;
-    } else {
-        socketDomain = PR_AF_INET_SDP;
-    }
-
     /* all suites except RSA_NULL_MD5 are enabled by Domestic Policy */
     NSS_SetDomesticPolicy();
 
@@ -1185,8 +1171,8 @@ client_main(
     }
 
     /* configure model SSL socket. */
-    
-    model_sock = PR_OpenTCPSocket(socketDomain);
+
+    model_sock = PR_OpenTCPSocket(addr.raw.family);
     if (model_sock == NULL) {
 	errExit("PR_OpenTCPSocket for model socket");
     }
@@ -1290,7 +1276,7 @@ client_main(
 
     if (!NoReuse) {
         remaining_connections = 1;
-	rv = launch_thread(do_connects, &addr, model_sock, 0, socketDomain);
+	rv = launch_thread(do_connects, &addr, model_sock, 0);
 	/* wait for the first connection to terminate, then launch the rest. */
 	reap_threads();
         remaining_connections = total_connections - 1 ;
@@ -1299,7 +1285,7 @@ client_main(
         active_threads  = PR_MIN(active_threads, remaining_connections);
 	/* Start up the threads */
 	for (i=0;i<active_threads;i++) {
-	    rv = launch_thread(do_connects, &addr, model_sock, i, socketDomain);
+	    rv = launch_thread(do_connects, &addr, model_sock, i);
 	}
 	reap_threads();
     }
diff --git a/security/nss/cmd/tstclnt/tstclnt.c b/security/nss/cmd/tstclnt/tstclnt.c
index 1e0453145f24..55684e685fa4 100644
--- a/security/nss/cmd/tstclnt/tstclnt.c
+++ b/security/nss/cmd/tstclnt/tstclnt.c
@@ -538,7 +538,6 @@ int main(int argc, char **argv)
     PLOptState *optstate;
     PLOptStatus optstatus;
     PRStatus prStatus;
-    PRUint16           socketDomain;
 
     progName = strrchr(argv[0], '/');
     if (!progName)
@@ -700,17 +699,11 @@ int main(int argc, char **argv)
 
     printHostNameAndAddr(host, &addr);
 
-    /* check if SDP is going to be used */
-    if (!PR_GetEnv("NSS_USE_SDP")) {
-        socketDomain = addr.raw.family;
-    } else {
-        socketDomain = PR_AF_INET_SDP;
-    }
     if (pingServerFirst) {
 	int iter = 0;
 	PRErrorCode err;
 	do {
-	    s = PR_OpenTCPSocket(socketDomain);
+	    s = PR_OpenTCPSocket(addr.raw.family);
 	    if (s == NULL) {
 		SECU_PrintError(progName, "Failed to create a TCP socket");
 	    }
@@ -748,7 +741,7 @@ int main(int argc, char **argv)
     }
 
     /* Create socket */
-    s = PR_OpenTCPSocket(socketDomain);
+    s = PR_OpenTCPSocket(addr.raw.family);
     if (s == NULL) {
 	SECU_PrintError(progName, "error creating socket");
 	return 1;
diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h
index 790abfb0213f..2b74f972f45f 100644
--- a/security/nss/lib/certdb/cert.h
+++ b/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.80.2.3 2011/04/08 22:54:34 kaie%kuix.de Exp $
+ * $Id: cert.h,v 1.80.2.1 2010/09/24 13:31:57 kaie%kuix.de Exp $
  */
 
 #ifndef _CERT_H_
@@ -1112,7 +1112,7 @@ extern CERTCertificateList *
 CERT_CertListFromCert(CERTCertificate *cert);
 
 extern CERTCertificateList *
-CERT_DupCertList(const CERTCertificateList * oldList);
+CERT_DupCertList(CERTCertificateList * oldList);
 
 extern void CERT_DestroyCertificateList(CERTCertificateList *list);
 
@@ -1665,33 +1665,26 @@ extern SECStatus CERT_PKIXVerifyCert(
 	CERTValInParam *paramsIn,
 	CERTValOutParam *paramsOut,
 	void *wincx);
+/*
+ * This function changes the application defaults for the Verify function.
+ * It should be called once at app initialization time, and only changes
+ * if the default configuration changes.
+ *
+ * This changes the default values for the parameters specified. These
+ * defaults can be overridden in CERT_PKIXVerifyCert() by explicitly 
+ * setting the value in paramsIn.
+ */
+extern SECStatus CERT_PKIXSetDefaults(CERTValInParam *paramsIn);
 
 /* Makes old cert validation APIs(CERT_VerifyCert, CERT_VerifyCertificate)
  * to use libpkix validation engine. The function should be called ones at
  * application initialization time.
  * Function is not thread safe.*/
-extern SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
+SECStatus CERT_SetUsePKIXForValidation(PRBool enable);
 
 /* The function return PR_TRUE if cert validation should use
  * libpkix cert validation engine. */
-extern PRBool CERT_GetUsePKIXForValidation(void);
-
-/*
- * Allocate a parameter container of type CERTRevocationFlags,
- * and allocate the inner arrays of the given sizes.
- * To cleanup call CERT_DestroyCERTRevocationFlags.
- */
-extern CERTRevocationFlags *
-CERT_AllocCERTRevocationFlags(
-    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
-    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods);
-
-/*
- * Destroy the arrays inside flags,
- * and destroy the object pointed to by flags, too.
- */
-extern void
-CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags);
+PRBool CERT_GetUsePKIXForValidation(void);
 
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/certdb/stanpcertdb.c b/security/nss/lib/certdb/stanpcertdb.c
index 56587ea8cf62..119a8da9fd42 100644
--- a/security/nss/lib/certdb/stanpcertdb.c
+++ b/security/nss/lib/certdb/stanpcertdb.c
@@ -37,7 +37,6 @@
 #include "prtime.h"
 
 #include "cert.h"
-#include "certi.h"
 #include "certdb.h"
 #include "secitem.h"
 #include "secder.h"
@@ -87,26 +86,12 @@ SEC_DeletePermCertificate(CERTCertificate *cert)
     PRStatus nssrv;
     NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
     NSSCertificate *c = STAN_GetNSSCertificate(cert);
-    CERTCertTrust *certTrust;
 
     if (c == NULL) {
         /* error code is set */
         return SECFailure;
     }
 
-    certTrust = nssTrust_GetCERTCertTrustForCert(c, cert);
-    if (certTrust) {
-	NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
-	if (nssTrust) {
-	    nssrv = STAN_DeleteCertTrustMatchingSlot(c);
-	    if (nssrv != PR_SUCCESS) {
-    		CERT_MapStanError();
-    	    }
-	    /* This call always returns PR_SUCCESS! */
-	    (void) nssTrust_Destroy(nssTrust);
-	}
-    }
-
     /* get rid of the token instances */
     nssrv = NSSCertificate_DeleteStoredObject(c, NULL);
 
diff --git a/security/nss/lib/certhigh/certhigh.c b/security/nss/lib/certhigh/certhigh.c
index 6081364ea1b9..83a4b01b2936 100644
--- a/security/nss/lib/certhigh/certhigh.c
+++ b/security/nss/lib/certhigh/certhigh.c
@@ -1176,7 +1176,7 @@ loser:
 }
 
 CERTCertificateList *
-CERT_DupCertList(const CERTCertificateList * oldList)
+CERT_DupCertList(CERTCertificateList * oldList)
 {
     CERTCertificateList *newList = NULL;
     PRArenaPool         *arena   = NULL;
diff --git a/security/nss/lib/certhigh/certvfypkix.c b/security/nss/lib/certhigh/certvfypkix.c
index 282d69b4eb71..27557c86c638 100644
--- a/security/nss/lib/certhigh/certvfypkix.c
+++ b/security/nss/lib/certhigh/certvfypkix.c
@@ -1986,63 +1986,6 @@ CERT_GetPKIXVerifyNistRevocationPolicy()
     return &certRev_PKIX_Verify_Nist_Policy;
 }
 
-CERTRevocationFlags *
-CERT_AllocCERTRevocationFlags(
-    PRUint32 number_leaf_methods, PRUint32 number_leaf_pref_methods,
-    PRUint32 number_chain_methods, PRUint32 number_chain_pref_methods)
-{
-    CERTRevocationFlags *flags;
-    
-    flags = PORT_New(CERTRevocationFlags);
-    if (!flags)
-        return(NULL);
-    
-    flags->leafTests.number_of_defined_methods = number_leaf_methods;
-    flags->leafTests.cert_rev_flags_per_method = 
-        PORT_NewArray(PRUint64, number_leaf_methods);
-
-    flags->leafTests.number_of_preferred_methods = number_leaf_pref_methods;
-    flags->leafTests.preferred_methods = 
-        PORT_NewArray(CERTRevocationMethodIndex, number_leaf_pref_methods);
-
-    flags->chainTests.number_of_defined_methods = number_chain_methods;
-    flags->chainTests.cert_rev_flags_per_method = 
-        PORT_NewArray(PRUint64, number_chain_methods);
-
-    flags->chainTests.number_of_preferred_methods = number_chain_pref_methods;
-    flags->chainTests.preferred_methods = 
-        PORT_NewArray(CERTRevocationMethodIndex, number_chain_pref_methods);
-    
-    if (!flags->leafTests.cert_rev_flags_per_method
-        || !flags->leafTests.preferred_methods
-        || !flags->chainTests.cert_rev_flags_per_method
-        || !flags->chainTests.preferred_methods) {
-        CERT_DestroyCERTRevocationFlags(flags);
-        return (NULL);
-    }
-    
-    return flags;
-}
-
-void CERT_DestroyCERTRevocationFlags(CERTRevocationFlags *flags)
-{
-    if (!flags)
-	return;
-  
-    if (flags->leafTests.cert_rev_flags_per_method)
-        PORT_Free(flags->leafTests.cert_rev_flags_per_method);
-
-    if (flags->leafTests.preferred_methods)
-        PORT_Free(flags->leafTests.preferred_methods);
-    
-    if (flags->chainTests.cert_rev_flags_per_method)
-        PORT_Free(flags->chainTests.cert_rev_flags_per_method);
-
-    if (flags->chainTests.preferred_methods)
-        PORT_Free(flags->chainTests.preferred_methods);
-
-     PORT_Free(flags);
-}
 
 /*
  * CERT_PKIXVerifyCert
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index 13a05ba435b9..924f36bb8f51 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $";
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $";
 #endif /* DEBUG */
 
 #ifndef BUILTINS_H
@@ -52,7 +52,6 @@ static const CK_OBJECT_CLASS cko_netscape_trust = CKO_NETSCAPE_TRUST;
 static const CK_TRUST ckt_netscape_trust_unknown = CKT_NETSCAPE_TRUST_UNKNOWN;
 static const CK_TRUST ckt_netscape_trusted_delegator = CKT_NETSCAPE_TRUSTED_DELEGATOR;
 static const CK_TRUST ckt_netscape_untrusted = CKT_NETSCAPE_UNTRUSTED;
-static const CK_TRUST ckt_netscape_valid = CKT_NETSCAPE_VALID;
 #ifdef DEBUG
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_0 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_APPLICATION,  CKA_VALUE
@@ -991,36 +990,6 @@ static const CK_ATTRIBUTE_TYPE nss_builtins_types_310 [] = {
 static const CK_ATTRIBUTE_TYPE nss_builtins_types_311 [] = {
  CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
 };
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_312 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_313 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_314 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_315 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_316 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_317 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_318 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_319 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_320 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERTIFICATE_TYPE,  CKA_SUBJECT,  CKA_ID,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_VALUE
-};
-static const CK_ATTRIBUTE_TYPE nss_builtins_types_321 [] = {
- CKA_CLASS,  CKA_TOKEN,  CKA_PRIVATE,  CKA_MODIFIABLE,  CKA_LABEL,  CKA_CERT_SHA1_HASH,  CKA_CERT_MD5_HASH,  CKA_ISSUER,  CKA_SERIAL_NUMBER,  CKA_TRUST_SERVER_AUTH,  CKA_TRUST_EMAIL_PROTECTION,  CKA_TRUST_CODE_SIGNING,  CKA_TRUST_STEP_UP_APPROVED
-};
 #ifdef DEBUG
 static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
@@ -1029,7 +998,7 @@ static const NSSItem nss_builtins_items_0 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)"CVS ID", (PRUint32)7 },
   { (void *)"NSS", (PRUint32)4 },
-  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.9 $ $Date: 2011/04/06 23:59:08 $", (PRUint32)164 }
+  { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.6 $ $Date: 2010/12/02 23:26:35 $", (PRUint32)164 }
 };
 #endif /* DEBUG */
 static const NSSItem nss_builtins_items_1 [] = {
@@ -1135,6 +1104,133 @@ static const NSSItem nss_builtins_items_3 [] = {
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
 static const NSSItem nss_builtins_items_4 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+"\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023"
+"\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003"
+"\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163"
+"\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023"
+"\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123"
+"\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156"
+"\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164"
+"\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155"
+"\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206"
+"\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055"
+"\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056"
+"\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060"
+"\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071"
+"\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023"
+"\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145"
+"\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003"
+"\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032"
+"\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040"
+"\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003"
+"\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151"
+"\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124"
+"\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106"
+"\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011"
+"\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157"
+"\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141"
+"\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206"
+"\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211"
+"\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330"
+"\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337"
+"\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176"
+"\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104"
+"\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170"
+"\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156"
+"\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152"
+"\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345"
+"\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006"
+"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015"
+"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
+"\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115"
+"\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317"
+"\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144"
+"\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254"
+"\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232"
+"\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163"
+"\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246"
+"\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242"
+"\201"
+, (PRUint32)817 }
+};
+static const NSSItem nss_builtins_items_5 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Personal Freemail CA", (PRUint32)28 },
+  { (void *)"\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207"
+"\244\353\000\205"
+, (PRUint32)20 },
+  { (void *)"\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331"
+, (PRUint32)16 },
+  { (void *)"\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007"
+"\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006"
+"\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156"
+"\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013"
+"\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157"
+"\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167"
+"\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145"
+"\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110"
+"\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154"
+"\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145"
+"\056\143\157\155"
+, (PRUint32)212 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_6 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1224,7 +1320,7 @@ static const NSSItem nss_builtins_items_4 [] = {
 "\243\377\212\043\056\160\107"
 , (PRUint32)791 }
 };
-static const NSSItem nss_builtins_items_5 [] = {
+static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1256,7 +1352,7 @@ static const NSSItem nss_builtins_items_5 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_6 [] = {
+static const NSSItem nss_builtins_items_8 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1349,7 +1445,7 @@ static const NSSItem nss_builtins_items_6 [] = {
 "\246\015\246\043\371\273\313\246\007\024\102"
 , (PRUint32)811 }
 };
-static const NSSItem nss_builtins_items_7 [] = {
+static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1382,7 +1478,7 @@ static const NSSItem nss_builtins_items_7 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_8 [] = {
+static const NSSItem nss_builtins_items_10 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1457,7 +1553,7 @@ static const NSSItem nss_builtins_items_8 [] = {
 "\254\007\167\070"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_9 [] = {
+static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1481,7 +1577,7 @@ static const NSSItem nss_builtins_items_9 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_10 [] = {
+static const NSSItem nss_builtins_items_12 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1556,7 +1652,7 @@ static const NSSItem nss_builtins_items_10 [] = {
 "\241\223\004\273\206\237\072\133\103\172\303\212\145"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_11 [] = {
+static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1580,7 +1676,7 @@ static const NSSItem nss_builtins_items_11 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_12 [] = {
+static const NSSItem nss_builtins_items_14 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1655,7 +1751,7 @@ static const NSSItem nss_builtins_items_12 [] = {
 "\307\177\033\033\326\006\040\002\130\241\303\242\003"
 , (PRUint32)813 }
 };
-static const NSSItem nss_builtins_items_13 [] = {
+static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1679,7 +1775,7 @@ static const NSSItem nss_builtins_items_13 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_14 [] = {
+static const NSSItem nss_builtins_items_16 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1745,7 +1841,7 @@ static const NSSItem nss_builtins_items_14 [] = {
 "\224"
 , (PRUint32)577 }
 };
-static const NSSItem nss_builtins_items_15 [] = {
+static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1772,7 +1868,7 @@ static const NSSItem nss_builtins_items_15 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_16 [] = {
+static const NSSItem nss_builtins_items_18 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1837,7 +1933,7 @@ static const NSSItem nss_builtins_items_16 [] = {
 "\360\210\321\345\170\215\245\052\117\366\227\015\027\167\312\330"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_17 [] = {
+static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1864,7 +1960,7 @@ static const NSSItem nss_builtins_items_17 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_18 [] = {
+static const NSSItem nss_builtins_items_20 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1929,7 +2025,7 @@ static const NSSItem nss_builtins_items_18 [] = {
 "\300\175\267\162\234\311\066\072\153\237\116\250\377\144\015\144"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_19 [] = {
+static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -1956,7 +2052,7 @@ static const NSSItem nss_builtins_items_19 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_20 [] = {
+static const NSSItem nss_builtins_items_22 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2046,7 +2142,7 @@ static const NSSItem nss_builtins_items_20 [] = {
 "\017\061\134\350\362\331"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_21 [] = {
+static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2079,7 +2175,7 @@ static const NSSItem nss_builtins_items_21 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_22 [] = {
+static const NSSItem nss_builtins_items_24 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2169,7 +2265,7 @@ static const NSSItem nss_builtins_items_22 [] = {
 "\214\022\173\305\104\264\256"
 , (PRUint32)775 }
 };
-static const NSSItem nss_builtins_items_23 [] = {
+static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2202,7 +2298,7 @@ static const NSSItem nss_builtins_items_23 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_24 [] = {
+static const NSSItem nss_builtins_items_26 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2292,7 +2388,7 @@ static const NSSItem nss_builtins_items_24 [] = {
 "\240\235\235\151\221\375"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_25 [] = {
+static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2325,7 +2421,7 @@ static const NSSItem nss_builtins_items_25 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_26 [] = {
+static const NSSItem nss_builtins_items_28 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2415,7 +2511,7 @@ static const NSSItem nss_builtins_items_26 [] = {
 "\117\312\200\221\266\051"
 , (PRUint32)774 }
 };
-static const NSSItem nss_builtins_items_27 [] = {
+static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2448,7 +2544,7 @@ static const NSSItem nss_builtins_items_27 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_28 [] = {
+static const NSSItem nss_builtins_items_30 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2530,7 +2626,7 @@ static const NSSItem nss_builtins_items_28 [] = {
 "\125\342\374\110\311\051\046\151\340"
 , (PRUint32)889 }
 };
-static const NSSItem nss_builtins_items_29 [] = {
+static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2555,7 +2651,7 @@ static const NSSItem nss_builtins_items_29 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_30 [] = {
+static const NSSItem nss_builtins_items_32 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2639,7 +2735,7 @@ static const NSSItem nss_builtins_items_30 [] = {
 "\152\374\176\102\070\100\144\022\367\236\201\341\223\056"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_31 [] = {
+static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2663,7 +2759,7 @@ static const NSSItem nss_builtins_items_31 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_32 [] = {
+static const NSSItem nss_builtins_items_34 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2748,7 +2844,7 @@ static const NSSItem nss_builtins_items_32 [] = {
 "\161\202\053\231\317\072\267\365\055\162\310"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_33 [] = {
+static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2779,7 +2875,7 @@ static const NSSItem nss_builtins_items_33 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_34 [] = {
+static const NSSItem nss_builtins_items_36 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2864,7 +2960,7 @@ static const NSSItem nss_builtins_items_34 [] = {
 "\276\355\164\114\274\133\325\142\037\103\335"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_35 [] = {
+static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2895,7 +2991,7 @@ static const NSSItem nss_builtins_items_35 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_36 [] = {
+static const NSSItem nss_builtins_items_38 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -2980,7 +3076,7 @@ static const NSSItem nss_builtins_items_36 [] = {
 "\040\017\105\176\153\242\177\243\214\025\356"
 , (PRUint32)747 }
 };
-static const NSSItem nss_builtins_items_37 [] = {
+static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3011,7 +3107,7 @@ static const NSSItem nss_builtins_items_37 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_38 [] = {
+static const NSSItem nss_builtins_items_40 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3118,7 +3214,7 @@ static const NSSItem nss_builtins_items_38 [] = {
 "\113\336\006\226\161\054\362\333\266\037\244\357\077\356"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_39 [] = {
+static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3151,7 +3247,7 @@ static const NSSItem nss_builtins_items_39 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_40 [] = {
+static const NSSItem nss_builtins_items_42 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3258,7 +3354,7 @@ static const NSSItem nss_builtins_items_40 [] = {
 "\311\130\020\371\252\357\132\266\317\113\113\337\052"
 , (PRUint32)1053 }
 };
-static const NSSItem nss_builtins_items_41 [] = {
+static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3291,7 +3387,7 @@ static const NSSItem nss_builtins_items_41 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_42 [] = {
+static const NSSItem nss_builtins_items_44 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3398,7 +3494,7 @@ static const NSSItem nss_builtins_items_42 [] = {
 "\153\271\012\172\116\117\113\204\356\113\361\175\335\021"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_43 [] = {
+static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3431,7 +3527,7 @@ static const NSSItem nss_builtins_items_43 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_44 [] = {
+static const NSSItem nss_builtins_items_46 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3538,7 +3634,7 @@ static const NSSItem nss_builtins_items_44 [] = {
 "\367\146\103\363\236\203\076\040\252\303\065\140\221\316"
 , (PRUint32)1054 }
 };
-static const NSSItem nss_builtins_items_45 [] = {
+static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3571,7 +3667,7 @@ static const NSSItem nss_builtins_items_45 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_46 [] = {
+static const NSSItem nss_builtins_items_48 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3689,7 +3785,7 @@ static const NSSItem nss_builtins_items_46 [] = {
 "\155\055\105\013\367\012\223\352\355\006\371\262"
 , (PRUint32)1244 }
 };
-static const NSSItem nss_builtins_items_47 [] = {
+static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3721,7 +3817,159 @@ static const NSSItem nss_builtins_items_47 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_48 [] = {
+static const NSSItem nss_builtins_items_50 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"\002\004\070\003\221\356"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070"
+"\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
+"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
+"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
+"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036"
+"\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027"
+"\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201"
+"\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024"
+"\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164"
+"\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167"
+"\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103"
+"\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120"
+"\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146"
+"\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045"
+"\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071"
+"\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151"
+"\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052"
+"\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145"
+"\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006"
+"\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000"
+"\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047"
+"\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150"
+"\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107"
+"\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226"
+"\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261"
+"\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164"
+"\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126"
+"\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346"
+"\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202"
+"\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004"
+"\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202"
+"\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244"
+"\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002"
+"\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004"
+"\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146"
+"\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141"
+"\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
+"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240"
+"\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056"
+"\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057"
+"\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125"
+"\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062"
+"\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061"
+"\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004"
+"\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312"
+"\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004"
+"\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231"
+"\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003"
+"\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000"
+"\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015"
+"\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201"
+"\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273"
+"\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002"
+"\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007"
+"\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363"
+"\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070"
+"\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003"
+"\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332"
+"\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134"
+"\354"
+, (PRUint32)1265 }
+};
+static const NSSItem nss_builtins_items_51 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Secure Personal CA", (PRUint32)31 },
+  { (void *)"\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125"
+"\262\371\365\200"
+, (PRUint32)20 },
+  { (void *)"\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364"
+, (PRUint32)16 },
+  { (void *)"\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165"
+"\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024"
+"\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164"
+"\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056"
+"\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061"
+"\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040"
+"\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003"
+"\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154"
+"\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)204 },
+  { (void *)"\002\004\070\003\221\356"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_52 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3829,7 +4077,7 @@ static const NSSItem nss_builtins_items_48 [] = {
 "\275\114\105\236\141\272\277\204\201\222\003\321\322\151\174\305"
 , (PRUint32)1120 }
 };
-static const NSSItem nss_builtins_items_49 [] = {
+static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3860,7 +4108,7 @@ static const NSSItem nss_builtins_items_49 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_50 [] = {
+static const NSSItem nss_builtins_items_54 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3942,7 +4190,7 @@ static const NSSItem nss_builtins_items_50 [] = {
 "\347\201\035\031\303\044\102\352\143\071\251"
 , (PRUint32)891 }
 };
-static const NSSItem nss_builtins_items_51 [] = {
+static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -3967,7 +4215,7 @@ static const NSSItem nss_builtins_items_51 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_52 [] = {
+static const NSSItem nss_builtins_items_56 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4035,7 +4283,7 @@ static const NSSItem nss_builtins_items_52 [] = {
 "\126\224\251\125"
 , (PRUint32)660 }
 };
-static const NSSItem nss_builtins_items_53 [] = {
+static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4060,7 +4308,7 @@ static const NSSItem nss_builtins_items_53 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_54 [] = {
+static const NSSItem nss_builtins_items_58 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4127,7 +4375,7 @@ static const NSSItem nss_builtins_items_54 [] = {
 "\132\052\202\262\067\171"
 , (PRUint32)646 }
 };
-static const NSSItem nss_builtins_items_55 [] = {
+static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4152,7 +4400,7 @@ static const NSSItem nss_builtins_items_55 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_56 [] = {
+static const NSSItem nss_builtins_items_60 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4227,7 +4475,7 @@ static const NSSItem nss_builtins_items_56 [] = {
 "\221\060\352\315"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_57 [] = {
+static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4251,7 +4499,7 @@ static const NSSItem nss_builtins_items_57 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_58 [] = {
+static const NSSItem nss_builtins_items_62 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4345,7 +4593,7 @@ static const NSSItem nss_builtins_items_58 [] = {
 "\065\341\035\026\034\320\274\053\216\326\161\331"
 , (PRUint32)1052 }
 };
-static const NSSItem nss_builtins_items_59 [] = {
+static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4371,7 +4619,7 @@ static const NSSItem nss_builtins_items_59 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_60 [] = {
+static const NSSItem nss_builtins_items_64 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4469,7 +4717,7 @@ static const NSSItem nss_builtins_items_60 [] = {
 "\027\132\173\320\274\307\217\116\206\004"
 , (PRUint32)1082 }
 };
-static const NSSItem nss_builtins_items_61 [] = {
+static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4496,7 +4744,7 @@ static const NSSItem nss_builtins_items_61 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_62 [] = {
+static const NSSItem nss_builtins_items_66 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4590,7 +4838,7 @@ static const NSSItem nss_builtins_items_62 [] = {
 "\116\072\063\014\053\263\055\220\006"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_63 [] = {
+static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4616,7 +4864,7 @@ static const NSSItem nss_builtins_items_63 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_64 [] = {
+static const NSSItem nss_builtins_items_68 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4711,7 +4959,7 @@ static const NSSItem nss_builtins_items_64 [] = {
 "\306\241"
 , (PRUint32)1058 }
 };
-static const NSSItem nss_builtins_items_65 [] = {
+static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4737,7 +4985,395 @@ static const NSSItem nss_builtins_items_65 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_66 [] = {
+static const NSSItem nss_builtins_items_70 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
+"\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061"
+"\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162"
+"\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023"
+"\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015"
+"\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060"
+"\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035"
+"\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027"
+"\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015"
+"\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213"
+"\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060"
+"\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040"
+"\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104"
+"\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003"
+"\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006"
+"\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003"
+"\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145"
+"\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123"
+"\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047"
+"\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237"
+"\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032"
+"\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376"
+"\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235"
+"\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213"
+"\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137"
+"\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060"
+"\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001"
+"\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005"
+"\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067"
+"\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302"
+"\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357"
+"\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333"
+"\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220"
+"\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354"
+"\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003"
+"\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031"
+"\011\254\211\111\323"
+, (PRUint32)677 }
+};
+static const NSSItem nss_builtins_items_71 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Thawte Time Stamping CA", (PRUint32)24 },
+  { (void *)"\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105"
+"\010\116\326\126"
+, (PRUint32)20 },
+  { (void *)"\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040"
+, (PRUint32)16 },
+  { (void *)"\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101"
+"\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145"
+"\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007"
+"\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060"
+"\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035"
+"\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060"
+"\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\101"
+, (PRUint32)142 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_72 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"\002\004\070\233\021\074"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070"
+"\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013"
+"\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006"
+"\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163"
+"\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156"
+"\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154"
+"\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043"
+"\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040"
+"\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151"
+"\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156"
+"\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145"
+"\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060"
+"\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132"
+"\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060"
+"\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164"
+"\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004"
+"\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156"
+"\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162"
+"\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151"
+"\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125"
+"\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164"
+"\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144"
+"\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165"
+"\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145"
+"\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
+"\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316"
+"\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265"
+"\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236"
+"\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201"
+"\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113"
+"\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002"
+"\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266"
+"\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332"
+"\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202"
+"\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370"
+"\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035"
+"\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317"
+"\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023"
+"\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075"
+"\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165"
+"\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151"
+"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
+"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
+"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
+"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
+"\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105"
+"\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162"
+"\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060"
+"\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060"
+"\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062"
+"\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003"
+"\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043"
+"\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042"
+"\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035"
+"\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234"
+"\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023"
+"\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366"
+"\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064"
+"\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015"
+"\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232"
+"\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251"
+"\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337"
+"\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205"
+"\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021"
+"\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154"
+"\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124"
+"\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274"
+"\005\377\154\211\063\360\354\025\017"
+, (PRUint32)1177 }
+};
+static const NSSItem nss_builtins_items_73 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Server CA", (PRUint32)36 },
+  { (void *)"\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366"
+"\045\072\110\223"
+, (PRUint32)20 },
+  { (void *)"\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231"
+, (PRUint32)16 },
+  { (void *)"\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125"
+"\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157"
+"\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155"
+"\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003"
+"\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156"
+"\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145"
+"\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162"
+"\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123"
+"\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171"
+, (PRUint32)189 },
+  { (void *)"\002\004\070\233\021\074"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_74 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"\002\004\070\236\366\344"
+, (PRUint32)6 },
+  { (void *)"\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070"
+"\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004"
+"\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013"
+"\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006"
+"\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163"
+"\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151"
+"\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050"
+"\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060"
+"\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060"
+"\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155"
+"\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105"
+"\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060"
+"\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062"
+"\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022"
+"\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156"
+"\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167"
+"\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103"
+"\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171"
+"\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151"
+"\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050"
+"\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056"
+"\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006"
+"\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145"
+"\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
+"\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264"
+"\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162"
+"\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255"
+"\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124"
+"\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064"
+"\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045"
+"\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374"
+"\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047"
+"\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001"
+"\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206"
+"\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335"
+"\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201"
+"\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003"
+"\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164"
+"\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145"
+"\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137"
+"\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162"
+"\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142"
+"\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051"
+"\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145"
+"\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125"
+"\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040"
+"\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015"
+"\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006"
+"\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062"
+"\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060"
+"\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035"
+"\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030"
+"\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067"
+"\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004"
+"\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105"
+"\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005"
+"\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007"
+"\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060"
+"\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001"
+"\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016"
+"\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022"
+"\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024"
+"\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276"
+"\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277"
+"\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172"
+"\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103"
+"\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235"
+"\316\145\146\227\256\046\136"
+, (PRUint32)1159 }
+};
+static const NSSItem nss_builtins_items_75 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"Entrust.net Global Secure Personal CA", (PRUint32)38 },
+  { (void *)"\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266"
+"\266\360\277\163"
+, (PRUint32)20 },
+  { (void *)"\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056"
+, (PRUint32)16 },
+  { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
+"\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143"
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
+"\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105"
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
+"\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171"
+, (PRUint32)183 },
+  { (void *)"\002\004\070\236\366\344"
+, (PRUint32)6 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_76 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4849,7 +5485,7 @@ static const NSSItem nss_builtins_items_66 [] = {
 "\036\177\132\264\074"
 , (PRUint32)1173 }
 };
-static const NSSItem nss_builtins_items_67 [] = {
+static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4880,7 +5516,285 @@ static const NSSItem nss_builtins_items_67 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_68 [] = {
+static const NSSItem nss_builtins_items_78 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
+"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
+"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
+"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
+"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
+"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060"
+"\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065"
+"\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
+"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
+"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
+"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
+"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
+"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303"
+"\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224"
+"\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204"
+"\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027"
+"\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110"
+"\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141"
+"\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226"
+"\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037"
+"\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266"
+"\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217"
+"\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205"
+"\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070"
+"\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216"
+"\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241"
+"\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356"
+"\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267"
+"\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000"
+"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
+"\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330"
+"\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310"
+"\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
+"\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263"
+"\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247"
+"\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037"
+"\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122"
+"\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323"
+"\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017"
+"\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362"
+"\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005"
+"\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007"
+"\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247"
+"\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227"
+"\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213"
+"\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120"
+"\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026"
+"\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325"
+"\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260"
+"\071\050\150\016\163\335\045\232\336\022"
+, (PRUint32)1002 }
+};
+static const NSSItem nss_builtins_items_79 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 1", (PRUint32)47 },
+  { (void *)"\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026"
+"\373\041\026\111"
+, (PRUint32)20 },
+  { (void *)"\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\061"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_80 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)"\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
+"\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151"
+"\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034"
+"\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141"
+"\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065"
+"\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040"
+"\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060"
+"\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063"
+"\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004"
+"\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024"
+"\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040"
+"\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101"
+"\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156"
+"\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114"
+"\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157"
+"\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060"
+"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
+"\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010"
+"\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211"
+"\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115"
+"\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044"
+"\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133"
+"\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235"
+"\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127"
+"\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230"
+"\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374"
+"\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136"
+"\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231"
+"\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111"
+"\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206"
+"\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352"
+"\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256"
+"\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165"
+"\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361"
+"\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352"
+"\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116"
+"\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363"
+"\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303"
+"\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320"
+"\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141"
+"\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372"
+"\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242"
+"\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322"
+"\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143"
+"\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224"
+"\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014"
+"\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277"
+"\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332"
+"\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056"
+"\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000"
+"\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004"
+"\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004"
+"\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325"
+"\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026"
+"\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116"
+"\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377"
+"\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015"
+"\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056"
+"\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022"
+"\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307"
+"\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117"
+"\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066"
+"\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104"
+"\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352"
+"\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275"
+"\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022"
+"\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223"
+"\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060"
+"\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100"
+"\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277"
+"\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346"
+"\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145"
+"\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201"
+"\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212"
+"\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045"
+"\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020"
+"\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316"
+"\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234"
+"\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116"
+"\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261"
+"\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027"
+"\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223"
+"\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234"
+"\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056"
+"\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007"
+"\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207"
+"\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025"
+"\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371"
+"\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274"
+"\204\327\372\334\162\133\367\301\072\150"
+, (PRUint32)1514 }
+};
+static const NSSItem nss_builtins_items_81 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"AOL Time Warner Root Certification Authority 2", (PRUint32)47 },
+  { (void *)"\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272"
+"\204\254\010\172"
+, (PRUint32)20 },
+  { (void *)"\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277"
+, (PRUint32)16 },
+  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
+"\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124"
+"\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061"
+"\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143"
+"\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060"
+"\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145"
+"\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162"
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
+"\162\151\164\171\040\062"
+, (PRUint32)134 },
+  { (void *)"\002\001\001"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_82 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4958,7 +5872,7 @@ static const NSSItem nss_builtins_items_68 [] = {
 "\354\040\005\141\336"
 , (PRUint32)869 }
 };
-static const NSSItem nss_builtins_items_69 [] = {
+static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -4982,7 +5896,7 @@ static const NSSItem nss_builtins_items_69 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_70 [] = {
+static const NSSItem nss_builtins_items_84 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5060,7 +5974,7 @@ static const NSSItem nss_builtins_items_70 [] = {
 "\302\005\146\200\241\313\346\063"
 , (PRUint32)856 }
 };
-static const NSSItem nss_builtins_items_71 [] = {
+static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5084,7 +5998,7 @@ static const NSSItem nss_builtins_items_71 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_72 [] = {
+static const NSSItem nss_builtins_items_86 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5163,7 +6077,7 @@ static const NSSItem nss_builtins_items_72 [] = {
 "\342\042\051\256\175\203\100\250\272\154"
 , (PRUint32)874 }
 };
-static const NSSItem nss_builtins_items_73 [] = {
+static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5187,7 +6101,7 @@ static const NSSItem nss_builtins_items_73 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_74 [] = {
+static const NSSItem nss_builtins_items_88 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5298,7 +6212,7 @@ static const NSSItem nss_builtins_items_74 [] = {
 "\244\346\216\330\371\051\110\212\316\163\376\054"
 , (PRUint32)1388 }
 };
-static const NSSItem nss_builtins_items_75 [] = {
+static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5322,7 +6236,7 @@ static const NSSItem nss_builtins_items_75 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_76 [] = {
+static const NSSItem nss_builtins_items_90 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5433,7 +6347,7 @@ static const NSSItem nss_builtins_items_76 [] = {
 "\362\034\054\176\256\002\026\322\126\320\057\127\123\107\350\222"
 , (PRUint32)1392 }
 };
-static const NSSItem nss_builtins_items_77 [] = {
+static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5457,7 +6371,7 @@ static const NSSItem nss_builtins_items_77 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_78 [] = {
+static const NSSItem nss_builtins_items_92 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5565,7 +6479,7 @@ static const NSSItem nss_builtins_items_78 [] = {
 "\152\372\246\070\254\037\304\204"
 , (PRUint32)1128 }
 };
-static const NSSItem nss_builtins_items_79 [] = {
+static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5596,7 +6510,7 @@ static const NSSItem nss_builtins_items_79 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_80 [] = {
+static const NSSItem nss_builtins_items_94 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5683,7 +6597,7 @@ static const NSSItem nss_builtins_items_80 [] = {
 "\200\072\231\355\165\314\106\173"
 , (PRUint32)936 }
 };
-static const NSSItem nss_builtins_items_81 [] = {
+static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5709,7 +6623,7 @@ static const NSSItem nss_builtins_items_81 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_82 [] = {
+static const NSSItem nss_builtins_items_96 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5828,7 +6742,7 @@ static const NSSItem nss_builtins_items_82 [] = {
 "\105\217\046\221\242\216\376\251"
 , (PRUint32)1448 }
 };
-static const NSSItem nss_builtins_items_83 [] = {
+static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5854,7 +6768,7 @@ static const NSSItem nss_builtins_items_83 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_84 [] = {
+static const NSSItem nss_builtins_items_98 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5942,7 +6856,7 @@ static const NSSItem nss_builtins_items_84 [] = {
 "\222\340\134\366\007\017"
 , (PRUint32)934 }
 };
-static const NSSItem nss_builtins_items_85 [] = {
+static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -5969,7 +6883,7 @@ static const NSSItem nss_builtins_items_85 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_86 [] = {
+static const NSSItem nss_builtins_items_100 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6061,7 +6975,7 @@ static const NSSItem nss_builtins_items_86 [] = {
 "\367\115\146\177\247\360\034\001\046\170\262\146\107\160\121\144"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_87 [] = {
+static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6092,7 +7006,7 @@ static const NSSItem nss_builtins_items_87 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_88 [] = {
+static const NSSItem nss_builtins_items_102 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6184,7 +7098,7 @@ static const NSSItem nss_builtins_items_88 [] = {
 "\030\122\051\213\107\064\022\011\324\273\222\065\357\017\333\064"
 , (PRUint32)864 }
 };
-static const NSSItem nss_builtins_items_89 [] = {
+static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6215,7 +7129,7 @@ static const NSSItem nss_builtins_items_89 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_90 [] = {
+static const NSSItem nss_builtins_items_104 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6286,7 +7200,7 @@ static const NSSItem nss_builtins_items_90 [] = {
 "\350\140\052\233\205\112\100\363\153\212\044\354\006\026\054\163"
 , (PRUint32)784 }
 };
-static const NSSItem nss_builtins_items_91 [] = {
+static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6309,7 +7223,7 @@ static const NSSItem nss_builtins_items_91 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_92 [] = {
+static const NSSItem nss_builtins_items_106 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6407,7 +7321,7 @@ static const NSSItem nss_builtins_items_92 [] = {
 "\225\351\066\226\230\156"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_93 [] = {
+static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6434,7 +7348,7 @@ static const NSSItem nss_builtins_items_93 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_94 [] = {
+static const NSSItem nss_builtins_items_108 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6533,7 +7447,7 @@ static const NSSItem nss_builtins_items_94 [] = {
 "\354\375\051"
 , (PRUint32)1091 }
 };
-static const NSSItem nss_builtins_items_95 [] = {
+static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6560,7 +7474,7 @@ static const NSSItem nss_builtins_items_95 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_96 [] = {
+static const NSSItem nss_builtins_items_110 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6661,7 +7575,7 @@ static const NSSItem nss_builtins_items_96 [] = {
 "\160\136\310\304\170\260\142"
 , (PRUint32)1095 }
 };
-static const NSSItem nss_builtins_items_97 [] = {
+static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6689,7 +7603,1302 @@ static const NSSItem nss_builtins_items_97 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_98 [] = {
+static const NSSItem nss_builtins_items_112 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Chained CAs root", (PRUint32)21 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
+"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
+"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
+"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
+"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132"
+"\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060"
+"\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052"
+"\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103"
+"\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156"
+"\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003"
+"\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151"
+"\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111"
+"\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061"
+"\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065"
+"\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201"
+"\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067"
+"\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062"
+"\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301"
+"\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350"
+"\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000"
+"\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016"
+"\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064"
+"\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035"
+"\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371"
+"\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241"
+"\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060"
+"\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103"
+"\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123"
+"\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035"
+"\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004"
+"\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060"
+"\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
+"\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006"
+"\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005"
+"\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006"
+"\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001"
+"\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067"
+"\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001"
+"\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060"
+"\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151"
+"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102"
+"\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103"
+"\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146"
+"\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040"
+"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
+"\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004"
+"\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006"
+"\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164"
+"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
+"\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103"
+"\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370"
+"\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167"
+"\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
+"\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150"
+"\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001"
+"\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060"
+"\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050"
+"\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145"
+"\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171"
+"\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004"
+"\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056"
+"\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126"
+"\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053"
+"\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006"
+"\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315"
+"\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343"
+"\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243"
+"\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315"
+"\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242"
+"\001\177\046\304\143\365\045\102\136\142\275"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_113 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Chained CAs root", (PRUint32)21 },
+  { (void *)"\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256"
+"\347\137\322\127"
+, (PRUint32)20 },
+  { (void *)"\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023"
+"\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040"
+"\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006"
+"\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141"
+"\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151"
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
+"\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+, (PRUint32)288 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_114 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE1 root", (PRUint32)16 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
+"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
+"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
+"\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060"
+"\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125"
+"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
+"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
+"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
+"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
+"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
+"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
+"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
+"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
+"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
+"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
+"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
+"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321"
+"\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022"
+"\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152"
+"\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165"
+"\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122"
+"\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161"
+"\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074"
+"\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020"
+"\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004"
+"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
+"\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233"
+"\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001"
+"\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254"
+"\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244"
+"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
+"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
+"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
+"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
+"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
+"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
+"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
+"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
+"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
+"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
+"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
+"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
+"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
+"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
+"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
+"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
+"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
+"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
+"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
+"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
+"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
+"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
+"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
+"\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
+"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
+"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
+"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
+"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
+"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206"
+"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
+"\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140"
+"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
+"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
+"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
+"\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110"
+"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061"
+"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
+"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
+"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056"
+"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006"
+"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
+"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
+"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320"
+"\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212"
+"\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305"
+"\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167"
+"\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143"
+"\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334"
+"\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105"
+"\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276"
+"\206\063\076\346\057\110\156\257\124\220\116\255\261\045"
+, (PRUint32)2030 }
+};
+static const NSSItem nss_builtins_items_115 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE1 root", (PRUint32)16 },
+  { (void *)"\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061"
+"\174\345\364\337"
+, (PRUint32)20 },
+  { (void *)"\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_116 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE3 root", (PRUint32)16 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045"
+"\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145"
+"\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150"
+"\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367"
+"\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151"
+"\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060"
+"\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061"
+"\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125"
+"\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023"
+"\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003"
+"\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056"
+"\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164"
+"\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147"
+"\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053"
+"\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040"
+"\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006"
+"\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006"
+"\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101"
+"\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006"
+"\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100"
+"\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015"
+"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215"
+"\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033"
+"\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331"
+"\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052"
+"\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213"
+"\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230"
+"\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055"
+"\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043"
+"\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153"
+"\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004"
+"\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024"
+"\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243"
+"\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001"
+"\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242"
+"\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244"
+"\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006"
+"\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102"
+"\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004"
+"\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054"
+"\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162"
+"\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123"
+"\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051"
+"\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102"
+"\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125"
+"\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125"
+"\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105"
+"\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040"
+"\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052"
+"\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141"
+"\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003"
+"\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035"
+"\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004"
+"\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053"
+"\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003"
+"\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001"
+"\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001"
+"\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053"
+"\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001"
+"\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102"
+"\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201"
+"\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163"
+"\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026"
+"\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151"
+"\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171"
+"\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056"
+"\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002"
+"\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072"
+"\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150"
+"\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206"
+"\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103"
+"\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140"
+"\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160"
+"\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160"
+"\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101"
+"\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110"
+"\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063"
+"\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152"
+"\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060"
+"\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056"
+"\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072"
+"\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163"
+"\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062"
+"\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006"
+"\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006"
+"\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157"
+"\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052"
+"\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145"
+"\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103"
+"\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342"
+"\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227"
+"\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275"
+"\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247"
+"\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026"
+"\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262"
+"\257\175\310\352\351\324\126\331\016\023\262\305\105\120"
+, (PRUint32)2030 }
+};
+static const NSSItem nss_builtins_items_117 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASE3 root", (PRUint32)16 },
+  { (void *)"\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365"
+"\015\317\161\134"
+, (PRUint32)20 },
+  { (void *)"\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023"
+"\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206"
+"\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163"
+, (PRUint32)278 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_118 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
+"\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
+"\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067"
+"\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334"
+"\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374"
+"\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320"
+"\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122"
+"\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035"
+"\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306"
+"\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236"
+"\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174"
+"\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000"
+"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
+"\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073"
+"\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035"
+"\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241"
+"\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241"
+"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
+"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
+"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
+"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
+"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
+"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
+"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
+"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
+"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
+"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
+"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
+"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
+"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
+"\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103"
+"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
+"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
+"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
+"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143"
+"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
+"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
+"\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150"
+"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
+"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164"
+"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
+"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
+"\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154"
+"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
+"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
+"\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060"
+"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
+"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
+"\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200"
+"\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312"
+"\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304"
+"\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205"
+"\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304"
+"\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347"
+"\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213"
+"\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120"
+"\336\007\043\162\346\275\040\024\113\264\206"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_119 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA1 root", (PRUint32)17 },
+  { (void *)"\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032"
+"\353\214\062\004"
+, (PRUint32)20 },
+  { (void *)"\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_120 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046"
+"\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103"
+"\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164"
+"\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110"
+"\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154"
+"\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062"
+"\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067"
+"\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060"
+"\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
+"\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366"
+"\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315"
+"\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202"
+"\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153"
+"\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324"
+"\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232"
+"\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165"
+"\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347"
+"\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000"
+"\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016"
+"\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374"
+"\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035"
+"\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107"
+"\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241"
+"\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006"
+"\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004"
+"\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020"
+"\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141"
+"\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111"
+"\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151"
+"\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056"
+"\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106"
+"\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060"
+"\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103"
+"\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141"
+"\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057"
+"\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040"
+"\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143"
+"\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061"
+"\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017"
+"\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202"
+"\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377"
+"\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153"
+"\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005"
+"\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053"
+"\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003"
+"\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001"
+"\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067"
+"\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006"
+"\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140"
+"\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032"
+"\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155"
+"\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035"
+"\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056"
+"\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370"
+"\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103"
+"\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163"
+"\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167"
+"\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206"
+"\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102"
+"\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143"
+"\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004"
+"\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166"
+"\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150"
+"\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001"
+"\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056"
+"\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162"
+"\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164"
+"\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010"
+"\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151"
+"\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157"
+"\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154"
+"\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240"
+"\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160"
+"\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163"
+"\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060"
+"\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167"
+"\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123"
+"\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005"
+"\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005"
+"\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160"
+"\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206"
+"\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032"
+"\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374"
+"\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012"
+"\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010"
+"\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306"
+"\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044"
+"\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022"
+"\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265"
+"\311\024\025\014\343\007\203\233\046\165\357"
+, (PRUint32)2043 }
+};
+static const NSSItem nss_builtins_items_121 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS CLASEA3 root", (PRUint32)17 },
+  { (void *)"\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342"
+"\101\104\276\156"
+, (PRUint32)20 },
+  { (void *)"\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023"
+"\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003"
+"\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063"
+"\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101"
+"\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206"
+"\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163"
+, (PRUint32)280 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_122 [] = {
+  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Timestamping root", (PRUint32)22 },
+  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"0", (PRUint32)2 },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)"\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000"
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
+"\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123"
+"\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145"
+"\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102"
+"\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004"
+"\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040"
+"\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151"
+"\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004"
+"\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071"
+"\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053"
+"\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160"
+"\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157"
+"\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006"
+"\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155"
+"\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146"
+"\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164"
+"\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001"
+"\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145"
+"\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061"
+"\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070"
+"\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002"
+"\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162"
+"\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023"
+"\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003"
+"\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145"
+"\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162"
+"\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003"
+"\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066"
+"\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013"
+"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
+"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060"
+"\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124"
+"\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164"
+"\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162"
+"\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001"
+"\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015"
+"\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000"
+"\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215"
+"\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257"
+"\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070"
+"\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161"
+"\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265"
+"\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130"
+"\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233"
+"\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243"
+"\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006"
+"\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235"
+"\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120"
+"\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213"
+"\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077"
+"\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061"
+"\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020"
+"\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141"
+"\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145"
+"\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111"
+"\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154"
+"\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040"
+"\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151"
+"\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103"
+"\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065"
+"\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040"
+"\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040"
+"\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165"
+"\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003"
+"\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141"
+"\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164"
+"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060"
+"\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160"
+"\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000"
+"\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014"
+"\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003"
+"\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003"
+"\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001"
+"\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006"
+"\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001"
+"\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001"
+"\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053"
+"\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110"
+"\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003"
+"\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151"
+"\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004"
+"\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160"
+"\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001"
+"\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156"
+"\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145"
+"\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006"
+"\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164"
+"\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057"
+"\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001"
+"\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057"
+"\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060"
+"\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164"
+"\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206"
+"\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072"
+"\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163"
+"\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124"
+"\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154"
+"\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065"
+"\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163"
+"\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145"
+"\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056"
+"\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102"
+"\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167"
+"\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057"
+"\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151"
+"\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170"
+"\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057"
+"\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062"
+"\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163"
+"\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240"
+"\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143"
+"\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062"
+"\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155"
+"\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005"
+"\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005"
+"\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163"
+"\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110"
+"\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314"
+"\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203"
+"\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067"
+"\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077"
+"\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114"
+"\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210"
+"\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001"
+"\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324"
+"\207\112\137\334\357\351\126\360\012\014\350\165"
+, (PRUint32)2108 }
+};
+static const NSSItem nss_builtins_items_123 [] = {
+  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
+  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
+  { (void *)"IPS Timestamping root", (PRUint32)22 },
+  { (void *)"\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313"
+"\361\266\304\322"
+, (PRUint32)20 },
+  { (void *)"\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233"
+, (PRUint32)16 },
+  { (void *)"\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105"
+"\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143"
+"\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011"
+"\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125"
+"\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164"
+"\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166"
+"\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125"
+"\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163"
+"\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060"
+"\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023"
+"\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155"
+"\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151"
+"\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062"
+"\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151"
+"\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151"
+"\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151"
+"\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011"
+"\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056"
+"\145\163"
+, (PRUint32)290 },
+  { (void *)"\002\001\000"
+, (PRUint32)3 },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
+  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
+};
+static const NSSItem nss_builtins_items_124 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6815,7 +9024,7 @@ static const NSSItem nss_builtins_items_98 [] = {
 "\112\164\066\371"
 , (PRUint32)1492 }
 };
-static const NSSItem nss_builtins_items_99 [] = {
+static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6843,7 +9052,7 @@ static const NSSItem nss_builtins_items_99 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_100 [] = {
+static const NSSItem nss_builtins_items_126 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6959,7 +9168,7 @@ static const NSSItem nss_builtins_items_100 [] = {
 "\020\005\145\325\202\020\352\302\061\315\056"
 , (PRUint32)1467 }
 };
-static const NSSItem nss_builtins_items_101 [] = {
+static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -6983,7 +9192,7 @@ static const NSSItem nss_builtins_items_101 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_102 [] = {
+static const NSSItem nss_builtins_items_128 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7114,7 +9323,7 @@ static const NSSItem nss_builtins_items_102 [] = {
 "\332"
 , (PRUint32)1697 }
 };
-static const NSSItem nss_builtins_items_103 [] = {
+static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7138,7 +9347,7 @@ static const NSSItem nss_builtins_items_103 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_104 [] = {
+static const NSSItem nss_builtins_items_130 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7218,7 +9427,7 @@ static const NSSItem nss_builtins_items_104 [] = {
 "\057\317\246\356\311\160\042\024\275\375\276\154\013\003"
 , (PRUint32)862 }
 };
-static const NSSItem nss_builtins_items_105 [] = {
+static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7243,7 +9452,7 @@ static const NSSItem nss_builtins_items_105 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_106 [] = {
+static const NSSItem nss_builtins_items_132 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7316,7 +9525,7 @@ static const NSSItem nss_builtins_items_106 [] = {
 "\127\275\125\232"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_107 [] = {
+static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7339,7 +9548,7 @@ static const NSSItem nss_builtins_items_107 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_108 [] = {
+static const NSSItem nss_builtins_items_134 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7412,7 +9621,7 @@ static const NSSItem nss_builtins_items_108 [] = {
 "\160\254\337\114"
 , (PRUint32)804 }
 };
-static const NSSItem nss_builtins_items_109 [] = {
+static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7435,7 +9644,7 @@ static const NSSItem nss_builtins_items_109 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_110 [] = {
+static const NSSItem nss_builtins_items_136 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7521,7 +9730,7 @@ static const NSSItem nss_builtins_items_110 [] = {
 "\025\301\044\174\062\174\003\035\073\241\130\105\062\223"
 , (PRUint32)958 }
 };
-static const NSSItem nss_builtins_items_111 [] = {
+static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7546,7 +9755,7 @@ static const NSSItem nss_builtins_items_111 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_112 [] = {
+static const NSSItem nss_builtins_items_138 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7637,7 +9846,7 @@ static const NSSItem nss_builtins_items_112 [] = {
 "\151\003\142\270\231\005\005\075\153\170\022\275\260\157\145"
 , (PRUint32)1071 }
 };
-static const NSSItem nss_builtins_items_113 [] = {
+static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7661,7 +9870,7 @@ static const NSSItem nss_builtins_items_113 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_114 [] = {
+static const NSSItem nss_builtins_items_140 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7765,7 +9974,7 @@ static const NSSItem nss_builtins_items_114 [] = {
 "\004\243\103\055\332\374\013\142\352\057\137\142\123"
 , (PRUint32)1309 }
 };
-static const NSSItem nss_builtins_items_115 [] = {
+static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7788,7 +9997,7 @@ static const NSSItem nss_builtins_items_115 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_116 [] = {
+static const NSSItem nss_builtins_items_142 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7894,7 +10103,7 @@ static const NSSItem nss_builtins_items_116 [] = {
 "\364\010"
 , (PRUint32)1122 }
 };
-static const NSSItem nss_builtins_items_117 [] = {
+static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -7924,7 +10133,7 @@ static const NSSItem nss_builtins_items_117 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_118 [] = {
+static const NSSItem nss_builtins_items_144 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8038,7 +10247,7 @@ static const NSSItem nss_builtins_items_118 [] = {
 "\005\323\312\003\112\124"
 , (PRUint32)1190 }
 };
-static const NSSItem nss_builtins_items_119 [] = {
+static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8070,7 +10279,7 @@ static const NSSItem nss_builtins_items_119 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_120 [] = {
+static const NSSItem nss_builtins_items_146 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8177,7 +10386,7 @@ static const NSSItem nss_builtins_items_120 [] = {
 "\062\234\036\273\235\370\146\250"
 , (PRUint32)1144 }
 };
-static const NSSItem nss_builtins_items_121 [] = {
+static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8207,7 +10416,7 @@ static const NSSItem nss_builtins_items_121 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_122 [] = {
+static const NSSItem nss_builtins_items_148 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8313,7 +10522,7 @@ static const NSSItem nss_builtins_items_122 [] = {
 "\275\023\122\035\250\076\315\000\037\310"
 , (PRUint32)1130 }
 };
-static const NSSItem nss_builtins_items_123 [] = {
+static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8343,7 +10552,7 @@ static const NSSItem nss_builtins_items_123 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_124 [] = {
+static const NSSItem nss_builtins_items_150 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8452,7 +10661,7 @@ static const NSSItem nss_builtins_items_124 [] = {
 "\334"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_125 [] = {
+static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8480,7 +10689,7 @@ static const NSSItem nss_builtins_items_125 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_126 [] = {
+static const NSSItem nss_builtins_items_152 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8587,7 +10796,7 @@ static const NSSItem nss_builtins_items_126 [] = {
 "\166\135\165\220\032\365\046\217\360"
 , (PRUint32)1225 }
 };
-static const NSSItem nss_builtins_items_127 [] = {
+static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8614,7 +10823,7 @@ static const NSSItem nss_builtins_items_127 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_128 [] = {
+static const NSSItem nss_builtins_items_154 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8764,7 +10973,7 @@ static const NSSItem nss_builtins_items_128 [] = {
 "\306\224\107\351\050"
 , (PRUint32)1749 }
 };
-static const NSSItem nss_builtins_items_129 [] = {
+static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8796,7 +11005,7 @@ static const NSSItem nss_builtins_items_129 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_130 [] = {
+static const NSSItem nss_builtins_items_156 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8939,7 +11148,7 @@ static const NSSItem nss_builtins_items_130 [] = {
 "\210"
 , (PRUint32)1665 }
 };
-static const NSSItem nss_builtins_items_131 [] = {
+static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -8970,7 +11179,7 @@ static const NSSItem nss_builtins_items_131 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_132 [] = {
+static const NSSItem nss_builtins_items_158 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9089,7 +11298,7 @@ static const NSSItem nss_builtins_items_132 [] = {
 "\066\053\143\254\130\001\153\063\051\120\206\203\361\001\110"
 , (PRUint32)1359 }
 };
-static const NSSItem nss_builtins_items_133 [] = {
+static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9118,7 +11327,7 @@ static const NSSItem nss_builtins_items_133 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_134 [] = {
+static const NSSItem nss_builtins_items_160 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9238,7 +11447,7 @@ static const NSSItem nss_builtins_items_134 [] = {
 "\063\004\324"
 , (PRUint32)1363 }
 };
-static const NSSItem nss_builtins_items_135 [] = {
+static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9267,7 +11476,7 @@ static const NSSItem nss_builtins_items_135 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_136 [] = {
+static const NSSItem nss_builtins_items_162 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9368,7 +11577,7 @@ static const NSSItem nss_builtins_items_136 [] = {
 "\264\003\045\274"
 , (PRUint32)1076 }
 };
-static const NSSItem nss_builtins_items_137 [] = {
+static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9397,7 +11606,7 @@ static const NSSItem nss_builtins_items_137 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_138 [] = {
+static const NSSItem nss_builtins_items_164 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9490,7 +11699,7 @@ static const NSSItem nss_builtins_items_138 [] = {
 "\177\333\275\237"
 , (PRUint32)1028 }
 };
-static const NSSItem nss_builtins_items_139 [] = {
+static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9516,7 +11725,7 @@ static const NSSItem nss_builtins_items_139 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_140 [] = {
+static const NSSItem nss_builtins_items_166 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9610,7 +11819,7 @@ static const NSSItem nss_builtins_items_140 [] = {
 "\037\027\224"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_141 [] = {
+static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9636,7 +11845,7 @@ static const NSSItem nss_builtins_items_141 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_142 [] = {
+static const NSSItem nss_builtins_items_168 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9791,7 +12000,7 @@ static const NSSItem nss_builtins_items_142 [] = {
 "\152\263\364\210\034\200\015\374\162\212\350\203\136"
 , (PRUint32)1997 }
 };
-static const NSSItem nss_builtins_items_143 [] = {
+static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9818,7 +12027,7 @@ static const NSSItem nss_builtins_items_143 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_144 [] = {
+static const NSSItem nss_builtins_items_170 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9931,7 +12140,7 @@ static const NSSItem nss_builtins_items_144 [] = {
 "\245\206\054\174\364\022"
 , (PRUint32)1398 }
 };
-static const NSSItem nss_builtins_items_145 [] = {
+static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -9956,7 +12165,7 @@ static const NSSItem nss_builtins_items_145 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_146 [] = {
+static const NSSItem nss_builtins_items_172 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10060,7 +12269,7 @@ static const NSSItem nss_builtins_items_146 [] = {
 "\252\341\247\063\366\375\112\037\366\331\140"
 , (PRUint32)1115 }
 };
-static const NSSItem nss_builtins_items_147 [] = {
+static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10089,7 +12298,7 @@ static const NSSItem nss_builtins_items_147 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_148 [] = {
+static const NSSItem nss_builtins_items_174 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10184,7 +12393,7 @@ static const NSSItem nss_builtins_items_148 [] = {
 "\117\041\145\073\112\177\107\243\373"
 , (PRUint32)1001 }
 };
-static const NSSItem nss_builtins_items_149 [] = {
+static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10212,7 +12421,7 @@ static const NSSItem nss_builtins_items_149 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_150 [] = {
+static const NSSItem nss_builtins_items_176 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10335,7 +12544,7 @@ static const NSSItem nss_builtins_items_150 [] = {
 "\060\032\365\232\154\364\016\123\371\072\133\321\034"
 , (PRUint32)1501 }
 };
-static const NSSItem nss_builtins_items_151 [] = {
+static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10362,7 +12571,7 @@ static const NSSItem nss_builtins_items_151 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_152 [] = {
+static const NSSItem nss_builtins_items_178 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10451,7 +12660,7 @@ static const NSSItem nss_builtins_items_152 [] = {
 "\346\120\262\247\372\012\105\057\242\360\362"
 , (PRUint32)955 }
 };
-static const NSSItem nss_builtins_items_153 [] = {
+static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10478,7 +12687,7 @@ static const NSSItem nss_builtins_items_153 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_154 [] = {
+static const NSSItem nss_builtins_items_180 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10567,7 +12776,7 @@ static const NSSItem nss_builtins_items_154 [] = {
 "\225\155\336"
 , (PRUint32)947 }
 };
-static const NSSItem nss_builtins_items_155 [] = {
+static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10594,7 +12803,7 @@ static const NSSItem nss_builtins_items_155 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_156 [] = {
+static const NSSItem nss_builtins_items_182 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10684,7 +12893,7 @@ static const NSSItem nss_builtins_items_156 [] = {
 "\370\351\056\023\243\167\350\037\112"
 , (PRUint32)969 }
 };
-static const NSSItem nss_builtins_items_157 [] = {
+static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10711,7 +12920,7 @@ static const NSSItem nss_builtins_items_157 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_158 [] = {
+static const NSSItem nss_builtins_items_184 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10792,7 +13001,7 @@ static const NSSItem nss_builtins_items_158 [] = {
 "\227\277\242\216\264\124"
 , (PRUint32)918 }
 };
-static const NSSItem nss_builtins_items_159 [] = {
+static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10816,7 +13025,7 @@ static const NSSItem nss_builtins_items_159 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_160 [] = {
+static const NSSItem nss_builtins_items_186 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10894,7 +13103,7 @@ static const NSSItem nss_builtins_items_160 [] = {
 "\013\004\216\007\333\051\266\012\356\235\202\065\065\020"
 , (PRUint32)846 }
 };
-static const NSSItem nss_builtins_items_161 [] = {
+static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -10919,7 +13128,7 @@ static const NSSItem nss_builtins_items_161 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_162 [] = {
+static const NSSItem nss_builtins_items_188 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11011,7 +13220,7 @@ static const NSSItem nss_builtins_items_162 [] = {
 "\363\267\240\247\315\345\172\063\066\152\372\232\053"
 , (PRUint32)1037 }
 };
-static const NSSItem nss_builtins_items_163 [] = {
+static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11037,7 +13246,7 @@ static const NSSItem nss_builtins_items_163 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_164 [] = {
+static const NSSItem nss_builtins_items_190 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11139,7 +13348,7 @@ static const NSSItem nss_builtins_items_164 [] = {
 "\104\144\003\045\352\336\133\156\237\311\362\116\254\335\307"
 , (PRUint32)1023 }
 };
-static const NSSItem nss_builtins_items_165 [] = {
+static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11170,7 +13379,7 @@ static const NSSItem nss_builtins_items_165 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_166 [] = {
+static const NSSItem nss_builtins_items_192 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11278,7 +13487,7 @@ static const NSSItem nss_builtins_items_166 [] = {
 "\167\161\307\372\221\372\057\121\236\351\071\122\266\347\004\102"
 , (PRUint32)1088 }
 };
-static const NSSItem nss_builtins_items_167 [] = {
+static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11310,7 +13519,7 @@ static const NSSItem nss_builtins_items_167 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_168 [] = {
+static const NSSItem nss_builtins_items_194 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11427,7 +13636,7 @@ static const NSSItem nss_builtins_items_168 [] = {
 "\205\206\171\145\322"
 , (PRUint32)1477 }
 };
-static const NSSItem nss_builtins_items_169 [] = {
+static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11451,7 +13660,7 @@ static const NSSItem nss_builtins_items_169 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_170 [] = {
+static const NSSItem nss_builtins_items_196 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11567,7 +13776,7 @@ static const NSSItem nss_builtins_items_170 [] = {
 "\111\044\133\311\260\320\127\301\372\076\172\341\227\311"
 , (PRUint32)1470 }
 };
-static const NSSItem nss_builtins_items_171 [] = {
+static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11591,7 +13800,7 @@ static const NSSItem nss_builtins_items_171 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_172 [] = {
+static const NSSItem nss_builtins_items_198 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11708,7 +13917,7 @@ static const NSSItem nss_builtins_items_172 [] = {
 "\156"
 , (PRUint32)1473 }
 };
-static const NSSItem nss_builtins_items_173 [] = {
+static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11732,7 +13941,7 @@ static const NSSItem nss_builtins_items_173 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_174 [] = {
+static const NSSItem nss_builtins_items_200 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11815,7 +14024,7 @@ static const NSSItem nss_builtins_items_174 [] = {
 "\253\022\350\263\336\132\345\240\174\350\017\042\035\132\351\131"
 , (PRUint32)896 }
 };
-static const NSSItem nss_builtins_items_175 [] = {
+static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11841,7 +14050,7 @@ static const NSSItem nss_builtins_items_175 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_176 [] = {
+static const NSSItem nss_builtins_items_202 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11945,7 +14154,7 @@ static const NSSItem nss_builtins_items_176 [] = {
 "\215\126\214\150"
 , (PRUint32)1060 }
 };
-static const NSSItem nss_builtins_items_177 [] = {
+static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -11976,7 +14185,7 @@ static const NSSItem nss_builtins_items_177 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_178 [] = {
+static const NSSItem nss_builtins_items_204 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12095,7 +14304,7 @@ static const NSSItem nss_builtins_items_178 [] = {
 "\254\021\326\250\355\143\152"
 , (PRUint32)1239 }
 };
-static const NSSItem nss_builtins_items_179 [] = {
+static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12128,7 +14337,7 @@ static const NSSItem nss_builtins_items_179 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_180 [] = {
+static const NSSItem nss_builtins_items_206 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12213,7 +14422,7 @@ static const NSSItem nss_builtins_items_180 [] = {
 "\113\035\236\054\302\270\150\274\355\002\356\061"
 , (PRUint32)956 }
 };
-static const NSSItem nss_builtins_items_181 [] = {
+static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12238,7 +14447,7 @@ static const NSSItem nss_builtins_items_181 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_182 [] = {
+static const NSSItem nss_builtins_items_208 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12323,7 +14532,7 @@ static const NSSItem nss_builtins_items_182 [] = {
 "\117\043\037\332\154\254\037\104\341\335\043\170\121\133\307\026"
 , (PRUint32)960 }
 };
-static const NSSItem nss_builtins_items_183 [] = {
+static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12348,7 +14557,7 @@ static const NSSItem nss_builtins_items_183 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_184 [] = {
+static const NSSItem nss_builtins_items_210 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12448,7 +14657,7 @@ static const NSSItem nss_builtins_items_184 [] = {
 "\145"
 , (PRUint32)1057 }
 };
-static const NSSItem nss_builtins_items_185 [] = {
+static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12477,7 +14686,7 @@ static const NSSItem nss_builtins_items_185 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_186 [] = {
+static const NSSItem nss_builtins_items_212 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12595,7 +14804,7 @@ static const NSSItem nss_builtins_items_186 [] = {
 "\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
 , (PRUint32)1422 }
 };
-static const NSSItem nss_builtins_items_187 [] = {
+static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12622,7 +14831,7 @@ static const NSSItem nss_builtins_items_187 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_188 [] = {
+static const NSSItem nss_builtins_items_214 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12714,7 +14923,7 @@ static const NSSItem nss_builtins_items_188 [] = {
 "\244\140\114\260\125\240\240\173\127\262"
 , (PRUint32)1002 }
 };
-static const NSSItem nss_builtins_items_189 [] = {
+static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12741,7 +14950,7 @@ static const NSSItem nss_builtins_items_189 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_190 [] = {
+static const NSSItem nss_builtins_items_216 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12850,7 +15059,7 @@ static const NSSItem nss_builtins_items_190 [] = {
 "\333"
 , (PRUint32)1217 }
 };
-static const NSSItem nss_builtins_items_191 [] = {
+static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12878,7 +15087,7 @@ static const NSSItem nss_builtins_items_191 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_192 [] = {
+static const NSSItem nss_builtins_items_218 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12952,7 +15161,7 @@ static const NSSItem nss_builtins_items_192 [] = {
 "\334\335\363\377\035\054\072\026\127\331\222\071\326"
 , (PRUint32)653 }
 };
-static const NSSItem nss_builtins_items_193 [] = {
+static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -12981,7 +15190,7 @@ static const NSSItem nss_builtins_items_193 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_194 [] = {
+static const NSSItem nss_builtins_items_220 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13073,7 +15282,7 @@ static const NSSItem nss_builtins_items_194 [] = {
 "\321\236\164\310\166\147"
 , (PRUint32)1078 }
 };
-static const NSSItem nss_builtins_items_195 [] = {
+static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13098,7 +15307,7 @@ static const NSSItem nss_builtins_items_195 [] = {
   { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_196 [] = {
+static const NSSItem nss_builtins_items_222 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13195,7 +15404,7 @@ static const NSSItem nss_builtins_items_196 [] = {
 "\253\205\322\140\126\132"
 , (PRUint32)1030 }
 };
-static const NSSItem nss_builtins_items_197 [] = {
+static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13223,7 +15432,7 @@ static const NSSItem nss_builtins_items_197 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_198 [] = {
+static const NSSItem nss_builtins_items_224 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13308,7 +15517,7 @@ static const NSSItem nss_builtins_items_198 [] = {
 "\164"
 , (PRUint32)897 }
 };
-static const NSSItem nss_builtins_items_199 [] = {
+static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13334,7 +15543,7 @@ static const NSSItem nss_builtins_items_199 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_200 [] = {
+static const NSSItem nss_builtins_items_226 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13431,7 +15640,7 @@ static const NSSItem nss_builtins_items_200 [] = {
 "\374\276\337\012\015"
 , (PRUint32)1013 }
 };
-static const NSSItem nss_builtins_items_201 [] = {
+static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13460,7 +15669,7 @@ static const NSSItem nss_builtins_items_201 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_202 [] = {
+static const NSSItem nss_builtins_items_228 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13571,7 +15780,7 @@ static const NSSItem nss_builtins_items_202 [] = {
 "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
 , (PRUint32)1151 }
 };
-static const NSSItem nss_builtins_items_203 [] = {
+static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13603,7 +15812,7 @@ static const NSSItem nss_builtins_items_203 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_204 [] = {
+static const NSSItem nss_builtins_items_230 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13757,7 +15966,7 @@ static const NSSItem nss_builtins_items_204 [] = {
 "\103\307\003\340\067\116\135\012\334\131\040\045"
 , (PRUint32)1964 }
 };
-static const NSSItem nss_builtins_items_205 [] = {
+static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13785,7 +15994,7 @@ static const NSSItem nss_builtins_items_205 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_206 [] = {
+static const NSSItem nss_builtins_items_232 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13866,7 +16075,7 @@ static const NSSItem nss_builtins_items_206 [] = {
 "\300\226\130\057\352\273\106\327\273\344\331\056"
 , (PRUint32)940 }
 };
-static const NSSItem nss_builtins_items_207 [] = {
+static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -13889,7 +16098,7 @@ static const NSSItem nss_builtins_items_207 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_208 [] = {
+static const NSSItem nss_builtins_items_234 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14023,7 +16232,7 @@ static const NSSItem nss_builtins_items_208 [] = {
 "\005\211\374\170\326\134\054\046\103\251"
 , (PRUint32)1642 }
 };
-static const NSSItem nss_builtins_items_209 [] = {
+static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14051,7 +16260,7 @@ static const NSSItem nss_builtins_items_209 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_210 [] = {
+static const NSSItem nss_builtins_items_236 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14156,7 +16365,7 @@ static const NSSItem nss_builtins_items_210 [] = {
 "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_211 [] = {
+static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14183,7 +16392,7 @@ static const NSSItem nss_builtins_items_211 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_212 [] = {
+static const NSSItem nss_builtins_items_238 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14288,7 +16497,7 @@ static const NSSItem nss_builtins_items_212 [] = {
 "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
 , (PRUint32)1198 }
 };
-static const NSSItem nss_builtins_items_213 [] = {
+static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14315,7 +16524,7 @@ static const NSSItem nss_builtins_items_213 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_214 [] = {
+static const NSSItem nss_builtins_items_240 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14408,7 +16617,7 @@ static const NSSItem nss_builtins_items_214 [] = {
 "\230"
 , (PRUint32)993 }
 };
-static const NSSItem nss_builtins_items_215 [] = {
+static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14435,7 +16644,7 @@ static const NSSItem nss_builtins_items_215 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_216 [] = {
+static const NSSItem nss_builtins_items_242 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14524,7 +16733,7 @@ static const NSSItem nss_builtins_items_216 [] = {
 "\126\144\127"
 , (PRUint32)931 }
 };
-static const NSSItem nss_builtins_items_217 [] = {
+static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14551,7 +16760,7 @@ static const NSSItem nss_builtins_items_217 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_218 [] = {
+static const NSSItem nss_builtins_items_244 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14632,7 +16841,7 @@ static const NSSItem nss_builtins_items_218 [] = {
 "\000\147\240\161\000\202\110"
 , (PRUint32)919 }
 };
-static const NSSItem nss_builtins_items_219 [] = {
+static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14656,7 +16865,7 @@ static const NSSItem nss_builtins_items_219 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_220 [] = {
+static const NSSItem nss_builtins_items_246 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14738,7 +16947,7 @@ static const NSSItem nss_builtins_items_220 [] = {
 "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
 , (PRUint32)943 }
 };
-static const NSSItem nss_builtins_items_221 [] = {
+static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14762,7 +16971,7 @@ static const NSSItem nss_builtins_items_221 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_222 [] = {
+static const NSSItem nss_builtins_items_248 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14843,7 +17052,7 @@ static const NSSItem nss_builtins_items_222 [] = {
 "\246\210\070\316\125"
 , (PRUint32)933 }
 };
-static const NSSItem nss_builtins_items_223 [] = {
+static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14866,7 +17075,7 @@ static const NSSItem nss_builtins_items_223 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_224 [] = {
+static const NSSItem nss_builtins_items_250 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -14985,7 +17194,7 @@ static const NSSItem nss_builtins_items_224 [] = {
 "\201\370\021\234"
 , (PRUint32)1460 }
 };
-static const NSSItem nss_builtins_items_225 [] = {
+static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15011,7 +17220,7 @@ static const NSSItem nss_builtins_items_225 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_226 [] = {
+static const NSSItem nss_builtins_items_252 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15145,7 +17354,7 @@ static const NSSItem nss_builtins_items_226 [] = {
 "\311\234\220\332\354\251\102\074\255\266\002"
 , (PRUint32)1307 }
 };
-static const NSSItem nss_builtins_items_227 [] = {
+static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15183,7 +17392,7 @@ static const NSSItem nss_builtins_items_227 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_228 [] = {
+static const NSSItem nss_builtins_items_254 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15261,7 +17470,7 @@ static const NSSItem nss_builtins_items_228 [] = {
 "\366\324\357\277\114\210\150"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_229 [] = {
+static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15285,7 +17494,7 @@ static const NSSItem nss_builtins_items_229 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_230 [] = {
+static const NSSItem nss_builtins_items_256 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15363,7 +17572,7 @@ static const NSSItem nss_builtins_items_230 [] = {
 "\246\347\313\100\003\335\171"
 , (PRUint32)855 }
 };
-static const NSSItem nss_builtins_items_231 [] = {
+static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15387,7 +17596,7 @@ static const NSSItem nss_builtins_items_231 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_232 [] = {
+static const NSSItem nss_builtins_items_258 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15514,7 +17723,7 @@ static const NSSItem nss_builtins_items_232 [] = {
 "\320\352\111\242\034\215\122\024\246\012\223"
 , (PRUint32)1515 }
 };
-static const NSSItem nss_builtins_items_233 [] = {
+static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15542,7 +17751,7 @@ static const NSSItem nss_builtins_items_233 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_234 [] = {
+static const NSSItem nss_builtins_items_260 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15616,7 +17825,7 @@ static const NSSItem nss_builtins_items_234 [] = {
 "\366\356\260\132\116\111\104\124\130\137\102\203"
 , (PRUint32)828 }
 };
-static const NSSItem nss_builtins_items_235 [] = {
+static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15639,7 +17848,7 @@ static const NSSItem nss_builtins_items_235 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_236 [] = {
+static const NSSItem nss_builtins_items_262 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15715,7 +17924,7 @@ static const NSSItem nss_builtins_items_236 [] = {
 "\011\333\212\101\202\236\146\233\021"
 , (PRUint32)857 }
 };
-static const NSSItem nss_builtins_items_237 [] = {
+static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15738,7 +17947,7 @@ static const NSSItem nss_builtins_items_237 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_238 [] = {
+static const NSSItem nss_builtins_items_264 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15821,7 +18030,7 @@ static const NSSItem nss_builtins_items_238 [] = {
 "\262\033\211\124"
 , (PRUint32)932 }
 };
-static const NSSItem nss_builtins_items_239 [] = {
+static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15845,7 +18054,7 @@ static const NSSItem nss_builtins_items_239 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_240 [] = {
+static const NSSItem nss_builtins_items_266 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15945,7 +18154,7 @@ static const NSSItem nss_builtins_items_240 [] = {
 "\021\055"
 , (PRUint32)1026 }
 };
-static const NSSItem nss_builtins_items_241 [] = {
+static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -15975,7 +18184,7 @@ static const NSSItem nss_builtins_items_241 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_242 [] = {
+static const NSSItem nss_builtins_items_268 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16049,7 +18258,7 @@ static const NSSItem nss_builtins_items_242 [] = {
 "\367\130\077\056\162\002\127\243\217\241\024\056"
 , (PRUint32)652 }
 };
-static const NSSItem nss_builtins_items_243 [] = {
+static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16078,7 +18287,7 @@ static const NSSItem nss_builtins_items_243 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_244 [] = {
+static const NSSItem nss_builtins_items_270 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16184,7 +18393,7 @@ static const NSSItem nss_builtins_items_244 [] = {
 "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
 , (PRUint32)1070 }
 };
-static const NSSItem nss_builtins_items_245 [] = {
+static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16216,7 +18425,7 @@ static const NSSItem nss_builtins_items_245 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_246 [] = {
+static const NSSItem nss_builtins_items_272 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16295,7 +18504,7 @@ static const NSSItem nss_builtins_items_246 [] = {
 "\017\212"
 , (PRUint32)690 }
 };
-static const NSSItem nss_builtins_items_247 [] = {
+static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16325,7 +18534,7 @@ static const NSSItem nss_builtins_items_247 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_248 [] = {
+static const NSSItem nss_builtins_items_274 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16440,7 +18649,7 @@ static const NSSItem nss_builtins_items_248 [] = {
 "\354\315\202\141\361\070\346\117\227\230\052\132\215"
 , (PRUint32)1213 }
 };
-static const NSSItem nss_builtins_items_249 [] = {
+static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16472,7 +18681,7 @@ static const NSSItem nss_builtins_items_249 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_250 [] = {
+static const NSSItem nss_builtins_items_276 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16570,7 +18779,7 @@ static const NSSItem nss_builtins_items_250 [] = {
 "\055\247\330\206\052\335\056\020"
 , (PRUint32)904 }
 };
-static const NSSItem nss_builtins_items_251 [] = {
+static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16603,7 +18812,7 @@ static const NSSItem nss_builtins_items_251 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_252 [] = {
+static const NSSItem nss_builtins_items_278 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16705,7 +18914,7 @@ static const NSSItem nss_builtins_items_252 [] = {
 "\330\316\304\143\165\077\131\107\261"
 , (PRUint32)1049 }
 };
-static const NSSItem nss_builtins_items_253 [] = {
+static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16735,7 +18944,7 @@ static const NSSItem nss_builtins_items_253 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_254 [] = {
+static const NSSItem nss_builtins_items_280 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16854,7 +19063,7 @@ static const NSSItem nss_builtins_items_254 [] = {
 "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
 , (PRUint32)1486 }
 };
-static const NSSItem nss_builtins_items_255 [] = {
+static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16879,7 +19088,7 @@ static const NSSItem nss_builtins_items_255 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_256 [] = {
+static const NSSItem nss_builtins_items_282 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16969,7 +19178,7 @@ static const NSSItem nss_builtins_items_256 [] = {
 "\315\345\250"
 , (PRUint32)1043 }
 };
-static const NSSItem nss_builtins_items_257 [] = {
+static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -16993,7 +19202,7 @@ static const NSSItem nss_builtins_items_257 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_258 [] = {
+static const NSSItem nss_builtins_items_284 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17098,7 +19307,7 @@ static const NSSItem nss_builtins_items_258 [] = {
 "\115\273\306\104\333\066\313\052\234\216"
 , (PRUint32)1258 }
 };
-static const NSSItem nss_builtins_items_259 [] = {
+static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17123,7 +19332,7 @@ static const NSSItem nss_builtins_items_259 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_260 [] = {
+static const NSSItem nss_builtins_items_286 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17199,7 +19408,7 @@ static const NSSItem nss_builtins_items_260 [] = {
 "\002\153\331\132"
 , (PRUint32)820 }
 };
-static const NSSItem nss_builtins_items_261 [] = {
+static const NSSItem nss_builtins_items_287 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17223,7 +19432,7 @@ static const NSSItem nss_builtins_items_261 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_262 [] = {
+static const NSSItem nss_builtins_items_288 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17305,7 +19514,7 @@ static const NSSItem nss_builtins_items_262 [] = {
 "\362"
 , (PRUint32)881 }
 };
-static const NSSItem nss_builtins_items_263 [] = {
+static const NSSItem nss_builtins_items_289 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17330,7 +19539,7 @@ static const NSSItem nss_builtins_items_263 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_264 [] = {
+static const NSSItem nss_builtins_items_290 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17446,7 +19655,7 @@ static const NSSItem nss_builtins_items_264 [] = {
 "\113\076\053\070\007\125\230\136\244"
 , (PRUint32)1465 }
 };
-static const NSSItem nss_builtins_items_265 [] = {
+static const NSSItem nss_builtins_items_291 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17470,7 +19679,7 @@ static const NSSItem nss_builtins_items_265 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_266 [] = {
+static const NSSItem nss_builtins_items_292 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17535,7 +19744,7 @@ static const NSSItem nss_builtins_items_266 [] = {
 "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_267 [] = {
+static const NSSItem nss_builtins_items_293 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17562,7 +19771,7 @@ static const NSSItem nss_builtins_items_267 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_268 [] = {
+static const NSSItem nss_builtins_items_294 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17627,7 +19836,7 @@ static const NSSItem nss_builtins_items_268 [] = {
 "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
 , (PRUint32)576 }
 };
-static const NSSItem nss_builtins_items_269 [] = {
+static const NSSItem nss_builtins_items_295 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17654,7 +19863,7 @@ static const NSSItem nss_builtins_items_269 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_270 [] = {
+static const NSSItem nss_builtins_items_296 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17751,7 +19960,7 @@ static const NSSItem nss_builtins_items_270 [] = {
 "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
 , (PRUint32)1038 }
 };
-static const NSSItem nss_builtins_items_271 [] = {
+static const NSSItem nss_builtins_items_297 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17779,7 +19988,7 @@ static const NSSItem nss_builtins_items_271 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_272 [] = {
+static const NSSItem nss_builtins_items_298 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17870,7 +20079,7 @@ static const NSSItem nss_builtins_items_272 [] = {
 "\336\102\343\055\202\361\017\345\372\227"
 , (PRUint32)954 }
 };
-static const NSSItem nss_builtins_items_273 [] = {
+static const NSSItem nss_builtins_items_299 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17898,7 +20107,7 @@ static const NSSItem nss_builtins_items_273 [] = {
   { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_274 [] = {
+static const NSSItem nss_builtins_items_300 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -17977,7 +20186,7 @@ static const NSSItem nss_builtins_items_274 [] = {
 "\130\077\137"
 , (PRUint32)867 }
 };
-static const NSSItem nss_builtins_items_275 [] = {
+static const NSSItem nss_builtins_items_301 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18001,7 +20210,7 @@ static const NSSItem nss_builtins_items_275 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_276 [] = {
+static const NSSItem nss_builtins_items_302 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18094,7 +20303,7 @@ static const NSSItem nss_builtins_items_276 [] = {
 "\045\361\224\264\146"
 , (PRUint32)997 }
 };
-static const NSSItem nss_builtins_items_277 [] = {
+static const NSSItem nss_builtins_items_303 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18121,7 +20330,7 @@ static const NSSItem nss_builtins_items_277 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_278 [] = {
+static const NSSItem nss_builtins_items_304 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18245,7 +20454,7 @@ static const NSSItem nss_builtins_items_278 [] = {
 "\156\117\022\176\012\074\235\225"
 , (PRUint32)1560 }
 };
-static const NSSItem nss_builtins_items_279 [] = {
+static const NSSItem nss_builtins_items_305 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18270,7 +20479,7 @@ static const NSSItem nss_builtins_items_279 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_280 [] = {
+static const NSSItem nss_builtins_items_306 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18389,7 +20598,7 @@ static const NSSItem nss_builtins_items_280 [] = {
 "\333\374\046\210\307"
 , (PRUint32)1525 }
 };
-static const NSSItem nss_builtins_items_281 [] = {
+static const NSSItem nss_builtins_items_307 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18413,7 +20622,7 @@ static const NSSItem nss_builtins_items_281 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_282 [] = {
+static const NSSItem nss_builtins_items_308 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18569,7 +20778,7 @@ static const NSSItem nss_builtins_items_282 [] = {
 "\167\110\320"
 , (PRUint32)1875 }
 };
-static const NSSItem nss_builtins_items_283 [] = {
+static const NSSItem nss_builtins_items_309 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18600,7 +20809,7 @@ static const NSSItem nss_builtins_items_283 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_284 [] = {
+static const NSSItem nss_builtins_items_310 [] = {
   { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18753,7 +20962,7 @@ static const NSSItem nss_builtins_items_284 [] = {
 "\351\233\256\325\124\300\164\200\321\013\102\237\301"
 , (PRUint32)1869 }
 };
-static const NSSItem nss_builtins_items_285 [] = {
+static const NSSItem nss_builtins_items_311 [] = {
   { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
   { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
@@ -18783,2574 +20992,6 @@ static const NSSItem nss_builtins_items_285 [] = {
   { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
   { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
 };
-static const NSSItem nss_builtins_items_286 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004"
-"\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154"
-"\141\056\157\162\147"
-, (PRUint32)229 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
-"\362\077\103"
-, (PRUint32)19 },
-  { (void *)"\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000"
-"\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
-"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
-"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
-"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
-"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
-"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
-"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
-"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
-"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
-"\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157"
-"\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202"
-"\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005"
-"\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253"
-"\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262"
-"\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241"
-"\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271"
-"\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307"
-"\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070"
-"\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262"
-"\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221"
-"\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033"
-"\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351"
-"\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316"
-"\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235"
-"\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345"
-"\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133"
-"\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100"
-"\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214"
-"\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002"
-"\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003"
-"\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230"
-"\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006"
-"\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160"
-"\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003"
-"\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003"
-"\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035"
-"\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006"
-"\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040"
-"\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001"
-"\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007"
-"\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165"
-"\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120"
-"\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066"
-"\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143"
-"\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055"
-"\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141"
-"\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164"
-"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056"
-"\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161"
-"\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073"
-"\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160"
-"\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056"
-"\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123"
-"\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053"
-"\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057"
-"\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157"
-"\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144"
-"\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147"
-"\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172"
-"\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206"
-"\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025"
-"\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276"
-"\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317"
-"\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111"
-"\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204"
-"\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163"
-"\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335"
-"\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043"
-"\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231"
-"\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312"
-"\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005"
-"\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142"
-"\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043"
-"\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236"
-"\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055"
-"\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171"
-"\242\355\264\324\265\145\103\267\223\106\212\323"
-, (PRUint32)1532 }
-};
-static const NSSItem nss_builtins_items_287 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Mozilla Addons", (PRUint32)21 },
-  { (void *)"\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014"
-"\165\332\071\326"
-, (PRUint32)20 },
-  { (void *)"\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341"
-"\362\077\103"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_288 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Global Trustee", (PRUint32)21 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155"
-"\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141"
-"\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006"
-"\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165"
-"\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107"
-"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060"
-"\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142"
-"\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160"
-"\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013"
-"\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060"
-"\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164"
-"\162\165\163\164\145\145"
-, (PRUint32)230 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
-"\070\057\260"
-, (PRUint32)19 },
-  { (void *)"\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000"
-"\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006"
-"\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006"
-"\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147"
-"\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107"
-"\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060"
-"\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124"
-"\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023"
-"\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107"
-"\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156"
-"\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151"
-"\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023"
-"\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060"
-"\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001"
-"\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000"
-"\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266"
-"\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064"
-"\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235"
-"\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151"
-"\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013"
-"\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117"
-"\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330"
-"\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335"
-"\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164"
-"\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350"
-"\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164"
-"\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053"
-"\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250"
-"\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064"
-"\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315"
-"\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164"
-"\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232"
-"\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234"
-"\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225"
-"\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267"
-"\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026"
-"\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137"
-"\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157"
-"\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253"
-"\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301"
-"\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345"
-"\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030"
-"\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121"
-"\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156"
-"\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160"
-"\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214"
-"\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145"
-"\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006"
-"\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050"
-"\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035"
-"\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101"
-"\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006"
-"\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006"
-"\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125"
-"\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001"
-"\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035"
-"\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061"
-"\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005"
-"\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143"
-"\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103"
-"\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240"
-"\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056"
-"\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116"
-"\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167"
-"\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150"
-"\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157"
-"\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162"
-"\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060"
-"\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060"
-"\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164"
-"\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141"
-"\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164"
-"\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010"
-"\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057"
-"\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143"
-"\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147"
-"\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006"
-"\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001"
-"\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305"
-"\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021"
-"\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011"
-"\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237"
-"\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306"
-"\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007"
-"\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201"
-"\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174"
-"\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240"
-"\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045"
-"\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346"
-"\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331"
-"\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215"
-"\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366"
-"\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265"
-"\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031"
-"\264"
-, (PRUint32)1761 }
-};
-static const NSSItem nss_builtins_items_289 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Global Trustee", (PRUint32)21 },
-  { (void *)"\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262"
-"\234\324\025\032"
-, (PRUint32)20 },
-  { (void *)"\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025"
-"\070\057\260"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_290 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus GMail", (PRUint32)12 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
-"\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143"
-"\157\155"
-, (PRUint32)226 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
-"\256\036"
-, (PRUint32)18 },
-  { (void *)"\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004"
-"\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
-"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
-"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
-"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
-"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
-"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
-"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
-"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
-"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
-"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
-"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
-"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
-"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
-"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
-"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
-"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
-"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
-"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
-"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
-"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
-"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
-"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
-"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
-"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
-"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
-"\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056"
-"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
-"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
-"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
-"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
-"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
-"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
-"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
-"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
-"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
-"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
-"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
-"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
-"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
-"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
-"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
-"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
-"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
-"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
-"\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
-"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
-"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
-"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
-"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
-"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
-"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
-"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
-"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
-"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
-"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
-"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
-"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
-"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
-"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
-"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
-"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
-"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
-"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
-"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
-"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
-"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
-"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
-"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006"
-"\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147"
-"\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155"
-"\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015"
-"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001"
-"\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320"
-"\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336"
-"\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204"
-"\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300"
-"\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255"
-"\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023"
-"\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206"
-"\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342"
-"\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140"
-"\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211"
-"\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173"
-"\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135"
-"\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254"
-"\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305"
-"\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206"
-"\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247"
-"\111\043"
-, (PRUint32)1522 }
-};
-static const NSSItem nss_builtins_items_291 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus GMail", (PRUint32)12 },
-  { (void *)"\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044"
-"\223\003\017\227"
-, (PRUint32)20 },
-  { (void *)"\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014"
-"\256\036"
-, (PRUint32)18 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_292 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Google", (PRUint32)13 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
-"\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157"
-"\155"
-, (PRUint32)225 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
-"\130\174\006"
-, (PRUint32)19 },
-  { (void *)"\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000"
-"\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
-"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
-"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
-"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
-"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
-"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
-"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
-"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
-"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
-"\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056"
-"\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
-"\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004"
-"\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037"
-"\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000"
-"\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142"
-"\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120"
-"\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166"
-"\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106"
-"\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036"
-"\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215"
-"\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150"
-"\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144"
-"\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263"
-"\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001"
-"\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335"
-"\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361"
-"\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036"
-"\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001"
-"\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
-"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
-"\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275"
-"\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
-"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
-"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
-"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
-"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
-"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
-"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
-"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
-"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
-"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
-"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
-"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
-"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
-"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
-"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
-"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
-"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
-"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
-"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
-"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
-"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006"
-"\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157"
-"\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145"
-"\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001"
-"\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063"
-"\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027"
-"\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062"
-"\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260"
-"\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102"
-"\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302"
-"\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154"
-"\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065"
-"\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146"
-"\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126"
-"\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332"
-"\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155"
-"\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235"
-"\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061"
-"\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327"
-"\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363"
-"\172\244\047\023\326\117\364\151"
-, (PRUint32)1512 }
-};
-static const NSSItem nss_builtins_items_293 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Google", (PRUint32)13 },
-  { (void *)"\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101"
-"\100\105\146\026"
-, (PRUint32)20 },
-  { (void *)"\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311"
-"\130\174\006"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_294 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Skype", (PRUint32)12 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
-"\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143"
-"\157\155"
-, (PRUint32)226 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
-"\025\104\107"
-, (PRUint32)19 },
-  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
-"\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
-"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
-"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
-"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
-"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
-"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
-"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
-"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
-"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
-"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
-"\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206"
-"\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256"
-"\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040"
-"\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056"
-"\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121"
-"\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040"
-"\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377"
-"\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171"
-"\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210"
-"\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071"
-"\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047"
-"\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244"
-"\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155"
-"\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066"
-"\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100"
-"\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131"
-"\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000"
-"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
-"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
-"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
-"\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034"
-"\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017"
-"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
-"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
-"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
-"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
-"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
-"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
-"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
-"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
-"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
-"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
-"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
-"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
-"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
-"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
-"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
-"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
-"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
-"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
-"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
-"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
-"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
-"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
-"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
-"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
-"\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056"
-"\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
-"\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132"
-"\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157"
-"\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172"
-"\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315"
-"\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345"
-"\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143"
-"\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153"
-"\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267"
-"\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255"
-"\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160"
-"\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116"
-"\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017"
-"\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225"
-"\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034"
-"\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224"
-"\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254"
-"\302\021\254"
-, (PRUint32)1523 }
-};
-static const NSSItem nss_builtins_items_295 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Skype", (PRUint32)12 },
-  { (void *)"\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045"
-"\004\372\043\311"
-, (PRUint32)20 },
-  { (void *)"\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210"
-"\025\104\107"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_296 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
-"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
-"\157\155"
-, (PRUint32)226 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
-"\167\051\243"
-, (PRUint32)19 },
-  { (void *)"\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000"
-"\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
-"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
-"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
-"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
-"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
-"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
-"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
-"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
-"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
-"\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151"
-"\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075"
-"\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034"
-"\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243"
-"\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030"
-"\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041"
-"\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202"
-"\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161"
-"\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174"
-"\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302"
-"\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321"
-"\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337"
-"\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115"
-"\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072"
-"\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154"
-"\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245"
-"\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167"
-"\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000"
-"\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043"
-"\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135"
-"\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035"
-"\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047"
-"\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017"
-"\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023"
-"\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026"
-"\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006"
-"\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060"
-"\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003"
-"\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026"
-"\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056"
-"\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173"
-"\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206"
-"\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157"
-"\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105"
-"\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056"
-"\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072"
-"\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164"
-"\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110"
-"\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053"
-"\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053"
-"\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057"
-"\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155"
-"\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166"
-"\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005"
-"\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163"
-"\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057"
-"\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156"
-"\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056"
-"\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202"
-"\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125"
-"\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310"
-"\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135"
-"\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326"
-"\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037"
-"\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120"
-"\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112"
-"\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210"
-"\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150"
-"\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326"
-"\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252"
-"\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111"
-"\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375"
-"\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007"
-"\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373"
-"\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325"
-"\147\024\060"
-, (PRUint32)1523 }
-};
-static const NSSItem nss_builtins_items_297 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 1", (PRUint32)14 },
-  { (void *)"\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307"
-"\153\333\167\320"
-, (PRUint32)20 },
-  { (void *)"\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160"
-"\167\051\243"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_298 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
-"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
-"\157\155"
-, (PRUint32)226 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
-"\302\051"
-, (PRUint32)18 },
-  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071"
-"\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
-"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
-"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
-"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
-"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
-"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
-"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
-"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
-"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
-"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
-"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
-"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
-"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
-"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
-"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
-"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
-"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
-"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
-"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
-"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
-"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
-"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
-"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
-"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
-"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
-"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
-"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
-"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
-"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
-"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
-"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
-"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
-"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
-"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
-"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
-"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
-"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
-"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
-"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
-"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
-"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
-"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
-"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
-"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
-"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
-"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
-"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
-"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
-"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
-"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
-"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
-"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
-"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
-"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
-"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
-"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
-"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
-"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
-"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
-"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
-"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
-"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
-"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
-"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
-"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
-"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
-"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
-"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
-"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
-"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341"
-"\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027"
-"\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371"
-"\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302"
-"\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254"
-"\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056"
-"\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161"
-"\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132"
-"\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122"
-"\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107"
-"\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143"
-"\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016"
-"\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105"
-"\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067"
-"\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264"
-"\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213"
-"\217\116\235\306\066\347\134\246\253\022\017\326\317"
-, (PRUint32)1501 }
-};
-static const NSSItem nss_builtins_items_299 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 2", (PRUint32)14 },
-  { (void *)"\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317"
-"\112\134\263\255"
-, (PRUint32)20 },
-  { (void *)"\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340"
-"\302\051"
-, (PRUint32)18 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_300 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004"
-"\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143"
-"\157\155"
-, (PRUint32)226 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
-"\052\161"
-, (PRUint32)18 },
-  { (void *)"\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076"
-"\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
-"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
-"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
-"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
-"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
-"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
-"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
-"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
-"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
-"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
-"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
-"\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061"
-"\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006"
-"\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004"
-"\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004"
-"\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003"
-"\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025"
-"\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141"
-"\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013"
-"\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006"
-"\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056"
-"\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145"
-"\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103"
-"\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003"
-"\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114"
-"\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156"
-"\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
-"\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355"
-"\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353"
-"\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011"
-"\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251"
-"\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356"
-"\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356"
-"\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204"
-"\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157"
-"\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314"
-"\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211"
-"\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312"
-"\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175"
-"\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370"
-"\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002"
-"\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231"
-"\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113"
-"\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001"
-"\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
-"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
-"\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141"
-"\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
-"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
-"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
-"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
-"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
-"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
-"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
-"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
-"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
-"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
-"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
-"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
-"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
-"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
-"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
-"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
-"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
-"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
-"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
-"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
-"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006"
-"\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056"
-"\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110"
-"\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230"
-"\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116"
-"\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316"
-"\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060"
-"\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240"
-"\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272"
-"\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276"
-"\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307"
-"\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066"
-"\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152"
-"\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176"
-"\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325"
-"\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265"
-"\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146"
-"\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105"
-"\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003"
-"\130\113\161\203\237\146\346\254\171\110\376\376\107"
-, (PRUint32)1501 }
-};
-static const NSSItem nss_builtins_items_301 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus Yahoo 3", (PRUint32)14 },
-  { (void *)"\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236"
-"\007\326\224\317"
-, (PRUint32)20 },
-  { (void *)"\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250"
-"\052\161"
-, (PRUint32)18 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_302 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus live.com", (PRUint32)15 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067"
-"\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151"
-"\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147"
-"\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123"
-"\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060"
-"\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114"
-"\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145"
-"\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004"
-"\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111"
-"\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151"
-"\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141"
-"\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004"
-"\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157"
-"\155"
-, (PRUint32)225 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
-"\275\072\300"
-, (PRUint32)19 },
-  { (void *)"\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000"
-"\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300"
-"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
-"\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025"
-"\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145"
-"\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025"
-"\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145"
-"\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030"
-"\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164"
-"\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004"
-"\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164"
-"\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060"
-"\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063"
-"\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125"
-"\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125"
-"\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006"
-"\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060"
-"\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154"
-"\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023"
-"\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021"
-"\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164"
-"\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164"
-"\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040"
-"\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006"
-"\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123"
-"\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151"
-"\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015"
-"\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001"
-"\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357"
-"\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230"
-"\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323"
-"\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076"
-"\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005"
-"\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264"
-"\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053"
-"\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041"
-"\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252"
-"\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045"
-"\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125"
-"\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303"
-"\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127"
-"\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271"
-"\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160"
-"\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146"
-"\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001"
-"\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004"
-"\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007"
-"\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016"
-"\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003"
-"\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001"
-"\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001"
-"\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060"
-"\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001"
-"\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075"
-"\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004"
-"\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035"
-"\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143"
-"\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006"
-"\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062"
-"\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144"
-"\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122"
-"\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143"
-"\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057"
-"\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057"
-"\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141"
-"\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006"
-"\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006"
-"\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143"
-"\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057"
-"\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145"
-"\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005"
-"\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006"
-"\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056"
-"\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157"
-"\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011"
-"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
-"\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332"
-"\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257"
-"\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311"
-"\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137"
-"\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052"
-"\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254"
-"\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122"
-"\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015"
-"\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047"
-"\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177"
-"\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025"
-"\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002"
-"\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067"
-"\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364"
-"\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177"
-"\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
-, (PRUint32)1520 }
-};
-static const NSSItem nss_builtins_items_303 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus live.com", (PRUint32)15 },
-  { (void *)"\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024"
-"\160\212\262\276"
-, (PRUint32)20 },
-  { (void *)"\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164"
-"\275\072\300"
-, (PRUint32)19 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_304 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus kuix.de", (PRUint32)14 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105"
-"\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065"
-"\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040"
-"\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011"
-"\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125"
-"\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061"
-"\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156"
-"\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106"
-"\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157"
-"\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004"
-"\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131"
-"\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101"
-"\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013"
-"\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123"
-"\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151"
-"\170\056\144\145"
-, (PRUint32)244 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
-"\350\260"
-, (PRUint32)18 },
-  { (void *)"\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162"
-"\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060"
-"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201"
-"\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013"
-"\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006"
-"\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040"
-"\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124"
-"\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164"
-"\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150"
-"\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162"
-"\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003"
-"\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055"
-"\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063"
-"\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061"
-"\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006"
-"\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004"
-"\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004"
-"\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060"
-"\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164"
-"\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164"
-"\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012"
-"\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040"
-"\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151"
-"\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171"
-"\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040"
-"\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101"
-"\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061"
-"\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157"
-"\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003"
-"\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201"
-"\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007"
-"\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123"
-"\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354"
-"\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337"
-"\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115"
-"\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224"
-"\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262"
-"\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271"
-"\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202"
-"\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060"
-"\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325"
-"\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026"
-"\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346"
-"\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377"
-"\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006"
-"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
-"\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073"
-"\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053"
-"\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164"
-"\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155"
-"\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125"
-"\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164"
-"\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143"
-"\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151"
-"\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154"
-"\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143"
-"\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124"
-"\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144"
-"\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005"
-"\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005"
-"\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164"
-"\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124"
-"\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103"
-"\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060"
-"\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143"
-"\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125"
-"\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202"
-"\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011"
-"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
-"\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222"
-"\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124"
-"\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311"
-"\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200"
-"\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056"
-"\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164"
-"\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366"
-"\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312"
-"\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213"
-"\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071"
-"\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160"
-"\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231"
-"\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226"
-"\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346"
-"\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260"
-"\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
-, (PRUint32)1392 }
-};
-static const NSSItem nss_builtins_items_305 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Bogus kuix.de", (PRUint32)14 },
-  { (void *)"\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171"
-"\262\144\040\100"
-, (PRUint32)20 },
-  { (void *)"\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007"
-, (PRUint32)16 },
-  { (void *)"\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060"
-"\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153"
-"\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023"
-"\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116"
-"\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023"
-"\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162"
-"\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125"
-"\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163"
-"\164\055\110\141\162\144\167\141\162\145"
-, (PRUint32)154 },
-  { (void *)"\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376"
-"\350\260"
-, (PRUint32)18 },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_306 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
-"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
-"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
-"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171\040\055\040\107\062"
-, (PRUint32)134 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
-"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
-"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
-"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171\040\055\040\107\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
-"\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
-"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
-"\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023"
-"\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156"
-"\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040"
-"\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
-"\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060"
-"\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063"
-"\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007"
-"\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007"
-"\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030"
-"\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143"
-"\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004"
-"\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164"
-"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
-"\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060"
-"\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202"
-"\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010"
-"\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203"
-"\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366"
-"\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116"
-"\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007"
-"\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215"
-"\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336"
-"\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062"
-"\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262"
-"\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353"
-"\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141"
-"\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051"
-"\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200"
-"\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221"
-"\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333"
-"\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033"
-"\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000"
-"\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004"
-"\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040"
-"\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001"
-"\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227"
-"\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145"
-"\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214"
-"\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256"
-"\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053"
-"\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337"
-"\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353"
-"\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355"
-"\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072"
-"\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350"
-"\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333"
-"\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075"
-"\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316"
-"\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006"
-"\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324"
-"\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210"
-"\342\342\104\276\134\367\352\034\365"
-, (PRUint32)969 }
-};
-static const NSSItem nss_builtins_items_307 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Go Daddy Root Certificate Authority - G2", (PRUint32)41 },
-  { (void *)"\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302"
-"\124\375\346\213"
-, (PRUint32)20 },
-  { (void *)"\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001"
-, (PRUint32)16 },
-  { (void *)"\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012"
-"\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111"
-"\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157"
-"\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164"
-"\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164"
-"\171\040\055\040\107\062"
-, (PRUint32)134 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_308 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
-"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
-"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
-"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
-"\107\062"
-, (PRUint32)146 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
-"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
-"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
-"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
-"\107\062"
-, (PRUint32)146 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
-"\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
-"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
-"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
-"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
-"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060"
-"\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154"
-"\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141"
-"\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107"
-"\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060"
-"\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071"
-"\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125"
-"\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172"
-"\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143"
-"\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004"
-"\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143"
-"\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061"
-"\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151"
-"\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151"
-"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055"
-"\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367"
-"\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002"
-"\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133"
-"\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327"
-"\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040"
-"\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334"
-"\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133"
-"\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165"
-"\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161"
-"\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363"
-"\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315"
-"\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202"
-"\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373"
-"\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115"
-"\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244"
-"\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134"
-"\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164"
-"\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303"
-"\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006"
-"\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016"
-"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035"
-"\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060"
-"\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006"
-"\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001"
-"\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071"
-"\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324"
-"\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321"
-"\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147"
-"\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267"
-"\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323"
-"\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175"
-"\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340"
-"\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040"
-"\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316"
-"\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312"
-"\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011"
-"\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042"
-"\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365"
-"\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045"
-"\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151"
-"\364"
-, (PRUint32)993 }
-};
-static const NSSItem nss_builtins_items_309 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Starfield Root Certificate Authority - G2", (PRUint32)42 },
-  { (void *)"\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071"
-"\324\347\017\016"
-, (PRUint32)20 },
-  { (void *)"\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226"
-, (PRUint32)16 },
-  { (void *)"\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062"
-"\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145"
-"\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143"
-"\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040"
-"\107\062"
-, (PRUint32)146 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_310 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
-"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
-"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
-"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
-"\150\157\162\151\164\171\040\055\040\107\062"
-, (PRUint32)155 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
-"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
-"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
-"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
-"\150\157\162\151\164\171\040\055\040\107\062"
-, (PRUint32)155 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)"\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000"
-"\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060"
-"\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156"
-"\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164"
-"\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023"
-"\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156"
-"\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060"
-"\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154"
-"\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040"
-"\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150"
-"\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071"
-"\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061"
-"\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060"
-"\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003"
-"\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021"
-"\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154"
-"\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162"
-"\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151"
-"\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004"
-"\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162"
-"\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151"
-"\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171"
-"\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110"
-"\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001"
-"\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276"
-"\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051"
-"\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136"
-"\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033"
-"\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266"
-"\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035"
-"\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203"
-"\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112"
-"\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256"
-"\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314"
-"\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336"
-"\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015"
-"\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105"
-"\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144"
-"\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237"
-"\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205"
-"\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060"
-"\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377"
-"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
-"\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252"
-"\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060"
-"\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202"
-"\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010"
-"\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055"
-"\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336"
-"\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301"
-"\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052"
-"\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056"
-"\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163"
-"\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320"
-"\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047"
-"\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035"
-"\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372"
-"\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046"
-"\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247"
-"\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060"
-"\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250"
-"\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215"
-"\261\050\272"
-, (PRUint32)1011 }
-};
-static const NSSItem nss_builtins_items_311 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Starfield Services Root Certificate Authority - G2", (PRUint32)51 },
-  { (void *)"\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143"
-"\350\045\157\077"
-, (PRUint32)20 },
-  { (void *)"\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242"
-, (PRUint32)16 },
-  { (void *)"\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123"
-"\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157"
-"\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157"
-"\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012"
-"\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150"
-"\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073"
-"\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145"
-"\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164"
-"\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164"
-"\150\157\162\151\164\171\040\055\040\107\062"
-, (PRUint32)155 },
-  { (void *)"\002\001\000"
-, (PRUint32)3 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_312 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
-"\145\162\143\151\141\154"
-, (PRUint32)70 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
-"\145\162\143\151\141\154"
-, (PRUint32)70 },
-  { (void *)"\002\010\167\167\006\047\046\251\261\174"
-, (PRUint32)10 },
-  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167"
-"\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367"
-"\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
-"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
-"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
-"\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015"
-"\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063"
-"\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013"
-"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
-"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
-"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
-"\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151"
-"\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
-"\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037"
-"\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303"
-"\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217"
-"\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065"
-"\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137"
-"\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053"
-"\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107"
-"\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326"
-"\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013"
-"\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005"
-"\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002"
-"\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265"
-"\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201"
-"\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120"
-"\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253"
-"\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334"
-"\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003"
-"\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077"
-"\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125"
-"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
-"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
-"\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000"
-"\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051"
-"\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006"
-"\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052"
-"\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324"
-"\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143"
-"\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045"
-"\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073"
-"\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355"
-"\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362"
-"\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302"
-"\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140"
-"\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162"
-"\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111"
-"\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002"
-"\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236"
-"\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
-, (PRUint32)848 }
-};
-static const NSSItem nss_builtins_items_313 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Commercial", (PRUint32)23 },
-  { (void *)"\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054"
-"\307\262\170\267"
-, (PRUint32)20 },
-  { (void *)"\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267"
-, (PRUint32)16 },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155"
-"\145\162\143\151\141\154"
-, (PRUint32)70 },
-  { (void *)"\002\010\167\167\006\047\046\251\261\174"
-, (PRUint32)10 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_314 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Networking", (PRUint32)23 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
-"\157\162\153\151\156\147"
-, (PRUint32)70 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
-"\157\162\153\151\156\147"
-, (PRUint32)70 },
-  { (void *)"\002\010\174\117\004\071\034\324\231\055"
-, (PRUint32)10 },
-  { (void *)"\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174"
-"\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367"
-"\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
-"\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006"
-"\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163"
-"\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015"
-"\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063"
-"\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013"
-"\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006"
-"\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163"
-"\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151"
-"\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151"
-"\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
-"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
-"\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240"
-"\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217"
-"\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362"
-"\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063"
-"\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241"
-"\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232"
-"\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253"
-"\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324"
-"\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113"
-"\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374"
-"\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275"
-"\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051"
-"\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024"
-"\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012"
-"\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106"
-"\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026"
-"\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003"
-"\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242"
-"\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125"
-"\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003"
-"\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011"
-"\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000"
-"\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264"
-"\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316"
-"\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116"
-"\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321"
-"\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356"
-"\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144"
-"\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145"
-"\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131"
-"\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025"
-"\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110"
-"\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056"
-"\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313"
-"\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221"
-"\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074"
-"\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064"
-"\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
-, (PRUint32)848 }
-};
-static const NSSItem nss_builtins_items_315 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Networking", (PRUint32)23 },
-  { (void *)"\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220"
-"\237\105\000\057"
-, (PRUint32)20 },
-  { (void *)"\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177"
-, (PRUint32)16 },
-  { (void *)"\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026"
-"\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167"
-"\157\162\153\151\156\147"
-, (PRUint32)70 },
-  { (void *)"\002\010\174\117\004\071\034\324\231\055"
-, (PRUint32)10 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_316 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Premium", (PRUint32)20 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155"
-, (PRUint32)67 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155"
-, (PRUint32)67 },
-  { (void *)"\002\010\155\214\024\106\261\246\012\356"
-, (PRUint32)10 },
-  { (void *)"\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155"
-"\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367"
-"\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004"
-"\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013"
-"\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006"
-"\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163"
-"\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060"
-"\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062"
-"\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006"
-"\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004"
-"\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034"
-"\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124"
-"\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042"
-"\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003"
-"\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337"
-"\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232"
-"\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347"
-"\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020"
-"\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221"
-"\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013"
-"\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331"
-"\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047"
-"\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055"
-"\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322"
-"\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373"
-"\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273"
-"\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271"
-"\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167"
-"\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265"
-"\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173"
-"\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050"
-"\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076"
-"\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206"
-"\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043"
-"\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003"
-"\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222"
-"\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270"
-"\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225"
-"\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322"
-"\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000"
-"\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013"
-"\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032"
-"\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173"
-"\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270"
-"\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327"
-"\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273"
-"\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001"
-"\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004"
-"\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021"
-"\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004"
-"\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377"
-"\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015"
-"\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116"
-"\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166"
-"\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104"
-"\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101"
-"\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040"
-"\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254"
-"\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365"
-"\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101"
-"\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142"
-"\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262"
-"\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320"
-"\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070"
-"\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010"
-"\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234"
-"\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000"
-"\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175"
-"\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320"
-"\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106"
-"\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057"
-"\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005"
-"\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103"
-"\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112"
-"\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107"
-"\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110"
-"\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344"
-"\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274"
-"\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303"
-"\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027"
-"\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216"
-"\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317"
-"\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052"
-"\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236"
-"\051\340\266\270\011\150\031\034\030\103"
-, (PRUint32)1354 }
-};
-static const NSSItem nss_builtins_items_317 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Premium", (PRUint32)20 },
-  { (void *)"\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145"
-"\046\062\050\047"
-, (PRUint32)20 },
-  { (void *)"\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127"
-, (PRUint32)16 },
-  { (void *)"\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155"
-, (PRUint32)67 },
-  { (void *)"\002\010\155\214\024\106\261\246\012\356"
-, (PRUint32)10 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_318 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155\040\105\103\103"
-, (PRUint32)71 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155\040\105\103\103"
-, (PRUint32)71 },
-  { (void *)"\002\010\164\227\045\212\307\077\172\124"
-, (PRUint32)10 },
-  { (void *)"\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164"
-"\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075"
-"\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002"
-"\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146"
-"\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004"
-"\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120"
-"\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060"
-"\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061"
-"\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011"
-"\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125"
-"\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061"
-"\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155"
-"\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103"
-"\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005"
-"\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003"
-"\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234"
-"\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350"
-"\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275"
-"\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117"
-"\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170"
-"\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006"
-"\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065"
-"\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003"
-"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006"
-"\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006"
-"\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060"
-"\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154"
-"\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306"
-"\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161"
-"\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210"
-"\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131"
-"\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002"
-"\214\171"
-, (PRUint32)514 }
-};
-static const NSSItem nss_builtins_items_319 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"AffirmTrust Premium ECC", (PRUint32)24 },
-  { (void *)"\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312"
-"\353\377\303\273"
-, (PRUint32)20 },
-  { (void *)"\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115"
-, (PRUint32)16 },
-  { (void *)"\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-"\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155"
-"\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027"
-"\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155"
-"\151\165\155\040\105\103\103"
-, (PRUint32)71 },
-  { (void *)"\002\010\164\227\045\212\307\077\172\124"
-, (PRUint32)10 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
-static const NSSItem nss_builtins_items_320 [] = {
-  { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
-  { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
-"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
-"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
-"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
-"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
-"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
-"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
-, (PRUint32)128 },
-  { (void *)"0", (PRUint32)2 },
-  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
-"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
-"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
-"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
-"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
-"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
-"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
-, (PRUint32)128 },
-  { (void *)"\002\003\004\104\300"
-, (PRUint32)5 },
-  { (void *)"\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004"
-"\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005"
-"\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
-"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
-"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
-"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
-"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
-"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
-"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
-"\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063"
-"\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067"
-"\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114"
-"\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145"
-"\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040"
-"\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103"
-"\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164"
-"\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060"
-"\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124"
-"\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103"
-"\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001"
-"\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001"
-"\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001"
-"\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307"
-"\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227"
-"\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074"
-"\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314"
-"\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253"
-"\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060"
-"\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124"
-"\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256"
-"\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121"
-"\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314"
-"\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227"
-"\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333"
-"\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061"
-"\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151"
-"\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251"
-"\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125"
-"\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003"
-"\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305"
-"\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125"
-"\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052"
-"\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246"
-"\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162"
-"\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271"
-"\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067"
-"\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313"
-"\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201"
-"\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055"
-"\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274"
-"\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061"
-"\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076"
-"\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230"
-"\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132"
-"\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130"
-"\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110"
-"\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232"
-"\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106"
-"\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
-, (PRUint32)959 }
-};
-static const NSSItem nss_builtins_items_321 [] = {
-  { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-  { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-  { (void *)"Certum Trusted Network CA", (PRUint32)26 },
-  { (void *)"\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031"
-"\247\017\006\236"
-, (PRUint32)20 },
-  { (void *)"\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170"
-, (PRUint32)16 },
-  { (void *)"\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061"
-"\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164"
-"\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123"
-"\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145"
-"\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151"
-"\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040"
-"\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162"
-"\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101"
-, (PRUint32)128 },
-  { (void *)"\002\003\004\104\300"
-, (PRUint32)5 },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-  { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-};
 
 builtinsInternalObject
 nss_builtins_data[] = {
@@ -21667,21 +21308,11 @@ nss_builtins_data[] = {
   { 11, nss_builtins_types_308, nss_builtins_items_308, {NULL} },
   { 13, nss_builtins_types_309, nss_builtins_items_309, {NULL} },
   { 11, nss_builtins_types_310, nss_builtins_items_310, {NULL} },
-  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} },
-  { 11, nss_builtins_types_312, nss_builtins_items_312, {NULL} },
-  { 13, nss_builtins_types_313, nss_builtins_items_313, {NULL} },
-  { 11, nss_builtins_types_314, nss_builtins_items_314, {NULL} },
-  { 13, nss_builtins_types_315, nss_builtins_items_315, {NULL} },
-  { 11, nss_builtins_types_316, nss_builtins_items_316, {NULL} },
-  { 13, nss_builtins_types_317, nss_builtins_items_317, {NULL} },
-  { 11, nss_builtins_types_318, nss_builtins_items_318, {NULL} },
-  { 13, nss_builtins_types_319, nss_builtins_items_319, {NULL} },
-  { 11, nss_builtins_types_320, nss_builtins_items_320, {NULL} },
-  { 13, nss_builtins_types_321, nss_builtins_items_321, {NULL} }
+  { 13, nss_builtins_types_311, nss_builtins_items_311, {NULL} }
 };
 const PRUint32
 #ifdef DEBUG
-  nss_builtins_nObjects = 321+1;
+  nss_builtins_nObjects = 311+1;
 #else
-  nss_builtins_nObjects = 321;
+  nss_builtins_nObjects = 311;
 #endif /* DEBUG */
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 42e674b6c24f..4694e7740ade 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -34,7 +34,7 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.9 $ $Date: 2011/04/06 23:59:09 $"
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.6 $ $Date: 2010/12/02 23:26:35 $"
 
 #
 # certdata.txt
@@ -207,6 +207,143 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+#
+# Certificate "Thawte Personal Freemail CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Thawte Personal Freemail CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
+\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
+\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
+\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
+\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
+\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
+\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
+\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
+\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
+\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
+\056\143\157\155
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
+\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
+\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
+\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
+\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
+\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
+\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
+\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
+\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
+\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
+\056\143\157\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\055\060\202\002\226\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101\061
+\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
+\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007\023
+\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006\003
+\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156\163
+\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013\023
+\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040\123
+\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157\156
+\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167\164
+\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145\155
+\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110\206
+\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154\055
+\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145\056
+\143\157\155\060\036\027\015\071\066\060\061\060\061\060\060\060
+\060\060\060\132\027\015\062\060\061\062\063\061\062\063\065\071
+\065\071\132\060\201\321\061\013\060\011\006\003\125\004\006\023
+\002\132\101\061\025\060\023\006\003\125\004\010\023\014\127\145
+\163\164\145\162\156\040\103\141\160\145\061\022\060\020\006\003
+\125\004\007\023\011\103\141\160\145\040\124\157\167\156\061\032
+\060\030\006\003\125\004\012\023\021\124\150\141\167\164\145\040
+\103\157\156\163\165\154\164\151\156\147\061\050\060\046\006\003
+\125\004\013\023\037\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\123\145\162\166\151\143\145\163\040\104\151\166\151
+\163\151\157\156\061\044\060\042\006\003\125\004\003\023\033\124
+\150\141\167\164\145\040\120\145\162\163\157\156\141\154\040\106
+\162\145\145\155\141\151\154\040\103\101\061\053\060\051\006\011
+\052\206\110\206\367\015\001\011\001\026\034\160\145\162\163\157
+\156\141\154\055\146\162\145\145\155\141\151\154\100\164\150\141
+\167\164\145\056\143\157\155\060\201\237\060\015\006\011\052\206
+\110\206\367\015\001\001\001\005\000\003\201\215\000\060\201\211
+\002\201\201\000\324\151\327\324\260\224\144\133\161\351\107\330
+\014\121\266\352\162\221\260\204\136\175\055\015\217\173\022\337
+\205\045\165\050\164\072\102\054\143\047\237\225\173\113\357\176
+\031\207\035\206\352\243\335\271\316\226\144\032\302\024\156\104
+\254\174\346\217\350\115\017\161\037\100\070\246\000\243\207\170
+\366\371\224\206\136\255\352\300\136\166\353\331\024\243\135\156
+\172\174\014\245\113\125\177\006\031\051\177\236\232\046\325\152
+\273\070\044\010\152\230\307\261\332\243\230\221\375\171\333\345
+\132\304\034\271\002\003\001\000\001\243\023\060\021\060\017\006
+\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\015
+\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
+\000\307\354\222\176\116\370\365\226\245\147\142\052\244\360\115
+\021\140\320\157\215\140\130\141\254\046\273\122\065\134\010\317
+\060\373\250\112\226\212\037\142\102\043\214\027\017\364\272\144
+\234\027\254\107\051\337\235\230\136\322\154\140\161\134\242\254
+\334\171\343\347\156\000\107\037\265\015\050\350\002\235\344\232
+\375\023\364\246\331\174\261\370\334\137\043\046\011\221\200\163
+\320\024\033\336\103\251\203\045\362\346\234\057\025\312\376\246
+\253\212\007\165\213\014\335\121\204\153\344\370\321\316\167\242
+\201
+END
+
+# Trust for Certificate "Thawte Personal Freemail CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Thawte Personal Freemail CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\040\231\000\266\075\225\127\050\024\014\321\066\042\330\306\207
+\244\353\000\205
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\036\164\303\206\074\014\065\305\076\302\177\357\074\252\074\331
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\321\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\022\060\020\006\003\125\004\007
+\023\011\103\141\160\145\040\124\157\167\156\061\032\060\030\006
+\003\125\004\012\023\021\124\150\141\167\164\145\040\103\157\156
+\163\165\154\164\151\156\147\061\050\060\046\006\003\125\004\013
+\023\037\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\123\145\162\166\151\143\145\163\040\104\151\166\151\163\151\157
+\156\061\044\060\042\006\003\125\004\003\023\033\124\150\141\167
+\164\145\040\120\145\162\163\157\156\141\154\040\106\162\145\145
+\155\141\151\154\040\103\101\061\053\060\051\006\011\052\206\110
+\206\367\015\001\011\001\026\034\160\145\162\163\157\156\141\154
+\055\146\162\145\145\155\141\151\154\100\164\150\141\167\164\145
+\056\143\157\155
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
 #
 # Certificate "Thawte Server CA"
 #
@@ -3014,6 +3151,168 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+#
+# Certificate "Entrust.net Secure Personal CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
+\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
+\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
+\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
+\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
+\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
+\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
+\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
+\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
+\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
+\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
+\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
+\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
+\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
+\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
+\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
+\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
+\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
+\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
+\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
+\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\003\221\356
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\355\060\202\004\126\240\003\002\001\002\002\004\070
+\003\221\356\060\015\006\011\052\206\110\206\367\015\001\001\004
+\005\000\060\201\311\061\013\060\011\006\003\125\004\006\023\002
+\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
+\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
+\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
+\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
+\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
+\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
+\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
+\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
+\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
+\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
+\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060\036
+\027\015\071\071\061\060\061\062\061\071\062\064\063\060\132\027
+\015\061\071\061\060\061\062\061\071\065\064\063\060\132\060\201
+\311\061\013\060\011\006\003\125\004\006\023\002\125\123\061\024
+\060\022\006\003\125\004\012\023\013\105\156\164\162\165\163\164
+\056\156\145\164\061\110\060\106\006\003\125\004\013\024\077\167
+\167\167\056\145\156\164\162\165\163\164\056\156\145\164\057\103
+\154\151\145\156\164\137\103\101\137\111\156\146\157\057\103\120
+\123\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146
+\056\040\154\151\155\151\164\163\040\154\151\141\142\056\061\045
+\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071\071
+\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151
+\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052
+\105\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145
+\156\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171\060\201\235\060\015\006
+\011\052\206\110\206\367\015\001\001\001\005\000\003\201\213\000
+\060\201\207\002\201\201\000\310\072\231\136\061\027\337\254\047
+\157\220\173\344\031\377\105\243\064\302\333\301\250\117\360\150
+\352\204\375\237\165\171\317\301\212\121\224\257\307\127\003\107
+\144\236\255\202\033\132\332\177\067\170\107\273\067\230\022\226
+\316\306\023\175\357\322\014\060\121\251\071\236\125\370\373\261
+\347\060\336\203\262\272\076\361\325\211\073\073\205\272\252\164
+\054\376\077\061\156\257\221\225\156\006\324\007\115\113\054\126
+\107\030\004\122\332\016\020\223\277\143\220\233\341\337\214\346
+\002\244\346\117\136\367\213\002\001\003\243\202\001\340\060\202
+\001\334\060\021\006\011\140\206\110\001\206\370\102\001\001\004
+\004\003\002\000\007\060\202\001\042\006\003\125\035\037\004\202
+\001\031\060\202\001\025\060\201\344\240\201\341\240\201\336\244
+\201\333\060\201\330\061\013\060\011\006\003\125\004\006\023\002
+\125\123\061\024\060\022\006\003\125\004\012\023\013\105\156\164
+\162\165\163\164\056\156\145\164\061\110\060\106\006\003\125\004
+\013\024\077\167\167\167\056\145\156\164\162\165\163\164\056\156
+\145\164\057\103\154\151\145\156\164\137\103\101\137\111\156\146
+\157\057\103\120\123\040\151\156\143\157\162\160\056\040\142\171
+\040\162\145\146\056\040\154\151\155\151\164\163\040\154\151\141
+\142\056\061\045\060\043\006\003\125\004\013\023\034\050\143\051
+\040\061\071\071\071\040\105\156\164\162\165\163\164\056\156\145
+\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
+\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
+\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
+\060\013\006\003\125\004\003\023\004\103\122\114\061\060\054\240
+\052\240\050\206\046\150\164\164\160\072\057\057\167\167\167\056
+\145\156\164\162\165\163\164\056\156\145\164\057\103\122\114\057
+\103\154\151\145\156\164\061\056\143\162\154\060\053\006\003\125
+\035\020\004\044\060\042\200\017\061\071\071\071\061\060\061\062
+\061\071\062\064\063\060\132\201\017\062\060\061\071\061\060\061
+\062\061\071\062\064\063\060\132\060\013\006\003\125\035\017\004
+\004\003\002\001\006\060\037\006\003\125\035\043\004\030\060\026
+\200\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312
+\231\164\213\225\352\114\060\035\006\003\125\035\016\004\026\004
+\024\304\373\234\051\173\227\315\114\226\374\356\133\263\312\231
+\164\213\225\352\114\060\014\006\003\125\035\023\004\005\060\003
+\001\001\377\060\031\006\011\052\206\110\206\366\175\007\101\000
+\004\014\060\012\033\004\126\064\056\060\003\002\004\220\060\015
+\006\011\052\206\110\206\367\015\001\001\004\005\000\003\201\201
+\000\077\256\212\361\327\146\003\005\236\076\372\352\034\106\273
+\244\133\217\170\232\022\110\231\371\364\065\336\014\066\007\002
+\153\020\072\211\024\201\234\061\246\174\262\101\262\152\347\007
+\001\241\113\371\237\045\073\226\312\231\303\076\241\121\034\363
+\303\056\104\367\260\147\106\252\222\345\073\332\034\031\024\070
+\060\325\342\242\061\045\056\361\354\105\070\355\370\006\130\003
+\163\142\260\020\061\217\100\277\144\340\134\076\305\117\037\332
+\022\103\377\114\346\006\046\250\233\031\252\104\074\166\262\134
+\354
+END
+
+# Trust for Certificate "Entrust.net Secure Personal CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Secure Personal CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\332\171\301\161\021\120\302\064\071\252\053\013\014\142\375\125
+\262\371\365\200
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\014\101\057\023\133\240\124\365\226\146\055\176\315\016\003\364
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\311\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\024\060\022\006\003\125\004\012\023\013\105\156\164\162\165
+\163\164\056\156\145\164\061\110\060\106\006\003\125\004\013\024
+\077\167\167\167\056\145\156\164\162\165\163\164\056\156\145\164
+\057\103\154\151\145\156\164\137\103\101\137\111\156\146\157\057
+\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
+\145\146\056\040\154\151\155\151\164\163\040\154\151\141\142\056
+\061\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061
+\071\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040
+\114\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003
+\023\052\105\156\164\162\165\163\164\056\156\145\164\040\103\154
+\151\145\156\164\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\003\221\356
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
 #
 # Certificate "Entrust.net Premium 2048 Secure Server CA"
 #
@@ -4120,6 +4419,424 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+#
+# Certificate "Thawte Time Stamping CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Thawte Time Stamping CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
+\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
+\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
+\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
+\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
+\151\155\145\163\164\141\155\160\151\156\147\040\103\101
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
+\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
+\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
+\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
+\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
+\151\155\145\163\164\141\155\160\151\156\147\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\002\241\060\202\002\012\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
+\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101\061
+\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145\162
+\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007\023
+\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060\015
+\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035\060
+\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060\035
+\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124\151
+\155\145\163\164\141\155\160\151\156\147\040\103\101\060\036\027
+\015\071\067\060\061\060\061\060\060\060\060\060\060\132\027\015
+\062\060\061\062\063\061\062\063\065\071\065\071\132\060\201\213
+\061\013\060\011\006\003\125\004\006\023\002\132\101\061\025\060
+\023\006\003\125\004\010\023\014\127\145\163\164\145\162\156\040
+\103\141\160\145\061\024\060\022\006\003\125\004\007\023\013\104
+\165\162\142\141\156\166\151\154\154\145\061\017\060\015\006\003
+\125\004\012\023\006\124\150\141\167\164\145\061\035\060\033\006
+\003\125\004\013\023\024\124\150\141\167\164\145\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\061\037\060\035\006\003
+\125\004\003\023\026\124\150\141\167\164\145\040\124\151\155\145
+\163\164\141\155\160\151\156\147\040\103\101\060\201\237\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
+\000\060\201\211\002\201\201\000\326\053\130\170\141\105\206\123
+\352\064\173\121\234\355\260\346\056\030\016\376\340\137\250\047
+\323\264\311\340\174\131\116\026\016\163\124\140\301\177\366\237
+\056\351\072\205\044\025\074\333\107\004\143\303\236\304\224\032
+\132\337\114\172\363\331\103\035\074\020\172\171\045\333\220\376
+\360\121\347\060\326\101\000\375\237\050\337\171\276\224\273\235
+\266\024\343\043\205\327\251\101\340\114\244\171\260\053\032\213
+\362\370\073\212\076\105\254\161\222\000\264\220\101\230\373\137
+\355\372\267\056\212\370\210\067\002\003\001\000\001\243\023\060
+\021\060\017\006\003\125\035\023\001\001\377\004\005\060\003\001
+\001\377\060\015\006\011\052\206\110\206\367\015\001\001\004\005
+\000\003\201\201\000\147\333\342\302\346\207\075\100\203\206\067
+\065\175\037\316\232\303\014\146\040\250\272\252\004\211\206\302
+\365\020\010\015\277\313\242\005\212\320\115\066\076\364\327\357
+\151\306\136\344\260\224\157\112\271\347\336\133\210\266\173\333
+\343\047\345\166\303\360\065\301\313\265\047\233\063\171\334\220
+\246\000\236\167\372\374\315\047\224\102\026\234\323\034\150\354
+\277\134\335\345\251\173\020\012\062\164\124\023\061\213\205\003
+\204\221\267\130\001\060\024\070\257\050\312\374\261\120\031\031
+\011\254\211\111\323
+END
+
+# Trust for Certificate "Thawte Time Stamping CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Thawte Time Stamping CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\276\066\244\126\057\262\356\005\333\263\323\043\043\255\364\105
+\010\116\326\126
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\177\146\172\161\323\353\151\170\040\232\121\024\235\203\332\040
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\213\061\013\060\011\006\003\125\004\006\023\002\132\101
+\061\025\060\023\006\003\125\004\010\023\014\127\145\163\164\145
+\162\156\040\103\141\160\145\061\024\060\022\006\003\125\004\007
+\023\013\104\165\162\142\141\156\166\151\154\154\145\061\017\060
+\015\006\003\125\004\012\023\006\124\150\141\167\164\145\061\035
+\060\033\006\003\125\004\013\023\024\124\150\141\167\164\145\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\061\037\060
+\035\006\003\125\004\003\023\026\124\150\141\167\164\145\040\124
+\151\155\145\163\164\141\155\160\151\156\147\040\103\101
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Entrust.net Global Secure Server CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
+\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
+\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
+\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
+\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
+\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
+\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
+\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
+\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
+\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
+\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
+\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
+\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
+\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
+\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
+\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
+\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\233\021\074
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\225\060\202\003\376\240\003\002\001\002\002\004\070
+\233\021\074\060\015\006\011\052\206\110\206\367\015\001\001\004
+\005\000\060\201\272\061\024\060\022\006\003\125\004\012\023\013
+\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075\006
+\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165\163
+\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151\156
+\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154
+\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043
+\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040
+\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151
+\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105\156
+\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162\145
+\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\060
+\036\027\015\060\060\060\062\060\064\061\067\062\060\060\060\132
+\027\015\062\060\060\062\060\064\061\067\065\060\060\060\132\060
+\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156\164
+\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125\004
+\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056\156
+\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157\162
+\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155\151
+\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003\125
+\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156\164
+\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145\144
+\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162\165
+\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123\145
+\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
+\215\000\060\201\211\002\201\201\000\307\301\137\116\161\361\316
+\360\140\206\017\322\130\177\323\063\227\055\027\242\165\060\265
+\226\144\046\057\150\303\104\253\250\165\346\000\147\064\127\236
+\145\307\042\233\163\346\323\335\010\016\067\125\252\045\106\201
+\154\275\376\250\366\165\127\127\214\220\154\112\303\076\213\113
+\103\012\311\021\126\232\232\047\042\231\317\125\236\141\331\002
+\342\174\266\174\070\007\334\343\177\117\232\271\003\101\200\266
+\165\147\023\013\237\350\127\066\310\135\000\066\336\146\024\332
+\156\166\037\117\067\214\202\023\211\002\003\001\000\001\243\202
+\001\244\060\202\001\240\060\021\006\011\140\206\110\001\206\370
+\102\001\001\004\004\003\002\000\007\060\201\343\006\003\125\035
+\037\004\201\333\060\201\330\060\201\325\240\201\322\240\201\317
+\244\201\314\060\201\311\061\024\060\022\006\003\125\004\012\023
+\013\105\156\164\162\165\163\164\056\156\145\164\061\077\060\075
+\006\003\125\004\013\024\066\167\167\167\056\145\156\164\162\165
+\163\164\056\156\145\164\057\123\123\114\137\103\120\123\040\151
+\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
+\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
+\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
+\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
+\151\164\145\144\061\072\060\070\006\003\125\004\003\023\061\105
+\156\164\162\165\163\164\056\156\145\164\040\123\145\143\165\162
+\145\040\123\145\162\166\145\162\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\061\015\060\013\006\003\125\004\003\023\004\103\122\114\061\060
+\053\006\003\125\035\020\004\044\060\042\200\017\062\060\060\060
+\060\062\060\064\061\067\062\060\060\060\132\201\017\062\060\062
+\060\060\062\060\064\061\067\065\060\060\060\132\060\013\006\003
+\125\035\017\004\004\003\002\001\006\060\037\006\003\125\035\043
+\004\030\060\026\200\024\313\154\300\153\343\273\076\313\374\042
+\234\376\373\213\222\234\260\362\156\042\060\035\006\003\125\035
+\016\004\026\004\024\313\154\300\153\343\273\076\313\374\042\234
+\376\373\213\222\234\260\362\156\042\060\014\006\003\125\035\023
+\004\005\060\003\001\001\377\060\035\006\011\052\206\110\206\366
+\175\007\101\000\004\020\060\016\033\010\126\065\056\060\072\064
+\056\060\003\002\004\220\060\015\006\011\052\206\110\206\367\015
+\001\001\004\005\000\003\201\201\000\142\333\201\221\316\310\232
+\167\102\057\354\275\047\243\123\017\120\033\352\116\222\360\251
+\257\251\240\272\110\141\313\357\311\006\357\037\325\364\356\337
+\126\055\346\312\152\031\163\252\123\276\222\263\120\002\266\205
+\046\162\143\330\165\120\142\165\024\267\263\120\032\077\312\021
+\000\013\205\105\151\155\266\245\256\121\341\112\334\202\077\154
+\214\064\262\167\153\331\002\366\177\016\352\145\004\361\315\124
+\312\272\311\314\340\204\367\310\076\021\227\323\140\011\030\274
+\005\377\154\211\063\360\354\025\017
+END
+
+# Trust for Certificate "Entrust.net Global Secure Server CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Global Secure Server CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\211\071\127\156\027\215\367\005\170\017\314\136\310\117\204\366
+\045\072\110\223
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\235\146\152\314\377\325\365\103\264\277\214\026\321\053\250\231
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\272\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\077\060\075\006\003\125
+\004\013\024\066\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\123\123\114\137\103\120\123\040\151\156\143\157
+\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151\155
+\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006\003
+\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105\156
+\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164\145
+\144\061\072\060\070\006\003\125\004\003\023\061\105\156\164\162
+\165\163\164\056\156\145\164\040\123\145\143\165\162\145\040\123
+\145\162\166\145\162\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\233\021\074
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "Entrust.net Global Secure Personal CA"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
+\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
+\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
+\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
+\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\236\366\344
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\004\203\060\202\003\354\240\003\002\001\002\002\004\070
+\236\366\344\060\015\006\011\052\206\110\206\367\015\001\001\004
+\005\000\060\201\264\061\024\060\022\006\003\125\004\012\023\013
+\105\156\164\162\165\163\164\056\156\145\164\061\100\060\076\006
+\003\125\004\013\024\067\167\167\167\056\145\156\164\162\165\163
+\164\056\156\145\164\057\107\103\103\101\137\103\120\123\040\151
+\156\143\157\162\160\056\040\142\171\040\162\145\146\056\040\050
+\154\151\155\151\164\163\040\154\151\141\142\056\051\061\045\060
+\043\006\003\125\004\013\023\034\050\143\051\040\062\060\060\060
+\040\105\156\164\162\165\163\164\056\156\145\164\040\114\151\155
+\151\164\145\144\061\063\060\061\006\003\125\004\003\023\052\105
+\156\164\162\165\163\164\056\156\145\164\040\103\154\151\145\156
+\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\060\036\027\015\060\060\060
+\062\060\067\061\066\061\066\064\060\132\027\015\062\060\060\062
+\060\067\061\066\064\066\064\060\132\060\201\264\061\024\060\022
+\006\003\125\004\012\023\013\105\156\164\162\165\163\164\056\156
+\145\164\061\100\060\076\006\003\125\004\013\024\067\167\167\167
+\056\145\156\164\162\165\163\164\056\156\145\164\057\107\103\103
+\101\137\103\120\123\040\151\156\143\157\162\160\056\040\142\171
+\040\162\145\146\056\040\050\154\151\155\151\164\163\040\154\151
+\141\142\056\051\061\045\060\043\006\003\125\004\013\023\034\050
+\143\051\040\062\060\060\060\040\105\156\164\162\165\163\164\056
+\156\145\164\040\114\151\155\151\164\145\144\061\063\060\061\006
+\003\125\004\003\023\052\105\156\164\162\165\163\164\056\156\145
+\164\040\103\154\151\145\156\164\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
+\005\000\003\201\215\000\060\201\211\002\201\201\000\223\164\264
+\266\344\305\113\326\241\150\177\142\325\354\367\121\127\263\162
+\112\230\365\320\211\311\255\143\315\115\065\121\152\204\324\255
+\311\150\171\157\270\353\021\333\207\256\134\044\121\023\361\124
+\045\204\257\051\053\237\343\200\342\331\313\335\306\105\111\064
+\210\220\136\001\227\357\352\123\246\335\374\301\336\113\052\045
+\344\351\065\372\125\005\006\345\211\172\352\244\021\127\073\374
+\174\075\066\315\147\065\155\244\251\045\131\275\146\365\371\047
+\344\225\147\326\077\222\200\136\362\064\175\053\205\002\003\001
+\000\001\243\202\001\236\060\202\001\232\060\021\006\011\140\206
+\110\001\206\370\102\001\001\004\004\003\002\000\007\060\201\335
+\006\003\125\035\037\004\201\325\060\201\322\060\201\317\240\201
+\314\240\201\311\244\201\306\060\201\303\061\024\060\022\006\003
+\125\004\012\023\013\105\156\164\162\165\163\164\056\156\145\164
+\061\100\060\076\006\003\125\004\013\024\067\167\167\167\056\145
+\156\164\162\165\163\164\056\156\145\164\057\107\103\103\101\137
+\103\120\123\040\151\156\143\157\162\160\056\040\142\171\040\162
+\145\146\056\040\050\154\151\155\151\164\163\040\154\151\141\142
+\056\051\061\045\060\043\006\003\125\004\013\023\034\050\143\051
+\040\062\060\060\060\040\105\156\164\162\165\163\164\056\156\145
+\164\040\114\151\155\151\164\145\144\061\063\060\061\006\003\125
+\004\003\023\052\105\156\164\162\165\163\164\056\156\145\164\040
+\103\154\151\145\156\164\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\015
+\060\013\006\003\125\004\003\023\004\103\122\114\061\060\053\006
+\003\125\035\020\004\044\060\042\200\017\062\060\060\060\060\062
+\060\067\061\066\061\066\064\060\132\201\017\062\060\062\060\060
+\062\060\067\061\066\064\066\064\060\132\060\013\006\003\125\035
+\017\004\004\003\002\001\006\060\037\006\003\125\035\043\004\030
+\060\026\200\024\204\213\164\375\305\215\300\377\047\155\040\067
+\105\174\376\055\316\272\323\175\060\035\006\003\125\035\016\004
+\026\004\024\204\213\164\375\305\215\300\377\047\155\040\067\105
+\174\376\055\316\272\323\175\060\014\006\003\125\035\023\004\005
+\060\003\001\001\377\060\035\006\011\052\206\110\206\366\175\007
+\101\000\004\020\060\016\033\010\126\065\056\060\072\064\056\060
+\003\002\004\220\060\015\006\011\052\206\110\206\367\015\001\001
+\004\005\000\003\201\201\000\116\157\065\200\073\321\212\365\016
+\247\040\313\055\145\125\320\222\364\347\204\265\006\046\203\022
+\204\013\254\073\262\104\356\275\317\100\333\040\016\272\156\024
+\352\060\340\073\142\174\177\213\153\174\112\247\325\065\074\276
+\250\134\352\113\273\223\216\200\146\253\017\051\375\115\055\277
+\032\233\012\220\305\253\332\321\263\206\324\057\044\122\134\172
+\155\306\362\376\345\115\032\060\214\220\362\272\327\112\076\103
+\176\324\310\120\032\207\370\117\201\307\166\013\204\072\162\235
+\316\145\146\227\256\046\136
+END
+
+# Trust for Certificate "Entrust.net Global Secure Personal CA"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "Entrust.net Global Secure Personal CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\317\164\277\377\233\206\201\133\010\063\124\100\066\076\207\266
+\266\360\277\163
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\232\167\031\030\355\226\317\337\033\267\016\365\215\271\210\056
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
+\156\145\164\057\107\103\103\101\137\103\120\123\040\151\156\143
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
+\003\125\004\013\023\034\050\143\051\040\062\060\060\060\040\105
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
+\162\165\163\164\056\156\145\164\040\103\154\151\145\156\164\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\004\070\236\366\344
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
 #
 # Certificate "Entrust Root Certification Authority"
 #
@@ -4273,6 +4990,304 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+#
+# Certificate "AOL Time Warner Root Certification Authority 1"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\061
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\003\346\060\202\002\316\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
+\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
+\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
+\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
+\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
+\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
+\151\164\171\040\061\060\036\027\015\060\062\060\065\062\071\060
+\066\060\060\060\060\132\027\015\063\067\061\061\062\060\061\065
+\060\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
+\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
+\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
+\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
+\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
+\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
+\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\040\061\060\202\001\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\001\017\000\060\202\001\012\002\202\001\001\000\231\336\217\303
+\045\243\151\064\350\005\367\164\271\277\132\227\031\271\057\224
+\322\223\345\055\211\312\204\174\077\020\103\033\214\213\174\204
+\130\370\044\174\110\317\052\375\300\025\331\030\176\204\032\027
+\323\333\236\327\312\344\331\327\252\130\121\207\360\360\213\110
+\116\342\302\304\131\151\060\142\266\060\242\214\013\021\231\141
+\065\155\176\357\305\261\031\006\040\022\216\102\341\337\017\226
+\020\122\250\317\234\137\225\024\330\257\073\165\013\061\040\037
+\104\057\242\142\101\263\273\030\041\333\312\161\074\214\354\266
+\271\015\237\357\121\357\115\173\022\362\013\014\341\254\100\217
+\167\177\260\312\170\161\014\135\026\161\160\242\327\302\072\205
+\315\016\232\304\340\000\260\325\045\352\334\053\344\224\055\070
+\234\211\101\127\144\050\145\031\034\266\104\264\310\061\153\216
+\001\173\166\131\045\177\025\034\204\010\174\163\145\040\012\241
+\004\056\032\062\250\232\040\261\234\054\041\131\347\373\317\356
+\160\055\010\312\143\076\054\233\223\031\152\244\302\227\377\267
+\206\127\210\205\154\236\025\026\053\115\054\263\002\003\001\000
+\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
+\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310\330
+\075\174\276\137\022\060\037\006\003\125\035\043\004\030\060\026
+\200\024\241\066\060\026\313\206\220\000\105\200\123\261\217\310
+\330\075\174\276\137\022\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
+\001\001\005\005\000\003\202\001\001\000\212\040\030\245\276\263
+\057\264\246\204\000\100\060\051\372\264\024\163\114\171\105\247
+\366\160\340\350\176\144\036\012\225\174\152\141\302\357\116\037
+\276\377\311\231\037\007\141\112\341\135\114\315\255\356\320\122
+\062\331\131\062\274\332\171\162\326\173\011\350\002\201\065\323
+\012\337\021\035\311\171\240\200\115\376\132\327\126\326\355\017
+\052\257\247\030\165\063\014\352\301\141\005\117\152\232\211\362
+\215\271\237\056\357\260\137\132\000\353\276\255\240\370\104\005
+\147\274\313\004\357\236\144\305\351\310\077\005\277\306\057\007
+\034\303\066\161\206\312\070\146\112\315\326\270\113\306\154\247
+\227\073\372\023\055\156\043\141\207\241\143\102\254\302\313\227
+\237\141\150\317\055\114\004\235\327\045\117\012\016\115\220\213
+\030\126\250\223\110\127\334\157\256\275\236\147\127\167\211\120
+\263\276\021\233\105\147\203\206\031\207\323\230\275\010\032\026
+\037\130\202\013\341\226\151\005\113\216\354\203\121\061\007\325
+\324\237\377\131\173\250\156\205\317\323\113\251\111\260\137\260
+\071\050\150\016\163\335\045\232\336\022
+END
+
+# Trust for Certificate "AOL Time Warner Root Certification Authority 1"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 1"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\164\124\123\134\044\243\247\130\040\176\076\076\323\044\370\026
+\373\041\026\111
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\347\172\334\261\037\156\006\037\164\154\131\026\047\303\113\300
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\061
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "AOL Time Warner Root Certification Authority 2"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\062
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\005\346\060\202\003\316\240\003\002\001\002\002\001\001
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
+\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124\151
+\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061\034
+\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143\141
+\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060\065
+\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145\040
+\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
+\151\164\171\040\062\060\036\027\015\060\062\060\065\062\071\060
+\066\060\060\060\060\132\027\015\063\067\060\071\062\070\062\063
+\064\063\060\060\132\060\201\203\061\013\060\011\006\003\125\004
+\006\023\002\125\123\061\035\060\033\006\003\125\004\012\023\024
+\101\117\114\040\124\151\155\145\040\127\141\162\156\145\162\040
+\111\156\143\056\061\034\060\032\006\003\125\004\013\023\023\101
+\155\145\162\151\143\141\040\117\156\154\151\156\145\040\111\156
+\143\056\061\067\060\065\006\003\125\004\003\023\056\101\117\114
+\040\124\151\155\145\040\127\141\162\156\145\162\040\122\157\157
+\164\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\040\062\060\202\002\042\060
+\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
+\002\017\000\060\202\002\012\002\202\002\001\000\264\067\132\010
+\026\231\024\350\125\261\033\044\153\374\307\213\346\207\251\211
+\356\213\231\315\117\100\206\244\266\115\311\331\261\334\074\115
+\015\205\114\025\154\106\213\122\170\237\370\043\375\147\365\044
+\072\150\135\320\367\144\141\101\124\243\213\245\010\322\051\133
+\233\140\117\046\203\321\143\022\126\111\166\244\026\302\245\235
+\105\254\213\204\225\250\026\261\354\237\352\044\032\357\271\127
+\134\232\044\041\054\115\016\161\037\246\254\135\105\164\003\230
+\304\124\214\026\112\101\167\206\225\165\014\107\001\146\140\374
+\025\361\017\352\365\024\170\307\016\327\156\201\034\136\277\136
+\347\072\052\330\227\027\060\174\000\255\010\235\063\257\270\231
+\141\200\213\250\225\176\024\334\022\154\244\320\330\357\100\111
+\002\066\371\156\251\326\035\226\126\004\262\263\055\026\126\206
+\217\331\040\127\200\315\147\020\155\260\114\360\332\106\266\352
+\045\056\106\257\215\260\205\070\064\213\024\046\202\053\254\256
+\231\013\216\024\327\122\275\236\151\303\206\002\013\352\166\165
+\061\011\316\063\031\041\205\103\346\211\055\237\045\067\147\361
+\043\152\322\000\155\227\371\237\347\051\312\335\037\327\006\352
+\270\311\271\011\041\237\310\077\006\305\322\351\022\106\000\116
+\173\010\353\102\075\053\110\156\235\147\335\113\002\344\104\363
+\223\031\245\047\316\151\172\276\147\323\374\120\244\054\253\303
+\153\271\343\200\114\317\005\141\113\053\334\033\271\246\322\320
+\252\365\053\163\373\316\220\065\237\014\122\034\277\134\041\141
+\021\133\025\113\251\044\121\374\244\134\367\027\235\260\322\372
+\007\351\217\126\344\032\214\150\212\004\323\174\132\343\236\242
+\241\312\161\133\242\324\240\347\051\205\135\003\150\052\117\322
+\006\327\075\371\303\003\057\077\145\371\147\036\107\100\323\143
+\017\343\325\216\371\205\253\227\114\263\327\046\353\226\012\224
+\336\205\066\234\310\177\201\011\002\111\052\016\365\144\062\014
+\202\321\272\152\202\033\263\113\164\021\363\214\167\326\237\277
+\334\067\244\247\125\004\057\324\061\350\323\106\271\003\174\332
+\022\116\131\144\267\121\061\061\120\240\312\034\047\331\020\056
+\255\326\275\020\146\053\303\260\042\112\022\133\002\003\001\000
+\001\243\143\060\141\060\017\006\003\125\035\023\001\001\377\004
+\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026\004
+\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116\325
+\277\251\304\040\050\060\037\006\003\125\035\043\004\030\060\026
+\200\024\117\151\155\003\176\235\237\007\030\103\274\267\020\116
+\325\277\251\304\040\050\060\016\006\003\125\035\017\001\001\377
+\004\004\003\002\001\206\060\015\006\011\052\206\110\206\367\015
+\001\001\005\005\000\003\202\002\001\000\073\363\256\312\350\056
+\207\205\373\145\131\347\255\021\024\245\127\274\130\237\044\022
+\127\273\373\077\064\332\356\255\172\052\064\162\160\061\153\307
+\031\230\200\311\202\336\067\167\136\124\213\216\362\352\147\117
+\311\164\204\221\126\011\325\345\172\232\201\266\201\302\255\066
+\344\361\124\021\123\363\064\105\001\046\310\345\032\274\064\104
+\041\336\255\045\374\166\026\167\041\220\200\230\127\235\116\352
+\354\057\252\074\024\173\127\301\176\030\024\147\356\044\306\275
+\272\025\260\322\030\275\267\125\201\254\123\300\350\335\151\022
+\023\102\267\002\265\005\101\312\171\120\156\202\016\161\162\223
+\106\350\235\015\135\275\256\316\051\255\143\325\125\026\200\060
+\047\377\166\272\367\270\326\112\343\331\265\371\122\320\116\100
+\251\307\345\302\062\307\252\166\044\341\153\005\120\353\305\277
+\012\124\345\271\102\074\044\373\267\007\234\060\237\171\132\346
+\340\100\122\025\364\374\252\364\126\371\104\227\207\355\016\145
+\162\136\276\046\373\115\244\055\010\007\336\330\134\240\334\201
+\063\231\030\045\021\167\247\353\375\130\011\054\231\153\033\212
+\363\122\077\032\115\110\140\361\240\366\063\002\123\213\355\045
+\011\270\015\055\355\227\163\354\327\226\037\216\140\016\332\020
+\233\057\030\044\366\246\115\012\371\073\313\165\302\314\057\316
+\044\151\311\012\042\216\131\247\367\202\014\327\327\153\065\234
+\103\000\152\304\225\147\272\234\105\313\270\016\067\367\334\116
+\001\117\276\012\266\003\323\255\212\105\367\332\047\115\051\261
+\110\337\344\021\344\226\106\275\154\002\076\326\121\310\225\027
+\001\025\251\362\252\252\362\277\057\145\033\157\320\271\032\223
+\365\216\065\304\200\207\076\224\057\146\344\351\250\377\101\234
+\160\052\117\052\071\030\225\036\176\373\141\001\074\121\010\056
+\050\030\244\026\017\061\375\072\154\043\223\040\166\341\375\007
+\205\321\133\077\322\034\163\062\335\372\271\370\214\317\002\207
+\172\232\226\344\355\117\211\215\123\103\253\016\023\300\001\025
+\264\171\070\333\374\156\075\236\121\266\270\023\213\147\317\371
+\174\331\042\035\366\135\305\034\001\057\230\350\172\044\030\274
+\204\327\372\334\162\133\367\301\072\150
+END
+
+# Trust for Certificate "AOL Time Warner Root Certification Authority 2"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "AOL Time Warner Root Certification Authority 2"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\374\041\232\166\021\057\166\301\305\010\203\074\232\057\242\272
+\204\254\010\172
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\001\132\231\303\326\117\251\113\074\073\261\243\253\047\114\277
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
+\061\035\060\033\006\003\125\004\012\023\024\101\117\114\040\124
+\151\155\145\040\127\141\162\156\145\162\040\111\156\143\056\061
+\034\060\032\006\003\125\004\013\023\023\101\155\145\162\151\143
+\141\040\117\156\154\151\156\145\040\111\156\143\056\061\067\060
+\065\006\003\125\004\003\023\056\101\117\114\040\124\151\155\145
+\040\127\141\162\156\145\162\040\122\157\157\164\040\103\145\162
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
+\162\151\164\171\040\062
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\001
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
 #
 # Certificate "RSA Security 2048 v3"
 #
@@ -6232,6 +7247,1361 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
 
+#
+# Certificate "IPS Chained CAs root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS Chained CAs root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
+\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
+\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
+\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
+\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
+\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
+\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
+\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
+\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
+\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
+\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
+\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
+\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
+\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
+\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
+\036\027\015\060\061\061\062\062\071\060\060\065\063\065\070\132
+\027\015\062\065\061\062\062\067\060\060\065\063\065\070\132\060
+\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023\052
+\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040\103
+\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157\156
+\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006\003
+\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141\151
+\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
+\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\201\215\000\060\201\211\002\201\201\000\334\126\222\111
+\262\224\040\274\230\117\120\353\150\244\247\111\013\277\322\061
+\350\307\117\302\206\013\372\150\375\103\132\212\363\140\222\065
+\231\070\273\115\003\122\041\133\360\067\231\065\341\101\040\201
+\205\201\005\161\201\235\264\225\031\251\137\166\064\056\143\067
+\065\127\216\264\037\102\077\025\134\341\172\301\137\023\030\062
+\061\311\255\276\243\307\203\146\036\271\234\004\023\313\151\301
+\006\336\060\006\273\063\243\265\037\360\217\157\316\377\226\350
+\124\276\146\200\256\153\333\101\204\066\242\075\002\003\001\000
+\001\243\202\004\103\060\202\004\077\060\035\006\003\125\035\016
+\004\026\004\024\241\255\061\261\371\076\341\027\246\310\253\064
+\374\122\207\011\036\142\122\101\060\202\001\116\006\003\125\035
+\043\004\202\001\105\060\202\001\101\200\024\241\255\061\261\371
+\076\341\027\246\310\253\064\374\122\207\011\036\142\122\101\241
+\202\001\044\244\202\001\040\060\202\001\034\061\013\060\011\006
+\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
+\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
+\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
+\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
+\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
+\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
+\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
+\056\040\040\102\055\066\060\071\062\071\064\065\062\061\063\060
+\061\006\003\125\004\013\023\052\111\120\123\040\103\101\040\103
+\150\141\151\156\145\144\040\103\101\163\040\103\145\162\164\151
+\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
+\164\171\061\063\060\061\006\003\125\004\003\023\052\111\120\123
+\040\103\101\040\103\150\141\151\156\145\144\040\103\101\163\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
+\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
+\056\151\160\163\056\145\163\202\001\000\060\014\006\003\125\035
+\023\004\005\060\003\001\001\377\060\014\006\003\125\035\017\004
+\005\003\003\007\377\200\060\153\006\003\125\035\045\004\144\060
+\142\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
+\005\005\007\003\002\006\010\053\006\001\005\005\007\003\003\006
+\010\053\006\001\005\005\007\003\004\006\010\053\006\001\005\005
+\007\003\010\006\012\053\006\001\004\001\202\067\002\001\025\006
+\012\053\006\001\004\001\202\067\002\001\026\006\012\053\006\001
+\004\001\202\067\012\003\001\006\012\053\006\001\004\001\202\067
+\012\003\004\060\021\006\011\140\206\110\001\206\370\102\001\001
+\004\004\003\002\000\007\060\032\006\003\125\035\021\004\023\060
+\021\201\017\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\060\032\006\003\125\035\022\004\023\060\021\201\017\151
+\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060\102
+\006\011\140\206\110\001\206\370\102\001\015\004\065\026\063\103
+\150\141\151\156\145\144\040\103\101\040\103\145\162\164\151\146
+\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171\040
+\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
+\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002\004
+\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151\160
+\163\056\145\163\057\151\160\163\062\060\060\062\057\060\067\006
+\011\140\206\110\001\206\370\102\001\004\004\052\026\050\150\164
+\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
+\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062\103
+\101\103\056\143\162\154\060\074\006\011\140\206\110\001\206\370
+\102\001\003\004\057\026\055\150\164\164\160\072\057\057\167\167
+\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
+\057\162\145\166\157\143\141\164\151\157\156\103\101\103\056\150
+\164\155\154\077\060\071\006\011\140\206\110\001\206\370\102\001
+\007\004\054\026\052\150\164\164\160\072\057\057\167\167\167\056
+\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
+\145\156\145\167\141\154\103\101\103\056\150\164\155\154\077\060
+\067\006\011\140\206\110\001\206\370\102\001\010\004\052\026\050
+\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145
+\163\057\151\160\163\062\060\060\062\057\160\157\154\151\143\171
+\103\101\103\056\150\164\155\154\060\155\006\003\125\035\037\004
+\146\060\144\060\056\240\054\240\052\206\050\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\151\160\163\062\060\060\062\103\101\103\056
+\143\162\154\060\062\240\060\240\056\206\054\150\164\164\160\072
+\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
+\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
+\103\101\103\056\143\162\154\060\057\006\010\053\006\001\005\005
+\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
+\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
+\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\201\201\000\104\162\060\235\126
+\130\242\101\033\050\267\225\341\246\032\225\137\247\170\100\053
+\357\333\226\112\374\114\161\143\331\163\225\275\002\342\242\006
+\307\276\227\052\223\200\064\206\003\372\334\330\075\036\007\315
+\036\163\103\044\140\365\035\141\334\334\226\240\274\373\035\343
+\347\022\000\047\063\002\300\300\053\123\075\330\153\003\201\243
+\333\326\223\225\040\357\323\226\176\046\220\211\234\046\233\315
+\157\146\253\355\003\042\104\070\314\131\275\237\333\366\007\242
+\001\177\046\304\143\365\045\102\136\142\275
+END
+
+# Trust for Certificate "IPS Chained CAs root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS Chained CAs root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\310\302\137\026\236\370\120\164\325\276\350\315\242\324\074\256
+\347\137\322\127
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\215\162\121\333\240\072\317\040\167\337\362\145\006\136\337\357
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\034\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\063\060\061\006\003\125\004\013\023
+\052\111\120\123\040\103\101\040\103\150\141\151\156\145\144\040
+\103\101\163\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\063\060\061\006
+\003\125\004\003\023\052\111\120\123\040\103\101\040\103\150\141
+\151\156\145\144\040\103\101\163\040\103\145\162\164\151\146\151
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
+\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026
+\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "IPS CLASE1 root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASE1 root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
+\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
+\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
+\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
+\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
+\060\065\071\063\070\132\027\015\062\065\061\062\062\067\060\060
+\065\071\063\070\132\060\202\001\022\061\013\060\011\006\003\125
+\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
+\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
+\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
+\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
+\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
+\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
+\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
+\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
+\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
+\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
+\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
+\123\105\061\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
+\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
+\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
+\000\060\201\211\002\201\201\000\340\121\047\247\013\335\257\321
+\271\103\133\202\067\105\126\162\357\232\266\302\022\357\054\022
+\314\166\371\006\131\257\135\041\324\322\132\270\240\324\363\152
+\375\312\151\215\146\110\367\164\346\356\066\275\350\226\221\165
+\246\161\050\312\347\042\022\062\151\260\076\036\153\364\120\122
+\142\142\375\143\073\175\176\354\356\070\352\142\364\154\250\161
+\215\341\351\213\311\077\306\265\315\224\102\157\335\202\105\074
+\350\337\011\350\357\012\125\251\126\107\141\114\111\144\163\020
+\050\077\312\277\011\377\306\057\002\003\001\000\001\243\202\004
+\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
+\353\263\031\171\363\301\245\034\254\334\272\037\146\242\262\233
+\151\320\170\010\060\202\001\104\006\003\125\035\043\004\202\001
+\073\060\202\001\067\200\024\353\263\031\171\363\301\245\034\254
+\334\272\037\146\242\262\233\151\320\170\010\241\202\001\032\244
+\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
+\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
+\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
+\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
+\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
+\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
+\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
+\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
+\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
+\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
+\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
+\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
+\061\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
+\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
+\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
+\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
+\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
+\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
+\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
+\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
+\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
+\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
+\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
+\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
+\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
+\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
+\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
+\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
+\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
+\062\103\114\101\123\105\061\040\103\101\040\103\145\162\164\151
+\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
+\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
+\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
+\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
+\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
+\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
+\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
+\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
+\103\114\101\123\105\061\056\143\162\154\060\077\006\011\140\206
+\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
+\114\101\123\105\061\056\150\164\155\154\077\060\074\006\011\140
+\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
+\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
+\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
+\123\105\061\056\150\164\155\154\077\060\072\006\011\140\206\110
+\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
+\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
+\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\061
+\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
+\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
+\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
+\062\057\151\160\163\062\060\060\062\103\114\101\123\105\061\056
+\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
+\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
+\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
+\103\114\101\123\105\061\056\143\162\154\060\057\006\010\053\006
+\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
+\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
+\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
+\206\110\206\367\015\001\001\005\005\000\003\201\201\000\053\320
+\353\375\332\310\312\131\152\332\323\314\062\056\311\124\033\212
+\142\176\025\055\351\331\061\323\056\364\047\043\377\133\253\305
+\112\266\162\100\256\123\164\364\274\005\264\306\331\310\311\167
+\373\267\371\064\177\170\000\370\326\244\344\122\077\054\112\143
+\127\201\165\132\216\350\214\373\002\300\224\306\051\272\263\334
+\034\350\262\257\322\056\142\133\032\251\216\016\314\305\127\105
+\121\024\351\116\034\210\245\221\364\243\367\216\121\310\251\276
+\206\063\076\346\057\110\156\257\124\220\116\255\261\045
+END
+
+# Trust for Certificate "IPS CLASE1 root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASE1 root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\103\236\122\137\132\152\107\303\054\353\304\134\143\355\071\061
+\174\345\364\337
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\204\220\035\225\060\111\126\374\101\201\360\105\327\166\304\153
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "IPS CLASE3 root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASE3 root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\352\060\202\007\123\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023\045
+\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023\045
+\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103\145
+\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150
+\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206\367
+\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056\151
+\160\163\056\145\163\060\036\027\015\060\061\061\062\062\071\060
+\061\060\061\064\064\132\027\015\062\065\061\062\062\067\060\061
+\060\061\064\064\132\060\202\001\022\061\013\060\011\006\003\125
+\004\006\023\002\105\123\061\022\060\020\006\003\125\004\010\023
+\011\102\141\162\143\145\154\157\156\141\061\022\060\020\006\003
+\125\004\007\023\011\102\141\162\143\145\154\157\156\141\061\056
+\060\054\006\003\125\004\012\023\045\111\120\123\040\111\156\164
+\145\162\156\145\164\040\160\165\142\154\151\163\150\151\156\147
+\040\123\145\162\166\151\143\145\163\040\163\056\154\056\061\053
+\060\051\006\003\125\004\012\024\042\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163\040\103\056\111\056\106\056\040
+\040\102\055\066\060\071\062\071\064\065\062\061\056\060\054\006
+\003\125\004\013\023\045\111\120\123\040\103\101\040\103\114\101
+\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\056\060\054\006
+\003\125\004\003\023\045\111\120\123\040\103\101\040\103\114\101
+\123\105\063\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\036\060\034\006
+\011\052\206\110\206\367\015\001\011\001\026\017\151\160\163\100
+\155\141\151\154\056\151\160\163\056\145\163\060\201\237\060\015
+\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215
+\000\060\201\211\002\201\201\000\253\027\376\016\260\306\150\033
+\123\360\122\276\237\372\332\372\213\023\004\273\001\217\062\331
+\037\217\115\316\066\230\332\344\000\104\214\050\330\023\104\052
+\244\153\116\027\044\102\234\323\210\244\101\202\326\043\373\213
+\311\206\345\271\251\202\005\334\361\336\037\340\014\231\125\230
+\362\070\354\154\235\040\003\300\357\252\243\306\144\004\121\055
+\170\015\243\322\250\072\326\044\114\351\226\172\030\254\023\043
+\042\033\174\350\061\021\263\137\011\252\060\160\161\106\045\153
+\111\161\200\053\225\001\262\037\002\003\001\000\001\243\202\004
+\112\060\202\004\106\060\035\006\003\125\035\016\004\026\004\024
+\270\223\377\056\313\334\054\216\242\347\172\376\066\121\041\243
+\230\133\014\064\060\202\001\104\006\003\125\035\043\004\202\001
+\073\060\202\001\067\200\024\270\223\377\056\313\334\054\216\242
+\347\172\376\066\121\041\243\230\133\014\064\241\202\001\032\244
+\202\001\026\060\202\001\022\061\013\060\011\006\003\125\004\006
+\023\002\105\123\061\022\060\020\006\003\125\004\010\023\011\102
+\141\162\143\145\154\157\156\141\061\022\060\020\006\003\125\004
+\007\023\011\102\141\162\143\145\154\157\156\141\061\056\060\054
+\006\003\125\004\012\023\045\111\120\123\040\111\156\164\145\162
+\156\145\164\040\160\165\142\154\151\163\150\151\156\147\040\123
+\145\162\166\151\143\145\163\040\163\056\154\056\061\053\060\051
+\006\003\125\004\012\024\042\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163\040\103\056\111\056\106\056\040\040\102
+\055\066\060\071\062\071\064\065\062\061\056\060\054\006\003\125
+\004\013\023\045\111\120\123\040\103\101\040\103\114\101\123\105
+\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\061\056\060\054\006\003\125
+\004\003\023\045\111\120\123\040\103\101\040\103\114\101\123\105
+\063\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040
+\101\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052
+\206\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141
+\151\154\056\151\160\163\056\145\163\202\001\000\060\014\006\003
+\125\035\023\004\005\060\003\001\001\377\060\014\006\003\125\035
+\017\004\005\003\003\007\377\200\060\153\006\003\125\035\045\004
+\144\060\142\006\010\053\006\001\005\005\007\003\001\006\010\053
+\006\001\005\005\007\003\002\006\010\053\006\001\005\005\007\003
+\003\006\010\053\006\001\005\005\007\003\004\006\010\053\006\001
+\005\005\007\003\010\006\012\053\006\001\004\001\202\067\002\001
+\025\006\012\053\006\001\004\001\202\067\002\001\026\006\012\053
+\006\001\004\001\202\067\012\003\001\006\012\053\006\001\004\001
+\202\067\012\003\004\060\021\006\011\140\206\110\001\206\370\102
+\001\001\004\004\003\002\000\007\060\032\006\003\125\035\021\004
+\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
+\163\056\145\163\060\032\006\003\125\035\022\004\023\060\021\201
+\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163
+\060\101\006\011\140\206\110\001\206\370\102\001\015\004\064\026
+\062\103\114\101\123\105\063\040\103\101\040\103\145\162\164\151
+\146\151\143\141\164\145\040\151\163\163\165\145\144\040\142\171
+\040\150\164\164\160\072\057\057\167\167\167\056\151\160\163\056
+\145\163\057\060\051\006\011\140\206\110\001\206\370\102\001\002
+\004\034\026\032\150\164\164\160\072\057\057\167\167\167\056\151
+\160\163\056\145\163\057\151\160\163\062\060\060\062\057\060\072
+\006\011\140\206\110\001\206\370\102\001\004\004\055\026\053\150
+\164\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163
+\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
+\103\114\101\123\105\063\056\143\162\154\060\077\006\011\140\206
+\110\001\206\370\102\001\003\004\062\026\060\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\103
+\114\101\123\105\063\056\150\164\155\154\077\060\074\006\011\140
+\206\110\001\206\370\102\001\007\004\057\026\055\150\164\164\160
+\072\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160
+\163\062\060\060\062\057\162\145\156\145\167\141\154\103\114\101
+\123\105\063\056\150\164\155\154\077\060\072\006\011\140\206\110
+\001\206\370\102\001\010\004\055\026\053\150\164\164\160\072\057
+\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
+\060\060\062\057\160\157\154\151\143\171\103\114\101\123\105\063
+\056\150\164\155\154\060\163\006\003\125\035\037\004\154\060\152
+\060\061\240\057\240\055\206\053\150\164\164\160\072\057\057\167
+\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060\060
+\062\057\151\160\163\062\060\060\062\103\114\101\123\105\063\056
+\143\162\154\060\065\240\063\240\061\206\057\150\164\164\160\072
+\057\057\167\167\167\142\141\143\153\056\151\160\163\056\145\163
+\057\151\160\163\062\060\060\062\057\151\160\163\062\060\060\062
+\103\114\101\123\105\063\056\143\162\154\060\057\006\010\053\006
+\001\005\005\007\001\001\004\043\060\041\060\037\006\010\053\006
+\001\005\005\007\060\001\206\023\150\164\164\160\072\057\057\157
+\143\163\160\056\151\160\163\056\145\163\057\060\015\006\011\052
+\206\110\206\367\015\001\001\005\005\000\003\201\201\000\027\145
+\134\231\225\103\003\047\257\046\345\353\320\263\027\043\367\103
+\252\307\360\175\354\017\306\251\256\256\226\017\166\051\034\342
+\006\055\176\046\305\074\372\241\301\201\316\123\260\102\321\227
+\127\032\027\176\244\121\141\306\356\351\136\357\005\272\353\275
+\017\247\222\157\330\243\006\150\051\216\171\365\377\277\371\247
+\257\344\261\316\302\321\200\102\047\005\004\064\370\303\177\026
+\170\043\014\007\044\362\106\107\255\073\124\320\257\325\061\262
+\257\175\310\352\351\324\126\331\016\023\262\305\105\120
+END
+
+# Trust for Certificate "IPS CLASE3 root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASE3 root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\101\170\253\114\277\316\173\101\002\254\332\304\223\076\157\365
+\015\317\161\134
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\102\166\227\150\317\246\264\070\044\252\241\033\362\147\336\312
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\022\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\056\060\054\006\003\125\004\013\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\056\060\054\006\003\125\004\003\023
+\045\111\120\123\040\103\101\040\103\114\101\123\105\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110\206
+\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "IPS CLASEA1 root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASEA1 root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
+\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
+\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
+\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
+\071\060\061\060\065\063\062\132\027\015\062\065\061\062\062\067
+\060\061\060\065\063\062\132\060\202\001\024\061\013\060\011\006
+\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
+\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
+\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
+\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
+\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
+\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
+\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
+\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
+\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
+\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
+\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
+\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
+\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\201\215\000\060\201\211\002\201\201\000\273\060\327\334
+\320\124\275\065\116\237\305\114\202\352\321\120\074\107\230\374
+\233\151\235\167\315\156\340\077\356\353\062\137\137\237\322\320
+\171\345\225\163\104\041\062\340\012\333\235\327\316\215\253\122
+\213\053\170\340\233\133\175\364\375\155\011\345\256\341\154\035
+\007\043\240\027\321\371\175\250\106\106\221\042\250\262\151\306
+\255\367\365\365\224\241\060\224\275\000\314\104\177\356\304\236
+\311\301\346\217\012\066\301\375\044\075\001\240\365\173\342\174
+\170\146\103\213\117\131\362\233\331\372\111\263\002\003\001\000
+\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
+\004\026\004\024\147\046\226\347\241\277\330\265\003\235\376\073
+\334\376\362\212\346\025\335\060\060\202\001\106\006\003\125\035
+\043\004\202\001\075\060\202\001\071\200\024\147\046\226\347\241
+\277\330\265\003\235\376\073\334\376\362\212\346\025\335\060\241
+\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
+\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
+\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
+\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
+\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
+\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
+\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
+\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
+\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
+\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
+\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
+\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
+\103\114\101\123\105\101\061\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
+\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
+\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
+\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
+\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
+\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
+\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
+\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
+\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
+\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
+\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
+\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
+\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
+\102\001\015\004\065\026\063\103\114\101\123\105\101\061\040\103
+\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
+\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
+\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
+\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
+\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
+\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
+\151\160\163\062\060\060\062\103\114\101\123\105\101\061\056\143
+\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
+\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
+\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
+\157\143\141\164\151\157\156\103\114\101\123\105\101\061\056\150
+\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
+\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
+\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
+\145\156\145\167\141\154\103\114\101\123\105\101\061\056\150\164
+\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
+\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
+\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
+\154\151\143\171\103\114\101\123\105\101\061\056\150\164\155\154
+\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
+\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
+\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
+\062\060\060\062\103\114\101\123\105\101\061\056\143\162\154\060
+\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
+\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
+\105\101\061\056\143\162\154\060\057\006\010\053\006\001\005\005
+\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
+\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
+\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\201\201\000\176\272\212\254\200
+\000\204\025\012\325\230\121\014\144\305\234\002\130\203\146\312
+\255\036\007\315\176\152\332\200\007\337\003\064\112\034\223\304
+\113\130\040\065\066\161\355\242\012\065\022\245\246\145\247\205
+\151\012\016\343\141\356\352\276\050\223\063\325\354\350\276\304
+\333\137\177\250\371\143\061\310\153\226\342\051\302\133\240\347
+\227\066\235\167\136\061\153\376\323\247\333\052\333\333\226\213
+\037\146\336\266\003\300\053\263\170\326\125\007\345\217\071\120
+\336\007\043\162\346\275\040\024\113\264\206
+END
+
+# Trust for Certificate "IPS CLASEA1 root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASEA1 root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\063\243\065\302\074\350\003\113\004\341\075\345\304\216\171\032
+\353\214\062\004
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\014\370\236\027\374\324\003\275\346\215\233\074\005\207\376\204
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\061
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "IPS CLASEA3 root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASEA3 root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\007\367\060\202\007\140\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023\046
+\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040\103
+\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165\164
+\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206\110
+\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151\154
+\056\151\160\163\056\145\163\060\036\027\015\060\061\061\062\062
+\071\060\061\060\067\065\060\132\027\015\062\065\061\062\062\067
+\060\061\060\067\065\060\132\060\202\001\024\061\013\060\011\006
+\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
+\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
+\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
+\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
+\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
+\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
+\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
+\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
+\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
+\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
+\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
+\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\060
+\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001\005
+\000\003\201\215\000\060\201\211\002\201\201\000\356\200\000\366
+\032\144\056\255\152\310\203\261\213\247\356\217\331\266\333\315
+\033\273\206\006\042\166\063\014\022\155\110\126\141\322\334\202
+\045\142\057\237\322\151\060\145\003\102\043\130\274\107\334\153
+\326\165\135\027\074\341\377\362\130\147\171\240\301\201\261\324
+\126\242\362\215\021\231\375\366\175\361\307\304\136\002\052\232
+\342\112\265\023\212\000\375\214\167\206\346\327\224\365\040\165
+\056\016\114\277\164\304\077\201\076\203\264\243\070\066\051\347
+\350\052\365\214\210\101\252\200\246\343\154\357\002\003\001\000
+\001\243\202\004\123\060\202\004\117\060\035\006\003\125\035\016
+\004\026\004\024\036\237\127\120\107\266\141\223\071\323\054\374
+\332\135\075\005\165\267\231\002\060\202\001\106\006\003\125\035
+\043\004\202\001\075\060\202\001\071\200\024\036\237\127\120\107
+\266\141\223\071\323\054\374\332\135\075\005\165\267\231\002\241
+\202\001\034\244\202\001\030\060\202\001\024\061\013\060\011\006
+\003\125\004\006\023\002\105\123\061\022\060\020\006\003\125\004
+\010\023\011\102\141\162\143\145\154\157\156\141\061\022\060\020
+\006\003\125\004\007\023\011\102\141\162\143\145\154\157\156\141
+\061\056\060\054\006\003\125\004\012\023\045\111\120\123\040\111
+\156\164\145\162\156\145\164\040\160\165\142\154\151\163\150\151
+\156\147\040\123\145\162\166\151\143\145\163\040\163\056\154\056
+\061\053\060\051\006\003\125\004\012\024\042\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\040\103\056\111\056\106
+\056\040\040\102\055\066\060\071\062\071\064\065\062\061\057\060
+\055\006\003\125\004\013\023\046\111\120\123\040\103\101\040\103
+\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143\141
+\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061\057
+\060\055\006\003\125\004\003\023\046\111\120\123\040\103\101\040
+\103\114\101\123\105\101\063\040\103\145\162\164\151\146\151\143
+\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171\061
+\036\060\034\006\011\052\206\110\206\367\015\001\011\001\026\017
+\151\160\163\100\155\141\151\154\056\151\160\163\056\145\163\202
+\001\000\060\014\006\003\125\035\023\004\005\060\003\001\001\377
+\060\014\006\003\125\035\017\004\005\003\003\007\377\200\060\153
+\006\003\125\035\045\004\144\060\142\006\010\053\006\001\005\005
+\007\003\001\006\010\053\006\001\005\005\007\003\002\006\010\053
+\006\001\005\005\007\003\003\006\010\053\006\001\005\005\007\003
+\004\006\010\053\006\001\005\005\007\003\010\006\012\053\006\001
+\004\001\202\067\002\001\025\006\012\053\006\001\004\001\202\067
+\002\001\026\006\012\053\006\001\004\001\202\067\012\003\001\006
+\012\053\006\001\004\001\202\067\012\003\004\060\021\006\011\140
+\206\110\001\206\370\102\001\001\004\004\003\002\000\007\060\032
+\006\003\125\035\021\004\023\060\021\201\017\151\160\163\100\155
+\141\151\154\056\151\160\163\056\145\163\060\032\006\003\125\035
+\022\004\023\060\021\201\017\151\160\163\100\155\141\151\154\056
+\151\160\163\056\145\163\060\102\006\011\140\206\110\001\206\370
+\102\001\015\004\065\026\063\103\114\101\123\105\101\063\040\103
+\101\040\103\145\162\164\151\146\151\143\141\164\145\040\151\163
+\163\165\145\144\040\142\171\040\150\164\164\160\072\057\057\167
+\167\167\056\151\160\163\056\145\163\057\060\051\006\011\140\206
+\110\001\206\370\102\001\002\004\034\026\032\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\060\073\006\011\140\206\110\001\206\370\102
+\001\004\004\056\026\054\150\164\164\160\072\057\057\167\167\167
+\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
+\151\160\163\062\060\060\062\103\114\101\123\105\101\063\056\143
+\162\154\060\100\006\011\140\206\110\001\206\370\102\001\003\004
+\063\026\061\150\164\164\160\072\057\057\167\167\167\056\151\160
+\163\056\145\163\057\151\160\163\062\060\060\062\057\162\145\166
+\157\143\141\164\151\157\156\103\114\101\123\105\101\063\056\150
+\164\155\154\077\060\075\006\011\140\206\110\001\206\370\102\001
+\007\004\060\026\056\150\164\164\160\072\057\057\167\167\167\056
+\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057\162
+\145\156\145\167\141\154\103\114\101\123\105\101\063\056\150\164
+\155\154\077\060\073\006\011\140\206\110\001\206\370\102\001\010
+\004\056\026\054\150\164\164\160\072\057\057\167\167\167\056\151
+\160\163\056\145\163\057\151\160\163\062\060\060\062\057\160\157
+\154\151\143\171\103\114\101\123\105\101\063\056\150\164\155\154
+\060\165\006\003\125\035\037\004\156\060\154\060\062\240\060\240
+\056\206\054\150\164\164\160\072\057\057\167\167\167\056\151\160
+\163\056\145\163\057\151\160\163\062\060\060\062\057\151\160\163
+\062\060\060\062\103\114\101\123\105\101\063\056\143\162\154\060
+\066\240\064\240\062\206\060\150\164\164\160\072\057\057\167\167
+\167\142\141\143\153\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\151\160\163\062\060\060\062\103\114\101\123
+\105\101\063\056\143\162\154\060\057\006\010\053\006\001\005\005
+\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005\005
+\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163\160
+\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110\206
+\367\015\001\001\005\005\000\003\201\201\000\112\075\040\107\032
+\332\211\364\172\053\061\171\354\001\300\314\001\365\326\301\374
+\310\303\363\120\002\121\220\130\052\237\347\065\011\133\060\012
+\201\000\045\107\257\324\017\016\236\140\046\250\225\247\203\010
+\337\055\254\351\016\367\234\310\237\313\223\105\361\272\152\306
+\147\121\112\151\117\153\376\175\013\057\122\051\302\120\255\044
+\104\355\043\263\110\313\104\100\301\003\225\014\012\170\006\022
+\001\365\221\061\055\111\215\273\077\105\116\054\340\350\315\265
+\311\024\025\014\343\007\203\233\046\165\357
+END
+
+# Trust for Certificate "IPS CLASEA3 root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS CLASEA3 root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\026\324\044\376\226\020\341\165\031\257\043\053\266\207\164\342
+\101\104\276\156
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\006\371\353\354\314\126\235\210\272\220\365\272\260\032\340\002
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\024\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\057\060\055\006\003\125\004\013\023
+\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\057\060\055\006\003\125\004\003
+\023\046\111\120\123\040\103\101\040\103\114\101\123\105\101\063
+\040\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101
+\165\164\150\157\162\151\164\171\061\036\060\034\006\011\052\206
+\110\206\367\015\001\011\001\026\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "IPS Timestamping root"
+#
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS Timestamping root"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
+\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
+\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
+\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
+\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
+\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
+\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
+\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163
+END
+CKA_ID UTF8 "0"
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
+\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
+\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
+\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
+\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
+\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
+\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
+\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_VALUE MULTILINE_OCTAL
+\060\202\010\070\060\202\007\241\240\003\002\001\002\002\001\000
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
+\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105\123
+\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143\145
+\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011\102
+\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125\004
+\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164\040
+\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166\151
+\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125\004
+\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060\071
+\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023\053
+\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155\160
+\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151\157
+\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062\006
+\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151\155
+\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151\146
+\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164
+\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011\001
+\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056\145
+\163\060\036\027\015\060\061\061\062\062\071\060\061\061\060\061
+\070\132\027\015\062\065\061\062\062\067\060\061\061\060\061\070
+\132\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002
+\105\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162
+\143\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023
+\011\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003
+\125\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145
+\164\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162
+\166\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003
+\125\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160
+\163\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066
+\060\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013
+\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
+\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060
+\062\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124
+\151\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164
+\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162
+\151\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001
+\011\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\060\201\237\060\015\006\011\052\206\110\206\367\015
+\001\001\001\005\000\003\201\215\000\060\201\211\002\201\201\000
+\274\270\356\126\245\232\214\346\066\311\302\142\240\146\201\215
+\032\325\172\322\163\237\016\204\144\272\225\264\220\247\170\257
+\312\376\124\141\133\316\262\040\127\001\256\104\222\103\020\070
+\021\367\150\374\027\100\245\150\047\062\073\304\247\346\102\161
+\305\231\357\166\377\053\225\044\365\111\222\030\150\312\000\265
+\244\132\057\156\313\326\033\054\015\124\147\153\172\051\241\130
+\253\242\132\000\326\133\273\030\302\337\366\036\023\126\166\233
+\245\150\342\230\316\306\003\212\064\333\114\203\101\246\251\243
+\002\003\001\000\001\243\202\004\200\060\202\004\174\060\035\006
+\003\125\035\016\004\026\004\024\213\320\020\120\011\201\362\235
+\011\325\016\140\170\003\042\242\077\310\312\146\060\202\001\120
+\006\003\125\035\043\004\202\001\107\060\202\001\103\200\024\213
+\320\020\120\011\201\362\235\011\325\016\140\170\003\042\242\077
+\310\312\146\241\202\001\046\244\202\001\042\060\202\001\036\061
+\013\060\011\006\003\125\004\006\023\002\105\123\061\022\060\020
+\006\003\125\004\010\023\011\102\141\162\143\145\154\157\156\141
+\061\022\060\020\006\003\125\004\007\023\011\102\141\162\143\145
+\154\157\156\141\061\056\060\054\006\003\125\004\012\023\045\111
+\120\123\040\111\156\164\145\162\156\145\164\040\160\165\142\154
+\151\163\150\151\156\147\040\123\145\162\166\151\143\145\163\040
+\163\056\154\056\061\053\060\051\006\003\125\004\012\024\042\151
+\160\163\100\155\141\151\154\056\151\160\163\056\145\163\040\103
+\056\111\056\106\056\040\040\102\055\066\060\071\062\071\064\065
+\062\061\064\060\062\006\003\125\004\013\023\053\111\120\123\040
+\103\101\040\124\151\155\145\163\164\141\155\160\151\156\147\040
+\103\145\162\164\151\146\151\143\141\164\151\157\156\040\101\165
+\164\150\157\162\151\164\171\061\064\060\062\006\003\125\004\003
+\023\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141
+\155\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164
+\151\157\156\040\101\165\164\150\157\162\151\164\171\061\036\060
+\034\006\011\052\206\110\206\367\015\001\011\001\026\017\151\160
+\163\100\155\141\151\154\056\151\160\163\056\145\163\202\001\000
+\060\014\006\003\125\035\023\004\005\060\003\001\001\377\060\014
+\006\003\125\035\017\004\005\003\003\007\377\200\060\153\006\003
+\125\035\045\004\144\060\142\006\010\053\006\001\005\005\007\003
+\001\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001
+\005\005\007\003\003\006\010\053\006\001\005\005\007\003\004\006
+\010\053\006\001\005\005\007\003\010\006\012\053\006\001\004\001
+\202\067\002\001\025\006\012\053\006\001\004\001\202\067\002\001
+\026\006\012\053\006\001\004\001\202\067\012\003\001\006\012\053
+\006\001\004\001\202\067\012\003\004\060\021\006\011\140\206\110
+\001\206\370\102\001\001\004\004\003\002\000\007\060\032\006\003
+\125\035\021\004\023\060\021\201\017\151\160\163\100\155\141\151
+\154\056\151\160\163\056\145\163\060\032\006\003\125\035\022\004
+\023\060\021\201\017\151\160\163\100\155\141\151\154\056\151\160
+\163\056\145\163\060\107\006\011\140\206\110\001\206\370\102\001
+\015\004\072\026\070\124\151\155\145\163\164\141\155\160\151\156
+\147\040\103\101\040\103\145\162\164\151\146\151\143\141\164\145
+\040\151\163\163\165\145\144\040\142\171\040\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\060\051\006
+\011\140\206\110\001\206\370\102\001\002\004\034\026\032\150\164
+\164\160\072\057\057\167\167\167\056\151\160\163\056\145\163\057
+\151\160\163\062\060\060\062\057\060\100\006\011\140\206\110\001
+\206\370\102\001\004\004\063\026\061\150\164\164\160\072\057\057
+\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062\060
+\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163\164
+\141\155\160\151\156\147\056\143\162\154\060\105\006\011\140\206
+\110\001\206\370\102\001\003\004\070\026\066\150\164\164\160\072
+\057\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163
+\062\060\060\062\057\162\145\166\157\143\141\164\151\157\156\124
+\151\155\145\163\164\141\155\160\151\156\147\056\150\164\155\154
+\077\060\102\006\011\140\206\110\001\206\370\102\001\007\004\065
+\026\063\150\164\164\160\072\057\057\167\167\167\056\151\160\163
+\056\145\163\057\151\160\163\062\060\060\062\057\162\145\156\145
+\167\141\154\124\151\155\145\163\164\141\155\160\151\156\147\056
+\150\164\155\154\077\060\100\006\011\140\206\110\001\206\370\102
+\001\010\004\063\026\061\150\164\164\160\072\057\057\167\167\167
+\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062\057
+\160\157\154\151\143\171\124\151\155\145\163\164\141\155\160\151
+\156\147\056\150\164\155\154\060\177\006\003\125\035\037\004\170
+\060\166\060\067\240\065\240\063\206\061\150\164\164\160\072\057
+\057\167\167\167\056\151\160\163\056\145\163\057\151\160\163\062
+\060\060\062\057\151\160\163\062\060\060\062\124\151\155\145\163
+\164\141\155\160\151\156\147\056\143\162\154\060\073\240\071\240
+\067\206\065\150\164\164\160\072\057\057\167\167\167\142\141\143
+\153\056\151\160\163\056\145\163\057\151\160\163\062\060\060\062
+\057\151\160\163\062\060\060\062\124\151\155\145\163\164\141\155
+\160\151\156\147\056\143\162\154\060\057\006\010\053\006\001\005
+\005\007\001\001\004\043\060\041\060\037\006\010\053\006\001\005
+\005\007\060\001\206\023\150\164\164\160\072\057\057\157\143\163
+\160\056\151\160\163\056\145\163\057\060\015\006\011\052\206\110
+\206\367\015\001\001\005\005\000\003\201\201\000\145\272\301\314
+\000\032\225\221\312\351\154\072\277\072\036\024\010\174\373\203
+\356\153\142\121\323\063\221\265\140\171\176\004\330\135\171\067
+\350\303\133\260\304\147\055\150\132\262\137\016\012\372\315\077
+\072\105\241\352\066\317\046\036\247\021\050\305\224\217\204\114
+\123\010\305\223\263\374\342\177\365\215\363\261\251\205\137\210
+\336\221\226\356\027\133\256\245\352\160\145\170\054\041\144\001
+\225\316\316\114\076\120\364\266\131\313\143\215\266\275\030\324
+\207\112\137\334\357\351\126\360\012\014\350\165
+END
+
+# Trust for Certificate "IPS Timestamping root"
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "IPS Timestamping root"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\226\231\134\167\021\350\345\055\371\343\113\354\354\147\323\313
+\361\266\304\322
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
+\056\003\375\305\365\327\053\224\144\301\276\211\061\361\026\233
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\202\001\036\061\013\060\011\006\003\125\004\006\023\002\105
+\123\061\022\060\020\006\003\125\004\010\023\011\102\141\162\143
+\145\154\157\156\141\061\022\060\020\006\003\125\004\007\023\011
+\102\141\162\143\145\154\157\156\141\061\056\060\054\006\003\125
+\004\012\023\045\111\120\123\040\111\156\164\145\162\156\145\164
+\040\160\165\142\154\151\163\150\151\156\147\040\123\145\162\166
+\151\143\145\163\040\163\056\154\056\061\053\060\051\006\003\125
+\004\012\024\042\151\160\163\100\155\141\151\154\056\151\160\163
+\056\145\163\040\103\056\111\056\106\056\040\040\102\055\066\060
+\071\062\071\064\065\062\061\064\060\062\006\003\125\004\013\023
+\053\111\120\123\040\103\101\040\124\151\155\145\163\164\141\155
+\160\151\156\147\040\103\145\162\164\151\146\151\143\141\164\151
+\157\156\040\101\165\164\150\157\162\151\164\171\061\064\060\062
+\006\003\125\004\003\023\053\111\120\123\040\103\101\040\124\151
+\155\145\163\164\141\155\160\151\156\147\040\103\145\162\164\151
+\146\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151
+\164\171\061\036\060\034\006\011\052\206\110\206\367\015\001\011
+\001\026\017\151\160\163\100\155\141\151\154\056\151\160\163\056
+\145\163
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
 #
 # Certificate "QuoVadis Root CA"
 #
@@ -19266,2751 +21636,3 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
 CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Mozilla Addons"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Mozilla Addons"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\342\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\033\060\031\006\003\125\004
-\003\023\022\141\144\144\157\156\163\056\155\157\172\151\154\154
-\141\056\157\162\147
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
-\362\077\103
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\370\060\202\004\340\240\003\002\001\002\002\021\000
-\222\071\325\064\217\100\321\151\132\164\124\160\341\362\077\103
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\342\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
-\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
-\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
-\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
-\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
-\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
-\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
-\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
-\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
-\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
-\114\061\033\060\031\006\003\125\004\003\023\022\141\144\144\157
-\156\163\056\155\157\172\151\154\154\141\056\157\162\147\060\202
-\001\042\060\015\006\011\052\206\110\206\367\015\001\001\001\005
-\000\003\202\001\017\000\060\202\001\012\002\202\001\001\000\253
-\306\155\066\363\025\163\170\203\163\316\164\205\325\256\354\262
-\360\340\044\037\023\203\270\040\254\273\232\376\210\273\253\241
-\035\013\037\105\000\252\111\267\065\067\014\152\357\107\114\271
-\321\276\343\127\022\004\215\222\307\266\354\001\274\266\332\307
-\201\070\040\255\162\205\346\016\374\201\154\007\255\150\166\070
-\305\104\327\314\306\112\305\227\076\144\364\121\346\360\176\262
-\354\126\367\045\202\115\111\230\313\026\230\335\043\361\211\221
-\321\027\227\100\231\046\326\342\242\053\136\337\275\211\362\033
-\032\123\055\314\120\101\172\320\075\052\014\125\160\024\001\351
-\130\111\020\172\013\223\202\213\341\036\355\072\200\020\202\316
-\226\212\064\360\314\327\323\271\264\120\207\125\124\011\270\235
-\102\050\125\000\345\214\065\124\277\335\045\221\106\267\015\345
-\135\203\250\345\213\373\204\344\074\256\166\332\304\103\053\133
-\164\013\370\276\135\150\361\170\133\265\316\175\361\135\231\100
-\332\312\356\070\201\120\276\230\241\154\270\044\255\363\257\214
-\017\327\021\050\054\204\030\114\175\265\331\217\060\265\033\002
-\003\001\000\001\243\202\001\360\060\202\001\354\060\037\006\003
-\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050\230
-\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035\006
-\003\125\035\016\004\026\004\024\335\200\322\124\075\367\114\160
-\312\243\260\335\064\172\062\344\350\073\132\073\060\016\006\003
-\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006\003
-\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125\035
-\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001\006
-\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035\040
-\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061\001
-\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005\007
-\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143\165
-\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103\120
-\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240\066
-\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056\143
-\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116\055
-\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167\141
-\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150\164
-\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\056
-\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060\161
-\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060\073
-\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164\160
-\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141\056
-\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164\123
-\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010\053
-\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057\057
-\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143\157
-\155\060\065\006\003\125\035\021\004\056\060\054\202\022\141\144
-\144\157\156\163\056\155\157\172\151\154\154\141\056\157\162\147
-\202\026\167\167\167\056\141\144\144\157\156\163\056\155\157\172
-\151\154\154\141\056\157\162\147\060\015\006\011\052\206\110\206
-\367\015\001\001\005\005\000\003\202\001\001\000\063\073\143\025
-\374\261\354\024\054\223\335\165\224\336\201\132\331\116\231\276
-\373\112\244\071\125\115\241\100\172\336\023\052\207\251\067\317
-\350\325\373\255\321\173\155\157\214\040\207\202\124\346\127\111
-\274\040\050\204\315\326\001\331\223\213\027\156\043\146\345\204
-\310\200\077\306\241\160\200\344\354\115\035\371\374\221\132\163
-\142\051\232\367\040\034\141\340\213\071\237\312\274\176\215\335
-\274\331\261\343\237\236\337\025\123\221\041\122\013\331\032\043
-\017\146\066\333\254\223\226\112\243\245\042\317\051\367\242\231
-\250\366\266\331\100\256\331\176\266\366\130\056\233\254\066\312
-\144\217\145\122\334\206\234\202\253\156\120\113\332\137\372\005
-\000\210\060\016\336\215\126\277\201\107\215\075\006\342\262\142
-\222\147\217\236\310\232\262\345\006\270\160\044\270\167\174\043
-\012\070\303\171\010\330\261\121\235\254\225\021\307\100\027\236
-\243\034\217\362\021\247\150\047\332\111\005\204\030\174\130\055
-\001\147\134\345\237\241\051\273\112\071\105\057\277\021\252\171
-\242\355\264\324\265\145\103\267\223\106\212\323
-END
-
-# Trust for Certificate "Bogus Mozilla Addons"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Mozilla Addons"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\060\137\213\321\172\242\313\304\203\244\304\033\031\243\232\014
-\165\332\071\326
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\204\305\030\147\037\052\032\220\276\342\261\030\117\003\000\062
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\222\071\325\064\217\100\321\151\132\164\124\160\341
-\362\077\103
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Global Trustee"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Global Trustee"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\343\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\016\060\014\006\003\125\004\007\023\005\124\141\155
-\160\141\061\027\060\025\006\003\125\004\011\023\016\123\145\141
-\040\126\151\154\154\141\147\145\040\061\060\061\027\060\025\006
-\003\125\004\012\023\016\107\154\157\142\141\154\040\124\162\165
-\163\164\145\145\061\027\060\025\006\003\125\004\013\023\016\107
-\154\157\142\141\154\040\124\162\165\163\164\145\145\061\050\060
-\046\006\003\125\004\013\023\037\110\157\163\164\145\144\040\142
-\171\040\107\124\111\040\107\162\157\165\160\040\103\157\162\160
-\157\162\141\164\151\157\156\061\024\060\022\006\003\125\004\013
-\023\013\120\154\141\164\151\156\165\155\123\123\114\061\027\060
-\025\006\003\125\004\003\023\016\147\154\157\142\141\154\040\164
-\162\165\163\164\145\145
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
-\070\057\260
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\006\335\060\202\005\305\240\003\002\001\002\002\021\000
-\330\363\137\116\267\207\053\055\253\006\222\343\025\070\057\260
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\343\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\016\060\014\006
-\003\125\004\007\023\005\124\141\155\160\141\061\027\060\025\006
-\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141\147
-\145\040\061\060\061\027\060\025\006\003\125\004\012\023\016\107
-\154\157\142\141\154\040\124\162\165\163\164\145\145\061\027\060
-\025\006\003\125\004\013\023\016\107\154\157\142\141\154\040\124
-\162\165\163\164\145\145\061\050\060\046\006\003\125\004\013\023
-\037\110\157\163\164\145\144\040\142\171\040\107\124\111\040\107
-\162\157\165\160\040\103\157\162\160\157\162\141\164\151\157\156
-\061\024\060\022\006\003\125\004\013\023\013\120\154\141\164\151
-\156\165\155\123\123\114\061\027\060\025\006\003\125\004\003\023
-\016\147\154\157\142\141\154\040\164\162\165\163\164\145\145\060
-\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001\001
-\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001\000
-\331\164\362\252\101\035\337\365\302\026\103\111\134\051\277\266
-\211\164\051\274\234\215\014\106\117\131\176\262\101\027\146\064
-\014\145\211\341\154\045\343\206\012\236\042\105\042\214\335\235
-\346\243\225\336\334\210\002\125\134\343\133\221\165\353\046\151
-\143\271\056\306\312\056\047\337\210\272\002\040\156\376\271\013
-\051\327\247\326\327\110\032\034\316\335\037\251\047\016\142\117
-\241\226\036\335\124\072\064\143\112\166\365\167\175\131\147\330
-\020\324\265\017\072\103\042\230\333\364\011\304\012\160\316\335
-\220\324\057\357\164\023\303\315\302\211\071\142\025\235\346\164
-\250\350\233\360\143\156\234\211\266\016\255\233\367\314\202\350
-\350\055\270\013\332\042\354\111\205\007\210\231\230\077\364\164
-\251\011\367\201\174\227\013\131\231\030\162\213\333\224\202\053
-\247\350\252\153\227\277\210\176\165\260\213\105\105\014\307\250
-\011\352\033\101\130\060\073\137\170\145\025\064\322\344\074\064
-\015\035\330\144\074\212\245\126\111\231\050\055\113\362\317\315
-\331\156\111\144\233\251\171\220\167\125\251\010\033\255\032\164
-\236\340\003\223\012\011\267\255\247\264\134\357\203\154\267\232
-\264\306\150\100\200\035\102\321\156\171\233\251\031\041\232\234
-\371\206\055\000\321\064\376\340\266\371\125\266\365\046\305\225
-\026\245\174\163\237\012\051\211\254\072\230\367\233\164\147\267
-\220\267\135\011\043\152\152\355\054\020\356\123\012\020\360\026
-\037\127\263\261\015\171\221\031\260\353\315\060\077\240\024\137
-\263\306\375\134\063\247\260\377\230\260\125\214\271\245\362\157
-\107\044\111\041\151\314\102\242\121\000\100\205\214\202\202\253
-\062\245\313\232\334\320\331\030\015\337\031\364\257\203\015\301
-\076\061\333\044\110\266\165\200\241\341\311\167\144\036\247\345
-\213\177\025\115\113\247\302\320\355\171\225\136\221\061\354\030
-\377\116\237\110\024\352\165\272\041\316\051\166\351\037\116\121
-\207\056\263\314\004\140\272\043\037\037\145\262\012\270\325\156
-\217\113\102\211\107\251\201\220\133\053\262\266\256\346\240\160
-\173\170\220\012\172\305\345\347\305\373\012\366\057\151\214\214
-\037\127\340\006\231\377\021\325\122\062\040\227\047\230\356\145
-\002\003\001\000\001\243\202\001\324\060\202\001\320\060\037\006
-\003\125\035\043\004\030\060\026\200\024\241\162\137\046\033\050
-\230\103\225\135\007\067\325\205\226\235\113\322\303\105\060\035
-\006\003\125\035\016\004\026\004\024\267\303\336\032\103\355\101
-\227\251\217\051\170\234\003\271\254\100\102\000\254\060\016\006
-\003\125\035\017\001\001\377\004\004\003\002\005\240\060\014\006
-\003\125\035\023\001\001\377\004\002\060\000\060\035\006\003\125
-\035\045\004\026\060\024\006\010\053\006\001\005\005\007\003\001
-\006\010\053\006\001\005\005\007\003\002\060\106\006\003\125\035
-\040\004\077\060\075\060\073\006\014\053\006\001\004\001\262\061
-\001\002\001\003\004\060\053\060\051\006\010\053\006\001\005\005
-\007\002\001\026\035\150\164\164\160\163\072\057\057\163\145\143
-\165\162\145\056\143\157\155\157\144\157\056\143\157\155\057\103
-\120\123\060\173\006\003\125\035\037\004\164\060\162\060\070\240
-\066\240\064\206\062\150\164\164\160\072\057\057\143\162\154\056
-\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124\116
-\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144\167
-\141\162\145\056\143\162\154\060\066\240\064\240\062\206\060\150
-\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157
-\056\156\145\164\057\125\124\116\055\125\123\105\122\106\151\162
-\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154\060
-\161\006\010\053\006\001\005\005\007\001\001\004\145\060\143\060
-\073\006\010\053\006\001\005\005\007\060\002\206\057\150\164\164
-\160\072\057\057\143\162\164\056\143\157\155\157\144\157\143\141
-\056\143\157\155\057\125\124\116\101\144\144\124\162\165\163\164
-\123\145\162\166\145\162\103\101\056\143\162\164\060\044\006\010
-\053\006\001\005\005\007\060\001\206\030\150\164\164\160\072\057
-\057\157\143\163\160\056\143\157\155\157\144\157\143\141\056\143
-\157\155\060\031\006\003\125\035\021\004\022\060\020\202\016\147
-\154\157\142\141\154\040\164\162\165\163\164\145\145\060\015\006
-\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001
-\000\217\272\165\272\071\324\046\323\160\017\304\263\002\247\305
-\022\043\161\311\376\143\351\243\142\170\044\104\117\324\271\021
-\076\037\307\050\347\125\153\356\364\341\000\221\206\212\311\011
-\153\237\056\244\105\071\321\141\142\136\223\245\005\105\170\237
-\140\022\054\364\154\145\145\015\314\106\064\213\050\272\240\306
-\364\231\161\144\363\042\166\254\117\363\142\311\247\063\132\007
-\037\075\311\206\200\334\333\004\057\207\047\350\277\110\104\201
-\300\360\111\043\156\037\345\344\003\206\044\023\242\205\142\174
-\130\004\312\346\215\023\162\012\272\126\104\242\017\274\373\240
-\075\015\052\177\373\236\251\011\075\267\132\324\212\215\341\045
-\350\244\011\204\160\255\022\104\271\317\271\063\172\272\134\346
-\113\246\273\005\006\230\377\362\230\122\173\167\200\047\112\331
-\342\372\271\122\324\373\373\346\326\055\236\217\301\025\104\215
-\233\164\057\356\224\132\116\323\304\213\212\254\103\235\163\366
-\256\014\207\211\255\207\311\311\307\335\272\024\140\172\370\265
-\065\235\302\215\306\226\201\015\251\122\212\051\100\004\351\031
-\264
-END
-
-# Trust for Certificate "Bogus Global Trustee"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Global Trustee"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\141\171\077\313\372\117\220\010\060\233\272\137\361\055\054\262
-\234\324\025\032
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\376\015\001\156\161\313\214\330\077\016\014\315\111\065\270\127
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\330\363\137\116\267\207\053\055\253\006\222\343\025
-\070\057\260
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus GMail"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus GMail"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
-\003\023\017\155\141\151\154\056\147\157\157\147\154\145\056\143
-\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
-\256\036
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\356\060\202\004\326\240\003\002\001\002\002\020\004
-\176\313\351\374\245\137\173\320\236\256\066\341\014\256\036\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
-\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
-\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
-\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
-\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
-\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
-\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
-\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
-\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
-\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
-\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
-\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
-\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
-\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
-\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
-\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
-\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
-\061\030\060\026\006\003\125\004\003\023\017\155\141\151\154\056
-\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
-\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
-\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
-\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
-\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
-\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
-\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
-\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
-\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
-\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
-\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
-\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
-\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
-\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
-\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
-\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
-\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
-\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043\004
-\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
-\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
-\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
-\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
-\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
-\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
-\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
-\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
-\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
-\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
-\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
-\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
-\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
-\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
-\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
-\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
-\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
-\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
-\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
-\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
-\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
-\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
-\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
-\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057\006
-\003\125\035\021\004\050\060\046\202\017\155\141\151\154\056\147
-\157\157\147\154\145\056\143\157\155\202\023\167\167\167\056\155
-\141\151\154\056\147\157\157\147\154\145\056\143\157\155\060\015
-\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\001
-\001\000\147\006\010\012\047\305\223\156\002\362\336\027\077\320
-\323\033\174\377\265\315\172\307\167\307\276\337\022\312\031\336
-\260\023\127\014\003\221\304\171\122\317\177\267\136\125\040\204
-\111\335\365\320\051\057\016\004\332\131\236\016\023\237\364\300
-\062\233\377\241\021\044\052\227\243\362\077\075\052\153\250\255
-\214\031\165\225\016\035\045\375\117\304\172\025\303\035\307\023
-\100\310\015\276\227\140\162\246\376\045\276\217\354\325\246\206
-\303\041\134\131\122\331\152\013\134\237\113\336\265\371\354\342
-\364\305\314\142\123\166\211\145\344\051\332\267\277\226\340\140
-\215\015\267\011\125\326\100\125\035\301\362\226\041\165\257\211
-\206\037\135\201\227\051\050\036\051\327\226\301\040\003\062\173
-\000\073\152\067\027\132\243\263\032\157\062\073\156\361\243\135
-\253\253\314\052\313\060\014\037\065\043\213\151\104\134\352\254
-\050\140\355\253\153\143\236\366\222\274\275\232\132\046\114\305
-\230\270\016\031\076\374\005\061\343\026\331\375\220\005\003\206
-\306\127\001\037\177\170\240\317\063\152\252\146\153\042\320\247
-\111\043
-END
-
-# Trust for Certificate "Bogus GMail"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus GMail"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\144\061\162\060\066\375\046\336\245\002\171\057\245\225\222\044
-\223\003\017\227
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\114\167\037\353\312\061\301\051\230\351\054\020\263\257\111\034
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\004\176\313\351\374\245\137\173\320\236\256\066\341\014
-\256\036
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Google"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Google"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
-\003\023\016\167\167\167\056\147\157\157\147\154\145\056\143\157
-\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
-\130\174\006
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\344\060\202\004\314\240\003\002\001\002\002\021\000
-\365\310\152\363\141\142\361\072\144\365\117\155\311\130\174\006
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
-\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
-\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
-\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
-\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
-\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
-\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
-\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
-\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
-\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
-\114\061\027\060\025\006\003\125\004\003\023\016\167\167\167\056
-\147\157\157\147\154\145\056\143\157\155\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\260\163\360\362\004
-\356\302\242\106\312\064\052\252\273\140\043\321\021\166\037\037
-\072\320\145\203\116\232\105\250\103\160\205\166\360\037\207\000
-\002\037\156\073\027\027\304\265\351\031\106\242\222\045\215\142
-\052\264\143\060\037\271\205\370\065\341\026\132\166\111\314\120
-\110\123\071\131\211\326\204\002\373\232\354\033\307\121\325\166
-\225\220\324\072\052\270\246\336\002\115\006\373\315\355\245\106
-\101\137\125\164\345\354\176\100\334\120\234\265\344\065\135\036
-\150\040\370\351\336\243\152\050\277\101\322\241\263\342\045\215
-\014\033\312\075\223\014\030\256\337\305\274\375\274\202\272\150
-\000\327\026\062\161\237\145\265\021\332\150\131\320\246\127\144
-\033\311\376\230\345\365\245\145\352\341\333\356\364\263\235\263
-\216\352\207\256\026\322\036\240\174\174\151\077\051\026\205\001
-\123\247\154\361\140\253\335\242\374\045\107\324\062\321\022\335
-\367\110\022\340\374\234\242\167\230\351\211\231\270\370\070\361
-\214\006\302\172\043\066\155\233\235\315\060\310\307\064\027\036
-\273\175\102\310\253\347\025\026\366\163\265\002\003\001\000\001
-\243\202\001\340\060\202\001\334\060\037\006\003\125\035\043\004
-\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
-\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
-\004\026\004\024\030\052\242\310\324\172\077\173\255\004\213\275
-\157\236\020\106\023\170\161\235\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
-\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
-\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
-\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
-\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
-\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
-\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
-\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
-\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
-\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
-\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
-\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
-\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
-\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
-\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
-\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
-\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
-\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
-\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
-\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
-\056\143\157\155\157\144\157\143\141\056\143\157\155\060\045\006
-\003\125\035\021\004\036\060\034\202\016\167\167\167\056\147\157
-\157\147\154\145\056\143\157\155\202\012\147\157\157\147\154\145
-\056\143\157\155\060\015\006\011\052\206\110\206\367\015\001\001
-\005\005\000\003\202\001\001\000\161\300\231\077\136\366\275\063
-\377\236\026\313\250\277\335\160\371\322\123\073\066\256\311\027
-\310\256\136\115\335\142\367\267\323\076\167\243\376\300\173\062
-\265\311\224\005\122\120\362\137\075\171\204\111\117\135\154\260
-\327\131\275\324\154\210\372\374\305\145\206\353\050\122\242\102
-\366\174\274\152\307\007\056\045\321\220\142\040\306\215\121\302
-\054\105\071\116\003\332\367\030\350\314\012\072\331\105\330\154
-\156\064\213\142\234\116\025\371\103\356\345\227\300\077\255\065
-\023\305\053\006\307\101\375\342\367\176\105\255\233\321\341\146
-\355\370\172\113\224\071\172\057\353\350\077\103\330\065\326\126
-\372\164\347\155\346\355\254\145\204\376\320\115\006\022\336\332
-\131\000\074\011\134\317\210\113\350\075\264\025\041\222\314\155
-\246\121\342\216\227\361\364\202\106\313\304\123\136\332\134\235
-\145\222\001\145\211\000\345\266\231\377\046\100\361\057\031\061
-\010\032\261\147\125\206\015\256\065\063\206\274\227\110\222\327
-\226\140\370\316\374\226\353\207\304\163\314\224\233\130\133\363
-\172\244\047\023\326\117\364\151
-END
-
-# Trust for Certificate "Bogus Google"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Google"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\031\026\242\257\064\155\071\237\120\061\074\071\062\000\361\101
-\100\105\146\026
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\001\163\251\130\360\274\311\276\224\053\032\114\230\044\343\270
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\365\310\152\363\141\142\361\072\144\365\117\155\311
-\130\174\006
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Skype"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Skype"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
-\003\023\017\154\157\147\151\156\056\163\153\171\160\145\056\143
-\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
-\025\104\107
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
-\351\002\213\225\170\344\025\334\032\161\012\053\210\025\104\107
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
-\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
-\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
-\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
-\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
-\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
-\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
-\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
-\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
-\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
-\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
-\156\056\163\153\171\160\145\056\143\157\155\060\202\001\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\001\017\000\060\202\001\012\002\202\001\001\000\260\170\231\206
-\016\242\163\043\324\132\303\111\353\261\066\214\174\312\204\256
-\074\257\070\210\050\231\215\055\130\023\261\227\170\076\122\040
-\147\254\133\163\230\154\062\125\311\160\321\331\252\025\350\056
-\046\205\201\274\126\344\274\200\143\333\116\327\365\002\276\121
-\143\036\074\333\337\327\000\135\132\271\345\173\152\352\070\040
-\262\073\266\356\165\124\204\371\246\312\070\160\335\277\260\377
-\245\205\135\264\101\376\335\075\331\052\341\060\103\032\230\171
-\223\240\137\340\147\154\225\372\076\172\256\161\173\343\155\210
-\102\077\045\324\356\276\150\150\254\255\254\140\340\040\243\071
-\203\271\133\050\243\223\155\241\275\166\012\343\353\256\207\047
-\016\124\217\264\110\014\232\124\364\135\216\067\120\334\136\244
-\213\153\113\334\246\363\064\276\167\131\042\210\377\031\053\155
-\166\144\163\332\014\207\007\053\232\067\072\320\342\214\366\066
-\062\153\232\171\314\322\073\223\157\032\115\154\346\301\235\100
-\254\055\164\303\276\352\134\163\145\001\051\261\052\277\160\131
-\301\316\306\303\242\310\105\137\272\147\075\017\002\003\001\000
-\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
-\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
-\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
-\016\004\026\004\024\325\216\132\121\023\264\051\015\061\266\034
-\215\076\121\121\061\012\063\252\201\060\016\006\003\125\035\017
-\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
-\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
-\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
-\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
-\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
-\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
-\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
-\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
-\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
-\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
-\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
-\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
-\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
-\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
-\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
-\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
-\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
-\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
-\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
-\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
-\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
-\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
-\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
-\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
-\056\163\153\171\160\145\056\143\157\155\202\023\167\167\167\056
-\154\157\147\151\156\056\163\153\171\160\145\056\143\157\155\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
-\001\001\000\010\362\201\165\221\273\316\022\004\030\302\115\132
-\373\106\220\012\124\104\364\362\335\007\201\360\037\246\172\157
-\237\317\270\016\054\117\234\304\232\365\250\366\272\244\311\172
-\135\261\342\132\312\074\372\140\250\150\076\313\272\055\342\315
-\326\266\344\222\074\151\255\127\352\250\057\070\020\204\162\345
-\150\161\355\276\353\156\030\357\143\172\276\347\044\377\300\143
-\375\130\073\114\201\222\330\051\253\216\065\135\327\323\011\153
-\205\323\325\163\005\104\342\345\273\203\123\020\313\362\317\267
-\156\341\151\267\241\222\144\305\317\315\202\273\066\240\070\255
-\327\044\337\123\374\077\142\267\267\325\307\127\343\223\061\160
-\216\044\211\206\312\143\053\071\272\135\331\152\140\354\241\116
-\212\376\123\370\136\222\337\057\134\046\027\155\003\175\002\017
-\017\252\103\147\155\260\142\277\176\123\335\314\354\170\163\225
-\345\245\366\000\243\004\375\077\004\052\263\230\305\267\003\034
-\333\311\120\253\260\005\035\036\276\126\264\317\076\102\023\224
-\236\371\347\001\201\245\170\157\014\172\166\254\005\206\354\254
-\302\021\254
-END
-
-# Trust for Certificate "Bogus Skype"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Skype"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\107\034\224\232\201\103\333\132\325\315\361\311\162\206\112\045
-\004\372\043\311
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\205\244\264\304\151\041\337\241\152\015\130\126\130\113\063\104
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\351\002\213\225\170\344\025\334\032\161\012\053\210
-\025\104\107
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Yahoo 1"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 1"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
-\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
-\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
-\167\051\243
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\357\060\202\004\327\240\003\002\001\002\002\021\000
-\327\125\217\332\365\361\020\133\262\023\050\053\160\167\051\243
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
-\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
-\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
-\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
-\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
-\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
-\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
-\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
-\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
-\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
-\114\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151
-\156\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\001\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075
-\355\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034
-\353\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243
-\011\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030
-\251\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041
-\356\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202
-\356\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161
-\204\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174
-\157\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302
-\314\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321
-\211\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337
-\312\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115
-\175\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072
-\370\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154
-\002\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245
-\231\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167
-\113\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000
-\001\243\202\001\352\060\202\001\346\060\037\006\003\125\035\043
-\004\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135
-\007\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035
-\016\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047
-\141\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017
-\001\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023
-\001\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026
-\060\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006
-\001\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060
-\075\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003
-\004\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026
-\035\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056
-\143\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173
-\006\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206
-\062\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157
-\144\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105
-\122\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056
-\143\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072
-\057\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164
-\057\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110
-\141\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053
-\006\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053
-\006\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057
-\143\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155
-\057\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166
-\145\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005
-\005\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163
-\160\056\143\157\155\157\144\157\143\141\056\143\157\155\060\057
-\006\003\125\035\021\004\050\060\046\202\017\154\157\147\151\156
-\056\171\141\150\157\157\056\143\157\155\202\023\167\167\167\056
-\154\157\147\151\156\056\171\141\150\157\157\056\143\157\155\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202
-\001\001\000\075\127\311\110\044\134\356\144\201\365\256\276\125
-\051\026\377\052\057\204\355\331\370\243\003\310\060\146\273\310
-\324\201\055\041\367\010\367\254\226\102\232\101\165\172\272\135
-\020\043\313\222\102\141\372\212\332\155\145\064\031\345\251\326
-\055\023\170\327\201\104\222\251\156\200\143\025\313\376\065\037
-\002\321\212\024\260\250\314\224\040\073\250\032\360\135\066\120
-\333\015\256\351\144\344\366\215\151\175\060\310\024\027\000\112
-\345\246\065\373\175\015\042\235\171\166\122\054\274\227\006\210
-\232\025\364\163\346\361\365\230\245\315\007\104\221\270\247\150
-\147\105\322\162\021\140\342\161\267\120\125\342\212\251\015\326
-\222\356\004\052\213\060\240\242\005\106\064\155\222\306\073\252
-\115\240\320\253\001\031\012\062\267\350\343\317\361\322\227\111
-\173\254\244\227\367\360\127\256\143\167\232\177\226\332\115\375
-\276\334\007\066\343\045\275\211\171\216\051\022\023\213\210\007
-\373\153\333\244\315\263\055\047\351\324\312\140\327\205\123\373
-\164\306\134\065\214\160\037\371\262\267\222\047\040\307\224\325
-\147\024\060
-END
-
-# Trust for Certificate "Bogus Yahoo 1"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 1"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\143\376\256\226\013\252\221\343\103\316\053\330\267\027\230\307
-\153\333\167\320
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\014\037\276\323\374\011\156\346\156\302\146\071\165\206\153\353
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\327\125\217\332\365\361\020\133\262\023\050\053\160
-\167\051\243
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Yahoo 2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
-\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
-\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
-\302\051
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\071
-\052\103\117\016\007\337\037\212\243\005\336\064\340\302\051\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
-\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
-\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
-\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
-\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
-\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
-\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
-\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
-\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
-\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
-\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
-\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
-\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
-\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
-\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
-\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
-\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
-\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
-\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
-\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
-\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
-\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
-\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
-\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
-\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
-\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
-\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
-\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
-\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
-\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
-\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
-\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
-\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
-\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
-\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
-\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
-\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
-\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
-\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
-\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
-\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
-\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
-\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
-\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
-\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
-\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
-\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
-\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
-\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
-\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
-\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
-\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
-\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
-\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
-\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
-\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
-\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
-\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
-\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
-\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
-\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
-\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
-\206\367\015\001\001\005\005\000\003\202\001\001\000\127\142\341
-\167\353\374\037\277\210\123\257\130\323\324\326\155\147\060\027
-\100\276\340\037\144\336\207\025\314\340\244\126\251\321\237\371
-\001\376\002\261\261\352\342\137\356\161\026\061\371\010\325\302
-\327\232\233\262\132\070\327\251\177\351\207\153\061\371\013\254
-\331\375\120\161\340\333\202\222\017\201\234\215\167\351\353\056
-\352\324\043\101\207\354\055\262\170\263\216\261\147\322\356\161
-\003\010\022\231\263\002\051\157\336\213\336\301\251\003\012\132
-\063\034\075\021\003\306\110\014\230\234\025\056\331\246\205\122
-\347\005\212\256\060\043\353\355\050\154\140\351\055\177\217\107
-\213\057\320\334\346\273\017\176\137\362\110\201\216\120\004\143
-\261\121\200\165\232\251\266\020\034\020\137\157\030\157\340\016
-\226\105\316\356\361\265\040\333\357\332\156\310\225\343\366\105
-\375\312\374\245\137\111\155\006\036\322\336\141\075\025\175\067
-\345\034\065\216\006\302\153\367\264\250\050\054\061\313\252\264
-\247\227\117\235\212\366\257\176\067\271\173\075\337\222\146\213
-\217\116\235\306\066\347\134\246\253\022\017\326\317
-END
-
-# Trust for Certificate "Bogus Yahoo 2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\320\030\266\055\305\030\220\162\107\337\120\222\133\260\232\317
-\112\134\263\255
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\162\334\310\162\154\123\073\262\375\314\135\031\275\257\246\061
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\071\052\103\117\016\007\337\037\212\243\005\336\064\340
-\302\051
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus Yahoo 3"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 3"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\337\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\030\060\026\006\003\125\004
-\003\023\017\154\157\147\151\156\056\171\141\150\157\157\056\143
-\157\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
-\052\161
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\331\060\202\004\301\240\003\002\001\002\002\020\076
-\165\316\324\153\151\060\041\041\210\060\256\206\250\052\161\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
-\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
-\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
-\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063\061
-\064\062\063\065\071\065\071\132\060\201\337\061\013\060\011\006
-\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125\004
-\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125\004
-\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006\003
-\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060\025
-\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154\141
-\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023\013
-\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021\006
-\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164\056
-\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164\145
-\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040\103
-\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006\003
-\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123\114
-\061\030\060\026\006\003\125\004\003\023\017\154\157\147\151\156
-\056\171\141\150\157\157\056\143\157\155\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\241\244\005\075\355
-\205\105\223\212\030\115\306\003\000\127\342\100\167\360\034\353
-\320\031\337\042\135\010\177\321\007\074\101\211\106\027\243\011
-\372\374\370\251\004\321\226\217\253\327\117\074\371\255\030\251
-\164\201\304\127\012\072\046\026\316\142\076\274\077\154\041\356
-\223\215\313\015\240\037\232\226\320\217\255\365\223\223\202\356
-\162\014\241\165\025\243\173\204\126\270\255\377\122\021\161\204
-\274\072\060\013\176\230\250\341\250\077\067\122\320\361\174\157
-\220\330\105\012\254\071\162\152\141\325\273\303\214\371\302\314
-\337\375\072\161\271\257\274\334\072\334\014\266\261\322\321\211
-\273\101\266\362\336\127\325\025\337\374\375\342\061\305\337\312
-\301\330\217\054\277\360\016\133\161\340\064\161\303\305\115\175
-\172\324\372\355\060\113\057\352\266\056\236\223\074\342\072\370
-\102\242\032\356\334\337\315\017\251\366\171\204\032\216\154\002
-\266\206\345\277\121\152\146\370\363\234\323\131\014\173\245\231
-\170\315\174\231\372\306\226\107\330\062\324\164\166\016\167\113
-\040\164\244\267\211\165\222\112\264\133\125\002\003\001\000\001
-\243\202\001\325\060\202\001\321\060\037\006\003\125\035\043\004
-\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
-\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
-\004\026\004\024\206\111\105\374\063\031\063\324\004\355\047\141
-\356\350\001\311\014\177\057\176\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
-\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
-\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
-\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
-\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
-\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
-\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
-\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
-\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
-\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
-\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
-\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
-\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
-\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
-\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
-\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
-\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
-\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
-\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
-\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
-\056\143\157\155\157\144\157\143\141\056\143\157\155\060\032\006
-\003\125\035\021\004\023\060\021\202\017\154\157\147\151\156\056
-\171\141\150\157\157\056\143\157\155\060\015\006\011\052\206\110
-\206\367\015\001\001\005\005\000\003\202\001\001\000\123\151\230
-\216\050\116\234\053\133\035\314\153\167\050\075\273\372\245\116
-\176\126\051\244\352\020\342\364\346\055\006\321\204\333\043\316
-\227\363\150\266\017\072\336\025\013\044\035\221\343\154\056\060
-\267\351\160\260\303\106\200\360\323\261\121\277\117\326\170\240
-\374\254\306\317\061\004\143\342\064\125\005\112\075\366\060\272
-\363\063\345\272\322\226\363\325\261\266\223\211\032\244\150\276
-\176\355\143\264\032\110\300\123\344\243\360\071\014\062\222\307
-\103\015\032\161\355\320\106\223\277\223\142\154\063\113\315\066
-\015\151\136\273\154\226\231\041\151\304\113\147\162\333\154\152
-\270\367\150\355\305\217\255\143\145\225\012\114\340\371\017\176
-\067\075\252\324\223\272\147\011\303\245\244\015\003\132\155\325
-\013\376\360\100\024\264\366\270\151\174\155\302\062\113\237\265
-\032\347\106\256\114\132\053\252\172\136\220\127\225\372\333\146
-\002\040\036\152\151\146\025\234\302\266\365\274\120\265\375\105
-\307\037\150\264\107\131\254\304\033\050\223\116\122\123\022\003
-\130\113\161\203\237\146\346\254\171\110\376\376\107
-END
-
-# Trust for Certificate "Bogus Yahoo 3"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus Yahoo 3"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\200\226\052\344\326\305\264\102\211\116\225\241\076\112\151\236
-\007\326\224\317
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\112\334\074\147\355\041\315\133\316\135\310\021\344\236\317\075
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\076\165\316\324\153\151\060\041\041\210\060\256\206\250
-\052\161
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus live.com"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus live.com"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\336\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\016\060\014\006\003\125\004\021\023\005\063\070\064\067\067
-\061\020\060\016\006\003\125\004\010\023\007\106\154\157\162\151
-\144\141\061\020\060\016\006\003\125\004\007\023\007\105\156\147
-\154\151\163\150\061\027\060\025\006\003\125\004\011\023\016\123
-\145\141\040\126\151\154\154\141\147\145\040\061\060\061\024\060
-\022\006\003\125\004\012\023\013\107\157\157\147\154\145\040\114
-\164\144\056\061\023\060\021\006\003\125\004\013\023\012\124\145
-\143\150\040\104\145\160\164\056\061\050\060\046\006\003\125\004
-\013\023\037\110\157\163\164\145\144\040\142\171\040\107\124\111
-\040\107\162\157\165\160\040\103\157\162\160\157\162\141\164\151
-\157\156\061\024\060\022\006\003\125\004\013\023\013\120\154\141
-\164\151\156\165\155\123\123\114\061\027\060\025\006\003\125\004
-\003\023\016\154\157\147\151\156\056\154\151\166\145\056\143\157
-\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
-\275\072\300
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\354\060\202\004\324\240\003\002\001\002\002\021\000
-\260\267\023\076\320\226\371\265\157\256\221\310\164\275\072\300
-\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060
-\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025
-\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145
-\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025
-\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145
-\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030
-\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164
-\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004
-\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164
-\055\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060
-\063\061\065\060\060\060\060\060\060\132\027\015\061\064\060\063
-\061\064\062\063\065\071\065\071\132\060\201\336\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\016\060\014\006\003\125
-\004\021\023\005\063\070\064\067\067\061\020\060\016\006\003\125
-\004\010\023\007\106\154\157\162\151\144\141\061\020\060\016\006
-\003\125\004\007\023\007\105\156\147\154\151\163\150\061\027\060
-\025\006\003\125\004\011\023\016\123\145\141\040\126\151\154\154
-\141\147\145\040\061\060\061\024\060\022\006\003\125\004\012\023
-\013\107\157\157\147\154\145\040\114\164\144\056\061\023\060\021
-\006\003\125\004\013\023\012\124\145\143\150\040\104\145\160\164
-\056\061\050\060\046\006\003\125\004\013\023\037\110\157\163\164
-\145\144\040\142\171\040\107\124\111\040\107\162\157\165\160\040
-\103\157\162\160\157\162\141\164\151\157\156\061\024\060\022\006
-\003\125\004\013\023\013\120\154\141\164\151\156\165\155\123\123
-\114\061\027\060\025\006\003\125\004\003\023\016\154\157\147\151
-\156\056\154\151\166\145\056\143\157\155\060\202\001\042\060\015
-\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001
-\017\000\060\202\001\012\002\202\001\001\000\363\374\053\057\357
-\341\255\131\360\102\074\302\361\202\277\054\101\223\321\366\230
-\063\225\114\274\142\361\225\130\010\266\351\173\167\110\260\323
-\334\027\077\274\156\346\354\036\354\215\027\376\034\044\306\076
-\147\075\222\225\242\060\300\247\127\040\317\160\210\227\112\005
-\223\171\223\102\227\057\076\377\304\024\024\050\242\023\066\264
-\370\356\276\035\274\170\135\141\223\137\353\210\327\321\344\053
-\232\315\130\342\007\105\237\117\270\271\100\152\063\054\133\041
-\003\132\112\224\362\172\227\131\033\250\265\102\330\203\000\252
-\064\314\247\166\320\107\003\137\005\257\073\341\271\241\064\045
-\267\154\137\232\060\204\230\302\302\327\362\270\102\112\020\125
-\275\372\123\201\135\215\150\146\105\054\122\176\345\304\004\303
-\124\347\303\071\332\172\112\305\271\230\202\040\341\054\140\127
-\277\272\362\106\000\274\137\072\334\343\063\227\370\112\230\271
-\354\063\117\055\140\154\025\222\246\201\112\013\351\354\166\160
-\064\061\027\160\346\160\113\216\213\323\165\313\170\111\253\146
-\233\206\237\217\251\304\001\350\312\033\347\002\003\001\000\001
-\243\202\001\350\060\202\001\344\060\037\006\003\125\035\043\004
-\030\060\026\200\024\241\162\137\046\033\050\230\103\225\135\007
-\067\325\205\226\235\113\322\303\105\060\035\006\003\125\035\016
-\004\026\004\024\324\144\366\251\350\245\176\327\277\143\122\003
-\203\123\333\305\101\215\352\200\060\016\006\003\125\035\017\001
-\001\377\004\004\003\002\005\240\060\014\006\003\125\035\023\001
-\001\377\004\002\060\000\060\035\006\003\125\035\045\004\026\060
-\024\006\010\053\006\001\005\005\007\003\001\006\010\053\006\001
-\005\005\007\003\002\060\106\006\003\125\035\040\004\077\060\075
-\060\073\006\014\053\006\001\004\001\262\061\001\002\001\003\004
-\060\053\060\051\006\010\053\006\001\005\005\007\002\001\026\035
-\150\164\164\160\163\072\057\057\163\145\143\165\162\145\056\143
-\157\155\157\144\157\056\143\157\155\057\103\120\123\060\173\006
-\003\125\035\037\004\164\060\162\060\070\240\066\240\064\206\062
-\150\164\164\160\072\057\057\143\162\154\056\143\157\155\157\144
-\157\143\141\056\143\157\155\057\125\124\116\055\125\123\105\122
-\106\151\162\163\164\055\110\141\162\144\167\141\162\145\056\143
-\162\154\060\066\240\064\240\062\206\060\150\164\164\160\072\057
-\057\143\162\154\056\143\157\155\157\144\157\056\156\145\164\057
-\125\124\116\055\125\123\105\122\106\151\162\163\164\055\110\141
-\162\144\167\141\162\145\056\143\162\154\060\161\006\010\053\006
-\001\005\005\007\001\001\004\145\060\143\060\073\006\010\053\006
-\001\005\005\007\060\002\206\057\150\164\164\160\072\057\057\143
-\162\164\056\143\157\155\157\144\157\143\141\056\143\157\155\057
-\125\124\116\101\144\144\124\162\165\163\164\123\145\162\166\145
-\162\103\101\056\143\162\164\060\044\006\010\053\006\001\005\005
-\007\060\001\206\030\150\164\164\160\072\057\057\157\143\163\160
-\056\143\157\155\157\144\157\143\141\056\143\157\155\060\055\006
-\003\125\035\021\004\046\060\044\202\016\154\157\147\151\156\056
-\154\151\166\145\056\143\157\155\202\022\167\167\167\056\154\157
-\147\151\156\056\154\151\166\145\056\143\157\155\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\124\343\244\232\044\322\363\035\102\255\033\360\036\253\373\332
-\325\252\351\317\132\263\036\127\173\061\362\156\127\113\061\257
-\063\273\266\015\025\307\136\131\001\316\104\265\267\277\011\311
-\325\334\151\204\351\305\032\267\360\076\324\300\044\275\051\137
-\264\351\326\130\353\105\021\211\064\064\323\021\353\064\316\052
-\117\000\075\366\162\357\151\146\300\237\232\254\176\160\120\254
-\125\107\332\276\103\133\354\213\310\305\043\204\311\237\266\122
-\010\317\221\033\057\200\151\346\064\063\346\263\237\244\345\015
-\232\025\371\127\374\013\251\101\013\365\377\130\101\222\042\047
-\146\022\006\307\052\330\131\247\306\337\104\022\117\300\250\177
-\247\101\310\310\151\377\272\005\056\227\255\073\320\353\363\025
-\155\176\033\345\272\335\064\276\042\021\354\150\230\063\201\002
-\152\013\023\125\171\061\165\116\072\310\266\023\275\227\157\067
-\012\013\055\210\016\336\147\220\302\263\312\040\312\232\121\364
-\144\076\333\364\056\105\362\307\107\027\250\364\372\220\132\177
-\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352
-END
-
-# Trust for Certificate "Bogus live.com"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus live.com"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\316\245\206\262\316\131\076\307\331\071\211\203\067\305\170\024
-\160\212\262\276
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\320\324\071\343\314\134\122\335\010\315\351\253\350\021\131\324
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\021\000\260\267\023\076\320\226\371\265\157\256\221\310\164
-\275\072\300
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Bogus kuix.de"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus kuix.de"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\361\061\013\060\011\006\003\125\004\006\023\002\104\105
-\061\016\060\014\006\003\125\004\021\023\005\061\062\063\064\065
-\061\023\060\021\006\003\125\004\010\023\012\124\145\163\164\040
-\123\164\141\164\145\061\022\060\020\006\003\125\004\007\023\011
-\124\145\163\164\040\103\151\164\171\061\024\060\022\006\003\125
-\004\011\023\013\124\145\163\164\040\123\164\162\145\145\164\061
-\023\060\021\006\003\125\004\012\023\012\113\141\151\040\105\156
-\147\145\162\164\061\042\060\040\006\003\125\004\013\023\031\106
-\157\162\040\124\145\163\164\151\156\147\040\120\165\162\160\157
-\163\145\163\040\117\156\154\171\061\055\060\053\006\003\125\004
-\013\023\044\124\105\123\124\040\125\123\105\040\117\116\114\131
-\040\055\040\116\117\040\127\101\122\122\101\116\124\131\040\101
-\124\124\101\103\110\105\104\061\031\060\027\006\003\125\004\013
-\023\020\103\157\155\157\144\157\040\124\162\151\141\154\040\123
-\123\114\061\020\060\016\006\003\125\004\003\023\007\153\165\151
-\170\056\144\145
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
-\350\260
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\154\060\202\004\124\240\003\002\001\002\002\020\162
-\003\041\005\305\014\010\127\075\216\245\060\116\376\350\260\060
-\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\201
-\227\061\013\060\011\006\003\125\004\006\023\002\125\123\061\013
-\060\011\006\003\125\004\010\023\002\125\124\061\027\060\025\006
-\003\125\004\007\023\016\123\141\154\164\040\114\141\153\145\040
-\103\151\164\171\061\036\060\034\006\003\125\004\012\023\025\124
-\150\145\040\125\123\105\122\124\122\125\123\124\040\116\145\164
-\167\157\162\153\061\041\060\037\006\003\125\004\013\023\030\150
-\164\164\160\072\057\057\167\167\167\056\165\163\145\162\164\162
-\165\163\164\056\143\157\155\061\037\060\035\006\003\125\004\003
-\023\026\125\124\116\055\125\123\105\122\106\151\162\163\164\055
-\110\141\162\144\167\141\162\145\060\036\027\015\061\061\060\063
-\061\067\060\060\060\060\060\060\132\027\015\061\061\060\064\061
-\066\062\063\065\071\065\071\132\060\201\361\061\013\060\011\006
-\003\125\004\006\023\002\104\105\061\016\060\014\006\003\125\004
-\021\023\005\061\062\063\064\065\061\023\060\021\006\003\125\004
-\010\023\012\124\145\163\164\040\123\164\141\164\145\061\022\060
-\020\006\003\125\004\007\023\011\124\145\163\164\040\103\151\164
-\171\061\024\060\022\006\003\125\004\011\023\013\124\145\163\164
-\040\123\164\162\145\145\164\061\023\060\021\006\003\125\004\012
-\023\012\113\141\151\040\105\156\147\145\162\164\061\042\060\040
-\006\003\125\004\013\023\031\106\157\162\040\124\145\163\164\151
-\156\147\040\120\165\162\160\157\163\145\163\040\117\156\154\171
-\061\055\060\053\006\003\125\004\013\023\044\124\105\123\124\040
-\125\123\105\040\117\116\114\131\040\055\040\116\117\040\127\101
-\122\122\101\116\124\131\040\101\124\124\101\103\110\105\104\061
-\031\060\027\006\003\125\004\013\023\020\103\157\155\157\144\157
-\040\124\162\151\141\154\040\123\123\114\061\020\060\016\006\003
-\125\004\003\023\007\153\165\151\170\056\144\145\060\201\237\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201
-\215\000\060\201\211\002\201\201\000\270\252\216\365\227\107\007
-\137\345\170\166\156\223\153\216\337\113\074\333\231\057\161\123
-\051\156\245\363\044\117\110\045\043\100\001\354\012\025\013\354
-\156\310\236\046\043\146\373\351\333\330\050\205\041\117\036\337
-\173\114\345\143\301\013\262\142\126\224\123\313\277\234\241\115
-\331\207\305\151\110\074\261\277\245\150\122\041\035\172\334\224
-\117\104\156\107\045\035\237\234\222\322\067\035\371\133\133\262
-\335\076\030\327\363\207\146\255\243\364\316\217\321\157\360\271
-\264\357\261\352\025\143\012\316\201\002\003\001\000\001\243\202
-\001\332\060\202\001\326\060\037\006\003\125\035\043\004\030\060
-\026\200\024\241\162\137\046\033\050\230\103\225\135\007\067\325
-\205\226\235\113\322\303\105\060\035\006\003\125\035\016\004\026
-\004\024\100\217\071\046\234\114\206\043\231\306\121\011\246\346
-\362\301\376\247\366\267\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\005\240\060\014\006\003\125\035\023\001\001\377
-\004\002\060\000\060\035\006\003\125\035\045\004\026\060\024\006
-\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
-\007\003\002\060\106\006\003\125\035\040\004\077\060\075\060\073
-\006\014\053\006\001\004\001\262\061\001\002\001\003\004\060\053
-\060\051\006\010\053\006\001\005\005\007\002\001\026\035\150\164
-\164\160\163\072\057\057\163\145\143\165\162\145\056\143\157\155
-\157\144\157\056\143\157\155\057\103\120\123\060\173\006\003\125
-\035\037\004\164\060\162\060\070\240\066\240\064\206\062\150\164
-\164\160\072\057\057\143\162\154\056\143\157\155\157\144\157\143
-\141\056\143\157\155\057\125\124\116\055\125\123\105\122\106\151
-\162\163\164\055\110\141\162\144\167\141\162\145\056\143\162\154
-\060\066\240\064\240\062\206\060\150\164\164\160\072\057\057\143
-\162\154\056\143\157\155\157\144\157\056\156\145\164\057\125\124
-\116\055\125\123\105\122\106\151\162\163\164\055\110\141\162\144
-\167\141\162\145\056\143\162\154\060\161\006\010\053\006\001\005
-\005\007\001\001\004\145\060\143\060\073\006\010\053\006\001\005
-\005\007\060\002\206\057\150\164\164\160\072\057\057\143\162\164
-\056\143\157\155\157\144\157\143\141\056\143\157\155\057\125\124
-\116\101\144\144\124\162\165\163\164\123\145\162\166\145\162\103
-\101\056\143\162\164\060\044\006\010\053\006\001\005\005\007\060
-\001\206\030\150\164\164\160\072\057\057\157\143\163\160\056\143
-\157\155\157\144\157\143\141\056\143\157\155\060\037\006\003\125
-\035\021\004\030\060\026\202\007\153\165\151\170\056\144\145\202
-\013\167\167\167\056\153\165\151\170\056\144\145\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\216\141\036\046\036\242\331\031\320\360\324\275\211\371\352\222
-\021\171\152\136\173\174\237\176\071\163\011\126\121\346\206\124
-\307\155\106\166\122\312\152\250\064\300\140\076\003\316\263\311
-\110\227\321\237\246\241\152\017\376\167\321\036\020\263\127\200
-\251\006\046\204\246\373\172\067\023\316\204\314\167\171\011\056
-\342\104\276\037\254\167\156\167\106\101\333\260\262\151\221\164
-\321\200\226\141\061\014\057\012\317\265\320\334\010\055\353\366
-\165\202\336\212\056\272\075\007\220\140\071\126\203\341\202\312
-\043\254\337\343\317\115\160\127\301\270\267\223\232\355\334\213
-\336\112\240\125\050\002\253\103\014\124\227\150\030\242\353\071
-\341\271\374\277\163\200\144\063\022\173\207\140\002\347\076\160
-\311\207\312\251\066\074\005\361\006\136\161\012\016\012\066\231
-\260\207\347\151\132\261\240\060\116\175\141\130\313\306\250\226
-\200\136\175\301\052\377\233\112\112\353\051\147\212\017\157\346
-\031\355\202\317\201\127\341\044\255\242\321\372\332\024\227\260
-\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221
-END
-
-# Trust for Certificate "Bogus kuix.de"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Bogus kuix.de"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\202\141\113\354\227\110\025\336\314\232\314\156\204\041\161\171
-\262\144\040\100
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\367\137\230\274\330\144\014\026\345\256\356\252\000\366\037\007
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\227\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\013\060\011\006\003\125\004\010\023\002\125\124\061\027\060
-\025\006\003\125\004\007\023\016\123\141\154\164\040\114\141\153
-\145\040\103\151\164\171\061\036\060\034\006\003\125\004\012\023
-\025\124\150\145\040\125\123\105\122\124\122\125\123\124\040\116
-\145\164\167\157\162\153\061\041\060\037\006\003\125\004\013\023
-\030\150\164\164\160\072\057\057\167\167\167\056\165\163\145\162
-\164\162\165\163\164\056\143\157\155\061\037\060\035\006\003\125
-\004\003\023\026\125\124\116\055\125\123\105\122\106\151\162\163
-\164\055\110\141\162\144\167\141\162\145
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\020\162\003\041\005\305\014\010\127\075\216\245\060\116\376
-\350\260
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_VALID
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Go Daddy Root Certificate Authority - G2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
-\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
-\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
-\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
-\171\040\055\040\107\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
-\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
-\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
-\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
-\171\040\055\040\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\305\060\202\002\255\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
-\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
-\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
-\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012\023
-\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111\156
-\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157\040
-\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164\151
-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
-\040\055\040\107\062\060\036\027\015\060\071\060\071\060\061\060
-\060\060\060\060\060\132\027\015\063\067\061\062\063\061\062\063
-\065\071\065\071\132\060\201\203\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023\007
-\101\162\151\172\157\156\141\061\023\060\021\006\003\125\004\007
-\023\012\123\143\157\164\164\163\144\141\154\145\061\032\060\030
-\006\003\125\004\012\023\021\107\157\104\141\144\144\171\056\143
-\157\155\054\040\111\156\143\056\061\061\060\057\006\003\125\004
-\003\023\050\107\157\040\104\141\144\144\171\040\122\157\157\164
-\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\062\060\202\001\042\060
-\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202
-\001\017\000\060\202\001\012\002\202\001\001\000\277\161\142\010
-\361\372\131\064\367\033\311\030\243\367\200\111\130\351\042\203
-\023\246\305\040\103\001\073\204\361\346\205\111\237\047\352\366
-\204\033\116\240\264\333\160\230\307\062\001\261\005\076\007\116
-\356\364\372\117\057\131\060\042\347\253\031\126\153\342\200\007
-\374\363\026\165\200\071\121\173\345\371\065\266\164\116\251\215
-\202\023\344\266\077\251\003\203\372\242\276\212\025\152\177\336
-\013\303\266\031\024\005\312\352\303\250\004\224\073\106\174\062
-\015\363\000\146\042\310\215\151\155\066\214\021\030\267\323\262
-\034\140\264\070\372\002\214\316\323\335\106\007\336\012\076\353
-\135\174\310\174\373\260\053\123\244\222\142\151\121\045\005\141
-\032\104\201\214\054\251\103\226\043\337\254\072\201\232\016\051
-\305\034\251\351\135\036\266\236\236\060\012\071\316\361\210\200
-\373\113\135\314\062\354\205\142\103\045\064\002\126\047\001\221
-\264\073\160\052\077\156\261\350\234\210\001\175\237\324\371\333
-\123\155\140\235\277\054\347\130\253\270\137\106\374\316\304\033
-\003\074\011\353\111\061\134\151\106\263\340\107\002\003\001\000
-\001\243\102\060\100\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\006\060\035\006\003\125\035\016\004\026\004
-\024\072\232\205\007\020\147\050\266\357\366\275\005\101\156\040
-\301\224\332\017\336\060\015\006\011\052\206\110\206\367\015\001
-\001\013\005\000\003\202\001\001\000\231\333\135\171\325\371\227
-\131\147\003\141\361\176\073\006\061\165\055\241\040\216\117\145
-\207\264\367\246\234\274\330\351\057\320\333\132\356\317\164\214
-\163\264\070\102\332\005\173\370\002\165\270\375\245\261\327\256
-\366\327\336\023\313\123\020\176\212\106\321\227\372\267\056\053
-\021\253\220\260\047\200\371\350\237\132\351\067\237\253\344\337
-\154\263\205\027\235\075\331\044\117\171\221\065\326\137\004\353
-\200\203\253\232\002\055\265\020\364\330\220\307\004\163\100\355
-\162\045\240\251\237\354\236\253\150\022\231\127\306\217\022\072
-\011\244\275\104\375\006\025\067\301\233\344\062\243\355\070\350
-\330\144\363\054\176\024\374\002\352\237\315\377\007\150\027\333
-\042\220\070\055\172\215\321\124\361\151\343\137\063\312\172\075
-\173\012\343\312\177\137\071\345\342\165\272\305\166\030\063\316
-\054\360\057\114\255\367\261\347\316\117\250\304\233\112\124\006
-\305\177\175\325\010\017\342\034\376\176\027\270\254\136\366\324
-\026\262\103\011\014\115\366\247\153\264\231\204\145\312\172\210
-\342\342\104\276\134\367\352\034\365
-END
-
-# Trust for Certificate "Go Daddy Root Certificate Authority - G2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Go Daddy Root Certificate Authority - G2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\107\276\253\311\042\352\350\016\170\170\064\142\247\237\105\302
-\124\375\346\213
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\200\072\274\042\301\346\373\215\233\073\047\112\062\033\232\001
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\203\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\032\060\030\006\003\125\004\012
-\023\021\107\157\104\141\144\144\171\056\143\157\155\054\040\111
-\156\143\056\061\061\060\057\006\003\125\004\003\023\050\107\157
-\040\104\141\144\144\171\040\122\157\157\164\040\103\145\162\164
-\151\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164
-\171\040\055\040\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Starfield Root Certificate Authority - G2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
-\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
-\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
-\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
-\107\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
-\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
-\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
-\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
-\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\335\060\202\002\305\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
-\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
-\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
-\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
-\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
-\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062\060
-\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145\154
-\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143\141
-\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040\107
-\062\060\036\027\015\060\071\060\071\060\061\060\060\060\060\060
-\060\132\027\015\063\067\061\062\063\061\062\063\065\071\065\071
-\132\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125
-\123\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172
-\157\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143
-\157\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004
-\012\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143
-\150\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061
-\062\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151
-\145\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151
-\143\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055
-\040\107\062\060\202\001\042\060\015\006\011\052\206\110\206\367
-\015\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002
-\202\001\001\000\275\355\301\003\374\366\217\374\002\261\157\133
-\237\110\331\235\171\342\242\267\003\141\126\030\303\107\266\327
-\312\075\065\056\211\103\367\241\151\233\336\212\032\375\023\040
-\234\264\111\167\062\051\126\375\271\354\214\335\042\372\162\334
-\047\141\227\356\366\132\204\354\156\031\271\211\054\334\204\133
-\325\164\373\153\137\305\211\245\020\122\211\106\125\364\270\165
-\034\346\177\344\124\256\113\370\125\162\127\002\031\370\027\161
-\131\353\036\050\007\164\305\235\110\276\154\264\364\244\260\363
-\144\067\171\222\300\354\106\136\177\341\155\123\114\142\257\315
-\037\013\143\273\072\235\373\374\171\000\230\141\164\317\046\202
-\100\143\363\262\162\152\031\015\231\312\324\016\165\314\067\373
-\213\211\301\131\361\142\177\137\263\137\145\060\370\247\267\115
-\166\132\036\166\136\064\300\350\226\126\231\212\263\360\177\244
-\315\275\334\062\061\174\221\317\340\137\021\370\153\252\111\134
-\321\231\224\321\242\343\143\133\011\166\265\126\142\341\113\164
-\035\226\324\046\324\010\004\131\320\230\016\016\346\336\374\303
-\354\037\220\361\002\003\001\000\001\243\102\060\100\060\017\006
-\003\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016
-\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035
-\006\003\125\035\016\004\026\004\024\174\014\062\037\247\331\060
-\177\304\175\150\243\142\250\241\316\253\007\133\047\060\015\006
-\011\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001
-\000\021\131\372\045\117\003\157\224\231\073\232\037\202\205\071
-\324\166\005\224\136\341\050\223\155\142\135\011\302\240\250\324
-\260\165\070\361\064\152\235\344\237\212\206\046\121\346\054\321
-\306\055\156\225\040\112\222\001\354\270\212\147\173\061\342\147
-\056\214\225\003\046\056\103\235\112\061\366\016\265\014\273\267
-\342\067\177\042\272\000\243\016\173\122\373\153\273\073\304\323
-\171\121\116\315\220\364\147\007\031\310\074\106\172\015\001\175
-\305\130\347\155\346\205\060\027\232\044\304\020\340\004\367\340
-\362\177\324\252\012\377\102\035\067\355\224\345\144\131\022\040
-\167\070\323\062\076\070\201\165\226\163\372\150\217\261\313\316
-\037\305\354\372\234\176\317\176\261\361\007\055\266\374\277\312
-\244\277\320\227\005\112\274\352\030\050\002\220\275\124\170\011
-\041\161\323\321\175\035\331\026\260\251\141\075\320\012\000\042
-\374\307\173\313\011\144\105\013\073\100\201\367\175\174\062\365
-\230\312\130\216\175\052\356\220\131\163\144\371\066\164\136\045
-\241\365\146\005\056\177\071\025\251\052\373\120\213\216\205\151
-\364
-END
-
-# Trust for Certificate "Starfield Root Certificate Authority - G2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Starfield Root Certificate Authority - G2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\265\034\006\174\356\053\014\075\370\125\253\055\222\364\376\071
-\324\347\017\016
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\326\071\201\306\122\176\226\151\374\374\312\146\355\005\362\226
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\217\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\062
-\060\060\006\003\125\004\003\023\051\123\164\141\162\146\151\145
-\154\144\040\122\157\157\164\040\103\145\162\164\151\146\151\143
-\141\164\145\040\101\165\164\150\157\162\151\164\171\040\055\040
-\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Starfield Services Root Certificate Authority - G2"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
-\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
-\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
-\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\062
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
-\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
-\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
-\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\357\060\202\002\327\240\003\002\001\002\002\001\000
-\060\015\006\011\052\206\110\206\367\015\001\001\013\005\000\060
-\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157\156
-\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157\164
-\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012\023
-\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150\156
-\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073\060
-\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145\154
-\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164\040
-\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150
-\157\162\151\164\171\040\055\040\107\062\060\036\027\015\060\071
-\060\071\060\061\060\060\060\060\060\060\132\027\015\063\067\061
-\062\063\061\062\063\065\071\065\071\132\060\201\230\061\013\060
-\011\006\003\125\004\006\023\002\125\123\061\020\060\016\006\003
-\125\004\010\023\007\101\162\151\172\157\156\141\061\023\060\021
-\006\003\125\004\007\023\012\123\143\157\164\164\163\144\141\154
-\145\061\045\060\043\006\003\125\004\012\023\034\123\164\141\162
-\146\151\145\154\144\040\124\145\143\150\156\157\154\157\147\151
-\145\163\054\040\111\156\143\056\061\073\060\071\006\003\125\004
-\003\023\062\123\164\141\162\146\151\145\154\144\040\123\145\162
-\166\151\143\145\163\040\122\157\157\164\040\103\145\162\164\151
-\146\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171
-\040\055\040\107\062\060\202\001\042\060\015\006\011\052\206\110
-\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001
-\012\002\202\001\001\000\325\014\072\304\052\371\116\342\365\276
-\031\227\137\216\210\123\261\037\077\313\317\237\040\023\155\051
-\072\310\017\175\074\367\153\166\070\143\331\066\140\250\233\136
-\134\000\200\262\057\131\177\366\207\371\045\103\206\347\151\033
-\122\232\220\341\161\343\330\055\015\116\157\366\310\111\331\266
-\363\032\126\256\053\266\164\024\353\317\373\046\343\032\272\035
-\226\056\152\073\130\224\211\107\126\377\045\240\223\160\123\203
-\332\204\164\024\303\147\236\004\150\072\337\216\100\132\035\112
-\116\317\103\221\073\347\126\326\000\160\313\122\356\173\175\256
-\072\347\274\061\371\105\366\302\140\317\023\131\002\053\200\314
-\064\107\337\271\336\220\145\155\002\317\054\221\246\246\347\336
-\205\030\111\174\146\116\243\072\155\251\265\356\064\056\272\015
-\003\270\063\337\107\353\261\153\215\045\331\233\316\201\321\105
-\106\062\226\160\207\336\002\016\111\103\205\266\154\163\273\144
-\352\141\101\254\311\324\124\337\207\057\307\042\262\046\314\237
-\131\124\150\237\374\276\052\057\304\125\034\165\100\140\027\205
-\002\125\071\213\177\005\002\003\001\000\001\243\102\060\100\060
-\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377
-\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
-\060\035\006\003\125\035\016\004\026\004\024\234\137\000\337\252
-\001\327\060\053\070\210\242\270\155\112\234\362\021\221\203\060
-\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202
-\001\001\000\113\066\246\204\167\151\335\073\031\237\147\043\010
-\157\016\141\311\375\204\334\137\330\066\201\315\330\033\101\055
-\237\140\335\307\032\150\331\321\156\206\341\210\043\317\023\336
-\103\317\342\064\263\004\235\037\051\325\277\370\136\310\325\301
-\275\356\222\157\062\164\362\221\202\057\275\202\102\172\255\052
-\267\040\175\115\274\172\125\022\302\025\352\275\367\152\225\056
-\154\164\237\317\034\264\362\305\001\243\205\320\162\076\255\163
-\253\013\233\165\014\155\105\267\216\224\254\226\067\265\240\320
-\217\025\107\016\343\350\203\335\217\375\357\101\001\167\314\047
-\251\142\205\063\362\067\010\357\161\317\167\006\336\310\031\035
-\210\100\317\175\106\035\377\036\307\341\316\377\043\333\306\372
-\215\125\116\251\002\347\107\021\106\076\364\375\275\173\051\046
-\273\251\141\142\067\050\266\055\052\366\020\206\144\311\160\247
-\322\255\267\051\160\171\352\074\332\143\045\237\375\150\267\060
-\354\160\373\165\212\267\155\140\147\262\036\310\271\351\330\250
-\157\002\213\147\015\115\046\127\161\332\040\374\301\112\120\215
-\261\050\272
-END
-
-# Trust for Certificate "Starfield Services Root Certificate Authority - G2"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Starfield Services Root Certificate Authority - G2"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\222\132\217\215\054\155\004\340\146\137\131\152\377\042\330\143
-\350\045\157\077
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\027\065\164\257\173\141\034\353\364\371\074\342\356\100\371\242
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\201\230\061\013\060\011\006\003\125\004\006\023\002\125\123
-\061\020\060\016\006\003\125\004\010\023\007\101\162\151\172\157
-\156\141\061\023\060\021\006\003\125\004\007\023\012\123\143\157
-\164\164\163\144\141\154\145\061\045\060\043\006\003\125\004\012
-\023\034\123\164\141\162\146\151\145\154\144\040\124\145\143\150
-\156\157\154\157\147\151\145\163\054\040\111\156\143\056\061\073
-\060\071\006\003\125\004\003\023\062\123\164\141\162\146\151\145
-\154\144\040\123\145\162\166\151\143\145\163\040\122\157\157\164
-\040\103\145\162\164\151\146\151\143\141\164\145\040\101\165\164
-\150\157\162\151\164\171\040\055\040\107\062
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\001\000
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AffirmTrust Commercial"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Commercial"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
-\145\162\143\151\141\154
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
-\145\162\143\151\141\154
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\167\167\006\047\046\251\261\174
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\167
-\167\006\047\046\251\261\174\060\015\006\011\052\206\110\206\367
-\015\001\001\013\005\000\060\104\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
-\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
-\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
-\164\040\103\157\155\155\145\162\143\151\141\154\060\036\027\015
-\061\060\060\061\062\071\061\064\060\066\060\066\132\027\015\063
-\060\061\062\063\061\061\064\060\066\060\066\132\060\104\061\013
-\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
-\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
-\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
-\162\155\124\162\165\163\164\040\103\157\155\155\145\162\143\151
-\141\154\060\202\001\042\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
-\001\001\000\366\033\117\147\007\053\241\025\365\006\042\313\037
-\001\262\343\163\105\006\104\111\054\273\111\045\024\326\316\303
-\267\253\054\117\306\101\062\224\127\372\022\247\133\016\342\217
-\037\036\206\031\247\252\265\055\271\137\015\212\302\257\205\065
-\171\062\055\273\034\142\067\362\261\133\112\075\312\315\161\137
-\351\102\276\224\350\310\336\371\042\110\144\306\345\253\306\053
-\155\255\005\360\372\325\013\317\232\345\360\120\244\213\073\107
-\245\043\133\172\172\370\063\077\270\357\231\227\343\040\301\326
-\050\211\317\224\373\271\105\355\343\100\027\021\324\164\360\013
-\061\342\053\046\152\233\114\127\256\254\040\076\272\105\172\005
-\363\275\233\151\025\256\175\116\040\143\304\065\166\072\007\002
-\311\067\375\307\107\356\350\361\166\035\163\025\362\227\244\265
-\310\172\171\331\102\252\053\177\134\376\316\046\117\243\146\201
-\065\257\104\272\124\036\034\060\062\145\235\346\074\223\136\120
-\116\172\343\072\324\156\314\032\373\371\322\067\256\044\052\253
-\127\003\042\050\015\111\165\177\267\050\332\165\277\216\343\334
-\016\171\061\002\003\001\000\001\243\102\060\100\060\035\006\003
-\125\035\016\004\026\004\024\235\223\306\123\213\136\312\257\077
-\237\036\017\345\231\225\274\044\366\224\217\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
-\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
-\052\206\110\206\367\015\001\001\013\005\000\003\202\001\001\000
-\130\254\364\004\016\315\300\015\377\012\375\324\272\026\137\051
-\275\173\150\231\130\111\322\264\035\067\115\177\047\175\106\006
-\135\103\306\206\056\076\163\262\046\175\117\223\251\266\304\052
-\232\253\041\227\024\261\336\214\323\253\211\025\330\153\044\324
-\361\026\256\330\244\134\324\177\121\216\355\030\001\261\223\143
-\275\274\370\141\200\232\236\261\316\102\160\342\251\175\006\045
-\175\047\241\376\157\354\263\036\044\332\343\113\125\032\000\073
-\065\264\073\331\327\135\060\375\201\023\211\362\302\006\053\355
-\147\304\216\311\103\262\134\153\025\211\002\274\142\374\116\362
-\265\063\252\262\157\323\012\242\120\343\366\073\350\056\104\302
-\333\146\070\251\063\126\110\361\155\033\063\215\015\214\077\140
-\067\235\323\312\155\176\064\176\015\237\162\166\213\033\237\162
-\375\122\065\101\105\002\226\057\034\262\232\163\111\041\261\111
-\107\105\107\264\357\152\064\021\311\115\232\314\131\267\326\002
-\236\132\116\145\265\224\256\033\337\051\260\026\361\277\000\236
-\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357
-END
-
-# Trust for Certificate "AffirmTrust Commercial"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Commercial"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\371\265\266\062\105\137\234\276\354\127\137\200\334\351\156\054
-\307\262\170\267
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\202\222\272\133\357\315\212\157\246\075\125\371\204\366\326\267
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\103\157\155\155
-\145\162\143\151\141\154
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\167\167\006\047\046\251\261\174
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AffirmTrust Networking"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Networking"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
-\157\162\153\151\156\147
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
-\157\162\153\151\156\147
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\174\117\004\071\034\324\231\055
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\114\060\202\002\064\240\003\002\001\002\002\010\174
-\117\004\071\034\324\231\055\060\015\006\011\052\206\110\206\367
-\015\001\001\005\005\000\060\104\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
-\101\146\146\151\162\155\124\162\165\163\164\061\037\060\035\006
-\003\125\004\003\014\026\101\146\146\151\162\155\124\162\165\163
-\164\040\116\145\164\167\157\162\153\151\156\147\060\036\027\015
-\061\060\060\061\062\071\061\064\060\070\062\064\132\027\015\063
-\060\061\062\063\061\061\064\060\070\062\064\132\060\104\061\013
-\060\011\006\003\125\004\006\023\002\125\123\061\024\060\022\006
-\003\125\004\012\014\013\101\146\146\151\162\155\124\162\165\163
-\164\061\037\060\035\006\003\125\004\003\014\026\101\146\146\151
-\162\155\124\162\165\163\164\040\116\145\164\167\157\162\153\151
-\156\147\060\202\001\042\060\015\006\011\052\206\110\206\367\015
-\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
-\001\001\000\264\204\314\063\027\056\153\224\154\153\141\122\240
-\353\243\317\171\224\114\345\224\200\231\313\125\144\104\145\217
-\147\144\342\006\343\134\067\111\366\057\233\204\204\036\055\362
-\140\235\060\116\314\204\205\342\054\317\036\236\376\066\253\063
-\167\065\104\330\065\226\032\075\066\350\172\016\330\325\107\241
-\152\151\213\331\374\273\072\256\171\132\325\364\326\161\273\232
-\220\043\153\232\267\210\164\207\014\036\137\271\236\055\372\253
-\123\053\334\273\166\076\223\114\010\010\214\036\242\043\034\324
-\152\255\042\272\231\001\056\155\145\313\276\044\146\125\044\113
-\100\104\261\033\327\341\302\205\300\336\020\077\075\355\270\374
-\361\361\043\123\334\277\145\227\157\331\371\100\161\215\175\275
-\225\324\316\276\240\136\047\043\336\375\246\320\046\016\000\051
-\353\074\106\360\075\140\277\077\120\322\334\046\101\121\236\024
-\067\102\004\243\160\127\250\033\207\355\055\372\173\356\214\012
-\343\251\146\211\031\313\101\371\335\104\066\141\317\342\167\106
-\310\175\366\364\222\201\066\375\333\064\361\162\176\363\014\026
-\275\264\025\002\003\001\000\001\243\102\060\100\060\035\006\003
-\125\035\016\004\026\004\024\007\037\322\347\234\332\302\156\242
-\100\264\260\172\120\020\120\164\304\310\275\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003
-\125\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011
-\052\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000
-\211\127\262\026\172\250\302\375\326\331\233\233\064\302\234\264
-\062\024\115\247\244\337\354\276\247\276\370\103\333\221\067\316
-\264\062\056\120\125\032\065\116\166\103\161\040\357\223\167\116
-\025\160\056\207\303\301\035\155\334\313\265\047\324\054\126\321
-\122\123\072\104\322\163\310\304\033\005\145\132\142\222\234\356
-\101\215\061\333\347\064\352\131\041\325\001\172\327\144\270\144
-\071\315\311\355\257\355\113\003\110\247\240\231\001\200\334\145
-\243\066\256\145\131\110\117\202\113\310\145\361\127\035\345\131
-\056\012\077\154\330\321\365\345\011\264\154\124\000\012\340\025
-\115\207\165\155\267\130\226\132\335\155\322\000\240\364\233\110
-\276\303\067\244\272\066\340\174\207\205\227\032\025\242\336\056
-\242\133\275\257\030\371\220\120\315\160\131\370\047\147\107\313
-\307\240\007\072\175\321\054\135\154\031\072\146\265\175\375\221
-\157\202\261\276\010\223\333\024\107\361\242\067\307\105\236\074
-\307\167\257\144\250\223\337\366\151\203\202\140\362\111\102\064
-\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333
-END
-
-# Trust for Certificate "AffirmTrust Networking"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Networking"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\051\066\041\002\213\040\355\002\365\146\305\062\321\326\355\220
-\237\105\000\057
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\102\145\312\276\001\232\232\114\251\214\101\111\315\300\325\177
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\104\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\037\060\035\006\003\125\004\003\014\026
-\101\146\146\151\162\155\124\162\165\163\164\040\116\145\164\167
-\157\162\153\151\156\147
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\174\117\004\071\034\324\231\055
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AffirmTrust Premium"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Premium"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\155\214\024\106\261\246\012\356
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\005\106\060\202\003\056\240\003\002\001\002\002\010\155
-\214\024\106\261\246\012\356\060\015\006\011\052\206\110\206\367
-\015\001\001\014\005\000\060\101\061\013\060\011\006\003\125\004
-\006\023\002\125\123\061\024\060\022\006\003\125\004\012\014\013
-\101\146\146\151\162\155\124\162\165\163\164\061\034\060\032\006
-\003\125\004\003\014\023\101\146\146\151\162\155\124\162\165\163
-\164\040\120\162\145\155\151\165\155\060\036\027\015\061\060\060
-\061\062\071\061\064\061\060\063\066\132\027\015\064\060\061\062
-\063\061\061\064\061\060\063\066\132\060\101\061\013\060\011\006
-\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125\004
-\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061\034
-\060\032\006\003\125\004\003\014\023\101\146\146\151\162\155\124
-\162\165\163\164\040\120\162\145\155\151\165\155\060\202\002\042
-\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003
-\202\002\017\000\060\202\002\012\002\202\002\001\000\304\022\337
-\251\137\376\101\335\335\365\237\212\343\366\254\341\074\170\232
-\274\330\360\177\172\240\063\052\334\215\040\133\256\055\157\347
-\223\331\066\160\152\150\317\216\121\243\205\133\147\004\240\020
-\044\157\135\050\202\301\227\127\330\110\051\023\266\341\276\221
-\115\337\205\014\123\030\232\036\044\242\117\217\360\242\205\013
-\313\364\051\177\322\244\130\356\046\115\311\252\250\173\232\331
-\372\070\336\104\127\025\345\370\214\310\331\110\342\015\026\047
-\035\036\310\203\205\045\267\272\252\125\101\314\003\042\113\055
-\221\215\213\346\211\257\146\307\351\377\053\351\074\254\332\322
-\263\303\341\150\234\211\370\172\000\126\336\364\125\225\154\373
-\272\144\335\142\213\337\013\167\062\353\142\314\046\232\233\273
-\252\142\203\114\264\006\172\060\310\051\277\355\006\115\227\271
-\034\304\061\053\325\137\274\123\022\027\234\231\127\051\146\167
-\141\041\061\007\056\045\111\235\030\362\356\363\053\161\214\265
-\272\071\007\111\167\374\357\056\222\220\005\215\055\057\167\173
-\357\103\277\065\273\232\330\371\163\247\054\362\320\127\356\050
-\116\046\137\217\220\150\011\057\270\370\334\006\351\056\232\076
-\121\247\321\042\304\012\247\070\110\154\263\371\377\175\253\206
-\127\343\272\326\205\170\167\272\103\352\110\177\366\330\276\043
-\155\036\277\321\066\154\130\134\361\356\244\031\124\032\365\003
-\322\166\346\341\214\275\074\263\323\110\113\342\310\370\177\222
-\250\166\106\234\102\145\076\244\036\301\007\003\132\106\055\270
-\227\363\267\325\262\125\041\357\272\334\114\000\227\373\024\225
-\047\063\277\350\103\107\106\322\010\231\026\140\073\232\176\322
-\346\355\070\352\354\001\036\074\110\126\111\011\307\114\067\000
-\236\210\016\300\163\341\157\146\351\162\107\060\076\020\345\013
-\003\311\232\102\000\154\305\224\176\141\304\212\337\177\202\032
-\013\131\304\131\062\167\263\274\140\151\126\071\375\264\006\173
-\054\326\144\066\331\275\110\355\204\037\176\245\042\217\052\270
-\102\364\202\267\324\123\220\170\116\055\032\375\201\157\104\327
-\073\001\164\226\102\340\000\342\056\153\352\305\356\162\254\273
-\277\376\352\252\250\370\334\366\262\171\212\266\147\002\003\001
-\000\001\243\102\060\100\060\035\006\003\125\035\016\004\026\004
-\024\235\300\147\246\014\042\331\046\365\105\253\246\145\122\021
-\047\330\105\254\143\060\017\006\003\125\035\023\001\001\377\004
-\005\060\003\001\001\377\060\016\006\003\125\035\017\001\001\377
-\004\004\003\002\001\006\060\015\006\011\052\206\110\206\367\015
-\001\001\014\005\000\003\202\002\001\000\263\127\115\020\142\116
-\072\344\254\352\270\034\257\062\043\310\263\111\132\121\234\166
-\050\215\171\252\127\106\027\325\365\122\366\267\104\350\010\104
-\277\030\204\322\013\200\315\305\022\375\000\125\005\141\207\101
-\334\265\044\236\074\304\330\310\373\160\236\057\170\226\203\040
-\066\336\174\017\151\023\210\245\165\066\230\010\246\306\337\254
-\316\343\130\326\267\076\336\272\363\353\064\100\330\242\201\365
-\170\077\057\325\245\374\331\242\324\136\004\016\027\255\376\101
-\360\345\262\162\372\104\202\063\102\350\055\130\367\126\214\142
-\077\272\102\260\234\014\134\176\056\145\046\134\123\117\000\262
-\170\176\241\015\231\055\215\270\035\216\242\304\260\375\140\320
-\060\244\216\310\004\142\251\304\355\065\336\172\227\355\016\070
-\136\222\057\223\160\245\251\234\157\247\175\023\035\176\306\010
-\110\261\136\147\353\121\010\045\351\346\045\153\122\051\221\234
-\322\071\163\010\127\336\231\006\264\133\235\020\006\341\302\000
-\250\270\034\112\002\012\024\320\301\101\312\373\214\065\041\175
-\202\070\362\251\124\221\031\065\223\224\155\152\072\305\262\320
-\273\211\206\223\350\233\311\017\072\247\172\270\241\360\170\106
-\372\374\067\057\345\212\204\363\337\376\004\331\241\150\240\057
-\044\342\011\225\006\325\225\312\341\044\226\353\174\366\223\005
-\273\355\163\351\055\321\165\071\327\347\044\333\330\116\137\103
-\217\236\320\024\071\277\125\160\110\231\127\061\264\234\356\112
-\230\003\226\060\037\140\006\356\033\043\376\201\140\043\032\107
-\142\205\245\314\031\064\200\157\263\254\032\343\237\360\173\110
-\255\325\001\331\147\266\251\162\223\352\055\146\265\262\270\344
-\075\074\262\357\114\214\352\353\007\277\253\065\232\125\206\274
-\030\246\265\250\136\264\203\154\153\151\100\323\237\334\361\303
-\151\153\271\341\155\011\364\361\252\120\166\012\172\175\172\027
-\241\125\226\102\231\061\011\335\140\021\215\005\060\176\346\216
-\106\321\235\024\332\307\027\344\005\226\214\304\044\265\033\317
-\024\007\262\100\370\243\236\101\206\274\004\320\153\226\310\052
-\200\064\375\277\357\006\243\335\130\305\205\075\076\217\376\236
-\051\340\266\270\011\150\031\034\030\103
-END
-
-# Trust for Certificate "AffirmTrust Premium"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Premium"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\330\246\063\054\340\003\157\261\205\366\143\117\175\152\006\145
-\046\062\050\047
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\304\135\016\110\266\254\050\060\116\012\274\371\070\026\207\127
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\101\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\034\060\032\006\003\125\004\003\014\023
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\155\214\024\106\261\246\012\356
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "AffirmTrust Premium ECC"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Premium ECC"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155\040\105\103\103
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155\040\105\103\103
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\164\227\045\212\307\077\172\124
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\001\376\060\202\001\205\240\003\002\001\002\002\010\164
-\227\045\212\307\077\172\124\060\012\006\010\052\206\110\316\075
-\004\003\003\060\105\061\013\060\011\006\003\125\004\006\023\002
-\125\123\061\024\060\022\006\003\125\004\012\014\013\101\146\146
-\151\162\155\124\162\165\163\164\061\040\060\036\006\003\125\004
-\003\014\027\101\146\146\151\162\155\124\162\165\163\164\040\120
-\162\145\155\151\165\155\040\105\103\103\060\036\027\015\061\060
-\060\061\062\071\061\064\062\060\062\064\132\027\015\064\060\061
-\062\063\061\061\064\062\060\062\064\132\060\105\061\013\060\011
-\006\003\125\004\006\023\002\125\123\061\024\060\022\006\003\125
-\004\012\014\013\101\146\146\151\162\155\124\162\165\163\164\061
-\040\060\036\006\003\125\004\003\014\027\101\146\146\151\162\155
-\124\162\165\163\164\040\120\162\145\155\151\165\155\040\105\103
-\103\060\166\060\020\006\007\052\206\110\316\075\002\001\006\005
-\053\201\004\000\042\003\142\000\004\015\060\136\033\025\235\003
-\320\241\171\065\267\072\074\222\172\312\025\034\315\142\363\234
-\046\134\007\075\345\124\372\243\326\314\022\352\364\024\137\350
-\216\031\253\057\056\110\346\254\030\103\170\254\320\067\303\275
-\262\315\054\346\107\342\032\346\143\270\075\056\057\170\304\117
-\333\364\017\244\150\114\125\162\153\225\035\116\030\102\225\170
-\314\067\074\221\342\233\145\053\051\243\102\060\100\060\035\006
-\003\125\035\016\004\026\004\024\232\257\051\172\300\021\065\065
-\046\121\060\000\303\152\376\100\325\256\326\074\060\017\006\003
-\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006
-\003\125\035\017\001\001\377\004\004\003\002\001\006\060\012\006
-\010\052\206\110\316\075\004\003\003\003\147\000\060\144\002\060
-\027\011\363\207\210\120\132\257\310\300\102\277\107\137\365\154
-\152\206\340\304\047\164\344\070\123\327\005\177\033\064\343\306
-\057\263\312\011\074\067\235\327\347\270\106\361\375\241\342\161
-\002\060\102\131\207\103\324\121\337\272\323\011\062\132\316\210
-\176\127\075\234\137\102\153\365\007\055\265\360\202\223\371\131
-\157\256\144\372\130\345\213\036\343\143\276\265\201\315\157\002
-\214\171
-END
-
-# Trust for Certificate "AffirmTrust Premium ECC"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "AffirmTrust Premium ECC"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\270\043\153\000\057\035\026\206\123\001\125\154\021\244\067\312
-\353\377\303\273
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\144\260\011\125\317\261\325\231\342\276\023\253\246\135\352\115
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\105\061\013\060\011\006\003\125\004\006\023\002\125\123\061
-\024\060\022\006\003\125\004\012\014\013\101\146\146\151\162\155
-\124\162\165\163\164\061\040\060\036\006\003\125\004\003\014\027
-\101\146\146\151\162\155\124\162\165\163\164\040\120\162\145\155
-\151\165\155\040\105\103\103
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\010\164\227\045\212\307\077\172\124
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
-#
-# Certificate "Certum Trusted Network CA"
-#
-CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Certum Trusted Network CA"
-CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-CKA_SUBJECT MULTILINE_OCTAL
-\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
-\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
-\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
-\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
-\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
-\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
-\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
-END
-CKA_ID UTF8 "0"
-CKA_ISSUER MULTILINE_OCTAL
-\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
-\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
-\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
-\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
-\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
-\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
-\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\004\104\300
-END
-CKA_VALUE MULTILINE_OCTAL
-\060\202\003\273\060\202\002\243\240\003\002\001\002\002\003\004
-\104\300\060\015\006\011\052\206\110\206\367\015\001\001\005\005
-\000\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
-\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
-\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
-\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
-\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
-\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
-\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
-\101\060\036\027\015\060\070\061\060\062\062\061\062\060\067\063
-\067\132\027\015\062\071\061\062\063\061\061\062\060\067\063\067
-\132\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114
-\061\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145
-\164\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040
-\123\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103
-\145\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164
-\151\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060
-\040\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124
-\162\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103
-\101\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001
-\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001
-\001\000\343\373\175\243\162\272\302\360\311\024\207\365\153\001
-\116\341\156\100\007\272\155\047\135\177\367\133\055\263\132\307
-\121\137\253\244\062\246\141\207\266\156\017\206\322\060\002\227
-\370\327\151\127\241\030\071\135\152\144\171\306\001\131\254\074
-\061\112\070\174\322\004\322\113\050\350\040\137\073\007\242\314
-\115\163\333\363\256\117\307\126\325\132\247\226\211\372\363\253
-\150\324\043\206\131\047\317\011\047\274\254\156\162\203\034\060
-\162\337\340\242\351\322\341\164\165\031\275\052\236\173\025\124
-\004\033\327\103\071\255\125\050\305\342\032\273\364\300\344\256
-\070\111\063\314\166\205\237\071\105\322\244\236\362\022\214\121
-\370\174\344\055\177\365\254\137\353\026\237\261\055\321\272\314
-\221\102\167\114\045\311\220\070\157\333\360\314\373\216\036\227
-\131\076\325\140\116\346\005\050\355\111\171\023\113\272\110\333
-\057\371\162\323\071\312\376\037\330\064\162\365\264\100\317\061
-\001\303\354\336\021\055\027\135\037\270\120\321\136\031\247\151
-\336\007\063\050\312\120\225\371\247\124\313\124\206\120\105\251
-\371\111\002\003\001\000\001\243\102\060\100\060\017\006\003\125
-\035\023\001\001\377\004\005\060\003\001\001\377\060\035\006\003
-\125\035\016\004\026\004\024\010\166\315\313\007\377\044\366\305
-\315\355\273\220\274\342\204\067\106\165\367\060\016\006\003\125
-\035\017\001\001\377\004\004\003\002\001\006\060\015\006\011\052
-\206\110\206\367\015\001\001\005\005\000\003\202\001\001\000\246
-\250\255\042\316\001\075\246\243\377\142\320\110\235\213\136\162
-\260\170\104\343\334\034\257\011\375\043\110\372\275\052\304\271
-\125\004\265\020\243\215\047\336\013\202\143\320\356\336\014\067
-\171\101\133\042\262\260\232\101\134\246\160\340\324\320\167\313
-\043\323\000\340\154\126\057\341\151\015\015\331\252\277\041\201
-\120\331\006\245\250\377\225\067\320\252\376\342\263\365\231\055
-\105\204\212\345\102\011\327\164\002\057\367\211\330\231\351\274
-\047\324\107\215\272\015\106\034\167\317\024\244\034\271\244\061
-\304\234\050\164\003\064\377\063\031\046\245\351\015\164\267\076
-\227\306\166\350\047\226\243\146\335\341\256\362\101\133\312\230
-\126\203\163\160\344\206\032\322\061\101\272\057\276\055\023\132
-\166\157\116\350\116\201\016\077\133\003\042\240\022\276\146\130
-\021\112\313\003\304\264\052\052\055\226\027\340\071\124\274\110
-\323\166\047\235\232\055\006\246\311\354\071\322\253\333\237\232
-\013\047\002\065\051\261\100\225\347\371\350\234\125\210\031\106
-\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054
-END
-
-# Trust for Certificate "Certum Trusted Network CA"
-CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-CKA_TOKEN CK_BBOOL CK_TRUE
-CKA_PRIVATE CK_BBOOL CK_FALSE
-CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "Certum Trusted Network CA"
-CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-\007\340\062\340\040\267\054\077\031\057\006\050\242\131\072\031
-\247\017\006\236
-END
-CKA_CERT_MD5_HASH MULTILINE_OCTAL
-\325\351\201\100\305\030\151\374\106\054\211\165\142\017\252\170
-END
-CKA_ISSUER MULTILINE_OCTAL
-\060\176\061\013\060\011\006\003\125\004\006\023\002\120\114\061
-\042\060\040\006\003\125\004\012\023\031\125\156\151\172\145\164
-\157\040\124\145\143\150\156\157\154\157\147\151\145\163\040\123
-\056\101\056\061\047\060\045\006\003\125\004\013\023\036\103\145
-\162\164\165\155\040\103\145\162\164\151\146\151\143\141\164\151
-\157\156\040\101\165\164\150\157\162\151\164\171\061\042\060\040
-\006\003\125\004\003\023\031\103\145\162\164\165\155\040\124\162
-\165\163\164\145\144\040\116\145\164\167\157\162\153\040\103\101
-END
-CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\002\003\004\104\300
-END
-CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/security/nss/lib/ckfw/builtins/nssckbi.h b/security/nss/lib/ckfw/builtins/nssckbi.h
index 3232c5f79a01..c9e57aaad063 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.h
+++ b/security/nss/lib/ckfw/builtins/nssckbi.h
@@ -77,8 +77,8 @@
  * of the comment in the CK_VERSION type definition.
  */
 #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 83
-#define NSS_BUILTINS_LIBRARY_VERSION "1.83"
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 81
+#define NSS_BUILTINS_LIBRARY_VERSION "1.81"
 
 /* These version numbers detail the semantic changes to the ckfw engine. */
 #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/security/nss/lib/cryptohi/seckey.c b/security/nss/lib/cryptohi/seckey.c
index 3afc83541ef9..e326fc6963f1 100644
--- a/security/nss/lib/cryptohi/seckey.c
+++ b/security/nss/lib/cryptohi/seckey.c
@@ -460,7 +460,7 @@ done:
  *    - If the cert does not have PQG parameters, obtain them from the issuer.
  *    - A valid cert chain cannot have a DSA or Fortezza cert without
  *      pqg parameters that has a parent that is not a DSA or Fortezza cert.
- *    - pqg parameters are stored in two different formats: the standard
+ *    - pqg paramters are stored in two different formats: the standard
  *      DER encoded format and the fortezza-only wrapped format.  The params
  *      should be copied from issuer to subject cert without modifying the
  *      formats.  The public key extraction code will deal with the different
@@ -1000,15 +1000,6 @@ seckey_GetKeyType (SECOidTag tag) {
       case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
 	keyType = ecKey;
 	break;
-      /* accommodate applications that hand us a signature type when they 
-	* should be handing us a cipher type */
-      case SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION:
-      case SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION:
-      case SEC_OID_PKCS1_SHA256_WITH_RSA_ENCRYPTION:
-      case SEC_OID_PKCS1_SHA384_WITH_RSA_ENCRYPTION:
-      case SEC_OID_PKCS1_SHA512_WITH_RSA_ENCRYPTION:
-	keyType = rsaKey;
-	break;
       default:
 	keyType = nullKey;
     }
@@ -1196,7 +1187,7 @@ CERT_ExtractPublicKey(CERTCertificate *cert)
 
 /*
  * Get the public key for the fortezza KMID. NOTE this requires the
- * PQG parameters to be set. We probably should have a fortezza call that 
+ * PQG paramters to be set. We probably should have a fortezza call that 
  * just extracts the kmid for us directly so this function can work
  * without having the whole cert chain
  */
@@ -2234,7 +2225,7 @@ SECKEY_DestroyPrivateKeyInfo(SECKEYPrivateKeyInfo *pvk,
 	    SECITEM_ZfreeItem(&pvk->version, PR_FALSE);
 	    SECITEM_ZfreeItem(&pvk->privateKey, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&pvk->algorithm, PR_FALSE);
-	    PORT_Memset((char *)pvk, 0, sizeof(*pvk));
+	    PORT_Memset((char *)pvk, 0, sizeof(pvk));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(pvk);
 	    }
@@ -2264,7 +2255,7 @@ SECKEY_DestroyEncryptedPrivateKeyInfo(SECKEYEncryptedPrivateKeyInfo *epki,
 	} else {
 	    SECITEM_ZfreeItem(&epki->encryptedData, PR_FALSE);
 	    SECOID_DestroyAlgorithmID(&epki->algorithm, PR_FALSE);
-	    PORT_Memset((char *)epki, 0, sizeof(*epki));
+	    PORT_Memset((char *)epki, 0, sizeof(epki));
 	    if(freeit == PR_TRUE) {
 		PORT_Free(epki);
 	    }
@@ -2334,24 +2325,19 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     SECKEYPublicKey *pubk = NULL;
     SECStatus rv = SECFailure;
     SECItem newDerKey;
-    PRArenaPool *arena = NULL;
 
     if (!derKey) {
         return NULL;
     } 
 
-    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-    if (arena == NULL) {
-	PORT_SetError(SEC_ERROR_NO_MEMORY);
+    pubk = PORT_ZNew(SECKEYPublicKey);
+    if(pubk == NULL) {
         goto finish;
     }
-
-    pubk = PORT_ArenaZNew(arena, SECKEYPublicKey);
-    if (pubk == NULL) {
+    pubk->arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (NULL == pubk->arena) {
         goto finish;
     }
-    pubk->arena = arena;
-
     rv = SECITEM_CopyItem(pubk->arena, &newDerKey, derKey);
     if (SECSuccess != rv) {
         goto finish;
@@ -2382,10 +2368,11 @@ SECKEY_ImportDERPublicKey(SECItem *derKey, CK_KEY_TYPE type)
     }
 
 finish:
-    if (rv != SECSuccess) {
-        if (arena != NULL) {
-            PORT_FreeArena(arena, PR_TRUE);
+    if( rv != SECSuccess && pubk != NULL) {
+        if (pubk->arena) {
+            PORT_FreeArena(pubk->arena, PR_TRUE);
         }
+        PORT_Free(pubk);
         pubk = NULL;
     }
     return pubk;
diff --git a/security/nss/lib/freebl/blapit.h b/security/nss/lib/freebl/blapit.h
index af4ed12b6033..704f514886d8 100644
--- a/security/nss/lib/freebl/blapit.h
+++ b/security/nss/lib/freebl/blapit.h
@@ -38,7 +38,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: blapit.h,v 1.22.22.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: blapit.h,v 1.22 2008/12/17 06:09:12 nelson%bolyard.com Exp $ */
 
 #ifndef _BLAPIT_H_
 #define _BLAPIT_H_
@@ -115,10 +115,6 @@
 #define AES_KEY_WRAP_BLOCK_SIZE  8  /* bytes */
 #define AES_BLOCK_SIZE          16  /* bytes */
 
-#define AES_128_KEY_LENGTH      16  /* bytes */
-#define AES_192_KEY_LENGTH      24  /* bytes */
-#define AES_256_KEY_LENGTH      32  /* bytes */
-
 #define CAMELLIA_BLOCK_SIZE          16  /* bytes */
 
 #define SEED_BLOCK_SIZE 16              /* bytes */
diff --git a/security/nss/lib/freebl/mpi/mpi-config.h b/security/nss/lib/freebl/mpi/mpi-config.h
index 08e5c5cc2d03..00a0acfa0bd1 100644
--- a/security/nss/lib/freebl/mpi/mpi-config.h
+++ b/security/nss/lib/freebl/mpi/mpi-config.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi-config.h,v 1.5.198.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
+/* $Id: mpi-config.h,v 1.5 2004/04/25 15:03:10 gerv%gerv.net Exp $ */
 
 #ifndef MPI_CONFIG_H_
 #define MPI_CONFIG_H_
@@ -100,7 +100,7 @@
 #endif
 
 #ifndef MP_MACRO
-#define MP_MACRO      1  /* use macros for frequent calls?      */
+#define MP_MACRO      0  /* use macros for frequent calls?      */
 #endif
 
 #ifndef MP_SQUARE
diff --git a/security/nss/lib/freebl/mpi/mpi.c b/security/nss/lib/freebl/mpi/mpi.c
index 25c96564040c..cfcfe60e5c17 100644
--- a/security/nss/lib/freebl/mpi/mpi.c
+++ b/security/nss/lib/freebl/mpi/mpi.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: mpi.c,v 1.47.2.1 2011/04/07 22:31:40 wtc%google.com Exp $ */
+/* $Id: mpi.c,v 1.47 2010/05/02 22:36:41 nelson%bolyard.com Exp $ */
 
 #include "mpi-priv.h"
 #if defined(OSF1)
@@ -206,6 +206,7 @@ mp_err mp_copy(const mp_int *from, mp_int *to)
   if(from == to)
     return MP_OKAY;
 
+  ++mp_copies;
   { /* copy */
     mp_digit   *tmp;
 
@@ -2863,7 +2864,6 @@ void s_mp_copy(const mp_digit *sp, mp_digit *dp, mp_size count)
 #else
   memcpy(dp, sp, count * sizeof(mp_digit));
 #endif
-  ++mp_copies;
 
 } /* end s_mp_copy() */
 #endif
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
index ed0de47815b6..86e16e362966 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_gas.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
+.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
 
 # ------------------------------------------------------------------------
 #
@@ -415,7 +415,7 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
+.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
 
 # Magic indicating no need for an executable stack
 .section .note.GNU-stack, "", @progbits
diff --git a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
index 242c631b1301..ac71074154de 100644
--- a/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
+++ b/security/nss/lib/freebl/mpi/mpi_amd64_sun.s
@@ -202,7 +202,7 @@
 	movq	%r9, %rax
 	ret
 
-.size s_mpv_mul_set_vec64, .-s_mpv_mul_set_vec64
+.size s_mpv_mul_set_vec64, [.-s_mpv_mul_set_vec64]
 
 / ------------------------------------------------------------------------
 /
@@ -415,4 +415,4 @@
 	movq	%r9, %rax
 	ret
         
-.size s_mpv_mul_add_vec64, .-s_mpv_mul_add_vec64
+.size s_mpv_mul_add_vec64, [.-s_mpv_mul_add_vec64]
diff --git a/security/nss/lib/freebl/nsslowhash.c b/security/nss/lib/freebl/nsslowhash.c
index db5d99b75b2f..e0a2a21c1177 100644
--- a/security/nss/lib/freebl/nsslowhash.c
+++ b/security/nss/lib/freebl/nsslowhash.c
@@ -33,7 +33,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nsslowhash.c,v 1.4.8.1 2011/01/20 18:41:51 emaldona%redhat.com Exp $ */
+/* $Id: nsslowhash.c,v 1.4 2009/06/09 23:34:06 rrelyea%redhat.com Exp $ */
 
 #include "stubs.h"
 #include "prtypes.h"
@@ -275,7 +275,7 @@ static int nsslow_GetFIPSEnabled(void) {
 
     f = fopen("/proc/sys/crypto/fips_enabled", "r");
     if (!f)
-        return 0;
+        return 1;
 
     size = fread(&d, 1, 1, f);
     fclose(f);
diff --git a/security/nss/lib/freebl/rsa.c b/security/nss/lib/freebl/rsa.c
index a8599771202e..5c443ca05861 100644
--- a/security/nss/lib/freebl/rsa.c
+++ b/security/nss/lib/freebl/rsa.c
@@ -37,7 +37,7 @@
 /*
  * RSA key generation, public key op, private key op.
  *
- * $Id: rsa.c,v 1.39.22.2 2011/03/30 18:39:44 rrelyea%redhat.com Exp $
+ * $Id: rsa.c,v 1.39.22.1 2010/11/16 19:06:38 rrelyea%redhat.com Exp $
  */
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -67,23 +67,11 @@
 */
 #define MAX_KEY_GEN_ATTEMPTS 10
 
-/* Blinding Parameters max cache size  */
-#define RSA_BLINDING_PARAMS_MAX_CACHE_SIZE 20
-
 /* exponent should not be greater than modulus */
 #define BAD_RSA_KEY_SIZE(modLen, expLen) \
     ((expLen) > (modLen) || (modLen) > RSA_MAX_MODULUS_BITS/8 || \
     (expLen) > RSA_MAX_EXPONENT_BITS/8)
 
-struct blindingParamsStr;
-typedef struct blindingParamsStr blindingParams;
-
-struct blindingParamsStr {
-    blindingParams *next;
-    mp_int         f, g;             /* blinding parameter                 */
-    int            counter;          /* number of remaining uses of (f, g) */
-};
-
 /*
 ** RSABlindingParamsStr
 **
@@ -97,10 +85,9 @@ struct RSABlindingParamsStr
     /* Blinding-specific parameters */
     PRCList   link;                  /* link to list of structs            */
     SECItem   modulus;               /* list element "key"                 */
-    blindingParams *free, *bp;       /* Blinding parameters queue          */
-    blindingParams array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE];
+    mp_int    f, g;                  /* Blinding parameters                */
+    int       counter;               /* number of remaining uses of (f, g) */
 };
-typedef struct RSABlindingParamsStr RSABlindingParams;
 
 /*
 ** RSABlindingParamsListStr
@@ -113,8 +100,6 @@ typedef struct RSABlindingParamsStr RSABlindingParams;
 struct RSABlindingParamsListStr
 {
     PZLock  *lock;   /* Lock for the list   */
-    PRCondVar *cVar; /* Condidtion Variable */
-    int  waitCount;  /* Number of threads waiting on cVar */
     PRCList  head;   /* Pointer to the list */
 };
 
@@ -286,7 +271,7 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return NULL;
     }
-    key = PORT_ArenaZNew(arena, RSAPrivateKey);
+    key = (RSAPrivateKey *)PORT_ArenaZAlloc(arena, sizeof(RSAPrivateKey));
     if (!key) {
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	PORT_FreeArena(arena, PR_TRUE);
@@ -1041,25 +1026,18 @@ init_blinding_params_list(void)
 	PORT_SetError(SEC_ERROR_NO_MEMORY);
 	return PR_FAILURE;
     }
-    blindingParamsList.cVar = PR_NewCondVar( blindingParamsList.lock );
-    if (!blindingParamsList.cVar) {
-	PORT_SetError(SEC_ERROR_NO_MEMORY);
-	return PR_FAILURE;
-    }
-    blindingParamsList.waitCount = 0;
     PR_INIT_CLIST(&blindingParamsList.head);
     return PR_SUCCESS;
 }
 
 static SECStatus
-generate_blinding_params(RSAPrivateKey *key, mp_int* f, mp_int* g, mp_int *n, 
-                         unsigned int modLen)
+generate_blinding_params(struct RSABlindingParamsStr *rsabp, 
+                         RSAPrivateKey *key, mp_int *n, unsigned int modLen)
 {
     SECStatus rv = SECSuccess;
     mp_int e, k;
     mp_err err = MP_OKAY;
     unsigned char *kb = NULL;
-
     MP_DIGITS(&e) = 0;
     MP_DIGITS(&k) = 0;
     CHECK_MPI_OK( mp_init(&e) );
@@ -1076,9 +1054,11 @@ generate_blinding_params(RSAPrivateKey *key, mp_int* f, mp_int* g, mp_int *n,
     /* k < n */
     CHECK_MPI_OK( mp_mod(&k, n, &k) );
     /* f = k**e mod n */
-    CHECK_MPI_OK( mp_exptmod(&k, &e, n, f) );
+    CHECK_MPI_OK( mp_exptmod(&k, &e, n, &rsabp->f) );
     /* g = k**-1 mod n */
-    CHECK_MPI_OK( mp_invmod(&k, n, g) );
+    CHECK_MPI_OK( mp_invmod(&k, n, &rsabp->g) );
+    /* Initialize the counter for this (f, g) */
+    rsabp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
 cleanup:
     if (kb)
 	PORT_ZFree(kb, modLen);
@@ -1092,202 +1072,114 @@ cleanup:
 }
 
 static SECStatus
-init_blinding_params(RSABlindingParams *rsabp, RSAPrivateKey *key,
+init_blinding_params(struct RSABlindingParamsStr *rsabp, RSAPrivateKey *key,
                      mp_int *n, unsigned int modLen)
 {
-    blindingParams * bp = rsabp->array;
     SECStatus rv = SECSuccess;
     mp_err err = MP_OKAY;
-    int i = 0;
-
-    /* Initialize the list pointer for the element */
-    PR_INIT_CLIST(&rsabp->link);
-    for (i = 0; i < RSA_BLINDING_PARAMS_MAX_CACHE_SIZE; ++i, ++bp) {
-    	bp->next = bp + 1;
-	MP_DIGITS(&bp->f) = 0;
-	MP_DIGITS(&bp->g) = 0;
-	bp->counter = 0;
-    }
-    /* The last bp->next value was initialized with out
-     * of rsabp->array pointer and must be set to NULL 
-     */ 
-    rsabp->array[RSA_BLINDING_PARAMS_MAX_CACHE_SIZE - 1].next = NULL;
-    
-    bp          = rsabp->array;
-    rsabp->bp   = NULL;
-    rsabp->free = bp;
-
+    MP_DIGITS(&rsabp->f) = 0;
+    MP_DIGITS(&rsabp->g) = 0;
+    /* initialize blinding parameters */
+    CHECK_MPI_OK( mp_init(&rsabp->f) );
+    CHECK_MPI_OK( mp_init(&rsabp->g) );
     /* List elements are keyed using the modulus */
     SECITEM_CopyItem(NULL, &rsabp->modulus, &key->modulus);
-
+    CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
     return SECSuccess;
+cleanup:
+    mp_clear(&rsabp->f);
+    mp_clear(&rsabp->g);
+    if (err) {
+	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
+    }
+    return rv;
 }
 
 static SECStatus
 get_blinding_params(RSAPrivateKey *key, mp_int *n, unsigned int modLen,
                     mp_int *f, mp_int *g)
 {
-    RSABlindingParams *rsabp           = NULL;
-    blindingParams    *bpUnlinked      = NULL;
-    blindingParams    *bp, *prevbp     = NULL;
-    PRCList           *el;
-    SECStatus          rv              = SECSuccess;
-    mp_err             err             = MP_OKAY;
-    int                cmp             = -1;
-    PRBool             holdingLock     = PR_FALSE;
-
-    do {
-	if (blindingParamsList.lock == NULL) {
-	    PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
-	    return SECFailure;
-	}
-	/* Acquire the list lock */
-	PZ_Lock(blindingParamsList.lock);
-	holdingLock = PR_TRUE;
-
-	/* Walk the list looking for the private key */
-	for (el = PR_NEXT_LINK(&blindingParamsList.head);
-	     el != &blindingParamsList.head;
-	     el = PR_NEXT_LINK(el)) {
-	    rsabp = (RSABlindingParams *)el;
-	    cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
-	    if (cmp >= 0) {
-		/* The key is found or not in the list. */
-		break;
+    SECStatus rv = SECSuccess;
+    mp_err err = MP_OKAY;
+    int cmp;
+    PRCList *el;
+    struct RSABlindingParamsStr *rsabp = NULL;
+    /* Init the list if neccessary (the init function is only called once!) */
+    if (blindingParamsList.lock == NULL) {
+        PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
+        return SECFailure;
+    }
+    /* Acquire the list lock */
+    PZ_Lock(blindingParamsList.lock);
+    /* Walk the list looking for the private key */
+    for (el = PR_NEXT_LINK(&blindingParamsList.head);
+         el != &blindingParamsList.head;
+         el = PR_NEXT_LINK(el)) {
+	rsabp = (struct RSABlindingParamsStr *)el;
+	cmp = SECITEM_CompareItem(&rsabp->modulus, &key->modulus);
+	if (cmp == 0) {
+	    /* Check the usage counter for the parameters */
+	    if (--rsabp->counter <= 0) {
+		/* Regenerate the blinding parameters */
+		CHECK_SEC_OK( generate_blinding_params(rsabp, key, n, modLen) );
 	    }
-	}
-
-	if (cmp) {
-	    /* At this point, the key is not in the list.  el should point to 
-	    ** the list element before which this key should be inserted. 
-	    */
-	    rsabp = PORT_ZNew(RSABlindingParams);
-	    if (!rsabp) {
-		PORT_SetError(SEC_ERROR_NO_MEMORY);
-		goto cleanup;
-	    }
-
-	    rv = init_blinding_params(rsabp, key, n, modLen);
-	    if (rv != SECSuccess) {
-		PORT_ZFree(rsabp, sizeof(RSABlindingParams));
-		goto cleanup;
-	    }
-
-	    /* Insert the new element into the list
-	    ** If inserting in the middle of the list, el points to the link
-	    ** to insert before.  Otherwise, the link needs to be appended to
-	    ** the end of the list, which is the same as inserting before the
-	    ** head (since el would have looped back to the head).
-	    */
-	    PR_INSERT_BEFORE(&rsabp->link, el);
-	}
-
-	/* We've found (or created) the RSAblindingParams struct for this key.
-	 * Now, search its list of ready blinding params for a usable one.
-	 */
-	while (0 != (bp = rsabp->bp)) {
-	    if (--(bp->counter) > 0) {
-		/* Found a match and there are still remaining uses left */
-		/* Return the parameters */
-		CHECK_MPI_OK( mp_copy(&bp->f, f) );
-		CHECK_MPI_OK( mp_copy(&bp->g, g) );
-
-		PZ_Unlock(blindingParamsList.lock); 
-		return SECSuccess;
-	    }
-	    /* exhausted this one, give its values to caller, and
-	     * then retire it.
-	     */
-	    mp_exch(&bp->f, f);
-	    mp_exch(&bp->g, g);
-	    mp_clear( &bp->f );
-	    mp_clear( &bp->g );
-	    bp->counter = 0;
-	    /* Move to free list */
-	    rsabp->bp   = bp->next;
-	    bp->next    = rsabp->free;
-	    rsabp->free = bp;
-	    /* In case there're threads waiting for new blinding
-	     * value - notify 1 thread the value is ready
-	     */
-	    if (blindingParamsList.waitCount > 0) {
-		PR_NotifyCondVar( blindingParamsList.cVar );
-		blindingParamsList.waitCount--;
-	    }
-	    PZ_Unlock(blindingParamsList.lock); 
+	    /* Return the parameters */
+	    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
+	    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
+	    /* Now that the params are located, release the list lock. */
+	    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
 	    return SECSuccess;
+	} else if (cmp > 0) {
+	    /* The key is not in the list.  Break to param creation. */
+	    break;
 	}
-	/* We did not find a usable set of blinding params.  Can we make one?
-	/* Find a free bp struct. */
-	prevbp = NULL;
-	if ((bp = rsabp->free) != NULL) {
-	    /* unlink this bp */
-	    rsabp->free  = bp->next;
-	    bp->next     = NULL;
-	    bpUnlinked   = bp;  /* In case we fail */
-
-	    PZ_Unlock(blindingParamsList.lock); 
-	    holdingLock = PR_FALSE;
-	    /* generate blinding parameter values for the current thread */
-	    CHECK_SEC_OK( generate_blinding_params(key, f, g, n, modLen ) );
-
-	    /* put the blinding parameter values into cache */
-	    CHECK_MPI_OK( mp_init( &bp->f) );
-	    CHECK_MPI_OK( mp_init( &bp->g) );
-	    CHECK_MPI_OK( mp_copy( f, &bp->f) );
-	    CHECK_MPI_OK( mp_copy( g, &bp->g) );
-
-	    /* Put this at head of queue of usable params. */
-	    PZ_Lock(blindingParamsList.lock);
-	    holdingLock = PR_TRUE;
-	    /* initialize RSABlindingParamsStr */
-	    bp->counter = RSA_BLINDING_PARAMS_MAX_REUSE;
-	    bp->next    = rsabp->bp;
-	    rsabp->bp   = bp;
-	    bpUnlinked  = NULL;
-	    /* In case there're threads waiting for new blinding value
-	     * just notify them the value is ready
-	     */
-	    if (blindingParamsList.waitCount > 0) {
-		PR_NotifyAllCondVar( blindingParamsList.cVar );
-		blindingParamsList.waitCount = 0;
-	    }
-	    PZ_Unlock(blindingParamsList.lock);
-	    return SECSuccess;
-	}
-	/* Here, there are no usable blinding parameters available,
-	 * and no free bp blocks, presumably because they're all 
-	 * actively having parameters generated for them.
-	 * So, we need to wait here and not eat up CPU until some 
-	 * change happens. 
-	 */
-	blindingParamsList.waitCount++;
-	PR_WaitCondVar( blindingParamsList.cVar, PR_INTERVAL_NO_TIMEOUT );
-	PZ_Unlock(blindingParamsList.lock); 
-	holdingLock = PR_FALSE;
-    } while (1);
-
+    }
+    /* At this point, the key is not in the list.  el should point to the
+    ** list element that this key should be inserted before.  NOTE: the list
+    ** lock is still held, so there cannot be a race condition here.
+    */
+    rsabp = (struct RSABlindingParamsStr *)
+              PORT_ZAlloc(sizeof(struct RSABlindingParamsStr));
+    if (!rsabp) {
+	PORT_SetError(SEC_ERROR_NO_MEMORY);
+	goto cleanup;
+    }
+    /* Initialize the list pointer for the element */
+    PR_INIT_CLIST(&rsabp->link);
+    /* Initialize the blinding parameters 
+    ** This ties up the list lock while doing some heavy, element-specific
+    ** operations, but we don't want to insert the element until it is valid,
+    ** which requires computing the blinding params.  If this proves costly,
+    ** it could be done after the list lock is released, and then if it fails
+    ** the lock would have to be reobtained and the invalid element removed.
+    */
+    rv = init_blinding_params(rsabp, key, n, modLen);
+    if (rv != SECSuccess) {
+	PORT_ZFree(rsabp, sizeof(struct RSABlindingParamsStr));
+	goto cleanup;
+    }
+    /* Insert the new element into the list
+    ** If inserting in the middle of the list, el points to the link
+    ** to insert before.  Otherwise, the link needs to be appended to
+    ** the end of the list, which is the same as inserting before the
+    ** head (since el would have looped back to the head).
+    */
+    PR_INSERT_BEFORE(&rsabp->link, el);
+    /* Return the parameters */
+    CHECK_MPI_OK( mp_copy(&rsabp->f, f) );
+    CHECK_MPI_OK( mp_copy(&rsabp->g, g) );
+    /* Release the list lock */
+    PZ_Unlock(blindingParamsList.lock); /* XXX when fails? */
+    return SECSuccess;
 cleanup:
-    /* It is possible to reach this after the lock is already released.  */
-    if (bpUnlinked) {
-	if (!holdingLock) {
-	    PZ_Lock(blindingParamsList.lock);
-	    holdingLock = PR_TRUE;
-	}
-	bp = bpUnlinked;
-	mp_clear( &bp->f );
-	mp_clear( &bp->g );
-	bp->counter = 0;
-    	/* Must put the unlinked bp back on the free list */
-	bp->next    = rsabp->free;
-	rsabp->free = bp;
-    }
-    if (holdingLock) {
-	PZ_Unlock(blindingParamsList.lock);
-	holdingLock = PR_FALSE;
-    }
+    /* It is possible to reach this after the lock is already released.
+    ** Ignore the error in that case.
+    */
+    PZ_Unlock(blindingParamsList.lock);
     if (err) {
 	MP_TO_SEC_ERROR(err);
+	rv = SECFailure;
     }
     return SECFailure;
 }
@@ -1549,31 +1441,22 @@ SECStatus BL_Init(void)
 /* cleanup at shutdown */
 void RSA_Cleanup(void)
 {
-    blindingParams * bp = NULL;
     if (!coBPInit.initialized)
 	return;
 
-    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head)) {
-	RSABlindingParams *rsabp = 
-	    (RSABlindingParams *)PR_LIST_HEAD(&blindingParamsList.head);
+    while (!PR_CLIST_IS_EMPTY(&blindingParamsList.head))
+    {
+	struct RSABlindingParamsStr * rsabp = (struct RSABlindingParamsStr *)
+	    PR_LIST_HEAD(&blindingParamsList.head);
 	PR_REMOVE_LINK(&rsabp->link);
-	/* clear parameters cache */
-	while (rsabp->bp != NULL) {
-	    bp = rsabp->bp;
-	    rsabp->bp = rsabp->bp->next;
-	    mp_clear( &bp->f );
-	    mp_clear( &bp->g );
-	}
+	mp_clear(&rsabp->f);
+	mp_clear(&rsabp->g);
 	SECITEM_FreeItem(&rsabp->modulus,PR_FALSE);
 	PORT_Free(rsabp);
     }
 
-    if (blindingParamsList.cVar) {
-	PR_DestroyCondVar(blindingParamsList.cVar);
-	blindingParamsList.cVar = NULL;
-    }
-
-    if (blindingParamsList.lock) {
+    if (blindingParamsList.lock)
+    {
 	SKIP_AFTER_FORK(PZ_DestroyLock(blindingParamsList.lock));
 	blindingParamsList.lock = NULL;
     }
diff --git a/security/nss/lib/freebl/sha512.c b/security/nss/lib/freebl/sha512.c
index 567586712bcb..91b446e59129 100644
--- a/security/nss/lib/freebl/sha512.c
+++ b/security/nss/lib/freebl/sha512.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sha512.c,v 1.14.6.2 2011/03/30 22:45:05 wtc%google.com Exp $ */
+/* $Id: sha512.c,v 1.14.6.1 2010/11/18 18:32:52 kaie%kuix.de Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ -135,7 +135,7 @@ static __inline__ PRUint32 swap4b(PRUint32 value)
 #define SHA_HTONL(x) swap4b(x)
 #define BYTESWAP4(x)  x = SHA_HTONL(x)
 
-#else
+#else /* neither windows nor Linux PC */
 #define SWAP4MASK  0x00FF00FF
 #define SHA_HTONL(x) (t1 = (x), t1 = (t1 << 16) | (t1 >> 16), \
                       ((t1 & SWAP4MASK) << 8) | ((t1 >> 8) & SWAP4MASK))
diff --git a/security/nss/lib/freebl/stubs.c b/security/nss/lib/freebl/stubs.c
index 02d3f04518c2..7697533d88f3 100644
--- a/security/nss/lib/freebl/stubs.c
+++ b/security/nss/lib/freebl/stubs.c
@@ -63,7 +63,6 @@
 #include <prsystem.h>
 #include <prinrval.h>
 #include <prtime.h>
-#include <prcvar.h>
 #include <secasn1.h>
 #include <secoid.h>
 #include <secdig.h>
@@ -151,15 +150,11 @@ STUB_DECLARE(void,PR_Assert,(const char *s, const char *file, PRIntn ln));
 STUB_DECLARE(PRStatus,PR_CallOnce,(PRCallOnceType *once, PRCallOnceFN func));
 STUB_DECLARE(PRStatus,PR_Close,(PRFileDesc *fd));
 STUB_DECLARE(void,PR_DestroyLock,(PRLock *lock));
-STUB_DECLARE(void,PR_DestroyCondVar,(PRCondVar *cvar));
 STUB_DECLARE(void,PR_Free,(void *ptr));
 STUB_DECLARE(char * ,PR_GetLibraryFilePathname,(const char *name,
 			PRFuncPtr addr));
 STUB_DECLARE(void,PR_Lock,(PRLock *lock));
-STUB_DECLARE(PRCondVar *,PR_NewCondVar,(PRLock *lock));
 STUB_DECLARE(PRLock *,PR_NewLock,(void));
-STUB_DECLARE(PRStatus,PR_NotifyCondVar,(PRCondVar *cvar));
-STUB_DECLARE(PRStatus,PR_NotifyAllCondVar,(PRCondVar *cvar));
 STUB_DECLARE(PRFileDesc *,PR_Open,(const char *name, PRIntn flags,
 			 PRIntn mode));
 STUB_DECLARE(PRInt32,PR_Read,(PRFileDesc *fd, void *buf, PRInt32 amount));
@@ -167,8 +162,6 @@ STUB_DECLARE(PROffset32,PR_Seek,(PRFileDesc *fd, PROffset32 offset,
 			PRSeekWhence whence));
 STUB_DECLARE(PRStatus,PR_Sleep,(PRIntervalTime ticks));
 STUB_DECLARE(PRStatus,PR_Unlock,(PRLock *lock));
-STUB_DECLARE(PRStatus,PR_WaitCondVar,(PRCondVar *cvar,
-			PRIntervalTime timeout));
 
 STUB_DECLARE(SECItem *,SECITEM_AllocItem_Util,(PRArenaPool *arena, 
 			SECItem *item,unsigned int len));
@@ -437,48 +430,6 @@ PR_DestroyLock_stub(PRLock *lock)
     return;
 }
 
-extern PRCondVar *
-PR_NewCondVar_stub(PRLock *lock)
-{
-    STUB_SAFE_CALL1(PR_NewCondVar, lock);
-    abort();
-    return NULL;
-}
-
-extern PRStatus
-PR_NotifyCondVar_stub(PRCondVar *cvar)
-{
-    STUB_SAFE_CALL1(PR_NotifyCondVar, cvar);
-    abort();
-    return PR_FAILURE;
-}
-
-extern PRStatus
-PR_NotifyAllCondVar_stub(PRCondVar *cvar)
-{
-    STUB_SAFE_CALL1(PR_NotifyAllCondVar, cvar);
-    abort();
-    return PR_FAILURE;
-}
-
-extern PRStatus
-PR_WaitCondVar_stub(PRCondVar *cvar, PRIntervalTime timeout)
-{
-    STUB_SAFE_CALL2(PR_WaitCondVar, cvar, timeout);
-    abort();
-    return PR_FAILURE;
-}
-
-
-
-extern void
-PR_DestroyCondVar_stub(PRCondVar *cvar)
-{
-    STUB_SAFE_CALL1(PR_DestroyCondVar, cvar);
-    abort();
-    return;
-}
-
 /*
  * NOTE: this presupposes GCC 4.1
  */
@@ -556,11 +507,6 @@ freebl_InitNSPR(void *lib)
     STUB_FETCH_FUNCTION(PR_Assert);
     STUB_FETCH_FUNCTION(PR_Sleep);
     STUB_FETCH_FUNCTION(PR_CallOnce);
-    STUB_FETCH_FUNCTION(PR_NewCondVar);
-    STUB_FETCH_FUNCTION(PR_NotifyCondVar);
-    STUB_FETCH_FUNCTION(PR_NotifyAllCondVar);
-    STUB_FETCH_FUNCTION(PR_WaitCondVar);
-    STUB_FETCH_FUNCTION(PR_DestroyCondVar);
     STUB_FETCH_FUNCTION(PR_NewLock);
     STUB_FETCH_FUNCTION(PR_Unlock);
     STUB_FETCH_FUNCTION(PR_Lock);
diff --git a/security/nss/lib/freebl/stubs.h b/security/nss/lib/freebl/stubs.h
index d435634ff169..730ed4a647b4 100644
--- a/security/nss/lib/freebl/stubs.h
+++ b/security/nss/lib/freebl/stubs.h
@@ -71,7 +71,6 @@
 
 #define NSS_SecureMemcmp NSS_SecureMemcmp_stub
 
-#define PR_DestroyCondVar PR_DestroyCondVar_stub
 #define PR_Assert  PR_Assert_stub
 #define PR_CallOnce  PR_CallOnce_stub
 #define PR_Close  PR_Close_stub
@@ -79,16 +78,12 @@
 #define PR_Free  PR_Free_stub
 #define PR_GetLibraryFilePathname  PR_GetLibraryFilePathname_stub
 #define PR_Lock  PR_Lock_stub
-#define PR_NewCondVar PR_NewCondVar_stub
 #define PR_NewLock  PR_NewLock_stub
-#define PR_NotifyCondVar PR_NotifyCondVar_stub
-#define PR_NotifyAllCondVar PR_NotifyAllCondVar_stub
 #define PR_Open  PR_Open_stub
 #define PR_Read  PR_Read_stub
 #define PR_Seek  PR_Seek_stub
 #define PR_Sleep  PR_Sleep_stub
 #define PR_Unlock  PR_Unlock_stub
-#define PR_WaitCondVar PR_WaitCondVar_stub
 
 extern int  FREEBL_InitStubs(void);
 
diff --git a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
index d7b7ae3e4b8d..cf2fa55f4e3f 100644
--- a/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
+++ b/security/nss/lib/libpkix/pkix/checker/pkix_crlchecker.c
@@ -399,9 +399,6 @@ pkix_CrlChecker_CheckExternal(
     if (!localStore) {
         PKIX_ERROR_FATAL(PKIX_CRLCHECKERNOLOCALCERTSTOREFOUND);
     }
-    PKIX_CHECK(
-        PKIX_PL_Cert_VerifyKeyUsage(issuer, PKIX_CRL_SIGN, plContext),
-        PKIX_CERTCHECKKEYUSAGEFAILED);
     PKIX_CHECK(
         PKIX_PL_Cert_GetCrlDp(cert, &dpList, plContext),
         PKIX_CERTGETCRLDPFAILED);
diff --git a/security/nss/lib/libpkix/pkix/top/pkix_build.c b/security/nss/lib/libpkix/pkix/top/pkix_build.c
index 4045a76fd5ad..1e5873cb6aa6 100755
--- a/security/nss/lib/libpkix/pkix/top/pkix_build.c
+++ b/security/nss/lib/libpkix/pkix/top/pkix_build.c
@@ -1981,18 +1981,6 @@ cleanup:
         PKIX_RETURN(BUILD);
 }
 
-/* Prepare 'state' for the AIA round. */
-static void
-pkix_PrepareForwardBuilderStateForAIA(
-        PKIX_ForwardBuilderState *state)
-{
-        PORT_Assert(state->useOnlyLocal == PKIX_TRUE);
-        state->useOnlyLocal = PKIX_FALSE;
-        state->certStoreIndex = 0;
-        state->numFanout = state->buildConstants.maxFanout;
-        state->status = BUILD_TRYAIA;
-}
-
 /*
  * FUNCTION: pkix_BuildForwardDepthFirstSearch
  * DESCRIPTION:
@@ -2113,7 +2101,6 @@ pkix_BuildForwardDepthFirstSearch(
         PKIX_Error *verifyError = NULL;
         PKIX_Error *finalError = NULL;
         void *nbio = NULL;
-        PKIX_UInt32 numIterations = 0;
 
         PKIX_ENTER(BUILD, "pkix_BuildForwardDepthFirstSearch");
         PKIX_NULLCHECK_THREE(pNBIOContext, state, pValResult);
@@ -2130,13 +2117,6 @@ pkix_BuildForwardDepthFirstSearch(
          * of this "while" clause our search has failed.
          */
         while (outOfOptions == PKIX_FALSE) {
-            /*
-             * The maximum number of iterations works around a bug that
-             * causes this while loop to never exit when AIA and cross
-             * certificates are involved.  See bug xxxxx.
-             */
-            if (numIterations++ > 250)
-                    PKIX_ERROR(PKIX_TIMECONSUMEDEXCEEDSRESOURCELIMITS);
 
             if (state->buildConstants.maxTime != 0) {
                     PKIX_DECREF(currTime);
@@ -2748,6 +2728,7 @@ pkix_BuildForwardDepthFirstSearch(
                      * chain, delete it and go to the certStores.
                      */
                     if (state->usingHintCerts == PKIX_TRUE) {
+
                             PKIX_DECREF(state->candidateCerts);
                             PKIX_CHECK(PKIX_List_Create
                                 (&state->candidateCerts, plContext),
@@ -2757,7 +2738,9 @@ pkix_BuildForwardDepthFirstSearch(
                             state->usingHintCerts = PKIX_FALSE;
                             state->status = BUILD_TRYAIA;
                             continue;
+
                     } else if (++(state->certIndex) < (state->numCerts)) {
+
                             if ((state->buildConstants.maxFanout != 0) &&
                                 (--(state->numFanout) == 0)) {
 
@@ -2792,12 +2775,16 @@ pkix_BuildForwardDepthFirstSearch(
              * parent cert, and see if there are any more to try.
              */
             if (state->useOnlyLocal == PKIX_TRUE) {
-                pkix_PrepareForwardBuilderStateForAIA(state);
+                state->useOnlyLocal = PKIX_FALSE;
+                state->certStoreIndex = 0;
+                state->numFanout = state->buildConstants.maxFanout;
+                state->status = BUILD_TRYAIA;
             } else do {
                 if (state->parentState == NULL) {
                         /* We are at the top level, and can't back up! */
                         outOfOptions = PKIX_TRUE;
                 } else {
+
                         /*
                          * Try the next cert, if any, for this parent.
                          * Otherwise keep backing up until we reach a
@@ -2861,7 +2848,10 @@ pkix_BuildForwardDepthFirstSearch(
                         }
                         if (state->useOnlyLocal == PKIX_TRUE) {
                             /* Clean up and go for AIA round. */
-                            pkix_PrepareForwardBuilderStateForAIA(state);
+                            state->useOnlyLocal = PKIX_FALSE;
+                            state->certStoreIndex = 0;
+                            state->numFanout = state->buildConstants.maxFanout;
+                            state->status = BUILD_TRYAIA;
                             break;
                         }
                 }
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index d5d3ea033cd4..c29e361bfe5d 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -1143,13 +1143,13 @@ pkix_pl_Socket_Poll(
 
         if ((pBytesWritten) &&
             ((sock->status == SOCKET_SENDPENDING) ||
-            (sock->status == SOCKET_SENDRCVPENDING))) {
+            (sock->status = SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags = PR_POLL_WRITE;
         }
 
         if ((pBytesRead) &&
-            ((sock->status == SOCKET_RCVPENDING) ||
-            (sock->status == SOCKET_SENDRCVPENDING))) {
+            ((sock->status = SOCKET_RCVPENDING) ||
+            (sock->status = SOCKET_SENDRCVPENDING))) {
                 pollDesc.in_flags |= PR_POLL_READ;
         }
 
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
index 7e0a0e7d2f6e..a3a7d063b482 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
@@ -573,8 +573,10 @@ pkix_pl_InfoAccess_ParseTokens(
         char terminator,
         void *plContext)
 {
+        PKIX_UInt32 len = 0;
         PKIX_UInt32 numFilters = 0;
         char *endPos = NULL;
+        char *p = NULL;
         char **filterP = NULL;
 
         PKIX_ENTER(INFOACCESS, "pkix_pl_InfoAccess_ParseTokens");
@@ -595,8 +597,8 @@ pkix_pl_InfoAccess_ParseTokens(
                 PKIX_ERROR(PKIX_LOCATIONSTRINGNOTPROPERLYTERMINATED);
         }
 
-        /* Last component doesn't need a separator, although we allow it */
-        if (endPos > *startPos && *(endPos-1) != separator) {
+        /* Last one doesn't have a "," as separator, although we allow it */
+        if (*(endPos-1) != ',') {
                 numFilters++;
         }
 
@@ -617,23 +619,36 @@ pkix_pl_InfoAccess_ParseTokens(
 
         while (numFilters) {
             if (*endPos == separator || *endPos == terminator) {
-                    PKIX_UInt32 len = endPos - *startPos;
-                    char *p = PORT_ArenaZAlloc(arena, len+1);
+                    len = endPos - *startPos;
+                    p = PORT_ArenaZAlloc(arena, len+1);
                     if (p == NULL) {
                         PKIX_ERROR(PKIX_PORTARENAALLOCFAILED);
                     }
 
-                    PORT_Memcpy(p, *startPos, len);
-                    p[len] = '\0';
-
                     *filterP = p;
+
+                    while (len) {
+                            if (**startPos == '%' &&
+                                strncmp(*startPos, "%20", 3) == 0) {
+                            /* replace %20 by blank */
+                                *p = ' ';
+                                *startPos += 3;
+                                len -= 3;
+                            } else {
+                                *p = **startPos;
+                                (*startPos)++;
+                                len--;
+                            }
+                            p++;
+                    }
+
+                    *p = '\0';
                     filterP++;
                     numFilters--;
 
                     separator = terminator;
 
                     if (endPos == '\0') {
-                        *startPos = endPos;
                         break;
                     } else {
                         endPos++;
@@ -651,44 +666,6 @@ cleanup:
         PKIX_RETURN(INFOACCESS);
 }
 
-static int
-pkix_pl_HexDigitToInt(
-        int ch)
-{
-        if (isdigit(ch)) {
-                ch = ch - '0';
-        } else if (isupper(ch)) {
-                ch = ch - 'A' + 10;
-        } else {
-                ch = ch - 'a' + 10;
-        }
-        return ch;
-}
-
-/*
- * Convert the "%" hex hex escape sequences in the URL 'location' in place.
- */
-static void
-pkix_pl_UnescapeURL(
-        char *location)
-{
-        const char *src;
-        char *dst;
-
-        for (src = dst = location; *src != '\0'; src++, dst++) {
-                if (*src == '%' && isxdigit((unsigned char)*(src+1)) &&
-                    isxdigit((unsigned char)*(src+2))) {
-                        *dst = pkix_pl_HexDigitToInt((unsigned char)*(src+1));
-                        *dst *= 16;
-                        *dst += pkix_pl_HexDigitToInt((unsigned char)*(src+2));
-                        src += 2;
-                } else {
-                        *dst = *src;
-                }
-        }
-        *dst = *src;  /* the terminating null */
-}
-
 /*
  * FUNCTION: pkix_pl_InfoAccess_ParseLocation
  * DESCRIPTION:
@@ -765,7 +742,11 @@ pkix_pl_InfoAccess_ParseLocation(
                 plContext),
                 PKIX_STRINGGETENCODEDFAILED);
 
-        pkix_pl_UnescapeURL(locationAscii);
+#if 0
+        /* For testing inside the firewall... */
+        locationAscii = "ldap://nss.red.iplanet.com:1389/cn=Good%20CA,o="
+                "Test%20Certificates,c=US?caCertificate;binary";
+#endif
 
         /* Skip "ldap:" */
         endPos = locationAscii;
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 0373d80d5608..6c4495d58f88 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -1013,10 +1013,3 @@ SECMOD_RestartModules;
 ;+    local:
 ;+       *;
 ;+};
-;+NSS_3.12.10 {  # NSS 3.12.10 release
-;+    global:
-CERT_AllocCERTRevocationFlags;
-CERT_DestroyCERTRevocationFlags;
-;+    local:
-;+       *;
-;+};
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 778d1ee11201..2fc56bb27c5d 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nss.h,v 1.81.2.5 2011/01/12 21:39:21 christophe.ravel.bugs%sun.com Exp $ */
+/* $Id: nss.h,v 1.81.2.4 2011/01/06 18:04:16 christophe.ravel.bugs%sun.com Exp $ */
 
 #ifndef __nss_h_
 #define __nss_h_
@@ -66,12 +66,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.12.10.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION  "3.12.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   12
-#define NSS_VPATCH   10
+#define NSS_VPATCH   9
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile
index 479086292db5..a3cca6ab0679 100644
--- a/security/nss/lib/pk11wrap/Makefile
+++ b/security/nss/lib/pk11wrap/Makefile
@@ -78,8 +78,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 
 export:: private_export
 
-$(OBJDIR)/pk11load$(OBJ_SUFFIX): debug_module.c
-
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
 # pk11slot.c in 64-bit mode for unknown reasons.  A workaround is
 # to compile it with optimizations turned on.  (Bugzilla bug #63815)
diff --git a/security/nss/lib/pk11wrap/debug_module.c b/security/nss/lib/pk11wrap/debug_module.c
index 0b29647a6df1..0df3cfcb61c6 100644
--- a/security/nss/lib/pk11wrap/debug_module.c
+++ b/security/nss/lib/pk11wrap/debug_module.c
@@ -92,7 +92,6 @@ STRING fmt_fwVersion[]            = "  firmware version: %d.%d";
 STRING fmt_hwVersion[]            = "  hardware version: %d.%d";
 STRING fmt_s_qsq_d[]              = "    %s = \"%s\" [%d]";
 STRING fmt_s_s_d[]                = "    %s = %s [%d]";
-STRING fmt_s_lu[]                 = "    %s = %lu";
 STRING fmt_invalid_handle[]       = " (CK_INVALID_HANDLE)";
 
 
@@ -111,7 +110,6 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_VALUE);
     CASE(CKA_OBJECT_ID);
     CASE(CKA_CERTIFICATE_TYPE);
-    CASE(CKA_CERTIFICATE_CATEGORY);
     CASE(CKA_ISSUER);
     CASE(CKA_SERIAL_NUMBER);
     CASE(CKA_AC_ISSUER);
@@ -146,7 +144,7 @@ static void get_attr_type_str(CK_ATTRIBUTE_TYPE atype, char *str, int len)
     CASE(CKA_SUBPRIME);
     CASE(CKA_BASE);
     CASE(CKA_PRIME_BITS);
-    CASE(CKA_SUBPRIME_BITS);
+    CASE(CKA_SUB_PRIME_BITS);
     CASE(CKA_VALUE_BITS);
     CASE(CKA_VALUE_LEN);
     CASE(CKA_EXTRACTABLE);
@@ -668,25 +666,6 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	           atype, valstr, attr->ulValueLen));
 	    break;
 	}
-    case CKA_PIXEL_X:
-    case CKA_PIXEL_Y:
-    case CKA_RESOLUTION:
-    case CKA_CHAR_ROWS:
-    case CKA_CHAR_COLUMNS:
-    case CKA_BITS_PER_PIXEL:
-    case CKA_CERTIFICATE_CATEGORY:  /* should print as enum/string */
-    case CKA_JAVA_MIDP_SECURITY_DOMAIN:  /* should print as enum/string */
-    case CKA_MODULUS_BITS:
-    case CKA_PRIME_BITS:
-    case CKA_SUBPRIME_BITS:
-    case CKA_VALUE_BITS:
-    case CKA_VALUE_LEN:
-	if (attr->ulValueLen > 0 && attr->pValue) {
-	    CK_ULONG valueLen = *((CK_ULONG *)attr->pValue);
-	    /* XXX check for the special value CK_UNAVAILABLE_INFORMATION */
-	    PR_LOG(modlog, 4, (fmt_s_lu, atype, (PRUint32)valueLen));
-	    break;
-	}
     case CKA_LABEL:
     case CKA_NETSCAPE_EMAIL:
     case CKA_NETSCAPE_URL:
@@ -712,8 +691,7 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    	PORT_Free(asciiName);
 		break;
 	    }
-	    /* else treat like a binary buffer */
-	    goto binary_buffer;
+	    /* else fall through and treat like a binary buffer */
 	}
     case CKA_ID:
 	if (attr->ulValueLen > 0 && attr->pValue) {
@@ -735,7 +713,6 @@ static void print_attr_value(CK_ATTRIBUTE_PTR attr)
 	    }
 	    /* else fall through and treat like a binary buffer */
 	}
-binary_buffer:
     case CKA_SERIAL_NUMBER:
     default:
 	if (attr->ulValueLen > 0 && attr->pValue) {
diff --git a/security/nss/lib/pk11wrap/pk11load.c b/security/nss/lib/pk11wrap/pk11load.c
index 80850c11c6d4..fd35491461f5 100644
--- a/security/nss/lib/pk11wrap/pk11load.c
+++ b/security/nss/lib/pk11wrap/pk11load.c
@@ -178,8 +178,8 @@ secmod_handleReload(SECMODModule *oldModule, SECMODModule *newModule)
 	char *oldModuleSpec;
 
 	if (secmod_IsInternalKeySlot(newModule)) {
-	    pk11_SetInternalKeySlotIfFirst(slot);
-	} 
+	    pk11_SetInternalKeySlot(slot);
+	}
 	newID = slot->slotID;
 	PK11_FreeSlot(slot);
 	for (thisChild=children, thisID=ids; thisChild && *thisChild; 
@@ -550,11 +550,6 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) {
 	    /* look down the slot info table */
 	    PK11_LoadSlotList(mod->slots[i],mod->slotInfo,mod->slotInfoCount);
 	    SECMOD_SetRootCerts(mod->slots[i],mod);
-	    /* explicitly mark the internal slot as such if IsInternalKeySlot()
-	     * is set */
-	    if (secmod_IsInternalKeySlot(mod) && (i == (mod->isFIPS ? 0 : 1))) {
-		pk11_SetInternalKeySlotIfFirst(mod->slots[i]);
-	    } 
 	}
 	mod->slotCount = slotCount;
 	mod->slotInfoCount = 0;
diff --git a/security/nss/lib/pk11wrap/pk11pars.c b/security/nss/lib/pk11wrap/pk11pars.c
index 5b50580b17ea..585508475302 100644
--- a/security/nss/lib/pk11wrap/pk11pars.c
+++ b/security/nss/lib/pk11wrap/pk11pars.c
@@ -258,19 +258,6 @@ secmod_IsInternalKeySlot(SECMODModule *mod)
    return (flags & SECMOD_FLAG_INTERNAL_KEY_SLOT) ? PR_TRUE : PR_FALSE;
 }
 
-void
-secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val)
-{
-   char flags = (char) mod->internal;
-
-   if (val)  {
-	flags |= SECMOD_FLAG_INTERNAL_KEY_SLOT;
-   } else {
-	flags &= ~SECMOD_FLAG_INTERNAL_KEY_SLOT;
-   }
-   mod->internal = flags;
-}
-
 /* forward declarations */
 static int secmod_escapeSize(const char *string, char quote);
 static char *secmod_addEscape(const char *string, char quote);
diff --git a/security/nss/lib/pk11wrap/pk11priv.h b/security/nss/lib/pk11wrap/pk11priv.h
index 0ce3c5e9e561..6f88e933052e 100644
--- a/security/nss/lib/pk11wrap/pk11priv.h
+++ b/security/nss/lib/pk11wrap/pk11priv.h
@@ -115,8 +115,6 @@ void PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot);
 PRBool PK11_NeedPWInitForSlot(PK11SlotInfo *slot);
 SECStatus PK11_ReadSlotCerts(PK11SlotInfo *slot);
 void pk11_SetInternalKeySlot(PK11SlotInfo *slot);
-PK11SlotInfo *pk11_SwapInternalKeySlot(PK11SlotInfo *slot);
-void pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot);
 
 /*********************************************************************
  *       Mechanism Mapping functions
diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c
index 65d807d0f30a..2175ff30c1d4 100644
--- a/security/nss/lib/pk11wrap/pk11slot.c
+++ b/security/nss/lib/pk11wrap/pk11slot.c
@@ -1349,7 +1349,7 @@ pk11_isRootSlot(PK11SlotInfo *slot)
  * times as tokens are removed and re-inserted.
  */
 void
-PK11_InitSlot(SECMODModule *mod, CK_SLOT_ID slotID, PK11SlotInfo *slot)
+PK11_InitSlot(SECMODModule *mod,CK_SLOT_ID slotID,PK11SlotInfo *slot)
 {
     SECStatus rv;
     char *tmp;
@@ -1726,12 +1726,6 @@ PK11_NeedUserInit(PK11SlotInfo *slot)
 }
 
 static PK11SlotInfo *pk11InternalKeySlot = NULL;
-
-/*
- * Set a new default internal keyslot. If one has already been set, clear it.
- * Passing NULL falls back to the NSS normally selected default internal key
- * slot.
- */
 void
 pk11_SetInternalKeySlot(PK11SlotInfo *slot)
 {
@@ -1741,32 +1735,6 @@ pk11_SetInternalKeySlot(PK11SlotInfo *slot)
    pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
 }
 
-/*
- * Set a new default internal keyslot if the normal key slot has not already
- * been overridden. Subsequent calls to this function will be ignored unless
- * pk11_SetInternalKeySlot is used to clear the current default.
- */
-void
-pk11_SetInternalKeySlotIfFirst(PK11SlotInfo *slot)
-{
-   if (pk11InternalKeySlot) {
-	return;
-   }
-   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
-}
-
-/*
- * Swap out a default internal keyslot.  Caller owns the Slot Reference
- */
-PK11SlotInfo *
-pk11_SwapInternalKeySlot(PK11SlotInfo *slot)
-{
-   PK11SlotInfo *swap = pk11InternalKeySlot;
-
-   pk11InternalKeySlot = slot ? PK11_ReferenceSlot(slot) : NULL;
-   return swap;
-}
-
 
 /* get the internal key slot. FIPS has only one slot for both key slots and
  * default slots */
diff --git a/security/nss/lib/pk11wrap/pk11util.c b/security/nss/lib/pk11wrap/pk11util.c
index 03d3c09d993e..f8828d4652e2 100644
--- a/security/nss/lib/pk11wrap/pk11util.c
+++ b/security/nss/lib/pk11wrap/pk11util.c
@@ -483,25 +483,13 @@ SECMOD_DeleteInternalModule(const char *name)
 				NULL, SECMOD_FIPS_FLAGS);
 	}
 	if (newModule) {
-	    PK11SlotInfo *slot;
 	    newModule->libraryParams = 
 	     PORT_ArenaStrdup(newModule->arena,mlp->module->libraryParams);
-	    /* if an explicit internal key slot has been set, reset it */
-	    slot = pk11_SwapInternalKeySlot(NULL);
-	    if (slot) {
-		secmod_SetInternalKeySlotFlag(newModule, PR_TRUE);
-	    }
 	    rv = SECMOD_AddModule(newModule);
 	    if (rv != SECSuccess) {
-		/* load failed, restore the internal key slot */
-		pk11_SetInternalKeySlot(slot);
 		SECMOD_DestroyModule(newModule);
 		newModule = NULL;
 	    }
-	    /* free the old explicit internal key slot, we now have a new one */
-	    if (slot) {
-		PK11_FreeSlot(slot);
-	    }
 	}
 	if (newModule == NULL) {
 	    SECMODModuleList *last = NULL,*mlp2;
diff --git a/security/nss/lib/pk11wrap/secmodi.h b/security/nss/lib/pk11wrap/secmodi.h
index 168d99719662..b67e6df99a30 100644
--- a/security/nss/lib/pk11wrap/secmodi.h
+++ b/security/nss/lib/pk11wrap/secmodi.h
@@ -90,8 +90,6 @@ SECStatus secmod_LoadPKCS11Module(SECMODModule *, SECMODModule **oldModule);
 SECStatus SECMOD_UnloadModule(SECMODModule *);
 void SECMOD_SetInternalModule(SECMODModule *);
 PRBool secmod_IsInternalKeySlot(SECMODModule *);
-void secmod_SetInternalKeySlotFlag(SECMODModule *mod, PRBool val);
-
 
 /* tools for checking if we are loading the same database twice */
 typedef struct SECMODConfigListStr SECMODConfigList;
diff --git a/security/nss/lib/pki/pki3hack.c b/security/nss/lib/pki/pki3hack.c
index b13a05ee1b14..6830a7840991 100644
--- a/security/nss/lib/pki/pki3hack.c
+++ b/security/nss/lib/pki/pki3hack.c
@@ -35,7 +35,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100.2.1 $ $Date: 2011/03/26 16:55:01 $";
+static const char CVS_ID[] = "@(#) $RCSfile: pki3hack.c,v $ $Revision: 1.100 $ $Date: 2010/05/18 19:38:40 $";
 #endif /* DEBUG */
 
 /*
@@ -1215,98 +1215,6 @@ done:
     return nssrv;
 }
 
-/*
-** Delete trust objects matching the given slot.
-** Returns error if a device fails to delete.
-**
-** This function has the side effect of moving the
-** surviving entries to the front of the object list
-** and nullifying the rest.
-*/
-static PRStatus
-DeleteCertTrustMatchingSlot(PK11SlotInfo *pk11slot, nssPKIObject *tObject)
-{
-    int numNotDestroyed = 0;     /* the ones skipped plus the failures */
-    int failureCount = 0;        /* actual deletion failures by devices */
-    int index;
-
-    nssPKIObject_Lock(tObject);
-    /* Keep going even if a module fails to delete. */
-    for (index = 0; index < tObject->numInstances; index++) {
-	nssCryptokiObject *instance = tObject->instances[index];
-	if (!instance) {
-	    continue;
-	}
-
-	/* ReadOnly and not matched treated the same */
-	if (PK11_IsReadOnly(instance->token->pk11slot) ||
-	    pk11slot != instance->token->pk11slot) {
-	    tObject->instances[numNotDestroyed++] = instance;
-	    continue;
-	}
-
-	/* Here we have found a matching one */
-	tObject->instances[index] = NULL;
-	if (nssToken_DeleteStoredObject(instance) == PR_SUCCESS) {
-	    nssCryptokiObject_Destroy(instance);
-	} else {
-	    tObject->instances[numNotDestroyed++] = instance;
-	    failureCount++;
-	}
-
-    }
-    if (numNotDestroyed == 0) {
-    	nss_ZFreeIf(tObject->instances);
-    	tObject->numInstances = 0;
-    } else {
-    	tObject->numInstances = numNotDestroyed;
-    }
-
-    nssPKIObject_Unlock(tObject);
-
-    return failureCount == 0 ? PR_SUCCESS : PR_FAILURE;
-}
-
-/*
-** Delete trust objects matching the slot of the given certificate.
-** Returns an error if any device fails to delete. 
-*/
-NSS_EXTERN PRStatus
-STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c)
-{
-    PRStatus nssrv = PR_SUCCESS;
-
-    NSSTrustDomain *td = STAN_GetDefaultTrustDomain();
-    NSSTrust *nssTrust = nssTrustDomain_FindTrustForCertificate(td, c);
-    /* caller made sure nssTrust isn't NULL */
-    nssPKIObject *tobject = &nssTrust->object;
-    nssPKIObject *cobject = &c->object;
-    int i;
-
-    /* Iterate through the cert and trust object instances looking for
-     * those with matching pk11 slots to delete. Even if some device
-     * can't delete we keep going. Keeping a status variable for the
-     * loop so that once it's failed the other gets set.
-     */
-    NSSRWLock_LockRead(td->tokensLock);
-    nssPKIObject_Lock(cobject);
-    for (i = 0; i < cobject->numInstances; i++) {
-	nssCryptokiObject *cInstance = cobject->instances[i];
-	if (cInstance && !PK11_IsReadOnly(cInstance->token->pk11slot)) {
-		PRStatus status;
-	    if (!tobject->numInstances || !tobject->instances) continue;
-	    status = DeleteCertTrustMatchingSlot(cInstance->token->pk11slot, tobject);
-	    if (status == PR_FAILURE) {
-	    	/* set the outer one but keep going */
-	    	nssrv = PR_FAILURE;
-	    }
-	}
-    }
-    nssPKIObject_Unlock(cobject);
-    NSSRWLock_UnlockRead(td->tokensLock);
-    return nssrv;
-}
-
 /* CERT_TraversePermCertsForSubject */
 NSS_IMPLEMENT PRStatus
 nssTrustDomain_TraverseCertificatesBySubject (
diff --git a/security/nss/lib/pki/pki3hack.h b/security/nss/lib/pki/pki3hack.h
index b9ce7f7c6ff2..3920f79c0938 100644
--- a/security/nss/lib/pki/pki3hack.h
+++ b/security/nss/lib/pki/pki3hack.h
@@ -38,7 +38,7 @@
 #define PKINSS3HACK_H
 
 #ifdef DEBUG
-static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19.192.1 $ $Date: 2011/03/26 16:55:01 $";
+static const char PKINSS3HACK_CVS_ID[] = "@(#) $RCSfile: pki3hack.h,v $ $Revision: 1.19 $ $Date: 2005/01/20 02:25:49 $";
 #endif /* DEBUG */
 
 #ifndef NSSDEVT_H
@@ -106,9 +106,6 @@ STAN_GetNSSCertificate(CERTCertificate *c);
 NSS_EXTERN CERTCertTrust * 
 nssTrust_GetCERTCertTrustForCert(NSSCertificate *c, CERTCertificate *cc);
 
-NSS_EXTERN PRStatus
-STAN_DeleteCertTrustMatchingSlot(NSSCertificate *c);
-
 NSS_EXTERN PRStatus
 STAN_ChangeCertTrust(CERTCertificate *cc, CERTCertTrust *trust);
 
diff --git a/security/nss/lib/smime/cms.h b/security/nss/lib/smime/cms.h
index 896408f72b5a..f993cf0c13a0 100644
--- a/security/nss/lib/smime/cms.h
+++ b/security/nss/lib/smime/cms.h
@@ -37,7 +37,7 @@
 /*
  * Interfaces of the CMS implementation.
  *
- * $Id: cms.h,v 1.23.2.3 2011/02/11 16:44:02 emaldona%redhat.com Exp $
+ * $Id: cms.h,v 1.23 2010/04/25 23:37:38 nelson%bolyard.com Exp $
  */
 
 #ifndef _CMS_H_
@@ -302,14 +302,6 @@ NSS_CMSContentInfo_SetContent_DigestedData(NSSCMSMessage *cmsg, NSSCMSContentInf
 extern SECStatus
 NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, NSSCMSEncryptedData *encd);
 
-/*
- * turn off streaming for this content type.
- * This could fail with SEC_ERROR_NO_MEMORY in memory constrained conditions.
- */
-extern SECStatus
-NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream);
-
-
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -1136,51 +1128,6 @@ NSS_CMSDEREncode(NSSCMSMessage *cmsg, SECItem *input, SECItem *derOut,
                  PLArenaPool *arena);
 
 
-/************************************************************************
- * 
- ************************************************************************/
-
-/*
- *  define new S/MIME content type entries
- *
- *  S/MIME uses the builtin PKCS7 oid types for encoding and decoding the
- *  various S/MIME content. Some applications have their own content type
- *  which is different from the standard content type defined by S/MIME.
- *
- *  This function allows you to register new content types. There are basically
- *  Two different types of content, Wrappping content, and Data.
- *
- *  For data types, All the functions below can be zero or NULL excext 
- *  type and is isData, which should be your oid tag and PR_FALSE respectively
- *
- *  For wrapping types, everything must be provided, or you will get encoder
- *  failures.
- *
- *  If NSS doesn't already define the OID that you need, you can register 
- *  your own with SECOID_AddEntry.
- * 
- *  Once you have defined your new content type, you can pass your new content
- *  type to NSS_CMSContentInfo_SetContent().
- * 
- *  If you are using a wrapping type you can pass your own data structure in 
- *  the ptr field, but it must contain and embedded NSSCMSGenericWrappingData 
- *  structure as the first element. The size you pass to 
- *  NSS_CMSType_RegisterContentType is the total size of your self defined 
- *  data structure. NSS_CMSContentInfo_GetContent will return that data 
- *  structure from the content info. Your ASN1Template will be evaluated 
- *  against that data structure.
- */
-SECStatus NSS_CMSType_RegisterContentType(SECOidTag type,
-                          SEC_ASN1Template *asn1Template, size_t size,
-                          NSSCMSGenericWrapperDataDestroy  destroy,
-                          NSSCMSGenericWrapperDataCallback decode_before,
-                          NSSCMSGenericWrapperDataCallback decode_after,
-                          NSSCMSGenericWrapperDataCallback decode_end,
-                          NSSCMSGenericWrapperDataCallback encode_start,
-                          NSSCMSGenericWrapperDataCallback encode_before,
-                          NSSCMSGenericWrapperDataCallback encode_after,
-                          PRBool isData);
-
 /************************************************************************/
 SEC_END_PROTOS
 
diff --git a/security/nss/lib/smime/cmsasn1.c b/security/nss/lib/smime/cmsasn1.c
index d924528a594c..8d8e3e711639 100644
--- a/security/nss/lib/smime/cmsasn1.c
+++ b/security/nss/lib/smime/cmsasn1.c
@@ -37,7 +37,7 @@
 /*
  * CMS ASN.1 templates
  *
- * $Id: cmsasn1.c,v 1.7.2.2 2011/02/01 00:33:23 rrelyea%redhat.com Exp $
+ * $Id: cmsasn1.c,v 1.7 2010/06/06 22:36:35 nelson%bolyard.com Exp $
  */
 
 #include "cmslocal.h"
@@ -479,20 +479,6 @@ const SEC_ASN1Template NSS_PointerToCMSEncryptedDataTemplate[] = {
     { SEC_ASN1_POINTER, 0, NSSCMSEncryptedDataTemplate }
 };
 
-const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[] = {
-    { SEC_ASN1_INLINE,
-	  offsetof(NSSCMSGenericWrapperData,contentInfo),
-	  NSSCMSEncapsulatedContentInfoTemplate },
-};
-
-SEC_ASN1_CHOOSER_IMPLEMENT(NSSCMSGenericWrapperDataTemplate);
-
-const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[] = {
-    { SEC_ASN1_POINTER, 0, NSSCMSGenericWrapperDataTemplate }
-};
-
-SEC_ASN1_CHOOSER_IMPLEMENT(NSS_PointerToCMSGenericWrapperDataTemplate);
-
 /* -----------------------------------------------------------------------------
  * FORTEZZA KEA
  */
@@ -561,17 +547,15 @@ nss_cms_choose_content_template(void *src_or_dest, PRBool encoding)
 {
     const SEC_ASN1Template *theTemplate;
     NSSCMSContentInfo *cinfo;
-    SECOidTag type;
 
     PORT_Assert (src_or_dest != NULL);
     if (src_or_dest == NULL)
 	return NULL;
 
     cinfo = (NSSCMSContentInfo *)src_or_dest;
-    type = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    switch (type) {
+    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
     default:
-	theTemplate = NSS_CMSType_GetTemplate(type);
+	theTemplate = SEC_ASN1_GET(SEC_PointerToAnyTemplate);
 	break;
     case SEC_OID_PKCS7_DATA:
 	theTemplate = SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
diff --git a/security/nss/lib/smime/cmscinfo.c b/security/nss/lib/smime/cmscinfo.c
index bd1cc85b6dae..b1f1d1df7b6e 100644
--- a/security/nss/lib/smime/cmscinfo.c
+++ b/security/nss/lib/smime/cmscinfo.c
@@ -37,7 +37,7 @@
 /*
  * CMS contentInfo methods.
  *
- * $Id: cmscinfo.c,v 1.7.192.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmscinfo.c,v 1.7 2004/04/25 15:03:16 gerv%gerv.net Exp $
  */
 
 #include "cmslocal.h"
@@ -47,37 +47,11 @@
 #include "secoid.h"
 #include "secerr.h"
 
-
 /*
  * NSS_CMSContentInfo_Create - create a content info
  *
  * version is set in the _Finalize procedures for each content type
  */
-SECStatus
-NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo)
-{
-    if (cinfo->privateInfo) {
-	return SECSuccess;
-    }
-    cinfo->privateInfo = PORT_ZNew(NSSCMSContentInfoPrivate);
-    return (cinfo->privateInfo) ? SECSuccess : SECFailure;
-}
-
-
-static void
-nss_cmsContentInfo_private_destroy(NSSCMSContentInfoPrivate *privateInfo)
-{
-    if (privateInfo->digcx) {
-	/* must destroy digest objects */
-	NSS_CMSDigestContext_Cancel(privateInfo->digcx);
-	privateInfo->digcx = NULL;
-    }
-    if (privateInfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(privateInfo->ciphcx);
-	privateInfo->ciphcx = NULL;
-    }
-    PORT_Free(privateInfo);
-}
 
 /*
  * NSS_CMSContentInfo_Destroy - destroy a CMS contentInfo and all of its sub-pieces.
@@ -102,17 +76,23 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 	NSS_CMSDigestedData_Destroy(cinfo->content.digestedData);
 	break;
       default:
-	NSS_CMSGenericWrapperData_Destroy(kind, cinfo->content.genericData);
 	/* XXX Anything else that needs to be "manually" freed/destroyed? */
 	break;
     }
-    if (cinfo->privateInfo) {
-	nss_cmsContentInfo_private_destroy(cinfo->privateInfo);
-	cinfo->privateInfo = NULL;
+    if (cinfo->digcx) {
+	/* must destroy digest objects */
+	NSS_CMSDigestContext_Cancel(cinfo->digcx);
+	cinfo->digcx = NULL;
     }
-    if (cinfo->bulkkey) {
+    if (cinfo->bulkkey)
 	PK11_FreeSymKey(cinfo->bulkkey);
+
+    if (cinfo->ciphcx) {
+	NSS_CMSCipherContext_Destroy(cinfo->ciphcx);
+	cinfo->ciphcx = NULL;
     }
+    
+    /* we live in a pool, so no need to worry about storage */
 }
 
 /*
@@ -121,56 +101,31 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo)
 NSSCMSContentInfo *
 NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo)
 {
+    void * ptr                  = NULL;
     NSSCMSContentInfo * ccinfo  = NULL;
     SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
     switch (tag) {
     case SEC_OID_PKCS7_SIGNED_DATA:
-	if (cinfo->content.signedData != NULL) {
-	    ccinfo = &(cinfo->content.signedData->contentInfo);
-	}
+	ptr    = (void *)cinfo->content.signedData;
+	ccinfo = &(cinfo->content.signedData->contentInfo);
 	break;
     case SEC_OID_PKCS7_ENVELOPED_DATA:
-	if (cinfo->content.envelopedData != NULL) {
-	    ccinfo = &(cinfo->content.envelopedData->contentInfo);
-	}
+	ptr    = (void *)cinfo->content.envelopedData;
+	ccinfo = &(cinfo->content.envelopedData->contentInfo);
 	break;
     case SEC_OID_PKCS7_DIGESTED_DATA:
-	if (cinfo->content.digestedData != NULL) {
-	    ccinfo = &(cinfo->content.digestedData->contentInfo);
-	}
+	ptr    = (void *)cinfo->content.digestedData;
+	ccinfo = &(cinfo->content.digestedData->contentInfo);
 	break;
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
-	if (cinfo->content.encryptedData != NULL) {
-	    ccinfo = &(cinfo->content.encryptedData->contentInfo);
-	}
+	ptr    = (void *)cinfo->content.encryptedData;
+	ccinfo = &(cinfo->content.encryptedData->contentInfo);
 	break;
     case SEC_OID_PKCS7_DATA:
     default:
-	if (NSS_CMSType_IsWrapper(tag)) {
-	    if (cinfo->content.genericData != NULL) {
-	       ccinfo = &(cinfo->content.genericData->contentInfo);
-	    }
-	}
 	break;
     }
-    if (ccinfo && !ccinfo->privateInfo) {
-	NSS_CMSContentInfo_Private_Init(ccinfo);
-    }
-    return ccinfo;
-}
-
-SECStatus
-NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream)
-{
-   SECStatus rv;
-
-   rv = NSS_CMSContentInfo_Private_Init(cinfo);
-   if (rv != SECSuccess) {
-	/* default is streaming, failure to get ccinfo will not effect this */
-	return dontStream ? SECFailure :  SECSuccess ;
-   }
-   cinfo->privateInfo->dontStream = dontStream;
-   return SECSuccess;
+    return (ptr ? ccinfo : NULL);
 }
 
 /*
@@ -192,9 +147,7 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, SEC
 
     cinfo->content.pointer = ptr;
 
-    if (NSS_CMSType_IsData(type) && ptr) {
-	cinfo->rawContent = ptr;
-    } else {
+    if (type != SEC_OID_PKCS7_DATA) {
 	/* as we always have some inner data,
 	 * we need to set it to something, just to fool the encoder enough to work on it
 	 * and get us into nss_cms_encoder_notify at that point */
@@ -221,10 +174,9 @@ NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo
 {
     if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess)
 	return SECFailure;
-    if (detached) {
-        cinfo->rawContent = NULL;
-    }
-	
+    cinfo->rawContent = (detached) ? 
+			    NULL : (data) ? 
+				data : SECITEM_AllocItem(cmsg->poolp, NULL, 1);
     return SECSuccess;
 }
 
@@ -252,7 +204,6 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn
     return NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_ENCRYPTED_DATA, (void *)encd);
 }
 
-
 /*
  * NSS_CMSContentInfo_GetContent - get pointer to inner content
  *
@@ -272,7 +223,7 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	return cinfo->content.pointer;
     default:
-	return NSS_CMSType_IsWrapper(tag) ? cinfo->content.pointer : (NSS_CMSType_IsData(tag) ? cinfo->rawContent : NULL);
+	return NULL;
     }
 }
 
@@ -281,7 +232,6 @@ NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo)
  *
  * this is typically only called by NSS_CMSMessage_GetContent()
  */
-
 SECItem *
 NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
 {
@@ -290,21 +240,26 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo)
     SECItem           *pItem = NULL;
 
     tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    if (NSS_CMSType_IsData(tag)) {
+    switch (tag) {
+    case SEC_OID_PKCS7_DATA:
+	/* end of recursion - every message has to have a data cinfo */
 	pItem = cinfo->content.data; 
-    } else if (NSS_CMSType_IsWrapper(tag)) {
+	break;
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_SIGNED_DATA:
 	ccinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo);
-	if (ccinfo != NULL) {
+	if (ccinfo != NULL)
 	    pItem = NSS_CMSContentInfo_GetContent(ccinfo);
-	}
-    } else {
+	break;
+    default:
 	PORT_Assert(0);
+	break;
     }
-
     return pItem;
 }
 
-
 /*
  * NSS_CMSContentInfo_GetContentType{Tag,OID} - find out (saving pointer to lookup result
  * for future reference) and return the inner content type.
diff --git a/security/nss/lib/smime/cmsdecode.c b/security/nss/lib/smime/cmsdecode.c
index 79299dd793ed..1be5a3e352c8 100644
--- a/security/nss/lib/smime/cmsdecode.c
+++ b/security/nss/lib/smime/cmsdecode.c
@@ -37,7 +37,7 @@
 /*
  * CMS decoding.
  *
- * $Id: cmsdecode.c,v 1.9.66.4 2011/03/15 17:51:01 emaldona%redhat.com Exp $
+ * $Id: cmsdecode.c,v 1.9.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
  */
 
 #include "cmslocal.h"
@@ -120,7 +120,8 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 #endif
 
     /* so what are we working on right now? */
-    if (p7dcx->type == SEC_OID_UNKNOWN) {
+    switch (p7dcx->type) {
+    case SEC_OID_UNKNOWN:
 	/*
 	 * right now, we are still decoding the OUTER (root) cinfo
 	 * As soon as we know the inner content type, set up the info,
@@ -135,7 +136,8 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 	    /* is this ready already ? need to alloc? */
 	    /* XXX yes we need to alloc -- continue here */
 	}
-    } else if (NSS_CMSType_IsData(p7dcx->type)) {
+	break;
+    case SEC_OID_PKCS7_DATA:
 	/* this can only happen if the outermost cinfo has DATA in it */
 	/* otherwise, we handle this type implicitely in the inner decoders */
 
@@ -148,71 +150,86 @@ nss_cms_decoder_notify(void *arg, PRBool before, void *dest, int depth)
 					  nss_cms_decoder_update_filter,
 					  p7dcx,
 					  (PRBool)(p7dcx->cb != NULL));
-	} else if (after && dest == &(rootcinfo->content.data)) {
+	    break;
+	}
+
+	if (after && dest == &(rootcinfo->content.data)) {
 	    /* remove the filter */
 	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
 	}
-    } else if (NSS_CMSType_IsWrapper(p7dcx->type)) {
-	if (!before || dest != &(rootcinfo->content)) {
+	break;
 
-	    if (p7dcx->content.pointer == NULL)
-		p7dcx->content = rootcinfo->content;
+    case SEC_OID_PKCS7_SIGNED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
 
-	    /* get this data type's inner contentInfo */
-	    cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
+	if (before && dest == &(rootcinfo->content))
+	    break;     /* we're not there yet */
+
+	if (p7dcx->content.pointer == NULL)
+	    p7dcx->content = rootcinfo->content;
+
+	/* get this data type's inner contentInfo */
+	cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, 
 	                                      p7dcx->type);
 
-	    if (before && dest == &(cinfo->contentType)) {
-	        /* at this point, set up the &%$&$ back pointer */
-	        /* we cannot do it later, because the content itself 
-		 * is optional! */
-		switch (p7dcx->type) {
-		case SEC_OID_PKCS7_SIGNED_DATA:
-		    p7dcx->content.signedData->cmsg = p7dcx->cmsg;
-		    break;
-		case SEC_OID_PKCS7_DIGESTED_DATA:
-		    p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
-		    break;
-		case SEC_OID_PKCS7_ENVELOPED_DATA:
-		    p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
-		    break;
-		case SEC_OID_PKCS7_ENCRYPTED_DATA:
-		    p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
-		    break;
-		default:
-		    p7dcx->content.genericData->cmsg = p7dcx->cmsg;
-		    break;
-		}
+	if (before && dest == &(cinfo->contentType)) {
+	    /* at this point, set up the &%$&$ back pointer */
+	    /* we cannot do it later, because the content itself is optional! */
+	    /* please give me C++ */
+	    switch (p7dcx->type) {
+	    case SEC_OID_PKCS7_SIGNED_DATA:
+		p7dcx->content.signedData->cmsg = p7dcx->cmsg;
+		break;
+	    case SEC_OID_PKCS7_DIGESTED_DATA:
+		p7dcx->content.digestedData->cmsg = p7dcx->cmsg;
+		break;
+	    case SEC_OID_PKCS7_ENVELOPED_DATA:
+		p7dcx->content.envelopedData->cmsg = p7dcx->cmsg;
+		break;
+	    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+		p7dcx->content.encryptedData->cmsg = p7dcx->cmsg;
+		break;
+	    default:
+		PORT_Assert(0);
+		break;
 	    }
+	}
 
-	    if (before && dest == &(cinfo->rawContent)) {
-		/* we want the ASN.1 decoder to deliver the decoded bytes to us 
-		 ** from now on 
-		 */
-		SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
+	if (before && dest == &(cinfo->rawContent)) {
+	    /* we want the ASN.1 decoder to deliver the decoded bytes to us 
+	    ** from now on 
+	    */
+	    SEC_ASN1DecoderSetFilterProc(p7dcx->dcx, 
 	                                 nss_cms_decoder_update_filter, 
 					 p7dcx, (PRBool)(p7dcx->cb != NULL));
 
 
-		/* we're right in front of the data */
-		if (nss_cms_before_data(p7dcx) != SECSuccess) {
-		    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
-		    /* stop all processing */
-		    p7dcx->error = PORT_GetError();
-		}
-	    }
-	    if (after && dest == &(cinfo->rawContent)) {
-		/* we're right after of the data */
-		if (nss_cms_after_data(p7dcx) != SECSuccess)
-		    p7dcx->error = PORT_GetError();
-
-		/* we don't need to see the contents anymore */
-		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
+	    /* we're right in front of the data */
+	    if (nss_cms_before_data(p7dcx) != SECSuccess) {
+		SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);	
+		/* stop all processing */
+		p7dcx->error = PORT_GetError();
 	    }
 	}
-    } else {
+	if (after && dest == &(cinfo->rawContent)) {
+	    /* we're right after of the data */
+	    if (nss_cms_after_data(p7dcx) != SECSuccess)
+		p7dcx->error = PORT_GetError();
+
+	    /* we don't need to see the contents anymore */
+	    SEC_ASN1DecoderClearFilterProc(p7dcx->dcx);
+	}
+	break;
+
+#if 0 /* NIH */
+    case SEC_OID_PKCS7_AUTHENTICATED_DATA:
+#endif
+    default:
 	/* unsupported or unknown message type - fail  gracefully */
 	p7dcx->error = SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE;
+	break;
     }
 }
 
@@ -252,8 +269,7 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
 	                             p7dcx->content.encryptedData);
 	break;
     default:
-	rv = NSS_CMSGenericWrapperData_Decode_BeforeData(p7dcx->type,
-				p7dcx->content.genericData);
+	return SECFailure;
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -264,7 +280,7 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     cinfo = NSS_CMSContent_GetContentInfo(p7dcx->content.pointer, p7dcx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    if (NSS_CMSType_IsData(childtype)) {
+    if (childtype == SEC_OID_PKCS7_DATA) {
 	cinfo->content.pointer = (void *) nss_cms_create_decoder_data(poolp);
 	if (cinfo->content.pointer == NULL)
 	    /* set memory error */
@@ -291,9 +307,6 @@ nss_cms_before_data(NSSCMSDecoderContext *p7dcx)
     if (childp7dcx->content.pointer == NULL)
 	goto loser;
 
-    /* give the parent a copy of the pointer so that it doesn't get lost */
-    cinfo->content.pointer = childp7dcx->content.pointer;
-
     /* start the child decoder */
     childp7dcx->dcx = SEC_ASN1DecoderStart(poolp, childp7dcx->content.pointer, 
                                            template);
@@ -382,8 +395,7 @@ nss_cms_after_data(NSSCMSDecoderContext *p7dcx)
 	/* do nothing */
 	break;
     default:
-	rv = NSS_CMSGenericWrapperData_Decode_AfterData(p7dcx->type,
-	                            p7dcx->content.genericData);
+	rv = SECFailure;
 	break;
     }
 done:
@@ -418,8 +430,7 @@ nss_cms_after_end(NSSCMSDecoderContext *p7dcx)
     case SEC_OID_PKCS7_DATA:
 	break;
     default:
-	rv = NSS_CMSGenericWrapperData_Decode_AfterEnd(p7dcx->type,
-	                               p7dcx->content.genericData);
+	rv = SECFailure;	/* we should not have got that far... */
 	break;
     }
     return rv;
@@ -458,7 +469,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	goto loser;
     }
 
-    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
+    if (cinfo->ciphcx != NULL) {
 	/*
 	 * we are decrypting.
 	 * 
@@ -472,7 +483,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	unsigned int buflen;		/* length available for decrypted data */
 
 	/* find out about the length of decrypted data */
-	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->privateInfo->ciphcx, len, final);
+	buflen = NSS_CMSCipherContext_DecryptLength(cinfo->ciphcx, len, final);
 
 	/*
 	 * it might happen that we did not provide enough data for a full
@@ -503,7 +514,7 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
 	 * any output (see above), but we still need to call NSS_CMSCipherContext_Decrypt to
 	 * keep track of incoming data
 	 */
-	rv = NSS_CMSCipherContext_Decrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
+	rv = NSS_CMSCipherContext_Decrypt(cinfo->ciphcx, buf, &outlen, buflen,
 			       data, len, final);
 	if (rv != SECSuccess) {
 	    p7dcx->error = PORT_GetError();
@@ -523,8 +534,8 @@ nss_cms_decoder_work_data(NSSCMSDecoderContext *p7dcx,
     /*
      * Update the running digests with plaintext bytes (if we need to).
      */
-    if (cinfo->privateInfo && cinfo->privateInfo->digcx)
-	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
+    if (cinfo->digcx)
+	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
 
     /* at this point, we have the plain decoded & decrypted data 
     ** which is either more encoded DER (which we need to hand to the child 
diff --git a/security/nss/lib/smime/cmsdigdata.c b/security/nss/lib/smime/cmsdigdata.c
index 47f5a4ceb4f4..41eefe3c4da7 100644
--- a/security/nss/lib/smime/cmsdigdata.c
+++ b/security/nss/lib/smime/cmsdigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS digestedData methods.
  *
- * $Id: cmsdigdata.c,v 1.5.192.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmsdigdata.c,v 1.5 2004/04/25 15:03:16 gerv%gerv.net Exp $
  */
 
 #include "cmslocal.h"
@@ -117,8 +117,7 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
     SECItem *dummy;
 
     version = NSS_CMS_DIGESTED_DATA_VERSION_DATA;
-    if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(
-							&(digd->contentInfo))))
+    if (NSS_CMSContentInfo_GetContentTypeTag(&(digd->contentInfo)) != SEC_OID_PKCS7_DATA)
 	version = NSS_CMS_DIGESTED_DATA_VERSION_ENCAP;
 
     dummy = SEC_ASN1EncodeInteger(digd->cmsg->poolp, &(digd->version), version);
@@ -135,16 +134,11 @@ NSS_CMSDigestedData_Encode_BeforeStart(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Encode_BeforeData(NSSCMSDigestedData *digd)
 {
-    SECStatus rv =NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
-    if (rv != SECSuccess)  {
-	return SECFailure;
-    }
-
     /* set up the digests */
     if (digd->digestAlg.algorithm.len != 0 && digd->digest.len == 0) {
 	/* if digest is already there, do nothing */
-	digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-	if (digd->contentInfo.privateInfo->digcx == NULL)
+	digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+	if (digd->contentInfo.digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -162,12 +156,12 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
+    if (digd->contentInfo.digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->digest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.privateInfo->digcx = NULL;
+	digd->contentInfo.digcx = NULL;
     }
 
     return rv;
@@ -183,19 +177,12 @@ NSS_CMSDigestedData_Encode_AfterData(NSSCMSDigestedData *digd)
 SECStatus
 NSS_CMSDigestedData_Decode_BeforeData(NSSCMSDigestedData *digd)
 {
-    SECStatus rv;
-
     /* is there a digest algorithm yet? */
     if (digd->digestAlg.algorithm.len == 0)
 	return SECFailure;
 
-    rv = NSS_CMSContentInfo_Private_Init(&digd->contentInfo);
-    if (rv != SECSuccess) {
-	return SECFailure;
-    }
-
-    digd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
-    if (digd->contentInfo.privateInfo->digcx == NULL)
+    digd->contentInfo.digcx = NSS_CMSDigestContext_StartSingle(&(digd->digestAlg));
+    if (digd->contentInfo.digcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -213,12 +200,12 @@ NSS_CMSDigestedData_Decode_AfterData(NSSCMSDigestedData *digd)
 {
     SECStatus rv = SECSuccess;
     /* did we have digest calculation going on? */
-    if (digd->contentInfo.privateInfo && digd->contentInfo.privateInfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.privateInfo->digcx,
+    if (digd->contentInfo.digcx) {
+	rv = NSS_CMSDigestContext_FinishSingle(digd->contentInfo.digcx,
 				               digd->cmsg->poolp, 
 					       &(digd->cdigest));
 	/* error has been set by NSS_CMSDigestContext_FinishSingle */
-	digd->contentInfo.privateInfo->digcx = NULL;
+	digd->contentInfo.digcx = NULL;
     }
 
     return rv;
diff --git a/security/nss/lib/smime/cmsencdata.c b/security/nss/lib/smime/cmsencdata.c
index 29d8e39dec9a..6b6a5e1b6457 100644
--- a/security/nss/lib/smime/cmsencdata.c
+++ b/security/nss/lib/smime/cmsencdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS encryptedData methods.
  *
- * $Id: cmsencdata.c,v 1.11.56.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmsencdata.c,v 1.11 2008/02/03 06:08:49 nelson%bolyard.com Exp $
  */
 
 #include "cmslocal.h"
@@ -181,7 +181,6 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
-    SECStatus rv;
 
     cinfo = &(encd->contentInfo);
 
@@ -193,16 +192,12 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
     if (algid == NULL)
 	return SECFailure;
 
-    rv = NSS_CMSContentInfo_Private_Init(cinfo);
-    if (rv != SECSuccess) {
-	return SECFailure;
-    }
     /* this may modify algid (with IVs generated in a token).
      * it is therefore essential that algid is a pointer to the "real" contentEncAlg,
      * not just to a copy */
-    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
+    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(encd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->privateInfo->ciphcx == NULL)
+    if (cinfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -214,9 +209,9 @@ NSS_CMSEncryptedData_Encode_BeforeData(NSSCMSEncryptedData *encd)
 SECStatus
 NSS_CMSEncryptedData_Encode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
-	encd->contentInfo.privateInfo->ciphcx = NULL;
+    if (encd->contentInfo.ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
+	encd->contentInfo.ciphcx = NULL;
     }
 
     /* nothing to do after data */
@@ -249,14 +244,8 @@ NSS_CMSEncryptedData_Decode_BeforeData(NSSCMSEncryptedData *encd)
 
     NSS_CMSContentInfo_SetBulkKey(cinfo, bulkkey);
 
-    rv = NSS_CMSContentInfo_Private_Init(cinfo);
-    if (rv != SECSuccess) {
-	goto loser;
-    }
-    rv = SECFailure;
-
-    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->privateInfo->ciphcx == NULL)
+    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -275,9 +264,9 @@ loser:
 SECStatus
 NSS_CMSEncryptedData_Decode_AfterData(NSSCMSEncryptedData *encd)
 {
-    if (encd->contentInfo.privateInfo && encd->contentInfo.privateInfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(encd->contentInfo.privateInfo->ciphcx);
-	encd->contentInfo.privateInfo->ciphcx = NULL;
+    if (encd->contentInfo.ciphcx) {
+	NSS_CMSCipherContext_Destroy(encd->contentInfo.ciphcx);
+	encd->contentInfo.ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmsencode.c b/security/nss/lib/smime/cmsencode.c
index 7e6f036397d8..0ba5d4150eb2 100644
--- a/security/nss/lib/smime/cmsencode.c
+++ b/security/nss/lib/smime/cmsencode.c
@@ -37,7 +37,7 @@
 /*
  * CMS encoding.
  *
- * $Id: cmsencode.c,v 1.6.66.5 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmsencode.c,v 1.6.66.1 2010/12/23 18:03:41 kaie%kuix.de Exp $
  */
 
 #include "cmslocal.h"
@@ -92,23 +92,8 @@ nss_cms_encoder_out(void *arg, const char *buf, unsigned long len,
 
 #ifdef CMSDEBUG
     int i;
-    const char *data_name = "unknown";
 
-    switch (data_kind) {
-    case SEC_ASN1_Identifier:
-        data_name = "identifier";
-        break;
-    case SEC_ASN1_Length:
-        data_name = "length";
-        break;
-    case SEC_ASN1_Contents:
-        data_name = "contents";
-        break;
-    case SEC_ASN1_EndOfContents:
-        data_name = "end-of-contents";
-        break;
-    }
-    fprintf(stderr, "kind = %s, depth = %d, len = %d\n", data_name, depth, len);
+    fprintf(stderr, "kind = %d, depth = %d, len = %d\n", data_kind, depth, len);
     for (i=0; i < len; i++) {
 	fprintf(stderr, " %02x%s", (unsigned int)buf[i] & 0xff, ((i % 16) == 15) ? "\n" : "");
     }
@@ -174,17 +159,34 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
      * Watch for the content field, at which point we want to instruct
      * the ASN.1 encoder to start taking bytes from the buffer.
      */
-    if (NSS_CMSType_IsData(p7ecx->type)) {
-	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
-	if (before && dest == &(cinfo->rawContent)) {
+    switch (p7ecx->type) {
+    default:
+    case SEC_OID_UNKNOWN:
+	/* we're still in the root message */
+	if (after && dest == &(rootcinfo->contentType)) {
+	    /* got the content type OID now - so find out the type tag */
+	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
+	    /* set up a pointer to our current content */
+	    p7ecx->content = rootcinfo->content;
+	}
+	break;
+
+    case SEC_OID_PKCS7_DATA:
+	if (before && dest == &(rootcinfo->rawContent)) {
 	    /* just set up encoder to grab from user - no encryption or digesting */
-	    if ((item = cinfo->content.data) != NULL)
+	    if ((item = rootcinfo->content.data) != NULL)
 		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
 	    else
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-    } else if (NSS_CMSType_IsWrapper(p7ecx->type)) {
+	break;
+
+    case SEC_OID_PKCS7_SIGNED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+
 	/* when we know what the content is, we encode happily until we reach the inner content */
 	cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
@@ -197,32 +199,19 @@ nss_cms_encoder_notify(void *arg, PRBool before, void *dest, int depth)
 		p7ecx->error = PORT_GetError();
 	}
 	if (before && dest == &(cinfo->rawContent)) {
-	    if (p7ecx->childp7ecx == NULL) {
-		if ((NSS_CMSType_IsData(childtype) && (item = cinfo->content.data) != NULL)) {
-		    /* we are the innermost non-data and we have data - feed it in */
-		    (void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
-	        } else {
-		    /* else we'll have to get data from user */
-		    SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
-		}
-	    } else {
-	        /* if we have a nested encoder, wait for its data */
+	    if (childtype == SEC_OID_PKCS7_DATA && (item = cinfo->content.data) != NULL)
+		/* we have data - feed it in */
+		(void)nss_cms_encoder_work_data(p7ecx, NULL, item->data, item->len, PR_TRUE, PR_TRUE);
+	    else
+		/* else try to get it from user */
 		SEC_ASN1EncoderSetTakeFromBuf(p7ecx->ecx);
-	    }
 	}
 	if (after && dest == &(cinfo->rawContent)) {
 	    if (nss_cms_after_data(p7ecx) != SECSuccess)
 		p7ecx->error = PORT_GetError();
 	    SEC_ASN1EncoderClearNotifyProc(p7ecx->ecx);	/* no need to get notified anymore */
 	}
-    } else {
-	/* we're still in the root message */
-	if (after && dest == &(rootcinfo->contentType)) {
-	    /* got the content type OID now - so find out the type tag */
-	    p7ecx->type = NSS_CMSContentInfo_GetContentTypeTag(rootcinfo);
-	    /* set up a pointer to our current content */
-	    p7ecx->content = rootcinfo->content;
-	}
+	break;
     }
 }
 
@@ -258,11 +247,7 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	rv = NSS_CMSEncryptedData_Encode_BeforeData(p7ecx->content.encryptedData);
 	break;
     default:
-        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
-	    rv = NSS_CMSGenericWrapperData_Encode_BeforeData(p7ecx->type, p7ecx->content.genericData);
-	} else {
-	    rv = SECFailure;
-	}
+	rv = SECFailure;
     }
     if (rv != SECSuccess)
 	return SECFailure;
@@ -273,7 +258,14 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
 
-    if (NSS_CMSType_IsWrapper(childtype)) {
+    switch (childtype) {
+    case SEC_OID_PKCS7_SIGNED_DATA:
+    case SEC_OID_PKCS7_ENVELOPED_DATA:
+    case SEC_OID_PKCS7_ENCRYPTED_DATA:
+    case SEC_OID_PKCS7_DIGESTED_DATA:
+#if 0
+    case SEC_OID_PKCS7_DATA:		/* XXX here also??? maybe yes! */
+#endif
 	/* in these cases, we need to set up a child encoder! */
 	/* create new encoder context */
 	childp7ecx = PORT_ZAlloc(sizeof(NSSCMSEncoderContext));
@@ -292,8 +284,6 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	childp7ecx->output.destpoolp = NULL;
 	childp7ecx->output.dest = NULL;
 	childp7ecx->cmsg = p7ecx->cmsg;
-	childp7ecx->ecxupdated = PR_FALSE;
-	childp7ecx->childp7ecx = NULL;
 
 	template = NSS_CMSUtil_GetTemplateByTypeTag(childtype);
 	if (template == NULL)
@@ -313,8 +303,11 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	    break;
+	case SEC_OID_PKCS7_DATA:
+	    rv = SECSuccess;
+	    break;
 	default:
-	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(childp7ecx->type, cinfo->content.genericData);
+	    PORT_Assert(0);
 	    break;
 	}
 	if (rv != SECSuccess)
@@ -328,17 +321,17 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	if (childp7ecx->ecx == NULL)
 	    goto loser;
 
+	childp7ecx->ecxupdated = PR_FALSE;
+
 	/*
 	 * Indicate that we are streaming.  We will be streaming until we
 	 * get past the contents bytes.
 	 */
-        if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
-	    SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
+	SEC_ASN1EncoderSetStreaming(childp7ecx->ecx);
 
 	/*
 	 * The notify function will watch for the contents field.
 	 */
-	p7ecx->childp7ecx = childp7ecx;
 	SEC_ASN1EncoderSetNotifyProc(childp7ecx->ecx, nss_cms_encoder_notify, childp7ecx);
 
 	/* please note that we are NOT calling SEC_ASN1EncoderUpdate here to kick off the */
@@ -346,11 +339,22 @@ nss_cms_before_data(NSSCMSEncoderContext *p7ecx)
 	/* otherwise we'd be encoding data from a call of the notify function of the */
 	/* parent encoder (which would not work) */
 
-    } else if (NSS_CMSType_IsData(childtype)) {
+	/* this will kick off the encoding process & encode everything up to the content bytes,
+	 * at which point the notify function sets streaming mode (and possibly creates
+	 * another child encoder). */
+	if (SEC_ASN1EncoderUpdate(childp7ecx->ecx, NULL, 0) != SECSuccess)
+	    goto loser;
+
+	p7ecx->childp7ecx = childp7ecx;
+	break;
+
+    case SEC_OID_PKCS7_DATA:
 	p7ecx->childp7ecx = NULL;
-    } else {
+	break;
+    default:
 	/* we do not know this type */
 	p7ecx->error = SEC_ERROR_BAD_DER;
+	break;
     }
 
     return SECSuccess;
@@ -360,7 +364,6 @@ loser:
 	if (childp7ecx->ecx)
 	    SEC_ASN1EncoderFinish(childp7ecx->ecx);
 	PORT_Free(childp7ecx);
-	p7ecx->childp7ecx = NULL;
     }
     return SECFailure;
 }
@@ -384,12 +387,11 @@ nss_cms_after_data(NSSCMSEncoderContext *p7ecx)
     case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	rv = NSS_CMSEncryptedData_Encode_AfterData(p7ecx->content.encryptedData);
 	break;
+    case SEC_OID_PKCS7_DATA:
+	/* do nothing */
+	break;
     default:
-        if (NSS_CMSType_IsWrapper(p7ecx->type)) {
-	    rv = NSS_CMSGenericWrapperData_Encode_AfterData(p7ecx->type, p7ecx->content.genericData);
-	} else {
-	    rv = SECFailure;
-	}
+	rv = SECFailure;
 	break;
     }
     return rv;
@@ -430,23 +432,23 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
     }
 
     /* Update the running digest. */
-    if (len && cinfo->privateInfo && cinfo->privateInfo->digcx != NULL)
-	NSS_CMSDigestContext_Update(cinfo->privateInfo->digcx, data, len);
+    if (len && cinfo->digcx != NULL)
+	NSS_CMSDigestContext_Update(cinfo->digcx, data, len);
 
     /* Encrypt this chunk. */
-    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
+    if (cinfo->ciphcx != NULL) {
 	unsigned int inlen;	/* length of data being encrypted */
 	unsigned int outlen;	/* length of encrypted data */
 	unsigned int buflen;	/* length available for encrypted data */
 
 	inlen = len;
-	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->privateInfo->ciphcx, inlen, final);
+	buflen = NSS_CMSCipherContext_EncryptLength(cinfo->ciphcx, inlen, final);
 	if (buflen == 0) {
 	    /*
 	     * No output is expected, but the input data may be buffered
 	     * so we still have to call Encrypt.
 	     */
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, NULL, NULL, 0,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, NULL, NULL, 0,
 				   data, inlen, final);
 	    if (final) {
 		len = 0;
@@ -463,7 +465,7 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
 	if (buf == NULL) {
 	    rv = SECFailure;
 	} else {
-	    rv = NSS_CMSCipherContext_Encrypt(cinfo->privateInfo->ciphcx, buf, &outlen, buflen,
+	    rv = NSS_CMSCipherContext_Encrypt(cinfo->ciphcx, buf, &outlen, buflen,
 				   data, inlen, final);
 	    data = buf;
 	    len = outlen;
@@ -479,12 +481,12 @@ nss_cms_encoder_work_data(NSSCMSEncoderContext *p7ecx, SECItem *dest,
      * (which will encode it, then hand it back to the user or the parent encoder)
      * We don't encode the data if we're innermost and we're told not to include the data
      */
-    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != cinfo->content.pointer))
+    if (p7ecx->ecx != NULL && len && (!innermost || cinfo->rawContent != NULL))
 	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, (const char *)data, len);
 
 done:
 
-    if (cinfo->privateInfo && cinfo->privateInfo->ciphcx != NULL) {
+    if (cinfo->ciphcx != NULL) {
 	if (dest != NULL) {
 	    dest->data = buf;
 	    dest->len = len;
@@ -530,7 +532,6 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     NSSCMSEncoderContext *p7ecx;
     SECStatus rv;
     NSSCMSContentInfo *cinfo;
-    SECOidTag tag;
 
     NSS_CMSMessage_SetEncodingParams(cmsg, pwfn, pwfn_arg, decrypt_key_cb, decrypt_key_cb_arg,
 					detached_digestalgs, detached_digests);
@@ -550,8 +551,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 
     cinfo = NSS_CMSMessage_GetContentInfo(cmsg);
 
-    tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-    switch (tag) {
+    switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) {
     case SEC_OID_PKCS7_SIGNED_DATA:
 	rv = NSS_CMSSignedData_Encode_BeforeStart(cinfo->content.signedData);
 	break;
@@ -565,12 +565,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
 	rv = NSS_CMSEncryptedData_Encode_BeforeStart(cinfo->content.encryptedData);
 	break;
     default:
-        if (NSS_CMSType_IsWrapper(tag)) {
-	    rv = NSS_CMSGenericWrapperData_Encode_BeforeStart(tag, 
-						p7ecx->content.genericData);
-	} else {
-	    rv = SECFailure;
-	}
+	rv = SECFailure;
 	break;
     }
     if (rv != SECSuccess) {
@@ -592,8 +587,7 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
      * Indicate that we are streaming.  We will be streaming until we
      * get past the contents bytes.
      */
-    if (!cinfo->privateInfo || !cinfo->privateInfo->dontStream)
-	SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
+    SEC_ASN1EncoderSetStreaming(p7ecx->ecx);
 
     /*
      * The notify function will watch for the contents field.
@@ -603,7 +597,6 @@ NSS_CMSEncoder_Start(NSSCMSMessage *cmsg,
     /* this will kick off the encoding process & encode everything up to the content bytes,
      * at which point the notify function sets streaming mode (and possibly creates
      * a child encoder). */
-    p7ecx->ecxupdated = PR_TRUE;
     if (SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0) != SECSuccess) {
 	PORT_Free (p7ecx);
 	return NULL;
@@ -634,13 +627,6 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 
     /* hand data to the innermost decoder */
     if (p7ecx->childp7ecx) {
-	/* tell the child to start encoding, up to its first data byte, if it
-	 * hasn't started yet */
-	if (!p7ecx->childp7ecx->ecxupdated) {
-	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
-	    if (SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0) != SECSuccess)
-	        return SECFailure;
-	}
 	/* recursion here */
 	rv = NSS_CMSEncoder_Update(p7ecx->childp7ecx, data, len);
     } else {
@@ -654,7 +640,7 @@ NSS_CMSEncoder_Update(NSSCMSEncoderContext *p7ecx, const char *data, unsigned lo
 	}
 
 	childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-	if (!NSS_CMSType_IsData(childtype))
+	if (childtype != SEC_OID_PKCS7_DATA)
 	    return SECFailure;
 	/* and we must not have preset data */
 	if (cinfo->content.data != NULL)
@@ -735,16 +721,6 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
      * while we are already in NSS_CMSEncoder_Finish, but that's allright.
      */
     if (p7ecx->childp7ecx) {
-	/* tell the child to start encoding, up to its first data byte, if it
-	 * hasn't yet */
-	if (!p7ecx->childp7ecx->ecxupdated) {
-	    p7ecx->childp7ecx->ecxupdated = PR_TRUE;
-	    rv = SEC_ASN1EncoderUpdate(p7ecx->childp7ecx->ecx, NULL, 0);
-	    if (rv != SECSuccess) {
-		NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
-		goto loser;
-	    }
-	}
 	rv = NSS_CMSEncoder_Finish(p7ecx->childp7ecx); /* frees p7ecx->childp7ecx */
 	if (rv != SECSuccess)
 	    goto loser;
@@ -761,6 +737,7 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 
     p7ecx->childp7ecx = NULL;
 
+    /* find out about our inner content type - must be data */
     cinfo = NSS_CMSContent_GetContentInfo(p7ecx->content.pointer, p7ecx->type);
     if (!cinfo) {
 	/* The original programmer didn't expect this to happen */
@@ -768,10 +745,14 @@ NSS_CMSEncoder_Finish(NSSCMSEncoderContext *p7ecx)
 	rv = SECFailure;
 	goto loser;
     }
-    SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
+    childtype = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
+    if (childtype == SEC_OID_PKCS7_DATA && cinfo->content.data == NULL) {
+	SEC_ASN1EncoderClearTakeFromBuf(p7ecx->ecx);
+	/* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
+	rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
+    }
+
     SEC_ASN1EncoderClearStreaming(p7ecx->ecx);
-    /* now that TakeFromBuf is off, this will kick this encoder to finish encoding */
-    rv = SEC_ASN1EncoderUpdate(p7ecx->ecx, NULL, 0);
 
     if (p7ecx->error)
 	rv = SECFailure;
diff --git a/security/nss/lib/smime/cmsenvdata.c b/security/nss/lib/smime/cmsenvdata.c
index 1c0c20aade77..718844cd7084 100644
--- a/security/nss/lib/smime/cmsenvdata.c
+++ b/security/nss/lib/smime/cmsenvdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS envelopedData methods.
  *
- * $Id: cmsenvdata.c,v 1.11.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmsenvdata.c,v 1.11 2005/10/03 22:01:57 relyea%netscape.com Exp $
  */
 
 #include "cmslocal.h"
@@ -270,7 +270,6 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     NSSCMSContentInfo *cinfo;
     PK11SymKey *bulkkey;
     SECAlgorithmID *algid;
-    SECStatus rv;
 
     cinfo = &(envd->contentInfo);
 
@@ -282,16 +281,12 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
     if (algid == NULL)
 	return SECFailure;
 
-    rv = NSS_CMSContentInfo_Private_Init(cinfo);
-    if (rv != SECSuccess) {
-	return SECFailure;
-    }
     /* this may modify algid (with IVs generated in a token).
      * it is essential that algid is a pointer to the contentEncAlg data, not a
      * pointer to a copy! */
-    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
+    cinfo->ciphcx = NSS_CMSCipherContext_StartEncrypt(envd->cmsg->poolp, bulkkey, algid);
     PK11_FreeSymKey(bulkkey);
-    if (cinfo->privateInfo->ciphcx == NULL)
+    if (cinfo->ciphcx == NULL)
 	return SECFailure;
 
     return SECSuccess;
@@ -303,9 +298,9 @@ NSS_CMSEnvelopedData_Encode_BeforeData(NSSCMSEnvelopedData *envd)
 SECStatus
 NSS_CMSEnvelopedData_Encode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
-	envd->contentInfo.privateInfo->ciphcx = NULL;
+    if (envd->contentInfo.ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
+	envd->contentInfo.ciphcx = NULL;
     }
 
     /* nothing else to do after data */
@@ -385,13 +380,8 @@ NSS_CMSEnvelopedData_Decode_BeforeData(NSSCMSEnvelopedData *envd)
 
     bulkalg = NSS_CMSContentInfo_GetContentEncAlg(cinfo);
 
-    rv = NSS_CMSContentInfo_Private_Init(cinfo);
-    if (rv != SECSuccess) {
-	goto loser;
-    }
-    rv = SECFailure;
-    cinfo->privateInfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
-    if (cinfo->privateInfo->ciphcx == NULL)
+    cinfo->ciphcx = NSS_CMSCipherContext_StartDecrypt(bulkkey, bulkalg);
+    if (cinfo->ciphcx == NULL)
 	goto loser;		/* error has been set by NSS_CMSCipherContext_StartDecrypt */
 
 
@@ -411,9 +401,9 @@ loser:
 SECStatus
 NSS_CMSEnvelopedData_Decode_AfterData(NSSCMSEnvelopedData *envd)
 {
-    if (envd && envd->contentInfo.privateInfo && envd->contentInfo.privateInfo->ciphcx) {
-	NSS_CMSCipherContext_Destroy(envd->contentInfo.privateInfo->ciphcx);
-	envd->contentInfo.privateInfo->ciphcx = NULL;
+    if (envd && envd->contentInfo.ciphcx) {
+	NSS_CMSCipherContext_Destroy(envd->contentInfo.ciphcx);
+	envd->contentInfo.ciphcx = NULL;
     }
 
     return SECSuccess;
diff --git a/security/nss/lib/smime/cmslocal.h b/security/nss/lib/smime/cmslocal.h
index 222f90a15d5f..0e1c09294a09 100644
--- a/security/nss/lib/smime/cmslocal.h
+++ b/security/nss/lib/smime/cmslocal.h
@@ -42,7 +42,7 @@
  * you.  If that has a problem, then just move out what you need, changing
  * its name as appropriate!
  *
- * $Id: cmslocal.h,v 1.5.142.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
+ * $Id: cmslocal.h,v 1.5 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
  */
 
 #ifndef _CMSLOCAL_H_
@@ -54,25 +54,9 @@
 
 extern const SEC_ASN1Template NSSCMSContentInfoTemplate[];
 
-struct NSSCMSContentInfoPrivateStr {
-    NSSCMSCipherContext *ciphcx;
-    NSSCMSDigestContext *digcx;
-    PRBool  dontStream;
-};
-
 /************************************************************************/
 SEC_BEGIN_PROTOS
 
-/*
- * private content Info stuff
- */
-
-/* initialize the private content info field. If this returns
- * SECSuccess, the cinfo->private field is safe to dereference.
- */
-SECStatus NSS_CMSContentInfo_Private_Init(NSSCMSContentInfo *cinfo);
-
-
 /***********************************************************************
  * cmscipher.c - en/decryption routines
  ***********************************************************************/
@@ -356,34 +340,7 @@ NSS_CMSAttributeArray_SetAttr(PLArenaPool *poolp, NSSCMSAttribute ***attrs, SECO
 extern SECStatus
 NSS_CMSSignedData_AddTempCertificate(NSSCMSSignedData *sigd, CERTCertificate *cert);
 
-
 /************************************************************************/
-
-/*
- * local functions to handle user defined S/MIME content types
- */
-
-
-PRBool NSS_CMSType_IsWrapper(SECOidTag type);
-PRBool NSS_CMSType_IsData(SECOidTag type);
-size_t NSS_CMSType_GetContentSize(SECOidTag type);
-const SEC_ASN1Template * NSS_CMSType_GetTemplate(SECOidTag type);
-
-void NSS_CMSGenericWrapperData_Destroy(SECOidTag type,
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-SECStatus NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
-					NSSCMSGenericWrapperData *gd);
-
 SEC_END_PROTOS
 
 #endif /* _CMSLOCAL_H_ */
diff --git a/security/nss/lib/smime/cmsmessage.c b/security/nss/lib/smime/cmsmessage.c
index cb45eba0bba6..9168ec357442 100644
--- a/security/nss/lib/smime/cmsmessage.c
+++ b/security/nss/lib/smime/cmsmessage.c
@@ -37,7 +37,7 @@
 /*
  * CMS message methods.
  *
- * $Id: cmsmessage.c,v 1.6.192.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
+ * $Id: cmsmessage.c,v 1.6 2004/04/25 15:03:16 gerv%gerv.net Exp $
  */
 
 #include "cmslocal.h"
@@ -81,7 +81,6 @@ NSS_CMSMessage_Create(PLArenaPool *poolp)
 	    PORT_FreeArena(poolp, PR_FALSE);
 	return NULL;
     }
-    NSS_CMSContentInfo_Private_Init(&(cmsg->contentInfo));
 
     cmsg->poolp = poolp;
     cmsg->poolp_is_ours = poolp_is_ours;
@@ -235,12 +234,11 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg)
 
     /* descend into CMS message */
     for (cinfo = &(cmsg->contentInfo); cinfo != NULL; cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) {
-	if (!NSS_CMSType_IsData(NSS_CMSContentInfo_GetContentTypeTag(cinfo)))
+	if (NSS_CMSContentInfo_GetContentTypeTag(cinfo) != SEC_OID_PKCS7_SIGNED_DATA)
 	    continue;	/* next level */
 	
 	if (NSS_CMSSignedData_ContainsCertsOrCrls(cinfo->content.signedData))
 	    return PR_TRUE;
-	/* callback here for generic wrappers? */
     }
     return PR_FALSE;
 }
@@ -261,7 +259,6 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg)
 	case SEC_OID_PKCS7_ENCRYPTED_DATA:
 	    return PR_TRUE;
 	default:
-	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
@@ -292,7 +289,6 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg)
 		return PR_TRUE;
 	    break;
 	default:
-	    /* callback here for generic wrappers? */
 	    break;
 	}
     }
diff --git a/security/nss/lib/smime/cmssigdata.c b/security/nss/lib/smime/cmssigdata.c
index 5a1bb4cea8f9..81ece5473dbe 100644
--- a/security/nss/lib/smime/cmssigdata.c
+++ b/security/nss/lib/smime/cmssigdata.c
@@ -37,7 +37,7 @@
 /*
  * CMS signedData methods.
  *
- * $Id: cmssigdata.c,v 1.29.142.2 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmssigdata.c,v 1.29 2005/06/27 22:21:18 julien.pierre.bugs%sun.com Exp $
  */
 
 #include "cmslocal.h"
@@ -217,22 +217,17 @@ loser:
 SECStatus
 NSS_CMSSignedData_Encode_BeforeData(NSSCMSSignedData *sigd)
 {
-    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
-    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
-    if (rv != SECSuccess) {
-	return SECFailure;
-    }
     /* set up the digests */
     if (sigd->digests && sigd->digests[0]) {
-	sigd->contentInfo.privateInfo->digcx = NULL; /* don't attempt to make new ones. */
+	sigd->contentInfo.digcx = NULL; /* don't attempt to make new ones. */
     } else if (sigd->digestAlgorithms != NULL) {
-	sigd->contentInfo.privateInfo->digcx =
+	sigd->contentInfo.digcx = 
 	        NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.privateInfo->digcx == NULL)
+	if (sigd->contentInfo.digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -272,11 +267,11 @@ NSS_CMSSignedData_Encode_AfterData(NSSCMSSignedData *sigd)
     cinfo = &(sigd->contentInfo);
 
     /* did we have digest calculation going on? */
-    if (cinfo->privateInfo && cinfo->privateInfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->privateInfo->digcx, poolp,
+    if (cinfo->digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(cinfo->digcx, poolp, 
 	                                         &(sigd->digests));
 	/* error has been set by NSS_CMSDigestContext_FinishMultiple */
-	cinfo->privateInfo->digcx = NULL;
+	cinfo->digcx = NULL;
 	if (rv != SECSuccess)
 	    goto loser;		
     }
@@ -397,20 +392,15 @@ loser:
 SECStatus
 NSS_CMSSignedData_Decode_BeforeData(NSSCMSSignedData *sigd)
 {
-    SECStatus rv;
     if (!sigd) {
         PORT_SetError(SEC_ERROR_INVALID_ARGS);
         return SECFailure;
     }
-    rv = NSS_CMSContentInfo_Private_Init(&sigd->contentInfo);
-    if (rv != SECSuccess) {
-	return SECFailure;
-    }
     /* set up the digests */
     if (sigd->digestAlgorithms != NULL && sigd->digests == NULL) {
 	/* if digests are already there, do nothing */
-	sigd->contentInfo.privateInfo->digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
-	if (sigd->contentInfo.privateInfo->digcx == NULL)
+	sigd->contentInfo.digcx = NSS_CMSDigestContext_StartMultiple(sigd->digestAlgorithms);
+	if (sigd->contentInfo.digcx == NULL)
 	    return SECFailure;
     }
     return SECSuccess;
@@ -431,11 +421,11 @@ NSS_CMSSignedData_Decode_AfterData(NSSCMSSignedData *sigd)
     }
 
     /* did we have digest calculation going on? */
-    if (sigd->contentInfo.privateInfo && sigd->contentInfo.privateInfo->digcx) {
-	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.privateInfo->digcx,
+    if (sigd->contentInfo.digcx) {
+	rv = NSS_CMSDigestContext_FinishMultiple(sigd->contentInfo.digcx, 
 				       sigd->cmsg->poolp, &(sigd->digests));
 	/* error set by NSS_CMSDigestContext_FinishMultiple */
-	sigd->contentInfo.privateInfo->digcx = NULL;
+	sigd->contentInfo.digcx = NULL;
     }
     return rv;
 }
diff --git a/security/nss/lib/smime/cmst.h b/security/nss/lib/smime/cmst.h
index 11b772a3093c..b5de52b109ba 100644
--- a/security/nss/lib/smime/cmst.h
+++ b/security/nss/lib/smime/cmst.h
@@ -37,7 +37,7 @@
 /*
  * Header for CMS types.
  *
- * $Id: cmst.h,v 1.10.142.3 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: cmst.h,v 1.10 2005/06/27 22:21:19 julien.pierre.bugs%sun.com Exp $
  */
 
 #ifndef _CMST_H_
@@ -98,8 +98,6 @@ typedef struct NSSCMSRecipientInfoStr NSSCMSRecipientInfo;
 typedef struct NSSCMSDigestedDataStr NSSCMSDigestedData;
 typedef struct NSSCMSEncryptedDataStr NSSCMSEncryptedData;
 
-typedef struct NSSCMSGenericWrapperDataStr NSSCMSGenericWrapperData;
-
 typedef struct NSSCMSSMIMEKEAParametersStr NSSCMSSMIMEKEAParameters;
 
 typedef struct NSSCMSAttributeStr NSSCMSAttribute;
@@ -110,21 +108,6 @@ typedef struct NSSCMSEncoderContextStr NSSCMSEncoderContext;
 typedef struct NSSCMSCipherContextStr NSSCMSCipherContext;
 typedef struct NSSCMSDigestContextStr NSSCMSDigestContext;
 
-typedef struct NSSCMSContentInfoPrivateStr NSSCMSContentInfoPrivate;
-
-typedef SECStatus (*NSSCMSGenericWrapperDataCallback)
-						(NSSCMSGenericWrapperData *);
-typedef   void    (*NSSCMSGenericWrapperDataDestroy) 
-						(NSSCMSGenericWrapperData *);
-
-extern const SEC_ASN1Template NSSCMSGenericWrapperDataTemplate[];
-extern const SEC_ASN1Template NSS_PointerToCMSGenericWrapperDataTemplate[];
-
-SEC_ASN1_CHOOSER_DECLARE(NSS_PointerToCMSGenericWrapperDataTemplate)
-SEC_ASN1_CHOOSER_DECLARE(NSSCMSGenericWrapperDataTemplate)
-
-
-
 /*
  * Type of function passed to NSSCMSDecode or NSSCMSDecoderStart.
  * If specified, this is where the content bytes (only) will be "sent"
@@ -159,7 +142,6 @@ union NSSCMSContentUnion {
     NSSCMSEncryptedData	*	encryptedData;
     NSSCMSEnvelopedData	*	envelopedData;
     NSSCMSSignedData *		signedData;
-    NSSCMSGenericWrapperData *	genericData;
     /* or anonymous pointer to something */
     void *			pointer;
 };
@@ -182,8 +164,8 @@ struct NSSCMSContentInfoStr {
 							 * (only used by creation code) */
     SECOidTag			contentEncAlgTag;	/* oid tag of encryption algorithm
 							 * (only used by creation code) */
-    NSSCMSContentInfoPrivate	*privateInfo;		/* place for NSS private info */
-    void		*reserved;			/* keep binary compatibility */
+    NSSCMSCipherContext		*ciphcx;		/* context for en/decryption going on */
+    NSSCMSDigestContext		*digcx;			/* context for digesting going on */
 };
 
 /* =============================================================================
@@ -204,18 +186,6 @@ struct NSSCMSMessageStr {
     void *		decrypt_key_cb_arg;
 };
 
-/* ============================================================================
- * GENERIC WRAPPER
- * 
- * used for user defined types.
- */
-struct NSSCMSGenericWrapperDataStr {
-    NSSCMSContentInfo	contentInfo;
-    /* ---- local; not part of encoding ------ */
-    NSSCMSMessage *	cmsg;
-    /* wrapperspecific data starts here */
-};
-
 /* =============================================================================
  * SIGNEDDATA
  */
diff --git a/security/nss/lib/smime/cmsudf.c b/security/nss/lib/smime/cmsudf.c
deleted file mode 100644
index 025c0e36b0d8..000000000000
--- a/security/nss/lib/smime/cmsudf.c
+++ /dev/null
@@ -1,480 +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 the Netscape security libraries.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1994-2000
- * 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 ***** */
-
-/*
- * CMS User Define Types
- *
- * $Id: cmsudf.c,v 1.1.2.4 2011/02/11 03:57:50 emaldona%redhat.com Exp $
- */
-
-#include "cmslocal.h"
-
-#include "prinit.h"
-#include "pk11func.h"
-#include "secitem.h"
-#include "secoid.h"
-#include "secerr.h"
-#include "nss.h"
-
-typedef struct nsscmstypeInfoStr nsscmstypeInfo;
-struct nsscmstypeInfoStr {
-    SECOidTag type;
-    SEC_ASN1Template *template;
-    size_t size;
-    PRBool isData;
-    NSSCMSGenericWrapperDataDestroy  destroy;
-    NSSCMSGenericWrapperDataCallback decode_before;
-    NSSCMSGenericWrapperDataCallback decode_after;
-    NSSCMSGenericWrapperDataCallback decode_end;
-    NSSCMSGenericWrapperDataCallback encode_start;
-    NSSCMSGenericWrapperDataCallback encode_before;
-    NSSCMSGenericWrapperDataCallback encode_after;
-};
-
-/* make sure the global tables are only initialized once */
-static PRCallOnceType nsscmstypeOnce;
-static PRCallOnceType nsscmstypeClearOnce;
-/* lock for adding a new entry */
-static PRLock *nsscmstypeAddLock;
-/* lock for the hash table */
-static PRLock *nsscmstypeHashLock;
-/* the hash table itself */
-static PLHashTable *nsscmstypeHash;
-/* arena to hold all the hash table data */
-static PRArenaPool *nsscmstypeArena;
-
-/*
- * clean up our global tables
- */
-SECStatus
-nss_cmstype_shutdown(void *appData, void *reserved)
-{
-    if (nsscmstypeHashLock) {
-	PR_Lock(nsscmstypeHashLock);
-    }
-    if (nsscmstypeHash) {
-	PL_HashTableDestroy(nsscmstypeHash);
-	nsscmstypeHash = NULL;
-    }
-    if (nsscmstypeArena) {
-	PORT_FreeArena(nsscmstypeArena, PR_FALSE);
-	nsscmstypeArena = NULL;
-    }
-    if (nsscmstypeAddLock) {
-	PR_DestroyLock(nsscmstypeAddLock);
-    }
-    if (nsscmstypeHashLock) {
-	PRLock *oldLock = nsscmstypeHashLock;
-	nsscmstypeHashLock = NULL;
-	PR_Unlock(oldLock);
-	PR_DestroyLock(oldLock);
-    }
-
-    /* don't clear out the PR_ONCE data if we failed our inital call */
-    if (appData == NULL) {
-    	nsscmstypeOnce = nsscmstypeClearOnce;
-    }
-    return SECSuccess;
-}
-
-static PLHashNumber
-nss_cmstype_hash_key(const void *key)
-{
-   return (PLHashNumber) key;
-}
-
-static PRIntn
-nss_cmstype_compare_keys(const void *v1, const void *v2)
-{
-   PLHashNumber value1 = (PLHashNumber) v1;
-   PLHashNumber value2 = (PLHashNumber) v2;
-
-   return (value1 == value2);
-}
-
-/*
- * initialize our hash tables, called once on the first attemat to register
- * a new SMIME type.
- */
-static PRStatus
-nss_cmstype_init(void)
-{
-    SECStatus rv;
-        
-    nsscmstypeHashLock = PR_NewLock();
-    if (nsscmstypeHashLock == NULL) {
-	return PR_FAILURE;
-    }
-    nsscmstypeAddLock = PR_NewLock();
-    if (nsscmstypeHashLock == NULL) {
-	goto fail;
-    }
-    nsscmstypeHash = PL_NewHashTable(64, nss_cmstype_hash_key, 
-		nss_cmstype_compare_keys, PL_CompareValues, NULL, NULL);
-    if (nsscmstypeHash == NULL) {
-	goto fail;
-    }
-    nsscmstypeArena = PORT_NewArena(2048);
-    if (nsscmstypeArena == NULL) {
-	goto fail;
-    }
-    rv = NSS_RegisterShutdown(nss_cmstype_shutdown, NULL);
-    if (rv != SECSuccess) {
-	goto fail;
-    }
-    return PR_SUCCESS;
-
-fail:
-    nss_cmstype_shutdown(&nsscmstypeOnce, NULL);
-    return PR_FAILURE;
-}
-
- 
-/*
- * look up and registered SIME type
- */
-static const nsscmstypeInfo *
-nss_cmstype_lookup(SECOidTag type)
-{
-    nsscmstypeInfo *typeInfo = NULL;;
-    if (!nsscmstypeHash) {
-	return NULL;
-    }
-    PR_Lock(nsscmstypeHashLock);
-    if (nsscmstypeHash) {
-	typeInfo = PL_HashTableLookupConst(nsscmstypeHash, (void *)type);
-    }
-    PR_Unlock(nsscmstypeHashLock);
-    return typeInfo;
-}
-
-/*
- * add a new type to the SMIME type table
- */
-static SECStatus
-nss_cmstype_add(SECOidTag type, nsscmstypeInfo *typeinfo)
-{
-    PLHashEntry *entry;
-
-    if (!nsscmstypeHash) {
-	/* assert? this shouldn't happen */
-	return SECFailure;
-    }
-    PR_Lock(nsscmstypeHashLock);
-    /* this is really paranoia. If we really are racing nsscmstypeHash, we'll
-     * also be racing nsscmstypeHashLock... */
-    if (!nsscmstypeHash) {
-	PR_Unlock(nsscmstypeHashLock);
-	return SECFailure;
-    }
-    entry = PL_HashTableAdd(nsscmstypeHash, (void *)type, typeinfo);
-    PR_Unlock(nsscmstypeHashLock);
-    return entry ? SECSuccess : SECFailure;
-}
-
-
-/* helper functions to manage new content types
- */
-
-PRBool
-NSS_CMSType_IsWrapper(SECOidTag type)
-{
-    const nsscmstypeInfo *typeInfo = NULL;
-
-    switch (type) {
-    case SEC_OID_PKCS7_SIGNED_DATA:
-    case SEC_OID_PKCS7_ENVELOPED_DATA:
-    case SEC_OID_PKCS7_DIGESTED_DATA:
-    case SEC_OID_PKCS7_ENCRYPTED_DATA:
-	return PR_TRUE;
-    default:
-	typeInfo = nss_cmstype_lookup(type);
-	if (typeInfo && !typeInfo->isData) {
-	    return PR_TRUE;
-	}
-    }
-    return PR_FALSE;
-}
-
-PRBool
-NSS_CMSType_IsData(SECOidTag type)
-{
-    const nsscmstypeInfo *typeInfo = NULL;
-
-    switch (type) {
-    case SEC_OID_PKCS7_DATA:
-	return PR_TRUE;
-    default:
-	typeInfo = nss_cmstype_lookup(type);
-	if (typeInfo && typeInfo->isData) {
-	    return PR_TRUE;
-	}
-    }
-    return PR_FALSE;
-}
-
-const SEC_ASN1Template *
-NSS_CMSType_GetTemplate(SECOidTag type)
-{
-    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
-
-    if (typeInfo && typeInfo->template) {
-	return typeInfo->template;
-    }
-    return SEC_ASN1_GET(SEC_PointerToOctetStringTemplate);
-}
-
-size_t
-NSS_CMSType_GetContentSize(SECOidTag type)
-{
-    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
-
-    if (typeInfo) {
-	return typeInfo->size;
-    }
-    return sizeof(SECItem *);
-
-}
-
-void
-NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type);
-
-    if (typeInfo && typeInfo->destroy) {
-	(*typeInfo->destroy)(gd);
-    }
-    
-}
-
-
-SECStatus
-NSS_CMSGenericWrapperData_Decode_BeforeData(SECOidTag type, 
-				     NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->decode_before) {
-	    return (*typeInfo->decode_before)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-    
-}
-
-SECStatus
-NSS_CMSGenericWrapperData_Decode_AfterData(SECOidTag type, 
-				    NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->decode_after) {
-	    return (*typeInfo->decode_after)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-}
-
-SECStatus
-NSS_CMSGenericWrapperData_Decode_AfterEnd(SECOidTag type, 
-				   NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->decode_end) {
-	    return (*typeInfo->decode_end)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-}
-
-SECStatus
-NSS_CMSGenericWrapperData_Encode_BeforeStart(SECOidTag type, 
-				      NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->encode_start) {
-	    return (*typeInfo->encode_start)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-}
-
-SECStatus
-NSS_CMSGenericWrapperData_Encode_BeforeData(SECOidTag type, 
-				     NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->encode_before) {
-	    return (*typeInfo->encode_before)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-}
-
-SECStatus
-NSS_CMSGenericWrapperData_Encode_AfterData(SECOidTag type, 
-				    NSSCMSGenericWrapperData *gd)
-{
-    const nsscmstypeInfo *typeInfo;
-
-    /* short cut common case */
-    if (type == SEC_OID_PKCS7_DATA) {
-	return SECSuccess;
-    }
-
-    typeInfo = nss_cmstype_lookup(type);
-    if (typeInfo) {
-	if  (typeInfo->encode_after) {
-	    return (*typeInfo->encode_after)(gd);
-	}
-	/* decoder ops optional for data tags */
-	if (typeInfo->isData) {
-	    return SECSuccess;
-	}
-    }
-    /* expected a function, but none existed */
-    return SECFailure;
-}
-
-
-SECStatus
-NSS_CMSType_RegisterContentType(SECOidTag type, 
-			SEC_ASN1Template *asn1Template, size_t size, 
-			NSSCMSGenericWrapperDataDestroy destroy,
-			NSSCMSGenericWrapperDataCallback decode_before,
-			NSSCMSGenericWrapperDataCallback decode_after,
-			NSSCMSGenericWrapperDataCallback decode_end,
-			NSSCMSGenericWrapperDataCallback encode_start,
-			NSSCMSGenericWrapperDataCallback encode_before,
-			NSSCMSGenericWrapperDataCallback encode_after,
-			PRBool isData)
-{
-    PRStatus rc;
-    SECStatus rv;
-    nsscmstypeInfo *typeInfo;
-    const nsscmstypeInfo *exists;
-
-    rc = PR_CallOnce( &nsscmstypeOnce, nss_cmstype_init);
-    if (rc == PR_FAILURE) {
-	return SECFailure;
-    }
-    PR_Lock(nsscmstypeAddLock);
-    exists = nss_cmstype_lookup(type);
-    if (exists) {
-	PR_Unlock(nsscmstypeAddLock);
-	/* already added */
-	return SECSuccess;
-    }
-    typeInfo = PORT_ArenaNew(nsscmstypeArena, nsscmstypeInfo);
-    typeInfo->type = type;
-    typeInfo->size = size;
-    typeInfo->isData = isData;
-    typeInfo->template = asn1Template;
-    typeInfo->destroy = destroy;
-    typeInfo->decode_before = decode_before;
-    typeInfo->decode_after = decode_after;
-    typeInfo->decode_end = decode_end;
-    typeInfo->encode_start = encode_start;
-    typeInfo->encode_before = encode_before;
-    typeInfo->encode_after = encode_after;
-    rv = nss_cmstype_add(type, typeInfo);
-    PR_Unlock(nsscmstypeAddLock);
-    return rv;
-}
-
diff --git a/security/nss/lib/smime/cmsutil.c b/security/nss/lib/smime/cmsutil.c
index a60255be9dae..edbb71818e5f 100644
--- a/security/nss/lib/smime/cmsutil.c
+++ b/security/nss/lib/smime/cmsutil.c
@@ -38,7 +38,7 @@
 /*
  * CMS miscellaneous utility functions.
  *
- * $Id: cmsutil.c,v 1.15.54.1 2011/01/28 23:08:27 rrelyea%redhat.com Exp $
+ * $Id: cmsutil.c,v 1.15 2008/03/10 00:01:27 wtc%google.com Exp $
  */
 
 #include "cmslocal.h"
@@ -243,7 +243,8 @@ NSS_CMSUtil_GetTemplateByTypeTag(SECOidTag type)
 	template = NSSCMSDigestedDataTemplate;
 	break;
     default:
-	template = NSS_CMSType_GetTemplate(type);
+    case SEC_OID_PKCS7_DATA:
+	template = NULL;
 	break;
     }
     return template;
@@ -268,7 +269,8 @@ NSS_CMSUtil_GetSizeByTypeTag(SECOidTag type)
 	size = sizeof(NSSCMSDigestedData);
 	break;
     default:
-	size = NSS_CMSType_GetContentSize(type);
+    case SEC_OID_PKCS7_DATA:
+	size = 0;
 	break;
     }
     return size;
@@ -298,9 +300,6 @@ NSS_CMSContent_GetContentInfo(void *msg, SECOidTag type)
 	break;
     default:
 	cinfo = NULL;
-	if (NSS_CMSType_IsWrapper(type)) {
-	    cinfo = &(c.genericData->contentInfo);
-	}
     }
     return cinfo;
 }
diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn
index 1f5421f35e4e..a72b4137790f 100644
--- a/security/nss/lib/smime/manifest.mn
+++ b/security/nss/lib/smime/manifest.mn
@@ -69,7 +69,6 @@ CSRCS = \
 	cmsreclist.c \
 	cmssigdata.c \
 	cmssiginfo.c \
-	cmsudf.c \
 	cmsutil.c \
 	smimemessage.c \
 	smimeutil.c \
diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def
index 993d108a28bb..39ccc45bb658 100644
--- a/security/nss/lib/smime/smime.def
+++ b/security/nss/lib/smime/smime.def
@@ -273,23 +273,3 @@ SEC_PKCS12AddCertOrChainAndKey;
 ;+    local:
 ;+       *;
 ;+};
-;+NSS_3.12.10 {   # NSS 3.12.10 release
-;+    global:
-NSS_CMSType_RegisterContentType;
-NSS_CMSContentInfo_SetDontStream;
-NSS_SMIMEUtil_CreateMSSMIMEEncKeyPrefs;
-;+#
-;+# Data objects
-;+#
-;+# Don't export these DATA symbols on Windows because they don't work right.
-;+# Use the SEC_ASN1_GET / SEC_ASN1_SUB / SEC_ASN1_XTRN macros to access them.
-;+#
-;+# See nssutil for other examples.
-;+#
-;;NSSCMSGenericWrapperDataTemplate DATA ;
-;;NSS_PointerToCMSGenericWrapperDataTemplate DATA ;
-NSS_Get_NSSCMSGenericWrapperDataTemplate;
-NSS_Get_NSS_PointerToCMSGenericWrapperDataTemplate;
-;+    local:
-;+       *;
-;+};
diff --git a/security/nss/lib/smime/smime.h b/security/nss/lib/smime/smime.h
index 0c112c9a10da..d7fbc8cdb8f5 100644
--- a/security/nss/lib/smime/smime.h
+++ b/security/nss/lib/smime/smime.h
@@ -38,7 +38,7 @@
  * Header file for routines specific to S/MIME.  Keep things that are pure
  * pkcs7 out of here; this is for S/MIME policy, S/MIME interoperability, etc.
  *
- * $Id: smime.h,v 1.8.192.1 2011/02/11 03:57:50 emaldona%redhat.com Exp $
+ * $Id: smime.h,v 1.8 2004/04/25 15:03:16 gerv%gerv.net Exp $
  */
 
 #ifndef _SECMIME_H_
@@ -83,7 +83,7 @@ extern SECStatus NSS_SMIMEUtil_EnableCipher(long which, int on);
  * Initialize the local recording of the S/MIME policy.
  * This function is called to allow/disallow a particular cipher.
  *
- * XXX This is for the current module, I think, so local, static storage
+ * XXX This is for a the current module, I think, so local, static storage
  * XXX is okay.  Is that correct, or could multiple uses of the same
  * XXX library expect to operate under different policies?
  *
diff --git a/security/nss/lib/softoken/pkcs11.c b/security/nss/lib/softoken/pkcs11.c
index 7a2425c9a9d7..737f7ea95ad8 100644
--- a/security/nss/lib/softoken/pkcs11.c
+++ b/security/nss/lib/softoken/pkcs11.c
@@ -4315,7 +4315,7 @@ sftk_expandSearchList(SFTKSearchResults *search, int count)
 
 static CK_RV
 sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
-                        const CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
+                        const CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
 {
     CK_RV crv;
     int objectListSize = search->array_size-search->size;
@@ -4349,7 +4349,7 @@ sftk_searchDatabase(SFTKDBHandle *handle, SFTKSearchResults *search,
  */
 CK_RV
 sftk_emailhack(SFTKSlot *slot, SFTKDBHandle *handle, 
-    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount)
+    SFTKSearchResults *search, CK_ATTRIBUTE *pTemplate, CK_LONG ulCount)
 {
     PRBool isCert = PR_FALSE;
     int emailIndex = -1;
@@ -4438,47 +4438,22 @@ loser:
     return crv;
 }
 	
-static void
-sftk_pruneSearch(CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
-			PRBool *searchCertDB, PRBool *searchKeyDB) {
-    CK_ULONG i;
-
-    *searchCertDB = PR_TRUE;
-    *searchKeyDB = PR_TRUE;
-    for (i = 0; i < ulCount; i++) {
-	if (pTemplate[i].type == CKA_CLASS && pTemplate[i].pValue != NULL) {
-	    CK_OBJECT_CLASS class = *((CK_OBJECT_CLASS*)pTemplate[i].pValue);
-	    if (class == CKO_PRIVATE_KEY || class == CKO_SECRET_KEY) {
-		*searchCertDB = PR_FALSE;
-	    } else {
-		*searchKeyDB = PR_FALSE;
-	    }
-	    break;
-	}
-    }
-}
 
 static CK_RV
 sftk_searchTokenList(SFTKSlot *slot, SFTKSearchResults *search,
-                        CK_ATTRIBUTE *pTemplate, CK_ULONG ulCount,
+                        CK_ATTRIBUTE *pTemplate, CK_LONG ulCount,
                         PRBool *tokenOnly, PRBool isLoggedIn)
 {
-    CK_RV crv = CKR_OK;
+    CK_RV crv;
     CK_RV crv2;
-    PRBool searchCertDB;
-    PRBool searchKeyDB;
-    
-    sftk_pruneSearch(pTemplate, ulCount, &searchCertDB, &searchKeyDB);
+    SFTKDBHandle *certHandle = sftk_getCertDB(slot);
 
-    if (searchCertDB) {
-	SFTKDBHandle *certHandle = sftk_getCertDB(slot);
-	crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
-	crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
-	if (crv == CKR_OK) crv = crv2;
-	sftk_freeDB(certHandle);
-    }
+    crv = sftk_searchDatabase(certHandle, search, pTemplate, ulCount);
+    crv2 = sftk_emailhack(slot, certHandle, search, pTemplate, ulCount);
+    if (crv == CKR_OK) crv2 = crv;
+    sftk_freeDB(certHandle);
 
-    if (crv == CKR_OK && isLoggedIn && searchKeyDB) {
+    if (crv == CKR_OK && isLoggedIn) {
 	SFTKDBHandle *keyHandle = sftk_getKeyDB(slot);
     	crv = sftk_searchDatabase(keyHandle, search, pTemplate, ulCount);
     	sftk_freeDB(keyHandle);
diff --git a/security/nss/lib/softoken/rsawrapr.c b/security/nss/lib/softoken/rsawrapr.c
index a40c265dcbff..cda6d7527680 100644
--- a/security/nss/lib/softoken/rsawrapr.c
+++ b/security/nss/lib/softoken/rsawrapr.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: rsawrapr.c,v 1.11.70.1 2011/04/07 22:54:48 wtc%google.com Exp $ */
+/* $Id: rsawrapr.c,v 1.11 2006/10/23 21:24:38 wtchang%redhat.com Exp $ */
 
 #include "blapi.h"
 #include "softoken.h"
@@ -193,7 +193,7 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
     unsigned char *block;
     unsigned char *bp;
     int padLen;
-    int i, j;
+    int i;
     SECStatus rv;
 
     block = (unsigned char *) PORT_Alloc(modulusLen);
@@ -246,53 +246,28 @@ rsa_FormatOneBlock(unsigned modulusLen, RSA_BlockType blockType,
 	 * 0x00 || BT || Pad || 0x00 || ActualData
 	 *   1      1   padLen    1      data->len
 	 * Pad is all non-zero random bytes.
-	 *
-	 * Build the block left to right.
-	 * Fill the entire block from Pad to the end with random bytes.
-	 * Use the bytes after Pad as a supply of extra random bytes from 
-	 * which to find replacements for the zero bytes in Pad.
-	 * If we need more than that, refill the bytes after Pad with 
-	 * new random bytes as necessary.
 	 */
-	padLen = modulusLen - (data->len + 3);
+	padLen = modulusLen - data->len - 3;
 	PORT_Assert (padLen >= RSA_BLOCK_MIN_PAD_LEN);
 	if (padLen < RSA_BLOCK_MIN_PAD_LEN) {
 	    PORT_Free (block);
 	    return NULL;
 	}
-	j = modulusLen - 2;
-	rv = RNG_GenerateGlobalRandomBytes(bp, j);
-	if (rv == SECSuccess) {
-	    for (i = 0; i < padLen; ) {
-		unsigned char repl;
-		/* Pad with non-zero random data. */
-		if (bp[i] != RSA_BLOCK_AFTER_PAD_OCTET) {
-		    ++i;
-		    continue;
-		}
-		if (j <= padLen) {
-		    rv = RNG_GenerateGlobalRandomBytes(bp + padLen,
-					  modulusLen - (2 + padLen));
-		    if (rv != SECSuccess)
-		    	break;
-		    j = modulusLen - 2;
-		}
-		do {
-		    repl = bp[--j];
-		} while (repl == RSA_BLOCK_AFTER_PAD_OCTET && j > padLen);
-		if (repl != RSA_BLOCK_AFTER_PAD_OCTET) {
-		    bp[i++] = repl;
-		}
+	for (i = 0; i < padLen; i++) {
+	    /* Pad with non-zero random data. */
+	    do {
+		rv = RNG_GenerateGlobalRandomBytes(bp + i, 1);
+	    } while (rv == SECSuccess && bp[i] == RSA_BLOCK_AFTER_PAD_OCTET);
+	    if (rv != SECSuccess) {
+		sftk_fatalError = PR_TRUE;
+		PORT_Free (block);
+		return NULL;
 	    }
 	}
-	if (rv != SECSuccess) {
-	    sftk_fatalError = PR_TRUE;
-	    PORT_Free (block);
-	    return NULL;
-	}
 	bp += padLen;
 	*bp++ = RSA_BLOCK_AFTER_PAD_OCTET;
 	PORT_Memcpy (bp, data->data, data->len);
+
 	break;
 
       /*
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 45745075d307..c11ff63e737a 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,11 +57,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.12.10.0" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION  "3.12.9.0" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   12
-#define SOFTOKEN_VPATCH   10
+#define SOFTOKEN_VPATCH   9
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_TRUE
+#define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/ssl/derive.c b/security/nss/lib/ssl/derive.c
index 8088296a6110..84d7da014653 100644
--- a/security/nss/lib/ssl/derive.c
+++ b/security/nss/lib/ssl/derive.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: derive.c,v 1.12.40.1 2011/03/24 01:39:01 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: derive.c,v 1.12 2008/06/06 01:16:31 wtc%google.com Exp $ */
 
 #include "ssl.h" 	/* prereq to sslimpl.h */
 #include "certt.h"	/* prereq to sslimpl.h */
@@ -604,9 +604,6 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     PRBool	      testrsa_export = PR_FALSE;
     PRBool	      testecdh = PR_FALSE;
     PRBool	      testecdhe = PR_FALSE;
-#ifdef NSS_ENABLE_ECC
-    SECKEYECParams ecParams = { siBuffer, NULL, 0 };
-#endif
 
     if (!cert || !srvPrivkey || !ciphersuites || !pcanbypass) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -706,15 +703,10 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    /* now wrap it */
 	    enc_pms.len  = SECKEY_PublicKeyStrength(srvPubkey);
 	    enc_pms.data = (unsigned char*)PORT_Alloc(enc_pms.len);
-	    if (enc_pms.data == NULL) {
-	        PORT_SetError(PR_OUT_OF_MEMORY_ERROR);
-	        break;
-	    }
 	    irv = PK11_PubWrapSymKey(CKM_RSA_PKCS, srvPubkey, pms, &enc_pms);
 	    if (irv != SECSuccess) 
 		break;
 	    PK11_FreeSymKey(pms);
-	    pms = NULL;
 	    /* now do the server side--check the triple bypass first */
 	    rv = PK11_PrivDecryptPKCS1(srvPrivkey, rsaPmsBuf, &outLen,
 				       sizeof rsaPmsBuf,
@@ -735,16 +727,6 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 		goto done;
 	    break;
 	}
-
-	/* Check for NULL to avoid double free. 
-	 * SECItem_FreeItem sets data NULL in secitem.c#265 
-	 */
-	if (enc_pms.data != NULL) {
-	    SECITEM_FreeItem(&enc_pms, PR_FALSE);
-        }
-	if (pms) {
-	    PK11_FreeSymKey(pms);
-        }
 #ifdef NSS_ENABLE_ECC
 	for (; (privKeytype == ecKey && ( testecdh || testecdhe)) ||
 	       (privKeytype == rsaKey && testecdhe); ) {
@@ -753,7 +735,8 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    SECKEYPrivateKey *keapriv;
 	    SECKEYPublicKey  *cpub = NULL; /* client's ephemeral ECDH keys */
 	    SECKEYPrivateKey *cpriv = NULL;
-	    SECKEYECParams   *pecParams = NULL;
+	    SECKEYECParams    ecParams = { siBuffer, NULL, 0 },
+			      *pecParams;
 
 	    if (privKeytype == ecKey && testecdhe) {
 		/* TLS_ECDHE_ECDSA */
@@ -838,16 +821,13 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
 	    if (testecdhe) {
 		SECKEY_DestroyPrivateKey(keapriv);
 		SECKEY_DestroyPublicKey(keapub);
+		if (privKeytype == rsaKey)
+		    PORT_Free(ecParams.data);
 	    }
 	    if (rv == SECSuccess && *pcanbypass == PR_FALSE)
 		goto done;
 	    break;
 	}
-	/* Check for NULL to avoid double free. */
-	if (ecParams.data != NULL) {
-	    PORT_Free(ecParams.data);
-	    ecParams.data = NULL;
-	}
 #endif /* NSS_ENABLE_ECC */
 	if (pms)
 	    PK11_FreeSymKey(pms);
@@ -860,18 +840,7 @@ SSL_CanBypass(CERTCertificate *cert, SECKEYPrivateKey *srvPrivkey,
     if (pms)
 	PK11_FreeSymKey(pms);
 
-    /* Check for NULL to avoid double free. 
-     * SECItem_FreeItem sets data NULL in secitem.c#265 
-     */
-    if (enc_pms.data != NULL) {
-    	SECITEM_FreeItem(&enc_pms, PR_FALSE);
-    }
-#ifdef NSS_ENABLE_ECC
-    if (ecParams.data != NULL) {
-        PORT_Free(ecParams.data);
-        ecParams.data = NULL;
-    }
-#endif /* NSS_ENABLE_ECC */
+    SECITEM_FreeItem(&enc_pms, PR_FALSE);
 
     if (srvPubkey) {
     	SECKEY_DestroyPublicKey(srvPubkey);
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index e2b9005d9652..d3f455c94eae 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -152,9 +152,3 @@ SSL_SNISocketConfigHook;
 ;+    local:
 ;+*;
 ;+};
-;+NSS_3.12.10 {      # NSS 3.12.10 release
-;+    global:
-SSL_ConfigSecureServerWithCertChain;
-;+    local:
-;+*;
-;+};
diff --git a/security/nss/lib/ssl/ssl.h b/security/nss/lib/ssl/ssl.h
index 1dcb4a0c9c8e..4a9e89d60a98 100644
--- a/security/nss/lib/ssl/ssl.h
+++ b/security/nss/lib/ssl/ssl.h
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl.h,v 1.38.2.4 2011/04/08 05:44:32 wtc%google.com Exp $ */
+/* $Id: ssl.h,v 1.38.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
 
 #ifndef __ssl_h_
 #define __ssl_h_
@@ -372,15 +372,6 @@ SSL_IMPORT SECStatus SSL_ConfigSecureServer(
 				PRFileDesc *fd, CERTCertificate *cert,
 				SECKEYPrivateKey *key, SSLKEAType kea);
 
-/*
-** Allows SSL socket configuration with caller-supplied certificate chain.
-** If certChainOpt is NULL, tries to find one.
-*/
-SSL_IMPORT SECStatus
-SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
-                                    const CERTCertificateList *certChainOpt,
-                                    SECKEYPrivateKey *key, SSLKEAType kea);
-
 /*
 ** Configure a secure server's session-id cache. Define the maximum number
 ** of entries in the cache, the longevity of the entires, and the directory
diff --git a/security/nss/lib/ssl/ssl3con.c b/security/nss/lib/ssl/ssl3con.c
index 850a54ceeba6..80489139c5ff 100644
--- a/security/nss/lib/ssl/ssl3con.c
+++ b/security/nss/lib/ssl/ssl3con.c
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3con.c,v 1.142.2.5 2011/01/25 01:49:22 wtc%google.com Exp $ */
+/* $Id: ssl3con.c,v 1.142.2.4 2010/09/01 19:47:11 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
@@ -4837,8 +4837,14 @@ ssl3_SendCertificateVerify(sslSocket *ss)
 	sid->u.ssl3.clAuthValid      = PR_TRUE;
 	PK11_FreeSlot(slot);
     }
-    SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-    ss->ssl3.clientPrivateKey = NULL;
+    /* If we're doing RSA key exchange, we're all done with the private key
+     * here.  Diffie-Hellman key exchanges need the client's
+     * private key for the key exchange.
+     */
+    if (ss->ssl3.hs.kea_def->exchKeyType == kt_rsa) {
+	SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+	ss->ssl3.clientPrivateKey = NULL;
+    }
     if (rv != SECSuccess) {
 	goto done;	/* err code was set by ssl3_SignHashes */
     }
@@ -4893,20 +4899,6 @@ ssl3_HandleServerHello(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
-    /* clean up anything left from previous handshake. */
-    if (ss->ssl3.clientCertChain != NULL) {
-       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
-       ss->ssl3.clientCertChain = NULL;
-    }
-    if (ss->ssl3.clientCertificate != NULL) {
-       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
-       ss->ssl3.clientCertificate = NULL;
-    }
-    if (ss->ssl3.clientPrivateKey != NULL) {
-       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
-       ss->ssl3.clientPrivateKey = NULL;
-    }
-
     temp = ssl3_ConsumeHandshakeNumber(ss, 2, &b, &length);
     if (temp < 0) {
     	goto loser; 	/* alert has been sent */
@@ -5462,9 +5454,19 @@ ssl3_HandleCertificateRequest(sslSocket *ss, SSL3Opaque *b, PRUint32 length)
 	goto alert_loser;
     }
 
-    PORT_Assert(ss->ssl3.clientCertChain == NULL);
-    PORT_Assert(ss->ssl3.clientCertificate == NULL);
-    PORT_Assert(ss->ssl3.clientPrivateKey == NULL);
+    /* clean up anything left from previous handshake. */
+    if (ss->ssl3.clientCertChain != NULL) {
+       CERT_DestroyCertificateList(ss->ssl3.clientCertChain);
+       ss->ssl3.clientCertChain = NULL;
+    }
+    if (ss->ssl3.clientCertificate != NULL) {
+       CERT_DestroyCertificate(ss->ssl3.clientCertificate);
+       ss->ssl3.clientCertificate = NULL;
+    }
+    if (ss->ssl3.clientPrivateKey != NULL) {
+       SECKEY_DestroyPrivateKey(ss->ssl3.clientPrivateKey);
+       ss->ssl3.clientPrivateKey = NULL;
+    }
 
     isTLS = (PRBool)(ss->ssl3.prSpec->version > SSL_LIBRARY_VERSION_3_0);
     rv = ssl3_ConsumeHandshakeVariable(ss, &cert_types, 1, &b, &length);
diff --git a/security/nss/lib/ssl/ssl3ext.c b/security/nss/lib/ssl/ssl3ext.c
index 3a92fa0281a1..becbfe9c70c6 100644
--- a/security/nss/lib/ssl/ssl3ext.c
+++ b/security/nss/lib/ssl/ssl3ext.c
@@ -41,7 +41,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 /* TLS extension code moved here from ssl3ecc.c */
-/* $Id: ssl3ext.c,v 1.14.2.2 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: ssl3ext.c,v 1.14 2010/04/03 19:19:07 nelson%bolyard.com Exp $ */
 
 #include "nssrenam.h"
 #include "nss.h"
@@ -56,7 +56,7 @@ static unsigned char  key_name[SESS_TICKET_KEY_NAME_LEN];
 static PK11SymKey    *session_ticket_enc_key_pkcs11 = NULL;
 static PK11SymKey    *session_ticket_mac_key_pkcs11 = NULL;
 
-static unsigned char  session_ticket_enc_key[AES_256_KEY_LENGTH];
+static unsigned char  session_ticket_enc_key[32];
 static unsigned char  session_ticket_mac_key[SHA256_LENGTH];
 
 static PRBool         session_ticket_keys_initialized = PR_FALSE;
@@ -1266,17 +1266,14 @@ no_ticket:
 			SSL_GETPID(), ss->fd));
 	ssl3stats = SSL_GetStatistics();
 	SSL_AtomicIncrementLong(& ssl3stats->hch_sid_ticket_parse_failures );
+	if (sid) {
+	    ssl_FreeSID(sid);
+	    sid = NULL;
+	}
     }
     rv = SECSuccess;
 
 loser:
-	/* ss->sec.ci.sid == sid if it did NOT come here via goto statement
-	 * in that case do not free sid
-	 */
-	if (sid && (ss->sec.ci.sid != sid)) {
-	    ssl_FreeSID(sid);
-	    sid = NULL;
-	}
     if (decrypted_state != NULL) {
 	SECITEM_FreeItem(decrypted_state, PR_TRUE);
 	decrypted_state = NULL;
diff --git a/security/nss/lib/ssl/sslcon.c b/security/nss/lib/ssl/sslcon.c
index 8f3bc06a8343..4e345548b4b0 100644
--- a/security/nss/lib/ssl/sslcon.c
+++ b/security/nss/lib/ssl/sslcon.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslcon.c,v 1.40.2.1 2011/03/30 17:38:42 wtc%google.com Exp $ */
+/* $Id: sslcon.c,v 1.40 2010/04/25 23:37:38 nelson%bolyard.com Exp $ */
 
 #include "nssrenam.h"
 #include "cert.h"
@@ -3125,11 +3125,11 @@ ssl2_BeginClientHandshake(sslSocket *ss)
 	/* ssl3_SendClientHello will override this if it succeeds. */
 	ss->version       = SSL_LIBRARY_VERSION_3_0;
 
+	ssl_GetXmitBufLock(ss);    /***************************************/
 	ssl_GetSSL3HandshakeLock(ss);
-	ssl_GetXmitBufLock(ss);
 	rv =  ssl3_SendClientHello(ss);
-	ssl_ReleaseXmitBufLock(ss);
 	ssl_ReleaseSSL3HandshakeLock(ss);
+	ssl_ReleaseXmitBufLock(ss); /***************************************/
 
 	return rv;
     }
diff --git a/security/nss/lib/ssl/sslimpl.h b/security/nss/lib/ssl/sslimpl.h
index 91070d35c07f..9af471d88bc3 100644
--- a/security/nss/lib/ssl/sslimpl.h
+++ b/security/nss/lib/ssl/sslimpl.h
@@ -39,7 +39,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslimpl.h,v 1.77.2.2 2011/03/16 18:55:38 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslimpl.h,v 1.77.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
 
 #ifndef __sslimpl_h_
 #define __sslimpl_h_
@@ -1515,7 +1515,7 @@ extern PRInt32 ssl3_SendServerNameXtn(sslSocket *ss, PRBool append,
  * fails to do so. If cert and keyPair are NULL - unconfigures
  * sslSocket of kea type.*/
 extern SECStatus ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                                        const CERTCertificateList *certChain,
+                                        CERTCertificateList *certChain,
                                         ssl3KeyPair *keyPair, SSLKEAType kea);
 /* Return key type for the cert */
 extern SSLKEAType ssl_FindCertKEAType(CERTCertificate * cert);
diff --git a/security/nss/lib/ssl/sslnonce.c b/security/nss/lib/ssl/sslnonce.c
index 024651073fcc..63dc5a28507b 100644
--- a/security/nss/lib/ssl/sslnonce.c
+++ b/security/nss/lib/ssl/sslnonce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslnonce.c,v 1.25.54.1 2011/03/24 16:30:57 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslnonce.c,v 1.25 2008/03/10 00:01:28 wtc%google.com Exp $ */
 
 #include "cert.h"
 #include "pk11pub.h"
@@ -222,9 +222,6 @@ ssl_DestroySID(sslSessionID *sid)
     if (sid->u.ssl3.sessionTicket.ticket.data) {
 	SECITEM_FreeItem(&sid->u.ssl3.sessionTicket.ticket, PR_FALSE);
     }
-    if (sid->u.ssl3.srvName.data) {
-	SECITEM_FreeItem(&sid->u.ssl3.srvName, PR_FALSE);
-    }
     
     PORT_ZFree(sid, sizeof(sslSessionID));
 }
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c
index a40dd4fc3195..a0cae5496801 100644
--- a/security/nss/lib/ssl/sslsecur.c
+++ b/security/nss/lib/ssl/sslsecur.c
@@ -37,7 +37,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsecur.c,v 1.43.2.4 2011/04/08 05:25:21 wtc%google.com Exp $ */
+/* $Id: sslsecur.c,v 1.43.2.2 2010/08/26 18:06:55 wtc%google.com Exp $ */
 #include "cert.h"
 #include "secitem.h"
 #include "keyhi.h"
@@ -674,7 +674,7 @@ static PRStatus serverCAListSetup(void *arg)
 
 SECStatus
 ssl_ConfigSecureServer(sslSocket *ss, CERTCertificate *cert,
-                       const CERTCertificateList *certChain,
+                       CERTCertificateList *certChain,
                        ssl3KeyPair *keyPair, SSLKEAType kea)
 {
     CERTCertificateList *localCertChain = NULL;
@@ -752,15 +752,6 @@ SECStatus
 SSL_ConfigSecureServer(PRFileDesc *fd, CERTCertificate *cert,
 		       SECKEYPrivateKey *key, SSL3KEAType kea)
 {
-
-    return SSL_ConfigSecureServerWithCertChain(fd, cert, NULL, key, kea);
-}
-
-SECStatus
-SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
-                                    const CERTCertificateList *certChainOpt,
-                                    SECKEYPrivateKey *key, SSL3KEAType kea)
-{
     sslSocket *ss;
     SECKEYPublicKey *pubKey = NULL;
     ssl3KeyPair *keyPair = NULL;
@@ -831,7 +822,7 @@ SSL_ConfigSecureServerWithCertChain(PRFileDesc *fd, CERTCertificate *cert,
         }
 	pubKey = NULL; /* adopted by serverKeyPair */
     }
-    if (ssl_ConfigSecureServer(ss, cert, certChainOpt,
+    if (ssl_ConfigSecureServer(ss, cert, NULL,
                                keyPair, kea) == SECFailure) {
         goto loser;
     }
diff --git a/security/nss/lib/ssl/sslsnce.c b/security/nss/lib/ssl/sslsnce.c
index cd318df29da8..6c73f25122eb 100644
--- a/security/nss/lib/ssl/sslsnce.c
+++ b/security/nss/lib/ssl/sslsnce.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsnce.c,v 1.54.2.1 2011/03/16 18:49:45 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslsnce.c,v 1.54 2010/07/05 19:31:56 alexei.volkov.bugs%sun.com Exp $ */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
  * cache sids!
@@ -1863,25 +1863,17 @@ WrapTicketKey(SECKEYPublicKey *svrPubKey, PK11SymKey *symKey,
 }
 
 static PRBool
-GenerateTicketKeys(void *pwArg, unsigned char *keyName, PK11SymKey **aesKey,
-                   PK11SymKey **macKey)
+GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
+                          unsigned char *keyName, PK11SymKey **aesKey,
+                          PK11SymKey **macKey)
 {
     PK11SlotInfo *slot;
     CK_MECHANISM_TYPE mechanismArray[2];
     PK11SymKey *aesKeyTmp = NULL;
     PK11SymKey *macKeyTmp = NULL;
     cacheDesc *cache = &globalCache;
-    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
-    uint8 *ticketKeyNameSuffix;
 
-    if (!cache->cacheMem) {
-        /* cache is not initalized. Use stack buffer */
-        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
-    } else {
-        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
-    }
-
-    if (PK11_GenerateRandom(ticketKeyNameSuffix,
+    if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
 	    SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess) {
 	SSL_DBG(("%d: SSL[%s]: Unable to generate random key name bytes.",
 		    SSL_GETPID(), "unknown"));
@@ -1893,10 +1885,9 @@ GenerateTicketKeys(void *pwArg, unsigned char *keyName, PK11SymKey **aesKey,
 
     slot = PK11_GetBestSlotMultiple(mechanismArray, 2, pwArg);
     if (slot) {
-	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL,
-                                AES_256_KEY_LENGTH, pwArg);
-	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL,
-                                SHA256_LENGTH, pwArg);
+	aesKeyTmp = PK11_KeyGen(slot, mechanismArray[0], NULL, 32, pwArg);
+	macKeyTmp = PK11_KeyGen(slot, mechanismArray[1], NULL, SHA256_LENGTH,
+				pwArg);
 	PK11_FreeSlot(slot);
     }
 
@@ -1905,39 +1896,15 @@ GenerateTicketKeys(void *pwArg, unsigned char *keyName, PK11SymKey **aesKey,
 		    SSL_GETPID(), "unknown"));
 	goto loser;
     }
-    PORT_Memcpy(keyName, ticketKeyNameSuffix, SESS_TICKET_KEY_VAR_NAME_LEN);
-    *aesKey = aesKeyTmp;
-    *macKey = macKeyTmp;
-    return PR_TRUE;
 
-loser:
-    if (aesKeyTmp)
-	PK11_FreeSymKey(aesKeyTmp);
-    if (macKeyTmp)
-	PK11_FreeSymKey(macKeyTmp);
-    return PR_FALSE;
-}
+    /* Export the keys to the shared cache in wrapped form. */
+    if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
+	goto loser;
+    if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
+	goto loser;
 
-static PRBool
-GenerateAndWrapTicketKeys(SECKEYPublicKey *svrPubKey, void *pwArg,
-                          unsigned char *keyName, PK11SymKey **aesKey,
-                          PK11SymKey **macKey)
-{
-    PK11SymKey *aesKeyTmp = NULL;
-    PK11SymKey *macKeyTmp = NULL;
-    cacheDesc *cache = &globalCache;
-
-    if (!GenerateTicketKeys(pwArg, keyName, &aesKeyTmp, &macKeyTmp)) {
-        goto loser;
-    }
-
-    if (cache->cacheMem) {
-        /* Export the keys to the shared cache in wrapped form. */
-        if (!WrapTicketKey(svrPubKey, aesKeyTmp, "enc key", cache->ticketEncKey))
-            goto loser;
-        if (!WrapTicketKey(svrPubKey, macKeyTmp, "mac key", cache->ticketMacKey))
-            goto loser;
-    }
+    PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
+	SESS_TICKET_KEY_VAR_NAME_LEN);
     *aesKey = aesKeyTmp;
     *macKey = macKeyTmp;
     return PR_TRUE;
@@ -2004,12 +1971,6 @@ ssl_GetSessionTicketKeysPKCS11(SECKEYPrivateKey *svrPrivKey,
     PRBool keysGenerated = PR_FALSE;
     cacheDesc *cache = &globalCache;
 
-    if (!cache->cacheMem) {
-        /* cache is uninitialized. Generate keys and return them
-         * without caching. */
-        return GenerateTicketKeys(pwArg, keyName, aesKey, macKey);
-    }
-
     now = LockSidCacheLock(cache->keyCacheLock, now);
     if (!now)
 	return rv;
@@ -2039,58 +2000,33 @@ ssl_GetSessionTicketKeys(unsigned char *keyName, unsigned char *encKey,
     PRBool rv = PR_FALSE;
     PRUint32 now = 0;
     cacheDesc *cache = &globalCache;
-    uint8 ticketMacKey[AES_256_KEY_LENGTH], ticketEncKey[SHA256_LENGTH];
-    uint8 ticketKeyNameSuffixLocal[SESS_TICKET_KEY_VAR_NAME_LEN];
-    uint8 *ticketMacKeyPtr, *ticketEncKeyPtr, *ticketKeyNameSuffix;
-    PRBool cacheIsEnabled = PR_TRUE;
 
-    if (!cache->cacheMem) { /* cache is uninitialized */
-        cacheIsEnabled = PR_FALSE;
-        ticketKeyNameSuffix = ticketKeyNameSuffixLocal;
-        ticketEncKeyPtr = ticketEncKey;
-        ticketMacKeyPtr = ticketMacKey;
-    } else {
-        /* these values have constant memory locations in the cache.
-         * Ok to reference them without holding the lock. */
-        ticketKeyNameSuffix = cache->ticketKeyNameSuffix;
-        ticketEncKeyPtr = cache->ticketEncKey->bytes;
-        ticketMacKeyPtr = cache->ticketMacKey->bytes;
-    }
+    /* Grab lock. */
+    now = LockSidCacheLock(cache->keyCacheLock, now);
+    if (!now)
+	return rv;
 
-    if (cacheIsEnabled) {
-        /* Grab lock if initialized. */
-        now = LockSidCacheLock(cache->keyCacheLock, now);
-        if (!now)
-            return rv;
-    }
-    /* Going to regenerate keys on every call if cache was not
-     * initialized. */
-    if (!cacheIsEnabled || !*(cache->ticketKeysValid)) {
-	if (PK11_GenerateRandom(ticketKeyNameSuffix,
+    if (!*(cache->ticketKeysValid)) {
+	if (PK11_GenerateRandom(cache->ticketKeyNameSuffix,
 		SESS_TICKET_KEY_VAR_NAME_LEN) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(ticketEncKeyPtr,
-                                AES_256_KEY_LENGTH) != SECSuccess)
+	if (PK11_GenerateRandom(cache->ticketEncKey->bytes, 32) != SECSuccess)
 	    goto loser;
-	if (PK11_GenerateRandom(ticketMacKeyPtr,
-                                SHA256_LENGTH) != SECSuccess)
+	if (PK11_GenerateRandom(cache->ticketMacKey->bytes,
+		SHA256_LENGTH) != SECSuccess)
 	    goto loser;
-        if (cacheIsEnabled) {
-            *(cache->ticketKeysValid) = 1;
-        }
+	*(cache->ticketKeysValid) = 1;
     }
 
     rv = PR_TRUE;
 
  loser:
-    if (cacheIsEnabled) {
-        UnlockSidCacheLock(cache->keyCacheLock);
-    }
+    UnlockSidCacheLock(cache->keyCacheLock);
     if (rv) {
-	PORT_Memcpy(keyName, ticketKeyNameSuffix,
-                    SESS_TICKET_KEY_VAR_NAME_LEN);
-	PORT_Memcpy(encKey, ticketEncKeyPtr, AES_256_KEY_LENGTH);
-	PORT_Memcpy(macKey, ticketMacKeyPtr, SHA256_LENGTH);
+	PORT_Memcpy(keyName, cache->ticketKeyNameSuffix,
+	    SESS_TICKET_KEY_VAR_NAME_LEN);
+	PORT_Memcpy(encKey, cache->ticketEncKey->bytes, 32);
+	PORT_Memcpy(macKey, cache->ticketMacKey->bytes, SHA256_LENGTH);
     }
     return rv;
 }
diff --git a/security/nss/lib/ssl/sslsock.c b/security/nss/lib/ssl/sslsock.c
index 7819440c8d91..bc770a16640f 100644
--- a/security/nss/lib/ssl/sslsock.c
+++ b/security/nss/lib/ssl/sslsock.c
@@ -40,7 +40,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslsock.c,v 1.67.2.2 2011/03/16 19:04:02 alexei.volkov.bugs%sun.com Exp $ */
+/* $Id: sslsock.c,v 1.67.2.1 2010/07/31 04:33:52 wtc%google.com Exp $ */
 #include "seccomon.h"
 #include "cert.h"
 #include "keyhi.h"
@@ -1271,8 +1271,8 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
 {
     sslSocket * sm = NULL, *ss = NULL;
     int i;
-    sslServerCerts * mc = NULL;
-    sslServerCerts * sc = NULL;
+    sslServerCerts * mc = sm->serverCerts;
+    sslServerCerts * sc = ss->serverCerts;
 
     if (model == NULL) {
         PR_SetError(SEC_ERROR_INVALID_ARGS, 0);
@@ -1301,9 +1301,7 @@ SSL_ReconfigFD(PRFileDesc *model, PRFileDesc *fd)
     /* This int should be SSLKEAType, but CC on Irix complains,
      * during the for loop.
      */
-    for (i=kt_null; i < kt_kea_size; i++) {
-        mc = &(sm->serverCerts[i]);
-        sc = &(ss->serverCerts[i]);
+    for (i=kt_null; i < kt_kea_size; i++, mc++, sc++) {
         if (mc->serverCert && mc->serverCertChain) {
             if (sc->serverCert) {
                 CERT_DestroyCertificate(sc->serverCert);
diff --git a/security/nss/lib/sysinit/nsssysinit.c b/security/nss/lib/sysinit/nsssysinit.c
index 883ed7833ad1..151c3c574b7c 100644
--- a/security/nss/lib/sysinit/nsssysinit.c
+++ b/security/nss/lib/sysinit/nsssysinit.c
@@ -221,16 +221,16 @@ getFIPSMode(void)
  * 2 for the key slot, and
  * 3 for the crypto operations slot fips
  */
-#define CIPHER_ORDER_FLAGS "cipherOrder=100"
+#define ORDER_FLAGS "trustOrder=75 cipherOrder=100"
 #define SLOT_FLAGS \
 	"[slotFlags=RSA,RC4,RC2,DES,DH,SHA1,MD5,MD2,SSL,TLS,AES,RANDOM" \
 	" askpw=any timeout=30 ]"
  
 static const char *nssDefaultFlags =
-	CIPHER_ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
+	ORDER_FLAGS " slotParams={0x00000001=" SLOT_FLAGS " }  ";
 
 static const char *nssDefaultFIPSFlags =
-	CIPHER_ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
+	ORDER_FLAGS " slotParams={0x00000003=" SLOT_FLAGS " }  ";
 
 /*
  * This function builds the list of databases and modules to load, and sets
@@ -270,7 +270,7 @@ get_list(char *filename, char *stripped_parameters)
 	    "library= "
 	    "module=\"NSS User database\" "
 	    "parameters=\"configdir='sql:%s' %s tokenDescription='NSS user database'\" "
-        "NSS=\"trustOrder=75 %sflags=internal%s\"",
+        "NSS=\"%sflags=internal%s\"",
         userdb, stripped_parameters, nssflags,
         isFIPS ? ",FIPS" : "");
 
@@ -284,6 +284,30 @@ get_list(char *filename, char *stripped_parameters)
 		userdb, stripped_parameters);
 	}
 
+#if 0
+	/* This doesn't actually work. If we register
+		both this and the sysdb (in either order)
+		then only one of them actually shows up */
+
+    /* Using a NULL filename as a Boolean flag to
+     * prevent registering both an application-defined
+     * db and the system db. rhbz #546211.
+     */
+    PORT_Assert(filename);
+    if (sysdb && PL_CompareStrings(filename, sysdb))
+	    filename = NULL;
+    else if (userdb && PL_CompareStrings(filename, userdb))
+	    filename = NULL;
+
+    if (filename && !userIsRoot()) {
+	    module_list[next++] = PR_smprintf(
+	      "library= "
+	      "module=\"NSS database\" "
+	      "parameters=\"configdir='sql:%s' tokenDescription='NSS database sql:%s'\" "
+	      "NSS=\"%sflags=internal\"",filename, filename, nssflags);
+    }
+#endif
+
     /* now the system database (always read only unless it's root) */
     if (sysdb) {
 	    const char *readonly = userCanModifySystemDB() ? "" : "flags=readonly";
@@ -291,7 +315,7 @@ get_list(char *filename, char *stripped_parameters)
 	      "library= "
 	      "module=\"NSS system database\" "
 	      "parameters=\"configdir='sql:%s' tokenDescription='NSS system database' %s\" "
-	      "NSS=\"trustOrder=80 %sflags=internal,critical\"",sysdb, readonly, nssflags);
+	      "NSS=\"%sflags=internal,critical\"",sysdb, readonly, nssflags);
     }
 
     /* that was the last module */
@@ -348,9 +372,9 @@ overlapstrcpy(char *target, char *src)
 
 /* determine what options the user was trying to open this database with */
 /* filename is the directory pointed to by configdir= */
-/* stripped is the rest of the parameters with configdir= stripped out */
+/* stripped is the rest of the paramters with configdir= stripped out */
 static SECStatus
-parse_parameters(char *parameters, char **filename, char **stripped)
+parse_paramters(char *parameters, char **filename, char **stripped)
 {
     char *sourcePrev;
     char *sourceCurr;
@@ -399,7 +423,7 @@ NSS_ReturnModuleSpecData(unsigned long function, char *parameters, void *args)
     char **retString = NULL;
     SECStatus rv;
 
-    rv = parse_parameters(parameters, &filename, &stripped);
+    rv = parse_paramters(parameters, &filename, &stripped);
     if (rv != SECSuccess) {
 	/* use defaults */
 	filename = getSystemDB();
diff --git a/security/nss/lib/util/nssb64d.c b/security/nss/lib/util/nssb64d.c
index 51426f015fed..12b53e528aea 100644
--- a/security/nss/lib/util/nssb64d.c
+++ b/security/nss/lib/util/nssb64d.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
@@ -562,9 +563,14 @@ PL_Base64DecodeBuffer (const char *src, PRUint32 srclen, unsigned char *dest,
     PLBase64Decoder *data = NULL;
     PRStatus status;
 
-    PR_ASSERT(srclen > 0);
-    if (srclen == 0)
+    if (srclen == 0) {
+	*output_destlen = 0;
+	if (dest == NULL) {
+	    /* PR_Malloc(0) is undefined */
+	    return (unsigned char *) PR_Malloc(1);
+	}
 	return dest;
+    }
 
     /*
      * How much space could we possibly need for decoding this input?
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index 3fd74f510daf..4511007f050e 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -51,11 +51,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION  "3.12.10.0 Beta"
+#define NSSUTIL_VERSION  "3.12.9.0"
 #define NSSUTIL_VMAJOR   3
 #define NSSUTIL_VMINOR   12
-#define NSSUTIL_VPATCH   10
+#define NSSUTIL_VPATCH   9
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_TRUE
+#define NSSUTIL_BETA     PR_FALSE
 
 #endif /* __nssutil_h_ */
diff --git a/security/nss/lib/util/secasn1e.c b/security/nss/lib/util/secasn1e.c
index 4f058e2b4ed3..3a4413fa41b5 100644
--- a/security/nss/lib/util/secasn1e.c
+++ b/security/nss/lib/util/secasn1e.c
@@ -38,7 +38,7 @@
  * Support for ENcoding ASN.1 data based on BER/DER (Basic/Distinguished
  * Encoding Rules).
  *
- * $Id: secasn1e.c,v 1.21.66.1 2011/01/13 00:26:57 wtc%google.com Exp $
+ * $Id: secasn1e.c,v 1.21 2006/04/07 11:41:18 kaie%kuix.de Exp $
  */
 
 #include "secasn1.h"
@@ -1587,7 +1587,7 @@ SEC_ASN1EncodeItem (PRArenaPool *poolp, SECItem *dest, const void *src,
 
 static SECItem *
 sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
-		  PRBool is_unsigned)
+		  PRBool make_unsigned)
 {
     unsigned long copy;
     unsigned char sign;
@@ -1604,11 +1604,11 @@ sec_asn1e_integer(PRArenaPool *poolp, SECItem *dest, unsigned long value,
     } while (copy);
 
     /*
-     * If 'value' is non-negative, and the high bit of the last
+     * If this is an unsigned encoding, and the high bit of the last
      * byte we counted was set, we need to add one to the length so
      * we put a high-order zero byte in the encoding.
      */
-    if (sign && (is_unsigned || (long)value >= 0))
+    if (sign && make_unsigned)
 	len++;
 
     /*
diff --git a/security/nss/tests/chains/ocspd-config/readme b/security/nss/tests/chains/ocspd-config/readme
index 87a3594296b6..f0e14a51a358 100644
--- a/security/nss/tests/chains/ocspd-config/readme
+++ b/security/nss/tests/chains/ocspd-config/readme
@@ -1,18 +1,16 @@
 This script is used to generate certificates used by ocspd.
 
 Some steps to run (only once - before all OCSP testing):
-1.  Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
-2.  Set environment variable to run only chains tests: export NSS_TESTS=chains.sh
-3.  Set environment variable to have the correct URI in the certificates: export NSS_AIA_OCSP=http://dochinups.us.oracle.com
-4.  Run tests: ./all.sh
-5.  Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
-6.  Copy ocspd-certs.sh and ocspd.conf.template to this directory
-7.  Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
-    Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
+1. Edit security/nss/tests/chains/scenarios/scenarios to have there only ocspd.cfg
+2. Set environment variable to run only chains tests: export NSS_TESTS=all.sh
+3. Run tests: ./all.sh
+4. Go to results directory: cd tests_results/security/${HOST}.${ID}/chains
+5. Copy ocspd-certs.sh and ocspd.conf.template to this directory
+6. Run: ./ocspd-certs.sh OCSPD ${OCSPD_ETC_DIR} ${LIBPKIX_CERTS_DIR}:
+   Example: ./ocspd-certs.sh OCSPD /export/iopr/openca-ocsp-responder/etc/ocspdPKIX \
        ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
-8.  Commit the new certificates that have been generated under ~/nss/securitytip/mozilla/security/nss/tests/libpkix/certs
-9.  Copy config files and keys/certs/crls to ocspd etc directory:
-    cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
-    cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
-10. Start ocsp deamons on dochinups (for all configs).
+7. Copy config files and keys/certs/crls to ocspd etc directory:
+   cp *.conf /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX
+   cp *.pem *.key /Volumes/dochinups.red.iplanet.com/openca-ocsp-responder/etc/ocspdPKIX/OCSPD
+8. Start ocsp deamons on dochinups (for all configs).
 
diff --git a/security/nss/tests/libpkix/certs/OCSPCA1.cert b/security/nss/tests/libpkix/certs/OCSPCA1.cert
index 6d24954120b014028dbf2ff2ddba4ebd91a63b82..8fb20c696dbf4133b4674abddf20eb885cab2b88 100644
GIT binary patch
delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<Xcjab81H1b1R}T>YB&dw7H9@U5E8
z(&Kq#iM#PnR~Do8S?b#~9~`*tv@_N&qHs%>(stWwnbvuyzU}G%7PRfjfi`6s`6<O~
znYpK&Y?>4BJn3>)vCz5K!HHQW2bX``>!jW4KFKg6=iI~{g<hxMy?eZ<dT-qN9W~Y7
z%BsQ>v{;Tm`75xCBSv?A%Bllyp{`8Kj0}v6!wf<U_}Q34WrZ0T|Ff_fFas$AM>Y;^
zHbz!fc1A`PQv+iILm1zHu}w9jq@=(~Uq2;3IU_T#w4hk8C^bbdvmhriFSTUyYDSs*
z73&>$8SFe<@u)}4-*e7^C36$A|6UgND_ZwP^?v3pU-MH(T7C$`GpjxO|H||!Q_tdC
z+v{H(oz}|WIam7SB}EDGuEZ7dH#i0B=P$2ZsUWJ;@a&iQ*J9h!cD7glTMmEsU$(z;
l#iLWcvX6s(R-Qia&-B?^o=@gMHDdd!n76(D;WmqL4gk(Zqpbh{

delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3?-@ab80+1b1R}T>Z7>xdMfkB7e5!
zy}c;cy>kuU=AVkv!P?iIeknNU_y@F=vtLbJw)A<+gmr~alVge=)~d}-xO9=XNJee>
zB*Xb(Y?Cs(-y}**UT!|&0dw<B`3K*3++x4D^vdCvHP=IC)#~1u@3OnDzjf}vIC-z)
zST*4&*9G&V*n@Z-=K9v=eXu?i+{nbt$iTQb#30CkpN%<GR+y3TKMSh?GmtW{XXDUj
zV`ODzXJlkCHZU~Mhw%*<+mtg(N(!v>^;7bbGcxl^3ySqhi}mu05|eXMC$D9csrO%<
z%K68s&PMivbnVhJRvd*z$1WK+q%zj1RR<cV#>6`vKUmMm@$Z|e>+Qbkf>YjSgSghJ
zoS(Ku@rC1CISISzQF{eTJm&ONo|s&HdF5i=?sZ%Ai<!3Wayz_wSzO<*O@XC{E}#8l
hyDi^rO=$D3>~|fk7N3~C7x3M64ts3<`iCmx3;>O+oRR<l

diff --git a/security/nss/tests/libpkix/certs/OCSPCA1.p12 b/security/nss/tests/libpkix/certs/OCSPCA1.p12
index 990cbb6f7cf4efa12a50d186721d0dbc5583ee0d..4ec3cf5bca6db42ab33cf698d1d69942170ea217 100644
GIT binary patch
delta 1499
zcmV<11tj{M4Wtc_839X?8b*ICdr2GY;E}oEZt|=7TfBe*0RaSp0)YHXoOP9*zmZDr
z-$biwv#Cn3;MSmi)|Rng4huXl0Z7C=NujgjYHv?33V6&7QGep((0|G<V@c?#&ZQC8
zw0;`lKxkHw=C<}+AMWPjScEKrx(yMcG<_T!U?m~}UQ_p>!$cn+*lvGmP|{hHlX}9S
zTA=IqejKN9sr$z{-ljoU))f#Ds%`C`oO&)39=as<0j}vyvfQJCznk$gzKcE;4qzEZ
zZAQ*iGeN7s=P~fO0A8A&iROK2VO}+yXGgU@DIl~%>R+H;PUc+oe3C9+_Z3eBSdxQ>
zhf~I<p5s$xnaiyi{WE`8zYaT~DLA^(zWC`hdkAewGrN>LrOz@TTEaCum&@sxURnze
zu;W$)#ZK`dBe5~{Nr)wZQ}TpsJO<9vRp@!jnO;KHpV$>5mJfAkG!7b3IKb`(8zf7G
zLl2&a><ecUqc#gf>gzK<KH_fVYB`;#0Qzz!y901G{(^_f=ZSy(2tT&cRScvPUsom{
zA{96OdPDiBusk$Gm^2KH1J6n7>!X^sJ+9vLfe(B)VRGd<t#LL>R6!=<e6K_#RU@;Y
zR4-uP&Mo4)AViH!r0lkEr>62?0F{J;&NHt{WPp<%+0XYJ-mgb?qoV>uzhi93oa|sW
z&Wy>xeu_3d>zIGo@|>Rt7C@7OXU1FG2#rxkiFtY|hBuBr<zf21Yi0557(iu*weEo>
zZ_sclsBv<^8Gs7=bX6|D=19}kQey-zdy9SnmjGHs838(d-b&5`0pbw3OoCb~&|FA>
zYlvvFtd~JS24GeXySh?P@B7E~dYF&w*icC%ZZI2pXFMG1+5gTgpnBe-iWPV_6C(VL
zYc+`iJlvd>O1|`y_X08$Q7=11ZP2E80VV(e5fZlytKFABlRX1De~Y)hLwdMK%xhLJ
zAmnqd-2wptpnwE|0>GCxfLReyBAH@6`h*l}ja6YoFAnUmOi4s?w6ZzZQWSJNszlh8
zDU#`~t1oPJCB=1D9o28*1s9T(Ur}WS0V2fmd>vzUGt-FyCm46yDBcbGx=$JskpRX-
z(6}>}NFZ>D#{4Y%e`+Q-h#(t<vVYwSp=8Y?pfAsyjU}}oH&7|vZ$O_<wNSc9Pw7T>
z`9BH?Lr$np?H`f^;ZO+9=ch?XzE!6Ws;^C~yv5c@5vBM2Fvd4XP1zRP?Ibj^{FP`L
zdwLKQC*WR*<fT3(g~OI8+D!DHp-Bh;X0NJFGEl=P_p_s`e>q%}$<_u!x_vX%P43Z#
zdR*GP(9!J@v2qBSmuaWBprrF$nD)%0&tHkGQUtq(E^juJ|1|(@+veL2o}6Q4<x>bC
z=IZdDU~%`uZLRkZUlf#FoDF!vHMsi@O_oefOoZ34n(U;A><nvIiBD!eG>6Nds9!g5
z-wqluqzHQNf8s_!v>yOdD7?D3D;NgJMbW!+^aY&aDGCW0-ztX}f3dRlG1jfIs4vjP
z>CP+8=w*o%G{_5F6gb>5tmo@Ce)Ekb1Y(<5K83m%4AN@2-AXw;8H9wijj1P&p1F3M
zzIv9w+PAw#SV4n%uSFZmtVBjxG{k&SpY=AYe0D}+e<MRv?BXd(qHXa;&EnKg-+Wjd
zK26k>=B6%Rz#Fy**`*5noSv(F`99C%6y`$9dQEQ~WQDT~Rj}qJvipe1sub0Z;O=%D
z`BK9u>|zs1QNB`UyRp=Fp~Vv^2c8=-(RI26z0mt-|CjM2*+!pQ3r`c1(~8x&%=Rr_
zx{&-RX!8@oz+%CH#BDNLM#{Z=QSbzA8Uts4c@qb8aguF3KSa4WVtQNQdH;*1TmDCo
zI9#~486h*tb*wg02gfW*544_qE}b=Z^X#^K5g3j-COoqYyz09{$xUZmXSj0&2sx>=
zM+hRJSd&o(BPaowW6iy~LsQTkDUE~ZC{HBwvZ(|R4x3BvvwOCUn=?lWL)6{r0071+
B#!vtN

delta 1491
zcmV;^1uXic4V(>-8399)8b*J3fnH<b80uhbM;c_Q=`|?=0RaSp0)VryfKw6miMwO+
zhE>2wnuhThT806VA!`F(pu-)LfMrcI--YzFi55PTFCAXA=0Y*KAmkVEuS88un8kM#
zsFC&zohE=_Hv3^8_yIY55m#ZNHOgx2Vd$n$j1Qj1(PbPA^#+g)*bRSFPKo#h?eD--
zySi4kK;v=)nETaSXOo?vA!r^qu=oPtA!7X>;#)zsIIOL6ZP8?M^%r6F8M2JS(Mj#v
z&sizEh(M74;IOZ#wDs%)iyK~t`}+_#sx3N>^xcTLcUO(KOHvJVZx9WkCbvW*sC{--
z{Yw%nV`4KW{zfo}m+OB|H%1*WM!m&FyZ`}+))j)3le)O=B{Q%WEmelCdHvYTsJfvN
zDP(|*214^VITccRf2B1*9=<M-LezlrN0fEBuZuDQX>lRJ^q#QIQa}nmjIUSlL%ePj
z{z?VHaRVp~I#$hLv@Ew+q_VtJ*i&rVNaK-1HGP30wg*O0fW&`ZHOufo@wczI1kCdU
z$QNu`lgw!A^Ez-W`>R3KfV56Hibwra#0+<!QLqNK&BzBHqMdSIKu^k&4x1el@@^Rn
zp|o}5Te`Dw_Di@M);>SL)%BH~VjqYRepjs(I502?um3ZTlnrA?x6xNXb7su=!DYY2
zniuT`QfBc}FMof?Bo7e;C@715d>P}^L4$CB)Xig59&oWEn3c|H|J4U{);77lb|_-b
z-G=3bf(krP0o<Pim3$zxDsJ?64+u5P^IH)KZI-l=l#2+uml9xBq$iwbKb=9Jhlz>O
z7`yNauZaCzkDFY`IKa2*`h&kID897N*Y2V58;C+X!b}{uO1z`l9i(;w!wC3VOm!9o
z76r?J5@nSQh&l0-_X08$*jn*F7yx6d>BBKlZ>>&xoPfB9lRX1De<luae&iRPF3S8R
zHuS-dD*^!lpnwE|0=T!2#-xWP9xa(gmm^_Qy#7lIR#U&Wff_niUhZJ7n9mTCt4mc!
zC>6duQOlX>6no}pxkD4z9+@7=Uj@TmLlW}vA#0tjg=-sV`e%$gGo!CaSQ(_&ISBUm
zv|kGuTG1Ozq66vqe}8PaTkpoH*SeHM{>BFH=|nV5jyy|kkE=hBu(tj*dtdV_mac1G
z8OHg*88Dm0Z-=D4Sv)0EmT}d^rW^*ybul3>X^4ScrJ-2X<l+@|(%DJ7xN7;Jf@uW4
zQqI0T#gu|ysYieOewvw<g>`I;>d1VrZyYXq<g1k}E0IX9e>ujs^T-@9H1~7BVmQx+
zTN_MgE%i+>uH#z$XTaGMp(`Tg%fPLVYj=XPa1BjTM_thWjl?TV^h@gr$+UEEuTjfq
zlOu^w2MTpuS`otaNdOhmDX{cdjX>Xyx+D@$5EVv1ZQ43Won|lrA#MttoHRko1sIU3
zn=A@BJAF%fe<xynBOa7mko;+q&EeP|Zn=<91q|j3t!fF?S`cDminIObi}WP;hN)*O
zv*R%8RT)jf&a&x!D^?eT?H8?HSTL`>&96L!=JvwFngG-7LzJ^^=IuoZ%OY*=AtEdm
zE9W;7?V00R{E+|IIogR4%Dfdi9()TQ=r8(uIM;MZf2f#9`r^s|wq<2;sB=@A!^sYM
zgN?he;pq~h(w%F|1{kGd;$;;fB+JkMd0M=jZOSU+ij^S9+_urP^#@qJlvE4)0eiiM
zdmxy>5;~sQiGYuNnC{ZOpqg`N{2{0=_aV+cSWlGM$xsI4N#>ud4EY^+zWqpWhoSL0
zMv%4IU>5U0Bu87r_TQYwR357Dsh5QyOT+i?Ecsdn;H0M%?R(pWy&S}JnYY$oFm0|0
z0zC@cS|)M?@;*P6GQas&B;k9-3sD_;1It?FB1R{GWg_DmbQwMb2#OD9B{PQ7sFPU+
tBPhiCw(o>3_g{syB1vqo;TZ?1&oKlL&fTqebM%$^Yj1#tWhsT}008Be%X<I-

diff --git a/security/nss/tests/libpkix/certs/OCSPCA2.cert b/security/nss/tests/libpkix/certs/OCSPCA2.cert
index 63504742aa807a8b3a2eb83aa08d79a417e3ac38..b8b6369786a78e902ade06850e59b90462f77509 100644
GIT binary patch
delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<Yn@ab81H1b1R}T>Z5TuYSgwluz(j
zb6}+#1D}1@%s8d(HaV>qLgl2`R&nI4e0X`E^k@Du;iP{n6|B?TITxmzypuX|RMf;e
zB<JwNx4Mf?XS`j(bN*}Cx}dX0Cyu_kb?pBHn?D`Wi@$rWn!?>Tt)rwe{KLA9`}a(e
zdU)&Cl}{P^ht5o673<X&c>g@_Y3Ok#W=00a#bE{^2K;Qyp|Zk^jQ?3!4VZzHfg>A-
zHX9==D?1}2i>ZOJfgy}<z}TjmQBqQ1rLUiopPZ4IS6Wc4SCpEfmsyaLn3q~Ic{QU<
zy|Pk$2aC26-xmkIMz$d3)ZmG2Qw+YI&b;ZpHqWj*OKU6pSMx}pFF7)^OAbDKCR<i}
z%|+JV^n20H1GUE<P06#77BTRZJ9EZ7)goZhDX;a<Kdrp294mZX*J9z{69-!EY+hXU
lWYNd@>2006X8-s;ML=xH(xWd8KgBUlKWOKyF!2uKQUI3XqND%-

delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3>yjab80+1b1R}T>Yc&W7@Wt&T;**
zzp^oX>Bm=Uy3+MkTJ^%GKb~qhv+?w)Cy!?>c*6ekRL7U*3qMq9zObv!S{;9EhlucR
z-gOcs7gl*&)xDc+X;;{6e{7=Ls(mthl9`287inCGdVlckPw!0mt*S=shR#_xpSox&
z^!k_z*oR$h-?6c3#bYI_`2oVyg0q>J85tNChZqDI@Ut<8$_g_w{%2t|U<OhK_G}#5
zY>cd|?2L>o#s-E4`Y^r$W1DhDNlAf~zJ5x6az<ueX+g1GX|Y~@QDSmV>g2VIGWBtr
zc_&uoK0D4RywRw+UVqtli?A~%IW*my3Rk?YI)1RF?Zvaing0VH9?mW=yc4Sv<LCP9
zbm8sOd2JeZ`9(^k6SN!OPhOEcajlugj+Z8$d<_>1PW!|@&)K%@Sy<rqX~%<j9d~(O
iIDAu-Lte~?*)1qTz9}m!|F&K81eayAw*6YqxEcV1!k=pZ

diff --git a/security/nss/tests/libpkix/certs/OCSPCA2.p12 b/security/nss/tests/libpkix/certs/OCSPCA2.p12
index cfa2b368cfdde553270023af9c2819b95c61ec0b..8703675436f6bd155131cda0a35a728b4b3c555f 100644
GIT binary patch
delta 1499
zcmV<11tj{M4Wtc_839X?8b*H|0kL*vOK1nxjx~4<`s*wL0RaSp0)R5Ta~DwEeZi-i
zjN)Nfwq*vdL1+@PYM=!<s2k$eYFdH`G&uP^nc7-xHC}26OMgxXiwg>|%56D50KFv3
z+3(!~G4#0b1Qa$fW=@iPBo`@qZgud`HGQ6GWjxIB6zj4??^-o36qtVpBd)-eJV3Xp
z;J_`(7%#ZdWdH>2IaM~q4t|wgOwRGx_wruWM1CI@YBwku6C<ODyq4(tVl&4(;3rsQ
zTn|u|Ptq+7`RUc8An8IL2&crFexP8t!yk1nSdVOt<Ppnoe}F^p$Gh-X<vk5oX!4H3
z5EK`k<I<BK$?FgKU}JwGGw_LwZWm5imbe<E55WqNKYb#Evdfr#lDQanCGMSgs5bRG
zqLTIU{_K4()<`E4Hb3w(0<^7lqZiN;a~;#_g<n3&Ow1FuW;sM=k_TSC(<}()Zh;-P
zXo6FI`-*RT5wT8B1ia99Pzu`-1VA`&9Si_#<M`WTbES44?1+CT#O*)E%0mWMB8U}(
zYL-Sc=3(uNtEDKHGibKesW;t{B5CUC&sAhXG#C<y62D7GBH0?*WNB+5a`w!4k2FZz
zxUTd<WVWy*E9+q$R-maXl3y7G?jfN&9#33B%)w=`+R`0Hj&}BSew=kC?s+%EHG-1i
z+e#fjC^#8J=E{FRaI;HgYpOYH>!@mvWR&`8j3$<V;8?L6OLCda!f4*Ur1ViralG+e
z*xqL1-4BGR9K1x5oh}@Y9i9K*JnXEdij+DpP|4p?_V)+u5x{^TCxnlubG{L@)Ley)
zUu@BV_x|O74d1mnkrnOQ#%AQx<Cji;(JoiB*aTEm*Jm8<{Eh?<7Js2=KQrDAlXarN
z?9RKu9<Seca%vcp_X08$Nj^I<fm;Z-+0Gy!j%5mpoimzHlRX1De=Mycdj~L)GgxBl
z-mcRXJOTj$pnwE|0>FAjgOseXq1uBDivJdJ!mOS&tY*BJ0b%vEn@Wfjkm-(jFH$@i
z61}%(%`k8|HUu|3Yvw98sTno!*If3k+iQK5>lA+Hq3L3c2sg%(Cz!WCq-X+>a$v-r
z)dKeQ3&c<aK428;f8&CzKeH7Mj2p)m=fhwQy?RQiqYiuP%5r$0l{xziD4+Q#sd5!+
zQ6HCuHFV22fGM~CM|X8)W#dR&Qbn`8r5%5i*bsQ0;q^26iF^lc4nW6<T!L_6KWR~8
zb&pe`bKUn4YvVmGVyXYT_lmyr)<K;yO@H4E^bj`_O6MT|e?E`S<Ge#9^>TKTlEKED
zwLI7mC2h+eXN<BO;hLc=Y-@yHF*$kh*mwm0+LL(s0%B=)e4k?=_p84!4F$WcKK1_$
zULI5KFn&>{z3AN6fgb!xH^TnkMw?JIhAi9tWwWZ@DNQ>H^=fC3jtec)&SV}D0JOCW
zaK@o4`VX5le*qc%vr8AUq-)u(%~gZfnx!d+#NiRWKkwT2g{J)dm}81T1SOm7VoJw6
zh#(dLcL!e)*9U7e>eNOLq3f)70A2+XUWC6RwTXKJvRvp>5)f00m#v;i0|bw)^uVjA
zVmr~<Lrq(&bl04@u&AwnRaUb=s|S501VDwa2y#p$f8(*{9bTDe0n3<Z0%$0$ertGT
zg8iO1fG-Wrl&WxSuF&oQk^?iaOcgtlbco3NfNOq6W`Lebudf<?7b0Y0)T^4jV6m*&
zq5FXDPN@3&T#yPNg2B(ho#PeE77r|yX(B#lYj@5BwrSctF#?o0FP}yJ$oyPGcHscg
zy_kv9XsXKJhh+G#sj!tmp}L2J$y1D!ks-_ct_dIXipa!#ip<o!WJB)dHfITe!?s1`
zoXb1$<BdGBusO#`rvv*5E9w6ee|fBofe#B|e}T3AlIvgCr`IGY&3@96TgvqW2*Uc>
zl9<wus*_O$BPhftc}U_6{sSJ;yP8z9+Ky0l`UeCMfHPu?3!%C1s3EGa01Kc+005OE
B(6ayl

delta 1491
zcmV;^1uXic4V(>-8399)8b*JmVekCE6*Fk(nnVSNdyxqO0RaSp0)TitTueFM?vd#d
z$qM(AR3-5i$3gzo<wspvBH<t!3DHhbW`LsC`mBvY(5w4uML&z?<A(V~X<TDN1^E2z
z$*}^8q8tN5gD84QxSq@}d;&5~gQra8M7!xtS$6jE>S3GPi-&|dxHx}C%@loT6~XEC
z4t8Ob$XCe<!==CSSCC)-A!3HYhTBuiOX+@)^BMyqhHCtX*qoYytHZs1@0jhVW3Axf
z8jCWvJ|O#t;)rBd<$3=k$!gIuot*DvYFq}suHYB6x?FVx4_fOarVRYIqe9yDysXnV
zq`9<`$CMY+7Boj<nwfuc;8tfh<CT5p*N)Z9erREuc^n5mDY5<0dIjkRT%qEymFbfC
zUgXz?+Mp}6beM4YJ0L6<LVhYq{XS)0B#EgJdp5I{wwv_;GDd~XWN~(HCEELfPpq3_
zDG*%hU(T;@qRt7ibcsdN32ngZ=P7f|K2fPzM1-5xvNr91t51KlL&H4uiZ(I8h*vVt
za@h%L@DYVJgA*&r?ml5@Isd&?+enlryFY73Y{|uD)IWJi1usP`%SU3S4f)WD-PB72
zo^wgwht;3w8b<&5bA>|1LSRHaLqM@V$AplRV0|hux@DD=4HlbP-jd5y0Ac#bM8$!4
z_i!5}_vl}vsBVARCSGlbl1q-Tiki)4H){I1{-HnWn!WooMJp&w+3kj(=goet@|hEC
zgY-d?sA5Zqd8dUr+9v{%vH5TjH4(50#|-OQIPgL=0Uwc%hJ(VtP3*{98;MN1u0$@n
z0@12jhTZ_gcBrtNmG|p~lg#2RK}Bt1S%qZ09klWd5+fYf5dmzoIl^(WLmTvr6eb_=
zD1sF21K|K$d^{kN_X08$Ch_&AOj)KnIzgDBD20pgBgZgylRX1De>A}>V?@s$0MWfW
z_8goKDgprkpnwE|0=V)?CnxO+G@K6H-d|<Jex3n6V1`@4Sq>;(>=Hz1A|r#Gn-H;W
zOt&k}BX5KTE)LJ?W_a0KrdoK&FW<Z^f9Pt)6#$x#tA=rt<Lks^<i@PukH`~B4r6P)
zk|Kn^slI;zrDl-ve|5W&_IPS-@ZanXG3({!$(U@mvdL{1Bhg61>Mkz%t!uUdi<izb
zGe#J9x1JeunJCVE)gsXg)TQFsa?qM9BD3&11_oq=ddrnSm=H_+3=EP>*^TBc59c+B
z)15s;r~0$2X*Pdi1o(p$f1p&V)jt|nTK(<R$^Ssa9Ky8Ie>Fd;@0Bl!%(#qN=-}BF
z<Zl_MiFEM#T2FuD3YW0N;0s>m$Q+&q#v}E$e*~!%$x%zHG(uq|KOj8h>d)t)1GwJ`
zo1rUui17u3+8yV?3vg%Z$LiL7*U)cP1-_f^t~{`tYM{oenv#~g-8<m)`U~Vv9vGIO
zB%KA$?4gr3e+AcUmc~%}eZqnA5?6h}FAIQ$a{cy5rpP(JONrS;u^3v@f=k!#Z}t!_
z>hTU`c=bIRLX5Y<TN${;UH<n+ur6lZA3{#|Slq89yDOTNe7HH@FRKf_;YTURU%;M+
zU`A{I>0!y30OB8_wcI*PsE%g+;787l(bS#TFf#MBf0N@HS&M<BWntbbd#REBGGz14
zYK4@}mXw;P73%AXA^zXVNeN{i)@`tz1iQtiFst$5cQ-<4pvoa(U2pK=UUYtg1myij
z(QlfubpO_I^5=gWN9XaR4m4Ey73xa?fP!+U?vLmj;+88_tHcU@5|h&(MJeOURPTvn
zThc4lVD)}R{@}@Z4VK!n$%l2>8VWawH<8PruVkjLik7w|%IhV8R1WNJ@n&0{)x6f9
zeuj|2@ilsdF_-J25jF32hVc;wh5?avq`Vp2aL7qfv9Ig|4fI$92m>RV#aWRa?UPvs
tBPf_HY^V^l$U@J{OUW@v!0pF*6ruzW;ySP48lLSZ>Lm}K$oFFM005}u^Be#G

diff --git a/security/nss/tests/libpkix/certs/OCSPCA3.cert b/security/nss/tests/libpkix/certs/OCSPCA3.cert
index a4ebf27df6f5c71f5ebfd368f3d10c576cf36934..c0bbc3905e65e13b2edce358204c833bba156228 100644
GIT binary patch
delta 394
zcmX@ka*~C^poz)VpowwaM2<))0|OI7BST{&V<XEbab81H1b1R}T>XQ}J6U22;;o(*
zM@-olT=eC`@h0h(@PA>Si*${(_m#Zlki9RN@ZHw?(hhEh!d~awyZ*fvb!Ew7xw!V<
zU#V_W*|q&AIrqd0sIYacXVZ<*?RMPsD*LggV4=vN$dhIfn;c%fx0XA($Bw)C9hd!~
z0~^1;_BgRdMA}^?#Pzy<&y+Kv>zSAt85kFb8H5<{voVLt3NtePXJIv922uu&Y#iEb
zjI6BejEpR%2F3=4Funm}n`%Z$Nr9EVeoB6FMrK}VL9t#@YKmTFK~7>`YRTl)j577r
zT(|Gt^^$5i{kY@Rn<+MnHkVzJ-}P#;{nWUQ4_<kxkH5xftzXz|!ntIBPGFmrn0zGb
z@r2*&=FAUzveSEC1|P%fUwtk+nGZ21hOOw3EIU2_Oi;64=O#97i7#>Dd@J_*{Fs~}
jao*Ear><#r=`H3ZX3c_6PvnJ6SRQ4}Q0sEMl~EG_WPh7)

delta 392
zcmX@fa-4<3poz)ZpowwKM2<))Ljz+26GIb2b3>yjab80+1b1R}T>ZKFO%;8c_$R4z
zum@%H?m0d)yS3-YbgSK*0y`AXtn0nIqC$jk^@1Qbu6eg*BK?YrkH#$3dwui5^VSy~
zim@Mc+Un->UhLR8W8&@~U*E_ckamsS5*C{4lanj7ck<6v9yOo6l@o3oB}#N@E65&X
z-0ve8E|t{DvSsc9)4#oMuBNjFdowXJGB7R<F$gl?XJZbP6=r1o&%$cJ45SR~**LV>
z7+G1_85voO4GazRVSEF|Hsy?xk^(Dz{gnLVjLf{!f?~bWV!iyL#N?dR$!i&9>V4+7
z_(uP@EBM1ZBTJ;+F?h<~>r<KS{wsfwsLk*eIJvfbhU^7#xi9g%a{jx%y2f}r+h{`*
z^BM6^yF!~UN$R}z*VFZySeLzot*mqVw29IiSdYyysgdrm@Od)lfkTY?qnM&f`&DaX
hPchB@VE1{~1;@aL9Z~x8!z4Y^D?HX8d7;4g2>|lKnOpz>

diff --git a/security/nss/tests/libpkix/certs/OCSPCA3.p12 b/security/nss/tests/libpkix/certs/OCSPCA3.p12
index 90bb3b3b25e54fecd1ed3ce83ab5085bd10b7025..2337174e33a1b0dc4deed7fd0355596e6bcd98db 100644
GIT binary patch
delta 1499
zcmV<11tj{M4Wtc_839X?8b*J{CS&hqQj~<F2>>7UM1<V}0RaSp0)SB+Xm7icG)Y_1
z{U*u#{xeq61ip6!0eXlZx{!NFQM5GZQoea&Z`AhI*j7H4xYPvU;>$CH={{N$t=W{t
zPOgK;d-S}Zrd6n6{_(~NyTN<*08#Ml720PRbt-c4nV9*Q=WG*B?#_Q)LWxR{{dGx9
z`}`bY@Y)TttHK-di^S*)f`5~#;vh2li5a)vy$QW9a0;i*sT5?b>4<8muj5Q){Dqm`
z0cST}{wyVgu?3gem?&jm6L$QjfcYKp>ks6{Ikp)jN%c*py3lsFaXgdikh8>_{Seb#
zy!zPFm;t3dWB#3_y<2~ys3~T5#>tb@arf=AZZx9VZt#|=61x)ddGt|INnSs@_5pNV
zQbZJ+R(FP4=h`3Obw8a;;ns8>(rJlNPK4}v#;YiJvXKvmhb{@R1>ZOR?W&of>XS2l
z&fXMvS!VS}VWXQ6QSvvT@@@?AL9lw-9S+FRodj7>dX!_b>?42O9P||FLJRWYj>~%W
zOn-?U@EpA2He8fdSX?8$FFYuQn7RZqGm1zEWu!@~rKk;~pcn%}Kox(+b74mO1*<*Z
z7cFMUG)r$cHRC#$mZ*7{nCEgUd2hkTaY&tGbO**#VIxp9!ZNClovwp})W2InJtxYT
zV_x9AJy4&dL#Tfp9s0YRnC1X>ROXec#VUX9Xi7MmAh2iEI|mF`d`Uio(Wp%u^M+;K
z!aO6iWodjIV@wsB5#C=coq%#wnA9J?`N*j9N00EyvSW<d<wonCxLWs6t96E{EWZLi
zG4)@&PuB+Iq9@*p&tRX~CJ21{I?NvU_b<J#vHX@rcikL}**-QK>qFxR2!mt=Kn;WS
z=>)cTx27coUTB|__X08$nMQK!fleNRON4rS2dpm-k9H~klRX1Df70#eHJ=Zo-0MpI
zJ^jDr-~s^wpnwE|0>Gz4<N2wQ<f)o(wWj^C%T?sn?4BofB~a4`w3(qu3a)#0Yo1*U
zqoJ4xhLAr30`@h0Q2er&X`(mcEo-gYguWktB)Yg780Ai_&^q_Y?kjGHR9NYwKc2B;
zo7rT-m?CC`)Tqm=e~B64R`$)8USCOXICVA3-`KI`z(Kh=pbNYquTVkQ=rPv4H9KZ%
zT%nzqCwAdtDh@G4QT4xePFlJvh__sgcvFMOuK`rd$*VFQ4)Lg7ehX2RaPw8nvC(+}
zjiEM2YmE(O@?A}FA4Ds(EaLxUeIh=;zR5DJPWl^{>x1|df8=3brDj)-rYK&4=0WMA
zuDLIUy6`zPzK7y0>e~FG+=r`NO}FM^?^pcaG<-lHPI(S|xotq{i+rQ}Qx(CB^V>`^
z+ZylOmc9zQFGBi(;_4izfH_sSb^v*`DntMuHI(Q0-B2KZT4uv&uo`N*Vw#l1cy<M%
z0=aDz7PVDse>Lz=u9ep)L(5&yaY_ok*MSd%6>yj=e;Twl)RtedZNf;=fH`+lZuMW(
zN}}pxcGth4D1hoTv6PbXo2Xw=4i%mKWH;h$_2ki31904M$~ald;+|0VoL;~E<|Eu|
zMP(x7WJ6?+3*CY&poZ|=WM<`Hss2lQqrtFlU-<aje^cxK*Ol`Z_>Ha!l=)YmX{rl`
zHk&knJ5pmT0sKDJ!mMMr$92e3n(wOAXsHK&0{Obnfn~$l%2LWQu)Al<>TnSNCE+YL
z_dd}chL)csFQoe$45JzBeKU>5z%+{<t{SeFdApFAJVU9$fR-%y9ec03I9--mhhTqE
z3Kc+@XihyaxQ@YiIhs)%T{$YLF6lfPP86_3MQ_6>a#S+DAQCxkhPIU=U|cJxPH^if
z41`C*>KLkW&1%*nLRh<T#jIypsHNwJ@mtH0fKAq<PRw8dTPO0XrO4s7JPk|)2+7)w
z%Xycue3MZIBPcXF1Tv&+uJO0E@ujKvQ2dMPUd03us=BIHVZOzF5b?tbIf6Z%001DU
B@#O#j

delta 1491
zcmV;^1uXic4V(>-8399)8b*J*+C1#x%$%LBz?a?e+mBlU0RaSp0)Sns)Bn0oi+Q#f
zcqVfoLUGriO_SJ$c?10W)q#2HvkYEwf4<x&krH34+qqRAv}asVO(?#)Jt5+iR8Cxj
zybEnJQ`rmR57xt1Lg-^Jz52i3S{qQF#8iv?#|YP8oo}`O>Ai&_ML2(6yZ(-3S!rnF
zhA{2%OMmEDn4s|y+ddG6Dt*$iG@qH555?Ug_x|%~eL2~pH1z;=L*@3&OU~Cf_pF57
zcjTT|9{qH>A$!wuWs-)A_g15wYx%Xde9SvbF397E=pxKZ366nARnZhseZxqr11-><
zjzs_wOfgBYfWJeiEY*J&s{?96Q5)I@^&Y)f`0K-#LpEx#=x-@{0Kg3Uam_)nvH)Ha
zke9h)$O`u3{5LaDa~uPh)Z_|u+9jSA6&%V^$um35J;ov&oCVmQk`Rq~n*$QL!(Lo<
zM(<0N243*#{N6k>MYE_8g#RlJ(#hKulr*rljB>@Z^yz~(b$)-oqXjbyN^Rt@817Vq
zD5$m6SmT1CCZe&GC1z-vkYH6YP3~}Uv0;JwMX4X}sLm=;f@o`HF|#pJ%IcKY1Gn?=
zTRurfTz4&2%Pr8{P<?l!98>WOt0@??K1(93=x`pL!$ab!Lur5w3%E|O$W_oJg`r3&
zl`y}7OfyW$`T>6qQ3n#NA*mM%oe^;a6K-TKQM_(jN9O4y%HJ>njb8>If(#y{A7Mp<
z*i9~?aOZ1&n3h^ug%Ak>GcDDV(MW>n&;j|NOmzWVNs+|9fdM<=)n~IJVJA47b4HMa
zmKHS-F-^%(nu4iTSrYlPoA{dFqKWaHyY!lvMIve4X3ZQSH!h@t9;mgYHtNKzm;<g!
zko~1&Umrpn$t7Tu_X08$VD9}%D|IyICT~b7mpm%|atd*hlRX1DfAHRk*nky3;-4=e
zX!3izq5=T{pnwE|0=Qk)L?$cV#NFf}QYugAkHq=J%DqPH%9y*x_~qRKW@q?@<P`I|
zuDNmWiQo<trg{;h)>ar6S`>PI-(h;9U-WDeQogrCD|+$xpLc2_l&{AisM%rNGzzTZ
zR(;yG9>GUuFkKwdf92FRoUp_f-g$nB5b{F-#9LN&Rif0aZjL6))aYDQ2k?k@*83YB
z;R(3OeOg=qc2-24M%=><>v~cO+Q`U+Wj$%^M`E4cUV~4f{%skA6pZQmN#tf^E+KC7
zt^TF#Po+cvTmNgg$~_XtCQL$jFes@SbLj6rz9FHghiIP^e<|bQ>M=6D(35*bRQasu
zzl7?^^GZBY?;layr+R{ImboBYQhh42504d*hb0d{{m?}ukG%7RVf48yv<W<VABVFE
zySH0YmYRFZp((rCdu(Cbfykp$k#h{*sC`@v2Btzynvd(Iv7gjgL_z}K2-gZgN%xNU
z=W`-#A^mz3e@_RXmL+=oN{?cS<i<)Z$f3M-V6r6;^;r}zM&=G%_&qy9V5BmuL$D`1
z?nF*Da3f7wU{uWQHQ1o=`vv~!er1|nax}crFv1|a!Q4q^uDjI_f1}4|GHI8@AV^Y+
z{v~!(RHAZge_6+s0wHh=MZ~iX;(&>>PSJuue$*A+e^|UfCX@bEywKkB8cOavuFkH$
z>W$2kq1WZDHovH3|7hd8T{wQh0jU8Gxl9kUU(iMZo^EQt<VpU-T9@3$ci(myjx<6@
z0!Z9rWh{GXvjg=ecW90)PqCTR33Ojp3o#IuJh23hKKhGRa9*L>(LEzF2m&P)u%T)3
zXgFNzU<}^Xe*H>zX!3%5B7+WY-&DaPZs@6vPS<p7E{itgq>vFz(DNDpf5>iFrKN&%
z$4j9P;(R;|4?8h(Xe4m12fTwod!FGyW+J&wj}(ZaXIXEvns~Pa2zir(pH`S<0Fzk;
tBPdAtce5~a{VP9tl5z+=d@&BvYgPmhhT1VL!F!Cp3xn|5Gk($q006>)(w6`L

diff --git a/security/nss/tests/libpkix/certs/OCSPEE11.cert b/security/nss/tests/libpkix/certs/OCSPEE11.cert
index 7c00550d6895dd1906cdd1479e2e300cf5e2b3cb..9b02a6a4bd5681b8a73e32faedf271e514366a36 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`IZ8ab81H1b1RxSpCWezFW5j$vE}q
ze=$%B51Lwj=}~BZtn_0iO^$p11-I@n_FAQ{mrVHbc?#>Je@yLG)?ZqD&ENJ_+Up+s
z!udzV{M5vlz@2h=G6`32ymm;kVo<xTR1}>0_0E~;pZ9ZZ*ZCp#@W&gg9gO>o|F3&>
zxyLGPe&~vQzH8+gC!P_>m6J%V_he#bWMEwEYT#_($i|_~#>mRb&dA7OYG7<&2;&<t
zwy9>6loVL$>!;)=XJqD;78L6hrKad*7UU%6rIzR==jU1(nHd-w@Un4gwRyCC=Vb(%
z!@%6w$l$;J)sDMGE35bV=1&Wr@?zut(nA4N$|~s+8Ny3G)QKnheK_}S&fTV*i(DDs
zv;8JimW0^tt4U1%@hZq(#O=w?SLO4#UuK%l-yk(FdP#P&%{0kdYPUidu3vP0I<2(S
qIQd_IuKaB6oey<y?<(DQdgt_*?E<^*)h<!LFSuk&&6~haoo4_cEu@wJ

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>yjab80+1b1RxSpD^G`-p&+3zObf
zeOex8ZLAb4`!=ZPU!Svf=03AYjh(W&1&!H~#t)^9|LqaY>Th&dP%%S3%QC6<*wo`!
z@7#2qv8Y_W%ar>zfA1vgvipMfS_Jve1r~mheq|Q@(X4&JPLT`dIZyHroI4a8{%7G6
z?kic&-c~{n>pWwe7WzvX9@<gw%f!scz_{4iz|p{-jYFG_k(HI5k&(sNz|cS+#y4PW
zQ_d(UDX`MlPsvZt$jmD(DAp@2*2^zSOwLKwOU}==GBN{d;AP{~YV&CO&dUfig@L)T
zk)dgB(2<?(6B0BgPvbbSSTI)O`t&PvH|8v<ZH!R$eCnX+8^37@Z`)?Zr#!Q|g%xh(
zGVQ5}Sh`jyW5>OftK5^zzkJxg?QWiG{?DVTD(c&wRK1(K?Y3C`mA!g<qPQpSzOr}E
nBW`!)c+(Fp_A|DNpX=tnvCk^3x_sTiMLZLQA6@#HYf=gT&8ME)

diff --git a/security/nss/tests/libpkix/certs/OCSPEE12.cert b/security/nss/tests/libpkix/certs/OCSPEE12.cert
index d46c26a191a219440becbc2fd95123ad657de05b..b4478e9c15db6ab06b9215d11444b4666209214e 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`HNzab81H1b1RxSp9<a9ScIXJ>0aT
z_($8Lo|BwB-3$|F-_j5Nx#z^|rCI;gd9Jg*{Bmil>Gq)ClXa)RWZx*WP1dje1%u(%
ztEw$4Y|6H#lq<dyOXB?9BJ<h*$V4l19q;>>54fE^WALMVTi61{3t#Uh$+M+%#x!N@
ze3yCQ!q0QJ3>8xol?wLT{9Cg8ZGANpGb01zVpjua14lLvZ8k<$R(3{47E=Rb149_!
zfU!+Aqokz3N?$)EKRF{aue6|8uP8M|FS8&gF)y`5FF8Ng%E-*X(14eXQ>)FR?K>|c
z&>RNl#zqE}lscPTcP1EqPy29N<W*<S&!x&or}tY;PP;OzWck^`M7FPQR_0u=oTvY}
za&C@c+bfG5o$vM8zP$>Kd-qAWwm9$krEmLfW$*o8#_ww@cTV!%>}v<-@BcJ!j-}w!
sv-O#FhgaPW`SWqM`mV<^9tn3$8w#uJ9j+P4<$o3HzPg$Jvd4-H03u7P{{R30

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpB{`1*+m)hSR)_
z{|9X_Ra5M+3J=uUz34==mDKbI5B~g(k9njM=iYe{7w>vGseFy)HLsUjYiqrp-W1;b
z(5SuW!`dqKd*$63>$aN*mV{a^c)lp*fNfCh3fH%}AKYq;I#zu!V}9(udeWwkju~&;
z=O#W16OL?Su{d`i`0%mhvJ|iSzf8=G42+AN4IB;Z**LV>7+G1_85voO4GazRVSEF|
zHsy?xk^(Dz{gnLVjLf{!f?~bWV!iyL#N?b*z2y8{D<d<Y23|H!tu~Lg@4SpaQy7>V
z8ySvQc{crjS)8<fmrh(#pYaNFv$gBjb2_Z<Udgg;zt}8?JMr%n*M1ND#57ql<WcPQ
zfNN&kc=;Rk_5_|(bSZO9y4qLGG|4nY@a5EN^)lD)+0?F{vwv$jBR{9X`$~@8-0Ig}
mdq0WQ6PnMoORv!VuJOY~E(szLCu^i9yzIXwIxAuK$;$v5JDgwu

diff --git a/security/nss/tests/libpkix/certs/OCSPEE13.cert b/security/nss/tests/libpkix/certs/OCSPEE13.cert
index 5f819af3b2e98bae5ce23acd7cd819692167850f..de675893572fa238504cfe03466a9d6ca65ea638 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`Gyjab81H1b1RxSpC1nTRmk0`AyVs
zZ~TAcC_}gQ+6RWE8@DLCv{g51C_WX8>*QHnxuSvN*z|8_+YegmM4z%`?`>49IPgW{
z<G){<Y!~aFc<FAlE!Fe2+NByRfj{a;yLs!>4&Rh^&*8hLxV_Wx@?N<txv0XlwG8vb
z6%Y5bzguDdRMm;Q_FG8J&lfrMQ<<0<85kG48aNv`vT<m$F|x9<GcvN68W<ZG!uSS^
zZK@e1B?VUc`YHLz8JT&d1;u(rsVRDy1v!a%sU>>J`MFj`W(I}^ylk9WZ60mkc^QG`
zFfcbZGAt`hJ@;4pXv{1J-tBWNn`NxlH|<=0Pssb{eeO#O@>LVr(zZ_8a?~p>YU}j9
zd^)P@CK}f-Raf!S^Y>_5QFJ0YMA*P=<BU^le|)V_l8*?!#36dIqxao<7Y&=pkD(Fo
pI8(W%taE<fez52C`8RIDn$C{8Dx$qi#qXqdUAn#|;`GElD*>oPo6Z0L

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpDjb7ps0S_Z0q}
z@uc^J`_`bvygS|A>woq>xbfH8wTYU~Uhd(@c|5Z)!O1e<G5>0Q-+6vhjFz^n7qhOo
z_S#_<>uTLyhmEY>xUrpbeR$J%M)bi;R~9NJ*#6!2a6xnWC62zL;A-A)PRSRFPCmH0
z)ayc=Xkpd#yCUZgnb>7LIFa+;tzMRinUR5Uv9p1rfjt|CHX9==D?1}2i?M;Bfj*3H
zz}TjoQBqQ1rLUiopPZ4IS6Wc4S6Zx>UzC`fld6}TpKE1g2GqdI#;Mij(e|B}5oihn
zb7LbzW<;NM_@iZ7LK%O*O1lcC)=Xzyl$_Nx(PUB3!;RD5{k<9QbS>QQ=(@NG%ePK5
zky~x+XurKT_}jXFIZL&28#={ruQ{8u>vBQY;m`9$_Q*}DWAX83)w&rrLHxQ&^Yyyd
oDQe$8UDM~aX?vAjdGqOM{~r+{F0~9wA7&k#UAXnrL&KIY0HeaDy#N3J

diff --git a/security/nss/tests/libpkix/certs/OCSPEE14.cert b/security/nss/tests/libpkix/certs/OCSPEE14.cert
index 5c171689d16f368a759d75bffa74dd9be9c71f03..be73602a15277a674d12ea82daca431732053f9a 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`I}Oab81H1b1RxSpAgO&+lyDlW}sp
z^X2`K<mdCPj9y%fTe@xTpVS5FE?biYc37!xIdM^P(T6qmS+~}xMx3-XId+vhJMZG|
z-?Q$&H_Lf0uv9w6y|T&i#sA92jbZxw`{us(TYLO)Wrfn?e8weP7q2jmR_R}T@6&zl
z{ufJ=yqZ7OmMlx+eB@!!8`s(Muzo%hGb01zVpjua14lLvZ8k<$R(3{47E=Rb149_!
zfU!+Aqokz3N?$)EKRF{aue6|8uP8M|FS8&gF)y`5FF8Ng%E-*X(14eXQ>)FR?K>|c
z&>RNl#zqFtz!$02Oa7dR+uXTl=KW6L%o|g53NsHn{dUTJ8IpfI@%X2B-WM~@B<61q
zzOECb$7p17_$l)S#;>2I*C|KXbgWwU@v+R5&l&Uc(_FXCT0J9BUp?mk1P4Q(wM^bh
s#}xR^?+g7b)+ae}#;3^FevA2j%z521_rbRFm4;b-?Hdg3uRoOq08V|VQvd(}

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpDiVYylcu>?fXF
z;h*%%F#M=a@cq{sEz`9bpT+$3UCP9eVj^sM^3mdnU#{gYn#{ap!6s?-{MTof>d!dE
zcwOX_`t*v8P0GSzu9`F2TUIh1`}J_Te%tc3FB#uv%GefVuNQrN-&Z#{CR4uW@2R($
z_x-buv29E0xN~jS8t)B<EPwyJS})4P%*epF*xA6*z@Cjmn~jl`m7S51#n`~mKp)08
zU~E&)C@Cqh($`PPPtM59D=jG2D=pT`FG@_#N!3fv&$Ti#18U%9<J4;NX#38~2sDL(
zxv`PKq;1=c+a>?X&*bDW`f*Knn53`wFy?2X`P8e)N8eU)wXchRdhpLfZ-LGaA<K1z
z4UGjSPvxB%TV1o^FVBy{`5RI~liUBwL|Db_Kc@Kl?ajZo%O1TiR*}dNsLIM>DcS6C
od(rHs)6K$F4|X<9R`7A`iJx+{w6h?<_vdGsdDlyhyk)Bg00oJnfdBvi

diff --git a/security/nss/tests/libpkix/certs/OCSPEE15.cert b/security/nss/tests/libpkix/certs/OCSPEE15.cert
index 2ad03804723ff1d7340bc920dd94072f2ff15a7b..54374a8199106f6cec54d9d4efc6fea5f160f70c 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`H-@ab81H1b1RxSpBKw>+H+C_f}L%
zTxgq;y<+de|36MEK0m(AJUm6)>EEdZiL+<(u`r$ablA{*k%{%L_G2H5Kd8?xVNL%q
zeS2H$o4s$Ndw0aGx>%C6q?T`m!Q?cN+yl9-@9v*ErgZ+RT)n{`zQwm0cKoec9rARt
zSL+OiV0Ontj5>QFqvGRCs)T14)Tc8sGcqtPb~SJ|aAf1qW@BV!WoKk$F*PtYFof|9
z7~51cN=gc>^z~EnlQS~&N(+khic(YbG7EAN^HNLnlJj$|j7%*p4S3l&wc0$|zVk8y
z&0%0}Y-Ffa>{RP#_qH}(*!sTRx7+4$%;Yoin@?)h?%cE>p)4ygz&NLZXNK0!tN`zi
zrx*Xz2>ZWOkms#xe2s)y{{`9R$z}h)zj+YYSasF(+aA%McVa}UTs1Ddo4(&BEAnl|
qw7{yIrUim0TP|7^I$Yl1a%N9g--*9-y?0-@xp7J2S|i3v>q7v|pQPUa

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@}Oab80+1b1RxSpB(srXTB~*kyZ!
z733471KJDA{%8JdJ6vI8V=^(-C-K($B|d!b9d+MtoGQ6!jzQw3Z~flJ;!fGzG3P5T
z+aA7ucl!TFfe&W9*}}DQMw!^!lD=wRt9?%oO1UX-pLg_$`?BqV;hhDF4zIoE<T(m&
zy>C@)Td>LH@(Ho_)sBU`s^=-z>oPGjGB7T7HgGhsXXDUjV`ODzXJlkCHZU~Mhw%*<
z+mtg(N(!v>^;7bbGcxl^3ySqhi}mu05|eXM^^)^*t&B`9Ee&|tIJMe5+P?EL0!?9H
zZfs;|^x49DYfk>@>c20hhibk2(YU5drr>A#=D#~$=3KK*e-jkHwEpwzB-b;ZKKCU1
zYurQEO?`NFPvG@z{;N}W3z~=i`7=FVL2NDC%r$>~&pR9t?7#fss#4=8#V5+CQ*G2_
pF0GunEj#4#x5#pjR~08NZMe#nBhk5<A^vE`9p>48w|=W#2mrYorE&lO

diff --git a/security/nss/tests/libpkix/certs/OCSPEE21.cert b/security/nss/tests/libpkix/certs/OCSPEE21.cert
index c4a98fa213e86a92b98a7ea8947f8ddb71eb2a74..f4548db7f0972cc6322d23555daecde6d822cd8b 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V`IxGab81H1b1RxSpBMu!jA2GrmZwd
z=VMotW6kuq>b1(a>bL*Tj|H(zkwKQr7kE#o7uxtN=H<ljf+I6!A}YS+Ueu`;+Pvd#
z^8u-^r~1_Hxdx>FK40@-{bS!}zmBK`CgiTUvU6w2BTqwDu|tK=C%t~G`D32;SO3S$
z?Bon<O`_aqwcTfKU-eDSK|yDJy)+XuBLm}NR|97QM>Y;^Hbz!fc1A`PQv+iILm1zH
zu}w9jq@=(~Uq2;3IU_T#w4hk8C^bbdvmhriFSSH3IX~CR$jrdVfR~L^tIebBJ1-;9
z90umbMuwAb=HKEdJzMqlel@?4%mkC@k3VinP2TwX`;wHhEvHfwpMBu>-7C?&^888h
zBLYT-wrO`J${l-Vm@_lfaN*)P@*%4(y4>IPOYe_EigwD8S$46J?<GIn2nhM-vHXaa
rK*FYzr-Z(C?7erO-%y~TS^LJ8U5`%o{7m-R^f~wSibt-phDtL5CSs>j

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpCsei@mpqzq2rN
zVsE?3&T&=dqci*a={Jo!7PeJ<YUkRM<`dQK8v0$}tFZLrqCJet&#u@`t+Kv(KlyeJ
zn<s0gdEO=~hg}P&21=AHGv>K4<zwRCe@*?1H2)uwnbpI5P*f+Pf@gv7T+y$FvaYtq
z>LFrB#B{Ho{OBd_GQr5ux5uV_E)z2&1LI<614jdUHV$nzMpjmKMn)E6149FS7~g=g
zO*x~aq`*pFKP5joBQvkGpjfZ8STDaQF*zqyFF8Ng%E-*X$bgrPQ>)FR?K>|c&=dyd
z#zqD~oyaNSVk!p~eKvIYz+KmH&T3WIN9o*6o3eAxbBadxR>Ygeem)|T);Z~Q^QHTH
ze6HML`g+y!+|J+S$vht!)B{zo_quh~?5^o?iduANX29!${oMfu+>^ef)XX_`ep{pe
m%icLvMy9flc;4l(dCWB`t?6mKA7WI@9jlgTq_D$BR15%vPL`Pf

diff --git a/security/nss/tests/libpkix/certs/OCSPEE22.cert b/security/nss/tests/libpkix/certs/OCSPEE22.cert
index 7839c47ee939f16ec49db0e8b07726b4695b977d..8ea88a67dccd1e86813b0c6bfc408ebf11ec1f8b 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-v$Dab81H1b1RxSpAJ~KKtawxn8Ws
ztbc7baXz-Uop@==#dFf;(RGUVTb#8wiC$zma8Bbz{g2C0K@ow6x7HZdmL$pbuo>~4
zUDEt+XGoFpwD7ZECWmf3@MYJ8pjXdxyeiE%ZC8_flf$y^&&Swki|xYiSXc~qbcP<?
zTgmf5{Ky8m-IE(WamaM{oz6H=Z^*>V$iTSR)xg=nk&Q!}jggg=osp5n)WF!l5XLuP
zY*WoBDJihh*H6h$&dAIwEhyG2N=?zrEXYaBOD)k$&d;?nGBYqT;AP{~YV&CO&dUfi
zhk?1Vks*`erRJ5x7x%8L-qU%~C(Ot!Zuy`78AXbAr<o_b%8f|mIKfkYXJ15Jm1vIs
z3gf$;A0Ic*d$4`J+3vs0;Vt)$TuWLY&-d(I_ky(Ni_<mpT{q-gPq~(!voJ-wYo-|g
q6VY%RuRhKFtuHUmOIn~|%jdhubN-TPZu9d^C0KR2B7#n{83F*~y_~54

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpDNfjsu>2p<fIp
zl=3VJRlmul<e2(o;nCyo*>z@oDH5<(S|YbyRL_`!&FIgI*>?;5a<;0s@n{K#KiA%P
z&sI5o-G-3Y+#(7&u`T6Kk8P7r_FLUk{J%d^b3<T`CD*|VCZ5h(l`A6(*zZgh5<Yq0
zQbyxZ^D9hJ2cAFrRHd+`c2Q9MYbIt!2FAtC295^yY#iEbjI6BejEpSC28IUuFunm}
zn{q};Nr9EVeoB6FMrK}VL9t$Gv0i>rVscKZUUGh}m64f&kpV9or&gOs+jm|@peYQ@
zjg1WRb8k#|SABNfL&5YVsZ5F~!lxF<oou`y?QIvh>FxBH;sx<F^S4N@JzTwAZsw{c
zmD$Ng^Fxliy$vwfP^2}7#W_|ol|6XYL#1XdPaCnOs)hfzZU5#|INxP4!>1P~d6Zv&
o`cj!T=Ykl=UZZD|{O0cD()w1)lXmCft5rUS7EHRd)u3+z07GP&ZvX%Q

diff --git a/security/nss/tests/libpkix/certs/OCSPEE23.cert b/security/nss/tests/libpkix/certs/OCSPEE23.cert
index 2293b8b5879b082fa31bdd6dacf96018a237cb91..3ac0521994917aa9153ba983c12c37a0678c6965 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-uq&ab81H1b1RxSpB7StoaLF>X;%b
z@+5?^+uv6!rfE!UT@jOayV3Gh^OFb6sZUn_D8FfuK6mcHe;j9fc6YJ8Y*@$HaUf=G
z?IQm6G;N>5cY}8XY-ie@l%=0t_(k_hwGew>ZB<jBR@h^<Y3BSJZZAt^Z@KhrL879`
zM%nr}{*_OAXGE;ep3Jc3dS^sEI}<Y_1LI;>17`zAHV$nzMpjmKMn)D>17ib27~g=g
zO*NyWq`*pFKP5joBQvkGpjfXcHAOG8ASW>|wL~vDKiA60)Y8&`myJ`a&7<u*FC)+#
z2Ij^_hU7JiL|@!XJsVrixNXnzjr$8PdDZprd)U<UeMbxPuJ?&etG|0St?P|ll+hEg
zxghGzjn<D}Zb)TJ_UgJhyT4*-WX*ng=RLc1QqEj%{ysOitmT|*<_S;J?{apob}y{X
ps7o$rp8D&z=0UIAW$wJ(9Y^D5HCKnb2{<gN$x50NT0K=(3;=`yq4@v+

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3>CTab80+1b1RxSpBy4$en9h@7imL
z?r7b9WuHK=yGN>)W9hR?F`e-<gZBT|mFCcY$e?fB=+h%Oty%f@lkbadv>yCee8DB;
z+WI4>GTk*KuLmDxve!MnOhfbVN4-_a-yM!te7^1Fr^-B6E+<^fWu{+?LB6t!rhHpo
zNF={l@`(lJ_lgeoRY;#)$tzf2%*4#dz_{4iz|p{-jYFG_k(HI5k&(sNz|cS+#y4PW
zQ_d(UDX`MlPsvZt$jmD(DAp@2*2^zSOwLKwOU}==GBUNaG~i|9)N1o+`_9V<G=+h=
zv5`UY(ab6>zu#L=sJooM^YX-mmlo<PXFh%!``)pU-HB1^S6=*qGtM$osxDnUb@+fc
zv-=0n=PYwqr8_&<)Ll{TU-L>rd)xV4#&2wXaL;VuTF-N3|E4&(X~Kc*3#<CyFUjij
n*!%WrWj(`^<=pZg`mVi6s%rQk5-ZM|VNoieC3+>-N<I$&Gbfpk

diff --git a/security/nss/tests/libpkix/certs/OCSPEE31.cert b/security/nss/tests/libpkix/certs/OCSPEE31.cert
index 3814a5408708eed168d183a6f259ce350699cd1f..a6fad98ed82dad3e22b9fe7402ee057892db7402 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-w>jab81H1b1RxSpA;0EkW!v)_2_R
zo?{)>zIDFpucK>YWkj|-cTZYA*->f2+?*}TX4qWsN%j;7$lrOLbArjYAK!&Jl=P>4
z`qtm}b4^dP@VEA;8~(=>Z>cV*II}Erp4)!y;|w~<MejY=NAXp?Ua-MO)HlvT;W2;o
zzgZ$;%8}<%p1-X7VmfQiu1zd5^{GtEj0}v6T@9QK9N9Ru*%(<_*%=vGObv_;3}Ji&
z#x~WAl9B=|ef^aD<c!R`(t={WqSO?<%z~W6ywnoC<osMKBQu~DUN%mxHjlRNyo^9|
z7?>Ly8O)3ie_ze`Iqs-t?fFpo^5A6kUB1<)R&ZTE5*-@nVw?DrwKw*8%dtgO?WLFY
zHMo17d-Kq|uaU`oiQ<#3jq7G>gbQA|KVfd!(Us|M&m{5lS7wR#ChC_z{B^{}W~N(|
p+LhYAns>V=J>9TZM&JI`X=jhM2X4OHlq>gR>IIJyM~xRE+W`<CqP_qC

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@Z8ab80+1b1RxSp6-wMdq3Ddstbj
zj$U8dl6Nnw?cFxNfNMLRmQ`q`XZC59+3G0t?#psf@jg9u^W>*3GyDEsv{<N=>GWQ-
zU3T@#ue~cvFLizQjPh>wVNxh@FkL9P>?c$2?_HUvzMC~|mX0+^wo#N@e&gJxf1xUj
z_aEE;KgD=A{B8aF+$}6TcfC{Ui<y`i85kEk8#o%+vvFv%F|x9<GcvLm8yFhs!}tb_
zZOR!XB?VUc`YHLz8JT&d1;u)$#d`TgiOD&sddc~@Rz@Ii@v?DhwRyCC=Vb(%!ob|v
z$RPH?y#A%ee%TFk)Hi++J7!SUYI;*6@nGhnQtQv{xhI%+#jB^>-kdQv$1Z2avc}L^
zqS8-(FYSC_7}4c*!}q)M{=-if^qpO@+t?)8%K6>ir?=)Voh@gs9MEXK$YS5FdDC?r
mxwYF2Hr!Eco!H7Zb<UrCf1(;1r2LoGEtA^gmpA=K<8uJPP@#eV

diff --git a/security/nss/tests/libpkix/certs/OCSPEE32.cert b/security/nss/tests/libpkix/certs/OCSPEE32.cert
index 434dad7f358f264ed049b107cb23a32ef0f23b78..a07893081c77902716a6099f827d591198e88dba 100644
GIT binary patch
delta 399
zcmdnUvYCa$povM}powwDM2;9q0|OI7BST{&V-wRTab81HICo-gc>O!obb-Tsc1JHt
ztMBMPF_FW2#^2v5w|AVscc@lR<I9w~v->pqy=Fv7KGu$@cUToyRX1-9(?zcnmkwMp
z+U}|@m$>4b^P(AB(=2Z6VO+3!p~9qR2VdBqILT2a+Wb^Kuv`1b@~U|u4WES8zR0`H
zH)Z9Vy*a$AbC2_Ek3VwdM-Wd!O8r45W=00a#jXa<299hT+H8!htn7@8ET#s=28J-c
z0b`qLMoCG5mA-yTesV@;UTHzGUQud_US>f~VqR*AUUGh}m5~`x3ojd|R+~rLcV0%I
zISkB=jSOnMt1M+o5*L*_etw{6&(3u0FPqtvlNRedRV?3ckjzRnUmf5tC$`@3uY;}L
z;p5Nm{8x&7z4iE-+KkVC4tHOQn0TALH`e0IEN7v@%?JJFi*IAN!yd-&5+C*Z<2zpe
r`^NjVKWi<$lKWte#*3ViZC_ij&8nLBXPuG#H!n@|g*$$yKd%4)!gr*5

delta 397
zcmdnYvXO<upovM>powwXM2;9qLjz+26GIb2b3@Z8ab80+ICo-gc>SK;qCO$ZQ;QD%
zdD{DP^_C647OwHUs`*~6*pxH;w~?G*>Ew@ve^17)m~{5YiQc6gn;-7b6aJ@Rbx2!E
zaC>d}M#Zh}|CHVyscm=f*Y_x!6|1_*;zUQ|Kf#-SwRc^Pe*eqxy^GZQ%gJurn>jek
zPkd!hk#b-EQqFC1&xIE6pm?i<dV3~jMh3>k&IXPK_G}#5Y>cd|?2L>o#s-E4`Y^r$
zW1DhDNlAf~zJ5x6az<ueX+g1GX|Y~@QDSmVs$Oz_u9XqUSG;VTT5TR}-+38<rZ6x!
zHZnMQ+up5w7P8D+{;Ipes#&#>QIfiU5ADpD-@o<Q%b8OuBjR7m+_jHmext?v@{`h?
zWzC{*6bnU8WM3-ReOtAtQFN00^sAgct3@8YXei`&VQ#Mevj4O3d!DPRHaFOLkF*vD
nvwL=(w)p9>+c)j>tB)10l31hnZLHX~wfOU`M=Ehr|Mmj_V0EJ=

diff --git a/security/nss/tests/libpkix/certs/OCSPEE33.cert b/security/nss/tests/libpkix/certs/OCSPEE33.cert
index b0a95eb030fe2d6baf00949b6c7228b9c789e32e..6fb2af875a77d0c8aac0e0465d6c8a19d17c03d1 100644
GIT binary patch
delta 400
zcmdnUvYCa$povM}powwDM2;9K0|OI7BST{&V-xczab81H1b1RxSpAmYmJ-dWcV?NW
zZt)h*S+X&SPv!RcS@B7w@nVZk`JV26zlM3X<C){1^1Ku;&%5Swcv)Vy=Ebk~bo^iM
z<Ko*F6xAPcXwu2jTuHICXxaa>EIw4vyOUbx9>lI=ks^3Us{G<KqjmTFkLx`$+?n;+
zr?HJ^hp*(3v_{+7V+^@|+mH9w2Qx7<GB7T7HE=d?WaH3gV`ODzXJlkCH83_Xgz*g+
z+f*}3N(!v>^;7bbGcxl^3ySrMQd9IY3vv?kQcLub^K-3?Of4-9c-c6$+C196^D+X>
zVPI}-Waw@w)q1-2@!nhc5<Kb=Gm=+`Kd_IReMzeI@W(RQN6v}&Vh^lytoeWZ!ZfYt
z%oSUbo^ShKTT~M?`L+4g|9#E^&8zZ$r&f5{XwH$fRw}niW$C)(RGVjapZV5WvtL%h
p(dmv;Vh-CBr9C*dOGD(h{KPQHs|o39O6E$xwpAGF?}^gZ1OS=~oiP9a

delta 398
zcmdnYvXO<upovM>powwXM2;9KLjz+26GIb2b3@Z8ab80+1b1RxSp7cv-FosYD`h$@
z<ZSoEmCUbu&SAfI{+_>Yq!YFqs0jRR=(-iDrhVx~yK&{c0%`yEKUF#t<+|F6m&%^c
ze;nC=dh+$(i&PKptm%$cdHC4SI^ag_0%zOSiRID9MDw{PNfh01sJ^2i_d}d-WBpU_
zGN<RoNpZg>B+ZBnzHYxXBZI3xnTeT^fpM|3fun&v8;3R<BP%OABO{BkfuVsujBmi$
zrkqhyQedU8pOT-Pk(pOoP^?#4te0Pun4FWUmz<w#Wn^k;X~4_IsnzDu_MMjzXbJ;!
zV<Usbf31|nMIZkpN*+;V7MR-oDuRu3rBC(ie>~buy|?5nKE&tjUEcKb(wQVRk!xx7
zjy>!;@o8ZOk6F}G?{Y5hSfy6&-#0<9;{A=OTROb^%Wn5tlzh{>8?e@c*Y$d}LWEC#
moOk|*Ni3|3=FW>uuF~|%TOA#9#JOQh?%w?hQ|6r5s{#PB^O=MI

diff --git a/security/nss/tests/libpkix/certs/OCSPRoot.cert b/security/nss/tests/libpkix/certs/OCSPRoot.cert
index 2e5d6ee851033007294bd565b275e442d9b4cc69..a60364bc620cdb9f6c70c3ed6d3599fa3eb86272 100644
GIT binary patch
delta 323
zcmV-J0lfaD1f>KMFoFUhFoFS!paTK{0s;gWkn#eN6Hy#6Ff=hTF*7nVGBjEk4>B+|
zFfcSRGBGnUGcq)hfLnjU99f!zsfZN+l7R%W-5m_)LB^_8<&qrTbh#Z#-pjViqGkQ4
z;4`Y7E<ks&KMx}aRWg*{`>$`Dv*HsX*+^$GD*5l5a@kE@HL+x1^VhZ4gz{qEsf`~r
zrX!_nOZc5-`Ip#+9>t}NDpSJRZ)qi=qC;Ro7H0+!fV{H<{AB^dlUo5we}=}8Aa#Ep
zsHO<6|6z)@??~Fi79i(8u}#J6#f1Ojd9g7sT+@j%ofv^iM(%^B6g<~e#dN@lxlX3-
zNp~KPQmgKt7@zRzvMyRkQ4QR2vj)$}W5gk@OV6h#dg(dOelqIJ_a~w#EH(<*%X>$J
VgQkEo2MoIEN*z52FgOw@0Y#2*kVgOj

delta 323
zcmV-J0lfaD1f>KMFoFUhFoFS!paTK{0s;gQApD<^6Hy#7Ff%YTF*GqZF)>;g4>B+|
zF)%YQG%++WH!(4hfLnjRp9QK+yYxyt<Co5+LiiW`XTg{R((625ga(c0p>6Z#6!faD
zg|hWI-1?Gn6qB6a)HiAy6SGP>4Nh--6#b(5YXbVrTe5m~gT9K5q8}e(%kN_Sj`Szp
zRipeyK6exX!NEFYv4Gd5E#{9=-)dV;VdJt#K{md2d}I8tO>+U`lUo5we~jm%DvT=(
zyTGBE48okYl(W^qW|A$<?a3SNRP$B=r>=zuE(%~fTcLYXnHjSXR?<YaiQc=9<}wko
zaohbXb!Hh8w~&Nvk6MOCIf(w@bMqmO{sAHQv+H_(F|h=@ng|d)^FB$Dke~mY4)<t`
VTMg8#&>fUZolD9avh1Uh0r!i#m9qc<

diff --git a/security/nss/tests/libpkix/certs/OCSPRoot.p12 b/security/nss/tests/libpkix/certs/OCSPRoot.p12
index 2cd0e7b31dc22c5296a3faf6e524be95f8885606..bcb0a075e9eb3eca07c522436e65202d8652a49e 100644
GIT binary patch
delta 1454
zcmV;f1yTC`4E_v|V1IHKrx1zUXCt;g>Ee}dQxgIK0R(~qfL$qi&{Az4H=IkhY{NoV
zoVAFEM@M7je`#)~kUjHLpJ5y|b&xf6qV9WFRI{`2++uJsQ6K|M==meObK8IDS9rkk
zm_6A6s7#O*CPVc^VYb#cQ#RyoS=AF|Wwe?<TdMB$12E~IPJgv9_3ryeT!w+xr<Y}p
zoor&s#O=gj5=Wly-VWM^YXan*4{~~GC*p^v67|4ht55K2VVuIx^Mx`UAYFEeZb9@j
zSNsgCPKtTO`nx^cn1VL00&4x}ip~fq7F)HpsKKg@SW+>1TKPf*^Q1v_trlvpQj5Zu
zf3Xi92`q4wrGH_&mMI)$HSP|7jjr@B1`C|);&m;khG3_hc)gi*G;19}Qw~7KeKu}(
zM5m5dtC`9MMrI<Ho789nsEEw{4P>(8Z<?Ma>}_G<qm5KD&+7<@>{%GcY<Mn!kaM62
z@}A>#z8VU2tUeYoezZ+Qs`dWW*0#8ly8&RYz=hn+Sbr}d`YS<Kkko)iEcoSA;pF-|
zdsuWC*inKLip@Z-`^BX&abh^buWy~HvRVpw*nk5n&pUG8v*}E4YV}S(??~-564$Fb
z%`^4f>+*qn*K<dG9KvhU@Gt41_f=R6Df{Taz^_{L<XSlo_dO|P-2emb^d*6db};xl
z#4*=*xPK8uev2P+Diqaku9dYufC*UM!l7%zcm_NN$7PpJ*Bt5@(gFLW#U^4)R`4K!
zkYN2>6C%rj@p?D^s`r7MriZ-u*4TwAJP!F683Kvp`(VaBh18dIVX8j;9}2>%Xjr&@
zN-M%7r{dk)v>oVR7pr!1sxY=JwfNfwSOVqd#2i}+9)NR{c=Upzj@fNI5P}`R`;}F;
z39yQW5uTIx0yGpF-5a85JHxStxXl|RZ~@hR>7B=uKLa^`QLbzBm~g8m#F*Lph#Pe{
z0s#S_fCPd9m_Ks4$uo(q_15Aeq(Fpu2+Ow4uUuI6oV!%wHgQfKw%PW{$_1Sn;e|pk
zSFP!ZC>mjXQQX&@5-1SIS~SNgvBaZIlb_Yu1Iimp#Zt&@4u!zXx*V}u{XB_oj|HQ;
z-(&qYUAgRkr3CKsm{Haw%HVKPtD}y_xb=8{Y?xE7O`DIDKG}#7E9sRT?h#&hs`&_0
zh$%@IO?0T#N|MWo-ey3V*;{`9Q@KSt@x!UbXMh+ym_T}DXX_jAr#S6IL;r;lS{g#P
z(z{`=;OF`ZU{Uk;)#P?!=#Zj)I5C(tPwS=MPDP)8y>bwgf60EEEh_HM10QU+b@wuK
z7QJKWfLb_m?QM5yaM=68{{6gER~APRIhht@7ph0)uLjCdSENXw!Kyt%Aq{7<lr)(?
zbYXyja?p-G-ZO84S1=j~g40yScd`rB+r-(zgIp$0sy$b|9$|ebb-gGQu}<`*r$;iv
z7Qq&O5}<g7ARHF;8TybJtmkRQBZSy~SMT&X;uG$ZNht$+8xUzKCNB6}NjNwR1gu;+
zK6`GtDr((rzI>I*Tc*@@uclKcNV*j?LKNamK3^1JQQM`9<e7}pNFl>>nxmc*QM`-q
zJ{M52+iz7g1%DS334LoV_3*`xynYijoO1(ziZ>BCnDz>cseu$nO4CFM-fbhMH`Uc&
z_qh5;t$+Tk&O$S?w9u<w=?j|qm=2?NZUu9MZP9pfDtwj)`N;L0XJ@-=Z~=Jov)@ip
zE$}pVbu~h0SSy_SULz|wj7gFkV@Ee<beXC0OuE{<EV?i6R~Vd6J(ILGyBBua*fohj
zyTp}&d|(XgTK99e7(Dq>&td%_!k=@_sA6pBQ9d%YT_iNZWmXO_vQ*!EmmZDtp-L7g
zLQDh*b1Am{nsj3QlQRY*DDDVXvh?jor#V|M_+O5+%eGynP6QC4p485c3_2K|-xUwq
I6C`i|0MY))z5oCK

delta 1454
zcmV;f1yTC`4E_v|V1J#PR87#x=2x6rk_DVSq(TA#0R(~qfY(MU>;#?~4)l%^WyR)F
z2sVe&I;sX39_haz4^V92MMbmDF-0Bjv{Qn8x+UhHeR8Yaspdmp+4Ya1(C0*xKNDxU
z)P;{ka0v`(;om<A+&scFP-qsh>XtTfNs&FpZ3eXLEX!U@aDS`omqm;0B*SPIkrbp#
zIxveVKI&^v*}pRkez2;iyf){@E+MkqJ8P3LAV<(A$f=+(eQNw9ikSge!CAfrj5FaI
z=oyD{D+m8O^`g<%NRujLUb=vcpL!tflF~@+_x4Gjo1L_=!jhEQQGY78t$t`A_HjqX
zBDXhem#DC&vVTKVlxt0ExY3ii4v;_97hzO%S&<3?N7vl!#&{BT51iq38%zsEb38wo
z9n+0Af%(;Icos{saQ0OjI>e%sYOq$UlY`Q2P!vQ|YpQ!?<sN{){hID&z<?VEM>xWR
zxrLP5N}^|bRt_s9$5i)zia6UBzf1C_gz2Y0bQNAN`+uURcbW`Op@I=(+>wB+WZ)+@
z24fuc`u+6vf=^UCG*gw9upj-#HR=j6Y|cceU=w-i@pc>slOm3GVu(PV1J^^5f_ta|
zmA7I|pf?<LV_J^vGG5_2=R2j0teT+}X*dW!94SnXcWE^5%QM0;0FDOdr+UKhC_*?G
zm_^Dt>VFi@S4Gm2sq3J;IN&E0Fl2%t7*pj!tqznh1;rmsa7i|qAj=Qsr1UxJJ$-LN
zjS8JsOLp3~>c*l7NH>)^kQio>P+tlzSg3SQvH*j|;ZwsU>aU_?M=rbpa${)?g2i|?
zc{AN=p>KhpcMkEnVk~%?K82gI?3St)0VCjeRvdMD*_<-1W;Q_`Brnhm^VVPb09fCj
z8@5OIq_~s!0yGrdfRv|7C=a{kO?&!sx8iUM2Z>vgKLa^`2(B9W)E;gp31g#vtcBRi
z0s#S_fCPd9m^j)~)^zc~g9K`|IXeP1gXFeBWhLJ|J4kG?wn@Z`77dp*j>K+l{SX&i
zv8d}9p?0{hQk(*0{G_x3pROcAMh2(yQA9QL*8nXR{fWi&_*kWw-(CJ{_~)M7oSK(;
zC2QL^8n!WimtouA(ZKTf$I0Grfysog5%yuSxM)L0eL?Mx)?V~-%0J2)lmay?Z`35%
z*n&fnLk1zAK+Y+e^EA=g7W27%{Yn<cs_o81t?LY^?%rj{&%cOj2VDEJ(V#o10(Tbb
zyjO!px=*lobOac9#CkZUa_|om5ZND#kOB<YKI{a4$?(8BL#{bH-XD9x%G+Z@Zhz<B
z*_rX}*ke^j7#oblYUR}-M!?1T?JO|#K4cYqRupaUyw32KO{%$mto`(u38eh_A-~+1
z$gOo~2)9n*sRqW<!7E}*7BfLC^iYtGvvteoOLWdh21Pjzh#L%Tt>MA%kCM?*znauh
zGN3JgEo%YaP%|=OZx4lb?D%Lj4o>OB3?p{J1G`-7daiHt&nrEVmU(EkqFik5<aA*M
z(T!GOjy@bNhO)t?dm<AlQ^n7&UgXa=s|RMK(+fx>`N^hnKj-w#B7_na={zl{qeVEh
z0A6UPYL|jd8<h`6r~(<J5)EZy+h@*z#D<c8Yv!o98&iU0EsTGoS`IqYZCw30GbLxy
zUs)Nyh^O+KAdCHrKh?gR`|SG10(#iU|9iH$PSgO7jZu3(eqOP_cxPQcVT}U)BYdvn
zW|b+Mn}s%r92Rw|JZF<D?%3s+-of#qgG><=+ObqlDnp1p87KL{@F>>ZOeXkr<}^@1
z(+=fnnnbnHzA+Y4j&QZ!rmE&&n|o?c2<*%jnOxf=(Q91a!FASMIA360x)xtHLy6<6
zYbyi@5@oP|Jq9O7lQRY*D6@v9J^mdEqXhgg6S`d|6YXIpN(2z(F3haP?01BgKP(j%
I=Iyos0Co4h6#xJL

diff --git a/security/nss/tests/libpkix/certs/PayPalEE.cert b/security/nss/tests/libpkix/certs/PayPalEE.cert
index 152efd3cd85c67f33c350f319fe025b542c17946..cca202a47e5203645bec5173ab9e53daa0fe3d5b 100644
GIT binary patch
delta 674
zcmV;T0$u&j49^T7FoFh4FoFd$paTK{0s;_sA^jZx=@4?lPe5~B_hCViAJGsnFf%bR
zFfcGMFfdvd4KXp20YDrZFc}5|RRj+c5>_!TFf1TLY+-eCWgs;!C}Js-UIC09955ON
z162eI6cb5qW^ZzBVRUJ4ZXi>6b97~GbCU%EI)AUGcpuoWw=P1fq4;_aCIe%+0s+s1
zm24KeQ$vjZS0DwKQ!2Yttbc|Eu<wPgG}|15$!EG&IB=xQ9@Bi8v!@g1tFfD2rUN@_
zxy&yzx-Hz{xs@rpicsX=cXoNmlX_*s#i2>gUKLe&w}2a6M)B3Yq(Yh>mQ(AlapPp$
zPk%|ew~@+lCPcBvZ5r)<pRG6{-SI+D9JYsXQW8ZlB62y8f_H!klczGPKJ1v2ak=oW
zg?m<m^J<@K5Gt+t{Sg(=92Km7Q$t0}k0xNMWFbLsYk``@S{2`W&z^;P3Y(lxh&m-u
zpvy7u`{~Bm6z_I{4AXRPaoYMXV5F0=eF8#}lRpC^6skBUxB9>QWE9+SRz(<YO{-_i
zc(Zl`*#Unn(KsUX^f2R}M=3RkBKOHTwjaZi@v#t^a~Gte16D4XlNSa{e^a@Ka`j;_
zq)7A%U!!&E(m7#p1esJagh{}P!9r-J*w1q$yz43Mcbcq`$xsd6`Z9D|p@}K3RRotV
zfhmaobdMci!+N9kT#v#&_{HlBj8lIUPJCa4F06l>b`VXu7qA4%UUbAYkZL&W(4!Ya
z{j$nIG$k74?PZ%%?$lky%>14EsycI%@|D2TX7CU3@BqquFrAZ9HIXO1?dwYY78&^B
z@_*Rercel8R|X98e{MJ@$06NRRh2?<QAC1e3JFg|-qMqYYQ~ll8d#VFvxo_nJKWcg
ID(eDr$vpEg0ssI2

delta 674
zcmV;T0$u&j49^T7FoFh4FoFd$paTK{0s;^&Glx%a;?y3~|Nk}iq{$eOAJGsoFf%eU
zFfcGMFfdvd4KXv40YDxdFdGH~RRj+c6i{+$c42g7AWw2<VQy)9VRUJ4Zj)RAj2jv-
z7zP7X1Pc@qP+@scVQe5!a&KgHV{~b6Zj%K9I)9zBH?2_pvqeVQH(STKe^ys%jH^Nj
zRSr#GX(<#e0b$NB!EeGIBP;pXEb>s@xF^Tv>|x0qO0<@`7)eMXBmAgPc^p-r*5x3e
zGs4yvxE-uil8geKQ7Vi|Fgq_%^eXtvD(0$V1P#X(vmPDY)0o(ibr!P29X{$G@qz|?
zn193R*(c8&i=pbBQergEjbHHpceXdLb#-o@^3*noz_0WE<1jQJzLmo{_YbGQ3(LCL
z0$Zh`v{B3l;ps}lk|t6a$=YMk?0$`_(MM58b`(?;!nnf+8xO<pP`I^#&#Yp?NX-2v
z964cG5(6S(wa#p|$F@tSLBQo^vW$*eN&<ghlRpC^6fvsZ3{|v_;#Gv@pn2ODJe*3o
zMYDDT*#Uow$72HdGV$nO;0+1fK>GV6bOlcPa;s}CLaNQ8+$_Jr!sz^fO3d)G+E~Gi
z{8C(?(G-Cx3?qNguT~eeac_32H@dovhA+~x<q1>HMxKmoR=q1)fND7D=5obEg4Q0o
z!nCml@vD+$6IZJD8klCXt~%g9@RYSzw5--4YqWn3Vy6l%XhOG>lSCxsA@}xX`TVuL
zm(<H8{)tqjn;}OFhV#2%<;|IA-Av;ImzSVN-eNQ|E|*k=NNzsKRo1IM257oF=emZ_
z$Gkl`!A6nJPOq@{1VeEuu=d@gxE_tZY4w27*JaCP<Rd#<qPlRbCP2u4-}y4CZs)pi
I^8Er(G)Boi;s5{u


From 8882a778e9ee2b4842b95c3939645bd222e198e5 Mon Sep 17 00:00:00 2001
From: Mihai Sucan <mihai.sucan@gmail.com>
Date: Wed, 4 May 2011 17:45:40 +0300
Subject: [PATCH 248/314] Bug 593460 - Tests must properly close the Inspector;
 f=rcampbell r=sdwilsh

---
 browser/base/content/browser.xul                   |  2 +-
 browser/base/content/inspector.js                  | 14 ++++++++------
 .../test/browser_inspector_initialization.js       |  2 +-
 .../content/test/browser_inspector_tab_switch.js   |  1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b88cfc516b96..39ad0993a57d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -240,7 +240,7 @@
            noautohide="true"
            titlebar="normal"
            close="true"
-           onpopuphiding="InspectorUI.closeInspectorUI(true);"
+           onpopuphiding="InspectorUI.closeInspectorUI();"
            label="&inspectPanelTitle.label;">
       <toolbar id="inspector-toolbar"
                nowindowdrag="true">
diff --git a/browser/base/content/inspector.js b/browser/base/content/inspector.js
index 37dc7946bf34..7fe792ae67e1 100644
--- a/browser/base/content/inspector.js
+++ b/browser/base/content/inspector.js
@@ -347,7 +347,7 @@ var InspectorUI = {
   toggleInspectorUI: function IUI_toggleInspectorUI(aEvent)
   {
     if (this.isTreePanelOpen) {
-      this.closeInspectorUI(true);
+      this.closeInspectorUI();
     } else {
       this.openInspectorUI();
     }
@@ -738,10 +738,12 @@ var InspectorUI = {
    * Remove event listeners for document scrolling, resize,
    * tabContainer.TabSelect and others.
    *
-   * @param boolean aClearStore tells if you want the store associated to the
-   * current tab/window to be cleared or not.
+   * @param boolean aKeepStore
+   *        Tells if you want the store associated to the current tab/window to
+   *        be cleared or not. Set this to true to not clear the store, or false
+   *        otherwise.
    */
-  closeInspectorUI: function IUI_closeInspectorUI(aClearStore)
+  closeInspectorUI: function IUI_closeInspectorUI(aKeepStore)
   {
     if (this.closing || !this.win || !this.browser) {
       return;
@@ -749,7 +751,7 @@ var InspectorUI = {
 
     this.closing = true;
 
-    if (aClearStore) {
+    if (!aKeepStore) {
       InspectorStore.deleteStore(this.winID);
       this.win.removeEventListener("pagehide", this, true);
     } else {
@@ -1028,7 +1030,7 @@ var InspectorUI = {
       case "TabSelect":
         winID = this.getWindowID(gBrowser.selectedBrowser.contentWindow);
         if (this.isTreePanelOpen && winID != this.winID) {
-          this.closeInspectorUI(false);
+          this.closeInspectorUI(true);
           inspectorClosed = true;
         }
 
diff --git a/browser/base/content/test/browser_inspector_initialization.js b/browser/base/content/test/browser_inspector_initialization.js
index 790826a8f447..b56dcba65240 100644
--- a/browser/base/content/test/browser_inspector_initialization.js
+++ b/browser/base/content/test/browser_inspector_initialization.js
@@ -56,7 +56,7 @@ function runInspectorTests()
   ok(InspectorUI.isTreePanelOpen, "Inspector Tree Panel is open");
   ok(InspectorUI.isStylePanelOpen, "Inspector Style Panel is open");
   ok(InspectorUI.isDOMPanelOpen, "Inspector DOM Panel is open");
-  InspectorUI.closeInspectorUI(true);
+  InspectorUI.closeInspectorUI();
 }
 
 function finishInspectorTests()
diff --git a/browser/base/content/test/browser_inspector_tab_switch.js b/browser/base/content/test/browser_inspector_tab_switch.js
index 07980d051f12..7ec32249d39c 100644
--- a/browser/base/content/test/browser_inspector_tab_switch.js
+++ b/browser/base/content/test/browser_inspector_tab_switch.js
@@ -157,6 +157,7 @@ function inspectorTabUnload1(evt)
   ok(InspectorUI.isStylePanelOpen, "Inspector Style Panel is open");
   is(InspectorStore.length, 1, "InspectorStore.length = 1");
 
+  InspectorUI.closeInspectorUI();
   gBrowser.removeCurrentTab();
   finish();
 }

From 4d7e6898e5f974291f36f3bbae97cb7133b44234 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:55:12 +0200
Subject: [PATCH 249/314] Bug 568825 - Fix -moz-appearance: progresschunk
 overflows on the bottom on Windows. r=jimm

---
 layout/reftests/native-theme/progress-nobar.html       |  7 +++++++
 .../reftests/native-theme/progress-overflow-ref.html   | 10 ++++++++++
 .../reftests/native-theme/progress-overflow-small.html |  9 +++++++++
 layout/reftests/native-theme/progress-overflow.html    |  9 +++++++++
 layout/reftests/native-theme/reftest.list              |  3 +++
 widget/src/windows/nsNativeThemeWin.cpp                |  9 +++++++++
 6 files changed, 47 insertions(+)
 create mode 100644 layout/reftests/native-theme/progress-nobar.html
 create mode 100644 layout/reftests/native-theme/progress-overflow-ref.html
 create mode 100644 layout/reftests/native-theme/progress-overflow-small.html
 create mode 100644 layout/reftests/native-theme/progress-overflow.html

diff --git a/layout/reftests/native-theme/progress-nobar.html b/layout/reftests/native-theme/progress-nobar.html
new file mode 100644
index 000000000000..a485d38c9f57
--- /dev/null
+++ b/layout/reftests/native-theme/progress-nobar.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <div style="-moz-appearance: progressbar; width:180px; height:6px;">
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/native-theme/progress-overflow-ref.html b/layout/reftests/native-theme/progress-overflow-ref.html
new file mode 100644
index 000000000000..22b3dbeddc74
--- /dev/null
+++ b/layout/reftests/native-theme/progress-overflow-ref.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <div style="overflow: hidden; -moz-appearance: progressbar; width:180px; height:40px;">
+      <div style="-moz-appearance: progresschunk; width:50%; height:100%;">
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/layout/reftests/native-theme/progress-overflow-small.html b/layout/reftests/native-theme/progress-overflow-small.html
new file mode 100644
index 000000000000..96bccb29a68a
--- /dev/null
+++ b/layout/reftests/native-theme/progress-overflow-small.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <div style="-moz-appearance: progressbar; width:180px; height:6px;">
+      <div style="-moz-appearance: progresschunk; width:50%; height:100%;">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/native-theme/progress-overflow.html b/layout/reftests/native-theme/progress-overflow.html
new file mode 100644
index 000000000000..d5611c473b0e
--- /dev/null
+++ b/layout/reftests/native-theme/progress-overflow.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <div style="-moz-appearance: progressbar; width:180px; height:40px;">
+      <div style="-moz-appearance: progresschunk; width:50%; height:100%;">
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index 4f59f4451553..6670e3db802a 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -64,3 +64,6 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim
 == border-radius.html border-radius-ref.html
 
 == checkbox-dynamic-1.html checkbox-dynamic-1-ref.html
+
+== progress-overflow.html progress-overflow-ref.html
+fails-if(cocoaWidget) != progress-overflow-small.html progress-nobar.html
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 4b179a606cd9..830a7b8e2e1a 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -343,6 +343,13 @@ static CaptionButtonPadding buttonData[3] = {
   }
 };
 
+/**
+ * Progress bar related constants.
+ */
+// PP_CHUNK is overflowing on the bottom for no appearant reasons.
+// This is a fix around this issue.
+static const PRInt32 kProgressDeterminedXPOverflow = 11;
+
 // Adds "hot" caption button padding to minimum widget size.
 static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
   if (!aSize)
@@ -1289,6 +1296,8 @@ RENDER_AGAIN:
   }
   else if (aWidgetType == NS_THEME_WINDOW_BUTTON_CLOSE) {
     OffsetBackgroundRect(widgetRect, CAPTIONBUTTON_CLOSE);
+  } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK) {
+    widgetRect.bottom -= kProgressDeterminedXPOverflow;
   }
 
   // widgetRect is the bounding box for a widget, yet the scale track is only

From 7bd74b165b3ebef21ee0be5eb8e159e89753f0d3 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:56:42 +0200
Subject: [PATCH 250/314] Bug 641517 (1/2) - Use PP_FILL instead of PP_CHUNK to
 show the progress bar on Windows Vista and Windows 7. r=jimm

---
 widget/src/windows/nsNativeThemeWin.cpp | 8 ++++++--
 widget/src/windows/nsUXThemeConstants.h | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 830a7b8e2e1a..76cd54bf48b1 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -349,6 +349,8 @@ static CaptionButtonPadding buttonData[3] = {
 // PP_CHUNK is overflowing on the bottom for no appearant reasons.
 // This is a fix around this issue.
 static const PRInt32 kProgressDeterminedXPOverflow = 11;
+// Same thing but for PP_FILL.
+static const PRInt32 kProgressDeterminedVistaOverflow = 4;
 
 // Adds "hot" caption button padding to minimum widget size.
 static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
@@ -665,7 +667,7 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
       return NS_OK;
     }
     case NS_THEME_PROGRESSBAR_CHUNK: {
-      aPart = PP_CHUNK;
+      aPart = nsUXThemeData::sIsVistaOrLater ? PP_FILL : PP_CHUNK;
       aState = TS_NORMAL;
       return NS_OK;
     }
@@ -1297,7 +1299,9 @@ RENDER_AGAIN:
   else if (aWidgetType == NS_THEME_WINDOW_BUTTON_CLOSE) {
     OffsetBackgroundRect(widgetRect, CAPTIONBUTTON_CLOSE);
   } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK) {
-    widgetRect.bottom -= kProgressDeterminedXPOverflow;
+    widgetRect.bottom -= nsUXThemeData::sIsVistaOrLater
+                           ? kProgressDeterminedVistaOverflow
+                           : kProgressDeterminedXPOverflow;
   }
 
   // widgetRect is the bounding box for a widget, yet the scale track is only
diff --git a/widget/src/windows/nsUXThemeConstants.h b/widget/src/windows/nsUXThemeConstants.h
index 0398a6f9e556..38202e9b9cb1 100644
--- a/widget/src/windows/nsUXThemeConstants.h
+++ b/widget/src/windows/nsUXThemeConstants.h
@@ -116,6 +116,7 @@
 #define PP_BARVERT         2
 #define PP_CHUNK           3
 #define PP_CHUNKVERT       4
+#define PP_FILL            5
 
 // Tab constants
 #define TABP_TAB             4

From 6e2095f65fb08264e0b605e53a645873a256f425 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:57:04 +0200
Subject: [PATCH 251/314] Bug 641517 (2/2) - Add the animated glow for progress
 bars on Windows Vista/7. r=jimm

---
 layout/reftests/bugs/474336-1-ref.xul     |  1 +
 layout/reftests/bugs/474336-1.xul         |  1 +
 layout/reftests/native-theme/reftest.list |  7 +++--
 widget/src/windows/nsNativeThemeWin.cpp   | 31 +++++++++++++++++++++++
 widget/src/windows/nsUXThemeConstants.h   |  1 +
 5 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/layout/reftests/bugs/474336-1-ref.xul b/layout/reftests/bugs/474336-1-ref.xul
index d9d75462d8c6..6d11e409231f 100644
--- a/layout/reftests/bugs/474336-1-ref.xul
+++ b/layout/reftests/bugs/474336-1-ref.xul
@@ -10,6 +10,7 @@
         background-color: blue;
     }
     #prog .progress-bar {
+        -moz-appearance: none;
         border-radius: 3px 3px;
         background-color: red;
     }
diff --git a/layout/reftests/bugs/474336-1.xul b/layout/reftests/bugs/474336-1.xul
index ec9182841538..958d6c49832d 100644
--- a/layout/reftests/bugs/474336-1.xul
+++ b/layout/reftests/bugs/474336-1.xul
@@ -10,6 +10,7 @@
         background-color: blue;
     }
     #prog .progress-bar {
+        -moz-appearance: none;
         border-radius: 3px 3px;
         background-color: red;
     }
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index 6670e3db802a..d967068d630a 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -65,5 +65,8 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim
 
 == checkbox-dynamic-1.html checkbox-dynamic-1-ref.html
 
-== progress-overflow.html progress-overflow-ref.html
-fails-if(cocoaWidget) != progress-overflow-small.html progress-nobar.html
+# These tests have been written to test the overflow of the window widget
+# (bug 568825) but we can't test it on Windows and Cocoa because they have
+# animated progress bars.
+skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
+skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 76cd54bf48b1..5d1b52bf1ea5 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -60,6 +60,7 @@
 #include <malloc.h>
 #include "nsWindow.h"
 #include "nsIComboboxControlFrame.h"
+#include "prinrval.h"
 
 #include "gfxPlatform.h"
 #include "gfxContext.h"
@@ -345,12 +346,18 @@ static CaptionButtonPadding buttonData[3] = {
 
 /**
  * Progress bar related constants.
+ * These values are found by experimenting and comparing against native widgets
+ * used by the system. They are very unlikely exact but try to not be too wrong.
  */
 // PP_CHUNK is overflowing on the bottom for no appearant reasons.
 // This is a fix around this issue.
 static const PRInt32 kProgressDeterminedXPOverflow = 11;
 // Same thing but for PP_FILL.
 static const PRInt32 kProgressDeterminedVistaOverflow = 4;
+// The width of the overlay used to animate the progress bar (Vista and later).
+static const PRInt32 kProgressVistaOverlayWidth = 120;
+// Speed of the animation for determined Vista and later progress bars.
+static const double kProgressDeterminedVistaSpeed = 0.3;
 
 // Adds "hot" caption button padding to minimum widget size.
 static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
@@ -1536,6 +1543,30 @@ RENDER_AGAIN:
 
     ctx->Restore();
     ctx->SetOperator(currentOp);
+  } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK &&
+             nsUXThemeData::sIsVistaOrLater) {
+    if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 60)) {
+      NS_WARNING("unable to animate progress widget!");
+    }
+
+    // Add the animated glow.
+    const PRInt32 frameWidth = widgetRect.right - widgetRect.left;
+    static const PRInt32 overlayWidth = kProgressVistaOverlayWidth;
+    static const double pixelsPerMillisecond = kProgressDeterminedVistaSpeed;
+
+    PRInt32 animationWidth = frameWidth + overlayWidth;
+    double interval = animationWidth / pixelsPerMillisecond;
+    // We have to pass a double* to modf and we can't pass NULL.
+    double tempValue;
+    double ratio = modf(PR_IntervalToMilliseconds(PR_IntervalNow())/interval,
+                        &tempValue);
+    PRInt32 dx = static_cast<PRInt32>(animationWidth * ratio) - overlayWidth;
+
+    RECT overlayRect = widgetRect;
+    overlayRect.left += dx;
+    overlayRect.right = overlayRect.left + overlayWidth;
+    nsUXThemeData::drawThemeBG(theme, hdc, PP_MOVEOVERLAY, state, &overlayRect,
+                               &clipRect);
   }
 
 
diff --git a/widget/src/windows/nsUXThemeConstants.h b/widget/src/windows/nsUXThemeConstants.h
index 38202e9b9cb1..28e2edc29f8f 100644
--- a/widget/src/windows/nsUXThemeConstants.h
+++ b/widget/src/windows/nsUXThemeConstants.h
@@ -117,6 +117,7 @@
 #define PP_CHUNK           3
 #define PP_CHUNKVERT       4
 #define PP_FILL            5
+#define PP_MOVEOVERLAY     8
 
 // Tab constants
 #define TABP_TAB             4

From 3d7f866daf4944b9d5480211a5300655e5342e3f Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:57:48 +0200
Subject: [PATCH 252/314] Bug 641905 - Use native rendering for indeterminate
 progress bar on Windows. r=jimm

---
 widget/src/windows/nsNativeThemeWin.cpp | 99 ++++++++++++++++++-------
 1 file changed, 71 insertions(+), 28 deletions(-)

diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 5d1b52bf1ea5..9ebdd49a833a 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -354,10 +354,19 @@ static CaptionButtonPadding buttonData[3] = {
 static const PRInt32 kProgressDeterminedXPOverflow = 11;
 // Same thing but for PP_FILL.
 static const PRInt32 kProgressDeterminedVistaOverflow = 4;
+// Same thing but for indeterminate progress bar.
+// The value is the same for PP_CHUNK and PP_MOVEOVERLAY in that case.
+static const PRInt32 kProgressIndeterminateOverflow = 2;
 // The width of the overlay used to animate the progress bar (Vista and later).
 static const PRInt32 kProgressVistaOverlayWidth = 120;
-// Speed of the animation for determined Vista and later progress bars.
+// The width of the overlay used to for indeterminate progress bars on XP.
+static const PRInt32 kProgressXPOverlayWidth = 55;
+// Speed (px per ms) of the animation for determined Vista and later progress bars.
 static const double kProgressDeterminedVistaSpeed = 0.3;
+// Speed (px per ms) of the animation for indeterminate progress bars.
+static const double kProgressIndeterminateSpeed = 0.175;
+// Delay between two indeterminate progress bar cycle (in ms).
+static const PRInt32 kProgressIndeterminateDelay = 500;
 
 // Adds "hot" caption button padding to minimum widget size.
 static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
@@ -674,7 +683,12 @@ nsNativeThemeWin::GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
       return NS_OK;
     }
     case NS_THEME_PROGRESSBAR_CHUNK: {
-      aPart = nsUXThemeData::sIsVistaOrLater ? PP_FILL : PP_CHUNK;
+      nsIFrame* stateFrame = aFrame->GetParent();
+      nsEventStates eventStates = GetContentState(stateFrame, aWidgetType);
+      // If the element is indeterminate, we are going to render it ourself so
+      // we have to return aPart = -1.
+      aPart = IsIndeterminateProgress(stateFrame, eventStates)
+                ? -1 : nsUXThemeData::sIsVistaOrLater ? PP_FILL : PP_CHUNK;
       aState = TS_NORMAL;
       return NS_OK;
     }
@@ -1306,9 +1320,13 @@ RENDER_AGAIN:
   else if (aWidgetType == NS_THEME_WINDOW_BUTTON_CLOSE) {
     OffsetBackgroundRect(widgetRect, CAPTIONBUTTON_CLOSE);
   } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK) {
-    widgetRect.bottom -= nsUXThemeData::sIsVistaOrLater
-                           ? kProgressDeterminedVistaOverflow
-                           : kProgressDeterminedXPOverflow;
+    nsIFrame* stateFrame = aFrame->GetParent();
+    nsEventStates eventStates = GetContentState(stateFrame, aWidgetType);
+    widgetRect.bottom -= IsIndeterminateProgress(stateFrame, eventStates)
+                           ? kProgressIndeterminateOverflow
+                           : nsUXThemeData::sIsVistaOrLater
+                             ? kProgressDeterminedVistaOverflow
+                             : kProgressDeterminedXPOverflow;
   }
 
   // widgetRect is the bounding box for a widget, yet the scale track is only
@@ -1543,30 +1561,55 @@ RENDER_AGAIN:
 
     ctx->Restore();
     ctx->SetOperator(currentOp);
-  } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK &&
-             nsUXThemeData::sIsVistaOrLater) {
-    if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 60)) {
-      NS_WARNING("unable to animate progress widget!");
+  } else if (aWidgetType == NS_THEME_PROGRESSBAR_CHUNK) {
+    /**
+     * Here, we draw the animated part of the progress bar.
+     * A progress bar has always an animated part on Windows Vista and later.
+     * On Windows XP, a progress bar has an animated part when in an
+     * indeterminated state.
+     * When the progress bar is indeterminated, no background is painted so we
+     * only see the animated part.
+     * When the progress bar is determinated, the animated part is a glow draw
+     * on top of the background (PP_FILL).
+     */
+    nsIFrame* stateFrame = aFrame->GetParent();
+    nsEventStates eventStates = GetContentState(stateFrame, aWidgetType);
+    bool indeterminate = IsIndeterminateProgress(stateFrame, eventStates);
+
+    if (indeterminate || nsUXThemeData::sIsVistaOrLater) {
+      if (!QueueAnimatedContentForRefresh(aFrame->GetContent(), 60)) {
+        NS_WARNING("unable to animate progress widget!");
+      }
+
+      const PRInt32 overlayWidth = nsUXThemeData::sIsVistaOrLater
+                                     ? kProgressVistaOverlayWidth
+                                     : kProgressXPOverlayWidth;
+      const double pixelsPerMillisecond = indeterminate
+                                            ? kProgressIndeterminateSpeed
+                                            : kProgressDeterminedVistaSpeed;
+
+      const PRInt32 frameWidth = widgetRect.right - widgetRect.left;
+      PRInt32 animationWidth = frameWidth + overlayWidth;
+      // When indeterminated, we add a delay of one second between two cycles.
+      if (indeterminate) {
+        animationWidth += static_cast<PRInt32>(pixelsPerMillisecond *
+                          kProgressIndeterminateDelay);
+      }
+      const double interval = animationWidth / pixelsPerMillisecond;
+      // We have to pass a double* to modf and we can't pass NULL.
+      double tempValue;
+      double ratio = modf(PR_IntervalToMilliseconds(PR_IntervalNow())/interval,
+                          &tempValue);
+      PRInt32 dx = static_cast<PRInt32>(animationWidth * ratio) - overlayWidth;
+
+      RECT overlayRect = widgetRect;
+      overlayRect.left += dx;
+      overlayRect.right = overlayRect.left + overlayWidth;
+      nsUXThemeData::drawThemeBG(theme, hdc,
+                                 nsUXThemeData::sIsVistaOrLater ? PP_MOVEOVERLAY
+                                                                : PP_CHUNK,
+                                 state, &overlayRect, &clipRect);
     }
-
-    // Add the animated glow.
-    const PRInt32 frameWidth = widgetRect.right - widgetRect.left;
-    static const PRInt32 overlayWidth = kProgressVistaOverlayWidth;
-    static const double pixelsPerMillisecond = kProgressDeterminedVistaSpeed;
-
-    PRInt32 animationWidth = frameWidth + overlayWidth;
-    double interval = animationWidth / pixelsPerMillisecond;
-    // We have to pass a double* to modf and we can't pass NULL.
-    double tempValue;
-    double ratio = modf(PR_IntervalToMilliseconds(PR_IntervalNow())/interval,
-                        &tempValue);
-    PRInt32 dx = static_cast<PRInt32>(animationWidth * ratio) - overlayWidth;
-
-    RECT overlayRect = widgetRect;
-    overlayRect.left += dx;
-    overlayRect.right = overlayRect.left + overlayWidth;
-    nsUXThemeData::drawThemeBG(theme, hdc, PP_MOVEOVERLAY, state, &overlayRect,
-                               &clipRect);
   }
 
 

From 68820b54b245fdd0b45f83e3d5d9e3dba994a432 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:58:23 +0200
Subject: [PATCH 253/314] Bug 642127 - Improve the Windows Vista/7 progress bar
 glow effect. r=jimm

---
 widget/src/windows/nsNativeThemeWin.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index 9ebdd49a833a..a1bd7137b074 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -362,11 +362,13 @@ static const PRInt32 kProgressVistaOverlayWidth = 120;
 // The width of the overlay used to for indeterminate progress bars on XP.
 static const PRInt32 kProgressXPOverlayWidth = 55;
 // Speed (px per ms) of the animation for determined Vista and later progress bars.
-static const double kProgressDeterminedVistaSpeed = 0.3;
+static const double kProgressDeterminedVistaSpeed = 0.225;
 // Speed (px per ms) of the animation for indeterminate progress bars.
 static const double kProgressIndeterminateSpeed = 0.175;
-// Delay between two indeterminate progress bar cycle (in ms).
+// Delay (in ms) between two indeterminate progress bar cycles.
 static const PRInt32 kProgressIndeterminateDelay = 500;
+// Delay (in ms) between two determinate progress bar animation on Vista/7.
+static const PRInt32 kProgressDeterminedVistaDelay = 1000;
 
 // Adds "hot" caption button padding to minimum widget size.
 static void AddPaddingRect(nsIntSize* aSize, CaptionButton button) {
@@ -1587,14 +1589,12 @@ RENDER_AGAIN:
       const double pixelsPerMillisecond = indeterminate
                                             ? kProgressIndeterminateSpeed
                                             : kProgressDeterminedVistaSpeed;
+      const PRInt32 delay = indeterminate ? kProgressIndeterminateDelay
+                                          : kProgressDeterminedVistaDelay;
 
       const PRInt32 frameWidth = widgetRect.right - widgetRect.left;
-      PRInt32 animationWidth = frameWidth + overlayWidth;
-      // When indeterminated, we add a delay of one second between two cycles.
-      if (indeterminate) {
-        animationWidth += static_cast<PRInt32>(pixelsPerMillisecond *
-                          kProgressIndeterminateDelay);
-      }
+      const PRInt32 animationWidth = frameWidth + overlayWidth +
+                                     static_cast<PRInt32>(pixelsPerMillisecond * delay);
       const double interval = animationWidth / pixelsPerMillisecond;
       // We have to pass a double* to modf and we can't pass NULL.
       double tempValue;

From acf3af443bf773e19dacef066c7ba90afeb9677e Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Wed, 4 May 2011 16:59:03 +0200
Subject: [PATCH 254/314] Bug 641942 - Make Windows progress bars RTL-friendly.
 r=jimm

---
 widget/src/windows/nsNativeThemeWin.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/widget/src/windows/nsNativeThemeWin.cpp b/widget/src/windows/nsNativeThemeWin.cpp
index a1bd7137b074..0c8388e653cf 100644
--- a/widget/src/windows/nsNativeThemeWin.cpp
+++ b/widget/src/windows/nsNativeThemeWin.cpp
@@ -1600,6 +1600,11 @@ RENDER_AGAIN:
       double tempValue;
       double ratio = modf(PR_IntervalToMilliseconds(PR_IntervalNow())/interval,
                           &tempValue);
+      // If the frame direction is RTL, we want to have the animation going RTL.
+      // ratio is in [0.0; 1.0[ range, inverting it reverse the animation.
+      if (IsFrameRTL(aFrame)) {
+        ratio = 1.0 - ratio;
+      }
       PRInt32 dx = static_cast<PRInt32>(animationWidth * ratio) - overlayWidth;
 
       RECT overlayRect = widgetRect;

From 97271fa8e444efec333d0be31142de677d7c3fe0 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 22:41:40 +0200
Subject: [PATCH 255/314] Bug 479393, Add libpkix-based certificate validation
 to PSM (off by default), r=rrelyea, r=bsmith

---
 security/manager/ssl/public/nsIX509Cert.idl   |  10 +-
 security/manager/ssl/src/Makefile.in          |   1 +
 .../ssl/src/nsCERTValInParamWrapper.cpp       | 157 +++++++++++++++++
 .../manager/ssl/src/nsCERTValInParamWrapper.h | 102 +++++++++++
 security/manager/ssl/src/nsCMS.cpp            |  30 +++-
 security/manager/ssl/src/nsNSSCallbacks.cpp   |  58 ++++++-
 security/manager/ssl/src/nsNSSCertificate.cpp |  34 +++-
 .../manager/ssl/src/nsNSSCertificateDB.cpp    |  49 +++++-
 .../ssl/src/nsNSSCertificateFakeTransport.cpp |   4 +-
 security/manager/ssl/src/nsNSSComponent.cpp   | 159 +++++++++++++++---
 security/manager/ssl/src/nsNSSComponent.h     |  14 ++
 security/manager/ssl/src/nsNSSIOLayer.cpp     |  22 +++
 .../manager/ssl/src/nsUsageArrayHelper.cpp    |  57 +++++--
 security/manager/ssl/src/nsUsageArrayHelper.h |   2 +-
 14 files changed, 645 insertions(+), 54 deletions(-)
 create mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.cpp
 create mode 100644 security/manager/ssl/src/nsCERTValInParamWrapper.h

diff --git a/security/manager/ssl/public/nsIX509Cert.idl b/security/manager/ssl/public/nsIX509Cert.idl
index 94e54a5a1271..88d31e9cb779 100644
--- a/security/manager/ssl/public/nsIX509Cert.idl
+++ b/security/manager/ssl/public/nsIX509Cert.idl
@@ -214,12 +214,13 @@ interface nsIX509Cert : nsISupports {
    *  Obtain an array of human readable strings describing
    *  the certificate's certified usages.
    *
-   *  @param ignoreOcsp Do not use OCSP even if it is currently activated.
+   *  @param localOnly Do not hit the network, even if revocation information
+   *                   downloading is currently activated.
    *  @param verified The certificate verification result, see constants.
    *  @param count The number of human readable usages returned.
    *  @param usages The array of human readable usages.
    */
-  void getUsagesArray(in boolean ignoreOcsp,
+  void getUsagesArray(in boolean localOnly,
                       out PRUint32 verified,
                       out PRUint32 count, 
                       [array, size_is(count)] out wstring usages);
@@ -228,11 +229,12 @@ interface nsIX509Cert : nsISupports {
    *  Obtain a single comma separated human readable string describing
    *  the certificate's certified usages.
    *
-   *  @param ignoreOcsp Do not use OCSP even if it is currently activated.
+   *  @param localOnly Do not hit the network, even if revocation information
+   *                   downloading is currently activated.
    *  @param verified The certificate verification result, see constants.
    *  @param purposes The string listing the usages.
    */
-  void getUsagesString(in boolean ignoreOcsp, out PRUint32 verified, out AString usages);
+  void getUsagesString(in boolean localOnly, out PRUint32 verified, out AString usages);
 
   /**
    *  Verify the certificate for a particular usage.
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
index 4e301a5e11d4..2aca078247d1 100644
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -54,6 +54,7 @@ GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 
 CPPSRCS = 				\
+	nsCERTValInParamWrapper.cpp     \
 	nsNSSCleaner.cpp                \
 	nsCertOverrideService.cpp   \
 	nsRecentBadCerts.cpp \
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.cpp b/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
new file mode 100644
index 000000000000..717883fd216c
--- /dev/null
+++ b/security/manager/ssl/src/nsCERTValInParamWrapper.cpp
@@ -0,0 +1,157 @@
+/* ***** 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
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Kai Engert <kengert@redhat.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 "nsCERTValInParamWrapper.h"
+
+NS_IMPL_THREADSAFE_ADDREF(nsCERTValInParamWrapper)
+NS_IMPL_THREADSAFE_RELEASE(nsCERTValInParamWrapper)
+
+nsCERTValInParamWrapper::nsCERTValInParamWrapper()
+:mAlreadyConstructed(PR_FALSE)
+,mCVIN(nsnull)
+,mRev(nsnull)
+{
+  MOZ_COUNT_CTOR(nsCERTValInParamWrapper);
+}
+
+nsCERTValInParamWrapper::~nsCERTValInParamWrapper()
+{
+  MOZ_COUNT_DTOR(nsCERTValInParamWrapper);
+  if (mRev) {
+    CERT_DestroyCERTRevocationFlags(mRev);
+  }
+  if (mCVIN)
+    PORT_Free(mCVIN);
+}
+
+nsresult nsCERTValInParamWrapper::Construct(missing_cert_download_config mcdc,
+                                            crl_download_config cdc,
+                                            ocsp_download_config odc,
+                                            ocsp_strict_config osc,
+                                            any_revo_fresh_config arfc,
+                                            const char *firstNetworkRevocationMethod)
+{
+  if (mAlreadyConstructed)
+    return NS_ERROR_FAILURE;
+
+  CERTValInParam *p = (CERTValInParam*)PORT_Alloc(3 * sizeof(CERTValInParam));
+  if (!p)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  CERTRevocationFlags *rev = CERT_AllocCERTRevocationFlags(
+      cert_revocation_method_ocsp +1, 1,
+      cert_revocation_method_ocsp +1, 1);
+  
+  if (!rev) {
+    PORT_Free(p);
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  
+  p[0].type = cert_pi_useAIACertFetch;
+  p[0].value.scalar.b = (mcdc == missing_cert_download_on);
+  p[1].type = cert_pi_revocationFlags;
+  p[1].value.pointer.revocation = rev;
+  p[2].type = cert_pi_end;
+  
+  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_crl] =
+    // implicit default source - makes no sense for CRLs
+    CERT_REV_M_IGNORE_IMPLICIT_DEFAULT_SOURCE
+
+    // let's not stop on fresh CRL. If OCSP is enabled, too, let's check it
+    | CERT_REV_M_CONTINUE_TESTING_ON_FRESH_INFO
+
+    // no fresh CRL? well, let other flag decide whether to fail or not
+    | CERT_REV_M_IGNORE_MISSING_FRESH_INFO
+
+    // testing using local CRLs is always allowed
+    | CERT_REV_M_TEST_USING_THIS_METHOD
+
+    // no local crl and don't know where to get it from? ignore
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // crl download based on parameter
+    | ((cdc == crl_download_allowed) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+    ;
+
+  rev->leafTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+  rev->chainTests.cert_rev_flags_per_method[cert_revocation_method_ocsp] =
+    // is ocsp enabled at all?
+    ((odc == ocsp_on) ?
+      CERT_REV_M_TEST_USING_THIS_METHOD : CERT_REV_M_DO_NOT_TEST_USING_THIS_METHOD)
+
+    // ocsp enabled controls network fetching, too
+    | ((odc == ocsp_on) ?
+        CERT_REV_M_ALLOW_NETWORK_FETCHING : CERT_REV_M_FORBID_NETWORK_FETCHING)
+
+    // ocsp set to strict==required?
+    | ((osc == ocsp_strict) ?
+        CERT_REV_M_FAIL_ON_MISSING_FRESH_INFO : CERT_REV_M_IGNORE_MISSING_FRESH_INFO)
+
+    // if app has a default OCSP responder configured, let's use it
+    | CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
+
+    // of course OCSP doesn't work without a source. let's accept such certs
+    | CERT_REV_M_SKIP_TEST_ON_MISSING_SOURCE
+
+    // ocsp success is sufficient
+    | CERT_REV_M_STOP_TESTING_ON_FRESH_INFO
+    ;
+
+  PRBool wantsCrlFirst = (firstNetworkRevocationMethod != nsnull)
+                          && (strcmp("crl", firstNetworkRevocationMethod) == 0);
+    
+  rev->leafTests.preferred_methods[0] =
+  rev->chainTests.preferred_methods[0] =
+    wantsCrlFirst ? cert_revocation_method_crl : cert_revocation_method_ocsp;
+
+  rev->leafTests.cert_rev_method_independent_flags =
+  rev->chainTests.cert_rev_method_independent_flags =
+    // avoiding the network is good, let's try local first
+    CERT_REV_MI_TEST_ALL_LOCAL_INFORMATION_FIRST
+
+    // is overall revocation requirement strict or relaxed?
+    | ((arfc == any_revo_strict) ?
+        CERT_REV_MI_REQUIRE_SOME_FRESH_INFO_AVAILABLE : CERT_REV_MI_NO_OVERALL_INFO_REQUIREMENT)
+    ;
+
+  mAlreadyConstructed = PR_TRUE;
+  mCVIN = p;
+  mRev = rev;
+  return NS_OK;
+}
diff --git a/security/manager/ssl/src/nsCERTValInParamWrapper.h b/security/manager/ssl/src/nsCERTValInParamWrapper.h
new file mode 100644
index 000000000000..6a7cdff30ad2
--- /dev/null
+++ b/security/manager/ssl/src/nsCERTValInParamWrapper.h
@@ -0,0 +1,102 @@
+/* ***** 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
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Kai Engert <kengert@redhat.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 _nsCERTValInParamWrapper_H
+#define _nsCERTValInParamWrapper_H
+
+#include "nsISupports.h"
+#include "cert.h"
+
+/*
+ * This is a wrapper around type
+ * CERTValInParam is a nested input parameter type for CERT_PKIXVerifyCert.
+ * The values inside this type depend on application preferences,
+ * as a consequence it's expensive to construct this object.
+ * (and we shall avoid to access prefs from secondary threads anyway).
+ * We want to create an instance of that input type once, and use as long as possible.
+ * Every time the preferences change, we will create a new default object.
+ *
+ * A race is possible between "verification function is active and object in use"
+ * and "must switch to new defaults".
+ *
+ * The global default object may be replaced at any time with a new object.
+ * The contents of inner CERTValInParam are supposed to be stable (const).
+ *
+ * In order to protect against the race, we use a reference counted wrapper.
+ * Each user of a foreign nsCERTValInParamWrapper object
+ * (e.g. the current global default object)
+ * must use nsRefPtr<nsCERTValInParamWrapper> = other-object
+ * prior to calling CERT_PKIXVerifyCert.
+ * 
+ * This guarantees the object will still be alive after the call,
+ * and if the default object has been replaced in the meantime,
+ * the reference counter will go to zero, and the old default
+ * object will get destroyed automatically.
+ */
+class nsCERTValInParamWrapper
+{
+ public:
+    NS_IMETHOD_(nsrefcnt) AddRef();
+    NS_IMETHOD_(nsrefcnt) Release();
+
+public:
+  nsCERTValInParamWrapper();
+  virtual ~nsCERTValInParamWrapper();
+
+  enum missing_cert_download_config { missing_cert_download_off = 0, missing_cert_download_on };
+  enum crl_download_config { crl_local_only = 0, crl_download_allowed };
+  enum ocsp_download_config { ocsp_off = 0, ocsp_on };
+  enum ocsp_strict_config { ocsp_relaxed = 0, ocsp_strict };
+  enum any_revo_fresh_config { any_revo_relaxed = 0, any_revo_strict };
+
+  nsresult Construct(missing_cert_download_config ac, crl_download_config cdc,
+                     ocsp_download_config odc, ocsp_strict_config osc,
+                     any_revo_fresh_config arfc,
+                     const char *firstNetworkRevocationMethod);
+
+private:
+  nsAutoRefCnt mRefCnt;
+  NS_DECL_OWNINGTHREAD
+  PRBool mAlreadyConstructed;
+  CERTValInParam *mCVIN;
+  CERTRevocationFlags *mRev;
+  
+public:
+  CERTValInParam *GetRawPointerForNSS() { return mCVIN; }
+};
+
+#endif
diff --git a/security/manager/ssl/src/nsCMS.cpp b/security/manager/ssl/src/nsCMS.cpp
index fd02751c0a82..70f2141ade89 100644
--- a/security/manager/ssl/src/nsCMS.cpp
+++ b/security/manager/ssl/src/nsCMS.cpp
@@ -46,6 +46,7 @@
 #include "nsIArray.h"
 #include "nsArrayUtils.h"
 #include "nsCertVerificationThread.h"
+#include "nsCERTValInParamWrapper.h"
 
 #include "prlog.h"
 #ifdef PR_LOGGING
@@ -53,6 +54,8 @@ extern PRLogModuleInfo* gPIPNSSLog;
 #endif
 
 #include "nsNSSCleaner.h"
+#include "nsNSSComponent.h"
+static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
 NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 
@@ -247,6 +250,8 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, PRUint3
   NSSCMSSignerInfo *si;
   PRInt32 nsigners;
   nsresult rv = NS_ERROR_FAILURE;
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsCOMPtr<nsINSSComponent> inss;
 
   if (!NSS_CMSMessage_IsSigned(m_cmsMsg)) {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - not signed\n"));
@@ -287,9 +292,10 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, PRUint3
   PR_ASSERT(nsigners > 0);
   si = NSS_CMSSignedData_GetSignerInfo(sigd, 0);
 
-
   // See bug 324474. We want to make sure the signing cert is 
   // still valid at the current time.
+
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), si->cert, PR_TRUE, 
                                 certificateUsageEmailSigner,
                                 si->cmsg->pwfn_arg, NULL) != SECSuccess) {
@@ -297,6 +303,28 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, PRUint3
     rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
     goto loser;
   }
+}
+else {
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
+  inss = do_GetService(kNSSComponentCID, &rv);
+  if (!inss) {
+    goto loser;
+  }
+
+  if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
+    goto loser;
+  }
+  rv = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
+                           survivingParams->GetRawPointerForNSS(),
+                           cvout, si->cmsg->pwfn_arg);
+  if (rv != SECSuccess) {
+    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+    rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
+    goto loser;
+  }
+}
 
   // We verify the first signer info,  only //
   if (NSS_CMSSignedData_VerifySignerInfo(sigd, 0, CERT_GetDefaultCertDB(), certUsageEmailSigner) != SECSuccess) {
diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp
index cdfbcce2705f..ea51a05a9609 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -75,6 +75,7 @@
 #include "ocsp.h"
 #include "nssb64.h"
 #include "secerr.h"
+#include "sslerr.h"
 
 using namespace mozilla;
 
@@ -958,6 +959,60 @@ void PR_CALLBACK HandshakeCallback(PRFileDesc* fd, void* client_data) {
   PR_Free(signer);
 }
 
+SECStatus
+PSM_SSL_PKIX_AuthCertificate(PRFileDesc *fd, CERTCertificate *peerCert, PRBool checksig, PRBool isServer)
+{
+    SECStatus          rv;
+    SECCertUsage       certUsage;
+    SECCertificateUsage certificateusage;
+    void *             pinarg;
+    char *             hostname;
+    
+    pinarg = SSL_RevealPinArg(fd);
+    hostname = SSL_RevealURL(fd);
+    
+    /* this may seem backwards, but isn't. */
+    certUsage = isServer ? certUsageSSLClient : certUsageSSLServer;
+    certificateusage = isServer ? certificateUsageSSLClient : certificateUsageSSLServer;
+
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), peerCert, checksig, certUsage,
+                            pinarg);
+}
+else {
+    nsresult nsrv;
+    nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+    if (!inss)
+      return SECFailure;
+    nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+    if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams)))
+      return SECFailure;
+
+    CERTValOutParam cvout[1];
+    cvout[0].type = cert_po_end;
+
+    rv = CERT_PKIXVerifyCert(peerCert, certificateusage,
+                             survivingParams->GetRawPointerForNSS(),
+                             cvout, pinarg);
+}
+
+    if ( rv == SECSuccess && isServer ) {
+        /* cert is OK.  This is the client side of an SSL connection.
+        * Now check the name field in the cert against the desired hostname.
+        * NB: This is our only defense against Man-In-The-Middle (MITM) attacks!
+        */
+        if (hostname && hostname[0])
+            rv = CERT_VerifyCertName(peerCert, hostname);
+        else
+            rv = SECFailure;
+        if (rv != SECSuccess)
+            PORT_SetError(SSL_ERROR_BAD_CERT_DOMAIN);
+    }
+        
+    PORT_Free(hostname);
+    return rv;
+}
+
 struct nsSerialBinaryBlacklistEntry
 {
   unsigned int len;
@@ -1025,8 +1080,7 @@ SECStatus PR_CALLBACK AuthCertificateCallback(void* client_data, PRFileDesc* fd,
     }
   }
   
-  // first the default action
-  SECStatus rv = SSL_AuthCertificate(CERT_GetDefaultCertDB(), fd, checksig, isServer);
+  SECStatus rv = PSM_SSL_PKIX_AuthCertificate(fd, serverCert, checksig, isServer);
 
   // We want to remember the CA certs in the temp db, so that the application can find the
   // complete chain at any time it might need it.
diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 491015fb524b..e7b22a7d9537 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -1289,6 +1289,15 @@ nsNSSCertificate::VerifyForUsage(PRUint32 usage, PRUint32 *verificationResult)
 
   NS_ENSURE_ARG(verificationResult);
 
+  nsresult nsrv;
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
+  
   SECCertificateUsage nss_usage;
   
   switch (usage)
@@ -1345,10 +1354,21 @@ nsNSSCertificate::VerifyForUsage(PRUint32 usage, PRUint32 *verificationResult)
       return NS_ERROR_FAILURE;
   }
 
+  SECStatus verify_result;
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
   CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
-
-  if (CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE, 
-                         nss_usage, NULL, NULL) == SECSuccess)
+  verify_result = CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE, 
+					    nss_usage, NULL, NULL);
+}
+else {
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+  verify_result = CERT_PKIXVerifyCert(mCert, nss_usage,
+				      survivingParams->GetRawPointerForNSS(),
+				      cvout, NULL);
+}
+  
+  if (verify_result == SECSuccess)
   {
     *verificationResult = VERIFIED_OK;
   }
@@ -1401,7 +1421,7 @@ nsNSSCertificate::VerifyForUsage(PRUint32 usage, PRUint32 *verificationResult)
 
 
 NS_IMETHODIMP
-nsNSSCertificate::GetUsagesArray(PRBool ignoreOcsp,
+nsNSSCertificate::GetUsagesArray(PRBool localOnly,
                                  PRUint32 *_verified,
                                  PRUint32 *_count,
                                  PRUnichar ***_usages)
@@ -1416,7 +1436,7 @@ nsNSSCertificate::GetUsagesArray(PRBool ignoreOcsp,
   const char *suffix = "";
   PRUint32 tmpCount;
   nsUsageArrayHelper uah(mCert);
-  rv = uah.GetUsagesArray(suffix, ignoreOcsp, max_usages, _verified, &tmpCount, tmpUsages);
+  rv = uah.GetUsagesArray(suffix, localOnly, max_usages, _verified, &tmpCount, tmpUsages);
   NS_ENSURE_SUCCESS(rv,rv);
   if (tmpCount > 0) {
     *_usages = (PRUnichar **)nsMemory::Alloc(sizeof(PRUnichar *) * tmpCount);
@@ -1456,7 +1476,7 @@ nsNSSCertificate::RequestUsagesArrayAsync(nsICertVerificationListener *aResultLi
 }
 
 NS_IMETHODIMP
-nsNSSCertificate::GetUsagesString(PRBool ignoreOcsp,
+nsNSSCertificate::GetUsagesString(PRBool localOnly,
                                   PRUint32   *_verified,
                                   nsAString &_usages)
 {
@@ -1470,7 +1490,7 @@ nsNSSCertificate::GetUsagesString(PRBool ignoreOcsp,
   const char *suffix = "_p";
   PRUint32 tmpCount;
   nsUsageArrayHelper uah(mCert);
-  rv = uah.GetUsagesArray(suffix, ignoreOcsp, max_usages, _verified, &tmpCount, tmpUsages);
+  rv = uah.GetUsagesArray(suffix, localOnly, max_usages, _verified, &tmpCount, tmpUsages);
   NS_ENSURE_SUCCESS(rv,rv);
   _usages.Truncate();
   for (PRUint32 i=0; i<tmpCount; i++) {
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index b58573607cef..5579ef2520ae 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -533,9 +533,18 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
   CERTCertListNode *node;
   PRTime now;
   SECCertUsage certusage;
+  SECCertificateUsage certificateusage;
   SECItem **rawArray;
   int numcerts;
   int i;
+  
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
  
   PRArenaPool *arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
   if (!arena)
@@ -549,6 +558,7 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
 
   certdb = CERT_GetDefaultCertDB();
   certusage = certUsageEmailRecipient;
+  certificateusage = certificateUsageEmailRecipient;
 
   numcerts = certCollection->numcerts;
 
@@ -591,6 +601,9 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
    * valid chains, then import them.
    */
   now = PR_Now();
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
@@ -601,10 +614,20 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
       continue;
     }
 
-    if (CERT_VerifyCert(certdb, node->cert, 
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    if (CERT_VerifyCert(certdb, node->cert,
         PR_TRUE, certusage, now, ctx, NULL) != SECSuccess) {
       alert_and_skip = true;
     }
+}
+else {
+    if (CERT_PKIXVerifyCert(node->cert, certificateusage,
+                            survivingParams->GetRawPointerForNSS(),
+                            cvout, ctx)
+        != SECSuccess) {
+      alert_and_skip = true;
+    }
+}
 
     CERTCertificateList *certChain = nsnull;
     CERTCertificateListCleaner chainCleaner(certChain);
@@ -774,6 +797,14 @@ nsresult
 nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfaceRequestor *ctx)
 {
   SECItem **rawArray;
+  nsresult nsrv;
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return nsrv;
 
   /* filter out the certs we don't want */
   SECStatus srv = CERT_FilterCertListByUsage(certList, certUsageAnyCA, PR_TRUE);
@@ -784,18 +815,30 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
   /* go down the remaining list of certs and verify that they have
    * valid chains, if yes, then import.
    */
-  PRTime now = PR_Now();
   CERTCertListNode *node;
+  CERTValOutParam cvout[1];
+  cvout[0].type = cert_po_end;
+
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node,certList);
        node = CERT_LIST_NEXT(node)) {
 
     bool alert_and_skip = false;
 
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
     if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert, 
-        PR_TRUE, certUsageVerifyCA, now, ctx, NULL) != SECSuccess) {
+        PR_TRUE, certUsageVerifyCA, PR_Now(), ctx, NULL) != SECSuccess) {
       alert_and_skip = true;
     }
+}
+else {
+    if (CERT_PKIXVerifyCert(node->cert, certificateUsageVerifyCA,
+                            survivingParams->GetRawPointerForNSS(),
+                            cvout, ctx)
+        != SECSuccess) {
+      alert_and_skip = true;
+    }
+}
 
     CERTCertificateList *certChain = nsnull;
     CERTCertificateListCleaner chainCleaner(certChain);
diff --git a/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp b/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
index 6f25a14438da..f731e1c18335 100644
--- a/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
@@ -284,7 +284,7 @@ nsNSSCertificateFakeTransport::VerifyForUsage(PRUint32 usage, PRUint32 *verifica
 }
 
 NS_IMETHODIMP
-nsNSSCertificateFakeTransport::GetUsagesArray(PRBool ignoreOcsp,
+nsNSSCertificateFakeTransport::GetUsagesArray(PRBool localOnly,
                                  PRUint32 *_verified,
                                  PRUint32 *_count,
                                  PRUnichar ***_usages)
@@ -301,7 +301,7 @@ nsNSSCertificateFakeTransport::RequestUsagesArrayAsync(nsICertVerificationListen
 }
 
 NS_IMETHODIMP
-nsNSSCertificateFakeTransport::GetUsagesString(PRBool ignoreOcsp,
+nsNSSCertificateFakeTransport::GetUsagesString(PRBool localOnly,
                                   PRUint32   *_verified,
                                   nsAString &_usages)
 {
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index d0b55cf8846b..a9462ccf12f4 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -117,6 +117,7 @@
 #include "base64.h"
 #include "secerr.h"
 #include "sslerr.h"
+#include "cert.h"
 
 #include "nsXULAppAPI.h"
 
@@ -139,6 +140,7 @@ PRLogModuleInfo* gPIPNSSLog = nsnull;
 
 static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 int nsNSSComponent::mInstanceCount = 0;
+PRBool nsNSSComponent::globalConstFlagUsePKIXVerification = PR_FALSE;
 
 // XXX tmp callback for slot password
 extern char * PR_CALLBACK 
@@ -147,7 +149,6 @@ pk11PasswordPrompt(PK11SlotInfo *slot, PRBool retry, void *arg);
 #define PIPNSS_STRBUNDLE_URL "chrome://pipnss/locale/pipnss.properties"
 #define NSSERR_STRBUNDLE_URL "chrome://pipnss/locale/nsserrors.properties"
 
-
 static PLHashNumber PR_CALLBACK certHashtable_keyHash(const void *key)
 {
   if (!key)
@@ -589,8 +590,6 @@ nsNSSComponent::DispatchEventToWindow(nsIDOMWindow *domWin,
 }
 
 
-static void setOCSPOptions(nsIPrefBranch * pref);
-
 NS_IMETHODIMP
 nsNSSComponent::PIPBundleFormatStringFromName(const char *name,
                                               const PRUnichar **params,
@@ -671,7 +670,6 @@ nsNSSComponent::GetNSSBundleString(const char *name,
   return rv;
 }
 
-
 NS_IMETHODIMP
 nsNSSComponent::SkipOcsp()
 {
@@ -685,7 +683,18 @@ nsNSSComponent::SkipOcsp()
 NS_IMETHODIMP
 nsNSSComponent::SkipOcspOff()
 {
-  setOCSPOptions(mPrefBranch);
+  nsNSSShutDownPreventionLock locker;
+  PRInt32 ocspEnabled;
+  if (NS_FAILED(mPrefBranch->GetIntPref("security.OCSP.enabled", &ocspEnabled)))
+    ocspEnabled = OCSP_ENABLED_DEFAULT;
+  // 0 = disabled, 1 = enabled, 
+  // 2 = enabled with given default responder
+  
+  setNonPkixOcspEnabled(ocspEnabled, mPrefBranch);
+
+  if (ocspEnabled)
+    SSL_ClearSessionCache();
+
   return NS_OK;
 }
 
@@ -1111,12 +1120,9 @@ nsresult nsNSSComponent::GetNSSCipherIDFromPrefString(const nsACString &aPrefStr
   return NS_ERROR_NOT_AVAILABLE;
 }
 
-static void setOCSPOptions(nsIPrefBranch * pref)
+static void
+setNonPkixOcspEnabled(PRInt32 ocspEnabled, nsIPrefBranch * pref)
 {
-  nsNSSShutDownPreventionLock locker;
-  // Set up OCSP //
-  PRInt32 ocspEnabled;
-  pref->GetIntPref("security.OCSP.enabled", &ocspEnabled);
   switch (ocspEnabled) {
   case 0:
     CERT_DisableOCSPChecking(CERT_GetDefaultCertDB());
@@ -1125,7 +1131,6 @@ static void setOCSPOptions(nsIPrefBranch * pref)
   case 1:
     CERT_EnableOCSPChecking(CERT_GetDefaultCertDB());
     CERT_DisableOCSPDefaultResponder(CERT_GetDefaultCertDB());
-    SSL_ClearSessionCache();
     break;
   case 2:
     {
@@ -1140,21 +1145,89 @@ static void setOCSPOptions(nsIPrefBranch * pref)
       CERT_EnableOCSPChecking(CERT_GetDefaultCertDB());
       CERT_SetOCSPDefaultResponder(CERT_GetDefaultCertDB(), url, signingCA);
       CERT_EnableOCSPDefaultResponder(CERT_GetDefaultCertDB());
-      SSL_ClearSessionCache();
 
       nsMemory::Free(signingCA);
       nsMemory::Free(url);
     }
     break;
   }
+}
+
+#define CRL_DOWNLOAD_DEFAULT PR_FALSE
+#define OCSP_ENABLED_DEFAULT 1
+#define OCSP_REQUIRED_DEFAULT 0
+#define FRESH_REVOCATION_REQUIRED_DEFAULT PR_FALSE
+#define MISSING_CERT_DOWNLOAD_DEFAULT PR_FALSE
+#define FIRST_REVO_METHOD_DEFAULT "ocsp"
+#define USE_NSS_LIBPKIX_DEFAULT PR_FALSE
+
+// Caller must hold a lock on nsNSSComponent::mutex when calling this function
+void nsNSSComponent::setValidationOptions(nsIPrefBranch * pref)
+{
+  nsNSSShutDownPreventionLock locker;
+  nsresult rv;
+
+  PRBool crlDownloading;
+  rv = pref->GetBoolPref("security.CRL_download.enabled", &crlDownloading);
+  if (NS_FAILED(rv))
+    crlDownloading = CRL_DOWNLOAD_DEFAULT;
+  
+  PRInt32 ocspEnabled;
+  rv = pref->GetIntPref("security.OCSP.enabled", &ocspEnabled);
+  // 0 = disabled, 1 = enabled, 
+  // 2 = enabled with given default responder
+  if (NS_FAILED(rv))
+    ocspEnabled = OCSP_ENABLED_DEFAULT;
+
   PRBool ocspRequired;
-  pref->GetBoolPref("security.OCSP.require", &ocspRequired);
-  if (ocspRequired) {
-    CERT_SetOCSPFailureMode(ocspMode_FailureIsVerificationFailure);
-  }
-  else {
-    CERT_SetOCSPFailureMode(ocspMode_FailureIsNotAVerificationFailure);
+  rv = pref->GetBoolPref("security.OCSP.require", &ocspRequired);
+  if (NS_FAILED(rv))
+    ocspRequired = OCSP_REQUIRED_DEFAULT;
+
+  PRBool anyFreshRequired;
+  rv = pref->GetBoolPref("security.fresh_revocation_info.require", &anyFreshRequired);
+  if (NS_FAILED(rv))
+    anyFreshRequired = FRESH_REVOCATION_REQUIRED_DEFAULT;
+  
+  PRBool aiaDownloadEnabled;
+  rv = pref->GetBoolPref("security.missing_cert_download.enabled", &aiaDownloadEnabled);
+  if (NS_FAILED(rv))
+    aiaDownloadEnabled = MISSING_CERT_DOWNLOAD_DEFAULT;
+
+  nsCString firstNetworkRevo;
+  rv = pref->GetCharPref("security.first_network_revocation_method", getter_Copies(firstNetworkRevo));
+  if (NS_FAILED(rv))
+    firstNetworkRevo = FIRST_REVO_METHOD_DEFAULT;
+  
+  setNonPkixOcspEnabled(ocspEnabled, pref);
+  
+  CERT_SetOCSPFailureMode( ocspRequired ?
+                           ocspMode_FailureIsVerificationFailure
+                           : ocspMode_FailureIsNotAVerificationFailure);
+
+  nsRefPtr<nsCERTValInParamWrapper> newCVIN = new nsCERTValInParamWrapper;
+  if (NS_SUCCEEDED(newCVIN->Construct(
+      aiaDownloadEnabled ? 
+        nsCERTValInParamWrapper::missing_cert_download_on : nsCERTValInParamWrapper::missing_cert_download_off,
+      crlDownloading ?
+        nsCERTValInParamWrapper::crl_download_allowed : nsCERTValInParamWrapper::crl_local_only,
+      ocspEnabled ? 
+        nsCERTValInParamWrapper::ocsp_on : nsCERTValInParamWrapper::ocsp_off,
+      ocspRequired ? 
+        nsCERTValInParamWrapper::ocsp_strict : nsCERTValInParamWrapper::ocsp_relaxed,
+      anyFreshRequired ?
+        nsCERTValInParamWrapper::any_revo_strict : nsCERTValInParamWrapper::any_revo_relaxed,
+      firstNetworkRevo.get()))) {
+    // Swap to new defaults, and will cause the old defaults to be released,
+    // as soon as any concurrent use of the old default objects has finished.
+    mDefaultCERTValInParam = newCVIN;
   }
+
+  /*
+    * The new defaults might change the validity of already established SSL sessions,
+    * let's not reuse them.
+    */
+  SSL_ClearSessionCache();
 }
 
 nsresult
@@ -1642,6 +1715,10 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
     TryCFM2MachOMigration(cfmSecurityPath, profilePath);
   #endif
 
+    rv = mPrefBranch->GetBoolPref("security.use_libpkix_verification", &globalConstFlagUsePKIXVerification);
+    if (NS_FAILED(rv))
+      globalConstFlagUsePKIXVerification = USE_NSS_LIBPKIX_DEFAULT;
+
     PRBool supress_warning_preference = PR_FALSE;
     rv = mPrefBranch->GetBoolPref("security.suppress_nss_rw_impossible_warning", &supress_warning_preference);
 
@@ -1767,8 +1844,23 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
       SEC_PKCS12SetPreferredCipher(PKCS12_DES_EDE3_168, 1);
       PORT_SetUCS2_ASCIIConversionFunction(pip_ucs2_ascii_conversion_fn);
 
-      // Set up OCSP //
-      setOCSPOptions(mPrefBranch);
+      // dynamic options from prefs
+      setValidationOptions(mPrefBranch);
+
+      // static validation options for usagesarray - do not hit the network
+      mDefaultCERTValInParamLocalOnly = new nsCERTValInParamWrapper;
+      rv = mDefaultCERTValInParamLocalOnly->Construct(
+          nsCERTValInParamWrapper::missing_cert_download_off,
+          nsCERTValInParamWrapper::crl_local_only,
+          nsCERTValInParamWrapper::ocsp_off,
+          nsCERTValInParamWrapper::ocsp_relaxed,
+          nsCERTValInParamWrapper::any_revo_relaxed,
+	  "ocsp");
+      if (NS_FAILED(rv)) {
+	nsPSMInitPanic::SetPanic();
+	return rv;
+      }
+      
       RegisterMyOCSPAIAInfoCallback();
 
       mHttpForNSS.initTable();
@@ -2273,8 +2365,13 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic,
       SSL_OptionSetDefault(SSL_ENABLE_FALSE_START, enabled);
 #endif
     } else if (prefName.Equals("security.OCSP.enabled")
+               || prefName.Equals("security.CRL_download.enabled")
+               || prefName.Equals("security.fresh_revocation_info.require")
+               || prefName.Equals("security.missing_cert_download.enabled")
+	       || prefName.Equals("security.first_network_revocation_method")
                || prefName.Equals("security.OCSP.require")) {
-      setOCSPOptions(mPrefBranch);
+      MutexAutoLock lock(mutex);
+      setValidationOptions(mPrefBranch);
     } else {
       /* Look through the cipher table and set according to pref setting */
       for (CipherPref* cp = CipherPrefs; cp->pref; ++cp) {
@@ -2561,6 +2658,26 @@ nsNSSComponent::IsNSSInitialized(PRBool *initialized)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsNSSComponent::GetDefaultCERTValInParam(nsRefPtr<nsCERTValInParamWrapper> &out)
+{
+  MutexAutoLock lock(mutex);
+  if (!mNSSInitialized)
+      return NS_ERROR_NOT_INITIALIZED;
+  out = mDefaultCERTValInParam;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::GetDefaultCERTValInParamLocalOnly(nsRefPtr<nsCERTValInParamWrapper> &out)
+{
+  MutexAutoLock lock(mutex);
+  if (!mNSSInitialized)
+      return NS_ERROR_NOT_INITIALIZED;
+  out = mDefaultCERTValInParamLocalOnly;
+  return NS_OK;
+}
+
 //---------------------------------------------
 // Implementing nsICryptoHash
 //---------------------------------------------
diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/src/nsNSSComponent.h
index 1bf3955a0ca9..17d0b9cc350e 100644
--- a/security/manager/ssl/src/nsNSSComponent.h
+++ b/security/manager/ssl/src/nsNSSComponent.h
@@ -71,6 +71,7 @@
 
 #include "nsNSSHelper.h"
 #include "nsClientAuthRemember.h"
+#include "nsCERTValInParamWrapper.h"
 
 #define NS_NSSCOMPONENT_CID \
 {0xa277189c, 0x1dd1, 0x11b2, {0xa8, 0xc9, 0xe4, 0xe8, 0xbf, 0xb1, 0x33, 0x8e}}
@@ -141,6 +142,8 @@ protected:
   nsresult handleContentDownloadError(nsresult errCode);
 };
 
+class nsNSSComponent;
+
 class NS_NO_VTABLE nsINSSComponent : public nsISupports {
  public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_INSSCOMPONENT_IID)
@@ -190,6 +193,9 @@ class NS_NO_VTABLE nsINSSComponent : public nsISupports {
   NS_IMETHOD EnsureIdentityInfoLoaded() = 0;
 
   NS_IMETHOD IsNSSInitialized(PRBool *initialized) = 0;
+
+  NS_IMETHOD GetDefaultCERTValInParam(nsRefPtr<nsCERTValInParamWrapper> &out) = 0;
+  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(nsRefPtr<nsCERTValInParamWrapper> &out) = 0;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsINSSComponent, NS_INSSCOMPONENT_IID)
@@ -287,6 +293,8 @@ public:
   NS_IMETHOD EnsureIdentityInfoLoaded();
   NS_IMETHOD IsNSSInitialized(PRBool *initialized);
 
+  NS_IMETHOD GetDefaultCERTValInParam(nsRefPtr<nsCERTValInParamWrapper> &out);
+  NS_IMETHOD GetDefaultCERTValInParamLocalOnly(nsRefPtr<nsCERTValInParamWrapper> &out);
 private:
 
   nsresult InitializeNSS(PRBool showWarningBox);
@@ -309,6 +317,7 @@ private:
   void LaunchSmartCardThreads();
   void ShutdownSmartCardThreads();
   void CleanupIdentityInfo();
+  void setValidationOptions(nsIPrefBranch * pref);
   nsresult InitializePIPNSSBundle();
   nsresult ConfigureInternalPKCS11Token();
   nsresult RegisterPSMContentListener();
@@ -352,9 +361,14 @@ private:
   nsCertVerificationThread *mCertVerificationThread;
   nsNSSHttpInterface mHttpForNSS;
   nsRefPtr<nsClientAuthRememberService> mClientAuthRememberService;
+  nsRefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParam;
+  nsRefPtr<nsCERTValInParamWrapper> mDefaultCERTValInParamLocalOnly;
 
   static PRStatus PR_CALLBACK IdentityInfoInit(void);
   PRCallOnceType mIdentityInfoCallOnce;
+
+public:
+  static PRBool globalConstFlagUsePKIXVerification;
 };
 
 class PSMContentListener : public nsIURIContentListener,
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 6f7615523a1d..5bc7ca1693fd 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -116,6 +116,8 @@ NSSCleanupAutoPtrClass(char, PL_strfree)
 NSSCleanupAutoPtrClass(void, PR_FREEIF)
 NSSCleanupAutoPtrClass_WithParam(PRArenaPool, PORT_FreeArena, FalseParam, PR_FALSE)
 
+static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
 /* SSM_UserCertChoice: enum for cert choice info */
 typedef enum {ASK, AUTO} SSM_UserCertChoice;
 
@@ -3377,6 +3379,14 @@ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
   PRErrorCode errorCodeMismatch = SECSuccess;
   PRErrorCode errorCodeExpired = SECSuccess;
 
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return cancel_and_failure(infoObject);
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  if (NS_FAILED(nsrv))
+    return cancel_and_failure(infoObject);
+  
   char *hostname = SSL_RevealURL(sslSocket);
   if (!hostname)
     return cancel_and_failure(infoObject);
@@ -3415,10 +3425,22 @@ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
 
     verify_log->arena = log_arena;
 
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
     srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), peerCert,
                                  PR_TRUE, certificateUsageSSLServer,
                                  PR_Now(), (void*)infoObject, 
                                  verify_log, NULL);
+}
+else {
+    CERTValOutParam cvout[2];
+    cvout[0].type = cert_po_errorLog;
+    cvout[0].value.pointer.log = verify_log;
+    cvout[1].type = cert_po_end;
+
+    srv = CERT_PKIXVerifyCert(peerCert, certificateUsageSSLServer,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, (void*)infoObject);
+}
 
     // We ignore the result code of the cert verification.
     // Either it is a failure, which is expected, and we'll process the
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index 968cab5bedd9..3f93dadc2e2c 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -152,7 +152,7 @@ nsUsageArrayHelper::verifyFailed(PRUint32 *_verified, int err)
 
 nsresult
 nsUsageArrayHelper::GetUsagesArray(const char *suffix,
-                      PRBool ignoreOcsp,
+                      PRBool localOnly,
                       PRUint32 outArraySize,
                       PRUint32 *_verified,
                       PRUint32 *_count,
@@ -167,7 +167,7 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
 
   nsCOMPtr<nsINSSComponent> nssComponent;
 
-  if (ignoreOcsp) {
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly) {
     nsresult rv;
     nssComponent = do_GetService(kNSSComponentCID, &rv);
     if (NS_FAILED(rv))
@@ -177,12 +177,15 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
       nssComponent->SkipOcsp();
     }
   }
-
+  
   PRUint32 &count = *_count;
   count = 0;
-  SECCertificateUsage usages;
-  
-  CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE, 
+  SECCertificateUsage usages = 0;
+  SECStatus verifyResult;
+
+if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+  verifyResult =
+  CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE,
 			    certificateUsageSSLClient |
 			    certificateUsageSSLServer |
 			    certificateUsageSSLServerWithStepUp |
@@ -192,7 +195,39 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
 			    certificateUsageSSLCA |
 			    certificateUsageStatusResponder,
 			    NULL, &usages);
-  int err = PR_GetError();
+}
+else {
+  nsresult nsrv;
+  nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+  if (!inss)
+    return nsrv;
+  nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+  if (localOnly)
+    nsrv = inss->GetDefaultCERTValInParamLocalOnly(survivingParams);
+  else
+    nsrv = inss->GetDefaultCERTValInParam(survivingParams);
+  
+  if (NS_FAILED(nsrv))
+    return nsrv;
+
+  CERTValOutParam cvout[2];
+  cvout[0].type = cert_po_usages;
+  cvout[0].value.scalar.usages = 0;
+  cvout[1].type = cert_po_end;
+  
+  verifyResult =
+  CERT_PKIXVerifyCert(mCert, certificateUsageCheckAllUsages,
+		      survivingParams->GetRawPointerForNSS(),
+		      cvout, NULL);
+
+  usages = cvout[0].value.scalar.usages;
+}
+
+  if (verifyResult != SECSuccess) {
+    int err = PR_GetError();
+    verifyFailed(_verified, err);
+    return NS_OK;
+  }
 
   // The following list of checks must be < max_returned_out_array_size
   
@@ -215,14 +250,10 @@ nsUsageArrayHelper::GetUsagesArray(const char *suffix,
   check(suffix, usages & certificateUsageAnyCA, count, outUsages);
 #endif
 
-  if (ignoreOcsp && nssComponent) {
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification && localOnly && nssComponent) {
     nssComponent->SkipOcspOff();
   }
 
-  if (count == 0) {
-    verifyFailed(_verified, err);
-  } else {
-    *_verified = nsNSSCertificate::VERIFIED_OK;
-  }
+  *_verified = nsNSSCertificate::VERIFIED_OK;
   return NS_OK;
 }
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.h b/security/manager/ssl/src/nsUsageArrayHelper.h
index dce44f10fd99..d6df85ecd914 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.h
+++ b/security/manager/ssl/src/nsUsageArrayHelper.h
@@ -48,7 +48,7 @@ public:
   nsUsageArrayHelper(CERTCertificate *aCert);
 
   nsresult GetUsagesArray(const char *suffix,
-               PRBool ignoreOcsp,
+               PRBool localOnly,
                PRUint32 outArraySize,
                PRUint32 *_verified,
                PRUint32 *_count,

From 571a5e9fc7b8fc89b97e752b5845d5abb465600a Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 22:41:40 +0200
Subject: [PATCH 256/314] Bug 479393, move two functions within the file, no
 code change, rs=me

---
 security/manager/ssl/src/nsNSSComponent.cpp | 56 ++++++++++-----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index a9462ccf12f4..862c60f9ae43 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -670,34 +670,6 @@ nsNSSComponent::GetNSSBundleString(const char *name,
   return rv;
 }
 
-NS_IMETHODIMP
-nsNSSComponent::SkipOcsp()
-{
-  nsNSSShutDownPreventionLock locker;
-  CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
-
-  SECStatus rv = CERT_DisableOCSPChecking(certdb);
-  return (rv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsNSSComponent::SkipOcspOff()
-{
-  nsNSSShutDownPreventionLock locker;
-  PRInt32 ocspEnabled;
-  if (NS_FAILED(mPrefBranch->GetIntPref("security.OCSP.enabled", &ocspEnabled)))
-    ocspEnabled = OCSP_ENABLED_DEFAULT;
-  // 0 = disabled, 1 = enabled, 
-  // 2 = enabled with given default responder
-  
-  setNonPkixOcspEnabled(ocspEnabled, mPrefBranch);
-
-  if (ocspEnabled)
-    SSL_ClearSessionCache();
-
-  return NS_OK;
-}
-
 void
 nsNSSComponent::LaunchSmartCardThreads()
 {
@@ -1230,6 +1202,34 @@ void nsNSSComponent::setValidationOptions(nsIPrefBranch * pref)
   SSL_ClearSessionCache();
 }
 
+NS_IMETHODIMP
+nsNSSComponent::SkipOcsp()
+{
+  nsNSSShutDownPreventionLock locker;
+  CERTCertDBHandle *certdb = CERT_GetDefaultCertDB();
+
+  SECStatus rv = CERT_DisableOCSPChecking(certdb);
+  return (rv == SECSuccess) ? NS_OK : NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsNSSComponent::SkipOcspOff()
+{
+  nsNSSShutDownPreventionLock locker;
+  PRInt32 ocspEnabled;
+  if (NS_FAILED(mPrefBranch->GetIntPref("security.OCSP.enabled", &ocspEnabled)))
+    ocspEnabled = OCSP_ENABLED_DEFAULT;
+  // 0 = disabled, 1 = enabled, 
+  // 2 = enabled with given default responder
+  
+  setNonPkixOcspEnabled(ocspEnabled, mPrefBranch);
+
+  if (ocspEnabled)
+    SSL_ClearSessionCache();
+
+  return NS_OK;
+}
+
 nsresult
 nsNSSComponent::PostCRLImportEvent(const nsCSubstring &urlString,
                                    nsIStreamListener *listener)

From 13c3ba68f26bfdfad012983b49f62a6081f23901 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 22:41:40 +0200
Subject: [PATCH 257/314] Bug 479393, fix whitespace, no code changes, rs=me

---
 security/manager/ssl/src/nsCMS.cpp            | 52 +++++++++----------
 security/manager/ssl/src/nsNSSCallbacks.cpp   | 36 ++++++-------
 security/manager/ssl/src/nsNSSCertificate.cpp | 24 ++++-----
 .../manager/ssl/src/nsNSSCertificateDB.cpp    | 48 ++++++++---------
 security/manager/ssl/src/nsNSSComponent.cpp   |  8 +--
 security/manager/ssl/src/nsNSSIOLayer.cpp     | 30 +++++------
 .../manager/ssl/src/nsUsageArrayHelper.cpp    |  4 +-
 7 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/security/manager/ssl/src/nsCMS.cpp b/security/manager/ssl/src/nsCMS.cpp
index 70f2141ade89..79079cd35e20 100644
--- a/security/manager/ssl/src/nsCMS.cpp
+++ b/security/manager/ssl/src/nsCMS.cpp
@@ -295,36 +295,36 @@ nsresult nsCMSMessage::CommonVerifySignature(unsigned char* aDigestData, PRUint3
   // See bug 324474. We want to make sure the signing cert is 
   // still valid at the current time.
 
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-  if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), si->cert, PR_TRUE, 
-                                certificateUsageEmailSigner,
-                                si->cmsg->pwfn_arg, NULL) != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
-    rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
-    goto loser;
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    if (CERT_VerifyCertificateNow(CERT_GetDefaultCertDB(), si->cert, PR_TRUE, 
+                                  certificateUsageEmailSigner,
+                                  si->cmsg->pwfn_arg, NULL) != SECSuccess) {
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+      rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
+      goto loser;
+    }
   }
-}
-else {
-  CERTValOutParam cvout[1];
-  cvout[0].type = cert_po_end;
+  else {
+    CERTValOutParam cvout[1];
+    cvout[0].type = cert_po_end;
 
-  inss = do_GetService(kNSSComponentCID, &rv);
-  if (!inss) {
-    goto loser;
-  }
+    inss = do_GetService(kNSSComponentCID, &rv);
+    if (!inss) {
+      goto loser;
+    }
 
-  if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
-    goto loser;
+    if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams))) {
+      goto loser;
+    }
+    rv = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
+			    survivingParams->GetRawPointerForNSS(),
+			    cvout, si->cmsg->pwfn_arg);
+    if (rv != SECSuccess) {
+      PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
+      rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
+      goto loser;
+    }
   }
-  rv = CERT_PKIXVerifyCert(si->cert, certificateUsageEmailSigner,
-                           survivingParams->GetRawPointerForNSS(),
-                           cvout, si->cmsg->pwfn_arg);
-  if (rv != SECSuccess) {
-    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSMessage::CommonVerifySignature - signing cert not trusted now\n"));
-    rv = NS_ERROR_CMS_VERIFY_UNTRUSTED;
-    goto loser;
-  }
-}
 
   // We verify the first signer info,  only //
   if (NSS_CMSSignedData_VerifySignerInfo(sigd, 0, CERT_GetDefaultCertDB(), certUsageEmailSigner) != SECSuccess) {
diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp
index ea51a05a9609..86b30b895d3d 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -975,26 +975,26 @@ PSM_SSL_PKIX_AuthCertificate(PRFileDesc *fd, CERTCertificate *peerCert, PRBool c
     certUsage = isServer ? certUsageSSLClient : certUsageSSLServer;
     certificateusage = isServer ? certificateUsageSSLClient : certificateUsageSSLServer;
 
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), peerCert, checksig, certUsage,
-                            pinarg);
-}
-else {
-    nsresult nsrv;
-    nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
-    if (!inss)
-      return SECFailure;
-    nsRefPtr<nsCERTValInParamWrapper> survivingParams;
-    if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams)))
-      return SECFailure;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+        rv = CERT_VerifyCertNow(CERT_GetDefaultCertDB(), peerCert, checksig, certUsage,
+                                pinarg);
+    }
+    else {
+        nsresult nsrv;
+        nsCOMPtr<nsINSSComponent> inss = do_GetService(kNSSComponentCID, &nsrv);
+        if (!inss)
+          return SECFailure;
+        nsRefPtr<nsCERTValInParamWrapper> survivingParams;
+        if (NS_FAILED(inss->GetDefaultCERTValInParam(survivingParams)))
+          return SECFailure;
 
-    CERTValOutParam cvout[1];
-    cvout[0].type = cert_po_end;
+        CERTValOutParam cvout[1];
+        cvout[0].type = cert_po_end;
 
-    rv = CERT_PKIXVerifyCert(peerCert, certificateusage,
-                             survivingParams->GetRawPointerForNSS(),
-                             cvout, pinarg);
-}
+        rv = CERT_PKIXVerifyCert(peerCert, certificateusage,
+                                survivingParams->GetRawPointerForNSS(),
+                                cvout, pinarg);
+    }
 
     if ( rv == SECSuccess && isServer ) {
         /* cert is OK.  This is the client side of an SSL connection.
diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index e7b22a7d9537..1051ec1b30ff 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/security/manager/ssl/src/nsNSSCertificate.cpp
@@ -1355,18 +1355,18 @@ nsNSSCertificate::VerifyForUsage(PRUint32 usage, PRUint32 *verificationResult)
   }
 
   SECStatus verify_result;
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-  CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
-  verify_result = CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE, 
-					    nss_usage, NULL, NULL);
-}
-else {
-  CERTValOutParam cvout[1];
-  cvout[0].type = cert_po_end;
-  verify_result = CERT_PKIXVerifyCert(mCert, nss_usage,
-				      survivingParams->GetRawPointerForNSS(),
-				      cvout, NULL);
-}
+  if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+    CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
+    verify_result = CERT_VerifyCertificateNow(defaultcertdb, mCert, PR_TRUE, 
+                                              nss_usage, NULL, NULL);
+  }
+  else {
+    CERTValOutParam cvout[1];
+    cvout[0].type = cert_po_end;
+    verify_result = CERT_PKIXVerifyCert(mCert, nss_usage,
+                                        survivingParams->GetRawPointerForNSS(),
+                                        cvout, NULL);
+  }
   
   if (verify_result == SECSuccess)
   {
diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index 5579ef2520ae..dada28dc7a7c 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -614,20 +614,20 @@ nsNSSCertificateDB::ImportEmailCertificate(PRUint8 * data, PRUint32 length,
       continue;
     }
 
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    if (CERT_VerifyCert(certdb, node->cert,
-        PR_TRUE, certusage, now, ctx, NULL) != SECSuccess) {
-      alert_and_skip = true;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      if (CERT_VerifyCert(certdb, node->cert,
+          PR_TRUE, certusage, now, ctx, NULL) != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
-}
-else {
-    if (CERT_PKIXVerifyCert(node->cert, certificateusage,
-                            survivingParams->GetRawPointerForNSS(),
-                            cvout, ctx)
-        != SECSuccess) {
-      alert_and_skip = true;
+    else {
+      if (CERT_PKIXVerifyCert(node->cert, certificateusage,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, ctx)
+          != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
-}
 
     CERTCertificateList *certChain = nsnull;
     CERTCertificateListCleaner chainCleaner(certChain);
@@ -825,20 +825,20 @@ nsNSSCertificateDB::ImportValidCACertsInList(CERTCertList *certList, nsIInterfac
 
     bool alert_and_skip = false;
 
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert, 
-        PR_TRUE, certUsageVerifyCA, PR_Now(), ctx, NULL) != SECSuccess) {
-      alert_and_skip = true;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      if (CERT_VerifyCert(CERT_GetDefaultCertDB(), node->cert, 
+          PR_TRUE, certUsageVerifyCA, PR_Now(), ctx, NULL) != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
-}
-else {
-    if (CERT_PKIXVerifyCert(node->cert, certificateUsageVerifyCA,
-                            survivingParams->GetRawPointerForNSS(),
-                            cvout, ctx)
-        != SECSuccess) {
-      alert_and_skip = true;
+    else {
+      if (CERT_PKIXVerifyCert(node->cert, certificateUsageVerifyCA,
+                              survivingParams->GetRawPointerForNSS(),
+                              cvout, ctx)
+          != SECSuccess) {
+        alert_and_skip = true;
+      }
     }
-}
 
     CERTCertificateList *certChain = nsnull;
     CERTCertificateListCleaner chainCleaner(certChain);
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
index 862c60f9ae43..99af07f45b0d 100644
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -1855,10 +1855,10 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
           nsCERTValInParamWrapper::ocsp_off,
           nsCERTValInParamWrapper::ocsp_relaxed,
           nsCERTValInParamWrapper::any_revo_relaxed,
-	  "ocsp");
+          FIRST_REVO_METHOD_DEFAULT);
       if (NS_FAILED(rv)) {
-	nsPSMInitPanic::SetPanic();
-	return rv;
+        nsPSMInitPanic::SetPanic();
+        return rv;
       }
       
       RegisterMyOCSPAIAInfoCallback();
@@ -2368,7 +2368,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const char *aTopic,
                || prefName.Equals("security.CRL_download.enabled")
                || prefName.Equals("security.fresh_revocation_info.require")
                || prefName.Equals("security.missing_cert_download.enabled")
-	       || prefName.Equals("security.first_network_revocation_method")
+               || prefName.Equals("security.first_network_revocation_method")
                || prefName.Equals("security.OCSP.require")) {
       MutexAutoLock lock(mutex);
       setValidationOptions(mPrefBranch);
diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
index 5bc7ca1693fd..c89030d74b37 100644
--- a/security/manager/ssl/src/nsNSSIOLayer.cpp
+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
@@ -3425,22 +3425,22 @@ nsNSSBadCertHandler(void *arg, PRFileDesc *sslSocket)
 
     verify_log->arena = log_arena;
 
-if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
-    srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), peerCert,
-                                 PR_TRUE, certificateUsageSSLServer,
-                                 PR_Now(), (void*)infoObject, 
-                                 verify_log, NULL);
-}
-else {
-    CERTValOutParam cvout[2];
-    cvout[0].type = cert_po_errorLog;
-    cvout[0].value.pointer.log = verify_log;
-    cvout[1].type = cert_po_end;
+    if (!nsNSSComponent::globalConstFlagUsePKIXVerification) {
+      srv = CERT_VerifyCertificate(CERT_GetDefaultCertDB(), peerCert,
+                                  PR_TRUE, certificateUsageSSLServer,
+                                  PR_Now(), (void*)infoObject, 
+                                  verify_log, NULL);
+    }
+    else {
+      CERTValOutParam cvout[2];
+      cvout[0].type = cert_po_errorLog;
+      cvout[0].value.pointer.log = verify_log;
+      cvout[1].type = cert_po_end;
 
-    srv = CERT_PKIXVerifyCert(peerCert, certificateUsageSSLServer,
-                              survivingParams->GetRawPointerForNSS(),
-                              cvout, (void*)infoObject);
-}
+      srv = CERT_PKIXVerifyCert(peerCert, certificateUsageSSLServer,
+                                survivingParams->GetRawPointerForNSS(),
+                                cvout, (void*)infoObject);
+    }
 
     // We ignore the result code of the cert verification.
     // Either it is a failure, which is expected, and we'll process the
diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/src/nsUsageArrayHelper.cpp
index 3f93dadc2e2c..94ddd7bcd549 100644
--- a/security/manager/ssl/src/nsUsageArrayHelper.cpp
+++ b/security/manager/ssl/src/nsUsageArrayHelper.cpp
@@ -217,8 +217,8 @@ else {
   
   verifyResult =
   CERT_PKIXVerifyCert(mCert, certificateUsageCheckAllUsages,
-		      survivingParams->GetRawPointerForNSS(),
-		      cvout, NULL);
+                      survivingParams->GetRawPointerForNSS(),
+                      cvout, NULL);
 
   usages = cvout[0].value.scalar.usages;
 }

From 8ef2432de5ffca7d05a0cd7d9ed300bfa5c3e43b Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Thu, 5 May 2011 22:41:40 +0200
Subject: [PATCH 258/314] Bug 479393, incremental patch to fix if condition,
 r=bsmith

---
 security/manager/ssl/src/nsNSSCallbacks.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/src/nsNSSCallbacks.cpp
index 86b30b895d3d..33cab2fa2586 100644
--- a/security/manager/ssl/src/nsNSSCallbacks.cpp
+++ b/security/manager/ssl/src/nsNSSCallbacks.cpp
@@ -996,7 +996,7 @@ PSM_SSL_PKIX_AuthCertificate(PRFileDesc *fd, CERTCertificate *peerCert, PRBool c
                                 cvout, pinarg);
     }
 
-    if ( rv == SECSuccess && isServer ) {
+    if ( rv == SECSuccess && !isServer ) {
         /* cert is OK.  This is the client side of an SSL connection.
         * Now check the name field in the cert against the desired hostname.
         * NB: This is our only defense against Man-In-The-Middle (MITM) attacks!

From d2feafa0a4f4360c4d966b01aa1140e3c8b9f1d0 Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Thu, 5 May 2011 16:50:19 -0400
Subject: [PATCH 259/314] Bug 650390 - osversion in chrome.manifest files
 should query android os version [r=dtownsend]

---
 xpcom/components/ManifestParser.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index 372c01d2cbc3..adc263987857 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -49,6 +49,10 @@
 #include <gtk/gtk.h>
 #endif
 
+#ifdef ANDROID
+#include "AndroidBridge.h"
+#endif
+
 #include "mozilla/Services.h"
 
 #include "nsConsoleMessage.h"
@@ -485,6 +489,10 @@ ParseManifestCommon(NSLocationType aType, nsILocalFile* aFile,
   nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
                                        gtk_major_version,
                                        gtk_minor_version);
+#elif defined(ANDROID)
+  if (mozilla::AndroidBridge::Bridge()) {
+    mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
+  }
 #endif
 
   // Because contracts must be registered after CIDs, we save and process them

From 38885cf314c3899140c623ed891626512749ef2d Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 14:21:38 -0700
Subject: [PATCH 260/314] Back out changeset 1defe29fdf3c, ffe31dc2d27f,
 54bacc404a6f, 16772cb4a781, c169c3b8dfb2, 94f06945b818, 6a2724d755f3 for test
 failure.

---
 build/binary-location.mk                      |  4 -
 mobile/chrome/content/browser.js              | 31 ++++----
 mobile/chrome/content/content.js              |  3 +-
 mobile/chrome/tests/Makefile.in               |  2 +-
 .../addons/browser_install1_1/install.rdf     |  2 +-
 .../addons/browser_install1_3/install.rdf     |  2 +-
 mobile/chrome/tests/browser_addons.js         |  2 +-
 mobile/chrome/tests/browser_formsZoom.js      |  2 +
 mobile/chrome/tests/browser_history.js        |  2 +-
 mobile/chrome/tests/browser_install.xml       |  4 +-
 mobile/chrome/tests/browser_navigation.js     |  1 +
 mobile/chrome/tests/browser_scroll.js         |  3 +-
 mobile/chrome/tests/browser_scrollbar.js      |  1 +
 mobile/chrome/tests/browser_thumbnails.js     |  1 +
 mobile/chrome/tests/browser_title.sjs         |  4 +-
 mobile/chrome/tests/browser_upgrade.rdf       |  2 +-
 mobile/chrome/tests/browser_viewport.js       |  1 +
 mobile/chrome/tests/head.js                   |  2 +-
 security/manager/Makefile.in                  | 24 +++++-
 xulrunner/Makefile.in                         |  2 +-
 xulrunner/app/Makefile.in                     |  8 +-
 xulrunner/app/nsXULRunnerApp.cpp              | 10 ++-
 xulrunner/stub/Makefile.in                    |  6 +-
 xulrunner/stub/nsXULStub.cpp                  | 77 ++++++++++++++++++-
 xulrunner/tools/redit/Makefile.in             |  8 ++
 25 files changed, 162 insertions(+), 42 deletions(-)

diff --git a/build/binary-location.mk b/build/binary-location.mk
index aae6c249383d..81e46f3d7bd1 100644
--- a/build/binary-location.mk
+++ b/build/binary-location.mk
@@ -40,12 +40,8 @@
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 else
-ifeq ($(MOZ_BUILD_APP),mobile)
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
-endif
 
 TARGET_DIST = $(TARGET_DEPTH)/dist
 
diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 26773f810fae..296975c1e0cd 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -362,7 +362,6 @@ var Browser = {
     }
 
     messageManager.addMessageListener("Browser:ViewportMetadata", this);
-    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
     messageManager.addMessageListener("Browser:FormSubmit", this);
     messageManager.addMessageListener("Browser:KeyPress", this);
     messageManager.addMessageListener("Browser:ZoomToPoint:Return", this);
@@ -1134,19 +1133,14 @@ var Browser = {
     let browser = aMessage.target;
 
     switch (aMessage.name) {
-      case "Browser:ViewportMetadata": {
+      case "Browser:ViewportMetadata":
         let tab = this.getTabForBrowser(browser);
         // Some browser such as iframes loaded dynamically into the chrome UI
         // does not have any assigned tab
         if (tab)
           tab.updateViewportMetadata(json);
         break;
-      }
-      case "Browser:CanCaptureMouse:Return": {
-        let tab = this.getTabForBrowser(browser);
-        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
-        break;
-      }
+
       case "Browser:FormSubmit":
         browser.lastLocation = null;
         break;
@@ -1547,7 +1541,7 @@ Browser.WebProgress.prototype = {
       aTab.updateThumbnail();
 
       browser.messageManager.addMessageListener("MozScrolledAreaChanged", aTab.scrolledAreaChanged);
-      aTab.updateContentCapture();
+      ContentTouchHandler.updateContentCapture();
     });
   }
 };
@@ -1646,7 +1640,6 @@ const ContentTouchHandler = {
     document.addEventListener("TapLong", this, false);
     document.addEventListener("TapMove", this, false);
 
-    document.addEventListener("PanBegin", this, false);
     document.addEventListener("PopupChanged", this, false);
     document.addEventListener("CancelTouchSequence", this, false);
 
@@ -1663,6 +1656,7 @@ const ContentTouchHandler = {
     messageManager.addMessageListener("Browser:ContextMenu", this);
     messageManager.addMessageListener("Browser:Highlight", this);
     messageManager.addMessageListener("Browser:CaptureEvents", this);
+    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
   },
 
   handleEvent: function handleEvent(aEvent) {
@@ -1671,9 +1665,6 @@ const ContentTouchHandler = {
       return;
 
     switch (aEvent.type) {
-      case "PanBegin":
-        getBrowser().messageManager.sendAsyncMessage("Browser:MouseCancel", {});
-        break;
       case "PopupChanged":
       case "CancelTouchSequence":
         this._clearPendingMessages();
@@ -1726,6 +1717,11 @@ const ContentTouchHandler = {
     }
   },
 
+  updateContentCapture: function() {
+    this._messageId++;
+    messageManager.sendAsyncMessage("Browser:CanCaptureMouse", { messageId: this._messageId });
+  },
+
   receiveMessage: function receiveMessage(aMessage) {
     let json = aMessage.json;
     if (json.messageId != this._messageId)
@@ -1760,6 +1756,11 @@ const ContentTouchHandler = {
           Elements.browsers.customDragger.contentMouseCapture = this.panningPrevented;
         break;
       }
+      case "Browser:CanCaptureMouse:Return": {
+        let tab = Browser.getTabForBrowser(aMessage.target);
+        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
+        break;
+      }
     }
   },
 
@@ -2956,10 +2957,6 @@ Tab.prototype = {
     return this._browser.getAttribute("type") == "content-primary";
   },
 
-  updateContentCapture: function() {
-    this._browser.messageManager.sendAsyncMessage("Browser:CanCaptureMouse", {});
-  },
-
   toString: function() {
     return "[Tab " + (this._browser ? this._browser.currentURI.spec : "(no browser)") + "]";
   }
diff --git a/mobile/chrome/content/content.js b/mobile/chrome/content/content.js
index 6d6379cb2da6..10e5cc3dc4a5 100644
--- a/mobile/chrome/content/content.js
+++ b/mobile/chrome/content/content.js
@@ -597,7 +597,8 @@ let Content = {
 
       case "Browser:CanCaptureMouse": {
         sendAsyncMessage("Browser:CanCaptureMouse:Return", {
-          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners
+          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners,
+          messageId: json.messageId
         });
         break;
       }
diff --git a/mobile/chrome/tests/Makefile.in b/mobile/chrome/tests/Makefile.in
index 34eb8fbf9f14..7e7e1fd2f594 100644
--- a/mobile/chrome/tests/Makefile.in
+++ b/mobile/chrome/tests/Makefile.in
@@ -39,7 +39,7 @@ DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = mobile/chrome/tests
+relativesrcdir  = mobile/chrome
 TESTXPI  = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)/addons
 ADDONSRC = $(srcdir)/addons
 
diff --git a/mobile/chrome/tests/addons/browser_install1_1/install.rdf b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
index 0825d11aa0cb..49891b5988c4 100644
--- a/mobile/chrome/tests/addons/browser_install1_1/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_1/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>1.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
     <em:bootstrap>true</em:bootstrap>
 
     <em:targetApplication>
diff --git a/mobile/chrome/tests/addons/browser_install1_3/install.rdf b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
index 2c10f4921628..43052832baf6 100644
--- a/mobile/chrome/tests/addons/browser_install1_3/install.rdf
+++ b/mobile/chrome/tests/addons/browser_install1_3/install.rdf
@@ -6,7 +6,7 @@
   <Description about="urn:mozilla:install-manifest">
     <em:id>addon1@tests.mozilla.org</em:id>
     <em:version>3.0</em:version>
-    <em:updateURL>http://example.com/browser/mobile/chrome/tests/browser_upgrade.rdf</em:updateURL>
+    <em:updateURL>http://example.com/browser/mobile/chrome/browser_upgrade.rdf</em:updateURL>
 
     <em:targetApplication>
       <Description>
diff --git a/mobile/chrome/tests/browser_addons.js b/mobile/chrome/tests/browser_addons.js
index 75299408b1f5..8ebd9d9a89ca 100644
--- a/mobile/chrome/tests/browser_addons.js
+++ b/mobile/chrome/tests/browser_addons.js
@@ -7,7 +7,7 @@ Components.utils.import("resource://gre/modules/AddonUpdateChecker.jsm");
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/NetUtil.jsm");
 
-const RELATIVE_DIR = "browser/mobile/chrome/tests/";
+const RELATIVE_DIR = "browser/mobile/chrome/";
 const TESTROOT     = "http://example.com/" + RELATIVE_DIR;
 const TESTROOT2    = "http://example.org/" + RELATIVE_DIR;
 const PREF_LOGGING_ENABLED            = "extensions.logging.enabled";
diff --git a/mobile/chrome/tests/browser_formsZoom.js b/mobile/chrome/tests/browser_formsZoom.js
index d78a26771690..145e918993bb 100644
--- a/mobile/chrome/tests/browser_formsZoom.js
+++ b/mobile/chrome/tests/browser_formsZoom.js
@@ -1,4 +1,6 @@
 let testURL_01 = chromeRoot + "browser_formsZoom.html";
+
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_02 = baseURI + "browser_formsZoom.html";
 messageManager.loadFrameScript(baseURI + "remote_formsZoom.js", true);
 
diff --git a/mobile/chrome/tests/browser_history.js b/mobile/chrome/tests/browser_history.js
index dd4ad8061cea..87a3ee03d1b8 100644
--- a/mobile/chrome/tests/browser_history.js
+++ b/mobile/chrome/tests/browser_history.js
@@ -2,7 +2,7 @@
  * Make sure history is being recorded when we visit websites.
  */
 
-var testURL_01 = baseURI + "browser_blank_01.html";
+var testURL_01 = "http://mochi.test:8888/browser/mobile/chrome/browser_blank_01.html";
 
 // A queue to order the tests and a handle for each test
 var gTests = [];
diff --git a/mobile/chrome/tests/browser_install.xml b/mobile/chrome/tests/browser_install.xml
index 3e96873c2afd..bb76898036bb 100644
--- a/mobile/chrome/tests/browser_install.xml
+++ b/mobile/chrome/tests/browser_install.xml
@@ -25,7 +25,7 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_1.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_1.xpi</install>
   </addon>
 
   <addon>
@@ -53,6 +53,6 @@
       </application>
     </compatible_applications>
     <compatible_os>ALL</compatible_os>
-    <install size="2">http://example.com/browser/mobile/chrome/tests/addons/browser_install1_2.xpi</install>
+    <install size="2">http://example.com/browser/mobile/chrome/addons/browser_install1_2.xpi</install>
   </addon>
 </searchresults>
diff --git a/mobile/chrome/tests/browser_navigation.js b/mobile/chrome/tests/browser_navigation.js
index aa69a0ff7615..ad5f4177c7df 100644
--- a/mobile/chrome/tests/browser_navigation.js
+++ b/mobile/chrome/tests/browser_navigation.js
@@ -1,6 +1,7 @@
 var testURL_01 = chromeRoot + "browser_blank_01.html";
 var testURL_02 = chromeRoot + "browser_blank_02.html";
 
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 var titleURL = baseURI + "browser_title.sjs?";
 var pngURL = "data:image/gif;base64,R0lGODlhCwALAIAAAAAA3pn/ZiH5BAEAAAEALAAAAAALAAsAAAIUhA+hkcuO4lmNVindo7qyrIXiGBYAOw==";
 
diff --git a/mobile/chrome/tests/browser_scroll.js b/mobile/chrome/tests/browser_scroll.js
index bb299e0d36e1..08b03525e387 100644
--- a/mobile/chrome/tests/browser_scroll.js
+++ b/mobile/chrome/tests/browser_scroll.js
@@ -4,7 +4,8 @@
 var gTab;
 registerCleanupFunction(function() Browser.closeTab(gTab));
 
-const TEST_URL = baseURI + "browser_scroll.html";
+const BASE_URL = "http://mochi.test:8888/browser/mobile/chrome/";
+const TEST_URL = BASE_URL + "browser_scroll.html";
 
 function test() {
   waitForExplicitFinish();
diff --git a/mobile/chrome/tests/browser_scrollbar.js b/mobile/chrome/tests/browser_scrollbar.js
index be54149b9735..3efbb7d9a7e8 100644
--- a/mobile/chrome/tests/browser_scrollbar.js
+++ b/mobile/chrome/tests/browser_scrollbar.js
@@ -1,3 +1,4 @@
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_01 = baseURI + "browser_scrollbar.sjs?";
 
 let gCurrentTest = null;
diff --git a/mobile/chrome/tests/browser_thumbnails.js b/mobile/chrome/tests/browser_thumbnails.js
index 59ac82d731e0..0787a76a5564 100644
--- a/mobile/chrome/tests/browser_thumbnails.js
+++ b/mobile/chrome/tests/browser_thumbnails.js
@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/browser_title.sjs b/mobile/chrome/tests/browser_title.sjs
index a523c1de5de6..ba525cddac4c 100644
--- a/mobile/chrome/tests/browser_title.sjs
+++ b/mobile/chrome/tests/browser_title.sjs
@@ -55,10 +55,10 @@ function handleRequest(request, response) {
       response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.title = 'This is not a french title'; }, false);</script>");
       break;
     case "redirect":
-      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title'></meta>");
+      response.write("<meta http-equiv='refresh' content='1;url=http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title'></meta>");
       break;
     case "location":
-      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/tests/browser_title.sjs?no_title' ; }, false);</script>");
+      response.write("<script>window.addEventListener('load', function() { window.removeEventListener('load', arguments.callee, false); document.location = 'http://mochi.test:8888/browser/mobile/chrome/browser_title.sjs?no_title' ; }, false);</script>");
       break;
     default:
       break;
diff --git a/mobile/chrome/tests/browser_upgrade.rdf b/mobile/chrome/tests/browser_upgrade.rdf
index bfde13200e03..507d574cc03b 100644
--- a/mobile/chrome/tests/browser_upgrade.rdf
+++ b/mobile/chrome/tests/browser_upgrade.rdf
@@ -14,7 +14,7 @@
                 <em:id>toolkit@mozilla.org</em:id>
                 <em:minVersion>0</em:minVersion>
                 <em:maxVersion>*</em:maxVersion>
-                <em:updateLink>http://example.com/browser/mobile/chrome/tests/addons/browser_install1_3.xpi</em:updateLink>
+                <em:updateLink>http://example.com/browser/mobile/chrome/addons/browser_install1_3.xpi</em:updateLink>
               </Description>
             </em:targetApplication>
           </Description>
diff --git a/mobile/chrome/tests/browser_viewport.js b/mobile/chrome/tests/browser_viewport.js
index bb95cc2eb6d2..c0cebe1b1fc4 100644
--- a/mobile/chrome/tests/browser_viewport.js
+++ b/mobile/chrome/tests/browser_viewport.js
@@ -38,6 +38,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 let testURL_blank = baseURI + "browser_blank_01.html";
 
 const DEFAULT_WIDTH = 800;
diff --git a/mobile/chrome/tests/head.js b/mobile/chrome/tests/head.js
index b2709c3f6996..85133ce9028e 100644
--- a/mobile/chrome/tests/head.js
+++ b/mobile/chrome/tests/head.js
@@ -83,6 +83,6 @@ let AsyncTests = {
 let chromeRoot = getRootDirectory(gTestPath);
 // For some security reasons (which?), loading remote_head using chromeRoot
 // instead of baseURI make the browser_formsZoom.js test fails.
-let baseURI = "http://mochi.test:8888/browser/mobile/chrome/tests/";
+let baseURI = "http://mochi.test:8888/browser/mobile/chrome/";
 messageManager.loadFrameScript(baseURI + "remote_head.js", true);
 messageManager.loadFrameScript("chrome://mochikit/content/tests/SimpleTest/EventUtils.js", true);
diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 5155c518d070..8bde1ed128b9 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -68,7 +68,7 @@ NSSDBM3_CHK =
 endif
 
 ifndef MOZ_NATIVE_NSS
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 SDK_LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
@@ -162,8 +162,11 @@ ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
 export DLLFLAGS
 endif
 
+ifndef WINCE
+# why is this disabled on WINCE?  See bug 514295.
 # To get debug symbols from NSS
 export MOZ_DEBUG_SYMBOLS
+endif
 
 ifdef .PYMAKE
 NSSMAKE = $(GMAKE)
@@ -243,6 +246,24 @@ DEFAULT_GMAKE_FLAGS += PROGRAMS=
 
 ifdef CROSS_COMPILE
 
+ifdef WINCE
+DEFAULT_GMAKE_FLAGS += \
+	NATIVE_CC="$(HOST_CC)" \
+	CC="$(CC)" \
+	CCC="$(CC)" \
+	LINK="$(LD)" \
+	LD="$(LD) -DLL" \
+	AS="$(AS) -Cp -Sn -Zi -coff $(INCLUDES)" \
+	AR='$(AR) -NOLOG0 -OUT:$$@' \
+	RANLIB="echo" \
+	RC="$(RC) $(RCFLAGS)" \
+	OS_ARCH="$(OS_ARCH)" \
+	OS_TEST="$(OS_TEST)" \
+	CPU_ARCH="ARM" \
+	USE_MSYS=1 \
+	WINCE=1 \
+	$(NULL)
+else
 DEFAULT_GMAKE_FLAGS += \
 	NATIVE_CC="$(HOST_CC)" \
 	CC="$(CC)" \
@@ -256,6 +277,7 @@ DEFAULT_GMAKE_FLAGS += \
 	OS_TEST="$(OS_TEST)" \
 	CPU_ARCH="$(TARGET_CPU)" \
 	$(NULL)
+endif
 
 # Android has pthreads integrated into -lc, so OS_LIBS is set to nothing
 ifeq ($(OS_TARGET), Android)
diff --git a/xulrunner/Makefile.in b/xulrunner/Makefile.in
index 0af55ea73f14..46406ba3ee67 100644
--- a/xulrunner/Makefile.in
+++ b/xulrunner/Makefile.in
@@ -56,7 +56,7 @@ DIRS += installer/windows
 endif
 endif
 
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 PARALLEL_DIRS += tools/redit
 endif
 
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 55fa9eea6d71..477d4117f249 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -54,7 +54,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
 DEFINES += -DAB_CD=$(AB_CD)
 
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
 PROGRAM = xulrunner$(BIN_SUFFIX)
 else
 PROGRAM = xulrunner-bin$(BIN_SUFFIX)
@@ -116,8 +116,12 @@ include $(topsrcdir)/config/config.mk
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
+ifdef WINCE
+WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
+else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
+endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
@@ -171,7 +175,7 @@ endif
 endif
 endif
 
-ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINCE WINNT,$(OS_ARCH)))
 ifeq (unix, $(MOZ_FS_LAYOUT))
 
 xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index 41bcfd2f7709..d7a29df7bbbc 100644
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -74,7 +74,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
   char *msg = PR_vsmprintf(fmt, ap);
   if (msg)
   {
@@ -174,6 +174,14 @@ static void Usage(const char *argv0)
            "  -h, --help                 show this message\n"
            "  -v, --version              show version\n"
            "  --gre-version              print the GRE version string on stdout\n"
+           "  --register-global          register this GRE in the machine registry\n"
+           "  --register-user            register this GRE in the user registry\n"
+           "  --unregister-global        unregister this GRE formerly registered with\n"
+           "                             --register-global\n"
+           "  --unregister-user          unregister this GRE formely registered with\n"
+           "                             --register-user\n"
+           "  --find-gre <version>       Find a GRE with version <version> and print\n"
+           "                             the path on stdout\n"
            "  --install-app <application> [<destination> [<directoryname>]]\n"
            "                             Install a XUL application.\n"
            "\n"
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 37ac92efbc43..675afe930a0b 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -73,7 +73,7 @@ LIBS            += \
 		$(NULL)
 endif
 
-ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 RCINCLUDE = xulrunner-stub.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
@@ -94,8 +94,12 @@ endif
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
+ifdef WINCE
+WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
+else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
+endif
 
 LIBS += $(JEMALLOC_LIBS)
 
diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
index 49ce073d4e67..3ebbd81f315a 100644
--- a/xulrunner/stub/nsXULStub.cpp
+++ b/xulrunner/stub/nsXULStub.cpp
@@ -86,7 +86,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
   char msg[2048];
 
   vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -191,6 +191,43 @@ XRE_CreateAppDataType XRE_CreateAppData;
 XRE_FreeAppDataType XRE_FreeAppData;
 XRE_mainType XRE_main;
 
+
+#ifdef WINCE
+void
+ForwardToWindow(HWND wnd) {
+  // For WinCE, we're stuck with providing our own argv[0] for the remote
+  // command-line.
+  WCHAR wPath[MAX_PATH] = L"dummy ";
+  WCHAR *wCmd = ::GetCommandLineW();
+  WCHAR wCwd[MAX_PATH];
+  _wgetcwd(wCwd, MAX_PATH);
+
+  // Construct a narrow UTF8 buffer <path> <commandline>\0<workingdir>\0
+  size_t len = wcslen(wPath) + wcslen(wCmd) + wcslen(wCwd) + 2;
+  WCHAR *wMsg = (WCHAR *)malloc(len * sizeof(*wMsg));
+  wcscpy(wMsg, wPath);
+  wcscpy(wMsg + wcslen(wPath), wCmd);                // The command line
+  wcscpy(wMsg + wcslen(wPath) + wcslen(wCmd) + 1, wCwd); // Working dir
+
+  // Then convert to UTF-8, assuming worst-case explosion of characters
+  char *msg = (char *)malloc(len * 4);
+  WideCharToMultiByte(CP_UTF8, 0, wMsg, len, msg, len * 4, NULL, NULL);
+
+  // We used to set dwData to zero, when we didn't send the working dir.
+  // Now we're using it as a version number.
+  COPYDATASTRUCT cds = { 1, len, (void *)msg };
+
+  // Bring the already running Mozilla process to the foreground.
+  // nsWindow will restore the window (if minimized) and raise it.
+  // for activating the existing window on wince we need "| 0x01"
+  // see http://msdn.microsoft.com/en-us/library/ms940024.aspx for details
+  ::SetForegroundWindow((HWND)(((ULONG) wnd) | 0x01));
+  ::SendMessage(wnd, WM_COPYDATA, 0, (LPARAM)&cds);
+  free(wMsg);
+  free(msg);
+}
+#endif
+
 int
 main(int argc, char **argv)
 {
@@ -362,6 +399,41 @@ main(int argc, char **argv)
     return 1;
   }
 
+#ifdef WINCE
+  // On Windows Mobile and WinCE, we can save a lot of time by not
+  // waiting for XUL and XPCOM to load up.  Let's see if we can find
+  // an existing app window to forward our command-line to now.
+
+  // Shouldn't attempt this if the -no-remote parameter has been provided.
+  bool noRemote = false;
+  for (int i = 1; i < argc; i++) {
+    if (IsArg(argv[i], "no-remote")) {
+      noRemote = true;
+      break;
+    }
+  }
+
+  if (!noRemote) {
+    char windowName[512];  // Is there a const for appname like VERSION_MAXLEN?
+    rv = parser.GetString("App", "Name", windowName, sizeof(windowName));
+    if (NS_FAILED(rv)) {
+      fprintf(stderr, "Couldn't figure out the application name\n");
+      return 1;
+    }
+
+    // Lookup the hidden message window created by nsNativeAppSupport
+    strncat(windowName, "MessageWindow", sizeof(windowName) - strlen(windowName));
+    WCHAR wWindowName[512];
+    MultiByteToWideChar(CP_UTF8, 0, windowName, -1, wWindowName, sizeof(wWindowName));
+    HWND wnd = ::FindWindowW(wWindowName, NULL);
+    if (wnd) {
+      // Forward the command-line and bail out
+      ForwardToWindow(wnd);
+      return 0;
+    }
+  }
+#endif
+
   if (!greFound) {
     Output(PR_FALSE,
            "Could not find the Mozilla runtime.\n");
@@ -411,7 +483,8 @@ main(int argc, char **argv)
   { // Scope COMPtr and AutoAppData
     nsCOMPtr<nsILocalFile> iniFile;
 #ifdef XP_WIN
-    // On Windows iniPath is UTF-8 encoded so we need to convert it.
+    // On Windows and Windows CE, iniPath is UTF-8 encoded,
+    // so we need to convert it.
     rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(iniPath), PR_FALSE,
                          getter_AddRefs(iniFile));
 #else
diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index 1614d6837fcf..e9e854e1cb09 100644
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@@ -52,4 +52,12 @@ SDK_BINARY =  \
 	$(NULL)
 endif
 
+ifeq ($(OS_ARCH),WINCE)
+HOST_CPPSRCS = redit.cpp
+HOST_PROGRAM = redit$(BIN_SUFFIX)
+SDK_BINARY   =  \
+	$(HOST_PROGRAM) \
+	$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk

From 9241c69505ba04554e442e902ff810cbf85c7638 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Thu, 5 May 2011 23:33:13 +0300
Subject: [PATCH 261/314] Bug 654770, fix few AddEventListener calls now that
 it has 2 optional parameters, r=sicking

--HG--
extra : rebase_source : d0a27a6ba059d5862f10ab49f0a079e8928b30fb
---
 accessible/src/base/nsRootAccessible.cpp     | 2 +-
 content/base/src/nsGenericElement.cpp        | 2 +-
 content/base/src/nsInProcessTabChildGlobal.h | 2 +-
 dom/ipc/TabChild.h                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp
index 298993b2c8ce..e5521be0501d 100644
--- a/accessible/src/base/nsRootAccessible.cpp
+++ b/accessible/src/base/nsRootAccessible.cpp
@@ -264,7 +264,7 @@ nsresult nsRootAccessible::AddEventListeners()
                    * const* e_end = docEvents + NS_ARRAY_LENGTH(docEvents);
          e < e_end; ++e) {
       nsresult rv = nstarget->AddEventListener(NS_ConvertASCIItoUTF16(*e),
-                                               this, PR_TRUE, PR_TRUE, 1);
+                                               this, PR_TRUE, PR_TRUE, 2);
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 6deee3dce6b4..f27dafbeaecc 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -2016,7 +2016,7 @@ nsDOMEventRTTearoff::AddEventListener(const nsAString& aType,
                                       nsIDOMEventListener *aListener,
                                       PRBool useCapture)
 {
-  return AddEventListener(aType, aListener, useCapture, PR_FALSE, 0);
+  return AddEventListener(aType, aListener, useCapture, PR_FALSE, 1);
 }
 
 NS_IMETHODIMP
diff --git a/content/base/src/nsInProcessTabChildGlobal.h b/content/base/src/nsInProcessTabChildGlobal.h
index 26c2f35051ac..24cf06a011b7 100644
--- a/content/base/src/nsInProcessTabChildGlobal.h
+++ b/content/base/src/nsInProcessTabChildGlobal.h
@@ -87,7 +87,7 @@ public:
   {
     // By default add listeners only for trusted events!
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
-                                                    aUseCapture, PR_FALSE, 1);
+                                                    aUseCapture, PR_FALSE, 2);
   }
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,
diff --git a/dom/ipc/TabChild.h b/dom/ipc/TabChild.h
index 0f8203e0cc5c..f840dcd66089 100644
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -117,7 +117,7 @@ public:
   {
     // By default add listeners only for trusted events!
     return nsDOMEventTargetHelper::AddEventListener(aType, aListener,
-                                                    aUseCapture, PR_FALSE, 1);
+                                                    aUseCapture, PR_FALSE, 2);
   }
   NS_IMETHOD AddEventListener(const nsAString& aType,
                               nsIDOMEventListener* aListener,

From f82b22ecaa3cce2191352a970678ac95cd8cbc64 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Thu, 5 May 2011 17:45:56 -0400
Subject: [PATCH 262/314] Backed out changeset de21696c8853 (bug 654423) on
 suspicion of causing Windows debug Mochitest-other permaorange from CLOSED
 TREE.

--HG--
extra : rebase_source : 2d88de067d1b4316077dba8313b947175c17d861
---
 .../test/tabview/browser_tabview_bug630102.js | 72 +++++++++++--------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/browser/base/content/test/tabview/browser_tabview_bug630102.js b/browser/base/content/test/tabview/browser_tabview_bug630102.js
index fe2d64fc2e0c..e2a91b0d8c9d 100644
--- a/browser/base/content/test/tabview/browser_tabview_bug630102.js
+++ b/browser/base/content/test/tabview/browser_tabview_bug630102.js
@@ -2,51 +2,63 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
-  let win, contentWindow, originalTab, newTab1, newTab2;
+  waitForExplicitFinish();
+
+  let originalTab = gBrowser.visibleTabs[0];
+  let newTab1 = gBrowser.addTab("about:blank", { skipAnimation: true });
+  let newTab2 = gBrowser.addTab("about:blank", { skipAnimation: true });
+  
+  gBrowser.pinTab(newTab1);
+  
+  let contentWindow;
+
+  let partOne = function() {
+    window.removeEventListener("tabviewshown", partOne, false);
+
+    contentWindow = document.getElementById("tab-view").contentWindow;
+    is(contentWindow.GroupItems.groupItems.length, 1, "There is only one group item");
 
-  let partOne = function () {
     let groupItem = contentWindow.GroupItems.groupItems[0];
     let tabItems = groupItem.getChildren();
     is(tabItems.length, 2, "There are two tab items in that group item");
     is(tabItems[0].tab, originalTab, "The first tab item is linked to the first tab");
     is(tabItems[1].tab, newTab2, "The second tab item is linked to the second tab");
 
-    hideTabView(partTwo, win);
+    window.addEventListener("tabviewhidden", partTwo, false);
+    TabView.toggle();
   };
 
-  let partTwo = function () {
-    win.gBrowser.unpinTab(newTab1);
-    showTabView(partThree, win);
+  let partTwo = function() {
+    window.removeEventListener("tabviewhidden", partTwo, false);
+
+    gBrowser.unpinTab(newTab1);
+
+    window.addEventListener("tabviewshown", partThree, false);
+    TabView.toggle();
   };
 
-  let partThree = function () {
+  let partThree = function() {
+    window.removeEventListener("tabviewshown", partThree, false);
+
     let tabItems = contentWindow.GroupItems.groupItems[0].getChildren();
     is(tabItems.length, 3, "There are three tab items in that group item");
-    is(tabItems[0].tab, win.gBrowser.tabs[0], "The first tab item is linked to the first tab");
-    is(tabItems[1].tab, win.gBrowser.tabs[1], "The second tab item is linked to the second tab");
-    is(tabItems[2].tab, win.gBrowser.tabs[2], "The third tab item is linked to the third tab");
+    is(tabItems[0].tab, gBrowser.visibleTabs[0], "The first tab item is linked to the first tab");
+    is(tabItems[1].tab, gBrowser.visibleTabs[1], "The second tab item is linked to the second tab");
+    is(tabItems[2].tab, gBrowser.visibleTabs[2], "The third tab item is linked to the third tab");
+
+    window.addEventListener("tabviewhidden", endGame, false);
+    TabView.toggle();
+  };
+
+  let endGame = function() {
+    window.removeEventListener("tabviewhidden", endGame, false);
+
+    gBrowser.removeTab(newTab1);
+    gBrowser.removeTab(newTab2);
 
     finish();
   };
 
-  let onLoad = function (tvwin) {
-    win = tvwin;
-    registerCleanupFunction(function () win.close());
-
-    for (let i = 0; i < 2; i++)
-      win.gBrowser.loadOneTab("about:blank", {inBackground: true});
-
-    [originalTab, newTab1, newTab2] = win.gBrowser.tabs;
-    win.gBrowser.pinTab(newTab1);
-  };
-
-  let onShow = function () {
-    contentWindow = win.TabView.getContentWindow();
-    is(contentWindow.GroupItems.groupItems.length, 1, "There is only one group item");
-
-    partOne();
-  };
-
-  waitForExplicitFinish();
-  newWindowWithTabView(onShow, onLoad);
+  window.addEventListener("tabviewshown", partOne, false);
+  TabView.toggle();
 }

From 5828357e55fb034a3e20c8a8a31355756302370a Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 14:51:29 -0700
Subject: [PATCH 263/314] Back out changeset 9a959f4d17e6 (Bug 653681) on
 suspicion of causing Windows debug Mochitest-other permaorange - CLOSED TREE.

---
 browser/base/content/tabview/search.js | 42 ++++++++++++++------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/browser/base/content/tabview/search.js b/browser/base/content/tabview/search.js
index 4afa0b1784d0..b7d17ad62c3e 100644
--- a/browser/base/content/tabview/search.js
+++ b/browser/base/content/tabview/search.js
@@ -218,39 +218,43 @@ TabMatcher.prototype = {
   
   // ---------
   // Function: _getTabsForOtherWindows
-  // Returns an array of <TabItem>s and <xul:tabs>s representing tabs
-  // from all windows but the current window. <TabItem>s will be returned
-  // for windows in which Panorama has been activated at least once, while
-  // <xul:tab>s will be returned for windows in which Panorama has never
-  // been activated.
-  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows() {
-    var enumerator = Services.wm.getEnumerator("navigator:browser");
-    var allTabs = [];
-
+  // Returns an array of <TabItem>s and <xul:tabs>s representing that
+  // tabs from all windows but the currently focused window. <TabItem>s
+  // will be returned for windows in which Panorama has been activated at
+  // least once, while <xul:tab>s will be return for windows in which
+  // Panorama has never been activated.
+  _getTabsForOtherWindows: function TabMatcher__getTabsForOtherWindows(){
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+    var enumerator = wm.getEnumerator("navigator:browser");    
+    var currentWindow = wm.getMostRecentWindow("navigator:browser");
+    
+    var allTabs = [];    
     while (enumerator.hasMoreElements()) {
       var win = enumerator.getNext();
-      // This function gets tabs from other windows, not from the current window
-      if (win != gWindow) {
+      // This function gets tabs from other windows: not the one you currently
+      // have focused.
+      if (win != currentWindow) {
         // If TabView is around iterate over all tabs, else get the currently
         // shown tabs...
+        
         let tvWindow = win.TabView.getContentWindow();
         if (tvWindow)
-          allTabs = allTabs.concat(tvWindow.TabItems.getItems());
+          allTabs = allTabs.concat( tvWindow.TabItems.getItems() );
         else
           // win.gBrowser.tabs isn't a proper array, so we can't use concat
-          for (let i = 0; i < win.gBrowser.tabs.length; i++)
-            allTabs.push(win.gBrowser.tabs[i]);
-      }
+          for (var i=0; i<win.gBrowser.tabs.length; i++) allTabs.push( win.gBrowser.tabs[i] );
+      } 
     }
-    return allTabs;
+    return allTabs;    
   },
   
   // ----------
   // Function: matchedTabsFromOtherWindows
   // Returns an array of <TabItem>s and <xul:tab>s that match the search term
-  // from all windows but the current window. <TabItem>s will be returned for
-  // windows in which Panorama has been activated at least once, while
-  // <xul:tab>s will be returned for windows in which Panorama has never
+  // from all windows but the currently focused window. <TabItem>s will be
+  // returned for windows in which Panorama has been activated at least once,
+  // while <xul:tab>s will be return for windows in which Panorama has never
   // been activated.
   // (new TabMatcher("app")).matchedTabsFromOtherWindows();
   matchedTabsFromOtherWindows: function TabMatcher_matchedTabsFromOtherWindows(){

From 816dcf8f0bcc8e670b1f5b5a33231e6531f7de48 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 14:52:24 -0700
Subject: [PATCH 264/314] Back out changeset 6b26a933cad7 (Bug 649319) on
 suspicion of causing Windows debug Mochitest-other permaorange - CLOSED TREE.

---
 browser/base/content/tabview/drag.js          | 13 +++
 browser/base/content/tabview/groupitems.js    |  3 +-
 browser/base/content/tabview/items.js         |  8 +-
 browser/base/content/test/tabview/Makefile.in |  1 -
 .../test/tabview/browser_tabview_bug649319.js | 88 -------------------
 5 files changed, 20 insertions(+), 93 deletions(-)
 delete mode 100644 browser/base/content/test/tabview/browser_tabview_bug649319.js

diff --git a/browser/base/content/tabview/drag.js b/browser/base/content/tabview/drag.js
index f40fcac87eb6..30eb30b74903 100644
--- a/browser/base/content/tabview/drag.js
+++ b/browser/base/content/tabview/drag.js
@@ -85,6 +85,19 @@ function Drag(item, event, isFauxDrag) {
   this.safeWindowBounds = Items.getSafeWindowBounds();
 
   Trenches.activateOthersTrenches(this.el);
+
+  if (!isFauxDrag) {
+    // When a tab drag starts, make it the focused tab.
+    if (this.item.isAGroupItem) {
+      var tab = UI.getActiveTab();
+      if (!tab || tab.parent != this.item) {
+        if (this.item._children.length)
+          UI.setActive(this.item._children[0]);
+      }
+    } else if (this.item.isATabItem) {
+      UI.setActive(this.item);
+    }
+  }
 };
 
 Drag.prototype = {
diff --git a/browser/base/content/tabview/groupitems.js b/browser/base/content/tabview/groupitems.js
index 8b096c085a8e..6ad132496b1d 100644
--- a/browser/base/content/tabview/groupitems.js
+++ b/browser/base/content/tabview/groupitems.js
@@ -1014,7 +1014,8 @@ GroupItem.prototype = Utils.extend(new Item(), new Subscribable(), {
         if (typeof item.setResizable == 'function')
           item.setResizable(false, options.immediately);
 
-        if (item == UI.getActiveTab() || !this._activeTab)
+        // if it is visually active, set it as the active tab.
+        if (iQ(item.container).hasClass("focus"))
           this.setActiveTab(item);
 
         // if it matches the selected tab or no active tab and the browser
diff --git a/browser/base/content/tabview/items.js b/browser/base/content/tabview/items.js
index 99add3765c34..7702d1d05ceb 100644
--- a/browser/base/content/tabview/items.js
+++ b/browser/base/content/tabview/items.js
@@ -151,9 +151,10 @@ Item.prototype = {
     this.dragOptions = {
       cancelClass: 'close stackExpander',
       start: function(e, ui) {
-        UI.setActive(this);
-        if (this.isAGroupItem)
+        if (this.isAGroupItem) {
+          UI.setActive(this);
           this._unfreezeItemSize();
+        }
         // if we start dragging a tab within a group, start with dropSpace on.
         else if (this.parent != null)
           this.parent._dropSpaceActive = true;
@@ -200,7 +201,8 @@ Item.prototype = {
       minWidth: 90,
       minHeight: 90,
       start: function(e,ui) {
-        UI.setActive(this);
+        if (this.isAGroupItem)
+          UI.setActive(this);
         resize.info = new Drag(this, e);
       },
       resize: function(e,ui) {
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index 39656d720c7c..d80ddb817ca0 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -135,7 +135,6 @@ _BROWSER_FILES = \
                  browser_tabview_bug648882.js \
                  browser_tabview_bug649006.js \
                  browser_tabview_bug649307.js \
-                 browser_tabview_bug649319.js \
                  browser_tabview_bug651311.js \
                  browser_tabview_dragdrop.js \
                  browser_tabview_exit_button.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug649319.js b/browser/base/content/test/tabview/browser_tabview_bug649319.js
deleted file mode 100644
index fe69bcbd9ef4..000000000000
--- a/browser/base/content/test/tabview/browser_tabview_bug649319.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-function test() {
-  waitForExplicitFinish();
-
-  newWindowWithTabView(function (win) {
-    registerCleanupFunction(function () win.close());
-    waitForFocus(function () testScenarios(win));
-  });
-}
-
-function testScenarios(win) {
-  let simulateDragDrop = function (target) {
-    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
-    EventUtils.synthesizeMouse(target, 40, 20, {type: "mousemove"}, cw);
-    EventUtils.synthesizeMouse(target, 80, 20, {type: "mouseup"}, cw);
-  }
-
-  let dragOutOfGroup = function (target) {
-    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
-    EventUtils.synthesizeMouse(target, 600, 5, {type: "mousemove"}, cw);
-    EventUtils.synthesizeMouse(target, 600, 5, {type: "mouseup"}, cw);
-  }
-
-  let dragIntoGroup = function (target) {
-    EventUtils.synthesizeMouseAtCenter(target, {type: "mousedown"}, cw);
-    EventUtils.synthesizeMouse(target, -200, 5, {type: "mousemove"}, cw);
-    EventUtils.synthesizeMouse(target, -200, 5, {type: "mouseup"}, cw);
-  }
-
-  let assertActiveOrphan = function (tabItem) {
-    ok(!cw.GroupItems.getActiveGroupItem(), "no groupItem is active");
-    is(cw.UI.getActiveTab(), tabItem, "orphan tab is active");
-    is(cw.UI.getActiveOrphanTab(), tabItem, "orphan tab is active");
-  }
-
-  let cw = win.TabView.getContentWindow();
-  let groupItem = cw.GroupItems.groupItems[0];
-  let groupItem2 = createGroupItemWithBlankTabs(win, 400, 300, 20, 4);
-
-  // move group
-  cw.UI.setActive(groupItem);
-  simulateDragDrop(groupItem2.container);
-  is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
-  is(cw.UI.getActiveTab(), groupItem2.getChild(0), "second groupItem's first tab is active");
-
-  // resize group
-  cw.UI.setActive(groupItem);
-  let tabItem = groupItem2.getChild(2);
-  groupItem2.setActiveTab(tabItem);
-  simulateDragDrop(groupItem2.$resizer[0]);
-  is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
-  is(cw.UI.getActiveTab(), tabItem, "second groupItem's third tab is active");
-
-  // create orphan
-  tabItem = groupItem2.getChild(0);
-  dragOutOfGroup(tabItem.container);
-
-  // move orphan
-  cw.UI.setActive(groupItem2);
-  simulateDragDrop(tabItem.container);
-  assertActiveOrphan(tabItem);
-
-  // resize orphan
-  cw.UI.setActive(groupItem2);
-  let $resizer = cw.iQ('.iq-resizable-handle', tabItem.container);
-  simulateDragDrop($resizer[0]);
-  assertActiveOrphan(tabItem);
-
-  // drag back into group
-  dragIntoGroup(tabItem.container);
-  cw.UI.setActive(groupItem);
-  cw.UI.setActive(groupItem2);
-  is(cw.UI.getActiveTab(), tabItem, "the dropped tab is active");
-
-  // hide + unhide groupItem
-  hideGroupItem(groupItem2, function () {
-    is(cw.GroupItems.getActiveGroupItem(), groupItem, "first groupItem is active");
-
-    unhideGroupItem(groupItem2, function () {
-      is(cw.GroupItems.getActiveGroupItem(), groupItem2, "second groupItem is active");
-      is(cw.UI.getActiveTab(), tabItem, "the dropped tab is active");
-
-      finish();
-    });
-  });
-}

From 410db6061d5e3751e7d958e286da99d648c32440 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Fri, 6 May 2011 08:44:33 -0700
Subject: [PATCH 265/314] Back out changeset 11d2a7ed963a (bug 595020) on
 suspicion of causing bug 655197.

---
 browser/base/content/browser-tabview.js       | 28 ++------
 browser/base/content/tabview/storage.js       |  9 ---
 browser/base/content/tabview/ui.js            |  1 -
 browser/base/content/test/tabview/Makefile.in |  1 -
 .../test/tabview/browser_tabview_bug595020.js | 66 -------------------
 5 files changed, 6 insertions(+), 99 deletions(-)
 delete mode 100644 browser/base/content/test/tabview/browser_tabview_bug595020.js

diff --git a/browser/base/content/browser-tabview.js b/browser/base/content/browser-tabview.js
index 1a2c1b895c9d..3020c7a58385 100644
--- a/browser/base/content/browser-tabview.js
+++ b/browser/base/content/browser-tabview.js
@@ -44,9 +44,7 @@ let TabView = {
   _browserKeyHandlerInitialized: false,
   _isFrameLoading: false,
   _initFrameCallbacks: [],
-  _lastSessionGroupName: null,
   VISIBILITY_IDENTIFIER: "tabview-visibility",
-  LAST_SESSION_GROUP_NAME_IDENTIFIER: "tabview-last-session-group-name",
 
   // ----------
   get windowTitle() {
@@ -100,10 +98,6 @@ let TabView = {
         };
         gBrowser.tabContainer.addEventListener(
           "TabShow", this._tabShowEventListener, true);
-
-       // grab the last used group title
-       this._lastSessionGroupName = sessionstore.getWindowValue(window,
-         this.LAST_SESSION_GROUP_NAME_IDENTIFIER);
       }
     }
   },
@@ -222,28 +216,18 @@ let TabView = {
   },
   
   getActiveGroupName: function TabView_getActiveGroupName() {
-    if (!this._window)
-      return this._lastSessionGroupName;
-
     // We get the active group this way, instead of querying
     // GroupItems.getActiveGroupItem() because the tabSelect event
     // will not have happened by the time the browser tries to
     // update the title.
-    let groupItem = null;
     let activeTab = window.gBrowser.selectedTab;
-    let activeTabItem = activeTab._tabViewTabItem;
-
-    if (activeTab.pinned) {
-      // It's an app tab, so it won't have a .tabItem. However, its .parent
-      // will already be set as the active group. 
-      groupItem = this._window.GroupItems.getActiveGroupItem();
-    } else if (activeTabItem) {
-      groupItem = activeTabItem.parent;
+    if (activeTab._tabViewTabItem && activeTab._tabViewTabItem.parent){
+      let groupName = activeTab._tabViewTabItem.parent.getTitle();
+      if (groupName)
+        return groupName;
     }
-
-    // groupItem may still be null, if the active tab is an orphan.
-    return groupItem ? groupItem.getTitle() : "";
-  },
+    return null;
+  },  
 
   // ----------
   updateContextMenu: function(tab, popup) {
diff --git a/browser/base/content/tabview/storage.js b/browser/base/content/tabview/storage.js
index 65d4aa857d59..3a18dda10aea 100644
--- a/browser/base/content/tabview/storage.js
+++ b/browser/base/content/tabview/storage.js
@@ -381,15 +381,6 @@ let Storage = {
       win, win.TabView.VISIBILITY_IDENTIFIER, data);
   },
 
-  // ----------
-  // Function: saveActiveGroupName
-  // Saves the active group's name for the given window.
-  saveActiveGroupName: function Storage_saveActiveGroupName(win) {
-    let groupName = win.TabView.getActiveGroupName();
-    this._sessionStore.setWindowValue(
-      win, win.TabView.LAST_SESSION_GROUP_NAME_IDENTIFIER, groupName);
-  },
-
   // ----------
   // Function: saveData
   // Generic routine for saving data to a window.
diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index 2963f88c9880..6ebc8add0438 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -258,7 +258,6 @@ let UI = {
       function domWinClosedObserver(subject, topic, data) {
         if (topic == "domwindowclosed" && subject == gWindow) {
           self.isDOMWindowClosing = true;
-          Storage.saveActiveGroupName(gWindow);
           if (self.isTabViewVisible())
             GroupItems.removeHiddenGroups();
           TabItems.saveAll(true);
diff --git a/browser/base/content/test/tabview/Makefile.in b/browser/base/content/test/tabview/Makefile.in
index d80ddb817ca0..29ffd7f45d6e 100644
--- a/browser/base/content/test/tabview/Makefile.in
+++ b/browser/base/content/test/tabview/Makefile.in
@@ -59,7 +59,6 @@ _BROWSER_FILES = \
                  browser_tabview_bug590606.js \
                  browser_tabview_bug591706.js \
                  browser_tabview_bug594958.js \
-                 browser_tabview_bug595020.js \
                  browser_tabview_bug595191.js \
                  browser_tabview_bug595436.js \
                  browser_tabview_bug595518.js \
diff --git a/browser/base/content/test/tabview/browser_tabview_bug595020.js b/browser/base/content/test/tabview/browser_tabview_bug595020.js
deleted file mode 100644
index d6c2a40ced2a..000000000000
--- a/browser/base/content/test/tabview/browser_tabview_bug595020.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-let ss = Cc["@mozilla.org/browser/sessionstore;1"].getService(Ci.nsISessionStore);
-
-let stateStartup = {windows:[
-  {tabs:[{entries:[{url:"about:home"}]}], extData:{"tabview-last-session-group-name":"title"}}
-]};
-
-function test() {
-  let assertWindowTitle = function (win, title) {
-    let browser = win.gBrowser.tabs[0].linkedBrowser;
-    let winTitle = win.gBrowser.getWindowTitleForBrowser(browser);
-    is(winTitle.indexOf(title), 0, "title starts with '" + title + "'");
-  };
-
-  let testGroupNameChange = function (win) {
-    showTabView(function () {
-      let cw = win.TabView.getContentWindow();
-      let groupItem = cw.GroupItems.groupItems[0];
-      groupItem.setTitle("new-title");
-
-      hideTabView(function () {
-        assertWindowTitle(win, "new-title");
-        waitForFocus(finish);
-      }, win);
-    }, win);
-  };
-
-  waitForExplicitFinish();
-
-  newWindowWithState(stateStartup, function (win) {
-    registerCleanupFunction(function () win.close());
-    assertWindowTitle(win, "title");
-    testGroupNameChange(win);
-  });
-}
-
-function newWindowWithState(state, callback) {
-  let opts = "chrome,all,dialog=no,height=800,width=800";
-  let win = window.openDialog(getBrowserURL(), "_blank", opts);
-
-  whenWindowLoaded(win, function () {
-    ss.setWindowState(win, JSON.stringify(state), true);
-  });
-
-  whenWindowStateReady(win, function () {
-    win.close();
-    win = ss.undoCloseWindow(0);
-    whenWindowLoaded(win, function () callback(win));
-  });
-}
-
-function whenWindowLoaded(win, callback) {
-  win.addEventListener("load", function onLoad() {
-    win.removeEventListener("load", onLoad, false);
-    executeSoon(callback);
-  }, false);
-}
-
-function whenWindowStateReady(win, callback) {
-  win.addEventListener("SSWindowStateReady", function onReady() {
-    win.removeEventListener("SSWindowStateReady", onReady, false);
-    executeSoon(callback);
-  }, false);
-}

From 3febb9d39a4663a8b67ebf1833231d6c1928d2e8 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Fri, 6 May 2011 08:45:33 -0700
Subject: [PATCH 266/314] Bug 541496 prelim 1: remove nsIUnicharStreamListener
 (no in-tree implementations). r=hsivonen

---
 netwerk/base/public/Makefile.in               |   1 -
 .../base/public/nsIUnicharStreamListener.idl  |  64 -----------
 parser/html/nsHtml5Parser.h                   |   1 -
 parser/htmlparser/public/Makefile.in          |   4 -
 .../htmlparser/public/nsParserDataListener.h  |  89 ---------------
 parser/htmlparser/src/nsParser.cpp            | 103 ------------------
 parser/htmlparser/src/nsParser.h              |   9 --
 parser/htmlparser/src/nsScanner.cpp           |  11 +-
 parser/htmlparser/src/nsScanner.h             |   7 --
 9 files changed, 1 insertion(+), 288 deletions(-)
 delete mode 100644 netwerk/base/public/nsIUnicharStreamListener.idl
 delete mode 100644 parser/htmlparser/public/nsParserDataListener.h

diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in
index acf18f79010f..0d3711efc391 100644
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -57,7 +57,6 @@ SDK_XPIDLSRCS   = \
 		nsIURL.idl \
 		nsIFileURL.idl \
 		nsIUploadChannel.idl \
-		nsIUnicharStreamListener.idl \
 		nsITraceableChannel.idl \
 		$(NULL)
 
diff --git a/netwerk/base/public/nsIUnicharStreamListener.idl b/netwerk/base/public/nsIUnicharStreamListener.idl
deleted file mode 100644
index 82a041e4f8a2..000000000000
--- a/netwerk/base/public/nsIUnicharStreamListener.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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.org.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@mozilla.org>
- *
- * 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 "nsIRequestObserver.idl"
-
-/**
- * nsIUnicharStreamListener is very similar to nsIStreamListener with
- * the difference being that this interface gives notifications about
- * data being available after the raw data has been converted to
- * UTF-16.
- *
- * nsIUnicharStreamListener
- */
-[scriptable, uuid(4a7e9b62-fef8-400d-9865-d6820f630b4c)]
-interface nsIUnicharStreamListener : nsIRequestObserver
-{
-    /**
-     * Called when the next chunk of data (corresponding to the
-     * request) is available.
-     *
-     * @param aRequest request corresponding to the source of the data
-     * @param aContext user defined context
-     * @param aData the data chunk
-     *
-     * An exception thrown from onUnicharDataAvailable has the
-     * side-effect of causing the request to be canceled.
-     */
-    void onUnicharDataAvailable(in nsIRequest aRequest,
-                                in nsISupports aContext, in AString aData);
-};
diff --git a/parser/html/nsHtml5Parser.h b/parser/html/nsHtml5Parser.h
index b94dad9385c6..28fb17bfa9f9 100644
--- a/parser/html/nsHtml5Parser.h
+++ b/parser/html/nsHtml5Parser.h
@@ -53,7 +53,6 @@
 #include "nsCOMArray.h"
 #include "nsContentSink.h"
 #include "nsIHTMLDocument.h"
-#include "nsIUnicharStreamListener.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIInputStream.h"
 #include "nsDetectionConfident.h"
diff --git a/parser/htmlparser/public/Makefile.in b/parser/htmlparser/public/Makefile.in
index 432eccbf4724..087de19fbaae 100644
--- a/parser/htmlparser/public/Makefile.in
+++ b/parser/htmlparser/public/Makefile.in
@@ -69,10 +69,6 @@ EXPORTS = \
 		nsToken.h                   \
 		$(NULL)
 
-SDK_HEADERS = \
-		nsParserDataListener.h      \
-		$(NULL)
-
 ifdef MOZ_DEBUG
 EXPORTS += \
 		nsILoggingSink.h \
diff --git a/parser/htmlparser/public/nsParserDataListener.h b/parser/htmlparser/public/nsParserDataListener.h
deleted file mode 100644
index 80ef95e8ac51..000000000000
--- a/parser/htmlparser/public/nsParserDataListener.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** 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.org.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@mozilla.org>
- *
- * 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 __nsParserDataListener_h__
-#define __nsParserDataListener_h__
-
-/*
- * Include this header if you're implementing a parser data
- * listener. To make a component a parser data listener you'll need to
- * make your component implement the interface
- * nsIUnicharStreamListener. That interface has three methods (one +
- * two inherited ones, not counting what's defined in
- * nsISupports). The methods are:
- *
- *  void onStartRequest(in nsIRequest aRequest,
- *                      in nsISupports aContext);
- *  void onUnicharDataAvailable(in nsIRequest aRequest,
- *                              in nsISupports aContext, in AString aData);
- *  void onStopRequest(in nsIRequest aRequest,
- *                     in nsISupports aContext,
- *                     in nsresult aStatusCode);
- *
- * All those methods are called for every network request that ends up
- * feeding data to the parser. The method are called in the order
- * shown above, first one call to onStartRequest(), then one call to
- * onUnicharDataAvailable() per chunk of data received and converted
- * to UTF-16, and finally one call to onStopRequest().
- *
- * The nsIRequest passed into these methods will be the same object
- * for all these calls for a given network request. If the request
- * pointer is used to uniquely identify an ongoing request, the
- * pointer should be QueryInterface()'d to nsISupports to ensure that
- * the pointer used is the identity pointer to the object.
- *
- * The context argument passed to these methods will be the document
- * (nsIDOMDocument) parsed from the stream, or null when not
- * available.
- *
- * Any errors returned from any of these calls will end up canceling
- * the stream, and the data that is passed to the call in question
- * will *not* be seen by the parser. So unless you intend to interrupt
- * a request, *make sure* that you return NS_OK from these methods!
- */
-
-#include "nsIUnicharStreamListener.h"
-
-/*
- * To register a component to be a parser data listener the
- * component's contract id should be registered with the category
- * manager (nsICategoryManager), with the category
- * PARSER_DATA_LISTENER_CATEGORY, defined here.
- */
-#define PARSER_DATA_LISTENER_CATEGORY "Parser data listener"
-
-#endif // __nsParserDataListener_h__
diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp
index 7cb1d32bf2d2..211ebd2d43d4 100644
--- a/parser/htmlparser/src/nsParser.cpp
+++ b/parser/htmlparser/src/nsParser.cpp
@@ -88,10 +88,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
 static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
 
-//-------------------------------------------------------------------
-
-nsCOMArray<nsIUnicharStreamListener> *nsParser::sParserDataListeners;
-
 //-------------- Begin ParseContinue Event Definition ------------------------
 /*
 The parser can be explicitly interrupted by passing a return value of
@@ -672,47 +668,6 @@ nsresult
 nsParser::Init()
 {
   nsresult rv;
-  nsCOMPtr<nsICategoryManager> cm =
-    do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCOMPtr<nsISimpleEnumerator> e;
-  rv = cm->EnumerateCategory("Parser data listener", getter_AddRefs(e));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  nsCAutoString categoryEntry;
-  nsXPIDLCString contractId;
-  nsCOMPtr<nsISupports> entry;
-
-  while (NS_SUCCEEDED(e->GetNext(getter_AddRefs(entry)))) {
-    nsCOMPtr<nsISupportsCString> category(do_QueryInterface(entry));
-
-    if (!category) {
-      NS_WARNING("Category entry not an nsISupportsCString!");
-      continue;
-    }
-
-    rv = category->GetData(categoryEntry);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    rv = cm->GetCategoryEntry("Parser data listener", categoryEntry.get(),
-                              getter_Copies(contractId));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIUnicharStreamListener> listener =
-      do_CreateInstance(contractId.get());
-
-    if (listener) {
-      if (!sParserDataListeners) {
-        sParserDataListeners = new nsCOMArray<nsIUnicharStreamListener>();
-
-        if (!sParserDataListeners)
-          return NS_ERROR_OUT_OF_MEMORY;
-      }
-
-      sParserDataListeners->AppendObject(listener);
-    }
-  }
 
   nsCOMPtr<nsICharsetAlias> charsetAlias =
     do_GetService(NS_CHARSETALIAS_CONTRACTID, &rv);
@@ -750,9 +705,6 @@ nsParser::Init()
 // static
 void nsParser::Shutdown()
 {
-  delete sParserDataListeners;
-  sParserDataListeners = nsnull;
-
   NS_IF_RELEASE(sCharsetAliasService);
   NS_IF_RELEASE(sCharsetConverterManager);
   if (sSpeculativeThreadPool) {
@@ -1847,35 +1799,6 @@ void nsParser::HandleParserContinueEvent(nsParserContinueEvent *ev)
   ContinueInterruptedParsing();
 }
 
-nsresult
-nsParser::DataAdded(const nsSubstring& aData, nsIRequest *aRequest)
-{
-  NS_ASSERTION(sParserDataListeners,
-               "Don't call this with no parser data listeners!");
-
-  if (!mSink || !aRequest) {
-    return NS_OK;
-  }
-
-  nsISupports *ctx = mSink->GetTarget();
-  PRInt32 count = sParserDataListeners->Count();
-  nsresult rv = NS_OK;
-  PRBool canceled = PR_FALSE;
-
-  while (count--) {
-    rv |= sParserDataListeners->ObjectAt(count)->
-      OnUnicharDataAvailable(aRequest, ctx, aData);
-
-    if (NS_FAILED(rv) && !canceled) {
-      aRequest->Cancel(rv);
-
-      canceled = PR_TRUE;
-    }
-  }
-
-  return rv;
-}
-
 PRBool
 nsParser::CanInterrupt()
 {
@@ -1957,12 +1880,6 @@ nsParser::Parse(nsIURI* aURL,
       pc->mDTDMode = aMode;
       PushContext(*pc);
 
-      // Here, and only here, hand this parser off to the scanner. We
-      // only want to do that here since the only reason the scanner
-      // needs the parser is to call DataAdded() on it, and that's
-      // only ever wanted when parsing from an URI.
-      theScanner->SetParser(this);
-
       result = NS_OK;
     } else {
       result = mInternalState = NS_ERROR_HTMLPARSER_BADCONTEXT;
@@ -2447,16 +2364,6 @@ nsParser::OnStartRequest(nsIRequest *request, nsISupports* aContext)
 
   rv = NS_OK;
 
-  if (sParserDataListeners && mSink) {
-    nsISupports *ctx = mSink->GetTarget();
-    PRInt32 count = sParserDataListeners->Count();
-
-    while (count--) {
-      rv |= sParserDataListeners->ObjectAt(count)->
-              OnStartRequest(request, ctx);
-    }
-  }
-
   return rv;
 }
 
@@ -2956,16 +2863,6 @@ nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext,
     mObserver->OnStopRequest(request, aContext, status);
   }
 
-  if (sParserDataListeners && mSink) {
-    nsISupports *ctx = mSink->GetTarget();
-    PRInt32 count = sParserDataListeners->Count();
-
-    while (count--) {
-      rv |= sParserDataListeners->ObjectAt(count)->OnStopRequest(request, ctx,
-                                                                 status);
-    }
-  }
-
   return rv;
 }
 
diff --git a/parser/htmlparser/src/nsParser.h b/parser/htmlparser/src/nsParser.h
index c04a3c6657c8..85ca5fbef76c 100644
--- a/parser/htmlparser/src/nsParser.h
+++ b/parser/htmlparser/src/nsParser.h
@@ -86,7 +86,6 @@
 #include "nsIContentSink.h"
 #include "nsIParserFilter.h"
 #include "nsCOMArray.h"
-#include "nsIUnicharStreamListener.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsWeakReference.h"
 
@@ -384,14 +383,6 @@ class nsParser : public nsIParser,
      */
     void HandleParserContinueEvent(class nsParserContinueEvent *);
 
-    /**
-     * Called by top-level scanners when data from necko is added to
-     * the scanner.
-     */
-    nsresult DataAdded(const nsSubstring& aData, nsIRequest *aRequest);
-
-    static nsCOMArray<nsIUnicharStreamListener> *sParserDataListeners;
-
     static nsICharsetAlias* GetCharsetAliasService() {
       return sCharsetAliasService;
     }
diff --git a/parser/htmlparser/src/nsScanner.cpp b/parser/htmlparser/src/nsScanner.cpp
index 4a8e5073316b..b3cad0633a35 100644
--- a/parser/htmlparser/src/nsScanner.cpp
+++ b/parser/htmlparser/src/nsScanner.cpp
@@ -90,7 +90,6 @@ const int   kBufsize=64;
  */
 nsScanner::nsScanner(const nsAString& anHTMLString, const nsACString& aCharset,
                      PRInt32 aSource)
-  : mParser(nsnull)
 {
   MOZ_COUNT_CTOR(nsScanner);
 
@@ -123,7 +122,7 @@ nsScanner::nsScanner(const nsAString& anHTMLString, const nsACString& aCharset,
  */
 nsScanner::nsScanner(nsString& aFilename,PRBool aCreateStream,
                      const nsACString& aCharset, PRInt32 aSource)
-  : mFilename(aFilename), mParser(nsnull)
+  : mFilename(aFilename)
 {
   MOZ_COUNT_CTOR(nsScanner);
   NS_ASSERTION(!aCreateStream, "This is always true.");
@@ -1166,14 +1165,6 @@ PRBool nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf,
                                  nsIRequest *aRequest,
                                  PRInt32 aErrorPos)
 {
-  if (nsParser::sParserDataListeners && mParser &&
-      NS_FAILED(mParser->DataAdded(Substring(aBuf->DataStart(),
-                                             aBuf->DataEnd()), aRequest))) {
-    // Don't actually append on failure.
-
-    return mSlidingBuffer != nsnull;
-  }
-
   PRUint32 countRemaining = mCountRemaining;
   if (!mSlidingBuffer) {
     mSlidingBuffer = new nsScannerString(aBuf);
diff --git a/parser/htmlparser/src/nsScanner.h b/parser/htmlparser/src/nsScanner.h
index 59640b82f9c1..6dd3624b03e5 100644
--- a/parser/htmlparser/src/nsScanner.h
+++ b/parser/htmlparser/src/nsScanner.h
@@ -310,12 +310,6 @@ class nsScanner {
         return mFirstNonWhitespacePosition;
       }
 
-      void SetParser(nsParser *aParser)
-      {
-        mParser = aParser;
-      }
-
-
       /**
        * Override replacement character used by nsIUnicodeDecoder.
        * Default behavior is that it uses nsIUnicodeDecoder's mapping.
@@ -352,7 +346,6 @@ class nsScanner {
       PRInt32         mCharsetSource;
       nsCString       mCharset;
       nsCOMPtr<nsIUnicodeDecoder> mUnicodeDecoder;
-      nsParser        *mParser;
 
   private:
       nsScanner &operator =(const nsScanner &); // Not implemented.

From 2e40645748a6340014738d7b5a49997e52d3d323 Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zackw@panix.com>
Date: Fri, 6 May 2011 08:45:36 -0700
Subject: [PATCH 267/314] Bug 541496 prelim 2: nuke trailing whitespace in
 layout/style/Loader.{h,cpp}. rs=dbaron

---
 layout/style/Loader.cpp | 126 ++++++++++++++++++++--------------------
 layout/style/Loader.h   |   2 +-
 2 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index 5af2cd3bcf64..2ea02b261e2f 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -222,7 +222,7 @@ public:
 
   // mIsCancelled is set to true when a sheet load is stopped by
   // Stop() or StopLoadingSheet() (which was removed in Bug 556446).
-  // SheetLoadData::OnStreamComplete() checks this to avoid parsing 
+  // SheetLoadData::OnStreamComplete() checks this to avoid parsing
   // sheets that have been cancelled and such.
   PRPackedBool               mIsCancelled : 1;
 
@@ -498,7 +498,7 @@ CollectNonAlternates(URIAndPrincipalHashKey *aKey,
 {
   NS_PRECONDITION(aData, "Must have a data");
   NS_PRECONDITION(aClosure, "Must have an array");
-  
+
   // Note that we don't want to affect what the selected style set is,
   // so use PR_TRUE for aHasAlternateRel.
   if (aData->mLoader->IsAlternate(aData->mTitle, PR_TRUE)) {
@@ -521,10 +521,10 @@ Loader::SetPreferredSheet(const nsAString& aTitle)
       doc->GetPreferredStyleSheetSet(currentPreferred);
     }
     NS_ASSERTION(currentPreferred.Equals(aTitle),
-                 "Unexpected argument to SetPreferredSheet");    
+                 "Unexpected argument to SetPreferredSheet");
   }
 #endif
-  
+
   mPreferredSheet = aTitle;
 
   // start any pending alternates that aren't alternates anymore
@@ -613,7 +613,7 @@ static nsresult GetCharsetFromData(const unsigned char* aStyleSheetData,
     if (aStyleSheetData[pos] == '"') {
       break;
     }
-    
+
     // casting to avoid ambiguities
     charset.Append(char(aStyleSheetData[pos]));
     pos += step;
@@ -709,14 +709,14 @@ SheetLoadData::OnDetermineCharset(nsIUnicharStreamLoader* aLoader,
     }
 #endif
   }
-  
+
   if (aCharset.IsEmpty() && mLoader->mDocument) {
     // no useful data on charset.  Try the document charset.
     aCharset = mLoader->mDocument->GetDocumentCharacterSet();
 #ifdef PR_LOGGING
     LOG(("  Set from document: %s", PromiseFlatCString(aCharset).get()));
 #endif
-  }      
+  }
 
   if (aCharset.IsEmpty()) {
     NS_WARNING("Unable to determine charset for sheet, using ISO-8859-1!");
@@ -761,14 +761,14 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
     // this data and a likely crash.
     return NS_OK;
   }
-  
+
   if (!mLoader->mDocument && !mIsNonDocumentSheet) {
     // Sorry, we don't care about this load anymore
     LOG_WARN(("  No document and not non-document sheet; dropping load"));
     mLoader->SheetComplete(this, NS_BINDING_ABORTED);
     return NS_OK;
   }
-  
+
   if (NS_FAILED(aStatus)) {
     LOG_WARN(("  Load failed: status 0x%x", aStatus));
     mLoader->SheetComplete(this, aStatus);
@@ -782,7 +782,7 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
     mLoader->SheetComplete(this, result);
     return NS_OK;
   }
-  
+
   nsCOMPtr<nsIURI> originalURI;
   channel->GetOriginalURI(getter_AddRefs(originalURI));
 
@@ -813,14 +813,14 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
     mLoader->SheetComplete(this, result);
     return NS_OK;
   }
-  
+
   mSheet->SetPrincipal(principal);
-  
+
 #ifdef MOZ_TIMELINE
   NS_TIMELINE_OUTDENT();
   NS_TIMELINE_MARK_CHANNEL("SheetLoadData::OnStreamComplete(%s)", channel);
 #endif // MOZ_TIMELINE
-  
+
   // If it's an HTTP channel, we want to make sure this is not an
   // error document we got.
   nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
@@ -926,7 +926,7 @@ Loader::IsAlternate(const nsAString& aTitle, PRBool aHasAlternateRel)
   if (aTitle.IsEmpty()) {
     return PR_FALSE;
   }
-  
+
   if (!aHasAlternateRel && mDocument && mPreferredSheet.IsEmpty()) {
     // There's no preferred set yet, and we now have a sheet with a title.
     // Make that be the preferred set.
@@ -940,7 +940,7 @@ Loader::IsAlternate(const nsAString& aTitle, PRBool aHasAlternateRel)
 
 /**
  * CheckLoadAllowed will return success if the load is allowed,
- * failure otherwise. 
+ * failure otherwise.
  *
  * @param aSourcePrincipal the principal of the node or document or parent
  *                         sheet loading the sheet
@@ -956,7 +956,7 @@ Loader::CheckLoadAllowed(nsIPrincipal* aSourcePrincipal,
   LOG(("css::Loader::CheckLoadAllowed"));
 
   nsresult rv;
-  
+
   if (aSourcePrincipal) {
     // Check with the security manager
     nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
@@ -1015,11 +1015,11 @@ Loader::CreateSheet(nsIURI* aURI,
                    (mLoadingDatas.IsInitialized() || mLoadingDatas.Init()) &&
                    (mPendingDatas.IsInitialized() || mPendingDatas.Init()),
                  NS_ERROR_OUT_OF_MEMORY);
-  
+
   nsresult rv = NS_OK;
   *aSheet = nsnull;
   aSheetState = eSheetStateUnknown;
-  
+
   if (aURI) {
     aSheetState = eSheetComplete;
     nsRefPtr<nsCSSStyleSheet> sheet;
@@ -1040,11 +1040,11 @@ Loader::CreateSheet(nsIURI* aURI,
     if (!sheet) {
       // Then our per-document complete sheets.
       URIAndPrincipalHashKey key(aURI, aLoaderPrincipal);
-      
+
       mCompleteSheets.Get(&key, getter_AddRefs(sheet));
       LOG(("  From completed: %p", sheet.get()));
     }
-    
+
     if (sheet) {
       // This sheet came from the XUL cache or our per-document hashtable; it
       // better be a complete sheet.
@@ -1139,7 +1139,7 @@ Loader::CreateSheet(nsIURI* aURI,
   NS_ASSERTION(*aSheet, "We should have a sheet by now!");
   NS_ASSERTION(aSheetState != eSheetStateUnknown, "Have to set a state!");
   LOG(("  State: %s", gStateStrings[aSheetState]));
-  
+
   return NS_OK;
 }
 
@@ -1184,7 +1184,7 @@ Loader::PrepareSheet(nsCSSStyleSheet* aSheet,
   if (aIsAlternate) {
     *aIsAlternate = alternate;
   }
-  return NS_OK;    
+  return NS_OK;
 }
 
 /**
@@ -1231,7 +1231,7 @@ Loader::InsertSheetInDoc(nsCSSStyleSheet* aSheet,
     domSheet->GetOwnerNode(getter_AddRefs(sheetOwner));
     if (sheetOwner && !aLinkingContent) {
       // Keep moving; all sheets with a sheetOwner come after all
-      // sheets without a linkingNode 
+      // sheets without a linkingNode
       continue;
     }
 
@@ -1254,7 +1254,7 @@ Loader::InsertSheetInDoc(nsCSSStyleSheet* aSheet,
   }
 
   ++insertionPoint; // adjust the index to the spot we want to insert in
-  
+
   // XXX <meta> elements do not implement nsIStyleSheetLinkingElement;
   // need to fix this for them to be ordered correctly.
   nsCOMPtr<nsIStyleSheetLinkingElement>
@@ -1293,7 +1293,7 @@ Loader::InsertChildSheet(nsCSSStyleSheet* aSheet,
   // child sheets should always start out enabled, even if they got
   // cloned off of top-level sheets which were disabled
   aSheet->SetEnabled(PR_TRUE);
-  
+
   aParentSheet->AppendStyleSheet(aSheet);
   aParentRule->SetSheet(aSheet); // This sets the ownerRule on the sheet
 
@@ -1331,8 +1331,8 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
 #endif
 
   LOG_URI("  Load from: '%s'", aLoadData->mURI);
-  
-  nsresult rv = NS_OK;  
+
+  nsresult rv = NS_OK;
 
   if (!mDocument && !aLoadData->mIsNonDocumentSheet) {
     // No point starting the load; just release all the data and such.
@@ -1360,7 +1360,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
     }
 
     NS_ASSERTION(channel, "NS_OpenURI lied?");
-    
+
     // Get the principal for this sheet
     nsCOMPtr<nsIPrincipal> principal;
     if (aLoadData->mUseSystemPrincipal) {
@@ -1379,9 +1379,9 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
 
     aLoadData->mSheet->SetPrincipal(principal);
 
-    nsCOMPtr<nsIConverterInputStream> converterStream = 
+    nsCOMPtr<nsIConverterInputStream> converterStream =
       do_CreateInstance("@mozilla.org/intl/converter-input-stream;1", &rv);
-    
+
     if (NS_FAILED(rv)) {
       LOG_ERROR(("  Failed to create converter stream"));
       SheetComplete(aLoadData, rv);
@@ -1397,7 +1397,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
                                8192,
                                nsIConverterInputStream::
                                     DEFAULT_REPLACEMENT_CHARACTER);
-    
+
     if (NS_FAILED(rv)) {
       LOG_ERROR(("  Failed to initialize converter stream"));
       SheetComplete(aLoadData, rv);
@@ -1421,7 +1421,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
     mPendingDatas.Get(&key, &existingData);
     NS_ASSERTION(existingData, "CreateSheet lied about the state");
   }
-  
+
   if (existingData) {
     LOG(("  Glomming on to existing load"));
     SheetLoadData* data = existingData;
@@ -1473,13 +1473,13 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
   NS_TIMELINE_MARK_URI("Loading style sheet: %s", aLoadData->mURI);
   NS_TIMELINE_INDENT();
 #endif
-  
+
   nsCOMPtr<nsIChannel> channel;
   rv = NS_NewChannel(getter_AddRefs(channel),
                      aLoadData->mURI, nsnull, loadGroup, nsnull,
                      nsIChannel::LOAD_NORMAL | nsIChannel::LOAD_CLASSIFY_URI,
                      channelPolicy);
-  
+
   if (NS_FAILED(rv)) {
 #ifdef DEBUG
     mSyncCallback = PR_FALSE;
@@ -1543,9 +1543,9 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
     SheetComplete(aLoadData, NS_ERROR_OUT_OF_MEMORY);
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  
+
   aLoadData->mIsLoading = PR_TRUE;
-  
+
   return NS_OK;
 }
 
@@ -1629,7 +1629,7 @@ Loader::SheetComplete(SheetLoadData* aLoadData, nsresult aStatus)
   mDatasToNotifyOn += count;
   for (PRUint32 i = 0; i < count; ++i) {
     --mDatasToNotifyOn;
-    
+
     SheetLoadData* data = datasToNotify[i];
     NS_ASSERTION(data && data->mMustNotify, "How did this data get here?");
     if (data->mObserver) {
@@ -1684,7 +1684,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
       aLoadData->mIsLoading = PR_FALSE;
     }
   }
-  
+
   // Go through and deal with the whole linked list.
   SheetLoadData* data = aLoadData;
   while (data) {
@@ -1714,7 +1714,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
         !mParsingDatas.Contains(data->mParentData)) {
       DoSheetComplete(data->mParentData, aStatus, aDatasToNotify);
     }
-    
+
     data = data->mNext;
   }
 
@@ -1745,7 +1745,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
 
 nsresult
 Loader::LoadInlineStyle(nsIContent* aElement,
-                        nsIUnicharInputStream* aStream, 
+                        nsIUnicharInputStream* aStream,
                         PRUint32 aLineNumber,
                         const nsAString& aTitle,
                         const nsAString& aMedia,
@@ -1768,7 +1768,6 @@ Loader::LoadInlineStyle(nsIContent* aElement,
 
   nsCOMPtr<nsIStyleSheetLinkingElement> owningElement(do_QueryInterface(aElement));
   NS_ASSERTION(owningElement, "Element is not a style linking element!");
-  
 
   // Since we're not planning to load a URI, no need to hand a principal to the
   // load data or to CreateSheet().
@@ -1783,12 +1782,12 @@ Loader::LoadInlineStyle(nsIContent* aElement,
   rv = PrepareSheet(sheet, aTitle, aMedia, nsnull, PR_FALSE,
                     aIsAlternate);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   LOG(("  Sheet is alternate: %d", *aIsAlternate));
-  
+
   rv = InsertSheetInDoc(sheet, aElement, mDocument);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   SheetLoadData* data = new SheetLoadData(this, aTitle, nsnull, sheet,
                                           owningElement, *aIsAlternate,
                                           aObserver, nsnull);
@@ -1812,11 +1811,11 @@ Loader::LoadInlineStyle(nsIContent* aElement,
     data->mMustNotify = PR_TRUE;
   }
   return rv;
-}        
+}
 
 nsresult
 Loader::LoadStyleLink(nsIContent* aElement,
-                      nsIURI* aURL, 
+                      nsIURI* aURL,
                       const nsAString& aTitle,
                       const nsAString& aMedia,
                       PRBool aHasAlternateRel,
@@ -1836,7 +1835,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
     LOG_WARN(("  Not enabled"));
     return NS_ERROR_NOT_AVAILABLE;
   }
-  
+
   NS_ENSURE_TRUE(mDocument, NS_ERROR_NOT_INITIALIZED);
 
   nsIPrincipal* principal =
@@ -1850,7 +1849,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
   if (NS_FAILED(rv)) return rv;
 
   LOG(("  Passed load check"));
-  
+
   StyleSheetState state;
   nsRefPtr<nsCSSStyleSheet> sheet;
   rv = CreateSheet(aURL, aElement, principal, PR_FALSE, state,
@@ -1862,7 +1861,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
   NS_ENSURE_SUCCESS(rv, rv);
 
   LOG(("  Sheet is alternate: %d", *aIsAlternate));
-  
+
   rv = InsertSheetInDoc(sheet, aElement, mDocument);
   NS_ENSURE_SUCCESS(rv, rv);
 
@@ -1913,7 +1912,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
 
 nsresult
 Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
-                       nsIURI* aURL, 
+                       nsIURI* aURL,
                        nsMediaList* aMedia,
                        ImportRule* aParentRule)
 {
@@ -1925,7 +1924,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
     LOG_WARN(("  Not enabled"));
     return NS_ERROR_NOT_AVAILABLE;
   }
-  
+
   LOG_URI("  Child uri: '%s'", aURL);
 
   nsCOMPtr<nsIDOMNode> owningNode;
@@ -1956,7 +1955,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
   if (NS_FAILED(rv)) return rv;
 
   LOG(("  Passed load check"));
-  
+
   SheetLoadData* parentData = nsnull;
   nsCOMPtr<nsICSSLoaderObserver> observer;
 
@@ -1998,10 +1997,10 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
   const nsSubstring& empty = EmptyString();
   rv = PrepareSheet(sheet, empty, empty, aMedia);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   rv = InsertChildSheet(sheet, aParentSheet, aParentRule);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   if (state == eSheetComplete) {
     LOG(("  Sheet already complete"));
     // We're completely done.  No need to notify, even, since the
@@ -2010,7 +2009,6 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
     return NS_OK;
   }
 
-  
   SheetLoadData* data = new SheetLoadData(this, aURL, sheet, parentData,
                                           observer, principal);
 
@@ -2030,7 +2028,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
   if (!syncLoad) {
     data->mMustNotify = PR_TRUE;
   }
-  return rv;  
+  return rv;
 }
 
 nsresult
@@ -2071,7 +2069,7 @@ Loader::LoadSheet(nsIURI* aURL,
 }
 
 nsresult
-Loader::InternalLoadNonDocumentSheet(nsIURI* aURL, 
+Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
                                      PRBool aAllowUnsafeRules,
                                      PRBool aUseSystemPrincipal,
                                      nsIPrincipal* aOriginPrincipal,
@@ -2086,11 +2084,11 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
   NS_ASSERTION(mParsingDatas.Length() == 0, "We're in the middle of a parse?");
 
   LOG_URI("  Non-document sheet uri: '%s'", aURL);
-  
+
   if (aSheet) {
     *aSheet = nsnull;
   }
-  
+
   if (!mEnabled) {
     LOG_WARN(("  Not enabled"));
     return NS_ERROR_NOT_AVAILABLE;
@@ -2104,7 +2102,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
   StyleSheetState state;
   nsRefPtr<nsCSSStyleSheet> sheet;
   PRBool syncLoad = (aObserver == nsnull);
-  
+
   rv = CreateSheet(aURL, nsnull, aOriginPrincipal, syncLoad, state,
                    getter_AddRefs(sheet));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2112,7 +2110,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
   const nsSubstring& empty = EmptyString();
   rv = PrepareSheet(sheet, empty, empty, nsnull);
   NS_ENSURE_SUCCESS(rv, rv);
-  
+
   if (state == eSheetComplete) {
     LOG(("  Sheet already complete"));
     if (aObserver) {
@@ -2133,7 +2131,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
     sheet->SetComplete();
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  
+
   NS_ADDREF(data);
   rv = LoadSheet(data, state);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2220,7 +2218,7 @@ StopLoadingSheetCallback(URIAndPrincipalHashKey* aKey,
 
   aData->mIsLoading = PR_FALSE; // we will handle the removal right here
   aData->mIsCancelled = PR_TRUE;
-  
+
   static_cast<Loader::LoadDataArray*>(aClosure)->AppendElement(aData);
 
   return PL_DHASH_REMOVE;
@@ -2234,7 +2232,7 @@ Loader::Stop()
   PRUint32 loadingCount =
     mLoadingDatas.IsInitialized() ? mLoadingDatas.Count() : 0;
   LoadDataArray arr(pendingCount + loadingCount + mPostedEvents.Length());
-  
+
   if (pendingCount) {
     mPendingDatas.Enumerate(StopLoadingSheetCallback, &arr);
   }
diff --git a/layout/style/Loader.h b/layout/style/Loader.h
index 0b1003219785..b7b3e97ef5b9 100644
--- a/layout/style/Loader.h
+++ b/layout/style/Loader.h
@@ -315,7 +315,7 @@ public:
 
   /**
    * nsresult Loader::StopLoadingSheet(nsIURI* aURL), which notifies the
-   * nsICSSLoaderObserver with NS_BINDING_ABORTED, was removed in Bug 556446. 
+   * nsICSSLoaderObserver with NS_BINDING_ABORTED, was removed in Bug 556446.
    * It can be found in revision 2c44a32052ad.
    */
 

From 280fe3f70b48a7a7538e669cd58f07b0e77afe87 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 09:37:45 -0700
Subject: [PATCH 268/314] Bug 654904 - Fix tap highlight regression from bug
 653009 [r=wesj]

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

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index 296975c1e0cd..fc026483b5a0 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -1640,6 +1640,7 @@ const ContentTouchHandler = {
     document.addEventListener("TapLong", this, false);
     document.addEventListener("TapMove", this, false);
 
+    document.addEventListener("PanBegin", this, false);
     document.addEventListener("PopupChanged", this, false);
     document.addEventListener("CancelTouchSequence", this, false);
 
@@ -1665,6 +1666,9 @@ const ContentTouchHandler = {
       return;
 
     switch (aEvent.type) {
+      case "PanBegin":
+        getBrowser().messageManager.sendAsyncMessage("Browser:MouseCancel", {});
+        break;
       case "PopupChanged":
       case "CancelTouchSequence":
         this._clearPendingMessages();

From 818cd0bd77e8ebb1b31bce78b6343137eb4fc6ad Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 5 May 2011 09:37:53 -0700
Subject: [PATCH 269/314] Bug 654127 (followup) - Cache
 "contentMightCaptureMouse" attribute per tab instead of globally [r=wesj]

---
 mobile/chrome/content/browser.js | 27 +++++++++++++--------------
 mobile/chrome/content/content.js |  3 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js
index fc026483b5a0..26773f810fae 100644
--- a/mobile/chrome/content/browser.js
+++ b/mobile/chrome/content/browser.js
@@ -362,6 +362,7 @@ var Browser = {
     }
 
     messageManager.addMessageListener("Browser:ViewportMetadata", this);
+    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
     messageManager.addMessageListener("Browser:FormSubmit", this);
     messageManager.addMessageListener("Browser:KeyPress", this);
     messageManager.addMessageListener("Browser:ZoomToPoint:Return", this);
@@ -1133,14 +1134,19 @@ var Browser = {
     let browser = aMessage.target;
 
     switch (aMessage.name) {
-      case "Browser:ViewportMetadata":
+      case "Browser:ViewportMetadata": {
         let tab = this.getTabForBrowser(browser);
         // Some browser such as iframes loaded dynamically into the chrome UI
         // does not have any assigned tab
         if (tab)
           tab.updateViewportMetadata(json);
         break;
-
+      }
+      case "Browser:CanCaptureMouse:Return": {
+        let tab = this.getTabForBrowser(browser);
+        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
+        break;
+      }
       case "Browser:FormSubmit":
         browser.lastLocation = null;
         break;
@@ -1541,7 +1547,7 @@ Browser.WebProgress.prototype = {
       aTab.updateThumbnail();
 
       browser.messageManager.addMessageListener("MozScrolledAreaChanged", aTab.scrolledAreaChanged);
-      ContentTouchHandler.updateContentCapture();
+      aTab.updateContentCapture();
     });
   }
 };
@@ -1657,7 +1663,6 @@ const ContentTouchHandler = {
     messageManager.addMessageListener("Browser:ContextMenu", this);
     messageManager.addMessageListener("Browser:Highlight", this);
     messageManager.addMessageListener("Browser:CaptureEvents", this);
-    messageManager.addMessageListener("Browser:CanCaptureMouse:Return", this);
   },
 
   handleEvent: function handleEvent(aEvent) {
@@ -1721,11 +1726,6 @@ const ContentTouchHandler = {
     }
   },
 
-  updateContentCapture: function() {
-    this._messageId++;
-    messageManager.sendAsyncMessage("Browser:CanCaptureMouse", { messageId: this._messageId });
-  },
-
   receiveMessage: function receiveMessage(aMessage) {
     let json = aMessage.json;
     if (json.messageId != this._messageId)
@@ -1760,11 +1760,6 @@ const ContentTouchHandler = {
           Elements.browsers.customDragger.contentMouseCapture = this.panningPrevented;
         break;
       }
-      case "Browser:CanCaptureMouse:Return": {
-        let tab = Browser.getTabForBrowser(aMessage.target);
-        tab.contentMightCaptureMouse = json.contentMightCaptureMouse;
-        break;
-      }
     }
   },
 
@@ -2961,6 +2956,10 @@ Tab.prototype = {
     return this._browser.getAttribute("type") == "content-primary";
   },
 
+  updateContentCapture: function() {
+    this._browser.messageManager.sendAsyncMessage("Browser:CanCaptureMouse", {});
+  },
+
   toString: function() {
     return "[Tab " + (this._browser ? this._browser.currentURI.spec : "(no browser)") + "]";
   }
diff --git a/mobile/chrome/content/content.js b/mobile/chrome/content/content.js
index 10e5cc3dc4a5..6d6379cb2da6 100644
--- a/mobile/chrome/content/content.js
+++ b/mobile/chrome/content/content.js
@@ -597,8 +597,7 @@ let Content = {
 
       case "Browser:CanCaptureMouse": {
         sendAsyncMessage("Browser:CanCaptureMouse:Return", {
-          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners,
-          messageId: json.messageId
+          contentMightCaptureMouse: content.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils).mayHaveTouchEventListeners
         });
         break;
       }

From 072a32717ac6dac089f81e5ca3168830aab72bcb Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 09:40:04 -0700
Subject: [PATCH 270/314] Bug 654736 - Remove WinCE code from XULRunner;
 r=mfinkle

---
 xulrunner/Makefile.in             |  2 +-
 xulrunner/app/Makefile.in         |  8 +---
 xulrunner/app/nsXULRunnerApp.cpp  |  2 +-
 xulrunner/stub/Makefile.in        |  6 +--
 xulrunner/stub/nsXULStub.cpp      | 77 +------------------------------
 xulrunner/tools/redit/Makefile.in |  8 ----
 6 files changed, 7 insertions(+), 96 deletions(-)

diff --git a/xulrunner/Makefile.in b/xulrunner/Makefile.in
index 46406ba3ee67..0af55ea73f14 100644
--- a/xulrunner/Makefile.in
+++ b/xulrunner/Makefile.in
@@ -56,7 +56,7 @@ DIRS += installer/windows
 endif
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 PARALLEL_DIRS += tools/redit
 endif
 
diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in
index 477d4117f249..55fa9eea6d71 100644
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -54,7 +54,7 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
 
 DEFINES += -DAB_CD=$(AB_CD)
 
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 PROGRAM = xulrunner$(BIN_SUFFIX)
 else
 PROGRAM = xulrunner-bin$(BIN_SUFFIX)
@@ -116,12 +116,8 @@ include $(topsrcdir)/config/config.mk
 ifdef _MSC_VER
 # Always enter a Windows program through wmain, whether or not we're
 # a console application.
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
@@ -175,7 +171,7 @@ endif
 endif
 endif
 
-ifneq (,$(filter-out OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
 ifeq (unix, $(MOZ_FS_LAYOUT))
 
 xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
diff --git a/xulrunner/app/nsXULRunnerApp.cpp b/xulrunner/app/nsXULRunnerApp.cpp
index d7a29df7bbbc..7cc993f25875 100644
--- a/xulrunner/app/nsXULRunnerApp.cpp
+++ b/xulrunner/app/nsXULRunnerApp.cpp
@@ -74,7 +74,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
   char *msg = PR_vsmprintf(fmt, ap);
   if (msg)
   {
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 675afe930a0b..37ac92efbc43 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -73,7 +73,7 @@ LIBS            += \
 		$(NULL)
 endif
 
-ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 RCINCLUDE = xulrunner-stub.rc
 ifndef GNU_CC
 RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
@@ -94,12 +94,8 @@ endif
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
-ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
-else
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
-endif
 
 LIBS += $(JEMALLOC_LIBS)
 
diff --git a/xulrunner/stub/nsXULStub.cpp b/xulrunner/stub/nsXULStub.cpp
index 3ebbd81f315a..49ce073d4e67 100644
--- a/xulrunner/stub/nsXULStub.cpp
+++ b/xulrunner/stub/nsXULStub.cpp
@@ -86,7 +86,7 @@ static void Output(PRBool isError, const char *fmt, ... )
   va_list ap;
   va_start(ap, fmt);
 
-#if (defined(XP_WIN) && !MOZ_WINCONSOLE) || defined(WINCE)
+#if (defined(XP_WIN) && !MOZ_WINCONSOLE)
   char msg[2048];
 
   vsnprintf(msg, sizeof(msg), fmt, ap);
@@ -191,43 +191,6 @@ XRE_CreateAppDataType XRE_CreateAppData;
 XRE_FreeAppDataType XRE_FreeAppData;
 XRE_mainType XRE_main;
 
-
-#ifdef WINCE
-void
-ForwardToWindow(HWND wnd) {
-  // For WinCE, we're stuck with providing our own argv[0] for the remote
-  // command-line.
-  WCHAR wPath[MAX_PATH] = L"dummy ";
-  WCHAR *wCmd = ::GetCommandLineW();
-  WCHAR wCwd[MAX_PATH];
-  _wgetcwd(wCwd, MAX_PATH);
-
-  // Construct a narrow UTF8 buffer <path> <commandline>\0<workingdir>\0
-  size_t len = wcslen(wPath) + wcslen(wCmd) + wcslen(wCwd) + 2;
-  WCHAR *wMsg = (WCHAR *)malloc(len * sizeof(*wMsg));
-  wcscpy(wMsg, wPath);
-  wcscpy(wMsg + wcslen(wPath), wCmd);                // The command line
-  wcscpy(wMsg + wcslen(wPath) + wcslen(wCmd) + 1, wCwd); // Working dir
-
-  // Then convert to UTF-8, assuming worst-case explosion of characters
-  char *msg = (char *)malloc(len * 4);
-  WideCharToMultiByte(CP_UTF8, 0, wMsg, len, msg, len * 4, NULL, NULL);
-
-  // We used to set dwData to zero, when we didn't send the working dir.
-  // Now we're using it as a version number.
-  COPYDATASTRUCT cds = { 1, len, (void *)msg };
-
-  // Bring the already running Mozilla process to the foreground.
-  // nsWindow will restore the window (if minimized) and raise it.
-  // for activating the existing window on wince we need "| 0x01"
-  // see http://msdn.microsoft.com/en-us/library/ms940024.aspx for details
-  ::SetForegroundWindow((HWND)(((ULONG) wnd) | 0x01));
-  ::SendMessage(wnd, WM_COPYDATA, 0, (LPARAM)&cds);
-  free(wMsg);
-  free(msg);
-}
-#endif
-
 int
 main(int argc, char **argv)
 {
@@ -399,41 +362,6 @@ main(int argc, char **argv)
     return 1;
   }
 
-#ifdef WINCE
-  // On Windows Mobile and WinCE, we can save a lot of time by not
-  // waiting for XUL and XPCOM to load up.  Let's see if we can find
-  // an existing app window to forward our command-line to now.
-
-  // Shouldn't attempt this if the -no-remote parameter has been provided.
-  bool noRemote = false;
-  for (int i = 1; i < argc; i++) {
-    if (IsArg(argv[i], "no-remote")) {
-      noRemote = true;
-      break;
-    }
-  }
-
-  if (!noRemote) {
-    char windowName[512];  // Is there a const for appname like VERSION_MAXLEN?
-    rv = parser.GetString("App", "Name", windowName, sizeof(windowName));
-    if (NS_FAILED(rv)) {
-      fprintf(stderr, "Couldn't figure out the application name\n");
-      return 1;
-    }
-
-    // Lookup the hidden message window created by nsNativeAppSupport
-    strncat(windowName, "MessageWindow", sizeof(windowName) - strlen(windowName));
-    WCHAR wWindowName[512];
-    MultiByteToWideChar(CP_UTF8, 0, windowName, -1, wWindowName, sizeof(wWindowName));
-    HWND wnd = ::FindWindowW(wWindowName, NULL);
-    if (wnd) {
-      // Forward the command-line and bail out
-      ForwardToWindow(wnd);
-      return 0;
-    }
-  }
-#endif
-
   if (!greFound) {
     Output(PR_FALSE,
            "Could not find the Mozilla runtime.\n");
@@ -483,8 +411,7 @@ main(int argc, char **argv)
   { // Scope COMPtr and AutoAppData
     nsCOMPtr<nsILocalFile> iniFile;
 #ifdef XP_WIN
-    // On Windows and Windows CE, iniPath is UTF-8 encoded,
-    // so we need to convert it.
+    // On Windows iniPath is UTF-8 encoded so we need to convert it.
     rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(iniPath), PR_FALSE,
                          getter_AddRefs(iniFile));
 #else
diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in
index e9e854e1cb09..1614d6837fcf 100644
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@@ -52,12 +52,4 @@ SDK_BINARY =  \
 	$(NULL)
 endif
 
-ifeq ($(OS_ARCH),WINCE)
-HOST_CPPSRCS = redit.cpp
-HOST_PROGRAM = redit$(BIN_SUFFIX)
-SDK_BINARY   =  \
-	$(HOST_PROGRAM) \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk

From d214a8ee0122ecf1d459aad799559d292d49bbe4 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Thu, 5 May 2011 09:40:21 -0700
Subject: [PATCH 271/314] Bug 654600 - Remove WinCE code from
 security/manager/Makefile.in; r=kaie

---
 security/manager/Makefile.in | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 8bde1ed128b9..5155c518d070 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -68,7 +68,7 @@ NSSDBM3_CHK =
 endif
 
 ifndef MOZ_NATIVE_NSS
-ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \
@@ -162,11 +162,8 @@ ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_MEMORY))
 export DLLFLAGS
 endif
 
-ifndef WINCE
-# why is this disabled on WINCE?  See bug 514295.
 # To get debug symbols from NSS
 export MOZ_DEBUG_SYMBOLS
-endif
 
 ifdef .PYMAKE
 NSSMAKE = $(GMAKE)
@@ -246,24 +243,6 @@ DEFAULT_GMAKE_FLAGS += PROGRAMS=
 
 ifdef CROSS_COMPILE
 
-ifdef WINCE
-DEFAULT_GMAKE_FLAGS += \
-	NATIVE_CC="$(HOST_CC)" \
-	CC="$(CC)" \
-	CCC="$(CC)" \
-	LINK="$(LD)" \
-	LD="$(LD) -DLL" \
-	AS="$(AS) -Cp -Sn -Zi -coff $(INCLUDES)" \
-	AR='$(AR) -NOLOG0 -OUT:$$@' \
-	RANLIB="echo" \
-	RC="$(RC) $(RCFLAGS)" \
-	OS_ARCH="$(OS_ARCH)" \
-	OS_TEST="$(OS_TEST)" \
-	CPU_ARCH="ARM" \
-	USE_MSYS=1 \
-	WINCE=1 \
-	$(NULL)
-else
 DEFAULT_GMAKE_FLAGS += \
 	NATIVE_CC="$(HOST_CC)" \
 	CC="$(CC)" \
@@ -277,7 +256,6 @@ DEFAULT_GMAKE_FLAGS += \
 	OS_TEST="$(OS_TEST)" \
 	CPU_ARCH="$(TARGET_CPU)" \
 	$(NULL)
-endif
 
 # Android has pthreads integrated into -lc, so OS_LIBS is set to nothing
 ifeq ($(OS_TARGET), Android)

From e9af9e5eaa01fe39d807cb31f77f0131ba3b1bad Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 9 May 2011 16:00:29 +0200
Subject: [PATCH 272/314] Fix build bustage.

---
 layout/forms/nsProgressFrame.cpp | 2 +-
 layout/forms/nsProgressFrame.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index f2f05f8e11c6..6c572fdc4342 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -107,7 +107,7 @@ nsProgressFrame::DestroyFrom(nsIFrame* aDestructRoot)
 }
 
 nsresult
-nsProgressFrame::CreateAnonymousContent(nsTArray<nsIContent*>& aElements)
+nsProgressFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
 {
   // Get the NodeInfoManager and tag necessary to create the progress bar div.
   nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
index 8fcae5821221..4ff4ee0ec4d6 100644
--- a/layout/forms/nsProgressFrame.h
+++ b/layout/forms/nsProgressFrame.h
@@ -73,7 +73,7 @@ public:
   virtual PRBool IsLeaf() const { return PR_TRUE; }
 
   // nsIAnonymousContentCreator
-  virtual nsresult CreateAnonymousContent(nsTArray<nsIContent*>& aElements);
+  virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements);
   virtual void AppendAnonymousContentTo(nsBaseContentList& aElements,
                                         PRUint32 aFilter);
 

From 73d26eb9e358db4889dbd9303ef57d5b4cebc026 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 273/314] Bug 653093 - Rename Workspace to Scratchpad; r=l10n

--HG--
rename : browser/base/content/workspace.js => browser/base/content/scratchpad.js
rename : browser/base/content/workspace.xul => browser/base/content/scratchpad.xul
rename : browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js => browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
rename : browser/base/content/test/browser_workspace_contexts.js => browser/base/content/test/browser_scratchpad_contexts.js
rename : browser/base/content/test/browser_workspace_execute_print.js => browser/base/content/test/browser_scratchpad_execute_print.js
rename : browser/base/content/test/browser_workspace_files.js => browser/base/content/test/browser_scratchpad_files.js
rename : browser/base/content/test/browser_workspace_initialization.js => browser/base/content/test/browser_scratchpad_initialization.js
rename : browser/base/content/test/browser_workspace_inspect.js => browser/base/content/test/browser_scratchpad_inspect.js
rename : browser/base/content/test/browser_workspace_ui.js => browser/base/content/test/browser_scratchpad_ui.js
rename : browser/locales/en-US/chrome/browser/workspace.dtd => browser/locales/en-US/chrome/browser/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/workspace.properties => browser/locales/en-US/chrome/browser/scratchpad.properties
---
 browser/app/profile/firefox.js                |   4 +-
 browser/base/content/browser-appmenu.inc      |   8 +-
 browser/base/content/browser-menubar.inc      |  10 +-
 browser/base/content/browser-sets.inc         |   6 +-
 browser/base/content/browser.js               |  26 +-
 .../content/{workspace.js => scratchpad.js}   | 120 +++++-----
 .../content/{workspace.xul => scratchpad.xul} | 222 +++++++++---------
 browser/base/content/test/Makefile.in         |  14 +-
 ...atchpad_bug_646070_chrome_context_pref.js} |  38 +--
 .../test/browser_scratchpad_contexts.js       | 125 ++++++++++
 ...js => browser_scratchpad_execute_print.js} |  76 +++---
 ...e_files.js => browser_scratchpad_files.js} |  48 ++--
 .../test/browser_scratchpad_initialization.js |  63 +++++
 ...spect.js => browser_scratchpad_inspect.js} |  26 +-
 .../content/test/browser_scratchpad_ui.js     |  81 +++++++
 .../test/browser_workspace_contexts.js        | 125 ----------
 .../test/browser_workspace_initialization.js  |  63 -----
 .../base/content/test/browser_workspace_ui.js |  81 -------
 browser/base/jar.mn                           |   4 +-
 .../locales/en-US/chrome/browser/browser.dtd  |  18 +-
 .../browser/{workspace.dtd => scratchpad.dtd} |  13 +-
 ...space.properties => scratchpad.properties} |  10 +-
 browser/locales/jar.mn                        |   4 +-
 23 files changed, 602 insertions(+), 583 deletions(-)
 rename browser/base/content/{workspace.js => scratchpad.js} (83%)
 rename browser/base/content/{workspace.xul => scratchpad.xul} (63%)
 rename browser/base/content/test/{browser_workspace_bug_646070_chrome_context_pref.js => browser_scratchpad_bug_646070_chrome_context_pref.js} (57%)
 create mode 100644 browser/base/content/test/browser_scratchpad_contexts.js
 rename browser/base/content/test/{browser_workspace_execute_print.js => browser_scratchpad_execute_print.js} (51%)
 rename browser/base/content/test/{browser_workspace_files.js => browser_scratchpad_files.js} (73%)
 create mode 100644 browser/base/content/test/browser_scratchpad_initialization.js
 rename browser/base/content/test/{browser_workspace_inspect.js => browser_scratchpad_inspect.js} (67%)
 create mode 100644 browser/base/content/test/browser_scratchpad_ui.js
 delete mode 100644 browser/base/content/test/browser_workspace_contexts.js
 delete mode 100644 browser/base/content/test/browser_workspace_initialization.js
 delete mode 100644 browser/base/content/test/browser_workspace_ui.js
 rename browser/locales/en-US/chrome/browser/{workspace.dtd => scratchpad.dtd} (82%)
 rename browser/locales/en-US/chrome/browser/{workspace.properties => scratchpad.properties} (75%)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index a38f9795545a..6a84d745129c 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -992,8 +992,8 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 pref("devtools.errorconsole.enabled", false);
 pref("devtools.inspector.enabled", false);
 
-// Enable the Workspace tool.
-pref("devtools.workspace.enabled", true);
+// Enable the Scratchpad tool.
+pref("devtools.scratchpad.enabled", true);
 
 // Enable tools for Chrome development.
 pref("devtools.chrome.enabled", false);
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index 296b7cd207db..215076659138 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -187,11 +187,11 @@
                     type="checkbox"
                     command="Tools:Inspect"
                     key="key_inspect"/>
-          <menuitem id="appmenu_workspace"
+          <menuitem id="appmenu_scratchpad"
                     hidden="true"
-                    label="&workspace.label;"
-                    key="key_workspace"
-                    command="Tools:Workspace"/>
+                    label="&scratchpad.label;"
+                    key="key_scratchpad"
+                    command="Tools:Scratchpad"/>
           <menuitem id="appmenu_pageSource"
                     label="&viewPageSourceCmd.label;"
                     command="View:PageSource"
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index f9d466eff367..19f4e4892177 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -557,12 +557,12 @@
                         accesskey="&webConsoleCmd.accesskey;"
                         key="key_webConsole"
                         oncommand="HUDConsoleUI.toggleHUD();"/>
-              <menuitem id="menu_workspace"
+              <menuitem id="menu_scratchpad"
                         hidden="true"
-                        label="&workspace.label;"
-                        accesskey="&workspace.accesskey;"
-                        key="key_workspace"
-                        command="Tools:Workspace"/>
+                        label="&scratchpad.label;"
+                        accesskey="&scratchpad.accesskey;"
+                        key="key_scratchpad"
+                        command="Tools:Scratchpad"/>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 59fa6f1bdf9b..e3fd839a9125 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -125,7 +125,7 @@
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
-    <command id="Tools:Workspace" oncommand="Workspace.openWorkspace();" disabled="true"/>
+    <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize"
      oncommand="Cc['@mozilla.org/browser/browserglue;1'].getService(Ci.nsIBrowserGlue).sanitize(window);"/>
@@ -242,8 +242,8 @@
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
     <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();" modifiers="accel,shift"/>
     <key id="key_inspect" key="&inspectMenu.commandkey;" command="Tools:Inspect" modifiers="accel,shift"/>
-    <key id="key_workspace" keycode="&workspace.keycode;"
-         keytext="&workspace.keytext;" command="Tools:Workspace"/>
+    <key id="key_scratchpad" keycode="&scratchpad.keycode;"
+         keytext="&scratchpad.keytext;" command="Tools:Scratchpad"/>
     <key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile"  modifiers="accel"/>
     <key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
     <key id="printKb" key="&printCmd.commandkey;" command="cmd_print"  modifiers="accel"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 57cd949ee32d..a7be03e604a7 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1654,13 +1654,13 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
 #endif
   }
 
-  // Enable Workspace in the UI, if the preference allows this.
-  let workspaceEnabled = gPrefService.getBoolPref(Workspace.prefEnabledName);
-  if (workspaceEnabled) {
-    document.getElementById("menu_workspace").hidden = false;
-    document.getElementById("Tools:Workspace").removeAttribute("disabled");
+  // Enable Scratchpad in the UI, if the preference allows this.
+  let scratchpadEnabled = gPrefService.getBoolPref(Scratchpad.prefEnabledName);
+  if (scratchpadEnabled) {
+    document.getElementById("menu_scratchpad").hidden = false;
+    document.getElementById("Tools:Scratchpad").removeAttribute("disabled");
 #ifdef MENUBAR_CAN_AUTOHIDE
-    document.getElementById("appmenu_workspace").hidden = false;
+    document.getElementById("appmenu_scratchpad").hidden = false;
 #endif
   }
 
@@ -8642,15 +8642,15 @@ function toggleAddonBar() {
   setToolbarVisibility(addonBar, addonBar.collapsed);
 }
 
-var Workspace = {
-  prefEnabledName: "devtools.workspace.enabled",
+var Scratchpad = {
+  prefEnabledName: "devtools.scratchpad.enabled",
 
-  openWorkspace: function WS_openWorkspace() {
-    const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
-    const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+  openScratchpad: function SP_openScratchpad() {
+    const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/scratchpad.xul";
+    const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
-    return Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
-                                  WORKSPACE_WINDOW_FEATURES, null);
+    return Services.ww.openWindow(null, SCRATCHPAD_WINDOW_URL, "_blank",
+                                  SCRATCHPAD_WINDOW_FEATURES, null);
   },
 };
 
diff --git a/browser/base/content/workspace.js b/browser/base/content/scratchpad.js
similarity index 83%
rename from browser/base/content/workspace.js
rename to browser/base/content/scratchpad.js
index e1abf7ce76c9..28215c6d9a12 100644
--- a/browser/base/content/workspace.js
+++ b/browser/base/content/scratchpad.js
@@ -12,7 +12,7 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is Workspace.
+ * The Original Code is Scratchpad.
  *
  * The Initial Developer of the Original Code is
  * The Mozilla Foundation.
@@ -48,40 +48,40 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource:///modules/PropertyPanel.jsm");
 
-const WORKSPACE_CONTEXT_CONTENT = 1;
-const WORKSPACE_CONTEXT_CHROME = 2;
-const WORKSPACE_WINDOW_URL = "chrome://browser/content/workspace.xul";
-const WORKSPACE_L10N = "chrome://browser/locale/workspace.properties";
-const WORKSPACE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
+const SCRATCHPAD_CONTEXT_CONTENT = 1;
+const SCRATCHPAD_CONTEXT_CHROME = 2;
+const SCRATCHPAD_WINDOW_URL = "chrome://browser/content/scratchpad.xul";
+const SCRATCHPAD_L10N = "chrome://browser/locale/scratchpad.properties";
+const SCRATCHPAD_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 const DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
 
 /**
- * The workspace object handles the Workspace window functionality.
+ * The scratchpad object handles the Scratchpad window functionality.
  */
-var Workspace = {
+var Scratchpad = {
   /**
-   * The script execution context. This tells Workspace in which context the
+   * The script execution context. This tells Scratchpad in which context the
    * script shall execute.
    *
    * Possible values:
-   *   - WORKSPACE_CONTEXT_CONTENT to execute code in the context of the current
+   *   - SCRATCHPAD_CONTEXT_CONTENT to execute code in the context of the current
    *   tab content window object.
-   *   - WORKSPACE_CONTEXT_CHROME to execute code in the context of the
+   *   - SCRATCHPAD_CONTEXT_CHROME to execute code in the context of the
    *   currently active chrome window object.
    */
-  executionContext: WORKSPACE_CONTEXT_CONTENT,
+  executionContext: SCRATCHPAD_CONTEXT_CONTENT,
 
   /**
    * Retrieve the xul:textbox DOM element. This element holds the source code
    * the user writes and executes.
    */
-  get textbox() document.getElementById("workspace-textbox"),
+  get textbox() document.getElementById("scratchpad-textbox"),
 
   /**
    * Retrieve the xul:statusbarpanel DOM element. The status bar tells the
    * current code execution context.
    */
-  get statusbarStatus() document.getElementById("workspace-status"),
+  get statusbarStatus() document.getElementById("scratchpad-status"),
 
   /**
    * Get the selected text from the textbox.
@@ -177,20 +177,20 @@ var Workspace = {
   /**
    * Drop the textbox selection.
    */
-  deselect: function WS_deselect()
+  deselect: function SP_deselect()
   {
     this.textbox.selectionEnd = this.textbox.selectionStart;
   },
 
   /**
-   * Select a specific range in the Workspace xul:textbox.
+   * Select a specific range in the Scratchpad xul:textbox.
    *
    * @param number aStart
    *        Selection range start.
    * @param number aEnd
    *        Selection range end.
    */
-  selectRange: function WS_selectRange(aStart, aEnd)
+  selectRange: function SP_selectRange(aStart, aEnd)
   {
     this.textbox.selectionStart = aStart;
     this.textbox.selectionEnd = aEnd;
@@ -204,12 +204,12 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalInContentSandbox: function WS_evalInContentSandbox(aString)
+  evalInContentSandbox: function SP_evalInContentSandbox(aString)
   {
     let result;
     try {
       result = Cu.evalInSandbox(aString, this.contentSandbox, "1.8",
-                                "Workspace", 1);
+                                "Scratchpad", 1);
     }
     catch (ex) {
       this.openWebConsole();
@@ -238,12 +238,12 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalInChromeSandbox: function WS_evalInChromeSandbox(aString)
+  evalInChromeSandbox: function SP_evalInChromeSandbox(aString)
   {
     let result;
     try {
       result = Cu.evalInSandbox(aString, this.chromeSandbox, "1.8",
-                                "Workspace", 1);
+                                "Scratchpad", 1);
     }
     catch (ex) {
       Cu.reportError(ex);
@@ -263,9 +263,9 @@ var Workspace = {
    * @return mixed
    *         The script evaluation result.
    */
-  evalForContext: function WS_evaluateForContext(aString)
+  evalForContext: function SP_evaluateForContext(aString)
   {
-    return this.executionContext == WORKSPACE_CONTEXT_CONTENT ?
+    return this.executionContext == SCRATCHPAD_CONTEXT_CONTENT ?
            this.evalInContentSandbox(aString) :
            this.evalInChromeSandbox(aString);
   },
@@ -274,7 +274,7 @@ var Workspace = {
    * Execute the selected text (if any) or the entire textbox content in the
    * current context.
    */
-  execute: function WS_execute()
+  execute: function SP_execute()
   {
     let selection = this.selectedText || this.textbox.value;
     let result = this.evalForContext(selection);
@@ -287,7 +287,7 @@ var Workspace = {
    * current context. The resulting object is opened up in the Property Panel
    * for inspection.
    */
-  inspect: function WS_inspect()
+  inspect: function SP_inspect()
   {
     let [selection, result] = this.execute();
 
@@ -302,7 +302,7 @@ var Workspace = {
    * the selected text, or at the end of the textbox value if there is no
    * selected text.
    */
-  print: function WS_print()
+  print: function SP_print()
   {
     let selectionStart = this.textbox.selectionStart;
     let selectionEnd = this.textbox.selectionEnd;
@@ -338,7 +338,7 @@ var Workspace = {
    * @return object
    *         The PropertyPanel object instance.
    */
-  openPropertyPanel: function WS_openPropertyPanel(aEvalString, aOutputObject)
+  openPropertyPanel: function SP_openPropertyPanel(aEvalString, aOutputObject)
   {
     let self = this;
     let propPanel;
@@ -375,7 +375,7 @@ var Workspace = {
     propPanel = new PropertyPanel(parent, doc, title, aOutputObject, buttons);
 
     let panel = propPanel.panel;
-    panel.setAttribute("class", "workspace_propertyPanel");
+    panel.setAttribute("class", "scratchpad_propertyPanel");
     panel.openPopup(null, "after_pointer", 0, 0, false, false);
     panel.sizeTo(200, 400);
 
@@ -385,12 +385,12 @@ var Workspace = {
   // Menu Operations
 
   /**
-   * Open a new Workspace window.
+   * Open a new Scratchpad window.
    */
-  openWorkspace: function WS_openWorkspace()
+  openScratchpad: function SP_openScratchpad()
   {
-    Services.ww.openWindow(null, WORKSPACE_WINDOW_URL, "_blank",
-                           WORKSPACE_WINDOW_FEATURES, null);
+    Services.ww.openWindow(null, SCRATCHPAD_WINDOW_URL, "_blank",
+                           SCRATCHPAD_WINDOW_FEATURES, null);
   },
 
   /**
@@ -408,7 +408,7 @@ var Workspace = {
    *        get the following arguments:
    *        1) the nsresult status code for the export operation.
    */
-  exportToFile: function WS_exportToFile(aFile, aNoConfirmation, aSilentError,
+  exportToFile: function SP_exportToFile(aFile, aNoConfirmation, aSilentError,
                                          aCallback)
   {
     if (!aNoConfirmation && aFile.exists() &&
@@ -453,7 +453,7 @@ var Workspace = {
    *        1) the nsresult status code for the import operation.
    *        2) the data that was read from the file, if any.
    */
-  importFromFile: function WS_importFromFile(aFile, aSilentError, aCallback)
+  importFromFile: function SP_importFromFile(aFile, aSilentError, aCallback)
   {
     // Prevent file type detection.
     let channel = NetUtil.newChannel(aFile);
@@ -479,9 +479,9 @@ var Workspace = {
   },
 
   /**
-   * Open a file to edit in the Workspace.
+   * Open a file to edit in the Scratchpad.
    */
-  openFile: function WS_openFile()
+  openFile: function SP_openFile()
   {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(window, this.strings.GetStringFromName("openFile.title"),
@@ -496,7 +496,7 @@ var Workspace = {
   /**
    * Save the textbox content to the currently open file.
    */
-  saveFile: function WS_saveFile()
+  saveFile: function SP_saveFile()
   {
     if (!this.filename) {
       return this.saveFileAs();
@@ -510,12 +510,12 @@ var Workspace = {
   /**
    * Save the textbox content to a new file.
    */
-  saveFileAs: function WS_saveFileAs()
+  saveFileAs: function SP_saveFileAs()
   {
     let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     fp.init(window, this.strings.GetStringFromName("saveFileAs"),
             Ci.nsIFilePicker.modeSave);
-    fp.defaultString = "workspace.js";
+    fp.defaultString = "scratchpad.js";
     if (fp.show() != Ci.nsIFilePicker.returnCancel) {
       document.title = this.filename = fp.file.path;
       this.exportToFile(fp.file);
@@ -525,7 +525,7 @@ var Workspace = {
   /**
    * Open the Error Console.
    */
-  openErrorConsole: function WS_openErrorConsole()
+  openErrorConsole: function SP_openErrorConsole()
   {
     this.browserWindow.toJavaScriptConsole();
   },
@@ -533,7 +533,7 @@ var Workspace = {
   /**
    * Open the Web Console.
    */
-  openWebConsole: function WS_openWebConsole()
+  openWebConsole: function SP_openWebConsole()
   {
     if (!this.browserWindow.HUDConsoleUI.getOpenHUD()) {
       this.browserWindow.HUDConsoleUI.toggleHUD();
@@ -544,33 +544,33 @@ var Workspace = {
   /**
    * Set the current execution context to be the active tab content window.
    */
-  setContentContext: function WS_setContentContext()
+  setContentContext: function SP_setContentContext()
   {
-    let content = document.getElementById("ws-menu-content");
-    document.getElementById("ws-menu-chrome").removeAttribute("checked");
+    let content = document.getElementById("sp-menu-content");
+    document.getElementById("sp-menu-chrome").removeAttribute("checked");
     content.setAttribute("checked", true);
     this.statusbarStatus.label = content.getAttribute("label");
-    this.executionContext = WORKSPACE_CONTEXT_CONTENT;
+    this.executionContext = SCRATCHPAD_CONTEXT_CONTENT;
     this.resetContext();
   },
 
   /**
    * Set the current execution context to be the most recent chrome window.
    */
-  setChromeContext: function WS_setChromeContext()
+  setChromeContext: function SP_setChromeContext()
   {
-    let chrome = document.getElementById("ws-menu-chrome");
-    document.getElementById("ws-menu-content").removeAttribute("checked");
+    let chrome = document.getElementById("sp-menu-chrome");
+    document.getElementById("sp-menu-content").removeAttribute("checked");
     chrome.setAttribute("checked", true);
     this.statusbarStatus.label = chrome.getAttribute("label");
-    this.executionContext = WORKSPACE_CONTEXT_CHROME;
+    this.executionContext = SCRATCHPAD_CONTEXT_CHROME;
     this.resetContext();
   },
 
   /**
    * Reset the cached Cu.Sandbox object for the current context.
    */
-  resetContext: function WS_resetContext()
+  resetContext: function SP_resetContext()
   {
     this._chromeSandbox = null;
     this._contentSandbox = null;
@@ -584,21 +584,21 @@ var Workspace = {
    * @return integer
    *         the outer window ID
    */
-  getWindowId: function HS_getWindowId(aWindow)
+  getWindowId: function SP_getWindowId(aWindow)
   {
     return aWindow.QueryInterface(Ci.nsIInterfaceRequestor).
            getInterface(Ci.nsIDOMWindowUtils).outerWindowID;
   },
 
   /**
-   * The Workspace window DOMContentLoaded event handler.
+   * The Scratchpad window DOMContentLoaded event handler.
    */
-  onLoad: function HS_onLoad()
+  onLoad: function SP_onLoad()
   {
-    let chromeContextMenu = document.getElementById("ws-menu-chrome");
-    let errorConsoleMenu = document.getElementById("ws-menu-errorConsole");
-    let errorConsoleCommand = document.getElementById("ws-cmd-errorConsole");
-    let chromeContextCommand = document.getElementById("ws-cmd-chromeContext");
+    let chromeContextMenu = document.getElementById("sp-menu-chrome");
+    let errorConsoleMenu = document.getElementById("sp-menu-errorConsole");
+    let errorConsoleCommand = document.getElementById("sp-cmd-errorConsole");
+    let chromeContextCommand = document.getElementById("sp-cmd-chromeContext");
 
     let chrome = Services.prefs.getBoolPref(DEVTOOLS_CHROME_ENABLED);
     if (chrome) {
@@ -610,9 +610,9 @@ var Workspace = {
   },
 };
 
-XPCOMUtils.defineLazyGetter(Workspace, "strings", function () {
-  return Services.strings.createBundle(WORKSPACE_L10N);
+XPCOMUtils.defineLazyGetter(Scratchpad, "strings", function () {
+  return Services.strings.createBundle(SCRATCHPAD_L10N);
 });
 
-addEventListener("DOMContentLoaded", Workspace.onLoad.bind(Workspace), false);
+addEventListener("DOMContentLoaded", Scratchpad.onLoad.bind(Scratchpad), false);
 
diff --git a/browser/base/content/workspace.xul b/browser/base/content/scratchpad.xul
similarity index 63%
rename from browser/base/content/workspace.xul
rename to browser/base/content/scratchpad.xul
index 332b5075679a..656954756e96 100644
--- a/browser/base/content/workspace.xul
+++ b/browser/base/content/scratchpad.xul
@@ -13,7 +13,7 @@
    - for the specific language governing rights and limitations under the
    - License.
    -
-   - The Original Code is Workspace.
+   - The Original Code is Scratchpad.
    -
    - The Initial Developer of the Original Code is
    - The Mozilla Foundation.
@@ -40,8 +40,8 @@
    - ***** END LICENSE BLOCK ***** -->
 #endif
 <!DOCTYPE window [
-<!ENTITY % workspaceDTD SYSTEM "chrome://browser/locale/workspace.dtd" >
- %workspaceDTD;
+<!ENTITY % scratchpadDTD SYSTEM "chrome://browser/locale/scratchpad.dtd" >
+ %scratchpadDTD;
 ]>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -49,59 +49,59 @@
 <window id="main-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
-        windowtype="devtools:workspace"
+        windowtype="devtools:scratchpad"
         screenX="4" screenY="4"
         width="640" height="480"
         persist="screenX screenY width height sizemode">
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://browser/content/workspace.js"/>
+<script type="application/javascript" src="chrome://browser/content/scratchpad.js"/>
 
 <commandset id="editMenuCommands"/>
 
-<commandset id="ws-commandset">
-  <command id="ws-cmd-newWindow" oncommand="Workspace.openWorkspace();"/>
-  <command id="ws-cmd-openFile" oncommand="Workspace.openFile();"/>
-  <command id="ws-cmd-save" oncommand="Workspace.saveFile();"/>
-  <command id="ws-cmd-saveas" oncommand="Workspace.saveFileAs();"/>
+<commandset id="sp-commandset">
+  <command id="sp-cmd-newWindow" oncommand="Scratchpad.openScratchpad();"/>
+  <command id="sp-cmd-openFile" oncommand="Scratchpad.openFile();"/>
+  <command id="sp-cmd-save" oncommand="Scratchpad.saveFile();"/>
+  <command id="sp-cmd-saveas" oncommand="Scratchpad.saveFileAs();"/>
 
   <!-- TODO: bug 650340 - implement printFile()
-  <command id="ws-cmd-printFile" oncommand="Workspace.printFile();" disabled="true"/>
+  <command id="sp-cmd-printFile" oncommand="Scratchpad.printFile();" disabled="true"/>
  -->
 
-  <command id="ws-cmd-close" oncommand="window.close();"/>
-  <command id="ws-cmd-execute" oncommand="Workspace.execute();"/>
-  <command id="ws-cmd-inspect" oncommand="Workspace.inspect();"/>
-  <command id="ws-cmd-print" oncommand="Workspace.print();"/>
-  <command id="ws-cmd-contentContext" oncommand="Workspace.setContentContext();"/>
-  <command id="ws-cmd-chromeContext" oncommand="Workspace.setChromeContext();" disabled="true"/>
-  <command id="ws-cmd-resetContext" oncommand="Workspace.resetContext();"/>
-  <command id="ws-cmd-errorConsole" oncommand="Workspace.openErrorConsole();" disabled="true"/>
-  <command id="ws-cmd-webConsole" oncommand="Workspace.openWebConsole();"/>
+  <command id="sp-cmd-close" oncommand="window.close();"/>
+  <command id="sp-cmd-execute" oncommand="Scratchpad.execute();"/>
+  <command id="sp-cmd-inspect" oncommand="Scratchpad.inspect();"/>
+  <command id="sp-cmd-print" oncommand="Scratchpad.print();"/>
+  <command id="sp-cmd-contentContext" oncommand="Scratchpad.setContentContext();"/>
+  <command id="sp-cmd-chromeContext" oncommand="Scratchpad.setChromeContext();" disabled="true"/>
+  <command id="sp-cmd-resetContext" oncommand="Scratchpad.resetContext();"/>
+  <command id="sp-cmd-errorConsole" oncommand="Scratchpad.openErrorConsole();" disabled="true"/>
+  <command id="sp-cmd-webConsole" oncommand="Scratchpad.openWebConsole();"/>
 </commandset>
 
-<keyset id="ws-keyset">
-  <key id="ws-key-window"
+<keyset id="sp-keyset">
+  <key id="sp-key-window"
        key="&newWindowCmd.commandkey;"
-       command="ws-cmd-newWindow"
+       command="sp-cmd-newWindow"
        modifiers="accel"/>
-  <key id="ws-key-open"
+  <key id="sp-key-open"
        key="&openFileCmd.commandkey;"
-       command="ws-cmd-openFile"
+       command="sp-cmd-openFile"
        modifiers="accel"/>
-  <key id="ws-key-save"
+  <key id="sp-key-save"
        key="&saveFileCmd.commandkey;"
-       command="ws-cmd-save"
+       command="sp-cmd-save"
        modifiers="accel"/>
-  <key id="ws-key-close"
+  <key id="sp-key-close"
        key="&closeCmd.key;"
-       command="ws-cmd-close"
+       command="sp-cmd-close"
        modifiers="accel"/>
 
   <!-- TODO: bug 650340 - implement printFile
-  <key id="ws-key-printFile"
+  <key id="sp-key-printFile"
        key="&printCmd.commandkey;"
-       command="ws-cmd-printFile"
+       command="sp-cmd-printFile"
        modifiers="accel"/>
   -->
 
@@ -118,104 +118,104 @@
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
   <key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
   <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
-  <key id="ws-key-execute"
+  <key id="sp-key-execute"
        key="&execute.key;"
-       command="ws-cmd-execute"
+       command="sp-cmd-execute"
        modifiers="accel"/>
-  <key id="ws-key-inspect"
+  <key id="sp-key-inspect"
        key="&inspect.key;"
-       command="ws-cmd-inspect"
+       command="sp-cmd-inspect"
        modifiers="accel"/>
-  <key id="ws-key-print"
+  <key id="sp-key-print"
        key="&print.key;"
-       command="ws-cmd-print"
+       command="sp-cmd-print"
        modifiers="accel"/>
-  <key id="ws-key-errorConsole"
+  <key id="sp-key-errorConsole"
        key="&errorConsoleCmd.commandkey;"
-       command="ws-cmd-errorConsole"
+       command="sp-cmd-errorConsole"
        modifiers="accel,shift"/>
-  <key id="ws-key-webConsole"
+  <key id="sp-key-webConsole"
        key="&webConsoleCmd.commandkey;"
-       command="ws-cmd-webConsole"
+       command="sp-cmd-webConsole"
        modifiers="accel,shift"/>
 </keyset>
 
 
-<menubar id="ws-menubar">
-  <menu id="ws-file-menu" label="&fileMenu.label;"
+<menubar id="sp-menubar">
+  <menu id="sp-file-menu" label="&fileMenu.label;"
         accesskey="&fileMenu.accesskey;">
-    <menupopup id="ws-menu-filepopup">
-      <menuitem id="ws-menu-newworkspace"
+    <menupopup id="sp-menu-filepopup">
+      <menuitem id="sp-menu-newscratchpad"
                 label="&newWindowCmd.label;"
                 accesskey="&newWindowCmd.accesskey;"
-                key="ws-key-window"
-                command="ws-cmd-newWindow"/>
+                key="sp-key-window"
+                command="sp-cmd-newWindow"/>
       <menuseparator/>
-      <menuitem id="ws-menu-open"
+      <menuitem id="sp-menu-open"
                 label="&openFileCmd.label;"
-                command="ws-cmd-openFile"
-                key="ws-key-open"
+                command="sp-cmd-openFile"
+                key="sp-key-open"
                 accesskey="&openFileCmd.accesskey;"/>
-      <menuitem id="ws-menu-save"
+      <menuitem id="sp-menu-save"
                 label="&saveFileCmd.label;"
                 accesskey="&saveFileCmd.accesskey;"
-                key="ws-key-save"
-                command="ws-cmd-save"/>
-      <menuitem id="ws-menu-saveas"
+                key="sp-key-save"
+                command="sp-cmd-save"/>
+      <menuitem id="sp-menu-saveas"
                 label="&saveFileAsCmd.label;"
                 accesskey="&saveFileAsCmd.accesskey;"
-                command="ws-cmd-saveas"/>
+                command="sp-cmd-saveas"/>
       <menuseparator/>
 
       <!-- TODO: bug 650340 - implement printFile
-      <menuitem id="ws-menu-print"
+      <menuitem id="sp-menu-print"
                 label="&printCmd.label;"
                 accesskey="&printCmd.accesskey;"
-                command="ws-cmd-printFile"/>
+                command="sp-cmd-printFile"/>
       <menuseparator/>
       -->
 
-      <menuitem id="ws-menu-close"
+      <menuitem id="sp-menu-close"
                 label="&closeCmd.label;"
-                key="ws-key-close"
+                key="sp-key-close"
                 accesskey="&closeCmd.accesskey;"
-                command="ws-cmd-close"/>
+                command="sp-cmd-close"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-edit-menu" label="&editMenu.label;"
+  <menu id="sp-edit-menu" label="&editMenu.label;"
         accesskey="&editMenu.accesskey;">
-    <menupopup id="ws-menu_editpopup">
-      <menuitem id="ws-menu_undo"
+    <menupopup id="sp-menu_editpopup">
+      <menuitem id="sp-menu_undo"
                 label="&undoCmd.label;"
                 key="key_undo"
                 accesskey="&undoCmd.accesskey;"
                 disabled="true"
                 oncommand="cmd_undo"/>
-      <menuitem id="ws-menu-redo"
+      <menuitem id="sp-menu-redo"
                 label="&redoCmd.label;"
                 key="key_redo"
                 disabled="true"
                 accesskey="&redoCmd.accesskey;"
                 command="cmd_redo"/>
       <menuseparator/>
-      <menuitem id="ws-menu-cut"
+      <menuitem id="sp-menu-cut"
                 label="&cutCmd.label;"
                 key="key_cut"
                 accesskey="&cutCmd.accesskey;"
                 command="cmd_cut"/>
-      <menuitem id="ws-menu-copy"
+      <menuitem id="sp-menu-copy"
                 label="&copyCmd.label;"
                 key="key_copy"
                 accesskey="&copyCmd.accesskey;"
                 command="cmd_copy"/>
-      <menuitem id="ws-menu-paste"
+      <menuitem id="sp-menu-paste"
                 label="&pasteCmd.label;"
                 key="key_paste"
                 accesskey="&pasteCmd.accesskey;"
                 command="cmd_paste"/>
       <menuseparator/>
-      <menuitem id="ws-menu-selectAll"
+      <menuitem id="sp-menu-selectAll"
                 label="&selectAllCmd.label;"
                 key="key_selectAll"
                 accesskey="&selectAllCmd.accesskey;"
@@ -223,82 +223,82 @@
       <menuseparator/>
 
       <!-- TODO: bug 650345 - implement search and replace
-      <menuitem id="ws-menu-find"
+      <menuitem id="sp-menu-find"
                 label="&findOnCmd.label;"
                 accesskey="&findOnCmd.accesskey;"
                 key="key_find"
                 disabled="true"
                 command="cmd_find"/>
-      <menuitem id="ws-menu-findAgain"
+      <menuitem id="sp-menu-findAgain"
                 label="&findAgainCmd.label;"
                 accesskey="&findAgainCmd.accesskey;"
                 key="key_findAgain"
                 disabled="true"
                 command="cmd_findAgain"/>
-      <menuseparator id="ws-execute-separator"/>
+      <menuseparator id="sp-execute-separator"/>
       -->
 
-      <menuitem id="ws-text-execute"
+      <menuitem id="sp-text-execute"
                 label="&execute.label;"
                 accesskey="&execute.accesskey;"
-                key="ws-key-execute"
-                command="ws-cmd-execute"/>
-      <menuitem id="ws-text-inspect"
+                key="sp-key-execute"
+                command="sp-cmd-execute"/>
+      <menuitem id="sp-text-inspect"
                 label="&inspect.label;"
                 accesskey="&inspect.accesskey;"
-                key="ws-key-inspect"
-                command="ws-cmd-inspect"/>
-      <menuitem id="ws-text-print"
+                key="sp-key-inspect"
+                command="sp-cmd-inspect"/>
+      <menuitem id="sp-text-print"
                 label="&print.label;"
                 accesskey="&print.accesskey;"
-                key="ws-key-print"
-                command="ws-cmd-print"/>
+                key="sp-key-print"
+                command="sp-cmd-print"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-context-menu"
+  <menu id="sp-context-menu"
         label="&contextMenu.label;"
         accesskey="&contextMenu.accesskey;">
-    <menupopup id="ws-menu-context">
-      <menuitem id="ws-menu-content"
+    <menupopup id="sp-menu-context">
+      <menuitem id="sp-menu-content"
                 label="&contentContext.label;"
                 accesskey="&contentContext.accesskey;"
-                command="ws-cmd-contentContext"
+                command="sp-cmd-contentContext"
                 checked="true"
                 type="radio"/>
-      <menuitem id="ws-menu-chrome" hidden="true"
-                command="ws-cmd-chromeContext"
+      <menuitem id="sp-menu-chrome" hidden="true"
+                command="sp-cmd-chromeContext"
                 label="&chromeContext.label;"
                 accesskey="&chromeContext.accesskey;"
                 type="radio"/>
       <menuseparator/>
-      <menuitem id="ws-menu-resetContext"
-                command="ws-cmd-resetContext"
+      <menuitem id="sp-menu-resetContext"
+                command="sp-cmd-resetContext"
                 label="&resetContext.label;"
                 accesskey="&resetContext.accesskey;"/>
     </menupopup>
   </menu>
 
-  <menu id="ws-tools-menu"
+  <menu id="sp-tools-menu"
         label="&toolsMenu.label;"
         accesskey="&toolsMenu.accesskey;">
-    <menupopup id="ws-menu-tools">
-      <menuitem id="ws-menu-errorConsole" hidden="true"
+    <menupopup id="sp-menu-tools">
+      <menuitem id="sp-menu-errorConsole" hidden="true"
                 label="&errorConsoleCmd.label;"
                 accesskey="&errorConsoleCmd.accesskey;"
-                key="ws-key-errorConsole"
-                command="ws-cmd-errorConsole"/>
-      <menuitem id="ws-menu-webConsole"
+                key="sp-key-errorConsole"
+                command="sp-cmd-errorConsole"/>
+      <menuitem id="sp-menu-webConsole"
                 label="&webConsoleCmd.label;"
                 accesskey="&webConsoleCmd.accesskey;"
-                key="ws-key-webConsole"
-                command="ws-cmd-webConsole"/>
+                key="sp-key-webConsole"
+                command="sp-cmd-webConsole"/>
     </menupopup>
   </menu>
 </menubar>
 
-<popupset id="workspace-popups">
-  <menupopup id="workspace-text-popup">
+<popupset id="scratchpad-popups">
+  <menupopup id="scratchpad-text-popup">
     <menuitem id="menu_cut"/>
     <menuitem id="menu_copy"/>
     <menuitem id="menu_paste"/>
@@ -306,31 +306,31 @@
     <menuseparator/>
     <menuitem id="menu_selectAll"/>
     <menuseparator/>
-    <menuitem id="ws-text-execute"
+    <menuitem id="sp-text-execute"
               label="&execute.label;"
               accesskey="&execute.accesskey;"
-              key="ws-key-execute"
-              command="ws-cmd-execute"/>
-    <menuitem id="ws-text-inspect"
+              key="sp-key-execute"
+              command="sp-cmd-execute"/>
+    <menuitem id="sp-text-inspect"
               label="&inspect.label;"
               accesskey="&inspect.accesskey;"
-              key="ws-key-inspect"
-              command="ws-cmd-inspect"/>
-    <menuitem id="ws-text-print"
+              key="sp-key-inspect"
+              command="sp-cmd-inspect"/>
+    <menuitem id="sp-text-print"
               label="&print.label;"
               accesskey="&print.accesskey;"
-              key="ws-key-print"
-              command="ws-cmd-print"/>
+              key="sp-key-print"
+              command="sp-cmd-print"/>
   </menupopup>
 </popupset>
 
-<textbox id="workspace-textbox"
+<textbox id="scratchpad-textbox"
          multiline="true"
          flex="1"
-         context="workspace-text-popup"
+         context="scratchpad-text-popup"
          placeholder="&textbox.placeholder;" />
-<statusbar id="workspace-statusbar" align="end">
-  <statusbarpanel id="workspace-status"
+<statusbar id="scratchpad-statusbar" align="end">
+  <statusbarpanel id="scratchpad-status"
                   label="&contentContext.label;"
                   class="statusbarpanel-iconic-text"/>
   <spacer flex="1"/>
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 6d34953e0179..6ac661849606 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -192,13 +192,13 @@ _BROWSER_FILES = \
                  browser_inspector_treePanel_output.js \
                  browser_inspector_treePanel_input.html \
                  browser_inspector_treePanel_result.html \
-                 browser_workspace_initialization.js \
-                 browser_workspace_contexts.js \
-                 browser_workspace_execute_print.js \
-                 browser_workspace_inspect.js \
-                 browser_workspace_files.js \
-                 browser_workspace_ui.js \
-                 browser_workspace_bug_646070_chrome_context_pref.js \
+                 browser_scratchpad_initialization.js \
+                 browser_scratchpad_contexts.js \
+                 browser_scratchpad_execute_print.js \
+                 browser_scratchpad_inspect.js \
+                 browser_scratchpad_files.js \
+                 browser_scratchpad_ui.js \
+                 browser_scratchpad_bug_646070_chrome_context_pref.js \
                  browser_overflowScroll.js \
                  browser_pageInfo.js \
                  browser_page_style_menu.js \
diff --git a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js b/browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
similarity index 57%
rename from browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
rename to browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
index bc622bca1fe1..b000e8421ddd 100644
--- a/browser/base/content/test/browser_workspace_bug_646070_chrome_context_pref.js
+++ b/browser/base/content/test/browser_scratchpad_bug_646070_chrome_context_pref.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 let gOldPref;
 let DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled";
@@ -19,50 +19,50 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    ok(Workspace, "Workspace variable exists");
+    ok(Scratchpad, "Scratchpad variable exists");
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,Workspace test for bug 646070 - chrome context preference";
+  content.location = "data:text/html,Scratchpad test for bug 646070 - chrome context preference";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
-  ok(ws, "Workspace object exists in new window");
+  let sp = gScratchpadWindow.Scratchpad;
+  ok(sp, "Scratchpad object exists in new window");
 
-  let chromeContextMenu = gWorkspaceWindow.document.
-                          getElementById("ws-menu-chrome");
+  let chromeContextMenu = gScratchpadWindow.document.
+                          getElementById("sp-menu-chrome");
   ok(chromeContextMenu, "Chrome context menuitem element exists");
   ok(!chromeContextMenu.hasAttribute("hidden"),
      "Chrome context menuitem is visible");
 
-  let errorConsoleCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-errorConsole");
+  let errorConsoleCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-errorConsole");
   ok(errorConsoleCommand, "Error console command element exists");
   ok(!errorConsoleCommand.hasAttribute("disabled"),
      "Error console command is enabled");
 
-  let errorConsoleMenu = gWorkspaceWindow.document.
-                         getElementById("ws-menu-errorConsole");
+  let errorConsoleMenu = gScratchpadWindow.document.
+                         getElementById("sp-menu-errorConsole");
   ok(errorConsoleMenu, "Error console menu element exists");
   ok(!errorConsoleMenu.hasAttribute("hidden"),
      "Error console menuitem is visible");
 
-  let chromeContextCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-chromeContext");
+  let chromeContextCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-chromeContext");
   ok(chromeContextCommand, "Chrome context command element exists");
   ok(!chromeContextCommand.hasAttribute("disabled"),
      "Chrome context command is disabled");
 
   Services.prefs.setBoolPref(DEVTOOLS_CHROME_ENABLED, gOldPref);
 
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_scratchpad_contexts.js b/browser/base/content/test/browser_scratchpad_contexts.js
new file mode 100644
index 000000000000..e9baf926700c
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_contexts.js
@@ -0,0 +1,125 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,test context switch in Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+
+  let contentMenu = gScratchpadWindow.document.getElementById("sp-menu-content");
+  let chromeMenu = gScratchpadWindow.document.getElementById("sp-menu-chrome");
+  let statusbar = sp.statusbarStatus;
+
+  ok(contentMenu, "found #sp-menu-content");
+  ok(chromeMenu, "found #sp-menu-chrome");
+  ok(statusbar, "found Scratchpad.statusbarStatus");
+
+  sp.setContentContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(contentMenu.getAttribute("checked"), "true",
+     "content menuitem is checked");
+
+  ok(!chromeMenu.hasAttribute("checked"),
+     "chrome menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "window.foobarBug636725 = 'aloha';";
+
+  ok(!content.wrappedJSObject.foobarBug636725,
+     "no content.foobarBug636725");
+
+  sp.execute();
+
+  is(content.wrappedJSObject.foobarBug636725, "aloha",
+     "content.foobarBug636725 has been set");
+
+  sp.setChromeContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CHROME,
+     "executionContext is chrome");
+
+  is(chromeMenu.getAttribute("checked"), "true",
+     "chrome menuitem is checked");
+
+  ok(!contentMenu.hasAttribute("checked"),
+     "content menuitem is not checked");
+
+  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
+     "statusbar label is correct");
+
+  sp.textbox.value = "window.foobarBug636725 = 'aloha2';";
+
+  ok(!window.foobarBug636725, "no window.foobarBug636725");
+
+  sp.execute();
+
+  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
+
+  sp.textbox.value = "window.gBrowser";
+
+  is(typeof sp.execute()[1].addTab, "function",
+     "chrome context has access to chrome objects");
+
+  // Check that the sandbox is cached.
+
+  sp.textbox.value = "typeof foobarBug636725cache;";
+  is(sp.execute()[1], "undefined", "global variable does not exist");
+
+  sp.textbox.value = "var foobarBug636725cache = 'foo';";
+  sp.execute();
+
+  sp.textbox.value = "typeof foobarBug636725cache;";
+  is(sp.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  sp.resetContext();
+
+  is(sp.execute()[1], "undefined",
+     "global variable no longer exists after calling resetContext()");
+
+  sp.textbox.value = "var foobarBug636725cache2 = 'foo';";
+  sp.execute();
+
+  sp.textbox.value = "typeof foobarBug636725cache2;";
+  is(sp.execute()[1], "string",
+     "global variable exists across two different executions");
+
+  sp.setContentContext();
+
+  is(sp.executionContext, gScratchpadWindow.SCRATCHPAD_CONTEXT_CONTENT,
+     "executionContext is content");
+
+  is(sp.execute()[1], "undefined",
+     "global variable no longer exists after changing the context");
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_execute_print.js b/browser/base/content/test/browser_scratchpad_execute_print.js
similarity index 51%
rename from browser/base/content/test/browser_workspace_execute_print.js
rename to browser/base/content/test/browser_scratchpad_execute_print.js
index 3257b897ce7e..91aa8d1f23b9 100644
--- a/browser/base/content/test/browser_workspace_execute_print.js
+++ b/browser/base/content/test/browser_scratchpad_execute_print.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 function test()
 {
@@ -13,103 +13,103 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,<p>test execute() and print() in Workspace";
+  content.location = "data:text/html,<p>test execute() and print() in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
+  let sp = gScratchpadWindow.Scratchpad;
 
   content.wrappedJSObject.foobarBug636725 = 1;
 
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "++window.foobarBug636725";
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "++window.foobarBug636725";
 
-  let exec = ws.execute();
-  is(exec[0], ws.textbox.value, "execute()[0] is correct");
+  let exec = sp.execute();
+  is(exec[0], sp.textbox.value, "execute()[0] is correct");
   is(exec[1], content.wrappedJSObject.foobarBug636725,
      "execute()[1] is correct");
 
-  is(ws.textbox.value, "++window.foobarBug636725",
+  is(sp.textbox.value, "++window.foobarBug636725",
      "execute() does not change the textbox value");
 
   is(content.wrappedJSObject.foobarBug636725, 2,
      "execute() updated window.foobarBug636725");
 
-  ws.print();
+  sp.print();
 
   is(content.wrappedJSObject.foobarBug636725, 3,
      "print() updated window.foobarBug636725");
 
-  is(ws.textbox.value, "++window.foobarBug636725/*\n3\n*/",
+  is(sp.textbox.value, "++window.foobarBug636725/*\n3\n*/",
      "print() shows evaluation result in the textbox");
 
-  is(ws.selectedText, "/*\n3\n*/", "selectedText is correct");
-  is(ws.textbox.selectionStart, 24, "selectionStart is correct");
-  is(ws.textbox.selectionEnd, 31, "selectionEnd is correct");
+  is(sp.selectedText, "/*\n3\n*/", "selectedText is correct");
+  is(sp.textbox.selectionStart, 24, "selectionStart is correct");
+  is(sp.textbox.selectionEnd, 31, "selectionEnd is correct");
 
   // Test selection execute() and print().
 
-  ws.textbox.value = "window.foobarBug636725 = 'a';\n" +
+  sp.textbox.value = "window.foobarBug636725 = 'a';\n" +
                      "window.foobarBug636725 = 'b';";
 
-  ws.selectRange(1, 2);
+  sp.selectRange(1, 2);
 
-  is(ws.textbox.selectionStart, 1, "selectionStart is 1");
-  is(ws.textbox.selectionEnd, 2, "selectionEnd is 2");
+  is(sp.textbox.selectionStart, 1, "selectionStart is 1");
+  is(sp.textbox.selectionEnd, 2, "selectionEnd is 2");
 
-  ws.selectRange(0, 29);
+  sp.selectRange(0, 29);
 
-  is(ws.textbox.selectionStart, 0, "selectionStart is 0");
-  is(ws.textbox.selectionEnd, 29, "selectionEnd is 29");
+  is(sp.textbox.selectionStart, 0, "selectionStart is 0");
+  is(sp.textbox.selectionEnd, 29, "selectionEnd is 29");
 
-  exec = ws.execute();
+  exec = sp.execute();
 
   is(exec[0], "window.foobarBug636725 = 'a';",
      "execute()[0] is correct");
   is(exec[1], "a",
      "execute()[1] is correct");
 
-  is(ws.textbox.value, "window.foobarBug636725 = 'a';\n" +
+  is(sp.textbox.value, "window.foobarBug636725 = 'a';\n" +
                        "window.foobarBug636725 = 'b';",
      "execute() does not change the textbox value");
 
   is(content.wrappedJSObject.foobarBug636725, "a",
      "execute() worked for the selected range");
 
-  ws.textbox.value = "window.foobarBug636725 = 'c';\n" +
+  sp.textbox.value = "window.foobarBug636725 = 'c';\n" +
                      "window.foobarBug636725 = 'b';";
 
-  ws.selectRange(0, 22);
+  sp.selectRange(0, 22);
 
-  ws.print();
+  sp.print();
 
   is(content.wrappedJSObject.foobarBug636725, "a",
      "print() worked for the selected range");
 
-  is(ws.textbox.value, "window.foobarBug636725" +
+  is(sp.textbox.value, "window.foobarBug636725" +
                        "/*\na\n*/" +
                        " = 'c';\n" +
                        "window.foobarBug636725 = 'b';",
      "print() shows evaluation result in the textbox");
 
-  is(ws.selectedText, "/*\na\n*/", "selectedText is correct");
-  is(ws.textbox.selectionStart, 22, "selectionStart is correct");
-  is(ws.textbox.selectionEnd, 29, "selectionEnd is correct");
+  is(sp.selectedText, "/*\na\n*/", "selectedText is correct");
+  is(sp.textbox.selectionStart, 22, "selectionStart is correct");
+  is(sp.textbox.selectionEnd, 29, "selectionEnd is correct");
 
-  ws.deselect();
+  sp.deselect();
 
-  ok(!ws.selectedText, "selectedText is empty");
-  is(ws.textbox.selectionStart, ws.textbox.selectionEnd, "deselect() works");
+  ok(!sp.selectedText, "selectedText is empty");
+  is(sp.textbox.selectionStart, sp.textbox.selectionEnd, "deselect() works");
 
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_workspace_files.js b/browser/base/content/test/browser_scratchpad_files.js
similarity index 73%
rename from browser/base/content/test/browser_workspace_files.js
rename to browser/base/content/test/browser_scratchpad_files.js
index 478a60b31e0b..1b3ce4c2ad57 100644
--- a/browser/base/content/test/browser_workspace_files.js
+++ b/browser/base/content/test/browser_scratchpad_files.js
@@ -9,11 +9,11 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
-// Reference to the Workspace object.
-let gWorkspace;
+// Reference to the Scratchpad object.
+let gScratchpad;
 
 // Reference to the temporary nsIFile we will work with.
 let gFile;
@@ -29,18 +29,18 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
-  content.location = "data:text/html,<p>test file open and save in Workspace";
+  content.location = "data:text/html,<p>test file open and save in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  gWorkspace = gWorkspaceWindow.Workspace;
+  gScratchpad = gScratchpadWindow.Scratchpad;
 
   // Create a temporary file.
   gFile = FileUtils.getFile("TmpD", ["fileForBug636725.tmp"]);
@@ -65,52 +65,52 @@ function tempFileSaved(aStatus)
   ok(Components.isSuccessCode(aStatus),
      "the temporary file was saved successfully");
 
-  // Import the file into Workspace.
-  gWorkspace.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
+  // Import the file into Scratchpad.
+  gScratchpad.importFromFile(gFile.QueryInterface(Ci.nsILocalFile),  true,
                             fileImported);
 }
 
 function fileImported(aStatus, aFileContent)
 {
   ok(Components.isSuccessCode(aStatus),
-     "the temporary file was imported successfully with Workspace");
+     "the temporary file was imported successfully with Scratchpad");
 
   is(aFileContent, gFileContent,
      "received data is correct");
 
-  is(gWorkspace.textbox.value, gFileContent,
+  is(gScratchpad.textbox.value, gFileContent,
      "the textbox.value is correct");
 
   // Save the file after changes.
   gFileContent += "// omg, saved!";
-  gWorkspace.textbox.value = gFileContent;
+  gScratchpad.textbox.value = gFileContent;
 
-  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
+  gScratchpad.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), true, true,
                           fileExported);
 }
 
 function fileExported(aStatus)
 {
   ok(Components.isSuccessCode(aStatus),
-     "the temporary file was exported successfully with Workspace");
+     "the temporary file was exported successfully with Scratchpad");
 
   let oldContent = gFileContent;
 
   // Attempt another file save, with confirmation which returns false.
   gFileContent += "// omg, saved twice!";
-  gWorkspace.textbox.value = gFileContent;
+  gScratchpad.textbox.value = gFileContent;
 
-  let oldConfirm = gWorkspaceWindow.confirm;
+  let oldConfirm = gScratchpadWindow.confirm;
   let askedConfirmation = false;
-  gWorkspaceWindow.confirm = function() {
+  gScratchpadWindow.confirm = function() {
     askedConfirmation = true;
     return false;
   };
 
-  gWorkspace.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
+  gScratchpad.exportToFile(gFile.QueryInterface(Ci.nsILocalFile), false, true,
                           fileExported2);
 
-  gWorkspaceWindow.confirm = oldConfirm;
+  gScratchpadWindow.confirm = oldConfirm;
 
   ok(askedConfirmation, "exportToFile() asked for overwrite confirmation");
 
@@ -141,9 +141,9 @@ function fileRead(aInputStream, aStatus)
   // Done!
   gFile.remove(false);
   gFile = null;
-  gWorkspace = null;
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
+  gScratchpad = null;
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
   gBrowser.removeCurrentTab();
   finish();
 }
diff --git a/browser/base/content/test/browser_scratchpad_initialization.js b/browser/base/content/test/browser_scratchpad_initialization.js
new file mode 100644
index 000000000000..bf2ad9b9c88b
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_initialization.js
@@ -0,0 +1,63 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    ok(Scratchpad, "Scratchpad variable exists");
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,initialization test for Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+  ok(sp, "Scratchpad object exists in new window");
+  is(typeof sp.execute, "function", "Scratchpad.execute() exists");
+  is(typeof sp.inspect, "function", "Scratchpad.inspect() exists");
+  is(typeof sp.print, "function", "Scratchpad.print() exists");
+
+  let chromeContextMenu = gScratchpadWindow.document.
+                          getElementById("sp-menu-chrome");
+  ok(chromeContextMenu, "Chrome context menuitem element exists");
+  is(chromeContextMenu.getAttribute("hidden"), "true",
+     "Chrome context menuitem is hidden");
+
+  let errorConsoleCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-errorConsole");
+  ok(errorConsoleCommand, "Error console command element exists");
+  is(errorConsoleCommand.getAttribute("disabled"), "true",
+     "Error console command is disabled");
+
+  let errorConsoleMenu = gScratchpadWindow.document.
+                         getElementById("sp-menu-errorConsole");
+  ok(errorConsoleMenu, "Error console menu element exists");
+  is(errorConsoleMenu.getAttribute("hidden"), "true",
+     "Error console menu item is hidden");
+
+  let chromeContextCommand = gScratchpadWindow.document.
+                            getElementById("sp-cmd-chromeContext");
+  ok(chromeContextCommand, "Chrome context command element exists");
+  is(chromeContextCommand.getAttribute("disabled"), "true",
+     "Chrome context command is disabled");
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_inspect.js b/browser/base/content/test/browser_scratchpad_inspect.js
similarity index 67%
rename from browser/base/content/test/browser_workspace_inspect.js
rename to browser/base/content/test/browser_scratchpad_inspect.js
index e0cc6ddacca1..1c43cafb2001 100644
--- a/browser/base/content/test/browser_workspace_inspect.js
+++ b/browser/base/content/test/browser_scratchpad_inspect.js
@@ -2,8 +2,8 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
 
 function test()
 {
@@ -13,26 +13,26 @@ function test()
   gBrowser.selectedBrowser.addEventListener("load", function() {
     gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
   }, true);
 
   content.location = "data:text/html,<title>foobarBug636725</title>" +
-    "<p>test inspect() in Workspace";
+    "<p>test inspect() in Scratchpad";
 }
 
 function runTests()
 {
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
 
-  let ws = gWorkspaceWindow.Workspace;
+  let sp = gScratchpadWindow.Scratchpad;
 
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "document";
+  ok(sp.textbox, "textbox exists");
+  sp.textbox.value = "document";
 
-  ws.inspect();
+  sp.inspect();
 
-  let propPanel = document.querySelector(".workspace_propertyPanel");
+  let propPanel = document.querySelector(".scratchpad_propertyPanel");
   ok(propPanel, "property panel is open");
 
   propPanel.addEventListener("popupshown", function() {
@@ -56,8 +56,8 @@ function runTests()
     executeSoon(function() {
       propPanel.hidePopup();
 
-      gWorkspaceWindow.close();
-      gWorkspaceWindow = null;
+      gScratchpadWindow.close();
+      gScratchpadWindow = null;
       gBrowser.removeCurrentTab();
       finish();
     });
diff --git a/browser/base/content/test/browser_scratchpad_ui.js b/browser/base/content/test/browser_scratchpad_ui.js
new file mode 100644
index 000000000000..d6cf5b7b8daf
--- /dev/null
+++ b/browser/base/content/test/browser_scratchpad_ui.js
@@ -0,0 +1,81 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Reference to the Scratchpad chrome window object.
+let gScratchpadWindow;
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+
+    gScratchpadWindow = Scratchpad.openScratchpad();
+    gScratchpadWindow.addEventListener("load", runTests, false);
+  }, true);
+
+  content.location = "data:text/html,<title>foobarBug636725</title>" +
+    "<p>test inspect() in Scratchpad";
+}
+
+function runTests()
+{
+  gScratchpadWindow.removeEventListener("load", arguments.callee, false);
+
+  let sp = gScratchpadWindow.Scratchpad;
+  let doc = gScratchpadWindow.document;
+
+  let methodsAndItems = {
+    "sp-menu-newscratchpad": "openScratchpad",
+    "sp-menu-open": "openFile",
+    "sp-menu-save": "saveFile",
+    "sp-menu-saveas": "saveFileAs",
+    "sp-text-execute": "execute",
+    "sp-text-inspect": "inspect",
+    "sp-menu-content": "setContentContext",
+    "sp-menu-chrome": "setChromeContext",
+    "sp-menu-resetContext": "resetContext",
+    "sp-menu-errorConsole": "openErrorConsole",
+    "sp-menu-webConsole": "openWebConsole",
+  };
+
+  let lastMethodCalled = null;
+  sp.__noSuchMethod__ = function(aMethodName) {
+    lastMethodCalled = aMethodName;
+  };
+
+  for (let id in methodsAndItems) {
+    lastMethodCalled = null;
+
+    let methodName = methodsAndItems[id];
+    let oldMethod = sp[methodName];
+    ok(oldMethod, "found method " + methodName + " in Scratchpad object");
+
+    delete sp[methodName];
+
+    let menu = doc.getElementById(id);
+    ok(menu, "found menuitem #" + id);
+
+    try {
+      menu.doCommand();
+    }
+    catch (ex) {
+      ok(false, "exception thrown while executing the command of menuitem #" + id);
+    }
+
+    ok(lastMethodCalled == methodName,
+       "method " + methodName + " invoked by the associated menuitem");
+
+    sp[methodName] = oldMethod;
+  }
+
+  delete sp.__noSuchMethod__;
+
+  gScratchpadWindow.close();
+  gScratchpadWindow = null;
+  gBrowser.removeCurrentTab();
+  finish();
+}
diff --git a/browser/base/content/test/browser_workspace_contexts.js b/browser/base/content/test/browser_workspace_contexts.js
deleted file mode 100644
index 6cc8f18edaa3..000000000000
--- a/browser/base/content/test/browser_workspace_contexts.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,test context switch in Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-
-  let contentMenu = gWorkspaceWindow.document.getElementById("ws-menu-content");
-  let chromeMenu = gWorkspaceWindow.document.getElementById("ws-menu-chrome");
-  let statusbar = ws.statusbarStatus;
-
-  ok(contentMenu, "found #ws-menu-content");
-  ok(chromeMenu, "found #ws-menu-chrome");
-  ok(statusbar, "found Workspace.statusbarStatus");
-
-  ws.setContentContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
-     "executionContext is content");
-
-  is(contentMenu.getAttribute("checked"), "true",
-     "content menuitem is checked");
-
-  ok(!chromeMenu.hasAttribute("checked"),
-     "chrome menuitem is not checked");
-
-  is(statusbar.getAttribute("label"), contentMenu.getAttribute("label"),
-     "statusbar label is correct");
-
-  ok(ws.textbox, "textbox exists");
-  ws.textbox.value = "window.foobarBug636725 = 'aloha';";
-
-  ok(!content.wrappedJSObject.foobarBug636725,
-     "no content.foobarBug636725");
-
-  ws.execute();
-
-  is(content.wrappedJSObject.foobarBug636725, "aloha",
-     "content.foobarBug636725 has been set");
-
-  ws.setChromeContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CHROME,
-     "executionContext is chrome");
-
-  is(chromeMenu.getAttribute("checked"), "true",
-     "chrome menuitem is checked");
-
-  ok(!contentMenu.hasAttribute("checked"),
-     "content menuitem is not checked");
-
-  is(statusbar.getAttribute("label"), chromeMenu.getAttribute("label"),
-     "statusbar label is correct");
-
-  ws.textbox.value = "window.foobarBug636725 = 'aloha2';";
-
-  ok(!window.foobarBug636725, "no window.foobarBug636725");
-
-  ws.execute();
-
-  is(window.foobarBug636725, "aloha2", "window.foobarBug636725 has been set");
-
-  ws.textbox.value = "window.gBrowser";
-
-  is(typeof ws.execute()[1].addTab, "function",
-     "chrome context has access to chrome objects");
-
-  // Check that the sandbox is cached.
-
-  ws.textbox.value = "typeof foobarBug636725cache;";
-  is(ws.execute()[1], "undefined", "global variable does not exist");
-
-  ws.textbox.value = "var foobarBug636725cache = 'foo';";
-  ws.execute();
-
-  ws.textbox.value = "typeof foobarBug636725cache;";
-  is(ws.execute()[1], "string",
-     "global variable exists across two different executions");
-
-  ws.resetContext();
-
-  is(ws.execute()[1], "undefined",
-     "global variable no longer exists after calling resetContext()");
-
-  ws.textbox.value = "var foobarBug636725cache2 = 'foo';";
-  ws.execute();
-
-  ws.textbox.value = "typeof foobarBug636725cache2;";
-  is(ws.execute()[1], "string",
-     "global variable exists across two different executions");
-
-  ws.setContentContext();
-
-  is(ws.executionContext, gWorkspaceWindow.WORKSPACE_CONTEXT_CONTENT,
-     "executionContext is content");
-
-  is(ws.execute()[1], "undefined",
-     "global variable no longer exists after changing the context");
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/content/test/browser_workspace_initialization.js b/browser/base/content/test/browser_workspace_initialization.js
deleted file mode 100644
index 3e0218215fc6..000000000000
--- a/browser/base/content/test/browser_workspace_initialization.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    ok(Workspace, "Workspace variable exists");
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,initialization test for Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-  ok(ws, "Workspace object exists in new window");
-  is(typeof ws.execute, "function", "Workspace.execute() exists");
-  is(typeof ws.inspect, "function", "Workspace.inspect() exists");
-  is(typeof ws.print, "function", "Workspace.print() exists");
-
-  let chromeContextMenu = gWorkspaceWindow.document.
-                          getElementById("ws-menu-chrome");
-  ok(chromeContextMenu, "Chrome context menuitem element exists");
-  is(chromeContextMenu.getAttribute("hidden"), "true",
-     "Chrome context menuitem is hidden");
-
-  let errorConsoleCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-errorConsole");
-  ok(errorConsoleCommand, "Error console command element exists");
-  is(errorConsoleCommand.getAttribute("disabled"), "true",
-     "Error console command is disabled");
-
-  let errorConsoleMenu = gWorkspaceWindow.document.
-                         getElementById("ws-menu-errorConsole");
-  ok(errorConsoleMenu, "Error console menu element exists");
-  is(errorConsoleMenu.getAttribute("hidden"), "true",
-     "Error console menu item is hidden");
-
-  let chromeContextCommand = gWorkspaceWindow.document.
-                            getElementById("ws-cmd-chromeContext");
-  ok(chromeContextCommand, "Chrome context command element exists");
-  is(chromeContextCommand.getAttribute("disabled"), "true",
-     "Chrome context command is disabled");
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/content/test/browser_workspace_ui.js b/browser/base/content/test/browser_workspace_ui.js
deleted file mode 100644
index b1af4447e148..000000000000
--- a/browser/base/content/test/browser_workspace_ui.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Reference to the Workspace chrome window object.
-let gWorkspaceWindow;
-
-function test()
-{
-  waitForExplicitFinish();
-
-  gBrowser.selectedTab = gBrowser.addTab();
-  gBrowser.selectedBrowser.addEventListener("load", function() {
-    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
-
-    gWorkspaceWindow = Workspace.openWorkspace();
-    gWorkspaceWindow.addEventListener("load", runTests, false);
-  }, true);
-
-  content.location = "data:text/html,<title>foobarBug636725</title>" +
-    "<p>test inspect() in Workspace";
-}
-
-function runTests()
-{
-  gWorkspaceWindow.removeEventListener("load", arguments.callee, false);
-
-  let ws = gWorkspaceWindow.Workspace;
-  let doc = gWorkspaceWindow.document;
-
-  let methodsAndItems = {
-    "ws-menu-newworkspace": "openWorkspace",
-    "ws-menu-open": "openFile",
-    "ws-menu-save": "saveFile",
-    "ws-menu-saveas": "saveFileAs",
-    "ws-text-execute": "execute",
-    "ws-text-inspect": "inspect",
-    "ws-menu-content": "setContentContext",
-    "ws-menu-chrome": "setChromeContext",
-    "ws-menu-resetContext": "resetContext",
-    "ws-menu-errorConsole": "openErrorConsole",
-    "ws-menu-webConsole": "openWebConsole",
-  };
-
-  let lastMethodCalled = null;
-  ws.__noSuchMethod__ = function(aMethodName) {
-    lastMethodCalled = aMethodName;
-  };
-
-  for (let id in methodsAndItems) {
-    lastMethodCalled = null;
-
-    let methodName = methodsAndItems[id];
-    let oldMethod = ws[methodName];
-    ok(oldMethod, "found method " + methodName + " in Workspace object");
-
-    delete ws[methodName];
-
-    let menu = doc.getElementById(id);
-    ok(menu, "found menuitem #" + id);
-
-    try {
-      menu.doCommand();
-    }
-    catch (ex) {
-      ok(false, "exception thrown while executing the command of menuitem #" + id);
-    }
-
-    ok(lastMethodCalled == methodName,
-       "method " + methodName + " invoked by the associated menuitem");
-
-    ws[methodName] = oldMethod;
-  }
-
-  delete ws.__noSuchMethod__;
-
-  gWorkspaceWindow.close();
-  gWorkspaceWindow = null;
-  gBrowser.removeCurrentTab();
-  finish();
-}
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index c043b39a4bb3..fb931687155c 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -29,8 +29,8 @@ browser.jar:
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
-*       content/browser/workspace.xul                 (content/workspace.xul)
-*       content/browser/workspace.js                  (content/workspace.js)
+*       content/browser/scratchpad.xul                (content/scratchpad.xul)
+*       content/browser/scratchpad.js                 (content/scratchpad.js)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
 *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index fab3d751aecc..ff34cab7fc29 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -191,10 +191,20 @@ can reach it easily. -->
 <!ENTITY inspectMenu.accesskey        "T">
 <!ENTITY inspectMenu.commandkey       "I">
 
-<!ENTITY workspace.label               "Workspace">
-<!ENTITY workspace.accesskey           "O">
-<!ENTITY workspace.keycode             "VK_F4">
-<!ENTITY workspace.keytext             "F4">
+<!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
+  -  in the Tools menu. See bug 653093.
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY scratchpad.label             "Scratchpad">
+<!ENTITY scratchpad.accesskey         "r">
+<!ENTITY scratchpad.keycode           "VK_F4">
+<!ENTITY scratchpad.keytext           "F4">
 
 <!ENTITY inspectPanelTitle.label      "HTML">
 <!ENTITY inspectButton.label          "Inspect">
diff --git a/browser/locales/en-US/chrome/browser/workspace.dtd b/browser/locales/en-US/chrome/browser/scratchpad.dtd
similarity index 82%
rename from browser/locales/en-US/chrome/browser/workspace.dtd
rename to browser/locales/en-US/chrome/browser/scratchpad.dtd
index 35589c1a83cc..1b2de5b849be 100644
--- a/browser/locales/en-US/chrome/browser/workspace.dtd
+++ b/browser/locales/en-US/chrome/browser/scratchpad.dtd
@@ -1,7 +1,16 @@
-<!-- LOCALIZATION NOTE : FILE This file contains the Workspace window strings -->
+<!-- LOCALIZATION NOTE : FILE This file contains the Scratchpad window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 
-<!ENTITY window.title                 "Workspace">
+<!-- LOCALIZATION NOTE (scratchpad.title):
+  -  The Scratchpad is intended to provide a simple text editor for creating
+  -  and evaluating bits of JavaScript code for the purposes of function
+  -  prototyping, experimentation and convenient scripting.
+  -
+  -  It's quite possible that you won't have a good analogue for the word
+  -  "Scratchpad" in your locale. You should feel free to find a close
+  -  approximation to it or choose a word (or words) that means
+  -  "simple discardable text editor". -->
+<!ENTITY window.title                 "Scratchpad">
 
 <!ENTITY fileMenu.label               "File">
 <!ENTITY fileMenu.accesskey           "F">
diff --git a/browser/locales/en-US/chrome/browser/workspace.properties b/browser/locales/en-US/chrome/browser/scratchpad.properties
similarity index 75%
rename from browser/locales/en-US/chrome/browser/workspace.properties
rename to browser/locales/en-US/chrome/browser/scratchpad.properties
index 3b0dbab5241c..916a2dcc82ae 100644
--- a/browser/locales/en-US/chrome/browser/workspace.properties
+++ b/browser/locales/en-US/chrome/browser/scratchpad.properties
@@ -1,5 +1,5 @@
 # LOCALIZATION NOTE  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Workspace window when inspecting an object. This
+# Panel that is opened by the Scratchpad window when inspecting an object. This
 # is the Update button label.
 propertyPanel.updateButton.label=Update
 propertyPanel.updateButton.accesskey=U
@@ -9,12 +9,12 @@ propertyPanel.updateButton.accesskey=U
 export.fileOverwriteConfirmation=File exists. Overwrite?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
-# when Workspace does not find any recently active window of navigator:browser
+# when Scratchpad does not find any recently active window of navigator:browser
 # type.
-browserWindow.unavailable=Workspace cannot find any browser window where to execute the code.
+browserWindow.unavailable=Scratchpad cannot find any browser window to execute the code in.
 
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
-# open a file from Workspace.
+# open a file from Scratchpad.
 openFile.title=Open File
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
@@ -22,7 +22,7 @@ openFile.title=Open File
 openFile.failed=Failed to read the file.
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
-# a file in Workspace.
+# a file in Scratchpad.
 saveFileAs=Save File As
 
 # LOCALIZATION NOTE  (saveFile.failed): This is the message displayed when file
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index eb4e225e2472..97599b5d8a38 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -15,8 +15,8 @@
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
     locale/browser/inspector.properties            (%chrome/browser/inspector.properties)
-    locale/browser/workspace.properties            (%chrome/browser/workspace.properties)
-    locale/browser/workspace.dtd                   (%chrome/browser/workspace.dtd)
+    locale/browser/scratchpad.properties           (%chrome/browser/scratchpad.properties)
+    locale/browser/scratchpad.dtd                  (%chrome/browser/scratchpad.dtd)
     locale/browser/openLocation.dtd                (%chrome/browser/openLocation.dtd)
     locale/browser/openLocation.properties         (%chrome/browser/openLocation.properties)
 *   locale/browser/pageInfo.dtd                    (%chrome/browser/pageInfo.dtd)

From aa0fd29ba0b0726e6baac55de014d4ef79786364 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 274/314] Bug 653934 - Add a comment to point people to
 original Workspace repo to Scratchpad.js; r=gavin.sharp,gerv

---
 browser/base/content/scratchpad.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/browser/base/content/scratchpad.js b/browser/base/content/scratchpad.js
index 28215c6d9a12..054317b00c0f 100644
--- a/browser/base/content/scratchpad.js
+++ b/browser/base/content/scratchpad.js
@@ -39,6 +39,15 @@
  *
  * ***** END LICENSE BLOCK *****/
 
+/*
+ * Original version history can be found here:
+ * https://github.com/mozilla/workspace
+ *
+ * Copied and relicensed from the Public Domain.
+ * See bug 653934 for details.
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=653934
+ */
+
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;

From 76c76cf8c805d51ae2d20123d8dc21ec4c14d3a2 Mon Sep 17 00:00:00 2001
From: Rob Campbell <rcampbell@mozilla.com>
Date: Mon, 9 May 2011 11:51:52 -0300
Subject: [PATCH 275/314] Bug 653221 - Create Web Developer Sub-menu in the
 Tools menu; r=dao

---
 browser/base/content/browser-menubar.inc      | 64 ++++++++++---------
 browser/base/content/test/Makefile.in         |  1 +
 .../base/content/test/browser_webdev_menu.js  | 43 +++++++++++++
 .../locales/en-US/chrome/browser/browser.dtd  |  3 +
 4 files changed, 82 insertions(+), 29 deletions(-)
 create mode 100644 browser/base/content/test/browser_webdev_menu.js

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 19f4e4892177..4009ba4d5cc6 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -315,11 +315,6 @@
                 </menu>
 #include browser-charsetmenu.inc
                 <menuseparator/>
-                <menuitem id="menu_pageSource"
-                          accesskey="&pageSourceCmd.accesskey;"
-                          label="&pageSourceCmd.label;"
-                          key="key_viewSource"
-                          command="View:PageSource"/>
                 <menuitem id="fullScreenItem"
                           accesskey="&fullScreenCmd.accesskey;"
                           label="&fullScreenCmd.label;"
@@ -539,30 +534,41 @@
                         oncommand="gSyncUI.doSync(event);"/>
 #endif
               <menuseparator id="devToolsSeparator"/>
-              <menuitem id="menu_pageinspect"
-                        type="checkbox"
-                        hidden="true"
-                        label="&inspectMenu.label;"
-                        accesskey="&inspectMenu.accesskey;"
-                        key="key_inspect"
-                        command="Tools:Inspect"/>
-              <menuitem id="javascriptConsole"
-                        hidden="true"
-                        label="&errorConsoleCmd.label;"
-                        accesskey="&errorConsoleCmd.accesskey;"
-                        key="key_errorConsole"
-                        oncommand="toJavaScriptConsole();"/>
-              <menuitem id="webConsole"
-                        label="&webConsoleCmd.label;"
-                        accesskey="&webConsoleCmd.accesskey;"
-                        key="key_webConsole"
-                        oncommand="HUDConsoleUI.toggleHUD();"/>
-              <menuitem id="menu_scratchpad"
-                        hidden="true"
-                        label="&scratchpad.label;"
-                        accesskey="&scratchpad.accesskey;"
-                        key="key_scratchpad"
-                        command="Tools:Scratchpad"/>
+              <menu id="webDeveloperMenu"
+                    label="&webDeveloperMenu.label;"
+                    accesskey="webDeveloperMenu.accesskey;">
+                <menupopup id="menuWebDeveloperPopup">
+                  <menuitem id="webConsole"
+                            label="&webConsoleCmd.label;"
+                            accesskey="&webConsoleCmd.accesskey;"
+                            key="key_webConsole"
+                            oncommand="HUDConsoleUI.toggleHUD();"/>
+                  <menuitem id="menu_pageinspect"
+                            type="checkbox"
+                            hidden="true"
+                            label="&inspectMenu.label;"
+                            accesskey="&inspectMenu.accesskey;"
+                            key="key_inspect"
+                            command="Tools:Inspect"/>
+                  <menuitem id="menu_scratchpad"
+                            hidden="true"
+                            label="&scratchpad.label;"
+                            accesskey="&scratchpad.accesskey;"
+                            key="key_scratchpad"
+                            command="Tools:Scratchpad"/>
+                  <menuitem id="menu_pageSource"
+                            accesskey="&pageSourceCmd.accesskey;"
+                            label="&pageSourceCmd.label;"
+                            key="key_viewSource"
+                            command="View:PageSource"/>
+                  <menuitem id="javascriptConsole"
+                            hidden="true"
+                            label="&errorConsoleCmd.label;"
+                            accesskey="&errorConsoleCmd.accesskey;"
+                            key="key_errorConsole"
+                            oncommand="toJavaScriptConsole();"/>
+                </menupopup>
+              </menu>
               <menuitem id="menu_pageInfo"
                         accesskey="&pageInfoCmd.accesskey;"
                         label="&pageInfoCmd.label;"
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index 6ac661849606..e8bc6f32657d 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -229,6 +229,7 @@ _BROWSER_FILES = \
                  browser_visibleTabs_bookmarkAllPages.js \
                  browser_visibleTabs_bookmarkAllTabs.js \
                  browser_visibleTabs_tabPreview.js \
+                 browser_webdev_menu.js \
                  bug592338.html \
                  disablechrome.html \
                  discovery.html \
diff --git a/browser/base/content/test/browser_webdev_menu.js b/browser/base/content/test/browser_webdev_menu.js
new file mode 100644
index 000000000000..793f171d7036
--- /dev/null
+++ b/browser/base/content/test/browser_webdev_menu.js
@@ -0,0 +1,43 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function menuTest()
+{
+  gBrowser.selectedBrowser.removeEventListener("load", menuTest, true);
+
+  let menuContents = [
+    "menu_pageinspect",
+    "webConsole",
+    "menu_scratchpad",
+    "menu_pageSource",
+    "javascriptConsole"
+  ];
+
+  let menu = document.getElementById("webDeveloperMenu");
+  ok(menu, "we have the menu");
+
+  let popup = menu.firstChild;
+  is(popup.id, "menuWebDeveloperPopup", "menu first child is menuWebDeveloperPopup");
+
+  is(popup.childNodes.length, menuContents.length, "popup childNodes.length matches");
+
+  for(let a = 0; a < popup.children.length; a++) {
+    isnot(menuContents.indexOf(popup.children[a].id), -1, "menuitem " + popup.children[a].id + " in popup");
+  };
+
+  gBrowser.removeCurrentTab();
+  finish();  
+}
+
+function test()
+{
+  waitForExplicitFinish();
+
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", menuTest, true);
+
+  content.location = "data:text/html,<title>Web Developer Menu Test</title>" +
+    "<p>testing the Web Developer Menu";
+}
+
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ff34cab7fc29..ab3772e72f14 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -179,6 +179,9 @@ can reach it easily. -->
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
 
+<!ENTITY webDeveloperMenu.label       "Web Developer">
+<!ENTITY webDeveloperMenu.accesskey   "W">
+
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">

From 08d1a9d72e7eafeff00add192b8152777e1a711c Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Mon, 9 May 2011 18:42:58 +0200
Subject: [PATCH 276/314] Bug 654990 - Don't use SetInitialChildList to specify
 the style context of the progress bar anonymous child. r=bz

---
 layout/forms/nsProgressFrame.cpp | 32 +++++++-------------------------
 layout/forms/nsProgressFrame.h   |  3 ---
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp
index 6c572fdc4342..12eb1305caea 100644
--- a/layout/forms/nsProgressFrame.cpp
+++ b/layout/forms/nsProgressFrame.cpp
@@ -71,30 +71,6 @@ nsProgressFrame::~nsProgressFrame()
 {
 }
 
-NS_IMETHODIMP
-nsProgressFrame::SetInitialChildList(nsIAtom*     aListName,
-                                     nsFrameList& aChildList)
-{
-  NS_ASSERTION(mBarDiv, "Progress bar div must exist!");
-
-  nsresult rv = nsHTMLContainerFrame::SetInitialChildList(aListName,
-                                                          aChildList);
-
-  nsIFrame* barFrame = mBarDiv->GetPrimaryFrame();
-  nsCSSPseudoElements::Type pseudoType = nsCSSPseudoElements::ePseudo_mozProgressBar;
-  nsRefPtr<nsStyleContext> newStyleContext;
-
-  newStyleContext = barFrame->PresContext()->StyleSet()->
-    ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
-                              barFrame->GetParent()->GetStyleContext());
-
-  if (newStyleContext) {
-    barFrame->SetStyleContext(newStyleContext);
-  }
-
-  return rv;
-}
-
 void
 nsProgressFrame::DestroyFrom(nsIFrame* aDestructRoot)
 {
@@ -122,7 +98,13 @@ nsProgressFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
                                   mozilla::dom::NOT_FROM_PARSER);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (!aElements.AppendElement(mBarDiv)) {
+  // Associate ::-moz-progress-bar pseudo-element to the anonymous child.
+  nsCSSPseudoElements::Type pseudoType = nsCSSPseudoElements::ePseudo_mozProgressBar;
+  nsRefPtr<nsStyleContext> newStyleContext = PresContext()->StyleSet()->
+    ResolvePseudoElementStyle(mContent->AsElement(), pseudoType,
+                              GetStyleContext());
+
+  if (!aElements.AppendElement(ContentInfo(mBarDiv, newStyleContext))) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
diff --git a/layout/forms/nsProgressFrame.h b/layout/forms/nsProgressFrame.h
index 4ff4ee0ec4d6..219a3696050a 100644
--- a/layout/forms/nsProgressFrame.h
+++ b/layout/forms/nsProgressFrame.h
@@ -54,9 +54,6 @@ public:
   nsProgressFrame(nsStyleContext* aContext);
   virtual ~nsProgressFrame();
 
-  NS_IMETHOD SetInitialChildList(nsIAtom*     aListName,
-                                 nsFrameList& aChildList);
-
   virtual void DestroyFrom(nsIFrame* aDestructRoot);
 
   NS_IMETHOD Reflow(nsPresContext*           aCX,

From 774351215fd7032a34aecfc000f02a27a396950d Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Mon, 9 May 2011 09:54:40 -0700
Subject: [PATCH 277/314] Bug 654716 - Remove WinCE code from
 other-licenses/bsdiff/Makefile.in; r=ted

---
 other-licenses/bsdiff/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in
index 5f281b0ba820..1c967a8a1f92 100644
--- a/other-licenses/bsdiff/Makefile.in
+++ b/other-licenses/bsdiff/Makefile.in
@@ -54,7 +54,7 @@ else
 HOST_LIBS += $(DIST)/host/lib/$(LIB_PREFIX)hostbz2.$(LIB_SUFFIX)
 endif
 
-ifneq (,$(filter WINCE WINNT,$(HOST_OS_ARCH)))
+ifeq ($(HOST_OS_ARCH),WINNT)
 HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)
 endif
 

From 6354509c50114f94d61539516f1e474a634dd5f1 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Mon, 9 May 2011 09:56:09 -0700
Subject: [PATCH 278/314] Bug 655493 - Remove WinCE code from layout; r=roc

---
 layout/base/tests/TestPoisonArea.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp
index 20cf9eda8621..f81ce1bf2e5a 100644
--- a/layout/base/tests/TestPoisonArea.cpp
+++ b/layout/base/tests/TestPoisonArea.cpp
@@ -224,8 +224,6 @@ static LPSTR
 StrW32Error(DWORD errcode)
 {
   LPSTR errmsg;
-
-#ifndef WINCE
   FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
                  FORMAT_MESSAGE_FROM_SYSTEM |
                  FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -236,14 +234,6 @@ StrW32Error(DWORD errcode)
   size_t n = strlen(errmsg)-1;
   while (errmsg[n] == '\r' || errmsg[n] == '\n') n--;
   errmsg[n+1] = '\0';
-#else
-  // CE doesn't have FormatMessageA so we just stringify the error code.
-  // Use LocalAlloc for consistency with the regular Windows code path.
-  // "code \0" is 6 bytes, and a 32-bit number might need 10 more.
-  errmsg = (LPSTR)LocalAlloc(LMEM_FIXED, 16);
-  _snprintf(errmsg, 16, "code %u", errcode);
-#endif
-
   return errmsg;
 }
 #define LastErrMsg() (StrW32Error(GetLastError()))

From 4e3e422feebe59a8597dd85c625ef7c57d9764cb Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 9 May 2011 10:01:15 -0700
Subject: [PATCH 279/314] Bug 649688 - Revert to fullscreen landscape keyboard
 on smaller devices [r=blassey]

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

diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js
index f11797fb336c..f2d8b1ed17c6 100644
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -577,8 +577,8 @@ pref("media.preload.auto", 2);    // preload metadata if preload=auto
 //  0: don't show fullscreen keyboard
 //  1: always show fullscreen keyboard
 // -1: show fullscreen keyboard based on threshold pref
-pref("widget.ime.android.landscape_fullscreen", 0);
-pref("widget.ime.android.fullscreen_threshold", 300); // in hundreths of inches
+pref("widget.ime.android.landscape_fullscreen", -1);
+pref("widget.ime.android.fullscreen_threshold", 250); // in hundreths of inches
 
 // optimize images memory usage
 pref("image.mem.decodeondraw", true);

From a8ba1048dc4590d20b5d385844c88108f674592e Mon Sep 17 00:00:00 2001
From: Justin Lebar <justin.lebar@gmail.com>
Date: Sun, 24 Apr 2011 22:30:54 -0400
Subject: [PATCH 280/314] Bug 551225 - Make pushState use structured clone.
 r=zpao, sicking

---
 .../sessionstore/src/nsSessionStore.js        |  14 +-
 .../test/browser/browser_500328.js            |   7 +-
 content/base/public/nsContentUtils.h          |   5 +
 content/base/public/nsIDocument.h             |  21 +-
 content/base/src/nsContentUtils.cpp           |   4 +-
 content/base/src/nsDocument.cpp               |  49 ++---
 content/base/src/nsDocument.h                 |   2 +-
 docshell/base/Makefile.in                     |   1 +
 docshell/base/nsDocShell.cpp                  | 124 ++++-------
 docshell/base/nsDocShell.h                    |   4 +-
 docshell/build/nsDocShellModule.cpp           |   7 +
 docshell/shistory/public/nsISHEntry.idl       |   5 +-
 docshell/shistory/src/nsSHEntry.cpp           |  11 +-
 docshell/shistory/src/nsSHEntry.h             |   2 +-
 docshell/test/Makefile.in                     |   1 +
 docshell/test/test_bug551225.html             |  33 +++
 dom/base/Makefile.in                          |   2 +
 dom/base/nsGlobalWindow.cpp                   |   6 +-
 dom/base/nsHistory.cpp                        |   2 +-
 dom/base/nsStructuredCloneContainer.cpp       | 195 ++++++++++++++++++
 dom/base/nsStructuredCloneContainer.h         |  73 +++++++
 dom/interfaces/base/Makefile.in               |   1 +
 .../base/nsIStructuredCloneContainer.idl      | 101 +++++++++
 23 files changed, 513 insertions(+), 157 deletions(-)
 create mode 100644 docshell/test/test_bug551225.html
 create mode 100644 dom/base/nsStructuredCloneContainer.cpp
 create mode 100644 dom/base/nsStructuredCloneContainer.h
 create mode 100644 dom/interfaces/base/nsIStructuredCloneContainer.idl

diff --git a/browser/components/sessionstore/src/nsSessionStore.js b/browser/components/sessionstore/src/nsSessionStore.js
index ed6d80549aac..01379d896a80 100644
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -1781,8 +1781,9 @@ SessionStoreService.prototype = {
       entry.docIdentifier = aEntry.docIdentifier;
     }
 
-    if (aEntry.stateData) {
-      entry.stateData = aEntry.stateData;
+    if (aEntry.stateData != null) {
+      entry.structuredCloneState = aEntry.stateData.getDataAsBase64();
+      entry.structuredCloneVersion = aEntry.stateData.formatVersion;
     }
 
     if (!(aEntry instanceof Ci.nsISHContainer)) {
@@ -2998,8 +2999,13 @@ SessionStoreService.prototype = {
     if (aEntry.docshellID)
       shEntry.docshellID = aEntry.docshellID;
 
-    if (aEntry.stateData) {
-      shEntry.stateData = aEntry.stateData;
+    if (aEntry.structuredCloneState && aEntry.structuredCloneVersion) {
+      shEntry.stateData =
+        Cc["@mozilla.org/docshell/structured-clone-container;1"].
+        createInstance(Ci.nsIStructuredCloneContainer);
+
+      shEntry.stateData.initFromBase64(aEntry.structuredCloneState,
+                                       aEntry.structuredCloneVersion);
     }
 
     if (aEntry.scroll) {
diff --git a/browser/components/sessionstore/test/browser/browser_500328.js b/browser/components/sessionstore/test/browser/browser_500328.js
index 1aa5418c4b9d..dab1efc8bce6 100644
--- a/browser/components/sessionstore/test/browser/browser_500328.js
+++ b/browser/components/sessionstore/test/browser/browser_500328.js
@@ -68,8 +68,7 @@ function checkState(tab) {
     }
     else if (popStateCount == 1) {
       popStateCount++;
-      is(JSON.stringify(aEvent.state), JSON.stringify({obj3:3}),
-         "second popstate object.");
+      is(aEvent.state.obj3.toString(), '/^a$/', "second popstate object.");
 
       // Make sure that the new-elem node is present in the document.  If it's
       // not, then this history entry has a different doc identifier than the
@@ -120,12 +119,12 @@ function test() {
       // history entries:
       //   testURL (state object: null)      <-- oldest
       //   testURL (state object: {obj1:1})
-      //   page2   (state object: {obj3:3})  <-- newest
+      //   page2   (state object: {obj3:/^a$/})  <-- newest
       let contentWindow = tab.linkedBrowser.contentWindow;
       let history = contentWindow.history;
       history.pushState({obj1:1}, "title-obj1");
       history.pushState({obj2:2}, "title-obj2", "page2");
-      history.replaceState({obj3:3}, "title-obj3");
+      history.replaceState({obj3:/^a$/}, "title-obj3");
 
       let state = ss.getTabState(tab);
       gBrowser.removeTab(tab);
diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index cbeed4f7dc58..f2e3031a7ab0 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -189,6 +189,11 @@ class nsContentUtils
 public:
   static nsresult Init();
 
+  /**
+   * Get a JSContext from the document's scope object.
+   */
+  static JSContext* GetContextFromDocument(nsIDocument *aDocument);
+
   /**
    * Get a scope from aNewDocument. Also get a context through the scope of one
    * of the documents, from the stack or the safe context.
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index cc0b5236e220..2c705faf8670 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -67,6 +67,7 @@
 #include "nsIDocumentEncoder.h"
 #include "nsIAnimationFrameListener.h"
 #include "nsEventStates.h"
+#include "nsIStructuredCloneContainer.h"
 
 class nsIContent;
 class nsPresContext;
@@ -123,8 +124,8 @@ class Element;
 
 
 #define NS_IDOCUMENT_IID      \
-{ 0x2c6ad63f, 0xb7b9, 0x42f8, \
- { 0xbd, 0xde, 0x76, 0x0a, 0x83, 0xe3, 0xb0, 0x49 } }
+{ 0x26ef6218, 0xcd5e, 0x4953,  \
+ { 0xbb, 0x57, 0xb8, 0x50, 0x29, 0xa1, 0xae, 0x40 } }
 
 // Flag for AddStyleSheet().
 #define NS_STYLESHEET_FROM_CATALOG                (1 << 0)
@@ -1422,12 +1423,13 @@ public:
   };
 
   /**
-   * Set the document's pending state object (as serialized to JSON).
+   * Set the document's pending state object (as serialized using structured
+   * clone).
    */
-  void SetCurrentStateObject(nsAString &obj)
+  void SetStateObject(nsIStructuredCloneContainer *scContainer)
   {
-    mCurrentStateObject.Assign(obj);
-    mCurrentStateObjectCached = nsnull;
+    mStateObjectContainer = scContainer;
+    mStateObjectCached = nsnull;
   }
 
   /**
@@ -1515,7 +1517,7 @@ public:
   // state is unlocked/false.
   virtual nsresult SetImageLockingState(PRBool aLocked) = 0;
 
-  virtual nsresult GetMozCurrentStateObject(nsIVariant** aResult) = 0;
+  virtual nsresult GetStateObject(nsIVariant** aResult) = 0;
 
 protected:
   ~nsIDocument()
@@ -1724,8 +1726,6 @@ protected:
    */
   PRUint32 mExternalScriptsBeingEvaluated;
 
-  nsString mCurrentStateObject;
-
   // Weak reference to mScriptGlobalObject QI:d to nsPIDOMWindow,
   // updated on every set of mSecriptGlobalObject.
   nsPIDOMWindow *mWindow;
@@ -1741,7 +1741,8 @@ protected:
   // Our base target.
   nsString mBaseTarget;
 
-  nsCOMPtr<nsIVariant> mCurrentStateObjectCached;
+  nsCOMPtr<nsIStructuredCloneContainer> mStateObjectContainer;
+  nsCOMPtr<nsIVariant> mStateObjectCached;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocument, NS_IDOCUMENT_IID)
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 95049f77b4c2..13e38cb86221 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -1391,8 +1391,8 @@ nsContentUtils::InProlog(nsINode *aNode)
   return !root || doc->IndexOf(aNode) < doc->IndexOf(root);
 }
 
-static JSContext *
-GetContextFromDocument(nsIDocument *aDocument)
+JSContext *
+nsContentUtils::GetContextFromDocument(nsIDocument *aDocument)
 {
   nsIScriptGlobalObject *sgo = aDocument->GetScopeObject();
   if (!sgo) {
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 641598647c24..99970a685b25 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1881,7 +1881,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mDOMImplementation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mOriginalDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCachedEncoder)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mCurrentStateObjectCached)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mStateObjectCached)
 
   // Traverse all our nsCOMArrays.
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mStyleSheets)
@@ -8153,47 +8153,22 @@ nsIDocument::ScheduleBeforePaintEvent(nsIAnimationFrameListener* aListener)
 }
 
 nsresult
-nsDocument::GetMozCurrentStateObject(nsIVariant** aState)
+nsDocument::GetStateObject(nsIVariant** aState)
 {
-  // Get the document's current state object. This is the object returned form
-  // both document.mozCurrentStateObject as well as popStateEvent.state
+  // Get the document's current state object. This is the object backing both
+  // history.state and popStateEvent.state.
+  //
+  // mStateObjectContainer may be null; this just means that there's no
+  // current state object.
 
   nsCOMPtr<nsIVariant> stateObj;
-  // Parse the JSON, if there's any to parse.
-  if (!mCurrentStateObjectCached && !mCurrentStateObject.IsEmpty()) {
-    // Get the JSContext associated with this document. We need this for
-    // deserialization.
-    nsIScriptGlobalObject *sgo = GetScopeObject();
-    NS_ENSURE_TRUE(sgo, NS_ERROR_FAILURE);
-
-    nsIScriptContext *scx = sgo->GetContext();
-    NS_ENSURE_TRUE(scx, NS_ERROR_FAILURE);
-
-    JSContext *cx = (JSContext*) scx->GetNativeContext();
-
-    // Make sure we in the request while we have jsval on the native stack.
-    JSAutoRequest ar(cx);
-
-    // If our json call triggers a JS-to-C++ call, we want that call to use cx
-    // as the context.  So we push cx onto the context stack.
-    nsCxPusher cxPusher;
-
-    jsval jsStateObj = JSVAL_NULL;
-
-    // Deserialize the state object into an nsIVariant.
-    nsCOMPtr<nsIJSON> json = do_GetService("@mozilla.org/dom/json;1");
-    NS_ENSURE_TRUE(cxPusher.Push(cx), NS_ERROR_FAILURE);
-    nsresult rv = json->DecodeToJSVal(mCurrentStateObject, cx, &jsStateObj);
-    NS_ENSURE_SUCCESS(rv, rv);
-    cxPusher.Pop();
-
-    nsCOMPtr<nsIXPConnect> xpconnect = do_GetService(nsIXPConnect::GetCID());
-    NS_ENSURE_TRUE(xpconnect, NS_ERROR_FAILURE);
-    rv = xpconnect->JSValToVariant(cx, &jsStateObj, getter_AddRefs(mCurrentStateObjectCached));
-    NS_ENSURE_SUCCESS(rv, rv);
+  if (!mStateObjectCached && mStateObjectContainer) {
+    JSContext *cx = nsContentUtils::GetContextFromDocument(this);
+    mStateObjectContainer->
+      DeserializeToVariant(cx, getter_AddRefs(mStateObjectCached));
   }
 
-  NS_IF_ADDREF(*aState = mCurrentStateObjectCached);
+  NS_IF_ADDREF(*aState = mStateObjectCached);
   
   return NS_OK;
 }
diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h
index 710d50c66b42..976733bb107c 100644
--- a/content/base/src/nsDocument.h
+++ b/content/base/src/nsDocument.h
@@ -979,7 +979,7 @@ public:
   virtual NS_HIDDEN_(nsresult) RemoveImage(imgIRequest* aImage);
   virtual NS_HIDDEN_(nsresult) SetImageLockingState(PRBool aLocked);
 
-  virtual nsresult GetMozCurrentStateObject(nsIVariant** aResult);
+  virtual nsresult GetStateObject(nsIVariant** aResult);
 
 protected:
   friend class nsNodeUtils;
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
index 0e0a2b92c042..b83f3f220ccf 100644
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -119,4 +119,5 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \
   -I$(topsrcdir)/layout/base \
+  -I$(topsrcdir)/js/src/xpconnect/src \
   $(NULL)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 31eabfc76b20..59f36fbc2906 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -160,6 +160,8 @@
 #include "nsIWebBrowserChrome3.h"
 #include "nsITabChild.h"
 #include "nsIStrictTransportSecurityService.h"
+#include "nsStructuredCloneContainer.h"
+#include "nsIStructuredCloneContainer.h"
 
 // Editor-related
 #include "nsIEditingSession.h"
@@ -7741,21 +7743,17 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
 nsresult
 nsDocShell::SetDocCurrentStateObj(nsISHEntry *shEntry)
 {
-    nsresult rv;
-
     nsCOMPtr<nsIDocument> document = do_GetInterface(GetAsSupports(this));
     NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
 
-    nsAutoString stateData;
-    if (shEntry) {
-        rv = shEntry->GetStateData(stateData);
-        NS_ENSURE_SUCCESS(rv, rv);
+    nsCOMPtr<nsIStructuredCloneContainer> scContainer;
+    nsresult rv = shEntry->GetStateData(getter_AddRefs(scContainer));
+    NS_ENSURE_SUCCESS(rv, rv);
 
-        // if shEntry is null, we just set the pending state object to the
-        // empty string.
-    }
+    // It's OK for scContainer too be null here; that just means there's no
+    // state data associated with this history entry.
+    document->SetStateObject(scContainer);
 
-    document->SetCurrentStateObject(stateData);
     return NS_OK;
 }
 
@@ -9413,66 +9411,6 @@ nsDocShell::SetReferrerURI(nsIURI * aURI)
 // nsDocShell: Session History
 //*****************************************************************************
 
-nsresult
-nsDocShell::StringifyJSValVariant(JSContext *aCx, nsIVariant *aData,
-                                  nsAString &aResult)
-{
-    nsresult rv;
-    aResult.Truncate();
-
-    // First, try to extract a jsval from the variant |aData|.  This works only
-    // if the variant implements GetAsJSVal.
-    jsval jsData;
-    rv = aData->GetAsJSVal(&jsData);
-    NS_ENSURE_SUCCESS(rv, NS_ERROR_UNEXPECTED);
-
-    nsCOMPtr<nsIJSContextStack> contextStack;
-    JSContext *cx = aCx;
-    if (!cx) {
-        // Now get the JSContext associated with the current document.
-        // First get the current document.
-        nsCOMPtr<nsIDocument> document = do_GetInterface(GetAsSupports(this));
-        NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
-
-        // Get the JSContext from the document, like we do in
-        // nsContentUtils::GetContextFromDocument().
-        nsIScriptGlobalObject *sgo = document->GetScopeObject();
-        NS_ENSURE_TRUE(sgo, NS_ERROR_FAILURE);
-
-        nsIScriptContext *scx = sgo->GetContext();
-        NS_ENSURE_TRUE(scx, NS_ERROR_FAILURE);
-
-        cx = (JSContext *)scx->GetNativeContext();
-
-        // If our json call triggers a JS-to-C++ call, we want that call to use
-        // aCx as the context.  So we push aCx onto the context stack.
-        contextStack =
-            do_GetService("@mozilla.org/js/xpc/ContextStack;1", &rv);
-        NS_ENSURE_SUCCESS(rv, rv);
-
-        contextStack->Push(cx);
-    }
-
-    nsCOMPtr<nsIJSON> json = do_GetService("@mozilla.org/dom/json;1");
-    if(json) {
-        // Do the encoding
-        rv = json->EncodeFromJSVal(&jsData, cx, aResult);
-    }
-    else {
-        rv = NS_ERROR_FAILURE;
-    }
-
-    if (contextStack) {
-        if (NS_FAILED(rv)) {
-            JS_ClearPendingException(cx);
-        }
-
-        contextStack->Pop(&cx);
-    }
-
-    return rv;
-}
-
 NS_IMETHODIMP
 nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
                      const nsAString& aURL, PRBool aReplace, JSContext* aCx)
@@ -9480,7 +9418,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
     // Implements History.pushState and History.replaceState
 
     // Here's what we do, roughly in the order specified by HTML5:
-    // 1. Serialize aData to JSON.
+    // 1. Serialize aData using structured clone.
     // 2. If the third argument is present,
     //     a. Resolve the url, relative to the first script's base URL
     //     b. If (a) fails, raise a SECURITY_ERR
@@ -9514,13 +9452,16 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
 
     nsresult rv;
 
-    // Step 1: Clone aData by getting its JSON representation.
-    //
-    // StringifyJSValVariant might cause arbitrary JS to run, and this code
-    // might navigate the page we're on, potentially to a different origin! (bug
+    nsCOMPtr<nsIDocument> document = do_GetInterface(GetAsSupports(this));
+    NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
+
+    // Step 1: Serialize aData using structured clone.
+    nsCOMPtr<nsIStructuredCloneContainer> scContainer;
+
+    // scContainer->Init might cause arbitrary JS to run, and this code might
+    // navigate the page we're on, potentially to a different origin! (bug
     // 634834)  To protect against this, we abort if our principal changes due
-    // to the stringify call.
-    nsString dataStr;
+    // to the InitFromVariant() call.
     {
         nsCOMPtr<nsIDocument> origDocument =
             do_GetInterface(GetAsSupports(this));
@@ -9528,7 +9469,18 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
             return NS_ERROR_DOM_SECURITY_ERR;
         nsCOMPtr<nsIPrincipal> origPrincipal = origDocument->NodePrincipal();
 
-        rv = StringifyJSValVariant(aCx, aData, dataStr);
+        scContainer = new nsStructuredCloneContainer();
+        JSContext *cx = aCx;
+        if (!cx) {
+            cx = nsContentUtils::GetContextFromDocument(document);
+        }
+        rv = scContainer->InitFromVariant(aData, cx);
+
+        // If we're running in the document's context and the structured clone
+        // failed, clear the context's pending exception.  See bug 637116.
+        if (NS_FAILED(rv) && !aCx) {
+            JS_ClearPendingException(aCx);
+        }
         NS_ENSURE_SUCCESS(rv, rv);
 
         nsCOMPtr<nsIDocument> newDocument =
@@ -9543,7 +9495,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
     }
 
     // Check that the state object isn't too long.
-    // Default max length: 640k chars.
+    // Default max length: 640k bytes.
     PRInt32 maxStateObjSize = 0xA0000;
     if (mPrefs) {
         mPrefs->GetIntPref("browser.history.maxStateObjectSize",
@@ -9552,11 +9504,13 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
     if (maxStateObjSize < 0) {
         maxStateObjSize = 0;
     }
-    NS_ENSURE_TRUE(dataStr.Length() <= (PRUint32)maxStateObjSize,
-                   NS_ERROR_ILLEGAL_VALUE);
 
-    nsCOMPtr<nsIDocument> document = do_GetInterface(GetAsSupports(this));
-    NS_ENSURE_TRUE(document, NS_ERROR_FAILURE);
+    PRUint64 scSize;
+    rv = scContainer->GetSerializedNBytes(&scSize);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    NS_ENSURE_TRUE(scSize <= (PRUint32)maxStateObjSize,
+                   NS_ERROR_ILLEGAL_VALUE);
 
     // Step 2: Resolve aURL
     PRBool equalURIs = PR_TRUE;
@@ -9693,7 +9647,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
 
     // Step 4: Modify new/original session history entry and clear its POST
     // data, if there is any.
-    newSHEntry->SetStateData(dataStr);
+    newSHEntry->SetStateData(scContainer);
     newSHEntry->SetPostData(nsnull);
 
     // Step 5: If aReplace is false, indicating that we're doing a pushState
@@ -9731,7 +9685,7 @@ nsDocShell::AddState(nsIVariant *aData, const nsAString& aTitle,
     else {
         FireDummyOnLocationChange();
     }
-    document->SetCurrentStateObject(dataStr);
+    document->SetStateObject(scContainer);
 
     return NS_OK;
 }
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 1a6ab579efa9..09555a93699c 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -335,9 +335,9 @@ protected:
     nsresult ScrollToAnchor(nsACString & curHash, nsACString & newHash,
                             PRUint32 aLoadType);
 
-    // Tries to stringify a given variant by converting it to JSON.  This only
+    // Tries to serialize a given variant using structured clone.  This only
     // works if the variant is backed by a JSVal.
-    nsresult StringifyJSValVariant(JSContext *aCx, nsIVariant *aData,
+    nsresult SerializeJSValVariant(JSContext *aCx, nsIVariant *aData,
                                    nsAString &aResult);
 
     // Returns PR_TRUE if would have called FireOnLocationChange,
diff --git a/docshell/build/nsDocShellModule.cpp b/docshell/build/nsDocShellModule.cpp
index 9df5c0cee7a7..4140a36608fb 100644
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -72,6 +72,8 @@
 // download history
 #include "nsDownloadHistory.h"
 
+#include "nsStructuredCloneContainer.h"
+
 static PRBool gInitialized = PR_FALSE;
 
 // The one time initialization for this module
@@ -131,6 +133,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSHistory)
 // download history
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDownloadHistory)
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsStructuredCloneContainer)
+
 NS_DEFINE_NAMED_CID(NS_DOCSHELL_CID);
 NS_DEFINE_NAMED_CID(NS_DEFAULTURIFIXUP_CID);
 NS_DEFINE_NAMED_CID(NS_WEBNAVIGATION_INFO_CID);
@@ -158,6 +162,7 @@ NS_DEFINE_NAMED_CID(NS_SHTRANSACTION_CID);
 NS_DEFINE_NAMED_CID(NS_SHISTORY_CID);
 NS_DEFINE_NAMED_CID(NS_SHISTORY_INTERNAL_CID);
 NS_DEFINE_NAMED_CID(NS_DOWNLOADHISTORY_CID);
+NS_DEFINE_NAMED_CID(NS_STRUCTUREDCLONECONTAINER_CID);
 
 
 const mozilla::Module::CIDEntry kDocShellCIDs[] = {
@@ -188,6 +193,7 @@ const mozilla::Module::CIDEntry kDocShellCIDs[] = {
   { &kNS_SHISTORY_CID, false, NULL, nsSHistoryConstructor },
   { &kNS_SHISTORY_INTERNAL_CID, false, NULL, nsSHistoryConstructor },
   { &kNS_DOWNLOADHISTORY_CID, false, NULL, nsDownloadHistoryConstructor },
+  { &kNS_STRUCTUREDCLONECONTAINER_CID, false, NULL, nsStructuredCloneContainerConstructor },
   { NULL }
 };
 
@@ -236,6 +242,7 @@ const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
   { NS_SHISTORY_CONTRACTID, &kNS_SHISTORY_CID },
   { NS_SHISTORY_INTERNAL_CONTRACTID, &kNS_SHISTORY_INTERNAL_CID },
   { NS_DOWNLOADHISTORY_CONTRACTID, &kNS_DOWNLOADHISTORY_CID },
+  { NS_STRUCTUREDCLONECONTAINER_CONTRACTID, &kNS_STRUCTUREDCLONECONTAINER_CID },
   { NULL }
 };
 
diff --git a/docshell/shistory/public/nsISHEntry.idl b/docshell/shistory/public/nsISHEntry.idl
index 5f4effe19152..93ac8a929342 100644
--- a/docshell/shistory/public/nsISHEntry.idl
+++ b/docshell/shistory/public/nsISHEntry.idl
@@ -50,6 +50,7 @@ interface nsIURI;
 interface nsIInputStream;
 interface nsIDocShellTreeItem;
 interface nsISupportsArray;
+interface nsIStructuredCloneContainer;
 %{C++
 struct nsIntRect;
 class nsDocShellEditorData;
@@ -201,9 +202,9 @@ interface nsISHEntry : nsIHistoryEntry
 
     /**
      * Get/set data associated with this history state via a pushState() call,
-     * encoded as JSON.
+     * serialized using structured clone.
      **/
-    attribute AString stateData;
+    attribute nsIStructuredCloneContainer stateData;
 
     /**
      * Gets the owning pointer to the editor data assosicated with
diff --git a/docshell/shistory/src/nsSHEntry.cpp b/docshell/shistory/src/nsSHEntry.cpp
index c69a98aaf62d..61b6d593091e 100644
--- a/docshell/shistory/src/nsSHEntry.cpp
+++ b/docshell/shistory/src/nsSHEntry.cpp
@@ -142,8 +142,8 @@ nsSHEntry::nsSHEntry(const nsSHEntry &other)
   , mParent(other.mParent)
   , mViewerBounds(0, 0, 0, 0)
   , mOwner(other.mOwner)
-  , mStateData(other.mStateData)
   , mDocShellID(other.mDocShellID)
+  , mStateData(other.mStateData)
 {
 }
 
@@ -992,16 +992,17 @@ nsSHEntry::HasDetachedEditor()
 }
 
 NS_IMETHODIMP
-nsSHEntry::GetStateData(nsAString &aStateData)
+nsSHEntry::GetStateData(nsIStructuredCloneContainer **aContainer)
 {
-  aStateData.Assign(mStateData);
+  NS_ENSURE_ARG_POINTER(aContainer);
+  NS_IF_ADDREF(*aContainer = mStateData);
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsSHEntry::SetStateData(const nsAString &aDataStr)
+nsSHEntry::SetStateData(nsIStructuredCloneContainer *aContainer)
 {
-  mStateData.Assign(aDataStr);
+  mStateData = aContainer;
   return NS_OK;
 }
 
diff --git a/docshell/shistory/src/nsSHEntry.h b/docshell/shistory/src/nsSHEntry.h
index a90fe4811c7c..394179db10f6 100644
--- a/docshell/shistory/src/nsSHEntry.h
+++ b/docshell/shistory/src/nsSHEntry.h
@@ -117,9 +117,9 @@ private:
   nsCOMPtr<nsISupports>           mOwner;
   nsExpirationState               mExpirationState;
   nsAutoPtr<nsDocShellEditorData> mEditorData;
-  nsString                        mStateData;
   PRUint64                        mDocShellID;
   PRUint32                        mLastTouched;
+  nsCOMPtr<nsIStructuredCloneContainer> mStateData;
 };
 
 #endif /* nsSHEntry_h */
diff --git a/docshell/test/Makefile.in b/docshell/test/Makefile.in
index 61e642046dac..1a632d3b844e 100644
--- a/docshell/test/Makefile.in
+++ b/docshell/test/Makefile.in
@@ -87,6 +87,7 @@ _TEST_FILES = \
 		bug529119-window.html \
 		test_bug540462.html \
 		file_bug540462.html \
+		test_bug551225.html \
 		test_bug580069.html \
 		file_bug580069_1.html \
 		file_bug580069_2.sjs \
diff --git a/docshell/test/test_bug551225.html b/docshell/test/test_bug551225.html
new file mode 100644
index 000000000000..1d436948d727
--- /dev/null
+++ b/docshell/test/test_bug551225.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=551225
+-->
+<head>
+  <title>Test for Bug 551225</title>
+  <script type="application/javascript" src="/MochiKit/packed.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.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=551225">Mozilla Bug 551225</a>
+
+<script type="application/javascript;version=1.7">
+
+/** Test for Bug 551225 **/
+
+obj = {
+  a: new Date('1/1/2000'),
+  b: /^foo$/,
+  c: 'bar'
+};
+
+history.replaceState(obj, '', '');
+is(history.state.a.toString(), new Date('1/1/2000').toString(), 'Date object.');
+is(history.state.b.toString(), '/^foo$/', 'Regex');
+is(history.state.c, 'bar', 'Other state');
+
+</script>
+</body>
+</html>
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
index 8603c0f7bd73..19089fce9f9c 100644
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -84,6 +84,7 @@ EXPORTS = \
   nsFocusManager.h \
   nsWrapperCache.h \
   nsContentPermissionHelper.h \
+  nsStructuredCloneContainer.h \
   $(NULL)
 
 CPPSRCS =			\
@@ -108,6 +109,7 @@ CPPSRCS =			\
 	nsDOMScriptObjectFactory.cpp \
 	nsQueryContentEventResult.cpp \
 	nsContentPermissionHelper.cpp \
+	nsStructuredCloneContainer.cpp \
 	$(NULL)
 
 include $(topsrcdir)/dom/dom-config.mk
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index c6b9231969e4..97eae93ca33f 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7772,10 +7772,10 @@ nsGlobalWindow::DispatchSyncPopState()
   }
 
   // Get the document's pending state object -- it contains the data we're
-  // going to send along with the popstate event.  The object is serialized as
-  // JSON.
+  // going to send along with the popstate event.  The object is serialized
+  // using structured clone.
   nsCOMPtr<nsIVariant> stateObj;
-  rv = mDoc->GetMozCurrentStateObject(getter_AddRefs(stateObj));
+  rv = mDoc->GetStateObject(getter_AddRefs(stateObj));
   NS_ENSURE_SUCCESS(rv, rv);
 
   // Obtain a presentation shell for use in creating a popstate event.
diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp
index 220e238834da..356ebe183dc6 100644
--- a/dom/base/nsHistory.cpp
+++ b/dom/base/nsHistory.cpp
@@ -354,7 +354,7 @@ nsHistory::GetState(nsIVariant **aState)
   if (!doc)
     return NS_ERROR_NOT_AVAILABLE;
 
-  return doc->GetMozCurrentStateObject(aState);
+  return doc->GetStateObject(aState);
 }
 
 NS_IMETHODIMP
diff --git a/dom/base/nsStructuredCloneContainer.cpp b/dom/base/nsStructuredCloneContainer.cpp
new file mode 100644
index 000000000000..cbbf18fe7c6c
--- /dev/null
+++ b/dom/base/nsStructuredCloneContainer.cpp
@@ -0,0 +1,195 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sw=2 et tw=80:
+ *
+ * ***** 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 Initial Developer of the Original Code is the Mozilla Foundation.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Lebar <justin.lebar@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"),
+ * 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 "nsStructuredCloneContainer.h"
+
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIJSContextStack.h"
+#include "nsIScriptContext.h"
+#include "nsIVariant.h"
+#include "nsServiceManagerUtils.h"
+#include "nsContentUtils.h"
+#include "xpcprivate.h"
+
+NS_IMPL_ADDREF(nsStructuredCloneContainer)
+NS_IMPL_RELEASE(nsStructuredCloneContainer)
+
+NS_INTERFACE_MAP_BEGIN(nsStructuredCloneContainer)
+  NS_INTERFACE_MAP_ENTRY(nsIStructuredCloneContainer)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+nsStructuredCloneContainer::nsStructuredCloneContainer()
+  : mData(nsnull), mSize(0), mVersion(0)
+{
+}
+
+nsStructuredCloneContainer::~nsStructuredCloneContainer()
+{
+  free(mData);
+}
+
+nsresult
+nsStructuredCloneContainer::InitFromVariant(nsIVariant *aData, JSContext *aCx)
+{
+  NS_ENSURE_STATE(!mData);
+  NS_ENSURE_ARG_POINTER(aData);
+  NS_ENSURE_ARG_POINTER(aCx);
+
+  // First, try to extract a jsval from the variant |aData|.  This works only
+  // if the variant implements GetAsJSVal.
+  jsval jsData;
+  nsresult rv = aData->GetAsJSVal(&jsData);
+  NS_ENSURE_SUCCESS(rv, NS_ERROR_UNEXPECTED);
+
+  // Make sure that we serialize in the right context.
+  JSAutoRequest ar(aCx);
+  JSAutoEnterCompartment ac;
+  NS_ENSURE_STATE(ac.enter(aCx, JS_GetGlobalObject(aCx)));
+
+  nsCxPusher cxPusher;
+  cxPusher.Push(aCx);
+
+  PRUint64* jsBytes = nsnull;
+  PRBool success = JS_WriteStructuredClone(aCx, jsData, &jsBytes, &mSize,
+                                           nsnull, nsnull);
+  NS_ENSURE_STATE(success);
+  NS_ENSURE_STATE(jsBytes);
+
+  // Copy jsBytes into our own buffer.
+  mData = (PRUint64*) malloc(mSize);
+  if (!mData) {
+    mSize = 0;
+    mVersion = 0;
+    return NS_ERROR_FAILURE;
+  }
+  else {
+    mVersion = JS_STRUCTURED_CLONE_VERSION;
+  }
+
+  memcpy(mData, jsBytes, mSize);
+  return NS_OK;
+}
+
+nsresult
+nsStructuredCloneContainer::InitFromBase64(const nsAString &aData,
+                                           PRUint32 aFormatVersion,
+                                           JSContext *aCx)
+{
+  NS_ENSURE_STATE(!mData);
+
+  NS_ConvertUTF16toUTF8 data(aData);
+
+  nsCAutoString binaryData;
+  nsresult rv = nsXPConnect::Base64Decode(data, binaryData);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Copy the string's data into our own buffer.
+  mData = (PRUint64*) malloc(binaryData.Length());
+  NS_ENSURE_STATE(mData);
+  memcpy(mData, binaryData.get(), binaryData.Length());
+
+  mSize = binaryData.Length();
+  mVersion = aFormatVersion;
+  return NS_OK;
+}
+
+
+nsresult
+nsStructuredCloneContainer::DeserializeToVariant(JSContext *aCx,
+                                                 nsIVariant **aData)
+{
+  NS_ENSURE_STATE(mData);
+  NS_ENSURE_ARG_POINTER(aData);
+  *aData = nsnull;
+
+  // Deserialize to a jsval.
+  jsval jsStateObj;
+  PRBool success = JS_ReadStructuredClone(aCx, mData, mSize, mVersion,
+                                          &jsStateObj, nsnull, nsnull);
+  NS_ENSURE_STATE(success);
+
+  // Now wrap the jsval as an nsIVariant.
+  nsCOMPtr<nsIVariant> varStateObj;
+  nsCOMPtr<nsIXPConnect> xpconnect = do_GetService(nsIXPConnect::GetCID());
+  NS_ENSURE_STATE(xpconnect);
+  xpconnect->JSValToVariant(aCx, &jsStateObj, getter_AddRefs(varStateObj));
+  NS_ENSURE_STATE(varStateObj);
+
+  NS_IF_ADDREF(*aData = varStateObj);
+  return NS_OK;
+}
+
+nsresult
+nsStructuredCloneContainer::GetDataAsBase64(nsAString &aOut)
+{
+  NS_ENSURE_STATE(mData);
+  aOut.Truncate();
+
+  nsCAutoString binaryData(reinterpret_cast<char*>(mData), mSize);
+  nsCAutoString base64Data;
+  nsresult rv = nsXPConnect::Base64Encode(binaryData, base64Data);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  aOut.Assign(NS_ConvertASCIItoUTF16(base64Data));
+  return NS_OK;
+}
+
+nsresult
+nsStructuredCloneContainer::GetSerializedNBytes(PRUint64 *aSize)
+{
+  NS_ENSURE_STATE(mData);
+  NS_ENSURE_ARG_POINTER(aSize);
+
+  // mSize is a size_t, while aSize is a PRUint64.  We rely on an implicit cast
+  // here so that we'll get a compile error if a size_t-to-uint64 cast is
+  // narrowing.
+  *aSize = mSize;
+
+  return NS_OK;
+}
+
+nsresult
+nsStructuredCloneContainer::GetFormatVersion(PRUint32 *aFormatVersion)
+{
+  NS_ENSURE_STATE(mData);
+  NS_ENSURE_ARG_POINTER(aFormatVersion);
+  *aFormatVersion = mVersion;
+  return NS_OK;
+}
diff --git a/dom/base/nsStructuredCloneContainer.h b/dom/base/nsStructuredCloneContainer.h
new file mode 100644
index 000000000000..63b7447105ba
--- /dev/null
+++ b/dom/base/nsStructuredCloneContainer.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sw=2 et tw=80:
+ *
+ * ***** 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 Initial Developer of the Original Code is the Mozilla Foundation.
+ *
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Lebar <justin.lebar@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"),
+ * 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 nsStructuredCloneContainer_h__
+#define nsStructuredCloneContainer_h__
+
+#include "nsIStructuredCloneContainer.h"
+#include "jsapi.h"
+
+#define NS_STRUCTUREDCLONECONTAINER_CLASSNAME "nsStructuredCloneContainer"
+#define NS_STRUCTUREDCLONECONTAINER_CONTRACTID \
+  "@mozilla.org/docshell/structured-clone-container;1"
+#define NS_STRUCTUREDCLONECONTAINER_CID \
+{ /* 38bd0634-0fd4-46f0-b85f-13ced889eeec */       \
+  0x38bd0634,                                      \
+  0x0fd4,                                          \
+  0x46f0,                                          \
+  {0xb8, 0x5f, 0x13, 0xce, 0xd8, 0x89, 0xee, 0xec} \
+}
+
+class nsStructuredCloneContainer : public nsIStructuredCloneContainer
+{
+  public:
+    nsStructuredCloneContainer();
+    ~nsStructuredCloneContainer();
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSISTRUCTUREDCLONECONTAINER
+
+  private:
+    PRUint64* mData;
+
+    // This needs to be size_t rather than a PR-type so it matches the JS API.
+    size_t mSize;
+    PRUint32 mVersion;
+};
+
+#endif
diff --git a/dom/interfaces/base/Makefile.in b/dom/interfaces/base/Makefile.in
index e9674e23bdeb..07de2a633b64 100644
--- a/dom/interfaces/base/Makefile.in
+++ b/dom/interfaces/base/Makefile.in
@@ -87,6 +87,7 @@ XPIDLSRCS =					\
 	nsITabChild.idl				\
 	nsITabParent.idl			\
 	nsIDOMGlobalPropertyInitializer.idl	\
+	nsIStructuredCloneContainer.idl		\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/interfaces/base/nsIStructuredCloneContainer.idl b/dom/interfaces/base/nsIStructuredCloneContainer.idl
new file mode 100644
index 000000000000..a5e7a10b2020
--- /dev/null
+++ b/dom/interfaces/base/nsIStructuredCloneContainer.idl
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: set ts=8 sw=2 et tw=80:
+ *
+ * ***** 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 Initial Developer of the Original Code is the Mozilla Foundation.
+
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Justin Lebar <justin.lebar@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"),
+ * 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 "nsISupports.idl"
+
+interface nsIVariant;
+interface nsIDocument;
+
+%{C++
+struct JSContext;
+%}
+
+/**
+ * This interface acts as a container for an object serialized using the
+ * structured clone algorithm.
+ *
+ * You can copy an object into an nsIStructuredCloneContainer using
+ * initFromVariant or initFromBase64.  It's an error to initialize an
+ * nsIStructuredCloneContainer more than once.
+ *
+ * Once you've initialized the container, you can get a copy of the object it
+ * stores by calling deserializeToVariant.  You can also get a base-64-encoded
+ * string containing a copy of the container's serialized data, using
+ * getDataAsBase64.
+ */
+[scriptable, uuid(400a282d-7157-4ed0-85b4-8bdc2fa634cd)]
+interface nsIStructuredCloneContainer : nsISupports
+{
+  /**
+   * Initialize this structured clone container so it contains a clone of the
+   * given variant. aData must be backed by a jsval.
+   */
+  [implicit_jscontext]
+  void initFromVariant(in nsIVariant aData);
+
+  /**
+   * Initialize this structured clone container from a base-64-encoded byte
+   * stream, stored in aData.  aFormatVersion should be the version of the
+   * structured clone algorithm which was used to generate aData.
+   */
+  [implicit_jscontext]
+  void initFromBase64(in AString aData,in unsigned long aFormatVersion);
+
+  /**
+   * Deserialize the object this conatiner holds, returning it wrapped as
+   * an nsIVariant.
+   */
+  [implicit_jscontext]
+  nsIVariant deserializeToVariant();
+
+  /**
+   * Get this structured clone container's data as a base-64-encoded string.
+   */
+  AString getDataAsBase64();
+
+  /**
+   * Get the size in bytes of this container's serialized data.
+   */
+  readonly attribute unsigned long long serializedNBytes;
+
+  /**
+   * Get the version of the structured clone algorithm which was used to
+   * generate this container's serialized buffer.
+   */
+  readonly attribute unsigned long formatVersion;
+};

From ab04e988f226b682892ef34dfc3946022adfbf31 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 9 May 2011 11:52:59 -0700
Subject: [PATCH 281/314] Bug 635402 - Get rid of :not([inFullscreen])
 workaround selectors for sizemode transitions. r=jmathies,dao

---
 .../themes/winstripe/browser/browser-aero.css | 30 +++----
 browser/themes/winstripe/browser/browser.css  |  2 +-
 dom/tests/mochitest/chrome/Makefile.in        |  7 ++
 .../mochitest/chrome/sizemode_attribute.xul   | 87 +++++++++++++++++++
 .../chrome/test_sizemode_attribute.xul        | 28 ++++++
 widget/src/windows/nsWindow.cpp               |  2 +-
 6 files changed, 138 insertions(+), 18 deletions(-)
 create mode 100644 dom/tests/mochitest/chrome/sizemode_attribute.xul
 create mode 100644 dom/tests/mochitest/chrome/test_sizemode_attribute.xul

diff --git a/browser/themes/winstripe/browser/browser-aero.css b/browser/themes/winstripe/browser/browser-aero.css
index 05305906460f..0f18dc769c5c 100644
--- a/browser/themes/winstripe/browser/browser-aero.css
+++ b/browser/themes/winstripe/browser/browser-aero.css
@@ -88,7 +88,7 @@
     background: transparent;
   }
 
-  #main-window[chromemargin^="0,"][sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox {
+  #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox {
     margin-top: -7px;
   }
 
@@ -114,7 +114,7 @@
     margin-bottom: -1px; /* compensate white outer border */
   }
 
-  #main-window:not(:-moz-lwtheme)[inFullscreen="true"] {
+  #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) {
     -moz-appearance: none;
     background-color: #556;
   }
@@ -131,9 +131,9 @@
   }
 
   /* Vertical toolbar border */
-  #main-window[sizemode=normal] #navigator-toolbox:not([inFullscreen])::after,
-  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not([inFullscreen]),
-  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar):not([inFullScreen]) {
+  #main-window[sizemode=normal] #navigator-toolbox::after,
+  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar),
+  #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) {
     border-left: 1px solid @toolbarShadowColor@;
     border-right: 1px solid @toolbarShadowColor@;
     background-clip: padding-box;
@@ -141,8 +141,8 @@
   #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme {
     border-color: transparent !important;
   }
-  #main-window[sizemode=normal]:not([inFullscreen]) #browser-border-start,
-  #main-window[sizemode=normal]:not([inFullscreen]) #browser-border-end {
+  #main-window[sizemode=normal] #browser-border-start,
+  #main-window[sizemode=normal] #browser-border-end {
     display: -moz-box;
     background-color: @toolbarShadowColor@;
     width: 1px;
@@ -159,10 +159,8 @@
 
   /* Toolbar shadow behind tabs */
   /* This code is only needed for restored windows (i.e. sizemode=normal)
-     because of the border radius on the toolbar below the tab bar.
-     :not([inFullscreen=true]) is added to ease the transition to and from
-     fullscreen mode, as the sizemode attribute isn't updated immediately. */
-  #main-window[sizemode=normal]:not([inFullscreen=true])[tabsontop=true] #nav-bar:not(:-moz-lwtheme),
+     because of the border radius on the toolbar below the tab bar. */
+  #main-window[sizemode=normal][tabsontop=true] #nav-bar:not(:-moz-lwtheme),
   #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme),
   #main-window[sizemode=normal][tabsontop=true] > #nav-bar[collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) {
     border-top: 1px solid @toolbarShadowColor@;
@@ -170,11 +168,11 @@
     border-top-right-radius: 3.5px;
     background-clip: padding-box;
   }
-  #main-window[sizemode=normal]:not([inFullscreen]):not([disablechrome]) #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
+  #main-window[sizemode=normal]:not([disablechrome]) #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) {
     margin-bottom: -1px;
     background-image: none !important;
   }
-  #main-window[sizemode=normal]:not([inFullscreen]):not([disablechrome]) #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
+  #main-window[sizemode=normal]:not([disablechrome]) #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) {
     position: relative;
   }
 
@@ -187,12 +185,12 @@
     background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0));
   }
 
-  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true]:not([inFullscreen]) {
+  #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] {
     padding-left: 4px;
     padding-right: 4px;
   }
 
-  #main-window[sizemode=normal] #TabsToolbar[tabsontop=false]:not([inFullscreen]) {
+  #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] {
     padding-left: 2px;
     padding-right: 2px;
   }
@@ -258,7 +256,7 @@
     text-shadow: none;
   }
 
-  #main-window[sizemode=normal]:not([inFullscreen=true]) .statuspanel-inner {
+  #main-window[sizemode=normal] .statuspanel-inner {
     /* align with the browser's side borders */
     padding-left: 1px;
     padding-right: 1px;
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 9ecb2b730051..bf524597f269 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1557,7 +1557,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 %ifndef WINSTRIPE_AERO
 @media all and (-moz-windows-default-theme) {
-  #main-window[sizemode=normal] #TabsToolbar:not([inFullscreen]) {
+  #main-window[sizemode=normal] #TabsToolbar {
     padding-left: 2px;
     padding-right: 2px;
   }
diff --git a/dom/tests/mochitest/chrome/Makefile.in b/dom/tests/mochitest/chrome/Makefile.in
index c67b490ff817..a6578eaaa776 100644
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -68,5 +68,12 @@ _TEST_FILES = \
 		test_sandbox_image.xul \
 		$(NULL)
 
+ifeq (WINNT,$(OS_ARCH))
+_TEST_FILES += \
+		test_sizemode_attribute.xul \
+		sizemode_attribute.xul \
+		$(NULL)
+endif
+
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
diff --git a/dom/tests/mochitest/chrome/sizemode_attribute.xul b/dom/tests/mochitest/chrome/sizemode_attribute.xul
new file mode 100644
index 000000000000..9e10bc1afbb3
--- /dev/null
+++ b/dom/tests/mochitest/chrome/sizemode_attribute.xul
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<!--
+  Test for fullscreen sizemode in chrome
+  -->
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        persist="sizemode"
+        sizemode="normal"
+        onload="nextStep()">
+
+<script type="text/javascript;version=1.8">
+let tests = [
+  function test1() {
+    checkAndContinue("normal");
+  },
+
+  function test2() {
+    listen("fullscreen", function() checkAndContinue("fullscreen"));
+    window.fullScreen = true;
+  },
+
+  function test3() {
+    listen("fullscreen", function() checkAndContinue("normal"));
+    window.fullScreen = false;
+  },
+
+  function test4() {
+    listen("resize", function() checkAndContinue("maximized"));
+    window.maximize();
+  },
+
+  function test5() {
+    listen("fullscreen", function() checkAndContinue("fullscreen"));
+    window.fullScreen = true;
+  },
+
+  function test6() {
+    listen("fullscreen", function() checkAndContinue("maximized"));
+    window.fullScreen = false;
+  },
+
+  function test7() {
+    listen("resize", function() checkAndContinue("normal"));
+    window.restore();
+  },
+
+  function test8() {
+    window.opener.wrappedJSObject.done();
+  }
+];
+
+function nextStep() {
+  tests.shift()();
+}
+
+function listen(event, fn) {
+  window.addEventListener(event, function listener() {
+    window.removeEventListener(event, listener, false);
+    fn();
+  }, false);
+}
+
+function checkAndContinue(sizemode) {
+
+  let windowStates = {
+    "fullscreen": window.STATE_FULLSCREEN,
+    "normal": window.STATE_NORMAL,
+    "maximized": window.STATE_MAXIMIZED
+  };
+
+  setTimeout(function() {
+    is(window.document.documentElement.getAttribute("sizemode"), sizemode, "sizemode attribute should match actual window state");
+    is(window.fullScreen, sizemode == "fullscreen", "window.fullScreen should match actual window state");
+    is(window.windowState, windowStates[sizemode], "window.sizeMode should match actual window state");
+    nextStep();
+  }, 0);
+}
+
+let is = window.opener.wrappedJSObject.is;
+
+</script>
+
+<body xmlns="http://www.w3.org/1999/xhtml">
+
+</body>
+</window>
diff --git a/dom/tests/mochitest/chrome/test_sizemode_attribute.xul b/dom/tests/mochitest/chrome/test_sizemode_attribute.xul
new file mode 100644
index 000000000000..5199639080d1
--- /dev/null
+++ b/dom/tests/mochitest/chrome/test_sizemode_attribute.xul
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<!--
+  Test for the sizemode attribute
+  -->
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        sizemode="fullscreen">
+
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/MochiKit/packed.js"></script>
+  <script type="application/javascript" 
+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
+
+<script>
+SimpleTest.waitForExplicitFinish();
+
+newwindow = window.open("sizemode_attribute.xul", "_blank","chrome,resizable=yes");
+
+function done() {
+  newwindow.close();
+  SimpleTest.finish();
+}
+
+</script>
+<body xmlns="http://www.w3.org/1999/xhtml" style="height: 300px;"/>
+
+</window>
diff --git a/widget/src/windows/nsWindow.cpp b/widget/src/windows/nsWindow.cpp
index 6beeca1572af..fa8f3f81ddde 100644
--- a/widget/src/windows/nsWindow.cpp
+++ b/widget/src/windows/nsWindow.cpp
@@ -1684,7 +1684,7 @@ NS_IMETHODIMP nsWindow::SetSizeMode(PRInt32 aMode) {
     ::ShowWindow(mWnd, mode);
     // we dispatch an activate event here to ensure that the right child window
     // is focused
-    if (mode == SW_RESTORE || mode == SW_MAXIMIZE)
+    if (mode == SW_RESTORE || mode == SW_MAXIMIZE || mode == SW_SHOW)
       DispatchFocusToTopLevelWindow(NS_ACTIVATE);
   }
   return rv;

From 70e80258815117e64340c670f9e5113e77c39a41 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:34 -0400
Subject: [PATCH 282/314] In cycle collector dumps, allow much more room for
 document URLs.  (Bug 652056)  r=peterv

---
 content/base/src/nsDocument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index 99970a685b25..a03de6ae1a6f 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -1808,7 +1808,7 @@ static const char* kNSURIs[] = {
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
   if (NS_UNLIKELY(cb.WantDebugInfo())) {
-    char name[72];
+    char name[512];
     PRUint32 nsid = tmp->GetDefaultNamespaceID();
     nsCAutoString uri;
     if (tmp->mDocumentURI)

From 03d0350670b1fc26588692bc78c17728b14c0a47 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:34 -0400
Subject: [PATCH 283/314] List value range restrictions more reliably in
 nsCSSPropList.  Change 'font-size-adjust' to reject negative values.  (Bug
 653842, patch 1)  r=bzbarsky

---
 layout/style/nsCSSPropList.h | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index ab4149286df0..94d1f0d7f3ec 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -307,6 +307,7 @@ CSS_PROP_OUTLINE(
     _moz_outline_radius_topLeft,
     CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusTopleft),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -317,6 +318,7 @@ CSS_PROP_OUTLINE(
     _moz_outline_radius_topRight,
     CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusTopright),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -327,6 +329,7 @@ CSS_PROP_OUTLINE(
     _moz_outline_radius_bottomRight,
     CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusBottomright),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -337,6 +340,7 @@ CSS_PROP_OUTLINE(
     _moz_outline_radius_bottomLeft,
     CSS_PROP_DOMPROP_PREFIXED(OutlineRadiusBottomleft),
     CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -558,6 +562,7 @@ CSS_PROP_BACKGROUND(
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     kBackgroundSizeKTable,
@@ -992,7 +997,8 @@ CSS_PROP_TABLEBORDER(
     border-spacing,
     border_spacing,
     BorderSpacing,
-    CSS_PROPERTY_PARSE_FUNCTION,
+    CSS_PROPERTY_PARSE_FUNCTION |
+        CSS_PROPERTY_VALUE_NONNEGATIVE,
     0,
     nsnull,
     CSS_PROP_NO_OFFSET,
@@ -1123,6 +1129,7 @@ CSS_PROP_BORDER(
     BorderTopLeftRadius,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -1134,6 +1141,7 @@ CSS_PROP_BORDER(
     BorderTopRightRadius,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -1145,6 +1153,7 @@ CSS_PROP_BORDER(
     BorderBottomRightRadius,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -1156,6 +1165,7 @@ CSS_PROP_BORDER(
     BorderBottomLeftRadius,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_STORES_CALC,
     0,
     nsnull,
@@ -1179,6 +1189,7 @@ CSS_PROP_BORDER(
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
+        // NOTE: some components must be nonnegative
     0,
     kBoxShadowTypeKTable,
     offsetof(nsStyleBorder, mBoxShadow),
@@ -1436,6 +1447,7 @@ CSS_PROP_FONT(
     font_size_adjust,
     FontSizeAdjust,
     CSS_PROPERTY_PARSE_VALUE |
+        CSS_PROPERTY_VALUE_NONNEGATIVE |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
     VARIANT_HON | VARIANT_SYSFONT,
     nsnull,
@@ -1478,6 +1490,7 @@ CSS_PROP_FONT(
     CSS_PROPERTY_PARSE_VALUE |
         CSS_PROPERTY_VALUE_PARSER_FUNCTION |
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
+        // NOTE: This property has range restrictions on interpolation!
     0,
     kFontWeightKTable,
     offsetof(nsStyleFont, mFont.weight),
@@ -2195,6 +2208,7 @@ CSS_PROP_TEXT(
         CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS |
         CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
+        // NOTE: some components must be nonnegative
     0,
     nsnull,
     offsetof(nsStyleText, mTextShadow),
@@ -2497,6 +2511,7 @@ CSS_PROP_FONT(
     -moz-script-level,
     script_level,
     ScriptLevel,
+    // REVIEW: no range restriction?
     CSS_PROPERTY_PARSE_VALUE,
     // script-level can take Integer or Number values, but only Integer
     // ("relative") values can be specified in a style sheet.
@@ -2508,6 +2523,7 @@ CSS_PROP_FONT(
     -moz-script-size-multiplier,
     script_size_multiplier,
     ScriptSizeMultiplier,
+    // REVIEW: no range restriction?
     CSS_PROPERTY_PARSE_VALUE,
     0,
     nsnull,
@@ -2517,6 +2533,7 @@ CSS_PROP_FONT(
     -moz-script-min-size,
     script_min_size,
     ScriptMinSize,
+    // REVIEW: no range restriction?
     CSS_PROPERTY_PARSE_VALUE,
     0,
     nsnull,
@@ -2725,6 +2742,7 @@ CSS_PROP_SVG(
     StrokeDasharray,
     CSS_PROPERTY_PARSE_FUNCTION |
         CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
+        // NOTE: Internal values have range restrictions.
     0,
     nsnull,
     CSS_PROP_NO_OFFSET, /* property stored in 2 separate members */

From 8a90d74ad2f83c0460eec68475792191d91b643b Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:35 -0400
Subject: [PATCH 284/314] Unify positive-nonzero value restriction (used for
 integers) with one-or-larger value restriction (used for floats) as a single
 one-or-larger value restriction.  (Bug 653842, patch 2)  r=bzbarsky

---
 layout/style/nsCSSParser.cpp | 33 +++++++++++++++------------------
 layout/style/nsCSSPropList.h |  8 ++++----
 layout/style/nsCSSProps.h    |  5 +----
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 85ce0a69b5df..4e1154c2870d 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -579,9 +579,9 @@ protected:
   PRBool ParseNonNegativeVariant(nsCSSValue& aValue,
                                  PRInt32 aVariantMask,
                                  const PRInt32 aKeywordTable[]);
-  PRBool ParsePositiveNonZeroVariant(nsCSSValue& aValue,
-                                     PRInt32 aVariantMask,
-                                     const PRInt32 aKeywordTable[]);
+  PRBool ParseOneOrLargerVariant(nsCSSValue& aValue,
+                                 PRInt32 aVariantMask,
+                                 const PRInt32 aKeywordTable[]);
   PRBool ParseCounter(nsCSSValue& aValue);
   PRBool ParseAttr(nsCSSValue& aValue);
   PRBool SetValueToURL(nsCSSValue& aValue, const nsString& aURL);
@@ -4470,19 +4470,25 @@ CSSParserImpl::ParseNonNegativeVariant(nsCSSValue& aValue,
 // computes the calc will be required to clamp the resulting value to an
 // appropriate range.
 PRBool
-CSSParserImpl::ParsePositiveNonZeroVariant(nsCSSValue& aValue,
-                                           PRInt32 aVariantMask,
-                                           const PRInt32 aKeywordTable[])
+CSSParserImpl::ParseOneOrLargerVariant(nsCSSValue& aValue,
+                                       PRInt32 aVariantMask,
+                                       const PRInt32 aKeywordTable[])
 {
   // The variant mask must only contain non-numeric variants or the ones
   // that we specifically handle.
   NS_ABORT_IF_FALSE((aVariantMask & ~(VARIANT_ALL_NONNUMERIC |
+                                      VARIANT_NUMBER |
                                       VARIANT_INTEGER)) == 0,
                     "need to update code below to handle additional variants");
 
   if (ParseVariant(aValue, aVariantMask, aKeywordTable)) {
     if (aValue.GetUnit() == eCSSUnit_Integer) {
-      if (aValue.GetIntValue() <= 0) {
+      if (aValue.GetIntValue() < 1) {
+        UngetToken();
+        return PR_FALSE;
+      }
+    } else if (eCSSUnit_Number == aValue.GetUnit()) {
+      if (aValue.GetFloatValue() < 1.0f) {
         UngetToken();
         return PR_FALSE;
       }
@@ -5675,17 +5681,8 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
       return ParseVariant(aValue, variant, kwtable);
     case CSS_PROPERTY_VALUE_NONNEGATIVE:
       return ParseNonNegativeVariant(aValue, variant, kwtable);
-    case CSS_PROPERTY_VALUE_POSITIVE_NONZERO:
-      return ParsePositiveNonZeroVariant(aValue, variant, kwtable);
     case CSS_PROPERTY_VALUE_AT_LEAST_ONE:
-      NS_ABORT_IF_FALSE((variant &
-                         ~(VARIANT_ALL_NONNUMERIC | VARIANT_NUMBER)) == 0,
-                        "need to update code to handle additional variants");
-      if (!ParseVariant(aValue, variant, kwtable))
-        return PR_FALSE;
-      // Enforce the restriction that the value is greater than 1.
-      return aValue.GetUnit() != eCSSUnit_Number || 
-             aValue.GetFloatValue() >= 1.0f;
+      return ParseOneOrLargerVariant(aValue, variant, kwtable);
   }
 }
 
@@ -8198,7 +8195,7 @@ CSSParserImpl::ParseTransitionStepTimingFunctionValues(nsCSSValue& aValue)
 
   nsRefPtr<nsCSSValue::Array> val = nsCSSValue::Array::Create(2);
 
-  if (!ParsePositiveNonZeroVariant(val->Item(0), VARIANT_INTEGER, nsnull)) {
+  if (!ParseOneOrLargerVariant(val->Item(0), VARIANT_INTEGER, nsnull)) {
     return PR_FALSE;
   }
 
diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index 94d1f0d7f3ec..e0b659acd3c9 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -1248,7 +1248,7 @@ CSS_PROP_COLUMN(
     CSS_PROPERTY_PARSE_VALUE |
         // Need to reject 0 in addition to negatives.  If we accept 0, we
         // need to change NS_STYLE_COLUMN_COUNT_AUTO to something else.
-        CSS_PROPERTY_VALUE_POSITIVE_NONZERO,
+        CSS_PROPERTY_VALUE_AT_LEAST_ONE,
     VARIANT_AHI,
     nsnull,
     offsetof(nsStyleColumn, mColumnCount),
@@ -1818,7 +1818,7 @@ CSS_PROP_BACKENDONLY(
     orphans,
     Orphans,
     CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_POSITIVE_NONZERO,
+        CSS_PROPERTY_VALUE_AT_LEAST_ONE,
     VARIANT_HI,
     nsnull)
 CSS_PROP_SHORTHAND(
@@ -2379,7 +2379,7 @@ CSS_PROP_BACKENDONLY(
     widows,
     Widows,
     CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_POSITIVE_NONZERO,
+        CSS_PROPERTY_VALUE_AT_LEAST_ONE,
     VARIANT_HI,
     nsnull)
 CSS_PROP_POSITION(
@@ -2490,7 +2490,7 @@ CSS_PROP_XUL(
     box_ordinal_group,
     CSS_PROP_DOMPROP_PREFIXED(BoxOrdinalGroup),
     CSS_PROPERTY_PARSE_VALUE |
-        CSS_PROPERTY_VALUE_POSITIVE_NONZERO,
+        CSS_PROPERTY_VALUE_AT_LEAST_ONE,
     VARIANT_HI,
     nsnull,
     CSS_PROP_NO_OFFSET,
diff --git a/layout/style/nsCSSProps.h b/layout/style/nsCSSProps.h
index d60ed0d68e51..f118fe1ab504 100644
--- a/layout/style/nsCSSProps.h
+++ b/layout/style/nsCSSProps.h
@@ -113,11 +113,8 @@ PR_STATIC_ASSERT((CSS_PROPERTY_PARSE_PROPERTY_MASK &
 // should enforce that the value of this property must be 0 or larger.
 #define CSS_PROPERTY_VALUE_NONNEGATIVE            (1<<13)
 // The parser (in particular, CSSParserImpl::ParseSingleValueProperty)
-// should enforce that the value of this property must be greater than 0.
-#define CSS_PROPERTY_VALUE_POSITIVE_NONZERO       (2<<13)
-// The parser (in particular, CSSParserImpl::ParseSingleValueProperty)
 // should enforce that the value of this property must be 1 or larger.
-#define CSS_PROPERTY_VALUE_AT_LEAST_ONE           (3<<13)
+#define CSS_PROPERTY_VALUE_AT_LEAST_ONE           (2<<13)
 
 // NOTE: next free bit is (1<<15)
 

From 944194d47c15ff412aa5afb39295811345bffd3e Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:35 -0400
Subject: [PATCH 285/314] Ensure nsStyleAnimation doesn't produce values
 outside valid ranges.  (Bug 653842, patch 3)  r=bzbarsky

---
 layout/style/nsStyleAnimation.cpp             |  99 +++-
 .../test/test_transitions_per_property.html   | 469 ++++++++++++++++--
 2 files changed, 497 insertions(+), 71 deletions(-)

diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp
index 6beea45e3909..13cdbaf5d3a8 100644
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -717,39 +717,74 @@ inline PRUint8 ClampColor(double aColor)
   return NSToIntRound(aColor);
 }
 
+template <typename T>
+T
+RestrictValue(PRUint32 aRestrictions, T aValue)
+{
+  T result = aValue;
+  switch (aRestrictions) {
+    case 0:
+      break;
+    case CSS_PROPERTY_VALUE_NONNEGATIVE:
+      if (result < 0) {
+        result = 0;
+      }
+      break;
+    case CSS_PROPERTY_VALUE_AT_LEAST_ONE:
+      if (result < 1) {
+        result = 1;
+      }
+      break;
+    default:
+      NS_ABORT_IF_FALSE(PR_FALSE, "bad value restriction");
+      break;
+  }
+  return result;
+}
+
+template <typename T>
+T
+RestrictValue(nsCSSProperty aProperty, T aValue)
+{
+  return RestrictValue(nsCSSProps::ValueRestrictions(aProperty), aValue);
+}
+
 static inline void
 AddCSSValuePixel(double aCoeff1, const nsCSSValue &aValue1,
                  double aCoeff2, const nsCSSValue &aValue2,
-                 nsCSSValue &aResult)
+                 nsCSSValue &aResult, PRUint32 aValueRestrictions = 0)
 {
   NS_ABORT_IF_FALSE(aValue1.GetUnit() == eCSSUnit_Pixel, "unexpected unit");
   NS_ABORT_IF_FALSE(aValue2.GetUnit() == eCSSUnit_Pixel, "unexpected unit");
-  aResult.SetFloatValue(aCoeff1 * aValue1.GetFloatValue() +
-                        aCoeff2 * aValue2.GetFloatValue(),
+  aResult.SetFloatValue(RestrictValue(aValueRestrictions,
+                                      aCoeff1 * aValue1.GetFloatValue() +
+                                      aCoeff2 * aValue2.GetFloatValue()),
                         eCSSUnit_Pixel);
 }
 
 static inline void
 AddCSSValueNumber(double aCoeff1, const nsCSSValue &aValue1,
                   double aCoeff2, const nsCSSValue &aValue2,
-                  nsCSSValue &aResult)
+                  nsCSSValue &aResult, PRUint32 aValueRestrictions = 0)
 {
   NS_ABORT_IF_FALSE(aValue1.GetUnit() == eCSSUnit_Number, "unexpected unit");
   NS_ABORT_IF_FALSE(aValue2.GetUnit() == eCSSUnit_Number, "unexpected unit");
-  aResult.SetFloatValue(aCoeff1 * aValue1.GetFloatValue() +
-                        aCoeff2 * aValue2.GetFloatValue(),
+  aResult.SetFloatValue(RestrictValue(aValueRestrictions,
+                                      aCoeff1 * aValue1.GetFloatValue() +
+                                      aCoeff2 * aValue2.GetFloatValue()),
                         eCSSUnit_Number);
 }
 
 static inline void
 AddCSSValuePercent(double aCoeff1, const nsCSSValue &aValue1,
                    double aCoeff2, const nsCSSValue &aValue2,
-                   nsCSSValue &aResult)
+                   nsCSSValue &aResult, PRUint32 aValueRestrictions = 0)
 {
   NS_ABORT_IF_FALSE(aValue1.GetUnit() == eCSSUnit_Percent, "unexpected unit");
   NS_ABORT_IF_FALSE(aValue2.GetUnit() == eCSSUnit_Percent, "unexpected unit");
-  aResult.SetPercentValue(aCoeff1 * aValue1.GetPercentValue() +
-                          aCoeff2 * aValue2.GetPercentValue());
+  aResult.SetPercentValue(RestrictValue(aValueRestrictions,
+                                        aCoeff1 * aValue1.GetPercentValue() +
+                                        aCoeff2 * aValue2.GetPercentValue()));
 }
 
 // Add two canonical-form calc values (eUnit_Calc) to make another
@@ -798,7 +833,9 @@ AddShadowItems(double aCoeff1, const nsCSSValue &aValue1,
 
   for (size_t i = 0; i < 4; ++i) {
     AddCSSValuePixel(aCoeff1, array1->Item(i), aCoeff2, array2->Item(i),
-                     resultArray->Item(i));
+                     resultArray->Item(i),
+                     // blur radius must be nonnegative
+                     (i == 2) ? CSS_PROPERTY_VALUE_NONNEGATIVE : 0);
   }
 
   const nsCSSValue& color1 = array1->Item(4);
@@ -1359,6 +1396,11 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
           // Animate just like eUnit_Integer.
           PRInt32 result = NS_floor(aCoeff1 * double(aValue1.GetIntValue()) +
                                     aCoeff2 * double(aValue2.GetIntValue()));
+          if (result < NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED) {
+            result = NS_STYLE_FONT_STRETCH_ULTRA_CONDENSED;
+          } else if (result > NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED) {
+            result = NS_STYLE_FONT_STRETCH_ULTRA_EXPANDED;
+          }
           aResultValue.SetIntValue(result, eUnit_Enumerated);
           return PR_TRUE;
         }
@@ -1382,26 +1424,33 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
       if (aProperty == eCSSProperty_font_weight) {
         NS_ASSERTION(result > 0, "unexpected value");
         result -= result % 100;
+        if (result < 100) {
+          result = 100;
+        } else if (result > 900) {
+          result = 900;
+        }
+      } else {
+        result = RestrictValue(aProperty, result);
       }
       aResultValue.SetIntValue(result, eUnit_Integer);
       return PR_TRUE;
     }
     case eUnit_Coord: {
-      aResultValue.SetCoordValue(NSToCoordRound(
+      aResultValue.SetCoordValue(RestrictValue(aProperty, NSToCoordRound(
         aCoeff1 * aValue1.GetCoordValue() +
-        aCoeff2 * aValue2.GetCoordValue()));
+        aCoeff2 * aValue2.GetCoordValue())));
       return PR_TRUE;
     }
     case eUnit_Percent: {
-      aResultValue.SetPercentValue(
+      aResultValue.SetPercentValue(RestrictValue(aProperty,
         aCoeff1 * aValue1.GetPercentValue() +
-        aCoeff2 * aValue2.GetPercentValue());
+        aCoeff2 * aValue2.GetPercentValue()));
       return PR_TRUE;
     }
     case eUnit_Float: {
-      aResultValue.SetFloatValue(
+      aResultValue.SetFloatValue(RestrictValue(aProperty,
         aCoeff1 * aValue1.GetFloatValue() +
-        aCoeff2 * aValue2.GetFloatValue());
+        aCoeff2 * aValue2.GetFloatValue()));
       return PR_TRUE;
     }
     case eUnit_Color: {
@@ -1478,17 +1527,18 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
       static nsCSSValue nsCSSValuePair::* const pairValues[2] = {
         &nsCSSValuePair::mXValue, &nsCSSValuePair::mYValue
       };
+      PRUint32 restrictions = nsCSSProps::ValueRestrictions(aProperty);
       for (PRUint32 i = 0; i < 2; ++i) {
         nsCSSValue nsCSSValuePair::*member = pairValues[i];
         switch (unit[i]) {
           case eCSSUnit_Pixel:
             AddCSSValuePixel(aCoeff1, pair1->*member, aCoeff2, pair2->*member,
-                             result->*member);
+                             result->*member, restrictions);
             break;
           case eCSSUnit_Percent:
             AddCSSValuePercent(aCoeff1, pair1->*member,
                                aCoeff2, pair2->*member,
-                               result->*member);
+                               result->*member, restrictions);
             break;
           case eCSSUnit_Calc:
             AddCSSValueCanonicalCalc(aCoeff1, pair1->*member,
@@ -1506,6 +1556,8 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
       return PR_TRUE;
     }
     case eUnit_CSSRect: {
+      NS_ABORT_IF_FALSE(nsCSSProps::ValueRestrictions(aProperty) == 0,
+                        "must add code for handling value restrictions");
       const nsCSSRect *rect1 = aValue1.GetCSSRectValue();
       const nsCSSRect *rect2 = aValue2.GetCSSRectValue();
       if (rect1->mTop.GetUnit() != rect2->mTop.GetUnit() ||
@@ -1588,9 +1640,11 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
         resultTail = &item->mNext;
 
         if (v1.GetUnit() == eCSSUnit_Number) {
-          AddCSSValueNumber(aCoeff1, v1, aCoeff2, v2, item->mValue);
+          AddCSSValueNumber(aCoeff1, v1, aCoeff2, v2, item->mValue,
+                            CSS_PROPERTY_VALUE_NONNEGATIVE);
         } else {
-          AddCSSValuePercent(aCoeff1, v1, aCoeff2, v2, item->mValue);
+          AddCSSValuePercent(aCoeff1, v1, aCoeff2, v2, item->mValue,
+                             CSS_PROPERTY_VALUE_NONNEGATIVE);
         }
 
         list1 = list1->mNext;
@@ -1735,6 +1789,7 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
           &nsCSSValuePairList::mXValue,
           &nsCSSValuePairList::mYValue,
         };
+        PRUint32 restrictions = nsCSSProps::ValueRestrictions(aProperty);
         for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(pairListValues); ++i) {
           const nsCSSValue &v1 = list1->*(pairListValues[i]);
           const nsCSSValue &v2 = list2->*(pairListValues[i]);
@@ -1746,10 +1801,10 @@ nsStyleAnimation::AddWeighted(nsCSSProperty aProperty,
           }
           switch (unit) {
             case eCSSUnit_Pixel:
-              AddCSSValuePixel(aCoeff1, v1, aCoeff2, v2, vr);
+              AddCSSValuePixel(aCoeff1, v1, aCoeff2, v2, vr, restrictions);
               break;
             case eCSSUnit_Percent:
-              AddCSSValuePercent(aCoeff1, v1, aCoeff2, v2, vr);
+              AddCSSValuePercent(aCoeff1, v1, aCoeff2, v2, vr, restrictions);
               break;
             case eCSSUnit_Calc:
               AddCSSValueCanonicalCalc(aCoeff1, v1, aCoeff2, v2, vr);
diff --git a/layout/style/test/test_transitions_per_property.html b/layout/style/test/test_transitions_per_property.html
index ec1a4408177f..8498a70f7dc6 100644
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@@ -49,20 +49,27 @@ function any_unit_to_num(str)
     return Number(String(str).match(/^([\d.]+)/)[1]);
 }
 
+var FUNC_NEGATIVE = "cubic-bezier(0.25, -2, 0.75, 1)";
+
 var supported_properties = {
     "border-bottom-left-radius": [ test_radius_transition ],
     "border-bottom-right-radius": [ test_radius_transition ],
     "border-top-left-radius": [ test_radius_transition ],
     "border-top-right-radius": [ test_radius_transition ],
     "-moz-box-flex": [ test_float_zeroToOne_transition,
-                       test_float_aboveOne_transition ],
+                       test_float_aboveOne_transition,
+                       test_float_zeroToOne_clamped ],
     "box-shadow": [ test_shadow_transition ],
-    "-moz-column-count": [ test_pos_integer_or_auto_transition ],
-    "-moz-column-gap": [ test_length_transition ],
+    "-moz-column-count": [ test_pos_integer_or_auto_transition,
+                           test_integer_at_least_one_clamping ],
+    "-moz-column-gap": [ test_length_transition,
+                         test_length_clamped ],
     "-moz-column-rule-color": [ test_color_transition,
                                 test_border_color_transition ],
-    "-moz-column-rule-width": [ test_length_transition ],
-    "-moz-column-width": [ test_length_transition ],
+    "-moz-column-rule-width": [ test_length_transition,
+                                test_length_clamped ],
+    "-moz-column-width": [ test_length_transition,
+                           test_length_clamped ],
     "-moz-image-region": [ test_rect_transition ],
     "-moz-outline-radius-bottomleft": [ test_radius_transition ],
     "-moz-outline-radius-bottomright": [ test_radius_transition ],
@@ -72,100 +79,157 @@ var supported_properties = {
                                     test_border_color_transition ],
     "-moz-transform": [ test_transform_transition ],
     "-moz-transform-origin": [ test_length_pair_transition,
-                               test_length_percent_pair_transition ],
+                               test_length_percent_pair_transition,
+                               test_length_percent_pair_unclamped ],
     "background-color": [ test_color_transition ],
-    "background-position": [ test_background_position_transition ],
-    "background-size": [ test_background_size_transition ],
+    "background-position": [ test_background_position_transition,
+                             // FIXME: We don't currently test clamping,
+                             // since background-position uses calc() as
+                             // an intermediate form.
+                             /* test_length_percent_pair_unclamped */ ],
+    "background-size": [ test_background_size_transition,
+                         // FIXME: We don't currently test clamping,
+                         // since background-size uses calc() as an
+                         // intermediate form.
+                         /* test_length_percent_pair_clamped */ ],
     "border-bottom-color": [ test_color_transition,
                              test_border_color_transition ],
-    "border-bottom-width": [ test_length_transition ],
+    "border-bottom-width": [ test_length_transition,
+                             test_length_clamped ],
     "border-left-color": [ test_color_transition,
                            test_border_color_transition ],
-    "border-left-width": [ test_length_transition ],
+    "border-left-width": [ test_length_transition,
+                           test_length_clamped ],
     "border-right-color": [ test_color_transition,
                             test_border_color_transition ],
-    "border-right-width": [ test_length_transition ],
-    "border-spacing": [ test_length_pair_transition ],
+    "border-right-width": [ test_length_transition,
+                            test_length_clamped ],
+    "border-spacing": [ test_length_pair_transition,
+                        test_length_pair_transition_clamped ],
     "border-top-color": [ test_color_transition,
                           test_border_color_transition ],
-    "border-top-width": [ test_length_transition ],
+    "border-top-width": [ test_length_transition,
+                           test_length_clamped ],
     "bottom": [ test_length_transition, test_percent_transition,
-                test_length_percent_calc_transition ],
+                test_length_percent_calc_transition,
+                test_length_unclamped, test_percent_unclamped ],
     "clip": [ test_rect_transition ],
     "color": [ test_color_transition ],
     "fill": [ test_color_transition ],
-    "fill-opacity" : [ test_float_zeroToOne_transition ],
+    "fill-opacity" : [ test_float_zeroToOne_transition,
+                       // opacity is clamped in computed style
+                       // (not parsing/interpolation)
+                       test_float_zeroToOne_clamped ],
     "flood-color": [ test_color_transition ],
-    "flood-opacity" : [ test_float_zeroToOne_transition ],
+    "flood-opacity" : [ test_float_zeroToOne_transition,
+                        // opacity is clamped in computed style
+                        // (not parsing/interpolation)
+                        test_float_zeroToOne_clamped ],
     "font-size": [ test_length_transition, test_percent_transition,
-                   test_length_percent_calc_transition ],
+                   test_length_percent_calc_transition,
+                   test_length_clamped, test_percent_clamped ],
     "font-size-adjust": [ test_float_zeroToOne_transition,
-                          test_float_aboveOne_transition ],
+                          test_float_aboveOne_transition,
+                          /* FIXME: font-size-adjust treats zero specially */
+                          /* test_float_zeroToOne_clamped */ ],
     "font-stretch": [ test_font_stretch ],
     "font-weight": [ test_font_weight ],
     "height": [ test_length_transition, test_percent_transition,
-                test_length_percent_calc_transition ],
+                test_length_percent_calc_transition,
+                test_length_clamped, test_percent_clamped ],
     "left": [ test_length_transition, test_percent_transition,
-              test_length_percent_calc_transition ],
-    "letter-spacing": [ test_length_transition ],
+              test_length_percent_calc_transition,
+              test_length_unclamped, test_percent_unclamped ],
+    "letter-spacing": [ test_length_transition, test_length_unclamped ],
     "lighting-color": [ test_color_transition ],
     // NOTE: when calc() is supported on 'line-height', we should add
     // test_length_percent_calc_transition.
-    "line-height": [ test_length_transition, test_percent_transition ],
+    "line-height": [ test_length_transition, test_percent_transition,
+                     test_length_clamped, test_percent_clamped ],
     "margin-bottom": [ test_length_transition, test_percent_transition,
-                       test_length_percent_calc_transition ],
+                       test_length_percent_calc_transition,
+                       test_length_unclamped, test_percent_unclamped ],
     "margin-left": [ test_length_transition, test_percent_transition,
-                     test_length_percent_calc_transition ],
+                     test_length_percent_calc_transition,
+                     test_length_unclamped, test_percent_unclamped ],
     "margin-right": [ test_length_transition, test_percent_transition,
-                      test_length_percent_calc_transition ],
+                      test_length_percent_calc_transition,
+                      test_length_unclamped, test_percent_unclamped ],
     "margin-top": [ test_length_transition, test_percent_transition,
-                    test_length_percent_calc_transition ],
-    "marker-offset": [ test_length_transition ],
+                    test_length_percent_calc_transition,
+                    test_length_unclamped, test_percent_unclamped ],
+    "marker-offset": [ test_length_transition,
+                       test_length_unclamped ],
     "max-height": [ test_length_transition, test_percent_transition,
-                    test_length_percent_calc_transition ],
+                    test_length_percent_calc_transition,
+                    test_length_clamped, test_percent_clamped ],
     "max-width": [ test_length_transition, test_percent_transition,
-                   test_length_percent_calc_transition ],
+                   test_length_percent_calc_transition,
+                   test_length_clamped, test_percent_clamped ],
     "min-height": [ test_length_transition, test_percent_transition,
-                    test_length_percent_calc_transition ],
+                    test_length_percent_calc_transition,
+                    test_length_clamped, test_percent_clamped ],
     "min-width": [ test_length_transition, test_percent_transition,
-                   test_length_percent_calc_transition ],
-    "opacity" : [ test_float_zeroToOne_transition ],
+                   test_length_percent_calc_transition,
+                   test_length_clamped, test_percent_clamped ],
+    "opacity" : [ test_float_zeroToOne_transition,
+                  // opacity is clamped in computed style
+                  // (not parsing/interpolation)
+                  test_float_zeroToOne_clamped ],
     "outline-color": [ test_color_transition ],
-    "outline-offset": [ test_length_transition ],
-    "outline-width": [ test_length_transition ],
+    "outline-offset": [ test_length_transition, test_length_unclamped ],
+    "outline-width": [ test_length_transition, test_length_clamped ],
     "padding-bottom": [ test_length_transition, test_percent_transition,
-                        test_length_percent_calc_transition ],
+                        test_length_percent_calc_transition,
+                        test_length_clamped, test_percent_clamped ],
     "padding-left": [ test_length_transition, test_percent_transition,
-                      test_length_percent_calc_transition ],
+                      test_length_percent_calc_transition,
+                      test_length_clamped, test_percent_clamped ],
     "padding-right": [ test_length_transition, test_percent_transition,
-                       test_length_percent_calc_transition ],
+                       test_length_percent_calc_transition,
+                       test_length_clamped, test_percent_clamped ],
     "padding-top": [ test_length_transition, test_percent_transition,
-                     test_length_percent_calc_transition ],
+                     test_length_percent_calc_transition,
+                     test_length_clamped, test_percent_clamped ],
     "right": [ test_length_transition, test_percent_transition,
-               test_length_percent_calc_transition ],
+               test_length_percent_calc_transition,
+               test_length_unclamped, test_percent_unclamped ],
     "stop-color": [ test_color_transition ],
-    "stop-opacity" : [ test_float_zeroToOne_transition ],
+    "stop-opacity" : [ test_float_zeroToOne_transition,
+                       // opacity is clamped in computed style
+                       // (not parsing/interpolation)
+                       test_float_zeroToOne_clamped ],
     "stroke": [ test_color_transition ],
     "stroke-dasharray": [ test_dasharray_transition ],
     // NOTE: when calc() is supported on 'stroke-dashoffset', we should
     // add test_length_percent_calc_transition.
-    "stroke-dashoffset": [ test_length_transition, test_percent_transition ],
-    "stroke-miterlimit": [ test_float_aboveOne_transition ],
-    "stroke-opacity" : [ test_float_zeroToOne_transition ],
+    "stroke-dashoffset": [ test_length_transition, test_percent_transition,
+                           test_length_unclamped, test_percent_unclamped ],
+    "stroke-miterlimit": [ test_float_aboveOne_transition,
+                           test_float_aboveOne_clamped ],
+    "stroke-opacity" : [ test_float_zeroToOne_transition,
+                         // opacity is clamped in computed style
+                         // (not parsing/interpolation)
+                         test_float_zeroToOne_clamped ],
     // NOTE: when calc() is supported on 'stroke-width', we should add
     // test_length_percent_calc_transition.
-    "stroke-width": [ test_length_transition, test_percent_transition ],
+    "stroke-width": [ test_length_transition, test_percent_transition,
+                      test_length_clamped, test_percent_clamped ],
     "text-indent": [ test_length_transition, test_percent_transition,
-                     test_length_percent_calc_transition ],
+                     test_length_percent_calc_transition,
+                     test_length_unclamped, test_percent_unclamped ],
     "text-shadow": [ test_shadow_transition ],
     "top": [ test_length_transition, test_percent_transition,
-             test_length_percent_calc_transition ],
+             test_length_percent_calc_transition,
+             test_length_unclamped, test_percent_unclamped ],
     "vertical-align": [ test_length_transition, test_percent_transition,
-                        test_length_percent_calc_transition ],
+                        test_length_percent_calc_transition,
+                        test_length_unclamped, test_percent_unclamped ],
     "visibility": [ test_visibility_transition ],
     "width": [ test_length_transition, test_percent_transition,
-               test_length_percent_calc_transition ],
-    "word-spacing": [ test_length_transition ],
+               test_length_percent_calc_transition,
+               test_length_clamped, test_percent_clamped ],
+    "word-spacing": [ test_length_transition, test_length_unclamped ],
     "z-index": [ test_zindex_transition, test_pos_integer_or_auto_transition ],
 };
 
@@ -304,6 +368,27 @@ function test_length_transition(prop) {
   check_distance(prop, "4px", "6px", "12px");
 }
 
+function test_length_clamped(prop) {
+  test_length_clamped_or_unclamped(prop, true);
+}
+
+function test_length_unclamped(prop) {
+  test_length_clamped_or_unclamped(prop, false);
+}
+
+function test_length_clamped_or_unclamped(prop, is_clamped) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0px", "");
+  is(cs.getPropertyValue(prop), "0px",
+     "length-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "100px", "");
+  (is_clamped ? is : isnot)(cs.getPropertyValue(prop), "0px",
+     "length-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 // Test using float values in the range [0, 1] (e.g. opacity)
 function test_float_zeroToOne_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
@@ -317,6 +402,26 @@ function test_float_zeroToOne_transition(prop) {
   check_distance(prop, "0.3", "0.425", "0.8");
 }
 
+function test_float_zeroToOne_clamped(prop) {
+  test_float_zeroToOne_clamped_or_unclamped(prop, true);
+}
+function test_float_zeroToOne_unclamped(prop) {
+  test_float_zeroToOne_clamped_or_unclamped(prop, false);
+}
+
+function test_float_zeroToOne_clamped_or_unclamped(prop, is_clamped) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0", "");
+  is(cs.getPropertyValue(prop), "0",
+     "float-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "1", "");
+  (is_clamped ? is : isnot)(cs.getPropertyValue(prop), "0",
+     "float-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 // Test using float values in the range [1, infinity) (e.g. stroke-miterlimit)
 function test_float_aboveOne_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
@@ -330,6 +435,19 @@ function test_float_aboveOne_transition(prop) {
   check_distance(prop, "1", "1.275", "2.1");
 }
 
+function test_float_aboveOne_clamped(prop) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "1", "");
+  is(cs.getPropertyValue(prop), "1",
+     "float-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "5", "");
+  is(cs.getPropertyValue(prop), "1",
+     "float-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 function test_percent_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
   div.style.setProperty(prop, "25%", "");
@@ -351,6 +469,26 @@ function test_percent_transition(prop) {
   check_distance(prop, "25%", "37.5%", "75%");
 }
 
+function test_percent_clamped(prop) {
+  test_percent_clamped_or_unclamped(prop, true);
+}
+
+function test_percent_unclamped(prop) {
+  test_percent_clamped_or_unclamped(prop, false);
+}
+
+function test_percent_clamped_or_unclamped(prop, is_clamped) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0%", "");
+  var zero_val = cs.getPropertyValue(prop); // flushes too
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "150%", "");
+  (is_clamped ? is : isnot)(cs.getPropertyValue(prop), zero_val,
+     "percent-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 function test_length_percent_calc_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
   div.style.setProperty(prop, "0%", "");
@@ -435,6 +573,32 @@ function test_color_transition(prop) {
   check_distance(prop, "rgb(128, 64, 0)", "rgb(96, 48, 32)", "currentColor");
 
   (prop == "color" ? div.parentNode : div).style.removeProperty("color");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "rgb(0, 255, 0)", "");
+  var vals = cs.getPropertyValue(prop).match(/rgb\(([^, ]*), ([^, ]*), ([^, ]*)\)/);
+  is(vals.length, 4,
+     "color-valued property " + prop + ": flush before clamping test (length)");
+  is(vals[1], "0",
+     "color-valued property " + prop + ": flush before clamping test (red)");
+  is(vals[2], "255",
+     "color-valued property " + prop + ": flush before clamping test (green)");
+  is(vals[3], "0",
+     "color-valued property " + prop + ": flush before clamping test (blue)");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "rgb(255, 0, 128)", "");
+  // FIXME: Once we support non-sRGB colors, these tests will need fixing.
+  vals = cs.getPropertyValue(prop).match(/rgb\(([^, ]*), ([^, ]*), ([^, ]*)\)/);
+  is(vals.length, 4,
+     "color-valued property " + prop + ": clamping of negatives (length)");
+  is(vals[1], "0",
+     "color-valued property " + prop + ": clamping of negatives (red)");
+  is(vals[2], "255",
+     "color-valued property " + prop + ": clamping of above-range (green)");
+  is(vals[3], "0",
+     "color-valued property " + prop + ": clamping of negatives (blue)");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_border_color_transition(prop) {
@@ -503,6 +667,45 @@ function test_shadow_transition(prop) {
   is(cs.getPropertyValue(prop), defaultColor + "3px 5px 4px" + spreadStr,
      "shadow-valued property " + prop + ": interpolation without color");
   check_distance(prop, "2px 2px 2px", "3px 5px 4px", "6px 14px 10px");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0px 0px 0px black", "");
+  is(cs.getPropertyValue(prop), "rgb(0, 0, 0) 0px 0px 0px" + spreadStr,
+     "shadow-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "10px 10px 10px black", "");
+  var vals = cs.getPropertyValue(prop).split(" ");
+  is(vals.length, 6 + (prop == "box-shadow"), "unexpected number of values");
+  is(vals.slice(0, 3).join(" "), "rgb(0, 0, 0)",
+     "shadow-valued property " + prop + " (color): clamping of negatives");
+  isnot(vals[3], "0px",
+        "shadow-valued property " + prop + " (x): clamping of negatives");
+  isnot(vals[4], "0px",
+        "shadow-valued property " + prop + " (y): clamping of negatives");
+  is(vals[5], "0px",
+     "shadow-valued property " + prop + " (radius): clamping of negatives");
+  if (prop == "box-shadow") {
+    div.style.setProperty("-moz-transition-property", "none", "");
+    div.style.setProperty(prop, "0px 0px 0px 0px black", "");
+    is(cs.getPropertyValue(prop), "rgb(0, 0, 0) 0px 0px 0px 0px",
+       "shadow-valued property " + prop + ": flush before clamping test");
+    div.style.setProperty("-moz-transition-property", prop, "");
+    div.style.setProperty(prop, "10px 10px 10px 10px black", "");
+    var vals = cs.getPropertyValue(prop).split(" ");
+    is(vals.length, 7, "unexpected number of values");
+    is(vals.slice(0, 3).join(" "), "rgb(0, 0, 0)",
+       "shadow-valued property " + prop + " (color): clamping of negatives");
+    isnot(vals[3], "0px",
+          "shadow-valued property " + prop + " (x): clamping of negatives");
+    isnot(vals[4], "0px",
+          "shadow-valued property " + prop + " (y): clamping of negatives");
+    is(vals[5], "0px",
+       "shadow-valued property " + prop + " (radius): clamping of negatives");
+    isnot(vals[6], "0px",
+          "shadow-valued property " + prop + " (spread): clamping of negatives");
+  }
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_dasharray_transition(prop) {
@@ -546,6 +749,17 @@ function test_dasharray_transition(prop) {
   is(cs.getPropertyValue(prop), "3, 45%, 5, 8",
      "dasharray-valued property " + prop + ": interpolation of dasharray");
   check_distance(prop, "2,50%,6,10", "3, 45%, 5, 8", "6,30%,2,2");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0,0%", "");
+  is(cs.getPropertyValue(prop), "0, 0%",
+     "dasharray-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "5, 25%", "");
+  is(cs.getPropertyValue(prop), "0, 0%",
+     "dasharray-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_radius_transition(prop) {
@@ -608,6 +822,17 @@ function test_radius_transition(prop) {
                  "-moz-calc(4.6875% + 16px) -moz-calc(9.375% + 4px)",
                  "64px 16px");
 
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0px 0px", "");
+  is(cs.getPropertyValue(prop), "0px",
+     "radius-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "10px 20px", "");
+  is(cs.getPropertyValue(prop), "0px",
+     "radius-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+
   test_length_percent_calc_transition(prop);
 
   div.style.removeProperty("width");
@@ -636,6 +861,17 @@ function test_zindex_transition(prop) {
   is(cs.getPropertyValue(prop), "-1",
      "integer-valued property " + prop + ": interpolation of lengths");
   check_distance(prop, "-4", "-1", "8");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0", "");
+  is(cs.getPropertyValue(prop), "0",
+     "integer-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "100", "");
+  isnot(cs.getPropertyValue(prop), "0",
+        "integer-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_font_stretch(prop) {
@@ -659,6 +895,25 @@ function test_font_stretch(prop) {
   is(cs.getPropertyValue(prop), "normal",
      "font-stretch property " + prop + ": interpolation of font-stretches");
   check_distance(prop, "expanded", "semi-expanded", "condensed");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "ultra-condensed", "");
+  is(cs.getPropertyValue(prop), "ultra-condensed",
+     "font-stretch property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "ultra-expanded", "");
+  is(cs.getPropertyValue(prop), "ultra-condensed",
+     "font-stretch property " + prop + ": clamping of values");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "ultra-expanded", "");
+  is(cs.getPropertyValue(prop), "ultra-expanded",
+     "font-stretch property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "ultra-condensed", "");
+  is(cs.getPropertyValue(prop), "ultra-expanded",
+     "font-stretch property " + prop + ": clamping of values");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_font_weight(prop) {
@@ -683,6 +938,25 @@ function test_font_weight(prop) {
   is(cs.getPropertyValue(prop), "700",
      "font-weight property " + prop + ": interpolation of font-weights");
   check_distance(prop, "900", "700", "100");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "100", "");
+  is(cs.getPropertyValue(prop), "100",
+     "font-weight property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "900", "");
+  is(cs.getPropertyValue(prop), "100",
+     "font-weight property " + prop + ": clamping of values");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "900", "");
+  is(cs.getPropertyValue(prop), "900",
+     "font-weight property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "100", "");
+  is(cs.getPropertyValue(prop), "900",
+     "font-weight property " + prop + ": clamping of values");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_pos_integer_or_auto_transition(prop) {
@@ -707,6 +981,19 @@ function test_pos_integer_or_auto_transition(prop) {
   check_distance(prop, "8", "7", "4");
 }
 
+function test_integer_at_least_one_clamping(prop) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "1", "");
+  is(cs.getPropertyValue(prop), "1",
+     "integer-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "5", "");
+  is(cs.getPropertyValue(prop), "1",
+     "integer-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 function test_length_pair_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
   div.style.setProperty(prop, "4px 6px", "");
@@ -719,6 +1006,19 @@ function test_length_pair_transition(prop) {
   check_distance(prop, "4px 6px", "6px 7px", "12px 10px");
 }
 
+function test_length_pair_transition_clamped(prop) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0px 0px", "");
+  is(cs.getPropertyValue(prop), "0px 0px",
+     "length-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "30px 50px", "");
+  is(cs.getPropertyValue(prop), "0px 0px",
+     "length-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 function test_length_percent_pair_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
   div.style.setProperty(prop, "4px 50%", "");
@@ -731,6 +1031,27 @@ function test_length_percent_pair_transition(prop) {
   check_distance(prop, "4px 50%", "6px 55%", "12px 70%");
 }
 
+function test_length_percent_pair_clamped(prop) {
+  test_length_percent_pair_clamped_or_unclamped(prop, true);
+}
+
+function test_length_percent_pair_unclamped(prop) {
+  test_length_percent_pair_clamped_or_unclamped(prop, false);
+}
+
+function test_length_percent_pair_clamped_or_unclamped(prop, is_clamped) {
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "0px 0%", "");
+  is(cs.getPropertyValue(prop), "0px 0%",
+     "length+percent-valued property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "30px 25%", "");
+  (is_clamped ? is : isnot)(cs.getPropertyValue(prop), "0px 0%",
+     "length+percent-valued property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
+}
+
 function test_rect_transition(prop) {
   div.style.setProperty("-moz-transition-property", "none", "");
   div.style.setProperty(prop, "rect(4px, 16px, 12px, 6px)", "");
@@ -752,6 +1073,35 @@ function test_rect_transition(prop) {
   div.style.setProperty(prop, "auto", "");
   is(cs.getPropertyValue(prop), "auto",
      "rect-valued property " + prop + ": can't interpolate auto components");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "rect(-10px, 30px, 0px, 0px)", "");
+  var vals = cs.getPropertyValue(prop).match(/rect\(([^, ]*), ([^, ]*), ([^, ]*), ([^, ]*)\)/);
+  is(vals.length, 5,
+     "rect-valued property " + prop + ": flush before clamping test (length)");
+  is(vals[1], "-10px",
+     "rect-valued property " + prop + ": flush before clamping test (top)");
+  is(vals[2], "30px",
+     "rect-valued property " + prop + ": flush before clamping test (right)");
+  is(vals[3], "0px",
+     "rect-valued property " + prop + ": flush before clamping test (bottom)");
+  is(vals[4], "0px",
+     "rect-valued property " + prop + ": flush before clamping test (left)");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "rect(0px, 40px, 10px, 10px)", "");
+  vals = cs.getPropertyValue(prop).match(/rect\(([^, ]*), ([^, ]*), ([^, ]*), ([^, ]*)\)/);
+  is(vals.length, 5,
+     "rect-valued property " + prop + ": clamping of negatives (length)");
+  isnot(vals[1], "-10px",
+     "rect-valued property " + prop + ": clamping of negatives (top)");
+  isnot(vals[2], "30px",
+     "rect-valued property " + prop + ": clamping of negatives (right)");
+  isnot(vals[3], "0px",
+     "rect-valued property " + prop + ": clamping of negatives (bottom)");
+  isnot(vals[4], "0px",
+     "rect-valued property " + prop + ": clamping of negatives (left)");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_visibility_transition(prop) {
@@ -769,6 +1119,25 @@ function test_visibility_transition(prop) {
      "distance between visible and visible should not be zero");
   is(get_distance(prop, "hidden", "hidden"), 0,
      "distance between hidden and hidden should not be zero");
+
+  div.style.setProperty("-moz-transition-timing-function", FUNC_NEGATIVE, "");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "visible", "");
+  is(cs.getPropertyValue(prop), "visible",
+     "visibility property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "hidden", "");
+  is(cs.getPropertyValue(prop), "visible",
+     "visibility property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-property", "none", "");
+  div.style.setProperty(prop, "hidden", "");
+  is(cs.getPropertyValue(prop), "hidden",
+     "visibility property " + prop + ": flush before clamping test");
+  div.style.setProperty("-moz-transition-property", prop, "");
+  div.style.setProperty(prop, "visible", "");
+  is(cs.getPropertyValue(prop), "hidden",
+     "visibility property " + prop + ": clamping of negatives");
+  div.style.setProperty("-moz-transition-timing-function", "linear", "");
 }
 
 function test_background_size_transition(prop) {
@@ -1146,6 +1515,8 @@ function test_transform_transition(prop) {
       check_distance(prop, test.start, test.expected_uncomputed, test.end);
     }
   }
+
+  // FIXME: should perhaps test that no clamping occurs
 }
 
 </script>

From 9d0767783c4417a85ceb7e313074bd6f062edf96 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:35 -0400
Subject: [PATCH 286/314] -moz-animation-play-state should not be part of the
 -moz-animation shorthand.  (Bug 654890)  r=bzbarsky

---
 layout/style/Declaration.cpp           | 2 +-
 layout/style/nsCSSParser.cpp           | 6 ++----
 layout/style/nsCSSProps.cpp            | 1 -
 layout/style/test/property_database.js | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/layout/style/Declaration.cpp b/layout/style/Declaration.cpp
index 19fffe670564..54cb317c8e4a 100644
--- a/layout/style/Declaration.cpp
+++ b/layout/style/Declaration.cpp
@@ -712,7 +712,7 @@ Declaration::GetValue(nsCSSProperty aProperty, nsAString& aValue) const
     case eCSSProperty_animation: {
       const nsCSSProperty* subprops =
         nsCSSProps::SubpropertyEntryFor(eCSSProperty_animation);
-      static const size_t numProps = 8;
+      static const size_t numProps = 7;
       NS_ABORT_IF_FALSE(subprops[numProps] == eCSSProperty_UNKNOWN,
                         "unexpected number of subproperties");
       const nsCSSValue* values[numProps];
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 4e1154c2870d..a71126dfb1d7 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -8264,7 +8264,7 @@ CSSParserImpl::ParseAnimationOrTransitionShorthand(
     return eParseAnimationOrTransitionShorthand_Inherit;
   }
 
-  static const size_t maxNumProperties = 8;
+  static const size_t maxNumProperties = 7;
   NS_ABORT_IF_FALSE(aNumProperties <= maxNumProperties,
                     "can't handle this many properties");
   nsCSSValueList *cur[maxNumProperties];
@@ -8425,7 +8425,6 @@ CSSParserImpl::ParseAnimation()
     eCSSProperty_animation_direction,
     eCSSProperty_animation_fill_mode,
     eCSSProperty_animation_iteration_count,
-    eCSSProperty_animation_play_state,
     // Must check 'animation-name' after 'animation-timing-function',
     // 'animation-direction', 'animation-fill-mode',
     // 'animation-iteration-count', and 'animation-play-state' since
@@ -8445,8 +8444,7 @@ CSSParserImpl::ParseAnimation()
   initialValues[3].SetIntValue(NS_STYLE_ANIMATION_DIRECTION_NORMAL, eCSSUnit_Enumerated);
   initialValues[4].SetIntValue(NS_STYLE_ANIMATION_FILL_MODE_NONE, eCSSUnit_Enumerated);
   initialValues[5].SetFloatValue(1.0f, eCSSUnit_Number);
-  initialValues[6].SetIntValue(NS_STYLE_ANIMATION_PLAY_STATE_RUNNING, eCSSUnit_Enumerated);
-  initialValues[7].SetNoneValue();
+  initialValues[6].SetNoneValue();
 
   nsCSSValue values[numProps];
 
diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp
index db1381058317..0a3b59e05a51 100644
--- a/layout/style/nsCSSProps.cpp
+++ b/layout/style/nsCSSProps.cpp
@@ -1578,7 +1578,6 @@ static const nsCSSProperty gAnimationSubpropTable[] = {
   eCSSProperty_animation_direction,
   eCSSProperty_animation_fill_mode,
   eCSSProperty_animation_iteration_count,
-  eCSSProperty_animation_play_state,
   // List animation-name last so we serialize it last, in case it has
   // a value that conflicts with one of the other properties.  (See
   // how Declaration::GetValue serializes 'animation'.
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
index a5c30c9e9b4e..c6048d5ef4a2 100644
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -79,8 +79,8 @@ var gCSSProperties = {
 		domProp: "MozAnimation",
 		inherited: false,
 		type: CSS_TYPE_TRUE_SHORTHAND,
-		subproperties: [ "-moz-animation-name", "-moz-animation-duration", "-moz-animation-timing-function", "-moz-animation-delay", "-moz-animation-direction", "-moz-animation-fill-mode", "-moz-animation-iteration-count", "-moz-animation-play-state" ],
-		initial_values: [ "none none 0s 0s ease normal running 1.0", "none", "0s", "ease", "normal", "running", "1.0" ],
+		subproperties: [ "-moz-animation-name", "-moz-animation-duration", "-moz-animation-timing-function", "-moz-animation-delay", "-moz-animation-direction", "-moz-animation-fill-mode", "-moz-animation-iteration-count" ],
+		initial_values: [ "none none 0s 0s ease normal 1.0", "none", "0s", "ease", "normal", "1.0" ],
 		other_values: [ "bounce 1s linear 2s", "bounce 1s 2s linear", "bounce linear 1s 2s", "linear bounce 1s 2s", "linear 1s bounce 2s", "linear 1s 2s bounce", "1s bounce linear 2s", "1s bounce 2s linear", "1s 2s bounce linear", "1s linear bounce 2s", "1s linear 2s bounce", "1s 2s linear bounce", "bounce linear 1s", "bounce 1s linear", "linear bounce 1s", "linear 1s bounce", "1s bounce linear", "1s linear bounce", "1s 2s bounce", "1s bounce 2s", "bounce 1s 2s", "1s 2s linear", "1s linear 2s", "linear 1s 2s", "bounce 1s", "1s bounce", "linear 1s", "1s linear", "1s 2s", "2s 1s", "bounce", "linear", "1s", "height", "2s", "ease-in-out", "2s ease-in", "opacity linear", "ease-out 2s", "2s color, 1s bounce, 500ms height linear, 1s opacity 4s cubic-bezier(0.0, 0.1, 1.0, 1.0)", "1s \\32bounce linear 2s", "1s -bounce linear 2s", "1s -\\32bounce linear 2s", "1s \\32 0bounce linear 2s", "1s -\\32 0bounce linear 2s", "1s \\2bounce linear 2s", "1s -\\2bounce linear 2s", "2s, 1s bounce", "1s bounce, 2s", "2s all, 1s bounce", "1s bounce, 2s all", "1s bounce, 2s none", "2s none, 1s bounce", "2s bounce, 1s all", "2s all, 1s bounce" ],
 		invalid_values: [  "2s inherit", "inherit 2s", "2s bounce, 1s inherit", "2s inherit, 1s bounce", "2s initial" ]
 	},

From 6950bbd9875cb69724ac5c1ae9cb9d48343c8fa1 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 9 May 2011 15:02:35 -0400
Subject: [PATCH 287/314] Propagate code that used to be in
 CSSParserImpl::ParseSingleValueProperty and mark -moz-script-size-multiplier
 and -moz-script-min-size as inaccessible to parser.  (Bug 636029, patch 9) 
 r=bzbarsky

---
 layout/style/nsCSSPropList.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/layout/style/nsCSSPropList.h b/layout/style/nsCSSPropList.h
index e0b659acd3c9..77cdbea1d4cb 100644
--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@@ -2512,6 +2512,8 @@ CSS_PROP_FONT(
     script_level,
     ScriptLevel,
     // REVIEW: no range restriction?
+    // NOTE: CSSParserImpl::ParseSingleValueProperty only accepts this
+    // property when mUnsafeRulesEnabled is set.
     CSS_PROPERTY_PARSE_VALUE,
     // script-level can take Integer or Number values, but only Integer
     // ("relative") values can be specified in a style sheet.
@@ -2524,7 +2526,7 @@ CSS_PROP_FONT(
     script_size_multiplier,
     ScriptSizeMultiplier,
     // REVIEW: no range restriction?
-    CSS_PROPERTY_PARSE_VALUE,
+    CSS_PROPERTY_PARSE_INACCESSIBLE,
     0,
     nsnull,
     CSS_PROP_NO_OFFSET,
@@ -2534,7 +2536,7 @@ CSS_PROP_FONT(
     script_min_size,
     ScriptMinSize,
     // REVIEW: no range restriction?
-    CSS_PROPERTY_PARSE_VALUE,
+    CSS_PROPERTY_PARSE_INACCESSIBLE,
     0,
     nsnull,
     CSS_PROP_NO_OFFSET,

From f868d9d754a9b94c46e09aa59febb8f3b0584319 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:03 -0700
Subject: [PATCH 288/314] Bug 651598: Make test_bug288392.html report better
 errors. r=smaug

---
 content/events/test/test_bug288392.html | 30 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/content/events/test/test_bug288392.html b/content/events/test/test_bug288392.html
index 19661b31f806..545eb715bfcd 100644
--- a/content/events/test/test_bug288392.html
+++ b/content/events/test/test_bug288392.html
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=288392
 <script class="testbody" type="text/javascript">
 
 /** Test for Bug 288392 **/
-var subtreeModifiedCount = 0;
+var subtreeModifiedCount;
 
 function subtreeModified(e)
 {
@@ -31,51 +31,59 @@ function doTest() {
   var targetNode = document.getElementById("mutationTarget");
   targetNode.addEventListener("DOMSubtreeModified", subtreeModified, false);
 
+  subtreeModifiedCount = 0;
   var temp = document.createElement("DIV");
   targetNode.appendChild(temp);
-  ok(subtreeModifiedCount == 1,
+  is(subtreeModifiedCount, 1,
      "Appending a child node should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   temp.setAttribute("foo", "bar");
-  ok(subtreeModifiedCount == 2,
+  is(subtreeModifiedCount, 1,
      "Setting an attribute should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   targetNode.removeChild(temp);
-  ok(subtreeModifiedCount == 3,
+  is(subtreeModifiedCount, 1,
      "Removing a child node should have dispatched a DOMSubtreeModified event");
 
   // Testing events in a subtree, which is not in the document.
   var subtree = document.createElement("div");
   var s = "<e1 attr1='value1'>Something1</e1><e2 attr2='value2'>Something2</e2>";
-
   subtree.innerHTML = s;
   subtree.addEventListener("DOMSubtreeModified", subtreeModified, false);
 
+  subtreeModifiedCount = 0;
   subtree.firstChild.firstChild.data = "foo";
-  ok(subtreeModifiedCount == 4,
+  is(subtreeModifiedCount, 1,
      "Editing character data should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   subtree.firstChild.removeChild(subtree.firstChild.firstChild);
-  ok(subtreeModifiedCount == 5,
+  is(subtreeModifiedCount, 1,
      "Removing a child node should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   subtree.firstChild.setAttribute("foo", "bar");
-  ok(subtreeModifiedCount == 6,
+  is(subtreeModifiedCount, 1,
      "Setting an attribute should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   subtree.textContent = "foobar";
-  ok(subtreeModifiedCount == 7,
+  is(subtreeModifiedCount, 1,
      "Setting .textContent should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   subtree.innerHTML = s;
-  ok(subtreeModifiedCount == 8,
+  is(subtreeModifiedCount, 1,
      "Setting .innerHTML should have dispatched a DOMSubtreeModified event");
 
+  subtreeModifiedCount = 0;
   subtree.removeEventListener("DOMSubtreeModified", subtreeModified, false);
   subtree.appendChild(document.createTextNode(""));
   subtree.addEventListener("DOMSubtreeModified", subtreeModified, false);
   subtree.normalize();
-  ok(subtreeModifiedCount == 9,
+  is(subtreeModifiedCount, 1,
      "Calling normalize() should have dispatched a DOMSubtreeModified event");
 }
 

From fe61cd65d5bb66e07393a14f34cb14c032c0ff48 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:03 -0700
Subject: [PATCH 289/314] Bug 650493 tests. rs=smaug

---
 content/events/test/Makefile.in         |   1 +
 content/events/test/test_bug650493.html | 188 ++++++++++++++++++++++++
 2 files changed, 189 insertions(+)
 create mode 100644 content/events/test/test_bug650493.html

diff --git a/content/events/test/Makefile.in b/content/events/test/Makefile.in
index b5e3915359d7..188d2707c902 100644
--- a/content/events/test/Makefile.in
+++ b/content/events/test/Makefile.in
@@ -100,6 +100,7 @@ _TEST_FILES = \
 		test_bug613634.html \
 		test_bug607464.html \
 		test_bug624127.html \
+		test_bug650493.html \
 		test_bug641477.html \
 		test_bug648573.html \
 		test_bug615597.html \
diff --git a/content/events/test/test_bug650493.html b/content/events/test/test_bug650493.html
new file mode 100644
index 000000000000..e9acedb9b72d
--- /dev/null
+++ b/content/events/test/test_bug650493.html
@@ -0,0 +1,188 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=650493
+-->
+<head>
+  <title>Test for Bug 650493</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" />
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=650493">Mozilla Bug 650493</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  
+</div>
+<pre id="test">
+<script class="testbody" type="text/javascript">
+
+function getNodes() {
+  var walker = document.createTreeWalker($('content'), NodeFilter.SHOW_ALL, null, false);
+  var nodes = [];
+  do {
+    nodes.push(walker.currentNode);
+  } while(walker.nextNode());
+
+  return nodes;
+}
+
+function check() {
+  var current = getNodes();
+  is(nodes.length, current.length, "length after " + testName);
+  nodes.forEach(function(val, index) {
+    ok(current.indexOf(val) > -1, "nodes[" + index + "] (" + val + ") shouldn't exist after " + testName);
+  });
+}
+
+var nodes;
+var testName;
+
+nodes = getNodes();
+check("empty");
+
+// Set up listeners
+root = $('content');
+root.addEventListener("DOMNodeInserted", function(e) {
+  is(e.isTrusted, true, "untrusted mutation event");
+  var w = document.createTreeWalker(e.target, NodeFilter.SHOW_ALL, null, false);
+  do {
+    is(nodes.indexOf(w.currentNode), -1, "already have inserted node (" + w.currentNode + ") when " + testName);
+    nodes.push(w.currentNode);
+  } while(w.nextNode());
+}, false);
+root.addEventListener("DOMNodeRemoved", function(e) {
+  is(e.isTrusted, true, "untrusted mutation event");
+  var w = document.createTreeWalker(e.target, NodeFilter.SHOW_ALL, null, false);
+  do {
+    var index = nodes.indexOf(w.currentNode);
+    ok(index != -1, "missing removed node (" + w.currentNode + ") when " + testName);
+    nodes.splice(index, 1);
+  } while(w.nextNode());
+}, false);
+
+testName = "text-only innerHTML";
+root.innerHTML = "hello world";
+check();
+
+testName = "innerHTML with <b>";
+root.innerHTML = "<b>bold</b> world";
+check();
+
+testName = "complex innerHTML";
+root.innerHTML = "<b>b<span>old</span></b> <strong>world";
+check();
+
+testName = "replacing using .textContent";
+root.textContent = "i'm just a plain text minding my own business";
+check();
+
+testName = "clearing using .textContent";
+root.textContent = "";
+check();
+
+testName = "inserting using .textContent";
+root.textContent = "i'm new text!!";
+check();
+
+testName = "inserting using .textContent";
+root.textContent = "i'm new text!!";
+check();
+
+testName = "preparing to normalize";
+root.innerHTML = "<u><b>foo</b></u>  ";
+var u = root.firstChild;
+is(u.nodeName, "U", "got the right node");
+var b = u.firstChild;
+is(b.nodeName, "B", "got the right node");
+b.insertBefore(document.createTextNode(""), b.firstChild);
+b.insertBefore(document.createTextNode(""), b.firstChild);
+b.appendChild(document.createTextNode(""));
+b.appendChild(document.createTextNode("hello"));
+b.appendChild(document.createTextNode("world"));
+u.appendChild(document.createTextNode("foo"));
+u.appendChild(document.createTextNode(""));
+u.appendChild(document.createTextNode("bar"));
+check();
+
+testName = "normalizing";
+root.normalize();
+check();
+
+testName = "prepare script/style";
+script = document.createElement("script");
+script.appendChild(document.createTextNode("void(0);"));
+root.appendChild(script);
+style = document.createElement("style");
+root.appendChild(style);
+check();
+
+testName = "set something in script";
+script.text = "something";
+check();
+
+testName = "set something in style";
+style.innerHTML = "something { dislay: none; }";
+check();
+
+testName = "moving style";
+root.insertBefore(style, root.firstChild);
+check();
+
+testName = "replacing script";
+root.replaceChild(b, script);
+check();
+
+testName = "doc-fragment insert in the middle";
+frag = document.createDocumentFragment();
+frag.addEventListener("DOMNodeRemoved", function(e) {
+  var index = children.indexOf(e.target);
+  ok(index != -1, "unknown child removed from fragment");
+  children.splice(index, 1);
+}, false);
+var children = [];
+children.push(document.createTextNode("foo"));
+children.push(document.createTextNode("bar"));
+children.push(document.createElement("span"));
+children.push(document.createElement("b"));
+children[2].appendChild(document.createElement("i"));
+children.forEach(function(child) { frag.appendChild(child); });
+ok(root.firstChild, "need to have children in order to test inserting before end");
+root.replaceChild(frag, root.firstChild);
+check();
+is(children.length, 0, "should have received DOMNodeRemoved for all frag children when inserting");
+is(frag.childNodes.length, 0, "fragment should be empty when inserting");
+
+testName = "doc-fragment append at the end";
+children.push(document.createTextNode("foo"));
+children.push(document.createTextNode("bar"));
+children.push(document.createElement("span"));
+children.push(document.createElement("b"));
+children[2].appendChild(document.createElement("i"));
+children.forEach(function(child) { frag.appendChild(child); });
+root.appendChild(frag);
+check();
+is(children.length, 0, "should have received DOMNodeRemoved for all frag children when appending");
+is(frag.childNodes.length, 0, "fragment should be empty when appending");
+
+testName = "prepare replaceWholeText";
+var textNode;
+root.appendChild(document.createTextNode("hello"));
+root.appendChild(document.createTextNode(""));
+root.appendChild(textNode = document.createTextNode("world"));
+root.appendChild(document.createTextNode("fahrvergnugen"));
+root.appendChild(document.createTextNode(""));
+root.appendChild(document.createElement("div"));
+root.appendChild(document.createTextNode("smorgasbord"));
+root.appendChild(document.createTextNode(""));
+check();
+
+testName = "run replaceWholeText";
+textNode.replaceWholeText("supercalifragilisticexpialidocious");
+check();
+
+</script>
+</body>
+</html>
+

From 6835982eccb57e7c92a44e2983b1892bf89132fb Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:03 -0700
Subject: [PATCH 290/314] Bug 650493 Part 1: Simplify mutation events by firing
 all but DOMNodeRemoved off of script runners, and DOMNodeRemoved before
 starting any update batches or aquiring any state. r=smaug/peterv

---
 content/base/public/nsContentUtils.h          |  28 ++
 content/base/public/nsINode.h                 |  19 +-
 content/base/src/nsContentUtils.cpp           |  84 ++++-
 content/base/src/nsDOMAttribute.cpp           |  18 +-
 content/base/src/nsDocument.cpp               |   4 +-
 content/base/src/nsGenericDOMDataNode.cpp     |  39 ++-
 content/base/src/nsGenericElement.cpp         | 303 ++++++++++--------
 content/base/src/nsGenericElement.h           |   7 +-
 content/base/src/nsRange.cpp                  |   2 +-
 content/base/test/test_bug548463.html         |   2 +-
 content/events/public/nsPLDOMEvent.h          |   4 +-
 content/events/src/nsPLDOMEvent.cpp           |  19 +-
 .../html/content/src/nsGenericHTMLElement.cpp |  22 +-
 content/xul/content/src/nsXULElement.cpp      |   6 +-
 docshell/base/crashtests/crashtests.list      |   4 +-
 .../libeditor/html/crashtests/crashtests.list |   1 -
 editor/libeditor/html/nsHTMLEditRules.cpp     |   3 -
 layout/base/crashtests/crashtests.list        |   2 +-
 layout/reftests/svg/as-image/reftest.list     |   3 +-
 layout/reftests/svg/image/reftest.list        |  14 +-
 layout/reftests/svg/reftest.list              |   2 +-
 layout/reftests/svg/smil/reftest.list         |   2 +-
 22 files changed, 351 insertions(+), 237 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index f2e3031a7ab0..2d22462431c0 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -935,6 +935,34 @@ public:
                                      PRUint32 aType,
                                      nsINode* aTargetForSubtreeModified);
 
+  /**
+   * Quick helper to determine whether there are any mutation listeners
+   * of a given type that apply to any content in this document. It is valid
+   * to pass null for aDocument here, in which case this function always
+   * returns PR_TRUE.
+   *
+   * @param aDocument The document to search for listeners
+   * @param aType     The type of listener (NS_EVENT_BITS_MUTATION_*)
+   *
+   * @return true if there are mutation listeners of the specified type
+   */
+  static PRBool HasMutationListeners(nsIDocument* aDocument,
+                                     PRUint32 aType);
+  /**
+   * Synchronously fire DOMNodeRemoved on aChild. Only fires the event if
+   * there really are listeners by checking using the HasMutationListeners
+   * function above. The function makes sure to hold the relevant objects alive
+   * for the duration of the event firing. However there are no guarantees
+   * that any of the objects are alive by the time the function returns.
+   * If you depend on that you need to hold references yourself.
+   *
+   * @param aChild    The node to fire DOMNodeRemoved at.
+   * @param aParent   The parent of aChild.
+   * @param aOwnerDoc The ownerDocument of aChild.
+   */
+  static void MaybeFireNodeRemoved(nsINode* aChild, nsINode* aParent,
+                                   nsIDocument* aOwnerDoc);
+
   /**
    * This method creates and dispatches a trusted event.
    * Works only with events which can be created by calling
diff --git a/content/base/public/nsINode.h b/content/base/public/nsINode.h
index 0086a62b4df3..33197f89b308 100644
--- a/content/base/public/nsINode.h
+++ b/content/base/public/nsINode.h
@@ -453,24 +453,7 @@ public:
   {
     return InsertBefore(aNewChild, nsnull, aReturn);
   }
-  nsresult RemoveChild(nsINode *aOldChild)
-  {
-    if (!aOldChild) {
-      return NS_ERROR_NULL_POINTER;
-    }
-
-    if (IsNodeOfType(eDATA_NODE)) {
-      return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
-    }
-
-    PRInt32 index = IndexOf(aOldChild);
-    if (index == -1) {
-      // aOldChild isn't one of our children.
-      return NS_ERROR_DOM_NOT_FOUND_ERR;
-    }
-
-    return RemoveChildAt(index, PR_TRUE);
-  }
+  nsresult RemoveChild(nsINode *aOldChild);
 
   /**
    * Insert a content node at a particular index.  This method handles calling
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 13e38cb86221..1da849a42444 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -166,6 +166,7 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
 #include "nsIOfflineCacheUpdate.h"
 #include "nsCPrefetchService.h"
 #include "nsIChromeRegistry.h"
+#include "nsEventDispatcher.h"
 #include "nsIMIMEHeaderParam.h"
 #include "nsIDOMXULCommandEvent.h"
 #include "nsIDOMDragEvent.h"
@@ -3649,12 +3650,6 @@ nsContentUtils::HasMutationListeners(nsINode* aNode,
     return PR_FALSE;
   }
 
-  NS_ASSERTION((aNode->IsNodeOfType(nsINode::eCONTENT) &&
-                static_cast<nsIContent*>(aNode)->
-                  IsInNativeAnonymousSubtree()) ||
-               sScriptBlockerCount == sRemovableScriptBlockerCount,
-               "Want to fire mutation events, but it's not safe");
-
   // global object will be null for documents that don't have windows.
   nsPIDOMWindow* window = doc->GetInnerWindow();
   // This relies on nsEventListenerManager::AddEventListener, which sets
@@ -3713,6 +3708,50 @@ nsContentUtils::HasMutationListeners(nsINode* aNode,
   return PR_FALSE;
 }
 
+/* static */
+PRBool
+nsContentUtils::HasMutationListeners(nsIDocument* aDocument,
+                                     PRUint32 aType)
+{
+  nsPIDOMWindow* window = aDocument ?
+    aDocument->GetInnerWindow() : nsnull;
+
+  // This relies on nsEventListenerManager::AddEventListener, which sets
+  // all mutation bits when there is a listener for DOMSubtreeModified event.
+  return !window || window->HasMutationListeners(aType);
+}
+
+void
+nsContentUtils::MaybeFireNodeRemoved(nsINode* aChild, nsINode* aParent,
+                                     nsIDocument* aOwnerDoc)
+{
+  NS_PRECONDITION(aChild, "Missing child");
+  NS_PRECONDITION(aChild->GetNodeParent() == aParent, "Wrong parent");
+  NS_PRECONDITION(aChild->GetOwnerDoc() == aOwnerDoc, "Wrong owner-doc");
+
+  NS_ASSERTION(aChild->IsNodeOfType(nsINode::eCONTENT) &&
+               static_cast<nsIContent*>(aChild)->
+                 IsInNativeAnonymousSubtree() ||
+               IsSafeToRunScript(),
+               "Want to fire DOMNodeRemoved event, but it's not safe");
+
+  // Having an explicit check here since it's an easy mistake to fall into,
+  // and there might be existing code with problems. We'd rather be safe
+  // than fire DOMNodeRemoved in all corner cases.
+  if (!IsSafeToRunScript()) {
+    return;
+  }
+
+  if (HasMutationListeners(aChild,
+        NS_EVENT_BITS_MUTATION_NODEREMOVED, aParent)) {
+    nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEREMOVED);
+    mutation.mRelatedNode = do_QueryInterface(aParent);
+
+    mozAutoSubtreeModified subtree(aOwnerDoc, aParent);
+    nsEventDispatcher::Dispatch(aChild, nsnull, &mutation);
+  }
+}
+
 /* static */
 void
 nsContentUtils::TraverseListenerManager(nsINode *aNode,
@@ -4084,6 +4123,37 @@ nsContentUtils::SetNodeTextContent(nsIContent* aContent,
                                    const nsAString& aValue,
                                    PRBool aTryReuse)
 {
+  // Fire DOMNodeRemoved mutation events before we do anything else.
+  nsCOMPtr<nsIContent> owningContent;
+
+  // Batch possible DOMSubtreeModified events.
+  mozAutoSubtreeModified subtree(nsnull, nsnull);
+
+  // Scope firing mutation events so that we don't carry any state that
+  // might be stale
+  {
+    // We're relying on mozAutoSubtreeModified to keep a strong reference if
+    // needed.
+    nsIDocument* doc = aContent->GetOwnerDoc();
+
+    // Optimize the common case of there being no observers
+    if (HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEREMOVED)) {
+      subtree.UpdateTarget(doc, nsnull);
+      owningContent = aContent;
+      nsCOMPtr<nsINode> child;
+      bool skipFirst = aTryReuse;
+      for (child = aContent->GetFirstChild();
+           child && child->GetNodeParent() == aContent;
+           child = child->GetNextSibling()) {
+        if (skipFirst && child->IsNodeOfType(nsINode::eTEXT)) {
+          skipFirst = false;
+          continue;
+        }
+        nsContentUtils::MaybeFireNodeRemoved(child, aContent, doc);
+      }
+    }
+  }
+
   // Might as well stick a batch around this since we're performing several
   // mutations.
   mozAutoDocUpdate updateBatch(aContent->GetCurrentDoc(),
@@ -4107,7 +4177,7 @@ nsContentUtils::SetNodeTextContent(nsIContent* aContent,
         aContent->RemoveChildAt(removeIndex, PR_TRUE);
       }
     }
-    
+
     if (removeIndex == 1) {
       return NS_OK;
     }
diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp
index 9c3a234c7822..874cfc28f6dc 100644
--- a/content/base/src/nsDOMAttribute.cpp
+++ b/content/base/src/nsDOMAttribute.cpp
@@ -59,6 +59,7 @@
 #include "nsTextNode.h"
 #include "mozAutoDocUpdate.h"
 #include "nsMutationEvent.h"
+#include "nsPLDOMEvent.h"
 
 using namespace mozilla::dom;
 
@@ -620,23 +621,6 @@ nsDOMAttribute::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMutationE
     nsCOMPtr<nsIContent> child = mChild;
     nsMutationGuard::DidMutate();
     mozAutoDocUpdate updateBatch(GetOwnerDoc(), UPDATE_CONTENT_MODEL, aNotify);
-    nsMutationGuard guard;
-  
-    mozAutoSubtreeModified subtree(nsnull, nsnull);
-    if (aNotify &&
-        nsContentUtils::HasMutationListeners(mChild,
-                                             NS_EVENT_BITS_MUTATION_NODEREMOVED,
-                                             this)) {
-      mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-      nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEREMOVED);
-      mutation.mRelatedNode =
-        do_QueryInterface(static_cast<nsIAttribute*>(this));
-      subtree.UpdateTarget(GetOwnerDoc(), this);
-      nsEventDispatcher::Dispatch(mChild, nsnull, &mutation);
-    }
-    if (guard.Mutated(0) && mChild != child) {
-      return NS_OK;
-    }
 
     doRemoveChild(aNotify);
   }
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index a03de6ae1a6f..a646cb65acc7 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -7562,10 +7562,8 @@ nsDocument::MutationEventDispatched(nsINode* aTarget)
 
     PRInt32 realTargetCount = realTargets.Count();
     for (PRInt32 k = 0; k < realTargetCount; ++k) {
-      mozAutoRemovableBlockerRemover blockerRemover(this);
-
       nsMutationEvent mutation(PR_TRUE, NS_MUTATION_SUBTREEMODIFIED);
-      nsEventDispatcher::Dispatch(realTargets[k], nsnull, &mutation);
+      (new nsPLDOMEvent(realTargets[k], mutation))->RunDOMEventWhenSafe();
     }
   }
 }
diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp
index f7b713c596aa..f4fe5320c6ee 100644
--- a/content/base/src/nsGenericDOMDataNode.cpp
+++ b/content/base/src/nsGenericDOMDataNode.cpp
@@ -63,6 +63,7 @@
 #include "nsBindingManager.h"
 #include "nsCCUncollectableMarker.h"
 #include "mozAutoDocUpdate.h"
+#include "nsPLDOMEvent.h"
 
 #include "pldhash.h"
 #include "prprf.h"
@@ -391,8 +392,6 @@ nsGenericDOMDataNode::SetTextInternal(PRUint32 aOffset, PRUint32 aCount,
     nsNodeUtils::CharacterDataChanged(this, &info);
 
     if (haveMutationListeners) {
-      mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-
       nsMutationEvent mutation(PR_TRUE, NS_MUTATION_CHARACTERDATAMODIFIED);
 
       mutation.mPrevAttrValue = oldValue;
@@ -403,7 +402,7 @@ nsGenericDOMDataNode::SetTextInternal(PRUint32 aOffset, PRUint32 aCount,
       }
 
       mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-      nsEventDispatcher::Dispatch(this, nsnull, &mutation);
+      (new nsPLDOMEvent(this, mutation))->RunDOMEventWhenSafe();
     }
   }
 
@@ -956,22 +955,23 @@ nsGenericTextNode::ReplaceWholeText(const nsAFlatString& aContent,
 {
   *aResult = NS_OK;
 
-  // Batch possible DOMSubtreeModified events.
-  mozAutoSubtreeModified subtree(GetOwnerDoc(), nsnull);
-  mozAutoDocUpdate updateBatch(GetCurrentDoc(), UPDATE_CONTENT_MODEL, PR_TRUE);
-
-  nsCOMPtr<nsIContent> parent = GetParent();
-
   // Handle parent-less nodes
+  nsCOMPtr<nsIContent> parent = GetParent();
   if (!parent) {
     if (aContent.IsEmpty()) {
       return nsnull;
     }
 
-    SetText(aContent.get(), aContent.Length(), PR_TRUE);
+    SetNodeValue(aContent);
     return this;
   }
 
+  // We're relying on mozAutoSubtreeModified to keep the doc alive here.
+  nsIDocument* doc = GetOwnerDoc();
+
+  // Batch possible DOMSubtreeModified events.
+  mozAutoSubtreeModified subtree(doc, nsnull);
+
   PRInt32 index = parent->IndexOf(this);
   if (index < 0) {
     NS_WARNING("Trying to use .replaceWholeText with an anonymous text node "
@@ -988,6 +988,25 @@ nsGenericTextNode::ReplaceWholeText(const nsAFlatString& aContent,
   PRInt32 last =
     LastLogicallyAdjacentTextNode(parent, index, parent->GetChildCount());
 
+  // Fire mutation events. Optimize the common case of there being no
+  // listeners
+  if (nsContentUtils::
+        HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEREMOVED)) {
+    for (PRInt32 i = first; i <= last; ++i) {
+      nsCOMPtr<nsIContent> child = parent->GetChildAt((PRUint32)i);
+      if (child &&
+          (i != index || aContent.IsEmpty())) {
+        nsContentUtils::MaybeFireNodeRemoved(child, parent, doc);
+      }
+    }
+  }
+
+  // Remove the needed nodes
+  // Don't want to use 'doc' here since it might no longer be the correct
+  // document.
+  mozAutoDocUpdate updateBatch(parent->GetCurrentDoc(), UPDATE_CONTENT_MODEL,
+                               PR_TRUE);
+
   do {
     if (last == index && !aContent.IsEmpty())
       continue;
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index f27dafbeaecc..54256bb12d7e 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -134,6 +134,7 @@
 #include "mozilla/css/StyleRule.h" /* For nsCSSSelectorList */
 #include "nsCSSRuleProcessor.h"
 #include "nsRuleProcessorData.h"
+#include "nsPLDOMEvent.h"
 
 #ifdef MOZ_XUL
 #include "nsIXULDocument.h"
@@ -523,6 +524,30 @@ nsINode::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
   return ownerDoc ? CallQueryInterface(ownerDoc, aOwnerDocument) : NS_OK;
 }
 
+nsresult
+nsINode::RemoveChild(nsINode *aOldChild)
+{
+  if (!aOldChild) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  if (IsNodeOfType(eDATA_NODE)) {
+    return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
+  }
+
+  if (aOldChild && aOldChild->GetNodeParent() == this) {
+    nsContentUtils::MaybeFireNodeRemoved(aOldChild, this, GetOwnerDoc());
+  }
+
+  PRInt32 index = IndexOf(aOldChild);
+  if (index == -1) {
+    // aOldChild isn't one of our children.
+    return NS_ERROR_DOM_NOT_FOUND_ERR;
+  }
+
+  return RemoveChildAt(index, PR_TRUE);
+}
+
 nsresult
 nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsIDOMNode* aNewChild,
                                nsIDOMNode* aRefChild, nsIDOMNode** aReturn)
@@ -2714,8 +2739,14 @@ nsGenericElement::JoinTextNodes(nsIContent* aFirst,
 nsresult
 nsGenericElement::Normalize()
 {
+  // We're relying on mozAutoSubtreeModified to keep the doc alive here.
+  nsIDocument* doc = GetOwnerDoc();
+
   // Batch possible DOMSubtreeModified events.
-  mozAutoSubtreeModified subtree(GetOwnerDoc(), nsnull);
+  mozAutoSubtreeModified subtree(doc, nsnull);
+
+  bool hasRemoveListeners = nsContentUtils::
+    HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEREMOVED);
 
   nsresult result = NS_OK;
   PRUint32 index, count = GetChildCount();
@@ -2733,6 +2764,9 @@ nsGenericElement::Normalize()
 
           // ensure that if the text node is empty, it is removed
           if (0 == child->TextLength()) {
+            if (hasRemoveListeners) {
+              nsContentUtils::MaybeFireNodeRemoved(child, this, doc);
+            }
             result = RemoveChildAt(index, PR_TRUE);
             if (NS_FAILED(result)) {
               return result;
@@ -2747,7 +2781,7 @@ nsGenericElement::Normalize()
             // Get the sibling. If it's also a text node, then
             // remove it from the tree and join the two text
             // nodes.
-            nsIContent *sibling = GetChildAt(index + 1);
+            nsCOMPtr<nsIContent> sibling = GetChildAt(index + 1);
 
             nsCOMPtr<nsIDOMNode> siblingNode = do_QueryInterface(sibling);
 
@@ -2756,6 +2790,9 @@ nsGenericElement::Normalize()
               siblingNode->GetNodeType(&siblingNodeType);
 
               if (siblingNodeType == nsIDOMNode::TEXT_NODE) {
+                if (hasRemoveListeners) {
+                  nsContentUtils::MaybeFireNodeRemoved(sibling, this, doc);
+                }
                 result = RemoveChildAt(index+1, PR_TRUE);
                 if (NS_FAILED(result)) {
                   return result;
@@ -3517,6 +3554,9 @@ nsGenericElement::InsertChildAt(nsIContent* aKid,
 static nsresult
 AdoptNodeIntoOwnerDoc(nsINode *aParent, nsINode *aNode)
 {
+  NS_ASSERTION(!aNode->GetNodeParent(),
+               "Should have removed from parent already");
+
   nsIDocument *doc = aParent->GetOwnerDoc();
 
   nsresult rv;
@@ -3545,6 +3585,8 @@ nsresult
 nsINode::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                          PRBool aNotify, nsAttrAndChildArray& aChildArray)
 {
+  NS_PRECONDITION(!aKid->GetNodeParent(),
+                  "Inserting node that already has parent");
   nsresult rv;
 
   if (!HasSameOwnerDoc(aKid)) {
@@ -3610,13 +3652,11 @@ nsINode::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
 
     if (nsContentUtils::HasMutationListeners(aKid,
           NS_EVENT_BITS_MUTATION_NODEINSERTED, this)) {
-      mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-      
       nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEINSERTED);
       mutation.mRelatedNode = do_QueryInterface(this);
 
       mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-      nsEventDispatcher::Dispatch(aKid, nsnull, &mutation);
+      (new nsPLDOMEvent(aKid, mutation))->RunDOMEventWhenSafe();
     }
   }
 
@@ -3642,41 +3682,16 @@ nsINode::doRemoveChildAt(PRUint32 aIndex, PRBool aNotify,
                          nsIContent* aKid, nsAttrAndChildArray& aChildArray,
                          PRBool aMutationEvent)
 {
-  nsIDocument* doc = GetCurrentDoc();
-
-  nsMutationGuard::DidMutate();
-
   NS_PRECONDITION(aKid && aKid->GetNodeParent() == this &&
                   aKid == GetChildAt(aIndex) &&
                   IndexOf(aKid) == (PRInt32)aIndex, "Bogus aKid");
 
+  nsMutationGuard::DidMutate();
+
+  nsIDocument* doc = GetCurrentDoc();
+
   mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
 
-  nsMutationGuard guard;
-
-  mozAutoSubtreeModified subtree(nsnull, nsnull);
-  if (aNotify &&
-      aMutationEvent &&
-      nsContentUtils::HasMutationListeners(aKid,
-        NS_EVENT_BITS_MUTATION_NODEREMOVED, this)) {
-    mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-
-    nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEREMOVED);
-    mutation.mRelatedNode = do_QueryInterface(this);
-
-    subtree.UpdateTarget(GetOwnerDoc(), this);
-    nsEventDispatcher::Dispatch(aKid, nsnull, &mutation);
-  }
-
-  // Someone may have removed the kid or any of its siblings while that event
-  // was processing.
-  if (guard.Mutated(0)) {
-    aIndex = IndexOf(aKid);
-    if (static_cast<PRInt32>(aIndex) < 0) {
-      return NS_OK;
-    }
-  }
-
   nsIContent* previousSibling = aKid->GetPreviousSibling();
 
   if (GetFirstChild() == aKid) {
@@ -3985,13 +4000,11 @@ nsGenericElement::FireNodeInserted(nsIDocument* aDoc,
 
     if (nsContentUtils::HasMutationListeners(childContent,
           NS_EVENT_BITS_MUTATION_NODEINSERTED, aParent)) {
-      mozAutoRemovableBlockerRemover blockerRemover(aDoc);
-
       nsMutationEvent mutation(PR_TRUE, NS_MUTATION_NODEINSERTED);
       mutation.mRelatedNode = do_QueryInterface(aParent);
 
       mozAutoSubtreeModified subtree(aDoc, aParent);
-      nsEventDispatcher::Dispatch(childContent, nsnull, &mutation);
+      (new nsPLDOMEvent(childContent, mutation))->RunDOMEventWhenSafe();
     }
   }
 }
@@ -4004,17 +4017,58 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
     return NS_ERROR_NULL_POINTER;
   }
 
-  if (!IsNodeOfType(eDOCUMENT) &&
-      !IsNodeOfType(eDOCUMENT_FRAGMENT) &&
-      !IsElement()) {
+  if ((!IsNodeOfType(eDOCUMENT) &&
+       !IsNodeOfType(eDOCUMENT_FRAGMENT) &&
+       !IsElement()) ||
+      !aNewChild->IsNodeOfType(eCONTENT)){
     return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
   }
 
+  PRUint16 nodeType = 0;
+  nsresult res = aNewChild->GetNodeType(&nodeType);
+  NS_ENSURE_SUCCESS(res, res);
+
+  // Before we do anything else, fire all DOMNodeRemoved mutation events
+  // We do this up front as to avoid having to deal with script running
+  // at random places further down.
+  // Scope firing mutation events so that we don't carry any state that
+  // might be stale
+  {
+    // This check happens again further down (though then using IndexOf).
+    // We're only checking this here to avoid firing mutation events when
+    // none should be fired.
+    // It's ok that we do the check twice in the case when firing mutation
+    // events as we need to recheck after running script anyway.
+    if (aRefChild && aRefChild->GetNodeParent() != this) {
+      return NS_ERROR_DOM_NOT_FOUND_ERR;
+    }
+
+    // If we're replacing, fire for node-to-be-replaced
+    if (aReplace) {
+      nsContentUtils::MaybeFireNodeRemoved(aRefChild, this, GetOwnerDoc());
+    }
+
+    // If the new node already has a parent, fire for removing from old
+    // parent
+    nsINode* oldParent = aNewChild->GetNodeParent();
+    if (oldParent) {
+      nsContentUtils::MaybeFireNodeRemoved(aNewChild, oldParent,
+                                           aNewChild->GetOwnerDoc());
+    }
+
+    // If we're inserting a fragment, fire for all the children of the
+    // fragment
+    if (nodeType == nsIDOMNode::DOCUMENT_FRAGMENT_NODE) {
+      static_cast<nsGenericElement*>(aNewChild)->FireNodeRemovedForChildren();
+    }
+  }
+
+  nsIDocument* doc = GetOwnerDoc();
+  nsIContent* newContent = static_cast<nsIContent*>(aNewChild);
   nsIContent* refContent;
-  nsresult res = NS_OK;
   PRInt32 insPos;
 
-  mozAutoDocConditionalContentUpdateBatch batch(GetCurrentDoc(), PR_TRUE);
+  mozAutoDocUpdate batch(GetCurrentDoc(), UPDATE_CONTENT_MODEL, PR_TRUE);
 
   // Figure out which index to insert at
   if (aRefChild) {
@@ -4037,21 +4091,51 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
     refContent = nsnull;
   }
 
-  if (!aNewChild->IsNodeOfType(eCONTENT)) {
-    return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
-  }
-
-  nsIContent* newContent = static_cast<nsIContent*>(aNewChild);
-
-  PRUint16 nodeType = 0;
-  res = aNewChild->GetNodeType(&nodeType);
-  NS_ENSURE_SUCCESS(res, res);
-
   // Make sure that the inserted node is allowed as a child of its new parent.
   if (!IsAllowedAsChild(newContent, nodeType, this, aReplace, refContent)) {
     return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
   }
 
+  // If we're replacing
+  if (aReplace) {
+    refContent = GetChildAt(insPos + 1);
+
+    res = RemoveChildAt(insPos, PR_TRUE);
+    NS_ENSURE_SUCCESS(res, res);
+  }
+
+  if (newContent->IsRootOfAnonymousSubtree()) {
+    // This is anonymous content.  Don't allow its insertion
+    // anywhere, since it might have UnbindFromTree calls coming
+    // its way.
+    return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+  }
+
+  // Remove the new child from the old parent if one exists
+  nsINode* oldParent = newContent->GetNodeParent();
+  if (oldParent) {
+    PRInt32 removeIndex = oldParent->IndexOf(newContent);
+    if (removeIndex < 0) {
+      // newContent is anonymous.  We can't deal with this, so just bail
+      NS_ERROR("How come our flags didn't catch this?");
+      return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
+    }
+    
+    NS_ASSERTION(!(oldParent == this && removeIndex == insPos),
+                 "invalid removeIndex");
+
+    res = oldParent->RemoveChildAt(removeIndex, PR_TRUE);
+    NS_ENSURE_SUCCESS(res, res);
+
+    // Adjust insert index if the node we ripped out was a sibling
+    // of the node we're inserting before
+    if (oldParent == this && removeIndex < insPos) {
+      --insPos;
+    }
+  }
+
+  // Move new child over to our document if needed. Do this after removing
+  // it from its parent so that AdoptNode doesn't fire DOMNodeRemoved
   // DocumentType nodes are the only nodes that can have a null
   // ownerDocument according to the DOM spec, and we need to allow
   // inserting them w/o calling AdoptNode().
@@ -4062,31 +4146,6 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
     NS_ENSURE_SUCCESS(res, res);
   }
 
-  // If we're replacing
-  if (aReplace) {
-    refContent = GetChildAt(insPos + 1);
-
-    nsMutationGuard guard;
-
-    res = RemoveChildAt(insPos, PR_TRUE);
-    NS_ENSURE_SUCCESS(res, res);
-
-    if (guard.Mutated(1)) {
-      insPos = refContent ? IndexOf(refContent) : GetChildCount();
-      if (insPos < 0) {
-        return NS_ERROR_DOM_NOT_FOUND_ERR;
-      }
-
-      // Passing PR_FALSE for aIsReplace since we now have removed the node
-      // to be replaced.
-      if (!IsAllowedAsChild(newContent, nodeType, this, PR_FALSE, refContent)) {
-        return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
-      }
-    }
-  }
-
-  nsIDocument *doc = GetOwnerDoc();
-
   /*
    * Check if we're inserting a document fragment. If we are, we need
    * to remove the children of the document fragment and add them
@@ -4189,74 +4248,18 @@ nsINode::ReplaceOrInsertBefore(PRBool aReplace, nsINode* aNewChild,
     }
 
     // Fire mutation events. Optimize for the case when there are no listeners
-    nsPIDOMWindow* window = nsnull;
-    if (doc &&
-        (((window = doc->GetInnerWindow()) &&
-          window->HasMutationListeners(NS_EVENT_BITS_MUTATION_NODEINSERTED)) ||
-         !window)) {
+    if (nsContentUtils::
+          HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
       nsGenericElement::FireNodeInserted(doc, this, fragChildren);
     }
   }
   else {
     // Not inserting a fragment but rather a single node.
 
-    if (newContent->IsRootOfAnonymousSubtree()) {
-      // This is anonymous content.  Don't allow its insertion
-      // anywhere, since it might have UnbindFromTree calls coming
-      // its way.
-      return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-    }
-
-    // Remove the element from the old parent if one exists
-    nsINode* oldParent = newContent->GetNodeParent();
-
-    if (oldParent) {
-      PRInt32 removeIndex = oldParent->IndexOf(newContent);
-
-      if (removeIndex < 0) {
-        // newContent is anonymous.  We can't deal with this, so just bail
-        NS_ERROR("How come our flags didn't catch this?");
-        return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
-      }
-      
-      NS_ASSERTION(!(oldParent == this && removeIndex == insPos),
-                   "invalid removeIndex");
-
-      nsMutationGuard guard;
-
-      res = oldParent->RemoveChildAt(removeIndex, PR_TRUE);
-      NS_ENSURE_SUCCESS(res, res);
-
-      // Adjust insert index if the node we ripped out was a sibling
-      // of the node we're inserting before
-      if (oldParent == this && removeIndex < insPos) {
-        --insPos;
-      }
-
-      if (guard.Mutated(1)) {
-        if (doc != newContent->GetOwnerDoc()) {
-          return NS_ERROR_DOM_WRONG_DOCUMENT_ERR;
-        }
-
-        insPos = refContent ? IndexOf(refContent) : GetChildCount();
-        if (insPos < 0) {
-          // Someone seriously messed up the childlist. We have no idea
-          // where to insert the new child, so just bail.
-          return NS_ERROR_DOM_NOT_FOUND_ERR;
-        }
-
-        if (newContent->GetNodeParent() ||
-            !IsAllowedAsChild(newContent, nodeType, this, PR_FALSE,
-                              refContent)) {
-          return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
-        }
-      }
-    }
-
     // FIXME https://bugzilla.mozilla.org/show_bug.cgi?id=544654
     //       We need to reparent here for nodes for which the parent of their
     //       wrapper is not the wrapper for their ownerDocument (XUL elements,
-    //       form controls, ...).
+    //       form controls, ...). Also applies in the fragment code above.
 
     res = InsertChildAt(newContent, insPos, PR_TRUE);
     NS_ENSURE_SUCCESS(res, res);
@@ -4751,8 +4754,6 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
   }
 
   if (aFireMutation) {
-    mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-    
     nsMutationEvent mutation(PR_TRUE, NS_MUTATION_ATTRMODIFIED);
 
     nsCOMPtr<nsIDOMAttr> attrNode;
@@ -4774,7 +4775,7 @@ nsGenericElement::SetAttrAndNotify(PRInt32 aNamespaceID,
     mutation.mAttrChange = aModType;
 
     mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation);
+    (new nsPLDOMEvent(this, mutation))->RunDOMEventWhenSafe();
   }
 
   return NS_OK;
@@ -4993,8 +4994,6 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
   NS_ENSURE_SUCCESS(rv, rv);
 
   if (hasMutationListeners) {
-    mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-
     nsCOMPtr<nsIDOMEventTarget> node =
       do_QueryInterface(static_cast<nsIContent *>(this));
     nsMutationEvent mutation(PR_TRUE, NS_MUTATION_ATTRMODIFIED);
@@ -5009,7 +5008,7 @@ nsGenericElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
     mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL;
 
     mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-    nsEventDispatcher::Dispatch(this, nsnull, &mutation);
+    (new nsPLDOMEvent(this, mutation))->RunDOMEventWhenSafe();
   }
 
   return NS_OK;
@@ -5439,6 +5438,26 @@ nsGenericElement::PostHandleEventForLinks(nsEventChainPostVisitor& aVisitor)
   return rv;
 }
 
+void
+nsGenericElement::FireNodeRemovedForChildren()
+{
+  nsIDocument* doc = GetOwnerDoc();
+  // Optimize the common case
+  if (!nsContentUtils::
+        HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEREMOVED)) {
+    return;
+  }
+
+  nsCOMPtr<nsIDocument> owningDoc = doc;
+
+  nsCOMPtr<nsINode> child;
+  for (child = GetFirstChild();
+       child && child->GetNodeParent() == this;
+       child = child->GetNextSibling()) {
+    nsContentUtils::MaybeFireNodeRemoved(child, this, doc);
+  }
+}
+
 void
 nsGenericElement::GetLinkTarget(nsAString& aTarget)
 {
diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h
index 64318a8ce3dd..965b661c66d8 100644
--- a/content/base/src/nsGenericElement.h
+++ b/content/base/src/nsGenericElement.h
@@ -350,8 +350,6 @@ public:
   }
   virtual nsresult SetTextContent(const nsAString& aTextContent)
   {
-    // Batch possible DOMSubtreeModified events.
-    mozAutoSubtreeModified subtree(GetOwnerDoc(), nsnull);
     return nsContentUtils::SetNodeTextContent(this, aTextContent, PR_FALSE);
   }
 
@@ -769,6 +767,11 @@ public:
   {
   }
 
+  /**
+   * Fire a DOMNodeRemoved mutation event for all children of this node
+   */
+  void FireNodeRemovedForChildren();
+
 protected:
   /**
    * Set attribute and (if needed) notify documentobservers and fire off
diff --git a/content/base/src/nsRange.cpp b/content/base/src/nsRange.cpp
index 67f27384c546..99d2bf9c5271 100644
--- a/content/base/src/nsRange.cpp
+++ b/content/base/src/nsRange.cpp
@@ -1172,7 +1172,7 @@ RemoveNode(nsIDOMNode* aNode)
 {
   nsCOMPtr<nsINode> node = do_QueryInterface(aNode);
   nsCOMPtr<nsINode> parent = node->GetNodeParent();
-  return parent ? parent->RemoveChildAt(parent->IndexOf(node), PR_TRUE) : NS_OK;
+  return parent ? parent->RemoveChild(node) : NS_OK;
 }
 
 /**
diff --git a/content/base/test/test_bug548463.html b/content/base/test/test_bug548463.html
index f0aea3fe7ad9..2eb78bf291c2 100644
--- a/content/base/test/test_bug548463.html
+++ b/content/base/test/test_bug548463.html
@@ -48,7 +48,7 @@ function testAdoptFromDOMNodeRemoved(nodeToAppend, nodeRemoved, nodeToAdopt)
     thrown = true;
   }
 
-  ok(thrown, "adoptNode while appending should throw");
+  ok(!thrown, "adoptNode while appending should not throw");
 }
 
 var frag = document.createDocumentFragment();
diff --git a/content/events/public/nsPLDOMEvent.h b/content/events/public/nsPLDOMEvent.h
index aa31a696ebb6..799879c881fc 100644
--- a/content/events/public/nsPLDOMEvent.h
+++ b/content/events/public/nsPLDOMEvent.h
@@ -69,9 +69,11 @@ public:
     : mEventNode(aEventNode), mEvent(aEvent), mDispatchChromeOnly(PR_FALSE)
   { }
 
+  nsPLDOMEvent(nsINode *aEventNode, nsEvent &aEvent);
+
   NS_IMETHOD Run();
   nsresult PostDOMEvent();
-  nsresult RunDOMEventWhenSafe();
+  void RunDOMEventWhenSafe();
 
   nsCOMPtr<nsINode>     mEventNode;
   nsCOMPtr<nsIDOMEvent> mEvent;
diff --git a/content/events/src/nsPLDOMEvent.cpp b/content/events/src/nsPLDOMEvent.cpp
index 0b63b7235c34..c4255a018c89 100644
--- a/content/events/src/nsPLDOMEvent.cpp
+++ b/content/events/src/nsPLDOMEvent.cpp
@@ -42,6 +42,21 @@
 #include "nsIDOMDocumentEvent.h"
 #include "nsIDOMEventTarget.h"
 #include "nsContentUtils.h"
+#include "nsEventDispatcher.h"
+#include "nsGUIEvent.h"
+
+nsPLDOMEvent::nsPLDOMEvent(nsINode *aEventNode, nsEvent &aEvent)
+  : mEventNode(aEventNode), mDispatchChromeOnly(PR_FALSE)
+{
+  PRBool trusted = NS_IS_TRUSTED_EVENT(&aEvent);
+  nsEventDispatcher::CreateEvent(nsnull, &aEvent, EmptyString(),
+                                 getter_AddRefs(mEvent));
+  NS_ASSERTION(mEvent, "Should never fail to create an event");
+  nsCOMPtr<nsIPrivateDOMEvent> priv = do_QueryInterface(mEvent);
+  NS_ASSERTION(priv, "Should also not fail to QI to nsIDOMEventPrivate");
+  priv->DuplicatePrivateData();
+  priv->SetTrusted(trusted);
+}
 
 NS_IMETHODIMP nsPLDOMEvent::Run()
 {
@@ -75,9 +90,9 @@ nsresult nsPLDOMEvent::PostDOMEvent()
   return NS_DispatchToCurrentThread(this);
 }
 
-nsresult nsPLDOMEvent::RunDOMEventWhenSafe()
+void nsPLDOMEvent::RunDOMEventWhenSafe()
 {
-  return nsContentUtils::AddScriptRunner(this) ? NS_OK : NS_ERROR_FAILURE;
+  nsContentUtils::AddScriptRunner(this);
 }
 
 nsLoadBlockingPLDOMEvent::~nsLoadBlockingPLDOMEvent()
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
index e10e8fd27aed..0b8489383eac 100644
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -702,15 +702,20 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
 
   nsresult rv = NS_OK;
 
+  // Batch possible DOMSubtreeModified events.
+  mozAutoSubtreeModified subtree(doc, nsnull);
+
+  FireNodeRemovedForChildren();
+
   // This BeginUpdate/EndUpdate pair is important to make us reenable the
   // scriptloader before the last EndUpdate call.
   mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, PR_TRUE);
 
-  // Batch possible DOMSubtreeModified events.
-  mozAutoSubtreeModified subtree(doc, nsnull);
-
-  // Remove childnodes
-  nsContentUtils::SetNodeTextContent(this, EmptyString(), PR_FALSE);
+  // Remove childnodes.
+  // i is unsigned, so i >= is always true
+  for (PRUint32 i = GetChildCount(); i-- != 0; ) {
+    RemoveChildAt(i, PR_TRUE);
+  }
 
   nsCOMPtr<nsIDOMDocumentFragment> df;
 
@@ -742,12 +747,9 @@ nsGenericHTMLElement::SetInnerHTML(const nsAString& aInnerHTML)
 
     // HTML5 parser has notified, but not fired mutation events.
     // Fire mutation events. Optimize for the case when there are no listeners
-    nsPIDOMWindow* window = nsnull;
     PRInt32 newChildCount = GetChildCount();
-    if (newChildCount &&
-        (((window = doc->GetInnerWindow()) &&
-          window->HasMutationListeners(NS_EVENT_BITS_MUTATION_NODEINSERTED)) ||
-         !window)) {
+    if (newChildCount && nsContentUtils::
+          HasMutationListeners(doc, NS_EVENT_BITS_MUTATION_NODEINSERTED)) {
       nsCOMArray<nsIContent> childNodes;
       NS_ASSERTION(newChildCount - oldChildCount >= 0,
                    "What, some unexpected dom mutation has happened?");
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index f09f322b49b6..7b10b309587e 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -124,6 +124,7 @@
 #include "nsContentUtils.h"
 #include "nsContentList.h"
 #include "nsMutationEvent.h"
+#include "nsPLDOMEvent.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsPIDOMWindow.h"
 #include "nsDOMAttributeMap.h"
@@ -1478,8 +1479,6 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify)
     }
 
     if (hasMutationListeners) {
-        mozAutoRemovableBlockerRemover blockerRemover(GetOwnerDoc());
-
         nsMutationEvent mutation(PR_TRUE, NS_MUTATION_ATTRMODIFIED);
 
         mutation.mRelatedNode = attrNode;
@@ -1490,8 +1489,7 @@ nsXULElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, PRBool aNotify)
         mutation.mAttrChange = nsIDOMMutationEvent::REMOVAL;
 
         mozAutoSubtreeModified subtree(GetOwnerDoc(), this);
-        nsEventDispatcher::Dispatch(static_cast<nsIContent*>(this),
-                                    nsnull, &mutation);
+        (new nsPLDOMEvent(this, mutation))->RunDOMEventWhenSafe();
     }
 
     return NS_OK;
diff --git a/docshell/base/crashtests/crashtests.list b/docshell/base/crashtests/crashtests.list
index 7bf61c7ba3d4..dbb78b0b21e0 100644
--- a/docshell/base/crashtests/crashtests.list
+++ b/docshell/base/crashtests/crashtests.list
@@ -3,8 +3,8 @@ load 369126-1.html
 load 403574-1.xhtml
 load 430124-1.html
 load 430628-1.html
-asserts(1-4) load 432114-1.html # bug 570215
-asserts(1) load 432114-2.html # bug 570215
+load 432114-1.html
+load 432114-2.html
 load 436900-1.html
 asserts(0-2) load 436900-2.html # bug 566159
 load 500328-1.html
diff --git a/editor/libeditor/html/crashtests/crashtests.list b/editor/libeditor/html/crashtests/crashtests.list
index d8a326fb3934..9b5395ddb7e3 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -21,4 +21,3 @@ load 582138-1.xhtml
 load 612565-1.html
 asserts(6) load 615015-1.html # Bug 439258
 load 615450-1.html
-load 643786-1.html
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index 09e68e0e317c..4cd7355c8c25 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -9202,9 +9202,6 @@ nsHTMLEditRules::DocumentModifiedWorker()
     return;
   }
 
-  // DeleteNode below may cause a flush, which could destroy the editor
-  nsAutoRemovableScriptBlocker scriptBlocker;
-
   nsCOMPtr<nsIHTMLEditor> kungFuDeathGrip(mHTMLEditor);
   nsCOMPtr<nsISelection> selection;
   nsresult res = mHTMLEditor->GetSelection(getter_AddRefs(selection));
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 014338507e93..87a48879ad94 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -204,7 +204,7 @@ load 409513.html
 load 410967.html
 load 411870-1.html
 load 412651-1.html
-asserts(6) load 413587-1.svg # Bug 563481?
+load 413587-1.svg
 load 414058-1.html
 load 414175-1.xul
 load 420031-1.html
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index f2af37cb460a..081958c8a1f0 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -52,8 +52,7 @@ fails-if(d2d) == img-simple-7.html  img-simple-7-ref.html # bug 633072
 
 # Test with mix of <html:img> and <svg:image> referring to the same images,
 # with a variety of preserveAspectRatio values in play.
-# NOTE: The reference cases in this test triggers 72 assertions (bug 563481)
-fails-if(Android) asserts(72) == img-and-image-1.html img-and-image-1-ref.svg
+fails-if(Android) == img-and-image-1.html img-and-image-1-ref.svg
 
 # More complex <img> tests
 == img-content-outside-viewBox-1.html img-content-outside-viewBox-1-ref.html
diff --git a/layout/reftests/svg/image/reftest.list b/layout/reftests/svg/image/reftest.list
index 75cf550192ba..afb9e53d1f5b 100644
--- a/layout/reftests/svg/image/reftest.list
+++ b/layout/reftests/svg/image/reftest.list
@@ -19,11 +19,9 @@
 == image-zoom-02.svg          image-zoom-02-ref.svg
 
 # Tests for <image> with preserveAspectRatio
-# NOTE: The reference cases in the following tests trigger 20+ assertions each
-# (1 per <symbol> element), due to bug 563481.
-asserts(20) == image-preserveAspectRatio-01-raster.svg image-preserveAspectRatio-01-ref.svg
-asserts(20) == image-preserveAspectRatio-01-svg.svg    image-preserveAspectRatio-01-ref.svg
-asserts(20) == image-preserveAspectRatio-02-raster.svg image-preserveAspectRatio-02-ref.svg
-asserts(20) == image-preserveAspectRatio-02-svg.svg    image-preserveAspectRatio-02-ref.svg
-asserts(21) == image-preserveAspectRatio-03.svg        image-preserveAspectRatio-03-ref.svg
-asserts(21) == image-preserveAspectRatio-04.svg        image-preserveAspectRatio-04-ref.svg
+== image-preserveAspectRatio-01-raster.svg image-preserveAspectRatio-01-ref.svg
+== image-preserveAspectRatio-01-svg.svg    image-preserveAspectRatio-01-ref.svg
+== image-preserveAspectRatio-02-raster.svg image-preserveAspectRatio-02-ref.svg
+== image-preserveAspectRatio-02-svg.svg    image-preserveAspectRatio-02-ref.svg
+== image-preserveAspectRatio-03.svg        image-preserveAspectRatio-03-ref.svg
+== image-preserveAspectRatio-04.svg        image-preserveAspectRatio-04-ref.svg
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 814699b35271..0daf73ae24a8 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -183,7 +183,7 @@ random-if(gtk2Widget) == objectBoundingBox-and-fePointLight-01.svg objectBoundin
 == svg-in-foreignObject-02.xhtml svg-in-foreignObject-01-ref.xhtml # reuse -01-ref.xhtml
 random-if(gtk2Widget) == text-font-weight-01.svg text-font-weight-01-ref.svg # bug 386713
 fails-if(Android) == switch-01.svg pass.svg # bug 652050
-asserts(3) == symbol-01.svg symbol-01-ref.svg # see bug 563481
+== symbol-01.svg symbol-01-ref.svg
 == text-gradient-01.svg text-gradient-01-ref.svg
 random-if(winWidget) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
 == text-gradient-03.svg pass.svg
diff --git a/layout/reftests/svg/smil/reftest.list b/layout/reftests/svg/smil/reftest.list
index 88bf391a01e2..f1de93fd36cd 100644
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -130,7 +130,7 @@ fails == anim-fillcolor-1.svg      anim-standard-ref.svg # bug 436296
 == anim-gradient-href-01.svg lime.svg
 == anim-image-href-01.svg lime.svg
 == anim-pattern-href-01.svg lime.svg
-asserts(9) == anim-use-href-01.svg lime.svg  # the asserts here are bug 563481
+== anim-use-href-01.svg lime.svg
 
 # animate the class attribute
 == anim-class-01.svg lime.svg

From 8c6f80554dbe550103ca163acca33181a3d9b477 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:03 -0700
Subject: [PATCH 291/314] Bug 650493 Part 2: Simplify userdata by firing
 adoption handlers off of scriptrunners. r=smaug/peterv

---
 content/base/src/nsDocument.cpp       | 69 +++++++++++++++++++--------
 content/base/src/nsGenericElement.cpp | 24 +++++-----
 content/base/src/nsNodeUtils.cpp      | 10 ++++
 content/base/test/test_bug548463.html |  2 +-
 content/base/test/test_bug626262.html |  2 +-
 5 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index a646cb65acc7..3588d5e05504 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -5984,6 +5984,30 @@ BlastSubtreeToPieces(nsINode *aNode)
   }
 }
 
+
+class nsUserDataCaller : public nsRunnable
+{
+public:
+  nsUserDataCaller(nsCOMArray<nsINode>& aNodesWithProperties,
+                   nsIDocument* aOwnerDoc)
+    : mNodesWithProperties(aNodesWithProperties),
+      mOwnerDoc(aOwnerDoc)
+  {
+  }
+
+  NS_IMETHOD Run()
+  {
+    nsNodeUtils::CallUserDataHandlers(mNodesWithProperties, mOwnerDoc,
+                                      nsIDOMUserDataHandler::NODE_ADOPTED,
+                                      PR_FALSE);
+    return NS_OK;
+  }
+
+private:
+  nsCOMArray<nsINode> mNodesWithProperties;
+  nsCOMPtr<nsIDocument> mOwnerDoc;
+};
+
 NS_IMETHODIMP
 nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
 {
@@ -5994,15 +6018,28 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
   nsresult rv = nsContentUtils::CheckSameOrigin(this, aAdoptedNode);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsCOMPtr<nsINode> adoptedNode;
+  nsCOMPtr<nsINode> adoptedNode = do_QueryInterface(aAdoptedNode);
+  
+  // Scope firing mutation events so that we don't carry any state that
+  // might be stale
+  {
+    nsINode* parent = adoptedNode->GetNodeParent();
+    if (parent) {
+      nsContentUtils::MaybeFireNodeRemoved(adoptedNode, parent,
+                                           adoptedNode->GetOwnerDoc());
+    }
+  }
+
+  nsAutoScriptBlocker scriptBlocker;
+
   PRUint16 nodeType;
   aAdoptedNode->GetNodeType(&nodeType);
   switch (nodeType) {
     case nsIDOMNode::ATTRIBUTE_NODE:
     {
       // Remove from ownerElement.
-      nsCOMPtr<nsIDOMAttr> adoptedAttr = do_QueryInterface(aAdoptedNode, &rv);
-      NS_ENSURE_SUCCESS(rv, rv);
+      nsCOMPtr<nsIDOMAttr> adoptedAttr = do_QueryInterface(aAdoptedNode);
+      NS_ASSERTION(adoptedAttr, "Attribute not implementing nsIDOMAttr");
 
       nsCOMPtr<nsIDOMElement> ownerElement;
       rv = adoptedAttr->GetOwnerElement(getter_AddRefs(ownerElement));
@@ -6017,8 +6054,6 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
         newAttr.swap(adoptedAttr);
       }
 
-      adoptedNode = do_QueryInterface(adoptedAttr, &rv);
-      NS_ENSURE_SUCCESS(rv, rv);
       break;
     }
     case nsIDOMNode::DOCUMENT_FRAGMENT_NODE:
@@ -6028,9 +6063,6 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
     case nsIDOMNode::CDATA_SECTION_NODE:
     case nsIDOMNode::COMMENT_NODE:
     {
-      adoptedNode = do_QueryInterface(aAdoptedNode, &rv);
-      NS_ENSURE_SUCCESS(rv, rv);
-
       // We don't want to adopt an element into its own contentDocument or into
       // a descendant contentDocument, so we check if the frameElement of this
       // document or any of its parents is the adopted node or one of its
@@ -6049,13 +6081,9 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
       } while ((doc = doc->GetParentDocument()));
 
       // Remove from parent.
-      nsCOMPtr<nsIDOMNode> parent;
-      aAdoptedNode->GetParentNode(getter_AddRefs(parent));
-      NS_ENSURE_SUCCESS(rv, rv);
-
+      nsINode* parent = adoptedNode->GetNodeParent();
       if (parent) {
-        nsCOMPtr<nsIDOMNode> newChild;
-        rv = parent->RemoveChild(aAdoptedNode, getter_AddRefs(newChild));
+        rv = parent->RemoveChildAt(parent->IndexOf(adoptedNode), PR_TRUE);
         NS_ENSURE_SUCCESS(rv, rv);
       }
 
@@ -6135,15 +6163,14 @@ nsDocument::AdoptNode(nsIDOMNode *aAdoptedNode, nsIDOMNode **aResult)
     }
   }
 
-  rv = nsNodeUtils::CallUserDataHandlers(nodesWithProperties, this,
-                                         nsIDOMUserDataHandler::NODE_ADOPTED,
-                                         PR_FALSE);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  if (adoptedNode->GetOwnerDoc() != this) {
-    return NS_ERROR_DOM_WRONG_DOCUMENT_ERR;
+  if (nodesWithProperties.Count()) {
+    nsContentUtils::AddScriptRunner(new nsUserDataCaller(nodesWithProperties,
+                                                         this));
   }
 
+  NS_ASSERTION(adoptedNode->GetOwnerDoc() == this,
+               "Should still be in the document we just got adopted into");
+
   return CallQueryInterface(adoptedNode, aResult);
 }
 
diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index 54256bb12d7e..947d980bca0a 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -3570,10 +3570,8 @@ AdoptNodeIntoOwnerDoc(nsINode *aParent, nsINode *aNode)
   rv = domDoc->AdoptNode(node, getter_AddRefs(adoptedNode));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  if (doc != aParent->GetOwnerDoc()) {
-    return NS_ERROR_DOM_WRONG_DOCUMENT_ERR;
-  }
-
+  NS_ASSERTION(aParent->GetOwnerDoc() == doc,
+               "ownerDoc chainged while adopting");
   NS_ASSERTION(adoptedNode == node, "Uh, adopt node changed nodes?");
   NS_ASSERTION(aParent->HasSameOwnerDoc(aNode),
                "ownerDocument changed again after adopting!");
@@ -3589,10 +3587,18 @@ nsINode::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
                   "Inserting node that already has parent");
   nsresult rv;
 
+  // The id-handling code, and in the future possibly other code, need to
+  // react to unexpected attribute changes.
+  nsMutationGuard::DidMutate();
+
+  // Do this before checking the child-count since this could cause mutations
+  nsIDocument* doc = GetCurrentDoc();
+  mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
+
   if (!HasSameOwnerDoc(aKid)) {
     nsCOMPtr<nsIDOMNode> kid = do_QueryInterface(aKid, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
- 
+
     PRUint16 nodeType = 0;
     rv = kid->GetNodeType(&nodeType);
     NS_ENSURE_SUCCESS(rv, rv);
@@ -3607,14 +3613,6 @@ nsINode::doInsertChildAt(nsIContent* aKid, PRUint32 aIndex,
     }
   }
 
-  // The id-handling code, and in the future possibly other code, need to
-  // react to unexpected attribute changes.
-  nsMutationGuard::DidMutate();
-
-  // Do this before checking the child-count since this could cause mutations
-  nsIDocument* doc = GetCurrentDoc();
-  mozAutoDocUpdate updateBatch(doc, UPDATE_CONTENT_MODEL, aNotify);
-
   PRUint32 childCount = aChildArray.ChildCount();
   NS_ENSURE_TRUE(aIndex <= childCount, NS_ERROR_ILLEGAL_VALUE);
   PRBool isAppend = (aIndex == childCount);
diff --git a/content/base/src/nsNodeUtils.cpp b/content/base/src/nsNodeUtils.cpp
index 45a558522237..aaba6a7d229d 100644
--- a/content/base/src/nsNodeUtils.cpp
+++ b/content/base/src/nsNodeUtils.cpp
@@ -364,6 +364,16 @@ nsNodeUtils::CallUserDataHandlers(nsCOMArray<nsINode> &aNodesWithProperties,
                   "Expected aNodesWithProperties to contain original and "
                   "cloned nodes.");
 
+  if (!nsContentUtils::IsSafeToRunScript()) {
+    if (nsContentUtils::IsChromeDoc(aOwnerDocument)) {
+      NS_WARNING("Fix the caller! Userdata callback disabled.");
+    } else {
+      NS_ERROR("This is unsafe! Fix the caller! Userdata callback disabled.");
+    }
+
+    return NS_OK;
+  }
+
   nsPropertyTable *table = aOwnerDocument->PropertyTable(DOM_USER_DATA_HANDLER);
 
   // Keep the document alive, just in case one of the handlers causes it to go
diff --git a/content/base/test/test_bug548463.html b/content/base/test/test_bug548463.html
index 2eb78bf291c2..f1106cd077f9 100644
--- a/content/base/test/test_bug548463.html
+++ b/content/base/test/test_bug548463.html
@@ -76,7 +76,7 @@ catch (e) {
   thrown = true;
 }
 
-ok(thrown, "adoptNode while adopting should throw");
+ok(!thrown, "adoptNode while adopting should not throw");
 
 </script>
 </pre>
diff --git a/content/base/test/test_bug626262.html b/content/base/test/test_bug626262.html
index 5e33a09fc7bb..29a9f6ea42ff 100644
--- a/content/base/test/test_bug626262.html
+++ b/content/base/test/test_bug626262.html
@@ -44,7 +44,7 @@ addLoadEvent(function() {
     thrown = true;
   }
 
-  ok(thrown, "changing ownerDocument during adoptNode should throw");
+  ok(!thrown, "changing ownerDocument during adoptNode should not throw");
 
   SimpleTest.finish();
 });

From 9a1d88b9eee3a90b6bbf825f658083cb35fe3a74 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:03 -0700
Subject: [PATCH 292/314] Bug 650493 Part 3: Back out patch from bug 645572 as
 we should now always end up with correct update counts. r=ehsan

---
 layout/base/nsCSSFrameConstructor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 769aec2e73ab..3cd26a01d730 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -8284,10 +8284,8 @@ nsCSSFrameConstructor::EndUpdate()
     RecalcQuotesAndCounters();
     NS_ASSERTION(mUpdateCount == 1, "Odd update count");
   }
-  // Negative update counts don't make sense
-  if (mUpdateCount > 0) {
-    --mUpdateCount;
-  }
+  NS_ASSERTION(mUpdateCount, "Negative mUpdateCount!");
+  --mUpdateCount;
 }
 
 void

From 2160f5e6fc533005f646f21800de5c69569b2aa0 Mon Sep 17 00:00:00 2001
From: Jonas Sicking <jonas@sicking.cc>
Date: Mon, 9 May 2011 12:33:04 -0700
Subject: [PATCH 293/314] Bug 643786. Don't fire DOMNodeRemoved when removing
 the editor created <br>. r=ehsan

---
 content/base/public/nsContentUtils.h          | 20 +++++++++++++++++++
 content/base/src/nsContentUtils.cpp           | 20 +++++++++++++++++--
 .../libeditor/html/crashtests/crashtests.list |  1 +
 editor/libeditor/html/nsHTMLEditRules.cpp     |  3 +++
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 2d22462431c0..47f16e338db8 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -130,6 +130,7 @@ class nsIMIMEHeaderParam;
 class nsIObserver;
 class nsPresContext;
 class nsIChannel;
+class nsAutoScriptBlockerSuppressNodeRemoved;
 struct nsIntMargin;
 class nsPIDOMWindow;
 class nsIDocumentLoaderFactory;
@@ -184,6 +185,7 @@ struct nsShortcutCandidate {
 
 class nsContentUtils
 {
+  friend class nsAutoScriptBlockerSuppressNodeRemoved;
   typedef mozilla::dom::Element Element;
 
 public:
@@ -1913,6 +1915,9 @@ private:
   static PRBool sInitialized;
   static PRUint32 sScriptBlockerCount;
   static PRUint32 sRemovableScriptBlockerCount;
+#ifdef DEBUG
+  static PRUint32 sDOMNodeRemovedSuppressCount;
+#endif
   static nsCOMArray<nsIRunnable>* sBlockedScriptRunners;
   static PRUint32 sRunnersCountAtFirstBlocker;
   static PRUint32 sScriptBlockerCountWhereRunnersPrevented;
@@ -2004,6 +2009,21 @@ private:
   MOZILLA_DECL_USE_GUARD_OBJECT_NOTIFIER
 };
 
+class NS_STACK_CLASS nsAutoScriptBlockerSuppressNodeRemoved :
+                          public nsAutoScriptBlocker {
+public:
+  nsAutoScriptBlockerSuppressNodeRemoved() {
+#ifdef DEBUG
+    ++nsContentUtils::sDOMNodeRemovedSuppressCount;
+#endif
+  }
+  ~nsAutoScriptBlockerSuppressNodeRemoved() {
+#ifdef DEBUG
+    --nsContentUtils::sDOMNodeRemovedSuppressCount;
+#endif
+  }
+};
+
 #define NS_INTERFACE_MAP_ENTRY_TEAROFF(_interface, _allocator)                \
   if (aIID.Equals(NS_GET_IID(_interface))) {                                  \
     foundInterface = static_cast<_interface *>(_allocator);                   \
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 1da849a42444..6c239fb7aa27 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -254,6 +254,9 @@ nsIBidiKeyboard *nsContentUtils::sBidiKeyboard = nsnull;
 #endif
 PRUint32 nsContentUtils::sScriptBlockerCount = 0;
 PRUint32 nsContentUtils::sRemovableScriptBlockerCount = 0;
+#ifdef DEBUG
+PRUint32 nsContentUtils::sDOMNodeRemovedSuppressCount = 0;
+#endif
 nsCOMArray<nsIRunnable>* nsContentUtils::sBlockedScriptRunners = nsnull;
 PRUint32 nsContentUtils::sRunnersCountAtFirstBlocker = 0;
 PRUint32 nsContentUtils::sScriptBlockerCountWhereRunnersPrevented = 0;
@@ -3729,15 +3732,28 @@ nsContentUtils::MaybeFireNodeRemoved(nsINode* aChild, nsINode* aParent,
   NS_PRECONDITION(aChild->GetNodeParent() == aParent, "Wrong parent");
   NS_PRECONDITION(aChild->GetOwnerDoc() == aOwnerDoc, "Wrong owner-doc");
 
+  // This checks that IsSafeToRunScript is true since we don't want to fire
+  // events when that is false. We can't rely on nsEventDispatcher to assert
+  // this in this situation since most of the time there are no mutation
+  // event listeners, in which case we won't even attempt to dispatch events.
+  // However this also allows for two exceptions. First off, we don't assert
+  // if the mutation happens to native anonymous content since we never fire
+  // mutation events on such content anyway.
+  // Second, we don't assert if sDOMNodeRemovedSuppressCount is true since
+  // that is a know case when we'd normally fire a mutation event, but can't
+  // make that safe and so we suppress it at this time. Ideally this should
+  // go away eventually.
   NS_ASSERTION(aChild->IsNodeOfType(nsINode::eCONTENT) &&
                static_cast<nsIContent*>(aChild)->
                  IsInNativeAnonymousSubtree() ||
-               IsSafeToRunScript(),
+               IsSafeToRunScript() ||
+               sDOMNodeRemovedSuppressCount,
                "Want to fire DOMNodeRemoved event, but it's not safe");
 
   // Having an explicit check here since it's an easy mistake to fall into,
   // and there might be existing code with problems. We'd rather be safe
-  // than fire DOMNodeRemoved in all corner cases.
+  // than fire DOMNodeRemoved in all corner cases. We also rely on it for
+  // nsAutoScriptBlockerSuppressNodeRemoved.
   if (!IsSafeToRunScript()) {
     return;
   }
diff --git a/editor/libeditor/html/crashtests/crashtests.list b/editor/libeditor/html/crashtests/crashtests.list
index 9b5395ddb7e3..d8a326fb3934 100644
--- a/editor/libeditor/html/crashtests/crashtests.list
+++ b/editor/libeditor/html/crashtests/crashtests.list
@@ -21,3 +21,4 @@ load 582138-1.xhtml
 load 612565-1.html
 asserts(6) load 615015-1.html # Bug 439258
 load 615450-1.html
+load 643786-1.html
diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
index 4cd7355c8c25..eb5fd2b069e2 100644
--- a/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -9202,6 +9202,9 @@ nsHTMLEditRules::DocumentModifiedWorker()
     return;
   }
 
+  // DeleteNode below may cause a flush, which could destroy the editor
+  nsAutoScriptBlockerSuppressNodeRemoved scriptBlocker;
+
   nsCOMPtr<nsIHTMLEditor> kungFuDeathGrip(mHTMLEditor);
   nsCOMPtr<nsISelection> selection;
   nsresult res = mHTMLEditor->GetSelection(getter_AddRefs(selection));

From c65bc78451de99745077f2fe6e7b16ab3e9a924d Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Mon, 9 May 2011 12:58:55 -0700
Subject: [PATCH 294/314] Bug 643032 - Don't start network status listener
 until Fennec starts [r=blassey]

---
 embedding/android/AndroidManifest.xml.in         |  7 -------
 embedding/android/GeckoApp.java                  | 14 ++++++++++----
 embedding/android/GeckoConnectivityReceiver.java |  2 --
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/embedding/android/AndroidManifest.xml.in b/embedding/android/AndroidManifest.xml.in
index ab1552a2ff9b..42838967ef66 100644
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -23,13 +23,6 @@
 		 android:icon="@drawable/icon"
 		 android:debuggable="true">
 
-        <!-- for network link status -->
-        <receiver android:name="org.mozilla.gecko.GeckoConnectivityReceiver">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name="App"
                   android:label="@MOZ_APP_DISPLAYNAME@"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc"
diff --git a/embedding/android/GeckoApp.java b/embedding/android/GeckoApp.java
index d22db8e23c6e..a8c0cf49da01 100644
--- a/embedding/android/GeckoApp.java
+++ b/embedding/android/GeckoApp.java
@@ -70,10 +70,11 @@ abstract public class GeckoApp
     public static GeckoSurfaceView surfaceView;
     public static GeckoApp mAppContext;
     public static boolean mFullscreen = false;
-    public static boolean mStartedEarly = false;
     public static File sGREDir = null;
     static Thread mLibLoadThread = null;
     public Handler mMainHandler;
+    private IntentFilter mConnectivityFilter;
+    private BroadcastReceiver mConnectivityReceiver;
 
     enum LaunchState {PreLaunch, Launching, WaitButton,
                       Launched, GeckoRunning, GeckoExiting};
@@ -161,9 +162,6 @@ abstract public class GeckoApp
 
                 // and then fire us up
                 String env = i.getStringExtra("env0");
-                if (GeckoApp.mStartedEarly) {
-                    GeckoAppShell.putenv("MOZ_APP_RESTART=" + startup_time);
-                }
                 GeckoAppShell.runGecko(getApplication().getPackageResourcePath(),
                                        i.getStringExtra("args"),
                                        i.getDataString());
@@ -257,6 +255,10 @@ abstract public class GeckoApp
                                    })
                 .show();
         }
+
+        mConnectivityFilter = new IntentFilter();
+        mConnectivityFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        mConnectivityReceiver = new GeckoConnectivityReceiver();
     }
 
     boolean IsNewInstall() {
@@ -349,6 +351,8 @@ abstract public class GeckoApp
 
         // onPause will be followed by either onResume or onStop.
         super.onPause();
+
+        unregisterReceiver(mConnectivityReceiver);
     }
 
     @Override
@@ -365,6 +369,8 @@ abstract public class GeckoApp
         if (checkLaunchState(LaunchState.PreLaunch) ||
             checkLaunchState(LaunchState.Launching))
             onNewIntent(getIntent());
+
+        registerReceiver(mConnectivityReceiver, mConnectivityFilter);
     }
 
     @Override
diff --git a/embedding/android/GeckoConnectivityReceiver.java b/embedding/android/GeckoConnectivityReceiver.java
index a9950fcdebc9..ffabc9a547d7 100644
--- a/embedding/android/GeckoConnectivityReceiver.java
+++ b/embedding/android/GeckoConnectivityReceiver.java
@@ -58,7 +58,5 @@ public class GeckoConnectivityReceiver
 
         if (GeckoApp.checkLaunchState(GeckoApp.LaunchState.GeckoRunning))
             GeckoAppShell.onChangeNetworkLinkStatus(status);
-        else
-            GeckoApp.mStartedEarly = true;
     }
 }

From cf45e697415c11209a553704d3dc65a6f0cc4eba Mon Sep 17 00:00:00 2001
From: Julian Reschke <julian.reschke@gmx.de>
Date: Tue, 26 Apr 2011 13:46:43 +0100
Subject: [PATCH 295/314] Implement exslt-date:date-time (bug 603159) r=sicking

---
 content/base/src/nsGkAtomList.h               |  1 +
 content/xslt/src/xslt/txEXSLTFunctions.cpp    | 36 +++++++++++-
 .../xslt/src/xslt/txStylesheetCompiler.cpp    |  2 +
 content/xslt/tests/mochitest/Makefile.in      |  1 +
 .../xslt/tests/mochitest/test_bug603159.html  | 55 +++++++++++++++++++
 5 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 content/xslt/tests/mochitest/test_bug603159.html

diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h
index d8a62c77ceea..f17ae5dd338f 100644
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -263,6 +263,7 @@ GK_ATOM(cycler, "cycler")
 GK_ATOM(data, "data")
 GK_ATOM(datalist, "datalist")
 GK_ATOM(dataType, "data-type")
+GK_ATOM(dateTime, "date-time")
 GK_ATOM(datasources, "datasources")
 GK_ATOM(datetime, "datetime")
 GK_ATOM(dblclick, "dblclick")
diff --git a/content/xslt/src/xslt/txEXSLTFunctions.cpp b/content/xslt/src/xslt/txEXSLTFunctions.cpp
index 549c22157c28..61a51feed5b0 100644
--- a/content/xslt/src/xslt/txEXSLTFunctions.cpp
+++ b/content/xslt/src/xslt/txEXSLTFunctions.cpp
@@ -46,6 +46,7 @@
 #include "txOutputFormat.h"
 #include "txRtfHandler.h"
 #include "txXPathTreeWalker.h"
+#include "nsPrintfCString.h"
 
 #ifndef TX_EXE
 #include "nsComponentManagerUtils.h"
@@ -225,6 +226,7 @@ static const char kEXSLTCommonNS[] = "http://exslt.org/common";
 static const char kEXSLTSetsNS[] = "http://exslt.org/sets";
 static const char kEXSLTStringsNS[] = "http://exslt.org/strings";
 static const char kEXSLTMathNS[] = "http://exslt.org/math";
+static const char kEXSLTDatesAndTimesNS[] = "http://exslt.org/dates-and-times";
 
 // The order of this table must be the same as the
 // txEXSLTFunctionCall::eType enum
@@ -245,6 +247,7 @@ static txEXSLTFunctionDescriptor descriptTable[] =
     { 1, 1, Expr::NUMBER_RESULT,  &txXSLTAtoms::min, 0, kEXSLTMathNS }, // MIN
     { 1, 1, Expr::NODESET_RESULT, &txXSLTAtoms::highest, 0, kEXSLTMathNS }, // HIGHEST
     { 1, 1, Expr::NODESET_RESULT, &txXSLTAtoms::lowest, 0, kEXSLTMathNS }, // LOWEST
+    { 0, 0, Expr::STRING_RESULT,  &txXSLTAtoms::dateTime, 0, kEXSLTDatesAndTimesNS }, // DATE_TIME
 
 };
 
@@ -269,7 +272,8 @@ public:
         MAX,
         MIN,
         HIGHEST,
-        LOWEST
+        LOWEST,
+        DATE_TIME
     };
     
     txEXSLTFunctionCall(eType aType)
@@ -685,6 +689,36 @@ txEXSLTFunctionCall::evaluate(txIEvalContext *aContext,
 
             NS_ADDREF(*aResult = resultSet);
 
+            return NS_OK;
+        }
+        case DATE_TIME:
+        {
+            // http://exslt.org/date/functions/date-time/
+            // format: YYYY-MM-DDTTHH:MM:SS.sss+00:00
+            char formatstr[] = "%04hd-%02ld-%02ldT%02ld:%02ld:%02ld.%03ld%c%02ld:%02ld";
+            const size_t max = sizeof("YYYY-MM-DDTHH:MM:SS.sss+00:00");
+            
+            PRExplodedTime prtime;
+            PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &prtime);
+            
+            PRInt32 offset = (prtime.tm_params.tp_gmt_offset +
+              prtime.tm_params.tp_dst_offset) / 60;
+              
+            PRBool isneg = offset < 0;
+            if (isneg) offset = -offset;
+            
+            StringResult* strRes;
+            rv = aContext->recycler()->getStringResult(&strRes);
+            NS_ENSURE_SUCCESS(rv, rv);
+            
+            CopyASCIItoUTF16(nsPrintfCString(max, formatstr,
+              prtime.tm_year, prtime.tm_month + 1, prtime.tm_mday,
+              prtime.tm_hour, prtime.tm_min, prtime.tm_sec,
+              prtime.tm_usec / 10000,
+              isneg ? '-' : '+', offset / 60, offset % 60), strRes->mValue);
+              
+            *aResult = strRes;
+
             return NS_OK;
         }
     }
diff --git a/content/xslt/src/xslt/txStylesheetCompiler.cpp b/content/xslt/src/xslt/txStylesheetCompiler.cpp
index b723c0e4eb02..39f40eead97e 100644
--- a/content/xslt/src/xslt/txStylesheetCompiler.cpp
+++ b/content/xslt/src/xslt/txStylesheetCompiler.cpp
@@ -997,6 +997,8 @@ static txFunctionFactoryMapping kExtensionFunctions[] = {
     { "http://exslt.org/strings", kNameSpaceID_Unknown,
       TX_ConstructEXSLTFunction },
     { "http://exslt.org/math", kNameSpaceID_Unknown,
+      TX_ConstructEXSLTFunction },
+    { "http://exslt.org/dates-and-times", kNameSpaceID_Unknown,
       TX_ConstructEXSLTFunction }
 };
 
diff --git a/content/xslt/tests/mochitest/Makefile.in b/content/xslt/tests/mochitest/Makefile.in
index 68d3e6489da9..be7750cb67a8 100644
--- a/content/xslt/tests/mochitest/Makefile.in
+++ b/content/xslt/tests/mochitest/Makefile.in
@@ -54,6 +54,7 @@ _TEST_FILES = 	test_bug319374.xhtml \
 		test_bug551654.html \
 		test_bug566629.html \
 		test_bug566629.xhtml \
+		test_bug603159.html \
 		test_exslt_regex.html \
 		$(NULL)
 
diff --git a/content/xslt/tests/mochitest/test_bug603159.html b/content/xslt/tests/mochitest/test_bug603159.html
new file mode 100644
index 000000000000..2ebfe69e5423
--- /dev/null
+++ b/content/xslt/tests/mochitest/test_bug603159.html
@@ -0,0 +1,55 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=603159
+-->
+<head>
+  <title>Test for Bug 603159</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=603159">Mozilla Bug 603159</a>
+<p id="display"></p>
+<div id="content" style="display: none"></div>
+<pre id="test">
+<script type="application/javascript">
+
+/** Test for Bug 603159 **/
+
+  var style =
+    '<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" ' +
+                    'xmlns:date="http://exslt.org/dates-and-times" '+
+                    'version="1.0">' +
+      '<xsl:output method="html"/>' +
+      '<xsl:template match="/">' +
+        '<xsl:value-of select="date:date-time()" /> ' +
+      '</xsl:template>' +
+    '</xsl:stylesheet>';
+  var styleDoc = new DOMParser().parseFromString (style, "text/xml");
+
+  var data = '<root/>';
+  var originalDoc = new DOMParser().parseFromString(data, "text/xml");
+
+  var processor = new XSLTProcessor();
+  processor.importStylesheet(styleDoc);
+
+  var fragment = processor.transformToFragment(originalDoc, document);
+  var content = document.getElementById("content");
+  content.appendChild(fragment);
+  
+  // use Gecko's Date.parse to parse, then compare the milliseconds since epoch
+  var xslt_ms = Date.parse(content.innerHTML);
+  var now_ms = new Date().getTime();
+  var accepted_diff = 30 * 60 * 1000; // 30 minutes
+  var diff = Math.abs(now_ms - xslt_ms);
+  
+  ok(diff < accepted_diff, "generated timestamp should be not more than "
+    + accepted_diff + " ms before 'now', but the difference was: " + diff);
+  
+  content.innerHTML = '';
+</script>
+</pre>
+</body>
+</html>

From 8597b8a7b1e65a72f84960704cce4e70996a29a7 Mon Sep 17 00:00:00 2001
From: Paul Biggar <pbiggar@mozilla.com>
Date: Mon, 9 May 2011 09:50:36 -0700
Subject: [PATCH 296/314] Backed out changeset 0c6254cb818d (bug 652593) due to
 PROCESS-CRASH orange in M(oth).

---
 browser/base/content/browser.js          |   6 +-
 js/src/imacros.jsasm                     |   8 ++
 js/src/jit-test/tests/basic/bug652539.js |   8 --
 js/src/jsanalyze.cpp                     |   1 +
 js/src/jsemit.cpp                        |  47 +++++-
 js/src/jsinterp.cpp                      | 175 ++++++++++++++---------
 js/src/jsopcode.cpp                      |  72 +++++++++-
 js/src/jsopcode.tbl                      |  70 ++++-----
 js/src/jsparse.cpp                       |   7 +-
 js/src/jspropertycache.cpp               |   3 +
 js/src/jstracer.cpp                      |  58 +++++++-
 js/src/methodjit/Compiler.cpp            |  63 +++++++-
 js/src/methodjit/Compiler.h              |   5 +
 js/src/methodjit/PolyIC.cpp              |  10 +-
 js/src/methodjit/StubCalls.cpp           |  72 ++++++----
 js/src/methodjit/StubCalls.h             |   1 +
 16 files changed, 445 insertions(+), 161 deletions(-)
 delete mode 100644 js/src/jit-test/tests/basic/bug652539.js

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index fa827280a996..7a9467280105 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7274,8 +7274,7 @@ var FeedHandler = {
    * a page is loaded or the user switches tabs to a page that has feeds.
    */
   updateFeeds: function() {
-    if (this._updateFeedTimeout)
-      clearTimeout(this._updateFeedTimeout);
+    clearTimeout(this._updateFeedTimeout);
 
     var feeds = gBrowser.selectedBrowser.feeds;
     var haveFeeds = feeds && feeds.length > 0;
@@ -7320,8 +7319,7 @@ var FeedHandler = {
     if (browserForLink == gBrowser.selectedBrowser) {
       // Batch updates to avoid updating the UI for multiple onLinkAdded events
       // fired within 100ms of each other.
-      if (this._updateFeedTimeout)
-        clearTimeout(this._updateFeedTimeout);
+      clearTimeout(this._updateFeedTimeout);
       this._updateFeedTimeout = setTimeout(this.updateFeeds.bind(this), 100);
     }
   }
diff --git a/js/src/imacros.jsasm b/js/src/imacros.jsasm
index bf20bde51a16..798adac78d59 100644
--- a/js/src/imacros.jsasm
+++ b/js/src/imacros.jsasm
@@ -708,3 +708,11 @@
         stop
     .end
 .end callprop
+
+.igroup getthisprop JSOP_GETTHISPROP,JSOP_GETARGPROP,JSOP_GETLOCALPROP
+    .imacro scriptgetter        #
+        .fixup +2               # getter obj
+        call 0                  # val
+        stop
+    .end
+.end getthisprop
diff --git a/js/src/jit-test/tests/basic/bug652539.js b/js/src/jit-test/tests/basic/bug652539.js
deleted file mode 100644
index dda41a995019..000000000000
--- a/js/src/jit-test/tests/basic/bug652539.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// |jit-test| error: ReferenceError: reference to undefined property e.stack
-options("strict", "werror");
-
-try {
-    throw 5;
-} catch(e) {
-    print(e + ',' + e.stack);
-}
diff --git a/js/src/jsanalyze.cpp b/js/src/jsanalyze.cpp
index 96197fdb9cf5..e7ebbeaaeb29 100644
--- a/js/src/jsanalyze.cpp
+++ b/js/src/jsanalyze.cpp
@@ -568,6 +568,7 @@ Script::analyze(JSContext *cx, JSScript *script)
             break;
 
           case JSOP_CALLLOCAL:
+          case JSOP_GETLOCALPROP:
           case JSOP_INCLOCAL:
           case JSOP_DECLOCAL:
           case JSOP_LOCALINC:
diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
index 29802577dc3a..c26289658f49 100644
--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -1832,8 +1832,7 @@ EmitAtomOp(JSContext *cx, JSParseNode *pn, JSOp op, JSCodeGenerator *cg)
     JS_ASSERT(JOF_OPTYPE(op) == JOF_ATOM);
     if (op == JSOP_GETPROP &&
         pn->pn_atom == cx->runtime->atomState.lengthAtom) {
-        /* Specialize length accesses for the interpreter. */
-        op = JSOP_LENGTH;
+        return js_Emit1(cx, cg, JSOP_LENGTH) >= 0;
     }
     ale = cg->atomList.add(cg->parser, pn->pn_atom);
     if (!ale)
@@ -2795,13 +2794,45 @@ EmitPropOp(JSContext *cx, JSParseNode *pn, JSOp op, JSCodeGenerator *cg,
         JS_ASSERT(op == JSOP_GETPROP);
         op = JSOP_CALLPROP;
     } else if (op == JSOP_GETPROP && pn->pn_type == TOK_DOT) {
-        if (pn2->pn_type == TOK_NAME) {
-            /* * Try to optimize arguments.length into JSOP_ARGCNT */
+        if (pn2->pn_op == JSOP_THIS) {
+            if (pn->pn_atom != cx->runtime->atomState.lengthAtom) {
+                /* Fast path for gets of |this.foo|. */
+                return EmitAtomOp(cx, pn, JSOP_GETTHISPROP, cg);
+            }
+        } else if (pn2->pn_type == TOK_NAME) {
+            /*
+             * Try to optimize:
+             *  - arguments.length into JSOP_ARGCNT
+             *  - argname.prop into JSOP_GETARGPROP
+             *  - localname.prop into JSOP_GETLOCALPROP
+             * but don't do this if the property is 'length' -- prefer to emit
+             * JSOP_GETARG, etc., and then JSOP_LENGTH.
+             */
             if (!BindNameToSlot(cx, cg, pn2))
                 return JS_FALSE;
             if (pn->pn_atom == cx->runtime->atomState.lengthAtom) {
                 if (pn2->pn_op == JSOP_ARGUMENTS)
                     return js_Emit1(cx, cg, JSOP_ARGCNT) >= 0;
+            } else {
+                switch (pn2->pn_op) {
+                  case JSOP_GETARG:
+                    op = JSOP_GETARGPROP;
+                    goto do_indexconst;
+                  case JSOP_GETLOCAL:
+                    op = JSOP_GETLOCALPROP;
+                  do_indexconst: {
+                        JSAtomListElement *ale;
+                        jsatomid atomIndex;
+
+                        ale = cg->atomList.add(cg->parser, pn->pn_atom);
+                        if (!ale)
+                            return JS_FALSE;
+                        atomIndex = ALE_INDEX(ale);
+                        return EmitSlotIndexOp(cx, op, pn2->pn_cookie.asInteger(), atomIndex, cg);
+                    }
+
+                  default:;
+                }
             }
         }
     }
@@ -6115,14 +6146,16 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
               case TOK_DOT:
                 if (js_Emit1(cx, cg, JSOP_DUP) < 0)
                     return JS_FALSE;
-                if (pn2->pn_atom == cx->runtime->atomState.protoAtom) {
+                if (pn2->pn_atom == cx->runtime->atomState.lengthAtom) {
+                    if (js_Emit1(cx, cg, JSOP_LENGTH) < 0)
+                        return JS_FALSE;
+                } else if (pn2->pn_atom == cx->runtime->atomState.protoAtom) {
                     if (!EmitIndexOp(cx, JSOP_QNAMEPART, atomIndex, cg))
                         return JS_FALSE;
                     if (js_Emit1(cx, cg, JSOP_GETELEM) < 0)
                         return JS_FALSE;
                 } else {
-                    bool isLength = (pn2->pn_atom == cx->runtime->atomState.lengthAtom);
-                    EMIT_INDEX_OP(isLength ? JSOP_LENGTH : JSOP_GETPROP, atomIndex);
+                    EMIT_INDEX_OP(JSOP_GETPROP, atomIndex);
                 }
                 break;
               case TOK_LB:
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index ac03209aba89..eed0b96a1b4d 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4001,84 +4001,121 @@ BEGIN_CASE(JSOP_UNBRANDTHIS)
 }
 END_CASE(JSOP_UNBRANDTHIS)
 
+{
+    JSObject *obj;
+    Value *vp;
+    jsint i;
+
+BEGIN_CASE(JSOP_GETTHISPROP)
+    if (!ComputeThis(cx, regs.fp()))
+        goto error;
+    i = 0;
+    PUSH_COPY(regs.fp()->thisValue());
+    goto do_getprop_body;
+
+BEGIN_CASE(JSOP_GETARGPROP)
+{
+    i = ARGNO_LEN;
+    uint32 slot = GET_ARGNO(regs.pc);
+    JS_ASSERT(slot < regs.fp()->numFormalArgs());
+    PUSH_COPY(argv[slot]);
+    goto do_getprop_body;
+}
+
+BEGIN_CASE(JSOP_GETLOCALPROP)
+{
+    i = SLOTNO_LEN;
+    uint32 slot = GET_SLOTNO(regs.pc);
+    JS_ASSERT(slot < script->nslots);
+    PUSH_COPY(regs.fp()->slots()[slot]);
+    goto do_getprop_body;
+}
+
 BEGIN_CASE(JSOP_GETPROP)
 BEGIN_CASE(JSOP_GETXPROP)
-BEGIN_CASE(JSOP_LENGTH)
-{
-    Value rval;
-    do {
-        Value *vp = &regs.sp[-1];
+    i = 0;
 
-        if (op == JSOP_LENGTH) {
-            /* Optimize length accesses on strings, arrays, and arguments. */
-            if (vp->isString()) {
-                rval = Int32Value(vp->toString()->length());
+  do_getprop_body:
+    vp = &regs.sp[-1];
+
+  do_getprop_with_lval:
+    VALUE_TO_OBJECT(cx, vp, obj);
+
+    {
+        Value rval;
+        do {
+            /*
+             * We do not impose the method read barrier if in an imacro,
+             * assuming any property gets it does (e.g., for 'toString'
+             * from JSOP_NEW) will not be leaked to the calling script.
+             */
+            JSObject *aobj = js_GetProtoIfDenseArray(obj);
+
+            PropertyCacheEntry *entry;
+            JSObject *obj2;
+            JSAtom *atom;
+            JS_PROPERTY_CACHE(cx).test(cx, regs.pc, aobj, obj2, entry, atom);
+            if (!atom) {
+                ASSERT_VALID_PROPERTY_CACHE_HIT(i, aobj, obj2, entry);
+                if (entry->vword.isFunObj()) {
+                    rval.setObject(entry->vword.toFunObj());
+                } else if (entry->vword.isSlot()) {
+                    uint32 slot = entry->vword.toSlot();
+                    rval = obj2->nativeGetSlot(slot);
+                } else {
+                    JS_ASSERT(entry->vword.isShape());
+                    const Shape *shape = entry->vword.toShape();
+                    NATIVE_GET(cx, obj, obj2, shape,
+                               regs.fp()->hasImacropc() ? JSGET_NO_METHOD_BARRIER : JSGET_METHOD_BARRIER,
+                               &rval);
+                }
                 break;
             }
-            if (vp->isObject()) {
-                JSObject *obj = &vp->toObject();
-                if (obj->isArray()) {
-                    jsuint length = obj->getArrayLength();
-                    rval = NumberValue(length);
-                    break;
-                }
-                if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
-                    uint32 length = obj->getArgsInitialLength();
-                    JS_ASSERT(length < INT32_MAX);
-                    rval = Int32Value(int32_t(length));
-                    break;
-                }
+
+            jsid id = ATOM_TO_JSID(atom);
+            if (JS_LIKELY(!aobj->getOps()->getProperty)
+                ? !js_GetPropertyHelper(cx, obj, id,
+                                        (regs.fp()->hasImacropc() ||
+                                         regs.pc[JSOP_GETPROP_LENGTH + i] == JSOP_IFEQ)
+                                        ? JSGET_CACHE_RESULT | JSGET_NO_METHOD_BARRIER
+                                        : JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
+                                        &rval)
+                : !obj->getProperty(cx, id, &rval)) {
+                goto error;
             }
+        } while (0);
+
+        regs.sp[-1] = rval;
+        assertSameCompartment(cx, regs.sp[-1]);
+        JS_ASSERT(JSOP_GETPROP_LENGTH + i == js_CodeSpec[op].length);
+        len = JSOP_GETPROP_LENGTH + i;
+    }
+END_VARLEN_CASE
+
+BEGIN_CASE(JSOP_LENGTH)
+    vp = &regs.sp[-1];
+    if (vp->isString()) {
+        vp->setInt32(vp->toString()->length());
+    } else if (vp->isObject()) {
+        JSObject *obj = &vp->toObject();
+        if (obj->isArray()) {
+            jsuint length = obj->getArrayLength();
+            regs.sp[-1].setNumber(length);
+        } else if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
+            uint32 length = obj->getArgsInitialLength();
+            JS_ASSERT(length < INT32_MAX);
+            regs.sp[-1].setInt32(int32_t(length));
+        } else {
+            i = -2;
+            goto do_getprop_with_lval;
         }
+    } else {
+        i = -2;
+        goto do_getprop_with_lval;
+    }
+END_CASE(JSOP_LENGTH)
 
-        /*
-         * We do not impose the method read barrier if in an imacro,
-         * assuming any property gets it does (e.g., for 'toString'
-         * from JSOP_NEW) will not be leaked to the calling script.
-         */
-        JSObject *obj;
-        VALUE_TO_OBJECT(cx, vp, obj);
-        JSObject *aobj = js_GetProtoIfDenseArray(obj);
-
-        PropertyCacheEntry *entry;
-        JSObject *obj2;
-        JSAtom *atom;
-        JS_PROPERTY_CACHE(cx).test(cx, regs.pc, aobj, obj2, entry, atom);
-        if (!atom) {
-            ASSERT_VALID_PROPERTY_CACHE_HIT(0, aobj, obj2, entry);
-            if (entry->vword.isFunObj()) {
-                rval.setObject(entry->vword.toFunObj());
-            } else if (entry->vword.isSlot()) {
-                uint32 slot = entry->vword.toSlot();
-                rval = obj2->nativeGetSlot(slot);
-            } else {
-                JS_ASSERT(entry->vword.isShape());
-                const Shape *shape = entry->vword.toShape();
-                NATIVE_GET(cx, obj, obj2, shape,
-                           regs.fp()->hasImacropc() ? JSGET_NO_METHOD_BARRIER : JSGET_METHOD_BARRIER,
-                           &rval);
-            }
-            break;
-        }
-
-        jsid id = ATOM_TO_JSID(atom);
-        if (JS_LIKELY(!aobj->getOps()->getProperty)
-            ? !js_GetPropertyHelper(cx, obj, id,
-                                    (regs.fp()->hasImacropc() ||
-                                     regs.pc[JSOP_GETPROP_LENGTH] == JSOP_IFEQ)
-                                    ? JSGET_CACHE_RESULT | JSGET_NO_METHOD_BARRIER
-                                    : JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
-                                    &rval)
-            : !obj->getProperty(cx, id, &rval)) {
-             goto error;
-        }
-    } while (0);
-
-    regs.sp[-1] = rval;
-    assertSameCompartment(cx, regs.sp[-1]);
 }
-END_CASE(JSOP_GETPROP)
- 
 
 BEGIN_CASE(JSOP_CALLPROP)
 {
diff --git a/js/src/jsopcode.cpp b/js/src/jsopcode.cpp
index 69ad9f604b5c..9b1b93e17b2a 100644
--- a/js/src/jsopcode.cpp
+++ b/js/src/jsopcode.cpp
@@ -1660,11 +1660,15 @@ DecompileDestructuring(SprintStack *ss, jsbytecode *pc, jsbytecode *endpc)
             }
             break;
 
+          case JSOP_LENGTH:
+            atom = cx->runtime->atomState.lengthAtom;
+            goto do_destructure_atom;
+
           case JSOP_CALLPROP:
           case JSOP_GETPROP:
-          case JSOP_LENGTH:
-          {
             LOAD_ATOM(0);
+          do_destructure_atom:
+          {
             *OFF2STR(&ss->sprinter, head) = '{';
 #if JS_HAS_DESTRUCTURING_SHORTHAND
             nameoff = ss->sprinter.offset;
@@ -2108,6 +2112,28 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                           case JSOP_ENUMCONSTELEM:
                             op = JSOP_GETELEM;
                             break;
+                          case JSOP_GETTHISPROP:
+                            /*
+                             * NB: JSOP_GETTHISPROP can't fail due to |this|
+                             * being null or undefined at runtime (beware that
+                             * this may change for ES4). Therefore any error
+                             * resulting from this op must be due to the value
+                             * of the property accessed via |this|, so do not
+                             * rewrite op to JSOP_THIS.
+                             *
+                             * The next two cases should not change op if
+                             * js_DecompileValueGenerator was called from the
+                             * the property getter. They should rewrite only
+                             * if the base object in the arg/var/local is null
+                             * or undefined. FIXME: bug 431569.
+                             */
+                            break;
+                          case JSOP_GETARGPROP:
+                            op = JSOP_GETARG;
+                            break;
+                          case JSOP_GETLOCALPROP:
+                            op = JSOP_GETLOCAL;
+                            break;
                           case JSOP_SETXMLNAME:
                             op = JSOp(JSOP_GETELEM2);
                             break;
@@ -3816,6 +3842,11 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
                 }
                 break;
 
+              case JSOP_LENGTH:
+                fmt = dot_format;
+                rval = js_length_str;
+                goto do_getprop_lval;
+
               case JSOP_GETPROP2:
                 op = JSOP_GETPROP;
                 (void) PopOff(ss, lastop);
@@ -3824,15 +3855,50 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
               case JSOP_CALLPROP:
               case JSOP_GETPROP:
               case JSOP_GETXPROP:
-              case JSOP_LENGTH:
                 LOAD_ATOM(0);
 
+              do_getprop:
                 GET_QUOTE_AND_FMT(index_format, dot_format, rval);
+              do_getprop_lval:
                 PROPAGATE_CALLNESS();
                 lval = POP_STR();
                 todo = Sprint(&ss->sprinter, fmt, lval, rval);
                 break;
 
+              case JSOP_GETTHISPROP:
+                LOAD_ATOM(0);
+                GET_QUOTE_AND_FMT(index_format, dot_format, rval);
+                todo = Sprint(&ss->sprinter, fmt, js_this_str, rval);
+                break;
+
+              case JSOP_GETARGPROP:
+                /* Get the name of the argument or variable. */
+                i = GET_ARGNO(pc);
+
+              do_getarg_prop:
+                atom = GetArgOrVarAtom(ss->printer, i);
+                LOCAL_ASSERT(atom);
+                lval = QuoteString(&ss->sprinter, atom, 0);
+                if (!lval || !PushOff(ss, STR2OFF(&ss->sprinter, lval), op))
+                    return NULL;
+
+                /* Get the name of the property. */
+                LOAD_ATOM(ARGNO_LEN);
+                goto do_getprop;
+
+              case JSOP_GETLOCALPROP:
+                if (IsVarSlot(jp, pc, &i))
+                    goto do_getarg_prop;
+                LOCAL_ASSERT((uintN)i < ss->top);
+                lval = GetLocal(ss, i);
+                if (!lval)
+                    return NULL;
+                todo = SprintCString(&ss->sprinter, lval);
+                if (todo < 0 || !PushOff(ss, todo, op))
+                    return NULL;
+                LOAD_ATOM(2);
+                goto do_getprop;
+
               case JSOP_SETPROP:
               case JSOP_SETMETHOD:
                 LOAD_ATOM(0);
diff --git a/js/src/jsopcode.tbl b/js/src/jsopcode.tbl
index 3045ff78beac..6071482b61fd 100644
--- a/js/src/jsopcode.tbl
+++ b/js/src/jsopcode.tbl
@@ -534,79 +534,85 @@ OPDEF(JSOP_ENUMCONSTELEM, 209,"enumconstelem",NULL,   1,  3,  0,  3,  JOF_BYTE|J
  */
 OPDEF(JSOP_LEAVEBLOCKEXPR,210,"leaveblockexpr",NULL,  5, -1,  1,  3,  JOF_UINT16)
 
+/*
+ * Optimize common JSOP_{THIS,GET{ARG,LOCAL}} -> JSOP_GETPROP cliches.
+ */
+OPDEF(JSOP_GETTHISPROP,   211,"getthisprop",   NULL,  3,  0,  1, 18,  JOF_ATOM|JOF_VARPROP)
+OPDEF(JSOP_GETARGPROP,    212,"getargprop",    NULL,  5,  0,  1, 18,  JOF_SLOTATOM|JOF_VARPROP)
+OPDEF(JSOP_GETLOCALPROP,  213,"getlocalprop",  NULL,  5,  0,  1, 18,  JOF_SLOTATOM|JOF_VARPROP)
+
 /*
  * Optimize atom segments 1-3.  These must be followed by JSOP_RESETBASE0 after
  * the opcode that they prefix.
  */
-OPDEF(JSOP_INDEXBASE1,    211,"indexbase1",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
-OPDEF(JSOP_INDEXBASE2,    212,"indexbase2",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
-OPDEF(JSOP_INDEXBASE3,    213,"indexbase3",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
+OPDEF(JSOP_INDEXBASE1,    214,"indexbase1",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
+OPDEF(JSOP_INDEXBASE2,    215,"indexbase2",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
+OPDEF(JSOP_INDEXBASE3,    216,"indexbase3",    NULL,  1,  0,  0,  0,  JOF_BYTE |JOF_INDEXBASE)
 
-OPDEF(JSOP_CALLGNAME,     214, "callgname",    NULL,  3,  0,  2, 19,  JOF_ATOM|JOF_NAME|JOF_CALLOP|JOF_GNAME)
-OPDEF(JSOP_CALLLOCAL,     215, "calllocal",    NULL,  3,  0,  2, 19,  JOF_LOCAL|JOF_NAME|JOF_CALLOP)
-OPDEF(JSOP_CALLARG,       216, "callarg",      NULL,  3,  0,  2, 19,  JOF_QARG |JOF_NAME|JOF_CALLOP)
-OPDEF(JSOP_BINDGNAME,     217, "bindgname",    NULL,  3,  0,  1,  0,  JOF_ATOM|JOF_NAME|JOF_SET|JOF_GNAME)
+OPDEF(JSOP_CALLGNAME,     217, "callgname",    NULL,  3,  0,  2, 19,  JOF_ATOM|JOF_NAME|JOF_CALLOP|JOF_GNAME)
+OPDEF(JSOP_CALLLOCAL,     218, "calllocal",    NULL,  3,  0,  2, 19,  JOF_LOCAL|JOF_NAME|JOF_CALLOP)
+OPDEF(JSOP_CALLARG,       219, "callarg",      NULL,  3,  0,  2, 19,  JOF_QARG |JOF_NAME|JOF_CALLOP)
+OPDEF(JSOP_BINDGNAME,     220, "bindgname",    NULL,  3,  0,  1,  0,  JOF_ATOM|JOF_NAME|JOF_SET|JOF_GNAME)
 
 /*
  * Opcodes to hold 8-bit and 32-bit immediate integer operands.
  */
-OPDEF(JSOP_INT8,          218, "int8",         NULL,  2,  0,  1, 16,  JOF_INT8)
-OPDEF(JSOP_INT32,         219, "int32",        NULL,  5,  0,  1, 16,  JOF_INT32)
+OPDEF(JSOP_INT8,          221, "int8",         NULL,  2,  0,  1, 16,  JOF_INT8)
+OPDEF(JSOP_INT32,         222, "int32",        NULL,  5,  0,  1, 16,  JOF_INT32)
 
 /*
- * Get the value of the 'length' property from a stacked object. This has an
- * identical layout to JSOP_GETPROP, and is here to speed up the interpreter.
+ * Get the value of the 'length' property from a stacked object.
  */
-OPDEF(JSOP_LENGTH,        220, "length",       NULL,  3,  1,  1, 18,  JOF_ATOM|JOF_PROP)
+OPDEF(JSOP_LENGTH,        223, "length",       NULL,  1,  1,  1, 18,  JOF_BYTE|JOF_PROP)
 
 /*
  * Push a JSVAL_HOLE value onto the stack, representing an omitted property in
  * an array literal (e.g. property 0 in the array [, 1]).  This opcode is used
  * with the JSOP_NEWARRAY opcode.
  */
-OPDEF(JSOP_HOLE,          221, "hole",         NULL,  1,  0,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_HOLE,          224, "hole",         NULL,  1,  0,  1,  0,  JOF_BYTE)
 
 /*
  * Variants of JSOP_{DEF{,LOCAL}FUN,LAMBDA} optimized for the flat closure case.
  */
-OPDEF(JSOP_DEFFUN_FC,     222,"deffun_fc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
-OPDEF(JSOP_DEFLOCALFUN_FC,223,"deflocalfun_fc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING|JOF_TMPSLOT)
-OPDEF(JSOP_LAMBDA_FC,     224,"lambda_fc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
+OPDEF(JSOP_DEFFUN_FC,     225,"deffun_fc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
+OPDEF(JSOP_DEFLOCALFUN_FC,226,"deflocalfun_fc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING|JOF_TMPSLOT)
+OPDEF(JSOP_LAMBDA_FC,     227,"lambda_fc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
 
 /*
  * Ensure that the value on the top of the stack is an object. The one
  * argument is an error message, defined in js.msg, that takes one parameter
  * (the decompilation of the primitive value).
  */
-OPDEF(JSOP_OBJTOP,        225,"objtop",        NULL,  3,  0,  0,  0,  JOF_UINT16)
+OPDEF(JSOP_OBJTOP,        228,"objtop",        NULL,  3,  0,  0,  0,  JOF_UINT16)
 
 /* This opcode stores an index that is unique to the given loop. */
-OPDEF(JSOP_TRACE,         226, "trace",         NULL,  3,  0,  0,  0,  JOF_UINT16)
+OPDEF(JSOP_TRACE,         229, "trace",         NULL,  3,  0,  0,  0,  JOF_UINT16)
 
 /*
  * Debugger versions of the flat closure (_FC) ops.
  */
-OPDEF(JSOP_GETUPVAR_DBG,  227,"getupvar_dbg",  NULL,  3,  0,  1, 19,  JOF_UINT16|JOF_NAME)
-OPDEF(JSOP_CALLUPVAR_DBG, 228,"callupvar_dbg", NULL,  3,  0,  2, 19,  JOF_UINT16|JOF_NAME|JOF_CALLOP)
-OPDEF(JSOP_DEFFUN_DBGFC,     229,"deffun_dbgfc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
-OPDEF(JSOP_DEFLOCALFUN_DBGFC,230,"deflocalfun_dbgfc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING|JOF_TMPSLOT)
-OPDEF(JSOP_LAMBDA_DBGFC,     231,"lambda_dbgfc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
+OPDEF(JSOP_GETUPVAR_DBG,  230,"getupvar_dbg",  NULL,  3,  0,  1, 19,  JOF_UINT16|JOF_NAME)
+OPDEF(JSOP_CALLUPVAR_DBG, 231,"callupvar_dbg", NULL,  3,  0,  2, 19,  JOF_UINT16|JOF_NAME|JOF_CALLOP)
+OPDEF(JSOP_DEFFUN_DBGFC,     232,"deffun_dbgfc",     NULL,  3,  0,  0,  0,  JOF_OBJECT|JOF_DECLARING)
+OPDEF(JSOP_DEFLOCALFUN_DBGFC,233,"deflocalfun_dbgfc",NULL,  5,  0,  0,  0,  JOF_SLOTOBJECT|JOF_DECLARING|JOF_TMPSLOT)
+OPDEF(JSOP_LAMBDA_DBGFC,     234,"lambda_dbgfc",     NULL,  3,  0,  1, 19,  JOF_OBJECT)
 
 /*
  * Joined function object as method optimization support.
  */
-OPDEF(JSOP_SETMETHOD,     232,"setmethod",     NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
-OPDEF(JSOP_INITMETHOD,    233,"initmethod",    NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
-OPDEF(JSOP_UNBRAND,       234,"unbrand",       NULL,  1,  1,  1,  0,  JOF_BYTE)
-OPDEF(JSOP_UNBRANDTHIS,   235,"unbrandthis",   NULL,  1,  0,  0,  0,  JOF_BYTE)
+OPDEF(JSOP_SETMETHOD,     235,"setmethod",     NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
+OPDEF(JSOP_INITMETHOD,    236,"initmethod",    NULL,  3,  2,  1,  3,  JOF_ATOM|JOF_PROP|JOF_SET|JOF_DETECTING)
+OPDEF(JSOP_UNBRAND,       237,"unbrand",       NULL,  1,  1,  1,  0,  JOF_BYTE)
+OPDEF(JSOP_UNBRANDTHIS,   238,"unbrandthis",   NULL,  1,  0,  0,  0,  JOF_BYTE)
 
-OPDEF(JSOP_SHARPINIT,     236,"sharpinit",     NULL,  3,  0,  0,  0,  JOF_UINT16|JOF_SHARPSLOT)
+OPDEF(JSOP_SHARPINIT,     239,"sharpinit",     NULL,  3,  0,  0,  0,  JOF_UINT16|JOF_SHARPSLOT)
 
 /* Static binding for globals. */
-OPDEF(JSOP_GETGLOBAL,     237,"getglobal",     NULL,  3,  0,  1, 19,  JOF_GLOBAL|JOF_NAME)
-OPDEF(JSOP_CALLGLOBAL,    238,"callglobal",    NULL,  3,  0,  2, 19,  JOF_GLOBAL|JOF_NAME|JOF_CALLOP)
+OPDEF(JSOP_GETGLOBAL,     240,"getglobal",     NULL,  3,  0,  1, 19,  JOF_GLOBAL|JOF_NAME)
+OPDEF(JSOP_CALLGLOBAL,    241,"callglobal",    NULL,  3,  0,  2, 19,  JOF_GLOBAL|JOF_NAME|JOF_CALLOP)
 
 /* Like JSOP_FUNAPPLY but for f.call instead of f.apply. */
-OPDEF(JSOP_FUNCALL,       239,"funcall",       NULL,  3, -1,  1, 18,  JOF_UINT16|JOF_INVOKE)
+OPDEF(JSOP_FUNCALL,       242,"funcall",       NULL,  3, -1,  1, 18,  JOF_UINT16|JOF_INVOKE)
 
-OPDEF(JSOP_FORGNAME,      240,"forgname",      NULL,  3,  1,  1, 19,  JOF_ATOM|JOF_GNAME|JOF_FOR|JOF_TMPSLOT3)
+OPDEF(JSOP_FORGNAME,      243,"forgname",      NULL,  3,  1,  1, 19,  JOF_ATOM|JOF_GNAME|JOF_FOR|JOF_TMPSLOT3)
diff --git a/js/src/jsparse.cpp b/js/src/jsparse.cpp
index 86e75b5ca336..f631f3bbaed7 100644
--- a/js/src/jsparse.cpp
+++ b/js/src/jsparse.cpp
@@ -1090,8 +1090,13 @@ Compiler::compileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
             if ((cs->format & JOF_SHARPSLOT) ||
                 JOF_TYPE(cs->format) == JOF_LOCAL ||
                 (JOF_TYPE(cs->format) == JOF_SLOTATOM)) {
+                /*
+                 * JSOP_GETARGPROP also has JOF_SLOTATOM type, but it may be
+                 * emitted only for a function.
+                 */
                 JS_ASSERT_IF(!(cs->format & JOF_SHARPSLOT),
-                             JOF_TYPE(cs->format) != JOF_SLOTATOM);
+                             (JOF_TYPE(cs->format) == JOF_SLOTATOM) ==
+                             (op == JSOP_GETLOCALPROP));
                 slot = GET_SLOTNO(code);
                 if (!(cs->format & JOF_SHARPSLOT))
                     slot += cg.sharpSlots();
diff --git a/js/src/jspropertycache.cpp b/js/src/jspropertycache.cpp
index 2811ac6c94b2..6296289f36bf 100644
--- a/js/src/jspropertycache.cpp
+++ b/js/src/jspropertycache.cpp
@@ -303,6 +303,9 @@ PropertyCache::fill(JSContext *cx, JSObject *obj, uintN scopeIndex, uintN protoI
 static inline JSAtom *
 GetAtomFromBytecode(JSContext *cx, jsbytecode *pc, JSOp op, const JSCodeSpec &cs)
 {
+    if (op == JSOP_LENGTH)
+        return cx->runtime->atomState.lengthAtom;
+
     // The method JIT's implementation of instanceof contains an internal lookup
     // of the prototype property.
     if (op == JSOP_INSTANCEOF)
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index b64bd59428ca..b5d297bb746c 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -12659,7 +12659,9 @@ TraceRecorder::getPropertyById(LIns* obj_ins, Value* outp)
     JSAtom* atom;
     jsbytecode* pc = cx->regs().pc;
     const JSCodeSpec& cs = js_CodeSpec[*pc];
-    if (JOF_TYPE(cs.format) == JOF_ATOM) {
+    if (*pc == JSOP_LENGTH) {
+        atom = cx->runtime->atomState.lengthAtom;
+    } else if (JOF_TYPE(cs.format) == JOF_ATOM) {
         atom = atoms[GET_INDEX(pc)];
     } else {
         JS_ASSERT(JOF_TYPE(cs.format) == JOF_SLOTATOM);
@@ -12756,6 +12758,16 @@ TraceRecorder::getPropertyWithScriptGetter(JSObject *obj, LIns* obj_ins, const S
         set(&sp[-1], get(&sp[-3]));
         return callImacroInfallibly(callprop_imacros.scriptgetter);
 
+      case JSOP_GETTHISPROP:
+      case JSOP_GETARGPROP:
+      case JSOP_GETLOCALPROP:
+        sp += 2;
+        sp[-2] = getter;
+        set(&sp[-2], w.immpObjGC(&getter.toObject()));
+        sp[-1] = ObjectValue(*obj);
+        set(&sp[-1], obj_ins);
+        return callImacroInfallibly(getthisprop_imacros.scriptgetter);
+
       default:
         RETURN_STOP("cannot trace script getter for this opcode");
     }
@@ -16206,6 +16218,37 @@ TraceRecorder::record_JSOP_LEAVEBLOCKEXPR()
     return ARECORD_CONTINUE;
 }
 
+JS_REQUIRES_STACK AbortableRecordingStatus
+TraceRecorder::record_JSOP_GETTHISPROP()
+{
+    LIns* this_ins;
+
+    CHECK_STATUS_A(getThis(this_ins));
+
+    /*
+     * It's safe to just use cx->fp->thisValue() here because getThis() returns
+     * ARECORD_STOP or ARECORD_ERROR if thisv is not available.
+     */
+    const Value &thisv = cx->fp()->thisValue();
+    if (!thisv.isObject())
+        RETURN_STOP_A("primitive this for GETTHISPROP");
+
+    CHECK_STATUS_A(getProp(&thisv.toObject(), this_ins));
+    return ARECORD_CONTINUE;
+}
+
+JS_REQUIRES_STACK AbortableRecordingStatus
+TraceRecorder::record_JSOP_GETARGPROP()
+{
+    return getProp(argval(GET_ARGNO(cx->regs().pc)));
+}
+
+JS_REQUIRES_STACK AbortableRecordingStatus
+TraceRecorder::record_JSOP_GETLOCALPROP()
+{
+    return getProp(varval(GET_SLOTNO(cx->regs().pc)));
+}
+
 JS_REQUIRES_STACK AbortableRecordingStatus
 TraceRecorder::record_JSOP_INDEXBASE1()
 {
@@ -17037,13 +17080,22 @@ LoopProfile::profileOperation(JSContext* cx, JSOp op)
             increment(OP_ARRAY_READ);
     }
 
-    if (op == JSOP_GETPROP || op == JSOP_CALLPROP)
+    if (op == JSOP_GETPROP || op == JSOP_CALLPROP ||
+        op == JSOP_GETARGPROP || op == JSOP_GETLOCALPROP)
     {
         /* Try to see if it's a scripted getter, which is faster in the tracer. */
         Value v = UndefinedValue();
         if (op == JSOP_GETPROP || op == JSOP_CALLPROP) {
             v = cx->regs().sp[-1];
-       } else {
+        } else if (op == JSOP_GETARGPROP) {
+            uint32 slot = GET_ARGNO(pc);
+            JS_ASSERT(slot < fp->numFormalArgs());
+            v = fp->formalArg(slot);
+        } else if (op == JSOP_GETLOCALPROP) {
+            uint32 slot = GET_SLOTNO(pc);
+            JS_ASSERT(slot < script->nslots);
+            v = fp->slots()[slot];
+        } else {
             JS_NOT_REACHED("no else");
         }
 
diff --git a/js/src/methodjit/Compiler.cpp b/js/src/methodjit/Compiler.cpp
index a52edb76ed7c..f480869fb0f8 100644
--- a/js/src/methodjit/Compiler.cpp
+++ b/js/src/methodjit/Compiler.cpp
@@ -1335,12 +1335,36 @@ mjit::Compiler::generateMethod()
             jsop_eleminc(op, STRICT_VARIANT(stubs::ElemDec));
           END_CASE(JSOP_ELEMDEC)
 
+          BEGIN_CASE(JSOP_GETTHISPROP)
+            /* Push thisv onto stack. */
+            jsop_this();
+            if (!jsop_getprop(script->getAtom(fullAtomIndex(PC))))
+                return Compile_Error;
+          END_CASE(JSOP_GETTHISPROP);
+
+          BEGIN_CASE(JSOP_GETARGPROP)
+            /* Push arg onto stack. */
+            frame.pushArg(GET_SLOTNO(PC));
+            if (!jsop_getprop(script->getAtom(fullAtomIndex(&PC[ARGNO_LEN]))))
+                return Compile_Error;
+          END_CASE(JSOP_GETARGPROP)
+
+          BEGIN_CASE(JSOP_GETLOCALPROP)
+            frame.pushLocal(GET_SLOTNO(PC));
+            if (!jsop_getprop(script->getAtom(fullAtomIndex(&PC[SLOTNO_LEN]))))
+                return Compile_Error;
+          END_CASE(JSOP_GETLOCALPROP)
+
           BEGIN_CASE(JSOP_GETPROP)
-          BEGIN_CASE(JSOP_LENGTH)
             if (!jsop_getprop(script->getAtom(fullAtomIndex(PC))))
                 return Compile_Error;
           END_CASE(JSOP_GETPROP)
 
+          BEGIN_CASE(JSOP_LENGTH)
+            if (!jsop_length())
+                return Compile_Error;
+          END_CASE(JSOP_LENGTH)
+
           BEGIN_CASE(JSOP_GETELEM)
             if (!jsop_getelem(false))
                 return Compile_Error;
@@ -2935,6 +2959,39 @@ mjit::Compiler::jsop_callprop_slow(JSAtom *atom)
     return true;
 }
 
+bool
+mjit::Compiler::jsop_length()
+{
+    FrameEntry *top = frame.peek(-1);
+
+    if (top->isTypeKnown() && top->getKnownType() == JSVAL_TYPE_STRING) {
+        if (top->isConstant()) {
+            JSString *str = top->getValue().toString();
+            Value v;
+            v.setNumber(uint32(str->length()));
+            frame.pop();
+            frame.push(v);
+        } else {
+            RegisterID str = frame.ownRegForData(top);
+            masm.loadPtr(Address(str, JSString::offsetOfLengthAndFlags()), str);
+            masm.urshift32(Imm32(JSString::LENGTH_SHIFT), str);
+            frame.pop();
+            frame.pushTypedPayload(JSVAL_TYPE_INT32, str);
+        }
+        return true;
+    }
+
+#if defined JS_POLYIC
+    return jsop_getprop(cx->runtime->atomState.lengthAtom);
+#else
+    prepareStubCall(Uses(1));
+    INLINE_STUBCALL(stubs::Length);
+    frame.pop();
+    frame.pushSynced();
+    return true;
+#endif
+}
+
 #ifdef JS_MONOIC
 void
 mjit::Compiler::passMICAddress(GlobalNameICInfo &ic)
@@ -2956,7 +3013,9 @@ mjit::Compiler::jsop_getprop(JSAtom *atom, bool doTypeCheck, bool usePropCache)
     FrameEntry *top = frame.peek(-1);
 
     /* If the incoming type will never PIC, take slow path. */
-    if (top->isNotType(JSVAL_TYPE_OBJECT)) {
+    if (top->isTypeKnown() && top->getKnownType() != JSVAL_TYPE_OBJECT) {
+        JS_ASSERT_IF(atom == cx->runtime->atomState.lengthAtom,
+                     top->getKnownType() != JSVAL_TYPE_STRING);
         jsop_getprop_slow(atom, usePropCache);
         return true;
     }
diff --git a/js/src/methodjit/Compiler.h b/js/src/methodjit/Compiler.h
index d2aa01d1b314..f9a7d95b639a 100644
--- a/js/src/methodjit/Compiler.h
+++ b/js/src/methodjit/Compiler.h
@@ -368,6 +368,10 @@ class Compiler : public BaseCompiler
 
     friend class CompilerAllocPolicy;
   public:
+    // Special atom index used to indicate that the atom is 'length'. This
+    // follows interpreter usage in JSOP_LENGTH.
+    enum { LengthAtomIndex = uint32(-2) };
+
     Compiler(JSContext *cx, StackFrame *fp);
     ~Compiler();
 
@@ -451,6 +455,7 @@ class Compiler : public BaseCompiler
     void jsop_callelem_slow();
     void jsop_unbrand();
     bool jsop_getprop(JSAtom *atom, bool typeCheck = true, bool usePropCache = true);
+    bool jsop_length();
     bool jsop_setprop(JSAtom *atom, bool usePropCache = true);
     void jsop_setprop_slow(JSAtom *atom, bool usePropCache = true);
     bool jsop_callprop_slow(JSAtom *atom);
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index 72d4bcd7e2cd..4dc89e596315 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -1613,6 +1613,12 @@ class BindNameCompiler : public PICStubCompiler
     }
 };
 
+static void JS_FASTCALL
+DisabledLengthIC(VMFrame &f, ic::PICInfo *pic)
+{
+    stubs::Length(f);
+}
+
 static void JS_FASTCALL
 DisabledGetPropIC(VMFrame &f, ic::PICInfo *pic)
 {
@@ -1633,7 +1639,7 @@ ic::GetProp(VMFrame &f, ic::PICInfo *pic)
     JSAtom *atom = pic->atom;
     if (atom == f.cx->runtime->atomState.lengthAtom) {
         if (f.regs.sp[-1].isString()) {
-            GetPropCompiler cc(f, script, NULL, *pic, NULL, DisabledGetPropIC);
+            GetPropCompiler cc(f, script, NULL, *pic, NULL, DisabledLengthIC);
             LookupStatus status = cc.generateStringLengthStub();
             if (status == Lookup_Error)
                 THROW();
@@ -1644,7 +1650,7 @@ ic::GetProp(VMFrame &f, ic::PICInfo *pic)
             JSObject *obj = &f.regs.sp[-1].toObject();
             if (obj->isArray() || (obj->isArguments() && !obj->isArgsLengthOverridden()) ||
                 obj->isString()) {
-                GetPropCompiler cc(f, script, obj, *pic, NULL, DisabledGetPropIC);
+                GetPropCompiler cc(f, script, obj, *pic, NULL, DisabledLengthIC);
                 if (obj->isArray()) {
                     LookupStatus status = cc.generateArrayLengthStub();
                     if (status == Lookup_Error)
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 28d4fd0c0405..91105eba0500 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -1832,42 +1832,19 @@ stubs::DecGlobalName(VMFrame &f, JSAtom *atom)
 template void JS_FASTCALL stubs::DecGlobalName<true>(VMFrame &f, JSAtom *atom);
 template void JS_FASTCALL stubs::DecGlobalName<false>(VMFrame &f, JSAtom *atom);
 
-void JS_FASTCALL
-stubs::GetProp(VMFrame &f)
+static bool JS_FASTCALL
+InlineGetProp(VMFrame &f)
 {
     JSContext *cx = f.cx;
     FrameRegs &regs = f.regs;
 
     Value *vp = &f.regs.sp[-1];
+    JSObject *obj = ValueToObject(f.cx, vp);
+    if (!obj)
+        return false;
 
     Value rval;
     do {
-        if (JSOp(*f.regs.pc) == JSOP_LENGTH) {
-            /* Optimize length accesses on strings, arrays, and arguments. */
-            if (vp->isString()) {
-                rval = Int32Value(vp->toString()->length());
-                break;
-            }
-            if (vp->isObject()) {
-                JSObject *obj = &vp->toObject();
-                if (obj->isArray()) {
-                    jsuint length = obj->getArrayLength();
-                    rval = NumberValue(length);
-                    break;
-                }
-                if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
-                    uint32 length = obj->getArgsInitialLength();
-                    JS_ASSERT(length < INT32_MAX);
-                    rval = Int32Value(int32_t(length));
-                    break;
-                }
-            }
-        }
-
-        JSObject *obj = ValueToObject(f.cx, vp);
-        if (!obj)
-            THROW();
-
         /*
          * We do not impose the method read barrier if in an imacro,
          * assuming any property gets it does (e.g., for 'toString'
@@ -1890,7 +1867,7 @@ stubs::GetProp(VMFrame &f)
                 const Shape *shape = entry->vword.toShape();
                 NATIVE_GET(cx, obj, obj2, shape,
                         f.fp()->hasImacropc() ? JSGET_NO_METHOD_BARRIER : JSGET_METHOD_BARRIER,
-                        &rval, THROW());
+                        &rval, return false);
             }
             break;
         }
@@ -1903,11 +1880,19 @@ stubs::GetProp(VMFrame &f)
                     : JSGET_CACHE_RESULT | JSGET_METHOD_BARRIER,
                     &rval)
                 : !obj->getProperty(cx, id, &rval)) {
-            THROW();
+            return false;
         }
     } while(0);
 
     regs.sp[-1] = rval;
+    return true;
+}
+
+void JS_FASTCALL
+stubs::GetProp(VMFrame &f)
+{
+    if (!InlineGetProp(f))
+        THROW();
 }
 
 void JS_FASTCALL
@@ -2017,6 +2002,33 @@ stubs::CallProp(VMFrame &f, JSAtom *origAtom)
 #endif
 }
 
+void JS_FASTCALL
+stubs::Length(VMFrame &f)
+{
+    FrameRegs &regs = f.regs;
+    Value *vp = &regs.sp[-1];
+
+    if (vp->isString()) {
+        vp->setInt32(vp->toString()->length());
+        return;
+    } else if (vp->isObject()) {
+        JSObject *obj = &vp->toObject();
+        if (obj->isArray()) {
+            jsuint length = obj->getArrayLength();
+            regs.sp[-1].setNumber(length);
+            return;
+        } else if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
+            uint32 length = obj->getArgsInitialLength();
+            JS_ASSERT(length < INT32_MAX);
+            regs.sp[-1].setInt32(int32_t(length));
+            return;
+        }
+    }
+
+    if (!InlineGetProp(f))
+        THROW();
+}
+
 void JS_FASTCALL
 stubs::Iter(VMFrame &f, uint32 flags)
 {
diff --git a/js/src/methodjit/StubCalls.h b/js/src/methodjit/StubCalls.h
index 46aab04b4c14..989bfa7c491d 100644
--- a/js/src/methodjit/StubCalls.h
+++ b/js/src/methodjit/StubCalls.h
@@ -133,6 +133,7 @@ void JS_FASTCALL GetPropNoCache(VMFrame &f, JSAtom *atom);
 void JS_FASTCALL GetElem(VMFrame &f);
 void JS_FASTCALL CallElem(VMFrame &f);
 template<JSBool strict> void JS_FASTCALL SetElem(VMFrame &f);
+void JS_FASTCALL Length(VMFrame &f);
 void JS_FASTCALL CallName(VMFrame &f);
 void JS_FASTCALL PushImplicitThisForGlobal(VMFrame &f);
 void JS_FASTCALL GetUpvar(VMFrame &f, uint32 index);

From a5a4160fa39a6a222f4e069980b6ebf33eccea97 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 10 May 2011 09:51:53 -0700
Subject: [PATCH 297/314] Bug 653785 - Properly compute stack quota in
 bumpLimit (r=dvander)

---
 js/src/jit-test/tests/test-apply-many-args.js | 11 +++++++++++
 js/src/vm/Stack.cpp                           |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 js/src/jit-test/tests/test-apply-many-args.js

diff --git a/js/src/jit-test/tests/test-apply-many-args.js b/js/src/jit-test/tests/test-apply-many-args.js
new file mode 100644
index 000000000000..210e6a2e2eb2
--- /dev/null
+++ b/js/src/jit-test/tests/test-apply-many-args.js
@@ -0,0 +1,11 @@
+function f(x) {
+    if (x == 0)
+        return;
+    arguments[0]--;
+    f.apply(null, arguments);
+}
+
+a = [100];
+for (var i = 0; i < 2000; ++i)
+  a.push(i);
+f.apply(null, a);
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 7738a1f98793..62c33fe92c82 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -359,7 +359,8 @@ StackSpace::bumpLimit(JSContext *cx, StackFrame *fp, Value *sp,
      * script is passing a obscene number of args to 'apply' and we are just
      * trying to keep the stack limit heuristic from breaking the script.
      */
-    Value *quota = (Value *)fp + STACK_QUOTA;
+    Value *quota = Max(*limit, (Value *)fp + STACK_QUOTA);
+    JS_ASSERT(quota >= sp);
     uintN remain = quota - sp;
     uintN inc = nvals + remain;
     if (!ensureSpace(NULL, sp, inc))

From 9ed402de9a7f7ce82da5367857f7102617251778 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 10 May 2011 11:33:26 -0700
Subject: [PATCH 298/314] Fix test added by 33d8b418732b to not hit quota on
 64-bit (r=orange)

--HG--
rename : js/src/jit-test/tests/test-apply-many-args.js => js/src/jit-test/tests/basic/test-apply-many-args.js
rename : js/src/jit-test/tests/testCrossGlobalInvokeSession.js => js/src/jit-test/tests/basic/testCrossGlobalInvokeSession.js
---
 js/src/jit-test/tests/{ => basic}/test-apply-many-args.js       | 2 +-
 .../jit-test/tests/{ => basic}/testCrossGlobalInvokeSession.js  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename js/src/jit-test/tests/{ => basic}/test-apply-many-args.js (93%)
 rename js/src/jit-test/tests/{ => basic}/testCrossGlobalInvokeSession.js (100%)

diff --git a/js/src/jit-test/tests/test-apply-many-args.js b/js/src/jit-test/tests/basic/test-apply-many-args.js
similarity index 93%
rename from js/src/jit-test/tests/test-apply-many-args.js
rename to js/src/jit-test/tests/basic/test-apply-many-args.js
index 210e6a2e2eb2..7fc6cdddf5c0 100644
--- a/js/src/jit-test/tests/test-apply-many-args.js
+++ b/js/src/jit-test/tests/basic/test-apply-many-args.js
@@ -5,7 +5,7 @@ function f(x) {
     f.apply(null, arguments);
 }
 
-a = [100];
+a = [10];
 for (var i = 0; i < 2000; ++i)
   a.push(i);
 f.apply(null, a);
diff --git a/js/src/jit-test/tests/testCrossGlobalInvokeSession.js b/js/src/jit-test/tests/basic/testCrossGlobalInvokeSession.js
similarity index 100%
rename from js/src/jit-test/tests/testCrossGlobalInvokeSession.js
rename to js/src/jit-test/tests/basic/testCrossGlobalInvokeSession.js

From c21c0b704ad54f24b33ec53b7930d3ca6aed2e9f Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Thu, 5 May 2011 00:24:15 -0400
Subject: [PATCH 299/314] Bug 653888 - Clean up the Walk internal spec
 function, make the reviver delete properties from arrays if it returns
 undefined.  r=pbiggar (relanding after a first try that appears to have
 triggered a random orange without methodjit on Linux debug, that went away on
 two rebuilds)

--HG--
extra : rebase_source : 4cef6936c39d63e232363baa64d24c0d1fabc60e
---
 js/src/jsarray.cpp                            |  12 +-
 js/src/jsarray.h                              |   7 ++
 js/src/json.cpp                               | 103 ++++++++++++------
 js/src/tests/ecma_5/JSON/jstests.list         |   1 +
 .../ecma_5/JSON/parse-reviver-array-delete.js |  89 +++++++++++++++
 5 files changed, 176 insertions(+), 36 deletions(-)
 create mode 100644 js/src/tests/ecma_5/JSON/parse-reviver-array-delete.js

diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index a81533bf873a..0b0f13ecbbd9 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -873,7 +873,9 @@ js_PrototypeHasIndexedProperties(JSContext *cx, JSObject *obj)
     return JS_FALSE;
 }
 
-static JSBool
+namespace js {
+
+JSBool
 array_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
                      PropertyOp getter, StrictPropertyOp setter, uintN attrs)
 {
@@ -908,6 +910,8 @@ array_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
     return js_DefineProperty(cx, obj, id, value, getter, setter, attrs);
 }
 
+} // namespace js
+
 static JSBool
 array_getAttributes(JSContext *cx, JSObject *obj, jsid id, uintN *attrsp)
 {
@@ -924,7 +928,9 @@ array_setAttributes(JSContext *cx, JSObject *obj, jsid id, uintN *attrsp)
     return JS_FALSE;
 }
 
-static JSBool
+namespace js {
+
+JSBool
 array_deleteProperty(JSContext *cx, JSObject *obj, jsid id, Value *rval, JSBool strict)
 {
     uint32 i;
@@ -947,6 +953,8 @@ array_deleteProperty(JSContext *cx, JSObject *obj, jsid id, Value *rval, JSBool
     return JS_TRUE;
 }
 
+} // namespace js
+
 static void
 array_trace(JSTracer *trc, JSObject *obj)
 {
diff --git a/js/src/jsarray.h b/js/src/jsarray.h
index 55f5cb7b5b0d..b4a590be0c42 100644
--- a/js/src/jsarray.h
+++ b/js/src/jsarray.h
@@ -199,6 +199,13 @@ js_HasLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp);
 
 namespace js {
 
+extern JSBool
+array_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
+                     PropertyOp getter, StrictPropertyOp setter, uintN attrs);
+
+extern JSBool
+array_deleteProperty(JSContext *cx, JSObject *obj, jsid id, Value *rval, JSBool strict);
+
 /*
  * This function assumes 'length' is effectively the result of calling
  * js_GetLengthProperty on aobj.
diff --git a/js/src/json.cpp b/js/src/json.cpp
index d800e85fda10..4016905c367b 100644
--- a/js/src/json.cpp
+++ b/js/src/json.cpp
@@ -808,50 +808,81 @@ static JSBool HandleDataNumber(JSContext *cx, JSONParser *jp);
 static JSBool HandleDataKeyword(JSContext *cx, JSONParser *jp);
 static JSBool PopState(JSContext *cx, JSONParser *jp);
 
+/* ES5 15.12.2 Walk. */
 static bool
-Walk(JSContext *cx, jsid id, JSObject *holder, const Value &reviver, Value *vp)
+Walk(JSContext *cx, JSObject *holder, jsid name, const Value &reviver, Value *vp)
 {
     JS_CHECK_RECURSION(cx, return false);
 
-    if (!holder->getProperty(cx, id, vp))
+    /* Step 1. */
+    Value val;
+    if (!holder->getProperty(cx, name, &val))
         return false;
 
-    JSObject *obj;
+    /* Step 2. */
+    if (val.isObject()) {
+        JSObject *obj = &val.toObject();
 
-    if (vp->isObject() && !(obj = &vp->toObject())->isCallable()) {
-        AutoValueRooter propValue(cx);
-
-        if(obj->isArray()) {
-            jsuint length = 0;
-            if (!js_GetLengthProperty(cx, obj, &length))
-                return false;
+        if (obj->isArray()) {
+            /* Step 2a(ii). */
+            jsuint length = obj->getArrayLength();
 
+            /* Step 2a(i), 2a(iii-iv). */
             for (jsuint i = 0; i < length; i++) {
-                jsid index;
-                if (!IndexToId(cx, i, &index))
+                jsid id;
+                if (!IndexToId(cx, i, &id))
                     return false;
 
-                if (!Walk(cx, index, obj, reviver, propValue.addr()))
+                /* Step 2a(iii)(1). */
+                Value newElement;
+                if (!Walk(cx, obj, id, reviver, &newElement))
                     return false;
 
-                if (!obj->defineProperty(cx, index, propValue.value(), NULL, NULL, JSPROP_ENUMERATE))
-                    return false;
+                /*
+                 * Arrays which begin empty and whose properties are always
+                 * incrementally appended are always dense, no matter their
+                 * length, under current dense/slow array heuristics.
+                 * Also, deleting a property from a dense array which is not
+                 * currently being enumerated never makes it slow.  This array
+                 * is never exposed until the reviver sees it below, so it must
+                 * be dense and isn't currently being enumerated.  Therefore
+                 * property definition and deletion will always succeed,
+                 * and we need not check for failure.
+                 */
+                if (newElement.isUndefined()) {
+                    /* Step 2a(iii)(2). */
+                    JS_ALWAYS_TRUE(array_deleteProperty(cx, obj, id, &newElement, false));
+                } else {
+                    /* Step 2a(iii)(3). */
+                    JS_ALWAYS_TRUE(array_defineProperty(cx, obj, id, &newElement, PropertyStub,
+                                                        StrictPropertyStub, JSPROP_ENUMERATE));
+                }
             }
         } else {
-            AutoIdVector props(cx);
-            if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props))
+            /* Step 2b(i). */
+            AutoIdVector keys(cx);
+            if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &keys))
                 return false;
 
-            for (size_t i = 0, len = props.length(); i < len; i++) {
-                jsid idName = props[i];
-                if (!Walk(cx, idName, obj, reviver, propValue.addr()))
+            /* Step 2b(ii). */
+            for (size_t i = 0, len = keys.length(); i < len; i++) {
+                /* Step 2b(ii)(1). */
+                Value newElement;
+                jsid id = keys[i];
+                if (!Walk(cx, obj, id, reviver, &newElement))
                     return false;
-                if (propValue.value().isUndefined()) {
-                    if (!js_DeleteProperty(cx, obj, idName, propValue.addr(), false))
+
+                if (newElement.isUndefined()) {
+                    /* Step 2b(ii)(2). */
+                    if (!js_DeleteProperty(cx, obj, id, &newElement, false))
                         return false;
                 } else {
-                    if (!obj->defineProperty(cx, idName, propValue.value(), NULL, NULL,
-                                             JSPROP_ENUMERATE)) {
+                    /* Step 2b(ii)(3). */
+                    JS_ASSERT(obj->isNative());
+                    if (!js_DefineNativeProperty(cx, obj, id, newElement, PropertyStub,
+                                                 StrictPropertyStub, JSPROP_ENUMERATE, 0, 0,
+                                                 NULL))
+                    {
                         return false;
                     }
                 }
@@ -859,20 +890,24 @@ Walk(JSContext *cx, jsid id, JSObject *holder, const Value &reviver, Value *vp)
         }
     }
 
-    // return reviver.call(holder, key, value);
-    const Value &value = *vp;
-    JSString *key = js_ValueToString(cx, IdToValue(id));
+    /* Step 3. */
+    JSString *key = IdToString(cx, name);
     if (!key)
         return false;
 
-    Value vec[2] = { StringValue(key), value };
-    Value reviverResult;
-    if (!JS_CallFunctionValue(cx, holder, Jsvalify(reviver),
-                              2, Jsvalify(vec), Jsvalify(&reviverResult))) {
+    LeaveTrace(cx);
+    InvokeArgsGuard args;
+    if (!cx->stack.pushInvokeArgs(cx, 2, &args))
         return false;
-    }
 
-    *vp = reviverResult;
+    args.calleev() = reviver;
+    args.thisv() = ObjectValue(*holder);
+    args[0] = StringValue(key);
+    args[1] = val;
+
+    if (!Invoke(cx, args))
+        return false;
+    *vp = args.rval();
     return true;
 }
 
@@ -898,7 +933,7 @@ Revive(JSContext *cx, const Value &reviver, Value *vp)
         return false;
     }
 
-    return Walk(cx, ATOM_TO_JSID(cx->runtime->atomState.emptyAtom), obj, reviver, vp);
+    return Walk(cx, obj, ATOM_TO_JSID(cx->runtime->atomState.emptyAtom), reviver, vp);
 }
 
 JSONParser *
diff --git a/js/src/tests/ecma_5/JSON/jstests.list b/js/src/tests/ecma_5/JSON/jstests.list
index 12349fc0383f..d282856aa1f4 100644
--- a/js/src/tests/ecma_5/JSON/jstests.list
+++ b/js/src/tests/ecma_5/JSON/jstests.list
@@ -6,6 +6,7 @@ script parse-arguments.js
 script parse-crockford-01.js
 script parse-primitives.js
 script parse-reviver.js
+script parse-reviver-array-delete.js
 script parse-syntax-errors-01.js
 script parse-syntax-errors-02.js
 script stringify.js
diff --git a/js/src/tests/ecma_5/JSON/parse-reviver-array-delete.js b/js/src/tests/ecma_5/JSON/parse-reviver-array-delete.js
new file mode 100644
index 000000000000..c34305878574
--- /dev/null
+++ b/js/src/tests/ecma_5/JSON/parse-reviver-array-delete.js
@@ -0,0 +1,89 @@
+// Any copyright is dedicated to the Public Domain.
+// http://creativecommons.org/licenses/publicdomain/
+
+var gTestfile = 'parse-reviver-array-delete.js';
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 999999;
+var summary = "JSON.parse with a reviver which elides array elements";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+/*
+ * The reviver deletes all properties from the to-be-returned array.  Thus
+ * stringification reveals properties on the prototype chain -- but there are
+ * none, so this result is unsurprising.
+ */
+assertEq(JSON.parse('[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]',
+                    function revive(k, v)
+                    {
+                      if (k === "")
+                        return v;
+                      return undefined;
+                    }) + "",
+         ",,,,,,,,,,,,,,,,,,,");
+
+/*
+ * Now let's try a reviver that deletes every property but a mega-huge one.
+ */
+var str = "[";
+var expected = "";
+var expected2 = "";
+for (var i = 0; i < 2048; i++)
+{
+  str += "1,";
+  if (i === 2047)
+  {
+    expected += "1";
+    expected2 += "1";
+  }
+  if (i === 3)
+    expected2 += "17";
+  expected += ",";
+  expected2 += ",";
+}
+str += "1]";
+
+assertEq(JSON.parse(str,
+                    function reviver(k, v)
+                    {
+                      if (k === "" || k === "2047")
+                        return v;
+                      return undefined;
+                    }) + "",
+         expected);
+
+
+Array.prototype[3] = 17;
+
+/* Now, with a property on the prototype chain, it'll show through. */
+assertEq(JSON.parse('[1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,7,8,9,0]',
+                    function revive(k, v)
+                    {
+                      if (k === "")
+                        return v;
+                      return undefined;
+                    }) + "",
+         ",,,17,,,,,,,,,,,,,,,,");
+
+
+/* And here too. */
+assertEq(JSON.parse(str,
+                    function reviver(k, v)
+                    {
+                      if (k === "" || k === "2047")
+                        return v;
+                      return undefined;
+                    }) + "",
+         expected2);
+
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("Tests complete");

From 46e40682f8e8f16609d545f45121243530f346fe Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Mon, 25 Apr 2011 22:40:00 -0400
Subject: [PATCH 300/314] Bug 652746 - Implement js::ArgumentsObject,
 js::NormalArgumentsObject, and js::StrictArgumentsObject.  r=njn

--HG--
extra : rebase_source : 84258ffa658ba09928ab9b86f8017fa6683f3146
---
 js/src/Makefile.in              |   1 +
 js/src/jsarray.cpp              | 108 +++++++++------
 js/src/jsfun.cpp                | 207 ++++++++++++++--------------
 js/src/jsfun.h                  |  47 -------
 js/src/jsinterp.cpp             |  39 +++---
 js/src/jsobj.h                  |  93 +------------
 js/src/jsobjinlines.h           |  91 -------------
 js/src/jsscope.h                |   5 +-
 js/src/jstracer.cpp             |  42 ++++--
 js/src/methodjit/PolyIC.cpp     |  11 +-
 js/src/methodjit/StubCalls.cpp  |  26 ++--
 js/src/tracejit/Writer.cpp      |   9 +-
 js/src/tracejit/Writer.h        |   9 +-
 js/src/vm/ArgumentsObject-inl.h | 133 ++++++++++++++++++
 js/src/vm/ArgumentsObject.h     | 234 ++++++++++++++++++++++++++++++++
 js/src/vm/Stack-inl.h           |  21 +--
 js/src/vm/Stack.h               |  12 +-
 17 files changed, 649 insertions(+), 439 deletions(-)
 create mode 100644 js/src/vm/ArgumentsObject-inl.h
 create mode 100644 js/src/vm/ArgumentsObject.h

diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 7784c95466a8..b446fa8d1f9b 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -277,6 +277,7 @@ VPATH		+= \
 EXPORTS_NAMESPACES = vm
 
 EXPORTS_vm = \
+		ArgumentsObject.h \
 		GlobalObject.h			\
 		Stack.h			\
 		StringObject.h \
diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp
index 0b0f13ecbbd9..dd0a852a6bd4 100644
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -82,6 +82,7 @@
 #include "jstypes.h"
 #include "jsstdint.h"
 #include "jsutil.h"
+
 #include "jsapi.h"
 #include "jsarray.h"
 #include "jsatom.h"
@@ -105,12 +106,15 @@
 #include "jsvector.h"
 #include "jswrapper.h"
 
+#include "vm/ArgumentsObject.h"
+
 #include "jsatominlines.h"
 #include "jscntxtinlines.h"
 #include "jsinterpinlines.h"
 #include "jsobjinlines.h"
 #include "jsstrinlines.h"
 
+#include "vm/ArgumentsObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;
@@ -217,9 +221,12 @@ js_GetLengthProperty(JSContext *cx, JSObject *obj, jsuint *lengthp)
         return true;
     }
 
-    if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
-        *lengthp = obj->getArgsInitialLength();
-        return true;
+    if (obj->isArguments()) {
+        ArgumentsObject *argsobj = obj->asArguments();
+        if (!argsobj->hasOverriddenLength()) {
+            *lengthp = argsobj->initialLength();
+            return true;
+        }
     }
 
     AutoValueRooter tvr(cx);
@@ -263,7 +270,7 @@ BigIndexToId(JSContext *cx, JSObject *obj, jsuint index, JSBool createAtom,
      */
     if (!createAtom &&
         ((clasp = obj->getClass()) == &js_SlowArrayClass ||
-         clasp == &js_ArgumentsClass ||
+         obj->isArguments() ||
          clasp == &js_ObjectClass)) {
         atom = js_GetExistingStringAtom(cx, start, JS_ARRAY_END(buf) - start);
         if (!atom) {
@@ -349,15 +356,17 @@ GetElement(JSContext *cx, JSObject *obj, jsdouble index, JSBool *hole, Value *vp
         *hole = JS_FALSE;
         return JS_TRUE;
     }
-    if (obj->isArguments() &&
-        index < obj->getArgsInitialLength() &&
-        !(*vp = obj->getArgsElement(uint32(index))).isMagic(JS_ARGS_HOLE)) {
-        *hole = JS_FALSE;
-        StackFrame *fp = (StackFrame *)obj->getPrivate();
-        if (fp != JS_ARGUMENTS_OBJECT_ON_TRACE) {
-            if (fp)
-                *vp = fp->canonicalActualArg(index);
-            return JS_TRUE;
+    if (obj->isArguments()) {
+        ArgumentsObject *argsobj = obj->asArguments();
+        if (index < argsobj->initialLength() &&
+            !(*vp = argsobj->element(uint32(index))).isMagic(JS_ARGS_HOLE)) {
+            *hole = JS_FALSE;
+            StackFrame *fp = reinterpret_cast<StackFrame *>(argsobj->getPrivate());
+            if (fp != JS_ARGUMENTS_OBJECT_ON_TRACE) {
+                if (fp)
+                    *vp = fp->canonicalActualArg(index);
+                return JS_TRUE;
+            }
         }
     }
 
@@ -390,17 +399,28 @@ namespace js {
 
 struct STATIC_SKIP_INFERENCE CopyNonHoleArgsTo
 {
-    CopyNonHoleArgsTo(JSObject *aobj, Value *dst) : aobj(aobj), dst(dst) {}
-    JSObject *aobj;
+    CopyNonHoleArgsTo(ArgumentsObject *argsobj, Value *dst) : argsobj(argsobj), dst(dst) {}
+    ArgumentsObject *argsobj;
     Value *dst;
     bool operator()(uintN argi, Value *src) {
-        if (aobj->getArgsElement(argi).isMagic(JS_ARGS_HOLE))
+        if (argsobj->element(argi).isMagic(JS_ARGS_HOLE))
             return false;
         *dst++ = *src;
         return true;
     }
 };
 
+static bool
+GetElementsSlow(JSContext *cx, JSObject *aobj, uint32 length, Value *vp)
+{
+    for (uint32 i = 0; i < length; i++) {
+        if (!aobj->getProperty(cx, INT_TO_JSID(jsint(i)), &vp[i]))
+            return false;
+    }
+
+    return true;
+}
+
 bool
 GetElements(JSContext *cx, JSObject *aobj, jsuint length, Value *vp)
 {
@@ -411,38 +431,38 @@ GetElements(JSContext *cx, JSObject *aobj, jsuint length, Value *vp)
         Value *srcend = srcbeg + length;
         for (Value *dst = vp, *src = srcbeg; src < srcend; ++dst, ++src)
             *dst = src->isMagic(JS_ARRAY_HOLE) ? UndefinedValue() : *src;
-    } else if (aobj->isArguments() && !aobj->isArgsLengthOverridden() &&
-               !js_PrototypeHasIndexedProperties(cx, aobj)) {
-        /*
-         * If the argsobj is for an active call, then the elements are the
-         * live args on the stack. Otherwise, the elements are the args that
-         * were copied into the argsobj by PutActivationObjects when the
-         * function returned. In both cases, it is necessary to fall off the
-         * fast path for deleted properties (MagicValue(JS_ARGS_HOLE) since
-         * this requires general-purpose property lookup.
-         */
-        if (StackFrame *fp = (StackFrame *) aobj->getPrivate()) {
-            JS_ASSERT(fp->numActualArgs() <= JS_ARGS_LENGTH_MAX);
-            if (!fp->forEachCanonicalActualArg(CopyNonHoleArgsTo(aobj, vp)))
-                goto found_deleted_prop;
-        } else {
-            Value *srcbeg = aobj->getArgsElements();
-            Value *srcend = srcbeg + length;
-            for (Value *dst = vp, *src = srcbeg; src < srcend; ++dst, ++src) {
-                if (src->isMagic(JS_ARGS_HOLE))
-                    goto found_deleted_prop;
-                *dst = *src;
+        return true;
+    }
+
+    if (aobj->isArguments()) {
+        ArgumentsObject *argsobj = aobj->asArguments();
+        if (!argsobj->hasOverriddenLength() && !js_PrototypeHasIndexedProperties(cx, argsobj)) {
+            /*
+             * If the argsobj is for an active call, then the elements are the
+             * live args on the stack. Otherwise, the elements are the args that
+             * were copied into the argsobj by PutActivationObjects when the
+             * function returned. In both cases, it is necessary to fall off the
+             * fast path for deleted properties (MagicValue(JS_ARGS_HOLE) since
+             * this requires general-purpose property lookup.
+             */
+            if (StackFrame *fp = reinterpret_cast<StackFrame *>(argsobj->getPrivate())) {
+                JS_ASSERT(fp->numActualArgs() <= JS_ARGS_LENGTH_MAX);
+                if (fp->forEachCanonicalActualArg(CopyNonHoleArgsTo(argsobj, vp)))
+                    return true;
+            } else {
+                Value *srcbeg = argsobj->elements();
+                Value *srcend = srcbeg + length;
+                for (Value *dst = vp, *src = srcbeg; src < srcend; ++dst, ++src) {
+                    if (src->isMagic(JS_ARGS_HOLE))
+                        return GetElementsSlow(cx, argsobj, length, vp);
+                    *dst = *src;
+                }
+                return true;
             }
         }
-    } else {
-      found_deleted_prop:
-        for (uintN i = 0; i < length; i++) {
-            if (!aobj->getProperty(cx, INT_TO_JSID(jsint(i)), &vp[i]))
-                return JS_FALSE;
-        }
     }
 
-    return true;
+    return GetElementsSlow(cx, aobj, length, vp);
 }
 
 }
diff --git a/js/src/jsfun.cpp b/js/src/jsfun.cpp
index cf3f44c517df..97945c28bece 100644
--- a/js/src/jsfun.cpp
+++ b/js/src/jsfun.cpp
@@ -90,6 +90,7 @@
 #include "jsobjinlines.h"
 #include "jsscriptinlines.h"
 
+#include "vm/ArgumentsObject-inl.h"
 #include "vm/Stack-inl.h"
 
 using namespace js;
@@ -145,10 +146,10 @@ js_GetArgsProperty(JSContext *cx, StackFrame *fp, jsid id, Value *vp)
     vp->setUndefined();
     if (JSID_IS_INT(id)) {
         uint32 arg = uint32(JSID_TO_INT(id));
-        JSObject *argsobj = fp->maybeArgsObj();
+        ArgumentsObject *argsobj = fp->maybeArgsObj();
         if (arg < fp->numActualArgs()) {
             if (argsobj) {
-                const Value &v = argsobj->getArgsElement(arg);
+                const Value &v = argsobj->element(arg);
                 if (v.isMagic(JS_ARGS_HOLE))
                     return argsobj->getProperty(cx, id, vp);
                 if (fp->functionScript()->strictModeCode) {
@@ -174,24 +175,27 @@ js_GetArgsProperty(JSContext *cx, StackFrame *fp, jsid id, Value *vp)
                 return argsobj->getProperty(cx, id, vp);
         }
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
-        JSObject *argsobj = fp->maybeArgsObj();
-        if (argsobj && argsobj->isArgsLengthOverridden())
+        ArgumentsObject *argsobj = fp->maybeArgsObj();
+        if (argsobj && argsobj->hasOverriddenLength())
             return argsobj->getProperty(cx, id, vp);
         vp->setInt32(fp->numActualArgs());
     }
     return true;
 }
 
-static JSObject *
-NewArguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee)
+js::ArgumentsObject *
+ArgumentsObject::create(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee)
 {
+    JS_ASSERT(argc <= JS_ARGS_LENGTH_MAX);
+
     JSObject *proto;
     if (!js_GetClassPrototype(cx, parent, JSProto_Object, &proto))
         return NULL;
 
-    JS_STATIC_ASSERT(JSObject::ARGS_CLASS_RESERVED_SLOTS == 2);
-    JSObject *argsobj = js_NewGCObject(cx, FINALIZE_OBJECT2);
-    if (!argsobj)
+    JS_STATIC_ASSERT(NormalArgumentsObject::RESERVED_SLOTS == 2);
+    JS_STATIC_ASSERT(StrictArgumentsObject::RESERVED_SLOTS == 2);
+    JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT2);
+    if (!obj)
         return NULL;
 
     EmptyShape *emptyArgumentsShape = EmptyShape::getEmptyArgumentsShape(cx);
@@ -206,16 +210,18 @@ NewArguments(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee)
     SetValueRangeToUndefined(data->slots, argc);
 
     /* Can't fail from here on, so initialize everything in argsobj. */
-    argsobj->init(cx, callee.getFunctionPrivate()->inStrictMode()
-                  ? &StrictArgumentsClass
-                  : &js_ArgumentsClass,
-                  proto, parent, NULL, false);
+    obj->init(cx, callee.getFunctionPrivate()->inStrictMode()
+              ? &StrictArgumentsObject::jsClass
+              : &NormalArgumentsObject::jsClass,
+              proto, parent, NULL, false);
+    obj->setMap(emptyArgumentsShape);
 
-    argsobj->setMap(emptyArgumentsShape);
+    ArgumentsObject *argsobj = obj->asArguments();
 
-    argsobj->setArgsLength(argc);
-    argsobj->setArgsData(data);
-    data->callee.setObject(callee);
+    JS_ASSERT(UINT32_MAX > (uint64(argc) << PACKED_BITS_COUNT));
+    argsobj->setInitialLength(argc);
+
+    argsobj->setCalleeAndData(callee, data);
 
     return argsobj;
 }
@@ -250,7 +256,8 @@ js_GetArgsObject(JSContext *cx, StackFrame *fp)
 
     /* Compute the arguments object's parent slot from fp's scope chain. */
     JSObject *global = fp->scopeChain().getGlobal();
-    JSObject *argsobj = NewArguments(cx, global, fp->numActualArgs(), fp->callee());
+    ArgumentsObject *argsobj =
+        ArgumentsObject::create(cx, global, fp->numActualArgs(), fp->callee());
     if (!argsobj)
         return argsobj;
 
@@ -264,7 +271,7 @@ js_GetArgsObject(JSContext *cx, StackFrame *fp)
      * retrieve up-to-date parameter values.
      */
     if (argsobj->isStrictArguments())
-        fp->forEachCanonicalActualArg(PutArg(argsobj->getArgsData()->slots));
+        fp->forEachCanonicalActualArg(PutArg(argsobj->data()->slots));
     else
         argsobj->setPrivate(fp);
 
@@ -275,10 +282,10 @@ js_GetArgsObject(JSContext *cx, StackFrame *fp)
 void
 js_PutArgsObject(StackFrame *fp)
 {
-    JSObject &argsobj = fp->argsObj();
+    ArgumentsObject &argsobj = fp->argsObj();
     if (argsobj.isNormalArguments()) {
         JS_ASSERT(argsobj.getPrivate() == fp);
-        fp->forEachCanonicalActualArg(PutArg(argsobj.getArgsData()->slots));
+        fp->forEachCanonicalActualArg(PutArg(argsobj.data()->slots));
         argsobj.setPrivate(NULL);
     } else {
         JS_ASSERT(!argsobj.getPrivate());
@@ -293,7 +300,7 @@ js_PutArgsObject(StackFrame *fp)
 JSObject * JS_FASTCALL
 js_NewArgumentsOnTrace(JSContext *cx, JSObject *parent, uint32 argc, JSObject *callee)
 {
-    JSObject *argsobj = NewArguments(cx, parent, argc, *callee);
+    ArgumentsObject *argsobj = ArgumentsObject::create(cx, parent, argc, *callee);
     if (!argsobj)
         return NULL;
 
@@ -314,9 +321,10 @@ JS_DEFINE_CALLINFO_4(extern, OBJECT, js_NewArgumentsOnTrace, CONTEXT, OBJECT, UI
 
 /* FIXME change the return type to void. */
 JSBool JS_FASTCALL
-js_PutArgumentsOnTrace(JSContext *cx, JSObject *argsobj, Value *args)
+js_PutArgumentsOnTrace(JSContext *cx, JSObject *obj, Value *argv)
 {
-    JS_ASSERT(argsobj->isNormalArguments());
+    NormalArgumentsObject *argsobj = obj->asNormalArguments();
+
     JS_ASSERT(argsobj->getPrivate() == JS_ARGUMENTS_OBJECT_ON_TRACE);
 
     /*
@@ -324,9 +332,9 @@ js_PutArgumentsOnTrace(JSContext *cx, JSObject *argsobj, Value *args)
      * the arguments, regardless of whether #actuals > #formals so there is no
      * need to worry about actual vs. formal arguments.
      */
-    Value *srcend = args + argsobj->getArgsInitialLength();
-    Value *dst = argsobj->getArgsData()->slots;
-    for (Value *src = args; src != srcend; ++src, ++dst) {
+    Value *srcend = argv + argsobj->initialLength();
+    Value *dst = argsobj->data()->slots;
+    for (Value *src = argv; src < srcend; ++src, ++dst) {
         if (!dst->isMagic(JS_ARGS_HOLE))
             *dst = *src;
     }
@@ -342,16 +350,15 @@ JS_DEFINE_CALLINFO_3(extern, BOOL, js_PutArgumentsOnTrace, CONTEXT, OBJECT, VALU
 static JSBool
 args_delProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp)
 {
-    JS_ASSERT(obj->isArguments());
-
+    ArgumentsObject *argsobj = obj->asArguments();
     if (JSID_IS_INT(id)) {
         uintN arg = uintN(JSID_TO_INT(id));
-        if (arg < obj->getArgsInitialLength())
-            obj->setArgsElement(arg, MagicValue(JS_ARGS_HOLE));
+        if (arg < argsobj->initialLength())
+            argsobj->setElement(arg, MagicValue(JS_ARGS_HOLE));
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
-        obj->setArgsLengthOverridden();
+        argsobj->markLengthOverridden();
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.calleeAtom)) {
-        obj->setArgsCallee(MagicValue(JS_ARGS_HOLE));
+        argsobj->asNormalArguments()->clearCallee();
     }
     return true;
 }
@@ -518,25 +525,26 @@ ArgGetter(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     if (!obj->isNormalArguments())
         return true;
 
+    NormalArgumentsObject *argsobj = obj->asNormalArguments();
     if (JSID_IS_INT(id)) {
         /*
          * arg can exceed the number of arguments if a script changed the
          * prototype to point to another Arguments object with a bigger argc.
          */
         uintN arg = uintN(JSID_TO_INT(id));
-        if (arg < obj->getArgsInitialLength()) {
-            JS_ASSERT(!obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE));
-            if (StackFrame *fp = (StackFrame *) obj->getPrivate())
+        if (arg < argsobj->initialLength()) {
+            JS_ASSERT(!argsobj->element(arg).isMagic(JS_ARGS_HOLE));
+            if (StackFrame *fp = reinterpret_cast<StackFrame *>(argsobj->getPrivate()))
                 *vp = fp->canonicalActualArg(arg);
             else
-                *vp = obj->getArgsElement(arg);
+                *vp = argsobj->element(arg);
         }
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
-        if (!obj->isArgsLengthOverridden())
-            vp->setInt32(obj->getArgsInitialLength());
+        if (!argsobj->hasOverriddenLength())
+            vp->setInt32(argsobj->initialLength());
     } else {
         JS_ASSERT(JSID_IS_ATOM(id, cx->runtime->atomState.calleeAtom));
-        const Value &v = obj->getArgsCallee();
+        const Value &v = argsobj->callee();
         if (!v.isMagic(JS_ARGS_HOLE)) {
             /*
              * If this function or one in it needs upvars that reach above it
@@ -572,11 +580,12 @@ ArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
     if (!obj->isNormalArguments())
         return true;
 
+    NormalArgumentsObject *argsobj = obj->asNormalArguments();
+
     if (JSID_IS_INT(id)) {
         uintN arg = uintN(JSID_TO_INT(id));
-        if (arg < obj->getArgsInitialLength()) {
-            StackFrame *fp = (StackFrame *) obj->getPrivate();
-            if (fp) {
+        if (arg < argsobj->initialLength()) {
+            if (StackFrame *fp = reinterpret_cast<StackFrame *>(argsobj->getPrivate())) {
                 JSScript *script = fp->functionScript();
                 if (script->usesArguments)
                     fp->canonicalActualArg(arg) = *vp;
@@ -597,54 +606,54 @@ ArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
      * that has a setter for this id.
      */
     AutoValueRooter tvr(cx);
-    return js_DeleteProperty(cx, obj, id, tvr.addr(), false) &&
-           js_DefineProperty(cx, obj, id, vp, NULL, NULL, JSPROP_ENUMERATE);
+    return js_DeleteProperty(cx, argsobj, id, tvr.addr(), false) &&
+           js_DefineProperty(cx, argsobj, id, vp, NULL, NULL, JSPROP_ENUMERATE);
 }
 
 static JSBool
 args_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags,
              JSObject **objp)
 {
-    JS_ASSERT(obj->isNormalArguments());
-
     *objp = NULL;
 
+    NormalArgumentsObject *argsobj = obj->asNormalArguments();
+
     uintN attrs = JSPROP_SHARED | JSPROP_SHADOWABLE;
     if (JSID_IS_INT(id)) {
         uint32 arg = uint32(JSID_TO_INT(id));
-        if (arg >= obj->getArgsInitialLength() || obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE))
+        if (arg >= argsobj->initialLength() || argsobj->element(arg).isMagic(JS_ARGS_HOLE))
             return true;
 
         attrs |= JSPROP_ENUMERATE;
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
-        if (obj->isArgsLengthOverridden())
+        if (argsobj->hasOverriddenLength())
             return true;
     } else {
         if (!JSID_IS_ATOM(id, cx->runtime->atomState.calleeAtom))
             return true;
 
-        if (obj->getArgsCallee().isMagic(JS_ARGS_HOLE))
+        if (argsobj->callee().isMagic(JS_ARGS_HOLE))
             return true;
     }
 
     Value undef = UndefinedValue();
-    if (!js_DefineProperty(cx, obj, id, &undef, ArgGetter, ArgSetter, attrs))
+    if (!js_DefineProperty(cx, argsobj, id, &undef, ArgGetter, ArgSetter, attrs))
         return JS_FALSE;
 
-    *objp = obj;
+    *objp = argsobj;
     return true;
 }
 
 static JSBool
 args_enumerate(JSContext *cx, JSObject *obj)
 {
-    JS_ASSERT(obj->isNormalArguments());
+    NormalArgumentsObject *argsobj = obj->asNormalArguments();
 
     /*
      * Trigger reflection in args_resolve using a series of js_LookupProperty
      * calls.
      */
-    int argc = int(obj->getArgsInitialLength());
+    int argc = int(argsobj->initialLength());
     for (int i = -2; i != argc; i++) {
         jsid id = (i == -2)
                   ? ATOM_TO_JSID(cx->runtime->atomState.lengthAtom)
@@ -654,7 +663,7 @@ args_enumerate(JSContext *cx, JSObject *obj)
 
         JSObject *pobj;
         JSProperty *prop;
-        if (!js_LookupProperty(cx, obj, id, &pobj, &prop))
+        if (!js_LookupProperty(cx, argsobj, id, &pobj, &prop))
             return false;
     }
     return true;
@@ -668,21 +677,23 @@ StrictArgGetter(JSContext *cx, JSObject *obj, jsid id, Value *vp)
     if (!obj->isStrictArguments())
         return true;
 
+    StrictArgumentsObject *argsobj = obj->asStrictArguments();
+
     if (JSID_IS_INT(id)) {
         /*
          * arg can exceed the number of arguments if a script changed the
          * prototype to point to another Arguments object with a bigger argc.
          */
         uintN arg = uintN(JSID_TO_INT(id));
-        if (arg < obj->getArgsInitialLength()) {
-            const Value &v = obj->getArgsElement(arg);
+        if (arg < argsobj->initialLength()) {
+            const Value &v = argsobj->element(arg);
             if (!v.isMagic(JS_ARGS_HOLE))
                 *vp = v;
         }
     } else {
         JS_ASSERT(JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom));
-        if (!obj->isArgsLengthOverridden())
-            vp->setInt32(obj->getArgsInitialLength());
+        if (!argsobj->hasOverriddenLength())
+            vp->setInt32(argsobj->initialLength());
     }
     return true;
 }
@@ -694,10 +705,12 @@ StrictArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
     if (!obj->isStrictArguments())
         return true;
 
+    StrictArgumentsObject *argsobj = obj->asStrictArguments();
+
     if (JSID_IS_INT(id)) {
         uintN arg = uintN(JSID_TO_INT(id));
-        if (arg < obj->getArgsInitialLength()) {
-            obj->setArgsElement(arg, *vp);
+        if (arg < argsobj->initialLength()) {
+            argsobj->setElement(arg, *vp);
             return true;
         }
     } else {
@@ -711,29 +724,29 @@ StrictArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
      * collect its value.
      */
     AutoValueRooter tvr(cx);
-    return js_DeleteProperty(cx, obj, id, tvr.addr(), strict) &&
-           js_SetProperty(cx, obj, id, vp, strict);
+    return js_DeleteProperty(cx, argsobj, id, tvr.addr(), strict) &&
+           js_SetProperty(cx, argsobj, id, vp, strict);
 }
 
 static JSBool
 strictargs_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp)
 {
-    JS_ASSERT(obj->isStrictArguments());
-
     *objp = NULL;
 
+    StrictArgumentsObject *argsobj = obj->asStrictArguments();
+
     uintN attrs = JSPROP_SHARED | JSPROP_SHADOWABLE;
     PropertyOp getter = StrictArgGetter;
     StrictPropertyOp setter = StrictArgSetter;
 
     if (JSID_IS_INT(id)) {
         uint32 arg = uint32(JSID_TO_INT(id));
-        if (arg >= obj->getArgsInitialLength() || obj->getArgsElement(arg).isMagic(JS_ARGS_HOLE))
+        if (arg >= argsobj->initialLength() || argsobj->element(arg).isMagic(JS_ARGS_HOLE))
             return true;
 
         attrs |= JSPROP_ENUMERATE;
     } else if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
-        if (obj->isArgsLengthOverridden())
+        if (argsobj->hasOverriddenLength())
             return true;
     } else {
         if (!JSID_IS_ATOM(id, cx->runtime->atomState.calleeAtom) &&
@@ -742,22 +755,22 @@ strictargs_resolve(JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject
         }
 
         attrs = JSPROP_PERMANENT | JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED;
-        getter = CastAsPropertyOp(obj->getThrowTypeError());
-        setter = CastAsStrictPropertyOp(obj->getThrowTypeError());
+        getter = CastAsPropertyOp(argsobj->getThrowTypeError());
+        setter = CastAsStrictPropertyOp(argsobj->getThrowTypeError());
     }
 
     Value undef = UndefinedValue();
-    if (!js_DefineProperty(cx, obj, id, &undef, getter, setter, attrs))
+    if (!js_DefineProperty(cx, argsobj, id, &undef, getter, setter, attrs))
         return false;
 
-    *objp = obj;
+    *objp = argsobj;
     return true;
 }
 
 static JSBool
 strictargs_enumerate(JSContext *cx, JSObject *obj)
 {
-    JS_ASSERT(obj->isStrictArguments());
+    StrictArgumentsObject *argsobj = obj->asStrictArguments();
 
     /*
      * Trigger reflection in strictargs_resolve using a series of
@@ -767,19 +780,19 @@ strictargs_enumerate(JSContext *cx, JSObject *obj)
     JSProperty *prop;
 
     // length
-    if (!js_LookupProperty(cx, obj, ATOM_TO_JSID(cx->runtime->atomState.lengthAtom), &pobj, &prop))
+    if (!js_LookupProperty(cx, argsobj, ATOM_TO_JSID(cx->runtime->atomState.lengthAtom), &pobj, &prop))
         return false;
 
     // callee
-    if (!js_LookupProperty(cx, obj, ATOM_TO_JSID(cx->runtime->atomState.calleeAtom), &pobj, &prop))
+    if (!js_LookupProperty(cx, argsobj, ATOM_TO_JSID(cx->runtime->atomState.calleeAtom), &pobj, &prop))
         return false;
 
     // caller
-    if (!js_LookupProperty(cx, obj, ATOM_TO_JSID(cx->runtime->atomState.callerAtom), &pobj, &prop))
+    if (!js_LookupProperty(cx, argsobj, ATOM_TO_JSID(cx->runtime->atomState.callerAtom), &pobj, &prop))
         return false;
 
-    for (uint32 i = 0, argc = obj->getArgsInitialLength(); i < argc; i++) {
-        if (!js_LookupProperty(cx, obj, INT_TO_JSID(i), &pobj, &prop))
+    for (uint32 i = 0, argc = argsobj->initialLength(); i < argc; i++) {
+        if (!js_LookupProperty(cx, argsobj, INT_TO_JSID(i), &pobj, &prop))
             return false;
     }
 
@@ -789,7 +802,7 @@ strictargs_enumerate(JSContext *cx, JSObject *obj)
 static void
 args_finalize(JSContext *cx, JSObject *obj)
 {
-    cx->free_((void *) obj->getArgsData());
+    cx->free_(reinterpret_cast<void *>(obj->asArguments()->data()));
 }
 
 /*
@@ -815,43 +828,39 @@ MaybeMarkGenerator(JSTracer *trc, JSObject *obj)
 static void
 args_trace(JSTracer *trc, JSObject *obj)
 {
-    JS_ASSERT(obj->isArguments());
-    if (obj->getPrivate() == JS_ARGUMENTS_OBJECT_ON_TRACE) {
-        JS_ASSERT(!obj->isStrictArguments());
+    ArgumentsObject *argsobj = obj->asArguments();
+    if (argsobj->getPrivate() == JS_ARGUMENTS_OBJECT_ON_TRACE) {
+        JS_ASSERT(!argsobj->isStrictArguments());
         return;
     }
 
-    ArgumentsData *data = obj->getArgsData();
+    ArgumentsData *data = argsobj->data();
     if (data->callee.isObject())
         MarkObject(trc, data->callee.toObject(), js_callee_str);
-    MarkValueRange(trc, obj->getArgsInitialLength(), data->slots, js_arguments_str);
+    MarkValueRange(trc, argsobj->initialLength(), data->slots, js_arguments_str);
 
-    MaybeMarkGenerator(trc, obj);
+    MaybeMarkGenerator(trc, argsobj);
 }
 
+namespace js {
+
 /*
- * The Arguments classes aren't initialized via js_InitClass, because arguments
- * objects have the initial value of Object.prototype as their [[Prototype]].
- * However, Object.prototype.toString.call(arguments) === "[object Arguments]"
- * per ES5 (although not ES3), so the class name is "Arguments" rather than
- * "Object".
- *
- * The JSClass functions below collaborate to lazily reflect and synchronize
- * actual argument values, argument count, and callee function object stored
- * in a StackFrame with their corresponding property values in the frame's
+ * The classes below collaborate to lazily reflect and synchronize actual
+ * argument values, argument count, and callee function object stored in a
+ * StackFrame with their corresponding property values in the frame's
  * arguments object.
  */
-Class js_ArgumentsClass = {
+Class NormalArgumentsObject::jsClass = {
     "Arguments",
     JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
-    JSCLASS_HAS_RESERVED_SLOTS(JSObject::ARGS_CLASS_RESERVED_SLOTS) |
+    JSCLASS_HAS_RESERVED_SLOTS(RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
     PropertyStub,         /* addProperty */
     args_delProperty,
     PropertyStub,         /* getProperty */
     StrictPropertyStub,   /* setProperty */
     args_enumerate,
-    (JSResolveOp) args_resolve,
+    reinterpret_cast<JSResolveOp>(args_resolve),
     ConvertStub,
     args_finalize,        /* finalize   */
     NULL,                 /* reserved0   */
@@ -863,17 +872,15 @@ Class js_ArgumentsClass = {
     args_trace
 };
 
-namespace js {
-
 /*
  * Strict mode arguments is significantly less magical than non-strict mode
  * arguments, so it is represented by a different class while sharing some
  * functionality.
  */
-Class StrictArgumentsClass = {
+Class StrictArgumentsObject::jsClass = {
     "Arguments",
     JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
-    JSCLASS_HAS_RESERVED_SLOTS(JSObject::ARGS_CLASS_RESERVED_SLOTS) |
+    JSCLASS_HAS_RESERVED_SLOTS(RESERVED_SLOTS) |
     JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
     PropertyStub,         /* addProperty */
     args_delProperty,
diff --git a/js/src/jsfun.h b/js/src/jsfun.h
index fab27b7782bc..4af2fa0a478c 100644
--- a/js/src/jsfun.h
+++ b/js/src/jsfun.h
@@ -247,53 +247,6 @@ struct JSFunction : public JSObject_Slots2
     JS_FN(name, fastcall, nargs, flags)
 #endif
 
-/*
- * NB: the Arguments classes are uninitialized internal classes that masquerade
- * (according to Object.prototype.toString.call(arguments)) as "Arguments",
- * while having Object.getPrototypeOf(arguments) === Object.prototype.
- *
- * WARNING (to alert embedders reading this private .h file): arguments objects
- * are *not* thread-safe and should not be used concurrently -- they should be
- * used by only one thread at a time, preferably by only one thread over their
- * lifetime (a JS worker that migrates from one OS thread to another but shares
- * nothing is ok).
- *
- * Yes, this is an incompatible change, which prefigures the impending move to
- * single-threaded objects and GC heaps.
- */
-extern js::Class js_ArgumentsClass;
-
-namespace js {
-
-extern Class StrictArgumentsClass;
-
-struct ArgumentsData {
-    js::Value   callee;
-    js::Value   slots[1];
-};
-
-}
-
-inline bool
-JSObject::isNormalArguments() const
-{
-    return getClass() == &js_ArgumentsClass;
-}
-
-inline bool
-JSObject::isStrictArguments() const
-{
-    return getClass() == &js::StrictArgumentsClass;
-}
-
-inline bool
-JSObject::isArguments() const
-{
-    return isNormalArguments() || isStrictArguments();
-}
-
-#define JS_ARGUMENTS_OBJECT_ON_TRACE ((void *)0xa126)
-
 extern JS_PUBLIC_DATA(js::Class) js_CallClass;
 extern JS_PUBLIC_DATA(js::Class) js_FunctionClass;
 extern JS_FRIEND_DATA(js::Class) js_DeclEnvClass;
diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index eed0b96a1b4d..f16fda7cf994 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4096,20 +4096,26 @@ BEGIN_CASE(JSOP_LENGTH)
     vp = &regs.sp[-1];
     if (vp->isString()) {
         vp->setInt32(vp->toString()->length());
-    } else if (vp->isObject()) {
-        JSObject *obj = &vp->toObject();
-        if (obj->isArray()) {
-            jsuint length = obj->getArrayLength();
-            regs.sp[-1].setNumber(length);
-        } else if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
-            uint32 length = obj->getArgsInitialLength();
-            JS_ASSERT(length < INT32_MAX);
-            regs.sp[-1].setInt32(int32_t(length));
-        } else {
-            i = -2;
-            goto do_getprop_with_lval;
-        }
     } else {
+        if (vp->isObject()) {
+            JSObject *obj = &vp->toObject();
+            if (obj->isArray()) {
+                jsuint length = obj->getArrayLength();
+                regs.sp[-1].setNumber(length);
+                DO_NEXT_OP(JSOP_LENGTH_LENGTH);
+            }
+
+            if (obj->isArguments()) {
+                ArgumentsObject *argsobj = obj->asArguments();
+                if (!argsobj->hasOverriddenLength()) {
+                    uint32 length = argsobj->initialLength();
+                    JS_ASSERT(length < INT32_MAX);
+                    regs.sp[-1].setInt32(int32_t(length));
+                    DO_NEXT_OP(JSOP_LENGTH_LENGTH);
+                }
+            }
+        }
+
         i = -2;
         goto do_getprop_with_lval;
     }
@@ -4405,11 +4411,12 @@ BEGIN_CASE(JSOP_GETELEM)
             }
         } else if (obj->isArguments()) {
             uint32 arg = uint32(i);
+            ArgumentsObject *argsobj = obj->asArguments();
 
-            if (arg < obj->getArgsInitialLength()) {
-                copyFrom = obj->addressOfArgsElement(arg);
+            if (arg < argsobj->initialLength()) {
+                copyFrom = argsobj->addressOfElement(arg);
                 if (!copyFrom->isMagic(JS_ARGS_HOLE)) {
-                    if (StackFrame *afp = (StackFrame *) obj->getPrivate())
+                    if (StackFrame *afp = reinterpret_cast<StackFrame *>(argsobj->getPrivate()))
                         copyFrom = &afp->canonicalActualArg(arg);
                     goto end_getelem;
                 }
diff --git a/js/src/jsobj.h b/js/src/jsobj.h
index 0c56922005b9..4cd0954ac968 100644
--- a/js/src/jsobj.h
+++ b/js/src/jsobj.h
@@ -261,7 +261,11 @@ namespace js {
 
 struct NativeIterator;
 class RegExp;
+
 class GlobalObject;
+class ArgumentsObject;
+class NormalArgumentsObject;
+class StrictArgumentsObject;
 class StringObject;
 
 }
@@ -794,93 +798,10 @@ struct JSObject : js::gc::Cell {
 
     JSBool makeDenseArraySlow(JSContext *cx);
 
-    /*
-     * Arguments-specific getters and setters.
-     */
-
-  private:
-    /*
-     * We represent arguments objects using js_ArgumentsClass and
-     * js::StrictArgumentsClass. The two are structured similarly, and methods
-     * valid on arguments objects of one class are also generally valid on
-     * arguments objects of the other.
-     *
-     * Arguments objects of either class store arguments length in a slot:
-     *
-     * JSSLOT_ARGS_LENGTH   - the number of actual arguments and a flag
-     *                        indicating whether arguments.length was
-     *                        overwritten. This slot is not used to represent
-     *                        arguments.length after that property has been
-     *                        assigned, even if the new value is integral: it's
-     *                        always the original length.
-     *
-     * Both arguments classes use a slot for storing arguments data:
-     *
-     * JSSLOT_ARGS_DATA     - pointer to an ArgumentsData structure
-     *
-     * ArgumentsData for normal arguments stores the value of arguments.callee,
-     * as long as that property has not been overwritten. If arguments.callee
-     * is overwritten, the corresponding value in ArgumentsData is set to
-     * MagicValue(JS_ARGS_HOLE). Strict arguments do not store this value
-     * because arguments.callee is a poison pill for strict mode arguments.
-     *
-     * The ArgumentsData structure also stores argument values. For normal
-     * arguments this occurs after the corresponding function has returned, and
-     * for strict arguments this occurs when the arguments object is created,
-     * or sometimes shortly after (but not observably so). arguments[i] is
-     * stored in ArgumentsData.slots[i], accessible via getArgsElement() and
-     * setArgsElement(). Deletion of arguments[i] overwrites that slot with
-     * MagicValue(JS_ARGS_HOLE); subsequent redefinition of arguments[i] will
-     * use a normal property to store the value, ignoring the slot.
-     *
-     * Non-strict arguments have a private:
-     *
-     * private              - the function's stack frame until the function
-     *                        returns, when it is replaced with null; also,
-     *                        JS_ARGUMENTS_OBJECT_ON_TRACE while on trace, if
-     *                        arguments was created on trace
-     *
-     * Technically strict arguments have a private, but it's always null.
-     * Conceptually it would be better to remove this oddity, but preserving it
-     * allows us to work with arguments objects of either kind more abstractly,
-     * so we keep it for now.
-     */
-    static const uint32 JSSLOT_ARGS_DATA = 1;
-
   public:
-    /* Number of extra fixed arguments object slots besides JSSLOT_PRIVATE. */
-    static const uint32 JSSLOT_ARGS_LENGTH = 0;
-    static const uint32 ARGS_CLASS_RESERVED_SLOTS = 2;
-    static const uint32 ARGS_FIRST_FREE_SLOT = ARGS_CLASS_RESERVED_SLOTS + 1;
-
-    /* Lower-order bit stolen from the length slot. */
-    static const uint32 ARGS_LENGTH_OVERRIDDEN_BIT = 0x1;
-    static const uint32 ARGS_PACKED_BITS_COUNT = 1;
-
-    /*
-     * Set the initial length of the arguments, and mark it as not overridden.
-     */
-    inline void setArgsLength(uint32 argc);
-
-    /*
-     * Return the initial length of the arguments.  This may differ from the
-     * current value of arguments.length!
-     */
-    inline uint32 getArgsInitialLength() const;
-
-    inline void setArgsLengthOverridden();
-    inline bool isArgsLengthOverridden() const;
-
-    inline js::ArgumentsData *getArgsData() const;
-    inline void setArgsData(js::ArgumentsData *data);
-
-    inline const js::Value &getArgsCallee() const;
-    inline void setArgsCallee(const js::Value &callee);
-
-    inline const js::Value &getArgsElement(uint32 i) const;
-    inline js::Value *getArgsElements() const;
-    inline js::Value *addressOfArgsElement(uint32 i);
-    inline void setArgsElement(uint32 i, const js::Value &v);
+    inline js::ArgumentsObject *asArguments();
+    inline js::NormalArgumentsObject *asNormalArguments();
+    inline js::StrictArgumentsObject *asStrictArguments();
 
   private:
     /*
diff --git a/js/src/jsobjinlines.h b/js/src/jsobjinlines.h
index d25527e6171e..de9931d3d899 100644
--- a/js/src/jsobjinlines.h
+++ b/js/src/jsobjinlines.h
@@ -409,97 +409,6 @@ JSObject::shrinkDenseArrayElements(JSContext *cx, uintN cap)
     shrinkSlots(cx, cap);
 }
 
-inline void
-JSObject::setArgsLength(uint32 argc)
-{
-    JS_ASSERT(isArguments());
-    JS_ASSERT(argc <= JS_ARGS_LENGTH_MAX);
-    JS_ASSERT(UINT32_MAX > (uint64(argc) << ARGS_PACKED_BITS_COUNT));
-    getSlotRef(JSSLOT_ARGS_LENGTH).setInt32(argc << ARGS_PACKED_BITS_COUNT);
-    JS_ASSERT(!isArgsLengthOverridden());
-}
-
-inline uint32
-JSObject::getArgsInitialLength() const
-{
-    JS_ASSERT(isArguments());
-    uint32 argc = uint32(getSlot(JSSLOT_ARGS_LENGTH).toInt32()) >> ARGS_PACKED_BITS_COUNT;
-    JS_ASSERT(argc <= JS_ARGS_LENGTH_MAX);
-    return argc;
-}
-
-inline void
-JSObject::setArgsLengthOverridden()
-{
-    JS_ASSERT(isArguments());
-    getSlotRef(JSSLOT_ARGS_LENGTH).getInt32Ref() |= ARGS_LENGTH_OVERRIDDEN_BIT;
-}
-
-inline bool
-JSObject::isArgsLengthOverridden() const
-{
-    JS_ASSERT(isArguments());
-    const js::Value &v = getSlot(JSSLOT_ARGS_LENGTH);
-    return v.toInt32() & ARGS_LENGTH_OVERRIDDEN_BIT;
-}
-
-inline js::ArgumentsData *
-JSObject::getArgsData() const
-{
-    JS_ASSERT(isArguments());
-    return (js::ArgumentsData *) getSlot(JSSLOT_ARGS_DATA).toPrivate();
-}
-
-inline void
-JSObject::setArgsData(js::ArgumentsData *data)
-{
-    JS_ASSERT(isArguments());
-    getSlotRef(JSSLOT_ARGS_DATA).setPrivate(data);
-}
-
-inline const js::Value &
-JSObject::getArgsCallee() const
-{
-    return getArgsData()->callee;
-}
-
-inline void
-JSObject::setArgsCallee(const js::Value &callee)
-{
-    getArgsData()->callee = callee;
-}
-
-inline const js::Value &
-JSObject::getArgsElement(uint32 i) const
-{
-    JS_ASSERT(isArguments());
-    JS_ASSERT(i < getArgsInitialLength());
-    return getArgsData()->slots[i];
-}
-
-inline js::Value *
-JSObject::getArgsElements() const
-{
-    JS_ASSERT(isArguments());
-    return getArgsData()->slots;
-}
-
-inline js::Value *
-JSObject::addressOfArgsElement(uint32 i)
-{
-    JS_ASSERT(isArguments());
-    JS_ASSERT(i < getArgsInitialLength());
-    return &getArgsData()->slots[i];
-}
-
-inline void
-JSObject::setArgsElement(uint32 i, const js::Value &v)
-{
-    JS_ASSERT(isArguments());
-    JS_ASSERT(i < getArgsInitialLength());
-    getArgsData()->slots[i] = v;
-}
-
 inline bool
 JSObject::callIsForEval() const
 {
diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 231792bbbe42..9ae845194000 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -49,6 +49,7 @@
 #endif
 
 #include "jstypes.h"
+
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jshashtable.h"
@@ -58,6 +59,8 @@
 #include "jspubtd.h"
 #include "jspropertytree.h"
 
+#include "vm/ArgumentsObject.h"
+
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4800)
@@ -635,7 +638,7 @@ struct EmptyShape : public js::Shape
     }
 
     static EmptyShape *getEmptyArgumentsShape(JSContext *cx) {
-        return ensure(cx, &js_ArgumentsClass, &cx->compartment->emptyArgumentsShape);
+        return ensure(cx, &NormalArgumentsObject::jsClass, &cx->compartment->emptyArgumentsShape);
     }
 
     static EmptyShape *getEmptyBlockShape(JSContext *cx) {
diff --git a/js/src/jstracer.cpp b/js/src/jstracer.cpp
index 1f3b304b27cf..199f074bf442 100644
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -3158,8 +3158,7 @@ public:
         if (p == fp->addressOfArgs()) {
             if (frameobj) {
                 JS_ASSERT_IF(fp->hasArgsObj(), frameobj == &fp->argsObj());
-                fp->setArgsObj(*frameobj);
-                JS_ASSERT(frameobj->isArguments());
+                fp->setArgsObj(*frameobj->asArguments());
                 if (frameobj->isNormalArguments())
                     frameobj->setPrivate(fp);
                 else
@@ -12881,7 +12880,7 @@ JS_REQUIRES_STACK void
 TraceRecorder::guardNotHole(LIns *argsobj_ins, LIns *idx_ins)
 {
     // vp = &argsobj->slots[JSSLOT_ARGS_DATA].slots[idx]
-    LIns* argsData_ins = w.getObjPrivatizedSlot(argsobj_ins, JSObject::JSSLOT_ARGS_DATA);
+    LIns* argsData_ins = w.getObjPrivatizedSlot(argsobj_ins, ArgumentsObject::DATA_SLOT);
     LIns* slotOffset_ins = w.addp(w.nameImmw(offsetof(ArgumentsData, slots)),
                                   w.ui2p(w.muliN(idx_ins, sizeof(Value))));
     LIns* vp_ins = w.addp(argsData_ins, slotOffset_ins);
@@ -12934,17 +12933,18 @@ TraceRecorder::record_JSOP_GETELEM()
     }
 
     if (obj->isArguments()) {
+        ArgumentsObject *argsobj = obj->asArguments();
+
         // Don't even try to record if out of range or reading a deleted arg
         int32 int_idx = idx.toInt32();
-        if (int_idx < 0 || int_idx >= (int32)obj->getArgsInitialLength())
+        if (int_idx < 0 || int_idx >= (int32)argsobj->initialLength())
             RETURN_STOP_A("cannot trace arguments with out of range index");
-        if (obj->getArgsElement(int_idx).isMagic(JS_ARGS_HOLE))
+        if (argsobj->element(int_idx).isMagic(JS_ARGS_HOLE))
             RETURN_STOP_A("reading deleted args element");
 
         // Only trace reading arguments out of active, tracked frame
         unsigned depth;
-        StackFrame *afp = guardArguments(obj, obj_ins, &depth);
-        if (afp) {
+        if (StackFrame *afp = guardArguments(obj, obj_ins, &depth)) {
             Value* vp = &afp->canonicalActualArg(int_idx);
             if (idx_ins->isImmD()) {
                 JS_ASSERT(int_idx == (int32)idx_ins->immD());
@@ -13863,7 +13863,7 @@ TraceRecorder::record_JSOP_FUNAPPLY()
             StackFrame *afp = guardArguments(aobj, aobj_ins, &depth);
             if (!afp)
                 RETURN_STOP_A("can't reach arguments object's frame");
-            if (aobj->isArgsLengthOverridden())
+            if (aobj->asArguments()->hasOverriddenLength())
                 RETURN_STOP_A("can't trace arguments with overridden length");
             guardArgsLengthNotAssigned(aobj_ins);
             length = afp->numActualArgs();
@@ -15671,13 +15671,27 @@ TraceRecorder::record_JSOP_ARGSUB()
     RETURN_STOP_A("can't trace JSOP_ARGSUB hard case");
 }
 
+namespace tjit {
+
+nj::LIns *
+Writer::getArgsLength(nj::LIns *args) const
+{
+    uint32 slot = js::ArgumentsObject::INITIAL_LENGTH_SLOT;
+    nj::LIns *vaddr_ins = ldpObjSlots(args);
+    return name(lir->insLoad(nj::LIR_ldi, vaddr_ins, slot * sizeof(Value) + sPayloadOffset,
+                             ACCSET_SLOTS),
+                "argsLength");
+}
+
+} // namespace tjit
+
 JS_REQUIRES_STACK LIns*
 TraceRecorder::guardArgsLengthNotAssigned(LIns* argsobj_ins)
 {
     // The following implements JSObject::isArgsLengthOverridden on trace.
     // ARGS_LENGTH_OVERRIDDEN_BIT is set if length was overridden.
     LIns *len_ins = w.getArgsLength(argsobj_ins);
-    LIns *ovr_ins = w.andi(len_ins, w.nameImmi(JSObject::ARGS_LENGTH_OVERRIDDEN_BIT));
+    LIns *ovr_ins = w.andi(len_ins, w.nameImmi(ArgumentsObject::LENGTH_OVERRIDDEN_BIT));
     guard(true, w.eqi0(ovr_ins), MISMATCH_EXIT);
     return len_ins;
 }
@@ -15696,7 +15710,7 @@ TraceRecorder::record_JSOP_ARGCNT()
     // We also have to check that arguments.length has not been mutated
     // at record time, because if so we will generate incorrect constant
     // LIR, which will assert in tryToDemote().
-    if (fp->hasArgsObj() && fp->argsObj().isArgsLengthOverridden())
+    if (fp->hasArgsObj() && fp->argsObj().hasOverriddenLength())
         RETURN_STOP_A("can't trace JSOP_ARGCNT if arguments.length has been modified");
     LIns *a_ins = getFrameObjPtr(fp->addressOfArgs());
     if (callDepth == 0) {
@@ -16359,13 +16373,13 @@ TraceRecorder::record_JSOP_LENGTH()
 
         // We must both check at record time and guard at run time that
         // arguments.length has not been reassigned, redefined or deleted.
-        if (obj->isArgsLengthOverridden())
+        if (obj->asArguments()->hasOverriddenLength())
             RETURN_STOP_A("can't trace JSOP_ARGCNT if arguments.length has been modified");
         LIns* slot_ins = guardArgsLengthNotAssigned(obj_ins);
 
-        // slot_ins is the value from the slot; right-shift to get the length
-        // (see JSObject::getArgsInitialLength in jsfun.cpp).
-        LIns* v_ins = w.i2d(w.rshiN(slot_ins, JSObject::ARGS_PACKED_BITS_COUNT));
+        // slot_ins is the value from the slot; right-shift to get the length;
+        // see ArgumentsObject.h.
+        LIns* v_ins = w.i2d(w.rshiN(slot_ins, ArgumentsObject::PACKED_BITS_COUNT));
         set(&l, v_ins);
         return ARECORD_CONTINUE;
     }
diff --git a/js/src/methodjit/PolyIC.cpp b/js/src/methodjit/PolyIC.cpp
index 4dc89e596315..3581e64e1bd8 100644
--- a/js/src/methodjit/PolyIC.cpp
+++ b/js/src/methodjit/PolyIC.cpp
@@ -770,12 +770,12 @@ class GetPropCompiler : public PICStubCompiler
         Jump notArgs = masm.testObjClass(Assembler::NotEqual, pic.objReg, obj->getClass());
 
         masm.loadPtr(Address(pic.objReg, offsetof(JSObject, slots)), pic.objReg);
-        masm.load32(Address(pic.objReg, JSObject::JSSLOT_ARGS_LENGTH * sizeof(Value)),
+        masm.load32(Address(pic.objReg, ArgumentsObject::INITIAL_LENGTH_SLOT * sizeof(Value)),
                     pic.objReg);
         masm.move(pic.objReg, pic.shapeReg);
         Jump overridden = masm.branchTest32(Assembler::NonZero, pic.shapeReg,
-                                            Imm32(JSObject::ARGS_LENGTH_OVERRIDDEN_BIT));
-        masm.rshift32(Imm32(JSObject::ARGS_PACKED_BITS_COUNT), pic.objReg);
+                                            Imm32(ArgumentsObject::LENGTH_OVERRIDDEN_BIT));
+        masm.rshift32(Imm32(ArgumentsObject::PACKED_BITS_COUNT), pic.objReg);
         
         masm.move(ImmType(JSVAL_TYPE_INT32), pic.shapeReg);
         Jump done = masm.jump();
@@ -1648,7 +1648,8 @@ ic::GetProp(VMFrame &f, ic::PICInfo *pic)
             return;
         } else if (!f.regs.sp[-1].isPrimitive()) {
             JSObject *obj = &f.regs.sp[-1].toObject();
-            if (obj->isArray() || (obj->isArguments() && !obj->isArgsLengthOverridden()) ||
+            if (obj->isArray() ||
+                (obj->isArguments() && !obj->asArguments()->hasOverriddenLength()) ||
                 obj->isString()) {
                 GetPropCompiler cc(f, script, obj, *pic, NULL, DisabledLengthIC);
                 if (obj->isArray()) {
@@ -1660,7 +1661,7 @@ ic::GetProp(VMFrame &f, ic::PICInfo *pic)
                     LookupStatus status = cc.generateArgsLengthStub();
                     if (status == Lookup_Error)
                         THROW();
-                    f.regs.sp[-1].setInt32(int32_t(obj->getArgsInitialLength()));
+                    f.regs.sp[-1].setInt32(int32_t(obj->asArguments()->initialLength()));
                 } else if (obj->isString()) {
                     LookupStatus status = cc.generateStringObjLengthStub();
                     if (status == Lookup_Error)
diff --git a/js/src/methodjit/StubCalls.cpp b/js/src/methodjit/StubCalls.cpp
index 91105eba0500..d1d12b477812 100644
--- a/js/src/methodjit/StubCalls.cpp
+++ b/js/src/methodjit/StubCalls.cpp
@@ -447,11 +447,12 @@ stubs::GetElem(VMFrame &f)
             }
         } else if (obj->isArguments()) {
             uint32 arg = uint32(i);
+            ArgumentsObject *argsobj = obj->asArguments();
 
-            if (arg < obj->getArgsInitialLength()) {
-                copyFrom = obj->addressOfArgsElement(arg);
+            if (arg < argsobj->initialLength()) {
+                copyFrom = argsobj->addressOfElement(arg);
                 if (!copyFrom->isMagic()) {
-                    if (StackFrame *afp = (StackFrame *) obj->getPrivate())
+                    if (StackFrame *afp = (StackFrame *) argsobj->getPrivate())
                         copyFrom = &afp->canonicalActualArg(arg);
                     goto end_getelem;
                 }
@@ -2011,17 +2012,24 @@ stubs::Length(VMFrame &f)
     if (vp->isString()) {
         vp->setInt32(vp->toString()->length());
         return;
-    } else if (vp->isObject()) {
+    }
+
+    if (vp->isObject()) {
         JSObject *obj = &vp->toObject();
         if (obj->isArray()) {
             jsuint length = obj->getArrayLength();
             regs.sp[-1].setNumber(length);
             return;
-        } else if (obj->isArguments() && !obj->isArgsLengthOverridden()) {
-            uint32 length = obj->getArgsInitialLength();
-            JS_ASSERT(length < INT32_MAX);
-            regs.sp[-1].setInt32(int32_t(length));
-            return;
+        }
+
+        if (obj->isArguments()) {
+            ArgumentsObject *argsobj = obj->asArguments();
+            if (!argsobj->hasOverriddenLength()) {
+                uint32 length = argsobj->initialLength();
+                JS_ASSERT(length < INT32_MAX);
+                regs.sp[-1].setInt32(int32_t(length));
+                return;
+            }
         }
     }
 
diff --git a/js/src/tracejit/Writer.cpp b/js/src/tracejit/Writer.cpp
index c91797d95a20..0099d3009803 100644
--- a/js/src/tracejit/Writer.cpp
+++ b/js/src/tracejit/Writer.cpp
@@ -39,10 +39,13 @@
 
 #include "jsprf.h"
 #include "jstl.h"
+
 #include "jscompartment.h"
 #include "Writer.h"
 #include "nanojit.h"
 
+#include "vm/ArgumentsObject.h"
+
 namespace js {
 namespace tjit {
 
@@ -544,9 +547,9 @@ void ValidateWriter::checkAccSet(LOpcode op, LIns *base, int32_t disp, AccSet ac
         // base_oprnd1 = <const private ptr slots[JSSLOT_ARGS_DATA]>
         // base        = addp base_oprnd1, ...
         // ins         = {ld,st}X.argsdata base[...]
-        ok = (isConstPrivatePtr(base, JSObject::JSSLOT_ARGS_DATA) ||
+        ok = (isConstPrivatePtr(base, ArgumentsObject::DATA_SLOT) ||
               (base->isop(LIR_addp) &&
-               isConstPrivatePtr(base->oprnd1(), JSObject::JSSLOT_ARGS_DATA)));
+               isConstPrivatePtr(base->oprnd1(), ArgumentsObject::DATA_SLOT)));
         break;
 
       default:
@@ -565,7 +568,7 @@ void ValidateWriter::checkAccSet(LOpcode op, LIns *base, int32_t disp, AccSet ac
     }
 }
 
-}
+} // namespace nanojit
 
 #endif
 
diff --git a/js/src/tracejit/Writer.h b/js/src/tracejit/Writer.h
index d9531d025a9f..67c3c398177f 100644
--- a/js/src/tracejit/Writer.h
+++ b/js/src/tracejit/Writer.h
@@ -41,7 +41,6 @@
 #define tracejit_Writer_h___
 
 #include "jsiter.h"
-#include "jsobj.h"
 #include "jsstr.h"
 #include "jstypedarray.h"
 #include "nanojit.h"
@@ -1217,13 +1216,7 @@ class Writer
                     "strChar");
     }
 
-    nj::LIns *getArgsLength(nj::LIns *args) const {
-        uint32 slot = JSObject::JSSLOT_ARGS_LENGTH;
-        nj::LIns *vaddr_ins = ldpObjSlots(args);
-        return name(lir->insLoad(nj::LIR_ldi, vaddr_ins, slot * sizeof(Value) + sPayloadOffset,
-                                 ACCSET_SLOTS),
-                    "argsLength");
-    }
+    inline nj::LIns *getArgsLength(nj::LIns *args) const;
 };
 
 }   /* namespace tjit */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
new file mode 100644
index 000000000000..1ec8a9873100
--- /dev/null
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -0,0 +1,133 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=78:
+ *
+ * ***** 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 SpiderMonkey arguments object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * 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 ***** */
+
+#ifndef ArgumentsObject_inl_h___
+#define ArgumentsObject_inl_h___
+
+#include "ArgumentsObject.h"
+
+namespace js {
+
+inline void
+ArgumentsObject::setInitialLength(uint32 length)
+{
+    JS_ASSERT(getSlot(INITIAL_LENGTH_SLOT).isUndefined());
+    setSlot(INITIAL_LENGTH_SLOT, Int32Value(length << PACKED_BITS_COUNT));
+    JS_ASSERT((getSlot(INITIAL_LENGTH_SLOT).toInt32() >> PACKED_BITS_COUNT) == length);
+    JS_ASSERT(!hasOverriddenLength());
+}
+
+inline uint32
+ArgumentsObject::initialLength() const
+{
+    uint32 argc = uint32(getSlot(INITIAL_LENGTH_SLOT).toInt32()) >> PACKED_BITS_COUNT;
+    JS_ASSERT(argc <= JS_ARGS_LENGTH_MAX);
+    return argc;
+}
+
+inline void
+ArgumentsObject::markLengthOverridden()
+{
+    getSlotRef(INITIAL_LENGTH_SLOT).getInt32Ref() |= LENGTH_OVERRIDDEN_BIT;
+}
+
+inline bool
+ArgumentsObject::hasOverriddenLength() const
+{
+    const js::Value &v = getSlot(INITIAL_LENGTH_SLOT);
+    return v.toInt32() & LENGTH_OVERRIDDEN_BIT;
+}
+
+inline void
+ArgumentsObject::setCalleeAndData(JSObject &callee, ArgumentsData *data)
+{
+    JS_ASSERT(getSlot(DATA_SLOT).isUndefined());
+    setSlot(DATA_SLOT, PrivateValue(data));
+    data->callee.setObject(callee);
+}
+
+inline ArgumentsData *
+ArgumentsObject::data() const
+{
+    return reinterpret_cast<js::ArgumentsData *>(getSlot(DATA_SLOT).toPrivate());
+}
+
+inline const js::Value &
+ArgumentsObject::element(uint32 i) const
+{
+    JS_ASSERT(i < initialLength());
+    return data()->slots[i];
+}
+
+inline js::Value *
+ArgumentsObject::elements() const
+{
+    return data()->slots;
+}
+
+inline Value *
+ArgumentsObject::addressOfElement(uint32 i)
+{
+    JS_ASSERT(i < initialLength());
+    return &data()->slots[i];
+}
+
+inline void
+ArgumentsObject::setElement(uint32 i, const js::Value &v)
+{
+    JS_ASSERT(i < initialLength());
+    data()->slots[i] = v;
+}
+
+inline const js::Value &
+NormalArgumentsObject::callee() const
+{
+    return data()->callee;
+}
+
+inline void
+NormalArgumentsObject::clearCallee()
+{
+    data()->callee = MagicValue(JS_ARGS_HOLE);
+}
+
+} // namespace js
+
+#endif /* ArgumentsObject_inl_h___ */
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
new file mode 100644
index 000000000000..81a6142d9901
--- /dev/null
+++ b/js/src/vm/ArgumentsObject.h
@@ -0,0 +1,234 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sw=4 et tw=78:
+ *
+ * ***** 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 SpiderMonkey arguments object code.
+ *
+ * The Initial Developer of the Original Code is
+ * the Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Jeff Walden <jwalden+code@mit.edu> (original author)
+ *
+ * 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 ***** */
+
+#ifndef ArgumentsObject_h___
+#define ArgumentsObject_h___
+
+#include "jsfun.h"
+#include "jstracer.h"
+#include "Writer.h"
+
+#ifdef JS_POLYIC
+class GetPropCompiler;
+#endif
+
+#define JS_ARGUMENTS_OBJECT_ON_TRACE ((void *)0xa126)
+
+namespace js {
+
+#ifdef JS_POLYIC
+struct VMFrame;
+namespace mjit {
+namespace ic {
+struct PICInfo;
+extern void GetProp(VMFrame &f, PICInfo *pic);
+}
+}
+#endif
+
+struct EmptyShape;
+
+struct ArgumentsData
+{
+    /*
+     * arguments.callee, or MagicValue(JS_ARGS_HOLE) if arguments.callee has
+     * been modified.
+     */
+    js::Value   callee;
+
+    /*
+     * Values of the arguments for this object, or MagicValue(JS_ARGS_HOLE) if
+     * the indexed argument has been modified.
+     */
+    js::Value   slots[1];
+};
+
+class ArgumentsObject : public ::JSObject
+{
+    /*
+     * Stores the initial arguments length, plus a flag indicating whether
+     * arguments.length has been overwritten. Use initialLength() to access the
+     * initial arguments length.
+     */
+    static const uint32 INITIAL_LENGTH_SLOT = 0;
+
+    /* Stores an ArgumentsData for these arguments; access with data(). */
+    static const uint32 DATA_SLOT = 1;
+
+  protected:
+    static const uint32 RESERVED_SLOTS = 2;
+
+  private:
+    /* Lower-order bit stolen from the length slot. */
+    static const uint32 LENGTH_OVERRIDDEN_BIT = 0x1;
+    static const uint32 PACKED_BITS_COUNT = 1;
+
+    /* Needs access to LENGTH_SLOT. */
+    friend ::nanojit::LIns*
+    tjit::Writer::getArgsLength(::nanojit::LIns*) const;
+
+    /*
+     * Need access to DATA_SLOT, LENGTH_SLOT, LENGTH_OVERRIDDEN_BIT, and
+     * PACKED_BIT_COUNT.
+     */
+    friend class TraceRecorder;
+#ifdef JS_POLYIC
+    friend class ::GetPropCompiler;
+#endif
+
+    /*
+     * Needs access to DATA_SLOT -- technically just checkAccSet needs it, but
+     * that's private, and exposing turns into a mess.
+     */
+    friend class ::nanojit::ValidateWriter;
+
+    void setInitialLength(uint32 length);
+
+    void setCalleeAndData(JSObject &callee, ArgumentsData *data);
+
+  public:
+    /*
+     * Create arguments parented to parent, for the given callee function.
+     * Is parent redundant with callee->getGlobal()?
+     */
+    static ArgumentsObject *create(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee);
+
+    /*
+     * Return the initial length of the arguments.  This may differ from the
+     * current value of arguments.length!
+     */
+    inline uint32 initialLength() const;
+
+    /* True iff arguments.length has been assigned or its attributes changed. */
+    inline bool hasOverriddenLength() const;
+    inline void markLengthOverridden();
+
+    inline js::ArgumentsData *data() const;
+
+    inline const js::Value &element(uint32 i) const;
+    inline js::Value *elements() const;
+    inline js::Value *addressOfElement(uint32 i);
+    inline void setElement(uint32 i, const js::Value &v);
+};
+
+/*
+ * Non-strict arguments have a private: the function's stack frame until the
+ * function returns, when it is replaced with null.  When an arguments object
+ * is created on-trace its private is JS_ARGUMENTS_OBJECT_ON_TRACE, and when
+ * the trace exits its private is replaced with the stack frame or null, as
+ * appropriate.
+ */
+class NormalArgumentsObject : public ArgumentsObject
+{
+    static js::Class jsClass;
+
+    friend bool JSObject::isNormalArguments() const;
+    friend struct EmptyShape; // for EmptyShape::getEmptyArgumentsShape
+    friend ArgumentsObject *
+    ArgumentsObject::create(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee);
+
+  public:
+    /*
+     * Stores arguments.callee, or MagicValue(JS_ARGS_HOLE) if the callee has
+     * been cleared.
+     */
+    inline const js::Value &callee() const;
+
+    /* Clear the location storing arguments.callee's initial value. */
+    inline void clearCallee();
+};
+
+/*
+ * Technically strict arguments have a private, but it's always null.
+ * Conceptually it would be better to remove this oddity, but preserving it
+ * allows us to work with arguments objects of either kind more abstractly,
+ * so we keep it for now.
+ */
+class StrictArgumentsObject : public ArgumentsObject
+{
+    static js::Class jsClass;
+
+    friend bool JSObject::isStrictArguments() const;
+    friend ArgumentsObject *
+    ArgumentsObject::create(JSContext *cx, JSObject *parent, uint32 argc, JSObject &callee);
+};
+
+} // namespace js
+
+inline bool
+JSObject::isNormalArguments() const
+{
+    return getClass() == &js::NormalArgumentsObject::jsClass;
+}
+
+js::NormalArgumentsObject *
+JSObject::asNormalArguments()
+{
+    JS_ASSERT(isNormalArguments());
+    return reinterpret_cast<js::NormalArgumentsObject *>(this);
+}
+
+inline bool
+JSObject::isStrictArguments() const
+{
+    return getClass() == &js::StrictArgumentsObject::jsClass;
+}
+
+js::StrictArgumentsObject *
+JSObject::asStrictArguments()
+{
+    JS_ASSERT(isStrictArguments());
+    return reinterpret_cast<js::StrictArgumentsObject *>(this);
+}
+
+inline bool
+JSObject::isArguments() const
+{
+    return isNormalArguments() || isStrictArguments();
+}
+
+js::ArgumentsObject *
+JSObject::asArguments()
+{
+    JS_ASSERT(isArguments());
+    return reinterpret_cast<js::ArgumentsObject *>(this);
+}
+
+#endif /* ArgumentsObject_h___ */
diff --git a/js/src/vm/Stack-inl.h b/js/src/vm/Stack-inl.h
index 5ad22be1055b..a7ab4d0b4ec4 100644
--- a/js/src/vm/Stack-inl.h
+++ b/js/src/vm/Stack-inl.h
@@ -43,6 +43,8 @@
 
 #include "Stack.h"
 
+#include "ArgumentsObject-inl.h"
+
 namespace js {
 
 /*****************************************************************************/
@@ -494,12 +496,11 @@ StackFrame::stealFrameAndSlots(Value *vp, StackFrame *otherfp,
         }
     }
     if (hasArgsObj()) {
-        JSObject &args = argsObj();
-        JS_ASSERT(args.isArguments());
-        if (args.isNormalArguments())
-            args.setPrivate(this);
+        ArgumentsObject &argsobj = argsObj();
+        if (argsobj.isNormalArguments())
+            argsobj.setPrivate(this);
         else
-            JS_ASSERT(!args.getPrivate());
+            JS_ASSERT(!argsobj.getPrivate());
         otherfp->flags_ &= ~HAS_ARGS_OBJ;
     }
 }
@@ -580,7 +581,7 @@ StackFrame::numActualArgs() const
 {
     JS_ASSERT(hasArgs());
     if (JS_UNLIKELY(flags_ & (OVERFLOW_ARGS | UNDERFLOW_ARGS)))
-        return hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
+        return hasArgsObj() ? argsObj().initialLength() : args.nactual;
     return numFormalArgs();
 }
 
@@ -590,7 +591,7 @@ StackFrame::actualArgs() const
     JS_ASSERT(hasArgs());
     Value *argv = formalArgs();
     if (JS_UNLIKELY(flags_ & OVERFLOW_ARGS)) {
-        uintN nactual = hasArgsObj() ? argsObj().getArgsInitialLength() : args.nactual;
+        uintN nactual = hasArgsObj() ? argsObj().initialLength() : args.nactual;
         return argv - (2 + nactual);
     }
     return argv;
@@ -606,10 +607,10 @@ StackFrame::actualArgsEnd() const
 }
 
 inline void
-StackFrame::setArgsObj(JSObject &obj)
+StackFrame::setArgsObj(ArgumentsObject &obj)
 {
     JS_ASSERT_IF(hasArgsObj(), &obj == args.obj);
-    JS_ASSERT_IF(!hasArgsObj(), numActualArgs() == obj.getArgsInitialLength());
+    JS_ASSERT_IF(!hasArgsObj(), numActualArgs() == obj.initialLength());
     args.obj = &obj;
     flags_ |= HAS_ARGS_OBJ;
 }
@@ -674,7 +675,7 @@ StackFrame::markActivationObjectsAsPut()
 {
     if (flags_ & (HAS_ARGS_OBJ | HAS_CALL_OBJ)) {
         if (hasArgsObj() && !argsObj().getPrivate()) {
-            args.nactual = args.obj->getArgsInitialLength();
+            args.nactual = args.obj->initialLength();
             flags_ &= ~HAS_ARGS_OBJ;
         }
         if (hasCallObj() && !callObj().getPrivate()) {
diff --git a/js/src/vm/Stack.h b/js/src/vm/Stack.h
index b45d12793efe..84463062304e 100644
--- a/js/src/vm/Stack.h
+++ b/js/src/vm/Stack.h
@@ -58,6 +58,8 @@ class ExecuteFrameGuard;
 class DummyFrameGuard;
 class GeneratorFrameGuard;
 
+class ArgumentsObject;
+
 namespace mjit { struct JITScript; }
 namespace detail { struct OOMCheck; }
 
@@ -259,8 +261,8 @@ class StackFrame
         JSFunction      *fun;           /*   function frame, pre GetScopeChain */
     } exec;
     union {                             /* describes the arguments of a function */
-        uintN           nactual;        /*   pre GetArgumentsObject */
-        JSObject        *obj;           /*   post GetArgumentsObject */
+        uintN           nactual;        /*   before js_GetArgsObject */
+        ArgumentsObject *obj;           /*   after js_GetArgsObject */
         JSScript        *script;        /* eval has no args, but needs a script */
     } args;
     mutable JSObject    *scopeChain_;   /* current scope chain */
@@ -546,17 +548,17 @@ class StackFrame
         return !!(flags_ & HAS_ARGS_OBJ);
     }
 
-    JSObject &argsObj() const {
+    ArgumentsObject &argsObj() const {
         JS_ASSERT(hasArgsObj());
         JS_ASSERT(!isEvalFrame());
         return *args.obj;
     }
 
-    JSObject *maybeArgsObj() const {
+    ArgumentsObject *maybeArgsObj() const {
         return hasArgsObj() ? &argsObj() : NULL;
     }
 
-    inline void setArgsObj(JSObject &obj);
+    inline void setArgsObj(ArgumentsObject &obj);
 
     /*
      * This value

From 2b4ea107013c85cfe3646a24a619b56ad47426ac Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Sat, 30 Apr 2011 03:22:25 -0400
Subject: [PATCH 301/314] Bug 653789 - Don't let
 Object.prototype.toLocaleString recur itself to death.  r=luke

--HG--
extra : rebase_source : 92b8b568512a28c577e526fd25b593db071a65b7
---
 js/src/jsobj.cpp                              |  12 +--
 js/src/tests/ecma_5/Object/jstests.list       |   1 +
 js/src/tests/ecma_5/Object/toLocaleString.js  | 102 ++++++++++++++++++
 js/src/tests/ecma_5/extensions/jstests.list   |   1 +
 .../toLocaleString-infinite-recursion.js      |  31 ++++++
 5 files changed, 141 insertions(+), 6 deletions(-)
 create mode 100644 js/src/tests/ecma_5/Object/toLocaleString.js
 create mode 100644 js/src/tests/ecma_5/extensions/toLocaleString-infinite-recursion.js

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index 6e4ddfce4333..a5517a783e7b 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -892,19 +892,19 @@ obj_toString(JSContext *cx, uintN argc, Value *vp)
     return true;
 }
 
+/* ES5 15.2.4.3. */
 static JSBool
 obj_toLocaleString(JSContext *cx, uintN argc, Value *vp)
 {
+    JS_CHECK_RECURSION(cx, return false);
+
+    /* Step 1. */
     JSObject *obj = ToObject(cx, &vp[1]);
     if (!obj)
         return false;
 
-    JSString *str = js_ValueToString(cx, ObjectValue(*obj));
-    if (!str)
-        return JS_FALSE;
-
-    vp->setString(str);
-    return JS_TRUE;
+    /* Steps 2-4. */
+    return obj->callMethod(cx, ATOM_TO_JSID(cx->runtime->atomState.toStringAtom), 0, NULL, vp);
 }
 
 static JSBool
diff --git a/js/src/tests/ecma_5/Object/jstests.list b/js/src/tests/ecma_5/Object/jstests.list
index 3ffc472d50da..46edc309b046 100644
--- a/js/src/tests/ecma_5/Object/jstests.list
+++ b/js/src/tests/ecma_5/Object/jstests.list
@@ -44,3 +44,4 @@ skip-if(!xulRuntime.shell) script freeze-global-eval-const.js # uses evalcx
 script preventExtensions-idempotent.js
 script isPrototypeOf.js
 script propertyIsEnumerable.js
+script toLocaleString.js
diff --git a/js/src/tests/ecma_5/Object/toLocaleString.js b/js/src/tests/ecma_5/Object/toLocaleString.js
new file mode 100644
index 000000000000..e42c4a09e5e3
--- /dev/null
+++ b/js/src/tests/ecma_5/Object/toLocaleString.js
@@ -0,0 +1,102 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+var gTestfile = 'toLocaleString.js';
+var BUGNUMBER = 653789;
+var summary = "Object.prototype.toLocaleString";
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+function expectThrowTypeError(fun)
+{
+  try
+  {
+    var r = fun();
+    throw "didn't throw TypeError, returned " + r;
+  }
+  catch (e)
+  {
+    assertEq(e instanceof TypeError, true,
+             "didn't throw TypeError, got: " + e);
+  }
+}
+
+var toLocaleString = Object.prototype.toLocaleString;
+
+/*
+ * 1. Let O be the result of calling ToObject passing the this value as the
+ *    argument.
+ */
+expectThrowTypeError(function() { toLocaleString.call(null); });
+expectThrowTypeError(function() { toLocaleString.call(undefined); });
+expectThrowTypeError(function() { toLocaleString.apply(null); });
+expectThrowTypeError(function() { toLocaleString.apply(undefined); });
+
+
+/*
+ * 2. Let toString be the result of calling the [[Get]] internal method of O
+ *    passing "toString" as the argument.
+ */
+try
+{
+  toLocaleString.call({ get toString() { throw 17; } });
+  throw new Error("didn't throw");
+}
+catch (e)
+{
+  assertEq(e, 17);
+}
+
+
+/* 3. If IsCallable(toString) is false, throw a TypeError exception. */
+expectThrowTypeError(function() { toLocaleString.call({ toString: 12 }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: 0.3423423452352e9 }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: undefined }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: false }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: [] }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: {} }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: new String }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: new Number(7.7) }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: new Boolean(true) }); });
+expectThrowTypeError(function() { toLocaleString.call({ toString: JSON }); });
+
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: 12 }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: 0.3423423452352e9 }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: undefined }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: false }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: [] }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: {} }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: new String }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: new Number(7.7) }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: new Boolean(true) }); });
+expectThrowTypeError(function() { toLocaleString.call({ valueOf: 0, toString: JSON }); });
+
+
+/*
+ * 4. Return the result of calling the [[Call]] internal method of toString
+ *    passing O as the this value and no arguments.
+ */
+assertEq(toLocaleString.call({ get toString() { return function() { return "foo"; } } }),
+         "foo");
+
+var obj = { toString: function() { assertEq(this, obj); assertEq(arguments.length, 0); return 5; } };
+assertEq(toLocaleString.call(obj), 5);
+
+assertEq(toLocaleString.call({ toString: function() { return obj; } }), obj);
+
+assertEq(toLocaleString.call({ toString: function() { return obj; },
+                               valueOf: function() { return "abc"; } }),
+         obj);
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");
diff --git a/js/src/tests/ecma_5/extensions/jstests.list b/js/src/tests/ecma_5/extensions/jstests.list
index bcd7fa0185b4..5d8e34e9e92e 100644
--- a/js/src/tests/ecma_5/extensions/jstests.list
+++ b/js/src/tests/ecma_5/extensions/jstests.list
@@ -24,6 +24,7 @@ script regress-bug629723.js
 script strict-function-statements.js
 script strict-option-redeclared-parameter.js
 script string-literal-getter-setter-decompilation.js
+script toLocaleString-infinite-recursion.js
 script toSource-infinite-recursion.js
 script uneval-strict-functions.js
 script watch-array-length.js
diff --git a/js/src/tests/ecma_5/extensions/toLocaleString-infinite-recursion.js b/js/src/tests/ecma_5/extensions/toLocaleString-infinite-recursion.js
new file mode 100644
index 000000000000..a11433ce4677
--- /dev/null
+++ b/js/src/tests/ecma_5/extensions/toLocaleString-infinite-recursion.js
@@ -0,0 +1,31 @@
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 653789;
+var summary = 'Check for too-deep stack when calling toLocaleString';
+
+print(BUGNUMBER + ": " + summary);
+
+/**************
+ * BEGIN TEST *
+ **************/
+
+try
+{
+  "" + { toString: Object.prototype.toLocaleString };
+  throw new Error("should have thrown on over-recursion");
+}
+catch (e)
+{
+  assertEq(e instanceof InternalError, true);
+}
+
+/******************************************************************************/
+
+if (typeof reportCompare === "function")
+  reportCompare(true, true);
+
+print("All tests passed!");

From 7b12ba4cef0f05a49db1cd188b06f52ba42561e7 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 14:40:45 -0700
Subject: [PATCH 302/314] Remove js_ReparentTypedArrayToScope as it's unused. 
 No bug, r=jorendorff, rs=bent

---
 content/base/public/nsContentUtils.h | 10 ----
 content/base/src/nsContentUtils.cpp  | 83 ----------------------------
 js/src/jstypedarray.cpp              | 36 ------------
 js/src/jstypedarray.h                |  9 ---
 4 files changed, 138 deletions(-)

diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h
index 47f16e338db8..bb99d7c2aa30 100644
--- a/content/base/public/nsContentUtils.h
+++ b/content/base/public/nsContentUtils.h
@@ -1698,16 +1698,6 @@ public:
    */
   static nsresult CreateStructuredClone(JSContext* cx, jsval val, jsval* rval);
 
-  /**
-   * Reparents the given object and all subobjects to the given scope. Also
-   * fixes all the prototypes. Assumes obj is properly rooted, that obj has no
-   * getter functions that can cause side effects, and that the only types of
-   * objects nested within obj are the types that are cloneable via the
-   * CreateStructuredClone function above.
-   */
-  static nsresult ReparentClonedObjectToScope(JSContext* cx, JSObject* obj,
-                                              JSObject* scope);
-
   /**
    * Strip all \n, \r and nulls from the given string
    * @param aString the string to remove newlines from [in/out]
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp
index 6c239fb7aa27..faa2e43a2cb8 100644
--- a/content/base/src/nsContentUtils.cpp
+++ b/content/base/src/nsContentUtils.cpp
@@ -6100,89 +6100,6 @@ nsContentUtils::CreateStructuredClone(JSContext* cx,
   *rval = output;
   return NS_OK;
 }
-
-// static
-nsresult
-nsContentUtils::ReparentClonedObjectToScope(JSContext* cx,
-                                            JSObject* obj,
-                                            JSObject* scope)
-{
-  JSAutoRequest ar(cx);
-
-  scope = JS_GetGlobalForObject(cx, scope);
-
-  nsAutoTArray<ReparentObjectData, 20> objectData;
-  objectData.AppendElement(ReparentObjectData(cx, obj));
-
-  while (!objectData.IsEmpty()) {
-    ReparentObjectData& data = objectData[objectData.Length() - 1];
-
-    if (!data.ids) {
-      NS_ASSERTION(!data.index, "Shouldn't have index here");
-
-      // Typed arrays are special and don't need to be enumerated.
-      if (js_IsTypedArray(data.obj)) {
-        if (!js_ReparentTypedArrayToScope(cx, data.obj, scope)) {
-          return NS_ERROR_FAILURE;
-        }
-
-        // No need to enumerate anything here.
-        objectData.RemoveElementAt(objectData.Length() - 1);
-        continue;
-      }
-
-      JSProtoKey key = JSCLASS_CACHED_PROTO_KEY(JS_GET_CLASS(cx, data.obj));
-      if (!key) {
-        // We should never be reparenting an object that doesn't have a standard
-        // proto key.
-        return NS_ERROR_FAILURE;
-      }
-
-      // Fix the prototype and parent first.
-      JSObject* proto;
-      if (!js_GetClassPrototype(cx, scope, key, &proto) ||
-          !JS_SetPrototype(cx, data.obj, proto) ||
-          !JS_SetParent(cx, data.obj, scope)) {
-        return NS_ERROR_FAILURE;
-      }
-
-      // Primitive arrays don't need to be enumerated either but the proto and
-      // parent needed to be fixed above. Now we can just move on.
-      if (js_IsDensePrimitiveArray(data.obj)) {
-        objectData.RemoveElementAt(objectData.Length() - 1);
-        continue;
-      }
-
-      // And now enumerate the object's properties.
-      if (!(data.ids = JS_Enumerate(cx, data.obj))) {
-        return NS_ERROR_FAILURE;
-      }
-    }
-
-    // If we've gone through all the object's properties then we're done with
-    // this frame.
-    if (data.index == data.ids->length) {
-      objectData.RemoveElementAt(objectData.Length() - 1);
-      continue;
-    }
-
-    // Get the id and increment!
-    jsid id = data.ids->vector[data.index++];
-
-    jsval prop;
-    if (!JS_GetPropertyById(cx, data.obj, id, &prop)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    // Push a new frame if this property is an object.
-    if (!JSVAL_IS_PRIMITIVE(prop)) {
-      objectData.AppendElement(ReparentObjectData(cx, JSVAL_TO_OBJECT(prop)));
-    }
-  }
-
-  return NS_OK;
-}
-
 struct ClassMatchingInfo {
   nsAttrValue::AtomArray mClasses;
   nsCaseTreatment mCaseTreatment;
diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp
index 73c3350758e8..7b7c2fd61d1e 100644
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1709,39 +1709,3 @@ js_CreateTypedArrayWithBuffer(JSContext *cx, jsint atype, JSObject *bufArg,
     AutoArrayRooter tvr(cx, JS_ARRAY_LENGTH(vals), vals);
     return TypedArrayConstruct(cx, atype, argc, &vals[0]);
 }
-
-JS_FRIEND_API(JSBool)
-js_ReparentTypedArrayToScope(JSContext *cx, JSObject *obj, JSObject *scope)
-{
-    JS_ASSERT(obj);
-
-    scope = JS_GetGlobalForObject(cx, scope);
-    if (!scope)
-        return JS_FALSE;
-
-    if (!js_IsTypedArray(obj))
-        return JS_FALSE;
-
-    TypedArray *typedArray = TypedArray::fromJSObject(obj);
-
-    JSObject *buffer = typedArray->bufferJS;
-    JS_ASSERT(js_IsArrayBuffer(buffer));
-
-    JSObject *proto;
-    JSProtoKey key =
-        JSCLASS_CACHED_PROTO_KEY(&TypedArray::slowClasses[typedArray->type]);
-    if (!js_GetClassPrototype(cx, scope, key, &proto))
-        return JS_FALSE;
-
-    obj->setProto(proto);
-    obj->setParent(scope);
-
-    key = JSCLASS_CACHED_PROTO_KEY(&ArrayBuffer::jsclass);
-    if (!js_GetClassPrototype(cx, scope, key, &proto))
-        return JS_FALSE;
-
-    buffer->setProto(proto);
-    buffer->setParent(scope);
-
-    return JS_TRUE;
-}
diff --git a/js/src/jstypedarray.h b/js/src/jstypedarray.h
index 953914d09502..e0a685e056f6 100644
--- a/js/src/jstypedarray.h
+++ b/js/src/jstypedarray.h
@@ -222,15 +222,6 @@ JS_FRIEND_API(JSObject *)
 js_CreateTypedArrayWithBuffer(JSContext *cx, jsint atype, JSObject *bufArg,
                               jsint byteoffset, jsint length);
 
-/*
- * Reparent a typed array to a new scope. This should only be used to reparent
- * a typed array that does not share its underlying ArrayBuffer with another
- * typed array to avoid having a parent mismatch with the other typed array and
- * its ArrayBuffer.
- */
-JS_FRIEND_API(JSBool)
-js_ReparentTypedArrayToScope(JSContext *cx, JSObject *obj, JSObject *scope);
-
 extern int32 JS_FASTCALL
 js_TypedArray_uint8_clamp_double(const double x);
 

From 10c41f1ca88d7db3c87d10264d25ea911cc05b88 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 15:53:27 -0700
Subject: [PATCH 303/314] Followup build bustage fixes. 
 r=failtastic-tinderboxen

---
 js/src/jsscope.h                | 6 +-----
 js/src/jsscopeinlines.h         | 8 ++++++++
 js/src/vm/ArgumentsObject-inl.h | 2 +-
 js/src/vm/ArgumentsObject.h     | 6 +++++-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/src/jsscope.h b/js/src/jsscope.h
index 9ae845194000..8cf6631babc7 100644
--- a/js/src/jsscope.h
+++ b/js/src/jsscope.h
@@ -59,8 +59,6 @@
 #include "jspubtd.h"
 #include "jspropertytree.h"
 
-#include "vm/ArgumentsObject.h"
-
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4800)
@@ -637,9 +635,7 @@ struct EmptyShape : public js::Shape
         return shape;
     }
 
-    static EmptyShape *getEmptyArgumentsShape(JSContext *cx) {
-        return ensure(cx, &NormalArgumentsObject::jsClass, &cx->compartment->emptyArgumentsShape);
-    }
+    static inline EmptyShape *getEmptyArgumentsShape(JSContext *cx);
 
     static EmptyShape *getEmptyBlockShape(JSContext *cx) {
         return ensure(cx, &js_BlockClass, &cx->compartment->emptyBlockShape);
diff --git a/js/src/jsscopeinlines.h b/js/src/jsscopeinlines.h
index 5cd3915e24fa..afd6f1ecf7b0 100644
--- a/js/src/jsscopeinlines.h
+++ b/js/src/jsscopeinlines.h
@@ -49,6 +49,7 @@
 #include "jsscope.h"
 #include "jsgc.h"
 
+#include "vm/ArgumentsObject.h"
 #include "vm/StringObject.h"
 
 #include "jscntxtinlines.h"
@@ -355,6 +356,13 @@ EmptyShape::EmptyShape(JSCompartment *comp, js::Class *aclasp)
 #endif
 }
 
+/* static */ inline EmptyShape *
+EmptyShape::getEmptyArgumentsShape(JSContext *cx)
+{
+    return ensure(cx, &NormalArgumentsObject::jsClass, &cx->compartment->emptyArgumentsShape);
+}
+
+
 } /* namespace js */
 
 #endif /* jsscopeinlines_h___ */
diff --git a/js/src/vm/ArgumentsObject-inl.h b/js/src/vm/ArgumentsObject-inl.h
index 1ec8a9873100..dad1d5a9e285 100644
--- a/js/src/vm/ArgumentsObject-inl.h
+++ b/js/src/vm/ArgumentsObject-inl.h
@@ -50,7 +50,7 @@ ArgumentsObject::setInitialLength(uint32 length)
 {
     JS_ASSERT(getSlot(INITIAL_LENGTH_SLOT).isUndefined());
     setSlot(INITIAL_LENGTH_SLOT, Int32Value(length << PACKED_BITS_COUNT));
-    JS_ASSERT((getSlot(INITIAL_LENGTH_SLOT).toInt32() >> PACKED_BITS_COUNT) == length);
+    JS_ASSERT((getSlot(INITIAL_LENGTH_SLOT).toInt32() >> PACKED_BITS_COUNT) == int32(length));
     JS_ASSERT(!hasOverriddenLength());
 }
 
diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 81a6142d9901..4ff5cea1d4fd 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -43,7 +43,6 @@
 
 #include "jsfun.h"
 #include "jstracer.h"
-#include "Writer.h"
 
 #ifdef JS_POLYIC
 class GetPropCompiler;
@@ -58,6 +57,11 @@ struct VMFrame;
 namespace mjit {
 namespace ic {
 struct PICInfo;
+
+/* Aargh, Windows. */
+#ifdef GetProp
+#undef GetProp
+#endif
 extern void GetProp(VMFrame &f, PICInfo *pic);
 }
 }

From 4df118ec5e897b93027abc490eb7b25c63e8440f Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 16:07:07 -0700
Subject: [PATCH 304/314] More bustage fixing,
 r=somewhat-less-failtastic-tinderboxen

---
 js/src/vm/ArgumentsObject.h | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 4ff5cea1d4fd..d7de94d0022d 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -104,24 +104,28 @@ class ArgumentsObject : public ::JSObject
     static const uint32 LENGTH_OVERRIDDEN_BIT = 0x1;
     static const uint32 PACKED_BITS_COUNT = 1;
 
-    /* Needs access to LENGTH_SLOT. */
+#ifdef JS_TRACER
+    /* Needs access to INITIAL_LENGTH_SLOT. */
     friend ::nanojit::LIns*
     tjit::Writer::getArgsLength(::nanojit::LIns*) const;
 
-    /*
-     * Need access to DATA_SLOT, LENGTH_SLOT, LENGTH_OVERRIDDEN_BIT, and
-     * PACKED_BIT_COUNT.
-     */
-    friend class TraceRecorder;
-#ifdef JS_POLYIC
-    friend class ::GetPropCompiler;
-#endif
-
     /*
      * Needs access to DATA_SLOT -- technically just checkAccSet needs it, but
      * that's private, and exposing turns into a mess.
      */
     friend class ::nanojit::ValidateWriter;
+#endif
+
+    /*
+     * Need access to DATA_SLOT, INITIAL_LENGTH_SLOT, LENGTH_OVERRIDDEN_BIT, and
+     * PACKED_BIT_COUNT.
+     */
+#ifdef JS_TRACER
+    friend class TraceRecorder;
+#endif
+#ifdef JS_POLYIC
+    friend class ::GetPropCompiler;
+#endif
 
     void setInitialLength(uint32 length);
 

From 5b9b11f774cd2bc130b4cb6cc2ba13570c4ea080 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 16:27:17 -0700
Subject: [PATCH 305/314] When was it we were dropping support for Windows
 again?  r=hate-hate-hate

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

diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index d7de94d0022d..8b07e4b9f00d 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -62,7 +62,7 @@ struct PICInfo;
 #ifdef GetProp
 #undef GetProp
 #endif
-extern void GetProp(VMFrame &f, PICInfo *pic);
+void JS_FASTCALL GetProp(VMFrame &f, ic::PICInfo *pic);
 }
 }
 #endif

From a14b1556ac98bfd96d9bc1d4da67a9031df51135 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 17:37:05 -0700
Subject: [PATCH 306/314] Last fix, actually built js/src/ on Windows this
 time.  If this doesn't work, I'm going to be angry.  r=final-answer

---
 js/src/vm/ArgumentsObject.h | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/js/src/vm/ArgumentsObject.h b/js/src/vm/ArgumentsObject.h
index 8b07e4b9f00d..ab8e2f43f7f8 100644
--- a/js/src/vm/ArgumentsObject.h
+++ b/js/src/vm/ArgumentsObject.h
@@ -42,7 +42,6 @@
 #define ArgumentsObject_h___
 
 #include "jsfun.h"
-#include "jstracer.h"
 
 #ifdef JS_POLYIC
 class GetPropCompiler;
@@ -50,6 +49,12 @@ class GetPropCompiler;
 
 #define JS_ARGUMENTS_OBJECT_ON_TRACE ((void *)0xa126)
 
+#ifdef JS_TRACER
+namespace nanojit {
+class ValidateWriter;
+}
+#endif
+
 namespace js {
 
 #ifdef JS_POLYIC
@@ -67,6 +72,12 @@ void JS_FASTCALL GetProp(VMFrame &f, ic::PICInfo *pic);
 }
 #endif
 
+#ifdef JS_TRACER
+namespace tjit {
+class Writer;
+}
+#endif
+
 struct EmptyShape;
 
 struct ArgumentsData
@@ -105,9 +116,11 @@ class ArgumentsObject : public ::JSObject
     static const uint32 PACKED_BITS_COUNT = 1;
 
 #ifdef JS_TRACER
-    /* Needs access to INITIAL_LENGTH_SLOT. */
-    friend ::nanojit::LIns*
-    tjit::Writer::getArgsLength(::nanojit::LIns*) const;
+    /*
+     * Needs access to INITIAL_LENGTH_SLOT -- technically just getArgsLength,
+     * but nanojit's including windows.h makes that difficult.
+     */
+    friend class tjit::Writer;
 
     /*
      * Needs access to DATA_SLOT -- technically just checkAccSet needs it, but

From 25a184d5bb2d016a7715796cf0202bddf62acb64 Mon Sep 17 00:00:00 2001
From: Jeff Walden <jwalden@mit.edu>
Date: Tue, 10 May 2011 18:23:13 -0700
Subject: [PATCH 307/314] Apparently DO_NEXT_OP must be passed len, sigh.

---
 js/src/jsinterp.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/src/jsinterp.cpp b/js/src/jsinterp.cpp
index f16fda7cf994..66efd150c200 100644
--- a/js/src/jsinterp.cpp
+++ b/js/src/jsinterp.cpp
@@ -4102,7 +4102,8 @@ BEGIN_CASE(JSOP_LENGTH)
             if (obj->isArray()) {
                 jsuint length = obj->getArrayLength();
                 regs.sp[-1].setNumber(length);
-                DO_NEXT_OP(JSOP_LENGTH_LENGTH);
+                len = JSOP_LENGTH_LENGTH;
+                DO_NEXT_OP(len);
             }
 
             if (obj->isArguments()) {
@@ -4111,7 +4112,8 @@ BEGIN_CASE(JSOP_LENGTH)
                     uint32 length = argsobj->initialLength();
                     JS_ASSERT(length < INT32_MAX);
                     regs.sp[-1].setInt32(int32_t(length));
-                    DO_NEXT_OP(JSOP_LENGTH_LENGTH);
+                    len = JSOP_LENGTH_LENGTH;
+                    DO_NEXT_OP(len);
                 }
             }
         }

From cce78cc6796b8ceffe216192b6f8482e475555e4 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Tue, 10 May 2011 18:49:27 -0700
Subject: [PATCH 308/314] Back out 33d8b418732b for causing Talos dromaeo_css
 crash

---
 js/src/jit-test/tests/basic/test-apply-many-args.js | 11 -----------
 js/src/vm/Stack.cpp                                 |  3 +--
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 js/src/jit-test/tests/basic/test-apply-many-args.js

diff --git a/js/src/jit-test/tests/basic/test-apply-many-args.js b/js/src/jit-test/tests/basic/test-apply-many-args.js
deleted file mode 100644
index 7fc6cdddf5c0..000000000000
--- a/js/src/jit-test/tests/basic/test-apply-many-args.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function f(x) {
-    if (x == 0)
-        return;
-    arguments[0]--;
-    f.apply(null, arguments);
-}
-
-a = [10];
-for (var i = 0; i < 2000; ++i)
-  a.push(i);
-f.apply(null, a);
diff --git a/js/src/vm/Stack.cpp b/js/src/vm/Stack.cpp
index 62c33fe92c82..7738a1f98793 100644
--- a/js/src/vm/Stack.cpp
+++ b/js/src/vm/Stack.cpp
@@ -359,8 +359,7 @@ StackSpace::bumpLimit(JSContext *cx, StackFrame *fp, Value *sp,
      * script is passing a obscene number of args to 'apply' and we are just
      * trying to keep the stack limit heuristic from breaking the script.
      */
-    Value *quota = Max(*limit, (Value *)fp + STACK_QUOTA);
-    JS_ASSERT(quota >= sp);
+    Value *quota = (Value *)fp + STACK_QUOTA;
     uintN remain = quota - sp;
     uintN inc = nvals + remain;
     if (!ensureSpace(NULL, sp, inc))

From 6990ad0d747d2cc08bb085a6acce693bbc33fb42 Mon Sep 17 00:00:00 2001
From: Gregor Wagner <anygregor@gmail.com>
Date: Tue, 10 May 2011 22:37:11 -0700
Subject: [PATCH 309/314] Bug 603916 - unifying GC sheduling. r=igor

---
 dom/base/nsJSEnvironment.cpp | 14 --------------
 js/src/jsapi.cpp             | 10 ++--------
 js/src/jsapi.h               | 20 +++++---------------
 js/src/jscntxt.h             |  2 --
 js/src/jsgc.cpp              | 33 ++++-----------------------------
 js/src/shell/js.cpp          | 10 ++--------
 6 files changed, 13 insertions(+), 76 deletions(-)

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
index 994c4ff58022..4563c2fff238 100644
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -3646,14 +3646,6 @@ SetMemoryMaxPrefChangedCallback(const char* aPrefName, void* aClosure)
   return 0;
 }
 
-static int
-SetMemoryGCFrequencyPrefChangedCallback(const char* aPrefName, void* aClosure)
-{
-  PRInt32 triggerFactor = nsContentUtils::GetIntPref(aPrefName, 300);
-  JS_SetGCParameter(nsJSRuntime::sRuntime, JSGC_TRIGGER_FACTOR, triggerFactor);
-  return 0;
-}
-
 static int
 SetMemoryGCModePrefChangedCallback(const char* aPrefName, void* aClosure)
 {
@@ -3796,12 +3788,6 @@ nsJSRuntime::Init()
   SetMemoryMaxPrefChangedCallback("javascript.options.mem.max",
                                   nsnull);
 
-  nsContentUtils::RegisterPrefCallback("javascript.options.mem.gc_frequency",
-                                       SetMemoryGCFrequencyPrefChangedCallback,
-                                       nsnull);
-  SetMemoryGCFrequencyPrefChangedCallback("javascript.options.mem.gc_frequency",
-                                          nsnull);
-
   nsContentUtils::RegisterPrefCallback("javascript.options.mem.gc_per_compartment",
                                        SetMemoryGCModePrefChangedCallback,
                                        nsnull);
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index bf4be97c5ffd..018d00cc1406 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2651,15 +2651,11 @@ JS_SetGCParameter(JSRuntime *rt, JSGCParamKey key, uint32 value)
       case JSGC_STACKPOOL_LIFESPAN:
         rt->gcEmptyArenaPoolLifespan = value;
         break;
-      case JSGC_MODE:
+      default:
+        JS_ASSERT(key == JSGC_MODE);
         rt->gcMode = JSGCMode(value);
         JS_ASSERT(rt->gcMode == JSGC_MODE_GLOBAL ||
                   rt->gcMode == JSGC_MODE_COMPARTMENT);
-        break;
-      default:
-        JS_ASSERT(key == JSGC_TRIGGER_FACTOR);
-        JS_ASSERT(value >= 100);
-        rt->setGCTriggerFactor(value);
         return;
     }
 }
@@ -2674,8 +2670,6 @@ JS_GetGCParameter(JSRuntime *rt, JSGCParamKey key)
         return rt->gcMaxMallocBytes;
       case JSGC_STACKPOOL_LIFESPAN:
         return rt->gcEmptyArenaPoolLifespan;
-      case JSGC_TRIGGER_FACTOR:
-        return rt->gcTriggerFactor;
       case JSGC_BYTES:
         return rt->gcBytes;
       case JSGC_MODE:
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index c15273c6f45c..57105a49a968 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1786,30 +1786,20 @@ typedef enum JSGCParamKey {
     /* Hoard stackPools for this long, in ms, default is 30 seconds. */
     JSGC_STACKPOOL_LIFESPAN = 2,
 
-    /*
-     * The factor that defines when the GC is invoked. The factor is a
-     * percent of the memory allocated by the GC after the last run of
-     * the GC. When the current memory allocated by the GC is more than
-     * this percent then the GC is invoked. The factor cannot be less
-     * than 100 since the current memory allocated by the GC cannot be less
-     * than the memory allocated after the last run of the GC.
-     */
-    JSGC_TRIGGER_FACTOR = 3,
-
     /* Amount of bytes allocated by the GC. */
-    JSGC_BYTES = 4,
+    JSGC_BYTES = 3,
 
     /* Number of times when GC was invoked. */
-    JSGC_NUMBER = 5,
+    JSGC_NUMBER = 4,
 
     /* Max size of the code cache in bytes. */
-    JSGC_MAX_CODE_CACHE_BYTES = 6,
+    JSGC_MAX_CODE_CACHE_BYTES = 5,
 
     /* Select GC mode. */
-    JSGC_MODE = 7,
+    JSGC_MODE = 6,
 
     /* Number of GC chunks waiting to expire. */
-    JSGC_UNUSED_CHUNKS = 8
+    JSGC_UNUSED_CHUNKS = 7
 } JSGCParamKey;
 
 typedef enum JSGCMode {
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index b068f1251449..1c7ea808ebb4 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -420,7 +420,6 @@ struct JSRuntime {
     uint32              gcEmptyArenaPoolLifespan;
     uint32              gcNumber;
     js::GCMarker        *gcMarkingTracer;
-    uint32              gcTriggerFactor;
     int64               gcJitReleaseTime;
     JSGCMode            gcMode;
     volatile bool       gcIsNeeded;
@@ -712,7 +711,6 @@ struct JSRuntime {
 
     bool init(uint32 maxbytes);
 
-    void setGCTriggerFactor(uint32 factor);
     void setGCLastBytes(size_t lastBytes);
     void reduceGCTriggerBytes(uint32 amount);
 
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 0da5f1072e6d..b728ebf51cc0 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -595,11 +595,8 @@ js_InitGC(JSRuntime *rt, uint32 maxbytes)
      */
     rt->gcMaxBytes = maxbytes;
     rt->setGCMaxMallocBytes(maxbytes);
-
     rt->gcEmptyArenaPoolLifespan = 30000;
 
-    rt->gcTriggerFactor = uint32(100.0f * GC_HEAP_GROWTH_FACTOR);
-
     /*
      * The assigned value prevents GC from running when GC memory is too low
      * (during JS engine start).
@@ -1065,29 +1062,12 @@ js_MapGCRoots(JSRuntime *rt, JSGCRootMapFun map, void *data)
     return ct;
 }
 
-void
-JSRuntime::setGCTriggerFactor(uint32 factor)
-{
-    JS_ASSERT(factor >= 100);
-
-    gcTriggerFactor = factor;
-    setGCLastBytes(gcLastBytes);
-
-    for (JSCompartment **c = compartments.begin(); c != compartments.end(); ++c)
-        (*c)->setGCLastBytes(gcLastBytes);
-}
-
 void
 JSRuntime::setGCLastBytes(size_t lastBytes)
 {
     gcLastBytes = lastBytes;
-
-    /* FIXME bug 603916 - we should unify the triggers here. */
-    float trigger1 = float(lastBytes) * float(gcTriggerFactor) / 100.0f;
-    float trigger2 = float(Max(lastBytes, GC_ARENA_ALLOCATION_TRIGGER)) *
-                     GC_HEAP_GROWTH_FACTOR;
-    float maxtrigger = Max(trigger1, trigger2);
-    gcTriggerBytes = (float(gcMaxBytes) < maxtrigger) ? gcMaxBytes : size_t(maxtrigger);
+    float trigger = float(Max(lastBytes, GC_ARENA_ALLOCATION_TRIGGER)) * GC_HEAP_GROWTH_FACTOR;
+    gcTriggerBytes = size_t(Min(float(gcMaxBytes), trigger));
 }
 
 void
@@ -1103,13 +1083,8 @@ void
 JSCompartment::setGCLastBytes(size_t lastBytes)
 {
     gcLastBytes = lastBytes;
-
-    /* FIXME bug 603916 - we should unify the triggers here. */
-    float trigger1 = float(lastBytes) * float(rt->gcTriggerFactor) / 100.0f;
-    float trigger2 = float(Max(lastBytes, GC_ARENA_ALLOCATION_TRIGGER)) *
-                     GC_HEAP_GROWTH_FACTOR;
-    float maxtrigger = Max(trigger1, trigger2);
-    gcTriggerBytes = (float(rt->gcMaxBytes) < maxtrigger) ? rt->gcMaxBytes : size_t(maxtrigger);
+    float trigger = float(Max(lastBytes, GC_ARENA_ALLOCATION_TRIGGER)) * GC_HEAP_GROWTH_FACTOR;
+    gcTriggerBytes = size_t(Min(float(rt->gcMaxBytes), trigger));
 }
 
 void
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 641bea9de8f5..63704f561fbf 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -1505,7 +1505,6 @@ GCParameter(JSContext *cx, uintN argc, jsval *vp)
         {"gcStackpoolLifespan", JSGC_STACKPOOL_LIFESPAN},
         {"gcBytes",             JSGC_BYTES},
         {"gcNumber",            JSGC_NUMBER},
-        {"gcTriggerFactor",     JSGC_TRIGGER_FACTOR},
     };
 
     JSString *str;
@@ -1528,8 +1527,8 @@ GCParameter(JSContext *cx, uintN argc, jsval *vp)
         if (paramIndex == JS_ARRAY_LENGTH(paramMap)) {
             JS_ReportError(cx,
                            "the first argument argument must be maxBytes, "
-                           "maxMallocBytes, gcStackpoolLifespan, gcBytes, "
-                           "gcNumber or gcTriggerFactor");
+                           "maxMallocBytes, gcStackpoolLifespan, gcBytes or "
+                           "gcNumber");
             return JS_FALSE;
         }
         if (JS_FlatStringEqualsAscii(flatStr, paramMap[paramIndex].name))
@@ -1556,11 +1555,6 @@ GCParameter(JSContext *cx, uintN argc, jsval *vp)
                        "with non-zero value");
         return JS_FALSE;
     }
-    if (param == JSGC_TRIGGER_FACTOR && value < 100) {
-        JS_ReportError(cx,
-                       "the gcTriggerFactor value must be >= 100");
-        return JS_FALSE;
-    }
     JS_SetGCParameter(cx->runtime, param, value);
     *vp = JSVAL_VOID;
     return JS_TRUE;

From 2bf7738be0736d0305920e19df2a976c1e794fca Mon Sep 17 00:00:00 2001
From: Jason Orendorff <jorendorff@mozilla.com>
Date: Wed, 11 May 2011 10:24:57 -0500
Subject: [PATCH 310/314] Bug 651030 - When removing a property from an object,
 add its slot to the freelist only if the slot is not reserved. r=cdleary.

---
 js/src/jsscope.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/js/src/jsscope.cpp b/js/src/jsscope.cpp
index 03ecb86fb13d..4d1f49e332d8 100644
--- a/js/src/jsscope.cpp
+++ b/js/src/jsscope.cpp
@@ -1107,7 +1107,6 @@ JSObject::removeProperty(JSContext *cx, jsid id)
         JS_ATOMIC_INCREMENT(&cx->runtime->propertyRemovals);
     }
 
-
     /* If shape is not the last property added, switch to dictionary mode. */
     if (shape != lastProp && !inDictionaryMode()) {
         if (!toDictionaryMode(cx))
@@ -1168,16 +1167,19 @@ JSObject::removeProperty(JSContext *cx, jsid id)
                 JS_ASSERT_IF(hadSlot, shape->slot + 1 <= shape->slotSpan);
 
                 /*
-                 * Maintain slot freelist consistency. The only constraint we
-                 * have is that slot numbers on the freelist are less than 
-                 * lastProp->slotSpan. Thus, if the freelist is non-empty,
-                 * then lastProp->slotSpan may not decrease.
-                 */ 
+                 * Maintain slot freelist consistency. Slot numbers on the
+                 * freelist are less than lastProp->slotSpan; so if the
+                 * freelist is non-empty, then lastProp->slotSpan may not
+                 * decrease.
+                 */
                 if (table->freelist != SHAPE_INVALID_SLOT) {
                     lastProp->slotSpan = shape->slotSpan;
-                    
-                    /* Add the slot to the freelist if it wasn't added in freeSlot. */
-                    if (hadSlot && !addedToFreelist) {
+
+                    /*
+                     * Add the slot to the freelist if it wasn't added in
+                     * freeSlot and it is not a reserved slot.
+                     */
+                    if (hadSlot && !addedToFreelist && JSSLOT_FREE(clasp) <= shape->slot) {
                         getSlotRef(shape->slot).setPrivateUint32(table->freelist);
                         table->freelist = shape->slot;
                     }

From b2d96a404e5122e56ee97dbbe75f55c67f61fb10 Mon Sep 17 00:00:00 2001
From: Tom Schuster <evilpies@gmail.com>
Date: Wed, 11 May 2011 18:23:21 +0200
Subject: [PATCH 311/314] Bug 656317: add .append back in path reversal
 r=jorendorff

---
 js/src/tests/manifest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/tests/manifest.py b/js/src/tests/manifest.py
index 3cd3f9bec51b..412523808bf5 100644
--- a/js/src/tests/manifest.py
+++ b/js/src/tests/manifest.py
@@ -15,6 +15,7 @@ def split_path_into_dirs(path):
         path, tail = os.path.split(path)
         if not tail:
             break
+        dirs.append(path)
     return dirs
 
 class XULInfo:

From 1fc43babc25d5e2ffb5047a4a169bb9f07972dc1 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Tue, 10 May 2011 16:18:55 -0700
Subject: [PATCH 312/314] Bug 649133: Implement xhr.mozResponse and
 xhr.mozResponseType. r=sicking

---
 content/base/public/nsIXMLHttpRequest.idl |  34 ++-
 content/base/src/Makefile.in              |   2 +
 content/base/src/nsXMLHttpRequest.cpp     | 325 ++++++++++++++++++----
 content/base/src/nsXMLHttpRequest.h       |  12 +
 content/base/test/test_XHR.html           | 129 +++++++--
 dom/src/threads/nsDOMWorkerEvents.h       |   2 +-
 dom/src/threads/nsDOMWorkerXHR.cpp        |  18 +-
 dom/src/threads/nsDOMWorkerXHRProxy.cpp   |   2 +-
 dom/src/threads/nsDOMWorkerXHRProxy.h     |   2 +-
 9 files changed, 439 insertions(+), 87 deletions(-)

diff --git a/content/base/public/nsIXMLHttpRequest.idl b/content/base/public/nsIXMLHttpRequest.idl
index b7e012dbc64d..f0de1f27d99a 100644
--- a/content/base/public/nsIXMLHttpRequest.idl
+++ b/content/base/public/nsIXMLHttpRequest.idl
@@ -46,6 +46,7 @@ interface nsIURI;
 interface nsIVariant;
 interface nsPIDOMWindow;
 interface nsIInputStream;
+interface nsIDOMBlob;
 
 %{C++
 // for jsval
@@ -109,7 +110,7 @@ interface nsIXMLHttpRequestUpload : nsIXMLHttpRequestEventTarget {
  * you're aware of all the security implications.  And then think twice about
  * it.
  */
-[scriptable, uuid(af62a870-820c-4981-96a3-28ab17b779e1)]
+[scriptable, uuid(a05a6424-a644-461a-a1ff-c7bbe96ea9e2)]
 interface nsIXMLHttpRequest : nsISupports
 {
   /**
@@ -141,11 +142,20 @@ interface nsIXMLHttpRequest : nsISupports
   readonly attribute AString responseText;
 
   /**
-   * The response to the request as a typed array ArrayBuffer.
+   * Determine a response format which response attribute returns.
+   * empty string (initial value) or "text": as text.
+   * "arraybuffer": as a typed array ArrayBuffer.
+   * "blob": as a File API Blob.
+   * "document": as a DOM Document object.
+   */
+  attribute AString mozResponseType;
+
+  /**
+   * The response to the request as a specified format by responseType.
    * NULL if the request is unsuccessful or
    * has not yet been sent.
    */
-  readonly attribute jsval /*ArrayBuffer*/ mozResponseArrayBuffer;
+  [implicit_jscontext] readonly attribute jsval /* any */ mozResponse;
 
   /**
    * The status of the response to the request for HTTP requests.
@@ -272,13 +282,19 @@ interface nsIXMLHttpRequest : nsISupports
    * The state of the request.
    *
    * Possible values:
-   *   0 UNINITIALIZED open() has not been called yet.
-   *   1 LOADING       send() has not been called yet.
-   *   2 LOADED        send() has been called, headers and status are available.
-   *   3 INTERACTIVE   Downloading, responseText holds the partial data.
-   *   4 COMPLETED     Finished with all operations.
+   *   0 UNSENT   open() has not been called yet.
+   *   1 OPENED   send() has not been called yet.
+   *   2 HEADERS_RECEIVED
+   *              send() has been called, headers and status are available.
+   *   3 LOADING  Downloading, responseText holds the partial data.
+   *   4 DONE     Finished with all operations.
    */
-  readonly attribute long readyState;
+  const unsigned short UNSENT = 0;
+  const unsigned short OPENED = 1;
+  const unsigned short HEADERS_RECEIVED = 2;
+  const unsigned short LOADING = 3;
+  const unsigned short DONE = 4;
+  readonly attribute unsigned short readyState;
 
   /**
    * Override the mime type returned by the server (if any). This may
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 972f5f436c81..d469d120d7f1 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -70,6 +70,8 @@ EXPORTS_mozilla/dom = \
   Link.h \
   $(NULL)
 
+LOCAL_INCLUDES = -I$(srcdir)/js/src/xpconnect/src
+
 CPPSRCS		= \
 		mozSanitizingSerializer.cpp \
 		nsAtomListUtils.cpp \
diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp
index 20fd6d7f6da8..607cb412fedf 100644
--- a/content/base/src/nsXMLHttpRequest.cpp
+++ b/content/base/src/nsXMLHttpRequest.cpp
@@ -67,7 +67,7 @@
 #include "nsIMIMEService.h"
 #include "nsCExternalHandlerService.h"
 #include "nsIVariant.h"
-#include "nsVariant.h"
+#include "xpcprivate.h"
 #include "nsIParser.h"
 #include "nsLoadListenerProxy.h"
 #include "nsStringStream.h"
@@ -100,6 +100,8 @@
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "jstypedarray.h"
 #include "nsStringBuffer.h"
+#include "nsDOMFile.h"
+#include "nsIFileChannel.h"
 
 #define LOAD_STR "load"
 #define ERROR_STR "error"
@@ -113,13 +115,13 @@
 // CIDs
 
 // State
-#define XML_HTTP_REQUEST_UNINITIALIZED  (1 << 0)  // 0
-#define XML_HTTP_REQUEST_OPENED         (1 << 1)  // 1 aka LOADING
-#define XML_HTTP_REQUEST_LOADED         (1 << 2)  // 2
-#define XML_HTTP_REQUEST_INTERACTIVE    (1 << 3)  // 3
-#define XML_HTTP_REQUEST_COMPLETED      (1 << 4)  // 4
-#define XML_HTTP_REQUEST_SENT           (1 << 5)  // Internal, LOADING in IE and external view
-#define XML_HTTP_REQUEST_STOPPED        (1 << 6)  // Internal, INTERACTIVE in IE and external view
+#define XML_HTTP_REQUEST_UNSENT           (1 << 0) // 0 UNSENT
+#define XML_HTTP_REQUEST_OPENED           (1 << 1) // 1 OPENED
+#define XML_HTTP_REQUEST_HEADERS_RECEIVED (1 << 2) // 2 HEADERS_RECEIVED
+#define XML_HTTP_REQUEST_LOADING          (1 << 3) // 3 LOADING
+#define XML_HTTP_REQUEST_DONE             (1 << 4) // 4 DONE
+#define XML_HTTP_REQUEST_SENT             (1 << 5) // Internal, OPENED in IE and external view
+#define XML_HTTP_REQUEST_STOPPED          (1 << 6) // Internal, LOADING in IE and external view
 // The above states are mutually exclusive, change with ChangeState() only.
 // The states below can be combined.
 #define XML_HTTP_REQUEST_ABORTED        (1 << 7)  // Internal
@@ -137,11 +139,11 @@
 #define XML_HTTP_REQUEST_AC_WITH_CREDENTIALS (1 << 17) // Internal
 
 #define XML_HTTP_REQUEST_LOADSTATES         \
-  (XML_HTTP_REQUEST_UNINITIALIZED |         \
+  (XML_HTTP_REQUEST_UNSENT |                \
    XML_HTTP_REQUEST_OPENED |                \
-   XML_HTTP_REQUEST_LOADED |                \
-   XML_HTTP_REQUEST_INTERACTIVE |           \
-   XML_HTTP_REQUEST_COMPLETED |             \
+   XML_HTTP_REQUEST_HEADERS_RECEIVED |      \
+   XML_HTTP_REQUEST_LOADING |               \
+   XML_HTTP_REQUEST_DONE |                  \
    XML_HTTP_REQUEST_SENT |                  \
    XML_HTTP_REQUEST_STOPPED)
 
@@ -417,7 +419,8 @@ NS_IMPL_RELEASE_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget)
 /////////////////////////////////////////////
 
 nsXMLHttpRequest::nsXMLHttpRequest()
-  : mRequestObserver(nsnull), mState(XML_HTTP_REQUEST_UNINITIALIZED),
+  : mResponseType(XML_HTTP_RESPONSE_TYPE_DEFAULT),
+    mRequestObserver(nsnull), mState(XML_HTTP_REQUEST_UNSENT),
     mUploadTransferred(0), mUploadTotal(0), mUploadComplete(PR_TRUE),
     mUploadProgress(0), mUploadProgressMax(0),
     mErrorLoad(PR_FALSE), mTimerIsActive(PR_FALSE),
@@ -437,7 +440,7 @@ nsXMLHttpRequest::~nsXMLHttpRequest()
 
   if (mState & (XML_HTTP_REQUEST_STOPPED |
                 XML_HTTP_REQUEST_SENT |
-                XML_HTTP_REQUEST_INTERACTIVE)) {
+                XML_HTTP_REQUEST_LOADING)) {
     Abort();
   }
 
@@ -661,7 +664,11 @@ nsXMLHttpRequest::GetResponseXML(nsIDOMDocument **aResponseXML)
 {
   NS_ENSURE_ARG_POINTER(aResponseXML);
   *aResponseXML = nsnull;
-  if ((XML_HTTP_REQUEST_COMPLETED & mState) && mResponseXML) {
+  if (mResponseType != XML_HTTP_RESPONSE_TYPE_DEFAULT &&
+      mResponseType != XML_HTTP_RESPONSE_TYPE_DOCUMENT) {
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+  }
+  if ((XML_HTTP_REQUEST_DONE & mState) && mResponseXML) {
     *aResponseXML = mResponseXML;
     NS_ADDREF(*aResponseXML);
   }
@@ -819,23 +826,27 @@ NS_IMETHODIMP nsXMLHttpRequest::GetResponseText(nsAString& aResponseText)
 
   aResponseText.Truncate();
 
-  if (mState & (XML_HTTP_REQUEST_COMPLETED |
-                XML_HTTP_REQUEST_INTERACTIVE)) {
+  if (mResponseType != XML_HTTP_RESPONSE_TYPE_DEFAULT &&
+      mResponseType != XML_HTTP_RESPONSE_TYPE_TEXT) {
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+  }
+
+  if (mState & (XML_HTTP_REQUEST_DONE |
+                XML_HTTP_REQUEST_LOADING)) {
     rv = ConvertBodyToText(aResponseText);
   }
 
   return rv;
 }
 
-/* readonly attribute jsval (ArrayBuffer) mozResponseArrayBuffer; */
-NS_IMETHODIMP nsXMLHttpRequest::GetMozResponseArrayBuffer(jsval *aResult)
+nsresult nsXMLHttpRequest::GetResponseArrayBuffer(jsval *aResult)
 {
   JSContext *cx = nsContentUtils::GetCurrentJSContext();
   if (!cx)
     return NS_ERROR_FAILURE;
 
-  if (!(mState & (XML_HTTP_REQUEST_COMPLETED |
-                  XML_HTTP_REQUEST_INTERACTIVE))) {
+  if (!(mState & (XML_HTTP_REQUEST_DONE |
+                  XML_HTTP_REQUEST_LOADING))) {
     *aResult = JSVAL_NULL;
     return NS_OK;
   }
@@ -856,6 +867,126 @@ NS_IMETHODIMP nsXMLHttpRequest::GetMozResponseArrayBuffer(jsval *aResult)
   return NS_OK;
 }
 
+/* attribute AString responseType; */
+NS_IMETHODIMP nsXMLHttpRequest::GetMozResponseType(nsAString& aResponseType)
+{
+  switch (mResponseType) {
+  case XML_HTTP_RESPONSE_TYPE_DEFAULT:
+    aResponseType.Truncate();
+    break;
+  case XML_HTTP_RESPONSE_TYPE_ARRAYBUFFER:
+    aResponseType.AssignLiteral("arraybuffer");
+    break;
+  case XML_HTTP_RESPONSE_TYPE_BLOB:
+    aResponseType.AssignLiteral("blob");
+    break;
+  case XML_HTTP_RESPONSE_TYPE_DOCUMENT:
+    aResponseType.AssignLiteral("document");
+    break;
+  case XML_HTTP_RESPONSE_TYPE_TEXT:
+    aResponseType.AssignLiteral("text");
+    break;
+  default:
+    NS_ERROR("Should not happen");
+  }
+
+  return NS_OK;
+}
+
+/* attribute AString responseType; */
+NS_IMETHODIMP nsXMLHttpRequest::SetMozResponseType(const nsAString& aResponseType)
+{
+  // If the state is not OPENED or HEADERS_RECEIVED raise an
+  // INVALID_STATE_ERR exception and terminate these steps.
+  if (!(mState & (XML_HTTP_REQUEST_OPENED | XML_HTTP_REQUEST_SENT |
+                  XML_HTTP_REQUEST_HEADERS_RECEIVED)))
+    return NS_ERROR_DOM_INVALID_STATE_ERR;
+
+  // Set the responseType attribute's value to the given value.
+  if (aResponseType.IsEmpty()) {
+    mResponseType = XML_HTTP_RESPONSE_TYPE_DEFAULT;
+  } else if (aResponseType.EqualsLiteral("arraybuffer")) {
+    mResponseType = XML_HTTP_RESPONSE_TYPE_ARRAYBUFFER;
+  } else if (aResponseType.EqualsLiteral("blob")) {
+    mResponseType = XML_HTTP_RESPONSE_TYPE_BLOB;
+  } else if (aResponseType.EqualsLiteral("document")) {
+    mResponseType = XML_HTTP_RESPONSE_TYPE_DOCUMENT;
+  } else if (aResponseType.EqualsLiteral("text")) {
+    mResponseType = XML_HTTP_RESPONSE_TYPE_TEXT;
+  }
+  // If the given value is not the empty string, "arraybuffer",
+  // "blob", "document", or "text" terminate these steps.
+
+  // If the state is OPENED, SetCacheAsFile would have no effect here
+  // because the channel hasn't initialized the cache entry yet.
+  // SetCacheAsFile will be called from OnStartRequest.
+  // If the state is HEADERS_RECEIVED, however, we need to call
+  // it immediately because OnStartRequest is already dispatched.
+  if (mState & XML_HTTP_REQUEST_HEADERS_RECEIVED) {
+    nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(mChannel));
+    if (cc) {
+      cc->SetCacheAsFile(mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB);
+    }
+  }
+
+  return NS_OK;
+}
+
+/* readonly attribute jsval response; */
+NS_IMETHODIMP nsXMLHttpRequest::GetMozResponse(JSContext *aCx, jsval *aResult)
+{
+  nsresult rv = NS_OK;
+
+  switch (mResponseType) {
+  case XML_HTTP_RESPONSE_TYPE_DEFAULT:
+  case XML_HTTP_RESPONSE_TYPE_TEXT:
+    {
+      nsString str;
+      rv = GetResponseText(str);
+      if (NS_FAILED(rv)) return rv;
+      nsStringBuffer* buf;
+      *aResult = XPCStringConvert::ReadableToJSVal(aCx, str, &buf);
+      if (buf) {
+        str.ForgetSharedBuffer();
+      }
+    }
+    break;
+
+  case XML_HTTP_RESPONSE_TYPE_ARRAYBUFFER:
+    if (mState & XML_HTTP_REQUEST_DONE) {
+      rv = GetResponseArrayBuffer(aResult);
+    } else {
+      *aResult = JSVAL_NULL;
+    }
+    break;
+
+  case XML_HTTP_RESPONSE_TYPE_BLOB:
+    if (mState & XML_HTTP_REQUEST_DONE && mResponseBlob) {
+      JSObject* scope = JS_GetScopeChain(aCx);
+      rv = nsContentUtils::WrapNative(aCx, scope, mResponseBlob, aResult,
+                                      nsnull, PR_TRUE);
+    } else {
+      *aResult = JSVAL_NULL;
+    }
+    break;
+
+  case XML_HTTP_RESPONSE_TYPE_DOCUMENT:
+    if (mState & XML_HTTP_REQUEST_DONE && mResponseXML) {
+      JSObject* scope = JS_GetScopeChain(aCx);
+      rv = nsContentUtils::WrapNative(aCx, scope, mResponseXML, aResult,
+                                      nsnull, PR_TRUE);
+    } else {
+      *aResult = JSVAL_NULL;
+    }
+    break;
+
+  default:
+    NS_ERROR("Should not happen");
+  }
+
+  return rv;
+}
+
 /* readonly attribute unsigned long status; */
 NS_IMETHODIMP
 nsXMLHttpRequest::GetStatus(PRUint32 *aStatus)
@@ -882,9 +1013,9 @@ nsXMLHttpRequest::GetStatus(PRUint32 *aStatus)
       // Someone's calling this before we got a response... Check our
       // ReadyState.  If we're at 3 or 4, then this means the connection
       // errored before we got any data; return 0 in that case.
-      PRInt32 readyState;
+      PRUint16 readyState;
       GetReadyState(&readyState);
-      if (readyState >= 3) {
+      if (readyState >= LOADING) {
         *aStatus = 0;
         return NS_OK;
       }
@@ -940,12 +1071,13 @@ nsXMLHttpRequest::Abort()
   PRUint32 responseLength = mResponseBody.Length();
   mResponseBody.Truncate();
   mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  mResponseBlob = nsnull;
   mState |= XML_HTTP_REQUEST_ABORTED;
 
-  if (!(mState & (XML_HTTP_REQUEST_UNINITIALIZED |
+  if (!(mState & (XML_HTTP_REQUEST_UNSENT |
                   XML_HTTP_REQUEST_OPENED |
-                  XML_HTTP_REQUEST_COMPLETED))) {
-    ChangeState(XML_HTTP_REQUEST_COMPLETED, PR_TRUE);
+                  XML_HTTP_REQUEST_DONE))) {
+    ChangeState(XML_HTTP_REQUEST_DONE, PR_TRUE);
   }
 
   if (!(mState & XML_HTTP_REQUEST_SYNCLOOPING)) {
@@ -963,7 +1095,7 @@ nsXMLHttpRequest::Abort()
   // if they load a new url will cause nsXMLHttpRequest::Open to clear
   // the abort state bit. If this occurs we're not uninitialized (bug 361773).
   if (mState & XML_HTTP_REQUEST_ABORTED) {
-    ChangeState(XML_HTTP_REQUEST_UNINITIALIZED, PR_FALSE);  // IE seems to do it
+    ChangeState(XML_HTTP_REQUEST_UNSENT, PR_FALSE);  // IE seems to do it
   }
 
   mState &= ~XML_HTTP_REQUEST_SYNCLOOPING;
@@ -1263,8 +1395,8 @@ nsXMLHttpRequest::Open(const nsACString& method, const nsACString& url,
   PRBool authp = PR_FALSE;
 
   if (mState & (XML_HTTP_REQUEST_OPENED |
-                XML_HTTP_REQUEST_LOADED |
-                XML_HTTP_REQUEST_INTERACTIVE |
+                XML_HTTP_REQUEST_HEADERS_RECEIVED |
+                XML_HTTP_REQUEST_LOADING |
                 XML_HTTP_REQUEST_SENT |
                 XML_HTTP_REQUEST_STOPPED)) {
     // IE aborts as well
@@ -1395,9 +1527,22 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in,
     return NS_ERROR_FAILURE;
   }
 
-  // Copy for our own use
-  xmlHttpRequest->mResponseBody.Append(fromRawSegment,count);
-  xmlHttpRequest->mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  if (xmlHttpRequest->mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB &&
+      xmlHttpRequest->mResponseBlob) {
+    xmlHttpRequest->ChangeState(XML_HTTP_REQUEST_LOADING);
+    *writeCount = count;
+    return NS_OK;
+  }
+
+  if (xmlHttpRequest->mResponseType != XML_HTTP_RESPONSE_TYPE_DOCUMENT) {
+    // Copy for our own use
+    PRUint32 previousLength = xmlHttpRequest->mResponseBody.Length();
+    xmlHttpRequest->mResponseBody.Append(fromRawSegment,count);
+    if (count > 0 && xmlHttpRequest->mResponseBody.Length() == previousLength) {
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+    xmlHttpRequest->mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  }
 
   nsresult rv = NS_OK;
 
@@ -1425,7 +1570,7 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in,
     }
   }
 
-  xmlHttpRequest->ChangeState(XML_HTTP_REQUEST_INTERACTIVE);
+  xmlHttpRequest->ChangeState(XML_HTTP_REQUEST_LOADING);
 
   if (NS_SUCCEEDED(rv)) {
     *writeCount = count;
@@ -1436,6 +1581,35 @@ nsXMLHttpRequest::StreamReaderFunc(nsIInputStream* in,
   return rv;
 }
 
+void nsXMLHttpRequest::CreateResponseBlob(nsIRequest *request)
+{
+  nsCOMPtr<nsIFile> file;
+  nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(request));
+  if (cc) {
+    cc->GetCacheFile(getter_AddRefs(file));
+    if (!file) {
+      // cacheAsFile returns false if caching is inhibited
+      PRBool cacheAsFile = PR_FALSE;
+      if (NS_SUCCEEDED(cc->GetCacheAsFile(&cacheAsFile)) && cacheAsFile) {
+        
+      }
+    }
+  } else {
+    nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(request);
+    if (fc) {
+      fc->GetFile(getter_AddRefs(file));
+    }
+  }
+  if (file) {
+    nsCAutoString contentType;
+    mChannel->GetContentType(contentType);
+    mResponseBlob = new nsDOMFile(file,
+                                  NS_ConvertASCIItoUTF16(contentType));
+    mResponseBody.Truncate();
+    mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  }
+}
+
 /* void onDataAvailable (in nsIRequest request, in nsISupports ctxt, in nsIInputStream inStr, in unsigned long sourceOffset, in unsigned long count); */
 NS_IMETHODIMP
 nsXMLHttpRequest::OnDataAvailable(nsIRequest *request, nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
@@ -1444,6 +1618,10 @@ nsXMLHttpRequest::OnDataAvailable(nsIRequest *request, nsISupports *ctxt, nsIInp
 
   NS_ABORT_IF_FALSE(mContext.get() == ctxt,"start context different from OnDataAvailable context");
 
+  if (mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB && !mResponseBlob) {
+    CreateResponseBlob(request);
+  }
+
   PRUint32 totalRead;
   return inStr->ReadSegments(nsXMLHttpRequest::StreamReaderFunc, (void*)this, count, &totalRead);
 }
@@ -1478,7 +1656,7 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   }
 
   // Don't do anything if we have been aborted
-  if (mState & XML_HTTP_REQUEST_UNINITIALIZED)
+  if (mState & XML_HTTP_REQUEST_UNSENT)
     return NS_OK;
 
   if (mState & XML_HTTP_REQUEST_ABORTED) {
@@ -1509,7 +1687,14 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   mContext = ctxt;
   mState |= XML_HTTP_REQUEST_PARSEBODY;
   mState &= ~XML_HTTP_REQUEST_MPART_HEADERS;
-  ChangeState(XML_HTTP_REQUEST_LOADED);
+  ChangeState(XML_HTTP_REQUEST_HEADERS_RECEIVED);
+
+  if (mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB) {
+    nsCOMPtr<nsICachingChannel> cc(do_QueryInterface(mChannel));
+    if (cc) {
+      cc->SetCacheAsFile(PR_TRUE);
+    }
+  }
 
   nsresult status;
   request->GetStatus(&status);
@@ -1525,11 +1710,13 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt)
   // Reset responseBody
   mResponseBody.Truncate();
   mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  mResponseBlob = nsnull;
 
   // Set up responseXML
-  PRBool parseBody = PR_TRUE;
+  PRBool parseBody = mResponseType == XML_HTTP_RESPONSE_TYPE_DEFAULT ||
+                     mResponseType == XML_HTTP_RESPONSE_TYPE_DOCUMENT;
   nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(mChannel));
-  if (httpChannel) {
+  if (parseBody && httpChannel) {
     nsCAutoString method;
     httpChannel->GetRequestMethod(method);
     parseBody = !method.EqualsLiteral("HEAD");
@@ -1668,7 +1855,7 @@ nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult
 
   // make sure to notify the listener if we were aborted
   // XXX in fact, why don't we do the cleanup below in this case??
-  if (mState & XML_HTTP_REQUEST_UNINITIALIZED) {
+  if (mState & XML_HTTP_REQUEST_UNSENT) {
     if (mXMLParserStreamListener)
       (void) mXMLParserStreamListener->OnStopRequest(request, ctxt, status);
     return NS_OK;
@@ -1690,6 +1877,31 @@ nsXMLHttpRequest::OnStopRequest(nsIRequest *request, nsISupports *ctxt, nsresult
   nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
   NS_ENSURE_TRUE(channel, NS_ERROR_UNEXPECTED);
 
+  if (NS_SUCCEEDED(status) && mResponseType == XML_HTTP_RESPONSE_TYPE_BLOB) {
+    if (!mResponseBlob) {
+      CreateResponseBlob(request);
+    }
+    if (!mResponseBlob) {
+      // Smaller files may be written in cache map instead of separate files.
+      // Also, no-store response cannot be written in persistent cache.
+      nsCAutoString contentType;
+      mChannel->GetContentType(contentType);
+      // XXX We should change mResponseBody to be a raw malloc'ed buffer
+      //     to avoid copying the data.
+      PRUint32 blobLen = mResponseBody.Length();
+      void *blobData = PR_Malloc(blobLen);
+      if (blobData) {
+        memcpy(blobData, mResponseBody.BeginReading(), blobLen);
+        mResponseBlob =
+          new nsDOMMemoryFile(blobData, blobLen, EmptyString(),
+                              NS_ConvertASCIItoUTF16(contentType));
+        mResponseBody.Truncate();
+      }
+      NS_ASSERTION(mResponseBodyUnicode.IsVoid(),
+                   "mResponseBodyUnicode should be empty");
+    }
+  }
+
   channel->SetNotificationCallbacks(nsnull);
   mNotificationCallbacks = nsnull;
   mChannelEventSink = nsnull;
@@ -1736,8 +1948,8 @@ nsXMLHttpRequest::RequestCompleted()
   // If we're uninitialized at this point, we encountered an error
   // earlier and listeners have already been notified. Also we do
   // not want to do this if we already completed.
-  if (mState & (XML_HTTP_REQUEST_UNINITIALIZED |
-                XML_HTTP_REQUEST_COMPLETED)) {
+  if (mState & (XML_HTTP_REQUEST_UNSENT |
+                XML_HTTP_REQUEST_DONE)) {
     return NS_OK;
   }
 
@@ -1753,7 +1965,7 @@ nsXMLHttpRequest::RequestCompleted()
     }
   }
 
-  ChangeState(XML_HTTP_REQUEST_COMPLETED, PR_TRUE);
+  ChangeState(XML_HTTP_REQUEST_DONE, PR_TRUE);
 
   PRUint32 responseLength = mResponseBody.Length();
   NS_NAMED_LITERAL_STRING(errorStr, ERROR_STR);
@@ -2134,6 +2346,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody)
   // Reset responseBody
   mResponseBody.Truncate();
   mResponseBodyUnicode.SetIsVoid(PR_TRUE);
+  mResponseBlob = nsnull;
 
   // Reset responseXML
   mResponseXML = nsnull;
@@ -2369,20 +2582,20 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
 
 /* readonly attribute long readyState; */
 NS_IMETHODIMP
-nsXMLHttpRequest::GetReadyState(PRInt32 *aState)
+nsXMLHttpRequest::GetReadyState(PRUint16 *aState)
 {
   NS_ENSURE_ARG_POINTER(aState);
   // Translate some of our internal states for external consumers
-  if (mState & XML_HTTP_REQUEST_UNINITIALIZED) {
-    *aState = 0; // UNINITIALIZED
+  if (mState & XML_HTTP_REQUEST_UNSENT) {
+    *aState = UNSENT;
   } else  if (mState & (XML_HTTP_REQUEST_OPENED | XML_HTTP_REQUEST_SENT)) {
-    *aState = 1; // LOADING
-  } else if (mState & XML_HTTP_REQUEST_LOADED) {
-    *aState = 2; // LOADED
-  } else if (mState & (XML_HTTP_REQUEST_INTERACTIVE | XML_HTTP_REQUEST_STOPPED)) {
-    *aState = 3; // INTERACTIVE
-  } else if (mState & XML_HTTP_REQUEST_COMPLETED) {
-    *aState = 4; // COMPLETED
+    *aState = OPENED;
+  } else if (mState & XML_HTTP_REQUEST_HEADERS_RECEIVED) {
+    *aState = HEADERS_RECEIVED;
+  } else if (mState & (XML_HTTP_REQUEST_LOADING | XML_HTTP_REQUEST_STOPPED)) {
+    *aState = LOADING;
+  } else if (mState & XML_HTTP_REQUEST_DONE) {
+    *aState = DONE;
   } else {
     NS_ERROR("Should not happen");
   }
@@ -2413,7 +2626,7 @@ nsXMLHttpRequest::GetMultipart(PRBool *_retval)
 NS_IMETHODIMP
 nsXMLHttpRequest::SetMultipart(PRBool aMultipart)
 {
-  if (!(mState & XML_HTTP_REQUEST_UNINITIALIZED)) {
+  if (!(mState & XML_HTTP_REQUEST_UNSENT)) {
     // Can't change this while we're in the middle of something.
     return NS_ERROR_IN_PROGRESS;
   }
@@ -2448,7 +2661,7 @@ nsXMLHttpRequest::SetMozBackgroundRequest(PRBool aMozBackgroundRequest)
   if (!privileged)
     return NS_ERROR_DOM_SECURITY_ERR;
 
-  if (!(mState & XML_HTTP_REQUEST_UNINITIALIZED)) {
+  if (!(mState & XML_HTTP_REQUEST_UNSENT)) {
     // Can't change this while we're in the middle of something.
     return NS_ERROR_IN_PROGRESS;
   }
@@ -2545,7 +2758,7 @@ nsresult
 nsXMLHttpRequest::Error(nsIDOMEvent* aEvent)
 {
   mResponseXML = nsnull;
-  ChangeState(XML_HTTP_REQUEST_COMPLETED);
+  ChangeState(XML_HTTP_REQUEST_DONE);
 
   mState &= ~XML_HTTP_REQUEST_SYNCLOOPING;
 
@@ -2572,7 +2785,7 @@ nsXMLHttpRequest::ChangeState(PRUint32 aState, PRBool aBroadcast)
   nsresult rv = NS_OK;
 
   if (mProgressNotifier &&
-      !(aState & (XML_HTTP_REQUEST_LOADED | XML_HTTP_REQUEST_INTERACTIVE))) {
+      !(aState & (XML_HTTP_REQUEST_HEADERS_RECEIVED | XML_HTTP_REQUEST_LOADING))) {
     mTimerIsActive = PR_FALSE;
     mProgressNotifier->Cancel();
   }
@@ -2581,7 +2794,7 @@ nsXMLHttpRequest::ChangeState(PRUint32 aState, PRBool aBroadcast)
       aBroadcast &&
       (mState & XML_HTTP_REQUEST_ASYNC ||
        aState & XML_HTTP_REQUEST_OPENED ||
-       aState & XML_HTTP_REQUEST_COMPLETED)) {
+       aState & XML_HTTP_REQUEST_DONE)) {
     nsCOMPtr<nsIDOMEvent> event;
     rv = CreateReadystatechangeEvent(getter_AddRefs(event));
     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h
index a91022d28d51..2ab09881ed2d 100644
--- a/content/base/src/nsXMLHttpRequest.h
+++ b/content/base/src/nsXMLHttpRequest.h
@@ -224,6 +224,8 @@ protected:
                 PRUint32 toOffset,
                 PRUint32 count,
                 PRUint32 *writeCount);
+  nsresult GetResponseArrayBuffer(jsval *aResult);
+  void CreateResponseBlob(nsIRequest *request);
   // Change the state of the object with this. The broadcast argument
   // determines if the onreadystatechange listener should be called.
   nsresult ChangeState(PRUint32 aState, PRBool aBroadcast = PR_TRUE);
@@ -293,6 +295,16 @@ protected:
   // will cause us to clear the cached value anyway.
   nsString mResponseBodyUnicode;
 
+  enum {
+    XML_HTTP_RESPONSE_TYPE_DEFAULT,
+    XML_HTTP_RESPONSE_TYPE_ARRAYBUFFER,
+    XML_HTTP_RESPONSE_TYPE_BLOB,
+    XML_HTTP_RESPONSE_TYPE_DOCUMENT,
+    XML_HTTP_RESPONSE_TYPE_TEXT
+  } mResponseType;
+
+  nsCOMPtr<nsIDOMBlob> mResponseBlob;
+
   nsCString mOverrideMimeType;
 
   /**
diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html
index ce5af69d161a..fd74cd4dcbcd 100644
--- a/content/base/test/test_XHR.html
+++ b/content/base/test/test_XHR.html
@@ -13,6 +13,7 @@
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
+SimpleTest.waitForExplicitFinish();
 
 var path = "/tests/content/base/test/";
 
@@ -28,16 +29,19 @@ var failFiles = [['//example.com' + path + 'file_XHR_pass1.xml', 'GET'],
 
 for (i = 0; i < passFiles.length; ++i) {
   xhr = new XMLHttpRequest();
+  is(xhr.mozResponseType, "", "wrong initial responseType");
   xhr.open(passFiles[i][1], passFiles[i][0], false); 
   xhr.send(null);
   is(xhr.status, 200, "wrong status");
   if (xhr.responseXML) {
     is((new XMLSerializer()).serializeToString(xhr.responseXML.documentElement),
        "<res>hello</res>",
-       "wrong response");
+       "wrong responseXML");
+    is(xhr.mozResponse, "<res>hello</res>\n", "wrong response");
   }
   else {
-    is(xhr.responseText, "hello pass\n", "wrong response");
+    is(xhr.responseText, "hello pass\n", "wrong responseText");
+    is(xhr.mozResponse, "hello pass\n", "wrong response");
   }
 }
 
@@ -60,35 +64,127 @@ for (i = 0; i < failFiles.length; ++i) {
   }
 }
 
-// test mozResponseArrayBuffer
+// test response (responseType='document')
+function checkResponseTextAccessThrows(xhr) {
+  var didthrow = false;
+  try { xhr.responseText } catch (e) { didthrow = true; }
+  ok(didthrow, "should have thrown when accessing responseText");
+}
+function checkResponseXMLAccessThrows(xhr) {
+  var didthrow = false;
+  try { xhr.responseXML } catch (e) { didthrow = true; }
+  ok(didthrow, "should have thrown when accessing responseXML");
+}
+function checkSetResponseTypeThrows(xhr) {
+  var didthrow = false;
+  try { xhr.mozResponseType = 'document'; } catch (e) { didthrow = true; }
+  ok(didthrow, "should have thrown when accessing responseType");
+}
+
+xhr = new XMLHttpRequest();
+checkSetResponseTypeThrows(xhr);
+xhr.open("GET", 'file_XHR_pass1.xml', false); 
+xhr.mozResponseType = 'document';
+xhr.send(null);
+checkSetResponseTypeThrows(xhr);
+is(xhr.status, 200, "wrong status");
+checkResponseTextAccessThrows(xhr);
+is((new XMLSerializer()).serializeToString(xhr.mozResponse.documentElement),
+   "<res>hello</res>",
+   "wrong response");
+
+// test response (responseType='text')
+xhr = new XMLHttpRequest();
+xhr.open("GET", 'file_XHR_pass2.txt', false); 
+xhr.mozResponseType = 'text';
+xhr.send(null);
+is(xhr.status, 200, "wrong status");
+checkResponseXMLAccessThrows(xhr);
+is(xhr.mozResponse, "hello pass\n", "wrong response");
+
+// test response (responseType='arraybuffer')
+function arraybuffer_equals_to(ab, s) {
+  is(ab.byteLength, s.length, "wrong arraybuffer byteLength");
+
+  u8v = new Uint8Array(ab);
+  is(String.fromCharCode.apply(String, u8v), s, "wrong values");
+}
 
 // with a simple text file
 xhr = new XMLHttpRequest();
 xhr.open("GET", 'file_XHR_pass2.txt', false); 
+xhr.mozResponseType = 'arraybuffer';
 xhr.send(null);
 is(xhr.status, 200, "wrong status");
-ab = xhr.mozResponseArrayBuffer;
+checkResponseTextAccessThrows(xhr);
+checkResponseXMLAccessThrows(xhr);
+ab = xhr.mozResponse;
 ok(ab != null, "should have a non-null arraybuffer");
-is(ab.byteLength, "hello pass\n".length, "wrong arraybuffer byteLength");
-
-u8v = new Uint8Array(ab);
-ok(String.fromCharCode([u8v[0], u8v[1], u8v[2], u8v[3], u8v[4]]), "hello", "wrong values");
+arraybuffer_equals_to(ab, "hello pass\n");
 
 // with a binary file
 xhr = new XMLHttpRequest();
 xhr.open("GET", 'file_XHR_binary1.bin', false); 
+xhr.mozResponseType = 'arraybuffer';
 xhr.send(null)
 is(xhr.status, 200, "wrong status");
-ab = xhr.mozResponseArrayBuffer;
+checkResponseTextAccessThrows(xhr);
+checkResponseXMLAccessThrows(xhr);
+ab = xhr.mozResponse;
 ok(ab != null, "should have a non-null arraybuffer");
-is(ab.byteLength, 12, "wrong arraybuffer byteLength");
+arraybuffer_equals_to(ab, "\xaa\xee\0\x03\xff\xff\xff\xff\xbb\xbb\xbb\xbb");
 
-u8v = new Uint8Array(ab);
-i32v = new Int32Array(ab);
-u32v = new Uint32Array(ab, 8);
-ok(u8v[0] == 0xaa && u8v[1] == 0xee && u8v[2] == 0x00 && u8v[3] == 0x03, "wrong initial 4 bytes");
-is(i32v[1], -1, "wrong value, expected -1 (0xffffffff)");
-is(u32v[0], 0xbbbbbbbb, "wrong value, expected 0xbbbbbbbb");
+// test response (responseType='blob')
+var onloadCount = 0;
+function checkOnloadCount() {
+  if (++onloadCount >= 2) SimpleTest.finish();
+};
+
+// with a simple text file
+xhr = new XMLHttpRequest();
+xhr.open("GET", 'file_XHR_pass2.txt', false); 
+xhr.mozResponseType = 'blob';
+xhr.send(null);
+is(xhr.status, 200, "wrong status");
+checkResponseTextAccessThrows(xhr);
+checkResponseXMLAccessThrows(xhr);
+b = xhr.mozResponse;
+ok(b, "should have a non-null blob");
+is(b.size, "hello pass\n".length, "wrong blob size");
+
+fr = new FileReader();
+fr.onload = function() {
+  ok(fr.result, "hello pass\n", "wrong values");
+  checkOnloadCount();
+};
+fr.readAsBinaryString(b);
+
+// with a binary file
+xhr = new XMLHttpRequest();
+xhr.onreadystatechange = function() {
+  switch (xhr.readyState) {
+  case 2:
+    is(xhr.status, 200, "wrong status");
+    xhr.mozResponseType = 'blob';
+    break;
+  case 4:
+    b = xhr.mozResponse;
+    ok(b != null, "should have a non-null blob");
+    is(b.size, 12, "wrong blob size");
+
+    fr = new FileReader();
+    fr.onload = function() {
+      is(fr.result, "\xaa\xee\0\x03\xff\xff\xff\xff\xbb\xbb\xbb\xbb", "wrong values");
+      checkOnloadCount();
+    };
+    xhr = null; // kill the XHR object
+    SpecialPowers.gc();
+    fr.readAsBinaryString(b);
+    break;
+  }
+};
+xhr.open("GET", 'file_XHR_binary1.bin', true);
+xhr.send(null);
 
 var client = new XMLHttpRequest();
 client.onreadystatechange = function() {
@@ -96,6 +192,7 @@ client.onreadystatechange = function() {
       try {
         is(client.responseXML, null, "responseXML should be null.");
         is(client.responseText, "", "responseText should be empty string.");
+        is(client.mozResponse, "", "response should be empty string.");
         is(client.status, 0, "status should be 0.");
         is(client.statusText, "", "statusText should be empty string.");
         is(client.getAllResponseHeaders(), "",
diff --git a/dom/src/threads/nsDOMWorkerEvents.h b/dom/src/threads/nsDOMWorkerEvents.h
index 602d5942831a..10ac2254e306 100644
--- a/dom/src/threads/nsDOMWorkerEvents.h
+++ b/dom/src/threads/nsDOMWorkerEvents.h
@@ -265,7 +265,7 @@ public:
   nsresult status;
   nsresult statusResult;
 
-  PRInt32 readyState;
+  PRUint16 readyState;
   nsresult readyStateResult;
 
 protected:
diff --git a/dom/src/threads/nsDOMWorkerXHR.cpp b/dom/src/threads/nsDOMWorkerXHR.cpp
index f152d975c5ac..e0b970914aa6 100644
--- a/dom/src/threads/nsDOMWorkerXHR.cpp
+++ b/dom/src/threads/nsDOMWorkerXHR.cpp
@@ -720,7 +720,7 @@ nsDOMWorkerXHR::SetRequestHeader(const nsACString& aHeader,
 }
 
 NS_IMETHODIMP
-nsDOMWorkerXHR::GetReadyState(PRInt32* aReadyState)
+nsDOMWorkerXHR::GetReadyState(PRUint16* aReadyState)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
 
@@ -902,9 +902,21 @@ nsDOMWorkerXHR::SetWithCredentials(PRBool aWithCredentials)
   return NS_OK;
 }
 
-/* readonly attribute jsval (ArrayBuffer) mozResponseArrayBuffer; */
 NS_IMETHODIMP
-nsDOMWorkerXHR::GetMozResponseArrayBuffer(jsval *aResult)
+nsDOMWorkerXHR::GetMozResponseType(nsAString& aResponseText)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsDOMWorkerXHR::SetMozResponseType(const nsAString& aResponseText)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* readonly attribute jsval response; */
+NS_IMETHODIMP
+nsDOMWorkerXHR::GetMozResponse(JSContext *aCx, jsval *aResult)
 {
     return NS_ERROR_NOT_IMPLEMENTED;
 }
diff --git a/dom/src/threads/nsDOMWorkerXHRProxy.cpp b/dom/src/threads/nsDOMWorkerXHRProxy.cpp
index caef07b0c2ee..c0bd215338b3 100644
--- a/dom/src/threads/nsDOMWorkerXHRProxy.cpp
+++ b/dom/src/threads/nsDOMWorkerXHRProxy.cpp
@@ -1090,7 +1090,7 @@ nsDOMWorkerXHRProxy::GetStatus(nsresult* _retval)
 }
 
 nsresult
-nsDOMWorkerXHRProxy::GetReadyState(PRInt32* _retval)
+nsDOMWorkerXHRProxy::GetReadyState(PRUint16* _retval)
 {
   NS_ASSERTION(_retval, "Null pointer!");
 
diff --git a/dom/src/threads/nsDOMWorkerXHRProxy.h b/dom/src/threads/nsDOMWorkerXHRProxy.h
index d8abe61c9210..02f1e6852df3 100644
--- a/dom/src/threads/nsDOMWorkerXHRProxy.h
+++ b/dom/src/threads/nsDOMWorkerXHRProxy.h
@@ -141,7 +141,7 @@ protected:
   nsresult GetResponseText(nsAString& _retval);
   nsresult GetStatusText(nsACString& _retval);
   nsresult GetStatus(nsresult* _retval);
-  nsresult GetReadyState(PRInt32* _retval);
+  nsresult GetReadyState(PRUint16* _retval);
   nsresult SetRequestHeader(const nsACString& aHeader,
                             const nsACString& aValue);
   nsresult OverrideMimeType(const nsACString& aMimetype);

From 0d6ac739ca1e301cbfe4ed17eb4ac13796d0fa05 Mon Sep 17 00:00:00 2001
From: Masatoshi Kimura <VYV03354@nifty.ne.jp>
Date: Wed, 11 May 2011 11:06:47 -0700
Subject: [PATCH 313/314] Bug 656253: Fix intermittent orange due to variables
 colliding. r=sicking

--HG--
extra : transplant_source : %DF%B7%0D%26%87NT%01RU%A3U%97FT%C0%C8%C7%C0V
---
 content/base/test/test_XHR.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/base/test/test_XHR.html b/content/base/test/test_XHR.html
index fd74cd4dcbcd..73914b225397 100644
--- a/content/base/test/test_XHR.html
+++ b/content/base/test/test_XHR.html
@@ -152,7 +152,7 @@ b = xhr.mozResponse;
 ok(b, "should have a non-null blob");
 is(b.size, "hello pass\n".length, "wrong blob size");
 
-fr = new FileReader();
+var fr = new FileReader();
 fr.onload = function() {
   ok(fr.result, "hello pass\n", "wrong values");
   checkOnloadCount();
@@ -172,7 +172,7 @@ xhr.onreadystatechange = function() {
     ok(b != null, "should have a non-null blob");
     is(b.size, 12, "wrong blob size");
 
-    fr = new FileReader();
+    var fr = new FileReader();
     fr.onload = function() {
       is(fr.result, "\xaa\xee\0\x03\xff\xff\xff\xff\xbb\xbb\xbb\xbb", "wrong values");
       checkOnloadCount();

From 05240284b777b434b80108871102255b0f934135 Mon Sep 17 00:00:00 2001
From: Luke Wagner <luke@mozilla.com>
Date: Wed, 11 May 2011 15:57:54 -0700
Subject: [PATCH 314/314] Bug 656171 - Use object principals finder in
 PrincipalsForCompiledCode, for now (r=mrbkap)

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

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index a5517a783e7b..07f238ed076b 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1337,7 +1337,7 @@ PrincipalsForCompiledCode(const CallArgs &call, JSContext *cx)
      * fp->script()->compartment() != fp->compartment().
      */
 
-    JSPrincipals *calleePrincipals = call.callee().compartment()->principals;
+    JSPrincipals *calleePrincipals = call.callee().principals(cx);
 
 #ifdef DEBUG
     if (calleePrincipals) {